From 144d790100cdbb03ec791d639ee21436ea4c2dc6 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Sat, 4 Jul 2009 12:59:02 +0000
Subject: Fix versioning and inclusion to ref. guide in docs for #1132

---
 numpy/lib/index_tricks.py | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'numpy/lib/index_tricks.py')

diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py
index 3388decf0..cec7a7ac9 100644
--- a/numpy/lib/index_tricks.py
+++ b/numpy/lib/index_tricks.py
@@ -695,6 +695,14 @@ def fill_diagonal(a, val):
       Value to be written on the diagonal, its type must be compatible with
       that of the array a.
 
+    See also
+    --------
+    diag_indices, diag_indices_from
+
+    Notes
+    -----
+    .. versionadded:: 1.4.0
+
     Examples
     --------
     >>> a = zeros((3,3),int)
@@ -722,10 +730,6 @@ def fill_diagonal(a, val):
            [0, 0, 0],
            [0, 0, 4]])
 
-    See also
-    --------
-    - diag_indices: indices to access diagonals given shape information.
-    - diag_indices_from: indices to access diagonals given an array.
     """
     if a.ndim < 2:
         raise ValueError("array must be at least 2-d")
@@ -761,6 +765,14 @@ def diag_indices(n, ndim=2):
     ndim : int, optional
       The number of dimensions.
 
+    Notes
+    -----
+    .. versionadded:: 1.4.0
+
+    See also
+    --------
+    diag_indices_from
+
     Examples
     --------
     Create a set of indices to access the diagonal of a (4,4) array:
@@ -792,10 +804,6 @@ def diag_indices(n, ndim=2):
            [[0, 0],
             [0, 1]]])
 
-    See also
-    --------
-    - diag_indices_from: create the indices based on the shape of an existing
-    array.
     """
     idx = arange(n)
     return (idx,) * ndim
@@ -809,6 +817,11 @@ def diag_indices_from(arr):
     Parameters
     ----------
     arr : array, at least 2-d
+
+    Notes
+    -----
+    .. versionadded:: 1.4.0
+
     """
 
     if not arr.ndim >= 2:
-- 
cgit v1.2.1