[Python-checkins] cpython (merge 3.4 -> 3.5): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/d1748935d4d1
changeset:   97958:d1748935d4d1
branch:      3.5
parent:      97953:84fb57098a28
parent:      97956:1208c85af6d5
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Sep 12 17:21:16 2015 -0700
summary:
  merge 3.4

files:
  Doc/distutils/apiref.rst   |  2 +-
  Lib/distutils/ccompiler.py |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -521,7 +521,7 @@
 
    .. method:: CCompiler.library_option(lib)
 
-      Return the compiler option to add *dir* to the list of libraries linked into the
+      Return the compiler option to add *lib* to the list of libraries linked into the
       shared library or executable.
 
 
diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py
--- a/Lib/distutils/ccompiler.py
+++ b/Lib/distutils/ccompiler.py
@@ -752,7 +752,7 @@
         raise NotImplementedError
 
     def library_option(self, lib):
-        """Return the compiler option to add 'dir' to the list of libraries
+        """Return the compiler option to add 'lib' to the list of libraries
         linked into the shared library or executable.
         """
         raise NotImplementedError

-- 
Repository URL: https://hg.python.org/cpython