Merge pull request #689 from camptocamp/doc_fix_napoleon

Doc fix napoleon
openoereb · Oct 29, 2018 · 8294c51 · 8294c51
2 parents 706bb1c + f493f52
commit 8294c51
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -59,7 +59,7 @@ install: $(PYTHON_VENV)
 	touch $@
 
 $(SPHINXBUILD): .venv/requirements-timestamp
-	$(VENV_BIN)pip$(PYTHON_BIN_POSTFIX) install "Sphinx<1.8" sphinxcontrib-napoleon sphinx_rtd_theme
+	$(VENV_BIN)pip$(PYTHON_BIN_POSTFIX) install "Sphinx<1.8" sphinx_rtd_theme
 
 .PHONY: doc
 doc: $(SPHINXBUILD)

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -44,7 +44,7 @@
     'sphinx.ext.viewcode',
     'sphinx.ext.githubpages',
     'sphinx.ext.autodoc',
-    'sphinxcontrib.napoleon',
+    'sphinx.ext.napoleon',
 ]
 
 with open('core/readers.rst', 'w') as readers:

diff --git a/doc/source/contrib/contributing.rst b/doc/source/contrib/contributing.rst
@@ -29,7 +29,7 @@ Code Documentation
 Some parts of the documentation are built directly from the code.
 The documentation is built using `Sphinx <http://sphinx-doc.org/>`__, so the code documentation uses
 `Google style docstrings
-<http://sphinxcontrib-napoleon.readthedocs.io/en/latest/example_google.html>`__.
+<http://www.sphinx-doc.org/en/master/usage/extensions/napoleon.html>`__.
 
 Contributing to the Code
 ========================