[master 3/5] Update Sphinx configuration for python3

bcl installerbot-noreply at redhat.com
Fri Jul 10 17:51:29 UTC 2015


From: "Brian C. Lane" <bcl at redhat.com>

This now uses python3-sphinx and refers to the python3 intersphinx.
---
 docs/Makefile.am | 4 ++--
 docs/conf.py     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index a8ea674..67b85a3 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -30,8 +30,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-SPHINXAPIDOC  = sphinx-apidoc
+SPHINXBUILD   = sphinx-build-3
+SPHINXAPIDOC  = sphinx-apidoc-3
 PAPER         =
 BUILDDIR      = .
 SOURCEDIR     = ../pyanaconda
diff --git a/docs/conf.py b/docs/conf.py
index eb6971c..e0598b0 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -302,7 +302,7 @@ def read_version():
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/2': None}
+intersphinx_mapping = {'https://docs.python.org/3': None}
 
 # on_rtd is whether we are on readthedocs.org
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/0c84f21a4dd0e01ece28b3a2f2990c8deb5c4c69


More information about the anaconda-patches mailing list