[Checkins] SVN: grok/branches/jw-documentation-rearangement/doc/conf.py copyright and dev mode unreleased marker thingy

[Jan-Wijbrand Kolman]

Log message for revision 119617:
  copyright and dev mode unreleased marker thingy

Changed:
  U   grok/branches/jw-documentation-rearangement/doc/conf.py

-=-
Modified: grok/branches/jw-documentation-rearangement/doc/conf.py
===================================================================
--- grok/branches/jw-documentation-rearangement/doc/conf.py	2011-01-17 09:00:42 UTC (rev 119616)
+++ grok/branches/jw-documentation-rearangement/doc/conf.py	2011-01-17 10:15:15 UTC (rev 119617)
@@ -25,8 +25,18 @@
 
 # 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.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.viewcode']
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.coverage',
+    'sphinx.ext.doctest',
+    'sphinx.ext.intersphinx',
+    'sphinx.ext.todo',
+    'sphinx.ext.viewcode',
+    ]
 
+# Order autodoc generated docs in source code order.
+autodoc_member_order = 'alphabetical'
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
@@ -41,7 +51,7 @@
 
 # General information about the project.
 project = u'grok'
-copyright = u'2011, The Grok developers and community'
+copyright = u'2006-2011, The Zope Foundation and Grok developers and community'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -51,6 +61,8 @@
 version = '1.4'
 # The full version, including alpha/beta/rc tags.
 release = '1.4'
+if release.endswith('dev'):
+    release = '%s (unreleased)' % release
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -164,7 +176,7 @@
 #html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'grokdoc'
+# htmlhelp_basename = 'grokdoc'
 
 
 # -- Options for LaTeX output --------------------------------------------------