[gentoo-commits] proj/gentoo-packages:master commit in: docs/source/

[gentoo-commits] proj/gentoo-packages:master commit in: docs/source/

[Slava Bacherikov]

commit:     e65e611a6209188939440d7e7a0cfa752a359b10
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Sun Aug 19 23:39:12 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Sun Aug 19 23:39:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=e65e611a

Update sphinx config

---
 docs/source/conf.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 5e03907..a9e2d43 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -17,6 +17,8 @@ PROJECT_PATH =  os.path.abspath(os.path.join(DIR, '../..'))
 PROJECT_ROOT = os.path.join(PROJECT_PATH, 'gpackages')
 sys.path.insert(0, os.path.join(PROJECT_ROOT, 'libs'))
 sys.path.insert(0, os.path.join(PROJECT_ROOT, 'apps'))
+sys.path.insert(0, os.path.join(PROJECT_ROOT, 'main'))
+os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

[gentoo-commits] proj/gentoo-packages:master commit in: docs/source/

[Slava Bacherikov]

commit:     25aaaabe6372a0e30f42c8913d70b67efddc45fc
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Mon Aug 20 11:24:55 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Mon Aug 20 11:24:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=25aaaabe

Update sphinx config

---
 docs/source/conf.py |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index a9e2d43..dc21c25 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -32,7 +32,11 @@ os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.viewcode']
+extensions = ['sphinx.ext.autodoc', 
+              'sphinx.ext.todo',
+              'sphinx.ext.coverage',
+              'sphinx.ext.viewcode',
+              'sphinx.ext.intersphinx']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -291,3 +295,7 @@ epub_copyright = u'2012, Slava Bacherikov'
 # Allow duplicate toc entries.
 #epub_tocdup = True
 autoclass_content = 'both'
+intersphinx_mapping = {
+        'python': ('http://docs.python.org/2.7', None),
+        'django': ('http://docs.djangoproject.com/en/1.4/', 'http://docs.djangoproject.com/en/1.4/_objects/'),
+    }

[gentoo-commits] proj/gentoo-packages:master commit in: docs/source/

[Slava Bacherikov]

commit:     438881c99fcf807bc72047bd49f863522f130a90
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Mon Aug 27 21:27:35 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Mon Aug 27 21:27:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=438881c9

Execute settings in doc config

---
 docs/source/conf.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index dc21c25..f656039 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -15,10 +15,10 @@ import sys, os
 DIR = os.path.dirname(__file__)
 PROJECT_PATH =  os.path.abspath(os.path.join(DIR, '../..'))
 PROJECT_ROOT = os.path.join(PROJECT_PATH, 'gpackages')
-sys.path.insert(0, os.path.join(PROJECT_ROOT, 'libs'))
-sys.path.insert(0, os.path.join(PROJECT_ROOT, 'apps'))
 sys.path.insert(0, os.path.join(PROJECT_ROOT, 'main'))
 os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+# for execute local_settings
+import settings
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the