Merged revisions 77298 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77298 | ezio.melotti | 2010-01-04 11:00:11 +0200 (Mon, 04 Jan 2010) | 1 line

  fixed markup errors
........

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 6b14dffca2605f8f73edfdcd4322cf2c8eac0884..6741db77cbdf83e6e75c68b9f562e7d3d4c3ecf8 100644 (file)
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -142,7 +142,7 @@ are always available.  They are listed here in alphabetical order.
 .. function:: compile(source, filename, mode, flags=0, dont_inherit=False)
 
    Compile the *source* into a code or AST object.  Code objects can be executed
-   by:func:`exec` or :func:`eval`.  *source* can either be a string or an AST
+   by :func:`exec` or :func:`eval`.  *source* can either be a string or an AST
    object.  Refer to the :mod:`ast` module documentation for information on how
    to work with AST objects.
 

diff --git a/Doc/library/readline.rst b/Doc/library/readline.rst
index ab4a099e8696f76020d9a63c7e1fc1aac6a0cb19..21f30e56c2799410be7ef6e1dcbb3e3912bcd87e 100644 (file)
--- a/Doc/library/readline.rst
+++ b/Doc/library/readline.rst
@@ -14,7 +14,7 @@ made using  this module affect the behaviour of both the interpreter's
 interactive prompt  and the prompts offered by the built-in :func:`input`
 function.
 
-..note::
+.. note::
 
   On MacOS X the :mod:`readline` module can be implemented using
   the ``libedit`` library instead of GNU readline.

diff --git a/Doc/library/runpy.rst b/Doc/library/runpy.rst
index 55e845d59448944cb38dd0063d9e8911fa289662..7278b7a0dfdfa7f0ba4c6438fa4837507e104aef 100644 (file)
--- a/Doc/library/runpy.rst
+++ b/Doc/library/runpy.rst
@@ -43,7 +43,7 @@ The :mod:`runpy` module provides two functions:
 
    ``__file__`` is set to the name provided by the module loader. If the
    loader does not make filename information available, this variable is set
-   to `:const:`None`.
+   to :const:`None`.
 
    ``__loader__`` is set to the PEP 302 module loader used to retrieve the
    code for the module (This loader may be a wrapper around the standard

diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index 4171593d429c00f2d195e053c3d622b361b734ad..a07a979f3f32976bc6131bf45c75b13e168c41a9 100644 (file)
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -740,7 +740,7 @@ changes, or look through the Subversion logs for all the details.
   global site-packages directories, and
   :func:`getusersitepackages` returns the path of the user's
   site-packages directory.
-  :func:`getuserbase` returns the value of the :envvar:``USER_BASE``
+  :func:`getuserbase` returns the value of the :envvar:`USER_BASE`
   environment variable, giving the path to a directory that can be used
   to store data.
   (Contributed by Tarek Ziade; :issue:`6693`.)