summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-01-04 09:29:10 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-01-04 09:29:10 (GMT)
commit6e40e27ecfe417ab4633c46b8ac99d30ebad6b36 (patch)
treec4e4c62aa19b1f936615743c462ab380932de51d /Doc
parentaafdca895b5384455de662f89955f240daaa8caf (diff)
downloadcpython-6e40e27ecfe417ab4633c46b8ac99d30ebad6b36.zip
cpython-6e40e27ecfe417ab4633c46b8ac99d30ebad6b36.tar.gz
cpython-6e40e27ecfe417ab4633c46b8ac99d30ebad6b36.tar.bz2
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 ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/functions.rst2
-rw-r--r--Doc/library/readline.rst2
-rw-r--r--Doc/library/runpy.rst2
-rw-r--r--Doc/whatsnew/2.7.rst2
4 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 6b14dff..6741db7 100644
--- 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 ab4a099..21f30e5 100644
--- 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 55e845d..7278b7a 100644
--- 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 4171593..a07a979 100644
--- 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`.)