diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5b0278c560df..4055ba0380ea 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -108,6 +108,9 @@ jobs:
           name: "Built documentation is available at:"
           command: echo "${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/doc/build/html/index.html"
 
+      - add_ssh_keys:
+          fingerprints:
+            - "78:13:59:08:61:a9:e5:09:af:df:3a:d8:89:c2:84:c0"
       - deploy:
           name: "Deploy new docs"
           command: ./.circleci/deploy-docs.sh
diff --git a/.circleci/deploy-docs.sh b/.circleci/deploy-docs.sh
index 7493a5f69129..e6a51e58d8ad 100755
--- a/.circleci/deploy-docs.sh
+++ b/.circleci/deploy-docs.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-if [ "$CIRCLE_BRANCH" != "master" -o "$CIRCLE_PULL_REQUEST" != "" ]; then
-    echo "Not uploading docs from non-master branch."
+if [ "$CIRCLE_PROJECT_USERNAME" != "matplotlib" -o "$CIRCLE_BRANCH" != "master" -o "$CIRCLE_PULL_REQUEST" != "" ]; then
+    echo "Not uploading docs from non-master branch or non-Matplotlib org."
     exit
 fi
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 45f6e07d2686..ced3ee9a82b3 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -24,7 +24,7 @@ detail.  Why is this change required?  What problem does it solve?-->
 - [ ] Code is PEP 8 compliant 
 - [ ] New features are documented, with examples if plot related
 - [ ] Documentation is sphinx and numpydoc compliant
-- [ ] Added an entry to doc/users/whats_new.rst if major new feature
+- [ ] Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)
 - [ ] Documented in doc/api/api_changes.rst if API changed in a backward-incompatible way
 
 <!--We understand that PRs can sometimes be overwhelming, especially as the
diff --git a/doc/conf.py b/doc/conf.py
index 422d33374c0c..ed5d94d24018 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -102,9 +102,11 @@ def _check_deps():
     'filename_pattern': '^((?!sgskip).)*$',
     'gallery_dirs': ['gallery', 'tutorials'],
     'doc_module': ('matplotlib', 'mpl_toolkits'),
-    'reference_url': {'matplotlib': None,
-                      'numpy': 'http://docs.scipy.org/doc/numpy/reference',
-                      'scipy': 'http://docs.scipy.org/doc/scipy/reference'},
+    'reference_url': {
+        'matplotlib': None,
+        'numpy': 'https://docs.scipy.org/doc/numpy',
+        'scipy': 'https://docs.scipy.org/doc/scipy/reference',
+    },
     'backreferences_dir': 'api/_as_gen'
 }
 
