DOC: merge wiki doc edits.

3 files changed, 9 insertions, 7 deletions

diff --git a/doc/source/dev/gitwash/following_latest.rst b/doc/source/dev/gitwash/following_latest.rst
index 5388ce104..8e0b6e797 100644
--- a/doc/source/dev/gitwash/following_latest.rst
+++ b/doc/source/dev/gitwash/following_latest.rst
@@ -10,7 +10,7 @@ These are the instructions if you just want to follow the latest
 The steps are:
 
 * :ref:`install-git`
-* get local copy of the git repository from github_
+* get local copy of the git repository from Github_
 * update local copy from time to time
 
 Get the local copy of the code
@@ -21,6 +21,9 @@ From the command line::
    git clone git://github.com/numpy/numpy.git
 
 You now have a copy of the code tree in the new ``numpy`` directory.
+If this doesn't work you can try the alternative read-only url::
+
+   git clone https://github.com/numpy/numpy.git
 
 Updating the code
 =================
@@ -34,4 +37,4 @@ From time to time you may want to pull down the latest code.  Do this with::
 The tree in ``numpy`` will now have the latest changes from the initial
 repository.
 
-.. include:: git_links.inc
+.. _Github: https://github.com/numpy
diff --git a/doc/source/reference/arrays.interface.rst b/doc/source/reference/arrays.interface.rst
index 87ba15a9f..16abe5ce1 100644
--- a/doc/source/reference/arrays.interface.rst
+++ b/doc/source/reference/arrays.interface.rst
@@ -18,7 +18,7 @@ The Array Interface
    uses the :pep:`3118` API; see the `Cython numpy
    tutorial`__. Cython provides a way to write code that supports the buffer
    protocol with Python versions older than 2.6 because it has a
-   backward-compatible implementation utilizing the legacy array interface
+   backward-compatible implementation utilizing the array interface
    described here.
 
 __ http://cython.org/
diff --git a/doc/source/reference/swig.interface-file.rst b/doc/source/reference/swig.interface-file.rst
index 53bf68756..0a358bd6e 100644
--- a/doc/source/reference/swig.interface-file.rst
+++ b/doc/source/reference/swig.interface-file.rst
@@ -98,13 +98,13 @@ above will produce wrapper code that looks something like::
      6   PyArrayObject *array1 = NULL ;
      7   int is_new_object1 = 0 ;
      8   PyObject * obj0 = 0 ;
-     9  
+     9
     10   if (!PyArg_ParseTuple(args,(char *)"O:rms",&obj0)) SWIG_fail;
     11   {
     12     array1 = obj_to_array_contiguous_allow_conversion(
     13                  obj0, NPY_DOUBLE, &is_new_object1);
     14     npy_intp size[1] = {
-    15       -1 
+    15       -1
     16     };
     17     if (!array1 || !require_dimensions(array1, 1) ||
     18         !require_size(array1, size, 1)) SWIG_fail;
@@ -484,7 +484,7 @@ If you get a Python error that looks like the following::
 and the argument you are passing is an integer extracted from a
 NumPy array, then you have stumbled upon this problem.  The
 solution is to modify the `SWIG`_ type conversion system to accept
-`Numpy`_ array scalars in addition to the standard integer types.
+Numpy array scalars in addition to the standard integer types.
 Fortunately, this capabilitiy has been provided for you.  Simply copy
 the file::
 
@@ -927,4 +927,3 @@ wrapper developers, including:
   * Nine C macros and 13 C functions that can be used to write
     specialized typemaps, extensions, or inlined functions that handle
     cases not covered by the provided typemaps.
-