merge 3.4

benjaminp · benjaminp · commit f07422c0258d · 2015-09-12T17:21:16.000-07:00
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
@@ -521,7 +521,7 @@ This module provides the following functions.
 
    .. 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
@@ -752,7 +752,7 @@ def runtime_library_dir_option(self, dir):
         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
