summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/_templates/indexcontent.html13
-rw-r--r--doc/source/contents.rst1
-rw-r--r--doc/source/neps/datetime-proposal.rst1
-rw-r--r--doc/source/neps/datetime-proposal3.rst1
-rw-r--r--doc/source/neps/deferred-ufunc-evaluation.rst1
-rw-r--r--doc/source/neps/generalized-ufuncs.rst1
-rw-r--r--doc/source/neps/groupby_additions.rst1
-rw-r--r--doc/source/neps/index.rst37
-rw-r--r--doc/source/neps/math_config_clean.rst1
-rw-r--r--doc/source/neps/missing-data.rst1
-rw-r--r--doc/source/neps/new-iterator-ufunc.rst1
-rw-r--r--doc/source/neps/newbugtracker.rst1
-rw-r--r--doc/source/neps/npy-format.rst1
-rw-r--r--doc/source/neps/structured_array_extensions.rst1
-rw-r--r--doc/source/neps/ufunc-overrides.rst1
-rw-r--r--doc/source/neps/warnfix.rst1
16 files changed, 59 insertions, 5 deletions
diff --git a/doc/source/_templates/indexcontent.html b/doc/source/_templates/indexcontent.html
index fb753e7b7..e3fe3ac9b 100644
--- a/doc/source/_templates/indexcontent.html
+++ b/doc/source/_templates/indexcontent.html
@@ -34,6 +34,7 @@
<td width="50%">
<p class="biglink"><a class="biglink" href="{{ pathto("bugs") }}">Reporting bugs</a></p>
<p class="biglink"><a class="biglink" href="{{ pathto("about") }}">About NumPy</a></p>
+ <p class="biglink"><a class="biglink" href="{{ pathto("neps/index") }}">Numpy Enhancement Proposals</a><br/>
</td><td width="50%">
<p class="biglink"><a class="biglink" href="{{ pathto("release") }}">Release Notes</a></p>
<p class="biglink"><a class="biglink" href="{{ pathto("license") }}">License of Numpy</a></p>
@@ -47,12 +48,14 @@
Public Domain in August 2008). The reference documentation for many of
the functions are written by numerous contributors and developers of
Numpy, both prior to and during the
- <a href="http://scipy.org/Developer_Zone/DocMarathon2008">Numpy Documentation Marathon</a>.
+ <a href="http://docs.scipy.org/numpy/">Numpy Documentation Marathon</a>.
</p>
<p>
- The Documentation Marathon is still ongoing. Please help us write
- better documentation for Numpy by joining it! Instructions on how to
- join and what to do can be found
- <a href="http://scipy.org/Developer_Zone/DocMarathon2008">on the scipy.org website</a>.
+ The preferred way to update the documentation is by submitting a pull
+ request on Github (see the
+ <a href="http://docs.scipy.org/doc/numpy-dev/dev/">Developer Guide</a>.
+ The <a href="http://docs.scipy.org/numpy/">Numpy Documentation Wiki</a>
+ can also still be used to submit documentation fixes.
+ Please help us to further improve the Numpy documentation!
</p>
{% endblock %}
diff --git a/doc/source/contents.rst b/doc/source/contents.rst
index 023ebb8a0..1d46e8c7b 100644
--- a/doc/source/contents.rst
+++ b/doc/source/contents.rst
@@ -8,6 +8,7 @@ Numpy manual contents
reference/index
f2py/index
dev/index
+ neps/index
release
about
bugs
diff --git a/doc/source/neps/datetime-proposal.rst b/doc/source/neps/datetime-proposal.rst
new file mode 100644
index 000000000..05f0182b7
--- /dev/null
+++ b/doc/source/neps/datetime-proposal.rst
@@ -0,0 +1 @@
+.. include:: ../../neps/datetime-proposal.rst
diff --git a/doc/source/neps/datetime-proposal3.rst b/doc/source/neps/datetime-proposal3.rst
new file mode 100644
index 000000000..fa9102a96
--- /dev/null
+++ b/doc/source/neps/datetime-proposal3.rst
@@ -0,0 +1 @@
+.. include:: ../../neps/datetime-proposal3.rst
diff --git a/doc/source/neps/deferred-ufunc-evaluation.rst b/doc/source/neps/deferred-ufunc-evaluation.rst
new file mode 100644
index 000000000..b4a7a457d
--- /dev/null
+++ b/doc/source/neps/deferred-ufunc-evaluation.rst
@@ -0,0 +1 @@
+.. include:: ../../neps/deferred-ufunc-evaluation.rst
diff --git a/doc/source/neps/generalized-ufuncs.rst b/doc/source/neps/generalized-ufuncs.rst
new file mode 100644
index 000000000..8b28f0224
--- /dev/null
+++ b/doc/source/neps/generalized-ufuncs.rst
@@ -0,0 +1 @@
+.. include:: ../../neps/generalized-ufuncs.rst
diff --git a/doc/source/neps/groupby_additions.rst b/doc/source/neps/groupby_additions.rst
new file mode 100644
index 000000000..61abc951e
--- /dev/null
+++ b/doc/source/neps/groupby_additions.rst
@@ -0,0 +1 @@
+.. include:: ../../neps/groupby_additions.rst
diff --git a/doc/source/neps/index.rst b/doc/source/neps/index.rst
new file mode 100644
index 000000000..94cf563a4
--- /dev/null
+++ b/doc/source/neps/index.rst
@@ -0,0 +1,37 @@
+===========================
+Numpy Enhancement Proposals
+===========================
+
+Numpy Enhancement Proposals (NEPs) describe proposed changes to Numpy.
+NEPs are modeled on Python Enhancement Proposals (PEPs), and are typically
+written up when large changes to Numpy are proposed.
+
+This page provides an overview of all NEPs, making only a distinction between
+the ones that have been implemented and those that have not been implemented.
+
+Implemented NEPs
+----------------
+
+.. toctree::
+ :maxdepth: 1
+
+ ufunc-overrides
+ generalized-ufuncs
+ new-iterator-ufunc
+ npy-format
+
+Other NEPs
+----------
+
+.. toctree::
+ :maxdepth: 1
+
+ missing-data
+ math_config_clean
+ groupby_additions
+ warnfix
+ newbugtracker
+ deferred-ufunc-evaluation
+ structured_array_extensions
+ datetime-proposal
+ datetime-proposal3
diff --git a/doc/source/neps/math_config_clean.rst b/doc/source/neps/math_config_clean.rst
new file mode 100644
index 000000000..25b340e51
--- /dev/null
+++ b/doc/source/neps/math_config_clean.rst
@@ -0,0 +1 @@
+.. include:: ../../neps/math_config_clean.rst
diff --git a/doc/source/neps/missing-data.rst b/doc/source/neps/missing-data.rst
new file mode 100644
index 000000000..f9899f1b0
--- /dev/null
+++ b/doc/source/neps/missing-data.rst
@@ -0,0 +1 @@
+.. include:: ../../neps/missing-data.rst
diff --git a/doc/source/neps/new-iterator-ufunc.rst b/doc/source/neps/new-iterator-ufunc.rst
new file mode 100644
index 000000000..7e06aa8ae
--- /dev/null
+++ b/doc/source/neps/new-iterator-ufunc.rst
@@ -0,0 +1 @@
+.. include:: ../../neps/new-iterator-ufunc.rst
diff --git a/doc/source/neps/newbugtracker.rst b/doc/source/neps/newbugtracker.rst
new file mode 100644
index 000000000..70ea21f8c
--- /dev/null
+++ b/doc/source/neps/newbugtracker.rst
@@ -0,0 +1 @@
+.. include:: ../../neps/newbugtracker.rst
diff --git a/doc/source/neps/npy-format.rst b/doc/source/neps/npy-format.rst
new file mode 100644
index 000000000..bd1f2bb5c
--- /dev/null
+++ b/doc/source/neps/npy-format.rst
@@ -0,0 +1 @@
+.. include:: ../../neps/npy-format.rst
diff --git a/doc/source/neps/structured_array_extensions.rst b/doc/source/neps/structured_array_extensions.rst
new file mode 100644
index 000000000..341e6c955
--- /dev/null
+++ b/doc/source/neps/structured_array_extensions.rst
@@ -0,0 +1 @@
+.. include:: ../../neps/structured_array_extensions.rst
diff --git a/doc/source/neps/ufunc-overrides.rst b/doc/source/neps/ufunc-overrides.rst
new file mode 100644
index 000000000..2e293ec44
--- /dev/null
+++ b/doc/source/neps/ufunc-overrides.rst
@@ -0,0 +1 @@
+.. include:: ../../neps/ufunc-overrides.rst
diff --git a/doc/source/neps/warnfix.rst b/doc/source/neps/warnfix.rst
new file mode 100644
index 000000000..1b9b1b87b
--- /dev/null
+++ b/doc/source/neps/warnfix.rst
@@ -0,0 +1 @@
+.. include:: ../../neps/warnfix.rst