summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-04-16 09:29:17 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-04-16 09:29:17 (GMT)
commit8b04a945eff25ee66746d717b060c1b7844808c9 (patch)
tree6a15965fd3f852d9822a98bd04ef01feda33ccb8 /Doc
parentd3aeb9b797a6a122c27be5649cbc25e26857109b (diff)
parent119e502277d104286620806ef130e3c0d4f439f0 (diff)
downloadcpython-8b04a945eff25ee66746d717b060c1b7844808c9.zip
cpython-8b04a945eff25ee66746d717b060c1b7844808c9.tar.gz
cpython-8b04a945eff25ee66746d717b060c1b7844808c9.tar.bz2
Merge typo fixes from 3.5
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/argparse.rst2
-rw-r--r--Doc/whatsnew/2.4.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
index 6181ee2..03dda1a 100644
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -923,7 +923,7 @@ the various :class:`ArgumentParser` actions. The two most common uses of it are
See the nargs_ description for examples.
With the ``'store_const'`` and ``'append_const'`` actions, the ``const``
-keyword argument must be given. For other actions, is defaults to ``None``.
+keyword argument must be given. For other actions, it defaults to ``None``.
default
diff --git a/Doc/whatsnew/2.4.rst b/Doc/whatsnew/2.4.rst
index a613a9f..fb4558b 100644
--- a/Doc/whatsnew/2.4.rst
+++ b/Doc/whatsnew/2.4.rst
@@ -1481,7 +1481,7 @@ Some of the changes to Python's build process and to the C API are:
* Python can now be built with additional profiling for the interpreter itself,
intended as an aid to people developing the Python core. Providing
- :option:`----enable-profiling` to the :program:`configure` script will let you
+ :option:`--enable-profiling` to the :program:`configure` script will let you
profile the interpreter with :program:`gprof`, and providing the
:option:`--with-tsc` switch enables profiling using the Pentium's Time-Stamp-
Counter register. Note that the :option:`--with-tsc` switch is slightly