summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-11-24 15:09:26 (GMT)
committerGeorg Brandl <georg@python.org>2013-11-24 15:09:26 (GMT)
commited007d5b1b50c7f9dc27a7e84448e1aea02605fd (patch)
treece491d3ec2c23dc527b1ac0196be5342b3cd83ef /Doc
parent163d7f02a1091eb7386ffeb4de6c7aa282254181 (diff)
downloadcpython-ed007d5b1b50c7f9dc27a7e84448e1aea02605fd.zip
cpython-ed007d5b1b50c7f9dc27a7e84448e1aea02605fd.tar.gz
cpython-ed007d5b1b50c7f9dc27a7e84448e1aea02605fd.tar.bz2
Fix suspicious markup in the docs.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/email.contentmanager.rst4
-rw-r--r--Doc/library/email.message.rst2
-rw-r--r--Doc/library/gettext.rst6
-rw-r--r--Doc/library/unittest.rst4
-rw-r--r--Doc/tools/sphinxext/susp-ignored.csv16
-rw-r--r--Doc/whatsnew/3.4.rst2
6 files changed, 18 insertions, 16 deletions
diff --git a/Doc/library/email.contentmanager.rst b/Doc/library/email.contentmanager.rst
index f3ba794..5162da1 100644
--- a/Doc/library/email.contentmanager.rst
+++ b/Doc/library/email.contentmanager.rst
@@ -96,7 +96,7 @@ this module.
only it when looking for candidate matches. Otherwise consider only the
first (default root) part of the ``multipart/related``.
- If a part has a :mailheader:``Content-Disposition`` header, only consider
+ If a part has a :mailheader:`Content-Disposition` header, only consider
the part a candidate match if the value of the header is ``inline``.
If none of the candidates matches any of the preferences in
@@ -134,7 +134,7 @@ this module.
Return an iterator over all of the immediate sub-parts of the message,
which will be empty for a non-``multipart``. (See also
- :meth:``~email.message.walk``.)
+ :meth:`~email.message.walk`.)
.. method:: get_content(*args, content_manager=None, **kw)
diff --git a/Doc/library/email.message.rst b/Doc/library/email.message.rst
index f278a0a..c0f947f 100644
--- a/Doc/library/email.message.rst
+++ b/Doc/library/email.message.rst
@@ -35,7 +35,7 @@ Here are the methods of the :class:`Message` class:
If *policy* is specified (it must be an instance of a :mod:`~email.policy`
class) use the rules it specifies to udpate and serialize the representation
- of the message. If *policy* is not set, use the :class`compat32
+ of the message. If *policy* is not set, use the :class:`compat32
<email.policy.Compat32>` policy, which maintains backward compatibility with
the Python 3.2 version of the email package. For more information see the
:mod:`~email.policy` documentation.
diff --git a/Doc/library/gettext.rst b/Doc/library/gettext.rst
index 18506ff..982780f 100644
--- a/Doc/library/gettext.rst
+++ b/Doc/library/gettext.rst
@@ -476,9 +476,9 @@ applications.)
:program:`xgettext`, :program:`pygettext`, and similar tools generate
:file:`.po` files that are message catalogs. They are structured
-:human-readable files that contain every marked string in the source
-:code, along with a placeholder for the translated versions of these
-:strings.
+human-readable files that contain every marked string in the source
+code, along with a placeholder for the translated versions of these
+strings.
Copies of these :file:`.po` files are then handed over to the
individual human translators who write translations for every
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index c13f9ca..6310624 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -901,8 +901,8 @@ Test cases
| :meth:`assertWarnsRegex(warn, r, fun, *args, **kwds) | ``fun(*args, **kwds)`` raises *warn* | 3.2 |
| <TestCase.assertWarnsRegex>` | and the message matches regex *r* | |
+---------------------------------------------------------+--------------------------------------+------------+
- | :meth:`assertLogs(logger, level)` | The ``with`` block logs on *logger* | 3.4 |
- | <TestCase.assertWarns>` | with minimum *level* | |
+ | :meth:`assertLogs(logger, level) | The ``with`` block logs on *logger* | 3.4 |
+ | <TestCase.assertLogs>` | with minimum *level* | |
+---------------------------------------------------------+--------------------------------------+------------+
.. method:: assertRaises(exception, callable, *args, **kwds)
diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv
index 57b1f1e..67ad01f 100644
--- a/Doc/tools/sphinxext/susp-ignored.csv
+++ b/Doc/tools/sphinxext/susp-ignored.csv
@@ -141,15 +141,8 @@ library/linecache,,:sys,"sys:x:3:3:sys:/dev:/bin/sh"
library/logging.handlers,,:port,host:port
library/mmap,,:i2,obj[i1:i2]
library/multiprocessing,,`,# Add more tasks using `put()`
-library/multiprocessing,,`,# A test file for the `multiprocessing` package
-library/multiprocessing,,`,# A test of `multiprocessing.Pool` class
-library/multiprocessing,,`,# `BaseManager`.
-library/multiprocessing,,`,# in the original order then consider using `Pool.map()` or
library/multiprocessing,,`,">>> l._callmethod('__getitem__', (20,)) # equiv to `l[20]`"
library/multiprocessing,,`,">>> l._callmethod('__getslice__', (2, 7)) # equiv to `l[2:7]`"
-library/multiprocessing,,`,# Not sure if we should synchronize access to `socket.accept()` method by
-library/multiprocessing,,`,# object. (We import `multiprocessing.reduction` to enable this pickling.)
-library/multiprocessing,,`,# `Pool.imap()` (which will save on the amount of code needed anyway).
library/multiprocessing,,:queue,">>> QueueManager.register('get_queue', callable=lambda:queue)"
library/multiprocessing,,`,# register the Foo class; make `f()` and `g()` accessible via proxy
library/multiprocessing,,`,# register the Foo class; make `g()` and `_h()` accessible via proxy
@@ -158,6 +151,10 @@ library/nntplib,,:bytes,:bytes
library/nntplib,,:lines,:lines
library/optparse,,:len,"del parser.rargs[:len(value)]"
library/os.path,,:foo,c:foo
+library/pathlib,,:bar,">>> PureWindowsPath('c:/Windows', 'd:bar')"
+library/pathlib,,:bar,PureWindowsPath('d:bar')
+library/pathlib,,:Program,>>> PureWindowsPath('c:Program Files/').root
+library/pathlib,,:Program,>>> PureWindowsPath('c:Program Files/').anchor
library/pdb,,:lineno,filename:lineno
library/pickle,,:memory,"conn = sqlite3.connect("":memory:"")"
library/posix,,`,"CFLAGS=""`getconf LFS_CFLAGS`"" OPT=""-g -O2 $CFLAGS"""
@@ -200,7 +197,12 @@ library/tarfile,,:xz,'r:xz'
library/tarfile,,:xz,'w:xz'
library/time,,:mm,
library/time,,:ss,
+library/tracemalloc,,:limit,"for index, stat in enumerate(top_stats[:limit], 1):"
library/turtle,,::,Example::
+library/unittest,1412,:foo,"self.assertEqual(cm.output, ['INFO:foo:first message',"
+library/unittest,1412,:first,"self.assertEqual(cm.output, ['INFO:foo:first message',"
+library/unittest,1412,:foo,'ERROR:foo.bar:second message'])
+library/unittest,1412,:second,'ERROR:foo.bar:second message'])
library/urllib.request,,:close,Connection:close
library/urllib.request,,:lang,"xmlns=""http://www.w3.org/1999/xhtml"" xml:lang=""en"" lang=""en"">\n\n<head>\n"
library/urllib.request,,:password,"""joe:password@python.org"""
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index 435d582..a47297d 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -424,7 +424,7 @@ base64
The encoding and decoding functions in :mod:`base64` now accept any
:term:`bytes-like object` in cases where it previously required a
-:class:`bytes` or :class:`bytearray` instance (:issue`17839`)
+:class:`bytes` or :class:`bytearray` instance (:issue:`17839`).
colorsys