cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

doc fix

Browse source
This commit is contained in:
Brian Coca 2018-05-24 14:54:07 -04:00 committed by Brian Coca
parent 27c43daab8
commit 2affb5f729
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/cli/doc.py
View file

@ -537,6 +537,8 @@ class DocCLI(CLI):
if 'deprecated' in doc and doc['deprecated'] is not None and len(doc['deprecated']) > 0: if 'deprecated' in doc and doc['deprecated'] is not None and len(doc['deprecated']) > 0:
text.append("DEPRECATED: \n") text.append("DEPRECATED: \n")
if isinstance(doc['deprecated'], dict): if isinstance(doc['deprecated'], dict):
if 'version' in doc['deprecated'] and 'removed_in' not in doc['deprecated']:
doc['deprecated']['removed_in'] = doc['deprecated']['version']
text.append("\tReason: %(why)s\n\tWill be removed in: Ansible %(removed_in)s\n\tAlternatives: %(alternative)s" % doc.pop('deprecated')) text.append("\tReason: %(why)s\n\tWill be removed in: Ansible %(removed_in)s\n\tAlternatives: %(alternative)s" % doc.pop('deprecated'))
else: else:
text.append("%s" % doc.pop('deprecated')) text.append("%s" % doc.pop('deprecated'))

2
lib/ansible/plugins/lookup/_redis_kv.py
View file

@ -11,7 +11,7 @@ DOCUMENTATION = """
short_description: fetch data from Redis short_description: fetch data from Redis
deprecated: deprecated:
why: This lookup uses options intermingled with terms which blurs the interface between settings and data why: This lookup uses options intermingled with terms which blurs the interface between settings and data
removed_in: '2.9' version: '2.9'
alternative: new 'redis' lookup alternative: new 'redis' lookup
description: description:
- this lookup returns a list of items given to it, if any of the top level items is also a list it will flatten it, but it will not recurse - this lookup returns a list of items given to it, if any of the top level items is also a list it will flatten it, but it will not recurse