Merge spelling and grammar from 3.5

Doc/library/shutil.rst

@@ -581,7 +581,7 @@ provided.  They rely on the :mod:`zipfile` and :mod:`tarfile` modules.
 
    By default :mod:`shutil` provides these formats:
 
-   - *zip*: ZIP file (unpacking compressed files works only if corresponding
+   - *zip*: ZIP file (unpacking compressed files works only if the corresponding
      module is available).
    - *tar*: uncompressed tar file.
    - *gztar*: gzip'ed tar-file (if the :mod:`zlib` module is available).

Lib/distutils/tests/test_bdist_rpm.py

@@ -94,7 +94,7 @@ class BuildRpmTestCase(support.TempdirManager,
     @unittest.skipIf(find_executable('rpmbuild') is None,
                      'the rpmbuild command is not found')
     def test_no_optimize_flag(self):
-        # let's create a package that brakes bdist_rpm
+        # let's create a package that breaks bdist_rpm
         tmp_dir = self.mkdtemp()
         os.environ['HOME'] = tmp_dir   # to confine dir '.rpmdb' creation
         pkg_dir = os.path.join(tmp_dir, 'foo')

Lib/test/test_unicode.py

@@ -2639,7 +2639,7 @@ class CAPITest(unittest.TestCase):
                      b'repr=%V', None, b'abc\xff')
 
         # not supported: copy the raw format string. these tests are just here
-        # to check for crashs and should not be considered as specifications
+        # to check for crashes and should not be considered as specifications
         check_format('%s',
                      b'%1%s', b'abc')
         check_format('%1abc',

Misc/HISTORY

@@ -2194,7 +2194,7 @@ Core and Builtins
   NULL).
 
 - Issue #10829: Refactor PyUnicode_FromFormat(), use the same function to parse
-  the format string in the 3 steps, fix crashs on invalid format strings.
+  the format string in the 3 steps, fix crashes on invalid format strings.
 
 - Issue #13007: whichdb should recognize gdbm 1.9 magic numbers.