Followup to docs refactor pull request ansible#36067 - fixes gitignor…

…e and c… (ansible#36120)

* Followup to docs refactor pull request ansible#36067 - fixes gitignore and cleanup in makefile; removes some generated files; moves a straggler to the appropriate subdirectory.

* Fixed some stragglers

* Removed redundant module entries

* Delete generated RST files.

.gitignore

@@ -31,29 +31,22 @@ docs/man/man3/*
 # docsite stuff...
 docs/api/_build/
 docs/api/rst/
-docs/docsite/*.html
 docs/docsite/_build
-docs/docsite/_static/*.gif
-docs/docsite/_static/*.png
-docs/docsite/_static/websupport.js
+docs/docsite/*.html
 docs/docsite/htmlout
-docs/docsite/searchindex.js
-docs/docsite/rst_warnings
-docs/docsite/rst/*_module.rst
-docs/docsite/rst/ansible.rst
-docs/docsite/rst/ansible-*.rst
-docs/docsite/rst/community_maintained.rst
-docs/docsite/rst/config.rst
-docs/docsite/rst/core_maintained.rst
-docs/docsite/rst/list_of_*.rst
-docs/docsite/rst/module_docs/*.rst
-docs/docsite/rst/modules_by_category.rst
-docs/docsite/rst/network_maintained.rst
-docs/docsite/rst/plugins_by_category.rst
-docs/docsite/rst/partner_maintained.rst
-docs/docsite/rst/playbooks_keywords.rst
+docs/docsite/rst/cli/ansible-*.rst
+docs/docsite/rst/cli/ansible.rst
+docs/docsite/rst/modules/*.rst
 docs/docsite/rst/playbooks_directives.rst
+docs/docsite/rst/plugins_by_category.rst
 docs/docsite/rst/plugins/*/*.rst
+docs/docsite/rst/reference_appendices/config.rst
+docs/docsite/rst/reference_appendices/playbooks_keywords.rst
+docs/docsite/rst_warnings
+docs/docsite/searchindex.js
+docs/docsite/_static/*.gif
+docs/docsite/_static/*.png
+docs/docsite/_static/websupport.js
 # deb building stuff...
 /debian/
 deb-build

docs/docsite/Makefile

@@ -58,19 +58,19 @@ clean:
 	find . -type f \( -name "*~" -or -name "#*" \) -delete
 	find . -type f \( -name "*.swp" \) -delete
 	@echo "Cleaning up generated rst"
-	-rm rst/list_of_*.rst
-	-rm rst/*_by_category.rst
-	-rm rst/*_module.rst
-	-rm rst/*_plugin.rst
-	-rm rst/*_maintained.rst
+	-rm rst/cli/ansible-*.rst
+	-rm rst/cli/ansible.rst
+	-rm rst/modules/*_by_category.rst
+	-rm rst/modules/list_of_*.rst
+	-rm rst/modules/*_maintained.rst
+	-rm rst/modules/*_module.rst
+	-rm rst/modules/*_plugin.rst
 	-rm rst/playbooks_directives.rst
-	-rm rst/playbooks_keywords.rst
 	-rm rst/plugins/*/*.rst
-	-rm rst/config.rst
-	-rm rst/ansible-*.rst
-	-rm rst/ansible.rst
+	-rm rst/reference_appendices/config.rst
+	-rm rst/reference_appendices/playbooks_keywords.rst
 
-.PHONEY: docs clean
+.PHONY: docs clean
 
 # TODO: make generate_man output dir cli option
 cli: $(GENERATE_CLI)

docs/docsite/rst/index.rst

@@ -50,7 +50,6 @@ Ansible, Inc. releases a new major release of Ansible approximately every two mo
    :caption: Scenario Guides
 
    networking_guide/network
-   ..scenario_guides/guides
    scenario_guides/guide_aws
    scenario_guides/guide_azure
    scenario_guides/guide_rax
@@ -65,7 +64,7 @@ Ansible, Inc. releases a new major release of Ansible approximately every two mo
    :maxdepth: 2
    :caption: Reference & Appendices
 
-   reference_appendices/modules_by_category
+   ../modules/modules_by_category
    reference_appendices/playbooks_keywords
    reference_appendices/galaxy
    reference_appendices/common_return_values