merge with 0.6

11 files changed, 66 insertions, 8 deletions

diff --git a/CHANGES b/CHANGES
index 99a5868c..c4feb137 100644
--- a/CHANGES
+++ b/CHANGES
@@ -49,6 +49,10 @@ Release 1.0 (in development)
 Release 0.6.4 (in development)
 ==============================
 
+* #293: line blocks are styled properly in HTML output.
+
+* #285: make the ``locale_dirs`` config value work again.
+
 * #303: ``html_context`` values given on the command line via ``-A``
   should not override other values given in conf.py.
 
diff --git a/EXAMPLES b/EXAMPLES
index dd203d46..472b5ff9 100644
--- a/EXAMPLES
+++ b/EXAMPLES
@@ -6,9 +6,11 @@ experimenting with using it for their documentation.  If you like to be
 included, please mail to `the Google group
 <http://groups.google.com/group/sphinx-dev>`_.
 
+* Advanced Generic Widgets: http://xoomer.virgilio.it/infinity77/AGW_Docs/index.html
 * Applied Mathematics at the Stellenbosch University: http://dip.sun.ac.za/
 * APSW: http://apsw.googlecode.com/svn/publish/index.html
 * ASE: https://wiki.fysik.dtu.dk/ase/
+* Blender: http://www.blender.org/documentation/250PythonDoc/
 * boostmpi: http://documen.tician.de/boostmpi/
 * Calibre: http://calibre.kovidgoyal.net/user_manual/
 * Chaco: http://code.enthought.com/projects/chaco/docs/html/
@@ -86,6 +88,7 @@ included, please mail to `the Google group
 * SymPy: http://docs.sympy.org/
 * tinyTiM: http://tinytim.sourceforge.net/docs/2.0/
 * The Wine Cellar Book: http://www.thewinecellarbook.com/doc/en/
+* Total Open Station: http://tops.berlios.de/
 * TurboGears: http://turbogears.org/2.0/docs/
 * VOR: http://www.vor-cycling.be/
 * WebFaction: http://docs.webfaction.com/
@@ -94,3 +97,5 @@ included, please mail to `the Google group
 * WTForms: http://wtforms.simplecodes.com/docs/
 * Zope 3: e.g. http://docs.carduner.net/z3c-tutorial/
 * zc.async: http://packages.python.org/zc.async/1.5.0/
+
+.. XXX maybe regroup by interesting features used?
diff --git a/doc/ext/math.rst b/doc/ext/math.rst
index a214b41e..c1602558 100644
--- a/doc/ext/math.rst
+++ b/doc/ext/math.rst
@@ -191,10 +191,10 @@ value:
    JSMath.  There is no default.
 
    The path can be absolute or relative; if it is relative, it is relative to
-   the root of the built docs.
+   the ``_static`` directory of the built docs.
 
    For example, if you put JSMath into the static path of the Sphinx docs, this
-   value would be ``_static/jsMath/easy/load.js``.  If you host more than one
+   value would be ``jsMath/easy/load.js``.  If you host more than one
    Sphinx documentation set on one server, it is advisable to install jsMath in
    a shared location.
 
diff --git a/doc/extensions.rst b/doc/extensions.rst
index 0bc9b5b7..29c40ccd 100644
--- a/doc/extensions.rst
+++ b/doc/extensions.rst
@@ -61,8 +61,8 @@ There are several extensions that are not (yet) maintained in the Sphinx
 distribution.  The `Wiki at BitBucket`_ maintains a list of those.
 
 If you write an extension that you think others will find useful, please write
-to the project mailing list (sphinx-dev@googlegroups.com) and we'll find the
-proper way of including or hosting it for the public.
+to the project mailing list (`join here <http://groups.google.com/group/sphinx-dev>`_)
+and we'll find the proper way of including or hosting it for the public.
 
 .. _Wiki at BitBucket: http://www.bitbucket.org/birkenfeld/sphinx/wiki/Home
 
diff --git a/sphinx/builders/__init__.py b/sphinx/builders/__init__.py
index 60755ab4..159d1f03 100644
--- a/sphinx/builders/__init__.py
+++ b/sphinx/builders/__init__.py
@@ -186,7 +186,7 @@ class Builder(object):
                     if self.translator is None:
                         self.translator = trans
                     else:
