merge with trunk

doc/config.rst

@@ -151,7 +151,8 @@ General configuration
    :confval:`language`), relative to the source directory.  The directories on
    this path are searched by the standard :mod:`gettext` module for a text
    domain of ``sphinx``; so if you add the directory :file:`./locale` to this
-   settting, the message catalogs must be in
+   settting, the message catalogs (compiled from ``.po`` format using
+   :program:`msgfmt`) must be in
    :file:`./locale/{language}/LC_MESSAGES/sphinx.mo`.
 
    The default is ``[]``.

doc/ext/tutorial.rst

@@ -201,7 +201,7 @@ The ``todo`` directive function looks like this::
        def run(self):
            env = self.state.document.settings.env
 
-           targetid = "todo-%s" % env.new_serialno('todo')
+           targetid = "todo-%d" % env.new_serialno('todo')
            targetnode = nodes.target('', '', ids=[targetid])
 
            ad = make_admonition(todo, self.name, [_('Todo')], self.options,