Merge pull request #12911 from bcoca/manpage_fixes

Manpage fixes
This commit is contained in:
James Cammarata
2015-10-27 14:48:38 -04:00
14 changed files with 230 additions and 1224 deletions

View File

@@ -229,7 +229,7 @@ class CLI(object):
if inventory_opts:
parser.add_option('-i', '--inventory-file', dest='inventory',
help="specify inventory host file (default=%s)" % C.DEFAULT_HOST_LIST,
help="specify inventory host path (default=%s) or comma separated host list" % C.DEFAULT_HOST_LIST,
default=C.DEFAULT_HOST_LIST, action="callback", callback=CLI.expand_tilde, type=str)
parser.add_option('--list-hosts', dest='listhosts', action='store_true',
help='outputs a list of matching hosts; does not execute anything else')