10 files changed, 63 insertions, 15 deletions
diff --git a/doc/source/_static/numpy_logo.png b/doc/source/_static/numpy_logo.png
new file mode 100644
index 000000000..af8cbe323
--- /dev/null
+++ b/doc/source/_static/numpy_logo.png
diff --git a/doc/source/_templates/indexsidebar.html b/doc/source/_templates/indexsidebar.html
index 51e7c4308..4707fc0e8 100644
--- a/doc/source/_templates/indexsidebar.html
+++ b/doc/source/_templates/indexsidebar.html
@@ -1,4 +1,5 @@
             <h3>Resources</h3>
             <ul>
+              <li><a href="https://numpy.org/">NumPy.org website</a></li>
               <li><a href="https://scipy.org/">Scipy.org website</a></li>
             </ul>
diff --git a/doc/source/_templates/layout.html b/doc/source/_templates/layout.html
index 77da54a00..beaa297db 100644
--- a/doc/source/_templates/layout.html
+++ b/doc/source/_templates/layout.html
@@ -1,5 +1,15 @@
 {% extends "!layout.html" %}
 
+{%- block header %}
+<div class="container">
+  <div class="top-scipy-org-logo-header" style="background-color: #a2bae8;">
+    <a href="{{ pathto('index') }}">
+      <img border=0 alt="NumPy" src="{{ pathto('_static/numpy_logo.png', 1) }}"></a>
+    </div>
+  </div>
+</div>
+
+{% endblock %}
 {% block rootrellink %}
         {% if pagename != 'index' %}
         <li class="active"><a href="{{ pathto('index') }}">{{ shorttitle|e }}</a></li>
diff --git a/doc/source/conf.py b/doc/source/conf.py
index fa0c0e7e4..4f312eff5 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -121,7 +121,9 @@ else:
         "edit_link": False,
         "sidebar": "left",
         "scipy_org_logo": False,
-        "rootlinks": []
+        "rootlinks": [("https://numpy.org/", "NumPy.org"),
+                      ("https://numpy.org/doc", "Docs"),
+                     ]
     }
     html_sidebars = {'index': ['indexsidebar.html', 'searchbox.html']}
 
diff --git a/doc/source/dev/development_environment.rst b/doc/source/dev/development_environment.rst
index 340f22026..ce571926e 100644
--- a/doc/source/dev/development_environment.rst
+++ b/doc/source/dev/development_environment.rst
@@ -19,6 +19,11 @@ sources needs some additional steps, which are explained below.  For the rest
 of this chapter we assume that you have set up your git repo as described in
 :ref:`using-git`.
 
+.. _testing-builds:
+
+Testing builds
+--------------
+
 To build the development version of NumPy and run tests, spawn
 interactive shells with the Python import paths properly set up etc.,
 do one of::
@@ -47,6 +52,10 @@ When using pytest as a target (the default), you can
 
     $ python runtests.py -v -t numpy/core/tests/test_multiarray.py -- -k "MatMul and not vector"
 
+.. note::
+
+    Remember that all tests of NumPy should pass before commiting your changes.
+
 Using ``runtests.py`` is the recommended approach to running tests.
 There are also a number of alternatives to it, for example in-place
 build or installing to a virtualenv. See the FAQ below for details.
diff --git a/doc/source/dev/development_workflow.rst b/doc/source/dev/development_workflow.rst
index 291b1df73..900431374 100644
--- a/doc/source/dev/development_workflow.rst
+++ b/doc/source/dev/development_workflow.rst
@@ -203,8 +203,9 @@ function, you should
   a description of and a motivation for your changes. This may generate
   changes and feedback. It might be prudent to start with this step if your
   change may be controversial.
-- add a release note to the ``changelog`` directory, following the instructions
-  and format in the ``changelog/README.rst`` file.
+- add a release note to the ``doc/release/upcoming_changes/`` directory,
+  following the instructions and format in the
+  ``doc/release/upcoming_changes/README.rst`` file.
 
 .. _rebasing-on-master:
 
diff --git a/doc/source/dev/index.rst b/doc/source/dev/index.rst
index a8bd0bb46..3b409f5ca 100644
--- a/doc/source/dev/index.rst
+++ b/doc/source/dev/index.rst
@@ -2,6 +2,33 @@
 Contributing to NumPy
 #####################
 
+Not a coder? Not a problem! NumPy is multi-faceted, and we can use a lot of help.
+These are all activities we'd like to get help with (they're all important, so
+we list them in alphabetical order):
+
+- Code maintenance and development
+- Community coordination
+- DevOps
+- Developing educational content & narrative documentation
+- Writing technical documentation
+- Fundraising
+- Project management
+- Marketing
+- Translating content
+- Website design and development
+
+The rest of this document discusses working on the NumPy code base and documentation.
+We're in the process of updating our descriptions of other activities and roles.
+If you are interested in these other activities, please contact us!
+You can do this via
+the `numpy-discussion mailing list <https://scipy.org/scipylib/mailing-lists.html>`__,
+or on GitHub (open an issue or comment on a relevant issue). These are our preferred
+communication channels (open source is open by nature!), however if you prefer
+to discuss in private first, please reach out to our community coordinators
+at `numpy-team@googlegroups.com` or `numpy-team.slack.com` (send an email to
+`numpy-team@googlegroups.com` for an invite the first time).
+
+
 Development process - summary
 =============================
 
diff --git a/doc/source/reference/routines.ma.rst b/doc/source/reference/routines.ma.rst
index 491bb6bff..5b2098c7a 100644
--- a/doc/source/reference/routines.ma.rst
+++ b/doc/source/reference/routines.ma.rst
@@ -264,17 +264,6 @@ Conversion operations
    ma.MaskedArray.tobytes
 
 
-Pickling and unpickling
-~~~~~~~~~~~~~~~~~~~~~~~
-.. autosummary::
-   :toctree: generated/
-
-   ma.dump
-   ma.dumps
-   ma.load
-   ma.loads
-
-
 Filling a masked array
 ~~~~~~~~~~~~~~~~~~~~~~
 .. autosummary::
diff --git a/doc/source/release.rst b/doc/source/release.rst
index 8dfb8db1d..5750e402f 100644
--- a/doc/source/release.rst
+++ b/doc/source/release.rst
@@ -2,7 +2,7 @@
 Release Notes
 *************
 
-.. include:: ../release/1.18.0-notes.rst
+.. include:: ../release/1.17.1-notes.rst
 .. include:: ../release/1.17.0-notes.rst
 .. include:: ../release/1.16.4-notes.rst
 .. include:: ../release/1.16.3-notes.rst
diff --git a/doc/source/user/building.rst b/doc/source/user/building.rst
index 26f251151..b4b4371e5 100644
--- a/doc/source/user/building.rst
+++ b/doc/source/user/building.rst
@@ -69,6 +69,15 @@ Using ``virtualenv`` should work as expected.
 *Note: for build instructions to do development work on NumPy itself, see*
 :ref:`development-environment`.
 
+Testing
+-------
+
+Make sure to test your builds. To ensure everything stays in shape, see if all tests pass::
+
+    $ python runtests.py -v -m full
+
+For detailed info on testing, see :ref:`testing-builds`.
+
 .. _parallel-builds:
 
 Parallel builds