Merge branch 'master' into feature/implicit-bootstrapfeature/implicit-bootstrap

1 files changed, 10 insertions, 10 deletions

diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index b887a923..7d0d8da9 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -594,7 +594,7 @@ Requirements Parsing
 
         FooProject >= 1.2
         Fizzy [foo, bar]
-        PickyThing<1.6,>1.9,!=1.9.6,<2.0a0,==2.4c1
+        PickyThing>1.6,<=1.9,!=1.8.6
         SomethingWhoseVersionIDontCareAbout
         SomethingWithMarker[foo]>1.0;python_version<"2.7"
 
@@ -1596,12 +1596,12 @@ Parsing Utilities
     See ``to_filename()``.
 
 ``safe_version(version)``
-    This will return the normalized form of any PEP 440 version, if the version
-    string is not PEP 440 compatible than it is similar to ``safe_name()``
-    except that spaces in the input become dots, and dots are allowed to exist
-    in the output.  As with ``safe_name()``, if you are generating a filename
-    from this you should replace any "-" characters in the output with
-    underscores.
+    This will return the normalized form of any PEP 440 version. If the version
+    string is not PEP 440 compatible, this function behaves similar to
+    ``safe_name()`` except that spaces in the input become dots, and dots are
+    allowed to exist in the output.  As with ``safe_name()``, if you are
+    generating a filename from this you should replace any "-" characters in
+    the output with underscores.
 
 ``safe_extra(extra)``
     Return a "safe" form of an extra's name, suitable for use in a requirement
@@ -1621,7 +1621,7 @@ Platform Utilities
 
 ``get_build_platform()``
     Return this platform's identifier string.  For Windows, the return value
-    is ``"win32"``, and for Mac OS X it is a string of the form
+    is ``"win32"``, and for macOS it is a string of the form
     ``"macosx-10.4-ppc"``.  All other platforms return the same uname-based
     string that the ``distutils.util.get_platform()`` function returns.
     This string is the minimum platform version required by distributions built
@@ -1641,7 +1641,7 @@ Platform Utilities
     considered a wildcard, and the platforms are therefore compatible.
     Likewise, if the platform strings are equal, they're also considered
     compatible, and ``True`` is returned.  Currently, the only non-equal
-    platform strings that are considered compatible are Mac OS X platform
+    platform strings that are considered compatible are macOS platform
     strings with the same hardware type (e.g. ``ppc``) and major version
     (e.g. ``10``) with the `provided` platform's minor version being less than
     or equal to the `required` platform's minor version.
@@ -1674,7 +1674,7 @@ File/Path Utilities
     the same filesystem location if they have equal ``normalized_path()``
     values.  Specifically, this is a shortcut for calling ``os.path.realpath``
     and ``os.path.normcase`` on `path`.  Unfortunately, on certain platforms
-    (notably Cygwin and Mac OS X) the ``normcase`` function does not accurately
+    (notably Cygwin and macOS) the ``normcase`` function does not accurately
     reflect the platform's case-sensitivity, so there is always the possibility
     of two apparently-different paths being equal on such platforms.