diff options
| -rw-r--r-- | MANIFEST.in | 2 | ||||
| -rw-r--r-- | doc/.gitignore | 1 | ||||
| -rw-r--r-- | doc/Makefile (renamed from docs/Makefile) | 5 | ||||
| -rw-r--r-- | doc/source/api.rst (renamed from docs/api.rst) | 0 | ||||
| -rw-r--r-- | doc/source/conf.py (renamed from docs/conf.py) | 2 | ||||
| -rw-r--r-- | doc/source/index.rst (renamed from docs/index.rst) | 0 | ||||
| -rw-r--r-- | doc/source/ref/backup_schedules.rst (renamed from docs/ref/backup_schedules.rst) | 0 | ||||
| -rw-r--r-- | doc/source/ref/exceptions.rst (renamed from docs/ref/exceptions.rst) | 0 | ||||
| -rw-r--r-- | doc/source/ref/flavors.rst (renamed from docs/ref/flavors.rst) | 0 | ||||
| -rw-r--r-- | doc/source/ref/images.rst (renamed from docs/ref/images.rst) | 0 | ||||
| -rw-r--r-- | doc/source/ref/index.rst (renamed from docs/ref/index.rst) | 0 | ||||
| -rw-r--r-- | doc/source/ref/ipgroups.rst (renamed from docs/ref/ipgroups.rst) | 0 | ||||
| -rw-r--r-- | doc/source/ref/servers.rst (renamed from docs/ref/servers.rst) | 0 | ||||
| -rw-r--r-- | doc/source/releases.rst (renamed from docs/releases.rst) | 0 | ||||
| -rw-r--r-- | doc/source/shell.rst (renamed from docs/shell.rst) | 0 | ||||
| -rw-r--r-- | docs/.gitignore | 1 | ||||
| -rw-r--r-- | setup.cfg | 6 |
17 files changed, 9 insertions, 8 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index c217ce17..936fd6c2 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,6 +3,6 @@ include HACKING include LICENSE include README.rst include run_tests.sh tox.ini -recursive-include docs * +recursive-include doc * recursive-include tests * recursive-include tools * diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 00000000..567609b1 --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1 @@ +build/ diff --git a/docs/Makefile b/doc/Makefile index 948b6f71..73aeb6ed 100644 --- a/docs/Makefile +++ b/doc/Makefile @@ -4,13 +4,14 @@ # You can set these variables from the command line. SPHINXOPTS = SPHINXBUILD = sphinx-build +SPHINXSOURCE = source PAPER = -BUILDDIR = _build +BUILDDIR = build # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SPHINXSOURCE) .PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest diff --git a/docs/api.rst b/doc/source/api.rst index 6e2b1002..6e2b1002 100644 --- a/docs/api.rst +++ b/doc/source/api.rst diff --git a/docs/conf.py b/doc/source/conf.py index ade5b76f..f6c6b571 100644 --- a/docs/conf.py +++ b/doc/source/conf.py @@ -64,7 +64,7 @@ release = '2.6.10' # List of directories, relative to source directory, that shouldn't be searched # for source files. -exclude_trees = ['_build'] +exclude_trees = [] # The reST default role (used for this markup: `text`) to use for all documents. #default_role = None diff --git a/docs/index.rst b/doc/source/index.rst index 64db466a..64db466a 100644 --- a/docs/index.rst +++ b/doc/source/index.rst diff --git a/docs/ref/backup_schedules.rst b/doc/source/ref/backup_schedules.rst index 28163480..28163480 100644 --- a/docs/ref/backup_schedules.rst +++ b/doc/source/ref/backup_schedules.rst diff --git a/docs/ref/exceptions.rst b/doc/source/ref/exceptions.rst index 0744edc2..0744edc2 100644 --- a/docs/ref/exceptions.rst +++ b/doc/source/ref/exceptions.rst diff --git a/docs/ref/flavors.rst b/doc/source/ref/flavors.rst index 6b281a0e..6b281a0e 100644 --- a/docs/ref/flavors.rst +++ b/doc/source/ref/flavors.rst diff --git a/docs/ref/images.rst b/doc/source/ref/images.rst index 7d1ceab7..7d1ceab7 100644 --- a/docs/ref/images.rst +++ b/doc/source/ref/images.rst diff --git a/docs/ref/index.rst b/doc/source/ref/index.rst index c1fe136b..c1fe136b 100644 --- a/docs/ref/index.rst +++ b/doc/source/ref/index.rst diff --git a/docs/ref/ipgroups.rst b/doc/source/ref/ipgroups.rst index a08d0668..a08d0668 100644 --- a/docs/ref/ipgroups.rst +++ b/doc/source/ref/ipgroups.rst diff --git a/docs/ref/servers.rst b/doc/source/ref/servers.rst index 529b807d..529b807d 100644 --- a/docs/ref/servers.rst +++ b/doc/source/ref/servers.rst diff --git a/docs/releases.rst b/doc/source/releases.rst index 6eb03403..6eb03403 100644 --- a/docs/releases.rst +++ b/doc/source/releases.rst diff --git a/docs/shell.rst b/doc/source/shell.rst index 15ad783a..15ad783a 100644 --- a/docs/shell.rst +++ b/doc/source/shell.rst diff --git a/docs/.gitignore b/docs/.gitignore deleted file mode 100644 index c6a151b3..00000000 --- a/docs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -_build/
\ No newline at end of file @@ -7,9 +7,9 @@ verbosity=2 detailed-errors=1 [build_sphinx] -source-dir = docs/ -build-dir = docs/_build +source-dir = doc/source +build-dir = doc/build all_files = 1 [upload_sphinx] -upload-dir = docs/_build/html +upload-dir = doc/build/html |