summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2016-02-25 19:17:45 (GMT)
committerGeorg Brandl <georg@python.org>2016-02-25 19:17:45 (GMT)
commit8c16cb9f65bfc7d732bc6bd3f533856795a95690 (patch)
treeee95fd5346ec40c976a07ffce0348d56180d8251
parent2305b3cde3406f3a0ee7ff8c858bce5d372c77ae (diff)
downloadcpython-8c16cb9f65bfc7d732bc6bd3f533856795a95690.zip
cpython-8c16cb9f65bfc7d732bc6bd3f533856795a95690.tar.gz
cpython-8c16cb9f65bfc7d732bc6bd3f533856795a95690.tar.bz2
Closes #26435: fix syntax in directives. Thanks to Jakub Stasiak.
-rw-r--r--Doc/distutils/apiref.rst6
-rw-r--r--Doc/library/email.charset.rst5
-rw-r--r--Doc/library/mmap.rst6
-rw-r--r--Doc/library/ossaudiodev.rst4
-rw-r--r--Doc/library/re.rst2
-rw-r--r--Doc/library/socket.rst6
-rw-r--r--Doc/library/ssl.rst2
-rw-r--r--Doc/library/stdtypes.rst6
-rw-r--r--Doc/using/cmdline.rst2
-rw-r--r--Lib/logging/__init__.py4
10 files changed, 22 insertions, 21 deletions
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
index 554d2c8..6b2d5cb 100644
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -876,7 +876,7 @@ tarballs or zipfiles.
archive. *root_dir* and *base_dir* both default to the current directory.
Returns the name of the archive file.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Added support for the ``xztar`` format.
@@ -891,7 +891,7 @@ tarballs or zipfiles.
compression extension (``.gz``, ``.bz2``, ``.xz`` or ``.Z``). Return the
output filename.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Added support for the ``xz`` compression.
@@ -1234,7 +1234,7 @@ other utility module.
<imp.get_tag>` in their name, in a :file:`__pycache__` subdirectory
instead of files without tag in the current directory.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Create ``.pyc`` files according to :pep:`488`.
diff --git a/Doc/library/email.charset.rst b/Doc/library/email.charset.rst
index 80ef3d6..c0fab8f 100644
--- a/Doc/library/email.charset.rst
+++ b/Doc/library/email.charset.rst
@@ -101,9 +101,10 @@ Import this class from the :mod:`email.charset` module.
returns the string ``base64`` if *body_encoding* is ``BASE64``, and
returns the string ``7bit`` otherwise.
+
.. XXX to_splittable and from_splittable are not there anymore!
- .. method to_splittable(s)
+ .. to_splittable(s)
Convert a possibly multibyte string to a safely splittable format. *s* is
the string to split.
@@ -118,7 +119,7 @@ Import this class from the :mod:`email.charset` module.
the Unicode replacement character ``'U+FFFD'``.
- .. method from_splittable(ustr[, to_output])
+ .. from_splittable(ustr[, to_output])
Convert a splittable string back into an encoded string. *ustr* is a
Unicode string to "unsplit".
diff --git a/Doc/library/mmap.rst b/Doc/library/mmap.rst
index b74a823..33baf2b 100644
--- a/Doc/library/mmap.rst
+++ b/Doc/library/mmap.rst
@@ -174,7 +174,7 @@ To map anonymous memory, -1 should be passed as the fileno along with the length
Optional arguments *start* and *end* are interpreted as in slice notation.
Returns ``-1`` on failure.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
@@ -237,7 +237,7 @@ To map anonymous memory, -1 should be passed as the fileno along with the length
Optional arguments *start* and *end* are interpreted as in slice notation.
Returns ``-1`` on failure.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
@@ -267,7 +267,7 @@ To map anonymous memory, -1 should be passed as the fileno along with the length
were written. If the mmap was created with :const:`ACCESS_READ`, then
writing to it will raise a :exc:`TypeError` exception.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
diff --git a/Doc/library/ossaudiodev.rst b/Doc/library/ossaudiodev.rst
index c60d596..211328f 100644
--- a/Doc/library/ossaudiodev.rst
+++ b/Doc/library/ossaudiodev.rst
@@ -155,7 +155,7 @@ and (read-only) attributes:
data may not be written
---see :meth:`writeall`.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
@@ -169,7 +169,7 @@ and (read-only) attributes:
no return value, since the amount of data written is always equal to the
amount of data supplied.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index a9f8161..1ef6c4e 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -297,7 +297,7 @@ The special characters are:
>>> m.group(0)
'egg'
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Added support for group references of fixed length.
``(?<!...)``
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index a0b02c0..863cb07 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -675,7 +675,7 @@ The :mod:`socket` module also offers various network-related services:
support IPv6, and :func:`inet_ntop` should be used instead for IPv4/v6 dual
stack support.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
@@ -717,7 +717,7 @@ The :mod:`socket` module also offers various network-related services:
.. versionchanged:: 3.4
Windows support added
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
@@ -1332,7 +1332,7 @@ to sockets.
ensure that the bytestring contains the proper bits (see the optional built-in
module :mod:`struct` for a way to encode C structures as bytestrings).
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index fbb9b28..23fddfe 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -344,7 +344,7 @@ Random generation
string (so you can always use :const:`0.0`). See :rfc:`1750` for more
information on sources of entropy.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
Certificate handling
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index e491fd2..a0f98fd 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1298,16 +1298,16 @@ loops.
only represent sequences that follow a strict pattern and repetition and
concatenation will usually violate that pattern).
- .. data: start
+ .. attribute:: start
The value of the *start* parameter (or ``0`` if the parameter was
not supplied)
- .. data: stop
+ .. attribute:: stop
The value of the *stop* parameter
- .. data: step
+ .. attribute:: step
The value of the *step* parameter (or ``1`` if the parameter was
not supplied)
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 7ec9dce..ec744a3 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -194,7 +194,7 @@ Miscellaneous options
:class:`str` or :class:`bytes` with :class:`int`. Issue an error when the
option is given twice (:option:`-bb`).
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Affects comparisons of :class:`bytes` with :class:`int`.
.. cmdoption:: -B
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 104b0be..a7bd890 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -471,7 +471,7 @@ class Formatter(object):
use one of %-formatting, :meth:`str.format` (``{}``) formatting or
:class:`string.Template` formatting in your format string.
- .. versionchanged: 3.2
+ .. versionchanged:: 3.2
Added the ``style`` parameter.
"""
if style not in _STYLES:
@@ -700,7 +700,7 @@ class Filterer(object):
this and the record is then dropped. Returns a zero value if a record
is to be dropped, else non-zero.
- .. versionchanged: 3.2
+ .. versionchanged:: 3.2
Allow filters to be just callables.
"""