Merge pull request #5107 from juliantaylor/na-doc

juliantaylor · juliantaylor · commit a2bfd3f43e0c · 2014-09-23T23:45:14.000+02:00
DOC: remove preservena reference from docstrings
diff --git a/numpy/add_newdocs.py b/numpy/add_newdocs.py
@@ -3834,7 +3834,7 @@ def luf(lamdaexpr, *args, **kwargs):
 
 add_newdoc('numpy.core.multiarray', 'copyto',
     """
-    copyto(dst, src, casting='same_kind', where=None, preservena=False)
+    copyto(dst, src, casting='same_kind', where=None)
 
     Copies values from one array to another, broadcasting as necessary.
 
@@ -3862,9 +3862,6 @@ def luf(lamdaexpr, *args, **kwargs):
         A boolean array which is broadcasted to match the dimensions
         of `dst`, and selects elements to copy from `src` to `dst`
         wherever it contains the value True.
-    preservena : bool, optional
-        If set to True, leaves any NA values in `dst` untouched. This
-        is similar to the "hard mask" feature in numpy.ma.
 
     """)
 
@@ -3879,11 +3876,6 @@ def luf(lamdaexpr, *args, **kwargs):
     If `values` is not the same size as `a` and `mask` then it will repeat.
     This gives behavior different from ``a[mask] = values``.
 
-    .. note:: The `putmask` functionality is also provided by `copyto`, which
-              can be significantly faster and in addition is NA-aware
-              (`preservena` keyword).  Replacing `putmask` with
-              ``np.copyto(a, values, where=mask)`` is recommended.
-
     Parameters
     ----------
     a : array_like
