diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-09-29 15:38:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-29 15:38:06 +0200 |
| commit | 72f27ce4702a3ace56a85573f565853aacd7e640 (patch) | |
| tree | 1619a5e1fd1d5d39e0a5762dd7c7f32b8640f319 | |
| parent | da0e7f9fd5c259aecde19aaab7758e9545b0ecfa (diff) | |
| parent | 3bb6d226fe1252924d60a28a0378a6979cd72c9c (diff) | |
| download | PROJ-72f27ce4702a3ace56a85573f565853aacd7e640.tar.gz PROJ-72f27ce4702a3ace56a85573f565853aacd7e640.zip | |
Merge pull request #1139 from rouault/fix_doc_make_html_warning
Documentation building fixes
| -rw-r--r-- | docs/Makefile | 2 | ||||
| -rw-r--r-- | docs/source/index.rst | 2 | ||||
| -rw-r--r-- | docs/source/zreferences.rst (renamed from docs/source/references.rst) | 0 | ||||
| -rwxr-xr-x | travis/build_docs.sh | 3 |
4 files changed, 2 insertions, 5 deletions
diff --git a/docs/Makefile b/docs/Makefile index ec0a2e6e..2540fdff 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -2,7 +2,7 @@ # # You can set these variables from the command line. -SPHINXOPTS = +SPHINXOPTS = -W SPHINXBUILD = sphinx-build PAPER = BUILDDIR = build diff --git a/docs/source/index.rst b/docs/source/index.rst index d09424c8..c367cafb 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -20,7 +20,7 @@ PROJ community/index faq glossary - references + zreferences .. only:: html diff --git a/docs/source/references.rst b/docs/source/zreferences.rst index 384281cd..384281cd 100644 --- a/docs/source/references.rst +++ b/docs/source/zreferences.rst diff --git a/travis/build_docs.sh b/travis/build_docs.sh index d62384f1..d6d38b3a 100755 --- a/travis/build_docs.sh +++ b/travis/build_docs.sh @@ -9,9 +9,6 @@ fi cd docs echo "building docs for $TRAVIS_BUILD_DIR/docs" docker run --user $(id -u):$(id -g) -v $TRAVIS_BUILD_DIR:/data -w /data/docs osgeo/proj-docs make html -# workaround for issue with sphinxcontrib-bibtex -docker run --user $(id -u):$(id -g) -v $TRAVIS_BUILD_DIR:/data -w /data/docs osgeo/proj-docs touch source/references.rst -docker run --user $(id -u):$(id -g) -v $TRAVIS_BUILD_DIR:/data -w /data/docs osgeo/proj-docs make html docker run --user $(id -u):$(id -g) -v $TRAVIS_BUILD_DIR:/data -w /data/docs osgeo/proj-docs make latexpdf |