Merge pull request #403 from loles/doc

Docs are now generated in doc/build
2015-12-02 13:36:41 +01:00 · 2015-12-02 13:36:41 +01:00 · 7af64a9f28
commit 7af64a9f28
parent 38f79d8b2e 9ea401d901
17 changed files with 13 additions and 7 deletions
--- a/docs/Makefile
+++ b/docs/Makefile
--- a/docs/_static/.gitignore
+++ b/docs/_static/.gitignore
--- a/docs/_templates/.gitignore
+++ b/docs/_templates/.gitignore
--- a/docs/commit-log.md
+++ b/docs/commit-log.md
--- a/docs/events.md
+++ b/docs/events.md
--- a/docs/libvirt.md
+++ b/docs/libvirt.md
--- a/docs/removal.md
+++ b/docs/removal.md
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
--- a/docs/source/deployment_plan.rst
+++ b/docs/source/deployment_plan.rst
--- a/docs/source/examples.rst
+++ b/docs/source/examples.rst
--- a/docs/source/glossary.rst
+++ b/docs/source/glossary.rst
--- a/docs/source/handler_ansible.rst
+++ b/docs/source/handler_ansible.rst
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@ -11,13 +11,13 @@ Contents:
 .. toctree::
   :maxdepth: 2

-   source/glossary
-   source/resource
-   source/orchestration
-   source/transports
-   source/handler_ansible
-   source/examples
-   source/deployment_plan
+   glossary
+   resource
+   orchestration
+   transports
+   handler_ansible
+   examples
+   deployment_plan


 Indices and tables
--- a/docs/source/orchestration.rst
+++ b/docs/source/orchestration.rst
--- a/docs/source/resource.rst
+++ b/docs/source/resource.rst
--- a/docs/source/transports.rst
+++ b/docs/source/transports.rst
--- a/setup.cfg
+++ b/setup.cfg
@ -16,6 +16,12 @@ classifier =
     Topic :: System :: Software Distribution
 keywords =
    deployment
+
+[build_sphinx]
+all_files = 1
+build-dir = doc/build
+source-dir = doc/source
+
 [entry_points]
 console_scripts =
    solar = solar.cli.main:run