diff --git a/MANIFEST.in b/MANIFEST.in index fde6d7af80..14e16cb10b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,6 @@ prune v2 -prune docsite +prune docs/docsite +prune docs/api prune ticket_stubs prune packaging prune test @@ -10,7 +11,7 @@ include examples/ansible.cfg include lib/ansible/module_utils/powershell.ps1 recursive-include lib/ansible/modules * recursive-include lib/ansible/galaxy/data * -recursive-include docs * +recursive-include docs/man * recursive-include packaging * include Makefile include VERSION diff --git a/Makefile b/Makefile index af38391130..ed7b0ac202 100644 --- a/Makefile +++ b/Makefile @@ -286,7 +286,7 @@ deb-src-upload: deb-src # for arch or gentoo, read instructions in the appropriate 'packaging' subdirectory directory webdocs: - (cd docsite/; make docs) + (cd docs/docsite/; make docs) docs: $(MANPAGES) diff --git a/docs-api/Makefile b/docs/api/Makefile similarity index 100% rename from docs-api/Makefile rename to docs/api/Makefile diff --git a/docs-api/conf.py b/docs/api/conf.py similarity index 100% rename from docs-api/conf.py rename to docs/api/conf.py diff --git a/docs-api/docs-requirements.txt b/docs/api/docs-requirements.txt similarity index 100% rename from docs-api/docs-requirements.txt rename to docs/api/docs-requirements.txt diff --git a/docs-api/index.rst b/docs/api/index.rst similarity index 100% rename from docs-api/index.rst rename to docs/api/index.rst diff --git a/docs-api/modules.rst b/docs/api/modules.rst similarity index 100% rename from docs-api/modules.rst rename to docs/api/modules.rst diff --git a/docsite/.gitignore b/docs/docsite/.gitignore similarity index 100% rename from docsite/.gitignore rename to docs/docsite/.gitignore diff --git a/docsite/.nojekyll b/docs/docsite/.nojekyll similarity index 100% rename from docsite/.nojekyll rename to docs/docsite/.nojekyll diff --git a/docsite/Makefile b/docs/docsite/Makefile similarity index 100% rename from docsite/Makefile rename to docs/docsite/Makefile diff --git a/docsite/README.md b/docs/docsite/README.md similarity index 100% rename from docsite/README.md rename to docs/docsite/README.md diff --git a/docsite/_static/ansible-local.css b/docs/docsite/_static/ansible-local.css similarity index 100% rename from docsite/_static/ansible-local.css rename to docs/docsite/_static/ansible-local.css diff --git a/docsite/_static/basic.css b/docs/docsite/_static/basic.css similarity index 100% rename from docsite/_static/basic.css rename to docs/docsite/_static/basic.css diff --git a/docsite/_static/bootstrap-dropdown.js b/docs/docsite/_static/bootstrap-dropdown.js similarity index 100% rename from docsite/_static/bootstrap-dropdown.js rename to docs/docsite/_static/bootstrap-dropdown.js diff --git a/docsite/_static/bootstrap-scrollspy.js b/docs/docsite/_static/bootstrap-scrollspy.js similarity index 100% rename from docsite/_static/bootstrap-scrollspy.js rename to docs/docsite/_static/bootstrap-scrollspy.js diff --git a/docsite/_static/bootstrap-sphinx.css b/docs/docsite/_static/bootstrap-sphinx.css similarity index 100% rename from docsite/_static/bootstrap-sphinx.css rename to docs/docsite/_static/bootstrap-sphinx.css diff --git a/docsite/_static/bootstrap.css b/docs/docsite/_static/bootstrap.css similarity index 100% rename from docsite/_static/bootstrap.css rename to docs/docsite/_static/bootstrap.css diff --git a/docsite/_static/default.css b/docs/docsite/_static/default.css similarity index 100% rename from docsite/_static/default.css rename to docs/docsite/_static/default.css diff --git a/docsite/_static/doctools.js b/docs/docsite/_static/doctools.js similarity index 100% rename from docsite/_static/doctools.js rename to docs/docsite/_static/doctools.js diff --git a/docsite/_static/favicon.ico b/docs/docsite/_static/favicon.ico similarity index 100% rename from docsite/_static/favicon.ico rename to docs/docsite/_static/favicon.ico diff --git a/docsite/_static/file.png b/docs/docsite/_static/file.png similarity index 100% rename from docsite/_static/file.png rename to docs/docsite/_static/file.png diff --git a/docsite/_static/jquery.js b/docs/docsite/_static/jquery.js similarity index 100% rename from docsite/_static/jquery.js rename to docs/docsite/_static/jquery.js diff --git a/docsite/_static/minus.png b/docs/docsite/_static/minus.png similarity index 100% rename from docsite/_static/minus.png rename to docs/docsite/_static/minus.png diff --git a/docsite/_static/plus.png b/docs/docsite/_static/plus.png similarity index 100% rename from docsite/_static/plus.png rename to docs/docsite/_static/plus.png diff --git a/docsite/_static/pygments.css b/docs/docsite/_static/pygments.css similarity index 100% rename from docsite/_static/pygments.css rename to docs/docsite/_static/pygments.css diff --git a/docsite/_static/searchtools.js b/docs/docsite/_static/searchtools.js similarity index 100% rename from docsite/_static/searchtools.js rename to docs/docsite/_static/searchtools.js diff --git a/docsite/_static/sidebar.js b/docs/docsite/_static/sidebar.js similarity index 100% rename from docsite/_static/sidebar.js rename to docs/docsite/_static/sidebar.js diff --git a/docsite/_static/solar.css b/docs/docsite/_static/solar.css similarity index 100% rename from docsite/_static/solar.css rename to docs/docsite/_static/solar.css diff --git a/docsite/_static/solarized-dark.css b/docs/docsite/_static/solarized-dark.css similarity index 100% rename from docsite/_static/solarized-dark.css rename to docs/docsite/_static/solarized-dark.css diff --git a/docsite/_static/subtle_dots.png b/docs/docsite/_static/subtle_dots.png similarity index 100% rename from docsite/_static/subtle_dots.png rename to docs/docsite/_static/subtle_dots.png diff --git a/docsite/_static/underscore.js b/docs/docsite/_static/underscore.js similarity index 100% rename from docsite/_static/underscore.js rename to docs/docsite/_static/underscore.js diff --git a/docsite/_themes/srtd/__init__.py b/docs/docsite/_themes/srtd/__init__.py similarity index 100% rename from docsite/_themes/srtd/__init__.py rename to docs/docsite/_themes/srtd/__init__.py diff --git a/docsite/_themes/srtd/breadcrumbs.html b/docs/docsite/_themes/srtd/breadcrumbs.html similarity index 100% rename from docsite/_themes/srtd/breadcrumbs.html rename to docs/docsite/_themes/srtd/breadcrumbs.html diff --git a/docsite/_themes/srtd/footer.html b/docs/docsite/_themes/srtd/footer.html similarity index 100% rename from docsite/_themes/srtd/footer.html rename to docs/docsite/_themes/srtd/footer.html diff --git a/docsite/_themes/srtd/layout.html b/docs/docsite/_themes/srtd/layout.html similarity index 100% rename from docsite/_themes/srtd/layout.html rename to docs/docsite/_themes/srtd/layout.html diff --git a/docsite/_themes/srtd/search.html b/docs/docsite/_themes/srtd/search.html similarity index 100% rename from docsite/_themes/srtd/search.html rename to docs/docsite/_themes/srtd/search.html diff --git a/docsite/_themes/srtd/static/css/badge_only.css b/docs/docsite/_themes/srtd/static/css/badge_only.css similarity index 100% rename from docsite/_themes/srtd/static/css/badge_only.css rename to docs/docsite/_themes/srtd/static/css/badge_only.css diff --git a/docsite/_themes/srtd/static/css/theme.css b/docs/docsite/_themes/srtd/static/css/theme.css similarity index 100% rename from docsite/_themes/srtd/static/css/theme.css rename to docs/docsite/_themes/srtd/static/css/theme.css diff --git a/docsite/_themes/srtd/static/font/fontawesome_webfont.eot b/docs/docsite/_themes/srtd/static/font/fontawesome_webfont.eot similarity index 100% rename from docsite/_themes/srtd/static/font/fontawesome_webfont.eot rename to docs/docsite/_themes/srtd/static/font/fontawesome_webfont.eot diff --git a/docsite/_themes/srtd/static/font/fontawesome_webfont.svg b/docs/docsite/_themes/srtd/static/font/fontawesome_webfont.svg similarity index 100% rename from docsite/_themes/srtd/static/font/fontawesome_webfont.svg rename to docs/docsite/_themes/srtd/static/font/fontawesome_webfont.svg diff --git a/docsite/_themes/srtd/static/font/fontawesome_webfont.ttf b/docs/docsite/_themes/srtd/static/font/fontawesome_webfont.ttf similarity index 100% rename from docsite/_themes/srtd/static/font/fontawesome_webfont.ttf rename to docs/docsite/_themes/srtd/static/font/fontawesome_webfont.ttf diff --git a/docsite/_themes/srtd/static/font/fontawesome_webfont.woff b/docs/docsite/_themes/srtd/static/font/fontawesome_webfont.woff similarity index 100% rename from docsite/_themes/srtd/static/font/fontawesome_webfont.woff rename to docs/docsite/_themes/srtd/static/font/fontawesome_webfont.woff diff --git a/docsite/_themes/srtd/static/images/logo_invert.png b/docs/docsite/_themes/srtd/static/images/logo_invert.png similarity index 100% rename from docsite/_themes/srtd/static/images/logo_invert.png rename to docs/docsite/_themes/srtd/static/images/logo_invert.png diff --git a/docsite/_themes/srtd/static/js/theme.js b/docs/docsite/_themes/srtd/static/js/theme.js similarity index 100% rename from docsite/_themes/srtd/static/js/theme.js rename to docs/docsite/_themes/srtd/static/js/theme.js diff --git a/docsite/_themes/srtd/theme.conf b/docs/docsite/_themes/srtd/theme.conf similarity index 100% rename from docsite/_themes/srtd/theme.conf rename to docs/docsite/_themes/srtd/theme.conf diff --git a/docsite/_themes/srtd/versions.html b/docs/docsite/_themes/srtd/versions.html similarity index 100% rename from docsite/_themes/srtd/versions.html rename to docs/docsite/_themes/srtd/versions.html diff --git a/docsite/build-site.py b/docs/docsite/build-site.py similarity index 100% rename from docsite/build-site.py rename to docs/docsite/build-site.py diff --git a/docsite/conf.py b/docs/docsite/conf.py similarity index 100% rename from docsite/conf.py rename to docs/docsite/conf.py diff --git a/docsite/favicon.ico b/docs/docsite/favicon.ico similarity index 100% rename from docsite/favicon.ico rename to docs/docsite/favicon.ico diff --git a/docsite/js/ansible/application.js b/docs/docsite/js/ansible/application.js similarity index 100% rename from docsite/js/ansible/application.js rename to docs/docsite/js/ansible/application.js diff --git a/docsite/man/ansible-playbook.1.html b/docs/docsite/man/ansible-playbook.1.html similarity index 100% rename from docsite/man/ansible-playbook.1.html rename to docs/docsite/man/ansible-playbook.1.html diff --git a/docsite/man/ansible.1.html b/docs/docsite/man/ansible.1.html similarity index 100% rename from docsite/man/ansible.1.html rename to docs/docsite/man/ansible.1.html diff --git a/docsite/modules.js b/docs/docsite/modules.js similarity index 100% rename from docsite/modules.js rename to docs/docsite/modules.js diff --git a/docsite/rst/YAMLSyntax.rst b/docs/docsite/rst/YAMLSyntax.rst similarity index 100% rename from docsite/rst/YAMLSyntax.rst rename to docs/docsite/rst/YAMLSyntax.rst diff --git a/docsite/rst/become.rst b/docs/docsite/rst/become.rst similarity index 100% rename from docsite/rst/become.rst rename to docs/docsite/rst/become.rst diff --git a/docsite/rst/committer_guidelines.rst b/docs/docsite/rst/committer_guidelines.rst similarity index 100% rename from docsite/rst/committer_guidelines.rst rename to docs/docsite/rst/committer_guidelines.rst diff --git a/docsite/rst/common_return_values.rst b/docs/docsite/rst/common_return_values.rst similarity index 100% rename from docsite/rst/common_return_values.rst rename to docs/docsite/rst/common_return_values.rst diff --git a/docsite/rst/community.rst b/docs/docsite/rst/community.rst similarity index 100% rename from docsite/rst/community.rst rename to docs/docsite/rst/community.rst diff --git a/docsite/rst/dev_guide/Makefile b/docs/docsite/rst/dev_guide/Makefile similarity index 100% rename from docsite/rst/dev_guide/Makefile rename to docs/docsite/rst/dev_guide/Makefile diff --git a/docsite/rst/dev_guide/conf.py b/docs/docsite/rst/dev_guide/conf.py similarity index 100% rename from docsite/rst/dev_guide/conf.py rename to docs/docsite/rst/dev_guide/conf.py diff --git a/docsite/rst/dev_guide/developing.rst b/docs/docsite/rst/dev_guide/developing.rst similarity index 100% rename from docsite/rst/dev_guide/developing.rst rename to docs/docsite/rst/dev_guide/developing.rst diff --git a/docsite/rst/dev_guide/developing_api.rst b/docs/docsite/rst/dev_guide/developing_api.rst similarity index 100% rename from docsite/rst/dev_guide/developing_api.rst rename to docs/docsite/rst/dev_guide/developing_api.rst diff --git a/docsite/rst/dev_guide/developing_core.rst b/docs/docsite/rst/dev_guide/developing_core.rst similarity index 100% rename from docsite/rst/dev_guide/developing_core.rst rename to docs/docsite/rst/dev_guide/developing_core.rst diff --git a/docsite/rst/dev_guide/developing_inventory.rst b/docs/docsite/rst/dev_guide/developing_inventory.rst similarity index 100% rename from docsite/rst/dev_guide/developing_inventory.rst rename to docs/docsite/rst/dev_guide/developing_inventory.rst diff --git a/docsite/rst/dev_guide/developing_module_utilities.rst b/docs/docsite/rst/dev_guide/developing_module_utilities.rst similarity index 100% rename from docsite/rst/dev_guide/developing_module_utilities.rst rename to docs/docsite/rst/dev_guide/developing_module_utilities.rst diff --git a/docsite/rst/dev_guide/developing_modules.rst b/docs/docsite/rst/dev_guide/developing_modules.rst similarity index 100% rename from docsite/rst/dev_guide/developing_modules.rst rename to docs/docsite/rst/dev_guide/developing_modules.rst diff --git a/docsite/rst/dev_guide/developing_modules_python3.rst b/docs/docsite/rst/dev_guide/developing_modules_python3.rst similarity index 100% rename from docsite/rst/dev_guide/developing_modules_python3.rst rename to docs/docsite/rst/dev_guide/developing_modules_python3.rst diff --git a/docsite/rst/dev_guide/developing_plugins.rst b/docs/docsite/rst/dev_guide/developing_plugins.rst similarity index 100% rename from docsite/rst/dev_guide/developing_plugins.rst rename to docs/docsite/rst/dev_guide/developing_plugins.rst diff --git a/docsite/rst/dev_guide/developing_program_flow_modules.rst b/docs/docsite/rst/dev_guide/developing_program_flow_modules.rst similarity index 100% rename from docsite/rst/dev_guide/developing_program_flow_modules.rst rename to docs/docsite/rst/dev_guide/developing_program_flow_modules.rst diff --git a/docsite/rst/dev_guide/developing_rebasing.rst b/docs/docsite/rst/dev_guide/developing_rebasing.rst similarity index 100% rename from docsite/rst/dev_guide/developing_rebasing.rst rename to docs/docsite/rst/dev_guide/developing_rebasing.rst diff --git a/docsite/rst/dev_guide/developing_releases.rst b/docs/docsite/rst/dev_guide/developing_releases.rst similarity index 100% rename from docsite/rst/dev_guide/developing_releases.rst rename to docs/docsite/rst/dev_guide/developing_releases.rst diff --git a/docsite/rst/dev_guide/developing_test_pr.rst b/docs/docsite/rst/dev_guide/developing_test_pr.rst similarity index 100% rename from docsite/rst/dev_guide/developing_test_pr.rst rename to docs/docsite/rst/dev_guide/developing_test_pr.rst diff --git a/docsite/rst/dev_guide/index.rst b/docs/docsite/rst/dev_guide/index.rst similarity index 100% rename from docsite/rst/dev_guide/index.rst rename to docs/docsite/rst/dev_guide/index.rst diff --git a/docsite/rst/dev_guide/overview_architecture.rst b/docs/docsite/rst/dev_guide/overview_architecture.rst similarity index 100% rename from docsite/rst/dev_guide/overview_architecture.rst rename to docs/docsite/rst/dev_guide/overview_architecture.rst diff --git a/docsite/rst/dev_guide/repomerge.rst b/docs/docsite/rst/dev_guide/repomerge.rst similarity index 100% rename from docsite/rst/dev_guide/repomerge.rst rename to docs/docsite/rst/dev_guide/repomerge.rst diff --git a/docsite/rst/developing_modules.rst b/docs/docsite/rst/developing_modules.rst similarity index 100% rename from docsite/rst/developing_modules.rst rename to docs/docsite/rst/developing_modules.rst diff --git a/docsite/rst/faq.rst b/docs/docsite/rst/faq.rst similarity index 100% rename from docsite/rst/faq.rst rename to docs/docsite/rst/faq.rst diff --git a/docsite/rst/galaxy.rst b/docs/docsite/rst/galaxy.rst similarity index 100% rename from docsite/rst/galaxy.rst rename to docs/docsite/rst/galaxy.rst diff --git a/docsite/rst/glossary.rst b/docs/docsite/rst/glossary.rst similarity index 100% rename from docsite/rst/glossary.rst rename to docs/docsite/rst/glossary.rst diff --git a/docsite/rst/guide_aws.rst b/docs/docsite/rst/guide_aws.rst similarity index 100% rename from docsite/rst/guide_aws.rst rename to docs/docsite/rst/guide_aws.rst diff --git a/docsite/rst/guide_azure.rst b/docs/docsite/rst/guide_azure.rst similarity index 100% rename from docsite/rst/guide_azure.rst rename to docs/docsite/rst/guide_azure.rst diff --git a/docsite/rst/guide_cloudstack.rst b/docs/docsite/rst/guide_cloudstack.rst similarity index 100% rename from docsite/rst/guide_cloudstack.rst rename to docs/docsite/rst/guide_cloudstack.rst diff --git a/docsite/rst/guide_docker.rst b/docs/docsite/rst/guide_docker.rst similarity index 100% rename from docsite/rst/guide_docker.rst rename to docs/docsite/rst/guide_docker.rst diff --git a/docsite/rst/guide_gce.rst b/docs/docsite/rst/guide_gce.rst similarity index 100% rename from docsite/rst/guide_gce.rst rename to docs/docsite/rst/guide_gce.rst diff --git a/docsite/rst/guide_rax.rst b/docs/docsite/rst/guide_rax.rst similarity index 100% rename from docsite/rst/guide_rax.rst rename to docs/docsite/rst/guide_rax.rst diff --git a/docsite/rst/guide_rolling_upgrade.rst b/docs/docsite/rst/guide_rolling_upgrade.rst similarity index 100% rename from docsite/rst/guide_rolling_upgrade.rst rename to docs/docsite/rst/guide_rolling_upgrade.rst diff --git a/docsite/rst/guide_vagrant.rst b/docs/docsite/rst/guide_vagrant.rst similarity index 100% rename from docsite/rst/guide_vagrant.rst rename to docs/docsite/rst/guide_vagrant.rst diff --git a/docsite/rst/guides.rst b/docs/docsite/rst/guides.rst similarity index 100% rename from docsite/rst/guides.rst rename to docs/docsite/rst/guides.rst diff --git a/docsite/rst/index.rst b/docs/docsite/rst/index.rst similarity index 100% rename from docsite/rst/index.rst rename to docs/docsite/rst/index.rst diff --git a/docsite/rst/intro.rst b/docs/docsite/rst/intro.rst similarity index 100% rename from docsite/rst/intro.rst rename to docs/docsite/rst/intro.rst diff --git a/docsite/rst/intro_adhoc.rst b/docs/docsite/rst/intro_adhoc.rst similarity index 100% rename from docsite/rst/intro_adhoc.rst rename to docs/docsite/rst/intro_adhoc.rst diff --git a/docsite/rst/intro_bsd.rst b/docs/docsite/rst/intro_bsd.rst similarity index 100% rename from docsite/rst/intro_bsd.rst rename to docs/docsite/rst/intro_bsd.rst diff --git a/docsite/rst/intro_configuration.rst b/docs/docsite/rst/intro_configuration.rst similarity index 100% rename from docsite/rst/intro_configuration.rst rename to docs/docsite/rst/intro_configuration.rst diff --git a/docsite/rst/intro_dynamic_inventory.rst b/docs/docsite/rst/intro_dynamic_inventory.rst similarity index 100% rename from docsite/rst/intro_dynamic_inventory.rst rename to docs/docsite/rst/intro_dynamic_inventory.rst diff --git a/docsite/rst/intro_getting_started.rst b/docs/docsite/rst/intro_getting_started.rst similarity index 100% rename from docsite/rst/intro_getting_started.rst rename to docs/docsite/rst/intro_getting_started.rst diff --git a/docsite/rst/intro_installation.rst b/docs/docsite/rst/intro_installation.rst similarity index 100% rename from docsite/rst/intro_installation.rst rename to docs/docsite/rst/intro_installation.rst diff --git a/docsite/rst/intro_inventory.rst b/docs/docsite/rst/intro_inventory.rst similarity index 100% rename from docsite/rst/intro_inventory.rst rename to docs/docsite/rst/intro_inventory.rst diff --git a/docsite/rst/intro_networking.rst b/docs/docsite/rst/intro_networking.rst similarity index 100% rename from docsite/rst/intro_networking.rst rename to docs/docsite/rst/intro_networking.rst diff --git a/docsite/rst/intro_patterns.rst b/docs/docsite/rst/intro_patterns.rst similarity index 100% rename from docsite/rst/intro_patterns.rst rename to docs/docsite/rst/intro_patterns.rst diff --git a/docsite/rst/intro_windows.rst b/docs/docsite/rst/intro_windows.rst similarity index 100% rename from docsite/rst/intro_windows.rst rename to docs/docsite/rst/intro_windows.rst diff --git a/docsite/rst/modules.rst b/docs/docsite/rst/modules.rst similarity index 100% rename from docsite/rst/modules.rst rename to docs/docsite/rst/modules.rst diff --git a/docsite/rst/modules/.gitdir b/docs/docsite/rst/modules/.gitdir similarity index 100% rename from docsite/rst/modules/.gitdir rename to docs/docsite/rst/modules/.gitdir diff --git a/docsite/rst/modules_core.rst b/docs/docsite/rst/modules_core.rst similarity index 100% rename from docsite/rst/modules_core.rst rename to docs/docsite/rst/modules_core.rst diff --git a/docsite/rst/modules_extra.rst b/docs/docsite/rst/modules_extra.rst similarity index 100% rename from docsite/rst/modules_extra.rst rename to docs/docsite/rst/modules_extra.rst diff --git a/docsite/rst/modules_intro.rst b/docs/docsite/rst/modules_intro.rst similarity index 100% rename from docsite/rst/modules_intro.rst rename to docs/docsite/rst/modules_intro.rst diff --git a/docsite/rst/playbooks.rst b/docs/docsite/rst/playbooks.rst similarity index 100% rename from docsite/rst/playbooks.rst rename to docs/docsite/rst/playbooks.rst diff --git a/docsite/rst/playbooks_acceleration.rst b/docs/docsite/rst/playbooks_acceleration.rst similarity index 100% rename from docsite/rst/playbooks_acceleration.rst rename to docs/docsite/rst/playbooks_acceleration.rst diff --git a/docsite/rst/playbooks_advanced_syntax.rst b/docs/docsite/rst/playbooks_advanced_syntax.rst similarity index 100% rename from docsite/rst/playbooks_advanced_syntax.rst rename to docs/docsite/rst/playbooks_advanced_syntax.rst diff --git a/docsite/rst/playbooks_async.rst b/docs/docsite/rst/playbooks_async.rst similarity index 100% rename from docsite/rst/playbooks_async.rst rename to docs/docsite/rst/playbooks_async.rst diff --git a/docsite/rst/playbooks_best_practices.rst b/docs/docsite/rst/playbooks_best_practices.rst similarity index 100% rename from docsite/rst/playbooks_best_practices.rst rename to docs/docsite/rst/playbooks_best_practices.rst diff --git a/docsite/rst/playbooks_blocks.rst b/docs/docsite/rst/playbooks_blocks.rst similarity index 100% rename from docsite/rst/playbooks_blocks.rst rename to docs/docsite/rst/playbooks_blocks.rst diff --git a/docsite/rst/playbooks_checkmode.rst b/docs/docsite/rst/playbooks_checkmode.rst similarity index 100% rename from docsite/rst/playbooks_checkmode.rst rename to docs/docsite/rst/playbooks_checkmode.rst diff --git a/docsite/rst/playbooks_conditionals.rst b/docs/docsite/rst/playbooks_conditionals.rst similarity index 100% rename from docsite/rst/playbooks_conditionals.rst rename to docs/docsite/rst/playbooks_conditionals.rst diff --git a/docsite/rst/playbooks_debugger.rst b/docs/docsite/rst/playbooks_debugger.rst similarity index 100% rename from docsite/rst/playbooks_debugger.rst rename to docs/docsite/rst/playbooks_debugger.rst diff --git a/docsite/rst/playbooks_delegation.rst b/docs/docsite/rst/playbooks_delegation.rst similarity index 100% rename from docsite/rst/playbooks_delegation.rst rename to docs/docsite/rst/playbooks_delegation.rst diff --git a/docsite/rst/playbooks_environment.rst b/docs/docsite/rst/playbooks_environment.rst similarity index 100% rename from docsite/rst/playbooks_environment.rst rename to docs/docsite/rst/playbooks_environment.rst diff --git a/docsite/rst/playbooks_error_handling.rst b/docs/docsite/rst/playbooks_error_handling.rst similarity index 100% rename from docsite/rst/playbooks_error_handling.rst rename to docs/docsite/rst/playbooks_error_handling.rst diff --git a/docsite/rst/playbooks_filters.rst b/docs/docsite/rst/playbooks_filters.rst similarity index 100% rename from docsite/rst/playbooks_filters.rst rename to docs/docsite/rst/playbooks_filters.rst diff --git a/docsite/rst/playbooks_filters_ipaddr.rst b/docs/docsite/rst/playbooks_filters_ipaddr.rst similarity index 100% rename from docsite/rst/playbooks_filters_ipaddr.rst rename to docs/docsite/rst/playbooks_filters_ipaddr.rst diff --git a/docsite/rst/playbooks_intro.rst b/docs/docsite/rst/playbooks_intro.rst similarity index 100% rename from docsite/rst/playbooks_intro.rst rename to docs/docsite/rst/playbooks_intro.rst diff --git a/docsite/rst/playbooks_lookups.rst b/docs/docsite/rst/playbooks_lookups.rst similarity index 100% rename from docsite/rst/playbooks_lookups.rst rename to docs/docsite/rst/playbooks_lookups.rst diff --git a/docsite/rst/playbooks_loops.rst b/docs/docsite/rst/playbooks_loops.rst similarity index 100% rename from docsite/rst/playbooks_loops.rst rename to docs/docsite/rst/playbooks_loops.rst diff --git a/docsite/rst/playbooks_prompts.rst b/docs/docsite/rst/playbooks_prompts.rst similarity index 100% rename from docsite/rst/playbooks_prompts.rst rename to docs/docsite/rst/playbooks_prompts.rst diff --git a/docsite/rst/playbooks_roles.rst b/docs/docsite/rst/playbooks_roles.rst similarity index 100% rename from docsite/rst/playbooks_roles.rst rename to docs/docsite/rst/playbooks_roles.rst diff --git a/docsite/rst/playbooks_special_topics.rst b/docs/docsite/rst/playbooks_special_topics.rst similarity index 100% rename from docsite/rst/playbooks_special_topics.rst rename to docs/docsite/rst/playbooks_special_topics.rst diff --git a/docsite/rst/playbooks_startnstep.rst b/docs/docsite/rst/playbooks_startnstep.rst similarity index 100% rename from docsite/rst/playbooks_startnstep.rst rename to docs/docsite/rst/playbooks_startnstep.rst diff --git a/docsite/rst/playbooks_strategies.rst b/docs/docsite/rst/playbooks_strategies.rst similarity index 100% rename from docsite/rst/playbooks_strategies.rst rename to docs/docsite/rst/playbooks_strategies.rst diff --git a/docsite/rst/playbooks_tags.rst b/docs/docsite/rst/playbooks_tags.rst similarity index 100% rename from docsite/rst/playbooks_tags.rst rename to docs/docsite/rst/playbooks_tags.rst diff --git a/docsite/rst/playbooks_tests.rst b/docs/docsite/rst/playbooks_tests.rst similarity index 100% rename from docsite/rst/playbooks_tests.rst rename to docs/docsite/rst/playbooks_tests.rst diff --git a/docsite/rst/playbooks_variables.rst b/docs/docsite/rst/playbooks_variables.rst similarity index 100% rename from docsite/rst/playbooks_variables.rst rename to docs/docsite/rst/playbooks_variables.rst diff --git a/docsite/rst/playbooks_vault.rst b/docs/docsite/rst/playbooks_vault.rst similarity index 100% rename from docsite/rst/playbooks_vault.rst rename to docs/docsite/rst/playbooks_vault.rst diff --git a/docsite/rst/porting_guide_2.0.rst b/docs/docsite/rst/porting_guide_2.0.rst similarity index 100% rename from docsite/rst/porting_guide_2.0.rst rename to docs/docsite/rst/porting_guide_2.0.rst diff --git a/docsite/rst/python_3_support.rst b/docs/docsite/rst/python_3_support.rst similarity index 100% rename from docsite/rst/python_3_support.rst rename to docs/docsite/rst/python_3_support.rst diff --git a/docsite/rst/quickstart.rst b/docs/docsite/rst/quickstart.rst similarity index 100% rename from docsite/rst/quickstart.rst rename to docs/docsite/rst/quickstart.rst diff --git a/docsite/rst/roadmap/ROADMAP_2_1.rst b/docs/docsite/rst/roadmap/ROADMAP_2_1.rst similarity index 100% rename from docsite/rst/roadmap/ROADMAP_2_1.rst rename to docs/docsite/rst/roadmap/ROADMAP_2_1.rst diff --git a/docsite/rst/roadmap/ROADMAP_2_2.rst b/docs/docsite/rst/roadmap/ROADMAP_2_2.rst similarity index 100% rename from docsite/rst/roadmap/ROADMAP_2_2.rst rename to docs/docsite/rst/roadmap/ROADMAP_2_2.rst diff --git a/docsite/rst/roadmap/ROADMAP_2_3.rst b/docs/docsite/rst/roadmap/ROADMAP_2_3.rst similarity index 100% rename from docsite/rst/roadmap/ROADMAP_2_3.rst rename to docs/docsite/rst/roadmap/ROADMAP_2_3.rst diff --git a/docsite/rst/roadmap/ROADMAP_2_4.rst b/docs/docsite/rst/roadmap/ROADMAP_2_4.rst similarity index 100% rename from docsite/rst/roadmap/ROADMAP_2_4.rst rename to docs/docsite/rst/roadmap/ROADMAP_2_4.rst diff --git a/docsite/rst/test_strategies.rst b/docs/docsite/rst/test_strategies.rst similarity index 100% rename from docsite/rst/test_strategies.rst rename to docs/docsite/rst/test_strategies.rst diff --git a/docsite/rst/tower.rst b/docs/docsite/rst/tower.rst similarity index 100% rename from docsite/rst/tower.rst rename to docs/docsite/rst/tower.rst diff --git a/docsite/rst_common/ansible_ssh_changes_note.rst b/docs/docsite/rst_common/ansible_ssh_changes_note.rst similarity index 100% rename from docsite/rst_common/ansible_ssh_changes_note.rst rename to docs/docsite/rst_common/ansible_ssh_changes_note.rst diff --git a/docsite/variables.dot b/docs/docsite/variables.dot similarity index 100% rename from docsite/variables.dot rename to docs/docsite/variables.dot diff --git a/test/runner/lib/classification.py b/test/runner/lib/classification.py index ee56e7853c..2128147776 100644 --- a/test/runner/lib/classification.py +++ b/test/runner/lib/classification.py @@ -139,12 +139,6 @@ class PathMapper(object): if path.startswith('docs/'): return minimal - if path.startswith('docs-api/'): - return minimal - - if path.startswith('docsite/'): - return minimal - if path.startswith('examples/'): return minimal