summaryrefslogtreecommitdiff
path: root/numpy/add_newdocs.py
diff options
context:
space:
mode:
authorRalf Gommers <ralf.gommers@googlemail.com>2012-05-05 21:16:13 +0200
committerRalf Gommers <ralf.gommers@googlemail.com>2012-07-07 14:48:49 +0200
commit2c9981b61ca56b41a5e7b9fbe785b6b54727aea4 (patch)
tree30f093eeef4682ef9eadddfe98e3c4ef5280a244 /numpy/add_newdocs.py
parent3445712afcd71d2a3d61973de45aa94c38613dd5 (diff)
downloadnumpy-2c9981b61ca56b41a5e7b9fbe785b6b54727aea4.tar.gz
DOC: merge wiki edits. Add percentile to statistics routines (ML suggestion).
Diffstat (limited to 'numpy/add_newdocs.py')
-rw-r--r--numpy/add_newdocs.py22
1 files changed, 17 insertions, 5 deletions
diff --git a/numpy/add_newdocs.py b/numpy/add_newdocs.py
index f550e2d41..a416559db 100644
--- a/numpy/add_newdocs.py
+++ b/numpy/add_newdocs.py
@@ -1822,10 +1822,21 @@ add_newdoc('numpy.core.multiarray', 'result_type',
""")
-add_newdoc('numpy.core.multiarray','newbuffer',
- """newbuffer(size)
+add_newdoc('numpy.core.multiarray', 'newbuffer',
+ """
+ newbuffer(size)
+
+ Return a new uninitialized buffer object.
- Return a new uninitialized buffer object of size bytes
+ Parameters
+ ----------
+ size : int
+ Size in bytes of returned buffer object.
+
+ Returns
+ -------
+ newbuffer : buffer object
+ Returned, uninitialized buffer object of `size` bytes.
""")
@@ -3717,8 +3728,9 @@ add_newdoc('numpy.core.multiarray', 'copyto',
"""
copyto(dst, src, casting='same_kind', where=None, preservena=False)
- Copies values from `src` into `dst`, broadcasting as necessary.
- Raises a TypeError if the casting rule is violated, and if
+ Copies values from one array to another, broadcasting as necessary.
+
+ Raises a TypeError if the `casting` rule is violated, and if
`where` is provided, it selects which elements to copy.
.. versionadded:: 1.7.0