summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-11-14 01:14:25 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2015-11-14 01:14:25 (GMT)
commit32acc16cdab1e890db17c79a5d32c2379800722d (patch)
tree51d3b4f5afa8351490051816749d198744a533e1 /Doc
parentfa9ea046732eff86408aba477d557c8fc92bc864 (diff)
parent2e4571a456c32af964d48b4bf70a9a53d27d10d6 (diff)
downloadcpython-32acc16cdab1e890db17c79a5d32c2379800722d.zip
cpython-32acc16cdab1e890db17c79a5d32c2379800722d.tar.gz
cpython-32acc16cdab1e890db17c79a5d32c2379800722d.tar.bz2
Merge typo and grammar fixes from 3.4 into 3.5
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/ast.rst2
-rw-r--r--Doc/library/copy.rst4
-rw-r--r--Doc/library/ftplib.rst4
-rw-r--r--Doc/library/urllib.request.rst2
4 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst
index 1ee5110..5373acd 100644
--- a/Doc/library/ast.rst
+++ b/Doc/library/ast.rst
@@ -104,7 +104,7 @@ The abstract grammar is currently defined as follows:
:mod:`ast` Helpers
------------------
-Apart from the node classes, :mod:`ast` module defines these utility functions
+Apart from the node classes, the :mod:`ast` module defines these utility functions
and classes for traversing abstract syntax trees:
.. function:: parse(source, filename='<unknown>', mode='exec')
diff --git a/Doc/library/copy.rst b/Doc/library/copy.rst
index 1db5c2d..02ef0e5 100644
--- a/Doc/library/copy.rst
+++ b/Doc/library/copy.rst
@@ -67,8 +67,8 @@ of lists by assigning a slice of the entire list, for example,
Classes can use the same interfaces to control copying that they use to control
pickling. See the description of module :mod:`pickle` for information on these
-methods. In fact, :mod:`copy` module uses the registered pickle functions from
-:mod:`copyreg` module.
+methods. In fact, the :mod:`copy` module uses the registered
+pickle functions from the :mod:`copyreg` module.
.. index::
single: __copy__() (copy protocol)
diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
index 2521f49..3d1f783 100644
--- a/Doc/library/ftplib.rst
+++ b/Doc/library/ftplib.rst
@@ -418,8 +418,8 @@ FTP_TLS Objects
.. method:: FTP_TLS.auth()
- Set up secure control connection by using TLS or SSL, depending on what
- specified in :meth:`ssl_version` attribute.
+ Set up a secure control connection by using TLS or SSL, depending on what
+ is specified in the :attr:`ssl_version` attribute.
.. versionchanged:: 3.4
The method now supports hostname check with
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index 81aeb12..8755155 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -1168,7 +1168,7 @@ The code for the sample CGI used in the above example is::
#!/usr/bin/env python
import sys
data = sys.stdin.read()
- print('Content-type: text-plain\n\nGot Data: "%s"' % data)
+ print('Content-type: text/plain\n\nGot Data: "%s"' % data)
Here is an example of doing a ``PUT`` request using :class:`Request`::