From 175bc520e1747be1ce46f519e595f189a45cc6f3 Mon Sep 17 00:00:00 2001
From: "Gary Wilson Jr." <gary.wilson@gmail.com>
Date: Tue, 28 Jun 2011 13:13:08 -0500
Subject: [PATCH 001/226] Fixed a couple links in the documentation for the
 contents docutils directive that were referring to the incorrect anchor.

---
 doc/markup/para.rst | 2 +-
 doc/rest.rst        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/markup/para.rst b/doc/markup/para.rst
index ced18d818..b532bc63d 100644
--- a/doc/markup/para.rst
+++ b/doc/markup/para.rst
@@ -145,7 +145,7 @@ The :rst:dir:`toctree` directive, which generates tables of contents of
 subdocuments, is described in :ref:`toctree-directive`.
 
 For local tables of contents, use the standard reST :dudir:`contents directive
-<contents>`.
+<table-of-contents>`.
 
 
 Glossary
diff --git a/doc/rest.rst b/doc/rest.rst
index 693075728..db832ed82 100644
--- a/doc/rest.rst
+++ b/doc/rest.rst
@@ -275,8 +275,8 @@ Docutils supports the following directives:
 
 * Additional body elements:
 
-  - :dudir:`contents` (a local, i.e. for the current file only, table of
-    contents)
+  - :dudir:`contents <table-of-contents>` (a local, i.e. for the current file
+    only, table of contents)
   - :dudir:`container` (a container with a custom class, useful to generate an
     outer ``<div>`` in HTML)
   - :dudir:`rubric` (a heading without relation to the document sectioning)

From 8187d7f04ceb138d5059d74756d376d79adc3f5e Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Tue, 28 Jun 2011 20:37:29 +0200
Subject: [PATCH 002/226] Closes #724: Add license for Underscore.js.

---
 LICENSE                                  | 27 ++++++++++++++++++++++++
 sphinx/themes/basic/static/underscore.js |  7 ++++++
 2 files changed, 34 insertions(+)

diff --git a/LICENSE b/LICENSE
index fa1ef9950..260c20fb1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -217,3 +217,30 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ----------------------------------------------------------------------
+
+The included Underscore JavaScript library is available under the MIT
+license:
+
+----------------------------------------------------------------------
+Copyright (c) 2009 Jeremy Ashkenas, DocumentCloud
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/sphinx/themes/basic/static/underscore.js b/sphinx/themes/basic/static/underscore.js
index 9146e0860..5d8991434 100644
--- a/sphinx/themes/basic/static/underscore.js
+++ b/sphinx/themes/basic/static/underscore.js
@@ -1,3 +1,10 @@
+// Underscore.js 0.5.5
+// (c) 2009 Jeremy Ashkenas, DocumentCloud Inc.
+// Underscore is freely distributable under the terms of the MIT license.
+// Portions of Underscore are inspired by or borrowed from Prototype.js,
+// Oliver Steele's Functional, and John Resig's Micro-Templating.
+// For all details and documentation:
+// http://documentcloud.github.com/underscore/
 (function(){var j=this,n=j._,i=function(a){this._wrapped=a},m=typeof StopIteration!=="undefined"?StopIteration:"__break__",b=j._=function(a){return new i(a)};if(typeof exports!=="undefined")exports._=b;var k=Array.prototype.slice,o=Array.prototype.unshift,p=Object.prototype.toString,q=Object.prototype.hasOwnProperty,r=Object.prototype.propertyIsEnumerable;b.VERSION="0.5.5";b.each=function(a,c,d){try{if(a.forEach)a.forEach(c,d);else if(b.isArray(a)||b.isArguments(a))for(var e=0,f=a.length;e<f;e++)c.call(d,
 a[e],e,a);else{var g=b.keys(a);f=g.length;for(e=0;e<f;e++)c.call(d,a[g[e]],g[e],a)}}catch(h){if(h!=m)throw h;}return a};b.map=function(a,c,d){if(a&&b.isFunction(a.map))return a.map(c,d);var e=[];b.each(a,function(f,g,h){e.push(c.call(d,f,g,h))});return e};b.reduce=function(a,c,d,e){if(a&&b.isFunction(a.reduce))return a.reduce(b.bind(d,e),c);b.each(a,function(f,g,h){c=d.call(e,c,f,g,h)});return c};b.reduceRight=function(a,c,d,e){if(a&&b.isFunction(a.reduceRight))return a.reduceRight(b.bind(d,e),c);
 var f=b.clone(b.toArray(a)).reverse();b.each(f,function(g,h){c=d.call(e,c,g,h,a)});return c};b.detect=function(a,c,d){var e;b.each(a,function(f,g,h){if(c.call(d,f,g,h)){e=f;b.breakLoop()}});return e};b.select=function(a,c,d){if(a&&b.isFunction(a.filter))return a.filter(c,d);var e=[];b.each(a,function(f,g,h){c.call(d,f,g,h)&&e.push(f)});return e};b.reject=function(a,c,d){var e=[];b.each(a,function(f,g,h){!c.call(d,f,g,h)&&e.push(f)});return e};b.all=function(a,c,d){c=c||b.identity;if(a&&b.isFunction(a.every))return a.every(c,

From 0e97f2ab58ade0f0e208056d0b7cd118d1161e27 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Wed, 29 Jun 2011 21:26:43 +0200
Subject: [PATCH 003/226] autosummary: improve robustness of the signature
 compactification

---
 sphinx/ext/autosummary/__init__.py | 26 +++++++++++++++++++++-----
 tests/test_autosummary.py          |  8 ++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/sphinx/ext/autosummary/__init__.py b/sphinx/ext/autosummary/__init__.py
index aad8b9f6e..82637583c 100644
--- a/sphinx/ext/autosummary/__init__.py
+++ b/sphinx/ext/autosummary/__init__.py
@@ -322,13 +322,29 @@ class Autosummary(Directive):
 
 def mangle_signature(sig, max_chars=30):
     """Reformat a function signature to a more compact form."""
-    sig = re.sub(r"^\((.*)\)$", r"\1", sig) + ", "
-    r = re.compile(r"(?P<name>[a-zA-Z0-9_*]+)(?P<default>=.*?)?, ")
-    items = r.findall(sig)
+    s = re.sub(r"^\((.*)\)$", r"\1", sig).strip()
 
-    args = [name for name, default in items if not default]
-    opts = [name for name, default in items if default]
+    # Strip strings (which can contain things that confuse the code below)
+    s = re.sub(r"\\\\", "", s)
+    s = re.sub(r"\\'", "", s)
+    s = re.sub(r"'[^']*'", "", s)
 
+    # Parse the signature to arguments + options
+    args = []
+    opts = []
+
+    opt_re = re.compile(r"^(.*, |)([a-zA-Z0-9_*]+)=")
+    while s:
+        m = opt_re.search(s)
+        if not m:
+            # The rest are arguments
+            args = s.split(', ')
+            break
+
+        opts.insert(0, m.group(2))
+        s = m.group(1)[:-2]
+
+    # Produce a more compact signature
     sig = limited_join(", ", args, max_chars=max_chars-2)
     if opts:
         if not sig:
diff --git a/tests/test_autosummary.py b/tests/test_autosummary.py
index 7783cc7bf..048940d0b 100644
--- a/tests/test_autosummary.py
+++ b/tests/test_autosummary.py
@@ -23,6 +23,14 @@ def test_mangle_signature():
     :: (a, b[, aaa, bbb, ccc, ...])
     (a, b, c=(), d=<foo>) :: (a, b[, c, d])
     (a, b, c='foobar()', d=123) :: (a, b[, c, d])
+    (a, b[, c]) :: (a, b[, c])
+    (a, b[, cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx]) :: (a, b[, ...)
+    (a, b='c=d, e=f, g=h', c=3) :: (a[, b, c])
+    (a, b='c=d, \\'e=f,\\' g=h', c=3) :: (a[, b, c])
+    (a, b='c=d, ', e='\\\\' g=h, c=3) :: (a[, b, e, c])
+    (a, b={'c=d, ': 3, '\\\\': 3}) :: (a[, b])
+    (a=1, b=2, c=3) :: ([a, b, c])
+    (a=1, b=<SomeClass: a, b, c>, c=3) :: ([a, b, c])
     """
 
     TEST = [map(lambda x: x.strip(), x.split("::")) for x in TEST.split("\n")

From 9962c00947a6490dbf04229343c6a7d2f0ac445a Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Wed, 29 Jun 2011 21:27:03 +0200
Subject: [PATCH 004/226] autosummary: fix get_documenter to handle its
 *parent* parameter correctly

The *parent* parameter is a Python object, and should not be passed on
to Documenter.can_document_member, which expects a Documenter instance.
---
 sphinx/ext/autosummary/__init__.py | 37 ++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/sphinx/ext/autosummary/__init__.py b/sphinx/ext/autosummary/__init__.py
index 82637583c..515777b82 100644
--- a/sphinx/ext/autosummary/__init__.py
+++ b/sphinx/ext/autosummary/__init__.py
@@ -125,22 +125,39 @@ def autosummary_table_visit_html(self, node):
 
 # -- autodoc integration -------------------------------------------------------
 
-try:
-    ismemberdescriptor = inspect.ismemberdescriptor
-    isgetsetdescriptor = inspect.isgetsetdescriptor
-except AttributeError:
-    def ismemberdescriptor(obj):
-        return False
-    isgetsetdescriptor = ismemberdescriptor
+class FakeDirective:
+    env = {}
+    genopt = {}
 
 def get_documenter(obj, parent):
     """Get an autodoc.Documenter class suitable for documenting the given
     object.
-    """
-    from sphinx.ext.autodoc import AutoDirective, DataDocumenter
 
+    *obj* is the Python object to be documented, and *parent* is an
+    another Python object (e.g. a module or a class) to which *obj*
+    belongs to.
+    """
+    from sphinx.ext.autodoc import AutoDirective, DataDocumenter, \
+         ModuleDocumenter
+
+    if inspect.ismodule(obj):
+        # ModuleDocumenter.can_document_member always returns False
+        return ModuleDocumenter
+
+    # Construct a fake documenter for *parent*
+    if parent is not None:
+        parent_doc_cls = get_documenter(parent, None)
+    else:
+        parent_doc_cls = ModuleDocumenter
+
+    if hasattr(parent, '__name__'):
+        parent_doc = parent_doc_cls(FakeDirective(), parent.__name__)
+    else:
+        parent_doc = parent_doc_cls(FakeDirective(), "")
+
+    # Get the corrent documenter class for *obj*
     classes = [cls for cls in AutoDirective._registry.values()
-               if cls.can_document_member(obj, '', False, parent)]
+               if cls.can_document_member(obj, '', False, parent_doc)]
     if classes:
         classes.sort(key=lambda cls: cls.priority)
         return classes[-1]

From bb51a2074578b1c86795aec917305d061c6387b8 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Wed, 29 Jun 2011 21:27:23 +0200
Subject: [PATCH 005/226] autosummary: respect py:currentclass when looking up
 Python objects

This makes autosummary directives inside classes to work properly.
---
 sphinx/ext/autosummary/__init__.py | 10 +++++++++-
 tests/root/autosummary.txt         | 24 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/sphinx/ext/autosummary/__init__.py b/sphinx/ext/autosummary/__init__.py
index 515777b82..b29470fbb 100644
--- a/sphinx/ext/autosummary/__init__.py
+++ b/sphinx/ext/autosummary/__init__.py
@@ -171,7 +171,7 @@ class Autosummary(Directive):
     """
     Pretty table containing short signatures and summaries of functions etc.
 
-    autosummary also generates a (hidden) toctree:: node.
+    autosummary can also optionally generate a hidden toctree:: node.
     """
 
     required_arguments = 0
@@ -232,10 +232,18 @@ class Autosummary(Directive):
         env = self.state.document.settings.env
 
         prefixes = ['']
+
         currmodule = env.temp_data.get('py:module')
         if currmodule:
             prefixes.insert(0, currmodule)
 
+        currclass = env.temp_data.get('py:class')
+        if currclass:
+            if currmodule:
+                prefixes.insert(0, currmodule + "." + currclass)
+            else:
+                prefixes.insert(0, currclass)
+
         items = []
 
         max_item_chars = 50
diff --git a/tests/root/autosummary.txt b/tests/root/autosummary.txt
index edf75e326..82cec7fd0 100644
--- a/tests/root/autosummary.txt
+++ b/tests/root/autosummary.txt
@@ -5,3 +5,27 @@ Autosummary test
    :toctree: generated
 
    sphinx.application.TemplateBridge
+
+.. currentmodule:: sphinx.application
+
+.. autoclass:: TemplateBridge
+
+   Basic test
+
+   .. autosummary::
+
+      render                    -- some ignored stuff goes here
+      render_string             More ignored stuff
+
+   Test with tildes
+
+   .. autosummary::
+
+      ~TemplateBridge.render
+      ~TemplateBridge.render_string
+
+   Methods:
+
+  .. automethod:: render
+
+  .. automethod:: render_string

From e1be6ef8f8e42147416671dda215ef5f4c1cc65c Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Wed, 29 Jun 2011 21:27:43 +0200
Subject: [PATCH 006/226] autosummary: minor doc clarifications

---
 doc/ext/autosummary.rst | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/doc/ext/autosummary.rst b/doc/ext/autosummary.rst
index 9f66e5103..878a3c2c4 100644
--- a/doc/ext/autosummary.rst
+++ b/doc/ext/autosummary.rst
@@ -19,19 +19,21 @@ The :mod:`sphinx.ext.autosummary` extension does this in two parts:
    contain links to the documented items, and short summary blurbs extracted
    from their docstrings.
 
-2. The convenience script :program:`sphinx-autogen` or the new
+2. Optionally, the convenience script :program:`sphinx-autogen` or the new
    :confval:`autosummary_generate` config value can be used to generate short
    "stub" files for the entries listed in the :rst:dir:`autosummary` directives.
-   These by default contain only the corresponding :mod:`sphinx.ext.autodoc`
-   directive.
+   These files by default contain only the corresponding :mod:`sphinx.ext.autodoc`
+   directive, but can be customized with templates.
 
 
 .. rst:directive:: autosummary
 
    Insert a table that contains links to documented items, and a short summary
-   blurb (the first sentence of the docstring) for each of them.  The
-   :rst:dir:`autosummary` directive can also optionally serve as a :rst:dir:`toctree`
-   entry for the included items.
+   blurb (the first sentence of the docstring) for each of them.  
+
+   The :rst:dir:`autosummary` directive can also optionally serve as a
+   :rst:dir:`toctree` entry for the included items. Optionally, stub
+   ``.rst`` files for these items can also be automatically generated.
 
    For example, ::
 

From a239643f0b4fd463732ed3f4a5454d24f5941653 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Wed, 29 Jun 2011 21:27:56 +0200
Subject: [PATCH 007/226] autosummary/generate: slightly more robust parsing in
 find_autosummary_in_lines

Skip non-content lines of autosummary:: directives, if they have a
greater leading indent.
---
 sphinx/ext/autosummary/generate.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sphinx/ext/autosummary/generate.py b/sphinx/ext/autosummary/generate.py
index fecb5689a..089d181fc 100644
--- a/sphinx/ext/autosummary/generate.py
+++ b/sphinx/ext/autosummary/generate.py
@@ -232,7 +232,7 @@ def find_autosummary_in_lines(lines, module=None, filename=None):
     *template* ``None`` if the directive does not have the
     corresponding options set.
     """
-    autosummary_re = re.compile(r'^\s*\.\.\s+autosummary::\s*')
+    autosummary_re = re.compile(r'^(\s*)\.\.\s+autosummary::\s*')
     automodule_re = re.compile(
         r'^\s*\.\.\s+automodule::\s*([A-Za-z0-9_.]+)\s*$')
     module_re = re.compile(
@@ -247,6 +247,7 @@ def find_autosummary_in_lines(lines, module=None, filename=None):
     template = None
     current_module = module
     in_autosummary = False
+    base_indent = ""
 
     for line in lines:
         if in_autosummary:
@@ -277,7 +278,7 @@ def find_autosummary_in_lines(lines, module=None, filename=None):
                 documented.append((name, toctree, template))
                 continue
 
-            if not line.strip():
+            if not line.strip() or line.startswith(base_indent + " "):
                 continue
 
             in_autosummary = False
@@ -285,6 +286,7 @@ def find_autosummary_in_lines(lines, module=None, filename=None):
         m = autosummary_re.match(line)
         if m:
             in_autosummary = True
+            base_indent = m.group(1)
             toctree = None
             template = None
             continue

From 485e1e0d373e052b5117f52b149e33d50aaf4604 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Wed, 29 Jun 2011 21:29:43 +0200
Subject: [PATCH 008/226] autosummary: obtain import prefixes from environment
 also in the autolink role

---
 sphinx/ext/autosummary/__init__.py | 36 ++++++++++++++++++------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/sphinx/ext/autosummary/__init__.py b/sphinx/ext/autosummary/__init__.py
index b29470fbb..32dcc3e4f 100644
--- a/sphinx/ext/autosummary/__init__.py
+++ b/sphinx/ext/autosummary/__init__.py
@@ -231,18 +231,7 @@ class Autosummary(Directive):
         """
         env = self.state.document.settings.env
 
-        prefixes = ['']
-
-        currmodule = env.temp_data.get('py:module')
-        if currmodule:
-            prefixes.insert(0, currmodule)
-
-        currclass = env.temp_data.get('py:class')
-        if currclass:
-            if currmodule:
-                prefixes.insert(0, currmodule + "." + currclass)
-            else:
-                prefixes.insert(0, currclass)
+        prefixes = get_import_prefixes_from_env(env)
 
         items = []
 
@@ -405,6 +394,26 @@ def limited_join(sep, items, max_chars=30, overflow_marker="..."):
 
 # -- Importing items -----------------------------------------------------------
 
+def get_import_prefixes_from_env(env):
+    """
+    Obtain current Python import prefixes (for `import_by_name`)
+    from ``document.env``
+    """
+    prefixes = [None]
+
+    currmodule = env.temp_data.get('py:module')
+    if currmodule:
+        prefixes.insert(0, currmodule)
+
+    currclass = env.temp_data.get('py:class')
+    if currclass:
+        if currmodule:
+            prefixes.insert(0, currmodule + "." + currclass)
+        else:
+            prefixes.insert(0, currclass)
+
+    return prefixes
+
 def import_by_name(name, prefixes=[None]):
     """Import a Python object that has the given *name*, under one of the
     *prefixes*.  The first name that succeeds is used.
@@ -477,8 +486,7 @@ def autolink_role(typ, rawtext, etext, lineno, inliner,
         'obj', rawtext, etext, lineno, inliner, options, content)
     pnode = r[0][0]
 
-    prefixes = [None]
-    #prefixes.insert(0, inliner.document.settings.env.currmodule)
+    prefixes = get_import_prefixes_from_env(env)
     try:
         name, obj, parent = import_by_name(pnode['reftarget'], prefixes)
     except ImportError:

From 66c2bc7b9cd9fecd47528490d1ec4d3672c0a51e Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 30 Jun 2011 09:08:21 +0200
Subject: [PATCH 009/226] The math extension displaymath directives now support
 ``name`` in addition to ``label`` for giving the equation label, for
 compatibility with Docutils.

---
 CHANGES                | 3 +++
 sphinx/ext/mathbase.py | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 501c59129..47ac85a6a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -91,6 +91,9 @@ Features added
   - #367: Added automatic exclusion of hidden members in inheritance
     diagrams, and an option to selectively enable it.
   - Added :confval:`pngmath_add_tooltips`.
+  - The math extension displaymath directives now support ``name`` in
+    addition to ``label`` for giving the equation label, for compatibility
+    with Docutils.
 
 * New locales:
 
diff --git a/sphinx/ext/mathbase.py b/sphinx/ext/mathbase.py
index b5473449e..1a2ca6afe 100644
--- a/sphinx/ext/mathbase.py
+++ b/sphinx/ext/mathbase.py
@@ -56,6 +56,7 @@ class MathDirective(Directive):
     final_argument_whitespace = True
     option_spec = {
         'label': directives.unchanged,
+        'name': directives.unchanged,
         'nowrap': directives.flag,
     }
 
@@ -65,7 +66,9 @@ class MathDirective(Directive):
             latex = self.arguments[0] + '\n\n' + latex
         node = displaymath()
         node['latex'] = latex
-        node['label'] = self.options.get('label', None)
+        node['label'] = self.options.get('name', None)
+        if node['label'] is None:
+            node['label'] = self.options.get('label', None)
         node['nowrap'] = 'nowrap' in self.options
         node['docname'] = self.state.document.settings.env.docname
         ret = [node]

From 0c9c9e8bee0f7e44fd3c095f38c2f0f061dddc51 Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Wed, 6 Jul 2011 07:50:02 +0200
Subject: [PATCH 010/226] Refactor comment generating code for message
 catalogs. Bring back UUIDs in comments too.

Overrides kou's 7b77dd3717af.
---
 sphinx/builders/gettext.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py
index f030750e4..cc86dd714 100644
--- a/sphinx/builders/gettext.py
+++ b/sphinx/builders/gettext.py
@@ -67,12 +67,11 @@ class I18nBuilder(Builder):
         catalog = self.catalogs[docname.split(SEP, 1)[0]]
 
         for node, msg in extract_messages(doctree):
+            if not node.source:
+                continue # built-in message
             if not msg in catalog:
                 catalog[msg] = []
-            if node.source and node.line:
-                position = {"source": node.source,
-                            "line": node.line}
-                catalog[msg].append(position)
+            catalog[msg].append((node.source, node.line, node.uid))
 
 
 class MessageCatalogBuilder(I18nBuilder):
@@ -99,13 +98,17 @@ class MessageCatalogBuilder(I18nBuilder):
             try:
                 pofile.write(POHEADER % data)
                 for message, positions in messages.iteritems():
+                    if positions:
+                        # generate "#: file1:line1 file2:line2 ..."
+                        pofile.write(u"#: %s\n" % ", ".join("%s:%s" %
+                            (path.relpath(source, self.srcdir), line)
+                            for source, line, _ in positions))
+                        # generate "# uuid ..."
+                        pofile.write(u"# %s\n" % ", ".join(uid for _, _, uid
+                            in positions))
                     # message contains *one* line of text ready for translation
                     message = message.replace(u'\\', ur'\\'). \
                                       replace(u'"', ur'\"')
-                    for position in positions:
-                        source = path.relpath(position["source"], self.outdir)
-                        line = position["line"]
-                        pofile.write(u'#: %s:%d\n' % (source, line))
                     pofile.write(u'msgid "%s"\nmsgstr ""\n\n' % message)
             finally:
                 pofile.close()

From 16a2fd90109ef59b6428c84fbef64271125f7231 Mon Sep 17 00:00:00 2001
From: shibukawa yoshiki <yoshiki at shibu.jp>
Date: Thu, 28 Oct 2010 09:34:47 +0900
Subject: [PATCH 011/226] skip literal_block

---
 sphinx/builders/gettext.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py
index cc86dd714..89703e721 100644
--- a/sphinx/builders/gettext.py
+++ b/sphinx/builders/gettext.py
@@ -69,6 +69,8 @@ class I18nBuilder(Builder):
         for node, msg in extract_messages(doctree):
             if not node.source:
                 continue # built-in message
+            if isinstance(node, nodes.literal_block):
+                continue
             if not msg in catalog:
                 catalog[msg] = []
             catalog[msg].append((node.source, node.line, node.uid))

From 806cadaa01f4e5f5fcc01643a1eaced4061106bd Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 22 Sep 2011 14:54:15 +0200
Subject: [PATCH 012/226] Fix #506: block table alignment problem.

---
 sphinx/writers/latex.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index 9fa85b3f1..ef8943aee 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -629,7 +629,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
             self.table.longtable = True
         self.body = self._body
         if not self.table.longtable and self.table.caption is not None:
-            self.body.append(u'\n\\begin{threeparttable}\n'
+            self.body.append(u'\n\n\\begin{threeparttable}\n'
                              u'\\capstart\\caption{%s}\n' % self.table.caption)
         if self.table.longtable:
             self.body.append('\n\\begin{longtable}')

From 1e139851316e3923a3276a79a0d493d102f7b73e Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 22 Sep 2011 15:31:32 +0200
Subject: [PATCH 013/226] Update examples list.

---
 EXAMPLES | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/EXAMPLES b/EXAMPLES
index 842402458..2f21cf3ad 100644
--- a/EXAMPLES
+++ b/EXAMPLES
@@ -19,10 +19,12 @@ Documentation using the default theme
 * CodePy: http://documen.tician.de/codepy/
 * Cython: http://docs.cython.org/
 * C\\C++ Python language binding project: http://language-binding.net/index.html
+* Cormoran: http://cormoran.nhopkg.org/docs/
 * Director: http://packages.python.org/director/
 * Dirigible: http://www.projectdirigible.com/documentation/
 * F2py: http://www.f2py.org/html/
 * GeoDjango: http://geodjango.org/docs/
+* Genomedata: http://noble.gs.washington.edu/proj/genomedata/doc/1.2.2/genomedata.html
 * gevent: http://www.gevent.org/
 * Google Wave API: http://wave-robot-python-client.googlecode.com/svn/trunk/pydocs/index.html
 * GSL Shell: http://www.nongnu.org/gsl-shell/
@@ -50,6 +52,7 @@ Documentation using the default theme
 * PyUblas: http://documen.tician.de/pyublas/
 * Quex: http://quex.sourceforge.net/doc/html/main.html
 * Scapy: http://www.secdev.org/projects/scapy/doc/
+* Segway: http://noble.gs.washington.edu/proj/segway/doc/1.1.0/segway.html
 * SimPy: http://simpy.sourceforge.net/SimPyDocs/index.html
 * SymPy: http://docs.sympy.org/
 * WTForms: http://wtforms.simplecodes.com/docs/
@@ -114,14 +117,15 @@ Documentation using another builtin theme
 * C/C++ Development with Eclipse: http://book.dehlia.in/c-cpp-eclipse/ (agogo)
 * Distribute: http://packages.python.org/distribute/ (nature)
 * Jinja: http://jinja.pocoo.org/2/documentation/ (scrolls)
+* jsFiddle: http://doc.jsfiddle.net/ (nature)
 * pip: http://pip.openplans.org/ (nature)
 * Programmieren mit PyGTK und Glade (German):
   http://www.florian-diesch.de/doc/python-und-glade/online/ (agogo)
-* pypol: http://pypol.altervista.org/ (nature)
 * Spring Python: http://springpython.webfactional.com/current/sphinx/index.html
   (nature)
 * sqlparse: http://python-sqlparse.googlecode.com/svn/docs/api/index.html
   (agogo)
+* Sylli: http://sylli.sourceforge.net/ (nature)
 * libLAS: http://liblas.org/ (nature)
 
 
@@ -132,8 +136,10 @@ Documentation using a custom theme/integrated in a site
 * Blinker: http://discorporate.us/projects/Blinker/docs/
 * Classy: classy: http://classy.pocoo.org/
 * Django: http://docs.djangoproject.com/
+* e-cidadania: http://e-cidadania.readthedocs.org/en/latest/
 * Flask: http://flask.pocoo.org/docs/
 * Flask-OpenID: http://packages.python.org/Flask-OpenID/
+* Gameduino: http://excamera.com/sphinx/gameduino/
 * GeoServer: http://docs.geoserver.org/
 * Glashammer: http://glashammer.org/
 * MirrorBrain: http://mirrorbrain.org/docs/
@@ -145,6 +151,7 @@ Documentation using a custom theme/integrated in a site
 * German Plone 4.0 user manual: http://www.hasecke.com/plone-benutzerhandbuch/4.0/
 * Pylons: http://pylonshq.com/docs/en/0.9.7/
 * PyMOTW: http://www.doughellmann.com/PyMOTW/
+* pypol: http://pypol.altervista.org/ (celery)
 * qooxdoo: http://manual.qooxdoo.org/current
 * Roundup: http://www.roundup-tracker.org/
 * Selenium: http://seleniumhq.org/docs/
@@ -163,6 +170,7 @@ Homepages and other non-documentation sites
 * A personal page: http://www.dehlia.in/
 * Benoit Boissinot: http://perso.ens-lyon.fr/benoit.boissinot/
 * lunarsite: http://lunaryorn.de/
+* Red Hot Chili Python: http://redhotchilipython.com/
 * The Wine Cellar Book: http://www.thewinecellarbook.com/doc/en/
 * VOR: http://www.vor-cycling.be/
 

From c8b57044cde77c3dcc3d220023a1e1d4cbad1cb0 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 22 Sep 2011 15:32:02 +0200
Subject: [PATCH 014/226] Fix long line.

---
 sphinx/ext/coverage.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sphinx/ext/coverage.py b/sphinx/ext/coverage.py
index cfd4265ec..2620df23f 100644
--- a/sphinx/ext/coverage.py
+++ b/sphinx/ext/coverage.py
@@ -213,7 +213,8 @@ class CoverageBuilder(Builder):
                         op.write('\n')
                     if undoc['classes']:
                         op.write('Classes:\n')
-                        for name, methods in sorted(undoc['classes'].iteritems()):
+                        for name, methods in sorted(
+                                                 undoc['classes'].iteritems()):
                             if not methods:
                                 op.write(' * %s\n' % name)
                             else:

From 6e81a0622aec8a3717dc66b8743024ebb453b105 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 22 Sep 2011 15:34:26 +0200
Subject: [PATCH 015/226] Fix pyflakes issues.

---
 sphinx/domains/python.py  | 6 +++---
 sphinx/pycode/__init__.py | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py
index 0220afd09..73f0440ef 100644
--- a/sphinx/domains/python.py
+++ b/sphinx/domains/python.py
@@ -609,9 +609,9 @@ class PythonDomain(Domain):
                 else:
                     # "fuzzy" searching mode
                     searchname = '.' + name
-                    matches = [(name, objects[name]) for name in objects
-                               if name.endswith(searchname)
-                               and objects[name][1] in objtypes]
+                    matches = [(oname, objects[oname]) for oname in objects
+                               if oname.endswith(searchname)
+                               and objects[oname][1] in objtypes]
         else:
             # NOTE: searching for exact match, object type is not considered
             if name in objects:
diff --git a/sphinx/pycode/__init__.py b/sphinx/pycode/__init__.py
index 8271b2996..ec4913a31 100644
--- a/sphinx/pycode/__init__.py
+++ b/sphinx/pycode/__init__.py
@@ -9,8 +9,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
-import sys
 from os import path
 from cStringIO import StringIO
 

From 0e0965209d6aed963db511218bb04be6e6fe45bb Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 22 Sep 2011 15:36:43 +0200
Subject: [PATCH 016/226] Prepare for release 1.0.8.

---
 CHANGES            | 4 ++--
 sphinx/__init__.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index e8a281aad..652a84e92 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,5 @@
-Release 1.0.8 (in development)
-==============================
+Release 1.0.8 (Sep 22, 2011)
+============================
 
 * #720: Add dummy visitors for graphviz nodes for text and man.
 
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 4671a449d..0875c59c2 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -12,8 +12,8 @@
 import sys
 from os import path
 
-__version__  = '1.0.7+'
-__released__ = '1.0.7'  # used when Sphinx builds its own docs
+__version__  = '1.0.8'
+__released__ = '1.0.8'  # used when Sphinx builds its own docs
 
 package_dir = path.abspath(path.dirname(__file__))
 

From 7c6e3855058f3ff3e95aefa0a3f13205b73f9d18 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 22 Sep 2011 18:44:33 +0200
Subject: [PATCH 017/226] Fix #613: Allow Unicode characters in production list
 token names.

---
 CHANGES                 | 2 ++
 sphinx/domains/std.py   | 2 +-
 sphinx/writers/latex.py | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 652a84e92..c89b5fe9b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 1.0.8 (Sep 22, 2011)
 ============================
 
+* #613: Allow Unicode characters in production list token names.
+
 * #720: Add dummy visitors for graphviz nodes for text and man.
 
 * #704: Fix image file duplication bug.
diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py
index 1fd015ac6..e2249cf3b 100644
--- a/sphinx/domains/std.py
+++ b/sphinx/domains/std.py
@@ -257,7 +257,7 @@ class Glossary(Directive):
         return [node]
 
 
-token_re = re.compile('`([a-z_][a-z0-9_]*)`')
+token_re = re.compile('`(\w+)`', re.U)
 
 def token_xrefs(text):
     retnodes = []
diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index ef8943aee..1418dc276 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -272,7 +272,8 @@ class LaTeXTranslator(nodes.NodeVisitor):
         return '\\autopageref*{%s}' % self.idescape(id)
 
     def idescape(self, id):
-        return str(unicode(id).translate(tex_replace_map))
+        return unicode(id).translate(tex_replace_map).\
+            encode('ascii', 'backslashreplace').replace('\\', '_')
 
     def generate_indices(self):
         def generate(content, collapsed):

From a7f255d2f69afc0c6a55237c76c6a0ef57a70415 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 22 Sep 2011 18:59:54 +0200
Subject: [PATCH 018/226] Fix #616: Allow keywords to be linked via
 intersphinx.

---
 CHANGES                   | 2 ++
 sphinx/domains/std.py     | 3 ++-
 sphinx/ext/intersphinx.py | 6 ++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index c89b5fe9b..278be689d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 1.0.8 (Sep 22, 2011)
 ============================
 
+* #616: Allow keywords to be linked via intersphinx.
+
 * #613: Allow Unicode characters in production list token names.
 
 * #720: Add dummy visitors for graphviz nodes for text and man.
diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py
index e2249cf3b..b9da29b86 100644
--- a/sphinx/domains/std.py
+++ b/sphinx/domains/std.py
@@ -328,7 +328,8 @@ class StandardDomain(Domain):
     object_types = {
         'term': ObjType(l_('glossary term'), 'term', searchprio=-1),
         'token': ObjType(l_('grammar token'), 'token', searchprio=-1),
-        'label': ObjType(l_('reference label'), 'ref', searchprio=-1),
+        'label': ObjType(l_('reference label'), 'ref', 'keyword',
+                         searchprio=-1),
         'envvar': ObjType(l_('environment variable'), 'envvar'),
         'cmdoption': ObjType(l_('program option'), 'option'),
     }
diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py
index 578dddeeb..64a747c9d 100644
--- a/sphinx/ext/intersphinx.py
+++ b/sphinx/ext/intersphinx.py
@@ -32,6 +32,7 @@ from os import path
 
 from docutils import nodes
 
+from sphinx.locale import _
 from sphinx.builders.html import INVENTORY_FILENAME
 
 handlers = [urllib2.ProxyHandler(), urllib2.HTTPRedirectHandler(),
@@ -206,11 +207,12 @@ def missing_reference(app, env, node, contnode):
                 continue
             proj, version, uri, dispname = inventory[objtype][target]
             newnode = nodes.reference('', '', internal=False, refuri=uri,
-                                      reftitle='(in %s v%s)' % (proj, version))
+                                      reftitle=_('(in %s v%s)') % (proj, version))
             if node.get('refexplicit'):
                 # use whatever title was given
                 newnode.append(contnode)
-            elif dispname == '-':
+            elif dispname == '-' or \
+                    (domain == 'std' and node['reftype'] == 'keyword'):
                 # use whatever title was given, but strip prefix
                 title = contnode.astext()
                 if in_set and title.startswith(in_set+':'):

From caaa2762a3fc481cf276cc64943504bbc62cdba8 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 22 Sep 2011 19:08:51 +0200
Subject: [PATCH 019/226] Fix #633: Allow footnotes in section headers in LaTeX
 output.

---
 CHANGES                     |  2 ++
 sphinx/texinputs/sphinx.sty | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/CHANGES b/CHANGES
index 278be689d..3ebee480f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 1.0.8 (Sep 22, 2011)
 ============================
 
+* #633: Allow footnotes in section headers in LaTeX output.
+
 * #616: Allow keywords to be linked via intersphinx.
 
 * #613: Allow Unicode characters in production list token names.
diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty
index 478810948..9b3ee43e5 100644
--- a/sphinx/texinputs/sphinx.sty
+++ b/sphinx/texinputs/sphinx.sty
@@ -479,3 +479,21 @@
   }
   {\endlist}
 }{}
+
+
+% From footmisc.sty: allows footnotes in titles
+\let\FN@sf@@footnote\footnote
+\def\footnote{\ifx\protect\@typeset@protect
+    \expandafter\FN@sf@@footnote
+  \else
+    \expandafter\FN@sf@gobble@opt
+  \fi
+}
+\edef\FN@sf@gobble@opt{\noexpand\protect
+  \expandafter\noexpand\csname FN@sf@gobble@opt \endcsname}
+\expandafter\def\csname FN@sf@gobble@opt \endcsname{%
+  \@ifnextchar[%]
+    \FN@sf@gobble@twobracket
+    \@gobble
+}
+\def\FN@sf@gobble@twobracket[#1]#2{}

From 1c902921f35eeb93816f8b5a26f117525d7a3f45 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 22 Sep 2011 19:11:28 +0200
Subject: [PATCH 020/226] Fix #609: a bit more spacing for big headings.

---
 sphinx/themes/agogo/static/agogo.css_t | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sphinx/themes/agogo/static/agogo.css_t b/sphinx/themes/agogo/static/agogo.css_t
index fe60145d7..91ad44efb 100644
--- a/sphinx/themes/agogo/static/agogo.css_t
+++ b/sphinx/themes/agogo/static/agogo.css_t
@@ -175,6 +175,10 @@ div.body {
   text-align: {{ theme_textalign }};
 }
 
+div.document h1 {
+  line-height: 120%;
+}
+
 div.document ul {
   margin: 1.5em;
   list-style-type: square;

From a2562088f7f2163f95ee157c9dd1b212f0e5cb09 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 7 Jan 2011 15:49:01 +0100
Subject: [PATCH 021/226] C++ domain now supports array definitions.

---
 CHANGES               |  2 ++
 sphinx/domains/cpp.py | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/CHANGES b/CHANGES
index 3ebee480f..291255232 100644
--- a/CHANGES
+++ b/CHANGES
@@ -49,6 +49,8 @@ Release 1.0.8 (Sep 22, 2011)
 
 * #647: Do not apply SmartyPants in parsed-literal blocks.
 
+* C++ domain now supports array definitions.
+
 
 Release 1.0.7 (Jan 15, 2011)
 ============================
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index dac0106bb..588a8466d 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -28,6 +28,7 @@ _whitespace_re = re.compile(r'\s+(?u)')
 _string_re = re.compile(r"[LuU8]?('([^'\\]*(?:\\.[^'\\]*)*)'"
                         r'|"([^"\\]*(?:\\.[^"\\]*)*)")', re.S)
 _visibility_re = re.compile(r'\b(public|private|protected)\b')
+_array_def_re = re.compile(r'\[\s*(.+?)?\s*\]')
 _operator_re = re.compile(r'''(?x)
         \[\s*\]
     |   \(\s*\)
@@ -269,6 +270,22 @@ class PtrDefExpr(WrappingDefExpr):
         return u'%s*' % self.typename
 
 
+class ArrayDefExpr(WrappingDefExpr):
+
+    def __init__(self, typename, size_hint=None):
+        WrappingDefExpr.__init__(self, typename)
+        self.size_hint = size_hint
+
+    def get_id(self):
+        return self.typename.get_id() + u'A'
+
+    def __unicode__(self):
+        return u'%s[%s]' % (
+            self.typename,
+            self.size_hint is not None and unicode(self.size_hint) or u''
+        )
+
+
 class RefDefExpr(WrappingDefExpr):
 
     def get_id(self):
@@ -558,6 +575,8 @@ class DefinitionParser(object):
                 expr = ConstDefExpr(expr)
             elif self.skip_string('*'):
                 expr = PtrDefExpr(expr)
+            elif self.match(_array_def_re):
+                expr = ArrayDefExpr(expr, self.last_match.group(1))
             elif self.skip_string('&'):
                 expr = RefDefExpr(expr)
             else:

From b863ecbf98db22ed275bd282499ad0ca6279c561 Mon Sep 17 00:00:00 2001
From: Chris Pickel <sfiera@sfzmail.com>
Date: Tue, 19 Apr 2011 22:22:33 -0400
Subject: [PATCH 022/226] Support varargs in C++ function signatures.

---
 sphinx/domains/cpp.py    | 7 +++++++
 tests/test_cpp_domain.py | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 588a8466d..c2cdd8f5a 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -708,6 +708,13 @@ class DefinitionParser(object):
                     self.fail('expected comma between arguments')
                 self.skip_ws()
 
+            if self.skip_string('...'):
+                args.append(ArgumentDefExpr(None, '...', None))
+                if self.skip_string(')'):
+                    break
+                else:
+                    self.fail('expected closing parenthesis after ellipses')
+
             argtype = self._parse_type()
             argname = default = None
             self.skip_ws()
diff --git a/tests/test_cpp_domain.py b/tests/test_cpp_domain.py
index 296de1c87..84649fd1b 100644
--- a/tests/test_cpp_domain.py
+++ b/tests/test_cpp_domain.py
@@ -37,6 +37,9 @@ def test_type_definitions():
     x = 'explicit module::myclass::foo::foo()'
     assert unicode(parse('function', x)) == x
 
+    x = 'int printf(const char* fmt, ...)'
+    assert unicode(parse('function', x)) == x
+
     x = 'std::vector<std::pair<std::string, long long>> module::blah'
     assert unicode(parse('type_object', x)) == x
 

From 102b3bf9252f3e8663f6c7f4dcc21c6318badaf1 Mon Sep 17 00:00:00 2001
From: Kouhei Sutou <kou@clear-code.com>
Date: Sun, 29 May 2011 19:48:01 +0900
Subject: [PATCH 023/226] [i18n][man] add missing deunicode().

We get the following error message when we have a translated admonition
(e.g. 'note') label:

  Exception occurred:
      File "../sphinx/sphinx/locale/__init__.py", line 75, in __str__
        return str(self.data)
        UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-2: ordinal not in range(128)
---
 sphinx/writers/manpage.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/writers/manpage.py b/sphinx/writers/manpage.py
index e6bccca78..620873bb7 100644
--- a/sphinx/writers/manpage.py
+++ b/sphinx/writers/manpage.py
@@ -197,7 +197,7 @@ class ManualPageTranslator(BaseTranslator):
     def visit_admonition(self, node, name=None):
         if name:
             self.body.append('.IP %s\n' %
-                             admonitionlabels.get(name, name))
+                             self.deunicode(admonitionlabels.get(name, name)))
 
     def visit_productionlist(self, node):
         self.ensure_eol()

From b4a6b2c3c130129e70a76e909a0f886df21d1f18 Mon Sep 17 00:00:00 2001
From: Michael Jones <m.pricejones@gmail.com>
Date: Sun, 5 Jun 2011 14:21:47 +1200
Subject: [PATCH 024/226] Respect "includehidden" for sub-toctrees as well

Previously, the includehidden method argument was only being taken into account
for top level toctrees. This meant that hidden subtree toctrees were still
being resolved if they exists below a non-hidden toctree.
---
 sphinx/environment.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sphinx/environment.py b/sphinx/environment.py
index 6fe18f59e..f7aa5a5ff 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -1376,12 +1376,13 @@ class BuildEnvironment:
                                 toplevel[1][:] = subtrees
                     # resolve all sub-toctrees
                     for toctreenode in toc.traverse(addnodes.toctree):
-                        i = toctreenode.parent.index(toctreenode) + 1
-                        for item in _entries_from_toctree(toctreenode,
-                                                          subtree=True):
-                            toctreenode.parent.insert(i, item)
-                            i += 1
-                        toctreenode.parent.remove(toctreenode)
+                        if not ( toctreenode.get('hidden', False) and not includehidden ):
+                            i = toctreenode.parent.index(toctreenode) + 1
+                            for item in _entries_from_toctree(toctreenode,
+                                                              subtree=True):
+                                toctreenode.parent.insert(i, item)
+                                i += 1
+                            toctreenode.parent.remove(toctreenode)
                     if separate:
                         entries.append(toc)
                     else:
@@ -1740,3 +1741,4 @@ class BuildEnvironment:
                 if 'orphan' in self.metadata[docname]:
                     continue
                 self.warn(docname, 'document isn\'t included in any toctree')
+

From 517acb80f0ab89c9ac9681db61de9f825a26334d Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 7 Jun 2011 17:17:54 +0200
Subject: [PATCH 025/226] Add Nepali translation, thanks to Arati Sharma.

---
 CHANGES                                |   1 +
 doc/config.rst                         |   1 +
 sphinx/locale/ne/LC_MESSAGES/sphinx.js |   1 +
 sphinx/locale/ne/LC_MESSAGES/sphinx.mo | Bin 0 -> 12322 bytes
 sphinx/locale/ne/LC_MESSAGES/sphinx.po | 798 +++++++++++++++++++++++++
 5 files changed, 801 insertions(+)
 create mode 100644 sphinx/locale/ne/LC_MESSAGES/sphinx.js
 create mode 100644 sphinx/locale/ne/LC_MESSAGES/sphinx.mo
 create mode 100644 sphinx/locale/ne/LC_MESSAGES/sphinx.po

diff --git a/CHANGES b/CHANGES
index 880e868dd..501c59129 100644
--- a/CHANGES
+++ b/CHANGES
@@ -97,6 +97,7 @@ Features added
   - #221: Added Swedish locale.
   - #526: Added Iranian locale.
   - #694: Added Latvian locale.
+  - Added Nepali locale.
 
 
 Release 1.0.8 (in development)
diff --git a/doc/config.rst b/doc/config.rst
index 58dfdefcf..5db7c74be 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -380,6 +380,7 @@ documentation on :ref:`intl` for details.
    * ``ja`` -- Japanese
    * ``lt`` -- Lithuanian
    * ``lv`` -- Latvian
+   * ``ne`` -- Nepali
    * ``nl`` -- Dutch
    * ``pl`` -- Polish
    * ``pt_BR`` -- Brazilian Portuguese
diff --git a/sphinx/locale/ne/LC_MESSAGES/sphinx.js b/sphinx/locale/ne/LC_MESSAGES/sphinx.js
new file mode 100644
index 000000000..d45d217eb
--- /dev/null
+++ b/sphinx/locale/ne/LC_MESSAGES/sphinx.js
@@ -0,0 +1 @@
+Documentation.addTranslations({"locale": "ne", "plural_expr": "(n != 1)", "messages": {"Hide Search Matches": "\u0916\u094b\u091c\u0947\u0915\u094b \u0928\u0924\u093f\u091c\u093e\u0939\u0930\u0941 \u0932\u0941\u0915\u093e\u0909\u0928\u0941\u0939\u094b\u0938\u094d", "Permalink to this definition": "\u092f\u094b \u0905\u0930\u094d\u0925\u0915\u094b \u0932\u093e\u0917\u093f \u092a\u0930\u094d\u092e\u093e\u0932\u093f\u0928\u094d\u0915", "Expand sidebar": "\u0938\u093e\u0907\u0921\u092c\u0930 \u0920\u0941\u0932\u094b \u092c\u0928\u093e\u0909\u0928\u0941\u0939\u094b\u0938\u094d", "Permalink to this headline": "\u092f\u094b \u0936\u093f\u0930\u094d\u0937\u0915\u0915\u094b \u0932\u093e\u0917\u093f \u092a\u0930\u094d\u092e\u093e\u0932\u093f\u0928\u094d\u0915 \u0964 ", "Collapse sidebar": "\u0938\u093e\u0907\u0921\u092c\u0930 \u0938\u093e\u0928\u094b \u092c\u0928\u093e\u0909\u0928\u0941\u0939\u094b\u0938\u094d"}});
\ No newline at end of file
diff --git a/sphinx/locale/ne/LC_MESSAGES/sphinx.mo b/sphinx/locale/ne/LC_MESSAGES/sphinx.mo
new file mode 100644
index 0000000000000000000000000000000000000000..84546b90a5121791816555905e39c727b40cc9d2
GIT binary patch
literal 12322
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
L`!pMLu`vG!#HS>P

literal 0
HcmV?d00001

diff --git a/sphinx/locale/ne/LC_MESSAGES/sphinx.po b/sphinx/locale/ne/LC_MESSAGES/sphinx.po
new file mode 100644
index 000000000..0b7e6665c
--- /dev/null
+++ b/sphinx/locale/ne/LC_MESSAGES/sphinx.po
@@ -0,0 +1,798 @@
+# Nepali (Nepal) translations for Sphinx.
+# Copyright (C) 2011 ORGANIZATION
+# This file is distributed under the same license as the Sphinx project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Sphinx 1.1pre/47a94f723e80+\n"
+"Report-Msgid-Bugs-To: sharma.arati11@gmail.com\n"
+"POT-Creation-Date: 2011-05-26 13:47-0400\n"
+"PO-Revision-Date: 2011-06-02 13:38+0545\n"
+"Last-Translator: Tika Karki <tikaraj.karki@olenepal.org>\n"
+"Language-Team: ne_NP <LL@li.org>\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#: sphinx/environment.py:120
+#: sphinx/writers/latex.py:189
+#: sphinx/writers/manpage.py:67
+#: sphinx/writers/texinfo.py:202
+#, python-format
+msgid "%B %d, %Y"
+msgstr "%B %d, %Y"
+
+#: sphinx/environment.py:1624
+#, python-format
+msgid "see %s"
+msgstr "%s हेर्नुहोस्"
+
+#: sphinx/environment.py:1627
+#, python-format
+msgid "see also %s"
+msgstr "%s पनि हेर्नुहोस् "
+
+#: sphinx/roles.py:175
+#, python-format
+msgid "Python Enhancement Proposals; PEP %s"
+msgstr "Python Enhancement Proposals; PEP %s"
+
+#: sphinx/builders/changes.py:73
+msgid "Builtins"
+msgstr "बिइल्टिन्स"
+
+#: sphinx/builders/changes.py:75
+msgid "Module level"
+msgstr "मडुलको तह"
+
+#: sphinx/builders/html.py:274
+#, python-format
+msgid "%b %d, %Y"
+msgstr "%b %d, %Y"
+
+#: sphinx/builders/html.py:293
+#: sphinx/themes/basic/defindex.html:30
+msgid "General Index"
+msgstr "सामान्य  अनुसुची"
+
+#: sphinx/builders/html.py:293
+msgid "index"
+msgstr "अनुसुची"
+
+#: sphinx/builders/html.py:353
+msgid "next"
+msgstr "पछिल्लो"
+
+#: sphinx/builders/html.py:362
+msgid "previous"
+msgstr "अघिल्लो"
+
+#: sphinx/builders/latex.py:141
+#: sphinx/builders/texinfo.py:196
+msgid " (in "
+msgstr "(in"
+
+#: sphinx/directives/other.py:136
+msgid "Section author: "
+msgstr "सेक्सनको लेखक"
+
+#: sphinx/directives/other.py:138
+msgid "Module author: "
+msgstr "मडुलको लेखक"
+
+#: sphinx/directives/other.py:140
+msgid "Code author: "
+msgstr "Codeको लेखक "
+
+#: sphinx/directives/other.py:142
+msgid "Author: "
+msgstr "लेखक"
+
+#: sphinx/directives/other.py:215
+msgid "See also"
+msgstr "पनि हेर्नुहोस"
+
+#: sphinx/domains/__init__.py:244
+#, python-format
+msgid "%s %s"
+msgstr "%s %s"
+
+#: sphinx/domains/c.py:51
+#: sphinx/domains/python.py:95
+msgid "Parameters"
+msgstr "Parameters"
+
+#: sphinx/domains/c.py:54
+#: sphinx/domains/javascript.py:128
+#: sphinx/domains/python.py:107
+msgid "Returns"
+msgstr "Returns"
+
+#: sphinx/domains/c.py:56
+#: sphinx/domains/python.py:109
+msgid "Return type"
+msgstr "Return type"
+
+#: sphinx/domains/c.py:141
+#, python-format
+msgid "%s (C function)"
+msgstr "%s (C कार्य)"
+
+#: sphinx/domains/c.py:143
+#, python-format
+msgid "%s (C member)"
+msgstr "%s (C सदस्य)"
+
+#: sphinx/domains/c.py:145
+#, python-format
+msgid "%s (C macro)"
+msgstr "%s (C बृहत)"
+
+#: sphinx/domains/c.py:147
+#, python-format
+msgid "%s (C type)"
+msgstr "%s (C किसिम)"
+
+#: sphinx/domains/c.py:149
+#, python-format
+msgid "%s (C variable)"
+msgstr "%s (C चल)"
+
+#: sphinx/domains/c.py:204
+#: sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162
+#: sphinx/domains/python.py:559
+msgid "function"
+msgstr "फन्क्सन"
+
+#: sphinx/domains/c.py:205
+#: sphinx/domains/cpp.py:1061
+msgid "member"
+msgstr "सदस्य"
+
+#: sphinx/domains/c.py:206
+msgid "macro"
+msgstr "बृहत"
+
+#: sphinx/domains/c.py:207
+#: sphinx/domains/cpp.py:1062
+msgid "type"
+msgstr "किसिम"
+
+#: sphinx/domains/c.py:208
+msgid "variable"
+msgstr "चल"
+
+#: sphinx/domains/cpp.py:904
+#, python-format
+msgid "%s (C++ class)"
+msgstr "%s (C++ कक्षा)"
+
+#: sphinx/domains/cpp.py:919
+#, python-format
+msgid "%s (C++ type)"
+msgstr "%s (C++ किसिम)"
+
+#: sphinx/domains/cpp.py:938
+#, python-format
+msgid "%s (C++ member)"
+msgstr "%s (C++ सदस्य)"
+
+#: sphinx/domains/cpp.py:990
+#, python-format
+msgid "%s (C++ function)"
+msgstr "%s (C++कार्य)"
+
+#: sphinx/domains/cpp.py:1059
+#: sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
+msgid "class"
+msgstr "कक्षा"
+
+#: sphinx/domains/javascript.py:106
+#: sphinx/domains/python.py:254
+#, python-format
+msgid "%s() (built-in function)"
+msgstr "%s() (built-in function)"
+
+#: sphinx/domains/javascript.py:107
+#: sphinx/domains/python.py:318
+#, python-format
+msgid "%s() (%s method)"
+msgstr "%s() (%s विधी)"
+
+#: sphinx/domains/javascript.py:109
+#, python-format
+msgid "%s() (class)"
+msgstr "%s() (कक्षा)"
+
+#: sphinx/domains/javascript.py:111
+#, python-format
+msgid "%s (global variable or constant)"
+msgstr "%s (global variable or constant)"
+
+#: sphinx/domains/javascript.py:113
+#: sphinx/domains/python.py:356
+#, python-format
+msgid "%s (%s attribute)"
+msgstr "%s (%s attribute)"
+
+#: sphinx/domains/javascript.py:122
+msgid "Arguments"
+msgstr "Arguments"
+
+#: sphinx/domains/javascript.py:125
+msgid "Throws"
+msgstr "Throws"
+
+#: sphinx/domains/javascript.py:164
+#: sphinx/domains/python.py:560
+msgid "data"
+msgstr "data"
+
+#: sphinx/domains/javascript.py:165
+#: sphinx/domains/python.py:566
+msgid "attribute"
+msgstr "attribute"
+
+#: sphinx/domains/python.py:100
+msgid "Variables"
+msgstr "चलहरू"
+
+#: sphinx/domains/python.py:104
+msgid "Raises"
+msgstr "Raises"
+
+#: sphinx/domains/python.py:255
+#: sphinx/domains/python.py:312
+#: sphinx/domains/python.py:324
+#: sphinx/domains/python.py:337
+#, python-format
+msgid "%s() (in module %s)"
+msgstr "%s() (in मडुल %s)"
+
+#: sphinx/domains/python.py:258
+#, python-format
+msgid "%s (built-in variable)"
+msgstr "%s (built-in चल)"
+
+#: sphinx/domains/python.py:259
+#: sphinx/domains/python.py:350
+#, python-format
+msgid "%s (in module %s)"
+msgstr "%s (in मडुल %s)"
+
+#: sphinx/domains/python.py:275
+#, python-format
+msgid "%s (built-in class)"
+msgstr "%s (built-in कक्षा)"
+
+#: sphinx/domains/python.py:276
+#, python-format
+msgid "%s (class in %s)"
+msgstr "%s (कक्षा in %s)"
+
+#: sphinx/domains/python.py:316
+#, python-format
+msgid "%s() (%s.%s method)"
+msgstr "%s() (%s.%s विधी)"
+
+#: sphinx/domains/python.py:328
+#, python-format
+msgid "%s() (%s.%s static method)"
+msgstr "%s() (%s.%s static विधी)"
+
+#: sphinx/domains/python.py:331
+#, python-format
+msgid "%s() (%s static method)"
+msgstr "%s() (%s static विधी)"
+
+#: sphinx/domains/python.py:341
+#, python-format
+msgid "%s() (%s.%s class method)"
+msgstr "%s() (%s.%s कक्षा विधी)"
+
+#: sphinx/domains/python.py:344
+#, python-format
+msgid "%s() (%s class method)"
+msgstr "%s() (%s कक्षा विधी)"
+
+#: sphinx/domains/python.py:354
+#, python-format
+msgid "%s (%s.%s attribute)"
+msgstr "%s (%s.%s attribute)"
+
+#: sphinx/domains/python.py:434
+#, python-format
+msgid "%s (module)"
+msgstr "%s (मडुल)"
+
+#: sphinx/domains/python.py:491
+msgid "Python Module Index"
+msgstr "Python Module Index"
+
+#: sphinx/domains/python.py:492
+msgid "modules"
+msgstr "modules"
+
+#: sphinx/domains/python.py:537
+msgid "Deprecated"
+msgstr "Deprecated"
+
+#: sphinx/domains/python.py:562
+#: sphinx/locale/__init__.py:179
+msgid "exception"
+msgstr "अपबाद"
+
+#: sphinx/domains/python.py:563
+msgid "method"
+msgstr "विधी"
+
+#: sphinx/domains/python.py:564
+msgid "class method"
+msgstr "कक्षा विधी"
+
+#: sphinx/domains/python.py:565
+msgid "static method"
+msgstr "static विधी"
+
+#: sphinx/domains/python.py:567
+#: sphinx/locale/__init__.py:175
+msgid "module"
+msgstr "मडुल"
+
+#: sphinx/domains/python.py:695
+msgid " (deprecated)"
+msgstr "(deprecated)"
+
+#: sphinx/domains/rst.py:55
+#, python-format
+msgid "%s (directive)"
+msgstr "%s (निर्देशिक)"
+
+#: sphinx/domains/rst.py:57
+#, python-format
+msgid "%s (role)"
+msgstr "%s (भूमिका)"
+
+#: sphinx/domains/rst.py:106
+msgid "directive"
+msgstr "निर्देशिक"
+
+#: sphinx/domains/rst.py:107
+msgid "role"
+msgstr "भूमिका"
+
+#: sphinx/domains/std.py:70
+#: sphinx/domains/std.py:86
+#, python-format
+msgid "environment variable; %s"
+msgstr "environment variable; %s"
+
+#: sphinx/domains/std.py:162
+#, python-format
+msgid "%scommand line option; %s"
+msgstr "%scommand line option; %s"
+
+#: sphinx/domains/std.py:393
+msgid "glossary term"
+msgstr "शब्द-अर्थमा भएको"
+
+#: sphinx/domains/std.py:394
+msgid "grammar token"
+msgstr "grammar token"
+
+#: sphinx/domains/std.py:395
+msgid "reference label"
+msgstr "सन्दर्व सामग्री"
+
+#: sphinx/domains/std.py:396
+msgid "environment variable"
+msgstr "environment variable"
+
+#: sphinx/domains/std.py:397
+msgid "program option"
+msgstr "कार्यक्रमका बिकल्प"
+
+#: sphinx/domains/std.py:427
+#: sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32
+#: sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68
+#: sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:178
+#: sphinx/writers/texinfo.py:447
+msgid "Index"
+msgstr "अनुसुची"
+
+#: sphinx/domains/std.py:428
+msgid "Module Index"
+msgstr "मडुल अनुसुची"
+
+#: sphinx/domains/std.py:429
+#: sphinx/themes/basic/defindex.html:25
+msgid "Search Page"
+msgstr "पानामा खोज्नुहोस्"
+
+#: sphinx/ext/autodoc.py:1002
+#, python-format
+msgid "   Bases: %s"
+msgstr "Bases: %s"
+
+#: sphinx/ext/autodoc.py:1038
+#, python-format
+msgid "alias of :class:`%s`"
+msgstr "alias of :class:`%s`"
+
+#: sphinx/ext/todo.py:41
+msgid "Todo"
+msgstr "Todo"
+
+#: sphinx/ext/todo.py:109
+#, python-format
+msgid "(The <<original entry>> is located in  %s, line %d.)"
+msgstr "(<<original entry>> यहाँ %s, line %d रहेको छ ।   "
+
+#: sphinx/ext/todo.py:117
+msgid "original entry"
+msgstr "मौलिक इन्ट्री"
+
+#: sphinx/ext/viewcode.py:70
+msgid "[source]"
+msgstr "[स्रोत]"
+
+#: sphinx/ext/viewcode.py:117
+msgid "[docs]"
+msgstr "[docs]"
+
+#: sphinx/ext/viewcode.py:131
+msgid "Module code"
+msgstr "Module code"
+
+#: sphinx/ext/viewcode.py:137
+#, python-format
+msgid "<h1>Source code for %s</h1>"
+msgstr "<h1>Source code for %s</h1>"
+
+#: sphinx/ext/viewcode.py:164
+msgid "Overview: module code"
+msgstr "पुनरावलोकन: module code"
+
+#: sphinx/ext/viewcode.py:165
+msgid "<h1>All modules for which code is available</h1>"
+msgstr "<h1>All modules for which code is available</h1>"
+
+#: sphinx/locale/__init__.py:155
+msgid "Attention"
+msgstr "ध्यानाकर्षण"
+
+#: sphinx/locale/__init__.py:156
+msgid "Caution"
+msgstr "होसियार "
+
+#: sphinx/locale/__init__.py:157
+msgid "Danger"
+msgstr "खतरा"
+
+#: sphinx/locale/__init__.py:158
+msgid "Error"
+msgstr "गलत"
+
+#: sphinx/locale/__init__.py:159
+msgid "Hint"
+msgstr "सङ्केत"
+
+#: sphinx/locale/__init__.py:160
+msgid "Important"
+msgstr "जरुरी"
+
+#: sphinx/locale/__init__.py:161
+msgid "Note"
+msgstr "टिप्पणी"
+
+#: sphinx/locale/__init__.py:162
+msgid "See Also"
+msgstr "पनि हेर्नुहोस्"
+
+#: sphinx/locale/__init__.py:163
+msgid "Tip"
+msgstr "Tip"
+
+#: sphinx/locale/__init__.py:164
+msgid "Warning"
+msgstr "साबधान"
+
+#: sphinx/locale/__init__.py:168
+#, python-format
+msgid "New in version %s"
+msgstr "भर्सन %s मा नयाँ"
+
+#: sphinx/locale/__init__.py:169
+#, python-format
+msgid "Changed in version %s"
+msgstr "भर्सन  %s मा बदलिएको"
+
+#: sphinx/locale/__init__.py:170
+#, python-format
+msgid "Deprecated since version %s"
+msgstr "Deprecated since version %s"
+
+#: sphinx/locale/__init__.py:176
+msgid "keyword"
+msgstr "मुख्य शब्द"
+
+#: sphinx/locale/__init__.py:177
+msgid "operator"
+msgstr "सन्चालक"
+
+#: sphinx/locale/__init__.py:178
+msgid "object"
+msgstr "object"
+
+#: sphinx/locale/__init__.py:180
+msgid "statement"
+msgstr "भनाई"
+
+#: sphinx/locale/__init__.py:181
+msgid "built-in function"
+msgstr "built-in फन्क्सन"
+
+#: sphinx/themes/agogo/layout.html:45
+#: sphinx/themes/basic/globaltoc.html:10
+#: sphinx/themes/basic/localtoc.html:11
+msgid "Table Of Contents"
+msgstr "विषयसूची"
+
+#: sphinx/themes/agogo/layout.html:49
+#: sphinx/themes/basic/layout.html:137
+#: sphinx/themes/basic/search.html:11
+#: sphinx/themes/basic/search.html:20
+msgid "Search"
+msgstr "खोज्नुहोस् "
+
+#: sphinx/themes/agogo/layout.html:52
+#: sphinx/themes/basic/searchbox.html:15
+msgid "Go"
+msgstr "जानुहोस्"
+
+#: sphinx/themes/agogo/layout.html:57
+#: sphinx/themes/basic/searchbox.html:20
+msgid "Enter search terms or a module, class or function name."
+msgstr "खोज्ने टर्मस् अथवा एक मडुल्, कक्षा अथवा फन्क्सनको नाम लेख्नुहोस "
+
+#: sphinx/themes/agogo/layout.html:78
+#: sphinx/themes/basic/sourcelink.html:14
+msgid "Show Source"
+msgstr "स्रोत देखाउनुहोस् "
+
+#: sphinx/themes/basic/defindex.html:11
+msgid "Overview"
+msgstr "पुनरावलोकन "
+
+#: sphinx/themes/basic/defindex.html:20
+msgid "Indices and tables:"
+msgstr "इन्डीसीस्स र तलिका"
+
+#: sphinx/themes/basic/defindex.html:23
+msgid "Complete Table of Contents"
+msgstr "पुरा विषयसूची"
+
+#: sphinx/themes/basic/defindex.html:24
+msgid "lists all sections and subsections"
+msgstr "सबै सेक्सन र सवसेक्सन देखाउनुहोस्"
+
+#: sphinx/themes/basic/defindex.html:26
+msgid "search this documentation"
+msgstr "यो डकुमेन्ट खोज्नुहोस्"
+
+#: sphinx/themes/basic/defindex.html:28
+msgid "Global Module Index"
+msgstr "ग्लोबल मडुल अनुसुची"
+
+#: sphinx/themes/basic/defindex.html:29
+msgid "quick access to all modules"
+msgstr "सबै मोदुलेसमा छिटै जानुहोस्"
+
+#: sphinx/themes/basic/defindex.html:31
+msgid "all functions, classes, terms"
+msgstr "सबै फन्क्सनस्, कक्षाहरू र टर्मस्"
+
+#: sphinx/themes/basic/genindex-single.html:35
+#, python-format
+msgid "Index &ndash; %(key)s"
+msgstr "Index &ndash; %(key)s"
+
+#: sphinx/themes/basic/genindex-single.html:63
+#: sphinx/themes/basic/genindex-split.html:24
+#: sphinx/themes/basic/genindex-split.html:38
+#: sphinx/themes/basic/genindex.html:74
+msgid "Full index on one page"
+msgstr "पुरा अनुसुची एकै पानामा"
+
+#: sphinx/themes/basic/genindex-split.html:16
+msgid "Index pages by letter"
+msgstr "अक्षर अनुसार अनुसुचीका पाना"
+
+#: sphinx/themes/basic/genindex-split.html:25
+msgid "can be huge"
+msgstr "धेरै ठुलो हुन सक्छ"
+
+#: sphinx/themes/basic/layout.html:29
+msgid "Navigation"
+msgstr "नेभिगेसन "
+
+#: sphinx/themes/basic/layout.html:122
+#, python-format
+msgid "Search within %(docstitle)s"
+msgstr "भित्र-भित्रै खोज्नुहोस्"
+
+#: sphinx/themes/basic/layout.html:131
+msgid "About these documents"
+msgstr "यी डकुमेन्टहरुको बारेमा"
+
+#: sphinx/themes/basic/layout.html:140
+msgid "Copyright"
+msgstr "कपिराइट "
+
+#: sphinx/themes/basic/layout.html:189
+#, python-format
+msgid "&copy; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
+msgstr "&copy; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
+
+#: sphinx/themes/basic/layout.html:191
+#, python-format
+msgid "&copy; Copyright %(copyright)s."
+msgstr "&copy; Copyright %(copyright)s."
+
+#: sphinx/themes/basic/layout.html:195
+#, python-format
+msgid "Last updated on %(last_updated)s."
+msgstr "यो भन्दा अगाडी %(last_updated)s मा अपडेट भएको"
+
+#: sphinx/themes/basic/layout.html:198
+#, python-format
+msgid "Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s."
+msgstr "<a href=\"http://sphinx.pocoo.org/\">Sphinx</a> प्रयोग गरेर बनाइएको"
+
+#: sphinx/themes/basic/opensearch.xml:4
+#, python-format
+msgid "Search %(docstitle)s"
+msgstr "खोज्नुहोस्"
+
+#: sphinx/themes/basic/relations.html:11
+msgid "Previous topic"
+msgstr "अघिल्लो विषय "
+
+#: sphinx/themes/basic/relations.html:13
+msgid "previous chapter"
+msgstr "अघिल्लो खन्ड"
+
+#: sphinx/themes/basic/relations.html:16
+msgid "Next topic"
+msgstr "पछिल्लो विषय"
+
+#: sphinx/themes/basic/relations.html:18
+msgid "next chapter"
+msgstr "पछिल्लो खन्ड"
+
+#: sphinx/themes/basic/search.html:24
+msgid ""
+"Please activate JavaScript to enable the search\n"
+"    functionality."
+msgstr "खोज्ने कार्य आगाडी बढाउनको लागि जाभास्कृप्ट चलाईदिनुहोस "
+
+#: sphinx/themes/basic/search.html:29
+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 ""
+"यहाँबाट तपाईंले यी ड्कुमेन्टहरु खोज्नसक्नु हुन्छ । खोज्न शब्दहरु\n"
+"तलको बक्समा लेख्‍नुहोस र \"खोज्नुहोस्\"थिच्नुहोस ।  खोज्नुहोस्\n"
+"फन्क्सनले आफै सबै शब्दहरु खोज्छ । \n"
+"थोरै शब्दहरु भएको पानाहरु नतिजामा देखिन्न । "
+
+#: sphinx/themes/basic/search.html:36
+msgid "search"
+msgstr "खोज्नुहोस्"
+
+#: sphinx/themes/basic/search.html:40
+msgid "Search Results"
+msgstr "खोजेको नतिजा"
+
+#: sphinx/themes/basic/search.html:42
+msgid "Your search did not match any results."
+msgstr "तपाईंले खोजेको कुरा कुनै नतिजासँग मिलेन "
+
+#: sphinx/themes/basic/searchbox.html:12
+msgid "Quick search"
+msgstr "छिट्टो खोज्नुहोस्"
+
+#: sphinx/themes/basic/sourcelink.html:11
+msgid "This Page"
+msgstr "यो पाना"
+
+#: sphinx/themes/basic/changes/frameset.html:5
+#: sphinx/themes/basic/changes/versionchanges.html:12
+#, python-format
+msgid "Changes in Version %(version)s &mdash; %(docstitle)s"
+msgstr "%(version)s &mdash; %(docstitle)s मा भएका फरकहरु "
+
+#: sphinx/themes/basic/changes/rstsource.html:5
+#, python-format
+msgid "%(filename)s &mdash; %(docstitle)s"
+msgstr "%(filename)s &mdash; %(docstitle)s"
+
+#: sphinx/themes/basic/changes/versionchanges.html:17
+#, python-format
+msgid "Automatically generated list of changes in version %(version)s"
+msgstr "भर्सन %(version)s मा भएका फरक हरु आफै जेनेरेट भए  "
+
+#: sphinx/themes/basic/changes/versionchanges.html:18
+msgid "Library changes"
+msgstr "लाईब्रेरीका  परिवर्तनहरु"
+
+#: sphinx/themes/basic/changes/versionchanges.html:23
+msgid "C API changes"
+msgstr "C API का  परिवर्तनहरु "
+
+#: sphinx/themes/basic/changes/versionchanges.html:25
+msgid "Other changes"
+msgstr "अरु परिवर्तनहरु "
+
+#: sphinx/themes/basic/static/doctools.js:154
+#: sphinx/writers/html.py:506
+#: sphinx/writers/html.py:512
+msgid "Permalink to this headline"
+msgstr "यो शिर्षकको लागि पर्मालिन्क । "
+
+#: sphinx/themes/basic/static/doctools.js:160
+#: sphinx/writers/html.py:92
+msgid "Permalink to this definition"
+msgstr "यो अर्थको लागि पर्मालिन्क"
+
+#: sphinx/themes/basic/static/doctools.js:189
+msgid "Hide Search Matches"
+msgstr "खोजेको नतिजाहरु लुकाउनुहोस्"
+
+#: sphinx/themes/default/static/sidebar.js:69
+msgid "Expand sidebar"
+msgstr "साइडबर ठुलो बनाउनुहोस्"
+
+#: sphinx/themes/default/static/sidebar.js:82
+#: sphinx/themes/default/static/sidebar.js:110
+msgid "Collapse sidebar"
+msgstr "साइडबर सानो बनाउनुहोस्"
+
+#: sphinx/themes/haiku/layout.html:26
+msgid "Contents"
+msgstr "विषयसूची"
+
+#: sphinx/writers/latex.py:176
+msgid "Release"
+msgstr "रीलीज"
+
+#: sphinx/writers/latex.py:590
+#: sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:580
+msgid "Footnotes"
+msgstr "फूट्नोट्स"
+
+#: sphinx/writers/latex.py:672
+msgid "continued from previous page"
+msgstr "अघिल्लो पानासँग जोडीएको"
+
+#: sphinx/writers/latex.py:677
+msgid "Continued on next page"
+msgstr "अर्को पानासँग जोडीएको"
+
+#: sphinx/writers/text.py:430
+msgid "[image]"
+msgstr "[चित्र]"
+

From 4bc665cf4adf9ca096923238af3e31b2ab1e3f5f Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 7 Jun 2011 17:21:59 +0200
Subject: [PATCH 026/226] Recompile German catalog.

---
 sphinx/locale/de/LC_MESSAGES/sphinx.mo | Bin 9615 -> 9616 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sphinx/locale/de/LC_MESSAGES/sphinx.mo b/sphinx/locale/de/LC_MESSAGES/sphinx.mo
index 357d46f08fc0e32878fba286c2d5dbcbc4184306..658a95a0255a44765bcb8ddbe4510e9a76c00c7e 100644
GIT binary patch
delta 1359
zcmXZbZ)nX?9LMpadw1EjyFcc-*EM&S-I=YirWq-gWTiV&2usn5kv&;TY4{1@W@T-8
zu$mPidt&T9Af^1RA<aCH+5^(kidM@bLf#+0Z{6<eobUOa^ZlOlJHIQLp3J?Sd0we=
zE)aKaF2*nqD{v`RV;Eb^-8SBa^NAnE7@oo+yov>Q3nMs!n*YSc-<T6vLi}6YdH*N=
zA)twoh5o_`TtL4L^<Xm=;vP(6I~HR%D#11L4wli+VHDqCIes-m3Fk=VmZ3J-l<@pO
z8v#|^h4V0r{M-P4jrahy&@`^W!bQH#sOL^2Ib1*HV-9EIWAi0$qW>1>U<p-fV+oIj
z0=1~4T#ajSD{2Q9Pz4R(5*)@5j$;LWL?!%<+c31)AK!&qcOU8`4`K#S+W07HU2lwr
z7Wjfqvz+^mE9lp<T~*kMx+5JJz%!_wo=5F)(7cVh6L(Rs=sDKl6lx=-Dee<iqc*w&
zd3ByUN<)<#M_r;U>YetRH&KNQqsE`23LZzzn?OB3jhwFgi5ib`TuCfPLT&?Y!TqSa
zGlXgKyGJyX;1lW+&Y%|ji`rp6H%0Lh)WS*BSF#*+v@5N@8FfiB7H>5>QR`hY`%r}s
zVu<|iJ`H_-4^a!hz#zWX12~3C`~g+aXRN|08!zS}=(!l`ohMO8UWGj3)?54lYNJO`
zC)tIbCSInY%6l<|*HMK$LnR(XO?;19c+%p(Pzi&)aLtdP7A`~0ueJCp<mWb8{17T{
zht6L+I%a_`^Q@UgCGN5Q4OGG*)X|Ti=D$K6={Ty8N#yOhAJ&gn`URy?iEB`IqrS4v
vUvN7CegAt=J8nlM?!*9|LnXeLI}z?J2sW&1sP8L^%>*06E|m+!yCeSqpqYRd

delta 1358
zcmXZbZ)nX?9LMpm?!7Z}uY1jPcelAS`(vBi*vgRnEB3&yC@m~SD@OKYDGv<&LRhFV
z9;{|X$evjHQ>2u?HKe&7NbLb>X+<kMB9!;X@6_$S&iS6-Ip6O&zw^74>COx_hrE0<
z3na~EV**21hGkfdd6;qTaO15QCw>46@Hj^CDu(eEMsOH4|B)Mi<($B|#J?oX`#<py
z0Zj}S`U@9gg8ov}gN--`cVY#$VGJ*z5?piM!3Fe3a6Z1lh4|SSDl#LLRiZYyuE_HP
ztprqYC+bAHke~JOw*v2>7MjMD7%BE`L_K!`$zi=X3rBD!K6F0Ejr3n*F2<-*8!Pl^
zD3C@S<#JqwTTnYVgDR*G7vUi0U>3{qJu2aE+=`);Ki-U5cQ@)J_hAN)x$!a7y52Yq
zE$|7~&oKLnwe-_$R~5G4JZ#4RdZ?YAM(wcQc^h>n?xJ4NQ(S^msEy>8n$=)6YNOkc
zSLfLw8mi<7>JoLK-f6G%CaRD@)c9jm!CBP23Don`$m!Zo)OeiZD!~#YWNUFV?m^w1
z0jwauJ)ofkA5fR@8*0J7s2%2VQxuP(7EYnQk}A~E*1G;C)Fo|l@fK$XYQ1yL9#rA|
zm_vRWqM^_4K5F4-7{r%)0LM{@-=PZnh*db{#-m&WJ(obe^AzgH7bB0@8W-P-+UP;l
zNp_;AiRWpk^2=C?*HMK$K_wnTO?-=5c+$mxp%Mmo;hG;tEnJM6pLX$j<YyaPd_O90
zyUt%bI_v_S&XdkARN`*ezky0PfI9kN)chByBh8`;nMB^6{c!zwrC(4vDsc_!Zq!vS
v^B3GkK;Qo^)Q;Owi90ZWr%;K{jvmeH2?rZi*VkQ%7JLsh<k@I2c`@=2XF-2X


From 71471311459338a23a5b9bb4107f2cc0a32462ba Mon Sep 17 00:00:00 2001
From: Jonathan Waltman <jonathan.waltman@gmail.com>
Date: Mon, 27 Jun 2011 18:45:00 -0500
Subject: [PATCH 027/226] Add method ``ensure_eol`` and use it to fix paragraph
 spacing in Texinfo.

---
 sphinx/writers/texinfo.py | 54 ++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/sphinx/writers/texinfo.py b/sphinx/writers/texinfo.py
index 7eb63c842..7ca2801bc 100644
--- a/sphinx/writers/texinfo.py
+++ b/sphinx/writers/texinfo.py
@@ -348,6 +348,11 @@ class TexinfoTranslator(nodes.NodeVisitor):
         s = ' '.join(s.split()).strip()
         return s
 
+    def ensure_eol(self):
+        """Ensure the last line in body is terminated by new line."""
+        if self.body and self.body[-1][-1:] != '\n':
+            self.body.append('\n')
+
     def format_menu_entry(self, name, node_name, desc):
         if name == node_name:
             s = '* %s:: ' % (name,)
@@ -703,7 +708,8 @@ class TexinfoTranslator(nodes.NodeVisitor):
     def visit_block_quote(self, node):
         self.body.append('\n@quotation\n')
     def depart_block_quote(self, node):
-        self.body.append('\n@end quotation\n\n')
+        self.ensure_eol()
+        self.body.append('@end quotation\n')
 
     def visit_literal_block(self, node):
         self.body.append('\n@example\n')
@@ -795,7 +801,8 @@ class TexinfoTranslator(nodes.NodeVisitor):
         bullet = node.get('bullet', '*')
         self.body.append('\n\n@itemize %s\n' % bullet)
     def depart_bullet_list(self, node):
-        self.body.append('\n@end itemize\n\n')
+        self.ensure_eol()
+        self.body.append('@end itemize\n')
 
     def visit_enumerated_list(self, node):
         # doesn't support Roman numerals
@@ -806,10 +813,11 @@ class TexinfoTranslator(nodes.NodeVisitor):
         start = node.get('start', starters.get(enum, ''))
         self.body.append('\n\n@enumerate %s\n' % start)
     def depart_enumerated_list(self, node):
-        self.body.append('\n@end enumerate\n\n')
+        self.ensure_eol()
+        self.body.append('@end enumerate\n')
 
     def visit_list_item(self, node):
-        self.body.append('\n@item\n')
+        self.body.append('\n@item ')
     def depart_list_item(self, node):
         pass
 
@@ -818,7 +826,8 @@ class TexinfoTranslator(nodes.NodeVisitor):
     def visit_option_list(self, node):
         self.body.append('\n\n@table @option\n')
     def depart_option_list(self, node):
-        self.body.append('\n@end table\n\n')
+        self.ensure_eol()
+        self.body.append('@end table\n')
 
     def visit_option_list_item(self, node):
         pass
@@ -856,7 +865,8 @@ class TexinfoTranslator(nodes.NodeVisitor):
     def visit_definition_list(self, node):
         self.body.append('\n\n@table @asis\n')
     def depart_definition_list(self, node):
-        self.body.append('\n@end table\n\n')
+        self.ensure_eol()
+        self.body.append('@end table\n')
 
     def visit_definition_list_item(self, node):
         self.at_item_x = '@item'
@@ -946,7 +956,8 @@ class TexinfoTranslator(nodes.NodeVisitor):
     def visit_field_list(self, node):
         self.body.append('\n\n@itemize @w\n')
     def depart_field_list(self, node):
-        self.body.append('\n@end itemize\n\n')
+        self.ensure_eol()
+        self.body.append('@end itemize\n')
 
     def visit_field(self, node):
         if not isinstance(node.parent, nodes.field_list):
@@ -971,15 +982,15 @@ class TexinfoTranslator(nodes.NodeVisitor):
         if not name:
             name = self.escape(node[0].astext())
         self.body.append('\n@cartouche\n'
-                         '@quotation %s\n' % name)
+                         '@quotation %s ' % name)
     def depart_admonition(self, node):
-        self.body.append('\n@end quotation\n'
-                         '@end cartouche\n\n')
+        self.ensure_eol()
+        self.body.append('@end quotation\n'
+                         '@end cartouche\n')
 
     def _make_visit_admonition(typ):
         def visit(self, node):
-            self.body.append('\n@cartouche\n'
-                             '@quotation %s\n' % self.escape(_(typ)))
+            self.visit_admonition(node, self.escape(_(typ)))
         return visit
 
     visit_attention = _make_visit_admonition('Attention')
@@ -1083,7 +1094,7 @@ class TexinfoTranslator(nodes.NodeVisitor):
         width = self.tex_image_length(attrs.get('width', ''))
         height = self.tex_image_length(attrs.get('height', ''))
         alt = self.escape_arg(attrs.get('alt', ''))
-        self.body.append('\n\n@image{%s,%s,%s,%s,%s}\n\n' %
+        self.body.append('\n@image{%s,%s,%s,%s,%s}\n' %
                          (name, width, height, alt, ext[1:]))
     def depart_image(self, node):
         pass
@@ -1127,8 +1138,9 @@ class TexinfoTranslator(nodes.NodeVisitor):
         pass
 
     def visit_comment(self, node):
+        self.body.append('\n')
         for line in node.astext().splitlines():
-            self.body.append('\n@c %s\n' % line)
+            self.body.append('@c %s\n' % line)
         raise nodes.SkipNode
 
     def visit_problematic(self, node):
@@ -1181,12 +1193,12 @@ class TexinfoTranslator(nodes.NodeVisitor):
         for entry in node['entries']:
             typ, text, tid, text2 = entry
             text = self.escape_menu(text)
-            self.body.append('@geindex %s\n' % text)
+            self.body.append('\n@geindex %s\n' % text)
 
     def visit_refcount(self, node):
         self.body.append('\n')
     def depart_refcount(self, node):
-        self.body.append('\n\n')
+        self.body.append('\n')
 
     def visit_versionmodified(self, node):
         intro = versionlabels[node['type']] % node['version']
@@ -1194,9 +1206,9 @@ class TexinfoTranslator(nodes.NodeVisitor):
             intro += ': '
         else:
             intro += '.'
-        self.body.append('\n\n%s' % self.escape(intro))
+        self.body.append('\n%s' % self.escape(intro))
     def depart_versionmodified(self, node):
-        self.body.append('\n\n')
+        self.body.append('\n')
 
     def visit_start_of_file(self, node):
         # add a document target
@@ -1257,7 +1269,9 @@ class TexinfoTranslator(nodes.NodeVisitor):
     def visit_desc(self, node):
         self.at_deffnx = '@deffn'
     def depart_desc(self, node):
-        self.body.append('\n@end deffn\n\n')
+        self.ensure_eol()
+        self.body.append('@end deffn\n')
+
     def visit_desc_signature(self, node):
         self.desctype = node.parent['desctype'].strip()
         if self.desctype != 'describe':
@@ -1313,7 +1327,7 @@ class TexinfoTranslator(nodes.NodeVisitor):
         raise nodes.SkipNode
 
     def visit_desc_content(self, node):
-        self.body.append("\n")
+        pass
     def depart_desc_content(self, node):
         pass
 

From 10e0fb8ad90a1cf8ca3c61dc23dde4a1875cc86b Mon Sep 17 00:00:00 2001
From: Jonathan Waltman <jonathan.waltman@gmail.com>
Date: Mon, 27 Jun 2011 19:28:47 -0500
Subject: [PATCH 028/226] Properly escape ``quote'' characters in Texinfo.

---
 sphinx/writers/texinfo.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sphinx/writers/texinfo.py b/sphinx/writers/texinfo.py
index 7ca2801bc..9e7414c58 100644
--- a/sphinx/writers/texinfo.py
+++ b/sphinx/writers/texinfo.py
@@ -319,6 +319,9 @@ class TexinfoTranslator(nodes.NodeVisitor):
         s = s.replace('@', '@@')
         s = s.replace('{', '@{')
         s = s.replace('}', '@}')
+        # prevent `` and '' quote conversion
+        s = s.replace('``', "`@w{`}")
+        s = s.replace("''", "'@w{'}")
         # prevent "--" from being converted to an "em dash"
         # s = s.replace('-', '@w{-}')
         return s

From 584dc318838d9afea728c1769b71e89d5d852a54 Mon Sep 17 00:00:00 2001
From: Jonathan Waltman <jonathan.waltman@gmail.com>
Date: Mon, 27 Jun 2011 19:51:00 -0500
Subject: [PATCH 029/226] Replace no-break spaces with normal ones inside
 desc_parameters for Texinfo.

---
 sphinx/writers/texinfo.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sphinx/writers/texinfo.py b/sphinx/writers/texinfo.py
index 9e7414c58..6eb3cd3bf 100644
--- a/sphinx/writers/texinfo.py
+++ b/sphinx/writers/texinfo.py
@@ -1318,7 +1318,10 @@ class TexinfoTranslator(nodes.NodeVisitor):
             self.body.append(', ')
         else:
             self.first_param = 0
-        self.body.append(self.escape(node.astext()))
+        text = self.escape(node.astext())
+        # replace no-break spaces with normal ones
+        text = text.replace(u' ', '@w{ }')
+        self.body.append(text)
         raise nodes.SkipNode
 
     def visit_desc_optional(self, node):

From a78b9ec92721987b55b2c694503e17fe7fae0606 Mon Sep 17 00:00:00 2001
From: Jonathan Waltman <jonathan.waltman@gmail.com>
Date: Wed, 29 Jun 2011 17:33:27 -0500
Subject: [PATCH 030/226] Prevent indexing commands from causing a paragraph
 break in Texinfo.

---
 sphinx/writers/texinfo.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sphinx/writers/texinfo.py b/sphinx/writers/texinfo.py
index 6eb3cd3bf..c110117d1 100644
--- a/sphinx/writers/texinfo.py
+++ b/sphinx/writers/texinfo.py
@@ -1193,10 +1193,15 @@ class TexinfoTranslator(nodes.NodeVisitor):
         self.body.append('}')
 
     def visit_index(self, node):
+        # terminate the line but don't prevent paragraph breaks
+        if isinstance(node.parent, nodes.paragraph):
+            self.ensure_eol()
+        else:
+            self.body.append('\n')
         for entry in node['entries']:
             typ, text, tid, text2 = entry
             text = self.escape_menu(text)
-            self.body.append('\n@geindex %s\n' % text)
+            self.body.append('@geindex %s\n' % text)
 
     def visit_refcount(self, node):
         self.body.append('\n')

From d16be40da1916ce3eaadbd1b239fb0ee306568ed Mon Sep 17 00:00:00 2001
From: Jonathan Waltman <jonathan.waltman@gmail.com>
Date: Thu, 30 Jun 2011 17:21:16 -0500
Subject: [PATCH 031/226] Fix NameError in graphviz.render_dot_texinfo.

---
 sphinx/ext/graphviz.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py
index 90874f0b2..e645ad876 100644
--- a/sphinx/ext/graphviz.py
+++ b/sphinx/ext/graphviz.py
@@ -308,7 +308,8 @@ def render_dot_texinfo(self, node, code, options, prefix='graphviz'):
         raise nodes.SkipNode
     if fname is not None:
         self.body.append('\n\n@float\n')
-        if node.get('caption'):
+        caption = node.get('caption')
+        if caption:
             self.body.append('@caption{%s}\n' % self.escape_arg(caption))
         self.body.append('@image{%s,,,[graphviz],png}\n'
                          '@end float\n\n' % fname[:-4])

From 626a9548211ad078ae8138027f9f6e6ff7400ff7 Mon Sep 17 00:00:00 2001
From: Jonathan Waltman <jonathan.waltman@gmail.com>
Date: Sun, 3 Jul 2011 17:44:03 -0500
Subject: [PATCH 032/226] Use ``ObjType.lname`` for the category in Texinfo
 desc_signatures.

---
 sphinx/writers/texinfo.py | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/sphinx/writers/texinfo.py b/sphinx/writers/texinfo.py
index c110117d1..526eccbaf 100644
--- a/sphinx/writers/texinfo.py
+++ b/sphinx/writers/texinfo.py
@@ -10,8 +10,9 @@
 """
 
 import re
-from os import path
+import string
 import textwrap
+from os import path
 
 from docutils import nodes, writers
 
@@ -1259,21 +1260,6 @@ class TexinfoTranslator(nodes.NodeVisitor):
 
     ## Desc
 
-    desc_map = {
-        'cfunction':    'C Function',
-        'classmethod':  'Class Method',
-        'cmacro':       'C Macro',
-        'cmdoption':    'Command Option',
-        'cmember':      'C Member',
-        'confval':      'Configuration Value',
-        'ctype':        'C Type',
-        'cvar':         'C Variable',
-        'describe':     'Description',
-        'envvar':       'Environment Variable',
-        'staticmethod': 'Static Method',
-        'var':          'Variable',
-        }
-
     def visit_desc(self, node):
         self.at_deffnx = '@deffn'
     def depart_desc(self, node):
@@ -1281,13 +1267,18 @@ class TexinfoTranslator(nodes.NodeVisitor):
         self.body.append('@end deffn\n')
 
     def visit_desc_signature(self, node):
-        self.desctype = node.parent['desctype'].strip()
-        if self.desctype != 'describe':
+        objtype = node.parent['objtype']
+        if objtype != 'describe':
             for id in node.get('ids'):
                 self.add_anchor(id, node)
-        typ = _(self.desc_map.get(self.desctype,
-                                  self.desctype.capitalize()))
-        self.body.append('\n%s {%s} ' % (self.at_deffnx, self.escape_arg(typ)))
+        # use the localized name for the category
+        try:
+            domain = self.builder.env.domains[node.parent['domain']]
+            lname = domain.object_types[objtype].lname
+        except KeyError:
+            lname = objtype
+        category = self.escape_arg(string.capwords(lname))
+        self.body.append('\n%s {%s} ' % (self.at_deffnx, category))
         self.at_deffnx = '@deffnx'
     def depart_desc_signature(self, node):
         self.body.append("\n")

From 1fde44cbf63462b18aad202009610540fa3012da Mon Sep 17 00:00:00 2001
From: Jonathan Waltman <jonathan.waltman@gmail.com>
Date: Thu, 7 Jul 2011 01:39:53 -0500
Subject: [PATCH 033/226] Follow the behavior described by
 :confval:`primary_domain` to display domain object names and use this as the
 category in Texinfo desc_signatures.

---
 sphinx/writers/texinfo.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sphinx/writers/texinfo.py b/sphinx/writers/texinfo.py
index 526eccbaf..5799e0234 100644
--- a/sphinx/writers/texinfo.py
+++ b/sphinx/writers/texinfo.py
@@ -1271,13 +1271,15 @@ class TexinfoTranslator(nodes.NodeVisitor):
         if objtype != 'describe':
             for id in node.get('ids'):
                 self.add_anchor(id, node)
-        # use the localized name for the category
+        # use the full name of the objtype for the category
         try:
             domain = self.builder.env.domains[node.parent['domain']]
-            lname = domain.object_types[objtype].lname
+            primary = self.builder.config.primary_domain
+            name = domain.get_type_name(domain.object_types[objtype],
+                                        primary == domain.name)
         except KeyError:
-            lname = objtype
-        category = self.escape_arg(string.capwords(lname))
+            name = objtype
+        category = self.escape_arg(string.capwords(name))
         self.body.append('\n%s {%s} ' % (self.at_deffnx, category))
         self.at_deffnx = '@deffnx'
     def depart_desc_signature(self, node):

From f4bd8c5e84b4612254599934a05a39b97f8562e3 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 9 Jul 2011 12:08:18 +0200
Subject: [PATCH 034/226] Remove unused import.

---
 sphinx/environment.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx/environment.py b/sphinx/environment.py
index f7aa5a5ff..86fb1b80c 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -17,7 +17,6 @@ import types
 import codecs
 import imghdr
 import string
-import posixpath
 import unicodedata
 import cPickle as pickle
 from os import path
@@ -1376,7 +1375,8 @@ class BuildEnvironment:
                                 toplevel[1][:] = subtrees
                     # resolve all sub-toctrees
                     for toctreenode in toc.traverse(addnodes.toctree):
-                        if not ( toctreenode.get('hidden', False) and not includehidden ):
+                        if not (toctreenode.get('hidden', False)
+                                and not includehidden):
                             i = toctreenode.parent.index(toctreenode) + 1
                             for item in _entries_from_toctree(toctreenode,
                                                               subtree=True):

From db733f40fce31f9255d17a6a824a55d4ec1439c2 Mon Sep 17 00:00:00 2001
From: Benoit Allard <benoit@aeteurope.nl>
Date: Thu, 14 Jul 2011 13:03:33 +0200
Subject: [PATCH 035/226] Don't use deprecated values in the template conf.py
 (issue732)

---
 sphinx/quickstart.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index 5b6e3e491..876e71821 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -209,11 +209,16 @@ htmlhelp_basename = '%(project_fn)sdoc'
 
 # -- Options for LaTeX output --------------------------------------------------
 
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
 
 # The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+}
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
@@ -236,9 +241,6 @@ latex_documents = [
 # If true, show URL addresses after external links.
 #latex_show_urls = False
 
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-
 # Documents to append as an appendix to all manuals.
 #latex_appendices = []
 

From 9350b3b46b832279afdf99cf5452de5088e91f3a Mon Sep 17 00:00:00 2001
From: Benoit Allard <benoit@aeteurope.nl>
Date: Thu, 14 Jul 2011 16:57:01 +0200
Subject: [PATCH 036/226] graphviz: also catch IOError with Errno 22 (invalid
 parameter)

This happen on Python2.7 and Graphviz version 2.12 (Mon Dec  4 22:04:37 UTC 2006)
on Windows when a not recognized renderer type is asked.
---
 sphinx/ext/graphviz.py | 9 ++++++++-
 sphinx/util/osutil.py  | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py
index e645ad876..b54cb3c09 100644
--- a/sphinx/ext/graphviz.py
+++ b/sphinx/ext/graphviz.py
@@ -25,7 +25,7 @@ from docutils import nodes
 from docutils.parsers.rst import directives
 
 from sphinx.errors import SphinxError
-from sphinx.util.osutil import ensuredir, ENOENT, EPIPE
+from sphinx.util.osutil import ensuredir, ENOENT, EPIPE, EINVAL
 from sphinx.util.compat import Directive
 
 
@@ -163,6 +163,7 @@ def render_dot(self, code, options, format, prefix='graphviz'):
                           self.builder.config.graphviz_dot)
         self.builder._graphviz_warned_dot = True
         return None, None
+    wentWrong = False
     try:
         # Graphviz may close standard input when an error occurs,
         # resulting in a broken pipe on communicate()
@@ -170,6 +171,12 @@ def render_dot(self, code, options, format, prefix='graphviz'):
     except OSError, err:
         if err.errno != EPIPE:
             raise
+        wentWrong = True
+    except IOError, err:
+        if err.errno != EINVAL:
+            raise
+        wentWrong = True
+    if wentWrong:
         # in this case, read the standard output and standard error streams
         # directly, to get the error message(s)
         stdout, stderr = p.stdout.read(), p.stderr.read()
diff --git a/sphinx/util/osutil.py b/sphinx/util/osutil.py
index 487a5afcd..b7a12cda9 100644
--- a/sphinx/util/osutil.py
+++ b/sphinx/util/osutil.py
@@ -21,6 +21,7 @@ from os import path
 EEXIST = getattr(errno, 'EEXIST', 0)
 ENOENT = getattr(errno, 'ENOENT', 0)
 EPIPE  = getattr(errno, 'EPIPE', 0)
+EINVAL = getattr(errno, 'EINVAL', 0)
 
 # SEP separates path elements in the canonical file names
 #

From e7d915e47eaa22c75accc5561719bc3dacc4196f Mon Sep 17 00:00:00 2001
From: Mateusz Paprocki <mattpap@gmail.com>
Date: Tue, 19 Jul 2011 01:45:52 +0200
Subject: [PATCH 037/226] Added support for non-local files to
 Application.add_stylesheet()

---
 sphinx/application.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sphinx/application.py b/sphinx/application.py
index 840fc46b9..dec9c13c8 100644
--- a/sphinx/application.py
+++ b/sphinx/application.py
@@ -472,8 +472,11 @@ class Sphinx(object):
 
     def add_stylesheet(self, filename):
         from sphinx.builders.html import StandaloneHTMLBuilder
-        StandaloneHTMLBuilder.css_files.append(
-            posixpath.join('_static', filename))
+        if '://' in filename:
+            StandaloneHTMLBuilder.css_files.append(filename)
+        else:
+            StandaloneHTMLBuilder.css_files.append(
+                posixpath.join('_static', filename))
 
     def add_lexer(self, alias, lexer):
         from sphinx.highlighting import lexers

From bfa6e8c0deb0e85d642ec2ca90318bb3b1fea28b Mon Sep 17 00:00:00 2001
From: bond <diehose@freenet.de>
Date: Tue, 19 Jul 2011 22:35:52 +0200
Subject: [PATCH 038/226] some changes to math docs

---
 doc/ext/math.rst | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/ext/math.rst b/doc/ext/math.rst
index e6e1826b0..6ae2c7198 100644
--- a/doc/ext/math.rst
+++ b/doc/ext/math.rst
@@ -4,16 +4,15 @@ Math support in Sphinx
 ======================
 
 .. module:: sphinx.ext.mathbase
-   :synopsis: Common math support for pngmath and jsmath.
+   :synopsis: Common math support for pngmath and mathjax / jsmath.
 
 .. versionadded:: 0.5
 
 Since mathematical notation isn't natively supported by HTML in any way, Sphinx
-supports math in documentation with two extensions.
+supports math in documentation with several extensions.
 
-The basic math support that is common to both extensions is contained in
-:mod:`sphinx.ext.mathbase`.  Other math support extensions should,
-if possible, reuse that support too.
+The basic math support is contained in :mod:`sphinx.ext.mathbase`. Other math
+support extensions should, if possible, reuse that support too.
 
 .. note::
 
@@ -103,7 +102,8 @@ This extension renders math via LaTeX and dvipng_ into PNG images.  This of
 course means that the computer where the docs are built must have both programs
 available.
 
-There are various config values you can set to influence how the images are built:
+There are various config values you can set to influence how the images are
+built:
 
 .. confval:: pngmath_latex
 
@@ -196,7 +196,7 @@ Sphinx.
 .. confval:: mathjax_path
 
    The path to the JavaScript file to include in the HTML files in order to load
-   JSMath.
+   MathJax.
 
    The default is the ``http://`` URL that loads the JS files from the `MathJax
    CDN <http://www.mathjax.org/docs/1.1/start.html>`_.  If you want MathJax to
@@ -206,7 +206,7 @@ Sphinx.
    The path can be absolute or relative; if it is relative, it is relative to
    the ``_static`` directory of the built docs.
 
-   For example, if you put JSMath into the static path of the Sphinx docs, this
+   For example, if you put MathJax into the static path of the Sphinx docs, this
    value would be ``MathJax/MathJax.js``.  If you host more than one Sphinx
    documentation set on one server, it is advisable to install MathJax in a
    shared location.

From 680d261694949b96e06267fbb3278ae51da17e73 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 23 Jul 2011 10:02:04 +0200
Subject: [PATCH 039/226] s/jsmath/mathjax/

---
 doc/ext/math.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ext/math.rst b/doc/ext/math.rst
index 6ae2c7198..bbefe382b 100644
--- a/doc/ext/math.rst
+++ b/doc/ext/math.rst
@@ -18,7 +18,7 @@ support extensions should, if possible, reuse that support too.
 
    :mod:`.mathbase` is not meant to be added to the :confval:`extensions` config
    value, instead, use either :mod:`sphinx.ext.pngmath` or
-   :mod:`sphinx.ext.jsmath` as described below.
+   :mod:`sphinx.ext.mathjax` as described below.
 
 The input language for mathematics is LaTeX markup.  This is the de-facto
 standard for plain-text math notation and has the added advantage that no

From ed0bad388924cd9f1b8b8c4fd385167ed32caa0c Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 23 Jul 2011 10:04:09 +0200
Subject: [PATCH 040/226] Doc and changelog entries for 91b4fc984b32.

---
 CHANGES            | 1 +
 doc/ext/appapi.rst | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 47ac85a6a..c3a4a083f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -64,6 +64,7 @@ Features added
 
   - #537: Added :confval:`nitpick_ignore`.
   - #306: Added :event:`env-get-outdated` event.
+  - :meth:`.Application.add_stylesheet` now accepts full URIs.
 
 * Autodoc:
 
diff --git a/doc/ext/appapi.rst b/doc/ext/appapi.rst
index d43a90eb1..643de9950 100644
--- a/doc/ext/appapi.rst
+++ b/doc/ext/appapi.rst
@@ -256,7 +256,7 @@ the following public API:
 
    Add *filename* to the list of CSS files that the default HTML template will
    include.  Like for :meth:`add_javascript`, the filename must be relative to
-   the HTML static path.
+   the HTML static path, or a full URI with scheme.
 
    .. versionadded:: 1.0
 

From f98cfbe862df32d98df7eb5f9c1dc90a4d3ac456 Mon Sep 17 00:00:00 2001
From: Kouhei Sutou <kou@clear-code.com>
Date: Fri, 12 Aug 2011 14:29:19 +0900
Subject: [PATCH 041/226] [i18n] use relative path from output directory for
 source path.

This commit reverts part of 5976facae92c commit:
  Refactor comment generating code for message catalogs.

The commit says "Refactor" but it changes original code behavior.
In original code, start path for path.relpath() is self.outdir but
in refactored code, start path for path.relpath() is self.srcdir.

It should be self.outdir not self.srcdir to improve po-mode.el
support. po-mode.el has "po-cycle-source-reference" command. It
search source code relative from .po file directory.

See also::
  http://www.gnu.org/s/hello/manual/gettext/C-Sources-Context.html

    Program source files are usually found relative to where the PO
    file stands. As a special provision, when this fails, the file
    is also looked for, but relative to the directory immediately
    above it.
---
 sphinx/builders/gettext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py
index fbe8afbb2..9dc2bb670 100644
--- a/sphinx/builders/gettext.py
+++ b/sphinx/builders/gettext.py
@@ -113,7 +113,7 @@ class MessageCatalogBuilder(I18nBuilder):
 
                     # generate "#: file1:line1 file2:line2 ..."
                     pofile.write(u"#: %s\n" % ", ".join("%s:%s" %
-                        (path.relpath(source, self.srcdir), line)
+                        (path.relpath(source, self.outdir), line)
                         for source, line, _ in positions))
                     # generate "# uuid1\n# uuid2\n ..."
                     pofile.write(u"# %s\n" % "\n# ".join(uid for _, _, uid

From 61867d69e78870a159c4982809ab50dec59080d6 Mon Sep 17 00:00:00 2001
From: Njal Karevoll <njal@karevoll.no>
Date: Fri, 12 Aug 2011 09:15:02 +0200
Subject: [PATCH 042/226] The graphviz extension uses an empty <object ... />
 tag to embed svg files, but for the object tag the start and the end tag are
 required (see http://www.w3.org/TR/html40/struct/objects.html#edef-OBJECT).

Issue #659: https://bitbucket.org/birkenfeld/sphinx/issue/659/patch-graphviz-object-tag-to-embed-svg
---
 sphinx/ext/graphviz.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py
index b54cb3c09..6b875081f 100644
--- a/sphinx/ext/graphviz.py
+++ b/sphinx/ext/graphviz.py
@@ -214,7 +214,7 @@ def get_svg_tag(svgref, svgfile, imgcls=None):
     # The object tag works fine on Firefox and WebKit
     # Besides it's a hack, this strategy does not mess with templates.
     imgcss = imgcls and ' class="%s"' % imgcls or ''
-    return '<object type="image/svg+xml" data="%s"%s%s/>\n' % \
+    return '<object type="image/svg+xml" data="%s"%s%s></object>\n' % \
            (svgref, imgcss, style)
 
 

From 773ba3b768534723936206c40f415ea7dc01b210 Mon Sep 17 00:00:00 2001
From: Kouhei Sutou <kou@clear-code.com>
Date: Sun, 14 Aug 2011 19:55:07 +0900
Subject: [PATCH 043/226] [i18n] fix reference line separator.

This commit fixes part of 5976facae92c commit:
  Refactor comment generating code for message catalogs.

The commit says "Refactor" but it changes original code behavior.
In original code, source locations are separated with " " but
in refactored code, source locations are separated with ", ".

msgmerge and po-mode that are part of the GNU gettext toolset treats
"," as part of source location. We can fix this problem by one of them:

  * Use " " instead of ", " as source locations separator
    in a "reference" line.
  * Put "reference" lines. Each "reference" line just has a source location.

This commit uses the latter because the latter has more higher readablility.

See also about "reference" line but it doesn't say about separator:
  http://www.gnu.org/s/hello/manual/gettext/PO-Files.html
---
 sphinx/builders/gettext.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py
index 9dc2bb670..1552e273d 100644
--- a/sphinx/builders/gettext.py
+++ b/sphinx/builders/gettext.py
@@ -111,8 +111,8 @@ class MessageCatalogBuilder(I18nBuilder):
                 for message in catalog.messages:
                     positions = catalog.metadata[message]
 
-                    # generate "#: file1:line1 file2:line2 ..."
-                    pofile.write(u"#: %s\n" % ", ".join("%s:%s" %
+                    # generate "#: file1:line1\n#: file2:line2 ..."
+                    pofile.write(u"#: %s\n" % "\n#: ".join("%s:%s" %
                         (path.relpath(source, self.outdir), line)
                         for source, line, _ in positions))
                     # generate "# uuid1\n# uuid2\n ..."

From 04c5c5aab8d09defe057acadd7c8357b0b872fb3 Mon Sep 17 00:00:00 2001
From: Njal Karevoll <njal@karevoll.no>
Date: Mon, 15 Aug 2011 10:27:25 +0200
Subject: [PATCH 044/226] Array.concat does not exist in all browsers.

[].concat can be used instead of Array.concat, and this works in Firefox and Chrome (and reportedly on IE8/9).
---
 sphinx/themes/basic/static/searchtools.js_t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/themes/basic/static/searchtools.js_t b/sphinx/themes/basic/static/searchtools.js_t
index 0aa291cba..c3f9adc9e 100644
--- a/sphinx/themes/basic/static/searchtools.js_t
+++ b/sphinx/themes/basic/static/searchtools.js_t
@@ -174,7 +174,7 @@ var Search = {
 
     // lookup as object
     for (var i = 0; i < objectterms.length; i++) {
-      var others = Array.concat(objectterms.slice(0,i),
+      var others = [].concat(objectterms.slice(0,i),
                                 objectterms.slice(i+1, objectterms.length))
       var results = this.performObjectSearch(objectterms[i], others);
       // Assume first word is most likely to be the object,

From 70c5e1474d5b5cb21a9975fd4e20caf987e420b4 Mon Sep 17 00:00:00 2001
From: Benoit Allard <benoit@aeteurope.nl>
Date: Wed, 24 Aug 2011 00:09:01 +0200
Subject: [PATCH 045/226] Render SVG using an img tag, not an object one. Even
 IE9 understands it now

---
 sphinx/ext/graphviz.py | 39 ++++++---------------------------------
 sphinx/writers/html.py | 10 ++++------
 2 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py
index 6b875081f..6c36f31b3 100644
--- a/sphinx/ext/graphviz.py
+++ b/sphinx/ext/graphviz.py
@@ -30,7 +30,6 @@ from sphinx.util.compat import Directive
 
 
 mapname_re = re.compile(r'<map id="(.*?)"')
-svg_dim_re = re.compile(r'<svg\swidth="(\d+)pt"\sheight="(\d+)pt"', re.M)
 
 
 class GraphvizError(SphinxError):
@@ -187,35 +186,9 @@ def render_dot(self, code, options, format, prefix='graphviz'):
     return relfn, outfn
 
 
-def get_svg_tag(svgref, svgfile, imgcls=None):
-    # Webkit can't figure out svg dimensions when using object tag
-    # so we need to get it from the svg file
-    fp = open(svgfile, 'r')
-    try:
-        for line in fp:
-            match = svg_dim_re.match(line)
-            if match:
-                dimensions = match.groups()
-                break
-        else:
-            dimensions = None
-    finally:
-        fp.close()
-
-    # We need this hack to make WebKit show our object tag properly
-    def pt2px(x):
-        return int(ceil((96.0/72.0) * float(x)))
-
-    if dimensions:
-        style = ' width="%s" height="%s"' % tuple(map(pt2px, dimensions))
-    else:
-        style = ''
-
-    # The object tag works fine on Firefox and WebKit
-    # Besides it's a hack, this strategy does not mess with templates.
-    imgcss = imgcls and ' class="%s"' % imgcls or ''
-    return '<object type="image/svg+xml" data="%s"%s%s></object>\n' % \
-           (svgref, imgcss, style)
+def get_svg_tag(svgref, imgcls=None):
+    return '<img src="%s"%s />\n' % \
+           (svgref, imgcss)
 
 
 def render_dot_html(self, node, code, options, prefix='graphviz',
@@ -225,7 +198,7 @@ def render_dot_html(self, node, code, options, prefix='graphviz',
         if format not in ('png', 'svg'):
             raise GraphvizError("graphviz_output_format must be one of 'png', "
                                 "'svg', but is %r" % format)
-        fname, outfn = render_dot(self, code, options, format, prefix)
+        fname, outfn = render_dot(self, code, options, format, prefix)g
     except GraphvizError, exc:
         self.builder.warn('dot code %r: ' % code + str(exc))
         raise nodes.SkipNode
@@ -242,8 +215,9 @@ def render_dot_html(self, node, code, options, prefix='graphviz',
     else:
         if alt is None:
             alt = node.get('alt', self.encode(code).strip())
+        imgcss = imgcls and 'class="%s"' % imgcls or ''
         if format == 'svg':
-            svgtag = get_svg_tag(fname, outfn, imgcls)
+            svgtag = '<img src="%s" alt="%s" %s/>\n' % (fname, alt, imgcss)
             self.body.append(svgtag)
         else:
             mapfile = open(outfn + '.map', 'rb')
@@ -251,7 +225,6 @@ def render_dot_html(self, node, code, options, prefix='graphviz',
                 imgmap = mapfile.readlines()
             finally:
                 mapfile.close()
-            imgcss = imgcls and 'class="%s"' % imgcls or ''
             if len(imgmap) == 2:
                 # nothing in image map (the lines are <map> and </map>)
                 self.body.append('<img src="%s" alt="%s" %s/>\n' %
diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py
index 99d621c6f..17c7d43db 100644
--- a/sphinx/writers/html.py
+++ b/sphinx/writers/html.py
@@ -336,22 +336,20 @@ class HTMLTranslator(BaseTranslator):
 
         if node['uri'].lower().endswith('svg') or \
            node['uri'].lower().endswith('svgz'):
-            atts = {'data': node['uri'], 'type': 'image/svg+xml'}
+            atts = {'src': node['uri']}
             if node.has_key('width'):
                 atts['width'] = node['width']
             if node.has_key('height'):
                 atts['height'] = node['height']
+            if node.has_key('alt'):
+                atts['alt'] = node['alt']
             if node.has_key('align'):
                 self.body.append('<div align="%s" class="align-%s">' %
                                  (node['align'], node['align']))
                 self.context.append('</div>\n')
             else:
                 self.context.append('')
-            embatts = atts.copy()
-            embatts['src'] = embatts.pop('data')
-            self.body.append(self.starttag(node, 'object', '', **atts))
-            self.body.append(self.emptytag(node, 'embed', '', **embatts))
-            self.body.append('</object>\n')
+            self.body.append(self.emptytag(node, 'img', '', **atts))
             return
 
         if node.has_key('scale'):

From 6d508e63dd21ed668d84c0a134925d15b6abf3aa Mon Sep 17 00:00:00 2001
From: Benoit Allard <benoit@aeteurope.nl>
Date: Wed, 24 Aug 2011 17:43:20 +0200
Subject: [PATCH 046/226] graphviz: Remove unused function get_svg_tag

---
 sphinx/ext/graphviz.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py
index 6c36f31b3..36932c170 100644
--- a/sphinx/ext/graphviz.py
+++ b/sphinx/ext/graphviz.py
@@ -186,11 +186,6 @@ def render_dot(self, code, options, format, prefix='graphviz'):
     return relfn, outfn
 
 
-def get_svg_tag(svgref, imgcls=None):
-    return '<img src="%s"%s />\n' % \
-           (svgref, imgcss)
-
-
 def render_dot_html(self, node, code, options, prefix='graphviz',
                     imgcls=None, alt=None):
     format = self.builder.config.graphviz_output_format

From f1ba8a4fcc87d9bd4f354ec3552204c4e23c2fd4 Mon Sep 17 00:00:00 2001
From: aohta <devnull@localhost>
Date: Sat, 27 Aug 2011 17:53:19 +0900
Subject: [PATCH 047/226] fix japanese translation.

---
 sphinx/locale/ja/LC_MESSAGES/sphinx.mo | Bin 10112 -> 10904 bytes
 sphinx/locale/ja/LC_MESSAGES/sphinx.po |   9 +++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sphinx/locale/ja/LC_MESSAGES/sphinx.mo b/sphinx/locale/ja/LC_MESSAGES/sphinx.mo
index 09535b7a4bc500240c13696b376f7981bb31eb72..6a1065fdc87db67a27ade0455dcb4e213af54b63 100644
GIT binary patch
delta 3703
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
bR4;$OdfCb9;={L2?5HkYUs2Wa-SGbaje%7G

delta 2903
zcmYM!4@}f$9LMoT6c7|bBvcUm`3DKw*`cCA{^d`KLZncUwd~XzUD2I!cRAF&YC4Hk
zlsA@3=dv;@SN>~Sjzvz}Tx6|MThlC^A?Dmf&8^JU`{O+;cHHav|9zhC^ZVV#2cEBu
zoK7FmVfcHG|B?Jx$E)`L-|A#z22*_wQ?Ly+WFwBjEtrG{t=+c&I1ZuxBxc|xyba?9
z#nwwl){B@?6!;hyUm8$?saS<tpux63iQ2$Q9Ez=&iJLJE_oC(<MhAaD&A*0xOaiCS
zM$=LAMq(QA%_IuLXsEyu_$VsCvzUc#I2^YjAM-h1>hDI4{{^SupEwHL>~b>Rk8WIt
z*|-mH$L~=a>6OGcS11g`zi|e}a}3ohkS0@uiTDU=fu*PbEw=w-R0cXx8$ODf--|kF
zA1dHL(p!t^n1D+#!nGJ51?@0|Q}H#_9UnpFnr~1G{EVibG3QYW_Yzeb{0Ehh6!IO1
zqfzy7H~{ZP&7Y21cMj?xHABe%trO9p2`xApUqQv%iDcDu+4|S0yF6vvdr=4Y1Nm^Y
zSUnvTI0v=CF{q5VQSnMp^J>${zn=O<G$?f|unae#PJSH6;W^X>llanxa!@HOL|si0
zYGWm~UTOPlP)~oo?f0S94Wlx?HbOyn_ZDi0yR8RM3m!t9>|0a{&!7Td#Qt~%b<*p$
z{|0J9@kAYuDX8(2QSJAj;*=vF6RGAqhk^$cAc6|`5^4jRP<OT+b@Go;89RUq{3B}K
zDdb~%_|n^Q!?tITZw1UnT}8gN7+E)B$|-1PRj4171+fkjLhXE|^#yAyYJ59t18<-<
zw%PW7fC{(^mFmxI{Rk@4-`V!Fn63A}kAfby6dq|Un1c#D2K9ay*m^lCBlA!veh_t{
z$5HeAsK7yN;VoH>ntz=i7mZINEy`pT>Yxs0=>0EO0UPXqr%_iBwC(FqJAV_oUb6$W
za2FE8{ABwtBWE%F=;V1d!%z=dA<|{;Mg7n%wyr>3w`r%Kr~h3nz%D!B0;<0sol0dU
zYUg=Kmzj&Ba0%w&i>PPgebl%wQR8}12Z&=gst?6NbSeK+C^XQZh1yZ|omhrFsNaJE
zRvm})QCG9vx&oE*HTW2=M?DKYs1sjBrG79^I7O3*`h}f@I#_cK`6q^1PlG1DgL)Qr
zp(cJ|{R+d>kD)d&FE{1_)WQuoAH%452T>d7MvXs*ex8YowttZmi?=L7K?9#b4QxZ*
z;p?b{wxim2TR%nJc^B%APoSQO3&`5$CMshi`O-QwknEd!RGfgd)%HiWQqT$Z+lFJP
zz`vscTtjUjkqdP&6_u&GP**Yy-RQx&xB(UTr0wrRWjJ$eY`ux7^(v8dBBq*xQvNV1
zu+I(%qISO0_IIEHZ?o-tP<MC~wcuIn1ysPxwmz6$YW<<8abr>I6yB<H|5I(p3~MFM
zWI#14z{{wIY%A*h{}7exeVC8OQ5(OB%2*<=0!5RBYM+V9NEK?{V%xq(?Zh{&6ttr)
zn1(x0JMBa*a0s>VQR}a^|0?Qae_4~q$JWV0jnB9BQq;IP)`u{GdLu>@*iS(dR-ppE
zYU>*@f%*>AxIL&7bfHpw8gFd?H7}WTBwz-rKO2>?sn&ArPrVkEk-B`QYXKh(n%I&b
zJ&}?d@7&?@JJAW*dC}pinQ?i+y@jcV2aR3mT^?u-xoU!qzGbemaAVL_A1HMyYi3tf
z&zfCPv9PkPE_!K1+4N#pQL!_zsB~iSo$eC1JGt5u47uu?J^o;mClqKdb>;`cPk4P!
zT{sj7JJX&Dgl8>n@_L$GO9RWi(LmOw5p%qLZ?h-lB}_}HQ|4LXZF1ZbN+wK+CS{NR
eZ+8o{vsKym#V4KL-+um+w}0#G*n7s=pY$)l5i3>z

diff --git a/sphinx/locale/ja/LC_MESSAGES/sphinx.po b/sphinx/locale/ja/LC_MESSAGES/sphinx.po
index 9d5488ec8..6069002ad 100644
--- a/sphinx/locale/ja/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/ja/LC_MESSAGES/sphinx.po
@@ -2,14 +2,15 @@
 # Copyright (C) 2008 ORGANIZATION
 # This file is distributed under the same license as the Sphinx project.
 # Yasushi Masuda <whosaysni@gmail.com>, 2008.
-# Kouhei Sutou <kou@clear-code.com, 2011.
+# Kouhei Sutou <kou@clear-code.com>, 2011.
+# Akitoshi Ohta <fire.kuma8@gmail.com>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 1.1pre\n"
 "POT-Creation-Date: 2008-09-11 23:58+0200\n"
-"PO-Revision-Date: 2011-05-15 21:25+0900\n"
-"Last-Translator: Kouhei Sutou <kou@clear-code.com>\n"
+"PO-Revision-Date: 2011-08-27 17:50+0900\n"
+"Last-Translator: Akitoshi Ohta <fire.kuma8@gmail.com>\n"
 "Language-Team: Japanese\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
@@ -753,7 +754,7 @@ msgstr "前のページからの続き"
 
 #: sphinx/writers/latex.py:677
 msgid "Continued on next page"
-msgstr "総索引"
+msgstr "次のページに続く"
 
 #: sphinx/writers/text.py:430
 msgid "[image]"

From 654034c9763bc331362f39dcfc0953a1f6663080 Mon Sep 17 00:00:00 2001
From: Joel Wurtz <joel.wurtz@gmail.com>
Date: Wed, 31 Aug 2011 16:08:49 +0000
Subject: [PATCH 048/226] Add multirow / multicol support for latex

---
 sphinx/writers/latex.py | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index ccd7a8bf2..b534ce534 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -40,6 +40,7 @@ HEADER = r'''%% Generated by Sphinx.
 %(fncychap)s
 %(longtable)s
 \usepackage{sphinx}
+\usepackage{multirow}
 %(preamble)s
 
 \title{%(title)s}
@@ -251,6 +252,9 @@ class LaTeXTranslator(nodes.NodeVisitor):
         self.no_contractions = 0
         self.compact_list = 0
         self.first_param = 0
+        self.previous_spanning_row = 0
+        self.previous_spanning_column = 0
+        self.remember_multirow = {}
 
     def astext(self):
         return (HEADER % self.elements +
@@ -715,22 +719,41 @@ class LaTeXTranslator(nodes.NodeVisitor):
     def visit_row(self, node):
         self.table.col = 0
     def depart_row(self, node):
-        self.body.append('\\\\\\hline\n')
+        if self.previous_spanning_row == 1:
+            self.previous_spanning_row = 0
+            self.body.append('\\\\\n')
+        else:
+            self.body.append('\\\\\\hline\n')
         self.table.rowcount += 1
 
     def visit_entry(self, node):
-        if 'morerows' in node or 'morecols' in node:
-            raise UnsupportedError('%s:%s: column or row spanning cells are '
-                                   'not yet implemented.' %
-                                   (self.curfilestack[-1], node.line or ''))
+        if self.remember_multirow.has_key('0') and self.remember_multirow['0'] > 1:
+            self.body.append(' & ')
         if self.table.col > 0:
             self.body.append(' & ')
         self.table.col += 1
+        self.context.append('')
+        if 'morerows' in node:
+            self.body.append(' \multirow{')
+            self.previous_spanning_row = 1
+            self.body.append(str(node.get('morerows') + 1))
+            self.body.append('}{*}{')
+            self.context.append('}')
+            self.remember_multirow[str(self.table.col)] = node.get('morerows') + 1;
+        if 'morecols' in node:
+            self.body.append(' \multicolumn{')
+            self.body.append(str(node.get('morecols') + 1))
+            if self.table.col == 1:
+                self.body.append('}{|l|}{')
+            else:
+                self.body.append('}{l|}{')
+            self.context.append('}')
         if isinstance(node.parent.parent, nodes.thead):
             self.body.append('\\textbf{')
             self.context.append('}')
-        else:
-            self.context.append('')
+        if self.remember_multirow.has_key(str(self.table.col + 1)) and self.remember_multirow[str(self.table.col + 1)] > 1:
+            self.remember_multirow[str(self.table.col + 1)] -= 1
+            self.context.append(' & ')
     def depart_entry(self, node):
         self.body.append(self.context.pop()) # header
 

From ade940d1f6f560d8923a9e88bedb063df92c2727 Mon Sep 17 00:00:00 2001
From: Lucas Taylor <ltaylor.volks@gmail.com>
Date: Sat, 3 Sep 2011 12:41:26 -0700
Subject: [PATCH 049/226] [intersphinx] [Fixes #622] env.warn called with
 incorrect number of arguments

---
 sphinx/ext/intersphinx.py |  2 +-
 tests/test_intersphinx.py | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py
index 709428a35..9bfd53fd5 100644
--- a/sphinx/ext/intersphinx.py
+++ b/sphinx/ext/intersphinx.py
@@ -158,7 +158,7 @@ def load_mappings(app):
             # new format
             name, (uri, inv) = key, value
             if not name.isalnum():
-                env.warn('intersphinx identifier %r is not alphanumeric' % name)
+                env.warn(docname=None, msg='intersphinx identifier %r is not alphanumeric' % name)
         else:
             # old format, no name
             name, uri, inv = None, key, value
diff --git a/tests/test_intersphinx.py b/tests/test_intersphinx.py
index 839a3e3d2..563750f6d 100644
--- a/tests/test_intersphinx.py
+++ b/tests/test_intersphinx.py
@@ -152,3 +152,27 @@ def test_missing_reference(tempdir, app):
     rn = missing_reference(app, app.env, node, contnode)
     assert rn is None
     assert contnode[0].astext() == 'py3k:unknown'
+
+
+@with_app(confoverrides={'extensions': 'sphinx.ext.intersphinx'})
+@with_tempdir
+def test_load_mappings_warnings(tempdir, app):
+    """
+    load_mappings issues a warning if new-style mapping
+    identifiers are not alphanumeric
+    """
+    inv_file = tempdir / 'inventory'
+    write_file(inv_file, inventory_v2)
+    app.config.intersphinx_mapping = {
+        'http://docs.python.org/': inv_file,
+        'py3k': ('http://docs.python.org/py3k/', inv_file),
+        'repoze.workflow': ('http://docs.repoze.org/workflow/', inv_file),
+        'django-taggit': ('http://django-taggit.readthedocs.org/en/latest/', inv_file)
+    }
+
+    app.config.intersphinx_cache_limit = 0
+    # load the inventory and check if it's done correctly
+    load_mappings(app)
+    assert len(app._warning.content) == 2
+
+

From 0dd3aa123d1cd150922cdc4f2112ca71b4e7c775 Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Fri, 16 Sep 2011 08:25:00 +0200
Subject: [PATCH 050/226] Closes #762: Update html2rest source location.

---
 doc/intro.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/intro.rst b/doc/intro.rst
index 0e6e5247a..5562f39b3 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -24,8 +24,7 @@ This section is intended to collect helpful hints for those wanting to migrate
 to reStructuredText/Sphinx from other documentation systems.
 
 * Gerard Flanagan has written a script to convert pure HTML to reST; it can be
-  found at `BitBucket
-  <https://bitbucket.org/djerdo/musette/src/tip/musette/html/html2rest.py>`_.
+  found at the `Python Package Index <http://pypi.python.org/pypi/html2rest>`_.
 
 * For converting the old Python docs to Sphinx, a converter was written which
   can be found at `the Python SVN repository

From 793042713c442cc2b9e7895d8ec758a7c31abcc2 Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Fri, 16 Sep 2011 13:34:17 +0200
Subject: [PATCH 051/226] Closes #760: Escape project name in man/texinfo
 configuration.

---
 sphinx/quickstart.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index 876e71821..ad7b3ce5c 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -253,7 +253,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('%(master_str)s', '%(project_manpage)s', u'%(project_doc)s',
+    ('%(master_str)s', '%(project_manpage)s', u'%(project_doc_str)s',
      [u'%(author_str)s'], 1)
 ]
 
@@ -267,7 +267,7 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('%(master_str)s', '%(project_fn)s', u'%(project_doc)s', u'%(author_str)s',
+  ('%(master_str)s', '%(project_fn)s', u'%(project_doc_str)s', u'%(author_str)s',
    '%(project_fn)s', 'One line description of project.', 'Miscellaneous'),
 ]
 
@@ -932,8 +932,9 @@ directly.'''
 
     # escape backslashes and single quotes in strings that are put into
     # a Python string literal
-    for key in ('project', 'copyright', 'author', 'author_texescaped',
-                'project_doc_texescaped', 'version', 'release', 'master'):
+    for key in ('project', 'project_doc', 'project_doc_texescaped',
+                'author', 'author_texescaped', 'copyright',
+                'version', 'release', 'master'):
         d[key + '_str'] = d[key].replace('\\', '\\\\').replace("'", "\\'")
 
     if not path.isdir(d['path']):

From 1d59011ce6277d4c875f087f6d9d2288edb10d84 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 17 Sep 2011 20:53:44 +0200
Subject: [PATCH 052/226] Add attribution for 9b4e41bba142.

---
 AUTHORS | 1 +
 CHANGES | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index acee46279..a24d6a545 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -40,6 +40,7 @@ Other contributors, listed alphabetically, are:
 * John Waltman -- Texinfo builder
 * Barry Warsaw -- setup command improvements
 * Sebastian Wiesner -- image handling, distutils support
+* Joel Wurtz -- cellspanning support in LaTeX
 
 Many thanks for all contributions!
 
diff --git a/CHANGES b/CHANGES
index c3a4a083f..fd5ae44f8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -59,6 +59,7 @@ Features added
     requests and allow configuring the timeout.  New config values:
     :confval:`linkcheck_timeout` and :confval:`linkcheck_workers`.
   - #521: Added :confval:`linkcheck_ignore` config value.
+  - #28: Support row/colspans in tables in the LaTeX builder.
 
 * Configuration and extensibility:
 

From 896b575cdc3a4a6ace6004338d69e53b5311738f Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 17 Sep 2011 21:05:12 +0200
Subject: [PATCH 053/226] Code style fixes.

---
 sphinx/writers/latex.py |  8 ++++----
 tests/root/markup.txt   | 10 ++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index b534ce534..d9f1fad92 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -727,7 +727,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
         self.table.rowcount += 1
 
     def visit_entry(self, node):
-        if self.remember_multirow.has_key('0') and self.remember_multirow['0'] > 1:
+        if self.remember_multirow.get(0, 0) > 1:
             self.body.append(' & ')
         if self.table.col > 0:
             self.body.append(' & ')
@@ -739,7 +739,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
             self.body.append(str(node.get('morerows') + 1))
             self.body.append('}{*}{')
             self.context.append('}')
-            self.remember_multirow[str(self.table.col)] = node.get('morerows') + 1;
+            self.remember_multirow[self.table.col] = node.get('morerows') + 1
         if 'morecols' in node:
             self.body.append(' \multicolumn{')
             self.body.append(str(node.get('morecols') + 1))
@@ -751,8 +751,8 @@ class LaTeXTranslator(nodes.NodeVisitor):
         if isinstance(node.parent.parent, nodes.thead):
             self.body.append('\\textbf{')
             self.context.append('}')
-        if self.remember_multirow.has_key(str(self.table.col + 1)) and self.remember_multirow[str(self.table.col + 1)] > 1:
-            self.remember_multirow[str(self.table.col + 1)] -= 1
+        if self.remember_multirow.get(self.table.col + 1, 0) > 1:
+            self.remember_multirow[self.table.col + 1] -= 1
             self.context.append(' & ')
     def depart_entry(self, node):
         self.body.append(self.context.pop()) # header
diff --git a/tests/root/markup.txt b/tests/root/markup.txt
index 71197689a..60ee4853c 100644
--- a/tests/root/markup.txt
+++ b/tests/root/markup.txt
@@ -169,6 +169,16 @@ Tables
    | 2  | Empty cells:   |    |
    +----+----------------+----+
 
+Table with multicol:
+
+   +----+---------------------+
+   | 1  | test!               |
+   +----+---------+------+----+
+   | 2  | col     | col  | c  |
+   | y  +---------+------+----+
+   | x  | test                |
+   +----+---------------------+
+
 
 Figures
 -------

From b07bf400a745d0460d16fed72e3ede28f1fcf305 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 19 Sep 2011 08:31:37 +0200
Subject: [PATCH 054/226] Fix #635: add missing "next" method to idgen() on
 Python 3.

---
 sphinx/jinja2glue.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sphinx/jinja2glue.py b/sphinx/jinja2glue.py
index 629bce30f..ffe3a0b3f 100644
--- a/sphinx/jinja2glue.py
+++ b/sphinx/jinja2glue.py
@@ -46,9 +46,10 @@ class idgen(object):
         self.id = 0
     def current(self):
         return self.id
-    def next(self):
+    def __next__(self):
         self.id += 1
         return self.id
+    next = __next__  # Python 2/Jinja compatibility
 
 
 class SphinxFileSystemLoader(FileSystemLoader):

From 7fc85139808999780b7db35f569ef1e32022a9f6 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 19 Sep 2011 08:36:20 +0200
Subject: [PATCH 055/226] Remove unused imports.

---
 sphinx/pycode/__init__.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sphinx/pycode/__init__.py b/sphinx/pycode/__init__.py
index bf51e7408..ab87e61d6 100644
--- a/sphinx/pycode/__init__.py
+++ b/sphinx/pycode/__init__.py
@@ -9,8 +9,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-import re
-import sys
 from os import path
 from cStringIO import StringIO
 

From 28609cc9b9aa414352b0c17b9016654e953d9d83 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 19 Sep 2011 09:02:00 +0200
Subject: [PATCH 056/226] Only test spanning cells for latex.

---
 tests/root/markup.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/root/markup.txt b/tests/root/markup.txt
index 60ee4853c..dde13a6b5 100644
--- a/tests/root/markup.txt
+++ b/tests/root/markup.txt
@@ -171,6 +171,8 @@ Tables
 
 Table with multicol:
 
+.. only:: latex
+
    +----+---------------------+
    | 1  | test!               |
    +----+---------+------+----+

From 7fa67682ac301fc5a6a33bb624ec6409f32cf348 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 19 Sep 2011 09:03:07 +0200
Subject: [PATCH 057/226] Fix #705: read module source in ModuleAnalyzer in
 binary mode, decode afterwards.

---
 sphinx/pycode/__init__.py | 23 +++++++++++++++--------
 sphinx/util/pycompat.py   |  6 ++++++
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/sphinx/pycode/__init__.py b/sphinx/pycode/__init__.py
index ab87e61d6..ac8407501 100644
--- a/sphinx/pycode/__init__.py
+++ b/sphinx/pycode/__init__.py
@@ -10,13 +10,12 @@
 """
 
 from os import path
-from cStringIO import StringIO
 
 from sphinx.errors import PycodeError
 from sphinx.pycode import nodes
 from sphinx.pycode.pgen2 import driver, token, tokenize, parse, literals
 from sphinx.util import get_module_source, detect_encoding
-from sphinx.util.pycompat import next
+from sphinx.util.pycompat import next, StringIO, BytesIO, TextIOWrapper
 from sphinx.util.docstrings import prepare_docstring, prepare_commentdoc
 
 
@@ -170,14 +169,16 @@ class ModuleAnalyzer(object):
 
     @classmethod
     def for_string(cls, string, modname, srcname='<string>'):
-        return cls(StringIO(string), modname, srcname)
+        if isinstance(string, bytes):
+            return cls(BytesIO(string), modname, srcname)
+        return cls(StringIO(string), modname, srcname, decoded=True)
 
     @classmethod
     def for_file(cls, filename, modname):
         if ('file', filename) in cls.cache:
             return cls.cache['file', filename]
         try:
-            fileobj = open(filename, 'r')
+            fileobj = open(filename, 'rb')
         except Exception, err:
             raise PycodeError('error opening %r' % filename, err)
         obj = cls(fileobj, modname, filename)
@@ -204,7 +205,7 @@ class ModuleAnalyzer(object):
         cls.cache['module', modname] = obj
         return obj
 
-    def __init__(self, source, modname, srcname):
+    def __init__(self, source, modname, srcname, decoded=False):
         # name of the module
         self.modname = modname
         # name of the source file
@@ -214,9 +215,15 @@ class ModuleAnalyzer(object):
 
         # cache the source code as well
         pos = self.source.tell()
-        self.encoding = detect_encoding(self.source.readline)
-        self.code = self.source.read()
-        self.source.seek(pos)
+        if not decoded:
+            self.encoding = detect_encoding(self.source.readline)
+            self.code = self.source.read().decode(self.encoding)
+            self.source.seek(pos)
+            self.source = TextIOWrapper(self.source, self.encoding)
+        else:
+            self.encoding = None
+            self.code = self.source.read()
+            self.source.seek(pos)
 
         # will be filled by tokenize()
         self.tokens = None
diff --git a/sphinx/util/pycompat.py b/sphinx/util/pycompat.py
index a95c9332c..375f69207 100644
--- a/sphinx/util/pycompat.py
+++ b/sphinx/util/pycompat.py
@@ -25,6 +25,8 @@ if sys.version_info >= (3, 0):
     bytes = bytes
     # prefix for Unicode strings
     u = ''
+    # StringIO/BytesIO classes
+    from io import StringIO, BytesIO, TextIOWrapper
     # support for running 2to3 over config files
     def convert_with_2to3(filepath):
         from lib2to3.refactor import RefactoringTool, get_fixers_from_package
@@ -48,8 +50,12 @@ else:
     b = str
     bytes = str
     u = 'u'
+    from StringIO import StringIO
+    BytesIO = StringIO
     # no need to refactor on 2.x versions
     convert_with_2to3 = None
+    def TextIOWrapper(stream, encoding):
+        return codecs.lookup(encoding or 'ascii')[2](stream)
 
 
 # ------------------------------------------------------------------------------

From 7cc2b0e46ba2bf4073006e2f1e2c8bf7f8832cea Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 19 Sep 2011 09:19:35 +0200
Subject: [PATCH 058/226] Adapt test to removal of <object> tags for SVG
 images.

---
 tests/test_build_html.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/test_build_html.py b/tests/test_build_html.py
index f544403de..6adcc8132 100644
--- a/tests/test_build_html.py
+++ b/tests/test_build_html.py
@@ -74,8 +74,7 @@ HTML_XPATH = {
         (".//img[@src='_images/img.png']", ''),
         (".//img[@src='_images/img1.png']", ''),
         (".//img[@src='_images/simg.png']", ''),
-        (".//object[@data='_images/svgimg.svg']", ''),
-        (".//embed[@src='_images/svgimg.svg']", ''),
+        (".//img[@src='_images/svgimg.svg']", ''),
     ],
     'subdir/images.html': [
         (".//img[@src='../_images/img1.png']", ''),

From ffa14ec4482bce79da308cb1ba36ce5564111664 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 19 Sep 2011 09:21:48 +0200
Subject: [PATCH 059/226] Fix dupicate autodocumentation leading to test
 failures.

---
 tests/root/autosummary.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/root/autosummary.txt b/tests/root/autosummary.txt
index 82cec7fd0..fc1a35a0e 100644
--- a/tests/root/autosummary.txt
+++ b/tests/root/autosummary.txt
@@ -4,7 +4,7 @@ Autosummary test
 .. autosummary::
    :toctree: generated
 
-   sphinx.application.TemplateBridge
+   sphinx.application.Sphinx
 
 .. currentmodule:: sphinx.application
 

From 19adf65faaab277ca469b6e7c95117bb3b74359f Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 09:09:50 +0200
Subject: [PATCH 060/226] Skip all websupport tests for now.

---
 tests/test_websupport.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/test_websupport.py b/tests/test_websupport.py
index 9cf64338a..87cc6ad4f 100644
--- a/tests/test_websupport.py
+++ b/tests/test_websupport.py
@@ -26,7 +26,7 @@ from sphinx.websupport.storage import StorageBackend
 from sphinx.websupport.storage.differ import CombinedHtmlDiff
 try:
     from sphinx.websupport.storage.sqlalchemystorage import Session, \
-         SQLAlchemyStorage, Comment, CommentVote
+         Comment, CommentVote
     from sphinx.websupport.storage.sqlalchemy_db import Node
     sqlalchemy_missing = False
 except ImportError:
@@ -35,6 +35,8 @@ except ImportError:
 from util import *
 
 
+raise SkipTest('websupport tests are currently not working')
+
 default_settings = {'builddir': os.path.join(test_root, 'websupport'),
                     'status': StringIO(),
                     'warning': StringIO()}

From 6479b74f4593b66d7672bb19a755cdbd54b1e4af Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 09:09:57 +0200
Subject: [PATCH 061/226] Always use longtables for autosummary.

---
 sphinx/ext/autosummary/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx/ext/autosummary/__init__.py b/sphinx/ext/autosummary/__init__.py
index 32dcc3e4f..0f5c2640d 100644
--- a/sphinx/ext/autosummary/__init__.py
+++ b/sphinx/ext/autosummary/__init__.py
@@ -296,10 +296,10 @@ class Autosummary(Directive):
         *items* is a list produced by :meth:`get_items`.
         """
         table_spec = addnodes.tabular_col_spec()
-        table_spec['spec'] = 'LL'
+        table_spec['spec'] = 'll'
 
         table = autosummary_table('')
-        real_table = nodes.table('')
+        real_table = nodes.table('', classes=['longtable'])
         table.append(real_table)
         group = nodes.tgroup('', cols=2)
         real_table.append(group)

From 4ec745d0b2c6fe1e9520c378829b74e7b14974ed Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 09:12:14 +0200
Subject: [PATCH 062/226] Fix syntax.

---
 sphinx/ext/graphviz.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py
index 36932c170..0519241a4 100644
--- a/sphinx/ext/graphviz.py
+++ b/sphinx/ext/graphviz.py
@@ -193,7 +193,7 @@ def render_dot_html(self, node, code, options, prefix='graphviz',
         if format not in ('png', 'svg'):
             raise GraphvizError("graphviz_output_format must be one of 'png', "
                                 "'svg', but is %r" % format)
-        fname, outfn = render_dot(self, code, options, format, prefix)g
+        fname, outfn = render_dot(self, code, options, format, prefix)
     except GraphvizError, exc:
         self.builder.warn('dot code %r: ' % code + str(exc))
         raise nodes.SkipNode

From 9d5215c1c942470f924074ae52cc4cd3d0b93740 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 09:15:11 +0200
Subject: [PATCH 063/226] Fix #728: escape root dir when putting it into a
 regex in latex/texinfo tests.

---
 tests/test_build_latex.py   | 2 +-
 tests/test_build_texinfo.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py
index 68a8c07c6..4e1e9f70c 100644
--- a/tests/test_build_latex.py
+++ b/tests/test_build_latex.py
@@ -42,7 +42,7 @@ def test_latex(app):
     LaTeXTranslator.ignore_missing_images = True
     app.builder.build_all()
     latex_warnings = latex_warnfile.getvalue().replace(os.sep, '/')
-    latex_warnings_exp = LATEX_WARNINGS % {'root': app.srcdir}
+    latex_warnings_exp = LATEX_WARNINGS % {'root': re.escape(app.srcdir)}
     assert re.match(latex_warnings_exp + '$', latex_warnings), \
            'Warnings don\'t match:\n' + \
            '--- Expected (regex):\n' + latex_warnings_exp + \
diff --git a/tests/test_build_texinfo.py b/tests/test_build_texinfo.py
index eedfd1fc7..c626c976b 100644
--- a/tests/test_build_texinfo.py
+++ b/tests/test_build_texinfo.py
@@ -41,7 +41,7 @@ def test_texinfo(app):
     TexinfoTranslator.ignore_missing_images = True
     app.builder.build_all()
     texinfo_warnings = texinfo_warnfile.getvalue().replace(os.sep, '/')
-    texinfo_warnings_exp = TEXINFO_WARNINGS % {'root': app.srcdir}
+    texinfo_warnings_exp = TEXINFO_WARNINGS % {'root': re.escape(app.srcdir)}
     assert re.match(texinfo_warnings_exp + '$', texinfo_warnings), \
            'Warnings don\'t match:\n' + \
            '--- Expected (regex):\n' + texinfo_warnings_exp + \

From 44f396488c318b1b686d928e516b35be12b052d6 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 09:19:20 +0200
Subject: [PATCH 064/226] Fix #718: "pass" is not a good way to exit a
 function.

---
 sphinx/ext/autodoc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index 55ac820d1..f193947d5 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -912,7 +912,7 @@ class FunctionDocumenter(DocstringSignatureMixin, ModuleLevelDocumenter):
         if inspect.isbuiltin(self.object) or \
                inspect.ismethoddescriptor(self.object):
             # cannot introspect arguments of a C function or method
-            pass
+            return None
         try:
             argspec = getargspec(self.object)
         except TypeError:

From 4718e50f4bd2788cb989b4ece8ebbe444e4eaf88 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 09:25:37 +0200
Subject: [PATCH 065/226] Fix #714: Add Korean locale, thanks to Channy Yun.

---
 CHANGES                                |   1 +
 doc/config.rst                         |   1 +
 sphinx/locale/ko/LC_MESSAGES/sphinx.js |   1 +
 sphinx/locale/ko/LC_MESSAGES/sphinx.mo | Bin 0 -> 9307 bytes
 sphinx/locale/ko/LC_MESSAGES/sphinx.po | 781 +++++++++++++++++++++++++
 5 files changed, 784 insertions(+)
 create mode 100644 sphinx/locale/ko/LC_MESSAGES/sphinx.js
 create mode 100644 sphinx/locale/ko/LC_MESSAGES/sphinx.mo
 create mode 100644 sphinx/locale/ko/LC_MESSAGES/sphinx.po

diff --git a/CHANGES b/CHANGES
index fd5ae44f8..99872dcd7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -103,6 +103,7 @@ Features added
   - #526: Added Iranian locale.
   - #694: Added Latvian locale.
   - Added Nepali locale.
+  - #714: Added Korean locale.
 
 
 Release 1.0.8 (in development)
diff --git a/doc/config.rst b/doc/config.rst
index 5db7c74be..eabab84a1 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -378,6 +378,7 @@ documentation on :ref:`intl` for details.
    * ``hr`` -- Croatian
    * ``it`` -- Italian
    * ``ja`` -- Japanese
+   * ``ko`` -- Korean
    * ``lt`` -- Lithuanian
    * ``lv`` -- Latvian
    * ``ne`` -- Nepali
diff --git a/sphinx/locale/ko/LC_MESSAGES/sphinx.js b/sphinx/locale/ko/LC_MESSAGES/sphinx.js
new file mode 100644
index 000000000..76fe76e34
--- /dev/null
+++ b/sphinx/locale/ko/LC_MESSAGES/sphinx.js
@@ -0,0 +1 @@
+Documentation.addTranslations({"locale": "ko", "plural_expr": "0", "messages": {}});
\ No newline at end of file
diff --git a/sphinx/locale/ko/LC_MESSAGES/sphinx.mo b/sphinx/locale/ko/LC_MESSAGES/sphinx.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d5f184d9150441fe314db32e6a610dcbd01654bc
GIT binary patch
literal 9307
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

literal 0
HcmV?d00001

diff --git a/sphinx/locale/ko/LC_MESSAGES/sphinx.po b/sphinx/locale/ko/LC_MESSAGES/sphinx.po
new file mode 100644
index 000000000..6e7ae10ff
--- /dev/null
+++ b/sphinx/locale/ko/LC_MESSAGES/sphinx.po
@@ -0,0 +1,781 @@
+# Koreantranslations for Sphinx.
+# Copyright (C) 2008 ORGANIZATION
+# This file is distributed under the same license as the Sphinx project.
+# Channy Yun <channy@mozilla.or.kr>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Sphinx 1.1pre\n"
+"POT-Creation-Date: 2008-09-11 23:58+0200\n"
+"PO-Revision-Date: 2011-06-09 21:25+0900\n"
+"Last-Translator: Channy Yun <channy@mozilla.or.kr>\n"
+"Language-Team: Korean\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: sphinx/environment.py: 120 sphinx/writers/latex.py: 189
+#: sphinx/writers/manpage.py: 67
+#, python-format
+msgid "%B %d, %Y"
+msgstr "%Y년 %m월 %d일"
+
+#: sphinx/environment.py: 1624
+#, python-format
+msgid "see %s"
+msgstr "%s 문서"
+
+#: sphinx/environment.py: 1627
+#, python-format
+msgid "see also %s"
+msgstr "%s 참조"
+
+#: sphinx/roles.py: 175
+#, python-format
+msgid "Python Enhancement Proposals; PEP %s"
+msgstr "Python Enhancement Proposals; PEP %s"
+
+#: sphinx/builders/changes.py: 73
+msgid "Builtins"
+msgstr "기본"
+
+#: sphinx/builders/changes.py: 75
+msgid "Module level"
+msgstr "모듈 수준"
+
+#: sphinx/builders/html.py: 274
+#, python-format
+msgid "%b %d, %Y"
+msgstr "%Y년 %m월 %d일"
+
+#: sphinx/builders/html.py: 293 sphinx/themes/basic/defindex.html: 30
+msgid "General Index"
+msgstr "전체 색인"
+
+#: sphinx/builders/html.py: 293
+msgid "index"
+msgstr "색인"
+
+#: sphinx/builders/html.py: 353
+msgid "next"
+msgstr "다음"
+
+#: sphinx/builders/html.py: 362
+msgid "previous"
+msgstr "이전"
+
+#: sphinx/builders/latex.py: 141 sphinx/builders/texinfo.py: 208
+msgid "(in"
+msgstr "("
+
+#: sphinx/builders/texinfo.py: 151 sphinx/builders/texinfo.py: 152
+#: sphinx/builders/texinfo.py: 153 sphinx/domains/std.py: 427
+#: sphinx/themes/basic/genindex-single.html: 32
+#: sphinx/themes/basic/genindex-split.html: 11
+#: sphinx/themes/basic/genindex-split.html: 14
+#: sphinx/themes/basic/genindex.html: 32 sphinx/themes/basic/genindex.html: 35
+#: sphinx/themes/basic/genindex.html: 68 sphinx/themes/basic/layout.html: 134
+#: sphinx/writers/latex.py: 178
+msgid "Index"
+msgstr "색인"
+
+#: sphinx/directives/other.py: 136
+msgid "Section author:"
+msgstr "항목 저자:"
+
+#: sphinx/directives/other.py: 138
+msgid "Module author:"
+msgstr "모듈 개발자:"
+
+#: sphinx/directives/other.py: 140
+msgid "Code author:"
+msgstr "코드 개발자:"
+
+#: sphinx/directives/other.py: 142
+msgid "Author:"
+msgstr "저자:"
+
+#: sphinx/directives/other.py: 215
+msgid "See also"
+msgstr "더 보기"
+
+#: sphinx/domains/__init__.py: 244
+#, python-format
+msgid "%s %s"
+msgstr ""
+
+#: sphinx/domains/c.py: 51 sphinx/domains/python.py: 95
+msgid "Parameters"
+msgstr "매개 변수"
+
+#: sphinx/domains/c.py: 54 sphinx/domains/javascript.py: 128
+#: sphinx/domains/python.py: 107
+msgid "Returns"
+msgstr "반환"
+
+#: sphinx/domains/c.py: 56 sphinx/domains/python.py: 109
+msgid "Return type"
+msgstr "반환 형식"
+
+#: sphinx/domains/c.py: 141
+#, python-format
+msgid "%s (C function)"
+msgstr "%s (C 함수)"
+
+#: sphinx/domains/c.py: 143
+#, python-format
+msgid "%s (C member)"
+msgstr "%s (C 멤버 변수)"
+
+#: sphinx/domains/c.py: 145
+#, python-format
+msgid "%s (C macro)"
+msgstr "%s (C 매크로)"
+
+#: sphinx/domains/c.py: 147
+#, python-format
+msgid "%s (C type)"
+msgstr "%s (C 데이터 형식)"
+
+#: sphinx/domains/c.py: 149
+#, python-format
+msgid "%s (C variable)"
+msgstr "%s (C 변수)"
+
+#: sphinx/domains/c.py: 204 sphinx/domains/cpp.py: 1053
+#: sphinx/domains/javascript.py: 162 sphinx/domains/python.py: 558
+msgid "function"
+msgstr "함수"
+
+#: sphinx/domains/c.py: 205 sphinx/domains/cpp.py: 1054
+msgid "member"
+msgstr "멤버 변수"
+
+#: sphinx/domains/c.py: 206
+msgid "macro"
+msgstr "매크로"
+
+#: sphinx/domains/c.py: 207 sphinx/domains/cpp.py: 1055
+msgid "type"
+msgstr "데이터 형식"
+
+#: sphinx/domains/c.py: 208
+msgid "variable"
+msgstr "변수"
+
+#: sphinx/domains/cpp.py: 897
+#, python-format
+msgid "%s (C++ class)"
+msgstr "%s (C++ 클래스)"
+
+#: sphinx/domains/cpp.py: 912
+#, python-format
+msgid "%s (C++ type)"
+msgstr "%s (C++ 데이터 형식)"
+
+#: sphinx/domains/cpp.py: 931
+#, python-format
+msgid "%s (C++ member)"
+msgstr "%s (C++의 멤버 변수)"
+
+#: sphinx/domains/cpp.py: 983
+#, python-format
+msgid "%s (C++ function)"
+msgstr "%s (C++ 함수)"
+
+#: sphinx/domains/cpp.py: 1052 sphinx/domains/javascript.py: 163
+#: sphinx/domains/python.py: 560
+msgid "class"
+msgstr "클래스"
+
+#: sphinx/domains/javascript.py: 106 sphinx/domains/python.py: 254
+#, python-format
+msgid "%s() (built-in function)"
+msgstr "%s() 내장 함수)"
+
+#: sphinx/domains/javascript.py: 107 sphinx/domains/python.py: 318
+#, python-format
+msgid "%s() (%s method)"
+msgstr "%s() (%s 메서드)"
+
+#: sphinx/domains/javascript.py: 109
+#, python-format
+msgid "%s() (class)"
+msgstr "%s() (클래스)"
+
+#: sphinx/domains/javascript.py: 111
+#, python-format
+msgid "%s (global variable or constant)"
+msgstr "%s (전역 변수 또는 상수)"
+
+#: sphinx/domains/javascript.py: 113 sphinx/domains/python.py: 356
+#, python-format
+msgid "%s (%s attribute)"
+msgstr "%s (%s의 속성)"
+
+#: sphinx/domains/javascript.py: 122
+msgid "Arguments"
+msgstr "인수"
+
+#: sphinx/domains/javascript.py: 125
+msgid "Throws"
+msgstr "예외"
+
+#: sphinx/domains/javascript.py: 164 sphinx/domains/python.py: 559
+msgid "data"
+msgstr "데이터"
+
+#: sphinx/domains/javascript.py: 165 sphinx/domains/python.py: 565
+msgid "attribute"
+msgstr "속성"
+
+#: sphinx/domains/python.py: 100
+msgid "Variables"
+msgstr "변수"
+
+#: sphinx/domains/python.py: 104
+msgid "Raises"
+msgstr "예외"
+
+#: sphinx/domains/python.py: 255 sphinx/domains/python.py: 312
+#: sphinx/domains/python.py: 324 sphinx/domains/python.py: 337
+#, python-format
+msgid "%s() (in module %s)"
+msgstr "%s() (%s 모듈)"
+
+#: sphinx/domains/python.py: 258
+#, python-format
+msgid "%s (built-in variable)"
+msgstr "%s (내장 변수)"
+
+#: sphinx/domains/python.py 259 sphinx/domains/python.py: 350
+#, python-format
+msgid "%s (in module %s)"
+msgstr "%s (%s 모듈)"
+
+#: sphinx/domains/python.py: 275
+#, python-format
+msgid "%s (built-in class)"
+msgstr "%s (내장 변수)"
+
+#: sphinx/domains/python.py: 276
+#, python-format
+msgid "%s (class in %s)"
+msgstr "%s (%s 종류)"
+
+#: sphinx/domains/python.py: 316
+#, python-format
+msgid "%s() (%s. %s method)"
+msgstr "%s() (%s. %s 메서드)"
+
+#: sphinx/domains/python.py: 328
+#, python-format
+msgid "%s() (%s. %s static method)"
+msgstr "%s() (%s. %s의 정적 메서드)"
+
+#: sphinx/domains/python.py: 331
+#, python-format
+msgid "%s() (%s static method)"
+msgstr "%s() (%s의 정적 메서드)"
+
+#: sphinx/domains/python.py: 341
+#, python-format
+msgid "%s() (%s. %s class method)"
+msgstr "%s() (%s. %s 클래스 메서드)"
+
+#: sphinx/domains/python.py: 344
+#, python-format
+msgid "%s() (%s class method)"
+msgstr "%s() (%s 클래스 메서드)"
+
+#: sphinx/domains/python.py: 354
+#, python-format
+msgid "%s (%s. %s attribute)"
+msgstr "%s (%s. %s의 속성)"
+
+#: sphinx/domains/python.py: 433
+#, python-format
+msgid "%s (module)"
+msgstr "%s (모듈)"
+
+#: sphinx/domains/python.py: 490
+msgid "Python Module Index"
+msgstr "Python 모듈 목록"
+
+#: sphinx/domains/python.py: 491
+msgid "modules"
+msgstr "모듈"
+
+#: sphinx/domains/python.py: 536
+msgid "Deprecated"
+msgstr "폐지"
+
+#: sphinx/domains/python.py: 561 sphinx/locale/__init__.py: 179
+msgid "exception"
+msgstr "예외"
+
+#: sphinx/domains/python.py: 562
+msgid "method"
+msgstr "메소드"
+
+#: sphinx/domains/python.py: 563
+msgid "class method"
+msgstr "클래스 메소드"
+
+#: sphinx/domains/python.py: 564
+msgid "static method"
+msgstr "정적 메서드"
+
+#: sphinx/domains/python.py: 566 sphinx/locale/__init__.py: 175
+msgid "module"
+msgstr "모듈"
+
+#: sphinx/domains/python.py: 694
+msgid "(deprecated)"
+msgstr "(폐지)"
+
+#: sphinx/domains/rst.py: 55
+#, python-format
+msgid "%s (directive)"
+msgstr "%s (지시문)"
+
+#: sphinx/domains/rst.py: 57
+#, python-format
+msgid "%s (role)"
+msgstr "%s (역할)"
+
+#: sphinx/domains/rst.py: 106
+msgid "directive"
+msgstr "지시자"
+
+#: sphinx/domains/rst.py: 107
+msgid "role"
+msgstr "역할"
+
+#: sphinx/domains/std.py: 70 sphinx/domains/std.py: 86
+#, python-format
+msgid "environment variable; %s"
+msgstr "환경 변수; %s"
+
+#: sphinx/domains/std.py: 162
+#, python-format
+msgid "%scommand line option; %s"
+msgstr "%s 명령; %s"
+
+#: sphinx/domains/std.py: 393
+msgid "glossary term"
+msgstr "용어의 항목"
+
+#: sphinx/domains/std.py: 394
+msgid "grammar token"
+msgstr "문법 토큰"
+
+#: sphinx/domains/std.py: 395
+msgid "reference label"
+msgstr "참조 레이블"
+
+#: sphinx/domains/std.py: 396
+msgid "environment variable"
+msgstr "환경 변수"
+
+#: sphinx/domains/std.py: 397
+msgid "program option"
+msgstr "프로그램 옵션"
+
+#: sphinx/domains/std.py: 428
+msgid "Module Index"
+msgstr "모듈 목록"
+
+#: sphinx/domains/std.py: 429 sphinx/themes/basic/defindex.html: 25
+msgid "Search Page"
+msgstr "검색 페이지"
+
+#: sphinx/ext/autodoc.py: 998
+#, python-format
+msgid "Bases: %s"
+msgstr "기본 클래스: %s"
+
+#: sphinx/ext/autodoc.py: 1034
+#, python-format
+msgid "alias of: class:`%s`"
+msgstr ": class:`%s`의 별칭"
+
+#: sphinx/ext/todo.py: 41
+msgid "Todo"
+msgstr "과제"
+
+#: sphinx/ext/todo.py: 109
+#, python-format
+msgid "(The <<original entry>> is located in %s, line %d.)"
+msgstr "(<<원래 항목" "는 %s %d 번째)"
+
+#: sphinx/ext/todo.py: 117
+msgid "original entry"
+msgstr "원래 항목"
+
+#: sphinx/ext/viewcode.py: 70
+msgid "[source]"
+msgstr "[소스]"
+
+#: sphinx/ext/viewcode.py: 117
+msgid "[docs]"
+msgstr "[문서]"
+
+#: sphinx/ext/viewcode.py: 131
+msgid "Module code"
+msgstr "모듈 코드"
+
+#: sphinx/ext/viewcode.py: 137
+#, python-format
+msgid "<h1>Source code for %s</ h1>"
+msgstr "<h1>%s의 소스 코드</ h1>"
+
+#: sphinx/ext/viewcode.py: 164
+msgid "Overview: module code"
+msgstr "설명: 모듈 코드"
+
+#: sphinx/ext/viewcode.py: 165
+msgid "<h1>All modules for which code is available </ h1>"
+msgstr "<h1>코드가 제공되는 모든 모듈 </ h1>"
+
+#: sphinx/locale/__init__.py: 155
+msgid "Attention"
+msgstr "주의"
+
+#: sphinx/locale/__init__.py: 156
+msgid "Caution"
+msgstr "조심"
+
+#: sphinx/locale/__init__.py: 157
+msgid "Danger"
+msgstr "위험"
+
+#: sphinx/locale/__init__.py: 158
+msgid "Error"
+msgstr "오류"
+
+#: sphinx/locale/__init__.py: 159
+msgid "Hint"
+msgstr "힌트"
+
+#: sphinx/locale/__init__.py: 160
+msgid "Important"
+msgstr "중요"
+
+#: sphinx/locale/__init__.py: 161
+msgid "Note"
+msgstr "주석"
+
+#: sphinx/locale/__init__.py: 162
+msgid "See Also"
+msgstr "더 보기"
+
+#: sphinx/locale/__init__.py: 163
+msgid "Tip"
+msgstr "참고"
+
+#: sphinx/locale/__init__.py: 164
+msgid "Warning"
+msgstr "경고"
+
+#: sphinx/locale/__init__.py: 168
+#, python-format
+msgid "New in version %s"
+msgstr "버전 %s에 추가"
+
+#: sphinx/locale/__init__.py: 169
+#, python-format
+msgid "Changed in version %s"
+msgstr "버전 %s으로 변경"
+
+#: sphinx/locale/__init__.py: 170
+#, python-format
+msgid "Deprecated since version %s"
+msgstr "버전 %s 폐지"
+
+#: sphinx/locale/__init__.py: 176
+msgid "keyword"
+msgstr "키워드"
+
+#: sphinx/locale/__init__.py: 177
+msgid "operator"
+msgstr "연산자"
+
+#: sphinx/locale/__init__.py: 178
+msgid "object"
+msgstr "객체"
+
+#: sphinx/locale/__init__.py: 180
+msgid "statement"
+msgstr "글"
+
+#: sphinx/locale/__init__.py: 181
+msgid "built-in function"
+msgstr "내장 함수"
+
+#: sphinx/themes/agogo/layout.html: 45 sphinx/themes/basic/globaltoc.html: 10
+#: sphinx/themes/basic/localtoc.html: 11
+msgid "Table Of Contents"
+msgstr "목차"
+
+#: sphinx/themes/agogo/layout.html: 49 sphinx/themes/basic/layout.html: 137
+#: sphinx/themes/basic/search.html: 11 sphinx/themes/basic/search.html: 20
+msgid "Search"
+msgstr "검색"
+
+#: sphinx/themes/agogo/layout.html: 52 sphinx/themes/basic/searchbox.html: 15
+msgid "Go"
+msgstr "바로 가기"
+
+#: sphinx/themes/agogo/layout.html: 57 sphinx/themes/basic/searchbox.html: 20
+msgid "Enter search terms or a module, class or function name."
+msgstr "모듈, 클래스 또는 함수 이름을 입력하십시오."
+
+#: sphinx/themes/agogo/layout.html: 78 sphinx/themes/basic/sourcelink.html: 14
+msgid "Show Source"
+msgstr "소스 코드를 보려면"
+
+#: sphinx/themes/basic/defindex.html: 11
+msgid "Overview"
+msgstr "개요"
+
+#: sphinx/themes/basic/defindex.html: 20
+msgid "Indices and tables:"
+msgstr "색인 및 표 목록:"
+
+#: sphinx/themes/basic/defindex.html: 23
+msgid "Complete Table of Contents"
+msgstr "종합 목차"
+
+#: sphinx/themes/basic/defindex.html: 24
+msgid "lists all sections and subsections"
+msgstr "영역별 목차"
+
+#: sphinx/themes/basic/defindex.html: 26
+msgid "search this documentation"
+msgstr "문서 검색"
+
+#: sphinx/themes/basic/defindex.html: 28
+msgid "Global Module Index"
+msgstr "모듈 총 색인"
+
+#: sphinx/themes/basic/defindex.html: 29
+msgid "quick access to all modules"
+msgstr "모든 모듈 조견표"
+
+#: sphinx/themes/basic/defindex.html: 31
+msgid "all functions, classes, terms"
+msgstr "함수, 클래스 및 용어 개관"
+
+#: sphinx/themes/basic/genindex-single.html: 35
+#, python-format
+msgid "Index-%(key)s"
+msgstr "색인-%(key)s"
+
+#: sphinx/themes/basic/genindex-single.html: 63
+#: sphinx/themes/basic/genindex-split.html: 24
+#: sphinx/themes/basic/genindex-split.html: 38
+#: sphinx/themes/basic/genindex.html: 74
+msgid "Full index on one page"
+msgstr "일반 색인"
+
+#: sphinx/themes/basic/genindex-split.html: 16
+msgid "Index pages by letter"
+msgstr "알파벳별 색인"
+
+#: sphinx/themes/basic/genindex-split.html: 25
+msgid "can be huge"
+msgstr "큰 경우가 있으므로 주의"
+
+#: sphinx/themes/basic/layout.html: 29
+msgid "Navigation"
+msgstr "탐색"
+
+#: sphinx/themes/basic/layout.html: 122
+#, python-format
+msgid "Search within %(docstitle)s"
+msgstr "%(docstitle)s에서 찾기"
+
+#: sphinx/themes/basic/layout.html: 131
+msgid "About these documents"
+msgstr "이 문서 정보"
+
+#: sphinx/themes/basic/layout.html: 140
+msgid "Copyright"
+msgstr "저작권"
+
+#: sphinx/themes/basic/layout.html: 189
+#, python-format
+msgid "©<a href=\"%(path)s\">Copyright</a> %(copyright)s."
+msgstr "©<a href=\"%(path)s\">Copyright</a> %(copyright)s."
+
+#: sphinx/themes/basic/layout.html: 191
+#, python-format
+msgid "©Copyright %(copyright)s."
+msgstr "©Copyright %(copyright)s."
+
+#: sphinx/themes/basic/layout.html: 195
+#, python-format
+msgid "Last updated on %(last_updated)s."
+msgstr "최종 업데이트: %(last_updated)s"
+
+#: sphinx/themes/basic/layout.html: 198
+#, python-format
+msgid ""
+"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a>"
+"%(sphinx_version)s."
+msgstr ""
+"이 문서는 <a href=\"http://sphinx.pocoo.org/\">Sphinx</a>"
+"%(sphinx_version)s로 제공됩니다."
+
+#: sphinx/themes/basic/opensearch.xml: 4
+#, python-format
+msgid "Search %(docstitle)s"
+msgstr "%(docstitle)s에서 찾기"
+
+#: sphinx/themes/basic/relations.html: 11
+msgid "Previous topic"
+msgstr "이전 항목"
+
+#: sphinx/themes/basic/relations.html: 13
+msgid "previous chapter"
+msgstr "이전 장"
+
+#: sphinx/themes/basic/relations.html: 16
+msgid "Next topic"
+msgstr "다음 항목"
+
+#: sphinx/themes/basic/relations.html: 18
+msgid "next chapter"
+msgstr "다음 장"
+
+#: sphinx/themes/basic/search.html: 24
+msgid ""
+"Please activate JavaScript to enable the search\n"
+"functionality."
+msgstr "검색 기능을 사용하려면 JavaScript를 활성화하십시오."
+
+#: sphinx/themes/basic/search.html: 29
+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 "이 문서에서 문서를 검색할 수 있습니다. 키워드를 아래 입력란에 입력하고 '검색'을 클릭하세요. 입력된 모든 키워드를 포함하는 페이지가 검색됩니다. 일부 키워드 밖에 없는 페이지는 검색 결과에 표시되지 않으므로 주의하십시오. "
+
+#: sphinx/themes/basic/search.html: 36
+msgid "search"
+msgstr "검색"
+
+#: sphinx/themes/basic/search.html: 40
+msgid "Search Results"
+msgstr "검색 결과"
+
+#: sphinx/themes/basic/search.html: 42
+msgid "Your search did not match any results."
+msgstr "검색 조건에 일치하는 항목이 없습니다."
+
+#: sphinx/themes/basic/searchbox.html: 12
+msgid "Quick search"
+msgstr "빠른 검색"
+
+#: sphinx/themes/basic/sourcelink.html: 11
+msgid "This Page"
+msgstr "현재 문서"
+
+#: sphinx/themes/basic/changes/frameset.html: 5
+#: sphinx/themes/basic/changes/versionchanges.html: 12
+#, python-format
+msgid "Changes in Version %(version)s-%(docstitle)s"
+msgstr "버전 %(version)s의 변경 사항-%(docstitle)s"
+
+#: sphinx/themes/basic/changes/rstsource.html: 5
+#, python-format
+msgid "%(filename)s-%(docstitle)s"
+msgstr "%(filename)s-%(docstitle)s"
+
+#: sphinx/themes/basic/changes/versionchanges.html: 17
+#, python-format
+msgid "Automatically generated list of changes in version %(version)s"
+msgstr "버전 %(version)s의 변경 사항 (이 목록은 자동으로 생성합니다)"
+
+#: sphinx/themes/basic/changes/versionchanges.html: 18
+msgid "Library changes"
+msgstr "라이브러리에 대한 변경"
+
+#: sphinx/themes/basic/changes/versionchanges.html: 23
+msgid "C API changes"
+msgstr "C API에 대한 변경"
+
+#: sphinx/themes/basic/changes/versionchanges.html: 25
+msgid "Other changes"
+msgstr "다른 변경 사항"
+
+#: sphinx/themes/basic/static/doctools.js: 154 sphinx/writers/html.py: 505
+#: sphinx/writers/html.py: 511
+msgid "Permalink to this headline"
+msgstr "제목 주소"
+
+#: sphinx/themes/basic/static/doctools.js: 160 sphinx/writers/html.py: 92
+msgid "Permalink to this definition"
+msgstr "정의 주소"
+
+#: sphinx/themes/basic/static/doctools.js: 189
+msgid "Hide Search Matches"
+msgstr "검색 결과 숨기기"
+
+#: sphinx/themes/default/static/sidebar.js: 69
+msgid "Expand sidebar"
+msgstr "사이드바 열기"
+
+#: sphinx/themes/default/static/sidebar.js: 82
+#: sphinx/themes/default/static/sidebar.js: 110
+msgid "Collapse sidebar"
+msgstr "사이드바 닫기"
+
+#: sphinx/themes/haiku/layout.html: 26
+msgid "Contents"
+msgstr "내용"
+
+#: sphinx/writers/latex.py: 176
+msgid "Release"
+msgstr "출시"
+
+#: sphinx/writers/latex.py: 590 sphinx/writers/manpage.py: 182
+msgid "Footnotes"
+msgstr "참고"
+
+#: sphinx/writers/latex.py: 672
+msgid "continued from previous page"
+msgstr "이전 페이지에서 계속"
+
+#: sphinx/writers/latex.py: 677
+msgid "Continued on next page"
+msgstr "일반 색인"
+
+#: sphinx/writers/text.py: 430
+msgid "[image]"
+msgstr "[그림]"
+
+#~msgid "Platforms:"
+#~msgstr "플랫폼:"
+
+#~msgid "Searching"
+#~msgstr "검색 중"
+
+#~msgid "Preparing search ..."
+#~ msgstr "검색 준비 중 ..."
+
+#~ msgid "in"
+#~ msgstr ""
+
+#~ 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 "검색 조건에 일치하는 문서를 찾을 수 없습니다. 검색할 단어를 정확한 철자로 입력했는지 확인하십시오. 또한 올바른 카테고리 검색을 실행하고 있는지 확인하십시오."
+
+#~ msgid "Search finished, found %s page (s) matching the search query."
+#~ msgstr "검색이 종료되고 조건과 일치하는 페이지가 %s 개 찾았습니다."

From 1b6e2bfa9c0376d629d994c2a9e0982c37a94ddd Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 09:28:49 +0200
Subject: [PATCH 066/226] Fix #766: Add Estonian locale, thanks to Aivar
 Annamaa.

---
 CHANGES                                |   1 +
 doc/config.rst                         |   1 +
 sphinx/locale/et/LC_MESSAGES/sphinx.js |   1 +
 sphinx/locale/et/LC_MESSAGES/sphinx.mo | Bin 0 -> 9698 bytes
 sphinx/locale/et/LC_MESSAGES/sphinx.po | 797 +++++++++++++++++++++++++
 5 files changed, 800 insertions(+)
 create mode 100644 sphinx/locale/et/LC_MESSAGES/sphinx.js
 create mode 100644 sphinx/locale/et/LC_MESSAGES/sphinx.mo
 create mode 100644 sphinx/locale/et/LC_MESSAGES/sphinx.po

diff --git a/CHANGES b/CHANGES
index 99872dcd7..26fa3d443 100644
--- a/CHANGES
+++ b/CHANGES
@@ -104,6 +104,7 @@ Features added
   - #694: Added Latvian locale.
   - Added Nepali locale.
   - #714: Added Korean locale.
+  - #766: Added Estonian locale.
 
 
 Release 1.0.8 (in development)
diff --git a/doc/config.rst b/doc/config.rst
index eabab84a1..904d0bdc0 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -372,6 +372,7 @@ documentation on :ref:`intl` for details.
    * ``de`` -- German
    * ``en`` -- English
    * ``es`` -- Spanish
+   * ``et`` -- Estonian
    * ``fa`` -- Iranian
    * ``fi`` -- Finnish
    * ``fr`` -- French
diff --git a/sphinx/locale/et/LC_MESSAGES/sphinx.js b/sphinx/locale/et/LC_MESSAGES/sphinx.js
new file mode 100644
index 000000000..5b8bcbcf5
--- /dev/null
+++ b/sphinx/locale/et/LC_MESSAGES/sphinx.js
@@ -0,0 +1 @@
+Documentation.addTranslations({"locale": "et", "plural_expr": "(n != 1)", "messages": {"Search Results": "Otsingutulemused", "Preparing search...": "Otsingu ettevalmistus...", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "Otsing ei andnud tulemusi. Veendu, et otsis\u00f5nad on \u00f5ieti kirjutatud ja et oled valinud sobivad kategooriad.", "Search finished, found %s page(s) matching the search query.": "Leiti %s p\u00e4ringule vastavat lehek\u00fclg(e)", ", in ": ", ", "Expand sidebar": "N\u00e4ita k\u00fclgriba", "Permalink to this headline": "P\u00fcsilink sellele pealkirjale", "Searching": "Otsing", "Collapse sidebar": "Varja k\u00fclgriba", "Permalink to this definition": "P\u00fcsilink sellele definitsioonile", "Hide Search Matches": "Varja otsingutulemused"}});
\ No newline at end of file
diff --git a/sphinx/locale/et/LC_MESSAGES/sphinx.mo b/sphinx/locale/et/LC_MESSAGES/sphinx.mo
new file mode 100644
index 0000000000000000000000000000000000000000..dc68cd11eb82936a0b419e40a9af7bb7d53a289c
GIT binary patch
literal 9698
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

literal 0
HcmV?d00001

diff --git a/sphinx/locale/et/LC_MESSAGES/sphinx.po b/sphinx/locale/et/LC_MESSAGES/sphinx.po
new file mode 100644
index 000000000..7de76feb1
--- /dev/null
+++ b/sphinx/locale/et/LC_MESSAGES/sphinx.po
@@ -0,0 +1,797 @@
+# Translations template for Sphinx.
+# Copyright (C) 2010 ORGANIZATION
+# This file is distributed under the same license as the Sphinx project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Sphinx 1.0pre/8b971dbc7d36\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2010-05-24 23:53+0200\n"
+"PO-Revision-Date: 2011-09-18 11:40+0200\n"
+"Last-Translator: Aivar Annamaa <aivar.annamaa@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.4\n"
+"X-Poedit-Language: Estonian\n"
+"X-Poedit-Country: ESTONIA\n"
+
+#: sphinx/environment.py:106
+#: sphinx/writers/latex.py:184
+#: sphinx/writers/manpage.py:67
+#, python-format
+msgid "%B %d, %Y"
+msgstr "%B %d, %Y"
+
+#: sphinx/roles.py:174
+#, python-format
+msgid "Python Enhancement Proposals!PEP %s"
+msgstr "Python Enhancement Proposals!PEP %s"
+
+#: sphinx/builders/changes.py:72
+msgid "Builtins"
+msgstr "Sisseehitatud"
+
+#: sphinx/builders/changes.py:74
+msgid "Module level"
+msgstr "Mooduli tase"
+
+#: sphinx/builders/html.py:266
+#, python-format
+msgid "%b %d, %Y"
+msgstr "%b %d, %Y"
+
+#: sphinx/builders/html.py:285
+#: sphinx/themes/basic/defindex.html:30
+msgid "General Index"
+msgstr "Üldindeks"
+
+#: sphinx/builders/html.py:285
+msgid "index"
+msgstr "indeks"
+
+#: sphinx/builders/html.py:345
+msgid "next"
+msgstr "järgmine"
+
+#: sphinx/builders/html.py:354
+msgid "previous"
+msgstr "eelmine"
+
+#: sphinx/builders/latex.py:151
+msgid " (in "
+msgstr " (in "
+
+#: sphinx/directives/other.py:127
+msgid "Section author: "
+msgstr "Sektsiooni autor:"
+
+#: sphinx/directives/other.py:129
+msgid "Module author: "
+msgstr "Mooduli autor:"
+
+#: sphinx/directives/other.py:131
+msgid "Code author: "
+msgstr "Koodi autor:"
+
+#: sphinx/directives/other.py:133
+msgid "Author: "
+msgstr "Autor: "
+
+#: sphinx/directives/other.py:238
+msgid "See also"
+msgstr "Vaata ka"
+
+#: sphinx/domains/__init__.py:253
+#, python-format
+msgid "%s %s"
+msgstr "%s %s"
+
+#: sphinx/domains/c.py:51
+#: sphinx/domains/python.py:49
+msgid "Parameters"
+msgstr "Parameetrid"
+
+#: sphinx/domains/c.py:54
+#: sphinx/domains/javascript.py:137
+#: sphinx/domains/python.py:59
+msgid "Returns"
+msgstr "Tagastab"
+
+#: sphinx/domains/c.py:56
+#: sphinx/domains/python.py:61
+msgid "Return type"
+msgstr "Tagastustüüp"
+
+#: sphinx/domains/c.py:133
+#, python-format
+msgid "%s (C function)"
+msgstr "%s (C funktsioon)"
+
+#: sphinx/domains/c.py:135
+#, python-format
+msgid "%s (C member)"
+msgstr "%s (C liige)"
+
+#: sphinx/domains/c.py:137
+#, python-format
+msgid "%s (C macro)"
+msgstr "%s (C makro)"
+
+#: sphinx/domains/c.py:139
+#, python-format
+msgid "%s (C type)"
+msgstr "%s (C tüüp)"
+
+#: sphinx/domains/c.py:141
+#, python-format
+msgid "%s (C variable)"
+msgstr "%s (C muutuja)"
+
+#: sphinx/domains/c.py:171
+#: sphinx/domains/cpp.py:1031
+#: sphinx/domains/javascript.py:166
+#: sphinx/domains/python.py:497
+msgid "function"
+msgstr "funktsioon"
+
+#: sphinx/domains/c.py:172
+#: sphinx/domains/cpp.py:1032
+msgid "member"
+msgstr "liige"
+
+#: sphinx/domains/c.py:173
+msgid "macro"
+msgstr "makro"
+
+#: sphinx/domains/c.py:174
+#: sphinx/domains/cpp.py:1033
+msgid "type"
+msgstr "tüüp"
+
+#: sphinx/domains/c.py:175
+msgid "variable"
+msgstr "muutuja"
+
+#: sphinx/domains/cpp.py:876
+#, python-format
+msgid "%s (C++ class)"
+msgstr "%s (C++ klass)"
+
+#: sphinx/domains/cpp.py:891
+#, python-format
+msgid "%s (C++ type)"
+msgstr "%s (C++ tüüp)"
+
+#: sphinx/domains/cpp.py:910
+#, python-format
+msgid "%s (C++ member)"
+msgstr "%s (C++ liige)"
+
+#: sphinx/domains/cpp.py:962
+#, python-format
+msgid "%s (C++ function)"
+msgstr "%s (C++ funktsioon)"
+
+#: sphinx/domains/cpp.py:1030
+#: sphinx/domains/python.py:499
+msgid "class"
+msgstr "klass"
+
+#: sphinx/domains/javascript.py:117
+#: sphinx/domains/python.py:221
+#, python-format
+msgid "%s() (built-in function)"
+msgstr "%s() (sisseehitatud funktsioon)"
+
+#: sphinx/domains/javascript.py:118
+#: sphinx/domains/python.py:285
+#, python-format
+msgid "%s() (%s method)"
+msgstr "%s() (%s meetod)"
+
+#: sphinx/domains/javascript.py:120
+#, python-format
+msgid "%s (global variable or constant)"
+msgstr "%s (globaalmuutuja või konstant)"
+
+#: sphinx/domains/javascript.py:122
+#: sphinx/domains/python.py:323
+#, python-format
+msgid "%s (%s attribute)"
+msgstr "%s (%s atribuut)"
+
+#: sphinx/domains/javascript.py:131
+msgid "Arguments"
+msgstr "Argumendid"
+
+#: sphinx/domains/javascript.py:134
+msgid "Throws"
+msgstr "Throws"
+
+#: sphinx/domains/javascript.py:167
+#: sphinx/domains/python.py:498
+msgid "data"
+msgstr "andmed"
+
+#: sphinx/domains/javascript.py:168
+#: sphinx/domains/python.py:504
+msgid "attribute"
+msgstr "atribuut"
+
+#: sphinx/domains/python.py:53
+msgid "Variables"
+msgstr "Muutujad"
+
+#: sphinx/domains/python.py:56
+msgid "Raises"
+msgstr "Raises"
+
+#: sphinx/domains/python.py:222
+#: sphinx/domains/python.py:279
+#: sphinx/domains/python.py:291
+#: sphinx/domains/python.py:304
+#, python-format
+msgid "%s() (in module %s)"
+msgstr "%s() (moodulis %s)"
+
+#: sphinx/domains/python.py:225
+#, python-format
+msgid "%s (built-in variable)"
+msgstr "%s (sisseehitatud muutuja)"
+
+#: sphinx/domains/python.py:226
+#: sphinx/domains/python.py:317
+#, python-format
+msgid "%s (in module %s)"
+msgstr "%s (moodulis %s)"
+
+#: sphinx/domains/python.py:242
+#, python-format
+msgid "%s (built-in class)"
+msgstr "%s (sisseehitatud klass)"
+
+#: sphinx/domains/python.py:243
+#, python-format
+msgid "%s (class in %s)"
+msgstr "%s (klass moodulis %s)"
+
+#: sphinx/domains/python.py:283
+#, python-format
+msgid "%s() (%s.%s method)"
+msgstr "%s() (%s.%s meetod)"
+
+#: sphinx/domains/python.py:295
+#, python-format
+msgid "%s() (%s.%s static method)"
+msgstr "%s() (%s.%s staatiline meetod)"
+
+#: sphinx/domains/python.py:298
+#, python-format
+msgid "%s() (%s static method)"
+msgstr "%s() (%s staatiline meetod)"
+
+#: sphinx/domains/python.py:308
+#, python-format
+msgid "%s() (%s.%s class method)"
+msgstr "%s() (%s.%s klassi meetod)"
+
+#: sphinx/domains/python.py:311
+#, python-format
+msgid "%s() (%s class method)"
+msgstr "%s() (%s klassi meetod)"
+
+#: sphinx/domains/python.py:321
+#, python-format
+msgid "%s (%s.%s attribute)"
+msgstr "%s (%s.%s atribuut)"
+
+#: sphinx/domains/python.py:366
+msgid "Platforms: "
+msgstr "Platvormid:"
+
+#: sphinx/domains/python.py:372
+#, python-format
+msgid "%s (module)"
+msgstr "%s (moodul)"
+
+#: sphinx/domains/python.py:429
+msgid "Python Module Index"
+msgstr "Pythoni moodulite indeks"
+
+#: sphinx/domains/python.py:430
+msgid "modules"
+msgstr "moodulid"
+
+#: sphinx/domains/python.py:475
+msgid "Deprecated"
+msgstr "Ebaasoovitav"
+
+#: sphinx/domains/python.py:500
+#: sphinx/locale/__init__.py:162
+msgid "exception"
+msgstr "erind"
+
+#: sphinx/domains/python.py:501
+msgid "method"
+msgstr "meetod"
+
+#: sphinx/domains/python.py:502
+msgid "class method"
+msgstr "klassi meetod"
+
+#: sphinx/domains/python.py:503
+msgid "static method"
+msgstr "staatiline meetod"
+
+#: sphinx/domains/python.py:505
+#: sphinx/locale/__init__.py:158
+msgid "module"
+msgstr "moodul"
+
+#: sphinx/domains/rst.py:53
+#, python-format
+msgid "%s (directive)"
+msgstr "%s (direktiiv)"
+
+#: sphinx/domains/rst.py:55
+#, python-format
+msgid "%s (role)"
+msgstr "%s (roll)"
+
+#: sphinx/domains/rst.py:103
+msgid "directive"
+msgstr "direktiiv"
+
+#: sphinx/domains/rst.py:104
+msgid "role"
+msgstr "roll"
+
+#: sphinx/domains/std.py:68
+#: sphinx/domains/std.py:84
+#, python-format
+msgid "environment variable; %s"
+msgstr "keskkonnamuutuja; %s"
+
+#: sphinx/domains/std.py:160
+#, python-format
+msgid "%scommand line option; %s"
+msgstr "%s käsurea valik; %s"
+
+#: sphinx/domains/std.py:328
+msgid "glossary term"
+msgstr "termin"
+
+#: sphinx/domains/std.py:329
+msgid "grammar token"
+msgstr "grammatika märgend"
+
+#: sphinx/domains/std.py:330
+msgid "reference label"
+msgstr "viite pealkiri"
+
+#: sphinx/domains/std.py:331
+msgid "environment variable"
+msgstr "keskkonnamuutuja"
+
+#: sphinx/domains/std.py:332
+msgid "program option"
+msgstr "programmi seade"
+
+#: sphinx/domains/std.py:360
+#: sphinx/themes/basic/genindex-single.html:11
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:11
+#: sphinx/themes/basic/genindex.html:14
+#: sphinx/themes/basic/genindex.html:50
+#: sphinx/themes/basic/layout.html:125
+#: sphinx/writers/latex.py:173
+msgid "Index"
+msgstr "Indeks"
+
+#: sphinx/domains/std.py:361
+msgid "Module Index"
+msgstr "Mooduli indeks"
+
+#: sphinx/domains/std.py:362
+#: sphinx/themes/basic/defindex.html:25
+msgid "Search Page"
+msgstr "Otsingu lehekülg"
+
+#: sphinx/ext/autodoc.py:917
+#, python-format
+msgid "   Bases: %s"
+msgstr "   Baasid: %s"
+
+#: sphinx/ext/autodoc.py:950
+#, python-format
+msgid "alias of :class:`%s`"
+msgstr "sünonüüm :class:`%s`"
+
+#: sphinx/ext/todo.py:41
+msgid "Todo"
+msgstr "Tegemata"
+
+#: sphinx/ext/todo.py:109
+#, python-format
+msgid "(The <<original entry>> is located in  %s, line %d.)"
+msgstr "(Algne kirje asub failis  %s, real %d.)"
+
+#: sphinx/ext/todo.py:117
+msgid "original entry"
+msgstr "algne kirje"
+
+#: sphinx/ext/viewcode.py:66
+msgid "[source]"
+msgstr "[lähtekood]"
+
+#: sphinx/ext/viewcode.py:109
+msgid "[docs]"
+msgstr "[dokumentatsioon]"
+
+#: sphinx/ext/viewcode.py:123
+msgid "Module code"
+msgstr "Mooduli kood"
+
+#: sphinx/ext/viewcode.py:129
+#, python-format
+msgid "<h1>Source code for %s</h1>"
+msgstr "<h1>%s lähtekood</h1>"
+
+#: sphinx/ext/viewcode.py:156
+msgid "Overview: module code"
+msgstr "Ülevaade: mooduli kood"
+
+#: sphinx/ext/viewcode.py:157
+msgid "<h1>All modules for which code is available</h1>"
+msgstr "<h1>Kõik lähtekoodiga moodulid</h1>"
+
+#: sphinx/locale/__init__.py:139
+msgid "Attention"
+msgstr "Tähelepanu"
+
+#: sphinx/locale/__init__.py:140
+msgid "Caution"
+msgstr "Ettevaatust"
+
+#: sphinx/locale/__init__.py:141
+msgid "Danger"
+msgstr "Oht"
+
+#: sphinx/locale/__init__.py:142
+msgid "Error"
+msgstr "Viga"
+
+#: sphinx/locale/__init__.py:143
+msgid "Hint"
+msgstr "Vihje"
+
+#: sphinx/locale/__init__.py:144
+msgid "Important"
+msgstr "Tähtis"
+
+#: sphinx/locale/__init__.py:145
+msgid "Note"
+msgstr "Märkus"
+
+#: sphinx/locale/__init__.py:146
+msgid "See Also"
+msgstr "Vaata ka"
+
+#: sphinx/locale/__init__.py:147
+msgid "Tip"
+msgstr "Nõuanne"
+
+#: sphinx/locale/__init__.py:148
+msgid "Warning"
+msgstr "Hoiatus"
+
+#: sphinx/locale/__init__.py:152
+#, python-format
+msgid "New in version %s"
+msgstr "Uus versioonis %s"
+
+#: sphinx/locale/__init__.py:153
+#, python-format
+msgid "Changed in version %s"
+msgstr "Muudetud versioonis %s"
+
+#: sphinx/locale/__init__.py:154
+#, python-format
+msgid "Deprecated since version %s"
+msgstr "Ebasoovitav alates versioonist %s"
+
+#: sphinx/locale/__init__.py:159
+msgid "keyword"
+msgstr "võtmesõna"
+
+#: sphinx/locale/__init__.py:160
+msgid "operator"
+msgstr "operaator"
+
+#: sphinx/locale/__init__.py:161
+msgid "object"
+msgstr "objekt"
+
+#: sphinx/locale/__init__.py:163
+msgid "statement"
+msgstr "lause"
+
+#: sphinx/locale/__init__.py:164
+msgid "built-in function"
+msgstr "sisseehitatud funktsioon"
+
+#: sphinx/themes/agogo/layout.html:45
+#: sphinx/themes/basic/globaltoc.html:10
+#: sphinx/themes/basic/localtoc.html:11
+msgid "Table Of Contents"
+msgstr "Sisukord"
+
+#: sphinx/themes/agogo/layout.html:49
+#: sphinx/themes/basic/layout.html:128
+#: sphinx/themes/basic/search.html:11
+#: sphinx/themes/basic/search.html:14
+msgid "Search"
+msgstr "Otsing"
+
+#: sphinx/themes/agogo/layout.html:52
+#: sphinx/themes/basic/searchbox.html:15
+msgid "Go"
+msgstr "Otsi"
+
+#: sphinx/themes/agogo/layout.html:57
+#: sphinx/themes/basic/searchbox.html:20
+msgid "Enter search terms or a module, class or function name."
+msgstr "Sisesta otsingusõna"
+
+#: sphinx/themes/agogo/layout.html:78
+#: sphinx/themes/basic/sourcelink.html:14
+msgid "Show Source"
+msgstr "Näita lähtekoodi"
+
+#: sphinx/themes/basic/defindex.html:11
+msgid "Overview"
+msgstr "Ülevaade"
+
+#: sphinx/themes/basic/defindex.html:20
+msgid "Indices and tables:"
+msgstr "Indeksid ja tabelid"
+
+#: sphinx/themes/basic/defindex.html:23
+msgid "Complete Table of Contents"
+msgstr "Täielik sisukord"
+
+#: sphinx/themes/basic/defindex.html:24
+msgid "lists all sections and subsections"
+msgstr "toob välja kõiks sektsioonid ja alamsektsioonid"
+
+#: sphinx/themes/basic/defindex.html:26
+msgid "search this documentation"
+msgstr "otsi sellest dokumentatsioonist"
+
+#: sphinx/themes/basic/defindex.html:28
+msgid "Global Module Index"
+msgstr "Globaalne moodulite indeks"
+
+#: sphinx/themes/basic/defindex.html:29
+msgid "quick access to all modules"
+msgstr "kiire ligipääs kõigile moodulitele"
+
+#: sphinx/themes/basic/defindex.html:31
+msgid "all functions, classes, terms"
+msgstr "kõik funktsioonid, klassid ja terminid"
+
+#: sphinx/themes/basic/genindex-single.html:14
+#, python-format
+msgid "Index &ndash; %(key)s"
+msgstr "Indeks &ndash; %(key)s"
+
+#: sphinx/themes/basic/genindex-single.html:46
+#: sphinx/themes/basic/genindex-split.html:24
+#: sphinx/themes/basic/genindex-split.html:38
+#: sphinx/themes/basic/genindex.html:56
+msgid "Full index on one page"
+msgstr "Täisindeks ühel lehel"
+
+#: sphinx/themes/basic/genindex-split.html:16
+msgid "Index pages by letter"
+msgstr "Indeksi leheküljed algustähe kaupa"
+
+#: sphinx/themes/basic/genindex-split.html:25
+msgid "can be huge"
+msgstr "võib olla väga suur"
+
+#: sphinx/themes/basic/layout.html:23
+msgid "Navigation"
+msgstr "Navigatsioon"
+
+#: sphinx/themes/basic/layout.html:113
+#, python-format
+msgid "Search within %(docstitle)s"
+msgstr "Otsi %(docstitle)s piires"
+
+#: sphinx/themes/basic/layout.html:122
+msgid "About these documents"
+msgstr "Info selle dokumentatsiooni kohta"
+
+#: sphinx/themes/basic/layout.html:131
+msgid "Copyright"
+msgstr "Copyright"
+
+#: sphinx/themes/basic/layout.html:180
+#, python-format
+msgid "&copy; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
+msgstr "&copy; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
+
+#: sphinx/themes/basic/layout.html:182
+#, python-format
+msgid "&copy; Copyright %(copyright)s."
+msgstr "&copy; Copyright %(copyright)s."
+
+#: sphinx/themes/basic/layout.html:186
+#, python-format
+msgid "Last updated on %(last_updated)s."
+msgstr "Viimati uuendatud %(last_updated)s."
+
+#: sphinx/themes/basic/layout.html:189
+#, python-format
+msgid "Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s."
+msgstr "Loodud <a href=\"http://sphinx.pocoo.org/\">Sphinx-iga</a> (versioon: %(sphinx_version)s)."
+
+#: sphinx/themes/basic/opensearch.xml:4
+#, python-format
+msgid "Search %(docstitle)s"
+msgstr "Otsi %(docstitle)s"
+
+#: sphinx/themes/basic/relations.html:11
+msgid "Previous topic"
+msgstr "Eelmine teema"
+
+#: sphinx/themes/basic/relations.html:13
+msgid "previous chapter"
+msgstr "eelmine peatükk"
+
+#: sphinx/themes/basic/relations.html:16
+msgid "Next topic"
+msgstr "Järgmine teema"
+
+#: sphinx/themes/basic/relations.html:18
+msgid "next chapter"
+msgstr "järgmine peatükk"
+
+#: sphinx/themes/basic/search.html:18
+msgid ""
+"Please activate JavaScript to enable the search\n"
+"    functionality."
+msgstr "Otsingu võimaldamiseks tuleb aktiveerida JavaScript."
+
+#: sphinx/themes/basic/search.html:23
+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 "Siin saad otsida käesolevast dokumentatsioonist. Sisesta otsisõned allolevasse lahtrisse ning klõpsa \"Otsi\". Tulemuseks antakse leheküljed, mis sisaldavad kõiki otsisõnesid."
+
+#: sphinx/themes/basic/search.html:30
+msgid "search"
+msgstr "otsi"
+
+#: sphinx/themes/basic/search.html:34
+#: sphinx/themes/basic/static/searchtools.js:489
+msgid "Search Results"
+msgstr "Otsingutulemused"
+
+#: sphinx/themes/basic/search.html:36
+msgid "Your search did not match any results."
+msgstr "Otsing ei andnud tulemusi"
+
+#: sphinx/themes/basic/searchbox.html:12
+msgid "Quick search"
+msgstr "Kiirotsing"
+
+#: sphinx/themes/basic/sourcelink.html:11
+msgid "This Page"
+msgstr "Käesolev lehekülg"
+
+#: sphinx/themes/basic/changes/frameset.html:5
+#: sphinx/themes/basic/changes/versionchanges.html:12
+#, python-format
+msgid "Changes in Version %(version)s &mdash; %(docstitle)s"
+msgstr "Muudatused versioonis %(version)s &mdash; %(docstitle)s"
+
+#: sphinx/themes/basic/changes/rstsource.html:5
+#, python-format
+msgid "%(filename)s &mdash; %(docstitle)s"
+msgstr "%(filename)s &mdash; %(docstitle)s"
+
+#: sphinx/themes/basic/changes/versionchanges.html:17
+#, python-format
+msgid "Automatically generated list of changes in version %(version)s"
+msgstr "Automaatselt genereeritud nimekiri versiooni %(version)s muudatustest"
+
+#: sphinx/themes/basic/changes/versionchanges.html:18
+msgid "Library changes"
+msgstr "Teegi muudatused"
+
+#: sphinx/themes/basic/changes/versionchanges.html:23
+msgid "C API changes"
+msgstr "C API muudatused"
+
+#: sphinx/themes/basic/changes/versionchanges.html:25
+msgid "Other changes"
+msgstr "Ülejäänud muudatused"
+
+#: sphinx/themes/basic/static/doctools.js:154
+#: sphinx/writers/html.py:482
+#: sphinx/writers/html.py:487
+msgid "Permalink to this headline"
+msgstr "Püsilink sellele pealkirjale"
+
+#: sphinx/themes/basic/static/doctools.js:160
+#: sphinx/writers/html.py:87
+msgid "Permalink to this definition"
+msgstr "Püsilink sellele definitsioonile"
+
+#: sphinx/themes/basic/static/doctools.js:189
+msgid "Hide Search Matches"
+msgstr "Varja otsingutulemused"
+
+#: sphinx/themes/basic/static/searchtools.js:285
+msgid "Searching"
+msgstr "Otsing"
+
+#: sphinx/themes/basic/static/searchtools.js:290
+msgid "Preparing search..."
+msgstr "Otsingu ettevalmistus..."
+
+#: sphinx/themes/basic/static/searchtools.js:364
+msgid ", in "
+msgstr ", "
+
+#: sphinx/themes/basic/static/searchtools.js:491
+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 "Otsing ei andnud tulemusi. Veendu, et otsisõnad on õieti kirjutatud ja et oled valinud sobivad kategooriad."
+
+#: sphinx/themes/basic/static/searchtools.js:493
+#, python-format
+msgid "Search finished, found %s page(s) matching the search query."
+msgstr "Leiti %s päringule vastavat lehekülg(e)"
+
+#: sphinx/themes/default/static/sidebar.js:66
+msgid "Expand sidebar"
+msgstr "Näita külgriba"
+
+#: sphinx/themes/default/static/sidebar.js:79
+#: sphinx/themes/default/static/sidebar.js:106
+msgid "Collapse sidebar"
+msgstr "Varja külgriba"
+
+#: sphinx/themes/haiku/layout.html:26
+msgid "Contents"
+msgstr "Sisukord"
+
+#: sphinx/writers/latex.py:171
+msgid "Release"
+msgstr "Väljalase"
+
+#: sphinx/writers/latex.py:572
+#: sphinx/writers/manpage.py:178
+msgid "Footnotes"
+msgstr "Joonealused märkused"
+
+#: sphinx/writers/latex.py:641
+msgid "continued from previous page"
+msgstr "jätk eelmisele leheküljele"
+
+#: sphinx/writers/latex.py:646
+msgid "Continued on next page"
+msgstr "Jätkub järgmisel lehel"
+
+#: sphinx/writers/text.py:422
+msgid "[image]"
+msgstr "[pilt]"
+

From 1e05041ea506b9e2888ebcf66873ed8beddc5368 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 09:38:51 +0200
Subject: [PATCH 067/226] Fix #706: use a custom TextWrapper instead of
 monkeypatching a new wordsep_re into the textwrap one.

---
 sphinx/writers/text.py | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/sphinx/writers/text.py b/sphinx/writers/text.py
index 1a7d2a7df..5d6f49ec3 100644
--- a/sphinx/writers/text.py
+++ b/sphinx/writers/text.py
@@ -18,6 +18,24 @@ from sphinx import addnodes
 from sphinx.locale import admonitionlabels, versionlabels, _
 
 
+class TextWrapper(textwrap.TextWrapper):
+    """Custom subclass that uses a different word separator regex."""
+
+    wordsep_re = re.compile(
+        r'(\s+|'                                  # any whitespace
+        r'(?<=\s)(?::[a-z-]+:)?`\S+|'             # interpreted text start
+        r'[^\s\w]*\w+[a-zA-Z]-(?=\w+[a-zA-Z])|'   # hyphenated words
+        r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w))')   # em-dash
+
+
+MAXWIDTH = 70
+STDINDENT = 3
+
+def my_wrap(text, width=MAXWIDTH, **kwargs):
+    w = TextWrapper(width=width, **kwargs)
+    return w.wrap(text)
+
+
 class TextWriter(writers.Writer):
     supported = ('text',)
     settings_spec = ('No options here.', '', ())
@@ -34,17 +52,6 @@ class TextWriter(writers.Writer):
         self.document.walkabout(visitor)
         self.output = visitor.body
 
-# monkey-patch...
-new_wordsep_re = re.compile(
-        r'(\s+|'                                  # any whitespace
-        r'(?<=\s)(?::[a-z-]+:)?`\S+|'             # interpreted text start
-        r'[^\s\w]*\w+[a-zA-Z]-(?=\w+[a-zA-Z])|'   # hyphenated words
-        r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w))')   # em-dash
-textwrap.TextWrapper.wordsep_re = new_wordsep_re
-
-MAXWIDTH = 70
-STDINDENT = 3
-
 
 class TextTranslator(nodes.NodeVisitor):
     sectionchars = '*=-~"+`'
@@ -81,7 +88,7 @@ class TextTranslator(nodes.NodeVisitor):
             if not toformat:
                 return
             if wrap:
-                res = textwrap.wrap(''.join(toformat), width=MAXWIDTH-maxindent)
+                res = my_wrap(''.join(toformat), width=MAXWIDTH-maxindent)
             else:
                 res = ''.join(toformat).splitlines()
             if end:
@@ -381,7 +388,7 @@ class TextTranslator(nodes.NodeVisitor):
             else:
                 cells = []
                 for i, cell in enumerate(line):
-                    par = textwrap.wrap(cell, width=colwidths[i])
+                    par = my_wrap(cell, width=colwidths[i])
                     if par:
                         maxwidth = max(map(len, par))
                     else:

From 6d6e6abfdb2b01bfa9ff8952ab11b87c7a756a6a Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 09:47:18 +0200
Subject: [PATCH 068/226] Fix #722: remove special styling of :samp: role, and
 enable placeholder formatting in literal nodes.

---
 sphinx/texinputs/sphinx.sty |  1 -
 sphinx/writers/latex.py     | 12 +++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty
index 21a3d8941..ef7b891bc 100644
--- a/sphinx/texinputs/sphinx.sty
+++ b/sphinx/texinputs/sphinx.sty
@@ -128,7 +128,6 @@
 \newcommand{\strong}[1]{{\bf #1}}
 \newcommand{\code}[1]{\texttt{#1}}
 \newcommand{\bfcode}[1]{\code{\bfseries#1}}
-\newcommand{\samp}[1]{`\code{#1}'}
 \newcommand{\email}[1]{\textsf{#1}}
 
 % Redefine the Verbatim environment to allow border and background colors.
diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index d9f1fad92..d4b2695a9 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -1246,15 +1246,13 @@ class LaTeXTranslator(nodes.NodeVisitor):
 
     def visit_literal(self, node):
         self.no_contractions += 1
-        content = self.encode(node.astext().strip())
-        self.no_contractions -= 1
         if self.in_title:
-            self.body.append(r'\texttt{%s}' % content)
-        elif node.get('role') == 'samp':
-            self.body.append(r'\samp{%s}' % content)
+            self.body.append(r'\texttt{')
         else:
-            self.body.append(r'\code{%s}' % content)
-        raise nodes.SkipNode
+            self.body.append(r'\code{')
+    def depart_literal(self, node):
+        self.no_contractions -= 1
+        self.body.append('}')
 
     def visit_footnote_reference(self, node):
         num = node.astext().strip()

From b9bd2ff791ce5195668a4ffa8f552bb3b3cb402d Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 09:49:06 +0200
Subject: [PATCH 069/226] Fix #698: msgstr errors found by msgfmt -c.

---
 sphinx/locale/fi/LC_MESSAGES/sphinx.po    | 4 ++--
 sphinx/locale/fr/LC_MESSAGES/sphinx.po    | 2 +-
 sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po | 8 ++++----
 sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sphinx/locale/fi/LC_MESSAGES/sphinx.po b/sphinx/locale/fi/LC_MESSAGES/sphinx.po
index 1b45f6905..6af7cee30 100644
--- a/sphinx/locale/fi/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/fi/LC_MESSAGES/sphinx.po
@@ -692,7 +692,7 @@ msgstr "Tämä sivu"
 #: sphinx/themes/basic/changes/versionchanges.html:12
 #, python-format
 msgid "Changes in Version %(version)s &mdash; %(docstitle)s"
-msgstr "Muutos versiosta %(version) &mdash; %(docstitle)"
+msgstr "Muutos versiosta %(version)s &mdash; %(docstitle)s"
 
 #: sphinx/themes/basic/changes/rstsource.html:5
 #, python-format
@@ -702,7 +702,7 @@ msgstr ""
 #: sphinx/themes/basic/changes/versionchanges.html:17
 #, python-format
 msgid "Automatically generated list of changes in version %(version)s"
-msgstr "Automaattisesti luotu muutoshistoria alkaen versiosta %(version)"
+msgstr "Automaattisesti luotu muutoshistoria alkaen versiosta %(version)s"
 
 #: sphinx/themes/basic/changes/versionchanges.html:18
 msgid "Library changes"
diff --git a/sphinx/locale/fr/LC_MESSAGES/sphinx.po b/sphinx/locale/fr/LC_MESSAGES/sphinx.po
index c4e1105cb..3a4ad6e1a 100644
--- a/sphinx/locale/fr/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/fr/LC_MESSAGES/sphinx.po
@@ -667,7 +667,7 @@ msgstr "Chapitre suivant"
 msgid ""
 "Please activate JavaScript to enable the search\n"
 "    functionality."
-msgstr "Activez le JavaScript pour que la recherche fonctionne\n"
+msgstr "Activez le JavaScript pour que la recherche fonctionne."
 
 #: sphinx/themes/basic/search.html:29
 #, fuzzy
diff --git a/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po b/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po
index 7667314f6..4c4ceae68 100644
--- a/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po
@@ -580,7 +580,7 @@ msgstr "всі функції, класи, терміни"
 #: sphinx/themes/basic/genindex-single.html:35
 #, python-format
 msgid "Index &ndash; %(key)s"
-msgstr "Індекс &ndash; %(key)"
+msgstr "Індекс &ndash; %(key)s"
 
 #: sphinx/themes/basic/genindex-single.html:63
 #: sphinx/themes/basic/genindex-split.html:24
@@ -704,17 +704,17 @@ msgstr "Ця сторінка"
 #: sphinx/themes/basic/changes/versionchanges.html:12
 #, python-format
 msgid "Changes in Version %(version)s &mdash; %(docstitle)s"
-msgstr "Зміни в Версії %(version)s &mdash; %(docstitle)"
+msgstr "Зміни в Версії %(version)s &mdash; %(docstitle)s"
 
 #: sphinx/themes/basic/changes/rstsource.html:5
 #, python-format
 msgid "%(filename)s &mdash; %(docstitle)s"
-msgstr "%(filename) &mdash; %(docstitle)"
+msgstr "%(filename)s &mdash; %(docstitle)s"
 
 #: sphinx/themes/basic/changes/versionchanges.html:17
 #, python-format
 msgid "Automatically generated list of changes in version %(version)s"
-msgstr "Автоматичного згенерований список змін в версії %(version)"
+msgstr "Автоматичного згенерований список змін в версії %(version)s"
 
 #: sphinx/themes/basic/changes/versionchanges.html:18
 msgid "Library changes"
diff --git a/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po b/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po
index 323aa0693..6ea02e826 100644
--- a/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po
@@ -618,7 +618,7 @@ msgstr "版权所有"
 #: sphinx/themes/basic/layout.html:189
 #, python-format
 msgid "&copy; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
-msgstr "&copy; <a href=\"%(path)s\">版权所有</a> % (copyright)s."
+msgstr "&copy; <a href=\"%(path)s\">版权所有</a> %(copyright)s."
 
 #: sphinx/themes/basic/layout.html:191
 #, python-format

From 9088433491a488f2e08b22dee3a1ced7b3d4ce51 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Wed, 4 May 2011 17:18:59 +0200
Subject: [PATCH 070/226] Correctly treat built-in method (method descriptors)
 as methods

This fixes a bug where method descriptors were treated as data
descriptors. As the builtin_method_descriptor type is not exported
anywhere in Python, we check for the name here. As we know that
it is a descriptor, this should not be a problem.
---
 sphinx/ext/autodoc.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index f193947d5..f19334a0e 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -1164,7 +1164,8 @@ class AttributeDocumenter(ClassLevelDocumenter):
     @classmethod
     def can_document_member(cls, member, membername, isattr, parent):
         isdatadesc = isdescriptor(member) and not \
-                     isinstance(member, cls.method_types)
+                     isinstance(member, cls.method_types) and not \
+                     type(member).__name__ == "method_descriptor"
         return isdatadesc or (not isinstance(parent, ModuleDocumenter)
                               and not inspect.isroutine(member)
                               and not isinstance(member, class_types))

From 2c0aa5092c95c992d41baf8ff5c7bb6f66ed22bc Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 7 Jun 2011 17:20:56 +0200
Subject: [PATCH 071/226] Close #712: fix indentation error in German
 translation.

---
 sphinx/locale/de/LC_MESSAGES/sphinx.mo | Bin 10037 -> 10038 bytes
 sphinx/locale/de/LC_MESSAGES/sphinx.po |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/locale/de/LC_MESSAGES/sphinx.mo b/sphinx/locale/de/LC_MESSAGES/sphinx.mo
index 5657b0ab860f6cfe66d2a6dbfed22fe5ddc1153c..abecb48043e26722d74bd3b42f90535fb854aae5 100644
GIT binary patch
delta 1377
zcmXZaOGs2v9LMp$=u9;^W|{9tldl><vQiT_lf6YUA_^<8O#~4b)v8)tD76-mQ4kdv
z7-ek)LCQ7;;--Rv!c9qwD6+&9A`o0i-(UB?`rLEQJ?H;8=Xv{!_TiI}AjiyR3(O*D
zg=Xat#TX{tdenLf*Wzx>$78q(&toQD!8rDz_V@exGxsH~X8yI0KNni?f8z`jI(Px|
zFtaH9u>!LgH((|1!fZT^3UJBo!4k%|Fc*h#9ZtC4kQyz$I4rOPHBJ==W^4H9V1j?_
z3^rmf>VPrahF?$}$R&!##i;)eAvs$YuE6WK3~##+a3|wOxEz0=Ixz3!w4gL>Wel5G
zC`VOr9F^EPT#wxt#X+pVAymK**p5@aUQ-qZ+KlRCGq&MD)c$_dxsOr%gHb+GX=dYC
z%S2it%y1LxZM0xI9!6Dq6jk8`_cH40uA;8!9@gL(s*s<U#3j_5*+@0Iy6s3Jfwl3W
zN7U&HUG7CxtGa#tE-K?eR0YGRgC>yMvG=|{gVbVwF@ZU}Xg$h$Y{ea@LT+F-@okU~
zwR98}a0>OBf1?5{qAHH?ljh^7M2b*vq7v2W8Xvcy9_?PN!y~?a4fO^d`uHivh;Og-
zfp1WiO``5<8du^RD$pWkp!%%!2r7|GRDyZfi)FY0pP>GG=T4#$m_l96cMK@b7JZ?#
zD(pZt>PnhW2kb*tbO00Bi4hD?3G|>k*M~ZIz~@I%0mo7M-=fa_gc1BzMgO%h&jdNx
zk}p(Lhk=u*%IbXF<fhy`sKEPud;%5l6zWROqW1TqI(ripZvc57He8(wCq6QvjJ{$N
wr%{h+4pm{CekxEtrehKnsCMLjtRo(+Pi)!R+;C?h|4&9^%n~EB1+7{C0QPr-cK`qY

delta 1376
zcmXZaOGuPa7{>9pbS%e9X5L3@)VxKP0WGVA8g{{oA)?3vTNOlLRI6&yP+nR@Mnr^Q
zV3f5H45VpeAZ{usDBP5^h$2f+7X^h2vH#Qeu72M+=R4=UoRf?{k3TyVO5~c^Y>`<A
zm#_ju#b#lwb?Z^<O_+zfu@H~rD!hQ1cn!0#54C^5*PpsCa5eL<eEg}{68|^OFrkD0
zU;$>71V2__Hsc0dkFA)4XHWqyyWLpI_%`O_Fs{Q1_bXDHEsq2RMo{CXNWx4VIK~A3
z*je0$J*Wf5un|9_I*>;cjZ0AfA4YPvPE5xexB~CE{n*O*A+E&ls1D5g*b-$yE7Ng1
z3+1Q^PM{JykLB2fX*h(HIE)JT9^*LW>vd~`KrvJ&ci;g$gxWuVI`<K3e<I08^D?t>
z+{A=MgA6z08ip;Hf=5u5wxcS%=w3lx-F4Iz-Ny|$hAQL-*5M-R&D2nhuC5tLBw_pc
z&?D;bg--Vps#RUSeh-!L5UPR^)Ik%-?bthCpFwJ|-x$SQUbG%%J+|R4R3SGphxj(c
zhgzCM1)M^?=2=vL1yseU{G|CzR3gQwH&Kadb)An}P>*&m#_*`G_oCjw10O%ZF!AlB
zKJYcFvPslkO=AYmp#m*nDlYkYD*aX>8K?yFu@}p*1|Or&dFxK15|~0=%{NR?oGti5
zX;sjHD%6!Uq7K-Hswj?8?7$FSMJ3RU>Rcb{;6a~Hq5_Vi_P;@$`w>I<vx@#}VV((c
zuti^}s15?xqAJ_s<3_j1-Gd5z(8niH0Z*f@<Q!^$52~}bQ1J$l=V2q&&B4S6CX~?^
xOv7o^Bbq~1m`Ohsr~p&278PjYXn(jpD{X5u7TZ~W_iy2^l!ma4&K0#~{{xuOgr)!h

diff --git a/sphinx/locale/de/LC_MESSAGES/sphinx.po b/sphinx/locale/de/LC_MESSAGES/sphinx.po
index f92ba23cd..83e6fabe8 100644
--- a/sphinx/locale/de/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/de/LC_MESSAGES/sphinx.po
@@ -380,7 +380,7 @@ msgstr "Suche"
 #: sphinx/ext/autodoc.py:917
 #, python-format
 msgid "   Bases: %s"
-msgstr "  Basisklassen: %s"
+msgstr "   Basisklassen: %s"
 
 #: sphinx/ext/autodoc.py:950
 #, python-format

From 05cf3c03603acb31151cd0a8ee4452dce8e5d4e1 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 09:09:57 +0200
Subject: [PATCH 072/226] Always use longtables for autosummary.

---
 sphinx/ext/autosummary/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx/ext/autosummary/__init__.py b/sphinx/ext/autosummary/__init__.py
index dace837fe..a194fba8b 100644
--- a/sphinx/ext/autosummary/__init__.py
+++ b/sphinx/ext/autosummary/__init__.py
@@ -285,10 +285,10 @@ class Autosummary(Directive):
         *items* is a list produced by :meth:`get_items`.
         """
         table_spec = addnodes.tabular_col_spec()
-        table_spec['spec'] = 'LL'
+        table_spec['spec'] = 'll'
 
         table = autosummary_table('')
-        real_table = nodes.table('')
+        real_table = nodes.table('', classes=['longtable'])
         table.append(real_table)
         group = nodes.tgroup('', cols=2)
         real_table.append(group)

From bc3eeddb35e33d33a4965d92357401500b50c06c Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 09:15:11 +0200
Subject: [PATCH 073/226] Fix #728: escape root dir when putting it into a
 regex in latex/texinfo tests.

---
 tests/test_build_latex.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py
index 9cb95e095..b488440c2 100644
--- a/tests/test_build_latex.py
+++ b/tests/test_build_latex.py
@@ -38,7 +38,7 @@ def test_latex(app):
     LaTeXTranslator.ignore_missing_images = True
     app.builder.build_all()
     latex_warnings = latex_warnfile.getvalue().replace(os.sep, '/')
-    latex_warnings_exp = LATEX_WARNINGS % {'root': app.srcdir}
+    latex_warnings_exp = LATEX_WARNINGS % {'root': re.escape(app.srcdir)}
     assert re.match(latex_warnings_exp + '$', latex_warnings), \
            'Warnings don\'t match:\n' + \
            '--- Expected (regex):\n' + latex_warnings_exp + \

From dbfc8a9d83137637fabe8a4c9ed9a336aeb83eae Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 09:38:51 +0200
Subject: [PATCH 074/226] Fix #706: use a custom TextWrapper instead of
 monkeypatching a new wordsep_re into the textwrap one.

---
 sphinx/writers/text.py | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/sphinx/writers/text.py b/sphinx/writers/text.py
index 1d6ad648c..b82bfcdbb 100644
--- a/sphinx/writers/text.py
+++ b/sphinx/writers/text.py
@@ -18,6 +18,24 @@ from sphinx import addnodes
 from sphinx.locale import admonitionlabels, versionlabels, _
 
 
+class TextWrapper(textwrap.TextWrapper):
+    """Custom subclass that uses a different word separator regex."""
+
+    wordsep_re = re.compile(
+        r'(\s+|'                                  # any whitespace
+        r'(?<=\s)(?::[a-z-]+:)?`\S+|'             # interpreted text start
+        r'[^\s\w]*\w+[a-zA-Z]-(?=\w+[a-zA-Z])|'   # hyphenated words
+        r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w))')   # em-dash
+
+
+MAXWIDTH = 70
+STDINDENT = 3
+
+def my_wrap(text, width=MAXWIDTH, **kwargs):
+    w = TextWrapper(width=width, **kwargs)
+    return w.wrap(text)
+
+
 class TextWriter(writers.Writer):
     supported = ('text',)
     settings_spec = ('No options here.', '', ())
@@ -34,17 +52,6 @@ class TextWriter(writers.Writer):
         self.document.walkabout(visitor)
         self.output = visitor.body
 
-# monkey-patch...
-new_wordsep_re = re.compile(
-        r'(\s+|'                                  # any whitespace
-        r'(?<=\s)(?::[a-z-]+:)?`\S+|'             # interpreted text start
-        r'[^\s\w]*\w+[a-zA-Z]-(?=\w+[a-zA-Z])|'   # hyphenated words
-        r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w))')   # em-dash
-textwrap.TextWrapper.wordsep_re = new_wordsep_re
-
-MAXWIDTH = 70
-STDINDENT = 3
-
 
 class TextTranslator(nodes.NodeVisitor):
     sectionchars = '*=-~"+`'
@@ -73,7 +80,7 @@ class TextTranslator(nodes.NodeVisitor):
             if not toformat:
                 return
             if wrap:
-                res = textwrap.wrap(''.join(toformat), width=MAXWIDTH-maxindent)
+                res = my_wrap(''.join(toformat), width=MAXWIDTH-maxindent)
             else:
                 res = ''.join(toformat).splitlines()
             if end:
@@ -373,7 +380,7 @@ class TextTranslator(nodes.NodeVisitor):
             else:
                 cells = []
                 for i, cell in enumerate(line):
-                    par = textwrap.wrap(cell, width=colwidths[i])
+                    par = my_wrap(cell, width=colwidths[i])
                     if par:
                         maxwidth = max(map(len, par))
                     else:

From 08d556d4b6f051fb75f73ce4f77d439771abdb19 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 09:49:12 +0200
Subject: [PATCH 075/226] Fix #698: msgstr errors found by msgfmt -c.

---
 sphinx/locale/fi/LC_MESSAGES/sphinx.po    | 4 ++--
 sphinx/locale/fr/LC_MESSAGES/sphinx.po    | 2 +-
 sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po | 8 ++++----
 sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sphinx/locale/fi/LC_MESSAGES/sphinx.po b/sphinx/locale/fi/LC_MESSAGES/sphinx.po
index 04839bba6..770762313 100644
--- a/sphinx/locale/fi/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/fi/LC_MESSAGES/sphinx.po
@@ -676,7 +676,7 @@ msgstr "Tämä sivu"
 #: sphinx/themes/basic/changes/versionchanges.html:12
 #, python-format
 msgid "Changes in Version %(version)s &mdash; %(docstitle)s"
-msgstr "Muutos versiosta %(version) &mdash; %(docstitle)"
+msgstr "Muutos versiosta %(version)s &mdash; %(docstitle)s"
 
 #: sphinx/themes/basic/changes/rstsource.html:5
 #, python-format
@@ -686,7 +686,7 @@ msgstr ""
 #: sphinx/themes/basic/changes/versionchanges.html:17
 #, python-format
 msgid "Automatically generated list of changes in version %(version)s"
-msgstr "Automaattisesti luotu muutoshistoria alkaen versiosta %(version)"
+msgstr "Automaattisesti luotu muutoshistoria alkaen versiosta %(version)s"
 
 #: sphinx/themes/basic/changes/versionchanges.html:18
 msgid "Library changes"
diff --git a/sphinx/locale/fr/LC_MESSAGES/sphinx.po b/sphinx/locale/fr/LC_MESSAGES/sphinx.po
index 8afcf435a..bdb133968 100644
--- a/sphinx/locale/fr/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/fr/LC_MESSAGES/sphinx.po
@@ -650,7 +650,7 @@ msgstr "Chapitre suivant"
 msgid ""
 "Please activate JavaScript to enable the search\n"
 "    functionality."
-msgstr "Activez le JavaScript pour que la recherche fonctionne\n"
+msgstr "Activez le JavaScript pour que la recherche fonctionne."
 
 #: sphinx/themes/basic/search.html:23
 #, fuzzy
diff --git a/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po b/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po
index a85eaebe4..6871e412c 100644
--- a/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po
@@ -565,7 +565,7 @@ msgstr "всі функції, класи, терміни"
 #: sphinx/themes/basic/genindex-single.html:14
 #, python-format
 msgid "Index &ndash; %(key)s"
-msgstr "Індекс &ndash; %(key)"
+msgstr "Індекс &ndash; %(key)s"
 
 #: sphinx/themes/basic/genindex-single.html:46
 #: sphinx/themes/basic/genindex-split.html:24
@@ -690,17 +690,17 @@ msgstr "Ця сторінка"
 #: sphinx/themes/basic/changes/versionchanges.html:12
 #, python-format
 msgid "Changes in Version %(version)s &mdash; %(docstitle)s"
-msgstr "Зміни в Версії %(version)s &mdash; %(docstitle)"
+msgstr "Зміни в Версії %(version)s &mdash; %(docstitle)s"
 
 #: sphinx/themes/basic/changes/rstsource.html:5
 #, python-format
 msgid "%(filename)s &mdash; %(docstitle)s"
-msgstr "%(filename) &mdash; %(docstitle)"
+msgstr "%(filename)s &mdash; %(docstitle)s"
 
 #: sphinx/themes/basic/changes/versionchanges.html:17
 #, python-format
 msgid "Automatically generated list of changes in version %(version)s"
-msgstr "Автоматичного згенерований список змін в версії %(version)"
+msgstr "Автоматичного згенерований список змін в версії %(version)s"
 
 #: sphinx/themes/basic/changes/versionchanges.html:18
 msgid "Library changes"
diff --git a/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po b/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po
index c17620439..7afde0267 100644
--- a/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po
@@ -601,7 +601,7 @@ msgstr "版权所有"
 #: sphinx/themes/basic/layout.html:180
 #, python-format
 msgid "&copy; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
-msgstr "&copy; <a href=\"%(path)s\">版权所有</a> % (copyright)s."
+msgstr "&copy; <a href=\"%(path)s\">版权所有</a> %(copyright)s."
 
 #: sphinx/themes/basic/layout.html:182
 #, python-format

From 64e7fcb71e6072711a41f784c7bd08eeb076ac62 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Wed, 4 May 2011 17:18:59 +0200
Subject: [PATCH 076/226] Correctly treat built-in method (method descriptors)
 as methods

This fixes a bug where method descriptors were treated as data
descriptors. As the builtin_method_descriptor type is not exported
anywhere in Python, we check for the name here. As we know that
it is a descriptor, this should not be a problem.
---
 sphinx/ext/autodoc.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index d184342ef..f72e7dfa0 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -1072,7 +1072,8 @@ class AttributeDocumenter(ClassLevelDocumenter):
     @classmethod
     def can_document_member(cls, member, membername, isattr, parent):
         isdatadesc = isdescriptor(member) and not \
-                     isinstance(member, cls.method_types)
+                     isinstance(member, cls.method_types) and not \
+                     type(member).__name__ == "method_descriptor"
         return isdatadesc or \
                (isattr and not isinstance(parent, ModuleDocumenter))
 

From 651a00f3cdf7a0e8f9ba5fc609a0e890db5a1627 Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Wed, 6 Jul 2011 08:25:25 +0200
Subject: [PATCH 077/226] Close #630: Revamp data structures used for message
 catalogs.

---
 sphinx/builders/gettext.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py
index 89703e721..47336cad9 100644
--- a/sphinx/builders/gettext.py
+++ b/sphinx/builders/gettext.py
@@ -43,6 +43,17 @@ msgstr ""
 """[1:]
 
 
+class Catalog(object):
+    def __init__(self):
+        self.messages = []  # retain order
+        self.metadata = {}  # msgid -> file, line, uid
+    def add(self, msg, origin):
+        if msg not in self.metadata:  # faster lookup in hash
+            self.messages.append(msg)
+            self.metadata[msg] = []
+        self.metadata[msg].append((origin.source, origin.line, origin.uid))
+
+
 class I18nBuilder(Builder):
     """
     General i18n builder.
@@ -52,7 +63,7 @@ class I18nBuilder(Builder):
 
     def init(self):
         Builder.init(self)
-        self.catalogs = defaultdict(dict)
+        self.catalogs = defaultdict(Catalog)
 
     def get_target_uri(self, docname, typ=None):
         return ''
@@ -71,9 +82,7 @@ class I18nBuilder(Builder):
                 continue # built-in message
             if isinstance(node, nodes.literal_block):
                 continue
-            if not msg in catalog:
-                catalog[msg] = []
-            catalog[msg].append((node.source, node.line, node.uid))
+            catalog.add(msg, node)
 
 
 class MessageCatalogBuilder(I18nBuilder):
@@ -91,7 +100,7 @@ class MessageCatalogBuilder(I18nBuilder):
             # XXX should supply tz
             ctime = datetime.now().strftime('%Y-%m-%d %H:%M%z'),
         )
-        for section, messages in self.status_iterator(
+        for section, catalog in self.status_iterator(
                 self.catalogs.iteritems(), "writing message catalogs... ",
                 lambda (section, _):darkgreen(section), len(self.catalogs)):
 
@@ -99,7 +108,8 @@ class MessageCatalogBuilder(I18nBuilder):
             pofile = open(pofn, 'w', encoding='utf-8')
             try:
                 pofile.write(POHEADER % data)
-                for message, positions in messages.iteritems():
+                for message in catalog.messages:
+                    positions = catalog.metadata[message]
                     if positions:
                         # generate "#: file1:line1 file2:line2 ..."
                         pofile.write(u"#: %s\n" % ", ".join("%s:%s" %

From f477eaf26f960171173bc53d7372558670175a16 Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Wed, 6 Jul 2011 08:31:40 +0200
Subject: [PATCH 078/226] Comment and stretch out code.

Also leverage the fact that we ignore Sphinx' built-in messages for catalogs.
---
 sphinx/builders/gettext.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py
index 47336cad9..0eb985edd 100644
--- a/sphinx/builders/gettext.py
+++ b/sphinx/builders/gettext.py
@@ -44,9 +44,12 @@ msgstr ""
 
 
 class Catalog(object):
+    """Catalog of translatable messages."""
+
     def __init__(self):
-        self.messages = []  # retain order
+        self.messages = []  # retain insertion order, a la OrderedDict
         self.metadata = {}  # msgid -> file, line, uid
+
     def add(self, msg, origin):
         if msg not in self.metadata:  # faster lookup in hash
             self.messages.append(msg)
@@ -108,19 +111,22 @@ class MessageCatalogBuilder(I18nBuilder):
             pofile = open(pofn, 'w', encoding='utf-8')
             try:
                 pofile.write(POHEADER % data)
+
                 for message in catalog.messages:
                     positions = catalog.metadata[message]
-                    if positions:
-                        # generate "#: file1:line1 file2:line2 ..."
-                        pofile.write(u"#: %s\n" % ", ".join("%s:%s" %
-                            (path.relpath(source, self.srcdir), line)
-                            for source, line, _ in positions))
-                        # generate "# uuid ..."
-                        pofile.write(u"# %s\n" % ", ".join(uid for _, _, uid
-                            in positions))
+
+                    # generate "#: file1:line1 file2:line2 ..."
+                    pofile.write(u"#: %s\n" % ", ".join("%s:%s" %
+                        (path.relpath(source, self.srcdir), line)
+                        for source, line, _ in positions))
+                    # generate "# uuid ..."
+                    pofile.write(u"# %s\n" % ", ".join(uid for _, _, uid
+                        in positions))
+
                     # message contains *one* line of text ready for translation
                     message = message.replace(u'\\', ur'\\'). \
                                       replace(u'"', ur'\"')
                     pofile.write(u'msgid "%s"\nmsgstr ""\n\n' % message)
+
             finally:
                 pofile.close()

From f1f7bde914364d25b3f420a719d0bb25fedf0fbd Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Wed, 6 Jul 2011 08:34:26 +0200
Subject: [PATCH 079/226] Distribute UUIDs over multiple comment lines.

---
 sphinx/builders/gettext.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py
index 0eb985edd..407f1cd13 100644
--- a/sphinx/builders/gettext.py
+++ b/sphinx/builders/gettext.py
@@ -119,8 +119,8 @@ class MessageCatalogBuilder(I18nBuilder):
                     pofile.write(u"#: %s\n" % ", ".join("%s:%s" %
                         (path.relpath(source, self.srcdir), line)
                         for source, line, _ in positions))
-                    # generate "# uuid ..."
-                    pofile.write(u"# %s\n" % ", ".join(uid for _, _, uid
+                    # generate "# uuid1\n# uuid2\n ..."
+                    pofile.write(u"# %s\n" % "\n# ".join(uid for _, _, uid
                         in positions))
 
                     # message contains *one* line of text ready for translation

From b5f53e1972393161fdd00c240bc47b9953134627 Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Wed, 6 Jul 2011 08:52:07 +0200
Subject: [PATCH 080/226] Move node filtering into extract_messages.

---
 sphinx/builders/gettext.py |  4 ----
 sphinx/util/nodes.py       | 13 +++++++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py
index 407f1cd13..fbe8afbb2 100644
--- a/sphinx/builders/gettext.py
+++ b/sphinx/builders/gettext.py
@@ -81,10 +81,6 @@ class I18nBuilder(Builder):
         catalog = self.catalogs[docname.split(SEP, 1)[0]]
 
         for node, msg in extract_messages(doctree):
-            if not node.source:
-                continue # built-in message
-            if isinstance(node, nodes.literal_block):
-                continue
             catalog.add(msg, node)
 
 
diff --git a/sphinx/util/nodes.py b/sphinx/util/nodes.py
index a241f5742..682ea77bc 100644
--- a/sphinx/util/nodes.py
+++ b/sphinx/util/nodes.py
@@ -22,16 +22,25 @@ from sphinx.util.pycompat import class_types
 explicit_title_re = re.compile(r'^(.+?)\s*(?<!\x00)<(.*?)>$', re.DOTALL)
 caption_ref_re = explicit_title_re  # b/w compat alias
 
-
+IGNORED_NODES = (
+    nodes.Invisible,
+    nodes.Inline,
+    nodes.literal_block,
+    nodes.doctest_block,
+    #XXX there are probably more
+)
 def extract_messages(doctree):
     """Extract translatable messages from a document tree."""
     for node in doctree.traverse(nodes.TextElement):
-        if isinstance(node, (nodes.Invisible, nodes.Inline)):
+        if not node.source:
+            continue # built-in message
+        if isinstance(node, IGNORED_NODES):
             continue
         # <field_name>orphan</field_name>
         # XXX ignore all metadata (== docinfo)
         if isinstance(node, nodes.field_name) and node.children[0] == 'orphan':
             continue
+
         msg = node.rawsource.replace('\n', ' ').strip()
         # XXX nodes rendering empty are likely a bug in sphinx.addnodes
         if msg:

From cab5a5edc165a524aacac1f858376e8f5446d25a Mon Sep 17 00:00:00 2001
From: Mark Lodato <lodatom@gmail.com>
Date: Wed, 6 Jul 2011 21:52:10 -0400
Subject: [PATCH 081/226] PygmentsBridge: construct new formatter each time

Previously, we pre-constructed two different formatters, one with line
numbers and one without.  This made the code rather confusing and also
was not scalable for options that take arguments, such as 'hl_lines'.
Now, we construct a new HTMLFormatter or LatexFormatter on each call to
highlight_block().
---
 sphinx/highlighting.py | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
index 76bcb122d..75c8be13a 100644
--- a/sphinx/highlighting.py
+++ b/sphinx/highlighting.py
@@ -94,14 +94,12 @@ class PygmentsBridge(object):
         else:
             style = get_style_by_name(stylename)
         self.trim_doctest_flags = trim_doctest_flags
+        self.formatter_args = {'style' : style}
         if dest == 'html':
-            self.fmter = {False: self.html_formatter(style=style),
-                          True: self.html_formatter(style=style, linenos=True)}
+            self.formatter = self.html_formatter
         else:
-            self.fmter = {False: self.latex_formatter(style=style,
-                                                      commandprefix='PYG'),
-                          True: self.latex_formatter(style=style, linenos=True,
-                                                     commandprefix='PYG')}
+            self.formatter = self.latex_formatter
+            self.formatter_args['commandprefix'] = 'PYG'
 
     def unhighlighted(self, source):
         if self.dest == 'html':
@@ -200,29 +198,36 @@ class PygmentsBridge(object):
 
         # highlight via Pygments
         try:
+            formatter = self.get_formatter(linenos=bool(linenos))
+            hlsource = highlight(source, lexer, formatter)
             if self.dest == 'html':
-                return highlight(source, lexer, self.fmter[bool(linenos)])
+                return hlsource
+            elif hlsource.startswith(r'\begin{Verbatim}[commandchars=\\\{\}'):
+                # Pygments >= 1.2
+                return hlsource.translate(tex_hl_escape_map_new)
             else:
-                hlsource = highlight(source, lexer, self.fmter[bool(linenos)])
-                if hlsource.startswith(r'\begin{Verbatim}[commandchars=\\\{\}'):
-                    # Pygments >= 1.2
-                    return hlsource.translate(tex_hl_escape_map_new)
                 return hlsource.translate(tex_hl_escape_map_old)
         except ErrorToken:
             # this is most probably not the selected language,
             # so let it pass unhighlighted
             return self.unhighlighted(source)
 
+    def get_formatter(self, **kwargs_orig):
+        kwargs = self.formatter_args.copy()
+        kwargs.update(kwargs_orig)
+        return self.formatter(**kwargs)
+
     def get_stylesheet(self):
         if not pygments:
             if self.dest == 'latex':
                 return _LATEX_STYLES
             # no HTML styles needed
             return ''
+        formatter = self.get_formatter()
         if self.dest == 'html':
-            return self.fmter[0].get_style_defs('.highlight')
+            return formatter.get_style_defs('.highlight')
         else:
-            styledefs = self.fmter[0].get_style_defs()
+            styledefs = formatter.get_style_defs()
             # workaround for Pygments < 0.12
             if styledefs.startswith('\\newcommand\\at{@}'):
                 styledefs += _LATEX_STYLES

From 94aab04ecb629430e8d61b06f643531691742e76 Mon Sep 17 00:00:00 2001
From: Mark Lodato <lodatom@gmail.com>
Date: Wed, 6 Jul 2011 22:05:22 -0400
Subject: [PATCH 082/226] PygmentsBridge: pass keyword arguments to Pygments

In Pygments.highlight_block, pass all extra keyword arguments, including
linenos, directly to the Pygments formatter.  This allows custom
directives to use other Pygments features.
---
 sphinx/ext/viewcode.py  | 2 +-
 sphinx/highlighting.py  | 4 ++--
 sphinx/writers/html.py  | 2 +-
 sphinx/writers/latex.py | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sphinx/ext/viewcode.py b/sphinx/ext/viewcode.py
index 020db6974..32840f30f 100644
--- a/sphinx/ext/viewcode.py
+++ b/sphinx/ext/viewcode.py
@@ -98,7 +98,7 @@ def collect_pages(app):
         # construct a page name for the highlighted source
         pagename = '_modules/' + modname.replace('.', '/')
         # highlight the source using the builder's highlighter
-        highlighted = highlighter.highlight_block(code, 'python', False)
+        highlighted = highlighter.highlight_block(code, 'python', linenos=False)
         # split the code into lines
         lines = highlighted.splitlines()
         # split off wrap markup from the first line of the actual code
diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
index 75c8be13a..65fe9f7d3 100644
--- a/sphinx/highlighting.py
+++ b/sphinx/highlighting.py
@@ -151,7 +151,7 @@ class PygmentsBridge(object):
         else:
             return True
 
-    def highlight_block(self, source, lang, linenos=False, warn=None):
+    def highlight_block(self, source, lang, warn=None, **kwargs):
         if not isinstance(source, unicode):
             source = source.decode()
         if not pygments:
@@ -198,7 +198,7 @@ class PygmentsBridge(object):
 
         # highlight via Pygments
         try:
-            formatter = self.get_formatter(linenos=bool(linenos))
+            formatter = self.get_formatter(**kwargs)
             hlsource = highlight(source, lexer, formatter)
             if self.dest == 'html':
                 return hlsource
diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py
index 99d621c6f..261325155 100644
--- a/sphinx/writers/html.py
+++ b/sphinx/writers/html.py
@@ -241,7 +241,7 @@ class HTMLTranslator(BaseTranslator):
         def warner(msg):
             self.builder.warn(msg, (self.builder.current_docname, node.line))
         highlighted = self.highlighter.highlight_block(
-            node.rawsource, lang, linenos, warn=warner)
+            node.rawsource, lang, warn=warner, linenos=linenos)
         starttag = self.starttag(node, 'div', suffix='',
                                  CLASS='highlight-%s' % lang)
         self.body.append(starttag + highlighted + '</div>\n')
diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index ccd7a8bf2..f9eca27fb 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -1267,8 +1267,8 @@ class LaTeXTranslator(nodes.NodeVisitor):
             linenos = node['linenos']
         def warner(msg):
             self.builder.warn(msg, (self.curfilestack[-1], node.line))
-        hlcode = self.highlighter.highlight_block(code, lang, linenos,
-                                                  warn=warner)
+        hlcode = self.highlighter.highlight_block(code, lang, warn=warner,
+                                                  linenos=linenos)
         # workaround for Unicode issue
         hlcode = hlcode.replace(u'€', u'@texteuro[]')
         # must use original Verbatim environment and "tabular" environment

From b9279ca1e30c420c786e83fd6ef6342a0d549f46 Mon Sep 17 00:00:00 2001
From: Mark Lodato <lodatom@gmail.com>
Date: Wed, 6 Jul 2011 22:47:32 -0400
Subject: [PATCH 083/226] add 'highlight_args' option for literal_block nodes

For the HTML and LaTeX writers, if 'highlight_args' is set on
a literal_block node, this is taken as a dictionary of keyword arguments
to pass to PygmentsBridge.highlight_block.  This allows custom
directives to directly set formatter options.
---
 sphinx/writers/html.py  | 4 +++-
 sphinx/writers/latex.py | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py
index 261325155..90830c249 100644
--- a/sphinx/writers/html.py
+++ b/sphinx/writers/html.py
@@ -238,10 +238,12 @@ class HTMLTranslator(BaseTranslator):
             lang = node['language']
         if node.has_key('linenos'):
             linenos = node['linenos']
+        highlight_args = node.get('highlight_args', {})
         def warner(msg):
             self.builder.warn(msg, (self.builder.current_docname, node.line))
         highlighted = self.highlighter.highlight_block(
-            node.rawsource, lang, warn=warner, linenos=linenos)
+            node.rawsource, lang, warn=warner, linenos=linenos,
+            **highlight_args)
         starttag = self.starttag(node, 'div', suffix='',
                                  CLASS='highlight-%s' % lang)
         self.body.append(starttag + highlighted + '</div>\n')
diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index f9eca27fb..799756c6a 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -1265,10 +1265,11 @@ class LaTeXTranslator(nodes.NodeVisitor):
             lang = node['language']
         if 'linenos' in node:
             linenos = node['linenos']
+        highlight_args = node.get('highlight_args', {})
         def warner(msg):
             self.builder.warn(msg, (self.curfilestack[-1], node.line))
         hlcode = self.highlighter.highlight_block(code, lang, warn=warner,
-                                                  linenos=linenos)
+                linenos=linenos, **highlight_args)
         # workaround for Unicode issue
         hlcode = hlcode.replace(u'€', u'@texteuro[]')
         # must use original Verbatim environment and "tabular" environment

From 2c0f936e6ba6cf4996175106a289b04f0856cd9a Mon Sep 17 00:00:00 2001
From: Mark Lodato <lodatom@gmail.com>
Date: Wed, 6 Jul 2011 22:58:19 -0400
Subject: [PATCH 084/226] add :emphasize-lines: option to source-code and
 literal-include

Add a new option, :emphasize-lines:, to the source-code and
literal-include directives.  The format is the same as the :lines:
option for literal-include.  The resulting list of lines is passed to
the Pygments formatter as 'hl_lines', which is only honored by the HTML
formatter.
---
 doc/markup/code.rst       | 18 ++++++++++++++++--
 sphinx/directives/code.py | 27 +++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/doc/markup/code.rst b/doc/markup/code.rst
index eaaf17d08..8f6d55247 100644
--- a/doc/markup/code.rst
+++ b/doc/markup/code.rst
@@ -86,6 +86,18 @@ on line numbers for the individual block::
 
       Some more Ruby code.
 
+Additionally, an ``emphasize-lines`` option can be given to have Pygments
+emphasize particular lines::
+
+    .. code-block:: python
+       :emphasize-lines: 3,5
+
+       def some_function():
+           interesting = False
+           print 'This line is highlighted.'
+           print 'This one is not...'
+           print '...but this one is.'
+
 
 Includes
 ^^^^^^^^
@@ -107,11 +119,13 @@ Includes
    desired tab width.
 
    The directive also supports the ``linenos`` flag option to switch on line
-   numbers, and a ``language`` option to select a language different from the
-   current file's standard language.  Example with options::
+   numbers, the ``emphasize-lines`` option to emphasize particular lines, and
+   a ``language`` option to select a language different from the current
+   file's standard language.  Example with options::
 
       .. literalinclude:: example.rb
          :language: ruby
+         :emphasize-lines: 12,15-18
          :linenos:
 
    Include files are assumed to be encoded in the :confval:`source_encoding`.
diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py
index 8cedab190..f41ca3a69 100644
--- a/sphinx/directives/code.py
+++ b/sphinx/directives/code.py
@@ -55,13 +55,28 @@ class CodeBlock(Directive):
     final_argument_whitespace = False
     option_spec = {
         'linenos': directives.flag,
+        'emphasize-lines': directives.unchanged_required,
     }
 
     def run(self):
         code = u'\n'.join(self.content)
+
+        linespec = self.options.get('emphasize-lines')
+        if linespec:
+            try:
+                nlines = len(self.content)
+                hl_lines = [x+1 for x in parselinenos(linespec, nlines)]
+            except ValueError, err:
+                document = self.state.document
+                return [document.reporter.warning(str(err), line=self.lineno)]
+        else:
+            hl_lines = None
+
         literal = nodes.literal_block(code, code)
         literal['language'] = self.arguments[0]
         literal['linenos'] = 'linenos' in self.options
+        if hl_lines is not None:
+            literal['highlight_args'] = {'hl_lines': hl_lines}
         literal.line = self.lineno
         return [literal]
 
@@ -88,6 +103,7 @@ class LiteralInclude(Directive):
         'end-before': directives.unchanged_required,
         'prepend': directives.unchanged_required,
         'append': directives.unchanged_required,
+        'emphasize-lines': directives.unchanged_required,
     }
 
     def run(self):
@@ -146,6 +162,15 @@ class LiteralInclude(Directive):
                     'Line spec %r: no lines pulled from include file %r' %
                     (linespec, filename), line=self.lineno)]
 
+        linespec = self.options.get('emphasize-lines')
+        if linespec:
+            try:
+                hl_lines = [x+1 for x in parselinenos(linespec, len(lines))]
+            except ValueError, err:
+                return [document.reporter.warning(str(err), line=self.lineno)]
+        else:
+            hl_lines = None
+
         startafter = self.options.get('start-after')
         endbefore  = self.options.get('end-before')
         prepend    = self.options.get('prepend')
@@ -178,6 +203,8 @@ class LiteralInclude(Directive):
             retnode['language'] = self.options['language']
         if 'linenos' in self.options:
             retnode['linenos'] = True
+        if hl_lines is not None:
+            retnode['highlight_args'] = {'hl_lines': hl_lines}
         env.note_dependency(rel_filename)
         return [retnode]
 

From 5d936d5ff152c476ff731d6232eb09f3d461621b Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 10:05:37 +0200
Subject: [PATCH 085/226] Fix :samp: latex tests.

---
 sphinx/writers/latex.py | 4 +++-
 tests/test_markup.py    | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index d4b2695a9..0e4e98cc6 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -1469,7 +1469,9 @@ class LaTeXTranslator(nodes.NodeVisitor):
             self.verbatim += node.astext()
         else:
             text = self.encode(node.astext())
-            self.body.append(educate_quotes_latex(text))
+            if not self.no_contractions:
+                text = educate_quotes_latex(text)
+            self.body.append(text)
     def depart_Text(self, node):
         pass
 
diff --git a/tests/test_markup.py b/tests/test_markup.py
index 09f617f47..5d56bea30 100644
--- a/tests/test_markup.py
+++ b/tests/test_markup.py
@@ -84,14 +84,14 @@ def test_inline():
     _html = ('<p><tt class="(samp )?docutils literal"><span class="pre">'
              'code</span>&nbsp;&nbsp; <span class="pre">sample</span></tt></p>')
     yield verify_re, '``code   sample``', _html, r'\\code{code   sample}'
-    yield verify_re, ':samp:`code   sample`', _html, r'\\samp{code   sample}'
+    yield verify_re, ':samp:`code   sample`', _html, r'\\code{code   sample}'
 
     # interpolation of braces in samp and file roles (HTML only)
     yield (verify, ':samp:`a{b}c`',
            '<p><tt class="samp docutils literal"><span class="pre">a</span>'
            '<em><span class="pre">b</span></em>'
            '<span class="pre">c</span></tt></p>',
-           '\\samp{abc}')
+           '\\code{a\\emph{b}c}')
 
     # interpolation of arrows in menuselection
     yield (verify, ':menuselection:`a --> b`',

From 13ef18cd09ad54587ba8c439711acc652c2a9ecd Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 10:16:20 +0200
Subject: [PATCH 086/226] Fix #649: translate default html_title. Update locale
 catalogs.

---
 sphinx/config.py                          |   3 +-
 sphinx/locale/bn/LC_MESSAGES/sphinx.mo    | Bin 12091 -> 12147 bytes
 sphinx/locale/bn/LC_MESSAGES/sphinx.po    | 129 +++---
 sphinx/locale/ca/LC_MESSAGES/sphinx.mo    | Bin 9093 -> 9093 bytes
 sphinx/locale/ca/LC_MESSAGES/sphinx.po    | 128 +++---
 sphinx/locale/cs/LC_MESSAGES/sphinx.mo    | Bin 8688 -> 8687 bytes
 sphinx/locale/cs/LC_MESSAGES/sphinx.po    | 130 +++---
 sphinx/locale/da/LC_MESSAGES/sphinx.mo    | Bin 9357 -> 9357 bytes
 sphinx/locale/da/LC_MESSAGES/sphinx.po    | 128 +++---
 sphinx/locale/de/LC_MESSAGES/sphinx.mo    | Bin 9616 -> 9672 bytes
 sphinx/locale/de/LC_MESSAGES/sphinx.po    | 128 +++---
 sphinx/locale/es/LC_MESSAGES/sphinx.mo    | Bin 7603 -> 7603 bytes
 sphinx/locale/es/LC_MESSAGES/sphinx.po    | 131 +++---
 sphinx/locale/et/LC_MESSAGES/sphinx.js    |   2 +-
 sphinx/locale/et/LC_MESSAGES/sphinx.mo    | Bin 9698 -> 9137 bytes
 sphinx/locale/et/LC_MESSAGES/sphinx.po    | 401 ++++++++---------
 sphinx/locale/fa/LC_MESSAGES/sphinx.mo    | Bin 8532 -> 8588 bytes
 sphinx/locale/fa/LC_MESSAGES/sphinx.po    | 171 +++-----
 sphinx/locale/fi/LC_MESSAGES/sphinx.mo    | Bin 8777 -> 8836 bytes
 sphinx/locale/fi/LC_MESSAGES/sphinx.po    | 127 +++---
 sphinx/locale/fr/LC_MESSAGES/sphinx.mo    | Bin 8513 -> 8513 bytes
 sphinx/locale/fr/LC_MESSAGES/sphinx.po    | 128 +++---
 sphinx/locale/hr/LC_MESSAGES/sphinx.mo    | Bin 8803 -> 8859 bytes
 sphinx/locale/hr/LC_MESSAGES/sphinx.po    | 131 +++---
 sphinx/locale/it/LC_MESSAGES/sphinx.mo    | Bin 9100 -> 9100 bytes
 sphinx/locale/it/LC_MESSAGES/sphinx.po    | 129 +++---
 sphinx/locale/ja/LC_MESSAGES/sphinx.mo    | Bin 10904 -> 10186 bytes
 sphinx/locale/ja/LC_MESSAGES/sphinx.po    | 124 +++---
 sphinx/locale/ko/LC_MESSAGES/sphinx.js    |   2 +-
 sphinx/locale/ko/LC_MESSAGES/sphinx.mo    | Bin 9307 -> 7126 bytes
 sphinx/locale/ko/LC_MESSAGES/sphinx.po    | 502 +++++++++++-----------
 sphinx/locale/lt/LC_MESSAGES/sphinx.mo    | Bin 9789 -> 9845 bytes
 sphinx/locale/lt/LC_MESSAGES/sphinx.po    | 131 +++---
 sphinx/locale/lv/LC_MESSAGES/sphinx.js    |   2 +-
 sphinx/locale/lv/LC_MESSAGES/sphinx.mo    | Bin 10113 -> 9651 bytes
 sphinx/locale/lv/LC_MESSAGES/sphinx.po    | 345 +++++++--------
 sphinx/locale/ne/LC_MESSAGES/sphinx.mo    | Bin 12322 -> 12378 bytes
 sphinx/locale/ne/LC_MESSAGES/sphinx.po    | 140 +++---
 sphinx/locale/nl/LC_MESSAGES/sphinx.mo    | Bin 9041 -> 9096 bytes
 sphinx/locale/nl/LC_MESSAGES/sphinx.po    | 128 +++---
 sphinx/locale/pl/LC_MESSAGES/sphinx.mo    | Bin 9495 -> 9551 bytes
 sphinx/locale/pl/LC_MESSAGES/sphinx.po    | 133 +++---
 sphinx/locale/pt_BR/LC_MESSAGES/sphinx.mo | Bin 9663 -> 9663 bytes
 sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po | 132 +++---
 sphinx/locale/ru/LC_MESSAGES/sphinx.mo    | Bin 10738 -> 10794 bytes
 sphinx/locale/ru/LC_MESSAGES/sphinx.po    | 130 +++---
 sphinx/locale/sl/LC_MESSAGES/sphinx.mo    | Bin 8827 -> 8883 bytes
 sphinx/locale/sl/LC_MESSAGES/sphinx.po    | 131 +++---
 sphinx/locale/sphinx.pot                  | 104 ++---
 sphinx/locale/sv/LC_MESSAGES/sphinx.mo    | Bin 9097 -> 9153 bytes
 sphinx/locale/sv/LC_MESSAGES/sphinx.po    | 130 +++---
 sphinx/locale/tr/LC_MESSAGES/sphinx.mo    | Bin 9662 -> 9718 bytes
 sphinx/locale/tr/LC_MESSAGES/sphinx.po    | 191 ++++----
 sphinx/locale/uk_UA/LC_MESSAGES/sphinx.mo | Bin 10425 -> 10486 bytes
 sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po | 130 +++---
 sphinx/locale/zh_CN/LC_MESSAGES/sphinx.mo | Bin 8537 -> 8592 bytes
 sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po | 126 +++---
 sphinx/locale/zh_TW/LC_MESSAGES/sphinx.mo | Bin 8342 -> 8398 bytes
 sphinx/locale/zh_TW/LC_MESSAGES/sphinx.po | 124 +++---
 59 files changed, 1990 insertions(+), 2581 deletions(-)

diff --git a/sphinx/config.py b/sphinx/config.py
index 143dcd711..2250c57f7 100644
--- a/sphinx/config.py
+++ b/sphinx/config.py
@@ -15,6 +15,7 @@ import sys
 from os import path
 
 from sphinx.errors import ConfigError
+from sphinx.locale import l_
 from sphinx.util.osutil import make_filename
 from sphinx.util.pycompat import bytes, b, convert_with_2to3
 
@@ -77,7 +78,7 @@ class Config(object):
         html_theme = ('default', 'html'),
         html_theme_path = ([], 'html'),
         html_theme_options = ({}, 'html'),
-        html_title = (lambda self: '%s %s documentation' %
+        html_title = (lambda self: l_('%s %s documentation') %
                                    (self.project, self.release),
                       'html'),
         html_short_title = (lambda self: self.html_title, 'html'),
diff --git a/sphinx/locale/bn/LC_MESSAGES/sphinx.mo b/sphinx/locale/bn/LC_MESSAGES/sphinx.mo
index 3f23ac2e7d3402d2b65cc7203d4afcc6070ada8c..cb06ba98706c6abf5ab5d6c2c3d9403c7a02a681 100644
GIT binary patch
delta 2598
zcmZY9e@vBC9LMo5p$LMBAc#N6D*-BS@m^$jq0Ka8vZP_C{a7YoT^5xv6)Vbk!hafL
z1?8HIWTO?f&|J%knB_uOtIet9l5kfCwUTnUlF~8R>iyw9TWdLaUgw<WdA{d+zUMsm
z__pzF&gFz@Zy5hN_*=wZXqtNe{yP|B7Du-Wr(-Xs;RncnJMVf4b^i(`;uy}sh?!<{
zF%f6uGE}?(&N6eXghng_o7@K~@pk(4r~pmwcsuffb)zOYiph8q<8cV}-f!r^3Do-w
z2(I`!T=aYZ^?W(bV}7fmF`t3wP=Q~^1$YQkZ~&F@Mfd&{)bqEn0F$`67|YOyPvb)D
z!X)fRieYCl8i#N-{-{3l+Y*+gm1S|6fdSNuYcL-lKxN#DO6(viP#<bVU!W!!#Bv<L
zDD+bfieLd$LdCcWD^Xi@03H6Ui;DsrQ76Le6I9?nHjG$y23465-iE)s{c+TBnL&1X
zKMoZ*8MS~#u6d~UOK}NqMP9Y0c<N6T>{WN*O;rCdD)UcKdw9z2e~+4Q7?s%1s7j2Z
zCY(gQm%vLp%&Dk~72!R&1+~TwOviWUP=8H$ngNw;2(<;n$oAT(+yB$OKZ!cckqP1Z
zDX4(ys1mP4a<Fn#VpXoSsCc`O5Y~jMSi3_*6L(@HzJ*$04=Ryf%)}3IDnWOA7&XBt
zDxp6x6{D!L0;i)U%0*4Q2DLS1s0CM`D&$ns(1d$YFE*nBwxUjdw>#dCn(!2=^ru}f
zq5_Yi626A|eYk;2cs{|T2X%ibYQ7anB97&|53EH^P>L$){cgVsRnl5_{CQNVTTq9n
z2Q|URsL%2<)Iu(x5*@}99O`Rs|9wuj4)JkJ)AxUZhF%zPy^31VU&tct7B0ux^Y{_L
zLS)ElP%C{ARmyJE^Pgh|ev3-<CaRK&T<*Xe)M4F#+4}ygX%yirsMGp2sscZu2d}&1
zi7byrST1H_F)EQKF%O$jiGGC4X_s*&-as#A5uBzygi3f9I(o5<hCYvzn2pm(+lPMC
z3bu0zU=wO(eW=o2!WO)Ws>B|mYK0xhko93cp2rOs%?Z_3Zbpp<Q>nl9ypsV<@HVP6
zA$%0CBa63<MAZ*REv~~>?8I}Z=bu^}u2?gw-;RxJ@*ymt?;*QoSc9vv4YlQG(j0=*
z_<;d^7R&Dp|1cDw0zHCS@lMpl2XGaJa4XJD5BGPXo_i0;+0G(!+ZbvAv$(1InOvC4
z%24ywJ2d<>_9CCK9Ysw%fLie&D&q-Uj{!FR2)=~cD(_OhZG0Hj??lD<3iWjip(gwl
zl}H?A(AH!ixtX(;##CvzD3LbQ3I|Y!Yyx#?Je(|9gbKJB74TWqsc*+9d<V6F!>9@j
zxcw2Vqkj|iTus*050hg%Xhbv6hzh(9@4_Bb1x8SbM6x^<VOgk^RUqfewqpr8sFHq(
zG58%8V+hxyCnucn6R7u_r~2&wYc!~?^`bIAH+9487c8a!H^yNp-;iG1f|@vpdVU{L
zB<pbd1FnOp&v*<ur#6YI@WR~iR^5kp6WbbTC~!Y&@4i7z9763;#)|L+_wH|rc`!a>
zx99Qt$M)<9)-_Z&)YjJ>3&qsL7W(~OU!gb8@A3PJd<EIQJfCmo#&T~(@R{1(Jmg(h
i-4HDD<oW*dT!80}y^s_e5mB)J<>XEO4}BpynDP(V6BMWb

delta 2548
zcmYM!eN2^Q7{~DoB;rLB@qkDW2PH%B&^bqu*DMtRbW4{N#L|?FnMJh1S!}dt)_OTE
zT}A|Ab!?-i(b|mRnjwzKa<iD$bhz2emjCdNHc4G>)%yN8_ZB;x&wW2H*L_{rb3f<L
zZQpM5e$7beHU9ee&*lGOf@c5!y_;+{m+5}I3kPrs9zi~K#yN>PKZOhM7xdvDI3E*I
zVsU(!#=HPi%{+U6fi9@VdAJc3pv4_;N8Qkk3vnN2;U}1mBdGhnLqA?Z-G3Wdz>@gV
z^*+?~CAbJ{a53xK;|vtI19R|o%*KyVm7j3u&){O_Q@9#$U_KUcQ4kyO9_+$Q>_v*V
zAxy#%T!Uk7{tu?Hz9mxL-RMKzn2W10jLLW?DzR5lfqGCCeS}(I7&qZ5OvE(WLGk88
zC6tflSdDr_oyf<!`0^Cs9nIp*-bV%Q;dv0tzCd;68;r*v-26Ohn_NZRKaC1JgDT)J
z=RC64{e@V7704-TL5jEM(&@hryy6bLjmrE3)H95_`Ek^Oqo~BjQJpxCTJSRJzU!z>
zd<WIBEP|}V5UR%AScq?+5;(em{;Opp9MB^eMINh7xcLRt`OB!?{F^&}6BW=hVlAGJ
ztZ5~v#A=*%sCbVew^$3RW9_K8dprhn7`%q6a4#y6w{RIAz}W=d@ln(Q6R3nHF%N%7
z1y;YcPzq|{T-2i}LRDOf>QFUmJ+GO8Zrq9rxD&PeyWR0#)Phk|>yJ85paM^z5<Z9e
zUHA!=@Ga-x?))5rYr#}hBI(F=p5-yn0)?oS2Hd;`)zUh5{7KYqZbR*vy{Lr_qF&2>
zR3TrZ5*@`cHuX6-kFc|~iThBA4q&q0|5LLAv$Lp*e#GTCg)1<QUkip-in_55)xu|y
z;_OYl4-cUdJdNt$6}%U3qBiM54wm3@timTSNALf83{?3L`thVr;1wi!yN$~*l`@q`
z7{l0zO0*kU!#>BAIEDe7K|baum=dl+-PeTca36ZgXp%t?@1QCu=Bol9K~?6VTKXAA
za2VBz2Z^c*w<Cwl!&P_~H{u1<Bg|!o>UaS4s9RC-pU<QJYRw=Aw&F>oSj#4=elS8<
zi(7C2`%%}g%#U@f5jAhdu6TaJv5xsPHy2?kS+2n*)ZX|IH{%i1CcLr4i~S({%K-&i
zx-?dCC2HYkup9^RY5dvED+^=Sy@cd!eaPB2f-2yWJAWMsZ9dwl1<Nsnwa6RG`_DiN
zM^F_<Q5lb8J?g=K2@R-6bqgQHg8O6hR#cz^sJG%%)Pl!RiCjcInrlcdmP}h_JHwX}
z@tPQ@!U$@UjiWZrv@@O^rhvJqfDfT|eKRIvJF0+AR0kq%ehfR9pGI9*S{(a9D#Ik^
zYmvB~ZD3H%ffrC6IEG5(dn9R_K~<JR`Rpev#yYG=wRArw;{dM5L9EAVRKmd(vHKfQ
z^QVyJ+RK=!_rKqr_zD|1aTe!dI`5Dc&O<F6KvlW{X^w4o^N2HwdW}breQFb^7GFhj
zvCLAshih^62MjY5_#gu<JcxQm*H8;&^c+fV8cs-QO|1-82121gu)-f&T@|h<35J5f
zl+Bw0kG1XD)w%1%jzH~>-ECF=a8MV80^zVfR8|!Va@}w=Gc_)*tY;`|%W%e`9ohc@
D<&pO^

diff --git a/sphinx/locale/bn/LC_MESSAGES/sphinx.po b/sphinx/locale/bn/LC_MESSAGES/sphinx.po
index c0456cbdb..49549939d 100644
--- a/sphinx/locale/bn/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/bn/LC_MESSAGES/sphinx.po
@@ -7,28 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 1.0pre/[?1034h2e1ab15e035e\n"
 "Report-Msgid-Bugs-To: nasim.haque@gmail.com\n"
-"POT-Creation-Date: 2009-11-08 16:28+0100\n"
-"PO-Revision-Date: 2011-01-22 14:41+0100\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
+"PO-Revision-Date: 2011-09-21 10:08+0200\n"
 "Last-Translator: Nasimul Haque <nasim.haque@gmail.com>\n"
 "Language-Team: Nasimul Haque <nasim.haque@gmail.com>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr ""
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%B %d, %Y"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, fuzzy, python-format
 msgid "see %s"
 msgstr "আরও %s"
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, fuzzy, python-format
 msgid "see also %s"
 msgstr "আরও দেখুন %s"
@@ -67,21 +72,10 @@ msgstr "পরবর্তী"
 msgid "previous"
 msgstr "পূর্ববর্তী"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr "(-"
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "ইনডেক্স"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "অনুচ্ছেদ লেখক:"
@@ -146,12 +140,12 @@ msgstr "%s (C টাইপ)"
 msgid "%s (C variable)"
 msgstr "%s (C ভ্যারিয়েবল)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "ফাংশন"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 #, fuzzy
 msgid "member"
 msgstr "C মেম্বার"
@@ -161,7 +155,7 @@ msgstr "C মেম্বার"
 msgid "macro"
 msgstr "C ম্যাক্রো"
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 #, fuzzy
 msgid "type"
 msgstr "C টাইপ"
@@ -171,28 +165,28 @@ msgstr "C টাইপ"
 msgid "variable"
 msgstr "C ভ্যারিয়েবল"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (C++ ক্লাসে)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (C++ টাইপ)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (C++ মেম্বার)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (C++ ফাংশন)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "ক্লাস"
 
@@ -230,11 +224,11 @@ msgstr "প্যারামিটার"
 msgid "Throws"
 msgstr ""
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr "ডাটা"
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "এ্যট্রিবিউট"
 
@@ -303,45 +297,45 @@ msgstr "%s() (%s ক্লাস মেথড)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (%s.%s এ্যট্রিবিউট)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (মডিউল)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 #, fuzzy
 msgid "Python Module Index"
 msgstr "মডিউল ইনডেক্স"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "মডিউল সমূহ"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "ডেপ্রিকেটেড"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "এক্সেপশন"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr "মেথড"
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr "ক্লাস মেথড"
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "স্ট্যাটিক মেথড"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "মডিউল"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 #, fuzzy
 msgid " (deprecated)"
 msgstr "ডেপ্রিকেটেড"
@@ -395,6 +389,15 @@ msgstr "এনভায়রনমেন্ট ভ্যারিয়েবল"
 msgid "program option"
 msgstr "প্রোগ্রাম অপশন"
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "ইনডেক্স"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "মডিউল ইনডেক্স"
@@ -403,12 +406,12 @@ msgstr "মডিউল ইনডেক্স"
 msgid "Search Page"
 msgstr "অনুসন্ধান পাতা"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr "বেস: %s"
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr ":class:`%s` এর উপনাম"
@@ -733,8 +736,8 @@ msgstr "C API পরিবর্তন"
 msgid "Other changes"
 msgstr "অন্যান্য পরিবর্তন"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "এই শিরোনামের পার্মালিঙ্ক"
 
@@ -759,48 +762,24 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "রিলিজ"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr "পাদটীকা"
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr "পূর্ববর্তী পাতা হতে চলমান"
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr "পরবর্তী পাতাতে চলমান"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[ছবি]"
 
-#~ msgid "Platforms: "
-#~ msgstr "প্লাটফরম:"
-
-#~ msgid "Searching"
-#~ msgstr "অনুসন্ধান চলছে"
-
-#~ msgid "Preparing search..."
-#~ msgstr "অনুসন্ধানের প্রস্তুতি চলছে..."
-
-#~ msgid ", in "
-#~ msgstr ", -"
-
-#~ 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 ""
-#~ "আপনার অনুসন্ধানে কোন ফলাফল পাওয়া যায়নি।"
-#~ " আপনার অনুসন্ধানের শব্দগুলোর সঠিক বানান"
-#~ " ও বিভাগ নির্বাচন নিশ্চিত করুন।"
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr "অনুসন্ধান শেষ হয়েছে, ফলাফলে %s-টি পাতা পাওয়া গেছে।"
-
diff --git a/sphinx/locale/ca/LC_MESSAGES/sphinx.mo b/sphinx/locale/ca/LC_MESSAGES/sphinx.mo
index 4773faee5c698b8dfa6421bf8bee08a2c37dfae7..fc373e47ce7f0301fee0e0c105deb7854472bd21 100644
GIT binary patch
delta 42
xcmZp5Z*|}BQ<TrpP}jgx*T_)8(7?*TY%;r;3X6%AiQ!~@u^)_Pn>EB^c>w=p3mX6c

delta 42
xcmZp5Z*|}BQ<TrZQrEy#*T_i0(89{pa5B4?3X7?gp}}N*u^)`4n>EB^c>n;H3nKsk

diff --git a/sphinx/locale/ca/LC_MESSAGES/sphinx.po b/sphinx/locale/ca/LC_MESSAGES/sphinx.po
index 89452144c..c876228ea 100644
--- a/sphinx/locale/ca/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/ca/LC_MESSAGES/sphinx.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 1.0\n"
 "Report-Msgid-Bugs-To: pau.fernandez@upc.edu\n"
-"POT-Creation-Date: 2009-05-22 18:51+0200\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: 2011-01-22 14:41+0100\n"
 "Last-Translator: Pau Fernández <pau.fernandez@upc.edu>\n"
 "Language-Team: ca <LL@li.org>\n"
@@ -15,20 +15,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, fuzzy, python-format
+msgid "%s %s documentation"
+msgstr "%s %s documentació"
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d de %B de %Y"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr "vegeu %s"
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, python-format
 msgid "see also %s"
 msgstr "vegeu també %s"
@@ -67,21 +72,10 @@ msgstr "següent"
 msgid "previous"
 msgstr "anterior"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr " (a "
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "Índex"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Autor de la secció:"
@@ -146,12 +140,12 @@ msgstr "%s (tipus de C)"
 msgid "%s (C variable)"
 msgstr "%s (variable de C)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "funció"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "membre"
 
@@ -159,7 +153,7 @@ msgstr "membre"
 msgid "macro"
 msgstr "macro"
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "tipus"
 
@@ -167,28 +161,28 @@ msgstr "tipus"
 msgid "variable"
 msgstr "variable"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (class de C++)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (tipus de C++)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (membre de C++)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (funció de C++)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "class"
 
@@ -226,11 +220,11 @@ msgstr "Paràmetres"
 msgid "Throws"
 msgstr ""
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr ""
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "atribut"
 
@@ -299,45 +293,45 @@ msgstr "%s() (mètode %s)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (atribut %s.%s)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (mòdul)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 #, fuzzy
 msgid "Python Module Index"
 msgstr "Índex de Mòduls"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "mòduls"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Obsolet"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "excepció"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr ""
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr ""
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "mètode estàtic"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "mòdul"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 msgid " (deprecated)"
 msgstr " (obsolet)"
 
@@ -389,6 +383,15 @@ msgstr "variable d'entorn"
 msgid "program option"
 msgstr ""
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Índex"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Índex de Mòduls"
@@ -397,12 +400,12 @@ msgstr "Índex de Mòduls"
 msgid "Search Page"
 msgstr "Pàgina de Cerca"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr "   Bases: %s"
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr "àlies de :class:`%s`"
@@ -725,8 +728,8 @@ msgstr "Canvis a la API de C"
 msgid "Other changes"
 msgstr "Altres canvis"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "Link permanent a aquest títol"
 
@@ -751,49 +754,24 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "Versió"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr ""
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr "ve de la pàgina anterior"
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr "Continua a la pàgina següent"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[imatge]"
 
-#~ msgid "Platforms: "
-#~ msgstr "Plataformes: "
-
-#~ msgid "Searching"
-#~ msgstr "Cercant"
-
-#~ msgid "Preparing search..."
-#~ msgstr "Preparant la cerca..."
-
-#~ msgid ", in "
-#~ msgstr ", a "
-
-#~ 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 ""
-#~ "La teva cerca no ha donat "
-#~ "resultats. Assegura't que totes les "
-#~ "paraules estan ben escrites i que "
-#~ "has seleccionat prou categories."
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr "Cerca finalitzada, s'han trobat %s pàgin(a/es) de resultats."
-
diff --git a/sphinx/locale/cs/LC_MESSAGES/sphinx.mo b/sphinx/locale/cs/LC_MESSAGES/sphinx.mo
index d5b560eb056426e87bebfb68f8bcac8da1f3a2a7..ba0798db6e18781081218359187b15015d105211 100644
GIT binary patch
delta 980
zcmXZaPe>GD7{~Evv({E~Q*$@ew6VlM8JQVm%*8{j{UZp)qB?YuTw*Eou;M|83A`xL
zMI_L35QLI2=q2h9bnDW=OLUD6B?Uszt?#dWVVKYRJ~Q*a&-2Xtd*au`&UiLyH?u#T
zW=)vuGCP4CSin9EaTHszig{eZ<G6}kw#Mx?ZeueZ>8`Jr$0GAiJca@4`xtY0rP~sF
z&tQ^3FXqpfDIp&T*(J>4eLRZ~@F*^$Hd;X~ypBqE6FYDRwed&n$FDA)=`lOSyogF<
zuqUZkHby`d-M}`yg)LY?Wm?0N_yqOdbJT_}-199|0ei@0``pTSi0WL-LnU$zmDpo!
z#N~v67JP=MaUE6h7HZ?v#owVm+(%XL6V(yjl&FV#f7p4^#mlG;O}Y6U)cUj7fXO2U
zYUw=c3@o62L4ta5&BZrRiM~X&cpJ~*2UI2BP~RP(I%8fvUPPU#UgR&>5Nf~cNWzKT
zWT49Kq7Ks>YNJ*Bp8%@D4d*LVMZ2ihzC|wk#7*%7=OOC*ziw`Q^?4SRa0|AwzZKkr
z0aOcp)ZrLK9kQ#ail<%tA)aTxh&mISsES^rHhhCBWDixyXH=qJP%Zy~=6POurdFw?
zySee^I1K$@%#T7Z3`#*f6huMLG&Si@R~D<a>inF4d1j$f@}fZRg?<!y;YevDOfMAf
RWioO4w7Alc=DNN&{sW*GV!i+X

delta 982
zcmXZaPe>GD7{~Ev+H!R**Z%A-t(l_<9&~MH!**S~<VJr8%2LRS2ceCW%3!SyLF2(g
zNpukj^c)1C7+ZM>FG0619lS)>x|DU04xRe`+!u!V%=^sy&ig#iyuZtT%IiZ7(P1<D
zd(<p}iLBXvOkoPUFvKFZ;xxA4BW%P4<g!I>W4MOR7;CG4FNtZ!S=@&qYJCBl@LZck
zw#mZ?f#aAwW_Aesk&vCi2AseSyn%ah9<|X^)Q6W)39sN0e1qEf6L#Y_7vIxvrh+r5
zM0(q!dSxX7s^}6P#4$X8H&L0+ViF&t<~>Jk_`<zkMHR4tT(-q+7<W*eEAUc@TtFpu
z2je&&@t_Yr!wfE=Dqclx{MN-cQ46<F75qYV#N(z!J5lpbItN|6jOx%;H@=Sgeg$I~
z-R40py@xsj_ffxK4mEMn#g|cuzC^Wn4ZH9os*>-hb=#=Ucz!*eL7k}%<S$qsYQKv}
z!jWC(L6wc84$};3qXpbe09E0#^A)P1_o&u>KrZ{tP4R8#4r={BH}*Q~<2Wke7HnmI
zOS>06s22944o4An$j+lG9(D0sc!Kdm)R|a8RrDIQ;X1024OAgtP>Fs;wfrZV@B71(
z)k?MYu4$<GbWqHNVJ=_r!(!>wU~doxL1N@e?po!+RCQ|RZtm>lY^CJq111H`%lqL#
YDGX{osd3L6sLiFH#5}*&nEes|4@*{KS^xk5

diff --git a/sphinx/locale/cs/LC_MESSAGES/sphinx.po b/sphinx/locale/cs/LC_MESSAGES/sphinx.po
index 4f3f620c8..9ed728ede 100644
--- a/sphinx/locale/cs/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/cs/LC_MESSAGES/sphinx.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 0.5\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2008-11-27 18:39+0100\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: 2011-01-22 14:41+0100\n"
 "Last-Translator: Pavel Kosina <pavel.kosina@gmail.com>\n"
 "Language-Team: Pavel Kosina <pavel.kosina@gmail.com>\n"
@@ -16,20 +16,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, fuzzy, python-format
+msgid "%s %s documentation"
+msgstr "%s %s dokumentaci"
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d.%m.%Y"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, fuzzy, python-format
 msgid "see %s"
 msgstr "viz %s"
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, fuzzy, python-format
 msgid "see also %s"
 msgstr "viz také %s"
@@ -41,7 +46,7 @@ msgstr "Python Enhancement Proposals; PEP %s"
 
 #: sphinx/builders/changes.py:73
 msgid "Builtins"
-msgstr "Vestavěné funkce "
+msgstr "Vestavěné funkce"
 
 #: sphinx/builders/changes.py:75
 msgid "Module level"
@@ -68,21 +73,10 @@ msgstr "další"
 msgid "previous"
 msgstr "předchozí"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr "(v"
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "Index"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Autor sekce: "
@@ -147,12 +141,12 @@ msgstr "%s (C typ)"
 msgid "%s (C variable)"
 msgstr "%s (C proměnná)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "funkce"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "člen"
 
@@ -160,7 +154,7 @@ msgstr "člen"
 msgid "macro"
 msgstr ""
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "typ"
 
@@ -169,28 +163,28 @@ msgstr "typ"
 msgid "variable"
 msgstr "Proměnná"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (C++ třída)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (C++ typ)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (člen C++)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (C++ funkce)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "třída"
 
@@ -228,11 +222,11 @@ msgstr "Parametry"
 msgid "Throws"
 msgstr ""
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr ""
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "atribut"
 
@@ -301,45 +295,45 @@ msgstr "%s() (metoda %s)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s() (atribut %s.%s)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (module)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 #, fuzzy
 msgid "Python Module Index"
 msgstr "Rejstřík modulů"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "moduly"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Zastaralé"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "výjimka"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr ""
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr ""
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "statická metoda"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "modul"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 msgid " (deprecated)"
 msgstr " (zastaralé)"
 
@@ -391,6 +385,15 @@ msgstr "promměná prostředí"
 msgid "program option"
 msgstr ""
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Index"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Rejstřík modulů "
@@ -399,12 +402,12 @@ msgstr "Rejstřík modulů "
 msgid "Search Page"
 msgstr "Vyhledávací stránka"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr ""
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr ""
@@ -726,8 +729,8 @@ msgstr "Změny API"
 msgid "Other changes"
 msgstr "Ostatní změny"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "Trvalý odkaz na tento nadpis"
 
@@ -752,50 +755,25 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "Vydání"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr ""
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr ""
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 #, fuzzy
 msgid "Continued on next page"
 msgstr "Plný index na jedné stránce"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[obrázek]"
 
-#~ msgid "Platforms: "
-#~ msgstr "Platformy: "
-
-#~ msgid "Searching"
-#~ msgstr "Hledám"
-
-#~ msgid "Preparing search..."
-#~ msgstr "Připravuji vyhledávání...."
-
-#~ msgid ", in "
-#~ msgstr ", v"
-
-#~ 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í."
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr "Vyhledávání skončilo, nalezeno %s stran."
-
diff --git a/sphinx/locale/da/LC_MESSAGES/sphinx.mo b/sphinx/locale/da/LC_MESSAGES/sphinx.mo
index 018ac7f0a0e3cfc9ee97f2785bac5c9fafb81fff..d0006ee21184d961016d57d28e97a89e4da0a4bf 100644
GIT binary patch
delta 46
zcmeD6?DgF6MoiGqP}jgx*T_)8(7?*TOxwU{@?SAU785HI!_7+KT#Srnn{_1;cmOq)
B3)TPt

delta 46
zcmeD6?DgF6MoiGaQrFN>*T6!-(9FunLfgP_@?SAU7E>!jgUw3fT#SsSn{_1;cmOvK
B3*Z0%

diff --git a/sphinx/locale/da/LC_MESSAGES/sphinx.po b/sphinx/locale/da/LC_MESSAGES/sphinx.po
index 752936bb5..df991aece 100644
--- a/sphinx/locale/da/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/da/LC_MESSAGES/sphinx.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 1.0pre/[?1034h2e1ab15e035e\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2009-11-08 16:28+0100\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: 2011-01-22 14:41+0100\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -15,20 +15,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, fuzzy, python-format
+msgid "%s %s documentation"
+msgstr "%s %s dokumentation"
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d. %B, %Y"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr "se %s"
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, python-format
 msgid "see also %s"
 msgstr "se også %s"
@@ -67,21 +72,10 @@ msgstr "næste"
 msgid "previous"
 msgstr "forrige"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr " (i "
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "Indeks"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Afsnitsforfatter: "
@@ -145,12 +139,12 @@ msgstr "%s (C-type)"
 msgid "%s (C variable)"
 msgstr "%s (C-variabel)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "funktion"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "medlem"
 
@@ -158,7 +152,7 @@ msgstr "medlem"
 msgid "macro"
 msgstr "makro"
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "type"
 
@@ -166,28 +160,28 @@ msgstr "type"
 msgid "variable"
 msgstr "variabel"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (C++-klasse)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (C++-type)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (C++-medlem)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (C++-funktion)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "klasse"
 
@@ -224,11 +218,11 @@ msgstr "Parametre"
 msgid "Throws"
 msgstr "Kaster"
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr "data"
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "attribut"
 
@@ -296,44 +290,44 @@ msgstr "%s() (klassemetode i %s)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (attribut i %s.%s)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (modul)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 msgid "Python Module Index"
 msgstr "Python-modulindeks"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "moduler"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Forældet"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "undtagelse"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr "metode"
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr "klassemetode"
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "statisk metode"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "modul"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 msgid " (deprecated)"
 msgstr " (forældet)"
 
@@ -385,6 +379,15 @@ msgstr "miljøvariabel"
 msgid "program option"
 msgstr "programtilvalg"
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Indeks"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Modulindeks"
@@ -393,12 +396,12 @@ msgstr "Modulindeks"
 msgid "Search Page"
 msgstr "Søgeside"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr "   Baser: %s"
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr "alias for :class:`%s`"
@@ -720,8 +723,8 @@ msgstr "Ændringer i C-API"
 msgid "Other changes"
 msgstr "Andre ændringer"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "Permalink til denne overskrift"
 
@@ -746,49 +749,24 @@ msgstr "Sammenfold sidebjælke"
 msgid "Contents"
 msgstr "Indhold"
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "Udgave"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr "Fodnoter"
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr "fortsat fra forrige side"
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr "Fortsættes på næste side"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[billede]"
 
-#~ msgid "Platforms: "
-#~ msgstr "Platforme: "
-
-#~ msgid "Searching"
-#~ msgstr "Søger"
-
-#~ msgid "Preparing search..."
-#~ msgstr "Forbereder søgning..."
-
-#~ msgid ", in "
-#~ msgstr ", i "
-
-#~ 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 ""
-#~ "Din søgning gav ingen resultater. "
-#~ "Kontrollér venligst at alle ord er "
-#~ "stavet korrekt, og at du har valgt"
-#~ " nok kategorier."
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr "Søgningen fuldført - fandt %s sider for denne søgning."
-
diff --git a/sphinx/locale/de/LC_MESSAGES/sphinx.mo b/sphinx/locale/de/LC_MESSAGES/sphinx.mo
index 658a95a0255a44765bcb8ddbe4510e9a76c00c7e..ce12882dab91ab21d8e62fbabd73eeb66b50bf11 100644
GIT binary patch
delta 2791
zcmYk-eQ4EH7{Ku}=hV&lwzWCebT^%oS%Y1%o4sI7(;Q<;va~=mYc@^h3u<LA-XOIg
z7q$w`*fca!G9hLX8L8ACmiWg?jVy;2wNgPdtjxl`-|aw+yZbqBzjL1Rob%f@)*h}+
zcjoneJ@E4mza{+EXIcC2XG2a1xm25R0B%8t?8K3{2eYvw`fcq05%Xz3hePlhUWY^a
zhcF1sk$KZ0MZt+DBcE_DUk;dy1F;F6;F;L|GCIBuU0^pB;z1mYU!%|cj0yY$eZGj*
zD2B0Uz$q+b{cslrADoRtaUl-F=g<YVU@`8&BK#crgzx#X{{lKblc-WS980kt$Ky(@
z!d-Yhp2PzD9kW?K<PxqC6=FY3;6$v5^@YgTupIkh8lB(;bb;2`|0TMS(`dlIqVwgF
zPBT=1u5%O4z!awYP*_ia;|a}Zgq!ge+>4&|d1S6|37sIrRWe8?I&m)fHNa75Mv~YI
zr^Na+>`i?R`uu!!-o-=6zdKn@L-&r*30m<6d>>gee1)d`hgiReo@L1EY0pJBFbwGm
zWwD+@7p_JFoQh_o9$jy49{Kmd6*PGJ*Py9;6DQ$5bmv#F4EqtC0ao&5K-Fjlr=v%6
z9~#))SYH(Tm!r4;$=KhF&ih81f+^pLX7w{P!sF3SbiyulXTPB-%wjed9)y`#i0-r)
z?Jq?Gs=#tgqT}z6?eoxe(v1}Ogk^jU$93og+tCHzLjyQ~p4ky}=N)LqI?;u%qR*LE
ziXjJmTT0RP3Fv~8(4(mBF&!SD;KYq+#7*cQmQ}HRGa7kY^zG<wbbLD+z<xBagR%c8
zy5KQ1)u&?pJeujt-R+!zAFi-RP=H>xBsyU=y6{x={jQ7kMl>T!(49Sn?r1IgTnoDJ
zCS1>3vJE-4Fotya-0kRw@4=D2|8*3+gv+8&#{uin2REQ8-G=^w`Tz~|D7xcQXaHx?
zdH#(3nMCcleDo+s#rn<Yb5k(w#4{-nWN1VOu0d0_5zBBZc3)0(f#cEB=p8tRWHa>R
z)hWdh(TPYb;X(9BpNRD>Xu$2oy#Kse;Sddc!ZE&5cmbWLoOAIH(bVV~blg5<&Cr1!
z!8!CUT#o*Olc{GBokvlFZfs_(H=vnpDk1+9D6FHw9ejcYbPW9i)P>%GY+j8~I2c`U
zJWj`nXn!-h&}(QWTd@}R#{Mv(XWqW(^Tl{4ccUy#p^}CMwrhkf=$Y?8-|G+2oqmk&
z@I<r|J-VOJBf5%XF_GxmNG(=SpO5bJCG_aFqZ{0V-i`Dj3U+ivze5A*LI+$yBhDrr
zKA4Y=FGsQ*l4yS&vX?L$6ZkmR;3o9$oIwM<gw8*d3&AB!hYAW#m_m10-O~|j(1~ZE
zuggPdY9EdDXVFXgd~9!t?n37~7(IdpegZwJU(na^B4+vj|8EMux4k%E2lPc39*721
zgkvxf`=>=`pl3b{y*u-esluw*z8T%=TWBWR(fL0`1OEaOtRKFi;12&n7dB5mn1fDS
zg0_!C7rX<VU<x{MJ^Fk@Y<~>-gw?UV4PAH#x}kSty&b#%|9=!44xtMlj`fr1f@jdw
zpG7Cg7~PZ7Y&4J(<XFRvv0jH+)aRfJKaAduMd*AlqVNAJqiJ?$TWN6NU6_gc<G=&2
zuFhF7c=U=y!_r4qH7!`Oa{kIiOP92t%(>QoU@}=*b!+9gWFlF0TUDyPt8i_GBkx|i
M_<tiCiz){E3+s^nmjD0&

delta 2741
zcmYM#dra0<7{Ku(ASv{kpoSqg5i}VT8Y<M(6>2jeZQab=GMky@+MH%nv9}8um@TGr
z<s#Ni%RkbTtqbdB+D4ffHmgm`a?aQ+H|??+cKLqcY_Zq(b1uJg&U2pgJFi`Jt#!#C
zveUK%{<iZkkAL+8t^NPkm=VIoRM%kwH=vI^kHy%IgK=;4K<qz)S+pO;;rJ_Ff+?B(
z^JOFRB|{+vKB0myAE?10I2)Z{UTnV~4PXrp!)Ck`+i)m$pyT#q5q^!1{~h^+bar8&
z+32`D9LoCPDhfF?%)rZV0lL5{%*72j61O3r@F8FJA3&c!j+5~`7Gfn)R^eQ%#3ykS
zzKtXBFd9gYvVJ&6VGv%xX*iH=Sf7D3g$BF`??flK2VG!w?B9uI;C(dUgXs7kbf;(0
z1qYGdIhc*<xCoOROIS+52v_11Y(>ww3mF@}L?`$j!+;QeMknrJRRjDN%}9cLr{HL`
zUV>>@jgFs+&U-z&k%lbt-?t+g9IzTk<1^@5yO6Agk7E4`^em6X_8xQte;^;W)?d#?
z7tTimEJia@iLO_Jj+>KB{(bA`(_rcz#_Mnsy7MDgf+x`c2lHh>`DhBu(4(1v238a6
zGh=@P`u5)v`<J5gK7?kxDM`VzdkKwjceE3oa38v}Lud+rLKi-bsdx_E>7TK`7Y%42
ztB%D4`g|4Iehs=#E%FJ;dcN~1+>I`fL>Fv919$;Fv)9p`zlmn76J7XQblfrI6Hf8v
zZRw5e!^yV`7NAElE;<RBHyLUv7};#}2j!;zj<6Dqd`<MRXfyi!vuFU%p@Fr<{vGIo
zZ=tDvFV?%zOn1lj6FAEIf0lwTTY^{G3G>l~i_!Z%KGti|jNE|k_%?J$3(;{8q6@FU
z_1uz1<TOGm>2O>Qn#nQfM#p1@_rKl(-X0%Vgr@R7^oMC38sHXmr`ynl_n_lGj{OIs
zN6{lZ9qWIi;}Yz~d2^B2!j+ix!C4ec)jTZ0C1|QPq6@qjeFHuF4kT&eD=frQ(R8j5
zYlX4s4yVWZA~fK&$VCb*$S1VrlK;sR-l671XV4#@A>0j}g+BNQvPRg7roIDx2R?{?
zinY`aqDPQLlx{2+t(T*joP^cbfNo%Y9{D$-HX8il*@d2cH;%#Y&;>8xjhN0=vHw<d
z;st0b7h@eZ#{MpJ-b3j46F8lB;uox-Ue0a}aDI}4FUd0WK0k`?v<cl|dvrT`c017{
z+J|M>gYINl5ib;uM|XNNdUOw<fviH`p%%1#Yc%;91tZyoKCl;!xEmdK6diB|$!<80
z_KzT41z3nQg=sh&??T_59cZAP=={ggm+&k)-#^F(lVLD#iXB<##0BUzxg1UH6|p`O
zeM#$L`~2u~bi(H7W;F12^r&{D*Y90)-u>ux{k*R~$r({_;cw8C|A^zTr|$uF!;9cV
zIp~=epeY}RJQAkH_J!z9m!g?mi;jC54SW+8;mc?spJ3nr|6LRuco?1dq#gJdx?mc4
zbb<sraUMEBd2FAEe8RP{{a$q8W$1=h#QNIk<IxuEyZ^1R;T3ej9cb$Jpc8zCrnDOk
z<Ro%@;kQ^HQQ99+3A%6@`ff}>=bMY(|2xo)EkQTDyp-uuDLfG$d}?z`#^R2Y%-+l)
bmDLq~rW8$_aCKE>M`ljbfR0y3mL~oKQS$Rg

diff --git a/sphinx/locale/de/LC_MESSAGES/sphinx.po b/sphinx/locale/de/LC_MESSAGES/sphinx.po
index 7fd5a4c23..50ba7490e 100644
--- a/sphinx/locale/de/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/de/LC_MESSAGES/sphinx.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2008-08-07 21:40+0200\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: 2011-01-22 14:41+0100\n"
 "Last-Translator: Georg Brandl <georg@python.org>\n"
 "Language-Team: de <LL@li.org>\n"
@@ -14,20 +14,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr "%s %s Dokumentation"
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d. %m. %Y"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr "siehe %s"
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, python-format
 msgid "see also %s"
 msgstr "siehe auch %s"
@@ -66,21 +71,10 @@ msgstr "weiter"
 msgid "previous"
 msgstr "zurück"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr " (in "
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "Stichwortverzeichnis"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Autor des Abschnitts: "
@@ -144,12 +138,12 @@ msgstr "%s (C-Typ)"
 msgid "%s (C variable)"
 msgstr "%s (C-Variable)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "Funktion"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "Member"
 
@@ -157,7 +151,7 @@ msgstr "Member"
 msgid "macro"
 msgstr "Makro"
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "Typ"
 
@@ -165,28 +159,28 @@ msgstr "Typ"
 msgid "variable"
 msgstr "Variable"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (C++-Klasse)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (C++-Typ)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (C++-Member)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (C++-Funktion)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "Klasse"
 
@@ -223,11 +217,11 @@ msgstr "Parameter"
 msgid "Throws"
 msgstr "Wirft"
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr "Daten"
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "Attribut"
 
@@ -295,44 +289,44 @@ msgstr "%s() (Klassenmethode von %s)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (Attribut von %s.%s)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (Modul)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 msgid "Python Module Index"
 msgstr "Python-Modulindex"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "Module"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Veraltet"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "Exception"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr "Methode"
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr "Klassenmethode"
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "statische Methode"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "Module"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 msgid " (deprecated)"
 msgstr " (veraltet)"
 
@@ -384,6 +378,15 @@ msgstr "Umgebungsvariable"
 msgid "program option"
 msgstr "Programmoption"
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Stichwortverzeichnis"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Modulindex"
@@ -392,12 +395,12 @@ msgstr "Modulindex"
 msgid "Search Page"
 msgstr "Suche"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr "   Basisklassen: %s"
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr "Alias von :class:`%s`"
@@ -720,8 +723,8 @@ msgstr "C API-Änderungen"
 msgid "Other changes"
 msgstr "Andere Änderungen"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "Permalink zu dieser Überschrift"
 
@@ -746,49 +749,24 @@ msgstr "Sidebar einklappen"
 msgid "Contents"
 msgstr "Inhalt"
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "Release"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr "Fußnoten"
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr "Fortsetzung der vorherigen Seite"
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr "Fortsetzung auf der nächsten Seite"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[Bild]"
 
-#~ msgid "Platforms: "
-#~ msgstr "Plattformen: "
-
-#~ msgid "Searching"
-#~ msgstr "Suche..."
-
-#~ msgid "Preparing search..."
-#~ msgstr "Suche wird vorbereitet..."
-
-#~ msgid ", in "
-#~ msgstr ", in "
-
-#~ 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 ""
-#~ "Es wurden keine zutreffenden Dokumente "
-#~ "gefunden. Haben Sie alle Suchbegriffe "
-#~ "richtig geschrieben und genügend Kategorien"
-#~ " ausgewählt?"
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr "Suche beendet, %s zutreffende Seite(n) gefunden."
-
diff --git a/sphinx/locale/es/LC_MESSAGES/sphinx.mo b/sphinx/locale/es/LC_MESSAGES/sphinx.mo
index b897ad43597bdf5469970c03a7ca33990f344e71..87b44fe64eaa56a977f436889acfe68467d831db 100644
GIT binary patch
delta 47
zcmdmNz1ez$pAes+p{{|Yu92aFp@Efw+2j}@6&4dK6T`_ZLjRb|xF+x6u-Lpu_&X;6
DJs%Dl

delta 47
zcmdmNz1ez$pAescg|306uA!lVk+GGj#pD<v6&6z~LxagJLjRadxhC)7u-Lpu_&X;6
DKGO~+

diff --git a/sphinx/locale/es/LC_MESSAGES/sphinx.po b/sphinx/locale/es/LC_MESSAGES/sphinx.po
index 52ed0b74f..fbcba7d90 100644
--- a/sphinx/locale/es/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/es/LC_MESSAGES/sphinx.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 0.5\n"
 "Report-Msgid-Bugs-To: guillem@torroja.dmt.upm.es\n"
-"POT-Creation-Date: 2008-09-11 23:58+0200\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: 2011-01-22 14:41+0100\n"
 "Last-Translator: Guillem Borrell <guillem@torroja.dmt.upm.es>\n"
 "Language-Team: es <LL@li.org>\n"
@@ -15,20 +15,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, fuzzy, python-format
+msgid "%s %s documentation"
+msgstr "%s %s documentación"
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d de %B de %Y"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr "ver %s"
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, python-format
 msgid "see also %s"
 msgstr "ver también %s"
@@ -69,21 +74,10 @@ msgstr "siguiente"
 msgid "previous"
 msgstr "anterior"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr ""
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "Índice"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Autor de la sección: "
@@ -149,12 +143,12 @@ msgstr "%s (tipo C)"
 msgid "%s (C variable)"
 msgstr "%s (variable C)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "función"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "miembro"
 
@@ -162,7 +156,7 @@ msgstr "miembro"
 msgid "macro"
 msgstr ""
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "tipo"
 
@@ -171,28 +165,28 @@ msgstr "tipo"
 msgid "variable"
 msgstr "Variable"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (clase C++)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (tipo C++)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, fuzzy, python-format
 msgid "%s (C++ member)"
 msgstr "%s (miembro C++)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, fuzzy, python-format
 msgid "%s (C++ function)"
 msgstr "%s (función C++)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "clase"
 
@@ -230,11 +224,11 @@ msgstr "Parámetros"
 msgid "Throws"
 msgstr ""
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr ""
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "atributo"
 
@@ -303,46 +297,46 @@ msgstr "%s() (%s método)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (%s.%s atributo)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (módulo)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 #, fuzzy
 msgid "Python Module Index"
 msgstr "Índice de Módulos"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "módulos"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Obsoleto"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "excepción"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr ""
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 #, fuzzy
 msgid "class method"
 msgstr "%s() (%s método)"
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "método estático"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "módulo"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 #, fuzzy
 msgid " (deprecated)"
 msgstr "Obsoleto"
@@ -396,6 +390,15 @@ msgstr "variables de entorno"
 msgid "program option"
 msgstr ""
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Índice"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Índice de Módulos"
@@ -404,12 +407,12 @@ msgstr "Índice de Módulos"
 msgid "Search Page"
 msgstr "Página de Búsqueda"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr ""
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr ""
@@ -733,8 +736,8 @@ msgstr "Cambios en la API C"
 msgid "Other changes"
 msgstr "Otros cambios"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "Enlazar permanentemente con este título"
 
@@ -760,54 +763,26 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 #, fuzzy
 msgid "Release"
 msgstr "Versión"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr ""
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr ""
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 #, fuzzy
 msgid "Continued on next page"
 msgstr "Índice completo en una página"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[imagen]"
 
-#~ msgid "Platforms: "
-#~ msgstr "Plataformas:"
-
-#~ msgid "Searching"
-#~ msgstr "Buscando"
-
-#~ msgid "Preparing search..."
-#~ msgstr "Preparando la búsqueda"
-
-#~ msgid ", in "
-#~ msgstr ""
-
-#~ 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 ""
-#~ "La búsqueda no dio ningún resultado."
-#~ "  Por favor asegúrese que escribió "
-#~ "todas las palabras correctamente y que"
-#~ " ha seleccionado suficientes categorías"
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr ""
-#~ "Búsqueda finalizada, se han encontrado "
-#~ "%s página(s) que concuerdan con su "
-#~ "consulta"
-
diff --git a/sphinx/locale/et/LC_MESSAGES/sphinx.js b/sphinx/locale/et/LC_MESSAGES/sphinx.js
index 5b8bcbcf5..5f51a53af 100644
--- a/sphinx/locale/et/LC_MESSAGES/sphinx.js
+++ b/sphinx/locale/et/LC_MESSAGES/sphinx.js
@@ -1 +1 @@
-Documentation.addTranslations({"locale": "et", "plural_expr": "(n != 1)", "messages": {"Search Results": "Otsingutulemused", "Preparing search...": "Otsingu ettevalmistus...", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "Otsing ei andnud tulemusi. Veendu, et otsis\u00f5nad on \u00f5ieti kirjutatud ja et oled valinud sobivad kategooriad.", "Search finished, found %s page(s) matching the search query.": "Leiti %s p\u00e4ringule vastavat lehek\u00fclg(e)", ", in ": ", ", "Expand sidebar": "N\u00e4ita k\u00fclgriba", "Permalink to this headline": "P\u00fcsilink sellele pealkirjale", "Searching": "Otsing", "Collapse sidebar": "Varja k\u00fclgriba", "Permalink to this definition": "P\u00fcsilink sellele definitsioonile", "Hide Search Matches": "Varja otsingutulemused"}});
\ No newline at end of file
+Documentation.addTranslations({"locale": "et", "plural_expr": "(n != 1)", "messages": {"Hide Search Matches": "Varja otsingutulemused", "Permalink to this definition": "P\u00fcsilink sellele definitsioonile", "Expand sidebar": "N\u00e4ita k\u00fclgriba", "Permalink to this headline": "P\u00fcsilink sellele pealkirjale", "Collapse sidebar": "Varja k\u00fclgriba"}});
\ No newline at end of file
diff --git a/sphinx/locale/et/LC_MESSAGES/sphinx.mo b/sphinx/locale/et/LC_MESSAGES/sphinx.mo
index dc68cd11eb82936a0b419e40a9af7bb7d53a289c..14b911c0eca752bb20710642384bf825618c9d55 100644
GIT binary patch
delta 2796
zcmZA2e@xVM9LMnw$Kelt!`*ctg?AF51@0h%V8+sECP}PvldMdq)NZ+<9@VDRg)AB{
zH}Yg6^ZX-ISE+@kHCfJ;HgnDS1JqH;=C53C1!Cn$Ydv4_+1g?UkI(n>{eC{5_xt_%
ze2>dd_RbFvWjebIKRfunm*27kUH$j7FwvM~E^AS@mf$p8hLf?yy3yX>f*JHj(T$&C
z8XiN<Gk__036qQon_>IF9Zcm$61|#W3Tj{xYQQXXVGZ7cOEDc^Lyc=iA9kU}e~x_2
zxBO9{1E_IBsByoem-WpA!pf#27q!46I0YAC7QSNp-$6aM8Ow1WPQ`0jh6zL&z$(na
zSJ8v-p#q3ncjF|kd$F4JO`q);Lq5hqIukJ+H9;0?ftjfLD^MA%K?S-2HDMH$;V#sI
zhp`Ti;{^0lPKs=DQ31}ta0QKdG_<#GA<vo?)C8N*#2K><HF1<x6~F;hrM^Z7p10S7
z=;Znr)c8@<ymwKFIM|ne6GDxjnL+*iH0IEuwN@h4G)?xp8QCWDzU_~qGWZzzn1lBE
zIBMaur~ogZDsm0A;IF80&dl*co`$MiQ6}}DLt{Q2%Df#F*;Z5_dr_t9Lv6`dsDMt`
z>vQ)0Mbv4(YVVJs=1X8QmD-II!30o&&9>HrX=uV{ks!@WsM4)LExaD%aRVyDR(rn#
z6;KxzU=;QIG28zgYN38qU_au0coQ{$8l76tpG`vnJc!z>3RLEgqP`DmB4^@VVJ^(;
z{L%Z+ftun&)DrtpMgPM34Qi%-REUG9Z;VT}-^q?B)I@8BH4F9pR8*>ks7Q)DoDvPF
zq(cinhAQp?dtHwz?sD6|7FG0S)TxT1CftjfXFuviK4h=^Q6=~umDo?Hgho)~{`PQ6
zv~WBxK?m<cGU|bD?|7!WP#Nw)O>oLOXzyP^1^6>kfAc4*_^Fgr8TzcnsClbU2|i(6
z9HyaxFWZiFsLa}skJ-u}o#*|i7xg4+f~%<a>lP{i4{0mY0#u--NGxU+>i!~B<r+})
zHKW!IZ=;b*<1^HE-YMjWn_;9%#=+C&n1#AuhlSXP`M3oY*kM#a1E?4B4^%*Ltg5|F
z!FlLGRpNOhu&@cz(1Ytx6SZOmMo}d^hpNbBRB1<1Tjt~ple|emWn6&u7(l&OZK&}Z
zQGxX!=hS?O+WRw@uKyC}X(-d{7{k9%rR(LbQYI&mWXu3+;4muC-%xKu66I5d8K^^;
zjk@o{`>_I5>K8B%SEIIMGp4e>*{KE|Kt+7idfIvsmH7=+CGMgYOlCh6s2f#*B70qq
zs_0Xw%$Fdsnm6%b>_Kh8Y1H{MLo}4>ZBzyh-}v=pRA6pY$@5V6i%@6eAyi<GqcW;T
zj*SVT`dd)rx~$t#<96HYJ|Fd0X^zsNi7(h2L)Poo5md%ws0HFkOAF+n#ucL~SB9#{
zY%Ij*PysZf5^YCq^$yh59rB0AOL2q_w%wdWO?U%U(wnHv?w}4&GG7K7=toto5cPa1
zDv?TiU5na+MOcE%P~$dPyHVq|hizjgD$+fug%6@ib;RC3Yx@UL6JJ49WEd6TZPeMA
z#0ksCEY#LjqYiDY^%-QB&0<sl54=G`6TXd#upL#}PW!+IsD(bti}fUqIAWbCX$g@}
zGUrC(U9L!#Ykg$Y<&C)9ZLva6wj-mV!IvL0Ay~dD)JQv0?d?n{DGpQ?mzMZS0#$+X
z*biQhGj=N{J|W`pmq(uVyCZG>ceCr7LP1~t^p%Y(LQTP@RSh#jzSY6t+J;c1ep+{I
RY2J&DOila0+57UR{{yF%7^?sP

delta 3352
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

diff --git a/sphinx/locale/et/LC_MESSAGES/sphinx.po b/sphinx/locale/et/LC_MESSAGES/sphinx.po
index 7de76feb1..a687f2972 100644
--- a/sphinx/locale/et/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/et/LC_MESSAGES/sphinx.po
@@ -1,4 +1,4 @@
-# Translations template for Sphinx.
+# Estonian translations for Sphinx.
 # Copyright (C) 2010 ORGANIZATION
 # This file is distributed under the same license as the Sphinx project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
@@ -7,406 +7,402 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 1.0pre/8b971dbc7d36\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2010-05-24 23:53+0200\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: 2011-09-18 11:40+0200\n"
 "Last-Translator: Aivar Annamaa <aivar.annamaa@gmail.com>\n"
 "Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\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.4\n"
-"X-Poedit-Language: Estonian\n"
-"X-Poedit-Country: ESTONIA\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:106
-#: sphinx/writers/latex.py:184
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, fuzzy, python-format
+msgid "%s %s documentation"
+msgstr "%s %s dokumentatsioon"
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%B %d, %Y"
 
-#: sphinx/roles.py:174
+#: sphinx/environment.py:1625
 #, python-format
-msgid "Python Enhancement Proposals!PEP %s"
+msgid "see %s"
+msgstr ""
+
+#: sphinx/environment.py:1628
+#, python-format
+msgid "see also %s"
+msgstr ""
+
+#: sphinx/roles.py:175
+#, fuzzy, python-format
+msgid "Python Enhancement Proposals; PEP %s"
 msgstr "Python Enhancement Proposals!PEP %s"
 
-#: sphinx/builders/changes.py:72
+#: sphinx/builders/changes.py:73
 msgid "Builtins"
 msgstr "Sisseehitatud"
 
-#: sphinx/builders/changes.py:74
+#: sphinx/builders/changes.py:75
 msgid "Module level"
 msgstr "Mooduli tase"
 
-#: sphinx/builders/html.py:266
+#: sphinx/builders/html.py:274
 #, python-format
 msgid "%b %d, %Y"
 msgstr "%b %d, %Y"
 
-#: sphinx/builders/html.py:285
-#: sphinx/themes/basic/defindex.html:30
+#: sphinx/builders/html.py:293 sphinx/themes/basic/defindex.html:30
 msgid "General Index"
 msgstr "Üldindeks"
 
-#: sphinx/builders/html.py:285
+#: sphinx/builders/html.py:293
 msgid "index"
 msgstr "indeks"
 
-#: sphinx/builders/html.py:345
+#: sphinx/builders/html.py:353
 msgid "next"
 msgstr "järgmine"
 
-#: sphinx/builders/html.py:354
+#: sphinx/builders/html.py:362
 msgid "previous"
 msgstr "eelmine"
 
-#: sphinx/builders/latex.py:151
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr " (in "
 
-#: sphinx/directives/other.py:127
+#: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Sektsiooni autor:"
 
-#: sphinx/directives/other.py:129
+#: sphinx/directives/other.py:138
 msgid "Module author: "
 msgstr "Mooduli autor:"
 
-#: sphinx/directives/other.py:131
+#: sphinx/directives/other.py:140
 msgid "Code author: "
 msgstr "Koodi autor:"
 
-#: sphinx/directives/other.py:133
+#: sphinx/directives/other.py:142
 msgid "Author: "
 msgstr "Autor: "
 
-#: sphinx/directives/other.py:238
+#: sphinx/directives/other.py:215
 msgid "See also"
 msgstr "Vaata ka"
 
-#: sphinx/domains/__init__.py:253
+#: sphinx/domains/__init__.py:244
 #, python-format
 msgid "%s %s"
 msgstr "%s %s"
 
-#: sphinx/domains/c.py:51
-#: sphinx/domains/python.py:49
+#: sphinx/domains/c.py:51 sphinx/domains/python.py:95
 msgid "Parameters"
 msgstr "Parameetrid"
 
-#: sphinx/domains/c.py:54
-#: sphinx/domains/javascript.py:137
-#: sphinx/domains/python.py:59
+#: sphinx/domains/c.py:54 sphinx/domains/javascript.py:128
+#: sphinx/domains/python.py:107
 msgid "Returns"
 msgstr "Tagastab"
 
-#: sphinx/domains/c.py:56
-#: sphinx/domains/python.py:61
+#: sphinx/domains/c.py:56 sphinx/domains/python.py:109
 msgid "Return type"
 msgstr "Tagastustüüp"
 
-#: sphinx/domains/c.py:133
+#: sphinx/domains/c.py:141
 #, python-format
 msgid "%s (C function)"
 msgstr "%s (C funktsioon)"
 
-#: sphinx/domains/c.py:135
+#: sphinx/domains/c.py:143
 #, python-format
 msgid "%s (C member)"
 msgstr "%s (C liige)"
 
-#: sphinx/domains/c.py:137
+#: sphinx/domains/c.py:145
 #, python-format
 msgid "%s (C macro)"
 msgstr "%s (C makro)"
 
-#: sphinx/domains/c.py:139
+#: sphinx/domains/c.py:147
 #, python-format
 msgid "%s (C type)"
 msgstr "%s (C tüüp)"
 
-#: sphinx/domains/c.py:141
+#: sphinx/domains/c.py:149
 #, python-format
 msgid "%s (C variable)"
 msgstr "%s (C muutuja)"
 
-#: sphinx/domains/c.py:171
-#: sphinx/domains/cpp.py:1031
-#: sphinx/domains/javascript.py:166
-#: sphinx/domains/python.py:497
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "funktsioon"
 
-#: sphinx/domains/c.py:172
-#: sphinx/domains/cpp.py:1032
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "liige"
 
-#: sphinx/domains/c.py:173
+#: sphinx/domains/c.py:206
 msgid "macro"
 msgstr "makro"
 
-#: sphinx/domains/c.py:174
-#: sphinx/domains/cpp.py:1033
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "tüüp"
 
-#: sphinx/domains/c.py:175
+#: sphinx/domains/c.py:208
 msgid "variable"
 msgstr "muutuja"
 
-#: sphinx/domains/cpp.py:876
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (C++ klass)"
 
-#: sphinx/domains/cpp.py:891
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (C++ tüüp)"
 
-#: sphinx/domains/cpp.py:910
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (C++ liige)"
 
-#: sphinx/domains/cpp.py:962
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (C++ funktsioon)"
 
-#: sphinx/domains/cpp.py:1030
-#: sphinx/domains/python.py:499
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "klass"
 
-#: sphinx/domains/javascript.py:117
-#: sphinx/domains/python.py:221
+#: sphinx/domains/javascript.py:106 sphinx/domains/python.py:254
 #, python-format
 msgid "%s() (built-in function)"
 msgstr "%s() (sisseehitatud funktsioon)"
 
-#: sphinx/domains/javascript.py:118
-#: sphinx/domains/python.py:285
+#: sphinx/domains/javascript.py:107 sphinx/domains/python.py:318
 #, python-format
 msgid "%s() (%s method)"
 msgstr "%s() (%s meetod)"
 
-#: sphinx/domains/javascript.py:120
+#: sphinx/domains/javascript.py:109
+#, fuzzy, python-format
+msgid "%s() (class)"
+msgstr "%s (C++ klass)"
+
+#: sphinx/domains/javascript.py:111
 #, python-format
 msgid "%s (global variable or constant)"
 msgstr "%s (globaalmuutuja või konstant)"
 
-#: sphinx/domains/javascript.py:122
-#: sphinx/domains/python.py:323
+#: sphinx/domains/javascript.py:113 sphinx/domains/python.py:356
 #, python-format
 msgid "%s (%s attribute)"
 msgstr "%s (%s atribuut)"
 
-#: sphinx/domains/javascript.py:131
+#: sphinx/domains/javascript.py:122
 msgid "Arguments"
 msgstr "Argumendid"
 
-#: sphinx/domains/javascript.py:134
+#: sphinx/domains/javascript.py:125
 msgid "Throws"
 msgstr "Throws"
 
-#: sphinx/domains/javascript.py:167
-#: sphinx/domains/python.py:498
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr "andmed"
 
-#: sphinx/domains/javascript.py:168
-#: sphinx/domains/python.py:504
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "atribuut"
 
-#: sphinx/domains/python.py:53
+#: sphinx/domains/python.py:100
 msgid "Variables"
 msgstr "Muutujad"
 
-#: sphinx/domains/python.py:56
+#: sphinx/domains/python.py:104
 msgid "Raises"
 msgstr "Raises"
 
-#: sphinx/domains/python.py:222
-#: sphinx/domains/python.py:279
-#: sphinx/domains/python.py:291
-#: sphinx/domains/python.py:304
+#: sphinx/domains/python.py:255 sphinx/domains/python.py:312
+#: sphinx/domains/python.py:324 sphinx/domains/python.py:337
 #, python-format
 msgid "%s() (in module %s)"
 msgstr "%s() (moodulis %s)"
 
-#: sphinx/domains/python.py:225
+#: sphinx/domains/python.py:258
 #, python-format
 msgid "%s (built-in variable)"
 msgstr "%s (sisseehitatud muutuja)"
 
-#: sphinx/domains/python.py:226
-#: sphinx/domains/python.py:317
+#: sphinx/domains/python.py:259 sphinx/domains/python.py:350
 #, python-format
 msgid "%s (in module %s)"
 msgstr "%s (moodulis %s)"
 
-#: sphinx/domains/python.py:242
+#: sphinx/domains/python.py:275
 #, python-format
 msgid "%s (built-in class)"
 msgstr "%s (sisseehitatud klass)"
 
-#: sphinx/domains/python.py:243
+#: sphinx/domains/python.py:276
 #, python-format
 msgid "%s (class in %s)"
 msgstr "%s (klass moodulis %s)"
 
-#: sphinx/domains/python.py:283
+#: sphinx/domains/python.py:316
 #, python-format
 msgid "%s() (%s.%s method)"
 msgstr "%s() (%s.%s meetod)"
 
-#: sphinx/domains/python.py:295
+#: sphinx/domains/python.py:328
 #, python-format
 msgid "%s() (%s.%s static method)"
 msgstr "%s() (%s.%s staatiline meetod)"
 
-#: sphinx/domains/python.py:298
+#: sphinx/domains/python.py:331
 #, python-format
 msgid "%s() (%s static method)"
 msgstr "%s() (%s staatiline meetod)"
 
-#: sphinx/domains/python.py:308
+#: sphinx/domains/python.py:341
 #, python-format
 msgid "%s() (%s.%s class method)"
 msgstr "%s() (%s.%s klassi meetod)"
 
-#: sphinx/domains/python.py:311
+#: sphinx/domains/python.py:344
 #, python-format
 msgid "%s() (%s class method)"
 msgstr "%s() (%s klassi meetod)"
 
-#: sphinx/domains/python.py:321
+#: sphinx/domains/python.py:354
 #, python-format
 msgid "%s (%s.%s attribute)"
 msgstr "%s (%s.%s atribuut)"
 
-#: sphinx/domains/python.py:366
-msgid "Platforms: "
-msgstr "Platvormid:"
-
-#: sphinx/domains/python.py:372
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (moodul)"
 
-#: sphinx/domains/python.py:429
+#: sphinx/domains/python.py:491
 msgid "Python Module Index"
 msgstr "Pythoni moodulite indeks"
 
-#: sphinx/domains/python.py:430
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "moodulid"
 
-#: sphinx/domains/python.py:475
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Ebaasoovitav"
 
-#: sphinx/domains/python.py:500
-#: sphinx/locale/__init__.py:162
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "erind"
 
-#: sphinx/domains/python.py:501
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr "meetod"
 
-#: sphinx/domains/python.py:502
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr "klassi meetod"
 
-#: sphinx/domains/python.py:503
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "staatiline meetod"
 
-#: sphinx/domains/python.py:505
-#: sphinx/locale/__init__.py:158
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "moodul"
 
-#: sphinx/domains/rst.py:53
+#: sphinx/domains/python.py:695
+#, fuzzy
+msgid " (deprecated)"
+msgstr "Ebaasoovitav"
+
+#: sphinx/domains/rst.py:55
 #, python-format
 msgid "%s (directive)"
 msgstr "%s (direktiiv)"
 
-#: sphinx/domains/rst.py:55
+#: sphinx/domains/rst.py:57
 #, python-format
 msgid "%s (role)"
 msgstr "%s (roll)"
 
-#: sphinx/domains/rst.py:103
+#: sphinx/domains/rst.py:106
 msgid "directive"
 msgstr "direktiiv"
 
-#: sphinx/domains/rst.py:104
+#: sphinx/domains/rst.py:107
 msgid "role"
 msgstr "roll"
 
-#: sphinx/domains/std.py:68
-#: sphinx/domains/std.py:84
+#: sphinx/domains/std.py:70 sphinx/domains/std.py:86
 #, python-format
 msgid "environment variable; %s"
 msgstr "keskkonnamuutuja; %s"
 
-#: sphinx/domains/std.py:160
+#: sphinx/domains/std.py:162
 #, python-format
 msgid "%scommand line option; %s"
 msgstr "%s käsurea valik; %s"
 
-#: sphinx/domains/std.py:328
+#: sphinx/domains/std.py:393
 msgid "glossary term"
 msgstr "termin"
 
-#: sphinx/domains/std.py:329
+#: sphinx/domains/std.py:394
 msgid "grammar token"
 msgstr "grammatika märgend"
 
-#: sphinx/domains/std.py:330
+#: sphinx/domains/std.py:395
 msgid "reference label"
 msgstr "viite pealkiri"
 
-#: sphinx/domains/std.py:331
+#: sphinx/domains/std.py:396
 msgid "environment variable"
 msgstr "keskkonnamuutuja"
 
-#: sphinx/domains/std.py:332
+#: sphinx/domains/std.py:397
 msgid "program option"
 msgstr "programmi seade"
 
-#: sphinx/domains/std.py:360
-#: sphinx/themes/basic/genindex-single.html:11
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
 #: sphinx/themes/basic/genindex-split.html:11
 #: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:11
-#: sphinx/themes/basic/genindex.html:14
-#: sphinx/themes/basic/genindex.html:50
-#: sphinx/themes/basic/layout.html:125
-#: sphinx/writers/latex.py:173
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
 msgid "Index"
 msgstr "Indeks"
 
-#: sphinx/domains/std.py:361
+#: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Mooduli indeks"
 
-#: sphinx/domains/std.py:362
-#: sphinx/themes/basic/defindex.html:25
+#: sphinx/domains/std.py:429 sphinx/themes/basic/defindex.html:25
 msgid "Search Page"
 msgstr "Otsingu lehekülg"
 
-#: sphinx/ext/autodoc.py:917
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr "   Baasid: %s"
 
-#: sphinx/ext/autodoc.py:950
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr "sünonüüm :class:`%s`"
@@ -424,131 +420,125 @@ msgstr "(Algne kirje asub failis  %s, real %d.)"
 msgid "original entry"
 msgstr "algne kirje"
 
-#: sphinx/ext/viewcode.py:66
+#: sphinx/ext/viewcode.py:70
 msgid "[source]"
 msgstr "[lähtekood]"
 
-#: sphinx/ext/viewcode.py:109
+#: sphinx/ext/viewcode.py:117
 msgid "[docs]"
 msgstr "[dokumentatsioon]"
 
-#: sphinx/ext/viewcode.py:123
+#: sphinx/ext/viewcode.py:131
 msgid "Module code"
 msgstr "Mooduli kood"
 
-#: sphinx/ext/viewcode.py:129
+#: sphinx/ext/viewcode.py:137
 #, python-format
 msgid "<h1>Source code for %s</h1>"
 msgstr "<h1>%s lähtekood</h1>"
 
-#: sphinx/ext/viewcode.py:156
+#: sphinx/ext/viewcode.py:164
 msgid "Overview: module code"
 msgstr "Ülevaade: mooduli kood"
 
-#: sphinx/ext/viewcode.py:157
+#: sphinx/ext/viewcode.py:165
 msgid "<h1>All modules for which code is available</h1>"
 msgstr "<h1>Kõik lähtekoodiga moodulid</h1>"
 
-#: sphinx/locale/__init__.py:139
+#: sphinx/locale/__init__.py:155
 msgid "Attention"
 msgstr "Tähelepanu"
 
-#: sphinx/locale/__init__.py:140
+#: sphinx/locale/__init__.py:156
 msgid "Caution"
 msgstr "Ettevaatust"
 
-#: sphinx/locale/__init__.py:141
+#: sphinx/locale/__init__.py:157
 msgid "Danger"
 msgstr "Oht"
 
-#: sphinx/locale/__init__.py:142
+#: sphinx/locale/__init__.py:158
 msgid "Error"
 msgstr "Viga"
 
-#: sphinx/locale/__init__.py:143
+#: sphinx/locale/__init__.py:159
 msgid "Hint"
 msgstr "Vihje"
 
-#: sphinx/locale/__init__.py:144
+#: sphinx/locale/__init__.py:160
 msgid "Important"
 msgstr "Tähtis"
 
-#: sphinx/locale/__init__.py:145
+#: sphinx/locale/__init__.py:161
 msgid "Note"
 msgstr "Märkus"
 
-#: sphinx/locale/__init__.py:146
+#: sphinx/locale/__init__.py:162
 msgid "See Also"
 msgstr "Vaata ka"
 
-#: sphinx/locale/__init__.py:147
+#: sphinx/locale/__init__.py:163
 msgid "Tip"
 msgstr "Nõuanne"
 
-#: sphinx/locale/__init__.py:148
+#: sphinx/locale/__init__.py:164
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: sphinx/locale/__init__.py:152
+#: sphinx/locale/__init__.py:168
 #, python-format
 msgid "New in version %s"
 msgstr "Uus versioonis %s"
 
-#: sphinx/locale/__init__.py:153
+#: sphinx/locale/__init__.py:169
 #, python-format
 msgid "Changed in version %s"
 msgstr "Muudetud versioonis %s"
 
-#: sphinx/locale/__init__.py:154
+#: sphinx/locale/__init__.py:170
 #, python-format
 msgid "Deprecated since version %s"
 msgstr "Ebasoovitav alates versioonist %s"
 
-#: sphinx/locale/__init__.py:159
+#: sphinx/locale/__init__.py:176
 msgid "keyword"
 msgstr "võtmesõna"
 
-#: sphinx/locale/__init__.py:160
+#: sphinx/locale/__init__.py:177
 msgid "operator"
 msgstr "operaator"
 
-#: sphinx/locale/__init__.py:161
+#: sphinx/locale/__init__.py:178
 msgid "object"
 msgstr "objekt"
 
-#: sphinx/locale/__init__.py:163
+#: sphinx/locale/__init__.py:180
 msgid "statement"
 msgstr "lause"
 
-#: sphinx/locale/__init__.py:164
+#: sphinx/locale/__init__.py:181
 msgid "built-in function"
 msgstr "sisseehitatud funktsioon"
 
-#: sphinx/themes/agogo/layout.html:45
-#: sphinx/themes/basic/globaltoc.html:10
+#: sphinx/themes/agogo/layout.html:45 sphinx/themes/basic/globaltoc.html:10
 #: sphinx/themes/basic/localtoc.html:11
 msgid "Table Of Contents"
 msgstr "Sisukord"
 
-#: sphinx/themes/agogo/layout.html:49
-#: sphinx/themes/basic/layout.html:128
-#: sphinx/themes/basic/search.html:11
-#: sphinx/themes/basic/search.html:14
+#: sphinx/themes/agogo/layout.html:49 sphinx/themes/basic/layout.html:137
+#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:20
 msgid "Search"
 msgstr "Otsing"
 
-#: sphinx/themes/agogo/layout.html:52
-#: sphinx/themes/basic/searchbox.html:15
+#: sphinx/themes/agogo/layout.html:52 sphinx/themes/basic/searchbox.html:15
 msgid "Go"
 msgstr "Otsi"
 
-#: sphinx/themes/agogo/layout.html:57
-#: sphinx/themes/basic/searchbox.html:20
+#: sphinx/themes/agogo/layout.html:57 sphinx/themes/basic/searchbox.html:20
 msgid "Enter search terms or a module, class or function name."
 msgstr "Sisesta otsingusõna"
 
-#: sphinx/themes/agogo/layout.html:78
-#: sphinx/themes/basic/sourcelink.html:14
+#: sphinx/themes/agogo/layout.html:78 sphinx/themes/basic/sourcelink.html:14
 msgid "Show Source"
 msgstr "Näita lähtekoodi"
 
@@ -584,15 +574,15 @@ msgstr "kiire ligipääs kõigile moodulitele"
 msgid "all functions, classes, terms"
 msgstr "kõik funktsioonid, klassid ja terminid"
 
-#: sphinx/themes/basic/genindex-single.html:14
+#: sphinx/themes/basic/genindex-single.html:35
 #, python-format
 msgid "Index &ndash; %(key)s"
 msgstr "Indeks &ndash; %(key)s"
 
-#: sphinx/themes/basic/genindex-single.html:46
+#: sphinx/themes/basic/genindex-single.html:63
 #: sphinx/themes/basic/genindex-split.html:24
 #: sphinx/themes/basic/genindex-split.html:38
-#: sphinx/themes/basic/genindex.html:56
+#: sphinx/themes/basic/genindex.html:74
 msgid "Full index on one page"
 msgstr "Täisindeks ühel lehel"
 
@@ -604,42 +594,46 @@ msgstr "Indeksi leheküljed algustähe kaupa"
 msgid "can be huge"
 msgstr "võib olla väga suur"
 
-#: sphinx/themes/basic/layout.html:23
+#: sphinx/themes/basic/layout.html:29
 msgid "Navigation"
 msgstr "Navigatsioon"
 
-#: sphinx/themes/basic/layout.html:113
+#: sphinx/themes/basic/layout.html:122
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Otsi %(docstitle)s piires"
 
-#: sphinx/themes/basic/layout.html:122
+#: sphinx/themes/basic/layout.html:131
 msgid "About these documents"
 msgstr "Info selle dokumentatsiooni kohta"
 
-#: sphinx/themes/basic/layout.html:131
+#: sphinx/themes/basic/layout.html:140
 msgid "Copyright"
 msgstr "Copyright"
 
-#: sphinx/themes/basic/layout.html:180
+#: sphinx/themes/basic/layout.html:189
 #, python-format
 msgid "&copy; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 msgstr "&copy; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 
-#: sphinx/themes/basic/layout.html:182
+#: sphinx/themes/basic/layout.html:191
 #, python-format
 msgid "&copy; Copyright %(copyright)s."
 msgstr "&copy; Copyright %(copyright)s."
 
-#: sphinx/themes/basic/layout.html:186
+#: sphinx/themes/basic/layout.html:195
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Viimati uuendatud %(last_updated)s."
 
-#: sphinx/themes/basic/layout.html:189
+#: sphinx/themes/basic/layout.html:198
 #, python-format
-msgid "Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s."
-msgstr "Loodud <a href=\"http://sphinx.pocoo.org/\">Sphinx-iga</a> (versioon: %(sphinx_version)s)."
+msgid ""
+"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> "
+"%(sphinx_version)s."
+msgstr ""
+"Loodud <a href=\"http://sphinx.pocoo.org/\">Sphinx-iga</a> (versioon: "
+"%(sphinx_version)s)."
 
 #: sphinx/themes/basic/opensearch.xml:4
 #, python-format
@@ -662,30 +656,32 @@ msgstr "Järgmine teema"
 msgid "next chapter"
 msgstr "järgmine peatükk"
 
-#: sphinx/themes/basic/search.html:18
+#: sphinx/themes/basic/search.html:24
 msgid ""
 "Please activate JavaScript to enable the search\n"
 "    functionality."
 msgstr "Otsingu võimaldamiseks tuleb aktiveerida JavaScript."
 
-#: sphinx/themes/basic/search.html:23
+#: sphinx/themes/basic/search.html:29
 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 "Siin saad otsida käesolevast dokumentatsioonist. Sisesta otsisõned allolevasse lahtrisse ning klõpsa \"Otsi\". Tulemuseks antakse leheküljed, mis sisaldavad kõiki otsisõnesid."
+msgstr ""
+"Siin saad otsida käesolevast dokumentatsioonist. Sisesta otsisõned "
+"allolevasse lahtrisse ning klõpsa \"Otsi\". Tulemuseks antakse "
+"leheküljed, mis sisaldavad kõiki otsisõnesid."
 
-#: sphinx/themes/basic/search.html:30
+#: sphinx/themes/basic/search.html:36
 msgid "search"
 msgstr "otsi"
 
-#: sphinx/themes/basic/search.html:34
-#: sphinx/themes/basic/static/searchtools.js:489
+#: sphinx/themes/basic/search.html:40
 msgid "Search Results"
 msgstr "Otsingutulemused"
 
-#: sphinx/themes/basic/search.html:36
+#: sphinx/themes/basic/search.html:42
 msgid "Your search did not match any results."
 msgstr "Otsing ei andnud tulemusi"
 
@@ -725,14 +721,12 @@ msgstr "C API muudatused"
 msgid "Other changes"
 msgstr "Ülejäänud muudatused"
 
-#: sphinx/themes/basic/static/doctools.js:154
-#: sphinx/writers/html.py:482
-#: sphinx/writers/html.py:487
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "Püsilink sellele pealkirjale"
 
-#: sphinx/themes/basic/static/doctools.js:160
-#: sphinx/writers/html.py:87
+#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:92
 msgid "Permalink to this definition"
 msgstr "Püsilink sellele definitsioonile"
 
@@ -740,33 +734,12 @@ msgstr "Püsilink sellele definitsioonile"
 msgid "Hide Search Matches"
 msgstr "Varja otsingutulemused"
 
-#: sphinx/themes/basic/static/searchtools.js:285
-msgid "Searching"
-msgstr "Otsing"
-
-#: sphinx/themes/basic/static/searchtools.js:290
-msgid "Preparing search..."
-msgstr "Otsingu ettevalmistus..."
-
-#: sphinx/themes/basic/static/searchtools.js:364
-msgid ", in "
-msgstr ", "
-
-#: sphinx/themes/basic/static/searchtools.js:491
-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 "Otsing ei andnud tulemusi. Veendu, et otsisõnad on õieti kirjutatud ja et oled valinud sobivad kategooriad."
-
-#: sphinx/themes/basic/static/searchtools.js:493
-#, python-format
-msgid "Search finished, found %s page(s) matching the search query."
-msgstr "Leiti %s päringule vastavat lehekülg(e)"
-
-#: sphinx/themes/default/static/sidebar.js:66
+#: sphinx/themes/default/static/sidebar.js:69
 msgid "Expand sidebar"
 msgstr "Näita külgriba"
 
-#: sphinx/themes/default/static/sidebar.js:79
-#: sphinx/themes/default/static/sidebar.js:106
+#: sphinx/themes/default/static/sidebar.js:82
+#: sphinx/themes/default/static/sidebar.js:110
 msgid "Collapse sidebar"
 msgstr "Varja külgriba"
 
@@ -774,24 +747,24 @@ msgstr "Varja külgriba"
 msgid "Contents"
 msgstr "Sisukord"
 
-#: sphinx/writers/latex.py:171
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "Väljalase"
 
-#: sphinx/writers/latex.py:572
-#: sphinx/writers/manpage.py:178
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr "Joonealused märkused"
 
-#: sphinx/writers/latex.py:641
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr "jätk eelmisele leheküljele"
 
-#: sphinx/writers/latex.py:646
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr "Jätkub järgmisel lehel"
 
-#: sphinx/writers/text.py:422
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[pilt]"
 
diff --git a/sphinx/locale/fa/LC_MESSAGES/sphinx.mo b/sphinx/locale/fa/LC_MESSAGES/sphinx.mo
index 040cf00a8bb3a155317edc5cad493242933f136f..fe705e767ab93c534b9874e403f9950047475036 100644
GIT binary patch
delta 2473
zcmZY9Z)lZO9KiA8)Y;6<xlMDM&8tnZbb4oN(U!4pijZXzY3K`SsaS&7rL&MJH*~NB
zUBhLtqS6%!(<q$f%IpsmWQZ@SmC!OXR4}qy%F3wq{px{UG@d=5bDrn?`JLZ6&;2U3
z<DSf^f?>M@f4lgf!2f|^*8cmuGbe;mROjGuycZ|qBIF7iqFd1SEm(*<aSZOoBJ9S|
z_!&ChNz4r)6V6h&o(I3j27~ATqeq4?4sXJItie27fC*fNPSAw*--&b$9ccSk@diAE
zj&~eO@HCFczpg&d5FNdXc`yyDF@+Ox6INjdCh-K8;vkO2QkLO_m3ST2;$1j5*0&)m
z3_EZHzJT`YM91yHeC7{7Q!uiB(1D8S<-n8i0i1!^xETpLY(oQSMN{5|X67xl--l@C
zjv-e#&CLv4#4OCBvGw7Yal4Bt*s%;9a2guv%;;RS!!n$NX>>2!keI`sSbrndkD`Ho
zj&4zJte;2c>qi3{$YcLq@o+|S!aTHNIeHjpp_#c4Q@9%G8@jL@-$esBg=Xj{G}Zmc
zE`=+xp3Q;qeI9xk$D;3VG5-!&%>z?954l1;Hv?NAZ9+RVqbq7dGuDX?d;o`HH@d>Z
zXdv(7RQv?51{k0BqvK!6P%xsQjCv!EM+dG(C#vJ-#1Eodvm9OVN;E@HpcA&D{o2vf
z{Zg#IgQohU=m~V3J~Y70847;S7vhWDf@_f$MoZ9!lhBE7Mgy1`-`AomNuils5bMj3
zwS^V&c_W(PZOE>KSCH{C;Y|vr<`DWB9*Ol{bVYsW3eKScT*8haA^eF3(oXtZ(H?Xm
zucQ5rMZb*ize5l4k4V=rfMc0IjO64QQ36RqNTL&_qKo45<!EXf&_lT$xx#DQT={#L
zz+>nS&jobcEWSkpDnK(b0sVccz(T+O`zaWCJ-VmOXeRbz0*_!d_MsgM8NCW`#Uwt4
zrnUne=WR5jC(!`D$Hn*ynt^$&g2jiWm@$QE3e&L({RP{HMtTm*Z~)!oaYW^S6LBfd
zLMPgeX08nlpff)I6wS<WGy~t_R6L8eA5}vB{Xr=spAJ-qGjKjSVPky01^r!UMy~KI
zH`{e#0>8oA@eg!@B<Y|S9!AGsk0dWVhc0+O5<}=ICI6=43m!P(d1TwduSm8+Hv3_{
z3_UbeI1T4x1vX#`Uq(~=1D50ESTEt5w%<&2;=9py3(>FY(F_Gwwg$;^*ccnMq7!!_
zSLlg;jjr%gw3PjEz!Vzr5;V1GG^0<W3u{3$(1y;p4{I@Vkb(^_q7hw2JN%7iCYuvi
zgQe&mE<po(1pQ%p68-$PqAPp`S$x=yey#`6eupuEAERgD4Dyv_!f)3KVGxZhmsYN5
zJkG%x=mcxfKpW6@Poal#D;n^wSbq_1w;yeH5S{QS+U_{ouNU*eLQW$EKch?Niz%EK
zBfkwDpa!|ZJZ=uWIzCS$D+rs=_AS_+E_x_`%7(<sbt^WmU6pREZ+v`Rx_fg@cg~o~
x%8KM26|*Z7mC2f9_4MTI_PWAJ!>VekD!W$|ju<kex_xcY;{W&kpy>Hg{{mmY?E(M*

delta 2426
zcmYM!eN2^A9Ki8|;R`4rAfiZkX$~o+E)H)%p$2Pf%u@d_tktO5S~412&RV2gXUoO1
zDS<1q7q_q%He*IBY?!^QT>e3=)HdBLwOQF(wfVNn>id<m#V+^roaZ^u`Mo^Pxm%hJ
zH>OV%WNr`q_3&THe}AT<|NrJ^g)oI-6^_SxyatybpRhXmFnawl%*PEl4Yy(*_M_{(
zi#hl)P7Wa*zKj!&V<8uQ!Rh!fPQ~fjA>`s*OkfHP(1I)w)*w^EI&^*-i*Xye-kVs0
zBRB)Ujpu*InZys7tdinF8P3L)ScB^@i32zbk7E&DL<8nf&Lk|xMVN@=R<y#0a3Vg6
z-q(e$+lMCl1(py$9OJ-+&Z7(egUfIdt4zRENV1_7O{5KN^=7m)ThRM<qMh4~e8LD{
zcHj_>!xM3Q5`D_&G3||ia^QlQtY)U!(FD3c3d^w>eU|M=j$wTqcgOJ#G||`5N3=JN
zKScwMBB8=JXu&6Q>AwNb#)+=(OE?*QW|i28O~{n68Ry`3G=UG$4jn{WJ&HV?a5Roj
z#p`F$m+_ByeFFV=y@ILq-<Fnh!e`RJmzmuWZ9x~j53Q&j?N}EY_-VWfx1tsHqKUkK
z6}StpBpA<+qU#?;6Z$UA!POj`Ll-U}ih)Y`GVt|yW!s?@FF`wWI~uSJy{`j(yC09^
z=g?Na6dgd<8AcQQ5Z%V<&*O!k(M*4fUO*>aMgxs67)u}<omY%jQiis2ZXBnOTEgOZ
zemUCVR;2sk33R<@kaf~w8wWEv@%-3{uotap7_HzF^oFl+M@9%o&`xyFKPy^~R<a4b
zZ+CPsUf+k@5)Pp6+Sh0zKViQ6{}KlV%I2!hK#C3(XiIC+mvII13GIAY@g_`Q5Bh`i
z4!ZCmG?8OyCw@SGSI(omsfayl!q;M{`+q41c3=%A@JUQzKYHVFtiiu9iAkc_()-bc
zHlUAW7n;BuxDww-1LjZ#HHLDub19sMO_=tVtAhhGeH+X00QziCpbP$pci}}e&<e7(
zL#xmP+R*dQqMhkOJMbD-;2w1TVf1(83_5>O3H_hXK_2}z;LYfTThSkqrN}3=@a4Qm
zFoCb)jrb87;1co)vuTR~>XBxJd(ev4A~C~8v=c9)@djtne;!L1<^<geqv-ey`qKQ3
zm6*q#tHN4r#0SyVzJ+see;l7e@4J8o&SGynZ#uf0u0so3fHX5Sq~nA;(ZFrUCv1$q
zf>t;ZJ&i7y&2uv0GPJcRv~#zil`TU%unG;>fj40%I`2I+q4a(Zyx}vnHKSOMr_pCv
z#v5p2mFN%BB6Qm|qZKYkiVgRo+q4tCFO3Q8M&F46ba(BG9z+sLha((V(f8PZ=g<HP
z5@VUxq7^JgU&dxM;k)B_HCoYHbY3SK@F{d&A9~-*==nY9E*il+d-5v>W_}r6U>t9d
zFHsI(E_?%eK803r3p#&UZ(UZ)P=D57R(`U!s=B%=S(m7;tFKATOIG(jP*|S1u)aDu
b)Ll3+BV%E2&$N{pmA&~zg+sYTT~q!8S5MsM

diff --git a/sphinx/locale/fa/LC_MESSAGES/sphinx.po b/sphinx/locale/fa/LC_MESSAGES/sphinx.po
index 8f75c591e..92caf31a0 100644
--- a/sphinx/locale/fa/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/fa/LC_MESSAGES/sphinx.po
@@ -1,8 +1,9 @@
+
 msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 1.0.3\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2008-11-09 19:46+0100\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: 2011-01-22 14:41+0100\n"
 "Last-Translator: Omid Raha <omidraha.com@gmail.com>\n"
 "Language-Team: Omid Raha <omidraha.com@gmail.com>\n"
@@ -10,20 +11,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr ""
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr ""
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr ""
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, fuzzy, python-format
 msgid "see also %s"
 msgstr "همچنین ملاحظه نمائید %s"
@@ -62,21 +68,10 @@ msgstr "بعدی"
 msgid "previous"
 msgstr "قبلی"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr ""
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "فهرست"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr ":نویسنده این بخش"
@@ -141,14 +136,14 @@ msgstr "%s (C نوع)"
 msgid "%s (C variable)"
 msgstr "%s (C متغیر)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
-#, fuzzy, python-format
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
+#, fuzzy
 msgid "function"
 msgstr "تابع"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
-#, fuzzy, python-format
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
+#, fuzzy
 msgid "member"
 msgstr "عضو"
 
@@ -156,7 +151,7 @@ msgstr "عضو"
 msgid "macro"
 msgstr ""
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr ""
 
@@ -165,28 +160,28 @@ msgstr ""
 msgid "variable"
 msgstr "متغیر"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, fuzzy, python-format
 msgid "%s (C++ class)"
 msgstr "%s (C++ کلاس در)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, fuzzy, python-format
 msgid "%s (C++ type)"
 msgstr "%s (C++ نوع)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, fuzzy, python-format
 msgid "%s (C++ member)"
 msgstr "%s (C++ عضو)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, fuzzy, python-format
 msgid "%s (C++ function)"
 msgstr "%s (C++ تابع)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr ""
 
@@ -224,12 +219,11 @@ msgstr "پارامترها"
 msgid "Throws"
 msgstr ""
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr ""
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
-#, python-format
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr ""
 
@@ -298,47 +292,45 @@ msgstr "%s() (%s متد)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (%s.%s مشخصه)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (ماژول)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 #, fuzzy
 msgid "Python Module Index"
 msgstr "فهرست ماژول ها"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "ماژول ها"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "منسوخ شده"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "استثناء"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr ""
 
-#: sphinx/domains/python.py:563
-#, python-format
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr ""
 
-#: sphinx/domains/python.py:564
-#, python-format
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr ""
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "ماژول"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 #, fuzzy
 msgid " (deprecated)"
 msgstr " (منسوخ شده)"
@@ -384,7 +376,7 @@ msgid "reference label"
 msgstr ""
 
 #: sphinx/domains/std.py:396
-#, fuzzy, python-format
+#, fuzzy
 msgid "environment variable"
 msgstr "متغیرهای عمومی؛"
 
@@ -392,6 +384,15 @@ msgstr "متغیرهای عمومی؛"
 msgid "program option"
 msgstr ""
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "فهرست"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "فهرست ماژول ها"
@@ -400,12 +401,12 @@ msgstr "فهرست ماژول ها"
 msgid "Search Page"
 msgstr "صفحه جستجو"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr ""
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr ""
@@ -728,8 +729,8 @@ msgstr "C API تغییرات"
 msgid "Other changes"
 msgstr "دگر تغییرات"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "لینک ثابت به این سر مقاله"
 
@@ -754,83 +755,25 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "انتشار"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr ""
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr ""
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 #, fuzzy
 msgid "Continued on next page"
 msgstr "فهرست کامل در یک صفحه"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr ""
 
-#~ msgid "Python Enhancement Proposals!PEP %s"
-#~ msgstr ""
-
-#~ msgid "Platform: %s"
-#~ msgstr "%s:پلتفرم"
-
-#~ msgid "Platforms: "
-#~ msgstr ":پلتفرم ها"
-
-#~ msgid "here"
-#~ msgstr "اینجا"
-
-#~ msgid "Searching"
-#~ msgstr "در حال جستجو"
-
-#~ msgid "Preparing search..."
-#~ msgstr "...آماده جستجو"
-
-#~ msgid "module, in "
-#~ msgstr "ماژول, در"
-
-#~ msgid ", in "
-#~ msgstr ", در"
-
-#~ 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 ""
-#~ ". هیچ سندی برای جستجوی شما یافت"
-#~ " نشد، لطفا  اطمینان حاصل نمائید که"
-#~ " املای تمامی کلمات صحیح می باشد "
-#~ "و همچنین موضوعات کافی را برای این"
-#~ " جستجو انتخاب نموده اید"
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr "جستجو انجام شد ، %s صفحه مطابق با پرس و جو پیدا شد"
-
-#~ msgid "Suggest Change"
-#~ msgstr ""
-
-#~ msgid "Keyword search"
-#~ msgstr "جستجو کلید واژه"
-
-#~ msgid "Most popular modules:"
-#~ msgstr "متداول ترین ماژول ها:"
-
-#~ msgid "Show modules only available on these platforms"
-#~ msgstr "تنها ماژول هایی که در این پلتفرم در دسترس هستند را نشان بده"
-
-#~ 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 ""
-
diff --git a/sphinx/locale/fi/LC_MESSAGES/sphinx.mo b/sphinx/locale/fi/LC_MESSAGES/sphinx.mo
index b0dfff474335a9668343b1f46db5ad0d557e3f65..497088c8f61bda33a33d8c835ae30a9bf67daa96 100644
GIT binary patch
delta 2733
zcmZwHduWzb9Ki9jsdLU|ZqB)RX|J~hwdp$>(~Tx+YAH4`vXn?BCi6PcT-GdJa5@Ez
z{&*>iykIx61eIaBAe||iW<+RKXkk_&l8`hrlBDmq9q6CNv*&ZpdCui`e&>1KQ<K(B
zPW_PI{k6c~PW}h;Kca`V|NhEyLb!`+Ip$&w+T~FkhIQBrS47vu=j*W_?VB(UcVGeT
z$Gh<aGH)uJr{KgtVQ;(<JN%7(sOQq?1cT9mqtO22(FLYsA=YDGT#b&~hzZ<+jz5H4
z;WRe`K97a0A1+aF;4K`0*@RV$33P!P9Ef#Tgo}_XtmWqOSJD3OU=@CXCD@6TSU|K%
zoQi|68T;ew*o*bU9t-#pW@87A$5XMM&2}h;JnV@j=mhto3)G?;ScwMOg3hxYop%?`
z!2Oto8KjZqhHOk3Q9lY}aWs0i4M^Xx44vR53>hJ`qN(1%Y6i3&&A=Ya#Ew`$hTW-u
zgO0z5&U*z7{MTq^9{G2IA`WOMmZ59aA=wLaV|_`iuR$Z<h+H8Z>+hip?n47RfM(zr
zy5Jdf+-3A7zm8@qC!hRJq%bnSYsU+51ohQu09(<N?M73-4|z?(p;$j2pPxbB?z8dv
zRWyU0XokD7OEw)!(7=+>>J$YhoQMP!>d=(cqYE#_Zny&7VN-nGj0Ut0OK~&Wzb&?Z
zj4t#k8rbJJ1TUfU-$B<)W%JYk2BK$FitfA&O;t6z@RR7kr;#fx;O5uR9NW`q>bFHd
zMCWTq13iNNUYv~W*N}iy;kT|rxD~yF4(P$bxo|ETP(HfD5_D&!Xo^S2`gk<OkHq%b
zXzCl#cd7-QFOAOg1{VAM?}!cU=ngy3ot#Doe2XslJ+9{~xPk_>lphOy5#4Dky2H(A
z|Gm*e@%d3C>)|At`U_a#_kW#&5oVIle|L%oP=X#!Ir_XB-SJd(g4wZsG1|WwU0@^n
znQlch(uR&ZjtM-Aj_<^j3uf{2<<9$|1BajkE0Ng3WaJ9ZaC3px=;yNunIpW9&T}L_
zKZ9K15;uPl|H2ZiU{EE_#3Z&3B>$e#K^lBJ&!U0cKvRD^*6lQbdJdY}>FADU#rk~Y
zRKijmgKN<Z96+WBC(v;}qVr$F8Q3|9{Cjqjc-4I{4GrW8H1d_`^WA6)_oDp{<0$+L
zxxy`O?zn)#!*LY)l0A;5dJa0z5;Tw%vAsD(!N@lwS9qJ7Degdj5znD#{|CB2);(QE
zltAB&vFI<`!{|bF=udGy8o+!sQ;X4lFQDtS#CqyY3hv-tG*w4&99~2x>d(QAz#=sA
zT6E$m=x6#E8py0zpNAgZBIHXBjcCSN(2cx;WIt>}Hku0U6rA9T=yzy@zo0w19ousg
zT?-eZsZ5|}T#7C*77cI$dIZzZKpW9Oo6zSkqk*;J5WoMoC^$hoy5KSNZT=cv=yI%I
zMKg61-C;iG<G2CnghSD<p(?h|KvO>_+7R2D(121njP=6?3NG{k8u7m9LA2vxH1ZRe
zfnTCW^A+0v9QynM`jY;P8TdQe?`CZO6HR^3VO>Wt9BbXl0~B-|`jXY66F-ISa4x!&
zg=oL$(FNC}i*pwA9r;}1+2!+_mMv&pHE-3T<&AC4IXipjRaBHGtINk!Br1|M$*TL4
zW71`XL%UbjR92*C7ItP-rKb$2|G%M?8Exl_9?VQ%&Mi*gH>f6E)n`{*ufY#x{R0Pk
B11kUk

delta 2701
zcmYk-duWzb9KiAOzS^3bw@o+OobxrE=xX-r=4~!Douyb_$@<IdB+YV^6H3FEFms?%
zxha^}l+=O{T!GrUU=dmtqJM-djbK_5T_6i%3;KTD`J?gpe9k$~x%|%WJkRSZGtSp$
zuH|>%75F>EzY_o5#qEE8B{?DVq&^6HVL94m0^W<0u?H@Tu8GgrV;=1ru|Mv>K6n_N
z?<6u`CVWC6mxixnhb!2d`b~6#+p#@|P6kkn{cr>pVh#4ih3L3COyN3od^2)|qudPi
zBs#7Y`?7wxOkn^G?O24J=mLd=S&Zd)56(a%U(C(tYta4~9EW>wFkZwe`~%ZiM$`jw
z5f<R{XdsQs`e7%9Y}|*F@$Fb|N3QTIx4W?eouC`rbb%st=X20Nm!R`(Ko{7Ib8!b|
z;Z-D=p&bqAcg&2Zkjue%rqhwOFbkdFNeqb)mZK?K!D<Gy0nI=oCUIY^AH?p|ThQ^R
z(0R|IfuD<BL&x7T|3fHbb5O2Tj$|!V$ND3&{sbC%9dd>GSbrH^a61~<8)ya&q6;2J
z$9;^x+~?6u-N0#>$S42qxHdn8VYm<t-~}{gThP>RM_!B29P5YT^W*5-eIh>p9G&kX
zn&Kaj&4vy%u%2vN3()yWGZY9Wl%pxDK^J})yWwN#4(G?`i_n0U;&5Dr_J1w5??x9m
zfChF92VpBZe;c}9I~qXdZwj7KlHTq-8%<RKy6_lu;CSQ;4{`HrSQOjq(bT^f-HOh)
z3k`HH`a5wXwts;Je4)!sxEveW&;dW93*STo`Yk^1KzEkpU`=r@S}#UZJT$gfp{bva
zzEexk`RdVy8_>^o<DEL^zl(x9+=uSuC_3PMbb-^jg|FZ&8qiFBEc9`7r_0eDu0s27
zi#EsS`_YsiLG}<nKm+>{d;0yiQE=g(&@=ffc1VzCcbbPzkU|HJLHkcbPA|+uKhHWe
z6C2TS+cAZE(ebTl;NPGd{thz^yiUP^oygju7x^(oW!zj~3i{bBM7o5v=tNuN^Je4<
z$GQ1ScoqlaKUjrD3{K-5^k_2ZOS!k0@83vH(_qR!L+j^oDqccU+K*B0xCE`2Bc~B6
z(TQiF8`yvh3ER+qN74CC;9NY79$63GaNGNokbfg7qQS_=qaD_wDQt)xH{&SkJCG~1
za&yO5a47zXzFY&C%v6`6^Q6&0#>Mt2XyEgaD?F9qZi=^{zl3|xGyV`=;48dyMCiNG
ziT<Kxmv$}G50li(&;UlDnR)>2_aM69%vfKHZeTT<sm!YsCQx__ov00m;Z-#9BnRol
zx#;Jaj|Ng4>%-Bb8->2zm1t^bq8nL&WIZfLH@XQOzq89sI6%P&-$hgRY3y(bUHBTB
z%IoME|AH>ii3XUJ>N<ixX#Ywy&}#JgG&Hc;Nb<r`bo?gF^Z)-w3ck&6q6;01_4m+J
zok4f_EjsXfbiy0x*U*8s_vidfeQET5w7nV)s22U5cobcy9<x|KthazKp&d7)k#EBU
zHls(g8|}9TeSQdiN#DT)o<jSbiR~YuslR|8#n0$QZb$#c3SY7$VL5RL8u3tcCl%;`
zN$7%8n?~lWY&o2>KQ}Kuu_8UXVoX(P^n~iliT9<`P4fzebRSziI^DFs@K$1M)6)Z%
z(lecC>0MNlY??iAK|yNxvvteXt(uf78&OxkVqL@PhG$leY<jNu>n*h<Q?vd9xSjSb

diff --git a/sphinx/locale/fi/LC_MESSAGES/sphinx.po b/sphinx/locale/fi/LC_MESSAGES/sphinx.po
index 6af7cee30..4a329546d 100644
--- a/sphinx/locale/fi/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/fi/LC_MESSAGES/sphinx.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 0.6\n"
 "Report-Msgid-Bugs-To: sphinx@awot.fi\n"
-"POT-Creation-Date: 2009-01-24 18:39+0000\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: 2011-01-22 14:41+0100\n"
 "Last-Translator: Jukka Inkeri <sphinx@awot.fi>\n"
 "Language-Team: fi <sphinx@awot.fi>\n"
@@ -15,20 +15,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr ""
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d.%m.%Y"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr ""
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, fuzzy, python-format
 msgid "see also %s"
 msgstr "katso myös %s"
@@ -67,21 +72,10 @@ msgstr ">"
 msgid "previous"
 msgstr "<"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr ""
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "Sisällysluettelo"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Luvun kirjoittaja: "
@@ -146,13 +140,13 @@ msgstr ""
 msgid "%s (C variable)"
 msgstr ""
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 #, fuzzy
 msgid "function"
 msgstr "Varoitus"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr ""
 
@@ -160,7 +154,7 @@ msgstr ""
 msgid "macro"
 msgstr ""
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr ""
 
@@ -168,28 +162,28 @@ msgstr ""
 msgid "variable"
 msgstr ""
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr ""
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr ""
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr ""
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr ""
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr ""
 
@@ -226,11 +220,11 @@ msgstr ""
 msgid "Throws"
 msgstr ""
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr ""
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr ""
 
@@ -298,45 +292,45 @@ msgstr ""
 msgid "%s (%s.%s attribute)"
 msgstr ""
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (moduuli)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 #, fuzzy
 msgid "Python Module Index"
 msgstr "Moduuli sisällysluettelo"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "moduulit"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Poistettu"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr ""
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr ""
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr ""
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr ""
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "moduuli"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 msgid " (deprecated)"
 msgstr " (poistettu)"
 
@@ -388,6 +382,15 @@ msgstr ""
 msgid "program option"
 msgstr ""
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Sisällysluettelo"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Moduuli sisällysluettelo"
@@ -396,12 +399,12 @@ msgstr "Moduuli sisällysluettelo"
 msgid "Search Page"
 msgstr "Etsi sivu"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr ""
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr ""
@@ -716,8 +719,8 @@ msgstr ""
 msgid "Other changes"
 msgstr ""
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr ""
 
@@ -742,49 +745,25 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr ""
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr ""
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr ""
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 #, fuzzy
 msgid "Continued on next page"
 msgstr ""
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr ""
 
-#~ msgid "Python Enhancement Proposals!PEP %s"
-#~ msgstr ""
-
-#~ msgid "Platforms: "
-#~ msgstr "Ympäristö"
-
-#~ msgid "Searching"
-#~ msgstr "Etsitään"
-
-#~ msgid "Preparing search..."
-#~ msgstr "Valmistellaan etsintää..."
-
-#~ msgid ", in "
-#~ msgstr ""
-
-#~ 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 "Ei löytynyt yhtään. Tarkista hakuehdot, sanahaku, ei sen osia"
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr "Etsintä tehty, löydetty %s sivu(a)."
-
diff --git a/sphinx/locale/fr/LC_MESSAGES/sphinx.mo b/sphinx/locale/fr/LC_MESSAGES/sphinx.mo
index a4d35a8be8d05e991c6c4df705f2d7900b453f92..f123c004b5547d97f0b9cc980a0aa4d75827aa3d 100644
GIT binary patch
delta 53
zcmX@;bkJ#oors{Jp{{|Yu92aFp@EfwnYMw^WPcGw785HI!_6fkvW$#on<t6Zu`}vz
J7L+w$0RVWj4DkQ}

delta 53
zcmX@;bkJ#oors`;g)SH=7#dj_TWT8^O!gO1WHGfeG}v4sBFo5Vx_Odl9Xlh}W<gm4
F765ts4A}qx

diff --git a/sphinx/locale/fr/LC_MESSAGES/sphinx.po b/sphinx/locale/fr/LC_MESSAGES/sphinx.po
index 3a4ad6e1a..ab989cf90 100644
--- a/sphinx/locale/fr/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/fr/LC_MESSAGES/sphinx.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 0.5\n"
 "Report-Msgid-Bugs-To: larlet@gmail.com\n"
-"POT-Creation-Date: 2008-08-08 12:39+0000\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: 2011-01-22 14:41+0100\n"
 "Last-Translator: Sébastien Douche <sdouche@gmail.com>\n"
 "Language-Team: French Translation Team <sphinx-dev@googlegroups.com>\n"
@@ -18,20 +18,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, fuzzy, python-format
+msgid "%s %s documentation"
+msgstr "%s %s documentation"
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d %B %Y"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr "voir %s"
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, python-format
 msgid "see also %s"
 msgstr "voir aussi %s"
@@ -70,21 +75,10 @@ msgstr "suivant"
 msgid "previous"
 msgstr "précédent"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr "(dans"
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "Index"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Auteur de la section : "
@@ -149,12 +143,12 @@ msgstr "%s (type C)"
 msgid "%s (C variable)"
 msgstr "%s (variable C)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "fonction"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "membre"
 
@@ -162,7 +156,7 @@ msgstr "membre"
 msgid "macro"
 msgstr ""
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "type"
 
@@ -171,28 +165,28 @@ msgstr "type"
 msgid "variable"
 msgstr "Variable"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (classe C++)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (type C++)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (membre C++)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (fonction C++)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "classe"
 
@@ -230,11 +224,11 @@ msgstr "Paramètres"
 msgid "Throws"
 msgstr "Lance"
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr "données"
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "attribut"
 
@@ -303,46 +297,46 @@ msgstr "%s() (méthode de classe %s)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (attribut %s.%s)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (module)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 #, fuzzy
 msgid "Python Module Index"
 msgstr "Index du module"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "modules"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Obsolète"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "exception"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr "méthode"
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 #, fuzzy
 msgid "class method"
 msgstr "méthode de classe"
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "méthode statique"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "module"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 msgid " (deprecated)"
 msgstr " (obsolète)"
 
@@ -394,6 +388,15 @@ msgstr "variable d'environnement"
 msgid "program option"
 msgstr "option du programme"
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Index"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Index du module"
@@ -402,12 +405,12 @@ msgstr "Index du module"
 msgid "Search Page"
 msgstr "Page de recherche"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr ""
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr "alias de :class:`%s`"
@@ -733,8 +736,8 @@ msgstr "Modifications de l'API C"
 msgid "Other changes"
 msgstr "Autres modifications"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "Lien permanent vers ce titre"
 
@@ -759,50 +762,25 @@ msgstr "Réduire le menu"
 msgid "Contents"
 msgstr "Contenu"
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "Version"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr "Notes de bas de page"
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr "Suite de la page précédente"
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 #, fuzzy
 msgid "Continued on next page"
 msgstr "Suite sur la page suivante"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[image]"
 
-#~ msgid "Platforms: "
-#~ msgstr "Plateformes : "
-
-#~ msgid "Searching"
-#~ msgstr "En cours de recherche"
-
-#~ msgid "Preparing search..."
-#~ msgstr "Préparation de la recherche..."
-
-#~ msgid ", in "
-#~ msgstr ", dans"
-
-#~ 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 ""
-#~ "Votre recherche ne correspond à aucun"
-#~ " document. Vérifiez l'orthographe des "
-#~ "termes de recherche et que vous "
-#~ "avez sélectionné suffisamment de catégories."
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr "La recherche est terminée, %s page(s) correspond(ent) à la requête."
-
diff --git a/sphinx/locale/hr/LC_MESSAGES/sphinx.mo b/sphinx/locale/hr/LC_MESSAGES/sphinx.mo
index 6e74304d6fd0001dcd29def0dddf70d414bc3264..a9bdb145c818f1c69912403a60de10a9a799174e 100644
GIT binary patch
delta 2646
zcmZYAYiQMF9Ki8sIXh0Bo91+GnrAv)X~vl@)2)kmDPgE3c3F#TP4f~>;;67N|AjP(
zUSu4jOe3VEAQMtVeBsg>WT-_Zgt1LC@G?kWm?bu(@7F!hi{$Kl{?GsN{4US)KmI;<
z`@E!kSpIu~e>?aa&0lZ6qyPSO7KAXEVHXx+5BA6FI1X<jpHMNd&&lZZ`|u8|!=bnc
zhhq~K;d*4=B(!nh#5o*<JL3&s;t<A%&<T#m^WEtEm(c*dI0B1#xEQO@=Vo9UA4Q*E
ziG0GVe3@_?785^g;b0^ucA^s=#4<dArFaqTKptOSAA+NB98Sjva4cpqgE=h64lKd5
zXu!X40Gj<nP=Eu7ALeslMUV59!lmegE3gJ%Lo3^hCiX2lQ8!xo1vJ1-T!aHC|8{&D
zX--&*CbSyw$2N3{+A-lTbnxW_KRd`{t<j0QSt#ZV*U-xQk;QE|5*?SJ+vQ&L`Dy6H
z526Lki8i43ufYo3gzkY|_MfhV{qe*%==da>`5AQWdg8bj4VdDji48_OQHBN_k3KgO
z-OO{*jy2(I+<?~jHCEyeL+QT(uX4hcg<*Y5kV2L{6vc5ldVM^)izmhF52F*-qb+_0
z$uX=)6Wbi!g3h-M2^Dss9XpV4;KWC;A09<3JdW;#pKv0c##;%}N6)9w07Ym*r8ows
zpcB`lfu2AEuRxb3ix%99b|`7%z<{5i4}OkLxEJ01-^KH1(SSW@>#s)hxY>z|(8Nm6
z--R*p{46x_N1_X&OOX4M(8z%aG^3fVj5n-918zWD{AL_)MO*w)JiiBR{ULNyokr)o
zga*EhzOL8M0*lxv7BC9)egCUC*vhWICtf(h*7t@V(TTdyiq4@E^ykOo)<kIKqmX8V
zv1kI*kktxv;`m9luot6Qbd$c0#lHV<bKrwJ&^6nQR@{z0cmhd2{EB?S6~631iuLin
zQcPnNdVW3{paD&ESv=o@z6}YQ@Q0YVY4&hni;km}pGPbB6Wt^!F3!SAyc?He2H!zj
ze;B>L6Ya<qwDs4}U%K9Sy^iS4zYyIk&z8}Du7zcssKJeB1^bZLp#$9mU6{u6Xyz%R
zF2r*5`f9Y|EIQvttilh_K!?#z9Ys6x3;IL%TRHu|ljC!gX}~<%!7_(3bmD4s!dkSV
zCDBH7!WWQj6J9|(wHYnoQ#677=+btfOZf--+zs@#EJ%oM<|XLbr_l$dq6y57<9f7`
zMl@hET1jghZ$g(~8`k1(be;=XiGQP=8$Gsfo(!5$GJ^vXn1@#QSoA4$(>)ijXVCx~
z(MsP%1MG>{+oRv3&z(XGx)l8foxd>M=WyihN<ujYCXmL7I2pZhF<Nm0+KDD~X;vfM
z3vZy;KSl$67CneQe+;egBvO1hgTBr;(a!a&FwumJIB@O9p@Hh6bJ5+pAlislyeis?
ze8O9Nx$D1(euXA*AdcJPxC5R47`havJWu>^F<!WWZjS5dgeiV?ys;2HUxB;;A%iAT
zk5<%(27Dg<eOM943A!2E(EnTBN7|g8-IQIPtxZqJhV)&z&Vt3o6SC=LYns=+yu4*?
z)7n*QTJ}vESTm@wdP-*Il&RI}>P&5BdhVr?%KVzzn(BSIl2l&a^xXCl&HsPy#)wse
F{sp}W^n(BZ

delta 2577
zcmYM#eQ4EH7{Ku}x72OU_vzf0yK_rhy1H9#ro+lyvk)9EDuuwDN&g52nIJJPLJSMB
z<hnn6OGza)(qfFESw`9*D=rHLCR=YaSWb%YB`wIlUw5E!cR#;#e!p{`=RD`!d-py$
z*qHiZa!yC!Z!iC){9n(p_5a^Dxgm_B`7IXUCA<fRa2EcKyuzfs5lhhf_u(X*i&Jqi
zPQVs)zE)(uRM^NxJ{@iGfj4nH?cL}EM`QnKG=U2^1ux<>yowVsn@Jou6%$y2j&DR>
z;W^$+v=x1R15PJ?Xyd{OJFpm!VG*83GaZQcuiy;Y|6)BBakC7YF^L<o1P@{%o<ReC
zhhwoHAH`o|yOPxu5I<CNF$NpZflF~du0}K6fhKkUo#-^W@^ff_OW2H;aWu}S3=}0a
zpb0hM0&GRMW)JcT2YE|5!AV<LA)G=dKFvlkSLj76^COPJYq5P3Jtlc%=lBWe#52$Z
zltt^%@yoFs*C0c~R-_1F=S1pn$GfrP1e*CL=-&0j_C++{Aez_^T8W!zz&q%;LI!z=
z6KKU2;}f_FUE^M?#N%iJnMu^&lJ(Q!77QZW8-`>1FZBK$^c0VtJaWGTop26X;(8>9
z(1IqmF1i7o?=@tKuobOX8l884ii>P64x=kPiYD?Q&c-ghn_%o8L<0<?30=o~F_$_!
z@f<Wz4H|eUx;4${il0R*)QZMSrMPh58|Z{P(9?e?_Mbrm_MoNDL<i7`htY)pM86Mi
z$No|#Gx1r`s%R2@egTp|Dm=!8nKi}-R-yq{p(S1$+pnM{-V*!YLQB6JJwsjSioQex
zUqC;uz32jm(FNQ<pUdXp?8;*Q$8zC~{TzM$0Da&Tx}wj}34V?aqbt9G2L1=xg^)je
zq&*W|(1Xzi^l(0fF5nq-+)L>B3!AubrS0gz4kXF&9`Xv^yg4v~KKBzQ@Q>I(k^M42
zIhyD^^!a-9Q?Lx#mC%ZwmCa~nc45jDpWwn3oIwvq1|P?(ScTO*oy6zSl5azwKa5tQ
z8!h>#=r`Q?ct4xy&OZ&^^Gf7an1}PRshIsY)7R-BR@jd2{Si#y2{iKzuE4=~zm_aq
zaRWMG6VAaG(LmeKO1*<t<N*2wcMNB8d7M=m@2gVk&-R61=rHhYbiz^8$rY7GE6@oa
zK)-MnqLpe!7q9_Mpbg#IBj{Fkq2s<lKaRa<;sfZ%bSTAz1O7%6$Rj=5Q_z)EpaJKi
zD_IiT%h4@Zi;Hj*I_@M^;#stEm(h7{p$YkmWda500#iltq6|HBv*QB|Xn-bkrK`~Z
zo8$fV=uULpK6FJNN6(=F`l9{lr)m&QU<haX`M(w)C{B!IT8>tt3f-Doq&VSebR{pN
zfi_0BqJh%r3ilw34ez4?d(g^#jV9WM?)?=UOZ<?{Pm=-1p{KPlT7j;(Cb|T9g_XQ{
z>R*j+K@&*Dc6)4ZN9RqWTd^<pe-!(>ar_J1_?!zT%%BhUc>{k#4t%(Uch3ahMy{v=
z4R}BD6%ZbZ?Pcg;T!H?ktVw^LyS}p}FPUGEtWGYhuBl1XKD?;zk@VYzl{s~bYLcDZ
Tg=4a^>e6SYt?R6xzCQmyh`{N!

diff --git a/sphinx/locale/hr/LC_MESSAGES/sphinx.po b/sphinx/locale/hr/LC_MESSAGES/sphinx.po
index d41dcab1e..15e70346b 100644
--- a/sphinx/locale/hr/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/hr/LC_MESSAGES/sphinx.po
@@ -1,8 +1,9 @@
+
 msgid ""
 msgstr ""
 "Project-Id-Version:  Sphinx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2010-09-11 23:58+0200\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: 2011-01-22 14:41+0100\n"
 "Last-Translator: Bojan Mihelač <bmihelac@mihelac.org>\n"
 "Language-Team: Bojan Mihelač <bmihelac@mihelac.org>\n"
@@ -10,20 +11,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr ""
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d %B, %Y"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, fuzzy, python-format
 msgid "see %s"
 msgstr "pogledaj %s"
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, fuzzy, python-format
 msgid "see also %s"
 msgstr "pogledaj i %s"
@@ -62,21 +68,10 @@ msgstr "naprijed"
 msgid "previous"
 msgstr "nazad"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr " (u "
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "Abecedni popis"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Autor sekcije: "
@@ -141,12 +136,12 @@ msgstr "%s (C tip)"
 msgid "%s (C variable)"
 msgstr "%s (C varijabla)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "funkcija"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "član"
 
@@ -154,7 +149,7 @@ msgstr "član"
 msgid "macro"
 msgstr ""
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "tip"
 
@@ -163,28 +158,28 @@ msgstr "tip"
 msgid "variable"
 msgstr "Varijabla"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (C++ razred)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (C++ tip)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (C++ član)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (C++ funkcija)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "razred"
 
@@ -222,11 +217,11 @@ msgstr "Parametri"
 msgid "Throws"
 msgstr ""
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr ""
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "atribut"
 
@@ -295,45 +290,45 @@ msgstr "%s() (%s metoda)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (%s.%s atribut)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (modul)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 #, fuzzy
 msgid "Python Module Index"
 msgstr "Popis modula"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "Moduli"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Zastarjelo"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "izuzetak"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr ""
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr ""
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "statična metoda"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "modul"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 msgid " (deprecated)"
 msgstr " (zastarjelo)"
 
@@ -385,6 +380,15 @@ msgstr "varijabla okruženja"
 msgid "program option"
 msgstr ""
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Abecedni popis"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Popis modula"
@@ -393,12 +397,12 @@ msgstr "Popis modula"
 msgid "Search Page"
 msgstr "Tražilica"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr "   Osnove: %s"
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr "nadimak za :class:`%s`"
@@ -721,8 +725,8 @@ msgstr "C API changes"
 msgid "Other changes"
 msgstr "Ostale promjene"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "Link na taj naslov"
 
@@ -747,51 +751,24 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "Distribucija"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr ""
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr "nastavak sa prethodne stranice"
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr "nastavak na slijedećoj stranici"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[slika]"
 
-#~ msgid "Platforms: "
-#~ msgstr "Platforme:"
-
-#~ msgid "Searching"
-#~ msgstr "Tražim"
-
-#~ msgid "Preparing search..."
-#~ msgstr "Pripremam pretraživanje..."
-
-#~ msgid ", in "
-#~ msgstr ", u "
-
-#~ 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 ""
-#~ "Za vašu pretragu nema rezultata. Molimo"
-#~ " pregledajte da li so sve riječi "
-#~ "ispravno napisane i da li ste "
-#~ "izbrali dovoljno kategorija."
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr ""
-#~ "Pretraživanje je zaključeno, pronađeno %s "
-#~ "stranica, koje odgovaraju traženom nizu."
-
diff --git a/sphinx/locale/it/LC_MESSAGES/sphinx.mo b/sphinx/locale/it/LC_MESSAGES/sphinx.mo
index 09c7fdfdc41bbd049ea1becf5481d321f424cb55..a4213c8e09774b1c4610b5adbd80f3253e23e12a 100644
GIT binary patch
delta 79
zcmeBi?{VL-QPj-PP}jgx*T_)8(7?*TOxwW7z<?{jUpFYVEVDQ>KTp>su_V<>!N>rl
h&QRCLNWsv=%EWN<b5SNnCNr+dZ#X43GmCff003Y&6%YUb

delta 79
zcmeBi?{VL-QPj-9Lf6nx*T`JK(89{tQrp1Lz<?{jUpFYVEVDQ>KTp>su_V<>!N>rp
h$N;F$NWsw5%Ftl*b5SNnCR47-Z#X43GmCff003lF6&?Tp

diff --git a/sphinx/locale/it/LC_MESSAGES/sphinx.po b/sphinx/locale/it/LC_MESSAGES/sphinx.po
index 04e2e3813..ccfab24e2 100644
--- a/sphinx/locale/it/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/it/LC_MESSAGES/sphinx.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 0.5\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2008-11-27 18:39+0100\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: 2011-01-22 14:41+0100\n"
 "Last-Translator: Sandro Dentella <sandro@e-den.it>\n"
 "Language-Team: <sphinx-dev@googlegroups.com>\n"
@@ -14,20 +14,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, fuzzy, python-format
+msgid "%s %s documentation"
+msgstr "%s %s documentazione"
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d %B %Y"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr "vedi %s"
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, python-format
 msgid "see also %s"
 msgstr "vedi anche %s"
@@ -66,21 +71,10 @@ msgstr "successivo"
 msgid "previous"
 msgstr "precedente"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr " (in "
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "Indice"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Autore della sezione: "
@@ -145,12 +139,12 @@ msgstr "%s (tipo C)"
 msgid "%s (C variable)"
 msgstr "%s (variabile C)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "funzione"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "membro"
 
@@ -158,7 +152,7 @@ msgstr "membro"
 msgid "macro"
 msgstr ""
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "tipo"
 
@@ -167,28 +161,28 @@ msgstr "tipo"
 msgid "variable"
 msgstr "Variabile"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (classe C++)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (tipo C++)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (membro C++)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (funzione C++)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr ""
 
@@ -226,11 +220,11 @@ msgstr "Parametri"
 msgid "Throws"
 msgstr ""
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr ""
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "attributo"
 
@@ -299,45 +293,45 @@ msgstr "%s() (%s metodo)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (%s.%s attributo)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (modulo)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 #, fuzzy
 msgid "Python Module Index"
 msgstr "Indice dei Moduli"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "moduli"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Deprecato"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "eccezione"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr ""
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr ""
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "metodo statico"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "modulo"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 msgid " (deprecated)"
 msgstr " (deprecato)"
 
@@ -389,6 +383,15 @@ msgstr "variabile d'ambiente"
 msgid "program option"
 msgstr ""
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Indice"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Indice dei Moduli"
@@ -397,12 +400,12 @@ msgstr "Indice dei Moduli"
 msgid "Search Page"
 msgstr "Cerca"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr ""
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr "alias per :class:`%s`"
@@ -725,8 +728,8 @@ msgstr "Modifiche nelle API C"
 msgid "Other changes"
 msgstr "Altre modifiche"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "link permanente per questa intestazione"
 
@@ -751,51 +754,25 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "Release"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr ""
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr ""
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 #, fuzzy
 msgid "Continued on next page"
 msgstr "Indice completo in una pagina"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[immagine]"
 
-#~ msgid "Platforms: "
-#~ msgstr "Piattaforme:"
-
-#~ msgid "Searching"
-#~ msgstr "Ricerca in corso"
-
-#~ msgid "Preparing search..."
-#~ msgstr "Preparazione della ricerca"
-
-#~ msgid ", in "
-#~ msgstr ", in "
-
-#~ 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 ""
-#~ "La tua ricerca non ha trovato "
-#~ "alcun risultato. Controlla la correttezza "
-#~ "dei termini di ricerca e di avere"
-#~ " selezionato un numero sufficiente di "
-#~ "categorie"
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr "Ricerca terminata, trovate %s pagine corrispondenti alla ricerca."
-
diff --git a/sphinx/locale/ja/LC_MESSAGES/sphinx.mo b/sphinx/locale/ja/LC_MESSAGES/sphinx.mo
index 6a1065fdc87db67a27ade0455dcb4e213af54b63..2bbd3b24befffe2d7751c913c77273bc36343a3d 100644
GIT binary patch
delta 2914
zcmZ|PeN5F=9LMp44>x&|FrEqcArA_9*}ZDlBsDLB*i7x}wQLKM;)YaSL}1Hu{c@Sw
z7P-1+h=Wzu(y44pYdPn1W?RwvLsM&6*mRW(H?y*)xYhduXZ2U?a$o21d(Qcu-|u!V
z?_c5$Oc?W~;qL?f@8mx`R<-~BUQIA2iE0NXV;5@39-N517>}o{=WYLwcn9r+n2LX6
z8m1;1lY*s4T-O9BDDXVwV?umsKpl?9HK+g^Z2N1d@ja*o_G1Pf$J_C1)V#~+;9scu
zS*%9Ul%qBrzzo(mb17)z!<dPyF&ke*EzpHI*o#^CIr1?V`BMK?)cDctDu8)dfMJ}D
zZRo?jn2X<HI{u0AtZ$Oou6C4x<Iur5SZ3?1k+G%)Z$lRqU<+!2Zrgtvb&wxW8@`5$
zmqa?1p>)(bQ*a3e(DhK*Oo8h$9jG04;tc!{b=OyrSmrlWfH<uZM><h~lgO_&ScJ-m
zA4g%0tuMea)E`C7uSdmwI+gtEBrP-yp9mG88w>FuvZnb8mGVor{wwM(&4iKmB-8=2
zkuFng>jBilLDUB4qcRdktyedJ{A*$>4SM=tK&5UMR^dmeli$E%9LMgoK`&q0P!N^D
z#i*-Uj@nqAtvA{J7Sz-KtnKeW#og&rP|Ek9vU(D=!?V@_RKTB6C;J_h!m&it!YMc!
zGf*eZLG>4)HdKbC=tqrTVcQ==t>ZRQ;A7VEm4`2*0_;XDcmTD5W2ig(0(J6JsEiGu
z79K*)Q(h^W1k~G7fNH-7wO|$MDi)6Dnnx%oa3gBRYfwKd?Y6xWweue9`_}!a@qMTb
z96@dDxb6QEwcr_4s=v4OE2vCgA8zOVJv_p?f^^iw=0^n#q86TydcPOhdLt?$QPjzv
zL!D?7YTg^Dh2O#ryd`g==I4<Pjh}%!a1bZz{ja5<ls#p2?SSpbb(=2KRrK2a<ERsy
zwf#S#7PyJ5Wzwjq|1RW^W)|}Nnx&|NMv$RqBf9#<>!KhJp*GTwdJ8UK8Q!%0#Wbpa
z7AmD7)K#rQhM1SI0K2gSkD{KDOQ>;LUE_*S8=RfX`>%$@G?e3N3}6fusNdFqLA{QJ
zMAPp=0~X_E)D`Ws9zv!5Fs{TCsAr;(CtD}3KwUvC(q%$<<X=CvQ5tlz1ISwD1Zv^{
z>X{fs1sFmFNXzE|#eCETwp(|h0>6t3@fd1+BB#;(bkz6?jPh*U?NZQy_neUhdr<?A
zpaz~n-QjuExNE5PA?qm8p*xR9-LZpuW~L!)n_A>!p5#k$wj#G-dQj`Qhi&1s9WaPG
zK^zyR3Hhjnr=u2_gW5m{9bAFR)OsAg67*5uhYRpKRGgBck^Xy88D53NbIk?{3b+jw
zXa_3gyHN}G+5V%bou9P*7f|D`+V)$hE6ijUiZ{hN4YgpUtv`f{UpHKL`N5%}Ky7xw
zM(bAVHoTAi9jFD)p&qh9)bGF_s8s8bp9BS{jn|?w7D9%Y2HXA$DkCw>XMMBRc6??#
zPNOz-8TFc6N1e!1IubY;6*$vcjvnf>Q75amhEZ`EP~%%{eUt5f9bHX$hk^$Wq9%Nd
zn(!&=B;VNjMf6a=jv99hb@F(QtrSnj;SHeXg;C>I+WrVCV;ij<lX%NV)3B2UrKB4b
zpbs_ilS#32$@ycQ$xTrwR*_p0%Nn1NQPOHkS{*(O%}=ziiA3A#+nSoAedXg%Ce|*E
ztZiP`=3Ug<*wo;yYHw`yhMOy$nnl6;ADA1gu3lQRY+1sCOTylH>mtLmyw&w>kxFN(
z&+qs8W_qXk9lx*A7l@_i+{mttL?i3yCeZpyr>g$($TN<wVrE4k7N1-C@18>cx1Z;8
H^HTl+Jh3D^

delta 3658
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

diff --git a/sphinx/locale/ja/LC_MESSAGES/sphinx.po b/sphinx/locale/ja/LC_MESSAGES/sphinx.po
index 6069002ad..17d26d93d 100644
--- a/sphinx/locale/ja/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/ja/LC_MESSAGES/sphinx.po
@@ -8,7 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 1.1pre\n"
-"POT-Creation-Date: 2008-09-11 23:58+0200\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: 2011-08-27 17:50+0900\n"
 "Last-Translator: Akitoshi Ohta <fire.kuma8@gmail.com>\n"
 "Language-Team: Japanese\n"
@@ -16,19 +17,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr ""
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%Y 年 %m 月 %d 日"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr "%sを参照"
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, python-format
 msgid "see also %s"
 msgstr "%sも参照"
@@ -67,21 +74,10 @@ msgstr "次へ"
 msgid "previous"
 msgstr "前へ"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr ""
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "索引"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "この節の作者: "
@@ -145,12 +141,12 @@ msgstr "%s (C のデータ型)"
 msgid "%s (C variable)"
 msgstr "%s (C の変数)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "の関数"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "のメンバ変数"
 
@@ -158,7 +154,7 @@ msgstr "のメンバ変数"
 msgid "macro"
 msgstr "のマクロ"
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "のデータ型"
 
@@ -166,28 +162,28 @@ msgstr "のデータ型"
 msgid "variable"
 msgstr "変数"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (C++ のクラス)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (C++ のデータ型)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (C++ のメンバ変数)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (C++ の関数)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "クラス"
 
@@ -224,11 +220,11 @@ msgstr "引数"
 msgid "Throws"
 msgstr "例外"
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr "データ"
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "の属性"
 
@@ -296,44 +292,44 @@ msgstr "%s() (%s のクラスメソッド)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (%s.%s の属性)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (モジュール)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 msgid "Python Module Index"
 msgstr "Pythonモジュール索引"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "モジュール"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "撤廃"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "例外"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr "メソッド"
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr "クラスメソッド"
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "の静的メソッド"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "モジュール"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 msgid " (deprecated)"
 msgstr " (撤廃)"
 
@@ -385,6 +381,15 @@ msgstr "環境変数"
 msgid "program option"
 msgstr "プログラムオプション"
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "索引"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "モジュール索引"
@@ -393,12 +398,12 @@ msgstr "モジュール索引"
 msgid "Search Page"
 msgstr "検索ページ"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr "   ベースクラス: %s"
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr ":class:`%s` のエイリアス"
@@ -714,8 +719,8 @@ msgstr "C API に関する変更"
 msgid "Other changes"
 msgstr "その多の変更"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "このヘッドラインへのパーマリンク"
 
@@ -740,45 +745,24 @@ msgstr "サイドバーをたたむ"
 msgid "Contents"
 msgstr "コンテンツ"
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "リリース"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr "注記"
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr "前のページからの続き"
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr "次のページに続く"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[画像]"
 
-#~ msgid "Platforms: "
-#~ msgstr "プラットフォーム: "
-
-#~ msgid "Searching"
-#~ msgstr "検索中"
-
-#~ msgid "Preparing search..."
-#~ msgstr "検索の準備中..."
-
-#~ msgid ", in "
-#~ msgstr ""
-
-#~ 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 "検索条件に一致するドキュメントはありませんでした。検索したい言葉を正しいつづりで入力しているか確認してください。また、正しいカテゴリの検索を行っているか確認してください。"
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr "検索が終了し、条件に一致するページが %s 個みつかりました。"
-
diff --git a/sphinx/locale/ko/LC_MESSAGES/sphinx.js b/sphinx/locale/ko/LC_MESSAGES/sphinx.js
index 76fe76e34..0beffaa2f 100644
--- a/sphinx/locale/ko/LC_MESSAGES/sphinx.js
+++ b/sphinx/locale/ko/LC_MESSAGES/sphinx.js
@@ -1 +1 @@
-Documentation.addTranslations({"locale": "ko", "plural_expr": "0", "messages": {}});
\ No newline at end of file
+Documentation.addTranslations({"locale": "ko", "plural_expr": "0", "messages": {"Hide Search Matches": "\uac80\uc0c9 \uacb0\uacfc \uc228\uae30\uae30", "Permalink to this definition": "\uc815\uc758 \uc8fc\uc18c", "Expand sidebar": "\uc0ac\uc774\ub4dc\ubc14 \uc5f4\uae30", "Permalink to this headline": "\uc81c\ubaa9 \uc8fc\uc18c", "Collapse sidebar": "\uc0ac\uc774\ub4dc\ubc14 \ub2eb\uae30"}});
\ No newline at end of file
diff --git a/sphinx/locale/ko/LC_MESSAGES/sphinx.mo b/sphinx/locale/ko/LC_MESSAGES/sphinx.mo
index d5f184d9150441fe314db32e6a610dcbd01654bc..d671331ac840d2055e7dbd1fcd24af5acb815a01 100644
GIT binary patch
delta 2569
zcmZYBe@xX?7{~Dg8X?H-3dlwIbx~0#0^$T#YHl=L&aJNfkgd{Y%G3<4MQAj4u_@4M
z)H+ZYP_~@Ow9H+X%)<Fc)><sxh?<rxM=p)q8aB(e7QH|EZ2b|t@H)@=p7We@p8NfN
z$M^SsTNNEnpV;B}d5zy(e!C|s`tK)ql5>1qo;e3^BQD1btima{3h%(RI2r3O4I42P
zTkU!~28a(J^P(<h7tWw2451Q_U>5#~K@6nanpl8g;!@PY_oEhAj|_EnsChe3^V%?k
z?_f5bKyC0GX0X1yNMjluV>lI4$)-ewW-;DPT!G10kJ{)iyd7Ug&GV=QdvQ9RM2#Op
zZD<&k_c|uwIHs_^OJX}YI0dV)1Xbc%RH?S2CN`oH?Llpz3stFJOvHYRPouuYZ&35j
zqw<ZQHhL8`ZyckAG&0Dh@2&#rbIXy<xd$v>hZM(cMU}k4;#Sl`9{IRV{^-O9Q41YK
z%{zm-x6Yv|^DF9L$pPv=i$;h@J6eL;Km=8ywWtzrL~ZCPi+9@fCd{P2#jbZFA9sj9
zs^|&Sh6c?aP<bw+4l)*?{wmP~j;{sNZ~|tcPL_?jo`>4V9Gs11sPSv8e=TaETFk?3
zsCloT7J37<@FCP!aU6BflTjKf%@?Qze?m>XiaOcvsJk|qJ4^kAsD+A=D!N5xH7aog
zwb3;=1J_yqZq$Zb%r-OHK|>R|Q5!gb+F7p+_!zZdKT<XKxy3`s#|>NmZ>W<0gY4N&
z=h(_O54CU^>M5(VID%9p>S}1{WE)T?szXhD0kv=w?nrR%CFJ80xKU&V>cmB;d#Bj?
zm!a~kMs4tMR3)EAy$AN%^&U*u^M9Czc6<u8!>`RNHwW-&F*}|9si+FfHLEa8yu#v5
zsPDMJd=Ygov>~b75sOb-Jd8m-|JT&O2|P2}c_!+FGf<^lWG==Caka%B^*(sZ;$s%~
zp%y%g$~R)y$1J{qs(2EUqgo(HLxxZr$;YKwX8m=jg!LA;q7uJq_MkR=*y4UvslP(y
z9Wj3~$58ohWKn<GZZe~ba3+RvC2D~u&7Ed5Dq%Y+L6`L(wf=sjnC>%+&m)I*Kce#e
zVNT?cQk<Sm{nZH5F$+sk2_Ccon^6lkn7gchkHxQ>`%rJT{iq6lg33E!{TEPg!t17P
zG>uP<($E64Q4>lmUTjvIE6s>mgB6Tlhk8od%^ve0&ZPe+D*qrV{{_@5{|f3Jh^DX&
zl`<1`x6VafSYbv`6CXi+$D2_J8_nIQ6Stzq?X&*(QF%VJ>wOk~i5fR}D~`HLG?Z}E
zyk`D|Dw*CYx}J(kn2t)2YyI<3<H}J7S%Q4cE`r+FX4L%W%_h|R7M$cto$I*S;2#9k
zyT2DT@dNV|D#2OwZ>Ho2i=GW{+`i$ty4r2^>+82{-{y~{gkr-fk0to#$@lp!X(j&c
zw59%XT7`co@UXuTX!g$pclp1AHU5byANkek1HL4qD|RtsTB5%v>(M}YdC7u1OBR-g
z%NN|WpfYwOE12NF3(f!kGUK68Y<_lIg3p@1tRUWVJUn`&FTSTc9N*tD8awXdJ$>=k
zP8Wag(|Av(@6MU!^K%yYO*xhRQcktso7?1<<nQ(a`E`C(!MlE8c*tiJo{armI4AL6
DM~oI?

literal 9307
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

diff --git a/sphinx/locale/ko/LC_MESSAGES/sphinx.po b/sphinx/locale/ko/LC_MESSAGES/sphinx.po
index 6e7ae10ff..8c0dd3d83 100644
--- a/sphinx/locale/ko/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/ko/LC_MESSAGES/sphinx.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 1.1pre\n"
-"POT-Creation-Date: 2008-09-11 23:58+0200\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: 2011-06-09 21:25+0900\n"
 "Last-Translator: Channy Yun <channy@mozilla.or.kr>\n"
 "Language-Team: Korean\n"
@@ -14,768 +15,763 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py: 120 sphinx/writers/latex.py: 189
-#: sphinx/writers/manpage.py: 67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr ""
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%Y년 %m월 %d일"
 
-#: sphinx/environment.py: 1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr "%s 문서"
 
-#: sphinx/environment.py: 1627
+#: sphinx/environment.py:1628
 #, python-format
 msgid "see also %s"
 msgstr "%s 참조"
 
-#: sphinx/roles.py: 175
+#: sphinx/roles.py:175
 #, python-format
 msgid "Python Enhancement Proposals; PEP %s"
 msgstr "Python Enhancement Proposals; PEP %s"
 
-#: sphinx/builders/changes.py: 73
+#: sphinx/builders/changes.py:73
 msgid "Builtins"
 msgstr "기본"
 
-#: sphinx/builders/changes.py: 75
+#: sphinx/builders/changes.py:75
 msgid "Module level"
 msgstr "모듈 수준"
 
-#: sphinx/builders/html.py: 274
+#: sphinx/builders/html.py:274
 #, python-format
 msgid "%b %d, %Y"
 msgstr "%Y년 %m월 %d일"
 
-#: sphinx/builders/html.py: 293 sphinx/themes/basic/defindex.html: 30
+#: sphinx/builders/html.py:293 sphinx/themes/basic/defindex.html:30
 msgid "General Index"
 msgstr "전체 색인"
 
-#: sphinx/builders/html.py: 293
+#: sphinx/builders/html.py:293
 msgid "index"
 msgstr "색인"
 
-#: sphinx/builders/html.py: 353
+#: sphinx/builders/html.py:353
 msgid "next"
 msgstr "다음"
 
-#: sphinx/builders/html.py: 362
+#: sphinx/builders/html.py:362
 msgid "previous"
 msgstr "이전"
 
-#: sphinx/builders/latex.py: 141 sphinx/builders/texinfo.py: 208
-msgid "(in"
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
+#, fuzzy
+msgid " (in "
 msgstr "("
 
-#: sphinx/builders/texinfo.py: 151 sphinx/builders/texinfo.py: 152
-#: sphinx/builders/texinfo.py: 153 sphinx/domains/std.py: 427
-#: sphinx/themes/basic/genindex-single.html: 32
-#: sphinx/themes/basic/genindex-split.html: 11
-#: sphinx/themes/basic/genindex-split.html: 14
-#: sphinx/themes/basic/genindex.html: 32 sphinx/themes/basic/genindex.html: 35
-#: sphinx/themes/basic/genindex.html: 68 sphinx/themes/basic/layout.html: 134
-#: sphinx/writers/latex.py: 178
-msgid "Index"
-msgstr "색인"
-
-#: sphinx/directives/other.py: 136
-msgid "Section author:"
+#: sphinx/directives/other.py:136
+#, fuzzy
+msgid "Section author: "
 msgstr "항목 저자:"
 
-#: sphinx/directives/other.py: 138
-msgid "Module author:"
+#: sphinx/directives/other.py:138
+#, fuzzy
+msgid "Module author: "
 msgstr "모듈 개발자:"
 
-#: sphinx/directives/other.py: 140
-msgid "Code author:"
+#: sphinx/directives/other.py:140
+#, fuzzy
+msgid "Code author: "
 msgstr "코드 개발자:"
 
-#: sphinx/directives/other.py: 142
-msgid "Author:"
+#: sphinx/directives/other.py:142
+#, fuzzy
+msgid "Author: "
 msgstr "저자:"
 
-#: sphinx/directives/other.py: 215
+#: sphinx/directives/other.py:215
 msgid "See also"
 msgstr "더 보기"
 
-#: sphinx/domains/__init__.py: 244
+#: sphinx/domains/__init__.py:244
 #, python-format
 msgid "%s %s"
 msgstr ""
 
-#: sphinx/domains/c.py: 51 sphinx/domains/python.py: 95
+#: sphinx/domains/c.py:51 sphinx/domains/python.py:95
 msgid "Parameters"
 msgstr "매개 변수"
 
-#: sphinx/domains/c.py: 54 sphinx/domains/javascript.py: 128
-#: sphinx/domains/python.py: 107
+#: sphinx/domains/c.py:54 sphinx/domains/javascript.py:128
+#: sphinx/domains/python.py:107
 msgid "Returns"
 msgstr "반환"
 
-#: sphinx/domains/c.py: 56 sphinx/domains/python.py: 109
+#: sphinx/domains/c.py:56 sphinx/domains/python.py:109
 msgid "Return type"
 msgstr "반환 형식"
 
-#: sphinx/domains/c.py: 141
+#: sphinx/domains/c.py:141
 #, python-format
 msgid "%s (C function)"
 msgstr "%s (C 함수)"
 
-#: sphinx/domains/c.py: 143
+#: sphinx/domains/c.py:143
 #, python-format
 msgid "%s (C member)"
 msgstr "%s (C 멤버 변수)"
 
-#: sphinx/domains/c.py: 145
+#: sphinx/domains/c.py:145
 #, python-format
 msgid "%s (C macro)"
 msgstr "%s (C 매크로)"
 
-#: sphinx/domains/c.py: 147
+#: sphinx/domains/c.py:147
 #, python-format
 msgid "%s (C type)"
 msgstr "%s (C 데이터 형식)"
 
-#: sphinx/domains/c.py: 149
+#: sphinx/domains/c.py:149
 #, python-format
 msgid "%s (C variable)"
 msgstr "%s (C 변수)"
 
-#: sphinx/domains/c.py: 204 sphinx/domains/cpp.py: 1053
-#: sphinx/domains/javascript.py: 162 sphinx/domains/python.py: 558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "함수"
 
-#: sphinx/domains/c.py: 205 sphinx/domains/cpp.py: 1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "멤버 변수"
 
-#: sphinx/domains/c.py: 206
+#: sphinx/domains/c.py:206
 msgid "macro"
 msgstr "매크로"
 
-#: sphinx/domains/c.py: 207 sphinx/domains/cpp.py: 1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "데이터 형식"
 
-#: sphinx/domains/c.py: 208
+#: sphinx/domains/c.py:208
 msgid "variable"
 msgstr "변수"
 
-#: sphinx/domains/cpp.py: 897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (C++ 클래스)"
 
-#: sphinx/domains/cpp.py: 912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (C++ 데이터 형식)"
 
-#: sphinx/domains/cpp.py: 931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (C++의 멤버 변수)"
 
-#: sphinx/domains/cpp.py: 983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (C++ 함수)"
 
-#: sphinx/domains/cpp.py: 1052 sphinx/domains/javascript.py: 163
-#: sphinx/domains/python.py: 560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "클래스"
 
-#: sphinx/domains/javascript.py: 106 sphinx/domains/python.py: 254
+#: sphinx/domains/javascript.py:106 sphinx/domains/python.py:254
 #, python-format
 msgid "%s() (built-in function)"
 msgstr "%s() 내장 함수)"
 
-#: sphinx/domains/javascript.py: 107 sphinx/domains/python.py: 318
+#: sphinx/domains/javascript.py:107 sphinx/domains/python.py:318
 #, python-format
 msgid "%s() (%s method)"
 msgstr "%s() (%s 메서드)"
 
-#: sphinx/domains/javascript.py: 109
+#: sphinx/domains/javascript.py:109
 #, python-format
 msgid "%s() (class)"
 msgstr "%s() (클래스)"
 
-#: sphinx/domains/javascript.py: 111
+#: sphinx/domains/javascript.py:111
 #, python-format
 msgid "%s (global variable or constant)"
 msgstr "%s (전역 변수 또는 상수)"
 
-#: sphinx/domains/javascript.py: 113 sphinx/domains/python.py: 356
+#: sphinx/domains/javascript.py:113 sphinx/domains/python.py:356
 #, python-format
 msgid "%s (%s attribute)"
 msgstr "%s (%s의 속성)"
 
-#: sphinx/domains/javascript.py: 122
+#: sphinx/domains/javascript.py:122
 msgid "Arguments"
 msgstr "인수"
 
-#: sphinx/domains/javascript.py: 125
+#: sphinx/domains/javascript.py:125
 msgid "Throws"
 msgstr "예외"
 
-#: sphinx/domains/javascript.py: 164 sphinx/domains/python.py: 559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr "데이터"
 
-#: sphinx/domains/javascript.py: 165 sphinx/domains/python.py: 565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "속성"
 
-#: sphinx/domains/python.py: 100
+#: sphinx/domains/python.py:100
 msgid "Variables"
 msgstr "변수"
 
-#: sphinx/domains/python.py: 104
+#: sphinx/domains/python.py:104
 msgid "Raises"
 msgstr "예외"
 
-#: sphinx/domains/python.py: 255 sphinx/domains/python.py: 312
-#: sphinx/domains/python.py: 324 sphinx/domains/python.py: 337
+#: sphinx/domains/python.py:255 sphinx/domains/python.py:312
+#: sphinx/domains/python.py:324 sphinx/domains/python.py:337
 #, python-format
 msgid "%s() (in module %s)"
 msgstr "%s() (%s 모듈)"
 
-#: sphinx/domains/python.py: 258
+#: sphinx/domains/python.py:258
 #, python-format
 msgid "%s (built-in variable)"
 msgstr "%s (내장 변수)"
 
-#: sphinx/domains/python.py 259 sphinx/domains/python.py: 350
+#: sphinx/domains/python.py:259 sphinx/domains/python.py:350
 #, python-format
 msgid "%s (in module %s)"
 msgstr "%s (%s 모듈)"
 
-#: sphinx/domains/python.py: 275
+#: sphinx/domains/python.py:275
 #, python-format
 msgid "%s (built-in class)"
 msgstr "%s (내장 변수)"
 
-#: sphinx/domains/python.py: 276
+#: sphinx/domains/python.py:276
 #, python-format
 msgid "%s (class in %s)"
 msgstr "%s (%s 종류)"
 
-#: sphinx/domains/python.py: 316
-#, python-format
-msgid "%s() (%s. %s method)"
+#: sphinx/domains/python.py:316
+#, fuzzy, python-format
+msgid "%s() (%s.%s method)"
 msgstr "%s() (%s. %s 메서드)"
 
-#: sphinx/domains/python.py: 328
-#, python-format
-msgid "%s() (%s. %s static method)"
+#: sphinx/domains/python.py:328
+#, fuzzy, python-format
+msgid "%s() (%s.%s static method)"
 msgstr "%s() (%s. %s의 정적 메서드)"
 
-#: sphinx/domains/python.py: 331
+#: sphinx/domains/python.py:331
 #, python-format
 msgid "%s() (%s static method)"
 msgstr "%s() (%s의 정적 메서드)"
 
-#: sphinx/domains/python.py: 341
-#, python-format
-msgid "%s() (%s. %s class method)"
+#: sphinx/domains/python.py:341
+#, fuzzy, python-format
+msgid "%s() (%s.%s class method)"
 msgstr "%s() (%s. %s 클래스 메서드)"
 
-#: sphinx/domains/python.py: 344
+#: sphinx/domains/python.py:344
 #, python-format
 msgid "%s() (%s class method)"
 msgstr "%s() (%s 클래스 메서드)"
 
-#: sphinx/domains/python.py: 354
-#, python-format
-msgid "%s (%s. %s attribute)"
+#: sphinx/domains/python.py:354
+#, fuzzy, python-format
+msgid "%s (%s.%s attribute)"
 msgstr "%s (%s. %s의 속성)"
 
-#: sphinx/domains/python.py: 433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (모듈)"
 
-#: sphinx/domains/python.py: 490
+#: sphinx/domains/python.py:491
 msgid "Python Module Index"
 msgstr "Python 모듈 목록"
 
-#: sphinx/domains/python.py: 491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "모듈"
 
-#: sphinx/domains/python.py: 536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "폐지"
 
-#: sphinx/domains/python.py: 561 sphinx/locale/__init__.py: 179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "예외"
 
-#: sphinx/domains/python.py: 562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr "메소드"
 
-#: sphinx/domains/python.py: 563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr "클래스 메소드"
 
-#: sphinx/domains/python.py: 564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "정적 메서드"
 
-#: sphinx/domains/python.py: 566 sphinx/locale/__init__.py: 175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "모듈"
 
-#: sphinx/domains/python.py: 694
-msgid "(deprecated)"
+#: sphinx/domains/python.py:695
+#, fuzzy
+msgid " (deprecated)"
 msgstr "(폐지)"
 
-#: sphinx/domains/rst.py: 55
+#: sphinx/domains/rst.py:55
 #, python-format
 msgid "%s (directive)"
 msgstr "%s (지시문)"
 
-#: sphinx/domains/rst.py: 57
+#: sphinx/domains/rst.py:57
 #, python-format
 msgid "%s (role)"
 msgstr "%s (역할)"
 
-#: sphinx/domains/rst.py: 106
+#: sphinx/domains/rst.py:106
 msgid "directive"
 msgstr "지시자"
 
-#: sphinx/domains/rst.py: 107
+#: sphinx/domains/rst.py:107
 msgid "role"
 msgstr "역할"
 
-#: sphinx/domains/std.py: 70 sphinx/domains/std.py: 86
+#: sphinx/domains/std.py:70 sphinx/domains/std.py:86
 #, python-format
 msgid "environment variable; %s"
 msgstr "환경 변수; %s"
 
-#: sphinx/domains/std.py: 162
+#: sphinx/domains/std.py:162
 #, python-format
 msgid "%scommand line option; %s"
 msgstr "%s 명령; %s"
 
-#: sphinx/domains/std.py: 393
+#: sphinx/domains/std.py:393
 msgid "glossary term"
 msgstr "용어의 항목"
 
-#: sphinx/domains/std.py: 394
+#: sphinx/domains/std.py:394
 msgid "grammar token"
 msgstr "문법 토큰"
 
-#: sphinx/domains/std.py: 395
+#: sphinx/domains/std.py:395
 msgid "reference label"
 msgstr "참조 레이블"
 
-#: sphinx/domains/std.py: 396
+#: sphinx/domains/std.py:396
 msgid "environment variable"
 msgstr "환경 변수"
 
-#: sphinx/domains/std.py: 397
+#: sphinx/domains/std.py:397
 msgid "program option"
 msgstr "프로그램 옵션"
 
-#: sphinx/domains/std.py: 428
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "색인"
+
+#: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "모듈 목록"
 
-#: sphinx/domains/std.py: 429 sphinx/themes/basic/defindex.html: 25
+#: sphinx/domains/std.py:429 sphinx/themes/basic/defindex.html:25
 msgid "Search Page"
 msgstr "검색 페이지"
 
-#: sphinx/ext/autodoc.py: 998
-#, python-format
-msgid "Bases: %s"
+#: sphinx/ext/autodoc.py:1002
+#, fuzzy, python-format
+msgid "   Bases: %s"
 msgstr "기본 클래스: %s"
 
-#: sphinx/ext/autodoc.py: 1034
-#, python-format
-msgid "alias of: class:`%s`"
+#: sphinx/ext/autodoc.py:1038
+#, fuzzy, python-format
+msgid "alias of :class:`%s`"
 msgstr ": class:`%s`의 별칭"
 
-#: sphinx/ext/todo.py: 41
+#: sphinx/ext/todo.py:41
 msgid "Todo"
 msgstr "과제"
 
-#: sphinx/ext/todo.py: 109
-#, python-format
-msgid "(The <<original entry>> is located in %s, line %d.)"
-msgstr "(<<원래 항목" "는 %s %d 번째)"
+#: sphinx/ext/todo.py:109
+#, fuzzy, python-format
+msgid "(The <<original entry>> is located in  %s, line %d.)"
+msgstr "(<<원래 항목\" \"는 %s %d 번째)"
 
-#: sphinx/ext/todo.py: 117
+#: sphinx/ext/todo.py:117
 msgid "original entry"
 msgstr "원래 항목"
 
-#: sphinx/ext/viewcode.py: 70
+#: sphinx/ext/viewcode.py:70
 msgid "[source]"
 msgstr "[소스]"
 
-#: sphinx/ext/viewcode.py: 117
+#: sphinx/ext/viewcode.py:117
 msgid "[docs]"
 msgstr "[문서]"
 
-#: sphinx/ext/viewcode.py: 131
+#: sphinx/ext/viewcode.py:131
 msgid "Module code"
 msgstr "모듈 코드"
 
-#: sphinx/ext/viewcode.py: 137
-#, python-format
-msgid "<h1>Source code for %s</ h1>"
+#: sphinx/ext/viewcode.py:137
+#, fuzzy, python-format
+msgid "<h1>Source code for %s</h1>"
 msgstr "<h1>%s의 소스 코드</ h1>"
 
-#: sphinx/ext/viewcode.py: 164
+#: sphinx/ext/viewcode.py:164
 msgid "Overview: module code"
 msgstr "설명: 모듈 코드"
 
-#: sphinx/ext/viewcode.py: 165
-msgid "<h1>All modules for which code is available </ h1>"
+#: sphinx/ext/viewcode.py:165
+#, fuzzy
+msgid "<h1>All modules for which code is available</h1>"
 msgstr "<h1>코드가 제공되는 모든 모듈 </ h1>"
 
-#: sphinx/locale/__init__.py: 155
+#: sphinx/locale/__init__.py:155
 msgid "Attention"
 msgstr "주의"
 
-#: sphinx/locale/__init__.py: 156
+#: sphinx/locale/__init__.py:156
 msgid "Caution"
 msgstr "조심"
 
-#: sphinx/locale/__init__.py: 157
+#: sphinx/locale/__init__.py:157
 msgid "Danger"
 msgstr "위험"
 
-#: sphinx/locale/__init__.py: 158
+#: sphinx/locale/__init__.py:158
 msgid "Error"
 msgstr "오류"
 
-#: sphinx/locale/__init__.py: 159
+#: sphinx/locale/__init__.py:159
 msgid "Hint"
 msgstr "힌트"
 
-#: sphinx/locale/__init__.py: 160
+#: sphinx/locale/__init__.py:160
 msgid "Important"
 msgstr "중요"
 
-#: sphinx/locale/__init__.py: 161
+#: sphinx/locale/__init__.py:161
 msgid "Note"
 msgstr "주석"
 
-#: sphinx/locale/__init__.py: 162
+#: sphinx/locale/__init__.py:162
 msgid "See Also"
 msgstr "더 보기"
 
-#: sphinx/locale/__init__.py: 163
+#: sphinx/locale/__init__.py:163
 msgid "Tip"
 msgstr "참고"
 
-#: sphinx/locale/__init__.py: 164
+#: sphinx/locale/__init__.py:164
 msgid "Warning"
 msgstr "경고"
 
-#: sphinx/locale/__init__.py: 168
+#: sphinx/locale/__init__.py:168
 #, python-format
 msgid "New in version %s"
 msgstr "버전 %s에 추가"
 
-#: sphinx/locale/__init__.py: 169
+#: sphinx/locale/__init__.py:169
 #, python-format
 msgid "Changed in version %s"
 msgstr "버전 %s으로 변경"
 
-#: sphinx/locale/__init__.py: 170
+#: sphinx/locale/__init__.py:170
 #, python-format
 msgid "Deprecated since version %s"
 msgstr "버전 %s 폐지"
 
-#: sphinx/locale/__init__.py: 176
+#: sphinx/locale/__init__.py:176
 msgid "keyword"
 msgstr "키워드"
 
-#: sphinx/locale/__init__.py: 177
+#: sphinx/locale/__init__.py:177
 msgid "operator"
 msgstr "연산자"
 
-#: sphinx/locale/__init__.py: 178
+#: sphinx/locale/__init__.py:178
 msgid "object"
 msgstr "객체"
 
-#: sphinx/locale/__init__.py: 180
+#: sphinx/locale/__init__.py:180
 msgid "statement"
 msgstr "글"
 
-#: sphinx/locale/__init__.py: 181
+#: sphinx/locale/__init__.py:181
 msgid "built-in function"
 msgstr "내장 함수"
 
-#: sphinx/themes/agogo/layout.html: 45 sphinx/themes/basic/globaltoc.html: 10
-#: sphinx/themes/basic/localtoc.html: 11
+#: sphinx/themes/agogo/layout.html:45 sphinx/themes/basic/globaltoc.html:10
+#: sphinx/themes/basic/localtoc.html:11
 msgid "Table Of Contents"
 msgstr "목차"
 
-#: sphinx/themes/agogo/layout.html: 49 sphinx/themes/basic/layout.html: 137
-#: sphinx/themes/basic/search.html: 11 sphinx/themes/basic/search.html: 20
+#: sphinx/themes/agogo/layout.html:49 sphinx/themes/basic/layout.html:137
+#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:20
 msgid "Search"
 msgstr "검색"
 
-#: sphinx/themes/agogo/layout.html: 52 sphinx/themes/basic/searchbox.html: 15
+#: sphinx/themes/agogo/layout.html:52 sphinx/themes/basic/searchbox.html:15
 msgid "Go"
 msgstr "바로 가기"
 
-#: sphinx/themes/agogo/layout.html: 57 sphinx/themes/basic/searchbox.html: 20
+#: sphinx/themes/agogo/layout.html:57 sphinx/themes/basic/searchbox.html:20
 msgid "Enter search terms or a module, class or function name."
 msgstr "모듈, 클래스 또는 함수 이름을 입력하십시오."
 
-#: sphinx/themes/agogo/layout.html: 78 sphinx/themes/basic/sourcelink.html: 14
+#: sphinx/themes/agogo/layout.html:78 sphinx/themes/basic/sourcelink.html:14
 msgid "Show Source"
 msgstr "소스 코드를 보려면"
 
-#: sphinx/themes/basic/defindex.html: 11
+#: sphinx/themes/basic/defindex.html:11
 msgid "Overview"
 msgstr "개요"
 
-#: sphinx/themes/basic/defindex.html: 20
+#: sphinx/themes/basic/defindex.html:20
 msgid "Indices and tables:"
 msgstr "색인 및 표 목록:"
 
-#: sphinx/themes/basic/defindex.html: 23
+#: sphinx/themes/basic/defindex.html:23
 msgid "Complete Table of Contents"
 msgstr "종합 목차"
 
-#: sphinx/themes/basic/defindex.html: 24
+#: sphinx/themes/basic/defindex.html:24
 msgid "lists all sections and subsections"
 msgstr "영역별 목차"
 
-#: sphinx/themes/basic/defindex.html: 26
+#: sphinx/themes/basic/defindex.html:26
 msgid "search this documentation"
 msgstr "문서 검색"
 
-#: sphinx/themes/basic/defindex.html: 28
+#: sphinx/themes/basic/defindex.html:28
 msgid "Global Module Index"
 msgstr "모듈 총 색인"
 
-#: sphinx/themes/basic/defindex.html: 29
+#: sphinx/themes/basic/defindex.html:29
 msgid "quick access to all modules"
 msgstr "모든 모듈 조견표"
 
-#: sphinx/themes/basic/defindex.html: 31
+#: sphinx/themes/basic/defindex.html:31
 msgid "all functions, classes, terms"
 msgstr "함수, 클래스 및 용어 개관"
 
-#: sphinx/themes/basic/genindex-single.html: 35
-#, python-format
-msgid "Index-%(key)s"
+#: sphinx/themes/basic/genindex-single.html:35
+#, fuzzy, python-format
+msgid "Index &ndash; %(key)s"
 msgstr "색인-%(key)s"
 
-#: sphinx/themes/basic/genindex-single.html: 63
-#: sphinx/themes/basic/genindex-split.html: 24
-#: sphinx/themes/basic/genindex-split.html: 38
-#: sphinx/themes/basic/genindex.html: 74
+#: sphinx/themes/basic/genindex-single.html:63
+#: sphinx/themes/basic/genindex-split.html:24
+#: sphinx/themes/basic/genindex-split.html:38
+#: sphinx/themes/basic/genindex.html:74
 msgid "Full index on one page"
 msgstr "일반 색인"
 
-#: sphinx/themes/basic/genindex-split.html: 16
+#: sphinx/themes/basic/genindex-split.html:16
 msgid "Index pages by letter"
 msgstr "알파벳별 색인"
 
-#: sphinx/themes/basic/genindex-split.html: 25
+#: sphinx/themes/basic/genindex-split.html:25
 msgid "can be huge"
 msgstr "큰 경우가 있으므로 주의"
 
-#: sphinx/themes/basic/layout.html: 29
+#: sphinx/themes/basic/layout.html:29
 msgid "Navigation"
 msgstr "탐색"
 
-#: sphinx/themes/basic/layout.html: 122
+#: sphinx/themes/basic/layout.html:122
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "%(docstitle)s에서 찾기"
 
-#: sphinx/themes/basic/layout.html: 131
+#: sphinx/themes/basic/layout.html:131
 msgid "About these documents"
 msgstr "이 문서 정보"
 
-#: sphinx/themes/basic/layout.html: 140
+#: sphinx/themes/basic/layout.html:140
 msgid "Copyright"
 msgstr "저작권"
 
-#: sphinx/themes/basic/layout.html: 189
-#, python-format
-msgid "©<a href=\"%(path)s\">Copyright</a> %(copyright)s."
+#: sphinx/themes/basic/layout.html:189
+#, fuzzy, python-format
+msgid "&copy; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 msgstr "©<a href=\"%(path)s\">Copyright</a> %(copyright)s."
 
-#: sphinx/themes/basic/layout.html: 191
-#, python-format
-msgid "©Copyright %(copyright)s."
+#: sphinx/themes/basic/layout.html:191
+#, fuzzy, python-format
+msgid "&copy; Copyright %(copyright)s."
 msgstr "©Copyright %(copyright)s."
 
-#: sphinx/themes/basic/layout.html: 195
+#: sphinx/themes/basic/layout.html:195
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "최종 업데이트: %(last_updated)s"
 
-#: sphinx/themes/basic/layout.html: 198
-#, python-format
+#: sphinx/themes/basic/layout.html:198
+#, fuzzy, python-format
 msgid ""
-"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a>"
+"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> "
 "%(sphinx_version)s."
 msgstr ""
-"이 문서는 <a href=\"http://sphinx.pocoo.org/\">Sphinx</a>"
-"%(sphinx_version)s로 제공됩니다."
+"이 문서는 <a href=\"http://sphinx.pocoo.org/\">Sphinx</a>%(sphinx_version)s로 "
+"제공됩니다."
 
-#: sphinx/themes/basic/opensearch.xml: 4
+#: sphinx/themes/basic/opensearch.xml:4
 #, python-format
 msgid "Search %(docstitle)s"
 msgstr "%(docstitle)s에서 찾기"
 
-#: sphinx/themes/basic/relations.html: 11
+#: sphinx/themes/basic/relations.html:11
 msgid "Previous topic"
 msgstr "이전 항목"
 
-#: sphinx/themes/basic/relations.html: 13
+#: sphinx/themes/basic/relations.html:13
 msgid "previous chapter"
 msgstr "이전 장"
 
-#: sphinx/themes/basic/relations.html: 16
+#: sphinx/themes/basic/relations.html:16
 msgid "Next topic"
 msgstr "다음 항목"
 
-#: sphinx/themes/basic/relations.html: 18
+#: sphinx/themes/basic/relations.html:18
 msgid "next chapter"
 msgstr "다음 장"
 
-#: sphinx/themes/basic/search.html: 24
+#: sphinx/themes/basic/search.html:24
+#, fuzzy
 msgid ""
 "Please activate JavaScript to enable the search\n"
-"functionality."
+"    functionality."
 msgstr "검색 기능을 사용하려면 JavaScript를 활성화하십시오."
 
-#: sphinx/themes/basic/search.html: 29
+#: sphinx/themes/basic/search.html:29
+#, 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 "이 문서에서 문서를 검색할 수 있습니다. 키워드를 아래 입력란에 입력하고 '검색'을 클릭하세요. 입력된 모든 키워드를 포함하는 페이지가 검색됩니다. 일부 키워드 밖에 없는 페이지는 검색 결과에 표시되지 않으므로 주의하십시오. "
+"    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 ""
+"이 문서에서 문서를 검색할 수 있습니다. 키워드를 아래 입력란에 입력하고 '검색'을 클릭하세요. 입력된 모든 키워드를 포함하는 "
+"페이지가 검색됩니다. 일부 키워드 밖에 없는 페이지는 검색 결과에 표시되지 않으므로 주의하십시오. "
 
-#: sphinx/themes/basic/search.html: 36
+#: sphinx/themes/basic/search.html:36
 msgid "search"
 msgstr "검색"
 
-#: sphinx/themes/basic/search.html: 40
+#: sphinx/themes/basic/search.html:40
 msgid "Search Results"
 msgstr "검색 결과"
 
-#: sphinx/themes/basic/search.html: 42
+#: sphinx/themes/basic/search.html:42
 msgid "Your search did not match any results."
 msgstr "검색 조건에 일치하는 항목이 없습니다."
 
-#: sphinx/themes/basic/searchbox.html: 12
+#: sphinx/themes/basic/searchbox.html:12
 msgid "Quick search"
 msgstr "빠른 검색"
 
-#: sphinx/themes/basic/sourcelink.html: 11
+#: sphinx/themes/basic/sourcelink.html:11
 msgid "This Page"
 msgstr "현재 문서"
 
-#: sphinx/themes/basic/changes/frameset.html: 5
-#: sphinx/themes/basic/changes/versionchanges.html: 12
-#, python-format
-msgid "Changes in Version %(version)s-%(docstitle)s"
+#: sphinx/themes/basic/changes/frameset.html:5
+#: sphinx/themes/basic/changes/versionchanges.html:12
+#, fuzzy, python-format
+msgid "Changes in Version %(version)s &mdash; %(docstitle)s"
 msgstr "버전 %(version)s의 변경 사항-%(docstitle)s"
 
-#: sphinx/themes/basic/changes/rstsource.html: 5
-#, python-format
-msgid "%(filename)s-%(docstitle)s"
+#: sphinx/themes/basic/changes/rstsource.html:5
+#, fuzzy, python-format
+msgid "%(filename)s &mdash; %(docstitle)s"
 msgstr "%(filename)s-%(docstitle)s"
 
-#: sphinx/themes/basic/changes/versionchanges.html: 17
+#: sphinx/themes/basic/changes/versionchanges.html:17
 #, python-format
 msgid "Automatically generated list of changes in version %(version)s"
 msgstr "버전 %(version)s의 변경 사항 (이 목록은 자동으로 생성합니다)"
 
-#: sphinx/themes/basic/changes/versionchanges.html: 18
+#: sphinx/themes/basic/changes/versionchanges.html:18
 msgid "Library changes"
 msgstr "라이브러리에 대한 변경"
 
-#: sphinx/themes/basic/changes/versionchanges.html: 23
+#: sphinx/themes/basic/changes/versionchanges.html:23
 msgid "C API changes"
 msgstr "C API에 대한 변경"
 
-#: sphinx/themes/basic/changes/versionchanges.html: 25
+#: sphinx/themes/basic/changes/versionchanges.html:25
 msgid "Other changes"
 msgstr "다른 변경 사항"
 
-#: sphinx/themes/basic/static/doctools.js: 154 sphinx/writers/html.py: 505
-#: sphinx/writers/html.py: 511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "제목 주소"
 
-#: sphinx/themes/basic/static/doctools.js: 160 sphinx/writers/html.py: 92
+#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:92
 msgid "Permalink to this definition"
 msgstr "정의 주소"
 
-#: sphinx/themes/basic/static/doctools.js: 189
+#: sphinx/themes/basic/static/doctools.js:189
 msgid "Hide Search Matches"
 msgstr "검색 결과 숨기기"
 
-#: sphinx/themes/default/static/sidebar.js: 69
+#: sphinx/themes/default/static/sidebar.js:69
 msgid "Expand sidebar"
 msgstr "사이드바 열기"
 
-#: sphinx/themes/default/static/sidebar.js: 82
-#: sphinx/themes/default/static/sidebar.js: 110
+#: sphinx/themes/default/static/sidebar.js:82
+#: sphinx/themes/default/static/sidebar.js:110
 msgid "Collapse sidebar"
 msgstr "사이드바 닫기"
 
-#: sphinx/themes/haiku/layout.html: 26
+#: sphinx/themes/haiku/layout.html:26
 msgid "Contents"
 msgstr "내용"
 
-#: sphinx/writers/latex.py: 176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "출시"
 
-#: sphinx/writers/latex.py: 590 sphinx/writers/manpage.py: 182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr "참고"
 
-#: sphinx/writers/latex.py: 672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr "이전 페이지에서 계속"
 
-#: sphinx/writers/latex.py: 677
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr "일반 색인"
 
-#: sphinx/writers/text.py: 430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[그림]"
 
-#~msgid "Platforms:"
-#~msgstr "플랫폼:"
-
-#~msgid "Searching"
-#~msgstr "검색 중"
-
-#~msgid "Preparing search ..."
-#~ msgstr "검색 준비 중 ..."
-
-#~ msgid "in"
-#~ msgstr ""
-
-#~ 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 "검색 조건에 일치하는 문서를 찾을 수 없습니다. 검색할 단어를 정확한 철자로 입력했는지 확인하십시오. 또한 올바른 카테고리 검색을 실행하고 있는지 확인하십시오."
-
-#~ msgid "Search finished, found %s page (s) matching the search query."
-#~ msgstr "검색이 종료되고 조건과 일치하는 페이지가 %s 개 찾았습니다."
diff --git a/sphinx/locale/lt/LC_MESSAGES/sphinx.mo b/sphinx/locale/lt/LC_MESSAGES/sphinx.mo
index c895af1fbee679daea0de7300e50eb47a0c97d34..9efc6d773f6ae159554d41006c1eb9ef4a655aa9 100644
GIT binary patch
delta 2805
zcmZYAeQ1?c9Ki82b-t{-HdmYTWp3%5sfoL4x8)z2iaK8^mxc-ru{N$ROdHNjQEyP@
zA8WlR;nI|-L<Q4A5iCTDKr8}RnKWxfs|*s<M599N``r%oN8@@w=Q+=F&hK}A=RDVw
z^KQ(`bQJV@J@B`me?$1UFx#vD{$9!nA;Dz}=Hf2&kpnmk4`V-Ui(ZWPf5E%x{~i0|
zZM+-%-w{F{Rv`0cLW+hHPe(qXhA$te#XGS9onTY!e;Iv#FB;$w7U5~k#|!AV->?k-
zM8_8sjb<2)CY-_|;)jQ5IB*dTz~wj)pF;!e!a;Z#i}5V-2|w}W{VVA6J;^GCC0L3J
zaUwQhB_71V*p7vG6Z;WABuLkcim)%1;ba^Yua_gwhDPjz8FYeeXn;NO{+H-Nenb<#
zhR&CuoK~n1jdLG9iYd(Wrtu;TwkNcp8MfjBcnsa^%g9{e4|IYoqhwJ|bm9c{HNoL%
zMUvP9XT<Aj?8WsH==f#mysP?Ce^=5-N7stb3HIPU_yH0#e1(?0GhSas_c9c8_b1Q=
z3`A~)@_3y>15ZU0oQYOsAsVl?fciUdEghczEokX><1{>uuKX`7$G&7|f@AqIp{ZyE
zA3?X~aWt{oc)cRtZ$wZ3v+;flI`1198kYP3TGda{49`b9&<QW0E4z-CFq_#7oQFNJ
z2wmwQ^nNLt&?v0HB>Mc~*uNBwlS$Ly6Q1U)1h=9Syn_aO4^7|{x@VuGD{n(9)`158
z2OVc!X@(s1Z7D_jtI&Yc(5;x;Z6++C;lyb);|BDHWnJuVMKj+U-4{KCK7SNV;3G7#
z)A9ZnXuz-0Qhy(>FQb*d(bdoX_vQ$@1%>EgOQI7_MFY=7-|vUxbsDY6YIJ2A(G|Ub
zj@ym~-ihDwmb?}3Z>AiMYeo~@iNk#V-=*PzGtqNsMZQJ0JN$rMdykejn`}&U5PE+!
zI^pE#T=e<H=*m~d>kaX`Il2oo{^A{^;a+}>9Q4o;AGn4ix%QPX;Js*|D)g<HfjkoC
zqXAbUpRkE9=i7-Ud<;EXXOU01#FrK8F_`z?fcezF9EYR7eAQ^+Z8!ms;0WwQ1NCEe
zsu~8PB^{4ea59?MES!Olp$WI5d%h3dvg641htor-e-({y=x~L3q-lnwXz3=Qhio>w
z(i${@Rk#2*qZ78F30y=z;b*>PVUMBRXJ`(Rd#FL5Z@|%<jrAEC{?ff&8sC33(0TOm
zT|piRH_?HGW!?RyXut~OScGxtbJb{N(l`pY#OniS1x}$AKZkBXrZYCKp{2WxK9ECJ
z1}s4<FcPiMxY$1h4Llni_awUV26Uy(SdIJ9Ex3wq@h$Yw4&xoClKlTq!vNLjisqve
zEkO_G`q=*py0TU@!6WG5`UDMl0iF0dy0?9XcUuyjfX11PuDqt}IupWD8m=^rCeVnk
zXd`;Kw&ECk4PD7ev=X1i`|Zf?gkRAW_U6m^#-It_k0v|^-O^fgd>xh$KQz%W@OE_I
zZgeI4&<dQ0_uHcFXeBz)iT{rMxx6AC+9ISYj6f5fgW0$Utw3$G9y11RpplKwpex^m
z_HRQg@G6?no3a0Ww1g*O{~2Uk!$tJ%xP{r6SJ6FBA$q8Xq7|q@=bci)nKh%iba*-!
zpabjBL{{$DkW-&OVr^O7ny1z^)UR$@*0f^H>Z9#Bd5PTQ*vbdTj!%{)D<@T^cHAr~
d?=^AK#N^ST1FEvJQactEr~g0h!{X<2{{^Y|{~iDU

delta 2755
zcmYM#4QN(X7{Kx4a&vyXxxHF$b8~Y|MRPbe-*Q$;x@E@33ZvA5mKLI5A80MjdK)C^
zC@e)%G7BXmW?GCs)H3>zL{rfi200^39f_5eO4--{?|UG*-rv3F-gBPkJm=hZ=Nmq5
zNFPh~Tod@Wng7N7Z^-uU|9?ySgwT)Mr!awS=qqcn95-NZ{4}~RKJUbQ+P}qtcn14p
zR^QBcNo2fqDCL49RC4l#TD%gcp##i_?eozDmf!$fj#uM)%)<_}-xpYhU!(nhM~;xg
zEKD?s_AACb;)fb82GLN5g?KL-;BhR%HY~t5kR$Bk<nw*#``_Vp_y?9^6<LnM+p!9l
z;b43pufoG<BHc>-aE^;y{0k>yHq-FF4rvOF*bDDL2bhBfSR9{kMJw<Tn(%(Ke>XbQ
zvuMCv%G-oV%)!~1W?8~KF3fNdUXL%LYrF^P8xEiYbYbWb!YOp%Zlaptzi34g)H@4@
zqW2Zp6UU?dZ$ihNicX|4pZZ^(5e;@&j6?ASG}bnxs^OD({}sBHM`L?8I)U@Z!PGMM
zNi=W?nqWCvkt#G^E!wXsN&VgRvuLn%EjSrhp)>Eq3j7gGus0_YDnUy)3SFA9XkxYT
zzCJ#0M0fw4@%cP-+{e(0Kbz*lwR;`S@ZIPRbimKinH@w+_&pl<G+u${(3xI{&o7|~
zWfOHcCeZiCq3t)Iai$<gNH=gU;o^QYKpG9W0!`o*bj{vGXZ|)?u^njOBWS;)$PrF*
z@@u&i+Xqr_0}er#Vnj5BjGGQqxG=M6=nu*rnFnDJn)#AwYjipK{z^1~m(j%5$LDXM
z0pCGOy*=LVK`VVIwjamAe*b5=aI+=Y(hgXH1};ax?~(C-3R;od&>7!_&Zrsf_YfL*
zAs*!`SsI_uq#X8}izd1do#-=|>-WFO3*3U1`aN_BcA_QSk0y8=S>A9C9VmzFbO8E(
z89L+Ycz<)epB|l!{?I*&F5wDHv$4bG_`-G^!TlaI;IC)^KMg;Z1kw}=(16v*5$ZTO
z;C*PqOVK^`5^{uXoUGJdG~PE@fv1b8zrT2Sd<zC{!WwMBVc3oaI)qd+{D7A7Pqbn=
zL^ZMgSdT?$!p-PfFF=>-X=IhdavYBv&<P$Xrv7GliUv!UMcQtzd~~LTXaY4j9qZ8n
z*P#h)LXNP7(^TAx?w#b2%=cZ0zMsNT?1@R}58V9HOoGp+xiHYHXvYtbcfu~TV^?fH
zg$Dc?S^jVleJ`&pQ<*V1lKWfY{Uc}vo<mE%7F~k&=ytSn=`XqPg~MpT6KDl~K}&QI
zZSO_e2F^!2jzVXiLRKS8$6N7XbO}C0*LXL&X@5d1`42jN9-jacN{0e29B3%IJ11ox
zguBr-Z$=YrK{r<$8t^rA;GO8&9*mxdUP1%qUz3@6A$mUoozNJ}_4}{o!Wm6QH&-KG
zi!;%gEJG`?Dn8$cR6lG*XLtY|@HaHUztMz~JakEiq5Vgr6TJ~#%2{~%@BbVwoXG;T
z0<H0db<vGzCEC$}Ka1_1=%zh}9N`Qn6HfB!_&ZXH&Ujd~5)GWfY@CRf|Nhs-2Tf=N
zW}pc@5Zj+XH&1J9Ux_SZ*o3a>Zp_9bXn-zsQ=ddD;9nxg?S&>Z0NtE}hm*e@N7LXE
zRIgsq=fRGwzJ2>8sw%5emDS_Qs%s{sYE~Bws_2=TFt(~=@}TiOdZboASunTbLP0w5
EAGI0tq5uE@

diff --git a/sphinx/locale/lt/LC_MESSAGES/sphinx.po b/sphinx/locale/lt/LC_MESSAGES/sphinx.po
index 6a9021263..b331d52ae 100644
--- a/sphinx/locale/lt/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/lt/LC_MESSAGES/sphinx.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 1.0pre/8b971dbc7d36\n"
 "Report-Msgid-Bugs-To: dalius@sandbox.lt\n"
-"POT-Creation-Date: 2010-05-24 23:53+0200\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: 2011-01-22 14:41+0100\n"
 "Last-Translator: Dalius Dobravolskas <dalius@sandbox.lt>\n"
 "Language-Team: lt <LL@li.org>\n"
@@ -15,20 +15,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr ""
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%Y-%m-%d"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr ""
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, python-format
 msgid "see also %s"
 msgstr ""
@@ -67,21 +72,10 @@ msgstr "kitas"
 msgid "previous"
 msgstr "praeitas"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr " (kuris yra "
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "Indeksas"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Skyriaus autorius: "
@@ -145,12 +139,12 @@ msgstr "%s (C tipas)"
 msgid "%s (C variable)"
 msgstr "%s (C kintamasis)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "funkcija"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "narys"
 
@@ -158,7 +152,7 @@ msgstr "narys"
 msgid "macro"
 msgstr "makrokomanda"
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "tipas"
 
@@ -166,28 +160,28 @@ msgstr "tipas"
 msgid "variable"
 msgstr "kintamasis"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr ""
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (C++ tipas)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (C++ narys)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (C++ funkcija)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "klasė"
 
@@ -224,11 +218,11 @@ msgstr "Argumentais"
 msgid "Throws"
 msgstr "Išmeta"
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr "duomenys"
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "atribudas"
 
@@ -296,44 +290,44 @@ msgstr "%s() (%s klasės metodas)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (%s.%s atributas)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (modulis)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 msgid "Python Module Index"
 msgstr ""
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "moduliai"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Atmestas"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "išimtis"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr "metodas"
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr "klasės metodas"
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "statinis metodas"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "modulis"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 msgid " (deprecated)"
 msgstr " (atmestas)"
 
@@ -385,6 +379,15 @@ msgstr "aplinkos kintamasis"
 msgid "program option"
 msgstr "programos parinktis"
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Indeksas"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Modulio indeksas"
@@ -393,12 +396,12 @@ msgstr "Modulio indeksas"
 msgid "Search Page"
 msgstr "Paieškos puslapis"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr "   Bazės: %s"
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr ":class:`%s` alternatyvus vardas"
@@ -721,8 +724,8 @@ msgstr "C API pakeitimai"
 msgid "Other changes"
 msgstr "Kiti pakeitimai"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "Nuoroda į šią antraštę"
 
@@ -747,52 +750,24 @@ msgstr "Paslėpti šoninę juostą"
 msgid "Contents"
 msgstr "Turinys"
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "Leidimas"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr "Išnašos"
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr "tęsinys iš praeito puslapio"
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr "Tęsinys kitame puslapyje"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[paveiksliukas]"
 
-#~ msgid "Python Enhancement Proposals!PEP %s"
-#~ msgstr ""
-
-#~ msgid "Platforms: "
-#~ msgstr "Platformos: "
-
-#~ msgid "Searching"
-#~ msgstr "Ieškoma"
-
-#~ msgid "Preparing search..."
-#~ msgstr "Ruošiama paieška..."
-
-#~ msgid ", in "
-#~ msgstr ", kuris yra "
-
-#~ 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 ""
-#~ "Jūsų paieška neatitiko jokių dokumentų. "
-#~ "Prašom patikrinti ar visi žodžiai "
-#~ "teisingai įvesti ir ar pasirinkote "
-#~ "pakankamai kategorijų."
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr "Paieška baigta, paieškos rezultatus atitiko %s puslapis(-iai,-ių)"
-
diff --git a/sphinx/locale/lv/LC_MESSAGES/sphinx.js b/sphinx/locale/lv/LC_MESSAGES/sphinx.js
index 434a99e34..7809a8108 100644
--- a/sphinx/locale/lv/LC_MESSAGES/sphinx.js
+++ b/sphinx/locale/lv/LC_MESSAGES/sphinx.js
@@ -1 +1 @@
-Documentation.addTranslations({"locale": "lv", "plural_expr": "(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)", "messages": {"Search Results": "Atlases rezult\u0101ti", "Preparing search...": "Sagatavojam atlasi...", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "J\u016bsu atlases rindai neatbilst neviens dokuments. L\u016bdzu, p\u0101rbaudiet, vai visi v\u0101rdi ir uzrakst\u012bti pareizi, un vai ir izv\u0113l\u0113tas pareiz\u0101s kategorijas.", "Search finished, found %s page(s) matching the search query.": "Atlase pabeigta, atrastas lapas: %s", ", in ": ", iek\u0161 ", "Expand sidebar": "Izplest s\u0101njoslu", "Permalink to this headline": "Past\u0101v\u012bga nor\u0101de \u0161o virsrakstu", "Searching": "Mekl\u0113jam", "Collapse sidebar": "Sav\u0113rst s\u0101njoslu", "Permalink to this definition": "Past\u0101v\u012bga nor\u0101de uz \u0161o defin\u012bciju", "Hide Search Matches": "Pasl\u0113pt atlases v\u0101rdus"}});
\ No newline at end of file
+Documentation.addTranslations({"locale": "lv", "plural_expr": "(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)", "messages": {"Hide Search Matches": "Pasl\u0113pt atlases v\u0101rdus", "Permalink to this definition": "Past\u0101v\u012bga nor\u0101de uz \u0161o defin\u012bciju", "Expand sidebar": "Izplest s\u0101njoslu", "Permalink to this headline": "Past\u0101v\u012bga nor\u0101de \u0161o virsrakstu", "Collapse sidebar": "Sav\u0113rst s\u0101njoslu"}});
\ No newline at end of file
diff --git a/sphinx/locale/lv/LC_MESSAGES/sphinx.mo b/sphinx/locale/lv/LC_MESSAGES/sphinx.mo
index 497ce4d0dec15626caca7b22a40d23e17562363c..e6e713a5aff63cf1dca976fba58bc52421893d9d 100644
GIT binary patch
delta 2898
zcmZYAeN5F=9LMn^0`ee%_kw_+UU?D=@S=7>EN#Us1)o^Wf6xhfmn4dHDFd57%$l)P
z8ox}_%muk=*_2)I0hhTZ=0mJ#l^brl5iM(tm2S>Wdw751Y;DD^_jS(s{m%J*&-eU(
z*R4y!70xwJ<SxVCLH=d(uRKb<fB)*^j2TOJJ?c_3W?>7)Vu$q;d;J7@8UGZ=VLvA0
z515E|Q0v9S8<Sv+V^V1FG1+|ShUs`8&O<G**p9D4CYX(=09$Z8wqX(;M$PL%A6`Vw
z{{{J&dweP37@}*Q2a||zrqM`cpbXQo3KgIpCtwSv;XXUwg}Uzo25=B3V>;Q*!rAD@
z4VZxkFa=Me66m*H#Teq7A8E|RVGUp*+n{LzI0nm63sj;4)Y|L2Q9D0~O7u8tem`o5
z1E_$%;}X1!(O5y5IR#UNjxt<9qXe5!XWWV0YfhjRIFDwOF<+w=?kB1eyn(9JZH&M;
z>aBhPM&cCI{5;gUe$+++*2;0zUlVE>n1U~$V(meyY7W_cH|h*~?RY<G2iK5~`PugG
zq5?;IMiPuiRU{o1I14qe6!ow_=Ar&7-6{qi#m%UlpTQjLLnU|<l~6PtmC%binhB`H
zvTVP|UJsz2`iJfHD%83wQ59d0I=WVehBDl1?LaMf1huo1s1ja61^yOC<5kp7uiNWG
zsDy?w4{xLHpGX!O&q2j0KqdAdUlY+;NJ9bEq5?jLO5hdLne9aF{2f%uI#7YnqUQA?
zAM+JodP|1v_#dc%W2n2Hl_cvV)Vc*oVvd<XLq8~G_QDEO=BusGSf54h<V92hEvUp^
zwb$EF0pCTHy506WQKjy&<CjrKFo21A|8LXKg3&zM3LKAmzdg2JfU3w$)Q;z&cC-LB
zZ#gP(HGaWc613L~DTl`Apf*@;`%hapVwB$hCK?=<aZs7Mw*MjOZ8(YA(FNPTf=cKo
z)REn?*Q3Z<{bXw%D$!D8k7hpV2&+-?n$S^zH)!PJepCYIQKh|t+VK$T7joEMkLHz8
z2~$yT&rH6w;9{JFwRU_f^5U5Hkg4V<2Jj+IMiz1Y`Kk1=S`qzas2f{Q8Sh0UaLn3+
zD(N}YFJ>RA5@Xqx?oUHqFG4+(B{&N!QI*(=N@xdagYB8rUuS-l0cCz174SP;j@MBO
zmhi4<fk%+!&0>5U>rfA6C#v+PQ0raB0MEiV$j8L8T~%l*lCznEinH9I!SR_IRG?<-
zHq^qeqe}laYM~>jg)U((UPGQY6X_dyRx(gW_yFpedC2xFP?f4iCAt=M-D#$wz^$lf
zp$!$d9ToT^RHmO}9)5{>ns4E39MA8z5?YEmxW@KdQGxcO-jbuJb-GYTa0ZF%n0^`x
zIDk6)LDbpYL){olG?gq9wO}b~p@r5bQD?srRr*HM{LQEzn%C_3o2YratOqbb@Bd*M
z_jBO{szihKhGEo#caU7nU&zNy$sVa#Icn#NP>I!`0)|k}N)zVec2ot9q5kvfMkRa}
z(}{1sw-<gx9mQSL&LgR(jvy6Pq3NizEkPZ{6L!1-HE$Ct;TAi--MRx6csFW(yB!as
zqmrDaq1UAsmH7ZF!yBlb{fRthCW$9bJN9EFmZK6|fO>nDp%U1Ls^lirdfQOzyoH+A
zflBC5u5tIpJ(ZLj@~vrD{rvjihQ^x4x`qwmU*q172=7ctjB-Erl)Iz7`4Mw`Zh^Pe
zz3EMLy~(ZNsVV6Z<AOn7Zpeh7rasg_+nt;Gazb&Te|F)FVqdYp%pVB%rFM_{|N2|f
zKZ^*@&+LtI)3VCkwORg=^)uYAEGJ`8a9#a5x6xM@T-W=7FE^jmLXCBe^}%T&_oeKX
S@SdDg5gtYTPw=Hvi~j}-IWCj{

delta 3317
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

diff --git a/sphinx/locale/lv/LC_MESSAGES/sphinx.po b/sphinx/locale/lv/LC_MESSAGES/sphinx.po
index e8409c5aa..ec19bbeec 100644
--- a/sphinx/locale/lv/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/lv/LC_MESSAGES/sphinx.po
@@ -4,379 +4,404 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 1.0.7\n"
-"POT-Creation-Date: 2010-05-24 23:53+0200\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: 2011-05-10 16:40+0200\n"
 "Last-Translator: alexander smishlajev <alex@gorka.lv>\n"
+"Language-Team: lv <LL@li.org>\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "(n%100<10 || n%100>=20) ? 1 : 2)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:106 sphinx/writers/latex.py:184
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr ""
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d.%m.%Y"
 
-#: sphinx/roles.py:174
+#: sphinx/environment.py:1625
 #, python-format
-msgid "Python Enhancement Proposals!PEP %s"
+msgid "see %s"
 msgstr ""
 
-#: sphinx/builders/changes.py:72
+#: sphinx/environment.py:1628
+#, python-format
+msgid "see also %s"
+msgstr ""
+
+#: sphinx/roles.py:175
+#, python-format
+msgid "Python Enhancement Proposals; PEP %s"
+msgstr ""
+
+#: sphinx/builders/changes.py:73
 msgid "Builtins"
 msgstr "Iebūvētie"
 
-#: sphinx/builders/changes.py:74
+#: sphinx/builders/changes.py:75
 msgid "Module level"
 msgstr "Moduļu līmenis"
 
-#: sphinx/builders/html.py:266
+#: sphinx/builders/html.py:274
 #, python-format
 msgid "%b %d, %Y"
 msgstr "%d.%m.%Y"
 
-#: sphinx/builders/html.py:285 sphinx/themes/basic/defindex.html:30
+#: sphinx/builders/html.py:293 sphinx/themes/basic/defindex.html:30
 msgid "General Index"
 msgstr "Vispārējs indekss"
 
-#: sphinx/builders/html.py:285
+#: sphinx/builders/html.py:293
 msgid "index"
 msgstr "indekss"
 
-#: sphinx/builders/html.py:345
+#: sphinx/builders/html.py:353
 msgid "next"
 msgstr "nākošais"
 
-#: sphinx/builders/html.py:354
+#: sphinx/builders/html.py:362
 msgid "previous"
 msgstr "iepriekšējs"
 
-#: sphinx/builders/latex.py:151
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr " (iekš "
 
-#: sphinx/directives/other.py:127
+#: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Sekcijas autors: "
 
-#: sphinx/directives/other.py:129
+#: sphinx/directives/other.py:138
 msgid "Module author: "
 msgstr "Moduļa autors: "
 
-#: sphinx/directives/other.py:131
+#: sphinx/directives/other.py:140
 msgid "Code author: "
 msgstr "Koda autors: "
 
-#: sphinx/directives/other.py:133
+#: sphinx/directives/other.py:142
 msgid "Author: "
 msgstr "Autors: "
 
-#: sphinx/directives/other.py:238
+#: sphinx/directives/other.py:215
 msgid "See also"
 msgstr "Skat.arī"
 
-#: sphinx/domains/__init__.py:253
+#: sphinx/domains/__init__.py:244
 #, python-format
 msgid "%s %s"
 msgstr "%s %s"
 
-#: sphinx/domains/c.py:51 sphinx/domains/python.py:49
+#: sphinx/domains/c.py:51 sphinx/domains/python.py:95
 msgid "Parameters"
 msgstr "Parametri"
 
-#: sphinx/domains/c.py:54 sphinx/domains/javascript.py:137
-#: sphinx/domains/python.py:59
+#: sphinx/domains/c.py:54 sphinx/domains/javascript.py:128
+#: sphinx/domains/python.py:107
 msgid "Returns"
 msgstr "Atgriež"
 
-#: sphinx/domains/c.py:56 sphinx/domains/python.py:61
+#: sphinx/domains/c.py:56 sphinx/domains/python.py:109
 msgid "Return type"
 msgstr "Atgriežamais tips"
 
-#: sphinx/domains/c.py:133
+#: sphinx/domains/c.py:141
 #, python-format
 msgid "%s (C function)"
 msgstr "%s (C funkcija)"
 
-#: sphinx/domains/c.py:135
+#: sphinx/domains/c.py:143
 #, python-format
 msgid "%s (C member)"
 msgstr "%s (C loceklis)"
 
-#: sphinx/domains/c.py:137
+#: sphinx/domains/c.py:145
 #, python-format
 msgid "%s (C macro)"
 msgstr "%s (C makross)"
 
-#: sphinx/domains/c.py:139
+#: sphinx/domains/c.py:147
 #, python-format
 msgid "%s (C type)"
 msgstr "%s (C tips)"
 
-#: sphinx/domains/c.py:141
+#: sphinx/domains/c.py:149
 #, python-format
 msgid "%s (C variable)"
 msgstr "%s (C mainīgais)"
 
-#: sphinx/domains/c.py:171 sphinx/domains/cpp.py:1031
-#: sphinx/domains/javascript.py:166 sphinx/domains/python.py:497
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "funkcija"
 
-#: sphinx/domains/c.py:172 sphinx/domains/cpp.py:1032
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "loceklis"
 
-#: sphinx/domains/c.py:173
+#: sphinx/domains/c.py:206
 msgid "macro"
 msgstr "makross"
 
-#: sphinx/domains/c.py:174 sphinx/domains/cpp.py:1033
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "tips"
 
-#: sphinx/domains/c.py:175
+#: sphinx/domains/c.py:208
 msgid "variable"
 msgstr "mainīgais"
 
-#: sphinx/domains/cpp.py:876
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (C++ klase)"
 
-#: sphinx/domains/cpp.py:891
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (C++ tips)"
 
-#: sphinx/domains/cpp.py:910
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (C++ loceklis)"
 
-#: sphinx/domains/cpp.py:962
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (C++ funkcija)"
 
-#: sphinx/domains/cpp.py:1030 sphinx/domains/python.py:499
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "klase"
 
-#: sphinx/domains/javascript.py:117 sphinx/domains/python.py:221
+#: sphinx/domains/javascript.py:106 sphinx/domains/python.py:254
 #, python-format
 msgid "%s() (built-in function)"
 msgstr "%s() (iebūvēta funkcija)"
 
-#: sphinx/domains/javascript.py:118 sphinx/domains/python.py:285
+#: sphinx/domains/javascript.py:107 sphinx/domains/python.py:318
 #, python-format
 msgid "%s() (%s method)"
 msgstr "%s() (%s metods)"
 
-#: sphinx/domains/javascript.py:120
+#: sphinx/domains/javascript.py:109
+#, fuzzy, python-format
+msgid "%s() (class)"
+msgstr "%s (C++ klase)"
+
+#: sphinx/domains/javascript.py:111
 #, python-format
 msgid "%s (global variable or constant)"
 msgstr "%s (globālais mainīgais vai konstanta)"
 
-#: sphinx/domains/javascript.py:122 sphinx/domains/python.py:323
+#: sphinx/domains/javascript.py:113 sphinx/domains/python.py:356
 #, python-format
 msgid "%s (%s attribute)"
 msgstr "%s (%s atributs)"
 
-#: sphinx/domains/javascript.py:131
+#: sphinx/domains/javascript.py:122
 msgid "Arguments"
 msgstr "Argumenti"
 
-#: sphinx/domains/javascript.py:134
+#: sphinx/domains/javascript.py:125
 msgid "Throws"
 msgstr "Izmet"
 
-#: sphinx/domains/javascript.py:167 sphinx/domains/python.py:498
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr "dati"
 
-#: sphinx/domains/javascript.py:168 sphinx/domains/python.py:504
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "atributs"
 
-#: sphinx/domains/python.py:53
+#: sphinx/domains/python.py:100
 msgid "Variables"
 msgstr "Mainīgie"
 
-#: sphinx/domains/python.py:56
+#: sphinx/domains/python.py:104
 msgid "Raises"
 msgstr "Ceļ"
 
-#: sphinx/domains/python.py:222 sphinx/domains/python.py:279
-#: sphinx/domains/python.py:291 sphinx/domains/python.py:304
+#: sphinx/domains/python.py:255 sphinx/domains/python.py:312
+#: sphinx/domains/python.py:324 sphinx/domains/python.py:337
 #, python-format
 msgid "%s() (in module %s)"
 msgstr "%s() (moduļī %s)"
 
-#: sphinx/domains/python.py:225
+#: sphinx/domains/python.py:258
 #, python-format
 msgid "%s (built-in variable)"
 msgstr "%s (iebūvētais mainīgais)"
 
-#: sphinx/domains/python.py:226 sphinx/domains/python.py:317
+#: sphinx/domains/python.py:259 sphinx/domains/python.py:350
 #, python-format
 msgid "%s (in module %s)"
 msgstr "%s (moduļī %s)"
 
-#: sphinx/domains/python.py:242
+#: sphinx/domains/python.py:275
 #, python-format
 msgid "%s (built-in class)"
 msgstr "%s (iebūvēta klase)"
 
-#: sphinx/domains/python.py:243
+#: sphinx/domains/python.py:276
 #, python-format
 msgid "%s (class in %s)"
 msgstr "%s (klase iekš %s)"
 
-#: sphinx/domains/python.py:283
+#: sphinx/domains/python.py:316
 #, python-format
 msgid "%s() (%s.%s method)"
 msgstr "%s() (%s.%s metods)"
 
-#: sphinx/domains/python.py:295
+#: sphinx/domains/python.py:328
 #, python-format
 msgid "%s() (%s.%s static method)"
 msgstr "%s() (%s.%s statiskais metods)"
 
-#: sphinx/domains/python.py:298
+#: sphinx/domains/python.py:331
 #, python-format
 msgid "%s() (%s static method)"
 msgstr "%s() (%s statiskais metods)"
 
-#: sphinx/domains/python.py:308
+#: sphinx/domains/python.py:341
 #, python-format
 msgid "%s() (%s.%s class method)"
 msgstr "%s() (%s.%s klases metods)"
 
-#: sphinx/domains/python.py:311
+#: sphinx/domains/python.py:344
 #, python-format
 msgid "%s() (%s class method)"
 msgstr "%s() (%s klases metods)"
 
-#: sphinx/domains/python.py:321
+#: sphinx/domains/python.py:354
 #, python-format
 msgid "%s (%s.%s attribute)"
 msgstr "%s (%s.%s atributs)"
 
-#: sphinx/domains/python.py:366
-msgid "Platforms: "
-msgstr "Platformas: "
-
-#: sphinx/domains/python.py:372
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (modulis)"
 
-#: sphinx/domains/python.py:429
+#: sphinx/domains/python.py:491
 msgid "Python Module Index"
 msgstr ""
 
-#: sphinx/domains/python.py:430
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "moduļi"
 
-#: sphinx/domains/python.py:475
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Nav ieteicams"
 
-#: sphinx/domains/python.py:500 sphinx/locale/__init__.py:162
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "izņēmums"
 
-#: sphinx/domains/python.py:501
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr "metods"
 
-#: sphinx/domains/python.py:502
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr "klases metods"
 
-#: sphinx/domains/python.py:503
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "statiskais metods"
 
-#: sphinx/domains/python.py:505 sphinx/locale/__init__.py:158
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "modulis"
 
-#: sphinx/domains/rst.py:53
+#: sphinx/domains/python.py:695
+#, fuzzy
+msgid " (deprecated)"
+msgstr "Nav ieteicams"
+
+#: sphinx/domains/rst.py:55
 #, python-format
 msgid "%s (directive)"
 msgstr "%s (direktīva)"
 
-#: sphinx/domains/rst.py:55
+#: sphinx/domains/rst.py:57
 #, python-format
 msgid "%s (role)"
 msgstr "%s (role)"
 
-#: sphinx/domains/rst.py:103
+#: sphinx/domains/rst.py:106
 msgid "directive"
 msgstr "direktīva"
 
-#: sphinx/domains/rst.py:104
+#: sphinx/domains/rst.py:107
 msgid "role"
 msgstr "role"
 
-#: sphinx/domains/std.py:68 sphinx/domains/std.py:84
+#: sphinx/domains/std.py:70 sphinx/domains/std.py:86
 #, python-format
 msgid "environment variable; %s"
 msgstr "apkārtnes mainīgais; %s"
 
-#: sphinx/domains/std.py:160
+#: sphinx/domains/std.py:162
 #, python-format
 msgid "%scommand line option; %s"
 msgstr "%skomandrindas opcija; %s"
 
-#: sphinx/domains/std.py:328
+#: sphinx/domains/std.py:393
 msgid "glossary term"
 msgstr "glosārija termins"
 
-#: sphinx/domains/std.py:329
+#: sphinx/domains/std.py:394
 msgid "grammar token"
 msgstr "gramatiskais marķieris"
 
-#: sphinx/domains/std.py:330
+#: sphinx/domains/std.py:395
 msgid "reference label"
 msgstr "atsauces virsraksts"
 
-#: sphinx/domains/std.py:331
+#: sphinx/domains/std.py:396
 msgid "environment variable"
 msgstr "apkārtnes mainīgais"
 
-#: sphinx/domains/std.py:332
+#: sphinx/domains/std.py:397
 msgid "program option"
 msgstr "programmas opcija"
 
-#: sphinx/domains/std.py:360 sphinx/themes/basic/genindex-single.html:11
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
 #: sphinx/themes/basic/genindex-split.html:11
 #: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:11 sphinx/themes/basic/genindex.html:14
-#: sphinx/themes/basic/genindex.html:50 sphinx/themes/basic/layout.html:125
-#: sphinx/writers/latex.py:173
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
 msgid "Index"
 msgstr "Indekss"
 
-#: sphinx/domains/std.py:361
+#: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Moduļu indekss"
 
-#: sphinx/domains/std.py:362 sphinx/themes/basic/defindex.html:25
+#: sphinx/domains/std.py:429 sphinx/themes/basic/defindex.html:25
 msgid "Search Page"
 msgstr "Atlases lapa"
 
-#: sphinx/ext/autodoc.py:917
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr "   Bāzes: %s"
 
-#: sphinx/ext/autodoc.py:950
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr "aizstājvārds klasei :class:`%s`"
@@ -394,103 +419,103 @@ msgstr "(<<original entry>> atrodas iekš %s, rinda %d.)"
 msgid "original entry"
 msgstr "sākotnējs ieraksts"
 
-#: sphinx/ext/viewcode.py:66
+#: sphinx/ext/viewcode.py:70
 msgid "[source]"
 msgstr "[kods]"
 
-#: sphinx/ext/viewcode.py:109
+#: sphinx/ext/viewcode.py:117
 msgid "[docs]"
 msgstr "[dokumenti]"
 
-#: sphinx/ext/viewcode.py:123
+#: sphinx/ext/viewcode.py:131
 msgid "Module code"
 msgstr "Moduļa teksts"
 
-#: sphinx/ext/viewcode.py:129
+#: sphinx/ext/viewcode.py:137
 #, python-format
 msgid "<h1>Source code for %s</h1>"
 msgstr "<h1>%s izejas teksts</h1>"
 
-#: sphinx/ext/viewcode.py:156
+#: sphinx/ext/viewcode.py:164
 msgid "Overview: module code"
 msgstr "Apskats: moduļa teksts"
 
-#: sphinx/ext/viewcode.py:157
+#: sphinx/ext/viewcode.py:165
 msgid "<h1>All modules for which code is available</h1>"
 msgstr "<h1>Visi moduļi, kuriem ir izejas teksti</h1>"
 
-#: sphinx/locale/__init__.py:139
+#: sphinx/locale/__init__.py:155
 msgid "Attention"
 msgstr "Uzmanību"
 
-#: sphinx/locale/__init__.py:140
+#: sphinx/locale/__init__.py:156
 msgid "Caution"
 msgstr "Uzmanies"
 
-#: sphinx/locale/__init__.py:141
+#: sphinx/locale/__init__.py:157
 msgid "Danger"
 msgstr "Bīstami"
 
-#: sphinx/locale/__init__.py:142
+#: sphinx/locale/__init__.py:158
 msgid "Error"
 msgstr "Kļūda"
 
-#: sphinx/locale/__init__.py:143
+#: sphinx/locale/__init__.py:159
 msgid "Hint"
 msgstr "Mājiens"
 
-#: sphinx/locale/__init__.py:144
+#: sphinx/locale/__init__.py:160
 msgid "Important"
 msgstr "Svarīgi"
 
-#: sphinx/locale/__init__.py:145
+#: sphinx/locale/__init__.py:161
 msgid "Note"
 msgstr "Piezīme"
 
-#: sphinx/locale/__init__.py:146
+#: sphinx/locale/__init__.py:162
 msgid "See Also"
 msgstr "Skat.arī"
 
-#: sphinx/locale/__init__.py:147
+#: sphinx/locale/__init__.py:163
 msgid "Tip"
 msgstr "Padoms"
 
-#: sphinx/locale/__init__.py:148
+#: sphinx/locale/__init__.py:164
 msgid "Warning"
 msgstr "Brīdinājums"
 
-#: sphinx/locale/__init__.py:152
+#: sphinx/locale/__init__.py:168
 #, python-format
 msgid "New in version %s"
 msgstr "Jauns versijā %s"
 
-#: sphinx/locale/__init__.py:153
+#: sphinx/locale/__init__.py:169
 #, python-format
 msgid "Changed in version %s"
 msgstr "Mainīts versijā %s"
 
-#: sphinx/locale/__init__.py:154
+#: sphinx/locale/__init__.py:170
 #, python-format
 msgid "Deprecated since version %s"
 msgstr "Neieteicams no versijas %s"
 
-#: sphinx/locale/__init__.py:159
+#: sphinx/locale/__init__.py:176
 msgid "keyword"
 msgstr "atslēgas vārds"
 
-#: sphinx/locale/__init__.py:160
+#: sphinx/locale/__init__.py:177
 msgid "operator"
 msgstr "operators"
 
-#: sphinx/locale/__init__.py:161
+#: sphinx/locale/__init__.py:178
 msgid "object"
 msgstr "objekts"
 
-#: sphinx/locale/__init__.py:163
+#: sphinx/locale/__init__.py:180
 msgid "statement"
 msgstr "priekšraksts"
 
-#: sphinx/locale/__init__.py:164
+#: sphinx/locale/__init__.py:181
 msgid "built-in function"
 msgstr "iebūvēta funkcija"
 
@@ -499,8 +524,8 @@ msgstr "iebūvēta funkcija"
 msgid "Table Of Contents"
 msgstr "Saturs"
 
-#: sphinx/themes/agogo/layout.html:49 sphinx/themes/basic/layout.html:128
-#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:14
+#: sphinx/themes/agogo/layout.html:49 sphinx/themes/basic/layout.html:137
+#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:20
 msgid "Search"
 msgstr "Meklēt"
 
@@ -548,15 +573,15 @@ msgstr "ātra piekļuve visiem moduliem"
 msgid "all functions, classes, terms"
 msgstr "visas funkcijas, klases un termini"
 
-#: sphinx/themes/basic/genindex-single.html:14
+#: sphinx/themes/basic/genindex-single.html:35
 #, python-format
 msgid "Index &ndash; %(key)s"
 msgstr "Indekss &ndash; %(key)s"
 
-#: sphinx/themes/basic/genindex-single.html:46
+#: sphinx/themes/basic/genindex-single.html:63
 #: sphinx/themes/basic/genindex-split.html:24
 #: sphinx/themes/basic/genindex-split.html:38
-#: sphinx/themes/basic/genindex.html:56
+#: sphinx/themes/basic/genindex.html:74
 msgid "Full index on one page"
 msgstr "Pilns indekss vienā lappusē"
 
@@ -568,39 +593,39 @@ msgstr "Lappušu indekss pēc burtiem"
 msgid "can be huge"
 msgstr "var būt milzīgs"
 
-#: sphinx/themes/basic/layout.html:23
+#: sphinx/themes/basic/layout.html:29
 msgid "Navigation"
 msgstr "Navigācija"
 
-#: sphinx/themes/basic/layout.html:113
+#: sphinx/themes/basic/layout.html:122
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Meklēt iekš %(docstitle)s"
 
-#: sphinx/themes/basic/layout.html:122
+#: sphinx/themes/basic/layout.html:131
 msgid "About these documents"
 msgstr "Par šiem dokumentiem"
 
-#: sphinx/themes/basic/layout.html:131
+#: sphinx/themes/basic/layout.html:140
 msgid "Copyright"
 msgstr "Copyright"
 
-#: sphinx/themes/basic/layout.html:180
+#: sphinx/themes/basic/layout.html:189
 #, python-format
 msgid "&copy; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 msgstr "&copy; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 
-#: sphinx/themes/basic/layout.html:182
+#: sphinx/themes/basic/layout.html:191
 #, python-format
 msgid "&copy; Copyright %(copyright)s."
 msgstr "&copy; Copyright %(copyright)s."
 
-#: sphinx/themes/basic/layout.html:186
+#: sphinx/themes/basic/layout.html:195
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Pēdējas izmaiņas %(last_updated)s."
 
-#: sphinx/themes/basic/layout.html:189
+#: sphinx/themes/basic/layout.html:198
 #, python-format
 msgid ""
 "Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> "
@@ -630,14 +655,13 @@ msgstr "nākoša tēma"
 msgid "next chapter"
 msgstr "nākoša sadaļa"
 
-#: sphinx/themes/basic/search.html:18
+#: sphinx/themes/basic/search.html:24
 msgid ""
 "Please activate JavaScript to enable the search\n"
 "    functionality."
-msgstr ""
-"Lai iespējotu meklēšanu, lūdzu aktivizēt JavaScript."
+msgstr "Lai iespējotu meklēšanu, lūdzu aktivizēt JavaScript."
 
-#: sphinx/themes/basic/search.html:23
+#: sphinx/themes/basic/search.html:29
 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"
@@ -650,16 +674,15 @@ msgstr ""
 " visi ievadītie vārdi. Dokumenti, kuros ir tikai daļa no ievadītiem\n"
 " vārdiem, netiks atlasīti."
 
-#: sphinx/themes/basic/search.html:30
+#: sphinx/themes/basic/search.html:36
 msgid "search"
 msgstr "meklēt"
 
-#: sphinx/themes/basic/search.html:34
-#: sphinx/themes/basic/static/searchtools.js:489
+#: sphinx/themes/basic/search.html:40
 msgid "Search Results"
 msgstr "Atlases rezultāti"
 
-#: sphinx/themes/basic/search.html:36
+#: sphinx/themes/basic/search.html:42
 msgid "Your search did not match any results."
 msgstr "Nav rezultātu, atbilstošu Jūsu atlasei."
 
@@ -699,12 +722,12 @@ msgstr "Izmaiņas iekš C API"
 msgid "Other changes"
 msgstr "Citas izmaiņas"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:482
-#: sphinx/writers/html.py:487
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "Pastāvīga norāde šo virsrakstu"
 
-#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:87
+#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:92
 msgid "Permalink to this definition"
 msgstr "Pastāvīga norāde uz šo definīciju"
 
@@ -712,35 +735,12 @@ msgstr "Pastāvīga norāde uz šo definīciju"
 msgid "Hide Search Matches"
 msgstr "Paslēpt atlases vārdus"
 
-#: sphinx/themes/basic/static/searchtools.js:285
-msgid "Searching"
-msgstr "Meklējam"
-
-#: sphinx/themes/basic/static/searchtools.js:290
-msgid "Preparing search..."
-msgstr "Sagatavojam atlasi..."
-
-#: sphinx/themes/basic/static/searchtools.js:364
-msgid ", in "
-msgstr ", iekš "
-
-#: sphinx/themes/basic/static/searchtools.js:491
-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 "Jūsu atlases rindai neatbilst neviens dokuments. Lūdzu, pārbaudiet, vai visi vārdi ir uzrakstīti pareizi, un vai ir izvēlētas pareizās kategorijas."
-
-#: sphinx/themes/basic/static/searchtools.js:493
-#, python-format
-msgid "Search finished, found %s page(s) matching the search query."
-msgstr "Atlase pabeigta, atrastas lapas: %s"
-
-#: sphinx/themes/default/static/sidebar.js:66
+#: sphinx/themes/default/static/sidebar.js:69
 msgid "Expand sidebar"
 msgstr "Izplest sānjoslu"
 
-#: sphinx/themes/default/static/sidebar.js:79
-#: sphinx/themes/default/static/sidebar.js:106
+#: sphinx/themes/default/static/sidebar.js:82
+#: sphinx/themes/default/static/sidebar.js:110
 msgid "Collapse sidebar"
 msgstr "Savērst sānjoslu"
 
@@ -748,23 +748,24 @@ msgstr "Savērst sānjoslu"
 msgid "Contents"
 msgstr "Saturs"
 
-#: sphinx/writers/latex.py:171
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "Izlaidums"
 
-#: sphinx/writers/latex.py:572 sphinx/writers/manpage.py:178
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr "Vēres"
 
-#: sphinx/writers/latex.py:641
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr "turpinājums no iepriekšējās lappuses"
 
-#: sphinx/writers/latex.py:646
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr "Turpnājums nākošā lappusē"
 
-#: sphinx/writers/text.py:422
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[attēls]"
 
diff --git a/sphinx/locale/ne/LC_MESSAGES/sphinx.mo b/sphinx/locale/ne/LC_MESSAGES/sphinx.mo
index 84546b90a5121791816555905e39c727b40cc9d2..05be753d122193cbf052901555746149c2c13a2f 100644
GIT binary patch
delta 2814
zcmZYAe@vBC9LMoPAV04m7#Ea~E58y6xR>-MS<00(9D_2zYRN){kSQ1wHgc@Tk;QD%
z3T&AUOI=EZtcJK;f27lmIaiH<Sys$+t|qj8s8Op`?~nJi{)oYSopYY&`JV6jp7UG|
z)m*G`CgQ_hGyELo?@s<IXQ=nz&+cerTy(o|ChkMs(uZj{fKfPN{mNdyinAG?#5nvL
z@4&biV`4E2iR&0Y4FxVne$5&_bVD`Xj*X}Q?RNZS)cprg6ZE4SPvI=QfO_tG^x!n=
z`6OneX%?aq_M@BmO%V+}_!uVQCY*yiP!sIKxj2AHcn<kBm-*23A5r&*l9eA*Fcm9t
z5w@Tg-@#<Ohza;BMlru}k*+dwV<dWT8D`u5Cgfhzj1lOd0(7D#=(X2BM=j(MD&e0|
z@m!Qs6-q$Ob2mPWesscVyhwxXF<qz(_u{>H9JSX|NG$UUDnN*4389>*z%J^m1k+I!
z@!@T_()LR*jQ%>*^XpM@H^)(bt)!WOTPs2Z=*9W?0Wzl<MV0)D?f-<@OA{X)ccB(A
z2f1W2Y~PQXIDkrU6{;eYsQIenslOiF#(+-$bEwko#}#-2wesIF10%^!3Fh*lgaW7v
zmZP?&3YA#3?Kjx#&8XAgX0Lal;=bX~P|5pHRXvN!aNIh93iusrW!F(9oIx~A9E+jo
zMy+%%>Ut_Fp=``TAL{<c?f6rud7OG0{F-O@NWm9S0S==kJcdf(W7M9VN3DDWRj~=w
z#DAckQ(bAAXw=)1iW*;nns5bbD@ubp<_Q`KT#w4Q5%tB=YRC7YGCyE_+uD!1e-M?x
zN2tV3+3TO6CLBYR`WxGyLRI?at#S50oFl9)NI)GnA1Yt~HSsFc`(0-H^{9$8p;opX
zwW6J<=eki7zm9#pC2yhbTTMBXU<GQ+YA{Xje=QB&&}n@YRgwM3cAJB!tr$X;b{L6i
zzP8t|+kOODYJ46lp~c80Q;hmzTW9+%)-H6k=SOHL@LAO9{}MfT!<xXL0{Bshl-qs{
z>TtE8CVmqY?*wM!7!tz#g&s_z%u1*bb^oKuy#KnPfdTnE`mq;NaSR{A8|cORIdL>i
zBL;96s&eOXK8~YGJdIm0jBMs%GwS(QP!pfF{V!6e|7r%JxJ#K;puT#yU?#q2$477}
z{cETIS!A~nA3#lb5cNGWfJ*QrzKi3i1b29XabH4RKZluoMP7AiEN37lo$qBV#l_f$
zN@xJfa2WXxG6@;ML%IMtz-EcH982lfVgbI7PvRAP5SOzWy;VDroXk<wA$EposPv=O
zA5eQ5!G|8mLrt^>m0&$8z#h!O<EWKi!j(9QkD%`^{&QjnlDkP+5c~!WpbquZ=wp7f
zoklnV{ixS(5S7^()cgGzYQhUh_02T$pmB4;lwb+!ENn({H^-1$%&6`EiK<B2!eB+K
zPzf|)xc>il&<JH<7lvUMDv@qf$q%6p(-11rG?uNmAlteW_4btETHJt9coLQH8Pwss
zjEXy(GIBmmItG~E6w%Pc9jL?6i3)fabp}2}Jvf5eif@r$GtGzI^Nif!cmXPK32N`_
z(1oW_&wpzB6V^#|RN~)gD6q*3meh?}X(4L72vyp(w%?8_eK#(`AuPpf$RdqDKUld9
zs0y^=GTeiDO-E4+xS7voWtc{Nv?uu(i^Zq}DtexcuA7y)%~QK|V{2nwQ_K36hOJFK
z?MZoqkug&-GYfMId>)_oKCeH=ThJ4dm>m1>i0>Xoyxzf_#Hx`01sH5kI+FMglNu7J

delta 2786
zcmYM!eN5F=9LMp)qdX>F6;uQ-1S#m1d*N~spCZ8-PXk;yhx~yt)-c0AKzs=L#a5eW
zjgplaSk}taW)I%gmQmDljZKT0b8RV9u8d)|aAh;gdVjcQi~YE-bI$K~&iS72IltdG
zO|LdN<F3f(41dS?U&wz|lxqL~b;TKzK(!kaaX;#j7cdiF!dU#&dd}XzgtKVBjC1f8
zoQdJ_q48YEc#c^_fy;RK(F4VJ7nY+2*lgRkp#s>8vvD6L;~*ws5Y_K2y73~a|L@3U
zqFIFkb)ot##3bf71r$<fD8u>Kh?<}i7vO%Jhp!`-`IsNwKZkn$TMXbWT!dbt^kXf0
z@kva@_i-+Mg$iUsGQYV&AqM}(wHU=RR4+rCOf}BHEvNySQ4{R3_uoQgU<eiP7pVRd
zsFhBkCX6AyHR!@<d=MSB#k5jTgdJFf&!F~r1nFzOL=7;8Cd`<hPy<ges{;HNm61g9
z9gZ2OdKO0F3RM3!sBt%-7E(Qn{7<il26fnj8Td46uD6k_nqgZ%kJ`&CwtWJ%fIpCn
zrG@G))Wm7105ee;@uKD{M)j+4k$;`~1{##QUAPVpqE>zhv+xI0fU*22pfpqpb5UF4
zLj_iB>+9|PYSig}z}{~~jk^<-@h2P#+PkBu2;a4yK@IpBYGtFS6n>AI_&P@54b)0+
z+WWUr0Yx$EJ(!4k-j8Zug_@@nxr|fAZyJTIs0kd@guSQ$22gwU25RM}P#HUen)qu}
zzbnXPuJNO{<+g2~L%ua(I%+ExTMLnK9aBm{k(Hx9D0QJ5rUMoEUTcqaAL{u&Q~-xi
zfeqUGCr}f<gG%)WwmyQ&^aa~~6;t*8Pf^feOXNsvz%<mvnW*<W$JR?x8L2?6coS+x
zO{jitsEOP0IB!W8>bY#vp#bwxTecdt&=Q<}|C?2y;Sp4-ccHeR8<o;NWGwR<vc2X*
zTOYMvLk02=a+!Fd)(0&MRbOqbM{RW*YTT#L(W!rhf*XgdW2gb{paMzeA=Q_l4pj*%
zpodTcK886sh;%WZqZ_|N1rWwj*YgWd_kGq%<v&0}3k~{o4&nwJLN7*g(kPljybtS8
znd-+3Jc3H?FmA{5n2yCnrT&{y6ZhKsQ7or^0TozkI{U9ruAg4n*p9k!7+2wG)BwL?
zGe!}mCTvB0Ksr$Y_TWi8f(r0{cWB&=sQb@iHlM~*crW#f9Drpw+qs+7Q7A!8+=<oL
zhkSF)80v8ThMd#suaQj7GNuxjVLtB0E%+vu;S5%zLso^vWOkqqZy#z42CU9|6tt(K
zs17$#6U?Vk5$2%=XvC%1g<AP>T#rGl#as9yRxCD#Sj~?}EGBkI=+G`lAN6$@jUC9s
z9P=mzMRox7ULQhD_%f1pGmPpujtVd-Cv+AHkXX%5<dzw*^|PpqOrkQHmKzEnfSR}h
zBd`u5_5RmWP>LH+Dc^?Mu^ZK467?2LStCe;UZ1(R33D+Pdr$!%Kpno5sBteN=h9q9
z9pV_$8i^H{%KWB=f(CpT74hS!j)zfOaRRx_Fh6?Ff41#^p$1O!g!bNp3DkR0{hzn>
zW7Z%l!=IqW9YIGa9jBm`hAj`>h(V<`-PX%c&o!VQyRi~aBa1S3P?^ik3uRypuBG0H
zdQAtASj|VM04Gr&vOn|qLeHcSPrejDYJYEBOE5e>IiaY~lOJ&V3Re1yJYK)o8&_N7
z+1S$A+TOaO%~Q6uqh+N#-|O>vyaA6lU(Xe+Sn4hG7Y1um>cjfO<8y;o=j~4U4`C4p
AyZ`_I

diff --git a/sphinx/locale/ne/LC_MESSAGES/sphinx.po b/sphinx/locale/ne/LC_MESSAGES/sphinx.po
index 0b7e6665c..5cb11e208 100644
--- a/sphinx/locale/ne/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/ne/LC_MESSAGES/sphinx.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 1.1pre/47a94f723e80+\n"
 "Report-Msgid-Bugs-To: sharma.arati11@gmail.com\n"
-"POT-Creation-Date: 2011-05-26 13:47-0400\n"
-"PO-Revision-Date: 2011-06-02 13:38+0545\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
+"PO-Revision-Date: 2011-09-21 10:13+0200\n"
 "Last-Translator: Tika Karki <tikaraj.karki@olenepal.org>\n"
 "Language-Team: ne_NP <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -17,20 +17,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120
-#: sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
-#: sphinx/writers/texinfo.py:202
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr ""
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%B %d, %Y"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr "%s हेर्नुहोस्"
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, python-format
 msgid "see also %s"
 msgstr "%s पनि हेर्नुहोस् "
@@ -53,8 +56,7 @@ msgstr "मडुलको तह"
 msgid "%b %d, %Y"
 msgstr "%b %d, %Y"
 
-#: sphinx/builders/html.py:293
-#: sphinx/themes/basic/defindex.html:30
+#: sphinx/builders/html.py:293 sphinx/themes/basic/defindex.html:30
 msgid "General Index"
 msgstr "सामान्य  अनुसुची"
 
@@ -70,8 +72,7 @@ msgstr "पछिल्लो"
 msgid "previous"
 msgstr "अघिल्लो"
 
-#: sphinx/builders/latex.py:141
-#: sphinx/builders/texinfo.py:196
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr "(in"
 
@@ -100,19 +101,16 @@ msgstr "पनि हेर्नुहोस"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: sphinx/domains/c.py:51
-#: sphinx/domains/python.py:95
+#: sphinx/domains/c.py:51 sphinx/domains/python.py:95
 msgid "Parameters"
 msgstr "Parameters"
 
-#: sphinx/domains/c.py:54
-#: sphinx/domains/javascript.py:128
+#: sphinx/domains/c.py:54 sphinx/domains/javascript.py:128
 #: sphinx/domains/python.py:107
 msgid "Returns"
 msgstr "Returns"
 
-#: sphinx/domains/c.py:56
-#: sphinx/domains/python.py:109
+#: sphinx/domains/c.py:56 sphinx/domains/python.py:109
 msgid "Return type"
 msgstr "Return type"
 
@@ -141,15 +139,12 @@ msgstr "%s (C किसिम)"
 msgid "%s (C variable)"
 msgstr "%s (C चल)"
 
-#: sphinx/domains/c.py:204
-#: sphinx/domains/cpp.py:1060
-#: sphinx/domains/javascript.py:162
-#: sphinx/domains/python.py:559
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "फन्क्सन"
 
-#: sphinx/domains/c.py:205
-#: sphinx/domains/cpp.py:1061
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "सदस्य"
 
@@ -157,8 +152,7 @@ msgstr "सदस्य"
 msgid "macro"
 msgstr "बृहत"
 
-#: sphinx/domains/c.py:207
-#: sphinx/domains/cpp.py:1062
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "किसिम"
 
@@ -186,20 +180,17 @@ msgstr "%s (C++ सदस्य)"
 msgid "%s (C++ function)"
 msgstr "%s (C++कार्य)"
 
-#: sphinx/domains/cpp.py:1059
-#: sphinx/domains/javascript.py:163
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
 #: sphinx/domains/python.py:561
 msgid "class"
 msgstr "कक्षा"
 
-#: sphinx/domains/javascript.py:106
-#: sphinx/domains/python.py:254
+#: sphinx/domains/javascript.py:106 sphinx/domains/python.py:254
 #, python-format
 msgid "%s() (built-in function)"
 msgstr "%s() (built-in function)"
 
-#: sphinx/domains/javascript.py:107
-#: sphinx/domains/python.py:318
+#: sphinx/domains/javascript.py:107 sphinx/domains/python.py:318
 #, python-format
 msgid "%s() (%s method)"
 msgstr "%s() (%s विधी)"
@@ -214,8 +205,7 @@ msgstr "%s() (कक्षा)"
 msgid "%s (global variable or constant)"
 msgstr "%s (global variable or constant)"
 
-#: sphinx/domains/javascript.py:113
-#: sphinx/domains/python.py:356
+#: sphinx/domains/javascript.py:113 sphinx/domains/python.py:356
 #, python-format
 msgid "%s (%s attribute)"
 msgstr "%s (%s attribute)"
@@ -228,13 +218,11 @@ msgstr "Arguments"
 msgid "Throws"
 msgstr "Throws"
 
-#: sphinx/domains/javascript.py:164
-#: sphinx/domains/python.py:560
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr "data"
 
-#: sphinx/domains/javascript.py:165
-#: sphinx/domains/python.py:566
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "attribute"
 
@@ -246,10 +234,8 @@ msgstr "चलहरू"
 msgid "Raises"
 msgstr "Raises"
 
-#: sphinx/domains/python.py:255
-#: sphinx/domains/python.py:312
-#: sphinx/domains/python.py:324
-#: sphinx/domains/python.py:337
+#: sphinx/domains/python.py:255 sphinx/domains/python.py:312
+#: sphinx/domains/python.py:324 sphinx/domains/python.py:337
 #, python-format
 msgid "%s() (in module %s)"
 msgstr "%s() (in मडुल %s)"
@@ -259,8 +245,7 @@ msgstr "%s() (in मडुल %s)"
 msgid "%s (built-in variable)"
 msgstr "%s (built-in चल)"
 
-#: sphinx/domains/python.py:259
-#: sphinx/domains/python.py:350
+#: sphinx/domains/python.py:259 sphinx/domains/python.py:350
 #, python-format
 msgid "%s (in module %s)"
 msgstr "%s (in मडुल %s)"
@@ -322,8 +307,7 @@ msgstr "modules"
 msgid "Deprecated"
 msgstr "Deprecated"
 
-#: sphinx/domains/python.py:562
-#: sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "अपबाद"
 
@@ -339,8 +323,7 @@ msgstr "कक्षा विधी"
 msgid "static method"
 msgstr "static विधी"
 
-#: sphinx/domains/python.py:567
-#: sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "मडुल"
 
@@ -366,8 +349,7 @@ msgstr "निर्देशिक"
 msgid "role"
 msgstr "भूमिका"
 
-#: sphinx/domains/std.py:70
-#: sphinx/domains/std.py:86
+#: sphinx/domains/std.py:70 sphinx/domains/std.py:86
 #, python-format
 msgid "environment variable; %s"
 msgstr "environment variable; %s"
@@ -397,16 +379,12 @@ msgstr "environment variable"
 msgid "program option"
 msgstr "कार्यक्रमका बिकल्प"
 
-#: sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
 #: sphinx/themes/basic/genindex-split.html:11
 #: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32
-#: sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68
-#: sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-#: sphinx/writers/texinfo.py:447
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
 msgid "Index"
 msgstr "अनुसुची"
 
@@ -414,8 +392,7 @@ msgstr "अनुसुची"
 msgid "Module Index"
 msgstr "मडुल अनुसुची"
 
-#: sphinx/domains/std.py:429
-#: sphinx/themes/basic/defindex.html:25
+#: sphinx/domains/std.py:429 sphinx/themes/basic/defindex.html:25
 msgid "Search Page"
 msgstr "पानामा खोज्नुहोस्"
 
@@ -542,31 +519,25 @@ msgstr "भनाई"
 msgid "built-in function"
 msgstr "built-in फन्क्सन"
 
-#: sphinx/themes/agogo/layout.html:45
-#: sphinx/themes/basic/globaltoc.html:10
+#: sphinx/themes/agogo/layout.html:45 sphinx/themes/basic/globaltoc.html:10
 #: sphinx/themes/basic/localtoc.html:11
 msgid "Table Of Contents"
 msgstr "विषयसूची"
 
-#: sphinx/themes/agogo/layout.html:49
-#: sphinx/themes/basic/layout.html:137
-#: sphinx/themes/basic/search.html:11
-#: sphinx/themes/basic/search.html:20
+#: sphinx/themes/agogo/layout.html:49 sphinx/themes/basic/layout.html:137
+#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:20
 msgid "Search"
 msgstr "खोज्नुहोस् "
 
-#: sphinx/themes/agogo/layout.html:52
-#: sphinx/themes/basic/searchbox.html:15
+#: sphinx/themes/agogo/layout.html:52 sphinx/themes/basic/searchbox.html:15
 msgid "Go"
 msgstr "जानुहोस्"
 
-#: sphinx/themes/agogo/layout.html:57
-#: sphinx/themes/basic/searchbox.html:20
+#: sphinx/themes/agogo/layout.html:57 sphinx/themes/basic/searchbox.html:20
 msgid "Enter search terms or a module, class or function name."
 msgstr "खोज्ने टर्मस् अथवा एक मडुल्, कक्षा अथवा फन्क्सनको नाम लेख्नुहोस "
 
-#: sphinx/themes/agogo/layout.html:78
-#: sphinx/themes/basic/sourcelink.html:14
+#: sphinx/themes/agogo/layout.html:78 sphinx/themes/basic/sourcelink.html:14
 msgid "Show Source"
 msgstr "स्रोत देखाउनुहोस् "
 
@@ -656,7 +627,9 @@ msgstr "यो भन्दा अगाडी %(last_updated)s मा अपड
 
 #: sphinx/themes/basic/layout.html:198
 #, python-format
-msgid "Created using <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 "<a href=\"http://sphinx.pocoo.org/\">Sphinx</a> प्रयोग गरेर बनाइएको"
 
 #: sphinx/themes/basic/opensearch.xml:4
@@ -746,14 +719,12 @@ msgstr "C API का  परिवर्तनहरु "
 msgid "Other changes"
 msgstr "अरु परिवर्तनहरु "
 
-#: sphinx/themes/basic/static/doctools.js:154
-#: sphinx/writers/html.py:506
-#: sphinx/writers/html.py:512
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "यो शिर्षकको लागि पर्मालिन्क । "
 
-#: sphinx/themes/basic/static/doctools.js:160
-#: sphinx/writers/html.py:92
+#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:92
 msgid "Permalink to this definition"
 msgstr "यो अर्थको लागि पर्मालिन्क"
 
@@ -774,25 +745,24 @@ msgstr "साइडबर सानो बनाउनुहोस्"
 msgid "Contents"
 msgstr "विषयसूची"
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "रीलीज"
 
-#: sphinx/writers/latex.py:590
-#: sphinx/writers/manpage.py:182
-#: sphinx/writers/texinfo.py:580
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr "फूट्नोट्स"
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr "अघिल्लो पानासँग जोडीएको"
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr "अर्को पानासँग जोडीएको"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[चित्र]"
 
diff --git a/sphinx/locale/nl/LC_MESSAGES/sphinx.mo b/sphinx/locale/nl/LC_MESSAGES/sphinx.mo
index f7afad063e5fae7dffc7231dd3ea91247ae90863..05ee5662b68b808aecb4080cc1564d25879b01f8 100644
GIT binary patch
delta 2676
zcmY+^duW$c7{KwfoR{gG)24H4SDV+IZMmG&vLQLU5b7UJ+bXg-G@^~%Tt(5FX5<Xa
zrHPT)Qqa(%;l$8NN{dYBVnj&fEscb91qBk>==<FcMB}&jbIy6+bDndabKdu4&HDMt
znNg{)1^(XTKac;cf!6-}OCK6SI@RGg9COh}CgC`ohH1DcS|9H>;`OvYh9fb-EbPD$
zxEmQa2?r@S@G%^QC*uRBF@yRQbbxEIJ%fjQz5op{6~|yTX5tdG-%2dPC(-`fkYCu#
z#pe!UHu1yf6ddR*=HeeX7BiThE1$^4`xTgjci{|t1Pk$XtiVH9hCO%#7Bb7xI2-#i
zghQy;;~ZRWo%mrF1%BZjE`#wf+VLnl@F{f0!&#OSEI<dULRUT)4RAj$zy=(I-AK~H
zVRS;DVI`hNw=jo&NGOLw3Jx&MjY$b%COU8xQHdQEq8WGyuftWbz8X`hx1;?xq62S3
z7qBCG0PTMQi}4H^ihW7?Qk=;K*^rN9Ka?U_3{~g~YLH)86zdIW;3jl}Eoes8pn*4_
z{W{S@y${XYah!`6(1lMJMgB`D+&Zd1U>%ye73fwpp%ZG0^|kT-2JAb{@&0af!2M{d
zKS355PNNg+iC#s=Gabw!q$d<iT>%<+5)Qzd(G^ZdCo&T!U^VtlFt#_L0ou?BIbJ?)
zLC4*X2Ko>U{1v)IKcE>-&QUN$SI~e%8O4qx&;fI}_%=+7?eo!qi_p~9MOUH&x1ke$
z7X3b~i|u>RiN6~?&~FkxpkRli=mbunGyA&#f$$?5@B*6R%d!49n&MP8-1gCE>PyhG
zRE-8)h`zQ<V*Lp;6Hj59@Bcaqu4E%Rf$eC(x3Gh^VJ|wN+p_z;8(nEFy21z0j3sEl
z_IUqQWV^#QbPM(&a}FP&6aE&{egDr>Z~{H(%&ws;8$#Y)Ne)_{9P6{t=kGyJ^-^@t
zThKrqXn<XKBkqsw-=pJSiuFG+F=d0uk24#G1z3p=Sc?W~MUF>Ui~Pb?E`9;Kun>QV
z^})=hjQSjO+-7v#m(i{0L^HGpYp^Sq{M&Gq1_!p659XpDpkl1TnP>)9A;}3ZpwGR5
z{K8HyZov^;h{w_UIh<_Ui_r0>;B34T-RkG_$iJz2F+R8jQ`qwzXa+jDc>f5xk}uIO
z;7>^Q!q4bHz32yL0O|8=WFW^TWFcz{Q_%kNa3a>BnOmDs@Nn%!2Ye6RqvNstJ9Gu-
z(ZlpBy2rifTa(Es4m=ipt`rSiiB9M~WNu+8nt?XF12>^(EBS^(359cL;DJT`jzk0G
z$NKnKFGo{bg$Axh11&}~^)R|c&FF$&LdWThzKt%V3pra!I7Y$1C((gVqhG*_Xva%v
zhJMGJ@E`QK$;JKcW#}2Y9i31Odg|-Zj3j8lcJvT$NBehSy6^w{6x^dv(Y-v2cD#so
z>_HD>3NO2X#-bA|M&FLf(Mojh=b`=Y#qqc}wm*XgUK3rf#1F4faKNo-fF0-_@9_aV
z6x%;WQ~X72KZWk$+1UOYy4St2J&!cle=71qgz2%qAX<z0&h$YF23&z=;Ayn|xy^s2
zHD-=)DO%p#u=?@Frq*Sxk2W`T*9~1aETg=<w5+Q1mhz(VvRP#_HeViHl3FpVqP#n6
YOiD`1jLl=RmyP&;$HwlK>@&mu1@!mwtpET3

delta 2627
zcmYM#duWzb9KiAOZcE*}Hs{<eTbq|@L=N7(%sI=I4Xv%bECXwp22Gh(EHH3gcx8bX
zD035M7gVGeHc=8KT_yHUEk|V1AC_38k>re^$pWWA->)5LyuP33oaZ^`_dCCH-p8$r
z&Mr*<T#&UZ@VA$LW&FGSHe3Jy-OQ$s=0BK=$z%vVQi_wY9Jv)9iZ;gkPvSWGo3RjI
zz_HkY&ew&^mk#^5$f4s<e4r2WXrD$W_#yTWq6v)PcpSr^Vl2aaoQaOB$BFm^I(`H4
z37h%yxh^ch4{$v3!)IJfpyLdd;vkw~CSL~1$2+hRt8qS7;LA7*cVP+#@J_seMOZ?%
zR;CKa;2fNf55{&HbBQ0eaxoga(Sdu>iI1TfUqKTbK_@C=nXbGX4KN#*U>%Oaw~-=+
zZZx6&I0sLnTQ`h+!VSLCPLOnC66_N?aS>686{e#VsKpFi9NWt<i*^e-ejPgT26O?h
zM0cR$dvFqdiiWy?6e;|XPyOw<P6t&F*=(3MiqI8IM)$BPw(HQq4QPT((2A@?1Fu2H
zy@np<EokLF#07W?U3o?U+lk`}sJ{WL>9BMUqg&B{Ce#$$&&2y{@YZRL_dC!Dx1*)r
zgRCX=p@|Jdzenf0faDN<M=Ljy=EA^P)F~5l&=rnF6Dh=LScbO}jQtI0fF?AdX1ojA
z(22LBf!;v__o7?$3A*6V(F&zcb78>C=)kM!gv02sAxXpjDQLhdwDi@{dUWC@G~pHK
zdtr6#e*;Z?TXaWsH}ZTs?B&7)deF=c#s^NI0Z*YN{yMhLp(Xw$_Wy;J-UHxSDnkQK
zM}M|6WBYNm63fvAt;Sq`|LeFgfsJUu*Rhjd!)7$0Qr;Fi6<z5JbcHqOM9t{9mU#a~
zwDcR0+`?vb0q>*p^r96!jyeARzvRLdokdr0DYl1VJCl8Iz<BgDPeS+lel*b2Xn^N&
z3cecq_n|9365A)yN}WLyyNc;@F07LiR-l0%K(;?LBA>8|FW-FaSb-nM_IH?~J({eX
zxCWhgIl2X{Xl2@PA-2c%7s$|XdII(L!C&d{#WRR=F~MwBWFAt4@EH2sbI2#G=gZP>
z!KK)V-oF(4ub=_0;XKUcsJq3FqLo^Vj$c_u{S)l<S~{#iD_=ga1zkxu`sO=`R4W`t
zC+bIEG~b|S;v8~Z!cWK=!Zmb!9_76or=XQ<M9;u_biR$&-#zM#H};^J^&+o^a17n!
ze)Q+{BRcU#^tr#$z|L+$#YpTh39UdK*5Om=*?Jc%@gp>D`rCMM9u06gw*QRn5wx@!
z6aNdGjRq=5D|HXLMK$P(mZI~tMqfe~(vF_3H_^cFA@im~4;Q}q4xs~&pe5?Vd+{qY
zfg!a2I(n!^@jr@{7>l0zO0*)6paGlEL)?OnZ%4;(LbvEG%<}htfC~p6LI)m4590tD
z=pvffAi9E~s4oHcJ`WvVh*PmV_Sd6<8=}jiE718?;TYnFwOqKzZSjE)Z_wU`mbfeS
z???CWK<qz(?sb3c{|yZ|j2!%MGqy`9kNp*BqSMfLDa`dWFNil5?aWTL9PLPM%E?R3
rtxDBYrK%^+m|2^ewKKoCGHZ72eW{~0#fd~>_RiXpXOA8(IiK?{vb*B=

diff --git a/sphinx/locale/nl/LC_MESSAGES/sphinx.po b/sphinx/locale/nl/LC_MESSAGES/sphinx.po
index c9065504c..473baadc8 100644
--- a/sphinx/locale/nl/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/nl/LC_MESSAGES/sphinx.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 0.5\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2009-08-06 23:04+0200\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: 2011-01-22 14:41+0100\n"
 "Last-Translator: Marijn van der Zee <marijn.vanderzee@gmail.com>\n"
 "Language-Team: nl <LL@li.org>\n"
@@ -14,20 +14,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr "%s %s documentatie"
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d. %B %Y"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr "zie %s"
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, python-format
 msgid "see also %s"
 msgstr "zie %s"
@@ -66,21 +71,10 @@ msgstr "volgende"
 msgid "previous"
 msgstr "vorige"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr ""
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "Index"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Auteur van deze sectie: "
@@ -145,12 +139,12 @@ msgstr "%s (C type)"
 msgid "%s (C variable)"
 msgstr "%s (C-variabele)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "functie"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "member"
 
@@ -158,7 +152,7 @@ msgstr "member"
 msgid "macro"
 msgstr "macro"
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "type"
 
@@ -166,28 +160,28 @@ msgstr "type"
 msgid "variable"
 msgstr "variabele"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (C++ klasse)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (C++ type)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (C++ member)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (C++ functie)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "klasse"
 
@@ -225,11 +219,11 @@ msgstr "Parameters"
 msgid "Throws"
 msgstr ""
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr ""
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "attribuut"
 
@@ -298,45 +292,45 @@ msgstr "%s() (%s methode)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (%s.%s attribuut)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (module)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 #, fuzzy
 msgid "Python Module Index"
 msgstr "Module-index"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "modules"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Verouderd"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "exceptie"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr ""
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr ""
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "statische methode"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "module"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 msgid " (deprecated)"
 msgstr " (verouderd)"
 
@@ -389,6 +383,15 @@ msgstr "omgevingsvariabele"
 msgid "program option"
 msgstr ""
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Index"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Module-index"
@@ -397,12 +400,12 @@ msgstr "Module-index"
 msgid "Search Page"
 msgstr "Zoekpagina"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr ""
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr ""
@@ -724,8 +727,8 @@ msgstr "Veranderingen in de C-API"
 msgid "Other changes"
 msgstr "Andere veranderingen"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "Permalink naar deze titel"
 
@@ -750,49 +753,24 @@ msgstr ""
 msgid "Contents"
 msgstr "Inhoud"
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "Release"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr "Voetnoten"
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr "Vervolgd van vorige pagina"
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr "Vervolgd op volgende pagina"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[afbeelding]"
 
-#~ msgid "Platforms: "
-#~ msgstr "Platformen: "
-
-#~ msgid "Searching"
-#~ msgstr "Zoeken"
-
-#~ msgid "Preparing search..."
-#~ msgstr "Het zoeken wordt voorbereid..."
-
-#~ msgid ", in "
-#~ msgstr ", in "
-
-#~ 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 ""
-#~ "Uw zoekopdracht leverde geen resultaten "
-#~ "op.  Controleer of alle woorden correct"
-#~ " gespeld zijn en dat u genoeg "
-#~ "categoriën hebt geselecteerd."
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr "Zoeken voltooid, %s pagina(s) gevonden."
-
diff --git a/sphinx/locale/pl/LC_MESSAGES/sphinx.mo b/sphinx/locale/pl/LC_MESSAGES/sphinx.mo
index 4f91a8c7eeb279874ebdb65df474291eeb39c074..bdceda4362a59aa405fe65db16205e0e34465fb9 100644
GIT binary patch
delta 2809
zcmZYBeQ1?c9Ki9TTju6VPV+X+^iJI>WqCK&biSrZQ%l?|EzvU5nTFFp)Kbgc$|N-%
z%CZ+iQY@$>#AXzxBHA#>G8L^9d`Zf(L0D-oQ1<=a9VlqrJ)iTO=e+#R@0{muFONGs
zE`7Rl_Qt@^oBa0Rcl0&h{rfX7H-z@w)?x=-hBjG+y|Es1a7Xl`_`C_bQ2#0B;TgOh
zFX46Ard?*-bVyKe;6BJFlyI@ZFzkrq(E+B#`uS-4I&^}yn83~02|qyleS%5+67Byx
z@(H=D#()!;2x%Hou;W0y0mooBd>EZz8Ft5d%*VHpPuS1J=ZDeu=dm3B!d_TLlx27y
zrf@ahh`X>Wp1>UD56u?v3bsYV9}YR_{TSp?sK#q?Iy%6k=mg8-^Y_q&>_Y=Sg7$Al
zGjti9r#<PNfC)^up)i{Q+Y)Ng2$$eMd=cI2LrC9n6dm9khE^f`hz{J$tOl4xp3O)e
zw#LGEe+y=FKNRgh5*_#MJo4{Ks;S7V2pwQK7T^YSu0|xQ;Xu6q0^Q5AvA!8yz#qsb
zWOr`4PoNVQpaB-487V{O8`hcp+wop1JpB)$se2Mf;Y;YszsA1!JsMyKE(TP9X7Dz2
zYi>sa8y4@!#^=@O>3<+TuSLgQnx<gNSD}0N1{&e}(Y@$^2ho)sLsR%II`L1Kg;&s(
z{u!TNMFYxV)*{S9+YdtPN1*ehD=F{^Ra|bu8gzmc=!EOg0A5G;Y#X}r9cae(q7$D&
z`<+ET;UX8`maDNopL{!EZ*(jAx0ntU6dbq`jch#n#WE?@FF_-(i>{2WMcX%^0lbC=
zwmCk37oBh?n(96A{t%k!<C%K)|2qn9!DaNY<#D7PumGL72z|ec(G^x==5<8dO-Co1
zg}ZqxYLV=Rek|XKhokMrqYImewqLBi|8*41!1HLwb!Z@4kn<LHpaXr3uJ9OUPCt5h
zo8$A}qHT!Q6?VnUsYm;jp<6Q&i7`yZw1rv<PVgKiu>l=mCpu9Ry7D7v`&04x&*<Bd
z#f4(%i7sFedY0}%VhWF;0jxk5v_95v?aupOPQ`92df_iP1iP>wIsyCO3uwpfXdwI1
zj2%MHz)>86C(-8#PNoY=q8S>1>~0v0DXc;RdZq{Yci?&|T-g?Mzz@+cpnd3o-{2H%
zM%&-T^32Q>bcHoI0_)H-vlmTu6S~(Yu^(sSJoe<iBdayQ;xq+QHx%tSIo>~rPVhvm
zUlCn{2D$->CA@_O)PzO&6}r-^m^lN<ma|lZj#rLOJPKV{x|)Iwr=o{$9-7*x&<@X{
z4eOEJ39rQaMl?fv&@DQHLotg=$GHRhVilU9#b`$A(F|{GF&(y1a4#Cs4D5>@L_2;S
zpI<-^*RMzxLtEY@S6+mk@``9Bx}ZtuxU<m(EJP<>j-H8?nC;*H_3^<*w8JLshwq>n
zI3Ay$i}ydE|0i5VVhJ5sz5@?HzcB}*fsI8oISn265p?etpx+1enECtPK*2rRgr0>)
z^w4~U4txR~@HD!zOK7HAlV4MvgQmJ07bhH!**F?)H#S;@j(0!WZaVt+C)C6SOVNp+
zMh9LU>t99NZAK5zPV}%Hi1imSoBO}f39|}Y4reZ!>YLHPOEC-YL<6ZT3=LCrXLc%F
zn4Gm>=Hl9#`HN;On!8|r<F4Eb?J7!2ic=NEr6tLd)ZkQk|5Rxzm0LBTcw)`ta~IO6
mc=U`#HG`9-ssFYsDWhHE$;7R#T9r3s=g;~7&~x&)xBmxXwhR^k

delta 2775
zcmYM$duY~G7{KwfId5~O^SXI`ZJRdjwfD7oX|qhTXtOXcEvHG18f;1_F0$C@^^YvO
zEDO`n%1WgyE72)YPNWDOjV?+GVObf9{h`4qgz(b$>kc&Dy`S?t*XKOv{KmeodZQ|H
zYCz7$z|RhTNANqnyHEfBJeV6o9*;}0FD^s7JcZZeGuRv7i|&f;`!S#T12_o3#eR4i
zov#y_FB7g(=tD(czU)wl*I_9-!L(Rkg$A$~2Vy-A!Dj4_8_;n(FoCV;_#cr^ILnuT
zcB11hVSm;S0|{p+6~$PH)6oU0aTqSc0$huH!dAX)--Y%+gj4V*9F6^nvJ6w0!a5v|
zn{Y7hMFVM9)(^)h^unL<Harubi`fpvki?!?flhD-x<E~Ae+A9JTWG+ap!2n(J3Wdn
zcn;@cC-%Tuq&q|QLnQ?xT!>R~C3?m?k-p(mbb^BzvO+k5PTbC_2KXzQk@J{s7xM0N
z4(4D1I({TN?>KZL$$avEZAVl%pa#d_W9VAzk*tPy;`7JoS+>Rcc60;Bkx%$7K6j!E
zUq%DW9?+GM{^)vz=(w8(kbiG|ITfbv0i1=a(4FtcV*DBn@J}?L%V-L7sq|>_(ZCAh
za|zm>L~nmtY_CM;y&ui^qZtaG-5T`FUW;x)C)|$iY&V+1FVTrRup1sjcX}eWpF{&X
zgJbbL+J6vHSU((Hrw9!!b0gm)Da=F{cnDpv0S%xDJ+tT0owuMF+k!6q89J^F`GmuK
z`L>*l^?#!aUO|tdC;8XG$h?_QM8U{P(LX5Zu7<D>jeK#mHd>GNUx5a&8V#&Dw!eTb
z_$r#}&GC6Bn&~~U{wo~r`+t;zm+d?{;bnB;Y_7QPcW-ouMQG$nv|k0f(Cyg9TTzK*
zJM>`tE<6nFSBh?IBHDjmbTM}K{eOgl0W=`@Dm;x&@G`oyH_@ZmiQd|MvHei=J9KBi
zpaEV$$6Z3Q9(uD2Vhf|9lhOI_!Ayd}5(-Yxj4srI?szjgaC>b30)0z5kWV<vmpiu7
zJ2VJcGfYAQn1gO;QLJB%Q+R$BN8^EE<iCQ#Nh)+G??e$UKnJcy19=g>gs-D#zXdCB
z8`^#f-O)KTLl==#4B6b&6c(TXRig7&qZ?}&LH?a^4Hf?3S%*&e5!T>7bij3N&&-TL
zcbLQ(co%wCo<mdJf}Zg<9M7HDg`;>r!IuI4gJv#=?K^H%hJqC(=mIlh!<^`RG}0O*
zmaq~Hs0GL3yXa1j;I%t|-lYrZd{@wga}!+~D@6Mhq5U#t6in@GbU+oFfokMb!o%^o
z3C+-2^oTyd>DYlz)QiSqEI>1KE1HpNG{eiIjp$J{AsNVobzOz99v!$TcG!(xt~Ml#
z;Rkf*7tmXt#XF__&>f9LC!UCIpaNa^PV`RPi@uJFV*OIg^Zl=*FrJ20Xa?Sn9X^cD
zd(i(64kBxZ<FWlB`j_%58dyGQF_Xn;Amh=qpNcMAjRv*^J+eA1Wc|=Y!Ar9djd&|M
z;rr;$K1VOhH)yJlqN)BJU9blaE|7=z%a0bI^NmLPjYBh<jO{Zq<HC1SaN>Efp%(2}
zk6xZ;9E&f-`n{OL^I>$s4)k&!LsR`18u-814f~XI1=0^gB9WL?+gR6Fo+xPyi49G;
z3tCU-{?X@_)U+g@bSjZfmzUi<A;nMbeRGrZ>z-_AY*_Jla(3+#b>)dksdPG-N+%~x
fN~9;3r&AMB>DDVlO0%*iZ@8hLzI8{zuDt&M`9b>z

diff --git a/sphinx/locale/pl/LC_MESSAGES/sphinx.po b/sphinx/locale/pl/LC_MESSAGES/sphinx.po
index adf4f3cc5..957d23e91 100644
--- a/sphinx/locale/pl/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/pl/LC_MESSAGES/sphinx.po
@@ -1,9 +1,10 @@
+
 msgid ""
 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: 2011-01-22 14:41+0100\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
+"PO-Revision-Date: 2011-09-21 10:14+0200\n"
 "Last-Translator: Michał Kandulski <michal.kandulski@gmail.com>\n"
 "Language-Team: \n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && "
@@ -11,20 +12,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr ""
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%B %d %Y"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, fuzzy, python-format
 msgid "see %s"
 msgstr "zobacz %s"
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, fuzzy, python-format
 msgid "see also %s"
 msgstr "zobacz także %s"
@@ -63,21 +69,10 @@ msgstr "dalej"
 msgid "previous"
 msgstr "wstecz"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr " (w "
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "Indeks"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Autor rozdziału: "
@@ -141,12 +136,12 @@ msgstr "%s (typ C)"
 msgid "%s (C variable)"
 msgstr "%s (zmienna C)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "funkcja"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "pole"
 
@@ -154,7 +149,7 @@ msgstr "pole"
 msgid "macro"
 msgstr "makro"
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "typ"
 
@@ -162,28 +157,28 @@ msgstr "typ"
 msgid "variable"
 msgstr "zmienna"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (klasa C++)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (typ C++)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (pole C++)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (funkcja C++)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "klasa"
 
@@ -220,11 +215,11 @@ msgstr "Argumenty"
 msgid "Throws"
 msgstr "Wyrzuca"
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr "dane"
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "atrybut"
 
@@ -292,44 +287,44 @@ msgstr "%s() (%s metoda klasy)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (atrybut %s.%s)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (moduł)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 msgid "Python Module Index"
 msgstr "Indeks modułów pythona"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "moduły"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Niezalecane"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "wyjątek"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr "metoda"
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr "metoda klasy"
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "statyczna metoda"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "moduł"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 msgid " (deprecated)"
 msgstr " (niezalecane)"
 
@@ -339,6 +334,7 @@ msgid "%s (directive)"
 msgstr "%s (dyrektywa)"
 
 #: sphinx/domains/rst.py:57
+#, python-format
 msgid "%s (role)"
 msgstr "%s (rola)"
 
@@ -380,6 +376,15 @@ msgstr "zmienna środowiskowa"
 msgid "program option"
 msgstr "opcja programu"
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Indeks"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Indeks modułów"
@@ -388,12 +393,12 @@ msgstr "Indeks modułów"
 msgid "Search Page"
 msgstr "Wyszukiwanie"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr "   Klasy bazowe: %s"
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr "alias klasy :class:`%s`"
@@ -403,6 +408,7 @@ msgid "Todo"
 msgstr "Todo"
 
 #: sphinx/ext/todo.py:109
+#, python-format
 msgid "(The <<original entry>> is located in  %s, line %d.)"
 msgstr "(<<Oryginalny wpis>> znajduje się w pliku %s, w linii %d.)"
 
@@ -714,8 +720,8 @@ msgstr "Zmiany w C API"
 msgid "Other changes"
 msgstr "Inne zmiany"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "Stały odnośnik do tego nagłówka"
 
@@ -740,49 +746,24 @@ msgstr "Zwiń pasek boczny"
 msgid "Contents"
 msgstr "Treść"
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "Wydanie"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr "Przypisy"
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr "kontynuacja poprzedniej strony"
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr "Kontynuacja na następnej stronie"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[obraz]"
 
-#~ msgid "Platforms: "
-#~ msgstr "Platformy: "
-
-#~ msgid "Searching"
-#~ msgstr "Wyszukiwanie"
-
-#~ msgid "Preparing search..."
-#~ msgstr "Przygotowanie wyszukiwania..."
-
-#~ msgid ", in "
-#~ msgstr ", w "
-
-#~ 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 ""
-#~ "Nie znaleziono żadnych pasujących dokumentów."
-#~ " Upewnij się, że wszystkie słowa są"
-#~ " poprawnie wpisane i że wybrałeś "
-#~ "wystarczającą liczbę kategorii."
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr "Przeszukiwanie zakończone, znaleziono %s pasujących stron."
-
diff --git a/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.mo b/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.mo
index bb7d8d2031852c32ea030574e40ad655e1903d9f..3016d5ef7145702f129ad834c2d65e92dd461cd1 100644
GIT binary patch
delta 46
zcmdn*z2AGoIx#^*LtO()T_ZyULjx-VGi?K-$@|3=Sxl@<3^zX!6JlgE+x%Vp1TO$Z
Co(;VK

delta 46
zcmdn*z2AGoIx#^53tdA)T?0!6LrW_YGi?LI$@|3=Sxl`A4K_a!6JlgE-TYnr1TO$b
CXAQ~#

diff --git a/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po b/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po
index 1906a7c7d..b41b5ad18 100644
--- a/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 0.5\n"
 "Report-Msgid-Bugs-To: roger.demetrescu@gmail.com\n"
-"POT-Creation-Date: 2008-11-09 19:46+0100\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: 2011-01-22 14:41+0100\n"
 "Last-Translator: Roger Demetrescu <roger.demetrescu@gmail.com>\n"
 "Language-Team: pt_BR <roger.demetrescu@gmail.com>\n"
@@ -15,20 +15,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, fuzzy, python-format
+msgid "%s %s documentation"
+msgstr "%s %s documentação"
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d/%m/%Y"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, fuzzy, python-format
 msgid "see %s"
 msgstr "veja %s"
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, fuzzy, python-format
 msgid "see also %s"
 msgstr "veja também %s"
@@ -67,21 +72,10 @@ msgstr "próximo"
 msgid "previous"
 msgstr "anterior"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr " (em "
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "Índice"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Autor da seção: "
@@ -145,12 +139,12 @@ msgstr "%s (tipo C)"
 msgid "%s (C variable)"
 msgstr "%s (variável C)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "função"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "membro"
 
@@ -158,7 +152,7 @@ msgstr "membro"
 msgid "macro"
 msgstr "macro"
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "tipo"
 
@@ -166,28 +160,28 @@ msgstr "tipo"
 msgid "variable"
 msgstr "variável"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (classe C++)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (tipo C++)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (membro C++)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (função C++)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "classe"
 
@@ -224,11 +218,11 @@ msgstr "Parâmetros"
 msgid "Throws"
 msgstr "Gera"
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr "dado"
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "atributo"
 
@@ -296,44 +290,44 @@ msgstr "%s() (método de classe %s)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (atributo %s.%s)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (módulo)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 msgid "Python Module Index"
 msgstr "Índice de Módulos do Python"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "módulos"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Obsoleto"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "exceção"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr "método"
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr "método de classe"
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "método estático"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "módulo"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 msgid " (deprecated)"
 msgstr " (obsoleto)"
 
@@ -385,6 +379,15 @@ msgstr "váriavel de ambiente"
 msgid "program option"
 msgstr "opção de programa"
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Índice"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Índice do Módulo"
@@ -393,12 +396,12 @@ msgstr "Índice do Módulo"
 msgid "Search Page"
 msgstr "Página de Pesquisa"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr "   Bases: %s"
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr "apelido de :class:`%s`"
@@ -720,8 +723,8 @@ msgstr "Alterações na API C"
 msgid "Other changes"
 msgstr "Outras alterações"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "Link permanente para este título"
 
@@ -746,53 +749,24 @@ msgstr "Recolher painel lateral"
 msgid "Contents"
 msgstr "Conteúdo"
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "Versão"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr "Notas de rodapé"
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr "continuação da página anterior"
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr "Continua na próxima página"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[imagem]"
 
-#~ msgid "Platforms: "
-#~ msgstr "Plataformas: "
-
-#~ msgid "Searching"
-#~ msgstr "Pesquisando"
-
-#~ msgid "Preparing search..."
-#~ msgstr "Preparando pesquisa..."
-
-#~ msgid ", in "
-#~ msgstr ", em "
-
-#~ 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 ""
-#~ "Sua pesquisa não encontrou nenhum "
-#~ "documento. Por favor assegure-se de "
-#~ "que todas as palavras foram digitadas"
-#~ " corretamente e de que você tenha "
-#~ "selecionado o mínimo de categorias."
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr ""
-#~ "Pesquisa finalizada, foram encontrada(s) %s"
-#~ " página(s) que conferem com o "
-#~ "critério de pesquisa."
-
diff --git a/sphinx/locale/ru/LC_MESSAGES/sphinx.mo b/sphinx/locale/ru/LC_MESSAGES/sphinx.mo
index dae20a23a6e409c828d8cea1f2f180a671881fd6..593350d31ce5c00185d0914e0baed6a08f056366 100644
GIT binary patch
delta 2629
zcmZY9Z%oxy9LMo<;e!0T{7bkYC^rzy%fEXOu9MButTD_ktANoKGcyJ}0GY{rkoBv%
z*~%3W)-*KpL1dWnfZeUBIm`#;pA@lHT0^m2w<ftHdtf@(`{O;W2eHe2{m%KFbH3m6
zJ-^?beRibDnaXy5VE7y2zkvT+ZnggVJCkfo8qM!80WV<@UO_%4J|(6Hb>E8*;C#%&
zAkM{An1QXR^*YgGjAQz^NTp+|9ng>IwD+PGIAr_BkqKr36<`W;aTYT%nME{j9{O-G
zYW`~EW1i<r33sB#Z$vNg%~me7;1JHkQG5_jp)&o|-v0yhXuIhQ;Q}ngW(;5-=HoEt
z;Mb^tKVcGH#YgbEZTs1chxld*7jtkWYGMP{;969sJ5Y&zidtwKweU%7#0!{+#cZEq
z7(XhJT3m`xqmJe+<YW5z()^FnF)m~FbD>gx&H=HO8Any*EXLtg+m50hkK3pP?x7Y=
zB1<KnZe56)UxyE27#V7Mk<FXeZTp=};;Um19m;$Jb!HLU{st9r5|!AGs0u_;0dJt@
zxtXMgHv?6va(oQyQ9FJc6=xT!Qp2c<AIzfu9IJ`gj^lQ~Nz_w2fw~_>Ep!uAT9X|+
zngUcp71j`H{G-TF^CYTLZK%K<7>_-ujcs(eP$rwP6xF_;q3u723J^ghbPVU?1=PYf
zQGxED0(+>tjwBDY<3dzr%25FuQ1im5^_*5N^t5-|8{1F;-$Rvrm-RE$!Vy%$M^L{5
zCv5*URN^z%KdpbG#=D571d>sSr6c1Vlh1_$7NJU9X4`eh@tRe(zX?_P^{9u*K`q#i
z3cLgLdJfrk1XYovs2zWc+R!9w-W8m5asE**w39D+1+>GTQSE6|Vs39t59)p{vME!5
zdTRox!1btyavd(h&8S58q5_YiHt-c{{zdfa{r{Z{onZp!pb1`Fh>Nfi*Ps@D1y!K|
z^x-GSRC63P{~~Iq*O5J$zpxBb$WG%zsP)3=$5+wO#Qj|GF^BmI;`bQBMBb%BT#f;3
zL+#*QEWr`f5lx`ZbQ-(x1{Py0gEf8&Up${?C#wGdK91+|Ie#rMmq%13D?yd~Db!9{
zuoquI1vrmNXbSay-@|TP$t$7zqo@iUMa@5r%i@gr0h?)O_+mdu?WhgD>7)Ldc#ICl
znA50Ce?$GS+(jieho7;fScSFNfvUhBd;(9PN}9}rqe|9T!>IK;Q5)?;&D)0B$QKS5
zI;%6bV;U9MMV)l!X{dyXunKFj0^3oQ8AM_mHxG;gm!j5NfePG=I)WEb>%4|qe*mk|
z*=;+{p%%JiZ`?&KSVg*eC>yNLVL9zCRG<%W0UkiThNn;g&ZCa<7vz*o6xU!}X>430
zQW3|raG`-6sHe3T8*w-4EN4(ha|gBaJkCP_>QOs<1{Gi}x^WBY?B75>W;<V6cMO&A
zWz@R2&_jF^|8VU6%tGBLM3t-(SKw+)!0niX1DJ>(p%U0<J%lRp5mdrwZT}4F>~Evi
zPgxvGBo7PQ=&0mEH^R6C+fXGRK<#KBD$p?A-w7&#%b1GSQ1fR|N9gj$?ic$94=1-|
zmb~nHX~X)y?)IKd>o#?5=ow2($w<u#1}g%~DyoCNV4yA#DhpH(mgnSq{_P3Y&@<MQ
Yv)tth4Zfe-^}j_1)4jQ49&a@JAIC`m^Z)<=

delta 2575
zcmYM!duWzb9Ki9T=`Jpto9?w-Zm-&$&fa`qotGJ=<O~ecWF-tEL$n%JjLcT~$4lP8
z{A<nf!YV8;D5k{BK%B9X%H^e`lEO+M31=5Da#Cr1zuSSvv*+_X=Q+>${m$>4=iU3z
zmAdQ?#r<9j{B7g^cK(0q=iUE*NAg3sncH^kkDWLYzd(-gNAx=SJa<3{MK}<LU^y0I
zH9Af$4#Wjm5JEOAjvbccEj(C-4)98BZ$)3&hlBAjCh!yv!i(s8S22nG8P)ekBS)CZ
z$wX_>{_}7sF2=#c4^3PQqhTZ7io4KEKkVrc!U?>M`|~&%|H5+2&?$`zuoPEg3BHL2
zJcxOC6z{=L<9!aZaYBWha)}>?bK#2>SdDk1nKq({y^IdjiVnOJ=i>p)!GDp-haAda
zB1Jd_Q|OW`LyoYVlkdOeO`j0fV%AcwV}TeWw4x>6i+%BEyzfA_#n<Qn-=PElgeKk<
zHEZ8b;0UZj9)-Ec<ijKJz9HVfIEeb2`Fa{$vu5=E9W>y6G_f|c0v%|;PPE^7bkkl&
zE0xC}_u?pYl8>W-SE7|#jk&l1S;f#?MEz}eBX-z{?%I8^LkBw0Nwl=*kXYdwnoxdm
zuf^zqrO2aDiB_rx4Ll2P!u!#Q%|qkXWw{v5#Ukv<Fh1CT253eT+J?jN06OqVG|*Wz
z@FjFf{zPZ|H(HrI*291m=zCS@c-81;&(4VtmY@NjLQB3fx&|G%8O?Yz`u)EZ+do1R
z|15es`VHFudo+QIXkuOQc{dU-8*Xr6iE~NI1QKY8%hC2UTKXC2W?F;}xEu}Kh<=_;
z@xB?Y$QE?QJJ1R3N8dYwXW0E6IMVNb6Q6)H`~aO<JDSM(=%x7l3UY*NoD5jVuZWv*
zELP$SG{Gm(fK6!P>ySBy?Z^?{=j76z#6rLSAGx>#f5*FU2n*xDv(O6EV-lZ4x`Ykr
z0Nc?Swjq-V?Klq4p#5&3<0Z(p3TLD5HKG$(%_*DVqLquucnZt0Ki^UsE6^D%#0q>C
zU79WETJFIHJcOe#NoV`la$^65$I$i_Sc{v{_s^jf`?Zw%Tj~<Fsxv9WMjV3%*or2!
z3;nJ?!KX2wPr>I+Xoc3I@3&x0Up{AinESK5><>{Y**n4c=zHstE}<n!{mt|}8vH>y
zhGuper(icu!tsn^1(xA#+=!O+OSF{#L=$Wv1EkTJPDkIHhfd@<bg4GQ`#o7M41642
z^RLi^x^O&R#}uZhqm@~N#0n?Sz`vmb=COecJRGTRs6xlN4;{ZAC*aa}zZo4T`*wVA
z3>~l=-Ni+utt0SG%%FiD#WGxhetxf_0k)z`xdU0H@Gj29PPE_9(Y+NZL;H<KHfuIa
z<zhY!OVPDFh_21Y=*%ym0SZ|cXE+QEP>KDp7G3)}$Pwx|`4y}}6W)!Edj$O~KaYOf
z)6V+;%!MVpiZiizOz-bO9hzx9=HL=EfrjYwXo=UL3BMlO529<|fd)Q<CUODY16N~v
zVr&Q#AE2Rv3rk&(&Zq$m^bGdQ1WjN!7T|t#;KS$|9*@s2k8SD9U)WYXprD{AU6V>@
yQWL6^nW@tz){IN1TOKSa9Z1WBWM<N|OnO{8)AmBi^gewiwH!(`v`rk^UHl&)IrU%w

diff --git a/sphinx/locale/ru/LC_MESSAGES/sphinx.po b/sphinx/locale/ru/LC_MESSAGES/sphinx.po
index 327152d12..b6374d813 100644
--- a/sphinx/locale/ru/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/ru/LC_MESSAGES/sphinx.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 0.6b1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2009-01-24 18:39+0000\n"
-"PO-Revision-Date: 2011-01-22 14:41+0100\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
+"PO-Revision-Date: 2011-09-21 10:14+0200\n"
 "Last-Translator: alexander smishlajev <alex@tycobka.lv>\n"
 "Language-Team: ru <LL@li.org>\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
@@ -15,20 +15,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr ""
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d %B %Y"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr ""
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, python-format
 msgid "see also %s"
 msgstr ""
@@ -67,21 +72,10 @@ msgstr "следующий"
 msgid "previous"
 msgstr "предыдущий"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr " (в "
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "Алфавитный указатель"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Автор секции: "
@@ -146,12 +140,12 @@ msgstr "%s (тип C)"
 msgid "%s (C variable)"
 msgstr "%s (переменная C)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "функция"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "поле"
 
@@ -159,7 +153,7 @@ msgstr "поле"
 msgid "macro"
 msgstr ""
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "тип"
 
@@ -168,28 +162,28 @@ msgstr "тип"
 msgid "variable"
 msgstr "Переменная"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (класс C++)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (тип C++)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (поле C++)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (функция C++)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "класс"
 
@@ -227,11 +221,11 @@ msgstr "Параметры"
 msgid "Throws"
 msgstr ""
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr ""
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "атрибут"
 
@@ -300,45 +294,45 @@ msgstr "%s() (метод %s)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (атрибут %s.%s)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (модуль)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 #, fuzzy
 msgid "Python Module Index"
 msgstr "Состав модуля"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "модули"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Не рекомендуется"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "исключение"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr ""
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr ""
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "статический метод"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "модуль"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 #, fuzzy
 msgid " (deprecated)"
 msgstr " (не рекомендуется)"
@@ -391,6 +385,15 @@ msgstr "переменная окружения"
 msgid "program option"
 msgstr ""
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Алфавитный указатель"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Состав модуля"
@@ -399,12 +402,12 @@ msgstr "Состав модуля"
 msgid "Search Page"
 msgstr "Поиск"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr "   Базовые классы: %s"
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr "псевдоним класса :class:`%s`"
@@ -726,8 +729,8 @@ msgstr "Изменения в C API"
 msgid "Other changes"
 msgstr "Другие изменения"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "Ссылка на этот заголовок"
 
@@ -752,50 +755,25 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "Выпуск"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr ""
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr ""
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 #, fuzzy
 msgid "Continued on next page"
 msgstr "Полный алфавитный указатель на одной странице"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[рисунок]"
 
-#~ msgid "Platforms: "
-#~ msgstr "Платформы: "
-
-#~ msgid "Searching"
-#~ msgstr "Поиск"
-
-#~ msgid "Preparing search..."
-#~ msgstr "Подготовка к поиску..."
-
-#~ msgid ", in "
-#~ msgstr ", в "
-
-#~ 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 ""
-#~ "Нет документов, соответствующих вашему "
-#~ "запросу.  Проверьте, правильно ли выбраны "
-#~ "категории и нет ли опечаток в "
-#~ "запросе."
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr "Поиск окончен, найдено страниц: %s."
-
diff --git a/sphinx/locale/sl/LC_MESSAGES/sphinx.mo b/sphinx/locale/sl/LC_MESSAGES/sphinx.mo
index 0535cf6e2d233314f247e76ab6e390459e81c951..79f7f4eb39dff44c5b9cc521109723b9c378ac7c 100644
GIT binary patch
delta 2669
zcmZYAeQ1?c9KiA8TYGbBFKsSe+g;66Qg`RerV9hzG<>Oq3@tTRIy2l{(TuF%ItrBq
zDO|NTwLi)g5hX35{!kb(uq2^@gn>$Cl(3W(0-Mgh-|a+yG_Ln^&Uv2a{C?+m&T}1T
z>|U5US2%iK;O`Ls%J?^SjJ^N<Ze%e=_a^3Ic6JEfQi^wDIdUn?k1mbZAHyQXS7QOT
z;T_n4x8r_f-c;zK;l$mTgFW$v?=g@5S#*N_I6jEppU2GxD8mv=Vm>~IKDP=J_ze2|
zF60y5<;#S-FrWD02#s+J^q>=-!SVP9mSQGpT7gQwygnW8#06N3Yp?>-n8a?JfETeC
z&DMY=n28B|0H@d|e%M5VPk5fM3{0U9?!;Mm5M5axn%FPsM1$zcGgz(x%JC7LjJM%S
zNU=f+O{f#=unXP7bLh2jkuN8>W@iL@jZQqsMiC<v6Wx{HgCnsn_Umyp{fE)#A4Ml#
zi!NY&bQ}8oZmh%)&@<3${i#wo9S1I;{i|r^x6r-I=F5H=8gLSt*i^I<^=QBb^uEW@
z!@L2lSO+e^1LzvhV-;R5p#BCdDjY6Z0^Nd1$o7Zo*uOtsZ$MA+l6ZX`I^kxt#4jT`
zhy7?`A4QL#^L>rP4!vl_eoWDDuYSf+_&d77el(Fk@m{=+-j|?`LkXe*s?mhz;9d9-
zI`L*S&{j0?PIPP1=z`xtE0pS@VZd+D2T!0A_MxZ$w>a*g0khH47ey=4iL24XW~09g
z^Wu0Dn)t?OYqTA?KNVh~VFItAneB=<>_Y<{Kudf$_P<0+d@PQiLQ8)ZJyh4x`LZ|=
z2F^oY*W%c(Mk`W_S-$@ZXt<(f=z~w-o4f_<&>JuFDwx>c==BVKEL`DOv|`oKxo9OC
zkfMdfXhLg|-3zU;za5=#kNW-}q~WRk1W7&|MIZbQ-NT>I3iP874xj-t*&kP4hE`+_
zdf#G9;Ho&j4V}LeO?Y1%e;-r69!F?6;Ysumoku?5CSO*jg!;LHD)i9QVFRwfsrWV~
zu@_C~FEr6YCbuFL=-HTv^*9Zkchh+4?@C`}z`fpq2HuUc@ndvl=aAh9SJ3;$5G8?m
z=nqvjF2hA=pftMD_mE<R!#D|#p=aV(9IEI9>hHh+16Ob)%Om-46-{I;<#2+D=za5I
zzcKdLpb4!<7t(?z^eU2TNTZee3{9X1-Qr7V0)wg8$Sof}Y-Q+PO-A>ACVJySG=UXp
zMOLFLZ9yy3j;^>9UBF%(3XJpU_n`CK!Ya(G7~X=^Od4L8j|Nzdu4pBC+MD8dGn#oz
zyxxH(*oju^09t{g=v&hp{Q*tzEE?xpbYx;EUMds}H$o{IumW946;8(KXkshT6+ek4
zxDhRN8&bru1HJwsn%JjkLdVhPPoanMH1Y`-_!{l|KdN##U?w_YA-Z={&<7jQfJ@O+
zyCV8D8sNF;cH|TG@a3uhBKj3N&+*vrjs25K{Ln|ky*d*w^rHc<p(VS4PME{5j`tOy
z<5lSEI1^1|ISy?Z8n78Xye+Z+I=VG)#Qs~D>tQ-X!~c9fPhZMv&Y$=~Vnf^dt*y;l
z+MjBFwrxxIlI%q}c{MfDl5?lcs7cf$>yx$VL&fE}|8{F;-Itt^{<e5<L~Z&+Nz?x)
Js2aC2=O1Hx^F#mu

delta 2646
zcmYM#4QQ2B7{Kvko8@*lb5l1z*6uaUOuKdO+H_8{(uqo@HY<fCT7HD|VJ$NY<kliV
z(2RzG!3d)d5)x!a=*R@EY+(tduq6^`8nR&ql{n4*|Ls8I?*86$-uIm6InO!o);7Dh
zK6kn_e@Eb_mEQ_}^9S1c|EIekgd&<fSd3TDM+Oy!a4QZ*x<WQO4ZS}bOYlJ)hRg6~
zY(nR2M&`?f?OY`2XpIkiii2tIM<+NM`@7HtF5pnSjAdBF;2}5`9aoJhoP~~Gg?z#W
zzD%?keSRyJ6F;<a;e?;#DEtmb;8`@&Yw>;|jghn~aWd9o64zk{x8rC$gv0R^8t_jX
zgjaC}4rCR!>#>;l;UO+=!bWu9O033L&`kHBiG76*>_S(51`Tip7h*okzY!lniW3^q
zgx25`Y(}@{0P+ck_{urKkG2Mc(1}jm#YQn_xP(^bI^KXo$;NgW=Ho<k{N3opQ_%(7
z7kw0c{%IV8Ib^D^3n@m}JB0e%aWHoLfM)&+x_9Sd`!X6Zk4_UCgjS*q4VXm7)u4y?
zezaoCa3*d<*VvBZumertVhQ!PWLN2M3-U_)4@&}Vm!tQS=qVl_?@vP~oP(D5F(k*(
zgeLYzbSrXv!VV-v*o9WC4W0MP92a?996?uj6b*a~$Kwg?OEC85QBMOT(1eEJEqDhy
z@f<YJ!)V}@=+>-5SNsxMp=LB*?tLyC_#rys9`y7dj{T?5falQCUyNQuCr&WPgiFxB
z2P4t`>1g6Jqw}JR(C3#R3FN|ZF3fCIeBcE%;6}8>ugCV=Xo+{m{@rNl_oHX%1iGT%
z(7+ea*Y#3tCpaipq!e9nB^LYsPvF9VlkqLyf@$c39lQ!Ab`rgR23_Ir=md%Keutwg
zPNIq2hU`|TiS4=QJWHdi(Zkw=!+ifYapAys(7pQrUHLwA;9;cN;W)bDvuGvUC!Z_9
z6sFMr2hacwXrjwv|5NB&u@RlG1#=#rPq^R{zUIq4K8>!R8$B%7aTZok&pUAiW^fyt
z&_OiOF0>No(LL_LI{XWrH$!w6Is@I}1*51xbB85#)Zp{z3O+`5A$$=ZJccRSCz0xh
ze{enyCc1$d(Uq=5iW8p2+wo2GEPRH26^-q~c#-~&(bS*h!U2|PB0r-O^q>O=QXbny
zXnP!*`6P5D)o4QXNKT;<t=tAQfi1}S3wzN7zKNbd&)8Y(?_T|Z?tO23pt!O>U<F!{
zvFJ*x(aKCmSKNRu;Bo8=jQ7&sf(HB+$KgqI3wmRJL9&1T+z2jQQ4&4n6XK0Dnt64+
zKMzf?0j<<3v;v#Zm28XdL=*f7O`tv6fmX0H`YRGI7tV9xO1g0Z{v97krutVr9!>Br
zwA53OB83HLMV>(uTaPBR84dI<dMI0wPuR_u3;Z69cO1)n|GT(w?=GPOi^lW^9Ez5#
zB03QbP#c|#e8N(`JoT?eUqk2F9NXJsyCwP_x>dVu6F=<Z!WFioB|Cyn_!IhIXYB7r
z&SmID6B)r@qrNRe1E$f#S{>W-(XCk=+so0jv<Cg3^D?$vEqJo6sc>duYNj@wnVQaK
zQ&soW)znVPRAn-Six#FER&QAQ;@Wl3rR$$qzq&3}mC0t)nQXeMDwVCN%Vs8JvMoKs
R{~b`%(p|QqZAJOw#D4^-^CkcQ

diff --git a/sphinx/locale/sl/LC_MESSAGES/sphinx.po b/sphinx/locale/sl/LC_MESSAGES/sphinx.po
index ad0ef4323..6f6e49aca 100644
--- a/sphinx/locale/sl/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/sl/LC_MESSAGES/sphinx.po
@@ -1,29 +1,35 @@
+
 msgid ""
 msgstr ""
 "Project-Id-Version:  Sphinx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2008-09-11 23:58+0200\n"
-"PO-Revision-Date: 2011-01-22 14:41+0100\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
+"PO-Revision-Date: 2011-09-21 10:14+0200\n"
 "Last-Translator: Luka Marinko <luka.marinko@simt.si>\n"
 "Language-Team: Rok Garbas <rok.garbas@gmail.com>\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr ""
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d %B, %Y"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr ""
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, python-format
 msgid "see also %s"
 msgstr ""
@@ -62,21 +68,10 @@ msgstr "naprej"
 msgid "previous"
 msgstr "nazaj"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr " (v "
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "Abecedni seznam"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Avtor sekcije: "
@@ -141,12 +136,12 @@ msgstr "%s (C tip)"
 msgid "%s (C variable)"
 msgstr "%s (C spremenljivka)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "funkcija"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "član"
 
@@ -154,7 +149,7 @@ msgstr "član"
 msgid "macro"
 msgstr ""
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "tip"
 
@@ -163,28 +158,28 @@ msgstr "tip"
 msgid "variable"
 msgstr "Spremenljivka"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (C++ razred)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (C++ tip)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (C++ član)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (C++ funkcija)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "razred"
 
@@ -222,11 +217,11 @@ msgstr "Parametri"
 msgid "Throws"
 msgstr ""
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr ""
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "atribut"
 
@@ -295,45 +290,45 @@ msgstr "%s() (%s metoda)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (%s.%s atribut)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (modul)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 #, fuzzy
 msgid "Python Module Index"
 msgstr "Seznam modulov"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "Moduli"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Zastarelo"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "izjema"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr ""
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr ""
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "statična metoda"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "modul"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 msgid " (deprecated)"
 msgstr " (zastarelo)"
 
@@ -385,6 +380,15 @@ msgstr "okoljska spremenljivka"
 msgid "program option"
 msgstr ""
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Abecedni seznam"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Seznam modulov"
@@ -393,12 +397,12 @@ msgstr "Seznam modulov"
 msgid "Search Page"
 msgstr "Iskalnik"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr "   Baza: %s"
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr "vzdevek za :class:`%s`"
@@ -721,8 +725,8 @@ msgstr "C API spremembe"
 msgid "Other changes"
 msgstr "Ostale spremembe"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "Povezava na naslov"
 
@@ -747,49 +751,24 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "Izdaja"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr "Opombe"
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr "nadaljevanje iz prejšnje strani"
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr "Nadaljevanje na naslednji strani"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[slika]"
 
-#~ msgid "Platforms: "
-#~ msgstr "Platforme:"
-
-#~ msgid "Searching"
-#~ msgstr "Iščem"
-
-#~ msgid "Preparing search..."
-#~ msgstr "Pripravljam iskanje..."
-
-#~ msgid ", in "
-#~ msgstr ", v "
-
-#~ 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 ""
-#~ "Za vaše iskanje ni rezultatov. Prosimo"
-#~ " preglejte ali so vse besede pravilno"
-#~ " črkovane in ali ste izbrali dovolj"
-#~ " kategorij."
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr "Iskanje končano, najdeno %s strani, ki ustrezajo iskalnemu nizu."
-
diff --git a/sphinx/locale/sphinx.pot b/sphinx/locale/sphinx.pot
index 1b9ea2f37..9ddde4c26 100644
--- a/sphinx/locale/sphinx.pot
+++ b/sphinx/locale/sphinx.pot
@@ -6,29 +6,34 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Sphinx 1.1pre/339c7a794c1a\n"
+"Project-Id-Version: Sphinx 1.1pre/9523af9ba9aa+\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-01-22 14:40+0100\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr ""
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr ""
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr ""
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, python-format
 msgid "see also %s"
 msgstr ""
@@ -67,21 +72,10 @@ msgstr ""
 msgid "previous"
 msgstr ""
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr ""
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr ""
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr ""
@@ -145,12 +139,12 @@ msgstr ""
 msgid "%s (C variable)"
 msgstr ""
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr ""
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr ""
 
@@ -158,7 +152,7 @@ msgstr ""
 msgid "macro"
 msgstr ""
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr ""
 
@@ -166,28 +160,28 @@ msgstr ""
 msgid "variable"
 msgstr ""
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr ""
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr ""
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr ""
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr ""
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr ""
 
@@ -224,11 +218,11 @@ msgstr ""
 msgid "Throws"
 msgstr ""
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr ""
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr ""
 
@@ -296,44 +290,44 @@ msgstr ""
 msgid "%s (%s.%s attribute)"
 msgstr ""
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr ""
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 msgid "Python Module Index"
 msgstr ""
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr ""
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr ""
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr ""
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr ""
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr ""
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr ""
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr ""
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 msgid " (deprecated)"
 msgstr ""
 
@@ -385,6 +379,15 @@ msgstr ""
 msgid "program option"
 msgstr ""
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr ""
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr ""
@@ -393,12 +396,12 @@ msgstr ""
 msgid "Search Page"
 msgstr ""
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr ""
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr ""
@@ -712,8 +715,8 @@ msgstr ""
 msgid "Other changes"
 msgstr ""
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr ""
 
@@ -738,23 +741,24 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr ""
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr ""
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr ""
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr ""
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr ""
 
diff --git a/sphinx/locale/sv/LC_MESSAGES/sphinx.mo b/sphinx/locale/sv/LC_MESSAGES/sphinx.mo
index aed6bf5c7bd22511d8526be9568dee9d94f06292..11b18023b925715f88923b3e41e93d6463617884 100644
GIT binary patch
delta 2797
zcmZYBduWzb9Ki82Z|UZAZl-Hqww$h+4d0o)=1RBhGPaaO)2tBD%F8OZBDFN-5hFz_
zlZNX8MXeAd!btN%M%sl^(C8u-q39&j$Yp6LmDu;Yo#>C`@%=pKocEmb`~A-Iyt<}(
zPjzx6x7&umpN;$-%-_k~ZT<IWS!M{mX)Z^H*5WW+kG*h9^usv*Ip)#7AN%1k?2l)$
zFZRspTrVH9LrB61Zn(m=eE5Y*?1Oda0yAU(BgllX0^ML84!~B-!JX*5eOQFwqx1hn
zuF#t-3^*U1Hw<&wKaA&QARV=M1>T2lunY@uJ?7)v$Q3^2!||`s@BfHtyo80ACd#pR
z7pCwT9E7{@a{LYrq+QuRT;QfBb|L(Un1!}$k)cqJm*H%5fd+JgB#v)IEATNI@HgoE
zb~MxT=!ShLZyn}i51fw)#}b;jF~X%d4qMQ(K7h;(-=Yf~$B+@iX>{Rsb~V86)Y*#U
zVHdnAwy(x+v?rqTZ${Uhf+kYmkNS6HM28C`cqKNYd%cfTHGCG^U!!N)7W>=L1pY#<
z&?C3AosVu@j0RYWRwRw?SBcJ>mP`G8>Sxhm>6YUpd<o6`2ON$+qXG8i!+?s>5~k3j
z8HWZ|8QZtV@p|;>zc-FIq3b@0R(x&3jc2zJjc|K(H@e_nG_!+f34cO2{tdh01vJyY
z<9G(U8Bi9MU>^GYir9Y>x=#&qh2%~?hj23w-Qa0-!{^Ze-ayan9W?VTXvKD;8y`mJ
zwINsdg%97B4C-uu0lMLE^eD=rHz4aKp@thHu0wxVrgsj6rD)_UqN}6p(C=?R19%k;
ztTm2rMmOAsminXEK7dyGQ0za6gM9zbbK}F7$0O~6#puSR==(i7wrkLe+<|5`1I=hI
zI&UGm@e*9XTe1=j;0!-59@Ql@!LF3Y`6cT6pW?<6S0Kk2s?bQM#`YXEz$Iv=YtW5b
z(5LvVIKCM>GDeT^K<qz?&O3uV$KfK9bI2jP#Dz<^altee<1J|ad~|~+(1@Qx&-l4G
z-irQmz8BqxZqSClO@GAx92y2tiUxKa5<{pip#EuYX3<fIFJdWf$B}pxStDfft~hZx
zTH-Vsa3y*qQ}8ytCyu|4R6lG&pOxL{hF@R>9zzouJec}hvT`121E@kXorQcSJQ&-n
za5C-n*zwe(&qy0ufm3KA8N5oK_4Q~aZbSpF!!>v}nphiJ+1|;}&ddg)6Gx&G%g~Lg
z&<t+Hj-O8S?CS9vY(T%?f*#!_q-bG3y1_~GSvreWtQ%R{pBqhvaAPS-(KDKWR-hIw
z;ndiE2rc0vbb)oq6<+4UO6|n4cn}RJv#9fza|n8LlhAdiq6y9HGzoLLu|$pN!jGew
zuS6GGjgG&92KXi#$h+v<vKJjc96f<%`YW2iMReW%{KMjr6{72xU@zbQQ5`otm1ty@
zND`qMoiH!<H=-LYMi)+yE40M^9cVy%&;SmiM|K<y;1rI)b7%ks{226P|4_({4`C^q
z@i+&tHd-H@fu7|Ybm7HlNtfYhTowDbp@Hv;?N6e6(FDJY<A>1yLxdx-<21VQIrRO%
zh?YE?C(CD~0L^SP`dUsvzc(GtXkPST^dWo{4fI*`HGKgM;5Brejm6~Mm7A?}xbcqW
zhRo?XBOWVypy~ca3+6N~oV~E2sd3A$%-^%J%ga*Z%f^%!m8U9F>E;gx49)(xSw41D
YYE1Kq0mn1a&HDyU`~Unw`Hfls03%=mbpQYW

delta 2748
zcmYM#ZD^KN7{KwPZcg{o^095UO*hjmWzM~?8oA1}K@%-#YAFi~ET$GlP+9G<2yFNv
zb(lfg3o)^UrYx~Y4XH&ABTy^JbYzo7#WY$)AKd!?*@4Eh=Xc-d+~=I@y3T#J6HOgW
z$%~1Uoq?Y&ehc|sl<M98KkL&&$mDhd+O-L9!p%4t-;3^#{YP*L?Z@y2{06ge0G($T
zvv6ES2z-(un{OW|!0WIKouDDMFF^;a#;Mqbx!8`^<4$zkUM$AL==krDPxyr|106=k
zjiBRlh$fHqLn#+G($I)5uoCleJx;?d$S1tRm;L+E=TBfgp2s3g5M?b^V<kR@1^5Q$
z;74d6ebKWxiS@%pE*f#r1}r5VE<**T;R1Am#pnX7V*fTYlef@-KSam(p_!gR7yK2M
z;V@3bMU<Oe2+f!@!sT4tf={7)+>JaN4x$r$hGAR?C(()fSk(Z3LMw6w$KwR*?)^ke
z!F+Ul5jyW&G?9wv;wjYM0jp@3iBF<yZAYpa-i`MM(7ik!+xyTAzDGXcQoJ8V7am0e
zOi7GYB!MnmfR3v|U-sJ*)ZfxQNW(&W8qNF&&c-j%0DnUR8bwQ(Nuygc6%DK)-rtP&
zSD<fyee7>W=UstTd@Z_lFDJQh&pM;K(FwcI%nqR?{2ZP5Yn*^*(M-?9{tIY8gIJ1J
z(C2fB!uILtIwfde^ZA;N$-B95fi>uY>(BsRME9%%&HOdAWV_LYKS9SGM?T>zzC0}#
zV*B6dg4W%wm>kVR=Pf}3ONKHo{DV>xJC>u7uZ}(%Z9_BJhz9T+8d!Vm--<4{11<HN
z@xB`^bx&;n0^Nc$nC<z$!i5u#q6??+ihI5@(EAd!BJ<FUZ$&d&h>p7tUAP4|a7tRy
z08ZtNZPj@+!G3i7c*>-inCkh@<-!OHk!=g*=qb1h&G3G7!B+I`T_5|OK^NMBZr$s#
zeIGjRW8{4ey-051T<jl0=NrM~EG{xh*99xl1@1&6Y)1FCCHA)=NrX+&9q0nx=qWlD
z+s~l^Ttx%BhO8B`d8i)eU=co?PyOd`k)&ZR?n9mpr_q7Gqoo}|BTi%E+=?8$2WO)F
zk0VtN8_{><Rdm5^*nsb&i433>`xgyhQX%y>(>c7_w1sN)ekm@&mFOOKq3=RBT7g4o
zCMVJ3=vlH7DQG}>*n!1pV%=zE&!UO-qvQTaa^b+g(1j+=7|S3FJtjHm-WA|HtU{k}
zMYnDvQk<|8UEm=4E`5qt>{M+3A$l3D#8q^QlBv|ej1y=H3*&taTEYeB#LJOSSi_f<
zdI@WB4;s*EoQ;>!4AYCp<}F0Gq%=Aotx!EOZ!+A$g_+-rPP7bt;1M*!b!Z^ZqNig!
z+TRsDfM$9GO`sPI_(ych2GRM4&_w@?Uc)rce;WUJ2s&h=11ivn>(PZ8(TSUoPiT$p
zo6&$e&;a(JTlN7Oz#%Nbqi6t^(D??@m+&h3|0j&bjs$-te4rpY8{NxtbmB%dgGE?@
zOJjRG8u%;mert3)n#iu$|2Det-gti)lP-9ai)`#gOa3kTl3YSF`v*Oisl0JMSA=F%
z5v@gE!rRb5A3%@kLudeN(RrT03HSoK?&evc^ZE3ao`LkCjI7G?%DVFE+T!Y(hPs;0
l{@fW^Rpr&y#Z`3;Rh4CxRh{X1KaZ>H9Lj6ySuw3G<3ELG^Z)<=

diff --git a/sphinx/locale/sv/LC_MESSAGES/sphinx.po b/sphinx/locale/sv/LC_MESSAGES/sphinx.po
index 42aaa5fe6..9967bdd74 100644
--- a/sphinx/locale/sv/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/sv/LC_MESSAGES/sphinx.po
@@ -1,29 +1,35 @@
+
 msgid ""
 msgstr ""
 "Project-Id-Version:  \n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2010-05-24 23:53+0200\n"
-"PO-Revision-Date: 2011-01-22 14:41+0100\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
+"PO-Revision-Date: 2011-09-21 10:14+0200\n"
 "Last-Translator: Henrik Holmboe <henrik@holmboe.se>\n"
 "Language-Team: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr ""
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%B %d, %Y"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr "se %s"
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, python-format
 msgid "see also %s"
 msgstr "se även %s"
@@ -62,21 +68,10 @@ msgstr "nästa"
 msgid "previous"
 msgstr "föregående"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr "(i "
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "Index"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Sektionsförfattare"
@@ -140,12 +135,12 @@ msgstr "%s (C-typ)"
 msgid "%s (C variable)"
 msgstr "%s (C-variabel)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "funktion"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "medlem"
 
@@ -153,7 +148,7 @@ msgstr "medlem"
 msgid "macro"
 msgstr "makro"
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "typ"
 
@@ -161,28 +156,28 @@ msgstr "typ"
 msgid "variable"
 msgstr "variabel"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (C++-klass)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (C++-typ)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (C++-medlem)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (C++-funktion)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "klass"
 
@@ -219,11 +214,11 @@ msgstr "Argument"
 msgid "Throws"
 msgstr "Kastar"
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr "data"
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "attribut"
 
@@ -291,44 +286,44 @@ msgstr "%s() (%s klassmetod)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (%s.%s attribut)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (modul)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 msgid "Python Module Index"
 msgstr "Python Modulindex"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "moduler"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Ersatt"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "undantag"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr "metod"
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr "klassmetod"
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "statisk metod"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "modul"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 #, fuzzy
 msgid " (deprecated)"
 msgstr " (ersatt)"
@@ -381,6 +376,15 @@ msgstr "miljövariabel"
 msgid "program option"
 msgstr "programväxel"
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Index"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Modulindex"
@@ -389,12 +393,12 @@ msgstr "Modulindex"
 msgid "Search Page"
 msgstr "Söksida"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr "   Baserad: %s"
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr "alias för :class:`%s`"
@@ -713,8 +717,8 @@ msgstr "Förändringar i C-API"
 msgid "Other changes"
 msgstr "Övriga förändringar"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "Permalink till denna rubrik"
 
@@ -739,48 +743,24 @@ msgstr "Dölj sidolist"
 msgid "Contents"
 msgstr "Innehåll"
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "Utgåva"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr "Fotnoter"
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr "fortsättning från föregående sida"
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr "Fortsätter på nästa sida"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[image]"
 
-#~ msgid "Platforms: "
-#~ msgstr "Plattformar:"
-
-#~ msgid "Searching"
-#~ msgstr "Söker"
-
-#~ msgid "Preparing search..."
-#~ msgstr "Förbereder sökning..."
-
-#~ msgid ", in "
-#~ msgstr ", i "
-
-#~ 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 ""
-#~ "Din sökning gav inga resultat. Kolla "
-#~ "stavning och att du valt tillräckligt"
-#~ " med kategorier."
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr "Sökning färdig, hittade %s träffar."
-
diff --git a/sphinx/locale/tr/LC_MESSAGES/sphinx.mo b/sphinx/locale/tr/LC_MESSAGES/sphinx.mo
index cbe9b2528259613d5cc3207e661ce32879268930..812b7cd941ba4757526fc09fe6aa702c50ad5942 100644
GIT binary patch
delta 2827
zcmZYAeQ1?c9Ki9jbn4cfy4j{qZA&+4+U(vT*HZ93(N=0<trtb5rcT?`HYG#46{bNh
zqBP%9BMB8$iuFoZD~im>vJ}B^NFmx1vQ|nM+4t*C^he|Fe$I2A^PJ!B{LXo{534U$
zXW9z7ZVdeF=64{!v$DPV?`M5(2njBmF%P$*L-yccJb*cPH2QtKe+K)||1;*}6}%4f
zuMMFW4n^k8gftB&o`ihDU3@uU4)(-)bb{5f|9N!$4m7|%EW%dojVI9O&S5EDLZ9zP
zG@4-;ns6G6h#$t&@WC4Fi;J*7K8Xg{ip6*U`{5VJC;Y&d_kTghcOk1Z4#E<gg(I;E
zleiZL;7KgRi<m?FkRV+%D#9LEies@NUN1t%hUM5DGw1~C&;Z-x{cq8QoJJG=6`e0Z
zIjvA38s{dQfoaTiqp_9-+Y_463^(H_d<)&{^T=G`H*|t5qhwJ|bm9c{HNhchMN)VT
z-WIQ?VppzbqtDMr=UtLd{awj&I<Bq=onSlOfNvr(!*^)Oe~i}`(7g-=o&5=P0sWC%
zp)6jf(ZCbX1gD@CnT5uiQ$YQFu#pZ={}X8Gw&6s42VMD}ScW~w&IBv@GNB1*1*fB1
za}S!>oOoRq?=MGB|6}ofGdk~<3=K=Z2d(O-Xokn5ZRmt&(Uo<eCCp|v1NXu%ScI;$
z7`<PDCRBk#F@=u5FZRzx<75`n;1ibdH3*+UC)kAs+>a*k5xQqzqANd&R;&#Td>MVt
zy3!1}=-X0)_TPdAoQQ5kb*GtdKMf~dh-O@m{$W`W`!}PR?})x0-G`2EK@<1@O{_KE
z{|XIw3@!DkczqtN^dDFI+5c`FVYi?VJ!~m-!U<^LDd_usXS`mBR-^%4+2iPn)}YV5
zhz8z-&AcVAqKS>59L_%m*~L(egMI(!((r+&qtBrg*?<n*if+XLw6v}9`Z&6>v(bxa
zV%cQNc@6o|GIX9%=*p|nglA)h<icVae8N+FS&41vfOpZ?@H1rYa25^VD`LV4w7(FY
zcm(<vbR0TQ4H~!+`Gj@R*U<3?i+TUOafGiD{0Y;T!_!`m$1yk$hv6&e+4vmUzR-?W
z6XGPgRSEP=^ud`p04@C^=;2<4j@yK+CF~eT{U_0QFAn?*%{YhA1{#D`Vm!LC>FAy>
zz#3eJ20VlY`UZXO6i&l%edn3D9j){XG~oq!86VBiFp~zB>y2m8J>G!6*L%?l?ME{|
zga-T?JtHU3N}NJ+4;|?9y-Pb2DM$OKq6?`-OW%mb%dDZ{A$kFwcqcmHZgfQl(L@fT
zD>#BqbOueV10C0sgE9mM;7}Zgci;l_ehXG$E1F<CGEXL4p<x1f)XfA2q5;a#Q(uK9
zFd047Q_=Ac#`}xW3a*aVFQWnXMBk46pP&mnh92H_%=7<$2MtS^MfwKr9xX&mJ_K*Z
zVd(#g2hc=o(TVDjT?{MHL%I<?BdzFJI*bNxi~YZ&3-}w0h#&IGIs=uV0fwV1O`|2B
z7W?N#m!N-0R-)t9q6^r9?(I%A;WyAkPe;$83%Y<NehD*X8p=Bd=Asi9pc4*`{WqeO
zNyh83=(s6p0{0?C40UJ%>oFU*V;9_oZsl$?q4&|}KQ5<m*))#QVSp3Z70;ljv;C!2
zxwXB^8%rNv`p}B{+J>h2O?68fT2AKnOjO-kS(PeHB}XUI!;@9XWbVuvm3P;!tZQUI
i<>dKIwWCX`lBrZ>^51c(kuAl2=VtwXwiW%R<^2PGyavz!

delta 2755
zcmYM#eQ1?c9KiA8%XCg>^J>nwxjE-+%<ksZ)X|`(#B$~WDJj#;Y-o^1YH7-okT3;N
zl+?(wf3*6;)D5DXOd_d;S!k{|T~S(%R7fkSjO_c}J<zz`&pGFLp7Z;i-#O3q`s~)(
z$+xMVF9rS%@NWeF>T>M;|F=Fbgno24U_Nd^Z`p&T_!{=X_oFA{^>!S<_&FSeSMV0>
z-Zwj63Yjkn#WeVYa=yG_I`+p}bb|SDd^wuHIvj|NI2iY00XC!0oxl?O9DV+G<P&<a
z3KLDC&yBzW;)lsJ3K^J*LvaBbU=0q#EjR@CBcIU9m)B3C_kV{|@h>dKG+Ab_9@Dr9
zhvPeVE1p3U=~Uu}Ycz84AFRe4mSKM;G8E=uZ+sY?U<n#vZM^<AT7hF|!l%&ZJJFS1
zMFZwi-np2<UicU$Y)e>1!wgs99k?Cc<2K~k@F_Y$2ZnAT{ESZANmLWOiB=?^dUwZB
zXuk}5;xzR6JJEUXK^HP-0QK)$5d%K37DwS$G}a-cs^NI-e}eAi`8eK*F5nO3!_u<-
z6dJe)O|TTLNE(ed9er+Yiu!x%A7a4LJ&Ska4s_-1ScVtT1pDx1LPcl^C!$+ZfhIOR
z_GiWGbI{X2FJ51U&bu0|_=^b*_wIEx!z0n7=!74jEBg#B;rD3ZOV|Uip)0)}uirou
z$|34l%t!CfpyO3&oEqd4k~+SNXe>qpBxu0RXacXGd-evp@`Gr_j-r9TM4vm4e8NwB
z`L^7M<AbQT0Y{=+F)lg<nKubFG|a3P{Xw}udm*esGhY|o7;QxF--afz8%=C)y#5v%
z@Gx5H_hP>dt@P<Q{sRv8{l7}X!<NsHcETbwa4GtJPl){*v?BMSD}Df7(WB^dPoaUI
z!L7U{>(RvWD2MYGBD)jDp$o0TT;KnNHn0IL^-6RL)}SSAjQv;96&;GUq6wWs&S&^K
zdKnFL6J7B@R$-!LNKT;=U05w&iKlQ04R1)W>-9sP4TsPGZD@jL<9G);@pbf<vp27f
z^Aw|jtI)S;Zge?%|EAdAg~jxb45R*2X`GG&xy({Ue>_ga$I()4Lv|@NVOK)v7M(@U
z!a1zR3uwtRoKO$-UFdy_kX*wPSc5O1_njC){mu9^0|xpLtwb(QyRyOPUQfaYaT*$M
zJ37H0^tt_5i*4vxNR7;vx)4ox65hZWXd+WtzT@=?4fl8f`aVC66eFxgGvAH|+>M@%
zeP|{2Be{ka^!cyQM6Sf~f|Be)%F)tSp#kgAGc+HaH)){Zge%Y$Z9)^-fgYA!Xhja9
ziM62jeSxF#0*=Mr9Gp6wgkFChCtxF*U=upeM`!}=NCHW?7%yB#PyOF$0{vKyr@8=r
zU^IHY5-s7(*k6bSTp8UE$G4yh+lwCFCNzN-w2~ip^%H(t<An~i<d^VvyoUZKQOYtc
zRXIA*6l5DiHF`)NLC;7ddX{#efe*y-W9R}tL@U~k#<`4n#1FsGaHapo8wQkR1CNhR
zMt?x6(fjU0SFjk}+Xgh@=g>soj2=b<y^AJ(98I(>UO$706MsX)34e(fenm_5XYBVH
zlTDyMn!re;IH3YfU>@e+QtW|GqFc2BO=u$;XEWyD%jo?3#!#4^G!8Q0>1^7$Id5rm
w_r7`k@+-<KD@!UeGcxJh(iJ<077owLl&3Q#>GX_DWpj1mqHfJchRn+U4~}X0OaK4?

diff --git a/sphinx/locale/tr/LC_MESSAGES/sphinx.po b/sphinx/locale/tr/LC_MESSAGES/sphinx.po
index 2fe3043a9..bf5fd568c 100644
--- a/sphinx/locale/tr/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/tr/LC_MESSAGES/sphinx.po
@@ -1,4 +1,4 @@
-# Translations template for Sphinx.
+# Turkish translations for Sphinx.
 # Copyright (C) 2011 ORGANIZATION
 # This file is distributed under the same license as the Sphinx project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
@@ -7,28 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 1.1pre/339c7a794c1a\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-01-22 14:40+0100\n"
-"PO-Revision-Date: 2011-04-04 00:42+0200\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
+"PO-Revision-Date: 2011-09-21 10:14+0200\n"
 "Last-Translator: Firat Ozgul <ozgulfirat@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: tr <LL@li.org>\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120
-#: sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr ""
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d %B %Y"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr "bkz. %s"
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, python-format
 msgid "see also %s"
 msgstr "ayrıca bkz. %s"
@@ -51,8 +56,7 @@ msgstr "Modül düzeyi"
 msgid "%b %d, %Y"
 msgstr "%d %b %Y"
 
-#: sphinx/builders/html.py:293
-#: sphinx/themes/basic/defindex.html:30
+#: sphinx/builders/html.py:293 sphinx/themes/basic/defindex.html:30
 msgid "General Index"
 msgstr "Genel Dizin"
 
@@ -68,26 +72,10 @@ msgstr "sonraki"
 msgid "previous"
 msgstr "önceki"
 
-#: sphinx/builders/latex.py:141
-#: sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr " (şunun içinde:  "
 
-#: sphinx/builders/texinfo.py:151
-#: sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153
-#: sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32
-#: sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68
-#: sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "Dizin"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Bölümü yazan: "
@@ -113,19 +101,16 @@ msgstr "Ayrıca bkz."
 msgid "%s %s"
 msgstr "%s %s"
 
-#: sphinx/domains/c.py:51
-#: sphinx/domains/python.py:95
+#: sphinx/domains/c.py:51 sphinx/domains/python.py:95
 msgid "Parameters"
 msgstr "Parametreler"
 
-#: sphinx/domains/c.py:54
-#: sphinx/domains/javascript.py:128
+#: sphinx/domains/c.py:54 sphinx/domains/javascript.py:128
 #: sphinx/domains/python.py:107
 msgid "Returns"
 msgstr "Dönüş değeri:"
 
-#: sphinx/domains/c.py:56
-#: sphinx/domains/python.py:109
+#: sphinx/domains/c.py:56 sphinx/domains/python.py:109
 msgid "Return type"
 msgstr "Dönüş tipi"
 
@@ -154,15 +139,12 @@ msgstr "%s (C tipi)"
 msgid "%s (C variable)"
 msgstr "%s (C değişkeni)"
 
-#: sphinx/domains/c.py:204
-#: sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162
-#: sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "fonksiyonu"
 
-#: sphinx/domains/c.py:205
-#: sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "öğesi"
 
@@ -170,8 +152,7 @@ msgstr "öğesi"
 msgid "macro"
 msgstr "makrosu"
 
-#: sphinx/domains/c.py:207
-#: sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "tipi"
 
@@ -179,40 +160,37 @@ msgstr "tipi"
 msgid "variable"
 msgstr "değişkeni"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (C++ sınıfı)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (C++ tipi)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (C++ öğesi)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (C++ fonksiyonu)"
 
-#: sphinx/domains/cpp.py:1052
-#: sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "sınıfı"
 
-#: sphinx/domains/javascript.py:106
-#: sphinx/domains/python.py:254
+#: sphinx/domains/javascript.py:106 sphinx/domains/python.py:254
 #, python-format
 msgid "%s() (built-in function)"
 msgstr "%s() (gömülü fonksiyon)"
 
-#: sphinx/domains/javascript.py:107
-#: sphinx/domains/python.py:318
+#: sphinx/domains/javascript.py:107 sphinx/domains/python.py:318
 #, python-format
 msgid "%s() (%s method)"
 msgstr "%s() (%s metodu)"
@@ -227,8 +205,7 @@ msgstr "%s() (sınıfı)"
 msgid "%s (global variable or constant)"
 msgstr "%s (global değişken veya sabit)"
 
-#: sphinx/domains/javascript.py:113
-#: sphinx/domains/python.py:356
+#: sphinx/domains/javascript.py:113 sphinx/domains/python.py:356
 #, python-format
 msgid "%s (%s attribute)"
 msgstr "%s (%s niteliği)"
@@ -241,13 +218,11 @@ msgstr "Argümanlar"
 msgid "Throws"
 msgstr "Şunu verir: "
 
-#: sphinx/domains/javascript.py:164
-#: sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr "verisi"
 
-#: sphinx/domains/javascript.py:165
-#: sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "niteliği"
 
@@ -259,10 +234,8 @@ msgstr "Değişkenler"
 msgid "Raises"
 msgstr "Şunu üretir:"
 
-#: sphinx/domains/python.py:255
-#: sphinx/domains/python.py:312
-#: sphinx/domains/python.py:324
-#: sphinx/domains/python.py:337
+#: sphinx/domains/python.py:255 sphinx/domains/python.py:312
+#: sphinx/domains/python.py:324 sphinx/domains/python.py:337
 #, python-format
 msgid "%s() (in module %s)"
 msgstr "%s() (%s modülü içinde)"
@@ -272,8 +245,7 @@ msgstr "%s() (%s modülü içinde)"
 msgid "%s (built-in variable)"
 msgstr "%s (gömülü değişken)"
 
-#: sphinx/domains/python.py:259
-#: sphinx/domains/python.py:350
+#: sphinx/domains/python.py:259 sphinx/domains/python.py:350
 #, python-format
 msgid "%s (in module %s)"
 msgstr "%s (%s modülü içinde)"
@@ -318,46 +290,44 @@ msgstr "%s() (%s sınıf metodu)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (%s.%s niteliği)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (modül)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 msgid "Python Module Index"
 msgstr "Python Modül Dizini"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "modüller"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Önerilmiyor"
 
-#: sphinx/domains/python.py:561
-#: sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "istisnası"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr "metodu"
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr "sınıf metodu"
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "statik metodu"
 
-#: sphinx/domains/python.py:566
-#: sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "modülü"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 msgid " (deprecated)"
 msgstr " (önerilmiyor)"
 
@@ -379,8 +349,7 @@ msgstr "yönergesi"
 msgid "role"
 msgstr "rolü"
 
-#: sphinx/domains/std.py:70
-#: sphinx/domains/std.py:86
+#: sphinx/domains/std.py:70 sphinx/domains/std.py:86
 #, python-format
 msgid "environment variable; %s"
 msgstr "çevre değişkeni; %s"
@@ -410,21 +379,29 @@ msgstr "çevre değişkeni"
 msgid "program option"
 msgstr "program seçeneği"
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Dizin"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Modül Dizini"
 
-#: sphinx/domains/std.py:429
-#: sphinx/themes/basic/defindex.html:25
+#: sphinx/domains/std.py:429 sphinx/themes/basic/defindex.html:25
 msgid "Search Page"
 msgstr "Arama Sayfası"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr "   Taban: %s"
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr "şunun takma adı: :class:`%s`"
@@ -542,31 +519,25 @@ msgstr "deyim"
 msgid "built-in function"
 msgstr "gömülü fonksiyon"
 
-#: sphinx/themes/agogo/layout.html:45
-#: sphinx/themes/basic/globaltoc.html:10
+#: sphinx/themes/agogo/layout.html:45 sphinx/themes/basic/globaltoc.html:10
 #: sphinx/themes/basic/localtoc.html:11
 msgid "Table Of Contents"
 msgstr "İçindekiler Tablosu"
 
-#: sphinx/themes/agogo/layout.html:49
-#: sphinx/themes/basic/layout.html:137
-#: sphinx/themes/basic/search.html:11
-#: sphinx/themes/basic/search.html:20
+#: sphinx/themes/agogo/layout.html:49 sphinx/themes/basic/layout.html:137
+#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:20
 msgid "Search"
 msgstr "Ara"
 
-#: sphinx/themes/agogo/layout.html:52
-#: sphinx/themes/basic/searchbox.html:15
+#: sphinx/themes/agogo/layout.html:52 sphinx/themes/basic/searchbox.html:15
 msgid "Go"
 msgstr "Git"
 
-#: sphinx/themes/agogo/layout.html:57
-#: sphinx/themes/basic/searchbox.html:20
+#: sphinx/themes/agogo/layout.html:57 sphinx/themes/basic/searchbox.html:20
 msgid "Enter search terms or a module, class or function name."
 msgstr "Aranacak terimleri veya modül, sınıf ya da fonksiyon adını yazınız"
 
-#: sphinx/themes/agogo/layout.html:78
-#: sphinx/themes/basic/sourcelink.html:14
+#: sphinx/themes/agogo/layout.html:78 sphinx/themes/basic/sourcelink.html:14
 msgid "Show Source"
 msgstr "Kaynağı Göster"
 
@@ -656,8 +627,12 @@ msgstr "Son güncelleme: %(last_updated)s."
 
 #: sphinx/themes/basic/layout.html:198
 #, python-format
-msgid "Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s."
-msgstr "<a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s ile oluşturulmuştur."
+msgid ""
+"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> "
+"%(sphinx_version)s."
+msgstr ""
+"<a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s ile "
+"oluşturulmuştur."
 
 #: sphinx/themes/basic/opensearch.xml:4
 #, python-format
@@ -748,14 +723,12 @@ msgstr "C API'sindeki değişiklikler"
 msgid "Other changes"
 msgstr "Diğer değişiklikler"
 
-#: sphinx/themes/basic/static/doctools.js:154
-#: sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "Bu başlığın kalıcı bağlantısı"
 
-#: sphinx/themes/basic/static/doctools.js:160
-#: sphinx/writers/html.py:92
+#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:92
 msgid "Permalink to this definition"
 msgstr "Bu tanımın kalıcı bağlantısı"
 
@@ -776,24 +749,24 @@ msgstr "Yan çubuğu daralt"
 msgid "Contents"
 msgstr "İçindekiler"
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "Sürüm"
 
-#: sphinx/writers/latex.py:590
-#: sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr "Dipnotları"
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr "önceki sayfadan devam"
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr "Devamı sonraki sayfada"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[resim]"
 
diff --git a/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.mo b/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.mo
index 92c00ca15b5f74773e5e6dadc26022f575cbd42d..4bc58ee1e050dc210b74c70b83c2f3b56641aaa0 100644
GIT binary patch
delta 2685
zcmZY9eN5F=9LMo<<wjhdynsLf$qy2|qQt!jR|9g1O<CoT+IrYZB)bNi0qtVhgS$Pl
zSj^dO${#tG)zUIsd3&Pg38UOlC$9NNaMvGYiY~EDyKN-BKXO`s#4h*sJLh+P-}61+
zbAETQ<#J0Tp6%Xg_}k5Y5&zR}wf_4X_ZX8-a{@DP60gAomf{uUV@gtIU5vV4i#b@2
zS=fy8unp(p<4D|y>E%L!qnL(!?SO-rN&9P5fKl5YM~(j-HNiCIp_hlfxDfT+a&&MF
z>iKr$W1iwm3HPFx`OOY4^6A)%3OI-bcoeV0GpGu<_|pAMydFz2hz(ebVf14Z3vn28
z@n_V8moWvE{R;443iF#LF0`T+zOKbq)Ps*;4Q@lN><}ukAyl9^D)4XEj2AH(SF(JH
zVwzBi+>Ohy3$-=-kdHaYS4086Qp;t`2&$Cdvq8i%any>>;~Z2LYA2zNNj~cNB2?gV
zRN_mlji~YWVF_+VLYeJIG0Yy-UmXW*$Cs$ge?aZoN!$JvHQ^L0u}i25Br!-6rlX!K
zMIGWwRHbgmMhv0WxE~kbXQ%|mv#7sHc9ss6ehS%cldx@f_U!$1)alJZ-S?pa)}Ttf
z3dzZ|q7v)2K8YItJQC7uM^)?%)V%LSxJcsSBh(5%K_&79mg8Z(nxO5ULQRlBCFG*M
zH((wra1Cmr6{v~Vp|<7$)QTTMRj3O!U!<Q4J@_gr;OnSU|Do+af|~Fos`TU5NmSqj
zD&Z@r--Bd=sDBYE@hWT3dJAg&ZAbzUb0-(dti=vkkD4%qDsiW6Z$p*1*Y*#fO8*Y(
z3>`+TXbd&+Db#Bkx9tRKp);t3csMw2z5n@K9Ov{Gp$^k|UIG0c%;8HbDL}2vK?PW4
zU2E^(i!9zeh<bY-Lrwg$ZNF*n526x1ib`NY{d)h;aiKk%K|Usn`m4PN^*}u;fje*k
zcA_SXqAIix9sCsa{3+D)7f=bi$c9CmG+c-dYFraWD!ACdg%4jrP53eLF~fZMF^>AB
zo69>@jH^-on^0RYfb%hidJV@=TRMRuoWvV(9fP%nJxFfmr9$ejABH`2G~jo3z~870
zGdZd{3+1R&UWMJb7I^{8H>j1Jz~y)vH(@b@RheGvPE;k{#zD6F1FWOnUQGS9qPO_E
z35QUb|AAWZ3@YQGGaGOX>i#{*TxKIK!)H+|{2Z6!IBLthtd6yqrKpNFTRTt-cp+j3
z?6Nlwp(Y$f?ePSvq!&?#a~kzvHqjfg%-W8fv=1OdOaa;GtTdn|ZbQX=8Wpb}l~`oJ
z-iX;7!>GMEj#SB<K?O`En%X{8z}2WN+F;#^)wFk@CKy5`d<^wE{(`F9IaDGEWS)re
zlo5=MQq;f>)DJ{AYVWrq=f^yU0o;w++heH2Ca@f5@akEip^2(cThxGVydQN2)}t2E
zjwQ@*dbwbcW<M(MDC+(E$$AzQ@K4mr-MmA$;(SzpD{A7+n2cL&|1;J;)Ryf+j+1#8
z_0xO=z07ZZ<U$jlMxEwMsFkJqX8V_*PIo=(_3S~d=tWei`>+CELnZL7?H@s{^n~rd
zfW~p0#<p-MT<4U9jpK`sd+zd<g`J1HHg0(|)Y;S4)6vx#t4J+R%L)W4{Wn)u2b_Sv
z&L3Rtua36m7H0h06R4#p)|cDhas{I!c`KuTd20V3D3~8la)qPw3g3_RXXM1j3cKB|
KaIDdJBIO^UdJ-)F

delta 2652
zcmYM!4NR3)9LMo<1&tRaAP@zCEAI(6@4cWP6ooP?Wf8P$v|c7cf$`FUbeZnisAM$D
z(T$?DkcF)*)9O}3YHMbuHCWSd6^ZsT8c~Z)8gtEI-=CZ<cDbK(&U4QB|If>FXRD4@
zIp<?TdklZC@xOxqe?nFJ|8F?ln8j2_a0!m#LY%}j{2Te0n233kP|q_l26HhEZ^CP_
z8Z}=nGM{5wDMZq++ji)}DC)1GCV1Pn51|tH2Cu^(a4G(U(HO!c8W)FdOh=6`M?U5r
zzLaP!s(%wE5Z~;kpb2|05f9=r{1TPvxP3l_%c;-dT3p7%RIEfVwqg?YV?2I_3U~&?
z@En%ngso?=nkB?H9tziB32NX5EWjF6rZ1op+mD)P2sQC>ti%yqgvl(Q%`h3LL{?)V
zZblu+)5ynk@ul&-=optVZ&1)y4sbxsWrk2YatasVIa|Mgx*jvA2`-@~UO<*gJj|Mc
z8ef1b@iwHZ*@i6M?6mdHXyU8k6&jTJ0o0itvGrr9fWxT7PNR0<0xIAnYTO*^@`f{5
zJC%j&u?)51XD|Z;sCa{@9Xk=j{%h-pY2aARD60Om?J$YDz0>x2Xzcui(Wos>MPi#0
zRALp@yHWE!hzvE`P&>8@6?hMZ;PVazt*{#v_+`w(KD?TtZ68Jj7)2#Cj>&itHE}fi
ztw4#Wz<H>nDMGEd6tzQ}QSlm3<D6y+ns5i|*6+0s-b4jFg4+5)>sP3WM^Oonp?(K`
zwe1U;Oo>NYW39_k{oSYpa*)Iv<FOrzQ31<PXST`KYfxKUYunpUTi=1YRDGxk52FGH
zQLpKct&gHs`V(p)6R7?(_^pfczeGWo=@hR(0-i^$a2DNo88tyN4`nv$xes|{3Q+;?
zu=NIHGmL{uFn|g?VB0@H9n}d;(EI<rZJ0(4aB&XW(iqIZ0@Q>xsGVs>H||1)nAcGg
zevC@+B(f%R8nf|tRKF;)T!mSfgH`A#;7$sB%yWEs@c^#HvzUsDd8gE#huZoFFa@7P
zy?(u@OE!RY_&%m%Je_rP>yRAGCe-i2RxH71lQ@5MI7WjqJcGIeQ>fcLgO6bhSC@-!
zI#4U?!6JMIAI9JC>YZVbtU>KW10Ho5^Eeh$&to-O&?9`^fSsw%eCD6fpcNlSCG;<9
zqDc4r^F$;UlZ}PA0ky)XFdz4$j_f;Bzgg6d#<E<Qhg!f!)bkqK{)9t80r#QKxF5Bp
zAE7Sg=cs{aaXn62bBWeMy#;A9<EXoG1r;!Z>@;sFYQ9QT;QMU*cH8cBQqbAFi0qPi
z7d7G6w*Dt-!f<BS5v5y8&`<p?RDeCGgu79%;ajLXaTt}zr>Ho?xDh9ievZk@od03S
zN1c5Ma(_%Y`tTvtQFNmc>&Gno0@eQyRG^E<H858&6j#tmcVH!IVY#UBw<BvZk75+@
z%{~fxKl`kQP!kTJR(=w1!C!298t;?>uf|1KgzA5@wE}fyHOMtGO{kyby{Mh&MJ?zc
z#@$b0kb*KBu@9zEw|frtdKTu)ujp3PR#)IEycd-~hi&gdt@I_^{$b$9@cLkNL|WuJ
zZ;{96_xOw4{`}$sZ?4zp^+w!T>8Y;Y-q_aI+TtnS(q3Qe_IrIkkJsn%``x}Z#Xj{5
zz88O^%e5vjwX`hWoz+~orLCdFotabDy0xvnvAwDO`hYtkCD@)Y780mTIuyK|)DaqV
I+&jYl1HUK<+yDRo

diff --git a/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po b/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po
index 4c4ceae68..32ce1dc4a 100644
--- a/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 0.6\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2008-12-28 23:40+0100\n"
-"PO-Revision-Date: 2011-01-22 14:41+0100\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
+"PO-Revision-Date: 2011-09-21 10:15+0200\n"
 "Last-Translator: Petro Sasnyk <petro@sasnyk.name>\n"
 "Language-Team: uk_UA <LL@li.org>\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
@@ -16,20 +16,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr ""
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr ""
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr ""
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, fuzzy, python-format
 msgid "see also %s"
 msgstr "дивись також %s"
@@ -68,21 +73,10 @@ msgstr "наступний"
 msgid "previous"
 msgstr "попередній"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr " (в "
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "Індекс"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Автор секції: "
@@ -147,12 +141,12 @@ msgstr "%s (C тип)"
 msgid "%s (C variable)"
 msgstr "%s (C змінна)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "функція"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "член"
 
@@ -160,7 +154,7 @@ msgstr "член"
 msgid "macro"
 msgstr "макрос"
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "тип"
 
@@ -169,28 +163,28 @@ msgstr "тип"
 msgid "variable"
 msgstr "Змінна"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, python-format
 msgid "%s (C++ class)"
 msgstr "%s (C++ клас)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (C++ тип)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (C++ член)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (C++ функція)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr "клас"
 
@@ -228,11 +222,11 @@ msgstr "Параметри"
 msgid "Throws"
 msgstr ""
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr ""
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "атрибут"
 
@@ -301,45 +295,45 @@ msgstr "%s() (%s метод)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (%s.%s атрибут)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (модуль)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 #, fuzzy
 msgid "Python Module Index"
 msgstr "Індекс модулів"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "модулі"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "Застарілий"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "виняткова ситуація"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr ""
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr ""
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "статичний метод"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "модуль"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 msgid " (deprecated)"
 msgstr " (застарілий)"
 
@@ -391,6 +385,15 @@ msgstr "змінна оточення"
 msgid "program option"
 msgstr ""
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Індекс"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "Індекс модулів"
@@ -399,12 +402,12 @@ msgstr "Індекс модулів"
 msgid "Search Page"
 msgstr "Сторінка пошуку"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr "   Базовий: %s"
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr "синонім :class:`%s`"
@@ -728,8 +731,8 @@ msgstr "зміни C API"
 msgid "Other changes"
 msgstr "Інші зміни"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "Постійне посилання на цей заголовок"
 
@@ -754,50 +757,25 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "Реліз"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr ""
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr ""
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 #, fuzzy
 msgid "Continued on next page"
 msgstr "Повний індекс на одній сторінці"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr ""
 
-#~ msgid "Platforms: "
-#~ msgstr "Платформи: "
-
-#~ msgid "Searching"
-#~ msgstr "Шукаю"
-
-#~ msgid "Preparing search..."
-#~ msgstr "Підготовка до пошуку..."
-
-#~ msgid ", in "
-#~ msgstr ", в "
-
-#~ 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 ""
-#~ "Ваш пошук не виявив жодного співпадіння."
-#~ " Будь-ласка переконайтеся що всі слова "
-#~ "набрані правильно і ви обрали достатньо"
-#~ " категорій."
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr "Пошук закінчено, знайдено %s сторінок які співпали з пошуковим запитом."
-
diff --git a/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.mo b/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.mo
index efcfb651fb720b651f550c7626e6c37503c820b7..3d9dac2bab802db0929e79338934ae45be79ffe7 100644
GIT binary patch
delta 2659
zcmZYA4NTQl7{~DglE|xo@v7)0ESSZ(_eLm&R)Dh?%C|PbMT6w7kdhi;##R?+j+x9_
zcjeHPrZa8nreU}eY?^CprmeTh&6dvIywO^PZ6&3Bf81xQEq1w||2hA2p7WgNfBq1z
zdZ9Y_bw=Dvj-PG(PUH7doLc|>e3al^GR;$X4StE&;d$iaCL~5pLEX>BDVUGx=)-HV
z8Yg2ND&8ZQ;#|;ma*;&GdK>UOYT|ZlA4CSaW2nF%V-|jcX?Ph^F^M1^%tOt;6&3eh
zzLaP^YWzyf#txjq`mUFYJUVt@4jvi5;oRq#OZy_0V=QUUzzQtGdi3IEoQm&ZCZ0tt
z_$yArF`SQa>_Y8o)P`#Lif4Vdf(uQ22o-oOD%1U_#EzmShEahp;3E79Ct@YrrwFbZ
zmB@WK8&{zo$xh_s_VT6qht-Ioq8L;ukMm%N<-({E|A4VLX6-AeW065t3XqKoT!2cv
z$ef3ozYGiTVPvY?h!nx~S^ITs52R6lW&S=LdS<6l?enMwM^K6Vf~vq3)PnI0*0_As
zp)E#LY5`VZBWjboa3;QmO5hBtV&7ssj-*q69<Lj<j;l5xJ|lW+Q&IN|Q2|R)C7zGu
z;#Qy%Yc)Gi<DW)Cxs9lbZ9^@*8z<mC)CLa(xlkr=;|(~3;~8522x@^*)NAw?=3_c_
zR^U?9LKUcm??FA9<)|GupenQqwO|iwUN0(M@MSJ^>ff{*Cr}HXMwR}I`5h|oC@SGU
zQGW+wh@$?PsKjTPK64Ig{B5WN7NQcXjouHsdM>nJBdWwL)?SM$@jB~&5moxvP={&=
z74Q^l;ZISoYuMVOsES-h?RX*wM;l5*&6|!JVtD?ATqvVAconph0o2Y0k-6@idCBf4
z@YjRQyUD183sH~2k6NGxbvTz=yTNQVpF(Y*N9z6GVjX)>0S}`Bet@dLu=PjKL;DZp
z<8pa!+My4%!+EIj3z1x19V*c_RAts%`xVsugBWD<?n5pr@EmIAxr{EuO7!9rsM7C5
z&YwGqD)}d<g@^HGykPxVyo;)6K8~LWRAN4yjaAm}%H#c4z)f`M47`e(xCigVL#P0M
zqZW!I3yn`jz2^m}`^~7zwW7v#;aPkZwZTSS0rjsz&F@Cd3r(Z`>ey->`^`h<5mYIU
zBgJuH)U*2yi!hdVQGsWn5-&sDzr)%~Pzyb1{Q<Mn`Zol*(8ONr=tE_^!`cJZ9x^{e
z?L2~7=%(q>M^lN4Q-@kGU_NU7?bhx#dr*fvxY-8mG7lhCb3>>@7)C8LVvd<fGolMl
zMJ-rtmZB<BZr*PFcVjXAORU|6Jo2Dh7rk)Lp)v}g64;9hd;+zzlc+?7QLpJm>;D;f
z8g2~rUgvnC3FM>Z6`>Aa87kfavldhI|9{!|g>y}IqYcLo3$j_)jaqO!D!^`YpV@D|
zi<)=LJc%0rg|)vz9n$Zu{kwdCj;mbgMgspcweuX*PRmd`szC+13$>%g)^0!@-ezk*
zY4@K&&D#`uCt-Qo_3fVKww0Za1y*-7b+ojt?oUp<KdHj!EAdv8_<bIqcdobmMz7!N
zO<cUFWNBbcOFM%~YMMF%b3K0Vf5-W5VO*#$GZI^#7#d8N6B^9&|3CbXS&^7fd~#-g
JB<Jx-{{ZD`1%Chl

delta 2607
zcmYM#e@xVM9LMnw3MzMiik`?par6Vwc6JAM;N2LOm`1;#qPaGkD|ZXBVZXGwr0*)x
ze(6$dC6%dLYw1=QG5_#Kwpdu{aIK_tnLpB&S*x*Hvfb$U;@&NG+~fQCe7>Le=lywq
zKVNvI@%#DSslx169X~z%mhyWkTdn_p_UAg6NAm#Y;Fow69z#BE*i56wC;FV5iupJl
z%WyKrP;nMuKHiCb=RCL6Zdi_*_>{Fbpl*B%r{Qj#fuG<MJdOqUGluYQ)chi%@^Q2H
zQi5^R{qwL0TTt=ZFv$9D4Hq-%c+Cbr#A4e0Sc|8y3<IPe!#GCpAuPc+Fo1he3m(Nu
zID`#&+S+C8MjNW)Ya-TSfc0Gi7Yf{p%Jc;cVh<`%A1d%cY{tVl0cWy(Htot#iOj}2
zT!?xUPa_|<mM_ikRwIjwqAIzK=i(8|^>Lw+e1_w2$l51R$KiKWfMHbNG-}7=$yOGl
z=3kHH*ofTXQpo1rN^3uB?aipf-=0GK^~`oz$9~j;1E|D~pek?zwa_`##LK9|n$2WY
zsvPHIJ!+F4UV|G^3G|{Wb_iAa0pzK=!Ku_=9VhLEbEs2$(QX(;1@sqYN*qMicD1O)
z7MU%mfcGL(TnbgOCs7MOgX8ge)CONht-HzNqJoR9IF_Le44@VmL?!ecUV*=%0{f}A
z77Cyiu0%bW8q|&xs0uAaEw~IduMHLNG1Q^=*4w~#)PlQErSCOAMFk#2W&ADb{r|!G
z6-|jxF!RmnsQXJ$30#dztjfmY$a<cu=RzgEDbwLvQ6;|5`a4jkyAyS&wxR;Qhg$f3
z)a%-3?LkyUj-z&b7PX;EsCgsU#al3nd3yi5co($8&8VHdj*Pi|<}n*Tk4p4cROv@h
zf%EvQqC*)(wXZd6%o|aOH=9e%6<DD6-{V37H==gFT?4oWLwE@JxHEidXO~es%i#g)
z{>ex#E`&T4SBI*|t=3MV=C4M*MVl~*@1mz2pXDNkIn0V+5>@i$$a!<?QKjxdExZG3
zaJTjUh<dgctUZiMYy|7j&pWDiBPw1i>a0DezrULJ2pu<LCu*V3Q41YKO&CJG-xqB>
zOm?bJ40T^4p2XWxJDkPQSN}ZJ{3cY~CDvYM?Nz1JUjv=iu@+Uzmyn{kov3HG4=eF2
zRN!G$;%OWA@ouUeM8&H_&6{I3SpOZU`|h#!10EO3xZOJbYp=8ZH&HwP2o>-zWRouE
z%1oeg)Pi%&xb@dtyUA=p9qPq4{;=t-=0XA2p$_3r)IuMd{pL5Q%zr{H_^0^~sv@Ii
zZdqo08dlLCw00xvncrgGjU?o`C0r<hM^S+{pcdMKN@NG>_1t6qdy%TUe$@MX29>}C
z8~+1!*wUzY1)+=q)azMl&K~RcoSVzV*kM67;hInjwxI%am@CaS=5wfdFPdAdf19=6
zK^@W$tbNctZ2ezj$!(4uaG{;1Q9H`#f2bBNL{*~L+7+nN9JcliHogcoueJM&+{L{y
zUyDBxNrWRc;YcDBO(bKr*F~b$5noGl_^#Bd_Q%^-bc7e&|3oSos*XgX;Yc)GT^)+X
llhFwGbsq@)GA{1xK9W1P`}B<J-io60Sy`c8e{t8Oe*t&t@z?+W

diff --git a/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po b/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po
index 6ea02e826..cb7b3e6f2 100644
--- a/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po
@@ -8,28 +8,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 0.6\n"
 "Report-Msgid-Bugs-To: zhutao.iscas@gmail.com\n"
-"POT-Creation-Date: 2009-03-09 19:46+0120\n"
-"PO-Revision-Date: 2011-01-22 14:41+0100\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
+"PO-Revision-Date: 2011-09-21 10:15+0200\n"
 "Last-Translator: Tower Joo<zhutao.iscas@gmail.com>\n"
 "Language-Team: cn <LL@li.org>\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr ""
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%Y 年 %m 月 %d 日"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr ""
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, python-format
 msgid "see also %s"
 msgstr "也可以参考 %s"
@@ -68,21 +73,10 @@ msgstr "下一页"
 msgid "previous"
 msgstr "上一页"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr ""
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "索引"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Section 作者："
@@ -147,12 +141,12 @@ msgstr "%s (C 类型)"
 msgid "%s (C variable)"
 msgstr "%s (C 变量)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "函数"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "成员"
 
@@ -160,7 +154,7 @@ msgstr "成员"
 msgid "macro"
 msgstr ""
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr ""
 
@@ -169,28 +163,28 @@ msgstr ""
 msgid "variable"
 msgstr "变量"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, fuzzy, python-format
 msgid "%s (C++ class)"
 msgstr "%s (C++ 內置类)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (C++ 类型)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (C++ 成员)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (C++ 函数)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr ""
 
@@ -228,11 +222,11 @@ msgstr "参数"
 msgid "Throws"
 msgstr ""
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr ""
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "属性"
 
@@ -301,45 +295,45 @@ msgstr "%s() (%s 方法)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (%s.%s 属性)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (模块)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 #, fuzzy
 msgid "Python Module Index"
 msgstr "模块索引"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "模块"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "已移除"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "例外"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr ""
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "class method"
 msgstr ""
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "静态方法"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "模块"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 #, fuzzy
 msgid " (deprecated)"
 msgstr " (已移除)"
@@ -392,6 +386,15 @@ msgstr "环境变量"
 msgid "program option"
 msgstr ""
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "索引"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "模块索引"
@@ -400,12 +403,12 @@ msgstr "模块索引"
 msgid "Search Page"
 msgstr "搜索页面"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr ""
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr ""
@@ -720,8 +723,8 @@ msgstr "C API 更改"
 msgid "Other changes"
 msgstr "其他更改"
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr "永久链接至标题"
 
@@ -746,46 +749,25 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "发布"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr ""
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr ""
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 #, fuzzy
 msgid "Continued on next page"
 msgstr "一页的全部索引"
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[图片]"
 
-#~ msgid "Platforms: "
-#~ msgstr "平台"
-
-#~ msgid "Searching"
-#~ msgstr "搜索中"
-
-#~ msgid "Preparing search..."
-#~ msgstr "准备搜索..."
-
-#~ msgid ", in "
-#~ msgstr ", 位于"
-
-#~ 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 "你的搜索没有匹配到任何文档。请确认你所搜索的关键字."
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr "搜索完成， 找到了 %s 页匹配所搜索的关键字"
-
diff --git a/sphinx/locale/zh_TW/LC_MESSAGES/sphinx.mo b/sphinx/locale/zh_TW/LC_MESSAGES/sphinx.mo
index 13c61e9a9397811dbf4940a8aa2650175e1bfb38..9dd86da5dda582e33fe90b5d939e4932868d0f7a 100644
GIT binary patch
delta 2555
zcmZY9e`wTo9LMob+fBXOuiLs?`*F>i;FQL$yRkM~l+A(+qgjNS4kT|8h3$}STCn;$
z`*9GN#my4U%q56XITQMETSAO7YAcXdFn|1$k<P+?AarHW^L2Yee>862$LI6;en0Qe
z=kxx4KHpb6zwY$TRr+>2{$Arh!vD8E)&Bc?(eGRd)ty*`dvOuIiTvDzIfc6aJzk4v
zu>ya?5EcfUE5~Y7yro#`oab($P)x%e_COb^<3_7*K^}BNsKC3h3g5yYX0Z&v!YIz5
z`u~lJTgpYx)!=n_11io6tYv(+hC($BTkOUQSVR2{Y{QRmAzsE-ENA+0yc6qi0K@nS
zvRHQ*7vM3x4YO9yp%zlWWj+Qm%=oUFf&#}-GfiSG_M-yrLalfYYJj8Ig&*TQ^s{^x
z>w>5W)uCQRJMwe4a#6o~RJn!)qvEaQeR#xhy%dy^K`g+Rt)4+`hr_4<@1O#IfLigm
zc?#A40yf}P<mc*H4U2X$RQ(pKuR=|DU6B0iT_vqy05#xt)Wn`cWgvqZ@O4zj_febm
z6I7;Va0OmLEpiz_HSk@i3_XBK`3B@Ix}?=p735zJY@<QD^l5t_g9>y2mD2Z+*zQZz
zgif31Q2~EJelEvFnJTWFiyOv5>Jik!qNs^1#zt)RDCB2oH#VRKNTMdR8L!77RNw=s
zfsUXC9z(s7lc<bLp$3{oJ%1S$Cx_bPWxOY~FF}ptB`7G>9p*|@z%{6ucB9UFkF}>!
z6W(bKoBL4DkDw;-HtH1|wfp0!0VhzIot&$C?lc9Z_PpJ=f=aoMX=~F&Q3J+N$Fkk(
z_n|Vd4z;2l%x`AY1O{;%yL|{XksKRH3!BH**Mdqgr1O7czQB1#J@6nh2e%P5(>_$n
zcc2CsHb=}+^MpBxn)r-4YyO3b6W}W(BN){Ak5SM-%Q1@gB0rbnq7|l58Ok6r+#%Ei
z$50vh#_AW5pZkZ4PD_{<-iA%M5I12f?!Y*Hh@Mh?fr2{th^AE6qEgy``hqo~-rZxU
zRQ92s+m4!88Wnht)u&L$@*JvP4mI%t8r8oByRcE;Uj^Dqg9dyG*{Cj!YTt{>%t5<9
ziu!_OQ31!8z51O(W#kO%1NN)c|3Jl=&(V-&W*D{LNQC^W&_aU(ti&bQje3XAqGmj7
z^@CPFh6;GX+CMX=t^G%<|BTAORn#~|oMrW^Lz>(okAfDp9Q6fTj~aMCYT$QK9kS-9
z*8YXnr_D3SMt48h{Xfm3`nl6oiQ05A)P!y~y}K!B!23}HZbA*1GPh#>)mS}kzJ!fD
zx7+IDsK68EBx*v_$XwhkD((VyqQ)slHn-;@6m;yCqEZq=o!?ccfmfqCtVeCOM^J&D
zFg?_<eBK<k_7PP7BdGI!+}gi0&*t^`@L0no^LJFooLLy18?Y4B9zt!(daE~^?bhCj
z>^rv_mD$ax2@fI%!98R3{aCCOAEKbZqo|c;Q5{ZZp7gH`F7Au=q>=-VKiu2@Q2(Q;
z-s6-0i-C$nqB(wZb4wzch<C)>n&K^)&qEEq){fRh=2GaVg0?_r(7!BGQq}VR{vB1_
Gfqwz(1nqDD

delta 2505
zcmYM!4``KD7{~EPUCw)*x$EY2E_2r<D$3~Ib@xXH+l(Ta*;RrZwLyO{m@ZaOxmxwY
zRwG@ObhoL&6w0jV59UHc5oTCnbCtq0BCTv@E{VdqLWKJMt`9Ws-p@JbJ@0wWdERs0
zub1~O56;fW>M{O$`Jco8@hsK;|9dWEmP7S<ya6|3F>XbE*6$uh-Tx9JIE4B5BTmOL
z)HqpTvuPN?sb+x{QBa2^s0XXOz6#Z`5%X{ZMlrx#?8O`L9gN|A)bpp2f$buy-xZvN
zlWEjAbFmOhv4Hrt%5OZ1v$^psmSZ;-;UFgQcZ_3<W!!{oa3(&6EY3P`3U0w_?DhIE
zY9VJa8!w@r8^a{=EzDibv<5Y^)u@3spjP}ODnJ*eum>mOd1P^R2{oa=QLiA6v?w#P
zx#+n?s!U+TsPS$i-E_4&43v_33KOvzRc}FUgAUXHFQW#29X0dq?nkKpM{yp0hy3g+
z7Zzt>R;BtZRDB_8!b#Mts>vn)YFI;q0ydy#_7ExqEvSI4sD7`aHt7yjruO6QcmlP^
zd`4BETTmH_qf%ahygjS&`bxilZ-o47m)`FkT2KSEp;EdT8Qb=tCUn3ZKn-{d`PncR
zW$FSd@LxCy|3NM68fqdFW|%F&5N0MAP{_;>6`%$+p%r*DHlhY@L&mU|P=U9hUddai
zjJ$^m^aZN_AZnapEWlB3pTzr8oN1^`2T?D~M-5ntnouR`oY#8$Bd8fSxsSUWQT<;)
zO`sF?3cCFMc2vM!sLa0W^#e#|0~_!gCr~N>3AJgip#tWx3?0inRJ{b1fh20BwV2t>
zs0q~LMs|B6Y9hmIAT8`1YC*ptw`?j$Az$Y|MnN6QP&2GTrMeC^aD%(vZFM`{Zq$U|
zboaTRp~gAsj-d9^I4VvyU!|DNf0Tm0P!(LXvJ|T014v(MMv`G2s7!40`p3x6KIfuS
zat6!sG8W-tUVIYkFpdE#!+TNvk7J;eo}-{tUPOJlE~DOADbbX|DpbD}sEMUe13&2X
z9@KH%gL>`=YT{p^p8pwB_y=m7YC0?4orUC|jcF+wbmL)EYMQ)5E9%SDjvBCo>FdEa
zP#M{c`fz>f^+Tv}zHv{vXHY91aj&AD&z(d57gCtd8PYqv8#UtwuQz%98Pvd?-oC}{
z^Y#zD{s}4rM^OQX{QfV<&qlduP1&4neYlDP3JSaq75FJspmukYw{P`&pSv5ii{JPA
z1MU#AIQt&8`NmNbnlksg5mdZFRJ>p@1qG~dt1<I#yq<FJ!v*wf^!kgafxFyp)P(ww
zn6?i!?zgBwr%{`G1a;c}M3NEMI0c>CJhrR?7oZ*}Ms2oRQ3KVwccG5uJ#K@yuSY%q
z1nQi(dHYWHZTADWKVx8akb)jO;tpnR@Zs?K52#J~tJkl%|9X2Uc0J_<sMID=6TSo4
z@V3(H>rfeJM#XEz9IdpSf*yD+y(zS|e=Kx99En$!BoZa@rLn})Wy$g-@kDwwe_mGE
bvP3*ReddLUW#RNIp~`eTTH60~v_AYFLe$|w

diff --git a/sphinx/locale/zh_TW/LC_MESSAGES/sphinx.po b/sphinx/locale/zh_TW/LC_MESSAGES/sphinx.po
index d75b45476..2a4fbef09 100644
--- a/sphinx/locale/zh_TW/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/zh_TW/LC_MESSAGES/sphinx.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 0.5\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2008-11-09 19:46+0100\n"
+"POT-Creation-Date: 2011-09-21 10:06+0200\n"
 "PO-Revision-Date: 2011-01-22 14:41+0100\n"
 "Last-Translator: Fred Lin <gasolin@gmail.com>\n"
 "Language-Team: tw <LL@li.org>\n"
@@ -15,20 +15,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
+"Generated-By: Babel 0.9.6\n"
 
-#: sphinx/environment.py:120 sphinx/writers/latex.py:189
-#: sphinx/writers/manpage.py:67
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr ""
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%Y 年 %m 月 %d 日"
 
-#: sphinx/environment.py:1624
+#: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
 msgstr ""
 
-#: sphinx/environment.py:1627
+#: sphinx/environment.py:1628
 #, python-format
 msgid "see also %s"
 msgstr ""
@@ -67,21 +72,10 @@ msgstr "下一頁"
 msgid "previous"
 msgstr "上一頁"
 
-#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
 msgid " (in "
 msgstr ""
 
-#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152
-#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427
-#: sphinx/themes/basic/genindex-single.html:32
-#: sphinx/themes/basic/genindex-split.html:11
-#: sphinx/themes/basic/genindex-split.html:14
-#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:178
-msgid "Index"
-msgstr "索引"
-
 #: sphinx/directives/other.py:136
 msgid "Section author: "
 msgstr "Section 作者："
@@ -146,12 +140,12 @@ msgstr "%s (C 類別)"
 msgid "%s (C variable)"
 msgstr "%s (C 變數)"
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
 msgid "function"
 msgstr "函式"
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
 msgid "member"
 msgstr "成員"
 
@@ -159,7 +153,7 @@ msgstr "成員"
 msgid "macro"
 msgstr "巨集"
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
 msgstr "類別"
 
@@ -168,28 +162,28 @@ msgstr "類別"
 msgid "variable"
 msgstr "變數"
 
-#: sphinx/domains/cpp.py:897
+#: sphinx/domains/cpp.py:904
 #, fuzzy, python-format
 msgid "%s (C++ class)"
 msgstr "%s (內建類別)"
 
-#: sphinx/domains/cpp.py:912
+#: sphinx/domains/cpp.py:919
 #, python-format
 msgid "%s (C++ type)"
 msgstr "%s (C++ 類別)"
 
-#: sphinx/domains/cpp.py:931
+#: sphinx/domains/cpp.py:938
 #, python-format
 msgid "%s (C++ member)"
 msgstr "%s (C++ 成員)"
 
-#: sphinx/domains/cpp.py:983
+#: sphinx/domains/cpp.py:990
 #, python-format
 msgid "%s (C++ function)"
 msgstr "%s (C++ 函式)"
 
-#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:560
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
 msgid "class"
 msgstr ""
 
@@ -227,11 +221,11 @@ msgstr "參數"
 msgid "Throws"
 msgstr ""
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
 msgstr ""
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "屬性"
 
@@ -300,46 +294,46 @@ msgstr "%s() (%s 方法)"
 msgid "%s (%s.%s attribute)"
 msgstr "%s (%s.%s 屬性)"
 
-#: sphinx/domains/python.py:433
+#: sphinx/domains/python.py:434
 #, python-format
 msgid "%s (module)"
 msgstr "%s (模組)"
 
-#: sphinx/domains/python.py:490
+#: sphinx/domains/python.py:491
 #, fuzzy
 msgid "Python Module Index"
 msgstr "模組索引"
 
-#: sphinx/domains/python.py:491
+#: sphinx/domains/python.py:492
 msgid "modules"
 msgstr "模組"
 
-#: sphinx/domains/python.py:536
+#: sphinx/domains/python.py:537
 msgid "Deprecated"
 msgstr "已移除"
 
-#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr "例外"
 
-#: sphinx/domains/python.py:562
+#: sphinx/domains/python.py:563
 msgid "method"
 msgstr ""
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 #, fuzzy
 msgid "class method"
 msgstr "%s() (%s 方法)"
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "static method"
 msgstr "靜態方法"
 
-#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr "模組"
 
-#: sphinx/domains/python.py:694
+#: sphinx/domains/python.py:695
 #, fuzzy
 msgid " (deprecated)"
 msgstr "已移除"
@@ -393,6 +387,15 @@ msgstr "環境變數"
 msgid "program option"
 msgstr ""
 
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "索引"
+
 #: sphinx/domains/std.py:428
 msgid "Module Index"
 msgstr "模組索引"
@@ -401,12 +404,12 @@ msgstr "模組索引"
 msgid "Search Page"
 msgstr "搜尋頁面"
 
-#: sphinx/ext/autodoc.py:998
+#: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
 msgstr ""
 
-#: sphinx/ext/autodoc.py:1034
+#: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr ""
@@ -722,8 +725,8 @@ msgstr "C API 改變"
 msgid "Other changes"
 msgstr "其他改變："
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505
-#: sphinx/writers/html.py:511
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
 msgid "Permalink to this headline"
 msgstr ""
 
@@ -748,45 +751,24 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#: sphinx/writers/latex.py:176
+#: sphinx/writers/latex.py:177
 msgid "Release"
 msgstr "釋出"
 
-#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
 msgstr ""
 
-#: sphinx/writers/latex.py:672
+#: sphinx/writers/latex.py:676
 msgid "continued from previous page"
 msgstr ""
 
-#: sphinx/writers/latex.py:677
+#: sphinx/writers/latex.py:681
 msgid "Continued on next page"
 msgstr ""
 
-#: sphinx/writers/text.py:430
+#: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[圖片]"
 
-#~ msgid "Platforms: "
-#~ msgstr "平台"
-
-#~ msgid "Searching"
-#~ msgstr "搜尋中"
-
-#~ msgid "Preparing search..."
-#~ msgstr "準備搜尋..."
-
-#~ msgid ", in "
-#~ msgstr ""
-
-#~ 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 ""
-
-#~ msgid "Search finished, found %s page(s) matching the search query."
-#~ msgstr ""
-

From f908267c5e6010deee541b3d8f708d915af7c557 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 10:17:45 +0200
Subject: [PATCH 087/226] Fix #612: add default abbr/acronym markup which is
 not present in some browsers.

---
 sphinx/themes/basic/static/basic.css_t | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sphinx/themes/basic/static/basic.css_t b/sphinx/themes/basic/static/basic.css_t
index 1be372847..69dfb20aa 100644
--- a/sphinx/themes/basic/static/basic.css_t
+++ b/sphinx/themes/basic/static/basic.css_t
@@ -440,6 +440,11 @@ dl.glossary dt {
     font-style: oblique;
 }
 
+abbr, acronym {
+    border-bottom: dotted 1px;
+    cursor: help;
+}
+
 /* -- code displays --------------------------------------------------------- */
 
 pre {

From 7bc89fcaec767f8977e158d5d425404ca962706f Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 10:19:09 +0200
Subject: [PATCH 088/226] Fix #650: add missing newline in coverage output.

---
 sphinx/ext/coverage.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/ext/coverage.py b/sphinx/ext/coverage.py
index 5ff81d704..af1b40266 100644
--- a/sphinx/ext/coverage.py
+++ b/sphinx/ext/coverage.py
@@ -232,7 +232,7 @@ class CoverageBuilder(Builder):
                             if not methods:
                                 op.write(' * %s\n' % name)
                             else:
-                                op.write(' * %s -- missing methods:\n' % name)
+                                op.write(' * %s -- missing methods:\n\n' % name)
                                 op.writelines('   - %s\n' % x for x in methods)
                         op.write('\n')
 

From e74a5541df69b696d3c99c6cd1fa9963f22f824a Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 10:21:22 +0200
Subject: [PATCH 089/226] Make it clear that math labels are internal.

---
 doc/ext/math.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/ext/math.rst b/doc/ext/math.rst
index bbefe382b..434c657b9 100644
--- a/doc/ext/math.rst
+++ b/doc/ext/math.rst
@@ -63,10 +63,10 @@ further translation is necessary when building LaTeX output.
       .. math:: (a + b)^2 = a^2 + 2ab + b^2
 
    Normally, equations are not numbered.  If you want your equation to get a
-   number, use the ``label`` option.  When given, it selects a label for the
-   equation, by which it can be cross-referenced, and causes an equation number
-   to be issued.  See :rst:role:`eqref` for an example.  The numbering style depends
-   on the output format.
+   number, use the ``label`` option.  When given, it selects an internal label
+   for the equation, by which it can be cross-referenced, and causes an equation
+   number to be issued.  See :rst:role:`eqref` for an example.  The numbering
+   style depends on the output format.
 
    There is also an option ``nowrap`` that prevents any wrapping of the given
    math in a math environment.  When you give this option, you must make sure

From 1f59194ee341182e8071d58743442213ab810dbe Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 10:24:16 +0200
Subject: [PATCH 090/226] Fix #663: add "return type" doc field to JS domain.

---
 sphinx/domains/javascript.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sphinx/domains/javascript.py b/sphinx/domains/javascript.py
index 73edf4515..882a01074 100644
--- a/sphinx/domains/javascript.py
+++ b/sphinx/domains/javascript.py
@@ -127,6 +127,8 @@ class JSCallable(JSObject):
                      can_collapse=True),
         Field('returnvalue', label=l_('Returns'), has_arg=False,
               names=('returns', 'return')),
+        Field('returntype', label=l_('Return type'), has_arg=False,
+              names=('rtype',)),
     ]
 
 

From ff4ec7fefd39647db4a4b1a29c349a27f124670c Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 10:25:22 +0200
Subject: [PATCH 091/226] Fix #659: use object start/end tag.

---
 sphinx/ext/graphviz.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py
index 398c6bedf..eedcf2b99 100644
--- a/sphinx/ext/graphviz.py
+++ b/sphinx/ext/graphviz.py
@@ -177,7 +177,7 @@ def get_svg_tag(svgref, svgfile, imgcls=None):
     # The object tag works fine on Firefox and WebKit
     # Besides it's a hack, this strategy does not mess with templates.
     imgcss = imgcls and ' class="%s"' % imgcls or ''
-    return '<object type="image/svg+xml" data="%s"%s%s/>\n' % \
+    return '<object type="image/svg+xml" data="%s"%s%s></object>\n' % \
            (svgref, imgcss, style)
 
 

From 1d564a7fa8ed382db20323bae7499edc1f705076 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 10:28:12 +0200
Subject: [PATCH 092/226] Fix #574: Improvement to Japanese LaTeX support.

---
 sphinx/texinputs/Makefile | 20 +++++++++++---------
 sphinx/writers/latex.py   |  4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/sphinx/texinputs/Makefile b/sphinx/texinputs/Makefile
index f219a2fe6..76e7c3e25 100644
--- a/sphinx/texinputs/Makefile
+++ b/sphinx/texinputs/Makefile
@@ -14,15 +14,16 @@ all-pdf: $(ALLPDF)
 all-dvi: $(ALLDVI)
 all-ps: all-dvi
 	for f in *.dvi; do dvips $$f; done
-all-pdf-ja: $(wildcard *.tex)
-	ebb $(wildcard *.pdf *.png *.gif *.jpeg)
-	platex -kanji=utf8 $(LATEXOPTS) '$<'
-	platex -kanji=utf8 $(LATEXOPTS) '$<'
-	platex -kanji=utf8 $(LATEXOPTS) '$<'
-	-mendex -U -f -d '$(basename $<).dic' -s python.ist '$(basename $<).idx'
-	platex -kanji=utf8 $(LATEXOPTS) '$<'
-	platex -kanji=utf8 $(LATEXOPTS) '$<'
-	dvipdfmx '$(basename $<).dvi'
+
+all-pdf-ja:
+	for f in *.pdf *.png *.gif *.jpg *.jpeg; do ebb $$f; done
+	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
+	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
+	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
+	for f in *.idx; do mendex -U -f -d "`basename $$f .idx`.dic" -s python.ist $$f; done
+	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
+	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
+	for f in *.dvi; do dvipdfmx $$f; done
 
 zip: all-$(FMT)
 	mkdir $(ARCHIVEPREFIX)docs-$(FMT)
@@ -61,4 +62,5 @@ clean:
 	rm -f *.dvi *.log *.ind *.aux *.toc *.syn *.idx *.out *.ilg *.pla
 
 .PHONY: all all-pdf all-dvi all-ps clean
+.PHONY: all-pdf-ja
 
diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index dd0c2665a..277a0b941 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -195,10 +195,10 @@ class LaTeXTranslator(nodes.NodeVisitor):
             if lang:
                 self.elements['classoptions'] += ',' + babel.get_language()
             elif builder.config.language == 'ja':
-                self.elements['classoptions'] += ',english,dvipdfm'
+                self.elements['classoptions'] += ',dvipdfm'
                 # not elements of babel, but this should be above sphinx.sty.
                 # because pTeX (Japanese TeX) cannot handle this count.
-                self.elements['babel'] += r'\newcount\pdfoutput\pdfoutput=0'
+                self.elements['babel'] = r'\newcount\pdfoutput\pdfoutput=0'
                 # to make the pdf with correct encoded hyperref bookmarks
                 self.elements['preamble'] += \
                     r'\AtBeginDvi{\special{pdf:tounicode EUC-UCS2}}'

From a4b8b81712fd080f2b25993add464c69ba6f1f39 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 10:37:48 +0200
Subject: [PATCH 093/226] Fix #611: latex writer raised IndexError on pages
 with no section but a link target.

---
 sphinx/writers/latex.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index 0e4e98cc6..e892406cd 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -1048,8 +1048,12 @@ class LaTeXTranslator(nodes.NodeVisitor):
                 next = node.parent[parindex+1]
             except IndexError:
                 # last node in parent, look at next after parent
-                # (for section of equal level)
-                next = node.parent.parent[node.parent.parent.index(node.parent)]
+                # (for section of equal level) if it exists
+                if node.parent.parent is not None:
+                    next = node.parent.parent[
+                        node.parent.parent.index(node.parent)]
+                else:
+                    raise
             if isinstance(next, nodes.section):
                 if node.get('refid'):
                     self.next_section_ids.add(node['refid'])

From 3b43bd5182d63a8433096a02fa9e34599cba70f9 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 10:37:48 +0200
Subject: [PATCH 094/226] Fix #611: latex writer raised IndexError on pages
 with no section but a link target.

---
 sphinx/writers/latex.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index 277a0b941..9fa85b3f1 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -1020,8 +1020,12 @@ class LaTeXTranslator(nodes.NodeVisitor):
                 next = node.parent[parindex+1]
             except IndexError:
                 # last node in parent, look at next after parent
-                # (for section of equal level)
-                next = node.parent.parent[node.parent.parent.index(node.parent)]
+                # (for section of equal level) if it exists
+                if node.parent.parent is not None:
+                    next = node.parent.parent[
+                        node.parent.parent.index(node.parent)]
+                else:
+                    raise
             if isinstance(next, nodes.section):
                 if node.get('refid'):
                     self.next_section_ids.add(node['refid'])

From c05063d0a5a0e873e03561bbe78b78dd73df80a1 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 10:46:39 +0200
Subject: [PATCH 095/226] Fix #767: safely encode SphinxErrors when printing to
 sys.stderr.

---
 sphinx/cmdline.py       | 10 +++++-----
 sphinx/util/pycompat.py |  6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/sphinx/cmdline.py b/sphinx/cmdline.py
index af780167a..5340aa884 100644
--- a/sphinx/cmdline.py
+++ b/sphinx/cmdline.py
@@ -22,6 +22,7 @@ from sphinx.errors import SphinxError
 from sphinx.application import Sphinx
 from sphinx.util import Tee, format_exception_cut_frames, save_traceback
 from sphinx.util.console import red, nocolor, color_terminal
+from sphinx.util.pycompat import terminal_safe
 
 
 def usage(argv, msg=None):
@@ -190,8 +191,7 @@ def main(argv):
     except KeyboardInterrupt:
         if use_pdb:
             import pdb
-            print >>error, red('Interrupted while building, '
-                                   'starting debugger:')
+            print >>error, red('Interrupted while building, starting debugger:')
             traceback.print_exc()
             pdb.post_mortem(sys.exc_info()[2])
         return 1
@@ -199,17 +199,17 @@ def main(argv):
         if use_pdb:
             import pdb
             print >>error, red('Exception occurred while building, '
-                                   'starting debugger:')
+                               'starting debugger:')
             traceback.print_exc()
             pdb.post_mortem(sys.exc_info()[2])
         else:
             print >>error
             if isinstance(err, SystemMessage):
                 print >>error, red('reST markup error:')
-                print >>error, err.args[0].encode('ascii', 'backslashreplace')
+                print >>error, terminal_safe(err.args[0])
             elif isinstance(err, SphinxError):
                 print >>error, red('%s:' % err.category)
-                print >>error, err
+                print >>error, terminal_safe(unicode(err))
             else:
                 print >>error, red('Exception occurred:')
                 print >>error, format_exception_cut_frames().rstrip()
diff --git a/sphinx/util/pycompat.py b/sphinx/util/pycompat.py
index 375f69207..cd9f6e2fc 100644
--- a/sphinx/util/pycompat.py
+++ b/sphinx/util/pycompat.py
@@ -27,6 +27,9 @@ if sys.version_info >= (3, 0):
     u = ''
     # StringIO/BytesIO classes
     from io import StringIO, BytesIO, TextIOWrapper
+    # safely encode a string for printing to the terminal
+    def terminal_safe(s):
+        return s.encode('ascii', 'backslashreplace').decode('ascii')
     # support for running 2to3 over config files
     def convert_with_2to3(filepath):
         from lib2to3.refactor import RefactoringTool, get_fixers_from_package
@@ -56,6 +59,9 @@ else:
     convert_with_2to3 = None
     def TextIOWrapper(stream, encoding):
         return codecs.lookup(encoding or 'ascii')[2](stream)
+    # safely encode a string for printing to the terminal
+    def terminal_safe(s):
+        return s.encode('ascii', 'backslashreplace')
 
 
 # ------------------------------------------------------------------------------

From 19775589e9de7855fe48ed94b0c580537db62820 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 10:47:18 +0200
Subject: [PATCH 096/226] Fix #767: safely encode SphinxErrors when printing to
 sys.stderr.

---
 sphinx/cmdline.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/cmdline.py b/sphinx/cmdline.py
index af780167a..5be530be2 100644
--- a/sphinx/cmdline.py
+++ b/sphinx/cmdline.py
@@ -209,7 +209,7 @@ def main(argv):
                 print >>error, err.args[0].encode('ascii', 'backslashreplace')
             elif isinstance(err, SphinxError):
                 print >>error, red('%s:' % err.category)
-                print >>error, err
+                print >>error, unicode(err).encode('ascii', 'backslashreplace')
             else:
                 print >>error, red('Exception occurred:')
                 print >>error, format_exception_cut_frames().rstrip()

From 425c44ed591fc4dda7ac107392d2b3a3fa6243cd Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 10:58:48 +0200
Subject: [PATCH 097/226] Fix indentation.

---
 sphinx/themes/basic/static/searchtools.js_t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/themes/basic/static/searchtools.js_t b/sphinx/themes/basic/static/searchtools.js_t
index c3f9adc9e..fbb3bb656 100644
--- a/sphinx/themes/basic/static/searchtools.js_t
+++ b/sphinx/themes/basic/static/searchtools.js_t
@@ -175,7 +175,7 @@ var Search = {
     // lookup as object
     for (var i = 0; i < objectterms.length; i++) {
       var others = [].concat(objectterms.slice(0,i),
-                                objectterms.slice(i+1, objectterms.length))
+                             objectterms.slice(i+1, objectterms.length))
       var results = this.performObjectSearch(objectterms[i], others);
       // Assume first word is most likely to be the object,
       // other words more likely to be in description.

From cb54b7db4e6ec346a51b9a77dacf6378c0b961a3 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 17:57:47 +0200
Subject: [PATCH 098/226] Fix #768: whitespace-strip JS function names.

---
 sphinx/domains/javascript.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sphinx/domains/javascript.py b/sphinx/domains/javascript.py
index cf2fd2cbf..e53eb5fd5 100644
--- a/sphinx/domains/javascript.py
+++ b/sphinx/domains/javascript.py
@@ -34,6 +34,7 @@ class JSObject(ObjectDescription):
         sig = sig.strip()
         if '(' in sig and sig[-1:] == ')':
             prefix, arglist = sig.split('(', 1)
+            prefix = prefix.strip()
             arglist = arglist[:-1].strip()
         else:
             prefix = sig

From 4239392906402928c9d294267cd1b7a34bd53cfd Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 18:43:49 +0200
Subject: [PATCH 099/226] #316: broader range of exceptions to catch while
 communicating with subprocess.

---
 sphinx/ext/graphviz.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py
index eedcf2b99..1bb70d022 100644
--- a/sphinx/ext/graphviz.py
+++ b/sphinx/ext/graphviz.py
@@ -137,7 +137,7 @@ def render_dot(self, code, options, format, prefix='graphviz'):
         # Graphviz may close standard input when an error occurs,
         # resulting in a broken pipe on communicate()
         stdout, stderr = p.communicate(code)
-    except OSError, err:
+    except (OSError, IOError), err:
         if err.errno != EPIPE:
             raise
         # in this case, read the standard output and standard error streams

From fed6bdac653e29380921282c550c8e8393d380e2 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 18:50:55 +0200
Subject: [PATCH 100/226] Fix #644: remove "clear: both" for center-aligned
 figures in HTML.

---
 sphinx/themes/basic/static/basic.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sphinx/themes/basic/static/basic.css b/sphinx/themes/basic/static/basic.css
index 32630d54c..8e85c93c5 100644
--- a/sphinx/themes/basic/static/basic.css
+++ b/sphinx/themes/basic/static/basic.css
@@ -236,7 +236,6 @@ img.align-center, .figure.align-center, object.align-center {
 }
 
 .align-center {
-    clear: both;
     text-align: center;
 }
 

From e9efb8f3afa8e2e4e445573e670d675eac8aee2a Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 18:51:24 +0200
Subject: [PATCH 101/226] e55ca1a50bfe for agogo.

---
 sphinx/themes/agogo/static/agogo.css_t | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sphinx/themes/agogo/static/agogo.css_t b/sphinx/themes/agogo/static/agogo.css_t
index 904fd7bef..e57c200f6 100644
--- a/sphinx/themes/agogo/static/agogo.css_t
+++ b/sphinx/themes/agogo/static/agogo.css_t
@@ -349,7 +349,6 @@ img.align-center, .figure.align-center, object.align-center {
 }
 
 .align-center {
-    clear: both;
     text-align: center;
 }
 

From c7f5ec3e8af1e895dcc677c9aad5e228c3afc498 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 18:57:13 +0200
Subject: [PATCH 102/226] Fix #734: make sidebar search box width consistent on
 all browsers.

---
 sphinx/themes/agogo/layout.html        | 2 +-
 sphinx/themes/agogo/static/agogo.css_t | 8 ++++++++
 sphinx/themes/basic/searchbox.html     | 2 +-
 sphinx/themes/basic/static/basic.css   | 8 ++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/sphinx/themes/agogo/layout.html b/sphinx/themes/agogo/layout.html
index 6668a7f67..3c427ed10 100644
--- a/sphinx/themes/agogo/layout.html
+++ b/sphinx/themes/agogo/layout.html
@@ -48,7 +48,7 @@
           {%- block sidebarsearch %}
           <h3 style="margin-top: 1.5em;">{{ _('Search') }}</h3>
           <form class="search" action="{{ pathto('search') }}" method="get">
-            <input type="text" name="q" size="18" />
+            <input type="text" name="q" />
             <input type="submit" value="{{ _('Go') }}" />
             <input type="hidden" name="check_keywords" value="yes" />
             <input type="hidden" name="area" value="default" />
diff --git a/sphinx/themes/agogo/static/agogo.css_t b/sphinx/themes/agogo/static/agogo.css_t
index e57c200f6..fe60145d7 100644
--- a/sphinx/themes/agogo/static/agogo.css_t
+++ b/sphinx/themes/agogo/static/agogo.css_t
@@ -300,6 +300,14 @@ div.sidebar li.toctree-l1.current li.toctree-l2 a {
   border-right: none;
 }
 
+div.sidebar input[type="text"] {
+  width: 170px;
+}
+
+div.sidebar input[type="submit"] {
+  width: 30px;
+}
+
 
 /* Footer */
 
diff --git a/sphinx/themes/basic/searchbox.html b/sphinx/themes/basic/searchbox.html
index 88edac5a1..13b453c49 100644
--- a/sphinx/themes/basic/searchbox.html
+++ b/sphinx/themes/basic/searchbox.html
@@ -11,7 +11,7 @@
 <div id="searchbox" style="display: none">
   <h3>{{ _('Quick search') }}</h3>
     <form class="search" action="{{ pathto('search') }}" method="get">
-      <input type="text" name="q" size="18" />
+      <input type="text" name="q" />
       <input type="submit" value="{{ _('Go') }}" />
       <input type="hidden" name="check_keywords" value="yes" />
       <input type="hidden" name="area" value="default" />
diff --git a/sphinx/themes/basic/static/basic.css b/sphinx/themes/basic/static/basic.css
index 8e85c93c5..eb22a9421 100644
--- a/sphinx/themes/basic/static/basic.css
+++ b/sphinx/themes/basic/static/basic.css
@@ -79,6 +79,14 @@ div.sphinxsidebar input {
     font-size: 1em;
 }
 
+div.sphinxsidebar input[type="text"] {
+    width: 170px;
+}
+
+div.sphinxsidebar input[type="submit"] {
+    width: 30px;
+}
+
 img {
     border: 0;
 }

From 6396adfda2b9e5db827eadb329571919395e89a4 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 19:02:13 +0200
Subject: [PATCH 103/226] Fix #700: use $(MAKE) in quickstart-generated
 makefile.

---
 sphinx/quickstart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index c825e9be8..27189a663 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -420,7 +420,7 @@ latex:
 latexpdf:
 \t$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 \t@echo "Running LaTeX files through pdflatex..."
-\tmake -C $(BUILDDIR)/latex all-pdf
+\t$(MAKE) -C $(BUILDDIR)/latex all-pdf
 \t@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
 
 text:

From d7d7e0287f0a894a54f3e72de10851b96570d526 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 19:06:48 +0200
Subject: [PATCH 104/226] Fix #765: on Windows, relpath() does not always
 succeed.

---
 sphinx/builders/gettext.py | 6 ++----
 sphinx/util/osutil.py      | 7 +++++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py
index 1552e273d..41a5acbcc 100644
--- a/sphinx/builders/gettext.py
+++ b/sphinx/builders/gettext.py
@@ -14,11 +14,9 @@ from codecs import open
 from datetime import datetime
 from collections import defaultdict
 
-from docutils import nodes
-
 from sphinx.builders import Builder
 from sphinx.util.nodes import extract_messages
-from sphinx.util.osutil import SEP, copyfile
+from sphinx.util.osutil import SEP, safe_relpath
 from sphinx.util.console import darkgreen
 
 POHEADER = ur"""
@@ -113,7 +111,7 @@ class MessageCatalogBuilder(I18nBuilder):
 
                     # generate "#: file1:line1\n#: file2:line2 ..."
                     pofile.write(u"#: %s\n" % "\n#: ".join("%s:%s" %
-                        (path.relpath(source, self.outdir), line)
+                        (safe_relpath(source, self.outdir), line)
                         for source, line, _ in positions))
                     # generate "# uuid1\n# uuid2\n ..."
                     pofile.write(u"# %s\n" % "\n# ".join(uid for _, _, uid
diff --git a/sphinx/util/osutil.py b/sphinx/util/osutil.py
index b7a12cda9..b07fa6ab0 100644
--- a/sphinx/util/osutil.py
+++ b/sphinx/util/osutil.py
@@ -133,3 +133,10 @@ if sys.version_info < (3, 0):
                 .decode('utf-8')
 else:
     ustrftime = time.strftime
+
+
+def safe_relpath(path, start=None):
+    try:
+        return os.path.relpath(path, start)
+    except ValueError:
+        return path

From 92f5c43279860f6ed38cf2f93daeeed56dc9dc99 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 19:15:56 +0200
Subject: [PATCH 105/226] Fix #610: remove duplicate <h1> tags in agogo theme.

---
 sphinx/themes/agogo/layout.html        | 3 ++-
 sphinx/themes/agogo/static/agogo.css_t | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sphinx/themes/agogo/layout.html b/sphinx/themes/agogo/layout.html
index 3c427ed10..d063194a1 100644
--- a/sphinx/themes/agogo/layout.html
+++ b/sphinx/themes/agogo/layout.html
@@ -19,7 +19,8 @@
           </a></p>
         {%- endif %}
         {%- block headertitle %}
-        <h1><a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a></h1>
+        <div class="headertitle"><a
+          href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a></div>
         {%- endblock %}
         <div class="rel">
           {%- for rellink in rellinks|reverse %}
diff --git a/sphinx/themes/agogo/static/agogo.css_t b/sphinx/themes/agogo/static/agogo.css_t
index fe60145d7..5d9a1eb75 100644
--- a/sphinx/themes/agogo/static/agogo.css_t
+++ b/sphinx/themes/agogo/static/agogo.css_t
@@ -128,14 +128,15 @@ div.header {
   padding-bottom: 10px;
 }
 
-div.header h1 {
+div.header .headertitle {
   font-family: {{ theme_headerfont }};
   font-weight: normal;
   font-size: 180%;
   letter-spacing: .08em;
+  margin-bottom: .8em;
 }
 
-div.header h1 a {
+div.header .headertitle a {
   color: white;
 }
 

From 23cbe85e9ff5b2c5ecb8623ea1716344d82d94e2 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 19:19:01 +0200
Subject: [PATCH 106/226] Fix #544: allow .pyw extension for importable
 modules.

---
 sphinx/util/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sphinx/util/__init__.py b/sphinx/util/__init__.py
index 4749ca143..b7e64b116 100644
--- a/sphinx/util/__init__.py
+++ b/sphinx/util/__init__.py
@@ -205,6 +205,8 @@ def get_module_source(modname):
     lfilename = filename.lower()
     if lfilename.endswith('.pyo') or lfilename.endswith('.pyc'):
         filename = filename[:-1]
+        if not path.isfile(filename) and path.isfile(filename + 'w'):
+            filename += 'w'
     elif not (lfilename.endswith('.py') or lfilename.endswith('.pyw')):
         raise PycodeError('source is not a .py file: %r' % filename)
     if not path.isfile(filename):

From d05588da413ba9bb21445f0a33740a3502bad83a Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 21 Sep 2011 19:23:24 +0200
Subject: [PATCH 107/226] Fix #637: ignore strange Emacs lock files by default.

---
 sphinx/environment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/environment.py b/sphinx/environment.py
index 65f98e66e..b2fb529fa 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -401,7 +401,7 @@ class BuildEnvironment:
             config.exclude_trees +
             [d + config.source_suffix for d in config.unused_docs] +
             ['**/' + d for d in config.exclude_dirnames] +
-            ['**/_sources']
+            ['**/_sources', '.#*']
         )
         self.found_docs = set(get_matching_docs(
             self.srcdir, config.source_suffix, exclude_matchers=matchers))

From af96d11f116740a8a715e15f9b61cc69e87e0ee8 Mon Sep 17 00:00:00 2001
From: Shunichi Shinohara <shino@gmail.com>
Date: Thu, 22 Sep 2011 15:20:26 +0900
Subject: [PATCH 108/226] Print table headers not only in first page but in
 next pages

---
 sphinx/writers/latex.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index ac65f05b6..4af39d514 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -626,6 +626,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
         self.table = Table()
         self.table.longtable = 'longtable' in node['classes']
         self.tablebody = []
+        self.tableheaders = []
         # Redirect body output until table is finished.
         self._body = self.body
         self.body = self.tablebody
@@ -670,11 +671,13 @@ class LaTeXTranslator(nodes.NodeVisitor):
             self.next_table_ids.clear()
         if self.table.longtable:
             self.body.append('\\hline\n')
+            self.body.extend(self.tableheaders)
             self.body.append('\\endfirsthead\n\n')
             self.body.append('\\multicolumn{%s}{c}%%\n' % self.table.colcount)
             self.body.append(r'{{\bfseries \tablename\ \thetable{} -- %s}} \\'
                              % _('continued from previous page'))
             self.body.append('\n\\hline\n')
+            self.body.extend(self.tableheaders)
             self.body.append('\\endhead\n\n')
             self.body.append(ur'\hline \multicolumn{%s}{|r|}{{%s}} \\ \hline'
                              % (self.table.colcount,
@@ -684,6 +687,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
             self.body.append('\\endlastfoot\n\n')
         else:
             self.body.append('\\hline\n')
+            self.body.extend(self.tableheaders)
         self.body.extend(self.tablebody)
         self.body.append(endmacro)
         if not self.table.longtable and self.table.caption is not None:
@@ -702,17 +706,19 @@ class LaTeXTranslator(nodes.NodeVisitor):
         pass
 
     def visit_thead(self, node):
+        self.table.had_head = True
         if self.next_table_colspec:
             self.table.colspec = '{%s}\n' % self.next_table_colspec
         self.next_table_colspec = None
-        # self.body.append('\\hline\n')
-        # self.table.had_head = True
+        # Redirect head output until header is finished. see visit_tbody.
+        self.body = self.tableheaders
     def depart_thead(self, node):
         pass
 
     def visit_tbody(self, node):
         if not self.table.had_head:
             self.visit_thead(node)
+        self.body = self.tablebody
     def depart_tbody(self, node):
         pass
 

From ad5d9f7c6b35fb0cf7d76d9a0501c20d91bd342b Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 22 Sep 2011 09:29:36 +0200
Subject: [PATCH 109/226] Add changelog entry for emphasize-lines and some
 coding style fixes.

---
 CHANGES                | 7 ++++---
 doc/markup/code.rst    | 3 +++
 sphinx/highlighting.py | 9 ++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 26fa3d443..761d41a1b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,10 +27,10 @@ Features added
 
 * Markup:
 
-  - #138: Add an :rst:role:`index` role, to make inline index entries.
-  - #454: Add more index markup capabilities: marking see/seealso entries,
+  - #138: Added an :rst:role:`index` role, to make inline index entries.
+  - #454: Added more index markup capabilities: marking see/seealso entries,
     and main entries for a given key.
-  - #460: Allow limiting the depth of section numbers for HTML using the
+  - #460: Allowed limiting the depth of section numbers for HTML using the
     :rst:dir:`toctree`\'s ``numbered`` option.
   - #586: Implemented improved :rst:dir:`glossary` markup which allows
     multiple terms per definition.
@@ -38,6 +38,7 @@ Features added
   - C++ domain now supports array definitions.
   - Section headings in :rst:dir:`only` directives are now correctly
     handled.
+  - Added ``emphasize-lines`` option to source code directives.
 
 * HTML builder:
 
diff --git a/doc/markup/code.rst b/doc/markup/code.rst
index 8f6d55247..c0e7e8ebe 100644
--- a/doc/markup/code.rst
+++ b/doc/markup/code.rst
@@ -98,6 +98,9 @@ emphasize particular lines::
            print 'This one is not...'
            print '...but this one is.'
 
+.. versionchanged:: 1.1
+   ``emphasize-lines`` has been added.
+
 
 Includes
 ^^^^^^^^
diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
index 65fe9f7d3..0912ee053 100644
--- a/sphinx/highlighting.py
+++ b/sphinx/highlighting.py
@@ -101,6 +101,10 @@ class PygmentsBridge(object):
             self.formatter = self.latex_formatter
             self.formatter_args['commandprefix'] = 'PYG'
 
+    def get_formatter(self, **kwargs):
+        kwargs.update(self.formatter_args)
+        return self.formatter(**kwargs)
+
     def unhighlighted(self, source):
         if self.dest == 'html':
             return '<pre>' + cgi.escape(source) + '</pre>\n'
@@ -212,11 +216,6 @@ class PygmentsBridge(object):
             # so let it pass unhighlighted
             return self.unhighlighted(source)
 
-    def get_formatter(self, **kwargs_orig):
-        kwargs = self.formatter_args.copy()
-        kwargs.update(kwargs_orig)
-        return self.formatter(**kwargs)
-
     def get_stylesheet(self):
         if not pygments:
             if self.dest == 'latex':

From a843bf403b6efda87445e2f88dd9ed5ab113811c Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 22 Sep 2011 09:46:46 +0200
Subject: [PATCH 110/226] Update changelog with latest bugfixes.

---
 CHANGES | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/CHANGES b/CHANGES
index 6a013d758..c7b1d45e4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,26 @@
 Release 1.0.8 (in development)
 ==============================
 
+* #637: Ignore Emacs lock files when looking for source files.
+
+* #544: Allow .pyw extension for importable modules in autodoc.
+
+* #700: Use ``$(MAKE)`` in quickstart-generated Makefiles.
+
+* #734: Make sidebar search box width consistent in browsers.
+
+* #644: Fix spacing of centered figures in HTML output.
+
+* #767: Safely encode SphinxError messages when printing them to
+  sys.stderr.
+
+* #611: Fix LaTeX output error with a document with no sections but
+  a link target.
+
+* Correctly treat built-in method descriptors as methods in autodoc.
+
+* #706: Stop monkeypatching the Python textwrap module.
+
 * #657: viewcode now works correctly with source files that have
   non-ASCII encoding.
 

From b3f1b5f8ff386073a684586d0ee7ebd353d1ca07 Mon Sep 17 00:00:00 2001
From: aohta <fire.kuma8@gmail.com>
Date: Thu, 22 Sep 2011 17:09:00 +0900
Subject: [PATCH 111/226] support to the pTex(Japanese TeX) in docutils 0.8.1

---
 sphinx/writers/latex.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index 14e24cfbd..e6585f273 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -196,19 +196,21 @@ class LaTeXTranslator(nodes.NodeVisitor):
             lang = babel.get_language()
             if lang:
                 self.elements['classoptions'] += ',' + babel.get_language()
-            elif builder.config.language == 'ja':
-                self.elements['classoptions'] += ',dvipdfm'
-                # not elements of babel, but this should be above sphinx.sty.
-                # because pTeX (Japanese TeX) cannot handle this count.
-                self.elements['babel'] = r'\newcount\pdfoutput\pdfoutput=0'
-                # to make the pdf with correct encoded hyperref bookmarks
-                self.elements['preamble'] += \
-                    r'\AtBeginDvi{\special{pdf:tounicode EUC-UCS2}}'
             else:
                 self.builder.warn('no Babel option known for language %r' %
                                   builder.config.language)
             self.elements['shorthandoff'] = babel.get_shorthandoff()
             self.elements['fncychap'] = '\\usepackage[Sonny]{fncychap}'
+
+            # pTeX (Japanese TeX) for support
+            if builder.config.language == 'ja':
+                self.elements['classoptions'] = ',dvipdfm'
+                # found elements of babel, but this should be above sphinx.sty.
+                # because pTeX (Japanese TeX) cannot handle this count.
+                self.elements['babel'] = r'\newcount\pdfoutput\pdfoutput=0'
+                # to make the pdf with correct encoded hyperref bookmarks
+                self.elements['preamble'] += \
+                    r'\AtBeginDvi{\special{pdf:tounicode EUC-UCS2}}'
         else:
             self.elements['classoptions'] += ',english'
         # allow the user to override them all

From 860b410fbc9d8e7a369743c3af879469141f852a Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 22 Sep 2011 10:23:46 +0200
Subject: [PATCH 112/226] Added support for non-name template arguments.  This
 fixes #696

---
 sphinx/domains/cpp.py    | 28 ++++++++++++++++++++++++----
 tests/test_cpp_domain.py |  3 +++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index c2cdd8f5a..fc9a286a8 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -29,6 +29,7 @@ _string_re = re.compile(r"[LuU8]?('([^'\\]*(?:\\.[^'\\]*)*)'"
                         r'|"([^"\\]*(?:\\.[^"\\]*)*)")', re.S)
 _visibility_re = re.compile(r'\b(public|private|protected)\b')
 _array_def_re = re.compile(r'\[\s*(.+?)?\s*\]')
+_template_arg_re = re.compile(r'[^,>]+')
 _operator_re = re.compile(r'''(?x)
         \[\s*\]
     |   \(\s*\)
@@ -236,6 +237,18 @@ class TemplateDefExpr(PrimaryDefExpr):
         return u'%s<%s>' % (self.typename, u', '.join(map(unicode, self.args)))
 
 
+class ConstantTemplateArgExpr(PrimaryDefExpr):
+
+    def __init__(self, arg):
+        self.arg = arg
+
+    def get_id(self):
+        return self.arg.replace(u' ', u'-')
+
+    def __unicode__(self):
+        return unicode(self.arg)
+
+
 class WrappingDefExpr(DefExpr):
 
     def __init__(self, typename):
@@ -540,8 +553,15 @@ class DefinitionParser(object):
         return CastOpDefExpr(type)
 
     def _parse_name(self):
+        return self._parse_name_or_template_arg(False)
+
+    def _parse_name_or_template_arg(self, in_template):
         if not self.match(_identifier_re):
-            self.fail('expected name')
+            if not in_template:
+                self.fail('expected name')
+            if not self.match(_template_arg_re):
+                self.fail('expected name or constant template argument')
+            return ConstantTemplateArgExpr(self.matched_text.strip())
         identifier = self.matched_text
 
         # strictly speaking, operators are not regular identifiers
@@ -610,8 +630,8 @@ class DefinitionParser(object):
         rv = ModifierDefExpr(NameDefExpr(typename), modifiers)
         return self._attach_crefptr(rv, is_const)
 
-    def _parse_type_expr(self):
-        typename = self._parse_name()
+    def _parse_type_expr(self, in_template=False):
+        typename = self._parse_name_or_template_arg(in_template)
         self.skip_ws()
         if not self.skip_string('<'):
             return typename
@@ -660,7 +680,7 @@ class DefinitionParser(object):
                (result and not self.skip_string('::')) or \
                self.eof:
                 break
-            result.append(self._parse_type_expr())
+            result.append(self._parse_type_expr(in_template))
 
         if not result:
             self.fail('expected type')
diff --git a/tests/test_cpp_domain.py b/tests/test_cpp_domain.py
index 84649fd1b..3ca29b4ee 100644
--- a/tests/test_cpp_domain.py
+++ b/tests/test_cpp_domain.py
@@ -25,6 +25,9 @@ def test_type_definitions():
     rv = parse('member_object', '  const  std::string  &  name leftover')
     assert unicode(rv) == 'const std::string& name'
 
+    x = 'void operator()(const boost::array<VertexID, 2>& v) const'
+    assert unicode(parse('function', x)) == x
+
     rv = parse('member_object', 'const std::vector< unsigned int, long> &name')
     assert unicode(rv) == 'const std::vector<unsigned int, long>& name'
 

From bdf58164379a27fb902bf7693d416dde1a813878 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 22 Sep 2011 10:23:46 +0200
Subject: [PATCH 113/226] Added support for non-name template arguments.  This
 fixes #696

---
 sphinx/domains/cpp.py    | 28 ++++++++++++++++++++++++----
 tests/test_cpp_domain.py |  3 +++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 2a4117402..996229779 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -29,6 +29,7 @@ _string_re = re.compile(r"[LuU8]?('([^'\\]*(?:\\.[^'\\]*)*)'"
                         r'|"([^"\\]*(?:\\.[^"\\]*)*)")', re.S)
 _visibility_re = re.compile(r'\b(public|private|protected)\b')
 _array_def_re = re.compile(r'\[\s*(.+?)?\s*\]')
+_template_arg_re = re.compile(r'[^,>]+')
 _operator_re = re.compile(r'''(?x)
         \[\s*\]
     |   \(\s*\)
@@ -240,6 +241,18 @@ class TemplateDefExpr(PrimaryDefExpr):
         return u'%s<%s>' % (self.typename, u', '.join(map(unicode, self.args)))
 
 
+class ConstantTemplateArgExpr(PrimaryDefExpr):
+
+    def __init__(self, arg):
+        self.arg = arg
+
+    def get_id(self):
+        return self.arg.replace(u' ', u'-')
+
+    def __unicode__(self):
+        return unicode(self.arg)
+
+
 class WrappingDefExpr(DefExpr):
 
     def __init__(self, typename):
@@ -544,8 +557,15 @@ class DefinitionParser(object):
         return CastOpDefExpr(type)
 
     def _parse_name(self):
+        return self._parse_name_or_template_arg(False)
+
+    def _parse_name_or_template_arg(self, in_template):
         if not self.match(_identifier_re):
-            self.fail('expected name')
+            if not in_template:
+                self.fail('expected name')
+            if not self.match(_template_arg_re):
+                self.fail('expected name or constant template argument')
+            return ConstantTemplateArgExpr(self.matched_text.strip())
         identifier = self.matched_text
 
         # strictly speaking, operators are not regular identifiers
@@ -614,8 +634,8 @@ class DefinitionParser(object):
         rv = ModifierDefExpr(NameDefExpr(typename), modifiers)
         return self._attach_crefptr(rv, is_const)
 
-    def _parse_type_expr(self):
-        typename = self._parse_name()
+    def _parse_type_expr(self, in_template=False):
+        typename = self._parse_name_or_template_arg(in_template)
         self.skip_ws()
         if not self.skip_string('<'):
             return typename
@@ -664,7 +684,7 @@ class DefinitionParser(object):
                (result and not self.skip_string('::')) or \
                self.eof:
                 break
-            result.append(self._parse_type_expr())
+            result.append(self._parse_type_expr(in_template))
 
         if not result:
             self.fail('expected type')
diff --git a/tests/test_cpp_domain.py b/tests/test_cpp_domain.py
index 84649fd1b..3ca29b4ee 100644
--- a/tests/test_cpp_domain.py
+++ b/tests/test_cpp_domain.py
@@ -25,6 +25,9 @@ def test_type_definitions():
     rv = parse('member_object', '  const  std::string  &  name leftover')
     assert unicode(rv) == 'const std::string& name'
 
+    x = 'void operator()(const boost::array<VertexID, 2>& v) const'
+    assert unicode(parse('function', x)) == x
+
     rv = parse('member_object', 'const std::vector< unsigned int, long> &name')
     assert unicode(rv) == 'const std::vector<unsigned int, long>& name'
 

From b3108306cda69378bbaca8e2ee968644d45d264e Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 22 Sep 2011 10:23:54 +0200
Subject: [PATCH 114/226] Fix #677: allow multiple signatures in C++ domain
 directives.

---
 CHANGES                | 2 ++
 sphinx/domains/cpp.py  | 2 +-
 tests/root/objects.txt | 4 +---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index c7b1d45e4..ddb8dea33 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 1.0.8 (in development)
 ==============================
 
+* #677: Fix parsing of multiple signatures in C++ domain.
+
 * #637: Ignore Emacs lock files when looking for source files.
 
 * #544: Allow .pyw extension for importable modules in autodoc.
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index f07037e45..dac0106bb 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -122,7 +122,7 @@ class DefExpr(object):
             return False
         try:
             for key, value in self.__dict__.iteritems():
-                if value != getattr(other, value):
+                if value != getattr(other, key):
                     return False
         except AttributeError:
             return False
diff --git a/tests/root/objects.txt b/tests/root/objects.txt
index 51ecee911..533bdae3e 100644
--- a/tests/root/objects.txt
+++ b/tests/root/objects.txt
@@ -169,6 +169,4 @@ CPP domain
 .. cpp:class:: n::Array<T,d>
 
    .. cpp:function:: T& operator[]( unsigned j )
-
-   .. cpp:function:: const T& operator[]( unsigned j ) const
-
+                     const T& operator[]( unsigned j ) const

From 55935bdd04aab5da256015b2af25ba0d842d89a0 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 22 Sep 2011 10:33:15 +0200
Subject: [PATCH 115/226] Be explicit about rvalue references.

---
 sphinx/domains/cpp.py    | 16 ++++++++++++++--
 tests/test_cpp_domain.py |  4 ++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 996229779..77ec032d9 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -303,7 +303,7 @@ class ArrayDefExpr(WrappingDefExpr):
         )
 
 
-class RefDefExpr(WrappingDefExpr):
+class LValRefDefExpr(WrappingDefExpr):
 
     def get_id(self):
         return self.typename.get_id() + u'R'
@@ -312,6 +312,15 @@ class RefDefExpr(WrappingDefExpr):
         return u'%s&' % self.typename
 
 
+class RValRefDefExpr(WrappingDefExpr):
+
+    def get_id(self):
+        return self.typename.get_id() + u'RR'
+
+    def __unicode__(self):
+        return u'%s&&' % self.typename
+
+
 class ConstDefExpr(WrappingDefExpr):
 
     def __init__(self, typename, prefix=False):
@@ -602,7 +611,10 @@ class DefinitionParser(object):
             elif self.match(_array_def_re):
                 expr = ArrayDefExpr(expr, self.last_match.group(1))
             elif self.skip_string('&'):
-                expr = RefDefExpr(expr)
+                if self.skip_string('&'):
+                    expr = RValRefDefExpr(expr)
+                else:
+                    expr = LValRefDefExpr(expr)
             else:
                 return expr
 
diff --git a/tests/test_cpp_domain.py b/tests/test_cpp_domain.py
index 3ca29b4ee..eb08c6085 100644
--- a/tests/test_cpp_domain.py
+++ b/tests/test_cpp_domain.py
@@ -49,6 +49,10 @@ def test_type_definitions():
     assert unicode(parse('type_object', 'long long int foo')) == 'long long foo'
 
 
+    x = 'MyClass::MyClass(MyClass::MyClass&&)'
+    assert unicode(parse('function', x)) == x
+
+
 def test_operators():
     x = parse('function', 'void operator new [  ] ()')
     assert unicode(x) == 'void operator new[]()'

From 6b96b1022039dc9882e4e4e30bdb10f07be80746 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 22 Sep 2011 10:33:15 +0200
Subject: [PATCH 116/226] Be explicit about rvalue references.

---
 sphinx/domains/cpp.py    | 16 ++++++++++++++--
 tests/test_cpp_domain.py |  4 ++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index fc9a286a8..2facdc93e 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -299,7 +299,7 @@ class ArrayDefExpr(WrappingDefExpr):
         )
 
 
-class RefDefExpr(WrappingDefExpr):
+class LValRefDefExpr(WrappingDefExpr):
 
     def get_id(self):
         return self.typename.get_id() + u'R'
@@ -308,6 +308,15 @@ class RefDefExpr(WrappingDefExpr):
         return u'%s&' % self.typename
 
 
+class RValRefDefExpr(WrappingDefExpr):
+
+    def get_id(self):
+        return self.typename.get_id() + u'RR'
+
+    def __unicode__(self):
+        return u'%s&&' % self.typename
+
+
 class ConstDefExpr(WrappingDefExpr):
 
     def __init__(self, typename, prefix=False):
@@ -598,7 +607,10 @@ class DefinitionParser(object):
             elif self.match(_array_def_re):
                 expr = ArrayDefExpr(expr, self.last_match.group(1))
             elif self.skip_string('&'):
-                expr = RefDefExpr(expr)
+                if self.skip_string('&'):
+                    expr = RValRefDefExpr(expr)
+                else:
+                    expr = LValRefDefExpr(expr)
             else:
                 return expr
 
diff --git a/tests/test_cpp_domain.py b/tests/test_cpp_domain.py
index 3ca29b4ee..eb08c6085 100644
--- a/tests/test_cpp_domain.py
+++ b/tests/test_cpp_domain.py
@@ -49,6 +49,10 @@ def test_type_definitions():
     assert unicode(parse('type_object', 'long long int foo')) == 'long long foo'
 
 
+    x = 'MyClass::MyClass(MyClass::MyClass&&)'
+    assert unicode(parse('function', x)) == x
+
+
 def test_operators():
     x = parse('function', 'void operator new [  ] ()')
     assert unicode(x) == 'void operator new[]()'

From e5e44202b659c0def17bdb1720a4cae2eee07327 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 22 Sep 2011 10:37:55 +0200
Subject: [PATCH 117/226] Closes #680: allow doc fields in cpp domain
 directives.

---
 CHANGES               |  1 +
 sphinx/domains/cpp.py | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 761d41a1b..bf57f97ad 100644
--- a/CHANGES
+++ b/CHANGES
@@ -36,6 +36,7 @@ Features added
     multiple terms per definition.
   - #478: Added :rst:dir:`py:decorator` directive to describe decorators.
   - C++ domain now supports array definitions.
+  - C++ domain now supports doc fields (``:param x:`` inside directives).
   - Section headings in :rst:dir:`only` directives are now correctly
     handled.
   - Added ``emphasize-lines`` option to source code directives.
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 996229779..df90e451c 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -21,6 +21,7 @@ from sphinx.domains import Domain, ObjType
 from sphinx.directives import ObjectDescription
 from sphinx.util.nodes import make_refnode
 from sphinx.util.compat import Directive
+from sphinx.util.docfields import Field, GroupedField
 
 
 _identifier_re = re.compile(r'(~?\b[a-zA-Z_][a-zA-Z0-9_]*)\b')
@@ -838,6 +839,17 @@ class DefinitionParser(object):
 class CPPObject(ObjectDescription):
     """Description of a C++ language object."""
 
+    doc_field_types = [
+        GroupedField('parameter', label=l_('Parameters'),
+                     names=('param', 'parameter', 'arg', 'argument'),
+                     can_collapse=True),
+        GroupedField('exceptions', label=l_('Throws'), rolename='cpp:class',
+                     names=('throws', 'throw', 'exception'),
+                     can_collapse=True),
+        Field('returnvalue', label=l_('Returns'), has_arg=False,
+              names=('returns', 'return')),
+    ]
+
     def attach_name(self, node, name):
         owner, name = name.split_owner()
         varname = unicode(name)
@@ -1128,7 +1140,7 @@ class CPPDomain(Domain):
                      node.line)
             return None
 
-        parent = node['cpp:parent']
+        parent = node.get('cpp:parent', None)
 
         rv = _create_refnode(expr)
         if rv is not None or parent is None:

From 9e43f54600bcdc8adb7193d6eaa98fc7d017535e Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 22 Sep 2011 10:43:24 +0200
Subject: [PATCH 118/226] Added support for constexpr in function signatures

---
 sphinx/domains/cpp.py    | 25 ++++++++++++++++---------
 tests/test_cpp_domain.py |  4 +++-
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 77ec032d9..f99c3ffc7 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -425,27 +425,31 @@ class MemberObjDefExpr(NamedDefExpr):
 
 class FuncDefExpr(NamedDefExpr):
 
-    def __init__(self, name, visibility, static, explicit, rv,
+    def __init__(self, name, visibility, static, explicit, constexpr, rv,
                  signature, const, pure_virtual):
         NamedDefExpr.__init__(self, name, visibility, static)
         self.rv = rv
         self.signature = signature
         self.explicit = explicit
+        self.constexpr = constexpr
         self.const = const
         self.pure_virtual = pure_virtual
 
     def get_id(self):
-        return u'%s%s%s' % (
+        return u'%s%s%s%s' % (
             self.name.get_id(),
             self.signature and u'__' +
                 u'.'.join(x.get_id() for x in self.signature) or u'',
-            self.const and u'C' or u''
+            self.const and u'C' or u'',
+            self.constexpr and 'CE' or ''
         )
 
     def __unicode__(self):
         buf = self.get_modifiers()
         if self.explicit:
             buf.append(u'explicit')
+        if self.constexpr:
+            buf.append(u'constexpr')
         if self.rv is not None:
             buf.append(unicode(self.rv))
         buf.append(u'%s(%s)' % (self.name, u', '.join(
@@ -815,11 +819,14 @@ class DefinitionParser(object):
 
     def parse_function(self):
         visibility, static = self._parse_visibility_static()
-        if self.skip_word('explicit'):
-            explicit = True
-            self.skip_ws()
-        else:
-            explicit = False
+        def _read_word(x):
+            if self.skip_word(x):
+                self.skip_ws()
+                return True
+            return False
+        explicit = _read_word('explicit')
+        constexpr = _read_word('constexpr')
+
         rv = self._parse_type()
         self.skip_ws()
         # some things just don't have return values
@@ -828,7 +835,7 @@ class DefinitionParser(object):
             rv = None
         else:
             name = self._parse_type()
-        return FuncDefExpr(name, visibility, static, explicit, rv,
+        return FuncDefExpr(name, visibility, static, explicit, constexpr, rv,
                            *self._parse_signature())
 
     def parse_class(self):
diff --git a/tests/test_cpp_domain.py b/tests/test_cpp_domain.py
index eb08c6085..a4e805100 100644
--- a/tests/test_cpp_domain.py
+++ b/tests/test_cpp_domain.py
@@ -48,10 +48,12 @@ def test_type_definitions():
 
     assert unicode(parse('type_object', 'long long int foo')) == 'long long foo'
 
-
     x = 'MyClass::MyClass(MyClass::MyClass&&)'
     assert unicode(parse('function', x)) == x
 
+    x = 'constexpr int get_value()'
+    assert unicode(parse('function', x)) == x
+
 
 def test_operators():
     x = parse('function', 'void operator new [  ] ()')

From 9753d743fcd8934c518366d226403d0265304cb1 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 22 Sep 2011 10:43:24 +0200
Subject: [PATCH 119/226] Added support for constexpr in function signatures

---
 sphinx/domains/cpp.py    | 25 ++++++++++++++++---------
 tests/test_cpp_domain.py |  4 +++-
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 2facdc93e..372decdcb 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -421,27 +421,31 @@ class MemberObjDefExpr(NamedDefExpr):
 
 class FuncDefExpr(NamedDefExpr):
 
-    def __init__(self, name, visibility, static, explicit, rv,
+    def __init__(self, name, visibility, static, explicit, constexpr, rv,
                  signature, const, pure_virtual):
         NamedDefExpr.__init__(self, name, visibility, static)
         self.rv = rv
         self.signature = signature
         self.explicit = explicit
+        self.constexpr = constexpr
         self.const = const
         self.pure_virtual = pure_virtual
 
     def get_id(self):
-        return u'%s%s%s' % (
+        return u'%s%s%s%s' % (
             self.name.get_id(),
             self.signature and u'__' +
                 u'.'.join(x.get_id() for x in self.signature) or u'',
-            self.const and u'C' or u''
+            self.const and u'C' or u'',
+            self.constexpr and 'CE' or ''
         )
 
     def __unicode__(self):
         buf = self.get_modifiers()
         if self.explicit:
             buf.append(u'explicit')
+        if self.constexpr:
+            buf.append(u'constexpr')
         if self.rv is not None:
             buf.append(unicode(self.rv))
         buf.append(u'%s(%s)' % (self.name, u', '.join(
@@ -811,11 +815,14 @@ class DefinitionParser(object):
 
     def parse_function(self):
         visibility, static = self._parse_visibility_static()
-        if self.skip_word('explicit'):
-            explicit = True
-            self.skip_ws()
-        else:
-            explicit = False
+        def _read_word(x):
+            if self.skip_word(x):
+                self.skip_ws()
+                return True
+            return False
+        explicit = _read_word('explicit')
+        constexpr = _read_word('constexpr')
+
         rv = self._parse_type()
         self.skip_ws()
         # some things just don't have return values
@@ -824,7 +831,7 @@ class DefinitionParser(object):
             rv = None
         else:
             name = self._parse_type()
-        return FuncDefExpr(name, visibility, static, explicit, rv,
+        return FuncDefExpr(name, visibility, static, explicit, constexpr, rv,
                            *self._parse_signature())
 
     def parse_class(self):
diff --git a/tests/test_cpp_domain.py b/tests/test_cpp_domain.py
index eb08c6085..a4e805100 100644
--- a/tests/test_cpp_domain.py
+++ b/tests/test_cpp_domain.py
@@ -48,10 +48,12 @@ def test_type_definitions():
 
     assert unicode(parse('type_object', 'long long int foo')) == 'long long foo'
 
-
     x = 'MyClass::MyClass(MyClass::MyClass&&)'
     assert unicode(parse('function', x)) == x
 
+    x = 'constexpr int get_value()'
+    assert unicode(parse('function', x)) == x
+
 
 def test_operators():
     x = parse('function', 'void operator new [  ] ()')

From 5542003e96df4311bac4ab50aa478e72cd68f02b Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 22 Sep 2011 10:54:16 +0200
Subject: [PATCH 120/226] Small refactoring for how modifiers are parsed in the
 C++ domain.

---
 sphinx/domains/cpp.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index f99c3ffc7..9ec70f537 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -529,6 +529,12 @@ class DefinitionParser(object):
     def skip_ws(self):
         return self.match(_whitespace_re)
 
+    def skip_word_and_ws(self, word):
+        if self.skip_word(word):
+            self.skip_ws()
+            return True
+        return False
+
     @property
     def eof(self):
         return self.pos >= self.end
@@ -769,9 +775,7 @@ class DefinitionParser(object):
 
             args.append(ArgumentDefExpr(argtype, argname, default))
         self.skip_ws()
-        const = self.skip_word('const')
-        if const:
-            self.skip_ws()
+        const = self.skip_word_and_ws('const')
         if self.skip_string('='):
             self.skip_ws()
             if not (self.skip_string('0') or \
@@ -786,7 +790,7 @@ class DefinitionParser(object):
         return args, const, pure_virtual
 
     def _parse_visibility_static(self):
-        visibility =  'public'
+        visibility = 'public'
         if self.match(_visibility_re):
             visibility = self.matched_text
         static = self.skip_word('static')
@@ -819,13 +823,8 @@ class DefinitionParser(object):
 
     def parse_function(self):
         visibility, static = self._parse_visibility_static()
-        def _read_word(x):
-            if self.skip_word(x):
-                self.skip_ws()
-                return True
-            return False
-        explicit = _read_word('explicit')
-        constexpr = _read_word('constexpr')
+        explicit = self.skip_word_and_ws('explicit')
+        constexpr = self.skip_word_and_ws('constexpr')
 
         rv = self._parse_type()
         self.skip_ws()

From deda15bed3cea902c850c80d66f990364ba7450d Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 22 Sep 2011 10:54:16 +0200
Subject: [PATCH 121/226] Small refactoring for how modifiers are parsed in the
 C++ domain.

---
 sphinx/domains/cpp.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 372decdcb..d6a1055e2 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -525,6 +525,12 @@ class DefinitionParser(object):
     def skip_ws(self):
         return self.match(_whitespace_re)
 
+    def skip_word_and_ws(self, word):
+        if self.skip_word(word):
+            self.skip_ws()
+            return True
+        return False
+
     @property
     def eof(self):
         return self.pos >= self.end
@@ -765,9 +771,7 @@ class DefinitionParser(object):
 
             args.append(ArgumentDefExpr(argtype, argname, default))
         self.skip_ws()
-        const = self.skip_word('const')
-        if const:
-            self.skip_ws()
+        const = self.skip_word_and_ws('const')
         if self.skip_string('='):
             self.skip_ws()
             if not (self.skip_string('0') or \
@@ -782,7 +786,7 @@ class DefinitionParser(object):
         return args, const, pure_virtual
 
     def _parse_visibility_static(self):
-        visibility =  'public'
+        visibility = 'public'
         if self.match(_visibility_re):
             visibility = self.matched_text
         static = self.skip_word('static')
@@ -815,13 +819,8 @@ class DefinitionParser(object):
 
     def parse_function(self):
         visibility, static = self._parse_visibility_static()
-        def _read_word(x):
-            if self.skip_word(x):
-                self.skip_ws()
-                return True
-            return False
-        explicit = _read_word('explicit')
-        constexpr = _read_word('constexpr')
+        explicit = self.skip_word_and_ws('explicit')
+        constexpr = self.skip_word_and_ws('constexpr')
 
         rv = self._parse_type()
         self.skip_ws()

From 794e241ba51c92678b345363badc7c507accc0e3 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 22 Sep 2011 11:15:46 +0200
Subject: [PATCH 122/226] Added support for noexcept specifiers

---
 sphinx/domains/cpp.py    | 8 ++++++--
 tests/test_cpp_domain.py | 3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 9ec70f537..ecae79f61 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -426,13 +426,14 @@ class MemberObjDefExpr(NamedDefExpr):
 class FuncDefExpr(NamedDefExpr):
 
     def __init__(self, name, visibility, static, explicit, constexpr, rv,
-                 signature, const, pure_virtual):
+                 signature, const, noexcept, pure_virtual):
         NamedDefExpr.__init__(self, name, visibility, static)
         self.rv = rv
         self.signature = signature
         self.explicit = explicit
         self.constexpr = constexpr
         self.const = const
+        self.noexcept = noexcept
         self.pure_virtual = pure_virtual
 
     def get_id(self):
@@ -456,6 +457,8 @@ class FuncDefExpr(NamedDefExpr):
             map(unicode, self.signature))))
         if self.const:
             buf.append(u'const')
+        if self.noexcept:
+            buf.append(u'noexcept')
         if self.pure_virtual:
             buf.append(u'= 0')
         return u' '.join(buf)
@@ -776,6 +779,7 @@ class DefinitionParser(object):
             args.append(ArgumentDefExpr(argtype, argname, default))
         self.skip_ws()
         const = self.skip_word_and_ws('const')
+        noexcept = self.skip_word_and_ws('noexcept')
         if self.skip_string('='):
             self.skip_ws()
             if not (self.skip_string('0') or \
@@ -787,7 +791,7 @@ class DefinitionParser(object):
             pure_virtual = True
         else:
             pure_virtual = False
-        return args, const, pure_virtual
+        return args, const, noexcept, pure_virtual
 
     def _parse_visibility_static(self):
         visibility = 'public'
diff --git a/tests/test_cpp_domain.py b/tests/test_cpp_domain.py
index a4e805100..61ad91e7a 100644
--- a/tests/test_cpp_domain.py
+++ b/tests/test_cpp_domain.py
@@ -54,6 +54,9 @@ def test_type_definitions():
     x = 'constexpr int get_value()'
     assert unicode(parse('function', x)) == x
 
+    x = 'int get_value() const noexcept'
+    assert unicode(parse('function', x)) == x
+
 
 def test_operators():
     x = parse('function', 'void operator new [  ] ()')

From 48ca7f47f917c761eef6d8ac6d71d21d1d7b9e18 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 22 Sep 2011 11:15:46 +0200
Subject: [PATCH 123/226] Added support for noexcept specifiers

---
 sphinx/domains/cpp.py    | 8 ++++++--
 tests/test_cpp_domain.py | 3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index d6a1055e2..68cb62934 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -422,13 +422,14 @@ class MemberObjDefExpr(NamedDefExpr):
 class FuncDefExpr(NamedDefExpr):
 
     def __init__(self, name, visibility, static, explicit, constexpr, rv,
-                 signature, const, pure_virtual):
+                 signature, const, noexcept, pure_virtual):
         NamedDefExpr.__init__(self, name, visibility, static)
         self.rv = rv
         self.signature = signature
         self.explicit = explicit
         self.constexpr = constexpr
         self.const = const
+        self.noexcept = noexcept
         self.pure_virtual = pure_virtual
 
     def get_id(self):
@@ -452,6 +453,8 @@ class FuncDefExpr(NamedDefExpr):
             map(unicode, self.signature))))
         if self.const:
             buf.append(u'const')
+        if self.noexcept:
+            buf.append(u'noexcept')
         if self.pure_virtual:
             buf.append(u'= 0')
         return u' '.join(buf)
@@ -772,6 +775,7 @@ class DefinitionParser(object):
             args.append(ArgumentDefExpr(argtype, argname, default))
         self.skip_ws()
         const = self.skip_word_and_ws('const')
+        noexcept = self.skip_word_and_ws('noexcept')
         if self.skip_string('='):
             self.skip_ws()
             if not (self.skip_string('0') or \
@@ -783,7 +787,7 @@ class DefinitionParser(object):
             pure_virtual = True
         else:
             pure_virtual = False
-        return args, const, pure_virtual
+        return args, const, noexcept, pure_virtual
 
     def _parse_visibility_static(self):
         visibility = 'public'
diff --git a/tests/test_cpp_domain.py b/tests/test_cpp_domain.py
index a4e805100..61ad91e7a 100644
--- a/tests/test_cpp_domain.py
+++ b/tests/test_cpp_domain.py
@@ -54,6 +54,9 @@ def test_type_definitions():
     x = 'constexpr int get_value()'
     assert unicode(parse('function', x)) == x
 
+    x = 'int get_value() const noexcept'
+    assert unicode(parse('function', x)) == x
+
 
 def test_operators():
     x = parse('function', 'void operator new [  ] ()')

From 49f1425da3c78fb0665bfa9775982a634fe7a8eb Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 22 Sep 2011 11:17:18 +0200
Subject: [PATCH 124/226] Added support for strings with commas in template
 definitions.

---
 sphinx/domains/cpp.py    | 2 +-
 tests/test_cpp_domain.py | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index ecae79f61..d0c62bc74 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -29,7 +29,7 @@ _string_re = re.compile(r"[LuU8]?('([^'\\]*(?:\\.[^'\\]*)*)'"
                         r'|"([^"\\]*(?:\\.[^"\\]*)*)")', re.S)
 _visibility_re = re.compile(r'\b(public|private|protected)\b')
 _array_def_re = re.compile(r'\[\s*(.+?)?\s*\]')
-_template_arg_re = re.compile(r'[^,>]+')
+_template_arg_re = re.compile(r'(%s)|([^,>]+)' % _string_re.pattern, re.S)
 _operator_re = re.compile(r'''(?x)
         \[\s*\]
     |   \(\s*\)
diff --git a/tests/test_cpp_domain.py b/tests/test_cpp_domain.py
index 61ad91e7a..30cdb69e7 100644
--- a/tests/test_cpp_domain.py
+++ b/tests/test_cpp_domain.py
@@ -28,6 +28,9 @@ def test_type_definitions():
     x = 'void operator()(const boost::array<VertexID, 2>& v) const'
     assert unicode(parse('function', x)) == x
 
+    x = 'void operator()(const boost::array<VertexID, 2, "foo,  bar">& v) const'
+    assert unicode(parse('function', x)) == x
+
     rv = parse('member_object', 'const std::vector< unsigned int, long> &name')
     assert unicode(rv) == 'const std::vector<unsigned int, long>& name'
 

From 9325a16c6f62141b3d254a3217c51e8defd52eb6 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 22 Sep 2011 11:17:18 +0200
Subject: [PATCH 125/226] Added support for strings with commas in template
 definitions.

---
 sphinx/domains/cpp.py    | 2 +-
 tests/test_cpp_domain.py | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 68cb62934..f616ee079 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -29,7 +29,7 @@ _string_re = re.compile(r"[LuU8]?('([^'\\]*(?:\\.[^'\\]*)*)'"
                         r'|"([^"\\]*(?:\\.[^"\\]*)*)")', re.S)
 _visibility_re = re.compile(r'\b(public|private|protected)\b')
 _array_def_re = re.compile(r'\[\s*(.+?)?\s*\]')
-_template_arg_re = re.compile(r'[^,>]+')
+_template_arg_re = re.compile(r'(%s)|([^,>]+)' % _string_re.pattern, re.S)
 _operator_re = re.compile(r'''(?x)
         \[\s*\]
     |   \(\s*\)
diff --git a/tests/test_cpp_domain.py b/tests/test_cpp_domain.py
index 61ad91e7a..30cdb69e7 100644
--- a/tests/test_cpp_domain.py
+++ b/tests/test_cpp_domain.py
@@ -28,6 +28,9 @@ def test_type_definitions():
     x = 'void operator()(const boost::array<VertexID, 2>& v) const'
     assert unicode(parse('function', x)) == x
 
+    x = 'void operator()(const boost::array<VertexID, 2, "foo,  bar">& v) const'
+    assert unicode(parse('function', x)) == x
+
     rv = parse('member_object', 'const std::vector< unsigned int, long> &name')
     assert unicode(rv) == 'const std::vector<unsigned int, long>& name'
 

From 020daea23f09d445eb09607c6a6e0281c464ab9d Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 22 Sep 2011 11:30:06 +0200
Subject: [PATCH 126/226] Fix #704: image file duplication bug.

---
 CHANGES                 | 2 ++
 sphinx/util/__init__.py | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index ddb8dea33..dea951de7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 1.0.8 (in development)
 ==============================
 
+* #704: Fix image file duplication bug.
+
 * #677: Fix parsing of multiple signatures in C++ domain.
 
 * #637: Ignore Emacs lock files when looking for source files.
diff --git a/sphinx/util/__init__.py b/sphinx/util/__init__.py
index b7e64b116..d2b9193c3 100644
--- a/sphinx/util/__init__.py
+++ b/sphinx/util/__init__.py
@@ -113,11 +113,11 @@ class FilenameUniqDict(dict):
         return uniquename
 
     def purge_doc(self, docname):
-        for filename, (docs, _) in self.items():
+        for filename, (docs, unique) in self.items():
             docs.discard(docname)
             if not docs:
                 del self[filename]
-                self._existing.discard(filename)
+                self._existing.discard(unique)
 
     def __getstate__(self):
         return self._existing

From 7be5f21f844f1107b6c281c08b7abccc7ac6603d Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 22 Sep 2011 12:42:45 +0200
Subject: [PATCH 127/226] Fix #720: add dummy visitor for graphviz nodes for
 man/text writer.

---
 CHANGES                   |  2 ++
 sphinx/ext/graphviz.py    | 20 +++++++++++++++++++-
 sphinx/writers/manpage.py |  4 ++--
 sphinx/writers/text.py    |  2 ++
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index dea951de7..e8a281aad 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 1.0.8 (in development)
 ==============================
 
+* #720: Add dummy visitors for graphviz nodes for text and man.
+
 * #704: Fix image file duplication bug.
 
 * #677: Fix parsing of multiple signatures in C++ domain.
diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py
index 1bb70d022..bf62c0638 100644
--- a/sphinx/ext/graphviz.py
+++ b/sphinx/ext/graphviz.py
@@ -24,6 +24,7 @@ from docutils import nodes
 from docutils.parsers.rst import directives
 
 from sphinx.errors import SphinxError
+from sphinx.locale import _
 from sphinx.util.osutil import ensuredir, ENOENT, EPIPE
 from sphinx.util.compat import Directive
 
@@ -243,10 +244,27 @@ def render_dot_latex(self, node, code, options, prefix='graphviz'):
 def latex_visit_graphviz(self, node):
     render_dot_latex(self, node, node['code'], node['options'])
 
+
+def text_visit_graphviz(self, node):
+    if 'alt' in node.attributes:
+        self.add_text(_('[graph: %s]') % node['alt'])
+    self.add_text(_('[graph]'))
+    raise nodes.SkipNode
+
+
+def man_visit_graphviz(self, node):
+    if 'alt' in node.attributes:
+        self.body.append(_('[graph: %s]') % node['alt'] + '\n')
+    self.body.append(_('[graph]'))
+    raise nodes.SkipNode
+
+
 def setup(app):
     app.add_node(graphviz,
                  html=(html_visit_graphviz, None),
-                 latex=(latex_visit_graphviz, None))
+                 latex=(latex_visit_graphviz, None),
+                 text=(text_visit_graphviz, None),
+                 man=(man_visit_graphviz, None))
     app.add_directive('graphviz', Graphviz)
     app.add_directive('graph', GraphvizSimple)
     app.add_directive('digraph', GraphvizSimple)
diff --git a/sphinx/writers/manpage.py b/sphinx/writers/manpage.py
index 5377ee58f..e49ba521e 100644
--- a/sphinx/writers/manpage.py
+++ b/sphinx/writers/manpage.py
@@ -226,8 +226,8 @@ class ManualPageTranslator(BaseTranslator):
     # overwritten -- don't emit a warning for images
     def visit_image(self, node):
         if 'alt' in node.attributes:
-            self.body.append('[image: %s]\n' % node['alt'])
-        self.body.append('[image]\n')
+            self.body.append(_('[image: %s]') % node['alt'] + '\n')
+        self.body.append(_('[image]') + '\n')
         raise nodes.SkipNode
 
     # overwritten -- don't visit inner marked up nodes
diff --git a/sphinx/writers/text.py b/sphinx/writers/text.py
index b82bfcdbb..4d28e7e4a 100644
--- a/sphinx/writers/text.py
+++ b/sphinx/writers/text.py
@@ -426,6 +426,8 @@ class TextTranslator(nodes.NodeVisitor):
         raise nodes.SkipNode
 
     def visit_image(self, node):
+        if 'alt' in node.attributes:
+            self.add_text(_('[image: %s]') % node['alt'])
         self.add_text(_('[image]'))
         raise nodes.SkipNode
 

From 3d4b8830a079fab5186573a60e774be2d46d53ff Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 22 Sep 2011 14:05:03 +0200
Subject: [PATCH 128/226] Fix #708: add reference to Pandoc.

---
 doc/intro.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/intro.rst b/doc/intro.rst
index 1a39e266c..1c7906ade 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -35,6 +35,9 @@ to reStructuredText/Sphinx from other documentation systems.
 * Marcin Wojdyr has written a script to convert Docbook to reST with Sphinx
   markup; it is at `Google Code <http://code.google.com/p/db2rst/>`_.
 
+* To convert different markups, `Pandoc <http://johnmacfarlane.net/pandoc/>`_ is
+  a very helpful tool.
+
 
 Use with other systems
 ----------------------

From f250397f77848926575e0bdba0cd7736ed2c8171 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 22 Sep 2011 14:28:31 +0200
Subject: [PATCH 129/226] Always close .buildinfo file after reading.

---
 sphinx/builders/html.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py
index 8ff628c90..ca3d61616 100644
--- a/sphinx/builders/html.py
+++ b/sphinx/builders/html.py
@@ -159,17 +159,19 @@ class StandaloneHTMLBuilder(Builder):
         old_config_hash = old_tags_hash = ''
         try:
             fp = open(path.join(self.outdir, '.buildinfo'))
-            version = fp.readline()
-            if version.rstrip() != '# Sphinx build info version 1':
-                raise ValueError
-            fp.readline()  # skip commentary
-            cfg, old_config_hash = fp.readline().strip().split(': ')
-            if cfg != 'config':
-                raise ValueError
-            tag, old_tags_hash = fp.readline().strip().split(': ')
-            if tag != 'tags':
-                raise ValueError
-            fp.close()
+            try:
+                version = fp.readline()
+                if version.rstrip() != '# Sphinx build info version 1':
+                    raise ValueError
+                fp.readline()  # skip commentary
+                cfg, old_config_hash = fp.readline().strip().split(': ')
+                if cfg != 'config':
+                    raise ValueError
+                tag, old_tags_hash = fp.readline().strip().split(': ')
+                if tag != 'tags':
+                    raise ValueError
+            finally:
+                fp.close()
         except ValueError:
             self.warn('unsupported build info format in %r, building all' %
                       path.join(self.outdir, '.buildinfo'))

From 5315d23365672cc43ae1c30224de5a1529e63122 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 23 Sep 2011 00:48:52 +0200
Subject: [PATCH 130/226] Attach arrays to the name not the type for C++ domain
 and fixed a few rendering errors.

---
 doc/domains.rst       |  12 ++++
 sphinx/domains/cpp.py | 126 ++++++++++++++++++++++++++++--------------
 2 files changed, 98 insertions(+), 40 deletions(-)

diff --git a/doc/domains.rst b/doc/domains.rst
index a1e7b98e3..9894caab3 100644
--- a/doc/domains.rst
+++ b/doc/domains.rst
@@ -535,8 +535,14 @@ The following directives are available:
 
          Describe a casting operator here.
 
+      .. cpp:function:: constexpr void foo(std::string &bar[2]) noexcept
+
+         Describe a constexpr function here.
+
       .. cpp:member:: std::string theclass::name
 
+      .. cpp:member:: std::string theclass::name[N][M]
+
       .. cpp:type:: theclass::const_iterator
 
    Will be rendered like this:
@@ -557,8 +563,14 @@ The following directives are available:
 
          Describe a casting operator here.
 
+      .. cpp:function:: constexpr void foo(std::string &bar[2]) noexcept
+
+         Describe a constexpr function here.
+
       .. cpp:member:: std::string theclass::name
 
+      .. cpp:member:: std::string theclass::name[N][M]
+
       .. cpp:type:: theclass::const_iterator
 
 .. rst:directive:: .. cpp:namespace:: namespace
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index d0c62bc74..b1f95291c 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -28,7 +28,7 @@ _whitespace_re = re.compile(r'\s+(?u)')
 _string_re = re.compile(r"[LuU8]?('([^'\\]*(?:\\.[^'\\]*)*)'"
                         r'|"([^"\\]*(?:\\.[^"\\]*)*)")', re.S)
 _visibility_re = re.compile(r'\b(public|private|protected)\b')
-_array_def_re = re.compile(r'\[\s*(.+?)?\s*\]')
+_array_def_re = re.compile(r'\[\s*([^\]]+?)?\s*\]')
 _template_arg_re = re.compile(r'(%s)|([^,>]+)' % _string_re.pattern, re.S)
 _operator_re = re.compile(r'''(?x)
         \[\s*\]
@@ -223,6 +223,20 @@ class PathDefExpr(PrimaryDefExpr):
         return u'::'.join(map(unicode, self.path))
 
 
+class ArrayTypeSuffixDefExpr(object):
+
+    def __init__(self, size_hint=None):
+        self.size_hint = size_hint
+
+    def get_id_suffix(self):
+        return 'A'
+
+    def __unicode__(self):
+        return u'[%s]' % (
+            self.size_hint is not None and unicode(self.size_hint) or u'',
+        )
+
+
 class TemplateDefExpr(PrimaryDefExpr):
 
     def __init__(self, typename, args):
@@ -287,22 +301,6 @@ class PtrDefExpr(WrappingDefExpr):
         return u'%s*' % self.typename
 
 
-class ArrayDefExpr(WrappingDefExpr):
-
-    def __init__(self, typename, size_hint=None):
-        WrappingDefExpr.__init__(self, typename)
-        self.size_hint = size_hint
-
-    def get_id(self):
-        return self.typename.get_id() + u'A'
-
-    def __unicode__(self):
-        return u'%s[%s]' % (
-            self.typename,
-            self.size_hint is not None and unicode(self.size_hint) or u''
-        )
-
-
 class LValRefDefExpr(WrappingDefExpr):
 
     def get_id(self):
@@ -348,22 +346,29 @@ class CastOpDefExpr(PrimaryDefExpr):
 
 class ArgumentDefExpr(DefExpr):
 
-    def __init__(self, type, name, default=None):
+    def __init__(self, type, name, type_suffixes, default=None):
         self.name = name
         self.type = type
+        self.type_suffixes = type_suffixes
         self.default = default
 
     def get_name(self):
         return self.name.get_name()
 
     def get_id(self):
-        if self.type is None:
-            return 'X'
-        return self.type.get_id()
+        buf = []
+        buf.append(self.type and self.type.get_id() or 'X')
+        for suffix in self.type_suffixes:
+            buf.append(suffix.get_id_suffix())
+        return u''.join(buf)
 
     def __unicode__(self):
-        return (u'%s %s' % (self.type or u'', self.name or u'')).strip() + \
-               (self.default is not None and u'=%s' % self.default or u'')
+        buf = [(u'%s %s' % (self.type or u'', self.name or u'')).strip()]
+        if self.default is not None:
+            buf.append('=%s' % self.default)
+        for suffix in self.type_suffixes:
+            buf.append(unicode(suffix))
+        return u''.join(buf)
 
 
 class NamedDefExpr(DefExpr):
@@ -387,14 +392,19 @@ class NamedDefExpr(DefExpr):
 
 class TypeObjDefExpr(NamedDefExpr):
 
-    def __init__(self, name, visibility, static, typename):
+    def __init__(self, name, visibility, static, typename, type_suffixes):
         NamedDefExpr.__init__(self, name, visibility, static)
         self.typename = typename
+        self.type_suffixes = type_suffixes
 
     def get_id(self):
         if self.typename is None:
-            return self.name.get_id()
-        return u'%s__%s' % (self.name.get_id(), self.typename.get_id())
+            buf = [self.name.get_id()]
+        else:
+            buf = [u'%s__%s' % (self.name.get_id(), self.typename.get_id())]
+        for suffix in self.type_suffixes:
+            buf.append(suffix.get_id_suffix())
+        return u''.join(buf)
 
     def __unicode__(self):
         buf = self.get_modifiers()
@@ -402,25 +412,36 @@ class TypeObjDefExpr(NamedDefExpr):
             buf.append(unicode(self.name))
         else:
             buf.extend(map(unicode, (self.typename, self.name)))
-        return u' '.join(buf)
+        buf = [u' '.join(buf)]
+        for suffix in self.type_suffixes:
+            buf.append(unicode(suffix))
+        return u''.join(buf)
 
 
 class MemberObjDefExpr(NamedDefExpr):
 
-    def __init__(self, name, visibility, static, typename, value):
+    def __init__(self, name, visibility, static, typename, type_suffixes,
+                 value):
         NamedDefExpr.__init__(self, name, visibility, static)
         self.typename = typename
+        self.type_suffixes = type_suffixes
         self.value = value
 
     def get_id(self):
-        return u'%s__%s' % (self.name.get_id(), self.typename.get_id())
+        buf = [u'%s__%s' % (self.name.get_id(), self.typename.get_id())]
+        for suffix in self.type_suffixes:
+            buf.append(suffix.get_id_suffix())
+        return u''.join(buf)
 
     def __unicode__(self):
         buf = self.get_modifiers()
-        buf.append(u'%s %s' % (self.typename, self.name))
+        buf.extend((unicode(self.typename), unicode(self.name)))
+        buf = [u' '.join(buf)]
+        for suffix in self.type_suffixes:
+            buf.append(unicode(suffix))
         if self.value is not None:
-            buf.append(u'= %s' % self.value)
-        return u' '.join(buf)
+            buf.append(u' = %s' % self.value)
+        return u''.join(buf)
 
 
 class FuncDefExpr(NamedDefExpr):
@@ -621,8 +642,6 @@ class DefinitionParser(object):
                 expr = ConstDefExpr(expr)
             elif self.skip_string('*'):
                 expr = PtrDefExpr(expr)
-            elif self.match(_array_def_re):
-                expr = ArrayDefExpr(expr, self.last_match.group(1))
             elif self.skip_string('&'):
                 if self.skip_string('&'):
                     expr = RValRefDefExpr(expr)
@@ -631,6 +650,13 @@ class DefinitionParser(object):
             else:
                 return expr
 
+    def _try_parse_type_suffixes(self):
+        rv = []
+        while self.match(_array_def_re):
+            rv.append(ArrayTypeSuffixDefExpr(self.last_match.group(1)))
+            self.skip_ws()
+        return rv
+
     def _peek_const(self, path):
         try:
             path.remove('const')
@@ -758,25 +784,29 @@ class DefinitionParser(object):
                 self.skip_ws()
 
             if self.skip_string('...'):
-                args.append(ArgumentDefExpr(None, '...', None))
+                args.append(ArgumentDefExpr(None, '...', [], None))
                 if self.skip_string(')'):
                     break
                 else:
                     self.fail('expected closing parenthesis after ellipses')
 
-            argtype = self._parse_type()
             argname = default = None
+            argtype = self._parse_type()
             self.skip_ws()
+            type_suffixes = self._try_parse_type_suffixes()
             if self.skip_string('='):
-                self.pos += 1
                 default = self._parse_default_expr()
             elif self.current_char not in ',)':
                 argname = self._parse_name()
                 self.skip_ws()
+                type_suffixes.extend(self._try_parse_type_suffixes())
                 if self.skip_string('='):
                     default = self._parse_default_expr()
+            if argname is None:
+                argname = argtype
+                argtype = None
 
-            args.append(ArgumentDefExpr(argtype, argname, default))
+            args.append(ArgumentDefExpr(argtype, argname, type_suffixes, default))
         self.skip_ws()
         const = self.skip_word_and_ws('const')
         noexcept = self.skip_word_and_ws('noexcept')
@@ -809,21 +839,25 @@ class DefinitionParser(object):
         self.skip_ws()
         if not self.eof:
             name = self._parse_type()
+            type_suffixes = self._try_parse_type_suffixes()
         else:
             name = typename
             typename = None
-        return TypeObjDefExpr(name, visibility, static, typename)
+            type_suffixes = []
+        return TypeObjDefExpr(name, visibility, static, typename, type_suffixes)
 
     def parse_member_object(self):
         visibility, static = self._parse_visibility_static()
         typename = self._parse_type()
         name = self._parse_type()
+        type_suffixes = self._try_parse_type_suffixes()
         self.skip_ws()
         if self.skip_string('='):
             value = self.read_rest().strip()
         else:
             value = None
-        return MemberObjDefExpr(name, visibility, static, typename, value)
+        return MemberObjDefExpr(name, visibility, static, typename,
+                                type_suffixes, value)
 
     def parse_function(self):
         visibility, static = self._parse_visibility_static()
@@ -868,6 +902,10 @@ class CPPObject(ObjectDescription):
             node += addnodes.desc_addname(owner, owner)
         node += addnodes.desc_name(varname, varname)
 
+    def attach_type_suffixes(self, node, suffixes):
+        for suffix in suffixes:
+            node += nodes.Text(unicode(suffix))
+
     def attach_type(self, node, type):
         # XXX: link to c?
         text = unicode(type)
@@ -886,6 +924,9 @@ class CPPObject(ObjectDescription):
         if obj.static:
             node += addnodes.desc_annotation('static', 'static')
             node += nodes.Text(' ')
+        if getattr(obj, 'constexpr', False):
+            node += addnodes.desc_annotation('constexpr', 'constexpr')
+            node += nodes.Text(' ')
 
     def add_target_and_index(self, sigobj, sig, signode):
         theid = sigobj.get_id()
@@ -971,6 +1012,7 @@ class CPPTypeObject(CPPObject):
             self.attach_type(signode, obj.typename)
             signode += nodes.Text(' ')
         self.attach_name(signode, obj.name)
+        self.attach_type_suffixes(signode, obj.type_suffixes)
 
 
 class CPPMemberObject(CPPObject):
@@ -988,6 +1030,7 @@ class CPPMemberObject(CPPObject):
         self.attach_type(signode, obj.typename)
         signode += nodes.Text(' ')
         self.attach_name(signode, obj.name)
+        self.attach_type_suffixes(signode, obj.type_suffixes)
         if obj.value is not None:
             signode += nodes.Text(u' = ' + obj.value)
 
@@ -1017,6 +1060,7 @@ class CPPFunctionObject(CPPObject):
                 self.attach_type(param, arg.type)
                 param += nodes.Text(u' ')
             param += nodes.emphasis(unicode(arg.name), unicode(arg.name))
+            self.attach_type_suffixes(param, arg.type_suffixes)
             if arg.default is not None:
                 def_ = u'=' + unicode(arg.default)
                 param += nodes.emphasis(def_, def_)
@@ -1025,6 +1069,8 @@ class CPPFunctionObject(CPPObject):
         node += paramlist
         if func.const:
             node += addnodes.desc_addname(' const', ' const')
+        if func.noexcept:
+            node += addnodes.desc_addname(' noexcept', ' noexcept')
         if func.pure_virtual:
             node += addnodes.desc_addname(' = 0', ' = 0')
 

From 7eae4bcaeb2c3d152a30ca13e8429a9480109db0 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 23 Sep 2011 00:48:52 +0200
Subject: [PATCH 131/226] Attach arrays to the name not the type for C++ domain
 and fixed a few rendering errors.

---
 doc/domains.rst       |  12 ++++
 sphinx/domains/cpp.py | 126 ++++++++++++++++++++++++++++--------------
 2 files changed, 98 insertions(+), 40 deletions(-)

diff --git a/doc/domains.rst b/doc/domains.rst
index 6e6a9b26a..56442599e 100644
--- a/doc/domains.rst
+++ b/doc/domains.rst
@@ -496,8 +496,14 @@ The following directives are available:
 
          Describe a casting operator here.
 
+      .. cpp:function:: constexpr void foo(std::string &bar[2]) noexcept
+
+         Describe a constexpr function here.
+
       .. cpp:member:: std::string theclass::name
 
+      .. cpp:member:: std::string theclass::name[N][M]
+
       .. cpp:type:: theclass::const_iterator
 
    Will be rendered like this:
@@ -518,8 +524,14 @@ The following directives are available:
 
          Describe a casting operator here.
 
+      .. cpp:function:: constexpr void foo(std::string &bar[2]) noexcept
+
+         Describe a constexpr function here.
+
       .. cpp:member:: std::string theclass::name
 
+      .. cpp:member:: std::string theclass::name[N][M]
+
       .. cpp:type:: theclass::const_iterator
 
 .. rst:directive:: .. cpp:namespace:: namespace
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index f616ee079..ca984dab8 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -28,7 +28,7 @@ _whitespace_re = re.compile(r'\s+(?u)')
 _string_re = re.compile(r"[LuU8]?('([^'\\]*(?:\\.[^'\\]*)*)'"
                         r'|"([^"\\]*(?:\\.[^"\\]*)*)")', re.S)
 _visibility_re = re.compile(r'\b(public|private|protected)\b')
-_array_def_re = re.compile(r'\[\s*(.+?)?\s*\]')
+_array_def_re = re.compile(r'\[\s*([^\]]+?)?\s*\]')
 _template_arg_re = re.compile(r'(%s)|([^,>]+)' % _string_re.pattern, re.S)
 _operator_re = re.compile(r'''(?x)
         \[\s*\]
@@ -219,6 +219,20 @@ class PathDefExpr(PrimaryDefExpr):
         return u'::'.join(map(unicode, self.path))
 
 
+class ArrayTypeSuffixDefExpr(object):
+
+    def __init__(self, size_hint=None):
+        self.size_hint = size_hint
+
+    def get_id_suffix(self):
+        return 'A'
+
+    def __unicode__(self):
+        return u'[%s]' % (
+            self.size_hint is not None and unicode(self.size_hint) or u'',
+        )
+
+
 class TemplateDefExpr(PrimaryDefExpr):
 
     def __init__(self, typename, args):
@@ -283,22 +297,6 @@ class PtrDefExpr(WrappingDefExpr):
         return u'%s*' % self.typename
 
 
-class ArrayDefExpr(WrappingDefExpr):
-
-    def __init__(self, typename, size_hint=None):
-        WrappingDefExpr.__init__(self, typename)
-        self.size_hint = size_hint
-
-    def get_id(self):
-        return self.typename.get_id() + u'A'
-
-    def __unicode__(self):
-        return u'%s[%s]' % (
-            self.typename,
-            self.size_hint is not None and unicode(self.size_hint) or u''
-        )
-
-
 class LValRefDefExpr(WrappingDefExpr):
 
     def get_id(self):
@@ -344,22 +342,29 @@ class CastOpDefExpr(PrimaryDefExpr):
 
 class ArgumentDefExpr(DefExpr):
 
-    def __init__(self, type, name, default=None):
+    def __init__(self, type, name, type_suffixes, default=None):
         self.name = name
         self.type = type
+        self.type_suffixes = type_suffixes
         self.default = default
 
     def get_name(self):
         return self.name.get_name()
 
     def get_id(self):
-        if self.type is None:
-            return 'X'
-        return self.type.get_id()
+        buf = []
+        buf.append(self.type and self.type.get_id() or 'X')
+        for suffix in self.type_suffixes:
+            buf.append(suffix.get_id_suffix())
+        return u''.join(buf)
 
     def __unicode__(self):
-        return (u'%s %s' % (self.type or u'', self.name or u'')).strip() + \
-               (self.default is not None and u'=%s' % self.default or u'')
+        buf = [(u'%s %s' % (self.type or u'', self.name or u'')).strip()]
+        if self.default is not None:
+            buf.append('=%s' % self.default)
+        for suffix in self.type_suffixes:
+            buf.append(unicode(suffix))
+        return u''.join(buf)
 
 
 class NamedDefExpr(DefExpr):
@@ -383,14 +388,19 @@ class NamedDefExpr(DefExpr):
 
 class TypeObjDefExpr(NamedDefExpr):
 
-    def __init__(self, name, visibility, static, typename):
+    def __init__(self, name, visibility, static, typename, type_suffixes):
         NamedDefExpr.__init__(self, name, visibility, static)
         self.typename = typename
+        self.type_suffixes = type_suffixes
 
     def get_id(self):
         if self.typename is None:
-            return self.name.get_id()
-        return u'%s__%s' % (self.name.get_id(), self.typename.get_id())
+            buf = [self.name.get_id()]
+        else:
+            buf = [u'%s__%s' % (self.name.get_id(), self.typename.get_id())]
+        for suffix in self.type_suffixes:
+            buf.append(suffix.get_id_suffix())
+        return u''.join(buf)
 
     def __unicode__(self):
         buf = self.get_modifiers()
@@ -398,25 +408,36 @@ class TypeObjDefExpr(NamedDefExpr):
             buf.append(unicode(self.name))
         else:
             buf.extend(map(unicode, (self.typename, self.name)))
-        return u' '.join(buf)
+        buf = [u' '.join(buf)]
+        for suffix in self.type_suffixes:
+            buf.append(unicode(suffix))
+        return u''.join(buf)
 
 
 class MemberObjDefExpr(NamedDefExpr):
 
-    def __init__(self, name, visibility, static, typename, value):
+    def __init__(self, name, visibility, static, typename, type_suffixes,
+                 value):
         NamedDefExpr.__init__(self, name, visibility, static)
         self.typename = typename
+        self.type_suffixes = type_suffixes
         self.value = value
 
     def get_id(self):
-        return u'%s__%s' % (self.name.get_id(), self.typename.get_id())
+        buf = [u'%s__%s' % (self.name.get_id(), self.typename.get_id())]
+        for suffix in self.type_suffixes:
+            buf.append(suffix.get_id_suffix())
+        return u''.join(buf)
 
     def __unicode__(self):
         buf = self.get_modifiers()
-        buf.append(u'%s %s' % (self.typename, self.name))
+        buf.extend((unicode(self.typename), unicode(self.name)))
+        buf = [u' '.join(buf)]
+        for suffix in self.type_suffixes:
+            buf.append(unicode(suffix))
         if self.value is not None:
-            buf.append(u'= %s' % self.value)
-        return u' '.join(buf)
+            buf.append(u' = %s' % self.value)
+        return u''.join(buf)
 
 
 class FuncDefExpr(NamedDefExpr):
@@ -617,8 +638,6 @@ class DefinitionParser(object):
                 expr = ConstDefExpr(expr)
             elif self.skip_string('*'):
                 expr = PtrDefExpr(expr)
-            elif self.match(_array_def_re):
-                expr = ArrayDefExpr(expr, self.last_match.group(1))
             elif self.skip_string('&'):
                 if self.skip_string('&'):
                     expr = RValRefDefExpr(expr)
@@ -627,6 +646,13 @@ class DefinitionParser(object):
             else:
                 return expr
 
+    def _try_parse_type_suffixes(self):
+        rv = []
+        while self.match(_array_def_re):
+            rv.append(ArrayTypeSuffixDefExpr(self.last_match.group(1)))
+            self.skip_ws()
+        return rv
+
     def _peek_const(self, path):
         try:
             path.remove('const')
@@ -754,25 +780,29 @@ class DefinitionParser(object):
                 self.skip_ws()
 
             if self.skip_string('...'):
-                args.append(ArgumentDefExpr(None, '...', None))
+                args.append(ArgumentDefExpr(None, '...', [], None))
                 if self.skip_string(')'):
                     break
                 else:
                     self.fail('expected closing parenthesis after ellipses')
 
-            argtype = self._parse_type()
             argname = default = None
+            argtype = self._parse_type()
             self.skip_ws()
+            type_suffixes = self._try_parse_type_suffixes()
             if self.skip_string('='):
-                self.pos += 1
                 default = self._parse_default_expr()
             elif self.current_char not in ',)':
                 argname = self._parse_name()
                 self.skip_ws()
+                type_suffixes.extend(self._try_parse_type_suffixes())
                 if self.skip_string('='):
                     default = self._parse_default_expr()
+            if argname is None:
+                argname = argtype
+                argtype = None
 
-            args.append(ArgumentDefExpr(argtype, argname, default))
+            args.append(ArgumentDefExpr(argtype, argname, type_suffixes, default))
         self.skip_ws()
         const = self.skip_word_and_ws('const')
         noexcept = self.skip_word_and_ws('noexcept')
@@ -805,21 +835,25 @@ class DefinitionParser(object):
         self.skip_ws()
         if not self.eof:
             name = self._parse_type()
+            type_suffixes = self._try_parse_type_suffixes()
         else:
             name = typename
             typename = None
-        return TypeObjDefExpr(name, visibility, static, typename)
+            type_suffixes = []
+        return TypeObjDefExpr(name, visibility, static, typename, type_suffixes)
 
     def parse_member_object(self):
         visibility, static = self._parse_visibility_static()
         typename = self._parse_type()
         name = self._parse_type()
+        type_suffixes = self._try_parse_type_suffixes()
         self.skip_ws()
         if self.skip_string('='):
             value = self.read_rest().strip()
         else:
             value = None
-        return MemberObjDefExpr(name, visibility, static, typename, value)
+        return MemberObjDefExpr(name, visibility, static, typename,
+                                type_suffixes, value)
 
     def parse_function(self):
         visibility, static = self._parse_visibility_static()
@@ -864,6 +898,10 @@ class CPPObject(ObjectDescription):
             node += addnodes.desc_addname(owner, owner)
         node += addnodes.desc_name(varname, varname)
 
+    def attach_type_suffixes(self, node, suffixes):
+        for suffix in suffixes:
+            node += nodes.Text(unicode(suffix))
+
     def attach_type(self, node, type):
         # XXX: link to c?
         text = unicode(type)
@@ -882,6 +920,9 @@ class CPPObject(ObjectDescription):
         if obj.static:
             node += addnodes.desc_annotation('static', 'static')
             node += nodes.Text(' ')
+        if getattr(obj, 'constexpr', False):
+            node += addnodes.desc_annotation('constexpr', 'constexpr')
+            node += nodes.Text(' ')
 
     def add_target_and_index(self, sigobj, sig, signode):
         theid = sigobj.get_id()
@@ -967,6 +1008,7 @@ class CPPTypeObject(CPPObject):
             self.attach_type(signode, obj.typename)
             signode += nodes.Text(' ')
         self.attach_name(signode, obj.name)
+        self.attach_type_suffixes(signode, obj.type_suffixes)
 
 
 class CPPMemberObject(CPPObject):
@@ -984,6 +1026,7 @@ class CPPMemberObject(CPPObject):
         self.attach_type(signode, obj.typename)
         signode += nodes.Text(' ')
         self.attach_name(signode, obj.name)
+        self.attach_type_suffixes(signode, obj.type_suffixes)
         if obj.value is not None:
             signode += nodes.Text(u' = ' + obj.value)
 
@@ -1013,6 +1056,7 @@ class CPPFunctionObject(CPPObject):
                 self.attach_type(param, arg.type)
                 param += nodes.Text(u' ')
             param += nodes.emphasis(unicode(arg.name), unicode(arg.name))
+            self.attach_type_suffixes(param, arg.type_suffixes)
             if arg.default is not None:
                 def_ = u'=' + unicode(arg.default)
                 param += nodes.emphasis(def_, def_)
@@ -1021,6 +1065,8 @@ class CPPFunctionObject(CPPObject):
         node += paramlist
         if func.const:
             node += addnodes.desc_addname(' const', ' const')
+        if func.noexcept:
+            node += addnodes.desc_addname(' noexcept', ' noexcept')
         if func.pure_virtual:
             node += addnodes.desc_addname(' = 0', ' = 0')
 

From f6711a62090beae8158501a6b7a3e68d821ffc72 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 23 Sep 2011 00:51:43 +0200
Subject: [PATCH 132/226] Added more tests to the basic parsing of C++
 signatures

---
 tests/test_cpp_domain.py | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/tests/test_cpp_domain.py b/tests/test_cpp_domain.py
index 30cdb69e7..22e24a08b 100644
--- a/tests/test_cpp_domain.py
+++ b/tests/test_cpp_domain.py
@@ -25,11 +25,8 @@ def test_type_definitions():
     rv = parse('member_object', '  const  std::string  &  name leftover')
     assert unicode(rv) == 'const std::string& name'
 
-    x = 'void operator()(const boost::array<VertexID, 2>& v) const'
-    assert unicode(parse('function', x)) == x
-
-    x = 'void operator()(const boost::array<VertexID, 2, "foo,  bar">& v) const'
-    assert unicode(parse('function', x)) == x
+    rv = parse('member_object', '  const  std::string  &  name [n] leftover')
+    assert unicode(rv) == 'const std::string& name[n]'
 
     rv = parse('member_object', 'const std::vector< unsigned int, long> &name')
     assert unicode(rv) == 'const std::vector<unsigned int, long>& name'
@@ -51,6 +48,12 @@ def test_type_definitions():
 
     assert unicode(parse('type_object', 'long long int foo')) == 'long long foo'
 
+    x = 'void operator()(const boost::array<VertexID, 2>& v) const'
+    assert unicode(parse('function', x)) == x
+
+    x = 'void operator()(const boost::array<VertexID, 2, "foo,  bar">& v) const'
+    assert unicode(parse('function', x)) == x
+
     x = 'MyClass::MyClass(MyClass::MyClass&&)'
     assert unicode(parse('function', x)) == x
 
@@ -60,6 +63,16 @@ def test_type_definitions():
     x = 'int get_value() const noexcept'
     assert unicode(parse('function', x)) == x
 
+    x = 'int main(int argc, char* argv[][])'
+    assert unicode(parse('function', x)) == x
+
+    x = 'std::vector<std::pair<std::string, int>>& module::test(register ' \
+        'foo, bar[n], std::string baz="foobar, blah, bleh") const = 0'
+    assert unicode(parse('function', x)) == x
+
+    x = 'module::myclass foo[n]'
+    assert unicode(parse('member_object', x)) == x
+
 
 def test_operators():
     x = parse('function', 'void operator new [  ] ()')

From c45de4cccd1c2bbbdd13712c81f3330bae7bce79 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 23 Sep 2011 07:58:45 +0200
Subject: [PATCH 133/226] Update release date.

---
 CHANGES | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 291255232..b2edc8c9d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-Release 1.0.8 (Sep 22, 2011)
+Release 1.0.8 (Sep 23, 2011)
 ============================
 
 * #633: Allow footnotes in section headers in LaTeX output.

From 2ff5e6fdd031c3766905ab042bdc8eee54e76967 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 23 Sep 2011 07:59:19 +0200
Subject: [PATCH 134/226] Update tox.ini with py32/du08 envs.

---
 tox.ini | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/tox.ini b/tox.ini
index 01d12ee6e..15e36aae3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,9 @@
 [tox]
-envlist=py24,py25,py26,py27,py31,pypy,du07,du06,du05
+envlist=py24,py25,py26,py27,py31,py32,pypy,du08,du07,du06,du05
 
 [testenv]
-deps=nose
+deps=
+    nose
 commands=
     nosetests
     sphinx-build -W -b html -d {envtmpdir}/doctrees doc {envtmpdir}/html
@@ -12,14 +13,6 @@ deps=
     nose
     simplejson
 
-[testenv:py25]
-deps=
-    nose
-    simplejson
-
-[testenv:py31]
-deps=https://bitbucket.org/jpellerin/nose3/get/tip.zip
-
 [testenv:pypy]
 deps=
     nose
@@ -39,3 +32,8 @@ deps=
 deps=
     nose
     docutils==0.7
+
+[testenv:du08]
+deps=
+    nose
+    docutils==0.8.1

From fef4faf50d51009160a7947eebd877fb44f6f862 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 23 Sep 2011 08:02:55 +0200
Subject: [PATCH 135/226] Changelog entry for C++ domain changes.

---
 CHANGES | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index b2edc8c9d..6e37d7432 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 Release 1.0.8 (Sep 23, 2011)
 ============================
 
+* #696, #666: Fix C++ array definitions and template arguments
+  that are not type names.
+
 * #633: Allow footnotes in section headers in LaTeX output.
 
 * #616: Allow keywords to be linked via intersphinx.

From db87ed440c39f08800feb11a5e851674ab949c6b Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 23 Sep 2011 09:46:24 +0200
Subject: [PATCH 136/226] Fix #648: Fix line numbers reported in warnings about
 undefined references.

---
 CHANGES                      |  3 ++
 sphinx/directives/code.py    |  6 ++--
 sphinx/directives/other.py   | 17 ++++++----
 sphinx/domains/c.py          |  5 ++-
 sphinx/domains/cpp.py        | 11 +++----
 sphinx/domains/javascript.py |  5 ++-
 sphinx/domains/python.py     | 14 ++++----
 sphinx/domains/rst.py        | 10 +++---
 sphinx/domains/std.py        |  5 ++-
 sphinx/environment.py        | 63 ++++++++++++++++--------------------
 sphinx/ext/doctest.py        |  3 +-
 sphinx/ext/extlinks.py       |  8 ++---
 sphinx/ext/ifconfig.py       |  3 +-
 sphinx/ext/intersphinx.py    |  2 +-
 sphinx/ext/mathbase.py       |  3 +-
 sphinx/ext/oldcmarkup.py     |  4 +--
 sphinx/ext/todo.py           |  8 +++--
 sphinx/roles.py              |  4 +--
 sphinx/util/nodes.py         | 28 ++++++++++++++++
 tests/test_build_html.py     |  4 +--
 20 files changed, 113 insertions(+), 93 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6e37d7432..690354a67 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 Release 1.0.8 (Sep 23, 2011)
 ============================
 
+* #648: Fix line numbers reported in warnings about undefined
+  references.
+
 * #696, #666: Fix C++ array definitions and template arguments
   that are not type names.
 
diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py
index 6073a7de2..ca2ea61ba 100644
--- a/sphinx/directives/code.py
+++ b/sphinx/directives/code.py
@@ -17,6 +17,7 @@ from docutils.parsers.rst import Directive, directives
 
 from sphinx import addnodes
 from sphinx.util import parselinenos
+from sphinx.util.nodes import set_source_info
 
 
 class Highlight(Directive):
@@ -64,7 +65,7 @@ class CodeBlock(Directive):
         literal = nodes.literal_block(code, code)
         literal['language'] = self.arguments[0]
         literal['linenos'] = 'linenos' in self.options
-        literal.line = self.lineno
+        set_source_info(self, literal)
         return [literal]
 
 
@@ -186,8 +187,7 @@ class LiteralInclude(Directive):
         if self.options.get('tab-width'):
             text = text.expandtabs(self.options['tab-width'])
         retnode = nodes.literal_block(text, text, source=fn)
-        retnode.line = 1
-        retnode.attributes['line_number'] = self.lineno
+        set_source_info(self, retnode)
         if self.options.get('language', ''):
             retnode['language'] = self.options['language']
         if 'linenos' in self.options:
diff --git a/sphinx/directives/other.py b/sphinx/directives/other.py
index f59a29e14..606c559bf 100644
--- a/sphinx/directives/other.py
+++ b/sphinx/directives/other.py
@@ -15,7 +15,7 @@ from docutils.parsers.rst import Directive, directives
 from sphinx import addnodes
 from sphinx.locale import pairindextypes, _
 from sphinx.util import url_re, docname_join
-from sphinx.util.nodes import explicit_title_re
+from sphinx.util.nodes import explicit_title_re, set_source_info
 from sphinx.util.compat import make_admonition
 from sphinx.util.matching import patfilter
 
@@ -101,6 +101,7 @@ class TocTree(Directive):
         subnode['hidden'] = 'hidden' in self.options
         subnode['numbered'] = 'numbered' in self.options
         subnode['titlesonly'] = 'titlesonly' in self.options
+        set_source_info(self, subnode)
         wrappernode = nodes.compound(classes=['toctree-wrapper'])
         wrappernode.append(subnode)
         ret.append(wrappernode)
@@ -205,6 +206,7 @@ class VersionChange(Directive):
     def run(self):
         node = addnodes.versionmodified()
         node.document = self.state.document
+        set_source_info(self, node)
         node['type'] = self.name
         node['version'] = self.arguments[0]
         if len(self.arguments) == 2:
@@ -217,7 +219,8 @@ class VersionChange(Directive):
         else:
             ret = [node]
         env = self.state.document.settings.env
-        env.note_versionchange(node['type'], node['version'], node, self.lineno)
+        # XXX should record node.source as well
+        env.note_versionchange(node['type'], node['version'], node, node.line)
         return ret
 
 
@@ -261,7 +264,7 @@ class TabularColumns(Directive):
     def run(self):
         node = addnodes.tabular_col_spec()
         node['spec'] = self.arguments[0]
-        node.line = self.lineno
+        set_source_info(self, node)
         return [node]
 
 
@@ -360,7 +363,7 @@ class Only(Directive):
     def run(self):
         node = addnodes.only()
         node.document = self.state.document
-        node.line = self.lineno
+        set_source_info(self, node)
         node['expr'] = self.arguments[0]
         self.state.nested_parse(self.content, self.content_offset, node,
                                 match_titles=1)
@@ -376,10 +379,10 @@ class Include(BaseInclude):
     """
 
     def run(self):
-        if self.arguments[0].startswith('/') or \
-               self.arguments[0].startswith(os.sep):
+        path = self.arguments[0]
+        if path.startswith('/') or path.startswith(os.sep):
             env = self.state.document.settings.env
-            self.arguments[0] = os.path.join(env.srcdir, self.arguments[0][1:])
+            self.arguments[0] = os.path.join(env.srcdir, path[1:])
         return BaseInclude.run(self)
 
 
diff --git a/sphinx/domains/c.py b/sphinx/domains/c.py
index 48fbb36f2..253fd345a 100644
--- a/sphinx/domains/c.py
+++ b/sphinx/domains/c.py
@@ -159,11 +159,10 @@ class CObject(ObjectDescription):
             self.state.document.note_explicit_target(signode)
             inv = self.env.domaindata['c']['objects']
             if name in inv:
-                self.env.warn(
-                    self.env.docname,
+                self.state_machine.reporter.warning(
                     'duplicate C object description of %s, ' % name +
                     'other instance in ' + self.env.doc2path(inv[name][0]),
-                    self.lineno)
+                    line=self.lineno)
             inv[name] = (self.env.docname, self.objtype)
 
         indextext = self.get_index_text(name)
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index ca984dab8..2f9789fd2 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -965,8 +965,7 @@ class CPPObject(ObjectDescription):
             rv = self.parse_definition(parser)
             parser.assert_end()
         except DefinitionError, e:
-            self.env.warn(self.env.docname,
-                          e.description, self.lineno)
+            self.state_machine.reporter.warning(e.description, line=self.lineno)
             raise ValueError
         self.describe_signature(signode, rv)
 
@@ -1111,8 +1110,8 @@ class CPPCurrentNamespace(Directive):
                 prefix = parser.parse_type()
                 parser.assert_end()
             except DefinitionError, e:
-                self.env.warn(self.env.docname,
-                              e.description, self.lineno)
+                self.state_machine.reporter.warning(e.description,
+                                                    line=self.lineno)
             else:
                 env.temp_data['cpp:prefix'] = prefix
         return []
@@ -1186,9 +1185,7 @@ class CPPDomain(Domain):
             if not parser.eof or expr is None:
                 raise DefinitionError('')
         except DefinitionError:
-            refdoc = node.get('refdoc', fromdocname)
-            env.warn(refdoc, 'unparseable C++ definition: %r' % target,
-                     node.line)
+            env.warn_node('unparseable C++ definition: %r' % target, node)
             return None
 
         parent = node['cpp:parent']
diff --git a/sphinx/domains/javascript.py b/sphinx/domains/javascript.py
index e53eb5fd5..80d25ad0f 100644
--- a/sphinx/domains/javascript.py
+++ b/sphinx/domains/javascript.py
@@ -86,12 +86,11 @@ class JSObject(ObjectDescription):
             self.state.document.note_explicit_target(signode)
             objects = self.env.domaindata['js']['objects']
             if fullname in objects:
-                self.env.warn(
-                    self.env.docname,
+                self.state_machine.reporter.warning(
                     'duplicate object description of %s, ' % fullname +
                     'other instance in ' +
                     self.env.doc2path(objects[fullname][0]),
-                    self.lineno)
+                    line=self.lineno)
             objects[fullname] = self.env.docname, self.objtype
 
         indextext = self.get_index_text(objectname, name_obj)
diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py
index 73f0440ef..e812b6106 100644
--- a/sphinx/domains/python.py
+++ b/sphinx/domains/python.py
@@ -212,13 +212,12 @@ class PyObject(ObjectDescription):
             self.state.document.note_explicit_target(signode)
             objects = self.env.domaindata['py']['objects']
             if fullname in objects:
-                self.env.warn(
-                    self.env.docname,
+                self.state_machine.reporter.warning(
                     'duplicate object description of %s, ' % fullname +
                     'other instance in ' +
                     self.env.doc2path(objects[fullname][0]) +
                     ', use :noindex: for one of them',
-                    self.lineno)
+                    line=self.lineno)
             objects[fullname] = (self.env.docname, self.objtype)
 
         indextext = self.get_index_text(modname, name_cls)
@@ -648,11 +647,10 @@ class PythonDomain(Domain):
         if not matches:
             return None
         elif len(matches) > 1:
-            env.warn(fromdocname,
-                     'more than one target found for cross-reference '
-                     '%r: %s' % (target,
-                                 ', '.join(match[0] for match in matches)),
-                     node.line)
+            env.warn_node(
+                'more than one target found for cross-reference '
+                '%r: %s' % (target, ', '.join(match[0] for match in matches)),
+                node)
         name, obj = matches[0]
 
         if obj[1] == 'module':
diff --git a/sphinx/domains/rst.py b/sphinx/domains/rst.py
index 6b3e05eec..770a6f6a7 100644
--- a/sphinx/domains/rst.py
+++ b/sphinx/domains/rst.py
@@ -38,12 +38,10 @@ class ReSTMarkup(ObjectDescription):
             objects = self.env.domaindata['rst']['objects']
             key = (self.objtype, name)
             if key in objects:
-                self.env.warn(self.env.docname,
-                              'duplicate description of %s %s, ' %
-                              (self.objtype, name) +
-                              'other instance in ' +
-                              self.env.doc2path(objects[key]),
-                              self.lineno)
+                self.state_machine.reporter.warning(
+                    'duplicate description of %s %s, ' % (self.objtype, name) +
+                    'other instance in ' + self.env.doc2path(objects[key]),
+                    line=self.lineno)
             objects[key] = self.env.docname
         indextext = self.get_index_text(self.objtype, name)
         if indextext:
diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py
index b9da29b86..389134ccc 100644
--- a/sphinx/domains/std.py
+++ b/sphinx/domains/std.py
@@ -408,9 +408,8 @@ class StandardDomain(Domain):
                 # link and object descriptions
                 continue
             if name in labels:
-                env.warn(docname, 'duplicate label %s, ' % name +
-                         'other instance in ' + env.doc2path(labels[name][0]),
-                         node.line)
+                env.warn_node('duplicate label %s, ' % name + 'other instance '
+                              'in ' + env.doc2path(labels[name][0]), node)
             anonlabels[name] = docname, labelid
             if node.tagname == 'section':
                 sectname = clean_astext(node[0]) # node[0] == title node
diff --git a/sphinx/environment.py b/sphinx/environment.py
index b2fb529fa..465c88255 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -25,7 +25,7 @@ from itertools import izip, groupby
 from docutils import nodes
 from docutils.io import FileInput, NullOutput
 from docutils.core import Publisher
-from docutils.utils import Reporter, relative_path
+from docutils.utils import Reporter, relative_path, get_source_line
 from docutils.readers import standalone
 from docutils.parsers.rst import roles, directives
 from docutils.parsers.rst.languages import en as english
@@ -37,7 +37,7 @@ from docutils.transforms.parts import ContentsFilter
 from sphinx import addnodes
 from sphinx.util import url_re, get_matching_docs, docname_join, \
      FilenameUniqDict
-from sphinx.util.nodes import clean_astext, make_refnode
+from sphinx.util.nodes import clean_astext, make_refnode, WarningStream
 from sphinx.util.osutil import movefile, SEP, ustrftime
 from sphinx.util.matching import compile_matchers
 from sphinx.util.pycompat import all
@@ -76,14 +76,6 @@ default_substitutions = set([
 dummy_reporter = Reporter('', 4, 4)
 
 
-class WarningStream(object):
-    def __init__(self, warnfunc):
-        self.warnfunc = warnfunc
-    def write(self, text):
-        if text.strip():
-            self.warnfunc(text, None, '')
-
-
 class NoUri(Exception):
     """Raised by get_relative_uri if there is no URI available."""
     pass
@@ -342,6 +334,9 @@ class BuildEnvironment:
         # strange argument order is due to backwards compatibility
         self._warnfunc(msg, (docname, lineno))
 
+    def warn_node(self, msg, node):
+        self._warnfunc(msg, '%s:%s' % get_source_line(node))
+
     def clear_doc(self, docname):
         """Remove all traces of a source file in the inventory."""
         if docname in self.all_docs:
@@ -792,8 +787,8 @@ class BuildEnvironment:
                 filepath = path.normpath(path.join(docdir, node['reftarget']))
             self.dependencies.setdefault(docname, set()).add(filepath)
             if not os.access(path.join(self.srcdir, filepath), os.R_OK):
-                self.warn(docname, 'download file not readable: %s' % filepath,
-                          getattr(node, 'line', None))
+                self.warn_node('download file not readable: %s' % filepath,
+                               node)
                 continue
             uniquename = self.dlfiles.add_file(docname, filepath)
             node['filename'] = uniquename
@@ -811,8 +806,7 @@ class BuildEnvironment:
             node['candidates'] = candidates = {}
             imguri = node['uri']
             if imguri.find('://') != -1:
-                self.warn(docname, 'nonlocal image URI found: %s' % imguri,
-                          node.line)
+                self.warn_node('nonlocal image URI found: %s' % imguri, node)
                 candidates['?'] = imguri
                 continue
             # imgpath is the image path *from srcdir*
@@ -838,9 +832,8 @@ class BuildEnvironment:
                             finally:
                                 f.close()
                         except (OSError, IOError), err:
-                            self.warn(docname, 'image file %s not '
-                                      'readable: %s' % (filename, err),
-                                      node.line)
+                            self.warn_node('image file %s not readable: %s' %
+                                           (filename, err), node)
                         if imgtype:
                             candidates['image/' + imgtype] = new_imgpath
             else:
@@ -850,8 +843,8 @@ class BuildEnvironment:
             for imgpath in candidates.itervalues():
                 self.dependencies.setdefault(docname, set()).add(imgpath)
                 if not os.access(path.join(self.srcdir, imgpath), os.R_OK):
-                    self.warn(docname, 'image file not readable: %s' % imgpath,
-                              node.line)
+                    self.warn_node('image file not readable: %s' % imgpath,
+                                   node)
                     continue
                 self.images.add_file(docname, imgpath)
 
@@ -974,9 +967,9 @@ class BuildEnvironment:
         for node in document.traverse(nodes.citation):
             label = node[0].astext()
             if label in self.citations:
-                self.warn(docname, 'duplicate citation %s, ' % label +
-                          'other instance in %s' % self.doc2path(
-                    self.citations[label][0]), node.line)
+                self.warn_node('duplicate citation %s, ' % label +
+                               'other instance in %s' % self.doc2path(
+                                   self.citations[label][0]), node)
             self.citations[label] = (docname, node['ids'][0])
 
     def note_toctree(self, docname, toctreenode):
@@ -1243,15 +1236,15 @@ class BuildEnvironment:
                                     refnode.children = [nodes.Text(title)]
                     if not toc.children:
                         # empty toc means: no titles will show up in the toctree
-                        self.warn(docname,
-                                  'toctree contains reference to document '
-                                  '%r that doesn\'t have a title: no link '
-                                  'will be generated' % ref, toctreenode.line)
+                        self.warn_node(
+                            'toctree contains reference to document %r that '
+                            'doesn\'t have a title: no link will be generated'
+                            % ref, toctreenode)
                 except KeyError:
                     # this is raised if the included file does not exist
-                    self.warn(docname, 'toctree contains reference to '
-                              'nonexisting document %r' % ref,
-                              toctreenode.line)
+                    self.warn_node(
+                        'toctree contains reference to nonexisting document %r'
+                        % ref, toctreenode)
                 else:
                     # if titles_only is given, only keep the main title and
                     # sub-toctrees
@@ -1332,8 +1325,7 @@ class BuildEnvironment:
                     # can be absolute or relative
                     docname = docname_join(refdoc, target)
                     if docname not in self.all_docs:
-                        self.warn(refdoc,
-                                  'unknown document: %s' % docname, node.line)
+                        self.warn_node('unknown document: %s' % docname, node)
                         warned = True
                     else:
                         if node['refexplicit']:
@@ -1349,8 +1341,7 @@ class BuildEnvironment:
                 elif typ == 'citation':
                     docname, labelid = self.citations.get(target, ('', ''))
                     if not docname:
-                        self.warn(refdoc,
-                                  'citation not found: %s' % target, node.line)
+                        self.warn_node('citation not found: %s' % target, node)
                         warned = True
                     else:
                         newnode = make_refnode(builder, fromdocname, docname,
@@ -1370,7 +1361,7 @@ class BuildEnvironment:
                         else:
                             msg = '%s reference target not found: ' \
                                   '%%(target)s' % typ
-                        self.warn(refdoc, msg % {'target': target}, node.line)
+                        self.warn_node(msg % {'target': target}, node)
             except NoUri:
                 newnode = contnode
             node.replace_self(newnode or contnode)
@@ -1379,8 +1370,8 @@ class BuildEnvironment:
             try:
                 ret = builder.tags.eval_condition(node['expr'])
             except Exception, err:
-                self.warn(fromdocname, 'exception while evaluating only '
-                          'directive expression: %s' % err, node.line)
+                self.warn_node('exception while evaluating only '
+                               'directive expression: %s' % err, node)
                 node.replace_self(node.children)
             else:
                 if ret:
diff --git a/sphinx/ext/doctest.py b/sphinx/ext/doctest.py
index dcee09f58..a981b9bc5 100644
--- a/sphinx/ext/doctest.py
+++ b/sphinx/ext/doctest.py
@@ -23,6 +23,7 @@ from docutils import nodes
 from docutils.parsers.rst import directives
 
 from sphinx.builders import Builder
+from sphinx.util.nodes import set_source_info
 from sphinx.util.compat import Directive
 from sphinx.util.console import bold
 
@@ -63,7 +64,7 @@ class TestDirective(Directive):
         else:
             groups = ['default']
         node = nodetype(code, code, testnodetype=self.name, groups=groups)
-        node.line = self.lineno
+        set_source_info(self, node)
         if test is not None:
             # only save if it differs from code
             node['test'] = test
diff --git a/sphinx/ext/extlinks.py b/sphinx/ext/extlinks.py
index 910354a29..9f60cdede 100644
--- a/sphinx/ext/extlinks.py
+++ b/sphinx/ext/extlinks.py
@@ -36,10 +36,10 @@ def make_link_role(base_url, prefix):
         try:
             full_url = base_url % part
         except (TypeError, ValueError):
-            env = inliner.document.settings.env
-            env.warn(env.docname, 'unable to expand %s extlink with base '
-                     'URL %r, please make sure the base contains \'%%s\' '
-                     'exactly once' % (typ, base_url))
+            inliner.reporter.warning(
+                'unable to expand %s extlink with base URL %r, please make '
+                'sure the base contains \'%%s\' exactly once'
+                % (typ, base_url), line=lineno)
             full_url = base_url + part
         if not has_explicit_title:
             if prefix is None:
diff --git a/sphinx/ext/ifconfig.py b/sphinx/ext/ifconfig.py
index 5698ca28c..50c7bbefa 100644
--- a/sphinx/ext/ifconfig.py
+++ b/sphinx/ext/ifconfig.py
@@ -22,6 +22,7 @@
 
 from docutils import nodes
 
+from sphinx.util.nodes import set_source_info
 from sphinx.util.compat import Directive
 
 
@@ -39,7 +40,7 @@ class IfConfig(Directive):
     def run(self):
         node = ifconfig()
         node.document = self.state.document
-        node.line = self.lineno
+        set_source_info(self, node)
         node['expr'] = self.arguments[0]
         self.state.nested_parse(self.content, self.content_offset,
                                 node, match_titles=1)
diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py
index 64a747c9d..4e1ca9809 100644
--- a/sphinx/ext/intersphinx.py
+++ b/sphinx/ext/intersphinx.py
@@ -151,7 +151,7 @@ def load_mappings(app):
             # new format
             name, (uri, inv) = key, value
             if not name.isalnum():
-                env.warn('intersphinx identifier %r is not alphanumeric' % name)
+                app.warn('intersphinx identifier %r is not alphanumeric' % name)
         else:
             # old format, no name
             name, uri, inv = None, key, value
diff --git a/sphinx/ext/mathbase.py b/sphinx/ext/mathbase.py
index e7ea82d7c..fc8495845 100644
--- a/sphinx/ext/mathbase.py
+++ b/sphinx/ext/mathbase.py
@@ -12,6 +12,7 @@
 from docutils import nodes, utils
 from docutils.parsers.rst import directives
 
+from sphinx.util.nodes import set_source_info
 from sphinx.util.compat import Directive
 
 
@@ -69,7 +70,7 @@ class MathDirective(Directive):
         node['nowrap'] = 'nowrap' in self.options
         node['docname'] = self.state.document.settings.env.docname
         ret = [node]
-        node.line = self.lineno
+        set_source_info(self, node)
         if hasattr(self, 'src'):
             node.source = self.src
         if node['label']:
diff --git a/sphinx/ext/oldcmarkup.py b/sphinx/ext/oldcmarkup.py
index 2bf9b65d8..cfc95ba48 100644
--- a/sphinx/ext/oldcmarkup.py
+++ b/sphinx/ext/oldcmarkup.py
@@ -31,7 +31,7 @@ class OldCDirective(Directive):
     def run(self):
         env = self.state.document.settings.env
         if not env.app._oldcmarkup_warned:
-            env.warn(env.docname, WARNING_MSG, self.lineno)
+            self.state_machine.reporter.warning(WARNING_MSG, line=self.lineno)
             env.app._oldcmarkup_warned = True
         newname = 'c:' + self.name[1:]
         newdir = env.lookup_domain_element('directive', newname)[0]
@@ -45,7 +45,7 @@ def old_crole(typ, rawtext, text, lineno, inliner, options={}, content=[]):
     if not typ:
         typ = env.config.default_role
     if not env.app._oldcmarkup_warned:
-        env.warn(env.docname, WARNING_MSG)
+        inliner.reporter.warning(WARNING_MSG, line=lineno)
         env.app._oldcmarkup_warned = True
     newtyp = 'c:' + typ[1:]
     newrole = env.lookup_domain_element('role', newtyp)[0]
diff --git a/sphinx/ext/todo.py b/sphinx/ext/todo.py
index 2ba9d5e1a..c18d70c8d 100644
--- a/sphinx/ext/todo.py
+++ b/sphinx/ext/todo.py
@@ -16,6 +16,7 @@ from docutils import nodes
 
 from sphinx.locale import _
 from sphinx.environment import NoUri
+from sphinx.util.nodes import set_source_info
 from sphinx.util.compat import Directive, make_admonition
 
 class todo_node(nodes.Admonition, nodes.Element): pass
@@ -41,7 +42,7 @@ class Todo(Directive):
         ad = make_admonition(todo_node, self.name, [_('Todo')], self.options,
                              self.content, self.lineno, self.content_offset,
                              self.block_text, self.state, self.state_machine)
-        ad[0].line = self.lineno
+        set_source_info(self, ad[0])
         return [targetnode] + ad
 
 
@@ -61,6 +62,7 @@ def process_todos(app, doctree):
             targetnode = None
         env.todo_all_todos.append({
             'docname': env.docname,
+            'source': node.source or env.doc2path(env.docname),
             'lineno': node.line,
             'todo': node.deepcopy(),
             'target': targetnode,
@@ -105,9 +107,9 @@ def process_todo_nodes(app, doctree, fromdocname):
 
         for todo_info in env.todo_all_todos:
             para = nodes.paragraph(classes=['todo-source'])
-            filename = env.doc2path(todo_info['docname'], base=None)
             description = _('(The <<original entry>> is located in '
-                            ' %s, line %d.)') % (filename, todo_info['lineno'])
+                            ' %s, line %d.)') % \
+                          (todo_info['source'], todo_info['lineno'])
             desc1 = description[:description.find('<<')]
             desc2 = description[description.find('>>')+2:]
             para += nodes.Text(desc1, desc1)
diff --git a/sphinx/roles.py b/sphinx/roles.py
index 32d02da14..e3d412997 100644
--- a/sphinx/roles.py
+++ b/sphinx/roles.py
@@ -18,7 +18,7 @@ from docutils.parsers.rst import roles
 from sphinx import addnodes
 from sphinx.locale import _
 from sphinx.util import ws_re
-from sphinx.util.nodes import split_explicit_title
+from sphinx.util.nodes import split_explicit_title, set_role_source_info
 
 
 generic_docroles = {
@@ -126,7 +126,7 @@ class XRefRole(object):
         refnode = self.nodeclass(rawtext, reftype=role, refdomain=domain,
                                  refexplicit=has_explicit_title)
         # we may need the line number for warnings
-        refnode.line = lineno
+        set_role_source_info(inliner, lineno, refnode)
         title, target = self.process_link(
             env, refnode, has_explicit_title, title, target)
         # now that the target and title are finally determined, set them
diff --git a/sphinx/util/nodes.py b/sphinx/util/nodes.py
index fd6a2f839..b7b5073d8 100644
--- a/sphinx/util/nodes.py
+++ b/sphinx/util/nodes.py
@@ -13,10 +13,23 @@ import re
 import types
 
 from docutils import nodes
+from docutils.statemachine import StateMachine
 
 from sphinx import addnodes
 
 
+class WarningStream(object):
+
+    def __init__(self, warnfunc):
+        self.warnfunc = warnfunc
+        self._re = re.compile(r'\((DEBUG|INFO|WARNING|ERROR|SEVERE)/[0-4]\)')
+
+    def write(self, text):
+        text = text.strip()
+        if text:
+            self.warnfunc(self._re.sub(r'\1:', text), None, '')
+
+
 # \x00 means the "<" was backslash-escaped
 explicit_title_re = re.compile(r'^(.+?)\s*(?<!\x00)<(.*?)>$', re.DOTALL)
 caption_ref_re = explicit_title_re  # b/w compat alias
@@ -91,6 +104,21 @@ def make_refnode(builder, fromdocname, todocname, targetid, child, title=None):
     node.append(child)
     return node
 
+
+if hasattr(StateMachine, 'get_source_and_line'):
+    def set_source_info(directive, node):
+        node.source, node.line = \
+            directive.state_machine.get_source_and_line(directive.lineno)
+    def set_role_source_info(inliner, lineno, node):
+        node.source, node.line = \
+            inliner.reporter.locator(lineno)
+else:
+    # docutils <= 0.6 compatibility
+    def set_source_info(directive, node):
+        node.line = directive.lineno
+    def set_role_source_info(inliner, lineno, node):
+        node.line = lineno
+
 # monkey-patch Node.traverse to get more speed
 # traverse() is called so many times during a build that it saves
 # on average 20-25% overall build time!
diff --git a/tests/test_build_html.py b/tests/test_build_html.py
index 638dc4afa..93aa41d41 100644
--- a/tests/test_build_html.py
+++ b/tests/test_build_html.py
@@ -32,12 +32,12 @@ html_warnfile = StringIO()
 
 ENV_WARNINGS = """\
 %(root)s/autodoc_fodder.py:docstring of autodoc_fodder\\.MarkupError:2: \
-\\(WARNING/2\\) Explicit markup ends without a blank line; unexpected \
+WARNING: Explicit markup ends without a blank line; unexpected \
 unindent\\.\\n?
 %(root)s/images.txt:9: WARNING: image file not readable: foo.png
 %(root)s/images.txt:23: WARNING: nonlocal image URI found: \
 http://www.python.org/logo.png
-%(root)s/includes.txt:\\d*: \\(WARNING/2\\) Encoding 'utf-8-sig' used for \
+%(root)s/includes.txt:\\d*: WARNING: Encoding 'utf-8-sig' used for \
 reading included file u'.*?wrongenc.inc' seems to be wrong, try giving an \
 :encoding: option\\n?
 %(root)s/includes.txt:4: WARNING: download file not readable: nonexisting.png

From 01f45a12c70320cb9a42c133d340210601103a93 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 23 Sep 2011 10:38:18 +0200
Subject: [PATCH 137/226] Fix #727: Fix the links to search results with custom
 object types.

---
 CHANGES                                   |  2 ++
 sphinx/search.py                          | 22 ++++++++++++++--------
 sphinx/themes/basic/static/searchtools.js | 11 +++++++----
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/CHANGES b/CHANGES
index 690354a67..a8904b31d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 1.0.8 (Sep 23, 2011)
 ============================
 
+* #727: Fix the links to search results with custom object types.
+
 * #648: Fix line numbers reported in warnings about undefined
   references.
 
diff --git a/sphinx/search.py b/sphinx/search.py
index 51f997c2d..373c80e37 100644
--- a/sphinx/search.py
+++ b/sphinx/search.py
@@ -121,7 +121,7 @@ class IndexBuilder(object):
         self._mapping = {}
         # objtype -> index
         self._objtypes = {}
-        # objtype index -> objname (localized)
+        # objtype index -> (domain, type, objname (localized))
         self._objnames = {}
 
     def load(self, stream, format):
@@ -160,21 +160,27 @@ class IndexBuilder(object):
                     continue
                 if prio < 0:
                     continue
-                # XXX splitting at dot is kind of Python specific
                 prefix, name = rpartition(fullname, '.')
                 pdict = rv.setdefault(prefix, {})
                 try:
-                    i = otypes[domainname, type]
+                    typeindex = otypes[domainname, type]
                 except KeyError:
-                    i = len(otypes)
-                    otypes[domainname, type] = i
+                    typeindex = len(otypes)
+                    otypes[domainname, type] = typeindex
                     otype = domain.object_types.get(type)
                     if otype:
                         # use unicode() to fire translation proxies
-                        onames[i] = unicode(domain.get_type_name(otype))
+                        onames[typeindex] = (domainname, type,
+                            unicode(domain.get_type_name(otype)))
                     else:
-                        onames[i] = type
-                pdict[name] = (fn2index[docname], i, prio)
+                        onames[typeindex] = (domainname, type, type)
+                if anchor == fullname:
+                    shortanchor = ''
+                elif anchor == type + '-' + fullname:
+                    shortanchor = '-'
+                else:
+                    shortanchor = anchor
+                pdict[name] = (fn2index[docname], typeindex, prio, shortanchor)
         return rv
 
     def get_terms(self, fn2index):
diff --git a/sphinx/themes/basic/static/searchtools.js b/sphinx/themes/basic/static/searchtools.js
index 9308c6d5c..04ce07534 100644
--- a/sphinx/themes/basic/static/searchtools.js
+++ b/sphinx/themes/basic/static/searchtools.js
@@ -363,10 +363,13 @@ var Search = {
           var fullname = (prefix ? prefix + '.' : '') + name;
           if (fullname.toLowerCase().indexOf(object) > -1) {
             match = objects[prefix][name];
-            descr = objnames[match[1]] + _(', in ') + titles[match[0]];
-            // XXX the generated anchors are not generally correct
-            // XXX there may be custom prefixes
-            result = [filenames[match[0]], fullname, '#'+fullname, descr];
+            descr = objnames[match[1]][0] + _(', in ') + titles[match[0]];
+            anchor = match[3];
+            if (anchor == '')
+              anchor = fullname;
+            else if (anchor == '-')
+              anchor = objnames[match[1]][1] + '-' + fullname;
+            result = [filenames[match[0]], fullname, '#'+anchor, descr];
             switch (match[2]) {
             case 1: objectResults.push(result); break;
             case 0: importantResults.push(result); break;

From 757d0013a70f0df65b353aa4ce9c3355781c35b3 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 23 Sep 2011 10:40:18 +0200
Subject: [PATCH 138/226] Fix the ``abbr`` role when the abbreviation has
 newlines in it.

---
 CHANGES         | 2 ++
 sphinx/roles.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index a8904b31d..3b8495e72 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 1.0.8 (Sep 23, 2011)
 ============================
 
+* Fix the ``abbr`` role when the abbreviation has newlines in it.
+
 * #727: Fix the links to search results with custom object types.
 
 * #648: Fix line numbers reported in warnings about undefined
diff --git a/sphinx/roles.py b/sphinx/roles.py
index e3d412997..0ef3624ef 100644
--- a/sphinx/roles.py
+++ b/sphinx/roles.py
@@ -259,7 +259,7 @@ def emph_literal_role(typ, rawtext, text, lineno, inliner,
     return [retnode], []
 
 
-_abbr_re = re.compile('\((.*)\)$')
+_abbr_re = re.compile('\((.*)\)$', re.S)
 
 def abbr_role(typ, rawtext, text, lineno, inliner, options={}, content=[]):
     text = utils.unescape(text)

From 69f7e0768114fde9ccabc4bf7d56f765743612a6 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 23 Sep 2011 10:46:43 +0200
Subject: [PATCH 139/226] Fix #627: Fix tracebacks for AttributeErrors in
 autosummary generation.

---
 CHANGES                            |  2 ++
 sphinx/ext/autosummary/generate.py | 13 +++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3b8495e72..6fb83f404 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 1.0.8 (Sep 23, 2011)
 ============================
 
+* #627: Fix tracebacks for AttributeErrors in autosummary generation.
+
 * Fix the ``abbr`` role when the abbreviation has newlines in it.
 
 * #727: Fix the links to search results with custom object types.
diff --git a/sphinx/ext/autosummary/generate.py b/sphinx/ext/autosummary/generate.py
index b5ff3f4ca..86be0e53a 100644
--- a/sphinx/ext/autosummary/generate.py
+++ b/sphinx/ext/autosummary/generate.py
@@ -29,6 +29,7 @@ from jinja2.sandbox import SandboxedEnvironment
 from sphinx.ext.autosummary import import_by_name, get_documenter
 from sphinx.jinja2glue import BuiltinTemplateLoader
 from sphinx.util.osutil import ensuredir
+from sphinx.util.inspect import safe_getattr
 
 def main(argv=sys.argv):
     usage = """%prog [OPTIONS] SOURCEFILE ..."""
@@ -135,10 +136,14 @@ def generate_autosummary_docs(sources, output_dir=None, suffix='.rst',
                     template = template_env.get_template('autosummary/base.rst')
 
             def get_members(obj, typ, include_public=[]):
-                items = [
-                    name for name in dir(obj)
-                    if get_documenter(getattr(obj, name), obj).objtype == typ
-                ]
+                items = []
+                for name in dir(obj):
+                    try:
+                        documenter = get_documenter(safe_getattr(obj, name), obj)
+                    except AttributeError:
+                        continue
+                    if documenter.objtype == typ:
+                        items.append(name)
                 public = [x for x in items
                           if x in include_public or not x.startswith('_')]
                 return public, items

From f04abffe60c17e4d21518e07d29e69561926ef63 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 23 Sep 2011 11:00:45 +0200
Subject: [PATCH 140/226] Fix index.

---
 sphinx/themes/basic/static/searchtools.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/themes/basic/static/searchtools.js b/sphinx/themes/basic/static/searchtools.js
index 04ce07534..4a78f9130 100644
--- a/sphinx/themes/basic/static/searchtools.js
+++ b/sphinx/themes/basic/static/searchtools.js
@@ -363,7 +363,7 @@ var Search = {
           var fullname = (prefix ? prefix + '.' : '') + name;
           if (fullname.toLowerCase().indexOf(object) > -1) {
             match = objects[prefix][name];
-            descr = objnames[match[1]][0] + _(', in ') + titles[match[0]];
+            descr = objnames[match[1]][2] + _(', in ') + titles[match[0]];
             anchor = match[3];
             if (anchor == '')
               anchor = fullname;

From a0b27776f1d0d7895c2c8f7dd503aa9cd738d898 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 23 Sep 2011 11:15:14 +0200
Subject: [PATCH 141/226] Fix output for complicated signatures in latex.

---
 sphinx/writers/latex.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index 1418dc276..5e0411e6b 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -515,7 +515,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
         else:
             self.body.append(r'\pysigline{')
     def depart_desc_signature(self, node):
-        self.body.append('}{}')
+        self.body.append('}')
 
     def visit_desc_addname(self, node):
         self.body.append(r'\code{')
@@ -530,9 +530,9 @@ class LaTeXTranslator(nodes.NodeVisitor):
         pass
 
     def visit_desc_returns(self, node):
-        self.body.append(r'}{ $\rightarrow$ ')
+        self.body.append(r'{ $\rightarrow$ ')
     def depart_desc_returns(self, node):
-        pass
+        self.body.append(r'}')
 
     def visit_desc_name(self, node):
         self.body.append(r'\bfcode{')
@@ -542,10 +542,12 @@ class LaTeXTranslator(nodes.NodeVisitor):
         self.literal_whitespace -= 1
 
     def visit_desc_parameterlist(self, node):
+        # close name, open parameterlist
         self.body.append('}{')
         self.first_param = 1
     def depart_desc_parameterlist(self, node):
-        pass
+        # close parameterlist, open return annotation
+        self.body.append('}{')
 
     def visit_desc_parameter(self, node):
         if not self.first_param:

From 87a417b3b181755a1bde519c9e0681e12926724b Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 23 Sep 2011 11:16:40 +0200
Subject: [PATCH 142/226] Add Elemental.

---
 EXAMPLES | 1 +
 1 file changed, 1 insertion(+)

diff --git a/EXAMPLES b/EXAMPLES
index 2f21cf3ad..76e03a3b9 100644
--- a/EXAMPLES
+++ b/EXAMPLES
@@ -22,6 +22,7 @@ Documentation using the default theme
 * Cormoran: http://cormoran.nhopkg.org/docs/
 * Director: http://packages.python.org/director/
 * Dirigible: http://www.projectdirigible.com/documentation/
+* Elemental: http://elemental.googlecode.com/hg/doc/build/html/index.html
 * F2py: http://www.f2py.org/html/
 * GeoDjango: http://geodjango.org/docs/
 * Genomedata: http://noble.gs.washington.edu/proj/genomedata/doc/1.2.2/genomedata.html

From ded4bee3281496508ac181ef460d66d3fece1a90 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 23 Sep 2011 11:22:35 +0200
Subject: [PATCH 143/226] Add note about inclusion with the "include"
 directive.

---
 doc/markup/toctree.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/markup/toctree.rst b/doc/markup/toctree.rst
index 2c0a418a2..b9eb0ebf9 100644
--- a/doc/markup/toctree.rst
+++ b/doc/markup/toctree.rst
@@ -11,6 +11,11 @@ documents into multiple output files, Sphinx uses a custom directive to add
 relations between the single files the documentation is made of, as well as
 tables of contents.  The ``toctree`` directive is the central element.
 
+.. note::
+
+   Simple "inclusion" of one file in another can be done with the
+   :dudir:`include` directive.
+
 .. rst:directive:: toctree
 
    This directive inserts a "TOC tree" at the current location, using the

From d02d07e992d258898151247e49a63a2a0458a880 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 23 Sep 2011 11:26:56 +0200
Subject: [PATCH 144/226] Switch off pagerefs in production lists.

---
 sphinx/writers/latex.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index 5e0411e6b..d282d2c99 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -1117,7 +1117,8 @@ class LaTeXTranslator(nodes.NodeVisitor):
             # references to labels in the same document
             id = self.curfilestack[-1] + ':' + uri[1:]
             self.body.append(self.hyperlink(id))
-            if self.builder.config.latex_show_pagerefs:
+            if self.builder.config.latex_show_pagerefs and not \
+                    self.in_productionlist:
                 self.context.append('}} (%s)' % self.hyperpageref(id))
             else:
                 self.context.append('}}')

From 09b5e1736cf731c8335a952d8c96f5f40acffd58 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 23 Sep 2011 11:36:32 +0200
Subject: [PATCH 145/226] Add reference to odt2sphinx.

---
 doc/intro.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/intro.rst b/doc/intro.rst
index 1c7906ade..ef8ef930b 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -35,6 +35,9 @@ to reStructuredText/Sphinx from other documentation systems.
 * Marcin Wojdyr has written a script to convert Docbook to reST with Sphinx
   markup; it is at `Google Code <http://code.google.com/p/db2rst/>`_.
 
+* Christophe de Vienne wrote a tool to convert from Open/LibreOffice documents
+  to Sphinx: `odt2sphinx <http://pypi.python.org/pypi/odt2sphinx/>`_.
+
 * To convert different markups, `Pandoc <http://johnmacfarlane.net/pandoc/>`_ is
   a very helpful tool.
 

From cd5e11abee7bdd09fd7f8a2709eb75349883beae Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 23 Sep 2011 11:42:18 +0200
Subject: [PATCH 146/226] Remove "Modules" suffix for project header.

---
 sphinx/apidoc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py
index af4043336..6006943d9 100644
--- a/sphinx/apidoc.py
+++ b/sphinx/apidoc.py
@@ -110,7 +110,7 @@ def create_modules_toc_file(master_package, modules, opts, name='modules'):
     """
     Create the module's index.
     """
-    text = format_heading(1, '%s Modules' % opts.header)
+    text = format_heading(1, '%s' % opts.header)
     text += '.. toctree::\n'
     text += '   :maxdepth: %s\n\n' % opts.maxdepth
 

From be6aa3940e2efc0a9372072ea4e6ae4525f0a2cc Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 23 Sep 2011 21:58:09 +0200
Subject: [PATCH 147/226] Shorten long lines.

---
 sphinx/domains/cpp.py              | 3 ++-
 sphinx/ext/autosummary/generate.py | 3 ++-
 sphinx/ext/intersphinx.py          | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 2f9789fd2..3349e32cf 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -802,7 +802,8 @@ class DefinitionParser(object):
                 argname = argtype
                 argtype = None
 
-            args.append(ArgumentDefExpr(argtype, argname, type_suffixes, default))
+            args.append(ArgumentDefExpr(argtype, argname,
+                                        type_suffixes, default))
         self.skip_ws()
         const = self.skip_word_and_ws('const')
         noexcept = self.skip_word_and_ws('noexcept')
diff --git a/sphinx/ext/autosummary/generate.py b/sphinx/ext/autosummary/generate.py
index 86be0e53a..dc1d6a434 100644
--- a/sphinx/ext/autosummary/generate.py
+++ b/sphinx/ext/autosummary/generate.py
@@ -139,7 +139,8 @@ def generate_autosummary_docs(sources, output_dir=None, suffix='.rst',
                 items = []
                 for name in dir(obj):
                     try:
-                        documenter = get_documenter(safe_getattr(obj, name), obj)
+                        documenter = get_documenter(safe_getattr(obj, name),
+                                                    obj)
                     except AttributeError:
                         continue
                     if documenter.objtype == typ:
diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py
index 4e1ca9809..17fe18992 100644
--- a/sphinx/ext/intersphinx.py
+++ b/sphinx/ext/intersphinx.py
@@ -207,7 +207,7 @@ def missing_reference(app, env, node, contnode):
                 continue
             proj, version, uri, dispname = inventory[objtype][target]
             newnode = nodes.reference('', '', internal=False, refuri=uri,
-                                      reftitle=_('(in %s v%s)') % (proj, version))
+                          reftitle=_('(in %s v%s)') % (proj, version))
             if node.get('refexplicit'):
                 # use whatever title was given
                 newnode.append(contnode)

From 947f64592f7ef740b3041d59652a422a32802e82 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 23 Sep 2011 22:07:48 +0200
Subject: [PATCH 149/226] Post-release updates.

---
 CHANGES            | 4 ++++
 sphinx/__init__.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 6fb83f404..fc7f1861f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Release 1.0.9 (in development)
+==============================
+
+
 Release 1.0.8 (Sep 23, 2011)
 ============================
 
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 0875c59c2..6b6af595b 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -12,7 +12,7 @@
 import sys
 from os import path
 
-__version__  = '1.0.8'
+__version__  = '1.0.8+'
 __released__ = '1.0.8'  # used when Sphinx builds its own docs
 
 package_dir = path.abspath(path.dirname(__file__))

From 142c15093a3cd5cea21450d3b9799140434ae30e Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 25 Sep 2011 08:31:27 +0200
Subject: [PATCH 150/226] Upgrade the version requirements.

---
 CHANGES  | 6 ++++++
 setup.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 1fe5ee642..b96a7eb18 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,12 @@ Incompatible changes
   value anymore.  (It was the only thing that the directive did output, and
   therefore quite inconsistent.)
 
+* Removed support for old dependency versions; requirements are now:
+
+  - Pygments >= 1.2
+  - Docutils >= 0.7
+  - Jinja2   >= 2.3
+
 Features added
 --------------
 
diff --git a/setup.py b/setup.py
index c73facaa6..a84ac7bf6 100644
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ A development egg can be found `here
 <http://bitbucket.org/birkenfeld/sphinx/get/tip.gz#egg=Sphinx-dev>`_.
 '''
 
-requires = ['Pygments>=0.8', 'Jinja2>=2.2', 'docutils>=0.5']
+requires = ['Pygments>=1.2', 'Jinja2>=2.3', 'docutils>=0.7']
 
 if sys.version_info < (2, 4):
     print('ERROR: Sphinx requires at least Python 2.4 to run.')

From 452a41ba8a001f58b3f96c5ed99f0f929af7e19c Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 25 Sep 2011 08:37:35 +0200
Subject: [PATCH 151/226] Fix tests in the face of docutils 0.6.

---
 tests/test_build_html.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_build_html.py b/tests/test_build_html.py
index 93aa41d41..77808f88d 100644
--- a/tests/test_build_html.py
+++ b/tests/test_build_html.py
@@ -40,7 +40,8 @@ http://www.python.org/logo.png
 %(root)s/includes.txt:\\d*: WARNING: Encoding 'utf-8-sig' used for \
 reading included file u'.*?wrongenc.inc' seems to be wrong, try giving an \
 :encoding: option\\n?
-%(root)s/includes.txt:4: WARNING: download file not readable: nonexisting.png
+(%(root)s/includes.txt|None):4: WARNING: download file not readable: \
+nonexisting.png
 %(root)s/objects.txt:\\d*: WARNING: using old C markup; please migrate to \
 new-style markup \(e.g. c:function instead of cfunction\), see \
 http://sphinx.pocoo.org/domains.html

From d7305c82dab383759404e3101bf58bc3d9b6de2f Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 25 Sep 2011 08:39:09 +0200
Subject: [PATCH 152/226] Remove compatibility code for Pygments < 1.2.

---
 sphinx/highlighting.py   | 23 ++++++++++-------------
 sphinx/util/texescape.py |  5 +----
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
index 0912ee053..25a777efd 100644
--- a/sphinx/highlighting.py
+++ b/sphinx/highlighting.py
@@ -20,7 +20,7 @@ except ImportError:
     # parser is not available on Jython
     parser = None
 
-from sphinx.util.texescape import tex_hl_escape_map_old, tex_hl_escape_map_new
+from sphinx.util.texescape import tex_hl_escape_map_new
 from sphinx.ext import doctest
 
 try:
@@ -54,15 +54,15 @@ else:
         _lexer.add_filter('raiseonerror')
 
 
-escape_hl_chars = {ord(u'@'): u'@PYGZat[]',
-                   ord(u'['): u'@PYGZlb[]',
-                   ord(u']'): u'@PYGZrb[]'}
+escape_hl_chars = {ord(u'\\'): u'\\PYGZbs{}',
+                   ord(u'{'): u'\\PYGZob{}',
+                   ord(u'}'): u'\\PYGZcb{}'}
 
 # used if Pygments is not available
 _LATEX_STYLES = r'''
-\newcommand\PYGZat{@}
-\newcommand\PYGZlb{[}
-\newcommand\PYGZrb{]}
+\newcommand\PYGZbs{\char`\\}
+\newcommand\PYGZob{\char`\{}
+\newcommand\PYGZcb{\char`\}}
 '''
 
 parsing_exceptions = (SyntaxError, UnicodeEncodeError)
@@ -112,8 +112,8 @@ class PygmentsBridge(object):
             # first, escape highlighting characters like Pygments does
             source = source.translate(escape_hl_chars)
             # then, escape all characters nonrepresentable in LaTeX
-            source = source.translate(tex_hl_escape_map_old)
-            return '\\begin{Verbatim}[commandchars=@\\[\\]]\n' + \
+            source = source.translate(tex_hl_escape_map_new)
+            return '\\begin{Verbatim}[commandchars=\\\\\\{\\}]\n' + \
                    source + '\\end{Verbatim}\n'
 
     def try_parse(self, src):
@@ -206,11 +206,8 @@ class PygmentsBridge(object):
             hlsource = highlight(source, lexer, formatter)
             if self.dest == 'html':
                 return hlsource
-            elif hlsource.startswith(r'\begin{Verbatim}[commandchars=\\\{\}'):
-                # Pygments >= 1.2
-                return hlsource.translate(tex_hl_escape_map_new)
             else:
-                return hlsource.translate(tex_hl_escape_map_old)
+                return hlsource.translate(tex_hl_escape_map_new)
         except ErrorToken:
             # this is most probably not the selected language,
             # so let it pass unhighlighted
diff --git a/sphinx/util/texescape.py b/sphinx/util/texescape.py
index f968f2e4c..1f6f76e66 100644
--- a/sphinx/util/texescape.py
+++ b/sphinx/util/texescape.py
@@ -100,9 +100,7 @@ tex_replacements = [
 
 tex_escape_map = {}
 tex_replace_map = {}
-tex_hl_escape_map_old = {}  # replacement map for Pygments <= 1.1
-tex_hl_escape_map_new = {}  # replacement map for Pygments >= 1.2
-_old_cmd_chars = {ord(u'\\'): u'@', ord(u'{'): u'[', ord(u'}'): u']'}
+tex_hl_escape_map_new = {}
 
 def init():
     for a, b in tex_replacements:
@@ -112,4 +110,3 @@ def init():
     for a, b in tex_replacements:
         if a in u'[]{}\\': continue
         tex_hl_escape_map_new[ord(a)] = b
-        tex_hl_escape_map_old[ord(a)] = b.translate(_old_cmd_chars)

From fa10e813e3a5582450973c9e8cbc71b6b88e88e4 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 25 Sep 2011 08:43:23 +0200
Subject: [PATCH 153/226] Remove docutils monkey-patches that are no longer
 needed with >= 0.7.

---
 sphinx/util/nodes.py | 59 ++++----------------------------------------
 1 file changed, 5 insertions(+), 54 deletions(-)

diff --git a/sphinx/util/nodes.py b/sphinx/util/nodes.py
index 9ab19d8b4..49f3a2125 100644
--- a/sphinx/util/nodes.py
+++ b/sphinx/util/nodes.py
@@ -12,11 +12,9 @@
 import re
 
 from docutils import nodes
-from docutils.statemachine import StateMachine
 
 from sphinx import addnodes
 from sphinx.locale import pairindextypes
-from sphinx.util.pycompat import class_types
 
 
 class WarningStream(object):
@@ -176,53 +174,13 @@ def make_refnode(builder, fromdocname, todocname, targetid, child, title=None):
     return node
 
 
-if hasattr(StateMachine, 'get_source_and_line'):
-    def set_source_info(directive, node):
-        node.source, node.line = \
-            directive.state_machine.get_source_and_line(directive.lineno)
-    def set_role_source_info(inliner, lineno, node):
+def set_source_info(directive, node):
+    node.source, node.line = \
+        directive.state_machine.get_source_and_line(directive.lineno)
+
+def set_role_source_info(inliner, lineno, node):
         node.source, node.line = \
             inliner.reporter.locator(lineno)
-else:
-    # docutils <= 0.6 compatibility
-    def set_source_info(directive, node):
-        node.line = directive.lineno
-    def set_role_source_info(inliner, lineno, node):
-        node.line = lineno
-
-# monkey-patch Node.traverse to get more speed
-# traverse() is called so many times during a build that it saves
-# on average 20-25% overall build time!
-
-def _all_traverse(self, result):
-    """Version of Node.traverse() that doesn't need a condition."""
-    result.append(self)
-    for child in self.children:
-        child._all_traverse(result)
-    return result
-
-def _fast_traverse(self, cls, result):
-    """Version of Node.traverse() that only supports instance checks."""
-    if isinstance(self, cls):
-        result.append(self)
-    for child in self.children:
-        child._fast_traverse(cls, result)
-    return result
-
-def _new_traverse(self, condition=None,
-                 include_self=1, descend=1, siblings=0, ascend=0):
-    if include_self and descend and not siblings and not ascend:
-        if condition is None:
-            return self._all_traverse([])
-        elif isinstance(condition, class_types):
-            return self._fast_traverse(condition, [])
-    return self._old_traverse(condition, include_self,
-                              descend, siblings, ascend)
-
-nodes.Node._old_traverse = nodes.Node.traverse
-nodes.Node._all_traverse = _all_traverse
-nodes.Node._fast_traverse = _fast_traverse
-nodes.Node.traverse = _new_traverse
 
 # monkey-patch Node.__contains__ to get consistent "in" operator behavior
 # across docutils versions
@@ -235,10 +193,3 @@ def _new_contains(self, key):
     return key in self.children
 
 nodes.Node.__contains__ = _new_contains
-
-# monkey-patch Element.copy to copy the rawsource
-
-def _new_copy(self):
-    return self.__class__(self.rawsource, **self.attributes)
-
-nodes.Element.copy = _new_copy

From c2ceb79881c8bddae7178799dfc2c661a1915017 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 25 Sep 2011 08:47:56 +0200
Subject: [PATCH 154/226] More version-compatibility hack removals.

---
 sphinx/highlighting.py | 8 +-------
 sphinx/util/compat.py  | 1 -
 sphinx/writers/html.py | 2 --
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
index 25a777efd..bf21ac64a 100644
--- a/sphinx/highlighting.py
+++ b/sphinx/highlighting.py
@@ -44,8 +44,6 @@ else:
         none = TextLexer(),
         python = PythonLexer(),
         pycon = PythonConsoleLexer(),
-        # the python3 option exists as of Pygments 1.0,
-        # but it doesn't do any harm in previous versions
         pycon3 = PythonConsoleLexer(python3=True),
         rest = RstLexer(),
         c = CLexer(),
@@ -223,8 +221,4 @@ class PygmentsBridge(object):
         if self.dest == 'html':
             return formatter.get_style_defs('.highlight')
         else:
-            styledefs = formatter.get_style_defs()
-            # workaround for Pygments < 0.12
-            if styledefs.startswith('\\newcommand\\at{@}'):
-                styledefs += _LATEX_STYLES
-            return styledefs
+            return formatter.get_style_defs()
diff --git a/sphinx/util/compat.py b/sphinx/util/compat.py
index 1a263cff1..bdb00845a 100644
--- a/sphinx/util/compat.py
+++ b/sphinx/util/compat.py
@@ -11,7 +11,6 @@
 
 from docutils import nodes
 
-# function missing in docutils 0.5
 def make_admonition(node_class, name, arguments, options, content, lineno,
                     content_offset, block_text, state, state_machine):
     #if not content:
diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py
index 7872dabe7..787b31059 100644
--- a/sphinx/writers/html.py
+++ b/sphinx/writers/html.py
@@ -428,8 +428,6 @@ class HTMLTranslator(BaseTranslator):
                 encoded = self.bulk_text_processor(encoded)
             self.body.append(encoded)
 
-    # these are all for docutils 0.5 compatibility
-
     def visit_note(self, node):
         self.visit_admonition(node, 'note')
     def depart_note(self, node):

From 6c14e874b16061e8666e507f4f2824c70455a61b Mon Sep 17 00:00:00 2001
From: Tibor Toth <szunyog@gmail.com>
Date: Tue, 27 Sep 2011 07:19:56 +0200
Subject: [PATCH 155/226] Added Hungarian translation.

---
 sphinx/locale/hu/LC_MESSAGES/sphinx.js |   1 +
 sphinx/locale/hu/LC_MESSAGES/sphinx.mo | Bin 0 -> 8166 bytes
 sphinx/locale/hu/LC_MESSAGES/sphinx.po | 592 +++++++++++++++++++++++++
 3 files changed, 593 insertions(+)
 create mode 100644 sphinx/locale/hu/LC_MESSAGES/sphinx.js
 create mode 100644 sphinx/locale/hu/LC_MESSAGES/sphinx.mo
 create mode 100644 sphinx/locale/hu/LC_MESSAGES/sphinx.po

diff --git a/sphinx/locale/hu/LC_MESSAGES/sphinx.js b/sphinx/locale/hu/LC_MESSAGES/sphinx.js
new file mode 100644
index 000000000..47830b894
--- /dev/null
+++ b/sphinx/locale/hu/LC_MESSAGES/sphinx.js
@@ -0,0 +1 @@
+Documentation.addTranslations({"locale": "hu", "plural_expr": "(n != 1)", "messages": {"Hide Search Matches": "Keresési Találatok Elrejtése", "Permalink to this definition": "Hivatkozás erre a definícióra", "Expand sidebar": "Oldalsáv kinyitása", "Permalink to this headline": "Hivatkozás erre a fejezetcímre", "Collapse sidebar": "Oldalsáv összezárása"}});
\ No newline at end of file
diff --git a/sphinx/locale/hu/LC_MESSAGES/sphinx.mo b/sphinx/locale/hu/LC_MESSAGES/sphinx.mo
new file mode 100644
index 0000000000000000000000000000000000000000..e33b7ad013a68bae2ac73c1c5112e1ae9177c5c7
GIT binary patch
literal 8166
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

literal 0
HcmV?d00001

diff --git a/sphinx/locale/hu/LC_MESSAGES/sphinx.po b/sphinx/locale/hu/LC_MESSAGES/sphinx.po
new file mode 100644
index 000000000..f8643685e
--- /dev/null
+++ b/sphinx/locale/hu/LC_MESSAGES/sphinx.po
@@ -0,0 +1,592 @@
+# Translations template for PROJECT.
+# Copyright (C) 2011 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Sphinx 1.0\n"
+"Report-Msgid-Bugs-To: szunyog@gmail.com\n"
+"POT-Creation-Date: 2011-09-25 20:04+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Tibor Toth <szunyog@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#: sphinx/environment.py:113 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
+#, python-format
+msgid "%B %d, %Y"
+msgstr "%Y %B %d"
+
+#: sphinx/environment.py:1619
+#, python-format
+msgid "see %s"
+msgstr "lásd %s"
+
+#: sphinx/environment.py:1622
+#, python-format
+msgid "see also %s"
+msgstr "lásd még %s"
+
+#: sphinx/roles.py:176
+#, python-format
+msgid "Python Enhancement Proposals; PEP %s"
+msgstr "Python Fejlesztési Javaslatok; PEP %s"
+
+#: sphinx/builders/changes.py:73
+msgid "Builtins"
+msgstr "Beépített"
+
+#: sphinx/builders/changes.py:75
+msgid "Module level"
+msgstr "Modul szint"
+
+#: sphinx/builders/html.py:276
+#, python-format
+msgid "%b %d, %Y"
+msgstr "%Y %b %d"
+
+#: sphinx/builders/html.py:295 sphinx/themes/basic/defindex.html:30
+msgid "General Index"
+msgstr "Általános tárgymutató"
+
+#: sphinx/builders/html.py:295
+msgid "index"
+msgstr "nyitóoldal"
+
+#: sphinx/builders/html.py:355
+msgid "next"
+msgstr "következő"
+
+#: sphinx/builders/html.py:364
+msgid "previous"
+msgstr "előző"
+
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
+msgid " (in "
+msgstr " ("
+
+#: sphinx/directives/other.py:138
+msgid "Section author: "
+msgstr "Fejezet szerző: "
+
+#: sphinx/directives/other.py:140
+msgid "Module author: "
+msgstr "Modul szerző: "
+
+#: sphinx/directives/other.py:142
+msgid "Code author: "
+msgstr "Kód szerző: "
+
+#: sphinx/directives/other.py:144
+msgid "Author: "
+msgstr "Szerző: "
+
+#: sphinx/directives/other.py:219
+msgid "See also"
+msgstr "Lásd még"
+
+#: sphinx/domains/__init__.py:244
+#, python-format
+msgid "%s %s"
+msgstr "%s %s"
+
+#: sphinx/domains/c.py:141
+#, python-format
+msgid "%s (C function)"
+msgstr "%s (C függvény)"
+
+#: sphinx/domains/c.py:143
+#, python-format
+msgid "%s (C member)"
+msgstr "%s (C tagváltozó)"
+
+#: sphinx/domains/c.py:145
+#, python-format
+msgid "%s (C macro)"
+msgstr "%s (C makró)"
+
+#: sphinx/domains/c.py:147
+#, python-format
+msgid "%s (C type)"
+msgstr "%s (C típus)"
+
+#: sphinx/domains/c.py:149
+#, python-format
+msgid "%s (C variable)"
+msgstr "%s (C változó)"
+
+#: sphinx/domains/cpp.py:999
+#, python-format
+msgid "%s (C++ class)"
+msgstr "%s (C++ osztály)"
+
+#: sphinx/domains/cpp.py:1014
+#, python-format
+msgid "%s (C++ type)"
+msgstr "%s (C++ típus)"
+
+#: sphinx/domains/cpp.py:1034
+#, python-format
+msgid "%s (C++ member)"
+msgstr "%s (C++ tagváltozó)"
+
+#: sphinx/domains/cpp.py:1090
+#, python-format
+msgid "%s (C++ function)"
+msgstr "%s (C++ függvény)"
+
+#: sphinx/domains/javascript.py:106 sphinx/domains/python.py:253
+#, python-format
+msgid "%s() (built-in function)"
+msgstr "%s() (beépített függvény)"
+
+#: sphinx/domains/javascript.py:107 sphinx/domains/python.py:317
+#, python-format
+msgid "%s() (%s method)"
+msgstr "%s() (%s metódus)"
+
+#: sphinx/domains/javascript.py:109
+#, python-format
+msgid "%s() (class)"
+msgstr "%s() (osztály)"
+
+#: sphinx/domains/javascript.py:111
+#, python-format
+msgid "%s (global variable or constant)"
+msgstr "%s (globális változó vagy konstans)"
+
+#: sphinx/domains/javascript.py:113 sphinx/domains/python.py:355
+#, python-format
+msgid "%s (%s attribute)"
+msgstr "%s (%s attribútum)"
+
+#: sphinx/domains/python.py:254 sphinx/domains/python.py:311
+#: sphinx/domains/python.py:323 sphinx/domains/python.py:336
+#, python-format
+msgid "%s() (in module %s)"
+msgstr "%s() (%s modulban)"
+
+#: sphinx/domains/python.py:257
+#, python-format
+msgid "%s (built-in variable)"
+msgstr "%s (beépített változó)"
+
+#: sphinx/domains/python.py:258 sphinx/domains/python.py:349
+#, python-format
+msgid "%s (in module %s)"
+msgstr "%s (%s modulban)"
+
+#: sphinx/domains/python.py:274
+#, python-format
+msgid "%s (built-in class)"
+msgstr "%s (beépített osztály)"
+
+#: sphinx/domains/python.py:275
+#, python-format
+msgid "%s (class in %s)"
+msgstr "%s (osztály %s)"
+
+#: sphinx/domains/python.py:315
+#, python-format
+msgid "%s() (%s.%s method)"
+msgstr "%s() (%s.%s metódus)"
+
+#: sphinx/domains/python.py:327
+#, python-format
+msgid "%s() (%s.%s static method)"
+msgstr "%s() (%s.%s statikus metódus)"
+
+#: sphinx/domains/python.py:330
+#, python-format
+msgid "%s() (%s static method)"
+msgstr "%s() (%s statikus metódus)"
+
+#: sphinx/domains/python.py:340
+#, python-format
+msgid "%s() (%s.%s class method)"
+msgstr "%s() (%s.%s osztály metódus)"
+
+#: sphinx/domains/python.py:343
+#, python-format
+msgid "%s() (%s class method)"
+msgstr "%s() (%s osztály metódus)"
+
+#: sphinx/domains/python.py:353
+#, python-format
+msgid "%s (%s.%s attribute)"
+msgstr "%s (%s.%s attribútum)"
+
+#: sphinx/domains/python.py:433
+#, python-format
+msgid "%s (module)"
+msgstr "%s (modul)"
+
+#: sphinx/domains/python.py:536
+msgid "Deprecated"
+msgstr "Elavult"
+
+#: sphinx/domains/python.py:693
+msgid " (deprecated)"
+msgstr " (elavult)"
+
+#: sphinx/domains/rst.py:53
+#, python-format
+msgid "%s (directive)"
+msgstr "%s (direktíva)"
+
+#: sphinx/domains/rst.py:55
+#, python-format
+msgid "%s (role)"
+msgstr "%s (szerepkör)"
+
+#: sphinx/domains/std.py:86
+#, python-format
+msgid "environment variable; %s"
+msgstr "környezeti változó; %s"
+
+#: sphinx/domains/std.py:162
+#, python-format
+msgid "%scommand line option; %s"
+msgstr "%sparancssor opció; %s"
+
+#: sphinx/ext/autodoc.py:1002
+#, python-format
+msgid "   Bases: %s"
+msgstr "   Alapul: %s"
+
+#: sphinx/ext/autodoc.py:1038
+#, python-format
+msgid "alias of :class:`%s`"
+msgstr "álneve :class:`%s`"
+
+#: sphinx/ext/graphviz.py:300 sphinx/ext/graphviz.py:306
+#, python-format
+msgid "[graph: %s]"
+msgstr "[graph: %s]"
+
+#: sphinx/ext/graphviz.py:301 sphinx/ext/graphviz.py:307
+msgid "[graph]"
+msgstr "[graph]"
+
+#: sphinx/ext/intersphinx.py:218
+#, python-format
+msgid "(in %s v%s)"
+msgstr "(%s v%s)"
+
+#: sphinx/ext/todo.py:42
+msgid "Todo"
+msgstr "Tennivaló"
+
+#: sphinx/ext/todo.py:110
+#, python-format
+msgid "(The <<original entry>> is located in  %s, line %d.)"
+msgstr "(Az <<eredeti bejegyzés>> megtalálható a(z) %s, %d sor.)"
+
+#: sphinx/ext/todo.py:119
+msgid "original entry"
+msgstr "eredeti bejegyzés"
+
+#: sphinx/ext/viewcode.py:70
+msgid "[source]"
+msgstr "[source]"
+
+#: sphinx/ext/viewcode.py:117
+msgid "[docs]"
+msgstr "[docs]"
+
+#: sphinx/ext/viewcode.py:131
+msgid "Module code"
+msgstr "Modul forráskód"
+
+#: sphinx/ext/viewcode.py:137
+#, python-format
+msgid "<h1>Source code for %s</h1>"
+msgstr "<h1>%s forráskódja</h1>"
+
+#: sphinx/ext/viewcode.py:164
+msgid "Overview: module code"
+msgstr "Áttekintés: modul forráskód"
+
+#: sphinx/ext/viewcode.py:165
+msgid "<h1>All modules for which code is available</h1>"
+msgstr "<h1>Az összes modul, melynek forrása elérhető</h1>"
+
+#: sphinx/themes/agogo/layout.html:46 sphinx/themes/basic/globaltoc.html:10
+#: sphinx/themes/basic/localtoc.html:11
+msgid "Table Of Contents"
+msgstr "Tartalomjegyzék"
+
+#: sphinx/themes/agogo/layout.html:50 sphinx/themes/basic/layout.html:137
+#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:20
+msgid "Search"
+msgstr "Keresés"
+
+#: sphinx/themes/agogo/layout.html:53 sphinx/themes/basic/searchbox.html:15
+msgid "Go"
+msgstr "Ok"
+
+#: sphinx/themes/agogo/layout.html:58 sphinx/themes/basic/searchbox.html:20
+msgid "Enter search terms or a module, class or function name."
+msgstr "Adjon meg egy keresendő kifejezést, modul, osztály vagy funkció nevet."
+
+#: sphinx/themes/agogo/layout.html:79 sphinx/themes/basic/sourcelink.html:14
+msgid "Show Source"
+msgstr "Forrás megtekintése"
+
+#: sphinx/themes/basic/defindex.html:11
+msgid "Overview"
+msgstr "Áttekintés"
+
+#: sphinx/themes/basic/defindex.html:20
+msgid "Indices and tables:"
+msgstr "Tárgymutató és táblázatok"
+
+#: sphinx/themes/basic/defindex.html:23
+msgid "Complete Table of Contents"
+msgstr "Teljes tartalomjegyzék"
+
+#: sphinx/themes/basic/defindex.html:24
+msgid "lists all sections and subsections"
+msgstr "kilistázza az összes fejezetet és alfejezetet"
+
+#: sphinx/themes/basic/defindex.html:25
+msgid "Search Page"
+msgstr "Keresés"
+
+#: sphinx/themes/basic/defindex.html:26
+msgid "search this documentation"
+msgstr "keresés ebben a dokumentációban"
+
+#: sphinx/themes/basic/defindex.html:28
+msgid "Global Module Index"
+msgstr "Teljes modul tárgymutató"
+
+#: sphinx/themes/basic/defindex.html:29
+msgid "quick access to all modules"
+msgstr "gyors hozzáférés az összes modulhoz"
+
+#: sphinx/themes/basic/defindex.html:31
+msgid "all functions, classes, terms"
+msgstr "összes funkció, osztály és kifejezés"
+
+#: sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Tárgymutató"
+
+#: sphinx/themes/basic/genindex-single.html:35
+#, python-format
+msgid "Index &ndash; %(key)s"
+msgstr "Tárgymutató &ndash; %(key)s"
+
+#: sphinx/themes/basic/genindex-single.html:63
+#: sphinx/themes/basic/genindex-split.html:24
+#: sphinx/themes/basic/genindex-split.html:38
+#: sphinx/themes/basic/genindex.html:74
+msgid "Full index on one page"
+msgstr "Teljes tárgymutató egy oldalon"
+
+#: sphinx/themes/basic/genindex-split.html:16
+msgid "Index pages by letter"
+msgstr "Oldalak ABC sorrendben"
+
+#: sphinx/themes/basic/genindex-split.html:25
+msgid "can be huge"
+msgstr "nagy lehet"
+
+#: sphinx/themes/basic/layout.html:29
+msgid "Navigation"
+msgstr "Navigáció"
+
+#: sphinx/themes/basic/layout.html:122
+#, python-format
+msgid "Search within %(docstitle)s"
+msgstr "Keresés köztük: %(docstitle)s"
+
+#: sphinx/themes/basic/layout.html:131
+msgid "About these documents"
+msgstr "Névjegy ezekről a dokumentumokról"
+
+#: sphinx/themes/basic/layout.html:140
+msgid "Copyright"
+msgstr "Minden jog fenntartva"
+
+#: sphinx/themes/basic/layout.html:189
+#, python-format
+msgid "&copy; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
+msgstr "&copy; <a href=\"%(path)s\">Minden jog fenntartva</a> %(copyright)s."
+
+#: sphinx/themes/basic/layout.html:191
+#, python-format
+msgid "&copy; Copyright %(copyright)s."
+msgstr "&copy; Minden jog fenntartva %(copyright)s."
+
+#: sphinx/themes/basic/layout.html:195
+#, python-format
+msgid "Last updated on %(last_updated)s."
+msgstr "Utolsó frissítés %(last_updated)s."
+
+#: sphinx/themes/basic/layout.html:198
+#, python-format
+msgid ""
+"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> "
+"%(sphinx_version)s."
+msgstr ""
+"<a href=\"http://sphinx.pocoo.org/\">Sphinx</a> "
+"%(sphinx_version)s használatával készült."
+
+#: sphinx/themes/basic/opensearch.xml:4
+#, python-format
+msgid "Search %(docstitle)s"
+msgstr "Keresés %(docstitle)s"
+
+#: sphinx/themes/basic/relations.html:11
+msgid "Previous topic"
+msgstr "Előző témakör"
+
+#: sphinx/themes/basic/relations.html:13
+msgid "previous chapter"
+msgstr "előző fejezet"
+
+#: sphinx/themes/basic/relations.html:16
+msgid "Next topic"
+msgstr "Következő témakör"
+
+#: sphinx/themes/basic/relations.html:18
+msgid "next chapter"
+msgstr "következő fejezet"
+
+#: sphinx/themes/basic/search.html:24
+msgid ""
+"Please activate JavaScript to enable the search\n"
+"    functionality."
+msgstr ""
+"Kérem engedélyezze a JavaScriptet a kereső funkció\n"
+"    használatához."
+
+#: sphinx/themes/basic/search.html:29
+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 ""
+"Erről az oldalról indíthatja kereséseit. Írja be a kulcsszavakat\n"
+"    az alábbi szövegdobozba, majd kattintson a \"keresés\" gombra.\n"
+"    Ügyeljen arra, hogy a keresés megadott kulcsszavak mindegyikét\n"
+"    figyelembe veszi, így azok az oldalak, melyek nem tartalmazzák az\n"
+"    összes kifejezést, nem jelennek meg a találati listában."
+
+#: sphinx/themes/basic/search.html:36
+msgid "search"
+msgstr "keresés"
+
+#: sphinx/themes/basic/search.html:40
+msgid "Search Results"
+msgstr "Keresési Eredmények"
+
+#: sphinx/themes/basic/search.html:42
+msgid "Your search did not match any results."
+msgstr "Nincs találat."
+
+#: sphinx/themes/basic/searchbox.html:12
+msgid "Quick search"
+msgstr "Gyorskeresés"
+
+#: sphinx/themes/basic/sourcelink.html:11
+msgid "This Page"
+msgstr "Ez az Oldal"
+
+#: sphinx/themes/basic/changes/frameset.html:5
+#: sphinx/themes/basic/changes/versionchanges.html:12
+#, python-format
+msgid "Changes in Version %(version)s &mdash; %(docstitle)s"
+msgstr "Változások a(z) %(version)s változatban &mdash; %(docstitle)s"
+
+#: sphinx/themes/basic/changes/rstsource.html:5
+#, python-format
+msgid "%(filename)s &mdash; %(docstitle)s"
+msgstr "%(filename)s &mdash; %(docstitle)s"
+
+#: sphinx/themes/basic/changes/versionchanges.html:17
+#, python-format
+msgid "Automatically generated list of changes in version %(version)s"
+msgstr "Automatikusan generált változáslista a(z) %(version)s változathoz"
+
+#: sphinx/themes/basic/changes/versionchanges.html:18
+msgid "Library changes"
+msgstr "Könyvtár változások"
+
+#: sphinx/themes/basic/changes/versionchanges.html:23
+msgid "C API changes"
+msgstr "C API változások"
+
+#: sphinx/themes/basic/changes/versionchanges.html:25
+msgid "Other changes"
+msgstr "Egyéb változások"
+
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
+msgid "Permalink to this headline"
+msgstr "Hivatkozás erre a fejezetcímre"
+
+#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:92
+msgid "Permalink to this definition"
+msgstr "Hivatkozás erre a definícióra"
+
+#: sphinx/themes/basic/static/doctools.js:189
+msgid "Hide Search Matches"
+msgstr "Keresési Találatok Elrejtése"
+
+#: sphinx/themes/default/static/sidebar.js:69
+msgid "Expand sidebar"
+msgstr "Oldalsáv kinyitása"
+
+#: sphinx/themes/default/static/sidebar.js:82
+#: sphinx/themes/default/static/sidebar.js:110
+msgid "Collapse sidebar"
+msgstr "Oldalsáv összezárása"
+
+#: sphinx/themes/haiku/layout.html:26
+msgid "Contents"
+msgstr "Tartalom"
+
+#: sphinx/writers/latex.py:177
+msgid "Release"
+msgstr "Kiadás"
+
+#: sphinx/writers/latex.py:599 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
+msgid "Footnotes"
+msgstr "Lábjegyzetek"
+
+#: sphinx/writers/latex.py:683
+msgid "continued from previous page"
+msgstr "folytatás az előző oldalról"
+
+#: sphinx/writers/latex.py:689
+msgid "Continued on next page"
+msgstr "A következő oldalon folytatódik"
+
+#: sphinx/writers/manpage.py:233 sphinx/writers/text.py:438
+#, python-format
+msgid "[image: %s]"
+msgstr "[image: %s]"
+
+#: sphinx/writers/manpage.py:234 sphinx/writers/text.py:439
+msgid "[image]"
+msgstr "[image]"
+
+#: tests/test_build_gettext.py:81
+msgid "Testing various markup"
+msgstr "Különféte leíró tesztelése"
+

From da0b6e6c5989ba6576bad8ccd47c83c1861249be Mon Sep 17 00:00:00 2001
From: Tibor Toth <szunyog@gmail.com>
Date: Tue, 27 Sep 2011 19:38:41 +0200
Subject: [PATCH 156/226] Compile Hungarian locale.

---
 sphinx/locale/hu/LC_MESSAGES/sphinx.mo | Bin 8166 -> 8160 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sphinx/locale/hu/LC_MESSAGES/sphinx.mo b/sphinx/locale/hu/LC_MESSAGES/sphinx.mo
index e33b7ad013a68bae2ac73c1c5112e1ae9177c5c7..193626f88a8befad0213988447ffaa219870954d 100644
GIT binary patch
delta 986
zcmXZaPe@cz6vy$Cl%q3a>HN_#%btHG^Uq>%A*Pj5DWr(tN--CT3P~U>TnWCF1i27Y
z2m-enwb6#ag{aU%g<6ywT|`C@5e>9U1)=Ycx$t<Od+xh`&OPt`Y&&jS3t#ke%xpet
zR*4Ikhwq(Rc!_uydF&IfV*HLpc!C8OjAg$kP;mnmVhd_qxBEVXapGrq1)s;vw^AA}
z>9~sPsEHrlfUkIyIOF<b%nlMKQ46H74BIh+k6k>8<-~KyV{cr%gV%|_q2`~*{p`d7
zj#Wa3hxf4=>v0-eaTQgWAJ~L{P>EMDsT%KMK8|1qKE)8eLnXF_?f4llV<ch5V--Gc
z`m6=DK_BW@45Bih!9iTY0RF`;JVA<L56D6#@5lZNX5;7)Z&OYsc#Nv-8Lu3SQ?47B
zK+W@;X{aQf$f0Z$Rk~?R;ww~wJE)Q!qW<YG)Ctd=x!1A@M^Ja=7KZT-YQsn9;S=Wz
z>}G#^OG69(L;dS~vQcI!)QRt*D$|Kdu-C=os0vM@hqI`4R#10j!+rmNx>HB!;cryp
zAx;@&e=DJ(lT~6aHlhaHMkUbU;vN?dpb{EJopb_gaR#;VYt)I;s9$h^S}%hsJaus$
xgQ5@VXriG@(uLY^2$j$n*5DLs!)4UnSaI<_s#0Il`+>dCVkVGGZ$|6F{{hq-UC{sl

delta 989
zcmXZaPe_zO7{~D^D=pppx2D_XZZBc#B8YTYg2Y|Sgxm!c2^IuHJtQg=;u7THMer6;
z-XaJDuNI1+M&KorJcLk(>QaKZ(M3d|o96e&4!pacdFGvY=b2|_Cy`4m2G02x%<M(b
z>^i<e#UGp-c%JwR^4K^2s__q2;0a#B@~Zs%C@Q{*<(Nc`>vivk@iOrfEW_tj=Gzq-
zZ|Df)Dr(|aH((d*iH}@=nAyd|O{fpV@hWy=B@Vebi&5fP<grB;Z(@Xa4>kX6wV$6D
zWLq_K)MGogVG~Z{ZG4NW%wLS-Au910lj`seUc?c+ixXIaYpBFFFp1x>6hk3?*x>U|
zpCwTXWKc&jh{}8h`|&jv;Xmxc6Qn41k1SO30nD5+8%K}$6XjHbIaFm;rUHT2Fp8Sz
zx6x2Z(#WQ46ji!uyn%D51UFG7`-M8webf%EHg5oxa0qo*nlXUws0F*x!$;1Sm|}ff
zqM;8Sqt3dFY?N6Xwc`#{Wzwhw@4I*$wO|%Ke1`hY0_u*eyZ2kDJM|kqJU}I0!7htg
z-y$@$vqmh$Tc`mER01g%_qq51Dxrs{oj%4G&Y%{4huZOb)DiqdeeVcc@V|>&7!>TF
xqm_m(Ne^nlVN^n6*nm^01?N$BW5LDSs7n1<-YWWBQaJW;<>{oiJR9r|oB|U&Ug`h<


From b3b7a5287618674367678e4c259430057690c7c0 Mon Sep 17 00:00:00 2001
From: Tibor Toth <szunyog@gmail.com>
Date: Wed, 28 Sep 2011 21:06:03 +0200
Subject: [PATCH 157/226] Fix date format, js text capitalization.

---
 sphinx/locale/hu/LC_MESSAGES/sphinx.js |   2 +-
 sphinx/locale/hu/LC_MESSAGES/sphinx.mo | Bin 8160 -> 8164 bytes
 sphinx/locale/hu/LC_MESSAGES/sphinx.po |   4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sphinx/locale/hu/LC_MESSAGES/sphinx.js b/sphinx/locale/hu/LC_MESSAGES/sphinx.js
index 47830b894..2d347242b 100644
--- a/sphinx/locale/hu/LC_MESSAGES/sphinx.js
+++ b/sphinx/locale/hu/LC_MESSAGES/sphinx.js
@@ -1 +1 @@
-Documentation.addTranslations({"locale": "hu", "plural_expr": "(n != 1)", "messages": {"Hide Search Matches": "Keresési Találatok Elrejtése", "Permalink to this definition": "Hivatkozás erre a definícióra", "Expand sidebar": "Oldalsáv kinyitása", "Permalink to this headline": "Hivatkozás erre a fejezetcímre", "Collapse sidebar": "Oldalsáv összezárása"}});
\ No newline at end of file
+Documentation.addTranslations({"locale": "hu", "plural_expr": "(n != 1)", "messages": {"Hide Search Matches": "Keresési találatok elrejtése", "Permalink to this definition": "Hivatkozás erre a definícióra", "Expand sidebar": "Oldalsáv kinyitása", "Permalink to this headline": "Hivatkozás erre a fejezetcímre", "Collapse sidebar": "Oldalsáv összezárása"}});
\ No newline at end of file
diff --git a/sphinx/locale/hu/LC_MESSAGES/sphinx.mo b/sphinx/locale/hu/LC_MESSAGES/sphinx.mo
index 193626f88a8befad0213988447ffaa219870954d..63c64bcb6d890c26103062f9fb897d7a4b96042b 100644
GIT binary patch
delta 980
zcmXZaPe@cz6vy$Sq~rfTY2&|9AK@rc3@!#2X8ywvM=V4TAwva~5{y7vw0ht!1Y5Kb
z0>Q0`3Zib@_y;6H&_xQOV5GPSQE-<^-=AK1^FH^?yZ63x&b!C;C-n=V2Y#xVE#;Uc
z;~FO5Pvo*)Zb3Z7Y`n&F%*efe9zw-cn1ywyd9U2_etbmy5i@Zd3-B8j;!>{pcMEsi
zgx^@sgG<zg`K(UCO4J5XEW&1dh<z>|#S-E#$Ypab-o#?!KdAL_RHJp-n1^LS->iv2
zEq^>gAD`iOOu{p)#tT&D6|5@5MpVa!@CANAb#fW?f^}@bUzmZxe2T#^H~z9Z)c##Q
zgU1YdQJIh7Yn;RYUSSNck)~J+S*Ybb*d1p!j2`g@{ZxV{sMg+ci^l@mRf-|hx>{66
zVn|Kqzh$7-`54A2REC?VmK~zL>0eZZx6YK%eZoQ1S$T?S*noOrJ9;?coWM5XdDMRY
zkWcMfI_W60D5~NnRBK|W3_D#sjOx%RdiWW&(G2R0th(o0sIzl~9-gBT&!kGtD?$}k
zj)}bAsu^g)b5sJYF79yg8&pDrs7l{sC61vsoJCc<g8BsesQoUn3U6E-VUpI@pw7rk
y3`809Gf+nFumV4!UO0_98#6B6Ms;d$@kii1H96viNB9jyz7{5xEFR<}ru_$n(Oz)?

delta 982
zcmXZaPe@cz6vy#Xl%tNOj^j9**-Lw-)?x?|wamd#Xe5GGin>TtC<JNIYGB?f1ltNi
z;8vwJ<sh^&!9^&xP&c&*6<b7TxJw10@2|P=c%OUT{dewp_h;8$*N2)*LB5$Smz&8I
zyo_Iv$G-B4;Xan(2^M2vG}j+T#dok2J5b~LT>mgu5WmC{oWd%c#cKQ*wc!86O*h~N
zHqdc|S}@A&LiAA!B=9OGF@i%bp2S+>H^^h}T)c|ch<8!*&r$P=IaMWkvB0dGMjIb)
zV;b+_0;(bh*oud!%<GwT6Fad0N3aJcFpNv64OTFTTX+Q{aWfvf!HZAUfm;7*K%<Vv
zAd;MAa1duOgvXe|6Qn5ikStX4e(b+sHjW<gXX>d0_fVxh<8=`$DA#q2qvo}tD$<Lb
z$%0WDDqR|Ve2dC(6;-ltsDJtkb;2`eUQI6H2<omhViDd)ZTJX1eD0jaKH~SN_5LEi
zI<NxLQDzC$i65X!(~HXRiHpZk6`Dj3U!xY9N8OQ6u73@6cfO;Czfp;YIi<!`q7GJv
zdF*d@X=p$@DuEssKX&l|DxqhnlfJ+v%%B!rM4dQ``UN|v^^P!sr!H=0kmk3d?nnwl
wEi{H{D5EjFg|AQ>&Y|wcyo=XSmD<j(hyH|1JipuXN6jDb{1F=2jq>WEe~5ft=>Px#

diff --git a/sphinx/locale/hu/LC_MESSAGES/sphinx.po b/sphinx/locale/hu/LC_MESSAGES/sphinx.po
index f8643685e..8f01bdced 100644
--- a/sphinx/locale/hu/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/hu/LC_MESSAGES/sphinx.po
@@ -20,7 +20,7 @@ msgstr ""
 #: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
 #, python-format
 msgid "%B %d, %Y"
-msgstr "%Y %B %d"
+msgstr "%Y. %m. %d."
 
 #: sphinx/environment.py:1619
 #, python-format
@@ -48,7 +48,7 @@ msgstr "Modul szint"
 #: sphinx/builders/html.py:276
 #, python-format
 msgid "%b %d, %Y"
-msgstr "%Y %b %d"
+msgstr "%b %d, %Y"
 
 #: sphinx/builders/html.py:295 sphinx/themes/basic/defindex.html:30
 msgid "General Index"

From 478ffe5632ebd6a1b2b3a6fcdae214859288b5dd Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Sun, 2 Oct 2011 16:58:43 +0200
Subject: [PATCH 158/226] Closes #778: Fix CSS class selector.

---
 sphinx/themes/basic/static/doctools.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx/themes/basic/static/doctools.js b/sphinx/themes/basic/static/doctools.js
index 8b9bd2c0e..81869f10b 100644
--- a/sphinx/themes/basic/static/doctools.js
+++ b/sphinx/themes/basic/static/doctools.js
@@ -187,7 +187,7 @@ var Documentation = {
       }, 10);
       $('<li class="highlight-link"><a href="javascript:Documentation.' +
         'hideSearchWords()">' + _('Hide Search Matches') + '</a></li>')
-          .appendTo($('.sidebar .this-page-menu'));
+          .appendTo($('.sphinxsidebar .this-page-menu'));
     }
   },
 
@@ -213,7 +213,7 @@ var Documentation = {
    * helper function to hide the search marks again
    */
   hideSearchWords : function() {
-    $('.sidebar .this-page-menu li.highlight-link').fadeOut(300);
+    $('.sphinxsidebar .this-page-menu li.highlight-link').fadeOut(300);
     $('span.highlighted').removeClass('highlighted');
   },
 

From c6d9f568957ac24ca05e1215d289a896bdacdf71 Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Sun, 2 Oct 2011 17:03:56 +0200
Subject: [PATCH 159/226] Move 'Hide Search Matches' to search box.

This is (a) semantically cleaner and (b) shows that feature even when source
links are disabled.
---
 sphinx/themes/basic/static/doctools.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sphinx/themes/basic/static/doctools.js b/sphinx/themes/basic/static/doctools.js
index 81869f10b..bd1b44efb 100644
--- a/sphinx/themes/basic/static/doctools.js
+++ b/sphinx/themes/basic/static/doctools.js
@@ -185,9 +185,9 @@ var Documentation = {
           body.highlightText(this.toLowerCase(), 'highlighted');
         });
       }, 10);
-      $('<li class="highlight-link"><a href="javascript:Documentation.' +
-        'hideSearchWords()">' + _('Hide Search Matches') + '</a></li>')
-          .appendTo($('.sphinxsidebar .this-page-menu'));
+      $('<p class="highlight-link"><a href="javascript:Documentation.' +
+        'hideSearchWords()">' + _('Hide Search Matches') + '</a></p>')
+          .appendTo($('#searchbox'));
     }
   },
 
@@ -213,7 +213,7 @@ var Documentation = {
    * helper function to hide the search marks again
    */
   hideSearchWords : function() {
-    $('.sphinxsidebar .this-page-menu li.highlight-link').fadeOut(300);
+    $('#searchbox .highlight-link').fadeOut(300);
     $('span.highlighted').removeClass('highlighted');
   },
 

From 975f9c7eaa7ec7a53a04a69f29b4cec9e8a4c78e Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 2 Oct 2011 17:50:37 +0200
Subject: [PATCH 160/226] Fix #778: Fix "hide search matches" link on pages
 linked by search.

---
 CHANGES                                | 2 ++
 sphinx/themes/basic/static/doctools.js | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index fc7f1861f..492e39f1e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 1.0.9 (in development)
 ==============================
 
+* #778: Fix "hide search matches" link on pages linked by search.
+
 
 Release 1.0.8 (Sep 23, 2011)
 ============================
diff --git a/sphinx/themes/basic/static/doctools.js b/sphinx/themes/basic/static/doctools.js
index 8b9bd2c0e..81869f10b 100644
--- a/sphinx/themes/basic/static/doctools.js
+++ b/sphinx/themes/basic/static/doctools.js
@@ -187,7 +187,7 @@ var Documentation = {
       }, 10);
       $('<li class="highlight-link"><a href="javascript:Documentation.' +
         'hideSearchWords()">' + _('Hide Search Matches') + '</a></li>')
-          .appendTo($('.sidebar .this-page-menu'));
+          .appendTo($('.sphinxsidebar .this-page-menu'));
     }
   },
 
@@ -213,7 +213,7 @@ var Documentation = {
    * helper function to hide the search marks again
    */
   hideSearchWords : function() {
-    $('.sidebar .this-page-menu li.highlight-link').fadeOut(300);
+    $('.sphinxsidebar .this-page-menu li.highlight-link').fadeOut(300);
     $('span.highlighted').removeClass('highlighted');
   },
 

From 411f82d9b9c268bf4e11dab7fe01d8ad0df88024 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 2 Oct 2011 19:39:42 +0200
Subject: [PATCH 161/226] Fix markup test with latest pygments-related updates.

---
 tests/test_markup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/test_markup.py b/tests/test_markup.py
index 5d56bea30..4c8e7264f 100644
--- a/tests/test_markup.py
+++ b/tests/test_markup.py
@@ -127,9 +127,9 @@ def test_latex_escaping():
     yield (verify, u'Γ\\\\∞$', None,
            ur'\(\Gamma\)\textbackslash{}\(\infty\)\$')
     # in verbatim code fragments
-    yield (verify, u'::\n\n @Γ\\∞$[]', None,
-           u'\\begin{Verbatim}[commandchars=@\\[\\]]\n'
-           u'@PYGZat[]@(@Gamma@)\\@(@infty@)@$@PYGZlb[]@PYGZrb[]\n'
+    yield (verify, u'::\n\n @Γ\\∞${}', None,
+           u'\\begin{Verbatim}[commandchars=\\\\\\{\\}]\n'
+           u'@\\(\\Gamma\\)\\PYGZbs{}\\(\\infty\\)\\$\\PYGZob{}\\PYGZcb{}\n'
            u'\\end{Verbatim}')
     # in URIs
     yield (verify_re, u'`test <http://example.com/~me/>`_', None,

From 262d8a0e5f33c2a0662c36c089e0543a837c1381 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 2 Oct 2011 19:54:35 +0200
Subject: [PATCH 162/226] Re-add monkey patch whose removal made latex build
 fail.

---
 sphinx/util/nodes.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/sphinx/util/nodes.py b/sphinx/util/nodes.py
index 49f3a2125..c2b7edf4d 100644
--- a/sphinx/util/nodes.py
+++ b/sphinx/util/nodes.py
@@ -193,3 +193,10 @@ def _new_contains(self, key):
     return key in self.children
 
 nodes.Node.__contains__ = _new_contains
+
+# monkey-patch Element.copy to copy the rawsource
+
+def _new_copy(self):
+    return self.__class__(self.rawsource, **self.attributes)
+
+nodes.Element.copy = _new_copy

From 77329bf4977fa8f5b1d539a72f4555e23b7d67c2 Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Mon, 3 Oct 2011 13:20:53 +0200
Subject: [PATCH 163/226] Closes #561: Add configuration option to prevent
 catalog bundling.

---
 doc/config.rst             | 13 +++++++++++--
 sphinx/builders/gettext.py | 13 ++++++++-----
 sphinx/config.py           |  3 +++
 sphinx/util/osutil.py      |  3 +++
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/doc/config.rst b/doc/config.rst
index 904d0bdc0..5d188c613 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -406,11 +406,20 @@ documentation on :ref:`intl` for details.
    add the directory :file:`./locale` to this settting, the message catalogs
    (compiled from ``.po`` format using :program:`msgfmt`) must be in
    :file:`./locale/{language}/LC_MESSAGES/sphinx.mo`.  The text domain of
-   individual documents depends on their docname if they are top-level project
-   files and on their base directory otherwise.
+   individual documents depends on :confval:`gettext_compact`.
 
    The default is ``[]``.
 
+.. confval:: gettext_compact
+
+   .. versionadded:: 1.1
+
+   If true, a document's text domain is its docname if it is a top-level
+   project file and its very base directory otherwise.
+
+   By default, the document ``markup/code.rst`` ends up in the ``markup`` text
+   domain.  With this option set to ``False``, it is ``markup/code``.
+
 
 .. _html-options:
 
diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py
index 41a5acbcc..81535f97f 100644
--- a/sphinx/builders/gettext.py
+++ b/sphinx/builders/gettext.py
@@ -16,7 +16,7 @@ from collections import defaultdict
 
 from sphinx.builders import Builder
 from sphinx.util.nodes import extract_messages
-from sphinx.util.osutil import SEP, safe_relpath
+from sphinx.util.osutil import SEP, safe_relpath, ensuredir, find_catalog
 from sphinx.util.console import darkgreen
 
 POHEADER = ur"""
@@ -76,7 +76,7 @@ class I18nBuilder(Builder):
         return
 
     def write_doc(self, docname, doctree):
-        catalog = self.catalogs[docname.split(SEP, 1)[0]]
+        catalog = self.catalogs[find_catalog(docname, self.config)]
 
         for node, msg in extract_messages(doctree):
             catalog.add(msg, node)
@@ -97,11 +97,14 @@ class MessageCatalogBuilder(I18nBuilder):
             # XXX should supply tz
             ctime = datetime.now().strftime('%Y-%m-%d %H:%M%z'),
         )
-        for section, catalog in self.status_iterator(
+        for textdomain, catalog in self.status_iterator(
                 self.catalogs.iteritems(), "writing message catalogs... ",
-                lambda (section, _):darkgreen(section), len(self.catalogs)):
+                lambda (textdomain, _):darkgreen(textdomain), len(self.catalogs)):
 
-            pofn = path.join(self.outdir, section + '.pot')
+            # noop if config.gettext_compact is set
+            ensuredir(path.join(self.outdir, path.dirname(textdomain)))
+
+            pofn = path.join(self.outdir, textdomain + '.pot')
             pofile = open(pofn, 'w', encoding='utf-8')
             try:
                 pofile.write(POHEADER % data)
diff --git a/sphinx/config.py b/sphinx/config.py
index 2250c57f7..b05054c60 100644
--- a/sphinx/config.py
+++ b/sphinx/config.py
@@ -176,6 +176,9 @@ class Config(object):
         linkcheck_ignore = ([], None),
         linkcheck_timeout = (None, None),
         linkcheck_workers = (5, None),
+
+        # gettext options
+        gettext_compact = (True, 'gettext'),
     )
 
     def __init__(self, dirname, filename, overrides, tags):
diff --git a/sphinx/util/osutil.py b/sphinx/util/osutil.py
index b07fa6ab0..e37d23954 100644
--- a/sphinx/util/osutil.py
+++ b/sphinx/util/osutil.py
@@ -140,3 +140,6 @@ def safe_relpath(path, start=None):
         return os.path.relpath(path, start)
     except ValueError:
         return path
+
+def find_catalog(docname, config):
+    return docname.split(SEP, 1)[0] if config.gettext_compact else docname

From 0f47e557872eb0ed2467b5bc4cf8a88118d75ad3 Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Mon, 3 Oct 2011 14:08:33 +0200
Subject: [PATCH 164/226] Respect gettext_compact in message patching too.

---
 sphinx/builders/gettext.py |  3 ++-
 sphinx/environment.py      | 15 +++++++++------
 sphinx/util/osutil.py      |  4 ++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py
index 81535f97f..b64c917ca 100644
--- a/sphinx/builders/gettext.py
+++ b/sphinx/builders/gettext.py
@@ -76,7 +76,8 @@ class I18nBuilder(Builder):
         return
 
     def write_doc(self, docname, doctree):
-        catalog = self.catalogs[find_catalog(docname, self.config)]
+        catalog = self.catalogs[find_catalog(docname,
+                                             self.config.gettext_compact)]
 
         for node, msg in extract_messages(doctree):
             catalog.add(msg, node)
diff --git a/sphinx/environment.py b/sphinx/environment.py
index 302d8766f..ae353ad44 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -41,7 +41,7 @@ from sphinx.util import url_re, get_matching_docs, docname_join, split_into, \
      FilenameUniqDict
 from sphinx.util.nodes import clean_astext, make_refnode, extract_messages, \
      WarningStream
-from sphinx.util.osutil import movefile, SEP, ustrftime
+from sphinx.util.osutil import movefile, SEP, ustrftime, find_catalog
 from sphinx.util.matching import compile_matchers
 from sphinx.util.pycompat import all, class_types
 from sphinx.util.websupport import is_commentable
@@ -198,13 +198,15 @@ class Locale(Transform):
         settings, source = self.document.settings, self.document['source']
         # XXX check if this is reliable
         assert source.startswith(env.srcdir)
-        docname = os.path.splitext(source[len(env.srcdir):].lstrip(os.sep))[0]
-        section = docname.split(os.sep, 1)[0]
+        docname = path.splitext(path.relpath(source, env.srcdir))[0]
+        textdomain = find_catalog(docname,
+                                  self.document.settings.gettext_compact)
 
         # fetch translations
-        dirs = [path.join(env.srcdir, x)
-                for x in env.config.locale_dirs]
-        catalog, has_catalog = init_locale(dirs, env.config.language, section)
+        dirs = [path.join(env.srcdir, directory)
+                for directory in env.config.locale_dirs]
+        catalog, has_catalog = init_locale(dirs, env.config.language,
+                                           textdomain)
         if not has_catalog:
             return
 
@@ -708,6 +710,7 @@ class BuildEnvironment:
         self.settings['input_encoding'] = self.config.source_encoding
         self.settings['trim_footnote_reference_space'] = \
             self.config.trim_footnote_reference_space
+        self.settings['gettext_compact'] = self.config.gettext_compact
 
         self.patch_lookup_functions()
 
diff --git a/sphinx/util/osutil.py b/sphinx/util/osutil.py
index e37d23954..ee6a6c858 100644
--- a/sphinx/util/osutil.py
+++ b/sphinx/util/osutil.py
@@ -141,5 +141,5 @@ def safe_relpath(path, start=None):
     except ValueError:
         return path
 
-def find_catalog(docname, config):
-    return docname.split(SEP, 1)[0] if config.gettext_compact else docname
+def find_catalog(docname, compaction):
+    return docname.split(SEP, 1)[0] if compaction else docname

From 608edd427cb43fff8200684666325f82b07244ac Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 5 Oct 2011 15:31:50 +0200
Subject: [PATCH 165/226] Fix #758: do not install custom_fixers and tests
 "packages".

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index a84ac7bf6..87734687c 100644
--- a/setup.py
+++ b/setup.py
@@ -187,7 +187,7 @@ setup(
         'Topic :: Utilities',
     ],
     platforms='any',
-    packages=find_packages(),
+    packages=find_packages(exclude=['custom_fixers', 'test']),
     include_package_data=True,
     entry_points={
         'console_scripts': [

From d07fe37744934e4da12e3fb82cdb5420439a5a71 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 6 Oct 2011 14:28:18 +0200
Subject: [PATCH 166/226] Update the websupport tests to API changes.

---
 sphinx/themes/basic/static/websupport.js |  2 +-
 tests/test_websupport.py                 | 30 ++++++++++--------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/sphinx/themes/basic/static/websupport.js b/sphinx/themes/basic/static/websupport.js
index cbb609232..e9bd1b851 100644
--- a/sphinx/themes/basic/static/websupport.js
+++ b/sphinx/themes/basic/static/websupport.js
@@ -566,7 +566,7 @@
     var context = $.extend({}, opts, comment);
     var div = $(renderTemplate(commentTemplate, context));
 
-    // If the user has voted on this comment, highblight the correct arrow.
+    // If the user has voted on this comment, highlight the correct arrow.
     if (comment.vote) {
       var direction = (comment.vote == 1) ? 'u' : 'd';
       div.find('#' + direction + 'v' + comment.id).hide();
diff --git a/tests/test_websupport.py b/tests/test_websupport.py
index 87cc6ad4f..d7b5fb32a 100644
--- a/tests/test_websupport.py
+++ b/tests/test_websupport.py
@@ -18,8 +18,6 @@ except ImportError:
     # functools is new in 2.5
     wraps = lambda f: (lambda w: w)
 
-from nose import SkipTest
-
 from sphinx.websupport import WebSupport
 from sphinx.websupport.errors import *
 from sphinx.websupport.storage import StorageBackend
@@ -35,8 +33,6 @@ except ImportError:
 from util import *
 
 
-raise SkipTest('websupport tests are currently not working')
-
 default_settings = {'builddir': os.path.join(test_root, 'websupport'),
                     'status': StringIO(),
                     'warning': StringIO()}
@@ -121,18 +117,18 @@ def test_comments(support):
     comments = data['comments']
     children = comments[0]['children']
     assert len(comments) == 2
-    assert comments[1]['text'] == 'Hidden comment'
+    assert comments[1]['text'] == '<p>Hidden comment</p>\n'
     assert len(children) == 2
-    assert children[1]['text'] == 'Hidden child test comment'
+    assert children[1]['text'] == '<p>Hidden child test comment</p>\n'
 
     # Access the comments without being a moderator.
     data = support.get_data(first_node.id)
     comments = data['comments']
     children = comments[0]['children']
     assert len(comments) == 1
-    assert comments[0]['text'] == 'First test comment'
+    assert comments[0]['text'] == '<p>First test comment</p>\n'
     assert len(children) == 1
-    assert children[0]['text'] == 'Child test comment'
+    assert children[0]['text'] == '<p>Child test comment</p>\n'
 
 
 @skip_if(sqlalchemy_missing, 'needs sqlalchemy')
@@ -218,9 +214,7 @@ def test_moderator_delete_comments(support):
     comment = get_comment()
     support.delete_comment(comment['id'], username='user_two',
                            moderator=True)
-    comment = get_comment()
-    assert comment['username'] == '[deleted]'
-    assert comment['text'] == '[deleted]'
+    raises(IndexError, get_comment)
 
 
 @skip_if(sqlalchemy_missing, 'needs sqlalchemy')
@@ -232,14 +226,14 @@ def test_update_username(support):
         filter(Comment.username == 'user_two').all()
     assert len(comments) == 0
     votes = session.query(CommentVote).\
-        filter(CommentVote.username == 'user_two')
-    assert len(comments) == 0
+        filter(CommentVote.username == 'user_two').all()
+    assert len(votes) == 0
     comments = session.query(Comment).\
         filter(Comment.username == 'new_user_two').all()
     assert len(comments) == 1
     votes = session.query(CommentVote).\
-        filter(CommentVote.username == 'new_user_two')
-    assert len(comments) == 1
+        filter(CommentVote.username == 'new_user_two').all()
+    assert len(votes) == 0
 
 
 called = False
@@ -257,15 +251,15 @@ def test_moderation(support):
     session.close()
     accepted = support.add_comment('Accepted Comment', node_id=node.id,
                                    displayed=False)
-    rejected = support.add_comment('Rejected comment', node_id=node.id,
+    deleted  = support.add_comment('Comment to delete', node_id=node.id,
                                    displayed=False)
     # Make sure the moderation_callback is called.
     assert called == True
     # Make sure the user must be a moderator.
     raises(UserNotAuthorizedError, support.accept_comment, accepted['id'])
-    raises(UserNotAuthorizedError, support.reject_comment, accepted['id'])
+    raises(UserNotAuthorizedError, support.delete_comment, deleted['id'])
     support.accept_comment(accepted['id'], moderator=True)
-    support.reject_comment(rejected['id'], moderator=True)
+    support.delete_comment(deleted['id'], moderator=True)
     comments = support.get_data(node.id)['comments']
     assert len(comments) == 1
     comments = support.get_data(node.id, moderator=True)['comments']

From b8873fe7b09387ace7f769efd956a832fa0c86a1 Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Thu, 6 Oct 2011 14:52:54 +0200
Subject: [PATCH 167/226] Fixes #354: Addressed PDF generation in the tutorial.

---
 doc/tutorial.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/tutorial.rst b/doc/tutorial.rst
index fa6ee2ab6..055dda979 100644
--- a/doc/tutorial.rst
+++ b/doc/tutorial.rst
@@ -125,6 +125,12 @@ to run ::
 to build HTML docs in the build directory you chose.  Execute ``make`` without
 an argument to see which targets are available.
 
+.. admonition:: How do I generate PDF documents?
+
+   ``make latexpdf`` runs the :mod:`LaTeX builder
+   <sphinx.builders.latex.LaTeXBuilder>` and readily invokes the pdfTeX
+   toolchain for you.
+
 
 Documenting objects
 -------------------

From b1d5e33899eca8b41437feebbac6b42f82706090 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 7 Oct 2011 11:39:19 +0200
Subject: [PATCH 168/226] Offer mathjax instead of jsmath in quickstart.

---
 sphinx/apidoc.py     | 13 ++++++-------
 sphinx/quickstart.py | 10 +++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py
index 6006943d9..f988957e8 100644
--- a/sphinx/apidoc.py
+++ b/sphinx/apidoc.py
@@ -231,7 +231,7 @@ def main(argv=sys.argv):
 usage: %prog [options] -o <output_path> <module_path> [exclude_paths, ...]
 
 Look recursively in <module_path> for Python modules and packages and create
-a reST file with automodule directives per package in the <output_path>.
+one reST file with automodule directives per package in the <output_path>.
 
 Note: By default this script will not overwrite already created files.""")
 
@@ -241,13 +241,13 @@ Note: By default this script will not overwrite already created files.""")
                       help='Maximum depth of submodules to show in the TOC '
                       '(default: 4)', type='int', default=4)
     parser.add_option('-f', '--force', action='store_true', dest='force',
-                      help='Overwrite all the files')
+                      help='Overwrite all files')
     parser.add_option('-n', '--dry-run', action='store_true', dest='dryrun',
-                      help='Run the script without creating the files')
+                      help='Run the script without creating files')
     parser.add_option('-T', '--no-toc', action='store_true', dest='notoc',
-                      help='Don\'t create the table of contents file')
+                      help='Don\'t create a table of contents file')
     parser.add_option('-H', '--doc-header', action='store', dest='header',
-                      help='Documentation Header (default: Project)',
+                      help='Documentation header (default: Project)',
                       default='Project')
     parser.add_option('-s', '--suffix', action='store', dest='suffix',
                       help='file suffix (default: rst)', default='rst')
@@ -263,7 +263,6 @@ Note: By default this script will not overwrite already created files.""")
         print >>sys.stderr, '%s is not a directory.' % rootpath
         sys.exit(1)
     if not path.isdir(opts.destdir):
-        print '%s is not a valid output directory.' % opts.destdir
-        sys.exit(1)
+        os.makedirs(opts.destdir)
     excludes = normalize_excludes(rootpath, excludes)
     recurse_tree(rootpath, excludes, opts)
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index c7b3aaf84..1cdb46f8d 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -897,10 +897,10 @@ Please indicate if you want to use one of the following Sphinx extensions:'''
               'coverage (y/N)', 'n', boolean)
     do_prompt(d, 'ext_pngmath', 'pngmath: include math, rendered '
               'as PNG images (y/N)', 'n', boolean)
-    do_prompt(d, 'ext_jsmath', 'jsmath: include math, rendered in the '
-              'browser by JSMath (y/N)', 'n', boolean)
-    if d['ext_pngmath'] and d['ext_jsmath']:
-        print '''Note: pngmath and jsmath cannot be enabled at the same time.
+    do_prompt(d, 'ext_mathjax', 'mathjax: include math, rendered in the '
+              'browser by MathJax (y/N)', 'n', boolean)
+    if d['ext_pngmath'] and d['ext_mathjax']:
+        print '''Note: pngmath and mathjax cannot be enabled at the same time.
 pngmath has been deselected.'''
     do_prompt(d, 'ext_ifconfig', 'ifconfig: conditional inclusion of '
               'content based on config values (y/N)', 'n', boolean)
@@ -921,7 +921,7 @@ directly.'''
     d['extensions'] = ', '.join(
         repr('sphinx.ext.' + name)
         for name in ('autodoc', 'doctest', 'intersphinx', 'todo', 'coverage',
-                     'pngmath', 'jsmath', 'ifconfig', 'viewcode')
+                     'pngmath', 'mathjax', 'ifconfig', 'viewcode')
         if d['ext_' + name])
     d['copyright'] = time.strftime('%Y') + ', ' + d['author']
     d['author_texescaped'] = unicode(d['author']).\

From 827cdb62661e71084c0b5468c128ca134472eec3 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 7 Oct 2011 11:52:12 +0200
Subject: [PATCH 169/226] Split user queries and file generation in quickstart
 into two functions.

---
 sphinx/quickstart.py     | 159 +++++++++++++++++++++++++--------------
 tests/test_quickstart.py |  10 ++-
 2 files changed, 110 insertions(+), 59 deletions(-)

diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index 1cdb46f8d..a91fd3f24 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -339,7 +339,7 @@ MASTER_FILE = '''\
    contain the root `toctree` directive.
 
 Welcome to %(project)s's documentation!
-===========%(underline)s=================
+===========%(project_underline)s=================
 
 Contents:
 
@@ -793,18 +793,25 @@ if sys.version_info >= (3, 0):
     del _unicode_string_re, _convert_python_source
 
 
-def inner_main(args):
-    d = {}
-    texescape.init()
+def ask_user(d):
+    """Ask the user for quickstart values missing from *d*.
 
-    if not color_terminal():
-        nocolor()
+    Values are:
 
-    if len(args) > 3:
-        print 'Usage: sphinx-quickstart [root]'
-        sys.exit(1)
-    elif len(args) == 2:
-        d['path'] = args[1]
+    * path:      root path
+    * sep:       separate source and build dirs (bool)
+    * dot:       replacement for dot in _templates etc.
+    * project:   project name
+    * author:    author names
+    * version:   version of project
+    * release:   release of project
+    * suffix:    source file suffix
+    * master:    master document name
+    * epub:      use epub (bool)
+    * ext_*:     extensions to use (bools)
+    * makefile:  make Makefile
+    * batchfile: make command file
+    """
 
     print bold('Welcome to the Sphinx %s quickstart utility.') % __version__
     print '''
@@ -831,42 +838,53 @@ Enter the root path for documentation.'''
         if not d['path']:
             sys.exit(1)
 
-    print '''
+    if 'sep' not in d:
+        print '''
 You have two options for placing the build directory for Sphinx output.
 Either, you use a directory "_build" within the root path, or you separate
 "source" and "build" directories within the root path.'''
-    do_prompt(d, 'sep', 'Separate source and build directories (y/N)', 'n',
-              boolean)
+        do_prompt(d, 'sep', 'Separate source and build directories (y/N)', 'n',
+                  boolean)
 
-    print '''
+    if 'dot' not in d:
+        print '''
 Inside the root directory, two more directories will be created; "_templates"
 for custom HTML templates and "_static" for custom stylesheets and other static
 files. You can enter another prefix (such as ".") to replace the underscore.'''
-    do_prompt(d, 'dot', 'Name prefix for templates and static dir', '_', ok)
+        do_prompt(d, 'dot', 'Name prefix for templates and static dir', '_', ok)
 
-    print '''
+    if 'project' not in d:
+        print '''
 The project name will occur in several places in the built documentation.'''
-    do_prompt(d, 'project', 'Project name')
-    do_prompt(d, 'author', 'Author name(s)')
-    print '''
+        do_prompt(d, 'project', 'Project name')
+    if 'author' not in d:
+        do_prompt(d, 'author', 'Author name(s)')
+
+    if 'version' not in d:
+        print '''
 Sphinx has the notion of a "version" and a "release" for the
 software. Each version can have multiple releases. For example, for
 Python the version is something like 2.5 or 3.0, while the release is
 something like 2.5.1 or 3.0a1.  If you don't need this dual structure,
 just set both to the same value.'''
-    do_prompt(d, 'version', 'Project version')
-    do_prompt(d, 'release', 'Project release', d['version'])
-    print '''
+        do_prompt(d, 'version', 'Project version')
+    if 'release' not in d:
+        do_prompt(d, 'release', 'Project release', d['version'])
+
+    if 'suffix' not in d:
+        print '''
 The file name suffix for source files. Commonly, this is either ".txt"
 or ".rst".  Only files with this suffix are considered documents.'''
-    do_prompt(d, 'suffix', 'Source file suffix', '.rst', suffix)
-    print '''
+        do_prompt(d, 'suffix', 'Source file suffix', '.rst', suffix)
+
+    if 'master' not in d:
+        print '''
 One document is special in that it is considered the top node of the
 "contents tree", that is, it is the root of the hierarchical structure
 of the documents. Normally, this is "index", but if your "index"
 document is a custom template, you can also set this to another filename.'''
-    do_prompt(d, 'master', 'Name of your master document (without suffix)',
-              'index')
+        do_prompt(d, 'master', 'Name of your master document (without suffix)',
+                  'index')
 
     while path.isfile(path.join(d['path'], d['master']+d['suffix'])) or \
           path.isfile(path.join(d['path'], 'source', d['master']+d['suffix'])):
@@ -878,51 +896,70 @@ document is a custom template, you can also set this to another filename.'''
         do_prompt(d, 'master', 'Please enter a new file name, or rename the '
                   'existing file and press Enter', d['master'])
 
-    print '''
+    if 'epub' not in d:
+        print '''
 Sphinx can also add configuration for epub output:'''
-    do_prompt(d, 'epub', 'Do you want to use the epub builder (y/N)',
-              'n', boolean)
+        do_prompt(d, 'epub', 'Do you want to use the epub builder (y/N)',
+                  'n', boolean)
 
-    print '''
+    if 'ext_autodoc' not in d:
+        print '''
 Please indicate if you want to use one of the following Sphinx extensions:'''
-    do_prompt(d, 'ext_autodoc', 'autodoc: automatically insert docstrings '
-              'from modules (y/N)', 'n', boolean)
-    do_prompt(d, 'ext_doctest', 'doctest: automatically test code snippets '
-              'in doctest blocks (y/N)', 'n', boolean)
-    do_prompt(d, 'ext_intersphinx', 'intersphinx: link between Sphinx '
-              'documentation of different projects (y/N)', 'n', boolean)
-    do_prompt(d, 'ext_todo', 'todo: write "todo" entries '
-              'that can be shown or hidden on build (y/N)', 'n', boolean)
-    do_prompt(d, 'ext_coverage', 'coverage: checks for documentation '
-              'coverage (y/N)', 'n', boolean)
-    do_prompt(d, 'ext_pngmath', 'pngmath: include math, rendered '
-              'as PNG images (y/N)', 'n', boolean)
-    do_prompt(d, 'ext_mathjax', 'mathjax: include math, rendered in the '
-              'browser by MathJax (y/N)', 'n', boolean)
+        do_prompt(d, 'ext_autodoc', 'autodoc: automatically insert docstrings '
+                  'from modules (y/N)', 'n', boolean)
+    if 'ext_doctest' not in d:
+        do_prompt(d, 'ext_doctest', 'doctest: automatically test code snippets '
+                  'in doctest blocks (y/N)', 'n', boolean)
+    if 'ext_intersphinx' not in d:
+        do_prompt(d, 'ext_intersphinx', 'intersphinx: link between Sphinx '
+                  'documentation of different projects (y/N)', 'n', boolean)
+    if 'ext_todo' not in d:
+        do_prompt(d, 'ext_todo', 'todo: write "todo" entries '
+                  'that can be shown or hidden on build (y/N)', 'n', boolean)
+    if 'ext_coverage' not in d:
+        do_prompt(d, 'ext_coverage', 'coverage: checks for documentation '
+                  'coverage (y/N)', 'n', boolean)
+    if 'ext_pngmath' not in d:
+        do_prompt(d, 'ext_pngmath', 'pngmath: include math, rendered '
+                  'as PNG images (y/N)', 'n', boolean)
+    if 'ext_mathjax' not in d:
+        do_prompt(d, 'ext_mathjax', 'mathjax: include math, rendered in the '
+                  'browser by MathJax (y/N)', 'n', boolean)
     if d['ext_pngmath'] and d['ext_mathjax']:
         print '''Note: pngmath and mathjax cannot be enabled at the same time.
 pngmath has been deselected.'''
-    do_prompt(d, 'ext_ifconfig', 'ifconfig: conditional inclusion of '
-              'content based on config values (y/N)', 'n', boolean)
-    do_prompt(d, 'ext_viewcode', 'viewcode: include links to the source code '
-              'of documented Python objects (y/N)', 'n', boolean)
-    print '''
+    if 'ext_ifconfig' not in d:
+        do_prompt(d, 'ext_ifconfig', 'ifconfig: conditional inclusion of '
+                  'content based on config values (y/N)', 'n', boolean)
+    if 'ext_viewcode' not in d:
+        do_prompt(d, 'ext_viewcode', 'viewcode: include links to the source code '
+                  'of documented Python objects (y/N)', 'n', boolean)
+
+    if 'makefile' not in d:
+        print '''
 A Makefile and a Windows command file can be generated for you so that you
 only have to run e.g. `make html' instead of invoking sphinx-build
 directly.'''
-    do_prompt(d, 'makefile', 'Create Makefile? (Y/n)', 'y', boolean)
-    do_prompt(d, 'batchfile', 'Create Windows command file? (Y/n)',
-              'y', boolean)
+        do_prompt(d, 'makefile', 'Create Makefile? (Y/n)', 'y', boolean)
+    if 'batchfile' not in d:
+        do_prompt(d, 'batchfile', 'Create Windows command file? (Y/n)',
+                  'y', boolean)
+
+
+def generate(d):
+    """Generate project based on values in *d*."""
+
+    texescape.init()
 
     d['project_fn'] = make_filename(d['project'])
     d['project_manpage'] = d['project_fn'].lower()
     d['now'] = time.asctime()
-    d['underline'] = len(d['project']) * '='
+    d['project_underline'] = len(d['project']) * '='
     d['extensions'] = ', '.join(
         repr('sphinx.ext.' + name)
         for name in ('autodoc', 'doctest', 'intersphinx', 'todo', 'coverage',
                      'pngmath', 'mathjax', 'ifconfig', 'viewcode')
-        if d['ext_' + name])
+        if d.get('ext_' + name))
     d['copyright'] = time.strftime('%Y') + ', ' + d['author']
     d['author_texescaped'] = unicode(d['author']).\
                              translate(texescape.tex_escape_map)
@@ -999,9 +1036,19 @@ where "builder" is one of the supported builders, e.g. html, latex or linkcheck.
 
 
 def main(argv=sys.argv):
+    if not color_terminal():
+        nocolor()
+
+    d = {}
+    if len(argv) > 3:
+        print 'Usage: sphinx-quickstart [root]'
+        sys.exit(1)
+    elif len(argv) == 2:
+        d['path'] = argv[1]
     try:
-        return inner_main(argv)
+        ask_user(d)
     except (KeyboardInterrupt, EOFError):
         print
         print '[Interrupted.]'
         return
+    generate(d)
diff --git a/tests/test_quickstart.py b/tests/test_quickstart.py
index 798d8d56b..cca89ed17 100644
--- a/tests/test_quickstart.py
+++ b/tests/test_quickstart.py
@@ -85,7 +85,9 @@ def test_quickstart_defaults(tempdir):
         'Project version': '0.1',
     }
     qs.term_input = mock_raw_input(answers)
-    qs.inner_main([])
+    d = {}
+    qs.ask_user(d)
+    qs.generate(d)
 
     conffile = tempdir / 'conf.py'
     assert conffile.isfile()
@@ -134,7 +136,7 @@ def test_quickstart_all_answers(tempdir):
         'todo': 'n',
         'coverage': 'no',
         'pngmath': 'N',
-        'jsmath': 'no',
+        'mathjax': 'no',
         'ifconfig': 'no',
         'viewcode': 'no',
         'Create Makefile': 'no',
@@ -143,7 +145,9 @@ def test_quickstart_all_answers(tempdir):
     }
     qs.term_input = mock_raw_input(answers, needanswer=True)
     qs.TERM_ENCODING = 'utf-8'
-    qs.inner_main([])
+    d = {}
+    qs.ask_user(d)
+    qs.generate(d)
 
     conffile = tempdir / 'source' / 'conf.py'
     assert conffile.isfile()

From ba95709f8732f4d59635722e8ac605c056641e91 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 7 Oct 2011 11:55:37 +0200
Subject: [PATCH 170/226] Remove unused import.

---
 tests/test_quickstart.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/test_quickstart.py b/tests/test_quickstart.py
index cca89ed17..260641174 100644
--- a/tests/test_quickstart.py
+++ b/tests/test_quickstart.py
@@ -11,7 +11,6 @@
 
 import sys
 import time
-import __builtin__
 
 from util import *
 

From 1329984f2ce5c6c2303d5714d571fa406f4a7281 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 7 Oct 2011 12:16:40 +0200
Subject: [PATCH 171/226] Optionally create a full quickstart project in
 apidoc.

---
 sphinx/apidoc.py     | 61 ++++++++++++++++++++++++++++++++++++--------
 sphinx/quickstart.py | 15 ++++++++---
 2 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py
index f988957e8..96159ba7f 100644
--- a/sphinx/apidoc.py
+++ b/sphinx/apidoc.py
@@ -41,7 +41,7 @@ def makename(package, module):
 
 def write_file(name, text, opts):
     """Write the output file for module/package <name>."""
-    fname = path.join(opts.destdir, "%s.%s" % (name, opts.suffix))
+    fname = path.join(opts.destdir, '%s.%s' % (name, opts.suffix))
     if opts.dryrun:
         print 'Would create file %s.' % fname
         return
@@ -106,7 +106,7 @@ def create_package_file(root, master_package, subroot, py_files, opts, subs):
 
     write_file(makename(master_package, subroot), text, opts)
 
-def create_modules_toc_file(master_package, modules, opts, name='modules'):
+def create_modules_toc_file(modules, opts, name='modules'):
     """
     Create the module's index.
     """
@@ -186,9 +186,8 @@ def recurse_tree(rootpath, excludes, opts):
                     create_module_file(package_name, module, opts)
                     toc.append(makename(package_name, module))
 
-    # create the module's index
-    if not opts.notoc:
-        create_modules_toc_file(package_name, toc, opts)
+    return toc
+
 
 def normalize_excludes(rootpath, excludes):
     """
@@ -246,23 +245,65 @@ Note: By default this script will not overwrite already created files.""")
                       help='Run the script without creating files')
     parser.add_option('-T', '--no-toc', action='store_true', dest='notoc',
                       help='Don\'t create a table of contents file')
-    parser.add_option('-H', '--doc-header', action='store', dest='header',
-                      help='Documentation header (default: Project)',
-                      default='Project')
     parser.add_option('-s', '--suffix', action='store', dest='suffix',
                       help='file suffix (default: rst)', default='rst')
+    parser.add_option('-F', '--full', action='store_true', dest='full',
+                      help='Generate a full project with sphinx-quickstart')
+    parser.add_option('-H', '--doc-project', action='store', dest='header',
+                      help='Project name (default: root module name)')
+    parser.add_option('-A', '--doc-author', action='store', dest='author', type='str',
+                      help='Project author(s), used when --full is given')
+    parser.add_option('-V', '--doc-version', action='store', dest='version',
+                      help='Project version, used when --full is given')
+    parser.add_option('-R', '--doc-release', action='store', dest='release',
+                      help='Project release, used when --full is given, '
+                      'defaults to --doc-version')
 
     (opts, args) = parser.parse_args(argv[1:])
 
     if not args:
         parser.error('A package path is required.')
+
+    rootpath, excludes = args[0], args[1:]
     if not opts.destdir:
         parser.error('An output directory is required.')
-    rootpath, excludes = args[0], args[1:]
+    if opts.header is None:
+        opts.header = rootpath
     if not path.isdir(rootpath):
         print >>sys.stderr, '%s is not a directory.' % rootpath
         sys.exit(1)
     if not path.isdir(opts.destdir):
         os.makedirs(opts.destdir)
     excludes = normalize_excludes(rootpath, excludes)
-    recurse_tree(rootpath, excludes, opts)
+    modules = recurse_tree(rootpath, excludes, opts)
+    if opts.full:
+        from sphinx import quickstart as qs
+        modules.sort()
+        prev_module = ''
+        text = ''
+        for module in modules:
+            if module.startswith(prev_module + '.'):
+                continue
+            prev_module = module
+            text += '   %s\n' % module
+        d = dict(
+            path = opts.destdir,
+            sep  = False,
+            dot  = '_',
+            project = opts.header,
+            author = opts.author or 'Author',
+            version = opts.version or '',
+            release = opts.release or opts.version or '',
+            suffix = '.' + opts.suffix,
+            master = 'modules',
+            epub = True,
+            ext_autodoc = True,
+            makefile = True,
+            batchfile = True,
+            mastertocmaxdepth = opts.maxdepth,
+            mastertoctree = text,
+        )
+        qs.generate(d, silent=True)
+        print 'Creating quickstart project and Makefile.'
+    elif not opts.notoc:
+        create_modules_toc_file(modules, opts)
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index a91fd3f24..b85579ca2 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -344,7 +344,9 @@ Welcome to %(project)s's documentation!
 Contents:
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: %(mastertocmaxdepth)s
+
+%(mastertoctree)s
 
 Indices and tables
 ==================
@@ -946,11 +948,16 @@ directly.'''
                   'y', boolean)
 
 
-def generate(d):
+def generate(d, silent=False):
     """Generate project based on values in *d*."""
 
     texescape.init()
 
+    if 'mastertoctree' not in d:
+        d['mastertoctree'] = ''
+    if 'mastertocmaxdepth' not in d:
+        d['mastertocmaxdepth'] = 2
+
     d['project_fn'] = make_filename(d['project'])
     d['project_manpage'] = d['project_fn'].lower()
     d['now'] = time.asctime()
@@ -993,7 +1000,7 @@ def generate(d):
     conf_text = QUICKSTART_CONF % d
     if d['epub']:
         conf_text += EPUB_CONFIG % d
-    if d['ext_intersphinx']:
+    if d.get('ext_intersphinx'):
         conf_text += INTERSPHINX_CONFIG
 
     f = open(path.join(srcdir, 'conf.py'), 'w', encoding='utf-8')
@@ -1020,6 +1027,8 @@ def generate(d):
         f.write(BATCHFILE % d)
         f.close()
 
+    if silent:
+        return
     print
     print bold('Finished: An initial directory structure has been created.')
     print '''

From ff940a16b61d15bb77d1d265cecd33788b5f01ec Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 7 Oct 2011 12:27:19 +0200
Subject: [PATCH 172/226] Add a rudimentary manpage for sphinx-apidoc.

---
 doc/conf.py               |  2 ++
 doc/man/sphinx-apidoc.rst | 52 +++++++++++++++++++++++++++++++++++++++
 sphinx/apidoc.py          |  4 ++-
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 doc/man/sphinx-apidoc.rst

diff --git a/doc/conf.py b/doc/conf.py
index a1d0e8ce5..1b8ba3e4d 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -62,6 +62,8 @@ man_pages = [
      '', 1),
     ('man/sphinx-quickstart', 'sphinx-quickstart', 'Sphinx documentation '
      'template generator', '', 1),
+    ('man/sphinx-apidoc', 'sphinx-apidoc', 'Sphinx API doc generator tool',
+     '', 1),
 ]
 
 texinfo_documents = [
diff --git a/doc/man/sphinx-apidoc.rst b/doc/man/sphinx-apidoc.rst
new file mode 100644
index 000000000..4b65cc632
--- /dev/null
+++ b/doc/man/sphinx-apidoc.rst
@@ -0,0 +1,52 @@
+:orphan:
+
+sphinx-apidoc manual page
+=========================
+
+Synopsis
+--------
+
+**sphinx-apidoc** [*options*] -o <*outputdir*> <*sourcedir*> [*filenames* ...]
+
+
+Description
+-----------
+
+:program:`sphinx-apidoc` is a tool for automatic generation of Sphinx sources
+that, using the autodoc extension, document a whole package in the style of
+other automatic API documentation tools.
+
+
+Options
+-------
+
+-o <outputdir>  Directory to place the output files.  If it does not exist,
+                it is created.
+-f, --force     Usually, apidoc does not overwrite files, unless this option
+                is given.
+-n, --dry-run   If given, apidoc does not create any files.
+-s <suffix>     Suffix for the source files generated, default is ``rst``.
+-d <maxdepth>   Maximum depth for the generated table of contents file.
+-T, --no-toc    Do not create a table of contents file.
+-F, --full      If given, a full Sphinx project is generated (``conf.py``,
+                ``Makefile`` etc.) using sphinx-quickstart.
+
+These options are used with ``-F``:
+
+-H <project>    Project name to put into the configuration.
+-A <author>     Author name(s) to put into the configuration.
+-V <version>    Project version, see :confval:`release`.
+-R <release>    Project release, see :confval:`release`.
+
+
+See also
+--------
+
+:manpage:`sphinx-build(1)`
+
+
+Author
+------
+
+Etienne Desautels, <etienne.desautels@gmail.com>, Georg Brandl
+<georg@python.org> et al.
diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py
index 96159ba7f..34381be0c 100644
--- a/sphinx/apidoc.py
+++ b/sphinx/apidoc.py
@@ -303,7 +303,9 @@ Note: By default this script will not overwrite already created files.""")
             mastertocmaxdepth = opts.maxdepth,
             mastertoctree = text,
         )
-        qs.generate(d, silent=True)
+        # XXX overwrites even without --force
+        if not opts.dryrun:
+            qs.generate(d, silent=True)
         print 'Creating quickstart project and Makefile.'
     elif not opts.notoc:
         create_modules_toc_file(modules, opts)

From 853cfbf7b61a6b33f4bb81e85b7921255590e992 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 7 Oct 2011 12:47:42 +0200
Subject: [PATCH 173/226] Do not overwrite files without -f given.

---
 sphinx/apidoc.py     | 11 ++++++-----
 sphinx/quickstart.py | 30 +++++++++++++++++-------------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py
index 34381be0c..5b6163ddd 100644
--- a/sphinx/apidoc.py
+++ b/sphinx/apidoc.py
@@ -269,11 +269,14 @@ Note: By default this script will not overwrite already created files.""")
         parser.error('An output directory is required.')
     if opts.header is None:
         opts.header = rootpath
+    if opts.suffix.startswith('.'):
+        opts.suffix = opts.suffix[1:]
     if not path.isdir(rootpath):
         print >>sys.stderr, '%s is not a directory.' % rootpath
         sys.exit(1)
     if not path.isdir(opts.destdir):
-        os.makedirs(opts.destdir)
+        if not opts.dryrun:
+            os.makedirs(opts.destdir)
     excludes = normalize_excludes(rootpath, excludes)
     modules = recurse_tree(rootpath, excludes, opts)
     if opts.full:
@@ -295,7 +298,7 @@ Note: By default this script will not overwrite already created files.""")
             version = opts.version or '',
             release = opts.release or opts.version or '',
             suffix = '.' + opts.suffix,
-            master = 'modules',
+            master = 'index',
             epub = True,
             ext_autodoc = True,
             makefile = True,
@@ -303,9 +306,7 @@ Note: By default this script will not overwrite already created files.""")
             mastertocmaxdepth = opts.maxdepth,
             mastertoctree = text,
         )
-        # XXX overwrites even without --force
         if not opts.dryrun:
-            qs.generate(d, silent=True)
-        print 'Creating quickstart project and Makefile.'
+            qs.generate(d, silent=True, overwrite=opts.force)
     elif not opts.notoc:
         create_modules_toc_file(modules, opts)
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index b85579ca2..ecb460407 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -946,9 +946,10 @@ directly.'''
     if 'batchfile' not in d:
         do_prompt(d, 'batchfile', 'Create Windows command file? (Y/n)',
                   'y', boolean)
+    print
 
 
-def generate(d, silent=False):
+def generate(d, overwrite=True, silent=False):
     """Generate project based on values in *d*."""
 
     texescape.init()
@@ -997,35 +998,38 @@ def generate(d, silent=False):
     mkdir_p(path.join(srcdir, d['dot'] + 'templates'))
     mkdir_p(path.join(srcdir, d['dot'] + 'static'))
 
+    def write_file(fpath, mode, content):
+        if overwrite or not path.isfile(fpath):
+            print 'Creating file %s.' % fpath
+            f = open(fpath, mode, encoding='utf-8')
+            try:
+                f.write(content)
+            finally:
+                f.close()
+        else:
+            print 'File %s already exists, skipping.' % fpath
+
     conf_text = QUICKSTART_CONF % d
     if d['epub']:
         conf_text += EPUB_CONFIG % d
     if d.get('ext_intersphinx'):
         conf_text += INTERSPHINX_CONFIG
 
-    f = open(path.join(srcdir, 'conf.py'), 'w', encoding='utf-8')
-    f.write(conf_text)
-    f.close()
+    write_file(path.join(srcdir, 'conf.py'), 'w', conf_text)
 
     masterfile = path.join(srcdir, d['master'] + d['suffix'])
-    f = open(masterfile, 'w', encoding='utf-8')
-    f.write(MASTER_FILE % d)
-    f.close()
+    write_file(masterfile, 'w', MASTER_FILE % d)
 
     if d['makefile']:
         d['rsrcdir'] = d['sep'] and 'source' or '.'
         d['rbuilddir'] = d['sep'] and 'build' or d['dot'] + 'build'
         # use binary mode, to avoid writing \r\n on Windows
-        f = open(path.join(d['path'], 'Makefile'), 'wb', encoding='utf-8')
-        f.write(MAKEFILE % d)
-        f.close()
+        write_file(path.join(d['path'], 'Makefile'), 'wb', MAKEFILE % d)
 
     if d['batchfile']:
         d['rsrcdir'] = d['sep'] and 'source' or '.'
         d['rbuilddir'] = d['sep'] and 'build' or d['dot'] + 'build'
-        f = open(path.join(d['path'], 'make.bat'), 'w', encoding='utf-8')
-        f.write(BATCHFILE % d)
-        f.close()
+        write_file(path.join(d['path'], 'make.bat'), 'w', BATCHFILE % d)
 
     if silent:
         return

From 38ebe67c4e934c9cfd663a0f2c2e21e8c84d29a5 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 7 Oct 2011 12:47:58 +0200
Subject: [PATCH 174/226] Closes #585: document sphinx-apidoc.

---
 doc/invocation.rst        | 71 +++++++++++++++++++++++++++++++++++++++
 doc/man/sphinx-apidoc.rst |  9 +++--
 doc/tutorial.rst          |  3 ++
 3 files changed, 80 insertions(+), 3 deletions(-)

diff --git a/doc/invocation.rst b/doc/invocation.rst
index c8e9a61fc..2c69d32f9 100644
--- a/doc/invocation.rst
+++ b/doc/invocation.rst
@@ -14,6 +14,8 @@ you don't need to specify any *filenames*.
 
 The :program:`sphinx-build` script has several options:
 
+.. program:: sphinx-build
+
 .. option:: -b buildername
 
    The most important option: it selects a builder.  The most common builders
@@ -183,3 +185,72 @@ variables to customize behavior:
 .. describe:: SPHINXOPTS
 
    Additional options for :program:`sphinx-build`.
+
+
+.. _invocation-apidoc:
+
+Invocation of sphinx-apidoc
+===========================
+
+The :program:`sphinx-apidoc` generates completely automatic API documentation
+for a Python package.  It is called like this::
+
+     $ sphinx-apidoc [options] -o outputdir packagedir [pathnames]
+
+where *packagedir* is the path to the package to document, and *outputdir* is
+the directory where the generated sources are placed.  Any *pathnames* given
+are paths to be excluded ignored during generation.
+
+The :program:`sphinx-apidoc` script has several options:
+
+.. program:: sphinx-apidoc
+
+.. option:: -o outputdir
+
+   Gives the directory in which to place the generated output.
+
+.. option:: -f, --force
+
+   Normally, sphinx-apidoc does not overwrite any files.  Use this option to
+   force the overwrite of all files that it generates.
+
+.. option:: -n, --dry-run
+
+   With this option given, no files will be written at all.
+
+.. option:: -s suffix
+
+   This option selects the file name suffix of output files.  By default, this
+   is ``rst``.
+
+.. option:: -d maxdepth
+
+   This sets the maximum depth of the table of contents, if one is generated.
+
+.. option:: -T, --no-toc
+
+   This prevents the generation of a table-of-contents file ``modules.rst``.
+   This has no effect when :option:`--full` is given.
+
+.. option:: -F, --full
+
+   This option makes sphinx-apidoc create a full Sphinx project, using the same
+   mechanism as :program:`sphinx-quickstart`.  Most configuration values are set
+   to default values, but you can influence the most important ones using the
+   following options.
+
+.. option:: -H project
+
+   Sets the project name to put in generated files (see :confval:`project`).
+
+.. option:: -A author
+
+   Sets the author name(s) to put in generated files (see :confval:`copyright`).
+
+.. option:: -V version
+
+   Sets the project version to put in generated files (see :confval:`version`).
+
+.. option:: -R release
+
+   Sets the project release to put in generated files (see :confval:`release`).
diff --git a/doc/man/sphinx-apidoc.rst b/doc/man/sphinx-apidoc.rst
index 4b65cc632..e48102deb 100644
--- a/doc/man/sphinx-apidoc.rst
+++ b/doc/man/sphinx-apidoc.rst
@@ -6,7 +6,7 @@ sphinx-apidoc manual page
 Synopsis
 --------
 
-**sphinx-apidoc** [*options*] -o <*outputdir*> <*sourcedir*> [*filenames* ...]
+**sphinx-apidoc** [*options*] -o <*outputdir*> <*sourcedir*> [*pathnames* ...]
 
 
 Description
@@ -16,6 +16,9 @@ Description
 that, using the autodoc extension, document a whole package in the style of
 other automatic API documentation tools.
 
+*sourcedir* must point to a Python package.  Any *pathnames* given are paths to
+be excluded from the generation.
+
 
 Options
 -------
@@ -35,8 +38,8 @@ These options are used with ``-F``:
 
 -H <project>    Project name to put into the configuration.
 -A <author>     Author name(s) to put into the configuration.
--V <version>    Project version, see :confval:`release`.
--R <release>    Project release, see :confval:`release`.
+-V <version>    Project version.
+-R <release>    Project release.
 
 
 See also
diff --git a/doc/tutorial.rst b/doc/tutorial.rst
index 055dda979..b0e1d4869 100644
--- a/doc/tutorial.rst
+++ b/doc/tutorial.rst
@@ -26,6 +26,9 @@ configuration values from a few questions it asks you.  Just run ::
 
 and answer its questions.  (Be sure to say yes to the "autodoc" extension.)
 
+There is also an automatic "API documentation" generator called
+:program:`sphinx-apidoc`; see :ref:`invocation-apidoc` for details.
+
 
 Defining document structure
 ---------------------------

From 5bff67432e956aa13e03454d08318dbe463510f6 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 7 Oct 2011 19:17:01 +0200
Subject: [PATCH 175/226] Fix the source positions referenced by the "viewcode"
 extension.

---
 CHANGES                   | 2 ++
 sphinx/pycode/__init__.py | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index 492e39f1e..02547e320 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@ Release 1.0.9 (in development)
 
 * #778: Fix "hide search matches" link on pages linked by search.
 
+* Fix the source positions referenced by the "viewcode" extension.
+
 
 Release 1.0.8 (Sep 23, 2011)
 ============================
diff --git a/sphinx/pycode/__init__.py b/sphinx/pycode/__init__.py
index ec4913a31..403269cda 100644
--- a/sphinx/pycode/__init__.py
+++ b/sphinx/pycode/__init__.py
@@ -193,6 +193,7 @@ class ModuleAnalyzer(object):
         # cache the source code as well
         pos = self.source.tell()
         self.encoding = detect_encoding(self.source.readline)
+	self.source.seek(pos)
         self.code = self.source.read()
         self.source.seek(pos)
 

From be5dac74a36fbd56b5ed7b84e3c3dc43edb10aad Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 7 Oct 2011 19:17:48 +0200
Subject: [PATCH 176/226] Activate the viewcode extension in the automatically
 generated apidoc project.

---
 sphinx/apidoc.py          | 1 +
 sphinx/pycode/__init__.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py
index 5b6163ddd..0885dc456 100644
--- a/sphinx/apidoc.py
+++ b/sphinx/apidoc.py
@@ -301,6 +301,7 @@ Note: By default this script will not overwrite already created files.""")
             master = 'index',
             epub = True,
             ext_autodoc = True,
+            ext_viewcode = True,
             makefile = True,
             batchfile = True,
             mastertocmaxdepth = opts.maxdepth,
diff --git a/sphinx/pycode/__init__.py b/sphinx/pycode/__init__.py
index ac8407501..09f7e2208 100644
--- a/sphinx/pycode/__init__.py
+++ b/sphinx/pycode/__init__.py
@@ -217,6 +217,7 @@ class ModuleAnalyzer(object):
         pos = self.source.tell()
         if not decoded:
             self.encoding = detect_encoding(self.source.readline)
+            self.source.seek(pos)
             self.code = self.source.read().decode(self.encoding)
             self.source.seek(pos)
             self.source = TextIOWrapper(self.source, self.encoding)

From 79e8cb40e8430b3a613158fad9a5e21c5ebc7960 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 7 Oct 2011 19:49:19 +0200
Subject: [PATCH 177/226] When collecting packages/modules to document, stop at
 directories without __init__.py.

---
 sphinx/apidoc.py | 98 ++++++++++++++++++++++++------------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py
index 0885dc456..24c56fbf2 100644
--- a/sphinx/apidoc.py
+++ b/sphinx/apidoc.py
@@ -28,6 +28,7 @@ OPTIONS = [
 
 INITPY = '__init__.py'
 
+
 def makename(package, module):
     """Join package and module with a dot."""
     # Both package and module can be None/empty.
@@ -39,6 +40,7 @@ def makename(package, module):
         name = module
     return name
 
+
 def write_file(name, text, opts):
     """Write the output file for module/package <name>."""
     fname = path.join(opts.destdir, '%s.%s' % (name, opts.suffix))
@@ -55,11 +57,13 @@ def write_file(name, text, opts):
         finally:
             f.close()
 
+
 def format_heading(level, text):
     """Create a heading of <level> [1, 2 or 3 supported]."""
     underlining = ['=', '-', '~', ][level-1] * len(text)
     return '%s\n%s\n\n' % (text, underlining)
 
+
 def format_directive(module, package=None):
     """Create the automodule directive and add the options."""
     directive = '.. automodule:: %s\n' % makename(package, module)
@@ -67,6 +71,7 @@ def format_directive(module, package=None):
         directive += '    :%s:\n' % option
     return directive
 
+
 def create_module_file(package, module, opts):
     """Build the text of the file and write the file."""
     text = format_heading(1, '%s Module' % module)
@@ -74,6 +79,7 @@ def create_module_file(package, module, opts):
     text += format_directive(module, package)
     write_file(makename(package, module), text, opts)
 
+
 def create_package_file(root, master_package, subroot, py_files, opts, subs):
     """Build the text of the file and write the file."""
     package = path.split(root)[-1]
@@ -106,10 +112,9 @@ def create_package_file(root, master_package, subroot, py_files, opts, subs):
 
     write_file(makename(master_package, subroot), text, opts)
 
+
 def create_modules_toc_file(modules, opts, name='modules'):
-    """
-    Create the module's index.
-    """
+    """Create the module's index."""
     text = format_heading(1, '%s' % opts.header)
     text += '.. toctree::\n'
     text += '   :maxdepth: %s\n\n' % opts.maxdepth
@@ -125,12 +130,12 @@ def create_modules_toc_file(modules, opts, name='modules'):
 
     write_file(name, text, opts)
 
+
 def shall_skip(module):
-    """
-    Check if we want to skip this module.
-    """
-    # skip it, if there is nothing (or just \n or \r\n) in the file
-    return path.getsize(module) < 3
+    """Check if we want to skip this module."""
+    # skip it if there is nothing (or just \n or \r\n) in the file
+    return path.getsize(module) <= 2
+
 
 def recurse_tree(rootpath, excludes, opts):
     """
@@ -139,54 +144,50 @@ def recurse_tree(rootpath, excludes, opts):
     """
     # use absolute path for root, as relative paths like '../../foo' cause
     # 'if "/." in root ...' to filter out *all* modules otherwise
-    rootpath = os.path.abspath(rootpath)
-    # check if the base directory is a package and get is name
+    rootpath = path.normpath(path.abspath(rootpath))
+    # check if the base directory is a package and get its name
     if INITPY in os.listdir(rootpath):
-        package_name = rootpath.split(path.sep)[-1]
+        root_package = rootpath.split(path.sep)[-1]
     else:
-        package_name = None
+        # otherwise, the base is a directory with packages
+        root_package = None
 
-    toc = []
-    tree = os.walk(rootpath, False)
-    for root, subs, files in tree:
-        # keep only the Python script files
-        py_files =  sorted([f for f in files if path.splitext(f)[1] == '.py'])
-        if INITPY in py_files:
+    toplevels = []
+    for root, subs, files in os.walk(rootpath):
+        if is_excluded(root, excludes):
+            del subs[:]
+            continue
+        # document only Python module files
+        py_files = sorted([f for f in files if path.splitext(f)[1] == '.py'])
+        is_pkg = INITPY in py_files
+        if is_pkg:
             py_files.remove(INITPY)
             py_files.insert(0, INITPY)
-        # remove hidden ('.') and private ('_') directories
-        subs = sorted([sub for sub in subs if sub[0] not in ['.', '_']])
-        # check if there are valid files to process
-        # TODO: could add check for windows hidden files
-        if "/." in root or "/_" in root \
-               or not py_files \
-               or is_excluded(root, excludes):
+        elif root != rootpath:
+            # only accept non-package at toplevel
+            del subs[:]
             continue
-        if INITPY in py_files:
-            # we are in package ...
-            if (# ... with subpackage(s)
-                subs
-                or
-                # ... with some module(s)
-                len(py_files) > 1
-                or
-                # ... with a not-to-be-skipped INITPY file
-                not shall_skip(path.join(root, INITPY))
-               ):
-                subroot = root[len(rootpath):].lstrip(path.sep).\
-                          replace(path.sep, '.')
-                create_package_file(root, package_name, subroot,
+        # remove hidden ('.') and private ('_') directories
+        subs[:] = sorted(sub for sub in subs if sub[0] not in ['.', '_'])
+
+        if is_pkg:
+            # we are in a package with something to document
+            if subs or len(py_files) > 1 or not shall_skip(path.join(root, INITPY)):
+                subpackage = root[len(rootpath):].lstrip(path.sep).\
+                    replace(path.sep, '.')
+                create_package_file(root, root_package, subpackage,
                                     py_files, opts, subs)
-                toc.append(makename(package_name, subroot))
-        elif root == rootpath:
+                toplevels.append(makename(root_package, subpackage))
+        else:
             # if we are at the root level, we don't require it to be a package
+            assert root == rootpath and root_package is None
             for py_file in py_files:
                 if not shall_skip(path.join(rootpath, py_file)):
                     module = path.splitext(py_file)[0]
-                    create_module_file(package_name, module, opts)
-                    toc.append(makename(package_name, module))
+                    create_module_file(root_package, module, opts)
+                    toplevels.append(module)
 
-    return toc
+    return toplevels
 
 
 def normalize_excludes(rootpath, excludes):
@@ -196,16 +197,14 @@ def normalize_excludes(rootpath, excludes):
     * otherwise it is joined with rootpath
     * with trailing slash
     """
-    sep = path.sep
     f_excludes = []
     for exclude in excludes:
         if not path.isabs(exclude) and not exclude.startswith(rootpath):
             exclude = path.join(rootpath, exclude)
-        if not exclude.endswith(sep):
-            exclude += sep
-        f_excludes.append(exclude)
+        f_excludes.append(path.normpath(exclude) + path.sep)
     return f_excludes
 
+
 def is_excluded(root, excludes):
     """
     Check if the directory is in the exclude list.
@@ -221,6 +220,7 @@ def is_excluded(root, excludes):
             return True
     return False
 
+
 def main(argv=sys.argv):
     """
     Parse and check the command line arguments.
@@ -268,7 +268,7 @@ Note: By default this script will not overwrite already created files.""")
     if not opts.destdir:
         parser.error('An output directory is required.')
     if opts.header is None:
-        opts.header = rootpath
+        opts.header = path.normpath(rootpath).split(path.sep)[-1]
     if opts.suffix.startswith('.'):
         opts.suffix = opts.suffix[1:]
     if not path.isdir(rootpath):

From 9904596da8c84007f579d9ca9e119468d02cf5fd Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Sat, 8 Oct 2011 14:02:13 +0200
Subject: [PATCH 178/226] Fixes #678: Support superclass declarations in C++
 domain.

---
 CHANGES                  |  1 +
 sphinx/domains/cpp.py    | 29 +++++++++++++++++++++++++++--
 tests/test_cpp_domain.py | 20 ++++++++++++++++++++
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4d97b45d2..527908e95 100644
--- a/CHANGES
+++ b/CHANGES
@@ -46,6 +46,7 @@ Features added
   - Section headings in :rst:dir:`only` directives are now correctly
     handled.
   - Added ``emphasize-lines`` option to source code directives.
+  - #678: C++ domain now supports superclasses.
 
 * HTML builder:
 
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 7a4e479a0..61173d447 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -488,8 +488,9 @@ class FuncDefExpr(NamedDefExpr):
 
 class ClassDefExpr(NamedDefExpr):
 
-    def __init__(self, name, visibility, static):
+    def __init__(self, name, visibility, static, bases):
         NamedDefExpr.__init__(self, name, visibility, static)
+        self.bases = bases
 
     def get_id(self):
         return self.name.get_id()
@@ -497,6 +498,9 @@ class ClassDefExpr(NamedDefExpr):
     def __unicode__(self):
         buf = self.get_modifiers()
         buf.append(unicode(self.name))
+        if self.bases:
+            buf.append(u':')
+            buf.append(u', '.join(unicode(base) for base in self.bases))
         return u' '.join(buf)
 
 
@@ -879,7 +883,21 @@ class DefinitionParser(object):
 
     def parse_class(self):
         visibility, static = self._parse_visibility_static()
-        return ClassDefExpr(self._parse_type(), visibility, static)
+        name = self._parse_type()
+        bases = []
+        if self.skip_string(':'):
+            self.skip_ws()
+            while 1:
+                access = 'public'
+                if self.match(_visibility_re):
+                    access = self.matched_text
+                base = self._parse_type()
+                bases.append(ClassDefExpr(base, access, False, []))
+                if self.skip_string(','):
+                    self.skip_ws()
+                else:
+                    break
+        return ClassDefExpr(name, visibility, static, bases)
 
     def read_rest(self):
         rv = self.definition[self.pos:]
@@ -1005,6 +1023,13 @@ class CPPClassObject(CPPObject):
         self.attach_modifiers(signode, cls)
         signode += addnodes.desc_annotation('class ', 'class ')
         self.attach_name(signode, cls.name)
+        if cls.bases:
+            signode += nodes.Text(' : ')
+            for base in cls.bases:
+                self.attach_modifiers(signode, base)
+                signode += nodes.emphasis(unicode(base.name), unicode(base.name))
+                signode += nodes.Text(', ')
+            signode.pop()  # remove the trailing comma
 
 
 class CPPTypeObject(CPPObject):
diff --git a/tests/test_cpp_domain.py b/tests/test_cpp_domain.py
index 22e24a08b..ff44c8dbf 100644
--- a/tests/test_cpp_domain.py
+++ b/tests/test_cpp_domain.py
@@ -74,6 +74,26 @@ def test_type_definitions():
     assert unicode(parse('member_object', x)) == x
 
 
+def test_bases():
+    x = 'A'
+    assert unicode(parse('class', x)) == x
+
+    x = 'A : B'
+    assert unicode(parse('class', x)) == x
+
+    x = 'A : private B'
+    assert unicode(parse('class', x)) == x
+
+    x = 'A : public B'
+    assert unicode(parse('class', x)) == 'A : B'
+
+    x = 'A : B, C'
+    assert unicode(parse('class', x)) == x
+
+    x = 'A : B, protected C, D'
+    assert unicode(parse('class', x)) == x
+
+
 def test_operators():
     x = parse('function', 'void operator new [  ] ()')
     assert unicode(x) == 'void operator new[]()'

From 1a287bb7e29fe05349d5b13acd0deed085a03612 Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Sat, 8 Oct 2011 14:55:18 +0200
Subject: [PATCH 179/226] Change default visibility for C++ superclasses.

---
 sphinx/domains/cpp.py    | 19 ++++++++++---------
 tests/test_cpp_domain.py |  4 ++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 61173d447..46bb73534 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -382,9 +382,9 @@ class NamedDefExpr(DefExpr):
     def get_name(self):
         return self.name.get_name()
 
-    def get_modifiers(self):
+    def get_modifiers(self, visibility='public'):
         rv = []
-        if self.visibility != 'public':
+        if self.visibility != visibility:
             rv.append(self.visibility)
         if self.static:
             rv.append(u'static')
@@ -495,12 +495,13 @@ class ClassDefExpr(NamedDefExpr):
     def get_id(self):
         return self.name.get_id()
 
-    def __unicode__(self):
-        buf = self.get_modifiers()
+    def __unicode__(self, visibility='public'):
+        buf = self.get_modifiers(visibility)
         buf.append(unicode(self.name))
         if self.bases:
             buf.append(u':')
-            buf.append(u', '.join(unicode(base) for base in self.bases))
+            buf.append(u', '.join(base.__unicode__('private')
+                                  for base in self.bases))
         return u' '.join(buf)
 
 
@@ -888,7 +889,7 @@ class DefinitionParser(object):
         if self.skip_string(':'):
             self.skip_ws()
             while 1:
-                access = 'public'
+                access = 'private'
                 if self.match(_visibility_re):
                     access = self.matched_text
                 base = self._parse_type()
@@ -947,8 +948,8 @@ class CPPObject(ObjectDescription):
         pnode += nodes.Text(text)
         node += pnode
 
-    def attach_modifiers(self, node, obj):
-        if obj.visibility != 'public':
+    def attach_modifiers(self, node, obj, visibility='public'):
+        if obj.visibility != visibility:
             node += addnodes.desc_annotation(obj.visibility,
                                              obj.visibility)
             node += nodes.Text(' ')
@@ -1026,7 +1027,7 @@ class CPPClassObject(CPPObject):
         if cls.bases:
             signode += nodes.Text(' : ')
             for base in cls.bases:
-                self.attach_modifiers(signode, base)
+                self.attach_modifiers(signode, base, 'private')
                 signode += nodes.emphasis(unicode(base.name), unicode(base.name))
                 signode += nodes.Text(', ')
             signode.pop()  # remove the trailing comma
diff --git a/tests/test_cpp_domain.py b/tests/test_cpp_domain.py
index ff44c8dbf..3ab8ece4c 100644
--- a/tests/test_cpp_domain.py
+++ b/tests/test_cpp_domain.py
@@ -82,10 +82,10 @@ def test_bases():
     assert unicode(parse('class', x)) == x
 
     x = 'A : private B'
-    assert unicode(parse('class', x)) == x
+    assert unicode(parse('class', x)) == 'A : B'
 
     x = 'A : public B'
-    assert unicode(parse('class', x)) == 'A : B'
+    assert unicode(parse('class', x)) == x
 
     x = 'A : B, C'
     assert unicode(parse('class', x)) == x

From 468a15cbf009d0a8a18b97120724eb6f47f69fcd Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Sat, 8 Oct 2011 16:04:42 +0200
Subject: [PATCH 180/226] Add project name to PO header.

---
 sphinx/builders/gettext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py
index b64c917ca..80df09a50 100644
--- a/sphinx/builders/gettext.py
+++ b/sphinx/builders/gettext.py
@@ -28,7 +28,7 @@ POHEADER = ur"""
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: %(version)s\n"
+"Project-Id-Version: %(project)s %(version)s\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: %(ctime)s\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

From 356b1ab8d31403846b947cad6d8dee0bace15d82 Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Sat, 8 Oct 2011 16:17:00 +0200
Subject: [PATCH 181/226] Fix typo.

---
 doc/intl.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/intl.rst b/doc/intl.rst
index 6a5471c4f..87068215b 100644
--- a/doc/intl.rst
+++ b/doc/intl.rst
@@ -46,7 +46,7 @@ with :confval:`locale_dirs` for your :confval:`language`, Sphinx will pick them
 up automatically.
 
 An example: you have a document ``usage.rst`` in your Sphinx project.  The
-gettext builder will put its messages into ``usage.pot``.  Image you have
+gettext builder will put its messages into ``usage.pot``.  Imagine you have
 Spanish translations [2]_ on your hands in ``usage.po`` --- for your builds to
 be translated you need to follow these instructions:
 

From 9a4a3c9afa66b7bddc2409e036abc578ae7b2fc4 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 9 Oct 2011 23:09:57 +0200
Subject: [PATCH 182/226] Satisfy "make check".

---
 doc/ext/autosummary.rst    |  2 +-
 doc/faq.rst                |  2 +-
 sphinx/apidoc.py           | 10 ++++++----
 sphinx/builders/gettext.py |  3 ++-
 sphinx/domains/cpp.py      |  3 ++-
 sphinx/domains/python.py   | 11 ++++++-----
 sphinx/quickstart.py       |  4 ++--
 tests/test_intersphinx.py  |  3 ++-
 8 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/doc/ext/autosummary.rst b/doc/ext/autosummary.rst
index 878a3c2c4..e3de18352 100644
--- a/doc/ext/autosummary.rst
+++ b/doc/ext/autosummary.rst
@@ -29,7 +29,7 @@ The :mod:`sphinx.ext.autosummary` extension does this in two parts:
 .. rst:directive:: autosummary
 
    Insert a table that contains links to documented items, and a short summary
-   blurb (the first sentence of the docstring) for each of them.  
+   blurb (the first sentence of the docstring) for each of them.
 
    The :rst:dir:`autosummary` directive can also optionally serve as a
    :rst:dir:`toctree` entry for the included items. Optionally, stub
diff --git a/doc/faq.rst b/doc/faq.rst
index 965a19869..bf2327d70 100644
--- a/doc/faq.rst
+++ b/doc/faq.rst
@@ -45,7 +45,7 @@ Using Sphinx with...
 Read the Docs
     http://readthedocs.org is a documentation hosting service based around Sphinx.
     They will host sphinx documentation, along with supporting a number of other
-    features including version support, PDF generation, and more. The `Getting 
+    features including version support, PDF generation, and more. The `Getting
     Started <http://read-the-docs.readthedocs.org/en/latest/getting_started.html>`_
     guide is a good place to start.
 
diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py
index 24c56fbf2..7e7f341fc 100644
--- a/sphinx/apidoc.py
+++ b/sphinx/apidoc.py
@@ -8,9 +8,9 @@
     creates a modules index (named modules.<suffix>).
 
     This is derived from the "sphinx-autopackage" script, which is:
-    Copyright 2008 Société des arts technologiques (SAT), http://www.sat.qc.ca/.
+    Copyright 2008 Société des arts technologiques (SAT), http://www.sat.qc.ca/
 
-    :copyright: 2007-2011 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import os
@@ -172,7 +172,8 @@ def recurse_tree(rootpath, excludes, opts):
 
         if is_pkg:
             # we are in a package with something to document
-            if subs or len(py_files) > 1 or not shall_skip(path.join(root, INITPY)):
+            if subs or len(py_files) > 1 or not \
+                shall_skip(path.join(root, INITPY)):
                 subpackage = root[len(rootpath):].lstrip(path.sep).\
                     replace(path.sep, '.')
                 create_package_file(root, root_package, subpackage,
@@ -251,7 +252,8 @@ Note: By default this script will not overwrite already created files.""")
                       help='Generate a full project with sphinx-quickstart')
     parser.add_option('-H', '--doc-project', action='store', dest='header',
                       help='Project name (default: root module name)')
-    parser.add_option('-A', '--doc-author', action='store', dest='author', type='str',
+    parser.add_option('-A', '--doc-author', action='store', dest='author',
+                      type='str',
                       help='Project author(s), used when --full is given')
     parser.add_option('-V', '--doc-version', action='store', dest='version',
                       help='Project version, used when --full is given')
diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py
index 80df09a50..a5f71a5f6 100644
--- a/sphinx/builders/gettext.py
+++ b/sphinx/builders/gettext.py
@@ -100,7 +100,8 @@ class MessageCatalogBuilder(I18nBuilder):
         )
         for textdomain, catalog in self.status_iterator(
                 self.catalogs.iteritems(), "writing message catalogs... ",
-                lambda (textdomain, _):darkgreen(textdomain), len(self.catalogs)):
+                lambda (textdomain, _): darkgreen(textdomain),
+                                        len(self.catalogs)):
 
             # noop if config.gettext_compact is set
             ensuredir(path.join(self.outdir, path.dirname(textdomain)))
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 46bb73534..acb8ba094 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -1028,7 +1028,8 @@ class CPPClassObject(CPPObject):
             signode += nodes.Text(' : ')
             for base in cls.bases:
                 self.attach_modifiers(signode, base, 'private')
-                signode += nodes.emphasis(unicode(base.name), unicode(base.name))
+                signode += nodes.emphasis(unicode(base.name),
+                                          unicode(base.name))
                 signode += nodes.Text(', ')
             signode.pop()  # remove the trailing comma
 
diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py
index 98d935450..779b071a3 100644
--- a/sphinx/domains/python.py
+++ b/sphinx/domains/python.py
@@ -422,13 +422,14 @@ class PyModule(Directive):
             env.domaindata['py']['modules'][modname] = \
                 (env.docname, self.options.get('synopsis', ''),
                  self.options.get('platform', ''), 'deprecated' in self.options)
-            # make a duplicate entry in 'objects' to facilitate searching for the
-            # module in PythonDomain.find_obj()
+            # make a duplicate entry in 'objects' to facilitate searching for
+            # the module in PythonDomain.find_obj()
             env.domaindata['py']['objects'][modname] = (env.docname, 'module')
-            targetnode = nodes.target('', '', ids=['module-' + modname], ismod=True)
+            targetnode = nodes.target('', '', ids=['module-' + modname],
+                                      ismod=True)
             self.state.document.note_explicit_target(targetnode)
-            # the platform and synopsis aren't printed; in fact, they are only used
-            # in the modindex currently
+            # the platform and synopsis aren't printed; in fact, they are only
+            # used in the modindex currently
             ret.append(targetnode)
             indextext = _('%s (module)') % modname
             inode = addnodes.index(entries=[('single', indextext,
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index ecb460407..88be5ceee 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -934,8 +934,8 @@ pngmath has been deselected.'''
         do_prompt(d, 'ext_ifconfig', 'ifconfig: conditional inclusion of '
                   'content based on config values (y/N)', 'n', boolean)
     if 'ext_viewcode' not in d:
-        do_prompt(d, 'ext_viewcode', 'viewcode: include links to the source code '
-                  'of documented Python objects (y/N)', 'n', boolean)
+        do_prompt(d, 'ext_viewcode', 'viewcode: include links to the source '
+                  'code of documented Python objects (y/N)', 'n', boolean)
 
     if 'makefile' not in d:
         print '''
diff --git a/tests/test_intersphinx.py b/tests/test_intersphinx.py
index 563750f6d..e1f4e827f 100644
--- a/tests/test_intersphinx.py
+++ b/tests/test_intersphinx.py
@@ -167,7 +167,8 @@ def test_load_mappings_warnings(tempdir, app):
         'http://docs.python.org/': inv_file,
         'py3k': ('http://docs.python.org/py3k/', inv_file),
         'repoze.workflow': ('http://docs.repoze.org/workflow/', inv_file),
-        'django-taggit': ('http://django-taggit.readthedocs.org/en/latest/', inv_file)
+        'django-taggit': ('http://django-taggit.readthedocs.org/en/latest/',
+                          inv_file)
     }
 
     app.config.intersphinx_cache_limit = 0

From d3c885d43c475ed227c11beb5b1e718431560403 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 9 Oct 2011 23:23:45 +0200
Subject: [PATCH 183/226] Restore Python 3 compatibility.

---
 sphinx/domains/cpp.py   | 18 ++++++++++--------
 sphinx/writers/latex.py |  3 ++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index acb8ba094..319ded44c 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -108,18 +108,15 @@ class DefinitionError(Exception):
     def __init__(self, description):
         self.description = description
 
-    def __unicode__(self):
-        return self.description
-
     def __str__(self):
         return unicode(self).encode('utf-8')
 
+    def __unicode__(self):
+        return self.description
+
 
 class DefExpr(object):
 
-    def __unicode__(self):
-        raise NotImplementedError()
-
     def __eq__(self, other):
         if type(self) is not type(other):
             return False
@@ -167,6 +164,9 @@ class DefExpr(object):
     def __str__(self):
         return unicode(self).encode('utf-8')
 
+    def __unicode__(self):
+        raise NotImplementedError()
+
     def __repr__(self):
         return '<%s %s>' % (self.__class__.__name__, self)
 
@@ -495,15 +495,17 @@ class ClassDefExpr(NamedDefExpr):
     def get_id(self):
         return self.name.get_id()
 
-    def __unicode__(self, visibility='public'):
+    def _tostring(self, visibility='public'):
         buf = self.get_modifiers(visibility)
         buf.append(unicode(self.name))
         if self.bases:
             buf.append(u':')
-            buf.append(u', '.join(base.__unicode__('private')
+            buf.append(u', '.join(base._tostring('private')
                                   for base in self.bases))
         return u' '.join(buf)
 
+    def __unicode__(self):
+        return self._tostring('public')
 
 class DefinitionParser(object):
 
diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index 75d6e8ec7..0ff2a1247 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -280,7 +280,8 @@ class LaTeXTranslator(nodes.NodeVisitor):
 
     def idescape(self, id):
         return unicode(id).translate(tex_replace_map).\
-            encode('ascii', 'backslashreplace').replace('\\', '_')
+            encode('ascii', 'backslashreplace').decode('ascii').\
+            replace('\\', '_')
 
     def generate_indices(self):
         def generate(content, collapsed):

From de117ea97421352c44cde2ad1ce773722336e91a Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 9 Oct 2011 23:25:40 +0200
Subject: [PATCH 184/226] Pre-release updates.

---
 CHANGES            | 4 ++--
 setup.py           | 1 +
 sphinx/__init__.py | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index d14138168..9374d4385 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,5 @@
-Release 1.1 (in development)
-============================
+Release 1.1 (Oct 9, 2011)
+=========================
 
 Incompatible changes
 --------------------
diff --git a/setup.py b/setup.py
index 87734687c..ca41aa431 100644
--- a/setup.py
+++ b/setup.py
@@ -182,6 +182,7 @@ setup(
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 3',
         'Topic :: Documentation',
         'Topic :: Text Processing',
         'Topic :: Utilities',
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 468b3406a..f1ddb7535 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -15,8 +15,8 @@
 import sys
 from os import path
 
-__version__  = '1.1pre'
-__released__ = '1.1 (hg)'  # used when Sphinx builds its own docs
+__version__  = '1.1'
+__released__ = '1.1'  # used when Sphinx builds its own docs
 
 package_dir = path.abspath(path.dirname(__file__))
 

From e782cec5fd9d0cd7f0559189a0130ac24be7fcdc Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 9 Oct 2011 23:31:15 +0200
Subject: [PATCH 186/226] Post-release update.

---
 CHANGES            | 4 ++++
 sphinx/__init__.py | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9374d4385..7f413d04c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Release 1.2 (in development)
+============================
+
+
 Release 1.1 (Oct 9, 2011)
 =========================
 
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index f1ddb7535..e1ffc2ed6 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -15,8 +15,8 @@
 import sys
 from os import path
 
-__version__  = '1.1'
-__released__ = '1.1'  # used when Sphinx builds its own docs
+__version__  = '1.2pre'
+__released__ = '1.2 (hg)'  # used when Sphinx builds its own docs
 
 package_dir = path.abspath(path.dirname(__file__))
 

From 7b6bf0ed8b6196ff9718b0d97238fde0c182bb40 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 23 Oct 2011 23:48:21 +0300
Subject: [PATCH 187/226] Fix typo and create a new "stable" named branch.

---
 sphinx/themes/basic/static/doctools.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/themes/basic/static/doctools.js b/sphinx/themes/basic/static/doctools.js
index bd1b44efb..d4619fdfb 100644
--- a/sphinx/themes/basic/static/doctools.js
+++ b/sphinx/themes/basic/static/doctools.js
@@ -2,7 +2,7 @@
  * doctools.js
  * ~~~~~~~~~~~
  *
- * Sphinx JavaScript utilties for all documentation.
+ * Sphinx JavaScript utilities for all documentation.
  *
  * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.

From 09d27b64c64f270cd91d4769e17064fde3974769 Mon Sep 17 00:00:00 2001
From: Benoit Allard <benoit@aeteurope.nl>
Date: Wed, 12 Oct 2011 20:35:17 +0200
Subject: [PATCH 188/226] latex: table: push the whole context at once

---
 sphinx/writers/latex.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index 0ff2a1247..c9a5381e7 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -744,13 +744,13 @@ class LaTeXTranslator(nodes.NodeVisitor):
         if self.table.col > 0:
             self.body.append(' & ')
         self.table.col += 1
-        self.context.append('')
+        context = ''
         if 'morerows' in node:
             self.body.append(' \multirow{')
             self.previous_spanning_row = 1
             self.body.append(str(node.get('morerows') + 1))
             self.body.append('}{*}{')
-            self.context.append('}')
+            context += '}'
             self.remember_multirow[self.table.col] = node.get('morerows') + 1
         if 'morecols' in node:
             self.body.append(' \multicolumn{')
@@ -759,13 +759,14 @@ class LaTeXTranslator(nodes.NodeVisitor):
                 self.body.append('}{|l|}{')
             else:
                 self.body.append('}{l|}{')
-            self.context.append('}')
+            context += '}'
         if isinstance(node.parent.parent, nodes.thead):
             self.body.append('\\textbf{')
-            self.context.append('}')
+            context += '}'
         if self.remember_multirow.get(self.table.col + 1, 0) > 1:
             self.remember_multirow[self.table.col + 1] -= 1
-            self.context.append(' & ')
+            context += ' & '
+        self.context.append(context)
     def depart_entry(self, node):
         self.body.append(self.context.pop()) # header
 

From 8fb564b90349c429f80f7aaca2c97e0200fa41be Mon Sep 17 00:00:00 2001
From: tk0miya <i.tkomiya@gmail.com>
Date: Sat, 22 Oct 2011 13:42:48 +0900
Subject: [PATCH 189/226] Fix SyntaxError when conf.py includes CR characters

---
 sphinx/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/config.py b/sphinx/config.py
index b05054c60..4bcf1b2cd 100644
--- a/sphinx/config.py
+++ b/sphinx/config.py
@@ -195,7 +195,7 @@ class Config(object):
                 # config file is executed
                 os.chdir(dirname)
                 # get config source
-                f = open(config_file, 'rb')
+                f = open(config_file, 'rU')
                 try:
                     source = f.read()
                 finally:

From 22546c4ebe474f9faaf2db87602e3d93004cfb59 Mon Sep 17 00:00:00 2001
From: Benoit Allard <benoit@aeteurope.nl>
Date: Wed, 26 Oct 2011 17:27:42 +0200
Subject: [PATCH 190/226] Restore compatibility with python2.5, use
 relative_path from docutils in place of path.relpath

Same as on the other places
---
 sphinx/environment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/environment.py b/sphinx/environment.py
index ae353ad44..54d9ee15e 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -198,7 +198,7 @@ class Locale(Transform):
         settings, source = self.document.settings, self.document['source']
         # XXX check if this is reliable
         assert source.startswith(env.srcdir)
-        docname = path.splitext(path.relpath(source, env.srcdir))[0]
+        docname = path.splitext(relative_path(source, env.srcdir))[0]
         textdomain = find_catalog(docname,
                                   self.document.settings.gettext_compact)
 

From 04cdfd83ebd7fde59f31c02952a6bead959db45c Mon Sep 17 00:00:00 2001
From: tk0miya <i.tkomiya@gmail.com>
Date: Sat, 22 Oct 2011 13:42:48 +0900
Subject: [PATCH 191/226] Fix SyntaxError when conf.py includes CR characters

---
 sphinx/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/config.py b/sphinx/config.py
index b05054c60..4bcf1b2cd 100644
--- a/sphinx/config.py
+++ b/sphinx/config.py
@@ -195,7 +195,7 @@ class Config(object):
                 # config file is executed
                 os.chdir(dirname)
                 # get config source
-                f = open(config_file, 'rb')
+                f = open(config_file, 'rU')
                 try:
                     source = f.read()
                 finally:

From ddb7fab16da780c862af0d5fbf4b62862b1236ff Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 1 Nov 2011 08:59:53 +0100
Subject: [PATCH 192/226] Closes #805: Make the ``Sphinx.add_index_to_domain``
 method work correctly.

---
 CHANGES               | 17 +++++++++++------
 sphinx/application.py |  5 ++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9374d4385..b2ef6db3a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+Release 1.1.1 (in development)
+==============================
+
+* #805: Make the ``Sphinx.add_index_to_domain`` method work correctly.
+
+* #780: Fix Python 2.5 compatibility.
+
+
 Release 1.1 (Oct 9, 2011)
 =========================
 
@@ -115,13 +123,10 @@ Features added
   - #714: Added Korean locale.
   - #766: Added Estonian locale.
 
+* Bugs fixed:
 
-Release 1.0.9 (in development)
-==============================
-
-* #778: Fix "hide search matches" link on pages linked by search.
-
-* Fix the source positions referenced by the "viewcode" extension.
+  - #778: Fix "hide search matches" link on pages linked by search.
+  - Fix the source positions referenced by the "viewcode" extension.
 
 
 Release 1.0.8 (Sep 23, 2011)
diff --git a/sphinx/application.py b/sphinx/application.py
index dec9c13c8..bfb39a70f 100644
--- a/sphinx/application.py
+++ b/sphinx/application.py
@@ -425,11 +425,10 @@ class Sphinx(object):
             raise ExtensionError('domain %s not yet registered' % domain)
         self.domains[domain].roles[name] = role
 
-    def add_index_to_domain(self, domain, name, localname, shortname, func):
+    def add_index_to_domain(self, domain, index):
         if domain not in self.domains:
             raise ExtensionError('domain %s not yet registered' % domain)
-        self.domains[domain].indices.append((name, localname, shortname))
-        setattr(self.domains[domain], 'get_%s_index' % name, func)
+        self.domains[domain].indices.append(index)
 
     def add_object_type(self, directivename, rolename, indextemplate='',
                         parse_node=None, ref_nodeclass=None, objname='',

From 5d19b860e2310213a536818518b53019b1dd6980 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 1 Nov 2011 09:01:48 +0100
Subject: [PATCH 193/226] Closes #801: Make intersphinx work properly without
 SSL support.

---
 CHANGES                   | 2 ++
 sphinx/ext/intersphinx.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index b2ef6db3a..74b638f3f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 1.1.1 (in development)
 ==============================
 
+* #801: Make intersphinx work properly without SSL support.
+
 * #805: Make the ``Sphinx.add_index_to_domain`` method work correctly.
 
 * #780: Fix Python 2.5 compatibility.
diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py
index ac229a669..7a1aeb401 100644
--- a/sphinx/ext/intersphinx.py
+++ b/sphinx/ext/intersphinx.py
@@ -42,7 +42,7 @@ handlers = [urllib2.ProxyHandler(), urllib2.HTTPRedirectHandler(),
             urllib2.HTTPHandler()]
 try:
     handlers.append(urllib2.HTTPSHandler)
-except NameError:
+except AttributeError:
     pass
 
 urllib2.install_opener(urllib2.build_opener(*handlers))

From 90b7372b8067359f1396f351c3a7e854cdc4e0fa Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 1 Nov 2011 09:09:50 +0100
Subject: [PATCH 194/226] Closes #797: Don't crash on a misformatted glossary.

---
 CHANGES               |  2 ++
 sphinx/domains/std.py | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 74b638f3f..fe7f6f46e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 1.1.1 (in development)
 ==============================
 
+* #797: Don't crash on a misformatted glossary.
+
 * #801: Make intersphinx work properly without SSL support.
 
 * #805: Make the ``Sphinx.add_index_to_domain`` method work correctly.
diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py
index 890ea10f7..1c68c449e 100644
--- a/sphinx/domains/std.py
+++ b/sphinx/domains/std.py
@@ -259,13 +259,23 @@ class Glossary(Directive):
                         messages.append(self.state.reporter.system_message(
                             2, 'glossary terms must not be separated by empty '
                             'lines', source=source, line=lineno))
-                    entries[-1][0].append((line, source, lineno))
+                    if entries:
+                        entries[-1][0].append((line, source, lineno))
+                    else:
+                        messages.append(self.state.reporter.system_message(
+                            2, 'glossary seems to be misformatted, check '
+                        'indentation', source=source, line=lineno))
             else:
                 if not in_definition:
                     # first line of definition, determines indentation
                     in_definition = True
                     indent_len = len(line) - len(line.lstrip())
-                entries[-1][1].append(line[indent_len:], source, lineno)
+                if entries:
+                    entries[-1][1].append(line[indent_len:], source, lineno)
+                else:
+                    messages.append(self.state.reporter.system_message(
+                        2, 'glossary seems to be misformatted, check '
+                    'indentation', source=source, line=lineno))
             was_empty = False
 
         # now, parse all the entries into a big definition list

From 3d3d3733e657633a103b8b09d0c36871f9698468 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 1 Nov 2011 09:13:41 +0100
Subject: [PATCH 195/226] Closes #796: use package_dir everywhere instead of
 __file__.

---
 sphinx/ext/autosummary/generate.py | 3 ++-
 sphinx/pycode/__init__.py          | 3 ++-
 sphinx/websupport/__init__.py      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sphinx/ext/autosummary/generate.py b/sphinx/ext/autosummary/generate.py
index c1eb2ac58..de1578a26 100644
--- a/sphinx/ext/autosummary/generate.py
+++ b/sphinx/ext/autosummary/generate.py
@@ -27,6 +27,7 @@ import optparse
 from jinja2 import FileSystemLoader, TemplateNotFound
 from jinja2.sandbox import SandboxedEnvironment
 
+from sphinx import package_dir
 from sphinx.ext.autosummary import import_by_name, get_documenter
 from sphinx.jinja2glue import BuiltinTemplateLoader
 from sphinx.util.osutil import ensuredir
@@ -78,7 +79,7 @@ def generate_autosummary_docs(sources, output_dir=None, suffix='.rst',
         sources = [os.path.join(base_path, filename) for filename in sources]
 
     # create our own templating environment
-    template_dirs = [os.path.join(os.path.dirname(__file__), 'templates')]
+    template_dirs = [os.path.join(package_dir, 'ext', 'autosummary', 'templates')]
     if builder is not None:
         # allow the user to override the templates
         template_loader = BuiltinTemplateLoader()
diff --git a/sphinx/pycode/__init__.py b/sphinx/pycode/__init__.py
index 09f7e2208..ef626f6d1 100644
--- a/sphinx/pycode/__init__.py
+++ b/sphinx/pycode/__init__.py
@@ -11,6 +11,7 @@
 
 from os import path
 
+from sphinx import package_dir
 from sphinx.errors import PycodeError
 from sphinx.pycode import nodes
 from sphinx.pycode.pgen2 import driver, token, tokenize, parse, literals
@@ -20,7 +21,7 @@ from sphinx.util.docstrings import prepare_docstring, prepare_commentdoc
 
 
 # load the Python grammar
-_grammarfile = path.join(path.dirname(__file__), 'Grammar.txt')
+_grammarfile = path.join(package_dir, 'pycode', 'Grammar.txt')
 pygrammar = driver.load_grammar(_grammarfile)
 pydriver = driver.Driver(pygrammar, convert=nodes.convert)
 
diff --git a/sphinx/websupport/__init__.py b/sphinx/websupport/__init__.py
index e054812e3..61b63cab2 100644
--- a/sphinx/websupport/__init__.py
+++ b/sphinx/websupport/__init__.py
@@ -87,7 +87,7 @@ class WebSupport(object):
 
     def _init_templating(self):
         import sphinx
-        template_path = path.join(path.dirname(sphinx.__file__),
+        template_path = path.join(sphinx.package_dir,
                                   'themes', 'basic')
         loader = FileSystemLoader(template_path)
         self.template_env = Environment(loader=loader)

From fd56b7c44a65379f776c0d33621e3590d808611f Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 1 Nov 2011 09:14:23 +0100
Subject: [PATCH 196/226] Closes #792: Include "sphinx-apidoc" in the source
 distribution.

---
 CHANGES     | 2 ++
 MANIFEST.in | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index fe7f6f46e..3995bbe45 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 1.1.1 (in development)
 ==============================
 
+* #792: Include "sphinx-apidoc" in the source distribution.
+
 * #797: Don't crash on a misformatted glossary.
 
 * #801: Make intersphinx work properly without SSL support.
diff --git a/MANIFEST.in b/MANIFEST.in
index cfc44c17e..214b81608 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -11,6 +11,7 @@ include distribute_setup.py
 include sphinx-autogen.py
 include sphinx-build.py
 include sphinx-quickstart.py
+include sphinx-apidoc.py
 
 recursive-include sphinx/texinputs *
 recursive-include sphinx/themes *

From 53d06fda7b44c6966d74da50d151a5a469b240e1 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 1 Nov 2011 09:16:37 +0100
Subject: [PATCH 197/226] Closes #793: Fix docutils version references.

---
 doc/ext/appapi.rst | 7 ++-----
 doc/intro.rst      | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/doc/ext/appapi.rst b/doc/ext/appapi.rst
index 643de9950..1f5c063c7 100644
--- a/doc/ext/appapi.rst
+++ b/doc/ext/appapi.rst
@@ -115,11 +115,8 @@ the following public API:
      <http://docutils.sourceforge.net/docs/howto/rst-directives.html>`_ for
      details.
 
-     The directive class normally must inherit from the class
-     ``docutils.parsers.rst.Directive``.  When writing a directive for usage in
-     a Sphinx extension, you inherit from ``sphinx.util.compat.Directive``
-     instead which does the right thing even on docutils 0.4 (which doesn't
-     support directive classes otherwise).
+     The directive class must inherit from the class
+     ``docutils.parsers.rst.Directive``.
 
    For example, the (already existing) :rst:dir:`literalinclude` directive would be
    added like this:
diff --git a/doc/intro.rst b/doc/intro.rst
index 46e4436bb..5d76dd29c 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -51,7 +51,7 @@ Prerequisites
 -------------
 
 Sphinx needs at least **Python 2.4** or **Python 3.1** to run, as well as the
-docutils_ and Jinja2_ libraries.  Sphinx should work with docutils version 0.5
+docutils_ and Jinja2_ libraries.  Sphinx should work with docutils version 0.7
 or some (not broken) SVN trunk snapshot.  If you like to have source code
 highlighting support, you must also install the Pygments_ library.
 

From 8fdeaec0184e8ded18c09c12d0ed695d532843e5 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 1 Nov 2011 09:24:34 +0100
Subject: [PATCH 198/226] Closes #791: Fix QtHelp and HtmlHelp index entry
 links.

---
 CHANGES                     | 2 ++
 sphinx/builders/htmlhelp.py | 3 ++-
 sphinx/builders/qthelp.py   | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3995bbe45..545ad5608 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 1.1.1 (in development)
 ==============================
 
+* #791: Fix QtHelp and HtmlHelp index entry links.
+
 * #792: Include "sphinx-apidoc" in the source distribution.
 
 * #797: Don't crash on a misformatted glossary.
diff --git a/sphinx/builders/htmlhelp.py b/sphinx/builders/htmlhelp.py
index 143f6df9e..f09f42e9a 100644
--- a/sphinx/builders/htmlhelp.py
+++ b/sphinx/builders/htmlhelp.py
@@ -258,7 +258,8 @@ class HTMLHelpBuilder(StandaloneHTMLBuilder):
             f.write('<UL>\n')
             def write_index(title, refs, subitems):
                 def write_param(name, value):
-                    item = '    <param name="%s" value="%s">\n' % (name, value)
+                    item = '    <param name="%s" value="%s">\n' % \
+                        (name, value[1])
                     f.write(item)
                 title = cgi.escape(title)
                 f.write('<LI> <OBJECT type="text/sitemap">\n')
diff --git a/sphinx/builders/qthelp.py b/sphinx/builders/qthelp.py
index 5598aad2c..b2ff26f4d 100644
--- a/sphinx/builders/qthelp.py
+++ b/sphinx/builders/qthelp.py
@@ -256,7 +256,7 @@ class QtHelpBuilder(StandaloneHTMLBuilder):
             groupdict = matchobj.groupdict()
             shortname = groupdict['title']
             id = groupdict.get('id')
-#            descr = groupdict.get('descr')
+            #descr = groupdict.get('descr')
             if shortname.endswith('()'):
                 shortname = shortname[:-2]
             id = '%s.%s' % (id, shortname)
@@ -265,9 +265,9 @@ class QtHelpBuilder(StandaloneHTMLBuilder):
 
         if id:
             item = ' '*12 + '<keyword name="%s" id="%s" ref="%s"/>' % (
-                                                                name, id, ref)
+                name, id, ref[1])
         else:
-            item = ' '*12 + '<keyword name="%s" ref="%s"/>' % (name, ref)
+            item = ' '*12 + '<keyword name="%s" ref="%s"/>' % (name, ref[1])
         item.encode('ascii', 'xmlcharrefreplace')
         return item
 

From 21cfc46dc30d10d952b00fc237a518fff675a2d9 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 1 Nov 2011 09:26:05 +0100
Subject: [PATCH 199/226] Fix DevHelp index entries too.

---
 CHANGES                    | 2 +-
 sphinx/builders/devhelp.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 545ad5608..c4157c340 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 Release 1.1.1 (in development)
 ==============================
 
-* #791: Fix QtHelp and HtmlHelp index entry links.
+* #791: Fix QtHelp, DevHelp and HtmlHelp index entry links.
 
 * #792: Include "sphinx-apidoc" in the source distribution.
 
diff --git a/sphinx/builders/devhelp.py b/sphinx/builders/devhelp.py
index a1b419453..62bd22377 100644
--- a/sphinx/builders/devhelp.py
+++ b/sphinx/builders/devhelp.py
@@ -107,12 +107,12 @@ class DevhelpBuilder(StandaloneHTMLBuilder):
                 pass
             elif len(refs) == 1:
                 etree.SubElement(functions, 'function',
-                                 name=title, link=refs[0])
+                                 name=title, link=refs[0][1])
             else:
                 for i, ref in enumerate(refs):
                     etree.SubElement(functions, 'function',
                                      name="[%d] %s" % (i, title),
-                                     link=ref)
+                                     link=ref[1])
 
             if subitems:
                 parent_title = re.sub(r'\s*\(.*\)\s*$', '', title)

From c6833609c07523605731a5c95860d0199c5a7620 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 1 Nov 2011 15:21:46 +0100
Subject: [PATCH 200/226] Fix relative_path() argument order.

---
 sphinx/environment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/environment.py b/sphinx/environment.py
index 54d9ee15e..9fd9ff89a 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -198,7 +198,7 @@ class Locale(Transform):
         settings, source = self.document.settings, self.document['source']
         # XXX check if this is reliable
         assert source.startswith(env.srcdir)
-        docname = path.splitext(relative_path(source, env.srcdir))[0]
+        docname = path.splitext(relative_path(env.srcdir, source))[0]
         textdomain = find_catalog(docname,
                                   self.document.settings.gettext_compact)
 

From a88eb5f0ef3559039ac7ca13c87debb2200673bd Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 1 Nov 2011 15:23:16 +0100
Subject: [PATCH 201/226] Fix overlong lines.

---
 sphinx/apidoc.py                   | 3 ++-
 sphinx/ext/autosummary/generate.py | 3 ++-
 sphinx/quickstart.py               | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py
index 7e7f341fc..16566761b 100644
--- a/sphinx/apidoc.py
+++ b/sphinx/apidoc.py
@@ -8,7 +8,8 @@
     creates a modules index (named modules.<suffix>).
 
     This is derived from the "sphinx-autopackage" script, which is:
-    Copyright 2008 Société des arts technologiques (SAT), http://www.sat.qc.ca/
+    Copyright 2008 Société des arts technologiques (SAT),
+    http://www.sat.qc.ca/
 
     :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
diff --git a/sphinx/ext/autosummary/generate.py b/sphinx/ext/autosummary/generate.py
index de1578a26..faba11605 100644
--- a/sphinx/ext/autosummary/generate.py
+++ b/sphinx/ext/autosummary/generate.py
@@ -79,7 +79,8 @@ def generate_autosummary_docs(sources, output_dir=None, suffix='.rst',
         sources = [os.path.join(base_path, filename) for filename in sources]
 
     # create our own templating environment
-    template_dirs = [os.path.join(package_dir, 'ext', 'autosummary', 'templates')]
+    template_dirs = [os.path.join(package_dir, 'ext',
+                                  'autosummary', 'templates')]
     if builder is not None:
         # allow the user to override the templates
         template_loader = BuiltinTemplateLoader()
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index 88be5ceee..86dc04762 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -267,8 +267,9 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('%(master_str)s', '%(project_fn)s', u'%(project_doc_str)s', u'%(author_str)s',
-   '%(project_fn)s', 'One line description of project.', 'Miscellaneous'),
+  ('%(master_str)s', '%(project_fn)s', u'%(project_doc_str)s',
+   u'%(author_str)s', '%(project_fn)s', 'One line description of project.',
+   'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.

From 313a428fa870d04529d77e0d470cb9a66662dd53 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 1 Nov 2011 15:24:26 +0100
Subject: [PATCH 202/226] Prepare for release 1.1.1.

---
 CHANGES            | 4 ++--
 sphinx/__init__.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index c4157c340..2c10a97a5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,5 @@
-Release 1.1.1 (in development)
-==============================
+Release 1.1.1 (Nov 1, 2011)
+===========================
 
 * #791: Fix QtHelp, DevHelp and HtmlHelp index entry links.
 
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index f1ddb7535..8a492228b 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -15,8 +15,8 @@
 import sys
 from os import path
 
-__version__  = '1.1'
-__released__ = '1.1'  # used when Sphinx builds its own docs
+__version__  = '1.1.1'
+__released__ = '1.1.1'  # used when Sphinx builds its own docs
 
 package_dir = path.abspath(path.dirname(__file__))
 

From cc1ca3a43a18ad961760e7dbfc3535eddec6da79 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 1 Nov 2011 21:40:52 +0100
Subject: [PATCH 204/226] Closes #809: Include custom fixers in the source
 distribution.

---
 CHANGES            | 6 ++++++
 MANIFEST.in        | 1 +
 sphinx/__init__.py | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2c10a97a5..298ce9582 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway!
+======================================================================
+
+* #809: Include custom fixers in the source distribution.
+
+
 Release 1.1.1 (Nov 1, 2011)
 ===========================
 
diff --git a/MANIFEST.in b/MANIFEST.in
index 214b81608..cf308103c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -19,6 +19,7 @@ recursive-include sphinx/locale *
 recursive-include sphinx/ext/autosummary/templates *
 recursive-include tests *
 recursive-include utils *
+recursive-include custom_fixers *
 include sphinx/pycode/Grammar.txt
 
 recursive-include doc *
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 8a492228b..0a2532271 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -15,8 +15,8 @@
 import sys
 from os import path
 
-__version__  = '1.1.1'
-__released__ = '1.1.1'  # used when Sphinx builds its own docs
+__version__  = '1.1.2'
+__released__ = '1.1.2'  # used when Sphinx builds its own docs
 
 package_dir = path.abspath(path.dirname(__file__))
 

From 1d188e778f7add99871ec7e164c0f915493a7544 Mon Sep 17 00:00:00 2001
From: Fraser Tweedale <frase@frase.id.au>
Date: Wed, 21 Dec 2011 15:22:46 +1000
Subject: [PATCH 206/226] apidoc: read options from SPHINX_APIDOC_OPTIONS
 envvar if set

If the SPHINX_APIDOC_OPTIONS environment variable exists, read
OPTIONS from there, otherwise use the existing default options.
This allows some configurability of sphinx-apidoc.
---
 sphinx/apidoc.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py
index 16566761b..ec1a8a33f 100644
--- a/sphinx/apidoc.py
+++ b/sphinx/apidoc.py
@@ -20,12 +20,15 @@ import optparse
 from os import path
 
 # automodule options
-OPTIONS = [
-    'members',
-    'undoc-members',
-    # 'inherited-members', # disabled because there's a bug in sphinx
-    'show-inheritance',
-]
+if 'SPHINX_APIDOC_OPTIONS' in os.environ:
+    OPTIONS = os.environ['SPHINX_APIDOC_OPTIONS'].split(',')
+else:
+    OPTIONS = [
+        'members',
+        'undoc-members',
+        # 'inherited-members', # disabled because there's a bug in sphinx
+        'show-inheritance',
+    ]
 
 INITPY = '__init__.py'
 

From 26f5a9b4d56328e2e41bf3c7d15fbe78ae84de63 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Wed, 25 Jan 2012 13:41:11 +0100
Subject: [PATCH 207/226] Fixed a priority error that caused operator++ and
 operator-> to not be parsed properly in the C++ domain. This fixes #861

---
 sphinx/domains/cpp.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 319ded44c..971aa1786 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -34,10 +34,10 @@ _template_arg_re = re.compile(r'(%s)|([^,>]+)' % _string_re.pattern, re.S)
 _operator_re = re.compile(r'''(?x)
         \[\s*\]
     |   \(\s*\)
-    |   [!<>=/*%+|&^-]=?
     |   \+\+ | --
-    |   (<<|>>)=? | ~ | && | \| | \|\|
     |   ->\*? | \,
+    |   [!<>=/*%+|&^-]=?
+    |   (<<|>>)=? | ~ | && | \| | \|\|
 ''')
 
 _id_shortwords = {

From 6649700221af013f4c2b978bcfe54bbe3359ca83 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Wed, 25 Jan 2012 13:43:49 +0100
Subject: [PATCH 208/226] Fixed another ordering priority bug in the C++
 parser.

---
 sphinx/domains/cpp.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 971aa1786..a6392c1cb 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -36,8 +36,8 @@ _operator_re = re.compile(r'''(?x)
     |   \(\s*\)
     |   \+\+ | --
     |   ->\*? | \,
-    |   [!<>=/*%+|&^-]=?
-    |   (<<|>>)=? | ~ | && | \| | \|\|
+    |   (<<|>>)=? | && | \|\|
+    |   [!<>=/*%+|&^~-]=?
 ''')
 
 _id_shortwords = {

From ff06931381ef2c506034d1fc538e874fb39835e9 Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Tue, 3 Jan 2012 12:43:13 +0100
Subject: [PATCH 209/226] Closes #846: Narrow down quick search styling.

---
 sphinx/themes/basic/static/basic.css_t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx/themes/basic/static/basic.css_t b/sphinx/themes/basic/static/basic.css_t
index 9459201ed..2937fa49b 100644
--- a/sphinx/themes/basic/static/basic.css_t
+++ b/sphinx/themes/basic/static/basic.css_t
@@ -79,11 +79,11 @@ div.sphinxsidebar input {
     font-size: 1em;
 }
 
-div.sphinxsidebar input[type="text"] {
+div.sphinxsidebar #searchbox input[type="text"] {
     width: 170px;
 }
 
-div.sphinxsidebar input[type="submit"] {
+div.sphinxsidebar #searchbox input[type="submit"] {
     width: 30px;
 }
 

From 00ed3ae8a9086cb12eac343e7ba278ff1c4457c2 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 29 Jan 2012 10:00:28 +0100
Subject: [PATCH 210/226] PR#40: Fix ``safe_repr`` function to decode
 bytestrings with non-ASCII characters correctly.

---
 CHANGES                | 7 +++++++
 sphinx/util/inspect.py | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 298ce9582..992d5048b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+Release 1.1.3 (in development)
+==============================
+
+* PR#40: Fix ``safe_repr`` function to decode bytestrings with non-ASCII
+  characters correctly.
+
+
 Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway!
 ======================================================================
 
diff --git a/sphinx/util/inspect.py b/sphinx/util/inspect.py
index ff6c222d2..f5c8911da 100644
--- a/sphinx/util/inspect.py
+++ b/sphinx/util/inspect.py
@@ -15,6 +15,8 @@ import sys
 # relatively import this module
 inspect = __import__('inspect')
 
+from sphinx.util import force_decode
+
 
 if sys.version_info >= (2, 5):
     from functools import partial
@@ -87,4 +89,4 @@ def safe_repr(object):
         s = repr(object)
     except Exception:
         raise ValueError
-    return s.replace('\n', ' ')
+    return force_decode(s, None).replace('\n', ' ')

From 0c0dda86759580a43fcaebe0ef64979ab1b36b64 Mon Sep 17 00:00:00 2001
From: Mathias Monnerville <mathias@monnerville.com>
Date: Thu, 5 Jan 2012 21:05:09 +0100
Subject: [PATCH 211/226] Updated french translations

---
 sphinx/locale/fr/LC_MESSAGES/sphinx.mo | Bin 8513 -> 10024 bytes
 sphinx/locale/fr/LC_MESSAGES/sphinx.po |  14 ++++----------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/sphinx/locale/fr/LC_MESSAGES/sphinx.mo b/sphinx/locale/fr/LC_MESSAGES/sphinx.mo
index f123c004b5547d97f0b9cc980a0aa4d75827aa3d..1027a790e9874004f468c2d276df46d3971b5ce7 100644
GIT binary patch
delta 4327
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

delta 2781
zcmZ|Pe`r-@9LMqJ-mY_c=iCq7yw15Zcds*HX0S{&HoStrm$}9Qr|6nf*Bn>wEyG~l
zsENz4mdBX7{zzOQf~DLA%Nop3F)bJ<r7pIlfwp93DMlFe{_H-`{%M?@*E!E~&iDB~
z-{(2^__Jrj@qsMg2Zp~R{LkS3j!$?0{e3mTm^5yCa1vg^ad-`9;Q(?N&%~sDRR2`W
z#5|mWB{&(wsCbn~ytvuKg`b8d`@n8Y=l*R}fJ3(Z1S)|un2i@P2Y<v2`~&r#k6;dF
zquwt?#b3rriB_VX-+;M{Z<@GJz&$t}592iKLS_1$?Z1Hm?niI|rqWq}<yeZFa6TTy
zJUow6@g{2EhnR{UW>JO{F_rPnN-i|BN>1Z(GwQ|dsKBqIGESfpJckN2hzfig*W&M(
zf?>))G0aL-B2}m**@+xx7bm^92jeQ?dtC6Y`2<yoF7)C>dw&_VEe2694xs{$pc1`r
zoyY>~eFqD%6gf;aCnj&U+WVNje`_-JSEg+=XstR>_a{*UcB2yOLCyFwYQU?g=Y~<6
z_5rFgS(GV^B}h(YCk8Q&N}v-}q0^{JcV|$4mecgwhHvcyS5dpRAJzXGD&QkjN&RHY
zr71=ww$Qo+_53R2Fx8w?vF)gVqxcx^Moq9e&V@306KCT-9L><SccTXAMJ4nN=Hmb=
z@FV0fDOt&Zr=gZ6h^ow7)IiHo&#ytnsYY$`c%$uTK@IdSs^sm~k5K^=s6@X&efMW=
z`w%MOVe38XpQz{mK_xJrjiDt-Lp>ir#)}(=3zhcqWP@3VD(w>6UWqDsEwap}85M9p
zD$oJcXL;D(Cs0dp1~uags0sC<-W$ME9%FvSG=2XE*-^^uC~BskqGs5Is>l!4pKSjx
zs08mKF-Cudl-LwLCB+G%27D5gNI9y1wY3JdWR1Gl_utHgUf7Qc*nz}0pV|BKs0v+2
zC3YJ*j6XLyz%0~E=ONWL3sDtYjf%4kXJRvQm=8H=ye^Du6MW5uzSn+SfPZ5FmeRQx
ztMDmoLw#l!tT%CV6IxSPho$sqpk`QwbeXNFO2$!%wPHDT2B^PEIYfhY^#jzV$z~J<
z&cg}}q1HNP+h0S?sKvG)L&Z6P+TCBGgMFyd-$M=T;pD}9455=p{S|l_4H~clwFh26
zm2M;IGm4>>rVSnJL{;oOYJgj|{~;=#pO^Flm4$jgpOZ?y2(<}Upc1W!bD`3_h$?v_
zYSX-f%CH?dOb@50@dm22S(Gb?LDbAwq7q+^s^DhSp4pCy|0-&NZ=jZBA1Y4#7#CE>
ze2yHZj}yypMo=?Iq0TZB^}-BPCFa@oFlyim)Xbkp4Y(eaNFA17qwPOz+do2{i<{$I
zs1&DBGro}QFn3Thdw|;2DU?S81W<`OsDa8*Gh2?D**a9kUb5|bQO~`PigN_@^_;|U
z`u@*xp$9JE6L@8`gWqW<Ip73Te}=sepl0S+=b#dukE+BHRK=E~+AC2@T8Elw1XaNn
zEZ)GyAuibXrWdt2ZlD4TVi69b225wiX%pq31`48<WG?ExXOOI%aBZwUw#W&^+-qrT
zy-+l1WWtt)Xnozw4ZG@HfBI6NGbb8JtVloLb?;^Dbx&m$xP4iFCBDy|?n(HjrhBGr
ziPXh5nwo~D+HLh1i@Xx8b8~X)-PWAKF`<s<wE1f5q7ipNZl^CA*-@Xkp6m1a$EMI9
zSTmZ!^t)r;OUql8OyRk_TVA(vW~&=0C`lZ37JCxE7M6Ju;i7f_lS6wj>dpuikBL<i
W3b-|)j$|J9Lsz_!9qzf=TmA*>R5A<z

diff --git a/sphinx/locale/fr/LC_MESSAGES/sphinx.po b/sphinx/locale/fr/LC_MESSAGES/sphinx.po
index ab989cf90..7f51effd1 100644
--- a/sphinx/locale/fr/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/fr/LC_MESSAGES/sphinx.po
@@ -303,9 +303,8 @@ msgid "%s (module)"
 msgstr "%s (module)"
 
 #: sphinx/domains/python.py:491
-#, fuzzy
 msgid "Python Module Index"
-msgstr "Index du module"
+msgstr "Index des modules Python"
 
 #: sphinx/domains/python.py:492
 msgid "modules"
@@ -324,7 +323,6 @@ msgid "method"
 msgstr "méthode"
 
 #: sphinx/domains/python.py:564
-#, fuzzy
 msgid "class method"
 msgstr "méthode de classe"
 
@@ -437,9 +435,8 @@ msgid "[docs]"
 msgstr ""
 
 #: sphinx/ext/viewcode.py:131
-#, fuzzy
 msgid "Module code"
-msgstr "module"
+msgstr "Code du module"
 
 #: sphinx/ext/viewcode.py:137
 #, python-format
@@ -544,9 +541,8 @@ msgid "Go"
 msgstr "Go"
 
 #: sphinx/themes/agogo/layout.html:57 sphinx/themes/basic/searchbox.html:20
-#, fuzzy
 msgid "Enter search terms or a module, class or function name."
-msgstr "Saisissez un nom de module, classe ou fonction."
+msgstr "Saisissez un mot clef ou un nom de module, classe ou fonction."
 
 #: sphinx/themes/agogo/layout.html:78 sphinx/themes/basic/sourcelink.html:14
 msgid "Show Source"
@@ -673,7 +669,6 @@ msgid ""
 msgstr "Activez le JavaScript pour que la recherche fonctionne."
 
 #: sphinx/themes/basic/search.html:29
-#, 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"
@@ -684,7 +679,7 @@ msgstr ""
 "termes\n"
 "    de votre recherche dans le champs ci-dessous et cliquez sur "
 "\"rechercher\". Notez que la fonctionnalité de recherche\n"
-"    va automatique chercher pour tous les mots. Les pages\n"
+"    va automatiquement chercher parmi l'ensemble les mots. Les pages\n"
 "    contenant moins de mots n'apparaîtront pas dans la liste des "
 "résultats."
 
@@ -776,7 +771,6 @@ msgid "continued from previous page"
 msgstr "Suite de la page précédente"
 
 #: sphinx/writers/latex.py:681
-#, fuzzy
 msgid "Continued on next page"
 msgstr "Suite sur la page suivante"
 

From 913bfd8e0cdc890fe5036a2a0b2db8a41aad4065 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 29 Jan 2012 10:08:27 +0100
Subject: [PATCH 212/226] Add changelog entry.

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 992d5048b..bd9359ecb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,8 @@ Release 1.1.3 (in development)
 * PR#40: Fix ``safe_repr`` function to decode bytestrings with non-ASCII
   characters correctly.
 
+* PR#37: Allow configuring sphinx-apidoc via ``SPHINX_APIDOC_OPTIONS``.
+
 
 Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway!
 ======================================================================

From 1436989b6bccd1c2224465b33cd2a75ca59f95b8 Mon Sep 17 00:00:00 2001
From: togakushi <togakushi@localhost>
Date: Sat, 26 Nov 2011 00:20:11 +0900
Subject: [PATCH 213/226] Changed Conditional Expressions

---
 sphinx/util/osutil.py                      |  7 ++++++-
 sphinx/websupport/storage/sqlalchemy_db.py | 22 ++++++++++++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/sphinx/util/osutil.py b/sphinx/util/osutil.py
index ee6a6c858..5becc37df 100644
--- a/sphinx/util/osutil.py
+++ b/sphinx/util/osutil.py
@@ -142,4 +142,9 @@ def safe_relpath(path, start=None):
         return path
 
 def find_catalog(docname, compaction):
-    return docname.split(SEP, 1)[0] if compaction else docname
+    if compaction:
+        ret = docname.split(SEP, 1)[0]
+    else:
+        ret = docname
+
+    return ret
diff --git a/sphinx/websupport/storage/sqlalchemy_db.py b/sphinx/websupport/storage/sqlalchemy_db.py
index dc2ec6a74..67136d1ae 100644
--- a/sphinx/websupport/storage/sqlalchemy_db.py
+++ b/sphinx/websupport/storage/sqlalchemy_db.py
@@ -77,7 +77,10 @@ class Node(Base):
         comments = []
         list_stack = [comments]
         for r in results:
-            comment, vote = r if username else (r, 0)
+            if username:
+                comment, vote = r
+            else:
+                comment, vote = (r, 0)
 
             inheritance_chain = comment.path.split('.')[1:]
 
@@ -176,7 +179,10 @@ class Comment(Base):
 
         path = self.path.split('.')
         node = path[0]
-        parent = path[-2] if len(path) > 2 else None
+        if len(path) > 2:
+            parent = path[-2]
+        else:
+            parent = None
 
         return {'text': self.text,
                 'username': self.username or 'Anonymous',
@@ -201,8 +207,16 @@ class Comment(Base):
         minutes = seconds / 60
 
         if days == 0:
-            dt = (minutes, 'minute') if hours == 0 else (hours, 'hour')
+            if hours == 0:
+                dt = (minutes, 'minute')
+            else:
+                dt = (hours, 'hour')
         else:
             dt = (days, 'day')
 
-        return '%s %s ago' % dt if dt[0] == 1 else '%s %ss ago' % dt
+        if dt[0] == 1:
+            ret = '%s %s ago' % dt
+        else:
+            ret = '%s %ss ago' % dt
+
+        return ret

From d0f5de9291239ade5d1aa3d95b9be822cbec0048 Mon Sep 17 00:00:00 2001
From: togakushi <togakushi@localhost>
Date: Sat, 26 Nov 2011 00:20:11 +0900
Subject: [PATCH 214/226] Changed Conditional Expressions

---
 sphinx/util/osutil.py                      |  7 ++++++-
 sphinx/websupport/storage/sqlalchemy_db.py | 22 ++++++++++++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/sphinx/util/osutil.py b/sphinx/util/osutil.py
index ee6a6c858..5becc37df 100644
--- a/sphinx/util/osutil.py
+++ b/sphinx/util/osutil.py
@@ -142,4 +142,9 @@ def safe_relpath(path, start=None):
         return path
 
 def find_catalog(docname, compaction):
-    return docname.split(SEP, 1)[0] if compaction else docname
+    if compaction:
+        ret = docname.split(SEP, 1)[0]
+    else:
+        ret = docname
+
+    return ret
diff --git a/sphinx/websupport/storage/sqlalchemy_db.py b/sphinx/websupport/storage/sqlalchemy_db.py
index dc2ec6a74..67136d1ae 100644
--- a/sphinx/websupport/storage/sqlalchemy_db.py
+++ b/sphinx/websupport/storage/sqlalchemy_db.py
@@ -77,7 +77,10 @@ class Node(Base):
         comments = []
         list_stack = [comments]
         for r in results:
-            comment, vote = r if username else (r, 0)
+            if username:
+                comment, vote = r
+            else:
+                comment, vote = (r, 0)
 
             inheritance_chain = comment.path.split('.')[1:]
 
@@ -176,7 +179,10 @@ class Comment(Base):
 
         path = self.path.split('.')
         node = path[0]
-        parent = path[-2] if len(path) > 2 else None
+        if len(path) > 2:
+            parent = path[-2]
+        else:
+            parent = None
 
         return {'text': self.text,
                 'username': self.username or 'Anonymous',
@@ -201,8 +207,16 @@ class Comment(Base):
         minutes = seconds / 60
 
         if days == 0:
-            dt = (minutes, 'minute') if hours == 0 else (hours, 'hour')
+            if hours == 0:
+                dt = (minutes, 'minute')
+            else:
+                dt = (hours, 'hour')
         else:
             dt = (days, 'day')
 
-        return '%s %s ago' % dt if dt[0] == 1 else '%s %ss ago' % dt
+        if dt[0] == 1:
+            ret = '%s %s ago' % dt
+        else:
+            ret = '%s %ss ago' % dt
+
+        return ret

From 6f67e145a2a900177f494fc90896f6294bddfa89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jozef=20=C5=A0ev=C4=8D=C3=ADk?= <sevcik@codescale.cz>
Date: Sat, 26 Nov 2011 15:53:42 +0100
Subject: [PATCH 215/226] Initial slovak translation

---
 sphinx/locale/sk/LC_MESSAGES/sphinx.js |   1 +
 sphinx/locale/sk/LC_MESSAGES/sphinx.mo | Bin 0 -> 8143 bytes
 sphinx/locale/sk/LC_MESSAGES/sphinx.po | 778 +++++++++++++++++++++++++
 3 files changed, 779 insertions(+)
 create mode 100644 sphinx/locale/sk/LC_MESSAGES/sphinx.js
 create mode 100644 sphinx/locale/sk/LC_MESSAGES/sphinx.mo
 create mode 100644 sphinx/locale/sk/LC_MESSAGES/sphinx.po

diff --git a/sphinx/locale/sk/LC_MESSAGES/sphinx.js b/sphinx/locale/sk/LC_MESSAGES/sphinx.js
new file mode 100644
index 000000000..2d210b548
--- /dev/null
+++ b/sphinx/locale/sk/LC_MESSAGES/sphinx.js
@@ -0,0 +1 @@
+Documentation.addTranslations({"locale": "sk", "plural_expr": "(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)", "messages": {"Hide Search Matches": "Skr\u00fdt v\u00fdsledky vyhled\u00e1v\u00e1n\u00ed", "Permalink to this definition": "Trval\u00fd odkaz na tuto definici", "Expand sidebar": "", "Permalink to this headline": "Trval\u00fd odkaz na tento nadpis", "Collapse sidebar": ""}});
diff --git a/sphinx/locale/sk/LC_MESSAGES/sphinx.mo b/sphinx/locale/sk/LC_MESSAGES/sphinx.mo
new file mode 100644
index 0000000000000000000000000000000000000000..8a4ac3a8723deb8935b82a7626702452d6d1d043
GIT binary patch
literal 8143
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
Gy!v1FG*vMG

literal 0
HcmV?d00001

diff --git a/sphinx/locale/sk/LC_MESSAGES/sphinx.po b/sphinx/locale/sk/LC_MESSAGES/sphinx.po
new file mode 100644
index 000000000..77f120232
--- /dev/null
+++ b/sphinx/locale/sk/LC_MESSAGES/sphinx.po
@@ -0,0 +1,778 @@
+# Slovak translations for Sphinx.
+# Copyright (C) 2008 ORGANIZATION
+# This file is distributed under the same license as the Sphinx project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Sphinx 0.5\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2011-11-26 13:53+0200\n"
+"PO-Revision-Date: 2011-11-26 14:00+0100\n"
+"Last-Translator: Jozef Sevcik <sevcik@codescale.net>\n"
+"Language-Team: Jozef Sevcik <sevcik@codescale.net>\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-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#: sphinx/config.py:81
+#, python-format
+msgid "%s %s documentation"
+msgstr "%s %s dokumentácia"
+
+#: sphinx/environment.py:119 sphinx/writers/latex.py:190
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
+#, python-format
+msgid "%B %d, %Y"
+msgstr "%d.%m.%Y"
+
+#: sphinx/environment.py:1625
+#, fuzzy, python-format
+msgid "see %s"
+msgstr "viz %s"
+
+#: sphinx/environment.py:1628
+#, fuzzy, python-format
+msgid "see also %s"
+msgstr "viz tiež %s"
+
+#: sphinx/roles.py:175
+#, python-format
+msgid "Python Enhancement Proposals; PEP %s"
+msgstr "Python Enhancement Proposals; PEP %s"
+
+#: sphinx/builders/changes.py:73
+msgid "Builtins"
+msgstr "Zabudované funkcie"
+
+#: sphinx/builders/changes.py:75
+msgid "Module level"
+msgstr "Úroveň modulov"
+
+#: sphinx/builders/html.py:274
+#, python-format
+msgid "%b %d, %Y"
+msgstr "%d.%m.%Y"
+
+#: sphinx/builders/html.py:293 sphinx/themes/basic/defindex.html:30
+msgid "General Index"
+msgstr "Register indexov"
+
+#: sphinx/builders/html.py:293
+msgid "index"
+msgstr "index"
+
+#: sphinx/builders/html.py:353
+msgid "next"
+msgstr "ďalší"
+
+#: sphinx/builders/html.py:362
+msgid "previous"
+msgstr "predchádzajúci"
+
+#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196
+msgid " (in "
+msgstr "(v"
+
+#: sphinx/directives/other.py:136
+msgid "Section author: "
+msgstr "Autor sekcie: "
+
+#: sphinx/directives/other.py:138
+msgid "Module author: "
+msgstr "Autor modulu: "
+
+#: sphinx/directives/other.py:140
+#, fuzzy
+msgid "Code author: "
+msgstr "Autor modulu: "
+
+#: sphinx/directives/other.py:142
+msgid "Author: "
+msgstr "Autor: "
+
+#: sphinx/directives/other.py:215
+msgid "See also"
+msgstr "Viz tiež"
+
+#: sphinx/domains/__init__.py:244
+#, python-format
+msgid "%s %s"
+msgstr ""
+
+#: sphinx/domains/c.py:51 sphinx/domains/python.py:95
+msgid "Parameters"
+msgstr "Parametre"
+
+#: sphinx/domains/c.py:54 sphinx/domains/javascript.py:128
+#: sphinx/domains/python.py:107
+msgid "Returns"
+msgstr "Vracia"
+
+#: sphinx/domains/c.py:56 sphinx/domains/python.py:109
+msgid "Return type"
+msgstr "Typ návratovej hodnoty"
+
+#: sphinx/domains/c.py:141
+#, python-format
+msgid "%s (C function)"
+msgstr "%s (C funkcia)"
+
+#: sphinx/domains/c.py:143
+#, python-format
+msgid "%s (C member)"
+msgstr "%s (člen C)"
+
+#: sphinx/domains/c.py:145
+#, python-format
+msgid "%s (C macro)"
+msgstr "%s (C makro)"
+
+#: sphinx/domains/c.py:147
+#, python-format
+msgid "%s (C type)"
+msgstr "%s (C typ)"
+
+#: sphinx/domains/c.py:149
+#, python-format
+msgid "%s (C variable)"
+msgstr "%s (C premenná)"
+
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
+#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
+msgid "function"
+msgstr "funkcia"
+
+#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
+msgid "member"
+msgstr "člen"
+
+#: sphinx/domains/c.py:206
+msgid "macro"
+msgstr ""
+
+#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
+msgid "type"
+msgstr "typ"
+
+#: sphinx/domains/c.py:208
+#, fuzzy
+msgid "variable"
+msgstr "Premenná"
+
+#: sphinx/domains/cpp.py:904
+#, python-format
+msgid "%s (C++ class)"
+msgstr "%s (C++ trieda)"
+
+#: sphinx/domains/cpp.py:919
+#, python-format
+msgid "%s (C++ type)"
+msgstr "%s (C++ typ)"
+
+#: sphinx/domains/cpp.py:938
+#, python-format
+msgid "%s (C++ member)"
+msgstr "%s (člen C++)"
+
+#: sphinx/domains/cpp.py:990
+#, python-format
+msgid "%s (C++ function)"
+msgstr "%s (C++ funkcia)"
+
+#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
+#: sphinx/domains/python.py:561
+msgid "class"
+msgstr "trieda"
+
+#: sphinx/domains/javascript.py:106 sphinx/domains/python.py:254
+#, python-format
+msgid "%s() (built-in function)"
+msgstr "%s() (zabudovaná funkcia)"
+
+#: sphinx/domains/javascript.py:107 sphinx/domains/python.py:318
+#, python-format
+msgid "%s() (%s method)"
+msgstr "%s() (metóda %s)"
+
+#: sphinx/domains/javascript.py:109
+#, python-format
+msgid "%s() (class)"
+msgstr "%s() (trieda)"
+
+#: sphinx/domains/javascript.py:111
+#, python-format
+msgid "%s (global variable or constant)"
+msgstr ""
+
+#: sphinx/domains/javascript.py:113 sphinx/domains/python.py:356
+#, python-format
+msgid "%s (%s attribute)"
+msgstr "%s() (atribút %s)"
+
+#: sphinx/domains/javascript.py:122
+#, fuzzy
+msgid "Arguments"
+msgstr "Parametre"
+
+#: sphinx/domains/javascript.py:125
+msgid "Throws"
+msgstr ""
+
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
+msgid "data"
+msgstr ""
+
+#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
+msgid "attribute"
+msgstr "atribút"
+
+#: sphinx/domains/python.py:100
+#, fuzzy
+msgid "Variables"
+msgstr "Premenná"
+
+#: sphinx/domains/python.py:104
+msgid "Raises"
+msgstr "Vyvolá"
+
+#: sphinx/domains/python.py:255 sphinx/domains/python.py:312
+#: sphinx/domains/python.py:324 sphinx/domains/python.py:337
+#, python-format
+msgid "%s() (in module %s)"
+msgstr "%s() (v module %s)"
+
+#: sphinx/domains/python.py:258
+#, python-format
+msgid "%s (built-in variable)"
+msgstr "%s() (zabudovaná premenná)"
+
+#: sphinx/domains/python.py:259 sphinx/domains/python.py:350
+#, python-format
+msgid "%s (in module %s)"
+msgstr "%s() (v module %s)"
+
+#: sphinx/domains/python.py:275
+#, python-format
+msgid "%s (built-in class)"
+msgstr "%s () (zabudovaná premenná)"
+
+#: sphinx/domains/python.py:276
+#, python-format
+msgid "%s (class in %s)"
+msgstr "%s() (trieda v %s)"
+
+#: sphinx/domains/python.py:316
+#, python-format
+msgid "%s() (%s.%s method)"
+msgstr "%s() (metoda %s.%s)"
+
+#: sphinx/domains/python.py:328
+#, python-format
+msgid "%s() (%s.%s static method)"
+msgstr "%s() (statická metóda %s.%s)"
+
+#: sphinx/domains/python.py:331
+#, python-format
+msgid "%s() (%s static method)"
+msgstr "%s() (statická metóda %s)"
+
+#: sphinx/domains/python.py:341
+#, fuzzy, python-format
+msgid "%s() (%s.%s class method)"
+msgstr "%s() (metóda %s.%s)"
+
+#: sphinx/domains/python.py:344
+#, fuzzy, python-format
+msgid "%s() (%s class method)"
+msgstr "%s() (metóda %s)"
+
+#: sphinx/domains/python.py:354
+#, python-format
+msgid "%s (%s.%s attribute)"
+msgstr "%s() (atribút %s.%s)"
+
+#: sphinx/domains/python.py:434
+#, python-format
+msgid "%s (module)"
+msgstr "%s (module)"
+
+#: sphinx/domains/python.py:491
+#, fuzzy
+msgid "Python Module Index"
+msgstr "Register modulov"
+
+#: sphinx/domains/python.py:492
+msgid "modules"
+msgstr "moduly"
+
+#: sphinx/domains/python.py:537
+msgid "Deprecated"
+msgstr "Zastaralé"
+
+#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
+msgid "exception"
+msgstr "výnimka"
+
+#: sphinx/domains/python.py:563
+msgid "method"
+msgstr ""
+
+#: sphinx/domains/python.py:564
+msgid "class method"
+msgstr ""
+
+#: sphinx/domains/python.py:565
+msgid "static method"
+msgstr "statická metóda"
+
+#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
+msgid "module"
+msgstr "modul"
+
+#: sphinx/domains/python.py:695
+msgid " (deprecated)"
+msgstr " (zastaralé)"
+
+#: sphinx/domains/rst.py:55
+#, python-format
+msgid "%s (directive)"
+msgstr ""
+
+#: sphinx/domains/rst.py:57
+#, python-format
+msgid "%s (role)"
+msgstr ""
+
+#: sphinx/domains/rst.py:106
+msgid "directive"
+msgstr ""
+
+#: sphinx/domains/rst.py:107
+msgid "role"
+msgstr ""
+
+#: sphinx/domains/std.py:70 sphinx/domains/std.py:86
+#, python-format
+msgid "environment variable; %s"
+msgstr "premenná prostredia, %s"
+
+#: sphinx/domains/std.py:162
+#, python-format
+msgid "%scommand line option; %s"
+msgstr "%s parametre príkazového riadku; %s"
+
+#: sphinx/domains/std.py:393
+msgid "glossary term"
+msgstr ""
+
+#: sphinx/domains/std.py:394
+msgid "grammar token"
+msgstr ""
+
+#: sphinx/domains/std.py:395
+msgid "reference label"
+msgstr ""
+
+#: sphinx/domains/std.py:396
+msgid "environment variable"
+msgstr "premenná prostredia"
+
+#: sphinx/domains/std.py:397
+msgid "program option"
+msgstr ""
+
+#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-split.html:11
+#: sphinx/themes/basic/genindex-split.html:14
+#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
+#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
+#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+msgid "Index"
+msgstr "Index"
+
+#: sphinx/domains/std.py:428
+msgid "Module Index"
+msgstr "Register modulov"
+
+#: sphinx/domains/std.py:429 sphinx/themes/basic/defindex.html:25
+msgid "Search Page"
+msgstr "Vyhľadávacia stránka"
+
+#: sphinx/ext/autodoc.py:1002
+#, python-format
+msgid "   Bases: %s"
+msgstr ""
+
+#: sphinx/ext/autodoc.py:1038
+#, python-format
+msgid "alias of :class:`%s`"
+msgstr ""
+
+#: sphinx/ext/todo.py:41
+msgid "Todo"
+msgstr "Todo"
+
+#: sphinx/ext/todo.py:109
+#, fuzzy, python-format
+msgid "(The <<original entry>> is located in  %s, line %d.)"
+msgstr "(Pôvodný záznam je v %s, riadok %d.)"
+
+#: sphinx/ext/todo.py:117
+msgid "original entry"
+msgstr ""
+
+#: sphinx/ext/viewcode.py:70
+msgid "[source]"
+msgstr ""
+
+#: sphinx/ext/viewcode.py:117
+msgid "[docs]"
+msgstr ""
+
+#: sphinx/ext/viewcode.py:131
+#, fuzzy
+msgid "Module code"
+msgstr "modul"
+
+#: sphinx/ext/viewcode.py:137
+#, python-format
+msgid "<h1>Source code for %s</h1>"
+msgstr ""
+
+#: sphinx/ext/viewcode.py:164
+msgid "Overview: module code"
+msgstr ""
+
+#: sphinx/ext/viewcode.py:165
+msgid "<h1>All modules for which code is available</h1>"
+msgstr ""
+
+#: sphinx/locale/__init__.py:155
+msgid "Attention"
+msgstr "Výstraha"
+
+#: sphinx/locale/__init__.py:156
+msgid "Caution"
+msgstr "Upozornenie"
+
+#: sphinx/locale/__init__.py:157
+msgid "Danger"
+msgstr "Nebezpečenstvo"
+
+#: sphinx/locale/__init__.py:158
+msgid "Error"
+msgstr "Chyba"
+
+#: sphinx/locale/__init__.py:159
+msgid "Hint"
+msgstr "Rada"
+
+#: sphinx/locale/__init__.py:160
+msgid "Important"
+msgstr "Dôležité"
+
+#: sphinx/locale/__init__.py:161
+msgid "Note"
+msgstr "Poznámka"
+
+#: sphinx/locale/__init__.py:162
+msgid "See Also"
+msgstr "Viz tiež"
+
+#: sphinx/locale/__init__.py:163
+msgid "Tip"
+msgstr "Tip"
+
+#: sphinx/locale/__init__.py:164
+msgid "Warning"
+msgstr "Varovanie"
+
+#: sphinx/locale/__init__.py:168
+#, python-format
+msgid "New in version %s"
+msgstr "Nové vo verzii %s"
+
+#: sphinx/locale/__init__.py:169
+#, python-format
+msgid "Changed in version %s"
+msgstr "Zmenené vo verzii %s"
+
+#: sphinx/locale/__init__.py:170
+#, python-format
+msgid "Deprecated since version %s"
+msgstr "Zastaralé od verzie %s"
+
+#: sphinx/locale/__init__.py:176
+msgid "keyword"
+msgstr "klúčové slovo"
+
+#: sphinx/locale/__init__.py:177
+msgid "operator"
+msgstr "operátor"
+
+#: sphinx/locale/__init__.py:178
+msgid "object"
+msgstr "objekt"
+
+#: sphinx/locale/__init__.py:180
+msgid "statement"
+msgstr "príkaz"
+
+#: sphinx/locale/__init__.py:181
+msgid "built-in function"
+msgstr "zabudovaná funkcia"
+
+#: sphinx/themes/agogo/layout.html:45 sphinx/themes/basic/globaltoc.html:10
+#: sphinx/themes/basic/localtoc.html:11
+msgid "Table Of Contents"
+msgstr "Obsah"
+
+#: sphinx/themes/agogo/layout.html:49 sphinx/themes/basic/layout.html:137
+#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:20
+msgid "Search"
+msgstr "Hľadanie"
+
+#: sphinx/themes/agogo/layout.html:52 sphinx/themes/basic/searchbox.html:15
+msgid "Go"
+msgstr "OK"
+
+#: sphinx/themes/agogo/layout.html:57 sphinx/themes/basic/searchbox.html:20
+msgid "Enter search terms or a module, class or function name."
+msgstr "Zadaj názov modulu, triedy alebo funkcie."
+
+#: sphinx/themes/agogo/layout.html:78 sphinx/themes/basic/sourcelink.html:14
+msgid "Show Source"
+msgstr "Ukázať zdroj"
+
+#: sphinx/themes/basic/defindex.html:11
+msgid "Overview"
+msgstr "Prehľad"
+
+#: sphinx/themes/basic/defindex.html:20
+msgid "Indices and tables:"
+msgstr "Register a tabuľky:"
+
+#: sphinx/themes/basic/defindex.html:23
+msgid "Complete Table of Contents"
+msgstr "Celkový obsah"
+
+#: sphinx/themes/basic/defindex.html:24
+msgid "lists all sections and subsections"
+msgstr "zoznam všetkých sekcií a podsekcií"
+
+#: sphinx/themes/basic/defindex.html:26
+msgid "search this documentation"
+msgstr "prehľadaj túto dokumentáciu"
+
+#: sphinx/themes/basic/defindex.html:28
+msgid "Global Module Index"
+msgstr "Celkový register modulov"
+
+#: sphinx/themes/basic/defindex.html:29
+msgid "quick access to all modules"
+msgstr "rýchly prístup ku všetkým modulom"
+
+#: sphinx/themes/basic/defindex.html:31
+msgid "all functions, classes, terms"
+msgstr "všetky funkcie, triedy, termíny"
+
+#: sphinx/themes/basic/genindex-single.html:35
+#, python-format
+msgid "Index &ndash; %(key)s"
+msgstr "Index &ndash; %(key)s"
+
+#: sphinx/themes/basic/genindex-single.html:63
+#: sphinx/themes/basic/genindex-split.html:24
+#: sphinx/themes/basic/genindex-split.html:38
+#: sphinx/themes/basic/genindex.html:74
+msgid "Full index on one page"
+msgstr "Celý index na jednej stránke"
+
+#: sphinx/themes/basic/genindex-split.html:16
+msgid "Index pages by letter"
+msgstr "Index podľa písmena"
+
+#: sphinx/themes/basic/genindex-split.html:25
+msgid "can be huge"
+msgstr "môže byť obrovský"
+
+#: sphinx/themes/basic/layout.html:29
+msgid "Navigation"
+msgstr "Navigácia"
+
+#: sphinx/themes/basic/layout.html:122
+#, python-format
+msgid "Search within %(docstitle)s"
+msgstr "Hľadanie v %(docstitle)s"
+
+#: sphinx/themes/basic/layout.html:131
+msgid "About these documents"
+msgstr "O týchto dokumentoch"
+
+#: sphinx/themes/basic/layout.html:140
+msgid "Copyright"
+msgstr "Všetky práva vyhradené"
+
+#: sphinx/themes/basic/layout.html:189
+#, python-format
+msgid "&copy; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
+msgstr "&copy; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
+
+#: sphinx/themes/basic/layout.html:191
+#, python-format
+msgid "&copy; Copyright %(copyright)s."
+msgstr "&copy; Copyright %(copyright)s."
+
+#: sphinx/themes/basic/layout.html:195
+#, python-format
+msgid "Last updated on %(last_updated)s."
+msgstr "Aktualizované dňa %(last_updated)s."
+
+#: sphinx/themes/basic/layout.html:198
+#, python-format
+msgid ""
+"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> "
+"%(sphinx_version)s."
+msgstr ""
+"Vytvorené pomocou <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> "
+"%(sphinx_version)s."
+
+#: sphinx/themes/basic/opensearch.xml:4
+#, python-format
+msgid "Search %(docstitle)s"
+msgstr "Prehľadať %(docstitle)s"
+
+#: sphinx/themes/basic/relations.html:11
+msgid "Previous topic"
+msgstr "Predchádzajúca téma"
+
+#: sphinx/themes/basic/relations.html:13
+msgid "previous chapter"
+msgstr "predchádzajúca kapitola"
+
+#: sphinx/themes/basic/relations.html:16
+msgid "Next topic"
+msgstr "Ďalšia téma"
+
+#: sphinx/themes/basic/relations.html:18
+msgid "next chapter"
+msgstr "dalšia kapitola"
+
+#: sphinx/themes/basic/search.html:24
+msgid ""
+"Please activate JavaScript to enable the search\n"
+"    functionality."
+msgstr ""
+
+#: sphinx/themes/basic/search.html:29
+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 vyhľadávacia stránka. Zadajte kľúčové slová a kliknete na "
+"\"hľadaj\". \n"
+"Vyhľadávanie hľadá automaticky všetky slová. Nebudú teda nájdené "
+"stránky obsahujúce menej slov."
+
+#: sphinx/themes/basic/search.html:36
+msgid "search"
+msgstr "hľadaj"
+
+#: sphinx/themes/basic/search.html:40
+msgid "Search Results"
+msgstr "Výsledky vyhľadávania"
+
+#: sphinx/themes/basic/search.html:42
+msgid "Your search did not match any results."
+msgstr "Nič nebolo nájdené."
+
+#: sphinx/themes/basic/searchbox.html:12
+msgid "Quick search"
+msgstr "Rýchle vyhľadávanie"
+
+#: sphinx/themes/basic/sourcelink.html:11
+msgid "This Page"
+msgstr "Táto stránka"
+
+#: sphinx/themes/basic/changes/frameset.html:5
+#: sphinx/themes/basic/changes/versionchanges.html:12
+#, python-format
+msgid "Changes in Version %(version)s &mdash; %(docstitle)s"
+msgstr "Zmeny vo verzii %(version)s &mdash; %(docstitle)s"
+
+#: sphinx/themes/basic/changes/rstsource.html:5
+#, python-format
+msgid "%(filename)s &mdash; %(docstitle)s"
+msgstr "%(filename)s &mdash; %(docstitle)s"
+
+#: sphinx/themes/basic/changes/versionchanges.html:17
+#, python-format
+msgid "Automatically generated list of changes in version %(version)s"
+msgstr "Automaticky generovaný zoznam zmien vo verzii %(version)s"
+
+#: sphinx/themes/basic/changes/versionchanges.html:18
+msgid "Library changes"
+msgstr "Zmeny v knižniciach"
+
+#: sphinx/themes/basic/changes/versionchanges.html:23
+msgid "C API changes"
+msgstr "Zmeny API"
+
+#: sphinx/themes/basic/changes/versionchanges.html:25
+msgid "Other changes"
+msgstr "Ostatné zmeny"
+
+#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
+#: sphinx/writers/html.py:510
+msgid "Permalink to this headline"
+msgstr "Trvalý odkaz na tento nadpis"
+
+#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:92
+msgid "Permalink to this definition"
+msgstr "Trvalý odkaz na túto definíciu"
+
+#: sphinx/themes/basic/static/doctools.js:189
+msgid "Hide Search Matches"
+msgstr "Skryť výsledky vyhľadávania"
+
+#: sphinx/themes/default/static/sidebar.js:69
+msgid "Expand sidebar"
+msgstr ""
+
+#: sphinx/themes/default/static/sidebar.js:82
+#: sphinx/themes/default/static/sidebar.js:110
+msgid "Collapse sidebar"
+msgstr ""
+
+#: sphinx/themes/haiku/layout.html:26
+msgid "Contents"
+msgstr ""
+
+#: sphinx/writers/latex.py:177
+msgid "Release"
+msgstr "Vydanie"
+
+#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
+#: sphinx/writers/texinfo.py:589
+msgid "Footnotes"
+msgstr ""
+
+#: sphinx/writers/latex.py:676
+msgid "continued from previous page"
+msgstr ""
+
+#: sphinx/writers/latex.py:681
+#, fuzzy
+msgid "Continued on next page"
+msgstr "Celý index na jednej stránke"
+
+#: sphinx/writers/text.py:437
+msgid "[image]"
+msgstr "[obrázok]"
+

From a6de8b78aa35465cdeb88a4fb46b0abec61e994e Mon Sep 17 00:00:00 2001
From: Marcio Mazza <marciomazza@gmail.com>
Date: Sun, 4 Dec 2011 14:43:46 -0200
Subject: [PATCH 216/226] Make the 'bibliography TOC fix' specific to document
 class howto/manual (article/report)

---
 sphinx/texinputs/sphinx.sty       | 15 ++++++---------
 sphinx/texinputs/sphinxhowto.cls  | 11 +++++++++++
 sphinx/texinputs/sphinxmanual.cls | 11 +++++++++++
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty
index 84c1ca1e4..08adec9e8 100644
--- a/sphinx/texinputs/sphinx.sty
+++ b/sphinx/texinputs/sphinx.sty
@@ -402,10 +402,15 @@
 }
 
 
-% Fix the index and bibliography environments to add an entry to the Table of
+% Fix the index environment to add an entry to the Table of
 % Contents; this is much nicer than just having to jump to the end of the book
 % and flip around, especially with multiple indexes.
 %
+% A similiar fix must be done to the bibliography environment, although
+% dependant on document class. In particular, the '\addcontentsline' command
+% should use 'chapter' for a report and 'section' for an article.
+% See sphinxmanual.cls and sphinxhowto.cls for specific fixes.
+%
 \let\py@OldTheindex=\theindex
 \renewcommand{\theindex}{
   \cleardoublepage
@@ -414,14 +419,6 @@
   \addcontentsline{toc}{chapter}{\indexname}
 }
 
-\let\py@OldThebibliography=\thebibliography
-\renewcommand{\thebibliography}[1]{
-  \cleardoublepage
-  \phantomsection
-  \py@OldThebibliography{1}
-  \addcontentsline{toc}{chapter}{\bibname}
-}
-
 % Include hyperref last.
 \RequirePackage[colorlinks,breaklinks,
                 linkcolor=InnerLinkColor,filecolor=OuterLinkColor,
diff --git a/sphinx/texinputs/sphinxhowto.cls b/sphinx/texinputs/sphinxhowto.cls
index 1ebdd4346..f4e3d2f4e 100644
--- a/sphinx/texinputs/sphinxhowto.cls
+++ b/sphinx/texinputs/sphinxhowto.cls
@@ -79,3 +79,14 @@
 \pagenumbering{arabic}		% ToC & chapters
 
 \thispagestyle{empty}
+
+% Fix the bibliography environment to add an entry to the Table of
+% Contents.
+% For an article document class this environment is a section,
+% so no page break before it.
+\let\py@OldThebibliography=\thebibliography
+\renewcommand{\thebibliography}[1]{
+  \phantomsection
+  \py@OldThebibliography{1}
+  \addcontentsline{toc}{section}{\bibname}
+}
diff --git a/sphinx/texinputs/sphinxmanual.cls b/sphinx/texinputs/sphinxmanual.cls
index 575177980..57fad1a96 100644
--- a/sphinx/texinputs/sphinxmanual.cls
+++ b/sphinx/texinputs/sphinxmanual.cls
@@ -120,3 +120,14 @@
 %
 \renewcommand*\l@section{\@dottedtocline{1}{1.5em}{2.6em}}
 \renewcommand*\l@subsection{\@dottedtocline{2}{4.1em}{3.5em}}
+
+% Fix the bibliography environment to add an entry to the Table of
+% Contents.
+% For a report document class this environment is a chapter.
+\let\py@OldThebibliography=\thebibliography
+\renewcommand{\thebibliography}[1]{
+  \cleardoublepage
+  \phantomsection
+  \py@OldThebibliography{1}
+  \addcontentsline{toc}{chapter}{\bibname}
+}

From 5abf089569968ee93c0883473b59d70996593dcf Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 29 Jan 2012 10:09:34 +0100
Subject: [PATCH 217/226] Add changelog entry.

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index bd9359ecb..fa5fc80ef 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@ Release 1.1.3 (in development)
 
 * PR#37: Allow configuring sphinx-apidoc via ``SPHINX_APIDOC_OPTIONS``.
 
+* PR#34: Restore Python 2.4 compatibility.
+
 
 Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway!
 ======================================================================

From c681ffd2127bcb4b3302d8674d489637811c8485 Mon Sep 17 00:00:00 2001
From: Marcio Mazza <marciomazza@gmail.com>
Date: Sun, 4 Dec 2011 14:43:46 -0200
Subject: [PATCH 218/226] Make the 'bibliography TOC fix' specific to document
 class howto/manual (article/report)

---
 sphinx/texinputs/sphinx.sty       | 15 ++++++---------
 sphinx/texinputs/sphinxhowto.cls  | 11 +++++++++++
 sphinx/texinputs/sphinxmanual.cls | 11 +++++++++++
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty
index 84c1ca1e4..08adec9e8 100644
--- a/sphinx/texinputs/sphinx.sty
+++ b/sphinx/texinputs/sphinx.sty
@@ -402,10 +402,15 @@
 }
 
 
-% Fix the index and bibliography environments to add an entry to the Table of
+% Fix the index environment to add an entry to the Table of
 % Contents; this is much nicer than just having to jump to the end of the book
 % and flip around, especially with multiple indexes.
 %
+% A similiar fix must be done to the bibliography environment, although
+% dependant on document class. In particular, the '\addcontentsline' command
+% should use 'chapter' for a report and 'section' for an article.
+% See sphinxmanual.cls and sphinxhowto.cls for specific fixes.
+%
 \let\py@OldTheindex=\theindex
 \renewcommand{\theindex}{
   \cleardoublepage
@@ -414,14 +419,6 @@
   \addcontentsline{toc}{chapter}{\indexname}
 }
 
-\let\py@OldThebibliography=\thebibliography
-\renewcommand{\thebibliography}[1]{
-  \cleardoublepage
-  \phantomsection
-  \py@OldThebibliography{1}
-  \addcontentsline{toc}{chapter}{\bibname}
-}
-
 % Include hyperref last.
 \RequirePackage[colorlinks,breaklinks,
                 linkcolor=InnerLinkColor,filecolor=OuterLinkColor,
diff --git a/sphinx/texinputs/sphinxhowto.cls b/sphinx/texinputs/sphinxhowto.cls
index 1ebdd4346..f4e3d2f4e 100644
--- a/sphinx/texinputs/sphinxhowto.cls
+++ b/sphinx/texinputs/sphinxhowto.cls
@@ -79,3 +79,14 @@
 \pagenumbering{arabic}		% ToC & chapters
 
 \thispagestyle{empty}
+
+% Fix the bibliography environment to add an entry to the Table of
+% Contents.
+% For an article document class this environment is a section,
+% so no page break before it.
+\let\py@OldThebibliography=\thebibliography
+\renewcommand{\thebibliography}[1]{
+  \phantomsection
+  \py@OldThebibliography{1}
+  \addcontentsline{toc}{section}{\bibname}
+}
diff --git a/sphinx/texinputs/sphinxmanual.cls b/sphinx/texinputs/sphinxmanual.cls
index 575177980..57fad1a96 100644
--- a/sphinx/texinputs/sphinxmanual.cls
+++ b/sphinx/texinputs/sphinxmanual.cls
@@ -120,3 +120,14 @@
 %
 \renewcommand*\l@section{\@dottedtocline{1}{1.5em}{2.6em}}
 \renewcommand*\l@subsection{\@dottedtocline{2}{4.1em}{3.5em}}
+
+% Fix the bibliography environment to add an entry to the Table of
+% Contents.
+% For a report document class this environment is a chapter.
+\let\py@OldThebibliography=\thebibliography
+\renewcommand{\thebibliography}[1]{
+  \cleardoublepage
+  \phantomsection
+  \py@OldThebibliography{1}
+  \addcontentsline{toc}{chapter}{\bibname}
+}

From 286df7f9df3c084a780b235b29110d5f7c6b6128 Mon Sep 17 00:00:00 2001
From: Timo Schmid <Timo Schmid@localhost>
Date: Fri, 23 Dec 2011 14:03:24 +0100
Subject: [PATCH 219/226] Fix: show [graph] in text builder

---
 sphinx/ext/graphviz.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py
index ee935945d..dc3b2623f 100644
--- a/sphinx/ext/graphviz.py
+++ b/sphinx/ext/graphviz.py
@@ -299,6 +299,7 @@ def text_visit_graphviz(self, node):
     if 'alt' in node.attributes:
         self.add_text(_('[graph: %s]') % node['alt'])
     self.add_text(_('[graph]'))
+    raise nodes.SkipNode
 
 
 def man_visit_graphviz(self, node):

From 5a911b5198f05ad592c725d394525f6dedde6fd6 Mon Sep 17 00:00:00 2001
From: Robert Lehmann <mail@robertlehmann.de>
Date: Tue, 3 Jan 2012 12:43:13 +0100
Subject: [PATCH 220/226] Closes #846: Narrow down quick search styling.

---
 sphinx/themes/basic/static/basic.css_t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx/themes/basic/static/basic.css_t b/sphinx/themes/basic/static/basic.css_t
index 9459201ed..2937fa49b 100644
--- a/sphinx/themes/basic/static/basic.css_t
+++ b/sphinx/themes/basic/static/basic.css_t
@@ -79,11 +79,11 @@ div.sphinxsidebar input {
     font-size: 1em;
 }
 
-div.sphinxsidebar input[type="text"] {
+div.sphinxsidebar #searchbox input[type="text"] {
     width: 170px;
 }
 
-div.sphinxsidebar input[type="submit"] {
+div.sphinxsidebar #searchbox input[type="submit"] {
     width: 30px;
 }
 

From dd176e436810a55fc9c86f9ac5ef8796b1e469f1 Mon Sep 17 00:00:00 2001
From: Mathias Monnerville <mathias@monnerville.com>
Date: Thu, 5 Jan 2012 21:05:09 +0100
Subject: [PATCH 221/226] Updated french translations

---
 sphinx/locale/fr/LC_MESSAGES/sphinx.mo | Bin 8513 -> 10024 bytes
 sphinx/locale/fr/LC_MESSAGES/sphinx.po |  14 ++++----------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/sphinx/locale/fr/LC_MESSAGES/sphinx.mo b/sphinx/locale/fr/LC_MESSAGES/sphinx.mo
index f123c004b5547d97f0b9cc980a0aa4d75827aa3d..1027a790e9874004f468c2d276df46d3971b5ce7 100644
GIT binary patch
delta 4327
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

delta 2781
zcmZ|Pe`r-@9LMqJ-mY_c=iCq7yw15Zcds*HX0S{&HoStrm$}9Qr|6nf*Bn>wEyG~l
zsENz4mdBX7{zzOQf~DLA%Nop3F)bJ<r7pIlfwp93DMlFe{_H-`{%M?@*E!E~&iDB~
z-{(2^__Jrj@qsMg2Zp~R{LkS3j!$?0{e3mTm^5yCa1vg^ad-`9;Q(?N&%~sDRR2`W
z#5|mWB{&(wsCbn~ytvuKg`b8d`@n8Y=l*R}fJ3(Z1S)|un2i@P2Y<v2`~&r#k6;dF
zquwt?#b3rriB_VX-+;M{Z<@GJz&$t}592iKLS_1$?Z1Hm?niI|rqWq}<yeZFa6TTy
zJUow6@g{2EhnR{UW>JO{F_rPnN-i|BN>1Z(GwQ|dsKBqIGESfpJckN2hzfig*W&M(
zf?>))G0aL-B2}m**@+xx7bm^92jeQ?dtC6Y`2<yoF7)C>dw&_VEe2694xs{$pc1`r
zoyY>~eFqD%6gf;aCnj&U+WVNje`_-JSEg+=XstR>_a{*UcB2yOLCyFwYQU?g=Y~<6
z_5rFgS(GV^B}h(YCk8Q&N}v-}q0^{JcV|$4mecgwhHvcyS5dpRAJzXGD&QkjN&RHY
zr71=ww$Qo+_53R2Fx8w?vF)gVqxcx^Moq9e&V@306KCT-9L><SccTXAMJ4nN=Hmb=
z@FV0fDOt&Zr=gZ6h^ow7)IiHo&#ytnsYY$`c%$uTK@IdSs^sm~k5K^=s6@X&efMW=
z`w%MOVe38XpQz{mK_xJrjiDt-Lp>ir#)}(=3zhcqWP@3VD(w>6UWqDsEwap}85M9p
zD$oJcXL;D(Cs0dp1~uags0sC<-W$ME9%FvSG=2XE*-^^uC~BskqGs5Is>l!4pKSjx
zs08mKF-Cudl-LwLCB+G%27D5gNI9y1wY3JdWR1Gl_utHgUf7Qc*nz}0pV|BKs0v+2
zC3YJ*j6XLyz%0~E=ONWL3sDtYjf%4kXJRvQm=8H=ye^Du6MW5uzSn+SfPZ5FmeRQx
ztMDmoLw#l!tT%CV6IxSPho$sqpk`QwbeXNFO2$!%wPHDT2B^PEIYfhY^#jzV$z~J<
z&cg}}q1HNP+h0S?sKvG)L&Z6P+TCBGgMFyd-$M=T;pD}9455=p{S|l_4H~clwFh26
zm2M;IGm4>>rVSnJL{;oOYJgj|{~;=#pO^Flm4$jgpOZ?y2(<}Upc1W!bD`3_h$?v_
zYSX-f%CH?dOb@50@dm22S(Gb?LDbAwq7q+^s^DhSp4pCy|0-&NZ=jZBA1Y4#7#CE>
ze2yHZj}yypMo=?Iq0TZB^}-BPCFa@oFlyim)Xbkp4Y(eaNFA17qwPOz+do2{i<{$I
zs1&DBGro}QFn3Thdw|;2DU?S81W<`OsDa8*Gh2?D**a9kUb5|bQO~`PigN_@^_;|U
z`u@*xp$9JE6L@8`gWqW<Ip73Te}=sepl0S+=b#dukE+BHRK=E~+AC2@T8Elw1XaNn
zEZ)GyAuibXrWdt2ZlD4TVi69b225wiX%pq31`48<WG?ExXOOI%aBZwUw#W&^+-qrT
zy-+l1WWtt)Xnozw4ZG@HfBI6NGbb8JtVloLb?;^Dbx&m$xP4iFCBDy|?n(HjrhBGr
ziPXh5nwo~D+HLh1i@Xx8b8~X)-PWAKF`<s<wE1f5q7ipNZl^CA*-@Xkp6m1a$EMI9
zSTmZ!^t)r;OUql8OyRk_TVA(vW~&=0C`lZ37JCxE7M6Ju;i7f_lS6wj>dpuikBL<i
W3b-|)j$|J9Lsz_!9qzf=TmA*>R5A<z

diff --git a/sphinx/locale/fr/LC_MESSAGES/sphinx.po b/sphinx/locale/fr/LC_MESSAGES/sphinx.po
index ab989cf90..7f51effd1 100644
--- a/sphinx/locale/fr/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/fr/LC_MESSAGES/sphinx.po
@@ -303,9 +303,8 @@ msgid "%s (module)"
 msgstr "%s (module)"
 
 #: sphinx/domains/python.py:491
-#, fuzzy
 msgid "Python Module Index"
-msgstr "Index du module"
+msgstr "Index des modules Python"
 
 #: sphinx/domains/python.py:492
 msgid "modules"
@@ -324,7 +323,6 @@ msgid "method"
 msgstr "méthode"
 
 #: sphinx/domains/python.py:564
-#, fuzzy
 msgid "class method"
 msgstr "méthode de classe"
 
@@ -437,9 +435,8 @@ msgid "[docs]"
 msgstr ""
 
 #: sphinx/ext/viewcode.py:131
-#, fuzzy
 msgid "Module code"
-msgstr "module"
+msgstr "Code du module"
 
 #: sphinx/ext/viewcode.py:137
 #, python-format
@@ -544,9 +541,8 @@ msgid "Go"
 msgstr "Go"
 
 #: sphinx/themes/agogo/layout.html:57 sphinx/themes/basic/searchbox.html:20
-#, fuzzy
 msgid "Enter search terms or a module, class or function name."
-msgstr "Saisissez un nom de module, classe ou fonction."
+msgstr "Saisissez un mot clef ou un nom de module, classe ou fonction."
 
 #: sphinx/themes/agogo/layout.html:78 sphinx/themes/basic/sourcelink.html:14
 msgid "Show Source"
@@ -673,7 +669,6 @@ msgid ""
 msgstr "Activez le JavaScript pour que la recherche fonctionne."
 
 #: sphinx/themes/basic/search.html:29
-#, 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"
@@ -684,7 +679,7 @@ msgstr ""
 "termes\n"
 "    de votre recherche dans le champs ci-dessous et cliquez sur "
 "\"rechercher\". Notez que la fonctionnalité de recherche\n"
-"    va automatique chercher pour tous les mots. Les pages\n"
+"    va automatiquement chercher parmi l'ensemble les mots. Les pages\n"
 "    contenant moins de mots n'apparaîtront pas dans la liste des "
 "résultats."
 
@@ -776,7 +771,6 @@ msgid "continued from previous page"
 msgstr "Suite de la page précédente"
 
 #: sphinx/writers/latex.py:681
-#, fuzzy
 msgid "Continued on next page"
 msgstr "Suite sur la page suivante"
 

From 8bac40f75204100d4b6a4a9dc0dfc91abf8db8fb Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Wed, 25 Jan 2012 13:41:11 +0100
Subject: [PATCH 222/226] Fixed a priority error that caused operator++ and
 operator-> to not be parsed properly in the C++ domain. This fixes #861

---
 sphinx/domains/cpp.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 319ded44c..971aa1786 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -34,10 +34,10 @@ _template_arg_re = re.compile(r'(%s)|([^,>]+)' % _string_re.pattern, re.S)
 _operator_re = re.compile(r'''(?x)
         \[\s*\]
     |   \(\s*\)
-    |   [!<>=/*%+|&^-]=?
     |   \+\+ | --
-    |   (<<|>>)=? | ~ | && | \| | \|\|
     |   ->\*? | \,
+    |   [!<>=/*%+|&^-]=?
+    |   (<<|>>)=? | ~ | && | \| | \|\|
 ''')
 
 _id_shortwords = {

From 81d5f7ac47e88f2bd918b3f76474eef51459e736 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Wed, 25 Jan 2012 13:43:49 +0100
Subject: [PATCH 223/226] Fixed another ordering priority bug in the C++
 parser.

---
 sphinx/domains/cpp.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 971aa1786..a6392c1cb 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -36,8 +36,8 @@ _operator_re = re.compile(r'''(?x)
     |   \(\s*\)
     |   \+\+ | --
     |   ->\*? | \,
-    |   [!<>=/*%+|&^-]=?
-    |   (<<|>>)=? | ~ | && | \| | \|\|
+    |   (<<|>>)=? | && | \|\|
+    |   [!<>=/*%+|&^~-]=?
 ''')
 
 _id_shortwords = {

From 5ad2895e731d75d31ca4da96d75c7f3dd000d87e Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 29 Jan 2012 10:03:09 +0100
Subject: [PATCH 224/226] Add Hungarian translation to docs.

---
 CHANGES        | 2 ++
 doc/config.rst | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index 095af3057..76b3b3e05 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 1.2 (in development)
 ============================
 
+* PR#28: Added Hungarian translation.
+
 
 Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway!
 ======================================================================
diff --git a/doc/config.rst b/doc/config.rst
index 5d188c613..28b2615c9 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -377,6 +377,7 @@ documentation on :ref:`intl` for details.
    * ``fi`` -- Finnish
    * ``fr`` -- French
    * ``hr`` -- Croatian
+   * ``hu`` -- Hungarian
    * ``it`` -- Italian
    * ``ja`` -- Japanese
    * ``ko`` -- Korean

From 4a8eef84798e0f21874011b2a7c6fe03bb6cde6e Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 29 Jan 2012 10:04:29 +0100
Subject: [PATCH 225/226] Add Slovak translation to docs.

---
 CHANGES        | 2 ++
 doc/config.rst | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index 76b3b3e05..5de4dc4fc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@ Release 1.2 (in development)
 
 * PR#28: Added Hungarian translation.
 
+* PR#35: Added Slovak translation.
+
 
 Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway!
 ======================================================================
diff --git a/doc/config.rst b/doc/config.rst
index 28b2615c9..5936cf8a4 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -388,6 +388,7 @@ documentation on :ref:`intl` for details.
    * ``pl`` -- Polish
    * ``pt_BR`` -- Brazilian Portuguese
    * ``ru`` -- Russian
+   * ``sk`` -- Slovak
    * ``sl`` -- Slovenian
    * ``sv`` -- Swedish
    * ``tr`` -- Turkish

From 77ba99950507b23ce69085c71efe2d397723af63 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 29 Jan 2012 10:12:07 +0100
Subject: [PATCH 226/226] Add changelog entry.

---
 CHANGES | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index fa5fc80ef..1798c441d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,9 @@ Release 1.1.3 (in development)
 
 * PR#34: Restore Python 2.4 compatibility.
 
+* PR#36: Make the "bibliography to TOC" fix in LaTeX output specific to
+  the document class.
+
 
 Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway!
 ======================================================================