Merge "Simplify the format of paragraphs"
This commit is contained in:
commit
4b6583d302
|
@ -480,8 +480,7 @@ def write_files(package_name, options, target):
|
||||||
helptext = helptext.replace('\n\n', '$sentinal$')
|
helptext = helptext.replace('\n\n', '$sentinal$')
|
||||||
helptext = helptext.replace('\n', ' ')
|
helptext = helptext.replace('\n', ' ')
|
||||||
helptext = ' '.join(helptext.split())
|
helptext = ' '.join(helptext.split())
|
||||||
# TODO(johngarbutt) space matches only the current template :(
|
helptext = helptext.split('$sentinal$')
|
||||||
helptext = helptext.replace('$sentinal$', '\n\n ')
|
|
||||||
|
|
||||||
if not option.deprecated_reason:
|
if not option.deprecated_reason:
|
||||||
option.deprecated_reason = (
|
option.deprecated_reason = (
|
||||||
|
@ -502,8 +501,9 @@ def write_files(package_name, options, target):
|
||||||
' restarting.'))
|
' restarting.'))
|
||||||
|
|
||||||
item = (option.dest,
|
item = (option.dest,
|
||||||
|
opt_type,
|
||||||
_sanitize_default(option),
|
_sanitize_default(option),
|
||||||
"(%s) %s" % (opt_type, helptext),
|
helptext,
|
||||||
flags)
|
flags)
|
||||||
items.append(item)
|
items.append(item)
|
||||||
|
|
||||||
|
|
|
@ -17,16 +17,25 @@
|
||||||
* - Configuration option = Default value
|
* - Configuration option = Default value
|
||||||
- Description
|
- Description
|
||||||
{% for group in groups %}
|
{% for group in groups %}
|
||||||
|
|
||||||
* - **[{{ group }}]**
|
* - **[{{ group }}]**
|
||||||
-
|
-
|
||||||
{% for item in items[loop.index0] %}
|
{% for item in items[loop.index0] %}
|
||||||
{% if item[1] is equalto '' %}
|
|
||||||
|
{% if item[2] is equalto '' %}
|
||||||
* - ``{{ item[0] }}`` =
|
* - ``{{ item[0] }}`` =
|
||||||
{% else %}
|
{% else %}
|
||||||
* - ``{{ item[0] }}`` = ``{{ item[1] }}``
|
* - ``{{ item[0] }}`` = ``{{ item[2] }}``
|
||||||
{% endif %}
|
{% endif %}
|
||||||
- {{ item[2] }}
|
{% for paragraph in item[3] %}
|
||||||
{% for flagname, flagdesc in item[3] %}
|
|
||||||
|
{% if loop.first %}
|
||||||
|
- ({{ item [1] }}) {{ paragraph }}
|
||||||
|
{% else %}
|
||||||
|
{{ paragraph }}
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
{% for flagname, flagdesc in item[4] %}
|
||||||
|
|
||||||
- **{{ flagname }}**
|
- **{{ flagname }}**
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue