#4811: fix markup glitches (mostly remains of the conversion),
found by Gabriel Genellina.
diff --git a/Doc/library/cookielib.rst b/Doc/library/cookielib.rst
index 022ac13..f55d6c2 100644
--- a/Doc/library/cookielib.rst
+++ b/Doc/library/cookielib.rst
@@ -733,7 +733,7 @@
The :class:`Cookie` class also defines the following method:
-.. method:: Cookie.is_expired([now=:const:`None`])
+.. method:: Cookie.is_expired([now=None])
True if cookie has passed the time at which the server requested it should
expire. If *now* is given (in seconds since the epoch), return whether the
diff --git a/Doc/library/email.mime.rst b/Doc/library/email.mime.rst
index 415a682..5b20944 100644
--- a/Doc/library/email.mime.rst
+++ b/Doc/library/email.mime.rst
@@ -57,14 +57,14 @@
.. currentmodule:: email.mime.multipart
-.. class:: MIMEMultipart([subtype[, boundary[, _subparts[, _params]]]])
+.. class:: MIMEMultipart([_subtype[, boundary[, _subparts[, _params]]]])
Module: :mod:`email.mime.multipart`
A subclass of :class:`MIMEBase`, this is an intermediate base class for MIME
messages that are :mimetype:`multipart`. Optional *_subtype* defaults to
:mimetype:`mixed`, but can be used to specify the subtype of the message. A
- :mailheader:`Content-Type` header of :mimetype:`multipart/`*_subtype* will be
+ :mailheader:`Content-Type` header of :mimetype:`multipart/_subtype` will be
added to the message object. A :mailheader:`MIME-Version` header will also be
added.
diff --git a/Doc/library/gzip.rst b/Doc/library/gzip.rst
index 86be3cd..c6f9ef8 100644
--- a/Doc/library/gzip.rst
+++ b/Doc/library/gzip.rst
@@ -7,7 +7,7 @@
This module provides a simple interface to compress and decompress files just
like the GNU programs :program:`gzip` and :program:`gunzip` would.
-The data compression is provided by the :mod:``zlib`` module.
+The data compression is provided by the :mod:`zlib` module.
The :mod:`gzip` module provides the :class:`GzipFile` class which is modeled
after Python's File Object. The :class:`GzipFile` class reads and writes
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
index cf6138e..5fb8498 100644
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -152,7 +152,7 @@
*default(obj)* is a function that should return a serializable version of
*obj* or raise :exc:`TypeError`. The default simply raises :exc:`TypeError`.
- To use a custom :class:`JSONEncoder`` subclass (e.g. one that overrides the
+ To use a custom :class:`JSONEncoder` subclass (e.g. one that overrides the
:meth:`default` method to serialize additional types), specify it with the
*cls* kwarg.
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 6f4a3f1..bf2d058 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1138,18 +1138,18 @@
Returns a :class:`Server` object which represents the actual server under
the control of the Manager. The :class:`Server` object supports the
- :meth:`serve_forever` method::
+ :meth:`serve_forever` method:
- >>> from multiprocessing.managers import BaseManager
- >>> m = BaseManager(address=('', 50000), authkey='abc'))
- >>> server = m.get_server()
- >>> s.serve_forever()
+ >>> from multiprocessing.managers import BaseManager
+ >>> m = BaseManager(address=('', 50000), authkey='abc'))
+ >>> server = m.get_server()
+ >>> s.serve_forever()
- :class:`Server` additionally have an :attr:`address` attribute.
+ :class:`Server` additionally have an :attr:`address` attribute.
.. method:: connect()
- Connect a local manager object to a remote manager process::
+ Connect a local manager object to a remote manager process:
>>> from multiprocessing.managers import BaseManager
>>> m = BaseManager(address='127.0.0.1', authkey='abc))
@@ -1295,7 +1295,7 @@
>>>>>>>>>>>>>>>>>>>
To create one's own manager, one creates a subclass of :class:`BaseManager` and
-use the :meth:`~BaseManager.resgister` classmethod to register new types or
+use the :meth:`~BaseManager.register` classmethod to register new types or
callables with the manager class. For example::
from multiprocessing.managers import BaseManager
@@ -1811,7 +1811,7 @@
* An ``'AF_PIPE'`` address is a string of the form
:samp:`r'\\\\.\\pipe\\{PipeName}'`. To use :func:`Client` to connect to a named
- pipe on a remote computer called ServerName* one should use an address of the
+ pipe on a remote computer called *ServerName* one should use an address of the
form :samp:`r'\\\\{ServerName}\\pipe\\{PipeName}'`` instead.
Note that any string beginning with two backslashes is assumed by default to be
diff --git a/Doc/library/numbers.rst b/Doc/library/numbers.rst
index b7aafb2..b0d55a7 100644
--- a/Doc/library/numbers.rst
+++ b/Doc/library/numbers.rst
@@ -51,14 +51,14 @@
:func:`round`, :func:`math.floor`, :func:`math.ceil`, :func:`divmod`, ``//``,
``%``, ``<``, ``<=``, ``>``, and ``>=``.
- Real also provides defaults for :func:`complex`, :attr:`Complex.real`,
- :attr:`Complex.imag`, and :meth:`Complex.conjugate`.
+ Real also provides defaults for :func:`complex`, :attr:`~Complex.real`,
+ :attr:`~Complex.imag`, and :meth:`~Complex.conjugate`.
.. class:: Rational
Subtypes :class:`Real` and adds
- :attr:`Rational.numerator` and :attr:`Rational.denominator` properties, which
+ :attr:`~Rational.numerator` and :attr:`~Rational.denominator` properties, which
should be in lowest terms. With these, it provides a default for
:func:`float`.
@@ -74,8 +74,8 @@
.. class:: Integral
Subtypes :class:`Rational` and adds a conversion to :class:`int`.
- Provides defaults for :func:`float`, :attr:`Rational.numerator`, and
- :attr:`Rational.denominator`, and bit-string operations: ``<<``,
+ Provides defaults for :func:`float`, :attr:`~Rational.numerator`, and
+ :attr:`~Rational.denominator`, and bit-string operations: ``<<``,
``>>``, ``&``, ``^``, ``|``, ``~``.
@@ -171,7 +171,7 @@
knowledge of ``A``, so it can handle those instances before
delegating to :class:`Complex`.
-If ``A<:Complex`` and ``B<:Real`` without sharing any other knowledge,
+If ``A <: Complex`` and ``B <: Real`` without sharing any other knowledge,
then the appropriate shared operation is the one involving the built
in :class:`complex`, and both :meth:`__radd__` s land there, so ``a+b
== b+a``.
diff --git a/Doc/library/parser.rst b/Doc/library/parser.rst
index bdd541c..b1cbd12 100644
--- a/Doc/library/parser.rst
+++ b/Doc/library/parser.rst
@@ -641,7 +641,7 @@
while the long form uses an indented block and allows nested definitions::
def make_power(exp):
- "Make a function that raises an argument to the exponent `exp'."
+ "Make a function that raises an argument to the exponent `exp`."
def raiser(x, y=exp):
return x ** y
return raiser
diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst
index bdbbe4a..385f116 100644
--- a/Doc/library/smtplib.rst
+++ b/Doc/library/smtplib.rst
@@ -207,7 +207,7 @@
previous ``EHLO`` or ``HELO`` command this session. It tries ESMTP ``EHLO``
first.
- :exc:SMTPHeloError
+ :exc:`SMTPHeloError`
The server didn't reply properly to the ``HELO`` greeting.
.. versionadded:: 2.6
diff --git a/Doc/library/urlparse.rst b/Doc/library/urlparse.rst
index e7ed0f1..40f889b 100644
--- a/Doc/library/urlparse.rst
+++ b/Doc/library/urlparse.rst
@@ -290,7 +290,7 @@
.. versionadded:: 2.5
-The following classes provide the implementations of the parse results::
+The following classes provide the implementations of the parse results:
.. class:: BaseResult