DOC: add some more wiki edits, of rst files in ref/user guide.

4 files changed, 20 insertions, 12 deletions

diff --git a/doc/source/reference/c-api.array.rst b/doc/source/reference/c-api.array.rst
index 156da5526..a548144bc 100644
--- a/doc/source/reference/c-api.array.rst
+++ b/doc/source/reference/c-api.array.rst
@@ -373,25 +373,25 @@ From other objects
 
         :cdata:`NPY_F_CONTIGUOUS` \| :cdata:`NPY_ALIGNED`
 
-    .. cvar:: NPY_INOUT_ARRAY
+    .. cvar:: NPY_OUT_ARRAY
 
         :cdata:`NPY_C_CONTIGUOUS` \| :cdata:`NPY_WRITEABLE` \|
         :cdata:`NPY_ALIGNED`
 
-    .. cvar:: NPY_INOUT_FARRAY
+    .. cvar:: NPY_OUT_FARRAY
 
         :cdata:`NPY_F_CONTIGUOUS` \| :cdata:`NPY_WRITEABLE` \|
         :cdata:`NPY_ALIGNED`
 
-    .. cvar:: NPY_OUT_ARRAY
+    .. cvar:: NPY_INOUT_ARRAY
 
         :cdata:`NPY_C_CONTIGUOUS` \| :cdata:`NPY_WRITEABLE` \|
         :cdata:`NPY_ALIGNED` \| :cdata:`NPY_UPDATEIFCOPY`
 
-    .. cvar:: NPY_OUT_FARRAY
+    .. cvar:: NPY_INOUT_FARRAY
 
         :cdata:`NPY_F_CONTIGUOUS` \| :cdata:`NPY_WRITEABLE` \|
-        :cdata:`NPY_ALIGNED` \| :cdata:`UPDATEIFCOPY`
+        :cdata:`NPY_ALIGNED` \| :cdata:`NPY_UPDATEIFCOPY`
 
 
 .. cfunction:: PyObject* PyArray_CheckFromAny(PyObject* op, PyArray_Descr* dtype, int min_depth, int max_depth, int requirements, PyObject* context)
diff --git a/doc/source/reference/distutils.rst b/doc/source/reference/distutils.rst
index 63174c2c7..5d11a6d4c 100644
--- a/doc/source/reference/distutils.rst
+++ b/doc/source/reference/distutils.rst
@@ -16,6 +16,7 @@ dictionary obtained from the todict() method of the class). More
 information is available in the NumPy Distutils Users Guide in
 ``<site-packages>/numpy/doc/DISTUTILS.txt``.
 
+
 .. index::
    single: distutils
 
@@ -31,7 +32,6 @@ misc_util
 .. autosummary::
    :toctree: generated/
 
-   Configuration
    get_numpy_include_dirs
    dict_append
    appendpath
@@ -59,9 +59,9 @@ misc_util
 .. class:: Configuration(package_name=None, parent_name=None, top_path=None, package_path=None, **attrs)
 
     Construct a configuration instance for the given package name. If
-    *parent_name* is not :const:`None`, then construct the package as a
+    *parent_name* is not None, then construct the package as a
     sub-package of the *parent_name* package. If *top_path* and
-    *package_path* are :const:`None` then they are assumed equal to
+    *package_path* are None then they are assumed equal to
     the path of the file this instance was created in. The setup.py
     files in the numpy distribution are good examples of how to use
     the :class:`Configuration` instance.
diff --git a/doc/source/reference/maskedarray.generic.rst b/doc/source/reference/maskedarray.generic.rst
index bb8695408..f753a56f9 100644
--- a/doc/source/reference/maskedarray.generic.rst
+++ b/doc/source/reference/maskedarray.generic.rst
@@ -315,8 +315,8 @@ new valid values to them::
       >>> x.soften_mask()
       >>> x[-1] = 5
       >>> x
-      masked_array(data = [1 2 --],
-                   mask = [False False  True],
+      masked_array(data = [1 2 5],
+                   mask = [False False  False],
              fill_value = 999999)
       >>> x.harden_mask()
 
diff --git a/doc/source/user/install.rst b/doc/source/user/install.rst
index aa16546d7..18e036ab0 100644
--- a/doc/source/user/install.rst
+++ b/doc/source/user/install.rst
@@ -126,14 +126,22 @@ means that g77 has been used. If libgfortran.so is a a dependency, gfortran
 has been used. If both are dependencies, this means both have been used, which
 is almost always a very bad idea.
 
-Disabling ATLAS and other accelerater libraries
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Disabling ATLAS and other accelerated libraries
+-----------------------------------------------
 
 Usage of ATLAS and other accelerated libraries in Numpy can be disabled
 via::
 
     BLAS=None LAPACK=None ATLAS=None python setup.py build
 
+
+Supplying additional compiler flags
+-----------------------------------
+
+Additional compiler flags can be supplied by setting the ``OPT``,
+``FOPT`` (for Fortran), and ``CC`` environment variables.
+
+
 Building with ATLAS support
 ---------------------------