Commits

Georg Brandl committed 21d5645 Merge

merge with 1.0

  • Participants
  • Parent commits cf7c885, 7025f76

Comments (0)

Files changed (3)

 
 * The ``repoze.bfg`` Web Application Framework: 
   http://www.amazon.com/repoze-bfg-Web-Application-Framework-Version/dp/0615345379
-* A Theoretical Physics Reference book:
-  http://ondrejcertik.blogspot.com/2010/07/theoretical-physics-reference-book.html
+* A Theoretical Physics Reference book: http://theoretical-physics.net/
    <https://github.com/blog/572-bypassing-jekyll-on-github-pages>`_ to support
    Sphinx HTML output properly.
 
+MediaWiki
+   See http://bitbucket.org/kevindunn/sphinx-wiki, a project by Kevin Dunn.
+
 Google Analytics
    You can use a custom ``layout.html`` template, like this:
 

doc/markup/misc.rst

 
    Undefined tags are false, defined tags (via the ``-t`` command-line option or
    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
    set as a tag.