diff options
| author | Michael DeHaan <michael.dehaan@gmail.com> | 2014-08-05 20:40:01 -0400 |
|---|---|---|
| committer | Michael DeHaan <michael.dehaan@gmail.com> | 2014-08-05 20:45:16 -0400 |
| commit | 1c6398dd3b03d5dc1e44cfb347bba46f883a673c (patch) | |
| tree | 0107c7e487496f9ca5846c612f1fa2bc34ba576c | |
| parent | f24e335d0f4a9ea0b3037aafb0bbc1ff5425dc54 (diff) | |
| download | ansible-1c6398dd3b03d5dc1e44cfb347bba46f883a673c.tar.gz | |
Resolve option conflict differently.
| -rw-r--r-- | lib/ansible/utils/module_docs.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/ansible/utils/module_docs.py b/lib/ansible/utils/module_docs.py index bb91c557fc..3983efd508 100644 --- a/lib/ansible/utils/module_docs.py +++ b/lib/ansible/utils/module_docs.py @@ -85,9 +85,7 @@ def get_docstring(filename, verbose=False): if not doc.has_key(key): doc[key] = value else: - # not sure this is the only example but don't do this for the copy module - if key != 'force': - doc[key].update(value) + doc[key].update(value) if 'EXAMPLES' in (t.id for t in child.targets): plainexamples = child.value.s[1:] # Skip first empty line |