diff --git a/doc/devel/release_guide.rst b/doc/devel/release_guide.rst
index 23292bc84a4f..b26627633dd5 100644
--- a/doc/devel/release_guide.rst
+++ b/doc/devel/release_guide.rst
@@ -48,7 +48,10 @@ Review and commit changes.  Some issue/PR titles may not be valid rst (the most
 Check Docs
 ----------
 
-Before tagging, make sure that the docs build cleanly ::
+Before tagging, update the what's new listing in :file:`doc/users/whats_new.rst`
+by merging all files in :file:`doc/users/next_whats_new/` coherently. Also,
+temporarily comment out the include and toctree glob; re-instate these after a
+release. Finally, make sure that the docs build cleanly ::
 
   pushd doc
   python make.py html latex -n 16
diff --git a/doc/users/whats_new/2015-10-31_TransformedPatchPath.rst b/doc/users/next_whats_new/2015-10-31_TransformedPatchPath.rst
similarity index 100%
rename from doc/users/whats_new/2015-10-31_TransformedPatchPath.rst
rename to doc/users/next_whats_new/2015-10-31_TransformedPatchPath.rst
diff --git a/doc/users/whats_new/CheckButtons_widget_get_status.rst b/doc/users/next_whats_new/CheckButtons_widget_get_status.rst
similarity index 100%
rename from doc/users/whats_new/CheckButtons_widget_get_status.rst
rename to doc/users/next_whats_new/CheckButtons_widget_get_status.rst
diff --git a/doc/users/whats_new/README.rst b/doc/users/next_whats_new/README.rst
similarity index 77%
rename from doc/users/whats_new/README.rst
rename to doc/users/next_whats_new/README.rst
index dd8e4a8a5214..cb09068bb0e1 100644
--- a/doc/users/whats_new/README.rst
+++ b/doc/users/next_whats_new/README.rst
@@ -1,4 +1,7 @@
-This folder is for placing new portions of `whats_new.rst`.
+What's new in unreleased Matplotlib?
+====================================
+
+Please place new portions of `whats_new.rst` in the `next_whats_new` directory.
 
 When adding an entry please look at the currently existing files to
 see if you can extend any of them.  If you create a file, name it
diff --git a/doc/users/whats_new/abstract_movie_writer.rst b/doc/users/next_whats_new/abstract_movie_writer.rst
similarity index 100%
rename from doc/users/whats_new/abstract_movie_writer.rst
rename to doc/users/next_whats_new/abstract_movie_writer.rst
diff --git a/doc/users/whats_new/anchoredsizebar_fill_bar_argument.rst b/doc/users/next_whats_new/anchoredsizebar_fill_bar_argument.rst
similarity index 100%
rename from doc/users/whats_new/anchoredsizebar_fill_bar_argument.rst
rename to doc/users/next_whats_new/anchoredsizebar_fill_bar_argument.rst
diff --git a/doc/users/whats_new/annotation-default-arrow.rst b/doc/users/next_whats_new/annotation-default-arrow.rst
similarity index 100%
rename from doc/users/whats_new/annotation-default-arrow.rst
rename to doc/users/next_whats_new/annotation-default-arrow.rst
diff --git a/doc/users/whats_new/axes3d_orthographic_projection.rst b/doc/users/next_whats_new/axes3d_orthographic_projection.rst
similarity index 100%
rename from doc/users/whats_new/axes3d_orthographic_projection.rst
rename to doc/users/next_whats_new/axes3d_orthographic_projection.rst
diff --git a/doc/users/whats_new/default_hexbin_linecolor.rst b/doc/users/next_whats_new/default_hexbin_linecolor.rst
similarity index 100%
rename from doc/users/whats_new/default_hexbin_linecolor.rst
rename to doc/users/next_whats_new/default_hexbin_linecolor.rst
diff --git a/doc/users/whats_new/figure_legend_no_args.rst b/doc/users/next_whats_new/figure_legend_no_args.rst
similarity index 100%
rename from doc/users/whats_new/figure_legend_no_args.rst
rename to doc/users/next_whats_new/figure_legend_no_args.rst
diff --git a/doc/users/whats_new/figure_new_clear_keyword.rst b/doc/users/next_whats_new/figure_new_clear_keyword.rst
similarity index 100%
rename from doc/users/whats_new/figure_new_clear_keyword.rst
rename to doc/users/next_whats_new/figure_new_clear_keyword.rst
diff --git a/doc/users/whats_new/fix_avconv.rst b/doc/users/next_whats_new/fix_avconv.rst
similarity index 100%
rename from doc/users/whats_new/fix_avconv.rst
rename to doc/users/next_whats_new/fix_avconv.rst
diff --git a/doc/users/whats_new/invalid_axes_limits_errors.rst b/doc/users/next_whats_new/invalid_axes_limits_errors.rst
similarity index 100%
rename from doc/users/whats_new/invalid_axes_limits_errors.rst
rename to doc/users/next_whats_new/invalid_axes_limits_errors.rst
diff --git a/doc/users/whats_new/metadata_savefig_kwarg.rst b/doc/users/next_whats_new/metadata_savefig_kwarg.rst
similarity index 100%
rename from doc/users/whats_new/metadata_savefig_kwarg.rst
rename to doc/users/next_whats_new/metadata_savefig_kwarg.rst
diff --git a/doc/users/whats_new/min_log_scale_exponent.rst b/doc/users/next_whats_new/min_log_scale_exponent.rst
similarity index 100%
rename from doc/users/whats_new/min_log_scale_exponent.rst
rename to doc/users/next_whats_new/min_log_scale_exponent.rst
diff --git a/doc/users/whats_new/multiple_legend_keys.rst b/doc/users/next_whats_new/multiple_legend_keys.rst
similarity index 66%
rename from doc/users/whats_new/multiple_legend_keys.rst
rename to doc/users/next_whats_new/multiple_legend_keys.rst
index 0eadb3012b57..982ce6fbae70 100644
--- a/doc/users/whats_new/multiple_legend_keys.rst
+++ b/doc/users/next_whats_new/multiple_legend_keys.rst
@@ -6,11 +6,9 @@ A legend entry can now contain more than one legend key. The extended
 legend area in the specified number of sections; ``pad`` changes the padding
 between the legend keys.
 
-.. figure:: ../../gallery/pylab_examples/images/sphx_glr_legend_demo6_001.png
-   :target: ../../gallery/pylab_examples/legend_demo6.html
+.. figure:: /gallery/text_labels_and_annotations/images/sphx_glr_legend_demo_004.png
+   :target: ../../gallery/text_labels_and_annotations/legend_demo.html
    :align: center
    :scale: 50
 
-   Legend Demo6
-
-
+   Multiple Legend Keys
diff --git a/doc/users/whats_new/percent_formatter.rst b/doc/users/next_whats_new/percent_formatter.rst
similarity index 100%
rename from doc/users/whats_new/percent_formatter.rst
rename to doc/users/next_whats_new/percent_formatter.rst
diff --git a/doc/users/whats_new/quiverkey_angle_kwarg.rst b/doc/users/next_whats_new/quiverkey_angle_kwarg.rst
similarity index 100%
rename from doc/users/whats_new/quiverkey_angle_kwarg.rst
rename to doc/users/next_whats_new/quiverkey_angle_kwarg.rst
diff --git a/doc/users/whats_new/reproducible_ps_pdf.rst b/doc/users/next_whats_new/reproducible_ps_pdf.rst
similarity index 100%
rename from doc/users/whats_new/reproducible_ps_pdf.rst
rename to doc/users/next_whats_new/reproducible_ps_pdf.rst
diff --git a/doc/users/whats_new/reversed_colormap.rst b/doc/users/next_whats_new/reversed_colormap.rst
similarity index 100%
rename from doc/users/whats_new/reversed_colormap.rst
rename to doc/users/next_whats_new/reversed_colormap.rst
diff --git a/doc/users/whats_new/scatter_no_longer_flattens.rst b/doc/users/next_whats_new/scatter_no_longer_flattens.rst
similarity index 100%
rename from doc/users/whats_new/scatter_no_longer_flattens.rst
rename to doc/users/next_whats_new/scatter_no_longer_flattens.rst
diff --git a/doc/users/whats_new/setp_output.rst b/doc/users/next_whats_new/setp_output.rst
similarity index 100%
rename from doc/users/whats_new/setp_output.rst
rename to doc/users/next_whats_new/setp_output.rst
diff --git a/doc/users/whats_new/streamplot_set_maximum_length.rst b/doc/users/next_whats_new/streamplot_set_maximum_length.rst
similarity index 100%
rename from doc/users/whats_new/streamplot_set_maximum_length.rst
rename to doc/users/next_whats_new/streamplot_set_maximum_length.rst
diff --git a/doc/users/whats_new/tick_params_rotation.rst b/doc/users/next_whats_new/tick_params_rotation.rst
similarity index 100%
rename from doc/users/whats_new/tick_params_rotation.rst
rename to doc/users/next_whats_new/tick_params_rotation.rst
diff --git a/doc/users/whats_new/toggle_3d_bar_shading.rst b/doc/users/next_whats_new/toggle_3d_bar_shading.rst
similarity index 100%
rename from doc/users/whats_new/toggle_3d_bar_shading.rst
rename to doc/users/next_whats_new/toggle_3d_bar_shading.rst
diff --git a/doc/users/whats_new/update_autofmt_xdate.rst b/doc/users/next_whats_new/update_autofmt_xdate.rst
similarity index 100%
rename from doc/users/whats_new/update_autofmt_xdate.rst
rename to doc/users/next_whats_new/update_autofmt_xdate.rst
diff --git a/doc/users/whats_new/update_subplot2grid.rst b/doc/users/next_whats_new/update_subplot2grid.rst
similarity index 100%
rename from doc/users/whats_new/update_subplot2grid.rst
rename to doc/users/next_whats_new/update_subplot2grid.rst
diff --git a/doc/users/whats_new/updated_fill_betweenx.rst b/doc/users/next_whats_new/updated_fill_betweenx.rst
similarity index 100%
rename from doc/users/whats_new/updated_fill_betweenx.rst
rename to doc/users/next_whats_new/updated_fill_betweenx.rst
diff --git a/doc/users/whats_new/validation_of_linestyle_rcparams.rst b/doc/users/next_whats_new/validation_of_linestyle_rcparams.rst
similarity index 100%
rename from doc/users/whats_new/validation_of_linestyle_rcparams.rst
rename to doc/users/next_whats_new/validation_of_linestyle_rcparams.rst
diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst
index fb03e8bf1924..1c6ce3c729df 100644
--- a/doc/users/whats_new.rst
+++ b/doc/users/whats_new.rst
@@ -11,6 +11,16 @@ revision, see the :ref:`github-stats`.
    :depth: 3
 
 
+..
+   For a release, add a new section after this, then comment out the include
+   and toctree below by indenting them. Uncomment them after the release.
+.. include:: next_whats_new/README.rst
+.. toctree::
+   :glob:
+   :maxdepth: 1
+
+   next_whats_new/*
+
 
 New in matplotlib 2.0
 =====================