Merge typo fixes from 3.5

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

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

Lib/posixpath.py

@@ -372,7 +372,7 @@ symbolic links encountered in the path."""
     path, ok = _joinrealpath(filename[:0], filename, {})
     return abspath(path)
 
-# Join two paths, normalizing ang eliminating any symbolic links
+# Join two paths, normalizing and eliminating any symbolic links
 # encountered in the second path.
 def _joinrealpath(path, rest, seen):
     if isinstance(path, bytes):

Lib/test/test_codecs.py

@@ -2401,7 +2401,7 @@ class TypesTest(unittest.TestCase):
             self.assertRaises(TypeError, decoder, "xxx")
 
     def test_unicode_escape(self):
-        # Escape-decoding a unicode string is supported ang gives the same
+        # Escape-decoding a unicode string is supported and gives the same
         # result as decoding the equivalent ASCII bytes string.
         self.assertEqual(codecs.unicode_escape_decode(r"\u1234"), ("\u1234", 6))
         self.assertEqual(codecs.unicode_escape_decode(br"\u1234"), ("\u1234", 6))
@@ -2809,7 +2809,7 @@ class TransformCodecTest(unittest.TestCase):
 # type and a single str argument.
 
 # Use a local codec registry to avoid appearing to leak objects when
-# registering multiple seach functions
+# registering multiple search functions
 _TEST_CODECS = {}
 
 def _get_test_codec(codec_name):

Modules/_io/bytesio.c

@@ -549,12 +549,12 @@ _io.BytesIO.readinto
 Read up to len(buffer) bytes into buffer.
 
 Returns number of bytes read (0 for EOF), or None if the object
-is set not to block as has no data to read.
+is set not to block and has no data to read.
 [clinic start generated code]*/
 
 static PyObject *
 _io_BytesIO_readinto_impl(bytesio *self, Py_buffer *buffer)
-/*[clinic end generated code: output=a5d407217dcf0639 input=71581f32635c3a31]*/
+/*[clinic end generated code: output=a5d407217dcf0639 input=b52a8782706f0037]*/
 {
     Py_ssize_t len, n;
 

Modules/_io/clinic/bytesio.c.h

@@ -262,7 +262,7 @@ PyDoc_STRVAR(_io_BytesIO_readinto__doc__,
 "Read up to len(buffer) bytes into buffer.\n"
 "\n"
 "Returns number of bytes read (0 for EOF), or None if the object\n"
-"is set not to block as has no data to read.");
+"is set not to block and has no data to read.");
 
 #define _IO_BYTESIO_READINTO_METHODDEF    \
     {"readinto", (PyCFunction)_io_BytesIO_readinto, METH_O, _io_BytesIO_readinto__doc__},
@@ -419,4 +419,4 @@ _io_BytesIO___init__(PyObject *self, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=500ccc149587fac4 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=164cf0e4117dadbe input=a9049054013a1b77]*/