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

Merge pull request #9485 from bcoca/doc_subcategory_merge_fix

Browse source 
Doc subcategory merge fix
This commit is contained in:
Brian Coca 2014-11-04 21:25:39 -05:00
parent d3da2edfe3 339d1ccc8b
commit 6090f541f7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hacking/module_formatter.py
View file

@ -135,7 +135,7 @@ def list_modules(module_dir, depth=0):
res = list_modules(d, depth + 1)
for key in res.keys():
if key in categories:
categories[key].update(res[key])
categories[key] = ansible.utils.merge_hash(categories[key], res[key])
res.pop(key, None)
if depth < 2:
@ -372,7 +372,7 @@ def process_category(category, categories, options, env, template, outputname):
sections.sort()
for section in sections:
category_file.write("%s\n%s\n\n" % (section.replace("_"," ").title(),'-' * len(section)))
category_file.write("\n%s\n%s\n\n" % (section.replace("_"," ").title(),'-' * len(section)))
category_file.write(".. toctree:: :maxdepth: 1\n\n")
section_modules = module_map[section].keys()