-                        self.translator._catalog.update(trans.catalog)
+                        self.translator._catalog.update(trans._catalog)
                 except Exception:
                     # Language couldn't be found in the specified path
                     pass
diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py
index 910af6b3..1799d1d4 100644
--- a/sphinx/builders/html.py
+++ b/sphinx/builders/html.py
@@ -664,7 +664,8 @@ class StandaloneHTMLBuilder(Builder):
                    baseuri=self.get_target_uri(pagename)):
             if not resource:
                 otheruri = self.get_target_uri(otheruri)
-            return relative_uri(baseuri, otheruri)
+            uri = relative_uri(baseuri, otheruri) or '#'
+            return uri
         ctx['pathto'] = pathto
         ctx['hasdoc'] = lambda name: name in self.env.all_docs
         ctx['customsidebar'] = self.config.html_sidebars.get(pagename)
diff --git a/sphinx/environment.py b/sphinx/environment.py
index 993eaeea..e92940ce 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -931,7 +931,7 @@ class BuildEnvironment:
         """Return a TOC nodetree -- for use on the same page only!"""
         toc = self.tocs[docname].deepcopy()
         for node in toc.traverse(nodes.reference):
-            node['refuri'] = node['anchorname']
+            node['refuri'] = node['anchorname'] or '#'
         return toc
 
     def get_toctree_for(self, docname, builder, collapse):
diff --git a/sphinx/themes/agogo/static/agogo.css_t b/sphinx/themes/agogo/static/agogo.css_t
index 24e7dba5..ab257f56 100644
--- a/sphinx/themes/agogo/static/agogo.css_t
+++ b/sphinx/themes/agogo/static/agogo.css_t
@@ -44,6 +44,18 @@ a {
   float: right;
 }
 
+.line-block {
+    display: block;
+    margin-top: 1em;
+    margin-bottom: 1em;
+}
+
+.line-block .line-block {
+    margin-top: 0;
+    margin-bottom: 0;
+    margin-left: 1.5em;
+}
+
 h1, h2, h3, h4 {
   font-family: {{ theme_headerfont }};
   font-weight: normal;
@@ -257,7 +269,7 @@ div.footer .left {
 }
 
 
-/* Styles copied form basic theme */
+/* Styles copied from basic theme */
 
 /* -- search page ----------------------------------------------------------- */
 
diff --git a/sphinx/themes/basic/static/basic.css b/sphinx/themes/basic/static/basic.css
index a440964e..344c81cd 100644
--- a/sphinx/themes/basic/static/basic.css
+++ b/sphinx/themes/basic/static/basic.css
@@ -332,6 +332,18 @@ dl.glossary dt {
     background-color: #ffa
 }
 
+.line-block {
+    display: block;
+    margin-top: 1em;
+    margin-bottom: 1em;
+}
+
+.line-block .line-block {
+    margin-top: 0;
+    margin-bottom: 0;
+    margin-left: 1.5em;
+}
+
 /* -- code displays --------------------------------------------------------- */
 
 pre {
diff --git a/sphinx/themes/scrolls/static/style.css_t b/sphinx/themes/scrolls/static/style.css_t
index 0c346d04..00b78aaa 100644
--- a/sphinx/themes/scrolls/static/style.css_t
+++ b/sphinx/themes/scrolls/static/style.css_t
@@ -396,3 +396,15 @@ span.highlight {
 #toc ul li {
     margin: 2px 0 0 0;
 }
+
+.line-block {
+    display: block;
+    margin-top: 1em;
+    margin-bottom: 1em;
+}
+
+.line-block .line-block {
+    margin-top: 0;
+    margin-bottom: 0;
+    margin-left: 1.5em;
+}
\ No newline at end of file
diff --git a/sphinx/themes/traditional/static/traditional.css b/sphinx/themes/traditional/static/traditional.css
index 8c224c07..624a3627 100644
--- a/sphinx/themes/traditional/static/traditional.css
+++ b/sphinx/themes/traditional/static/traditional.css
@@ -636,6 +636,18 @@ tt.xref, a tt {
 
 .footnote:target  { background-color: #ffa }
 
+.line-block {
+    display: block;
+    margin-top: 1em;
+    margin-bottom: 1em;
+}
+
+.line-block .line-block {
+    margin-top: 0;
+    margin-bottom: 0;
+    margin-left: 1.5em;
+}
+
 h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
     background-color: transparent;
 }