From a63b7b1dabaf60ad08d2171e31f36933e58e4beb Mon Sep 17 00:00:00 2001
From: Zebedee Nicholls <zebedee.nicholls@climate-energy-college.org>
Date: Tue, 6 Oct 2020 21:44:38 +1100
Subject: [PATCH] Move whatsnew entries into correct file

---
 docs/iris/src/whatsnew/3.0.rst    |  5 +++
 docs/iris/src/whatsnew/latest.rst | 57 -------------------------------
 2 files changed, 5 insertions(+), 57 deletions(-)
 delete mode 100644 docs/iris/src/whatsnew/latest.rst

diff --git a/docs/iris/src/whatsnew/3.0.rst b/docs/iris/src/whatsnew/3.0.rst
index f0df167cce..a6d1c97036 100644
--- a/docs/iris/src/whatsnew/3.0.rst
+++ b/docs/iris/src/whatsnew/3.0.rst
@@ -168,6 +168,7 @@ This document explains the changes made to Iris for this release
   Previously, the first tick label would occasionally be duplicated. This also
   removes the use of Matplotlib's deprecated ``IndexFormatter``. (:pull:`3857`)
 
+* `@znicholls`_ fixed :meth:`~iris.quickplot._title` to only check ``units.is_time_reference`` if the ``units`` symbol is not used. (:pull:`3902`)
 
 .. _whatsnew 3.0 changes:
 
@@ -417,6 +418,9 @@ This document explains the changes made to Iris for this release
 * `@owena11`_ identified and optimised a bottleneck in ``FieldsFile`` header
   loading due to the use of :func:`numpy.fromfile`. (:pull:`3791`)
 
+* `@znicholls`_ added a test for plotting with the label being taken from the unit's symbol, see :meth:`~iris.tests.test_quickplot.TestLabels.test_pcolormesh_str_symbol` (:pull:`3902`).
+
+* `@znicholls`_ made :func:`~iris.tests.idiff.step_over_diffs` robust to hyphens (``-``) in the input path (i.e. the ``result_dir`` argument) (:pull:`3902`).
 
 .. _Read the Docs: https://scitools-iris.readthedocs.io/en/latest/
 .. _Matplotlib: https://matplotlib.org/
@@ -450,6 +454,7 @@ This document explains the changes made to Iris for this release
 .. _@rcomer: https://github.com/rcomer
 .. _@jvegasbsc: https://github.com/jvegasbsc
 .. _@zklaus: https://github.com/zklaus
+.. _@znicholls: https://github.com/znicholls
 .. _ESMValTool: https://github.com/ESMValGroup/ESMValTool
 .. _v75: https://cfconventions.org/Data/cf-standard-names/75/build/cf-standard-name-table.html
 .. _sphinx-panels: https://sphinx-panels.readthedocs.io/en/latest/
diff --git a/docs/iris/src/whatsnew/latest.rst b/docs/iris/src/whatsnew/latest.rst
deleted file mode 100644
index 0ef087fc25..0000000000
--- a/docs/iris/src/whatsnew/latest.rst
+++ /dev/null
@@ -1,57 +0,0 @@
-.. include:: ../common_links.inc
-
-<unreleased>
-************
-
-This document explains the changes made to Iris for this release
-(:doc:`View all changes <index>`.)
-
-
-📢 Announcements
-================
-
-* N/A
-
-
-✨ Features
-===========
-
-* N/A
-
-
-🐛 Bugs Fixed
-=============
-
-* `@znicholls`_ fixed :meth:`~iris.quickplot._title` to only check ``units.is_time_reference`` if the ``units`` symbol is not used. (:pull:`3902`)
-
-
-💣 Incompatible Changes
-=======================
-
-* N/A
-
-
-🔥 Deprecations
-===============
-
-* N/A
-
-
-🔗 Dependencies
-===============
-
-* N/A
-
-
-📚 Documentation
-================
-
-* N/A
-
-
-💼 Internal
-===========
-
-* `@znicholls`_ added a test for plotting with the label being taken from the unit's symbol, see :meth:`~iris.tests.test_quickplot.TestLabels.test_pcolormesh_str_symbol` (:pull:`3902`).
-
-* `@znicholls`_ made :func:`~iris.tests.idiff.step_over_diffs` robust to hyphens (``-``) in the input path (i.e. the ``result_dir`` argument) (:pull:`3902`).