Merged revisions 78859-78860 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78859 | georg.brandl | 2010-03-12 10:57:43 +0100 (Fr, 12 Mär 2010) | 1 line
Get rid of backticks.
........
r78860 | georg.brandl | 2010-03-12 11:02:03 +0100 (Fr, 12 Mär 2010) | 1 line
Fix warnings from "make check".
........
diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst
index 9f906df..bc50423 100644
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@ -498,7 +498,7 @@
.. attribute:: HTTPResponse.debuglevel
- A debugging hook. If `debuglevel` is greater than zero, messages
+ A debugging hook. If :attr:`debuglevel` is greater than zero, messages
will be printed to stdout as the response is read and parsed.
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index a576838..6e809cd 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -1210,12 +1210,12 @@
:class:`Handler` subclass are passed to its :meth:`handleError` method.
The default implementation of :meth:`handleError` in :class:`Handler` checks
-to see if a module-level variable, `raiseExceptions`, is set. If set, a
-traceback is printed to `sys.stderr`. If not set, the exception is swallowed.
+to see if a module-level variable, :data:`raiseExceptions`, is set. If set, a
+traceback is printed to :data:`sys.stderr`. If not set, the exception is swallowed.
-**Note:** The default value of `raiseExceptions` is `True`. This is because
+**Note:** The default value of :data:`raiseExceptions` is ``True``. This is because
during development, you typically want to be notified of any exceptions that
-occur. It's advised that you set `raiseExceptions` to `False` for production
+occur. It's advised that you set :data:`raiseExceptions` to ``False`` for production
usage.
.. _context-info:
diff --git a/Doc/library/site.rst b/Doc/library/site.rst
index eb4079d..b347ee8 100644
--- a/Doc/library/site.rst
+++ b/Doc/library/site.rst
@@ -124,9 +124,9 @@
.. function:: getuserbase()
- Returns the `user base` directory path.
+ Returns the "user base" directory path.
- The `user base` directory can be used to store data. If the global
+ The "user base" directory can be used to store data. If the global
variable ``USER_BASE`` is not initialized yet, this function will also set
it.
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index f3f0846..5342220 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -339,7 +339,7 @@
specific.
If given, *default* will be returned if the object does not provide means to
- retrieve the size. Otherwise a `TypeError` will be raised.
+ retrieve the size. Otherwise a :exc:`TypeError` will be raised.
:func:`getsizeof` calls the object's ``__sizeof__`` method and adds an
additional garbage collector overhead if the object is managed by the garbage