Merge with 3.5

This commit is contained in:
Zachary Ware 2016-01-01 12:24:12 -06:00
commit bdce29b9a4

View file

@ -1291,7 +1291,7 @@ module instead of using :func:`find_library` to locate the library at runtime.
Loading shared libraries
^^^^^^^^^^^^^^^^^^^^^^^^
There are several ways to loaded shared libraries into the Python process. One
There are several ways to load shared libraries into the Python process. One
way is to instantiate one of the following classes: