Merge branch 'master' into patch-2

Author: mpoulin

docs/intro/duction.rst

@@ -33,7 +33,7 @@ include:
   Perl's `CPAN <https://www.cpan.org>`_. There is a thriving community
   of very powerful Python frameworks and tools like
   the `Django <https://www.djangoproject.com>`_ web framework and the
-  `NumPy <http://numpy.scipy.org>`_ set of math routines.
+  `NumPy <https://numpy.org/>`_ set of math routines.
 
 * **integration with other systems**
 

docs/scenarios/scientific.rst

@@ -47,7 +47,7 @@ Libraries
 NumPy
 -----
 
-`NumPy <http://numpy.scipy.org/>`_ is a low level library written in C (and
+`NumPy <https://numpy.org/>`_ is a low level library written in C (and
 Fortran) for high level mathematical functions. NumPy cleverly overcomes the
 problem of running slower algorithms on Python by using multidimensional arrays
 and functions that operate on arrays. Any algorithm can then be expressed as a

docs/writing/reading.rst

@@ -49,4 +49,4 @@ reading. Each one of these projects is a paragon of Python coding.
 
 .. todo:: Include code examples of exemplary code from each of the projects listed. Explain why it is excellent code. Use complex examples.
 
-.. todo:: Explain techniques to rapidly identify data structures and algorithms and determine what the code is doing.
+.. todo:: Explain techniques for rapidly identifying data structures and algorithms and determining what the code is doing.