Commits

Georg Brandl committed eda9356 Merge

merge with main

  • Participants
  • Parent commits 482eae1, 9653c01

Comments (0)

Files changed (69)

-The doctools are written and maintained by Georg Brandl <georg@python.org>.
-Substantial parts of the templates and the web application were written by
-Armin Ronacher <armin.ronacher@active-4.com>.
+Sphinx is written and maintained by Georg Brandl <georg@python.org>.
 
-Other contributors are noted in the :copyright: fields within the docstrings
-of the respective files.
+Substantial parts of the templates were written by Armin Ronacher
+<armin.ronacher@active-4.com>.
+
+Other contributors, listed alphabetically, are:
+
+* Daniel Bültmann -- todo extension
+* Josip Dzolonga -- coverage builder
+* Horst Gutmann -- internationalization support
+* Martin Hans -- autodoc improvements
+* Dave Kuhlman -- original LaTeX writer
+* Thomas Lamb -- linkcheck builder
+* Benjamin Peterson -- unittests
+* Antonio Valentino -- qthelp builder
+* Pauli Virtanen -- autodoc improvements
+* Sebastian Wiesner -- image handling, distutils support
 
 Many thanks for all contributions!
+
+There are also a few modules or functions incorporated from other
+authors and projects:
+
+* sphinx.util.jsdump uses the basestring encoding from simplejson,
+  written by Bob Ippolito, released under the MIT license
+* sphinx.util.stemmer was written by Vivake Gupta, placed in the
+  Public Domain
 Release 0.5.2 (in development)
 ==============================
 
+* #81: Write environment and search index in a manner that is safe
+  from exceptions that occur during dumping.
+
+* #80: Fix UnicodeErrors when a locale is set with setlocale().
+
 
 Release 0.5.1 (Dec 15, 2008)
 ============================
 * Matplotlib: http://matplotlib.sourceforge.net/
 * Mayavi: http://code.enthought.com/projects/mayavi/docs/development/html/mayavi
 * Mixin.com: http://dev.mixin.com/
+* mpmath: http://mpmath.googlecode.com/svn/trunk/doc/build/index.html
 * NetworkX: http://networkx.lanl.gov/
 * NumPy: http://docs.scipy.org/doc/numpy/reference/
 * ObjectListView: http://objectlistview.sourceforge.net/python
 * SymPy: http://docs.sympy.org/
 * tinyTiM: http://tinytim.sourceforge.net/docs/2.0/
 * TurboGears: http://turbogears.org/2.0/docs/
+* WFront: http://discorporate.us/projects/WFront/
 * Zope 3: e.g. http://docs.carduner.net/z3c-tutorial/
-* mpmath: http://mpmath.googlecode.com/svn/trunk/doc/build/index.html
 * zc.async: http://packages.python.org/zc.async/1.5.0/
-Copyright (c) 2007-2008 by the Sphinx team (see AUTHORS file).  All
-rights reserved.
+Copyright (c) 2007-2008 by the Sphinx team (see AUTHORS file).
+All rights reserved.
 
 License for Sphinx
 ==================
 sphinx.pycode.pgen2, is available in the Python 2.6 distribution under
 the PSF license agreement for Python:
 
+----------------------------------------------------------------------
 1. This LICENSE AGREEMENT is between the Python Software Foundation
    ("PSF"), and the Individual or Organization ("Licensee") accessing
    and otherwise using Python 2.6 software in source or binary form
 8. By copying, installing or otherwise using Python 2.6, Licensee
    agrees to be bound by the terms and conditions of this License
    Agreement.
