Merge branch 'ufw' of git://github.com/Trozz/ansible into devel

pull/7869/merge
Michael DeHaan 10 years ago
commit b69f096e8a

@ -113,6 +113,9 @@ def get_man_text(doc):
if 'choices' in opt: if 'choices' in opt:
choices = ", ".join(str(i) for i in opt['choices']) choices = ", ".join(str(i) for i in opt['choices'])
desc = desc + " (Choices: " + choices + ")" desc = desc + " (Choices: " + choices + ")"
if 'default' in opt:
default = str(opt['default'])
desc = desc + " [Default: " + default + "]"
text.append("%s\n" % textwrap.fill(tty_ify(desc), initial_indent=opt_indent, text.append("%s\n" % textwrap.fill(tty_ify(desc), initial_indent=opt_indent,
subsequent_indent=opt_indent)) subsequent_indent=opt_indent))

@ -108,6 +108,11 @@ options:
- Delete rule. - Delete rule.
required: false required: false
choices: ['yes', 'no'] choices: ['yes', 'no']
interface:
description:
- Specify interface for rule.
required: false
aliases: ['if']
''' '''
EXAMPLES = ''' EXAMPLES = '''

Loading…
Cancel
Save