diff --git a/Makefile b/Makefile index 97c646dec3..bc6c7bef75 100644 --- a/Makefile +++ b/Makefile @@ -178,7 +178,6 @@ modulepages: PYTHONPATH=./lib $(PYTHON) hacking/module_formatter.py -A $(VERSION) -t man -o docs/man/man3/ --module-dir=library --template-dir=hacking/templates modulejson: -<<<<<<< HEAD mkdir -p docs/json PYTHONPATH=./lib $(PYTHON) hacking/module_formatter.py -A $(VERSION) -t json -o docs/json --module-dir=library --template-dir=hacking/templates @@ -190,21 +189,10 @@ modulejs: # because this requires Sphinx it is not run as part of every build, those building the RPM and so on can ignore this webdocs: - (cd docsite; make docs) -======= - -(mkdir -p docs/json) + (cd docsite/latest; make docs) PYTHONPATH=./lib $(PYTHON) hacking/module_formatter.py -A $(VERSION) -t json -o docs/json --module-dir=library --template-dir=hacking/templates modulejs: modulejson -(mkdir -p docs/json) PYTHONPATH=./lib $(PYTHON) hacking/module_formatter.py -A $(VERSION) -t js -o docs/json --module-dir=library --template-dir=hacking/templates -# because this requires Sphinx it is not run as part of every build, those building the RPM and so on can ignore this - -webdocs: - (cd docsite/latest; make docs) ->>>>>>> Docs on parameterized roles, make document generation output less noisy - -# just for quick testing of all the module docs -webdocs2: - (cd docsite; make modules) diff --git a/docsite/latest/Makefile b/docsite/latest/Makefile index 4635890bc1..3c75911343 100644 --- a/docsite/latest/Makefile +++ b/docsite/latest/Makefile @@ -1,6 +1,6 @@ #!/usr/bin/make SITELIB = $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") -FORMATTER=../hacking/module_formatter.py +FORMATTER=../../hacking/module_formatter.py all: clean docs @@ -25,7 +25,7 @@ clean: .PHONEY: docs clean -modules: $(FORMATTER) ../hacking/templates/rst.j2 - PYTHONPATH=../lib $(FORMATTER) -t rst --template-dir=../hacking/templates --module-dir=../library -o rst/modules/ --includes-file=rst/modules/_list.rst +modules: $(FORMATTER) ../../hacking/templates/rst.j2 + PYTHONPATH=../../lib $(FORMATTER) -t rst --template-dir=../../hacking/templates --module-dir=../../library -o rst/modules/ --includes-file=rst/modules/_list.rst diff --git a/docsite/_static/ansible-local.css b/docsite/latest/_static/ansible-local.css similarity index 100% rename from docsite/_static/ansible-local.css rename to docsite/latest/_static/ansible-local.css diff --git a/docsite/_static/basic.css b/docsite/latest/_static/basic.css similarity index 100% rename from docsite/_static/basic.css rename to docsite/latest/_static/basic.css diff --git a/docsite/_static/bootstrap-dropdown.js b/docsite/latest/_static/bootstrap-dropdown.js similarity index 100% rename from docsite/_static/bootstrap-dropdown.js rename to docsite/latest/_static/bootstrap-dropdown.js diff --git a/docsite/_static/bootstrap-scrollspy.js b/docsite/latest/_static/bootstrap-scrollspy.js similarity index 100% rename from docsite/_static/bootstrap-scrollspy.js rename to docsite/latest/_static/bootstrap-scrollspy.js diff --git a/docsite/_static/bootstrap-sphinx.css b/docsite/latest/_static/bootstrap-sphinx.css similarity index 100% rename from docsite/_static/bootstrap-sphinx.css rename to docsite/latest/_static/bootstrap-sphinx.css diff --git a/docsite/_static/bootstrap.css b/docsite/latest/_static/bootstrap.css similarity index 100% rename from docsite/_static/bootstrap.css rename to docsite/latest/_static/bootstrap.css diff --git a/docsite/_static/default.css b/docsite/latest/_static/default.css similarity index 100% rename from docsite/_static/default.css rename to docsite/latest/_static/default.css diff --git a/docsite/_static/doctools.js b/docsite/latest/_static/doctools.js similarity index 100% rename from docsite/_static/doctools.js rename to docsite/latest/_static/doctools.js diff --git a/docsite/_static/favicon.ico b/docsite/latest/_static/favicon.ico similarity index 100% rename from docsite/_static/favicon.ico rename to docsite/latest/_static/favicon.ico diff --git a/docsite/_static/file.png b/docsite/latest/_static/file.png similarity index 100% rename from docsite/_static/file.png rename to docsite/latest/_static/file.png diff --git a/docsite/_static/jquery.js b/docsite/latest/_static/jquery.js similarity index 100% rename from docsite/_static/jquery.js rename to docsite/latest/_static/jquery.js diff --git a/docsite/_static/minus.png b/docsite/latest/_static/minus.png similarity index 100% rename from docsite/_static/minus.png rename to docsite/latest/_static/minus.png diff --git a/docsite/_static/plus.png b/docsite/latest/_static/plus.png similarity index 100% rename from docsite/_static/plus.png rename to docsite/latest/_static/plus.png diff --git a/docsite/_static/pygments.css b/docsite/latest/_static/pygments.css similarity index 100% rename from docsite/_static/pygments.css rename to docsite/latest/_static/pygments.css diff --git a/docsite/_static/searchtools.js b/docsite/latest/_static/searchtools.js similarity index 100% rename from docsite/_static/searchtools.js rename to docsite/latest/_static/searchtools.js diff --git a/docsite/_static/sidebar.js b/docsite/latest/_static/sidebar.js similarity index 100% rename from docsite/_static/sidebar.js rename to docsite/latest/_static/sidebar.js diff --git a/docsite/_static/underscore.js b/docsite/latest/_static/underscore.js similarity index 100% rename from docsite/_static/underscore.js rename to docsite/latest/_static/underscore.js diff --git a/docsite/_themes/bootstrap/globaltoc.html b/docsite/latest/_themes/bootstrap/globaltoc.html similarity index 100% rename from docsite/_themes/bootstrap/globaltoc.html rename to docsite/latest/_themes/bootstrap/globaltoc.html diff --git a/docsite/_themes/bootstrap/layout.html b/docsite/latest/_themes/bootstrap/layout.html similarity index 100% rename from docsite/_themes/bootstrap/layout.html rename to docsite/latest/_themes/bootstrap/layout.html diff --git a/docsite/_themes/bootstrap/localtoc.html b/docsite/latest/_themes/bootstrap/localtoc.html similarity index 100% rename from docsite/_themes/bootstrap/localtoc.html rename to docsite/latest/_themes/bootstrap/localtoc.html diff --git a/docsite/_themes/bootstrap/relations.html b/docsite/latest/_themes/bootstrap/relations.html similarity index 100% rename from docsite/_themes/bootstrap/relations.html rename to docsite/latest/_themes/bootstrap/relations.html diff --git a/docsite/_themes/bootstrap/searchbox.html b/docsite/latest/_themes/bootstrap/searchbox.html similarity index 100% rename from docsite/_themes/bootstrap/searchbox.html rename to docsite/latest/_themes/bootstrap/searchbox.html diff --git a/docsite/_themes/bootstrap/sourcelink.html b/docsite/latest/_themes/bootstrap/sourcelink.html similarity index 100% rename from docsite/_themes/bootstrap/sourcelink.html rename to docsite/latest/_themes/bootstrap/sourcelink.html diff --git a/docsite/_themes/bootstrap/static/bootstrap-dropdown.js b/docsite/latest/_themes/bootstrap/static/bootstrap-dropdown.js similarity index 100% rename from docsite/_themes/bootstrap/static/bootstrap-dropdown.js rename to docsite/latest/_themes/bootstrap/static/bootstrap-dropdown.js diff --git a/docsite/_themes/bootstrap/static/bootstrap-scrollspy.js b/docsite/latest/_themes/bootstrap/static/bootstrap-scrollspy.js similarity index 100% rename from docsite/_themes/bootstrap/static/bootstrap-scrollspy.js rename to docsite/latest/_themes/bootstrap/static/bootstrap-scrollspy.js diff --git a/docsite/_themes/bootstrap/static/bootstrap-sphinx.css_t b/docsite/latest/_themes/bootstrap/static/bootstrap-sphinx.css_t similarity index 100% rename from docsite/_themes/bootstrap/static/bootstrap-sphinx.css_t rename to docsite/latest/_themes/bootstrap/static/bootstrap-sphinx.css_t diff --git a/docsite/_themes/bootstrap/static/bootstrap.css b/docsite/latest/_themes/bootstrap/static/bootstrap.css similarity index 100% rename from docsite/_themes/bootstrap/static/bootstrap.css rename to docsite/latest/_themes/bootstrap/static/bootstrap.css diff --git a/docsite/_themes/bootstrap/theme.conf b/docsite/latest/_themes/bootstrap/theme.conf similarity index 100% rename from docsite/_themes/bootstrap/theme.conf rename to docsite/latest/_themes/bootstrap/theme.conf diff --git a/docsite/man/ansible-playbook.1.html b/docsite/latest/man/ansible-playbook.1.html similarity index 100% rename from docsite/man/ansible-playbook.1.html rename to docsite/latest/man/ansible-playbook.1.html diff --git a/docsite/man/ansible.1.html b/docsite/latest/man/ansible.1.html similarity index 100% rename from docsite/man/ansible.1.html rename to docsite/latest/man/ansible.1.html diff --git a/docsite/rst/YAMLSyntax.rst b/docsite/latest/rst/YAMLSyntax.rst similarity index 100% rename from docsite/rst/YAMLSyntax.rst rename to docsite/latest/rst/YAMLSyntax.rst diff --git a/docsite/rst/api.rst b/docsite/latest/rst/api.rst similarity index 100% rename from docsite/rst/api.rst rename to docsite/latest/rst/api.rst diff --git a/docsite/rst/bestpractices.rst b/docsite/latest/rst/bestpractices.rst similarity index 100% rename from docsite/rst/bestpractices.rst rename to docsite/latest/rst/bestpractices.rst diff --git a/docsite/rst/contrib.rst b/docsite/latest/rst/contrib.rst similarity index 100% rename from docsite/rst/contrib.rst rename to docsite/latest/rst/contrib.rst diff --git a/docsite/rst/examples.rst b/docsite/latest/rst/examples.rst similarity index 100% rename from docsite/rst/examples.rst rename to docsite/latest/rst/examples.rst diff --git a/docsite/rst/gettingstarted.rst b/docsite/latest/rst/gettingstarted.rst similarity index 100% rename from docsite/rst/gettingstarted.rst rename to docsite/latest/rst/gettingstarted.rst diff --git a/docsite/rst/glossary.rst b/docsite/latest/rst/glossary.rst similarity index 100% rename from docsite/rst/glossary.rst rename to docsite/latest/rst/glossary.rst diff --git a/docsite/rst/index.rst b/docsite/latest/rst/index.rst similarity index 100% rename from docsite/rst/index.rst rename to docsite/latest/rst/index.rst diff --git a/docsite/rst/moduledev.rst b/docsite/latest/rst/moduledev.rst similarity index 100% rename from docsite/rst/moduledev.rst rename to docsite/latest/rst/moduledev.rst diff --git a/docsite/rst/modules.rst b/docsite/latest/rst/modules.rst similarity index 100% rename from docsite/rst/modules.rst rename to docsite/latest/rst/modules.rst diff --git a/docsite/rst/modules/.gitdir b/docsite/latest/rst/modules/.gitdir similarity index 100% rename from docsite/rst/modules/.gitdir rename to docsite/latest/rst/modules/.gitdir diff --git a/docsite/rst/patterns.rst b/docsite/latest/rst/patterns.rst similarity index 100% rename from docsite/rst/patterns.rst rename to docsite/latest/rst/patterns.rst diff --git a/docsite/rst/playbooks.rst b/docsite/latest/rst/playbooks.rst similarity index 100% rename from docsite/rst/playbooks.rst rename to docsite/latest/rst/playbooks.rst diff --git a/docsite/rst/playbooks2.rst b/docsite/latest/rst/playbooks2.rst similarity index 100% rename from docsite/rst/playbooks2.rst rename to docsite/latest/rst/playbooks2.rst