mv src/doc/common/*.py to src/sage/docs/conf

src/doc/ca/intro/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u"Introducció de Sage"

src/doc/de/a_tour_of_sage/conf.py

@@ -14,9 +14,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u"Ein Rundgang durch Sage"

src/doc/de/thematische_anleitungen/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u"Thematische Anleitungen"

src/doc/de/tutorial/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u"Sage Tutorial"

src/doc/en/a_tour_of_sage/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u'A Tour of Sage'

src/doc/en/constructions/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u"Sage Constructions"

src/doc/en/developer/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u"Sage Developer's Guide"

src/doc/en/faq/conf.py

@@ -16,9 +16,7 @@
 import os
 import sys
 
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u"Sage FAQ"

src/doc/en/installation/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u"Sage Installation Guide"

src/doc/en/prep/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 
 # General information about the project.

src/doc/en/reference/conf.py

@@ -13,8 +13,7 @@
 
 import sys, os
 from sage.env import SAGE_DOC_SRC, SAGE_DOC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 ref_src = os.path.join(SAGE_DOC_SRC, 'en', 'reference')
 ref_out = os.path.join(SAGE_DOC, 'html', 'en', 'reference')

src/doc/en/reference/conf_sub.py

@@ -13,8 +13,7 @@
 
 import sys, os
 from sage.env import SAGE_DOC_SRC, SAGE_DOC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 from six.moves import range
 

src/doc/en/thematic_tutorials/conf.py

@@ -15,9 +15,7 @@
 
 import os
 import sys
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u"Thematic Tutorials"

src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 name = 'bordeaux_2008'

src/doc/en/thematic_tutorials/numerical_sage/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u'Numerical Computing with Sage'

src/doc/en/tutorial/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u"Sage Tutorial"

src/doc/en/website/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u'Sage Documentation'

src/doc/es/a_tour_of_sage/conf.py

@@ -15,9 +15,7 @@
 
 import sys
 import os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u'Un Tour Por Sage'

src/doc/es/tutorial/conf.py

@@ -13,9 +13,7 @@
 
 import sys
 import os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u"Sage Tutorial"

src/doc/fr/a_tour_of_sage/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u'Sage en quelques mots'

src/doc/fr/tutorial/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u"Tutoriel Sage"

src/doc/hu/a_tour_of_sage/conf.py

@@ -14,9 +14,7 @@
 # out serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u'A Sage bemutatása'

src/doc/it/a_tour_of_sage/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u'Esplora Sage'

src/doc/ja/a_tour_of_sage/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u"Sage ガイドツアー"

src/doc/ja/tutorial/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u"Sage チュートリアル"

src/doc/pt/a_tour_of_sage/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u'Uma Turnê pelo Sage'

src/doc/pt/tutorial/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u"Tutorial Sage"

src/doc/ru/tutorial/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u"Sage Tutorial in Russian"

src/doc/tr/a_tour_of_sage/conf.py

@@ -12,9 +12,7 @@
 # serve to show the default.
 
 import sys, os
-from sage.env import SAGE_DOC_SRC
-sys.path.append(SAGE_DOC_SRC)
-from common.conf import *
+from sage.docs.conf.conf import *
 
 # General information about the project.
 project = u'Sage Turu'

src/sage/misc/sphinxify.py

@@ -85,6 +85,7 @@ def sphinxify(docstring, format='html'):
     os.makedirs(confdir)
     with open(os.path.join(confdir, 'conf.py'), 'w') as filed:
         filed.write(r"""
+from sage.docs.conf.conf import *
 extensions = ['sphinx.ext.autodoc', 'sphinx.ext.mathjax', 'sphinx.ext.todo', 'sphinx.ext.extlinks']
 
 templates_path = ['templates']

src/sage_setup/docbuild/__init__.py

@@ -1174,9 +1174,8 @@ def __init__(self, path):
 # This file is automatically generated by {}, do not edit!
 
 import sys, os
-sys.path.append(os.environ['SAGE_DOC_SRC'])
 sys.path.append({!r})
-from common.conf import *
+from sage.docs.conf.conf import *
 project = u'Documentation for {}'
 release = 'unknown'
 name = {!r}