Author: cito
Date: Sat Feb 6 16:31:33 2016
New Revision: 829
Log:
Always use index.rst as master page
Implement the case distinction on the home page with ifconfig.
Deleted:
branches/4.x/docs/toc.rst
trunk/docs/toc.rst
Modified:
branches/4.x/docs/conf.py
branches/4.x/docs/index.rst
trunk/docs/conf.py
trunk/docs/index.rst
Modified: branches/4.x/docs/conf.py
==============================================================================
--- branches/4.x/docs/conf.py Sat Feb 6 15:34:06 2016 (r828)
+++ branches/4.x/docs/conf.py Sat Feb 6 16:31:33 2016 (r829)
@@ -92,12 +92,6 @@
'community/mailinglist.rst', 'community/source.rst',
'community/bugtracker.rst', 'community/support.rst',
'community/homes.rst']
-if use_cloud_theme:
- # We use a naviagtion bar instead of the table of contents
- # and we include the about page on the index page.
- exclude_patterns += ['toc.rst', 'about.rst']
-else:
- exclude_patterns += ['index.rst']
# The reST default role (used for this markup: `text`) for all documents.
#default_role = None
Modified: branches/4.x/docs/index.rst
==============================================================================
--- branches/4.x/docs/index.rst Sat Feb 6 15:34:06 2016 (r828)
+++ branches/4.x/docs/index.rst Sat Feb 6 16:31:33 2016 (r829)
@@ -3,13 +3,27 @@
Welcome to PyGreSQL
===================
-.. toctree::
- :hidden:
+.. ifconfig:: html_theme != 'cloud'
- copyright
- announce
- download/index
- contents/index
- community/index
+ .. toctree::
+ :maxdepth: 2
-.. include:: about.txt
+ about
+ copyright
+ announce
+ download/index
+ contents/index
+ community/index
+
+.. ifconfig:: html_theme == 'cloud'
+
+ .. toctree::
+ :hidden:
+
+ copyright
+ announce
+ download/index
+ contents/index
+ community/index
+
+ .. include:: about.txt
Deleted: branches/4.x/docs/toc.rst
==============================================================================
--- branches/4.x/docs/toc.rst Sat Feb 6 16:31:33 2016 (r828)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,14 +0,0 @@
-.. PyGreSQL documentation master file
-
-Welcome to PyGreSQL
-===================
-
-.. toctree::
- :maxdepth: 2
-
- about
- copyright
- announce
- download/index
- contents/index
- community/index
Modified: trunk/docs/conf.py
==============================================================================
--- trunk/docs/conf.py Sat Feb 6 15:34:06 2016 (r828)
+++ trunk/docs/conf.py Sat Feb 6 16:31:33 2016 (r829)
@@ -39,7 +39,7 @@
# 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']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.ifconfig']
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates'] if use_cloud_theme else []
@@ -53,7 +53,7 @@
#source_encoding = 'utf-8-sig'
# The master toctree document.
-master_doc = 'index' if use_cloud_theme else 'toc'
+master_doc = 'index'
# General information about the project.
project = 'PyGreSQL'
@@ -92,12 +92,6 @@
'community/mailinglist.rst', 'community/source.rst',
'community/bugtracker.rst', 'community/support.rst',
'community/homes.rst']
-if use_cloud_theme:
- # We use a naviagtion bar instead of the table of contents
- # and we include the about page on the index page.
- exclude_patterns += ['toc.rst', 'about.rst']
-else:
- exclude_patterns += ['index.rst']
# The reST default role (used for this markup: `text`) for all documents.
#default_role = None
Modified: trunk/docs/index.rst
==============================================================================
--- trunk/docs/index.rst Sat Feb 6 15:34:06 2016 (r828)
+++ trunk/docs/index.rst Sat Feb 6 16:31:33 2016 (r829)
@@ -3,13 +3,27 @@
Welcome to PyGreSQL
===================
-.. toctree::
- :hidden:
+.. ifconfig:: html_theme != 'cloud'
- copyright
- announce
- download/index
- contents/index
- community/index
+ .. toctree::
+ :maxdepth: 2
-.. include:: about.txt
+ about
+ copyright
+ announce
+ download/index
+ contents/index
+ community/index
+
+.. ifconfig:: html_theme == 'cloud'
+
+ .. toctree::
+ :hidden:
+
+ copyright
+ announce
+ download/index
+ contents/index
+ community/index
+
+ .. include:: about.txt
Deleted: trunk/docs/toc.rst
==============================================================================
--- trunk/docs/toc.rst Sat Feb 6 16:31:33 2016 (r828)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,14 +0,0 @@
-.. PyGreSQL documentation master file
-
-Welcome to PyGreSQL
-===================
-
-.. toctree::
- :maxdepth: 2
-
- about
- copyright
- announce
- download/index
- contents/index
- community/index
_______________________________________________
PyGreSQL mailing list
[email protected]
https://mail.vex.net/mailman/listinfo.cgi/pygresql
