Merge branch 'master' into develop-nspkg-alwaysdevelop-nspkg-always

1 files changed, 7 insertions, 4 deletions

diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index 7b979ec3..e8412b33 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -831,10 +831,9 @@ correspond exactly to the constructor argument names: ``name``,
 ``module_name``, ``attrs``, ``extras``, and ``dist`` are all available.  In
 addition, the following methods are provided:
 
-``load(require=True, env=None, installer=None)``
-    Load the entry point, returning the advertised Python object, or raise
-    ``ImportError`` if it cannot be obtained.  If `require` is a true value,
-    then ``require(env, installer)`` is called before attempting the import.
+``load()``
+    Load the entry point, returning the advertised Python object.  Effectively
+    calls ``self.require()`` then returns ``self.resolve()``.
 
 ``require(env=None, installer=None)``
     Ensure that any "extras" needed by the entry point are available on
@@ -846,6 +845,10 @@ addition, the following methods are provided:
     taking a ``Requirement`` instance and returning a matching importable
     ``Distribution`` instance or None.
 
+``resolve()``
+    Resolve the entry point from its module and attrs, returning the advertised
+    Python object. Raises ``ImportError`` if it cannot be obtained.
+
 ``__str__()``
     The string form of an ``EntryPoint`` is a string that could be passed to
     ``EntryPoint.parse()`` to produce an equivalent ``EntryPoint``.