Merge "Simplify the format of paragraphs"

This commit is contained in:
Jenkins 2017-03-20 19:15:38 +00:00 committed by Gerrit Code Review
commit 4b6583d302
2 changed files with 16 additions and 7 deletions

View File

@ -480,8 +480,7 @@ def write_files(package_name, options, target):
helptext = helptext.replace('\n\n', '$sentinal$')
helptext = helptext.replace('\n', ' ')
helptext = ' '.join(helptext.split())
# TODO(johngarbutt) space matches only the current template :(
helptext = helptext.replace('$sentinal$', '\n\n ')
helptext = helptext.split('$sentinal$')
if not option.deprecated_reason:
option.deprecated_reason = (
@ -502,8 +501,9 @@ def write_files(package_name, options, target):
' restarting.'))
item = (option.dest,
opt_type,
_sanitize_default(option),
"(%s) %s" % (opt_type, helptext),
helptext,
flags)
items.append(item)

View File

@ -17,16 +17,25 @@
* - Configuration option = Default value
- Description
{% for group in groups %}
* - **[{{ group }}]**
-
{% for item in items[loop.index0] %}
{% if item[1] is equalto '' %}
{% if item[2] is equalto '' %}
* - ``{{ item[0] }}`` =
{% else %}
* - ``{{ item[0] }}`` = ``{{ item[1] }}``
* - ``{{ item[0] }}`` = ``{{ item[2] }}``
{% endif %}
- {{ item[2] }}
{% for flagname, flagdesc in item[3] %}
{% for paragraph in item[3] %}
{% if loop.first %}
- ({{ item [1] }}) {{ paragraph }}
{% else %}
{{ paragraph }}
{% endif %}
{% endfor %}
{% for flagname, flagdesc in item[4] %}
- **{{ flagname }}**