Added/corrected docstrings for custom model fields and EntityProxyFields (now renamed...

[philo.git] / docs / conf.py

diff --git a/docs/conf.py b/docs/conf.py
index ece87fc..d6c70af 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,6 +21,9 @@ sys.path.append(os.path.abspath(os.path.dirname(os.path.dirname(__file__))))
 
 os.environ['DJANGO_SETTINGS_MODULE'] = 'dummy-settings'
 
+# Import loader so that loader_tags will be correctly added to builtins. Weird import situations... this is necessary for doc build to work.
+from django.template import loader
+
 # -- General configuration -----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -51,9 +54,10 @@ copyright = u'2011, Joseph Spiros'
 # built documents.
 #
 # The short X.Y version.
-version = '1.0'
+from philo import VERSION
+version = '%s.%s' % (VERSION[0], VERSION[1])
 # The full version, including alpha/beta/rc tags.
-release = '1.0a1'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -90,6 +94,10 @@ pygments_style = 'sphinx'
 #modindex_common_prefix = []
 
 
+# Autodoc config
+autodoc_member_order = "bysource"
+
+
 # -- Options for HTML output ---------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for