From 2c9981b61ca56b41a5e7b9fbe785b6b54727aea4 Mon Sep 17 00:00:00 2001 From: Ralf Gommers Date: Sat, 5 May 2012 21:16:13 +0200 Subject: DOC: merge wiki edits. Add percentile to statistics routines (ML suggestion). --- numpy/add_newdocs.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'numpy/add_newdocs.py') 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 -- cgit v1.2.1