[SCM] dataset manipulation GUI generator branch, master, updated. upstream/1.2.3-26-ged200a3

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit 356b1d74c5ea6a1d4320ef20cd2ba412ed51994c
Merge: d173a3bde9ba09b59d5e808eb05d48d62793253e 92ae978895365fd390187d567f48928762c11acd
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Mon Nov 29 12:43:40 2010 -0500

    Merge commit 'upstream/1.2.4'

diff --combined doc/conf.py
index 9026564,91b4b55..b346e2f
--- a/doc/conf.py
+++ b/doc/conf.py
@@@ -22,7 -22,7 +22,7 @@@ import sys, o
  
  # Add any Sphinx extension module names here, as strings. They can be extensions
  # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
- extensions = []
+ extensions = ['sphinx.ext.autodoc']
  
  # Add any paths that contain templates here, relative to this directory.
  templates_path = ['_templates']
@@@ -84,16 -84,14 +84,16 @@@ exclude_trees = [
  pygments_style = 'sphinx'
  
  # A list of ignored prefixes for module index sorting.
- #modindex_common_prefix = []
+ modindex_common_prefix = ['guidata.']
  
  
  # -- Options for HTML output ---------------------------------------------------
  
 +html_copy_source=False
 +
  # The theme to use for HTML and HTML Help pages.  Major themes that come with
  # Sphinx are currently 'default' and 'sphinxdoc'.
- html_theme = 'default'
+ html_theme = 'sphinxdoc'
  
  # Theme options are theme-specific and customize the look and feel of a theme
  # further.  For a list of options available for each theme, see the
@@@ -113,12 -111,12 +113,12 @@@
  
  # The name of an image file (relative to this directory) to place at the top
  # of the sidebar.
- #html_logo = 'guidata_bbg.png'
+ html_logo = 'images/guidata.png'
  
  # The name of an image file (within the static path) to use as favicon of the
  # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
  # pixels large.
- #html_favicon = 'favicon.ico'
+ html_favicon = 'favicon.ico'
  
  # Add any paths that contain custom static files (such as style sheets) here,
  # relative to this directory. They are copied after the builtin static files,
@@@ -141,7 -139,7 +141,7 @@@ html_static_path = ['_static'
  #html_additional_pages = {}
  
  # If false, no module index is generated.
- #html_use_modindex = True
+ html_use_modindex = True
  
  # If false, no index is generated.
  #html_use_index = True

-- 
dataset manipulation GUI generator