merge with 1.0

This commit is contained in:
Georg Brandl 2011-01-08 20:09:29 +01:00
commit 6c23616b2c
3 changed files with 5 additions and 3 deletions

View File

@ -169,5 +169,4 @@ Books produced using Sphinx
* The ``repoze.bfg`` Web Application Framework: * The ``repoze.bfg`` Web Application Framework:
http://www.amazon.com/repoze-bfg-Web-Application-Framework-Version/dp/0615345379 http://www.amazon.com/repoze-bfg-Web-Application-Framework-Version/dp/0615345379
* A Theoretical Physics Reference book: * A Theoretical Physics Reference book: http://theoretical-physics.net/
http://ondrejcertik.blogspot.com/2010/07/theoretical-physics-reference-book.html

View File

@ -66,6 +66,9 @@ GitHub Pages
<https://github.com/blog/572-bypassing-jekyll-on-github-pages>`_ to support <https://github.com/blog/572-bypassing-jekyll-on-github-pages>`_ to support
Sphinx HTML output properly. Sphinx HTML output properly.
MediaWiki
See http://bitbucket.org/kevindunn/sphinx-wiki, a project by Kevin Dunn.
Google Analytics Google Analytics
You can use a custom ``layout.html`` template, like this: You can use a custom ``layout.html`` template, like this:

View File

@ -177,7 +177,7 @@ Including content based on tags
Undefined tags are false, defined tags (via the ``-t`` command-line option or Undefined tags are false, defined tags (via the ``-t`` command-line option or
within :file:`conf.py`) are true. Boolean expressions, also using within :file:`conf.py`) are true. Boolean expressions, also using
parentheses (like ``html and (latex or draft)`` are supported. parentheses (like ``html and (latex or draft)``) are supported.
The format of the current builder (``html``, ``latex`` or ``text``) is always The format of the current builder (``html``, ``latex`` or ``text``) is always
set as a tag. set as a tag.