Merged in kenhys/sphinx (pull request #217)

Add feature to suppress uuid/location information for message catalogs

7 files changed, 9 insertions, 11 deletions

diff --git a/doc/_templates/indexsidebar.html b/doc/_templates/indexsidebar.html
index 70107eb5..4a350ae4 100644
--- a/doc/_templates/indexsidebar.html
+++ b/doc/_templates/indexsidebar.html
@@ -1,5 +1,6 @@
 <p class="logo">A <a href="http://pocoo.org/">
-  <img src="{{ pathto("_static/pocoo.png", 1) }}" /></a> {%trans%}project{%endtrans%}</a></p>
+  <img src="{{ pathto("_static/pocoo.png", 1) }}" alt="Pocoo" /></a>
+  {%trans%}project{%endtrans%}</p>
 
 <h3>Download</h3>
 {% if version.endswith('(hg)') %}
diff --git a/doc/_themes/sphinx13/layout.html b/doc/_themes/sphinx13/layout.html
index 69dd37f7..57378c1a 100644
--- a/doc/_themes/sphinx13/layout.html
+++ b/doc/_themes/sphinx13/layout.html
@@ -4,7 +4,7 @@
 
     Sphinx layout template for the sphinxdoc theme.
 
-    :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 #}
 {%- extends "basic/layout.html" %}
@@ -15,7 +15,7 @@
 
 {% block extrahead %}
     <link href='http://fonts.googleapis.com/css?family=Open+Sans:300,400,700'
-          rel='stylesheet' type='text/css'>
+          rel='stylesheet' type='text/css' />
 {{ super() }}
 {%- if not embedded %}
     <style type="text/css">
diff --git a/doc/_themes/sphinx13/static/sphinx13.css b/doc/_themes/sphinx13/static/sphinx13.css
index bb81b67b..0b31c6b1 100644
--- a/doc/_themes/sphinx13/static/sphinx13.css
+++ b/doc/_themes/sphinx13/static/sphinx13.css
@@ -4,7 +4,7 @@
  *
  * Sphinx stylesheet -- sphinx13 theme.
  *
- * :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */
diff --git a/doc/builders.rst b/doc/builders.rst
index 00f4e223..2dbbb188 100644
--- a/doc/builders.rst
+++ b/doc/builders.rst
@@ -133,11 +133,6 @@ for details.
 
    Its name is ``man``.
 
-   .. note::
-
-      This builder requires the docutils manual page writer, which is only
-      available as of docutils 0.6.
-
    .. versionadded:: 1.0
 
 
diff --git a/doc/conf.py b/doc/conf.py
index 9932c8ed..3ae94821 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -14,7 +14,7 @@ templates_path = ['_templates']
 exclude_patterns = ['_build']
 
 project = 'Sphinx'
-copyright = '2007-2013, Georg Brandl'
+copyright = '2007-2014, Georg Brandl and the Sphinx team'
 version = sphinx.__released__
 release = version
 show_authors = True
diff --git a/doc/develop.rst b/doc/develop.rst
index 41a75dcb..aad3ff1e 100644
--- a/doc/develop.rst
+++ b/doc/develop.rst
@@ -19,6 +19,8 @@ For more about our development process and methods, see the :doc:`devguide`.
 Extensions
 ==========
 
+To learn how to write your own extension, see :ref:`dev-extensions`.
+
 The `sphinx-contrib <http://bitbucket.org/birkenfeld/sphinx-contrib/>`_
 repository contains many contributed extensions.  Some of them have their own
 releases on PyPI, others you can install from a checkout.
diff --git a/doc/intro.rst b/doc/intro.rst
index dd541bf1..a796d937 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -55,7 +55,7 @@ Prerequisites
 -------------
 
 Sphinx needs at least **Python 2.6** or **Python 3.2** to run, as well as the
-docutils_ and Jinja2_ libraries.  Sphinx should work with docutils version 0.7
+docutils_ and Jinja2_ libraries.  Sphinx should work with docutils version 0.10
 or some (not broken) SVN trunk snapshot.  If you like to have source code
 highlighting support, you must also install the Pygments_ library.