From 24635609dc5ab8aff2e7fa3f34c4993cbc424579 Mon Sep 17 00:00:00 2001 From: Olle Lundberg Date: Thu, 23 Jan 2014 11:32:59 +0100 Subject: Epydoc -> Sphinx. --- sites/docs/conf.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sites/docs/conf.py') diff --git a/sites/docs/conf.py b/sites/docs/conf.py index 0c7ffe55..94267f0a 100644 --- a/sites/docs/conf.py +++ b/sites/docs/conf.py @@ -1,4 +1,7 @@ # Obtain shared config values import os, sys sys.path.append(os.path.abspath('..')) +sys.path.append(os.path.abspath('../..')) from shared_conf import * + +extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx'] -- cgit v1.2.3 From 4a98671bf67c3df92b9b60640480828053cda0eb Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 14 Feb 2014 13:33:36 -0800 Subject: Tweak conf.py in prep for less boilerplatey versions of module files --- sites/docs/conf.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'sites/docs/conf.py') diff --git a/sites/docs/conf.py b/sites/docs/conf.py index 94267f0a..c0f51f76 100644 --- a/sites/docs/conf.py +++ b/sites/docs/conf.py @@ -4,4 +4,8 @@ sys.path.append(os.path.abspath('..')) sys.path.append(os.path.abspath('../..')) from shared_conf import * -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx'] +# Enable autodoc, intersphinx +extensions.extend(['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']) + +# Autodoc settings +autodoc_default_flags = ['members', 'special-members'] -- cgit v1.2.3 From 0b2d523665f3989d9375cd83970400ace0e40336 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 21 Feb 2014 15:35:22 -0800 Subject: Connect to Python stdlib intersphinx --- sites/docs/conf.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sites/docs/conf.py') diff --git a/sites/docs/conf.py b/sites/docs/conf.py index c0f51f76..619ff816 100644 --- a/sites/docs/conf.py +++ b/sites/docs/conf.py @@ -9,3 +9,8 @@ extensions.extend(['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']) # Autodoc settings autodoc_default_flags = ['members', 'special-members'] + +# Intersphinx connection to stdlib +intersphinx_mapping = { + 'python': ('http://docs.python.org/2.6', None), +} -- cgit v1.2.3