Merge pull request #2066 from Myles1/master

Docs Update

docs/src/reference/extension_types.rst

@@ -387,7 +387,7 @@ Extension Types and None
 
 * Be very aware of exposing Python functions that take extension types as arguments::
 
-    def widen_shrubbery(Shrubbery sh, extra_width): # This is
+    def widen_shrubbery(Shrubbery sh, extra_width): # This is dangerous
     sh.width = sh.width + extra_width
 
     * Users could **crash** the program by passing ``None`` for the ``sh`` parameter.

docs/src/reference/language_basics.rst

@@ -332,7 +332,7 @@ Automatic Type Conversion
         cdef char *s
         s = pystring1 + pystring2
 
-    * The reason is that concatenating to strings in Python produces a temporary variable.
+    * The reason is that concatenating two strings in Python produces a temporary variable.
 
      * The variable is decrefed, and the Python string deallocated as soon as the statement has finished,
 

docs/src/userguide/numpy_pythran.rst

@@ -20,7 +20,7 @@ Usage example with distutils
 ----------------------------
 
 You first need to install Pythran. See its `documentation
-<https://pythonhosted.org/pythran/MANUAL.html>`_ for more information.
+<http://pythran.readthedocs.io/en/latest/>`_ for more information.
 
 Then, simply add a ``cython: np_pythran=True`` directive at the top of the
 Python files that needs to be compiled using Pythran numpy support.