+----------------------------------------------------------------------
+
+The included smartypants module, included as sphinx.util.smartypants,
+is available under the following license:
+
+----------------------------------------------------------------------
+SmartyPants_ license::
+
+    Copyright (c) 2003 John Gruber
+    (http://daringfireball.net/)
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    *   Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials
+        provided with the distribution.
+
+    *   Neither the name "SmartyPants" nor the names of its
+        contributors may be used to endorse or promote products
+        derived from this software without specific prior written
+        permission.
+
+    This software is provided by the copyright holders and
+    contributors "as is" and any express or implied warranties,
+    including, but not limited to, the implied warranties of
+    merchantability and fitness for a particular purpose are
+    disclaimed. In no event shall the copyright owner or contributors
+    be liable for any direct, indirect, incidental, special,
+    exemplary, or consequential damages (including, but not limited
+    to, procurement of substitute goods or services; loss of use,
+    data, or profits; or business interruption) however caused and on
+    any theory of liability, whether in contract, strict liability, or
+    tort (including negligence or otherwise) arising in any way out of
+    the use of this software, even if advised of the possibility of
+    such damage.
+
+
+smartypants.py license::
+
+    smartypants.py is a derivative work of SmartyPants.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    *   Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials
+        provided with the distribution.
+
+    This software is provided by the copyright holders and
+    contributors "as is" and any express or implied warranties,
+    including, but not limited to, the implied warranties of
+    merchantability and fitness for a particular purpose are
+    disclaimed. In no event shall the copyright owner or contributors
+    be liable for any direct, indirect, incidental, special,
+    exemplary, or consequential damages (including, but not limited
+    to, procurement of substitute goods or services; loss of use,
+    data, or profits; or business interruption) however caused and on
+    any theory of liability, whether in contract, strict liability, or
+    tort (including negligence or otherwise) arising in any way out of
+    the use of this software, even if advised of the possibility of
+    such damage.
+----------------------------------------------------------------------
+
+The ElementTree package, included in this distribution in
+test/etree13, is available under the following license:
+
+----------------------------------------------------------------------
+The ElementTree toolkit is
+
+Copyright (c) 1999-2007 by Fredrik Lundh
+
+By obtaining, using, and/or copying this software and/or its
+associated documentation, you agree that you have read, understood,
+and will comply with the following terms and conditions:
+
+Permission to use, copy, modify, and distribute this software and its
+associated documentation for any purpose and without fee is hereby
+granted, provided that the above copyright notice appears in all
+copies, and that both that copyright notice and this permission notice
+appear in supporting documentation, and that the name of Secret Labs
+AB or the author not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT- ABILITY
+AND FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+----------------------------------------------------------------------
     Sphinx - Python documentation toolchain
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx-quickstart.py

     Sphinx - Python documentation toolchain
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/__init__.py

 
     The Sphinx documentation toolchain.
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 
     Jinja glue.
 
-    :copyright: 2007-2008 by Georg Brandl, Horst Gutmann.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/addnodes.py

 
     Additional docutils nodes.
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/application.py

 
     Gracefully adapted from the TextPress system by Armin.
 
-
-    :copyright: 2008 by Georg Brandl, Armin Ronacher.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/builder.py

        This module is only kept for API compatibility; new code should
        import these classes directly from the sphinx.builders package.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/builders/changes.py

 
     Changelog builder.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/builders/html.py

 
     Several HTML builders.
 
-    :copyright: 2007-2008 by Georg Brandl, Armin Ronacher.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
     def handle_finish(self):
         self.info(bold('dumping search index... '), nonl=True)
         self.indexer.prune(self.env.all_docs)
-        f = open(path.join(self.outdir, self.searchindex_filename), 'wb')
+        searchindexfn = path.join(self.outdir, self.searchindex_filename)
+        # first write to a temporary file, so that if dumping fails, the existing
+        # index won't be overwritten
+        f = open(searchindexfn + '.tmp', 'wb')
         try:
             self.indexer.dump(f, self.indexer_format)
         finally:
             f.close()
+        os.rename(searchindexfn + '.tmp', searchindexfn)
         self.info('done')
 
         self.info(bold('dumping object inventory... '), nonl=True)

sphinx/builders/htmlhelp.py

     Build HTML help support files.
     Parts adapted from Python's Doc/tools/prechm.py.
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/builders/latex.py

 
     LaTeX builder.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/builders/linkcheck.py

 
     The CheckExternalLinksBuilder class.
 
-    :copyright: 2008 by Georg Brandl, Thomas Lamb.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/builders/qthelp.py

 
     Build input files for the Qt collection generator.
 
-    :copyright: 2008 by Antonio Valentino.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/builders/text.py

 
     Plain-text Sphinx builder.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/cmdline.py

 
     sphinx-build command-line handling.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 
     Build configuration file handling.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD, see LICENSE for details license.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import os

sphinx/directives/__init__.py

 
     Handlers for additional ReST directives.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/directives/code.py

     sphinx.directives.code
     ~~~~~~~~~~~~~~~~~~~~~~
 
-    :copyright: 2007-2009 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/directives/desc.py

     sphinx.directives.desc
     ~~~~~~~~~~~~~~~~~~~~~~
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
     # add cross-ref nodes for all words
     for part in filter(None, wsplit_re.split(ctype)):
         tnode = nodes.Text(part, part)
-        if part[0] in string.letters+'_' and part not in stopwords:
+        if part[0] in string.ascii_letters+'_' and part not in stopwords:
             pnode = addnodes.pending_xref(
                 '', reftype='ctype', reftarget=part, modname=None, classname=None)
             pnode += tnode

sphinx/directives/other.py

     sphinx.directives.other
     ~~~~~~~~~~~~~~~~~~~~~~~
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/environment.py

 
     Global creation environment.
 
-    :copyright: 2007-2008 by Georg Brandl.
+<<<<<<< local
+    :copyright: 2007-2009 by Georg Brandl.
+=======
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+>>>>>>> other
     :license: BSD, see LICENSE for details.
 """
 
 import cPickle as pickle
 from os import path
 from glob import glob
-from string import uppercase
+from string import ascii_uppercase as uppercase
 from itertools import izip, groupby
 try:
     import hashlib
         self.set_warnfunc(None)
         values = self.config.values
         del self.config.values
-        picklefile = open(filename, 'wb')
+        # first write to a temporary file, so that if dumping fails, the existing
+        # environment won't be overwritten
+        picklefile = open(filename + '.tmp', 'wb')
         # remove potentially pickling-problematic values from config
         for key, val in vars(self.config).items():
             if key.startswith('_') or \
             pickle.dump(self, picklefile, pickle.HIGHEST_PROTOCOL)
         finally:
             picklefile.close()
+        os.rename(filename + '.tmp', filename)
         # reset attributes
         self.config.values = values
         self.set_warnfunc(warnfunc)

sphinx/ext/__init__.py

 
     Contains Sphinx features not activated by default.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """

sphinx/ext/autodoc.py

     the doctree, thus avoiding duplication between docstrings and documentation
     for those who like elaborate docstrings.
 
-    :copyright: 2008 by Georg Brandl, Pauli Virtanen, Martin Hans.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/ext/coverage.py

     Check Python modules and C API for coverage.  Mostly written by Josip
     Dzolonga for the Google Highly Open Participation contest.
 
-    :copyright: 2008 by Josip Dzolonga, Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/ext/doctest.py

     Mimic doctest by automatically executing code snippets and checking
     their results.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/ext/ifconfig.py

     namespace of the project configuration (that is, all variables from ``conf.py``
     are available.)
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/ext/intersphinx.py

       also be specified individually, e.g. if the docs should be buildable
       without Internet access.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/ext/jsmath.py

     Set up everything for use of JSMath to display math in HTML
     via JavaScript.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/ext/mathbase.py

 
     Set up math support in source files and LaTeX/text output.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/ext/pngmath.py

 
     Render math in HTML via dvipng.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/ext/refcounting.py

     Usage: Set the `refcount_file` config value to the path to the reference
     count data file.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/ext/todo.py

     all todos of your project and lists them along with a backlink to the
     original location.
 
-    :copyright: 2008 Daniel Bültmann.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/highlighting.py

 
     Highlight code blocks using Pygments.
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/locale/__init__.py

 
     Locale utilities.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/locale/cs/LC_MESSAGES/sphinx.js

-Documentation.addTranslations({"locale": "cs", "plural_expr": "(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)", "messages": {"module, in ": "modul", "Preparing search...": "", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "", "Search finished, found %s page(s) matching the search query.": "", ", in ": "", "Permalink to this headline": "Trval\u00fd odkaz na tento nadpis", "Searching": "hledej", "Permalink to this definition": "Trval\u00fd odkaz na tuto definici", "Hide Search Matches": "", "Search Results": "V\u00fdsledky hled\u00e1n\u00ed"}});
+Documentation.addTranslations({"locale": "cs", "plural_expr": "(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)", "messages": {"module, in ": "modul, v", "Preparing search...": "Připravuji hledání...", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "Nenalezli jsme žádný dokument. Ujistěte se prosím, že všechna slova jsou správně.", "Search finished, found %s page(s) matching the search query.": "Vyhledávání skončilo, nalezeno %s stran.", ", in ": ", v", "Permalink to this headline": "Trvalý odkaz na tento nadpis", "Searching": "Hledám", "Permalink to this definition": "Trvalý odkaz na tuto definici", "Hide Search Matches": "Skrýt výsledky hledání", "Search Results": "Výsledky hledání"}});

sphinx/locale/cs/LC_MESSAGES/sphinx.mo

Binary file modified.

sphinx/locale/cs/LC_MESSAGES/sphinx.po

 msgstr ""
 "Project-Id-Version: Sphinx 0.5\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2008-08-10 11:43+0000\n"
-"PO-Revision-Date: 2008-12-28 23:40+0100\n"
+"POT-Creation-Date: 2008-11-27 18:39+0100\n"
+"PO-Revision-Date: 2008-12-25 05:59+0100\n"
 "Last-Translator: Pavel Kosina <pavel.kosina@gmail.com>\n"
 "Language-Team: Pavel Kosina <pavel.kosina@gmail.com>\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.3\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Generated-By: Babel 0.9.4\n"
+"X-Poedit-Language: Czech\n"
+"X-Poedit-Country: CZECH REPUBLIC\n"
 
-#: sphinx/environment.py:103 sphinx/writers/latex.py:170
+#: sphinx/builder.py:408
+#, python-format
+msgid "%b %d, %Y"
+msgstr "%d.%m.%Y"
+
+#: sphinx/builder.py:427
+#: sphinx/templates/defindex.html:21
+msgid "General Index"
+msgstr "Rejstřík indexů"
+
+#: sphinx/builder.py:427
+msgid "index"
+msgstr "index"
+
+#: sphinx/builder.py:429
+#: sphinx/htmlhelp.py:156
+#: sphinx/templates/defindex.html:19
+#: sphinx/templates/modindex.html:2
+#: sphinx/templates/modindex.html:13
+msgid "Global Module Index"
+msgstr "Celkový rejstřík modulů"
+
+#: sphinx/builder.py:429
+msgid "modules"
+msgstr "moduly"
+
+#: sphinx/builder.py:466
+msgid "next"
+msgstr "další"
+
+#: sphinx/builder.py:473
+msgid "previous"
+msgstr "předchozí"
+
+#: sphinx/builder.py:1054
+msgid " (in "
+msgstr "(v"
+
+#: sphinx/builder.py:1129
+msgid "Builtins"
+msgstr "Vestavěné funkce "
+
+#: sphinx/builder.py:1131
+msgid "Module level"
+msgstr "Úroveň modulů"
+
+#: sphinx/environment.py:102
+#: sphinx/latexwriter.py:169
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d.%m.%Y"
 
-#: sphinx/environment.py:293 sphinx/templates/genindex-single.html:2
+#: sphinx/environment.py:291
+#: sphinx/latexwriter.py:175
+#: sphinx/templates/genindex-single.html:2
 #: sphinx/templates/genindex-split.html:2
-#: sphinx/templates/genindex-split.html:5 sphinx/templates/genindex.html:2
-#: sphinx/templates/genindex.html:5 sphinx/templates/genindex.html:48
-#: sphinx/templates/layout.html:117 sphinx/writers/latex.py:176
+#: sphinx/templates/genindex-split.html:5
+#: sphinx/templates/genindex.html:2
+#: sphinx/templates/genindex.html:5
+#: sphinx/templates/genindex.html:48
+#: sphinx/templates/layout.html:130
 msgid "Index"
 msgstr "Index"
 
-#: sphinx/environment.py:294 sphinx/writers/latex.py:175
-#, fuzzy
+#: sphinx/environment.py:292
+#: sphinx/latexwriter.py:174
 msgid "Module Index"
-msgstr "Rejstřík modulů"
+msgstr "Rejstřík modulů "
 
-#: sphinx/environment.py:295 sphinx/templates/defindex.html:16
-#, fuzzy
+#: sphinx/environment.py:293
+#: sphinx/templates/defindex.html:16
 msgid "Search Page"
 msgstr "Vyhledávací stránka"
 
-#: sphinx/roles.py:53 sphinx/directives/desc.py:564
+#: sphinx/htmlwriter.py:79
+#: sphinx/static/doctools.js:145
+msgid "Permalink to this definition"
+msgstr "Trvalý odkaz na tuto definici"
+
+#: sphinx/htmlwriter.py:399
+#: sphinx/static/doctools.js:139
+msgid "Permalink to this headline"
+msgstr "Trvalý odkaz na tento nadpis"
+
+#: sphinx/latexwriter.py:172
+msgid "Release"
+msgstr "Vydání"
+
+#: sphinx/roles.py:53
+#: sphinx/directives/desc.py:537
 #, python-format
 msgid "environment variable; %s"
 msgstr "promměná prostředí, %s"
 msgid "Python Enhancement Proposals!PEP %s"
 msgstr "Python Enhancement Proposals!PEP %s"
 
-#: sphinx/builders/changes.py:64
-msgid "Builtins"
-msgstr "Vestavěné funkce"
+#: sphinx/textwriter.py:166
+#, python-format
+msgid "Platform: %s"
+msgstr "Platforma: %s"
 
-#: sphinx/builders/changes.py:66
-msgid "Module level"
-msgstr "Úroveň modulů"
-
-#: sphinx/builders/html.py:115
-#, python-format
-msgid "%b %d, %Y"
-msgstr "%d.%m.%Y"
-
-#: sphinx/builders/html.py:134 sphinx/templates/defindex.html:21
-msgid "General Index"
-msgstr "Rejstřík indexů"
-
-#: sphinx/builders/html.py:134
-msgid "index"
-msgstr "index"
-
-#: sphinx/builders/html.py:136 sphinx/builders/htmlhelp.py:180
-#: sphinx/builders/qthelp.py:129 sphinx/templates/defindex.html:19
-#: sphinx/templates/modindex.html:2 sphinx/templates/modindex.html:13
-msgid "Global Module Index"
-msgstr "Rejstřík modulů"
-
-#: sphinx/builders/html.py:136
-msgid "modules"
-msgstr "moduly"
-
-#: sphinx/builders/html.py:175
-msgid "next"
-msgstr "další"
-
-#: sphinx/builders/html.py:182
-msgid "previous"
-msgstr "předchozí"
-
-#: sphinx/builders/latex.py:155
-msgid " (in "
-msgstr ""
+#: sphinx/textwriter.py:422
+msgid "[image]"
+msgstr "[obrázek]"
 
 #: sphinx/directives/desc.py:25
 #, python-format
 msgid "%s() (built-in function)"
 msgstr "%s() (vestavěná funkce)"
 
-#: sphinx/directives/desc.py:26 sphinx/directives/desc.py:42
+#: sphinx/directives/desc.py:26
+#: sphinx/directives/desc.py:42
 #: sphinx/directives/desc.py:54
 #, python-format
 msgid "%s() (in module %s)"
 msgid "%s (built-in variable)"
 msgstr "%s() (vestavěná proměnná)"
 
-#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:66
+#: sphinx/directives/desc.py:30
+#: sphinx/directives/desc.py:66
 #, python-format
 msgid "%s (in module %s)"
 msgstr "%s() (v modulu %s)"
 
 #: sphinx/directives/desc.py:33
-#, fuzzy, python-format
+#, python-format
 msgid "%s (built-in class)"
-msgstr "%s() (vestavěná proměnná)"
+msgstr "%s () (vestavěná proměnná)"
 
 #: sphinx/directives/desc.py:34
 #, python-format
 msgid "Return type"
 msgstr "Typ navrácené hodnoty"
 
-#: sphinx/directives/desc.py:201
-#, fuzzy
-msgid "Parameter"
-msgstr "Parametry"
-
-#: sphinx/directives/desc.py:205
+#: sphinx/directives/desc.py:143
 msgid "Parameters"
 msgstr "Parametry"
 
-#: sphinx/directives/desc.py:450
-#, fuzzy, python-format
+#: sphinx/directives/desc.py:423
+#, python-format
 msgid "%scommand line option; %s"
-msgstr "%sparametry příkazového řádku; %s"
+msgstr "%s parametry příkazového řádku; %s"
 
 #: sphinx/directives/other.py:101
 msgid "Platforms: "
 msgid "Author: "
 msgstr "Autor: "
 
-#: sphinx/directives/other.py:249
+#: sphinx/directives/other.py:246
 msgid "See also"
 msgstr "Viz také"
 
-#: sphinx/ext/autodoc.py:576 sphinx/ext/autodoc.py:590
-#, python-format
-msgid "alias of :class:`%s`"
-msgstr ""
-
 #: sphinx/ext/todo.py:31
 msgid "Todo"
-msgstr ""
+msgstr "Todo"
 
 #: sphinx/ext/todo.py:75
 #, python-format
 msgid "(The original entry is located in %s, line %d and can be found "
-msgstr ""
+msgstr "(Původní záznam je v %s, řádka %d a lze jej nalézt"
 
 #: sphinx/ext/todo.py:81
 msgid "here"
-msgstr ""
+msgstr "zde"
 
 #: sphinx/locale/__init__.py:15
 msgid "Attention"
 msgid "built-in function"
 msgstr "vestavěná funkce"
 
-#: sphinx/static/doctools.js:139 sphinx/writers/html.py:415
-msgid "Permalink to this headline"
-msgstr "Trvalý odkaz na tento nadpis"
-
-#: sphinx/static/doctools.js:145 sphinx/writers/html.py:80
-msgid "Permalink to this definition"
-msgstr "Trvalý odkaz na tuto definici"
-
 #: sphinx/static/doctools.js:174
 msgid "Hide Search Matches"
-msgstr ""
+msgstr "Skrýt výsledky vyhledávání"
 
 #: sphinx/static/searchtools.js:274
-#, fuzzy
 msgid "Searching"
-msgstr "hledej"
+msgstr "Hledám"
 
 #: sphinx/static/searchtools.js:279
 msgid "Preparing search..."
-msgstr ""
+msgstr "Připravuji vyhledávání...."
 
 #: sphinx/static/searchtools.js:338
-#, fuzzy
 msgid "module, in "
-msgstr "modul"
+msgstr "modul, v"
 
 #: sphinx/static/searchtools.js:347
 msgid ", in "
-msgstr ""
+msgstr ", v"
 
-#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:18
+#: sphinx/static/searchtools.js:447
+#: sphinx/templates/search.html:18
 msgid "Search Results"
 msgstr "Výsledky hledání"
 
-#: sphinx/static/searchtools.js:455
-msgid ""
-"Your search did not match any documents. Please make sure that all words "
-"are spelled correctly and that you've selected enough categories."
-msgstr ""
+#: sphinx/static/searchtools.js:449
+msgid "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories."
+msgstr "Nenalezli jsme žádný dokument. Ujistěte se prosím, že všechna slova jsou správně a že jste vybral dostatek kategorií."
 
-#: sphinx/static/searchtools.js:457
+#: sphinx/static/searchtools.js:451
 #, python-format
 msgid "Search finished, found %s page(s) matching the search query."
-msgstr ""
+msgstr "Vyhledávání skončilo, nalezeno %s stran."
 
 #: sphinx/templates/defindex.html:2
 msgid "Overview"
 
 #: sphinx/templates/genindex-single.html:44
 #: sphinx/templates/genindex-split.html:14
-#: sphinx/templates/genindex-split.html:27 sphinx/templates/genindex.html:54
+#: sphinx/templates/genindex-split.html:27
+#: sphinx/templates/genindex.html:54
 msgid "Full index on one page"
 msgstr "Plný index na jedné stránce"
 
 msgid "next chapter"
 msgstr "další kapitola"
 
-#: sphinx/templates/layout.html:56
+#: sphinx/templates/layout.html:55
 msgid "This Page"
 msgstr "Tato stránka"
 
-#: sphinx/templates/layout.html:58
+#: sphinx/templates/layout.html:59
+msgid "Suggest Change"
+msgstr "Návrh změnu"
+
+#: sphinx/templates/layout.html:60
+#: sphinx/templates/layout.html:62
 msgid "Show Source"
 msgstr "Ukázat zdroj"
 
-#: sphinx/templates/layout.html:67
+#: sphinx/templates/layout.html:71
 msgid "Quick search"
 msgstr "Rychlé vyhledávání"
 
-#: sphinx/templates/layout.html:69
+#: sphinx/templates/layout.html:71
+msgid "Keyword search"
+msgstr "Hledání dle klíče"
+
+#: sphinx/templates/layout.html:73
 msgid "Go"
 msgstr "hledej"
 
-#: sphinx/templates/layout.html:73
-#, fuzzy
-msgid "Enter search terms or a module, class or function name."
+#: sphinx/templates/layout.html:78
+msgid "Enter a module, class or function name."
 msgstr "Zadej jméno modulu, třídy nebo funkce."
 
-#: sphinx/templates/layout.html:106
+#: sphinx/templates/layout.html:119
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Hledání uvnitř %(docstitle)s"
 
-#: sphinx/templates/layout.html:115
+#: sphinx/templates/layout.html:128
 msgid "About these documents"
 msgstr "O těchto dokumentech"
 
-#: sphinx/templates/layout.html:118 sphinx/templates/search.html:2
+#: sphinx/templates/layout.html:131
+#: sphinx/templates/search.html:2
 #: sphinx/templates/search.html:5
 msgid "Search"
 msgstr "Hledání"
 
-#: sphinx/templates/layout.html:120
+#: sphinx/templates/layout.html:133
 msgid "Copyright"
 msgstr "Veškerá práva vyhrazena"
 
-#: sphinx/templates/layout.html:165
+#: sphinx/templates/layout.html:178
 #, python-format
 msgid "&copy; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 msgstr "&copy; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 
-#: sphinx/templates/layout.html:167
+#: sphinx/templates/layout.html:180
 #, python-format
 msgid "&copy; Copyright %(copyright)s."
 msgstr "&copy; Copyright %(copyright)s."
 
-#: sphinx/templates/layout.html:170
+#: sphinx/templates/layout.html:183
 #, python-format
 msgid "Last updated on %(last_updated)s."
-msgstr "Naposledy aktualizováno dne %(last_updated)s."
+msgstr "Aktualizováno dne %(last_updated)s."
 
-#: sphinx/templates/layout.html:173
+#: sphinx/templates/layout.html:186
 #, python-format
-msgid ""
-"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> "
-"%(sphinx_version)s."
-msgstr ""
-"Vytvořeno pomocí <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> "
-"%(sphinx_version)s."
+msgid "Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s."
+msgstr "Vytvořeno pomocí <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s."
 
-#: sphinx/templates/modindex.html:36
+#: sphinx/templates/modindex.html:15
+msgid "Most popular modules:"
+msgstr "Nejpopulárnější moduly:"
+
+#: sphinx/templates/modindex.html:24
+msgid "Show modules only available on these platforms"
+msgstr "Zobrazit moduly dostupné na této platformě"
+
+#: sphinx/templates/modindex.html:56
 msgid "Deprecated"
 msgstr "Zastaralé"
 
 msgid "Search %(docstitle)s"
 msgstr "Prohledat %(docstitle)s"
 
+#: sphinx/templates/page.html:8
+msgid "<strong>Note:</strong> You requested an out-of-date URL from this server. We've tried to redirect you to the new location of this page, but it may not be the right one."
+msgstr "<strong>Poznámka:</strong> Stránka, kterou hledáte, neexistuje.<br>Snažili jsme se najít nové umístění této stránky, ale nepovedlo se."
+
 #: sphinx/templates/search.html:7
-#, fuzzy
 msgid ""
 "From here you can search these documents. Enter your search\n"
 "    words into the box below and click \"search\". Note that the search\n"
 "    function will automatically search for all of the words. Pages\n"
 "    containing fewer words won't appear in the result list."
 msgstr ""
-"Toto je vyhledávací stránka. Zadejte klíčová slova    do pole níže a "
-"klikněte na \"hledej\". \n"
-"Prohledávání funkcí  hledá automaticky všechna slova. Stránky obsahující"
-"    slov méně, nebudou nalezeny."
+"Toto je vyhledávací stránka. Zadejte klíčová slova a klikněte na \"hledej\". \n"
+"Vyhledávání hledá automaticky všechna slova. Nebudou tedy nalezeny stránky, obsahující méně slov."
 
 #: sphinx/templates/search.html:14
 msgid "search"
 msgid "Other changes"
 msgstr "Ostatní změny"
 
-#: sphinx/writers/latex.py:173
-msgid "Release"
-msgstr "Vydání"
-
-#: sphinx/writers/text.py:166
-#, python-format
-msgid "Platform: %s"
-msgstr "Platforma: %s"
-
-#: sphinx/writers/text.py:427
-msgid "[image]"
-msgstr "[obrázek]"
-
-#~ msgid "Suggest Change"
-#~ msgstr "Návrh změnu"
-
-#~ msgid "Keyword search"
-#~ msgstr "Hledání dle klíče"
-
-#~ msgid "Most popular modules:"
-#~ msgstr "Nejpopulárnější moduly:"
-
-#~ msgid "Show modules only available on these platforms"
-#~ msgstr "Zobrazit moduly dostupné na této platformě"
-
-#~ msgid ""
-#~ "<strong>Note:</strong> You requested an "
-#~ "out-of-date URL from this server. "
-#~ "We've tried to redirect you to the"
-#~ " new location of this page, but "
-#~ "it may not be the right one."
-#~ msgstr ""
-#~ "<strong>Poznámka:</strong> Stránka, kterou hledáte,"
-#~ " neexistuje.<br>Snažili jsme se najít nové"
-#~ " umístění této stránky, ale nepovedlo "
-#~ "se."
-

sphinx/quickstart.py

 
     Quickly setup documentation source to work with Sphinx.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 
     Handlers for additional ReST roles.
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 
     Create a search index for offline search.
 
-    :copyright: 2007-2008 by Armin Ronacher.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import re

sphinx/setup_command.py

 
     :author: Sebastian Wiesner
     :contact: basti.wiesner@gmx.net
-    :copyright: 2008 by Sebastian Wiesner.
-    :license: MIT.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import sys

sphinx/util/__init__.py

 
     Utility functions for Sphinx.
 
-    :copyright: 2007-2009 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/util/compat.py

 
     Stuff for docutils compatibility.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/util/console.py

 
     Format colored console output.
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/util/jsdump.py

     ~~~~~~~~~~~~~~~~~~
 
     This module implements a simple JavaScript serializer.
-    Uses the basestring encode function from simplejson.
+    Uses the basestring encode function from simplejson by Bob Ippolito.
 
-    :copyright: 2008 by Armin Ronacher, Bob Ippolito, Georg Brandl.
+    :copyright: Copyright 2008 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/util/png.py

 
     PNG image manipulation helpers.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/util/stemmer.py

 
     Release 1: January 2001
 
-    :copyright: 2001 by Vivake Gupta <v@nano.com>.
+    :copyright: Copyright 2001 by Vivake Gupta <v@nano.com>.
     :license: Public Domain ("can be used free of charge for any purpose").
 """
 

sphinx/util/texescape.py

 
     TeX escaping helper.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/writers/__init__.py

 
     Custom docutils writers.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """

sphinx/writers/html.py

 
     docutils writers handling Sphinx' custom nodes.
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/writers/latex.py

     Much of this code is adapted from Dave Kuhlman's "docpy" writer from his
     docutils sandbox.
 
-    :copyright: 2007-2008 by Georg Brandl, Dave Kuhlman.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

sphinx/writers/text.py

 
     Custom docutils writer for plain text.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 
     This script runs the Sphinx unit test suite.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

tests/test_application.py

 
     Test the Sphinx class.
 
-    :copyright: 2008 by Benjamin Peterson.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

tests/test_autodoc.py

     Test the autodoc extension.  This tests mainly the RstGenerator; the auto
     directives are tested in a test source file translated by test_build.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

tests/test_build.py

 
     Test the entire build process with the test root.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

tests/test_config.py

     Test the sphinx.config.Config class and its handling in the
     Application class.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

tests/test_coverage.py

 
     Test the coverage builder.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

tests/test_env.py

 
     Test the BuildEnvironment class.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

tests/test_highlighting.py

 
     Test the Pygments highlighting bridge.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
         ],
     }
 
+class ComplainOnUnhighlighted(PygmentsBridge):
+
+    def unhighlighted(self, source):
+        raise AssertionError("should highlight %r" % source)
+
 class MyFormatter(HtmlFormatter):
     def format(self, tokensource, outfile):
         outfile.write('test')
     ret = bridge.highlight_block('ab', 'test')
     assert '<span class="n">a</span>b' in ret
 
+def test_detect_interactive():
+    bridge = ComplainOnUnhighlighted('html')
+    blocks = [
+        """
+        >>> testing()
+        True
+        """,
+        ]
+    for block in blocks:
+        ret = bridge.highlight_block(block.lstrip(), 'python')
+        assert ret.startswith("<div class=\"highlight\">")
+
 def test_set_formatter():
     PygmentsBridge.html_formatter = MyFormatter
     try:

tests/test_i18n.py

 
     Test locale features.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

tests/test_markup.py

 
     Test various Sphinx-specific markup extensions.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

tests/test_quickstart.py

 
     Test the sphinx.quickstart module.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
     Sphinx test suite utilities
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

utils/check_sources.py

     Make sure each Python file has a correct file header
     including copyright and license information.
 
-    :copyright: 2006-2008 by Georg Brandl.
+    :copyright: Copyright 2006-2009 by Georg Brandl.
     :license: GNU GPL, see LICENSE for more details.
 """
 
 
 
 name_mail_re = r'[\w ]+(<.*?>)?'
-copyright_re = re.compile(r'^    :copyright: 200\d(-200\d)? by %s(, %s)*[,.]$' %
+copyright_re = re.compile(r'^    :copyright: Copyright 200\d(-200\d)?'
+                          r'by %s(, %s)*[,.]$' %
                           (name_mail_re, name_mail_re))
 license_re = re.compile(r"    :license: (.*?).\n")
 copyright_2_re = re.compile(r'^                %s(, %s)*[,.]$' %