Merge branch 'master' into iep_creation

* master: corrected syntax (SciTools#3980) core dev whatsnew entry (SciTools#3978) moved docs dir and updated references to it (SciTools#3975) Fix test_incompatible_dimensions test (SciTools#3977)
tkknight · Feb 4, 2021 · 2088c69 · 2088c69
2 parents 921f60d + 3ff15a6
commit 2088c69
Show file tree

Hide file tree

Showing 193 changed files with 57 additions and 47 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -106,7 +106,7 @@ linux_minimal_task:
   << : *LINUX_TASK_TEMPLATE
   tests_script:
     - echo "[Resources]" > ${SITE_CFG}
-    - echo "doc_dir = ${CIRRUS_WORKING_DIR}/docs/iris" >> ${SITE_CFG}
+    - echo "doc_dir = ${CIRRUS_WORKING_DIR}/docs" >> ${SITE_CFG}
     - nox --session tests
 
 
@@ -136,7 +136,7 @@ linux_task:
   tests_script:
     - echo "[Resources]" > ${SITE_CFG}
     - echo "test_data_dir = ${IRIS_TEST_DATA_DIR}/test_data" >> ${SITE_CFG}
-    - echo "doc_dir = ${CIRRUS_WORKING_DIR}/docs/iris" >> ${SITE_CFG}
+    - echo "doc_dir = ${CIRRUS_WORKING_DIR}/docs" >> ${SITE_CFG}
     - nox --session tests
 
 
@@ -166,7 +166,7 @@ gallery_task:
   tests_script:
     - echo "[Resources]" > ${SITE_CFG}
     - echo "test_data_dir = ${IRIS_TEST_DATA_DIR}/test_data" >> ${SITE_CFG}
-    - echo "doc_dir = ${CIRRUS_WORKING_DIR}/docs/iris" >> ${SITE_CFG}
+    - echo "doc_dir = ${CIRRUS_WORKING_DIR}/docs" >> ${SITE_CFG}
     - nox --session gallery
 
 
@@ -197,7 +197,7 @@ doctest_task:
   tests_script:
     - echo "[Resources]" > ${SITE_CFG}
     - echo "test_data_dir = ${IRIS_TEST_DATA_DIR}/test_data" >> ${SITE_CFG}
-    - echo "doc_dir = ${CIRRUS_WORKING_DIR}/docs/iris" >> ${SITE_CFG}
+    - echo "doc_dir = ${CIRRUS_WORKING_DIR}/docs" >> ${SITE_CFG}
     - mkdir -p ${MPL_RC_DIR}
     - echo "backend : agg" > ${MPL_RC_FILE}
     - echo "image.cmap : viridis" >> ${MPL_RC_FILE}

diff --git a/.flake8 b/.flake8
@@ -30,7 +30,7 @@ exclude =
     .eggs,
     build,
     compiled_krb,
-    docs/iris/src/sphinxext/*,
+    docs/src/sphinxext/*,
     tools/*,
     #
     # ignore auto-generated files

diff --git a/.gitignore b/.gitignore
@@ -56,11 +56,11 @@ lib/iris/tests/results/imagerepo.lock
 *.cover
 
 # Auto generated documentation files
-docs/iris/src/_build/*
-docs/iris/src/generated
+docs/src/_build/*
+docs/src/generated
 
 # Example test results
-docs/iris/iris_image_test_output/
+docs/iris_image_test_output/
 
 # Created by editiors
 *~

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -7,7 +7,7 @@ conda:
     environment: requirements/ci/readthedocs.yml
 
 sphinx:
-    configuration: docs/iris/src/conf.py
+    configuration: docs/src/conf.py
     fail_on_warning: false
 
 python:

diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,5 @@
 This file is no longer updated and is provided for historical purposes only.
-Please see docs/iris/src/whatsnew/ for a changelog.
+Please see docs/src/whatsnew/ for a changelog.
 
 
 Release 1.4 (14 June 2013)

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -11,7 +11,7 @@ include requirements/*.txt
 
 # File required to build docs
 recursive-include docs Makefile *.js *.png *.py *.rst
-prune docs/iris/build
+prune docs/build
 
 # Files required to build std_names module
 include tools/generate_std_names.py

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 <h1 align="center">
   <a href="https://scitools.org.uk/iris/docs/latest/">
-   <img src="docs/iris/src/_static/iris-logo-title.png" alt="Iris" width="300"></a><br>
+   <img src="docs/src/_static/iris-logo-title.png" alt="Iris" width="300"></a><br>
 </h1>
 
 

diff --git a/docs/iris/Makefile → docs/Makefile b/docs/iris/Makefile → docs/Makefile
diff --git a/docs/iris/gallery_code/README.rst → docs/gallery_code/README.rst b/docs/iris/gallery_code/README.rst → docs/gallery_code/README.rst
diff --git a/docs/iris/gallery_code/general/README.rst → docs/gallery_code/general/README.rst b/docs/iris/gallery_code/general/README.rst → docs/gallery_code/general/README.rst
diff --git a/...allery_code/general/plot_SOI_filtering.py → ...allery_code/general/plot_SOI_filtering.py b/...allery_code/general/plot_SOI_filtering.py → ...allery_code/general/plot_SOI_filtering.py
diff --git a/...ode/general/plot_anomaly_log_colouring.py → ...ode/general/plot_anomaly_log_colouring.py b/...ode/general/plot_anomaly_log_colouring.py → ...ode/general/plot_anomaly_log_colouring.py
diff --git a/...ris/gallery_code/general/plot_coriolis.py → docs/gallery_code/general/plot_coriolis.py b/...ris/gallery_code/general/plot_coriolis.py → docs/gallery_code/general/plot_coriolis.py
diff --git a/...allery_code/general/plot_cross_section.py → ...allery_code/general/plot_cross_section.py b/...allery_code/general/plot_cross_section.py → ...allery_code/general/plot_cross_section.py
diff --git a/...y_code/general/plot_custom_aggregation.py → ...y_code/general/plot_custom_aggregation.py b/...y_code/general/plot_custom_aggregation.py → ...y_code/general/plot_custom_aggregation.py
diff --git a/..._code/general/plot_custom_file_loading.py → ..._code/general/plot_custom_file_loading.py b/..._code/general/plot_custom_file_loading.py → ..._code/general/plot_custom_file_loading.py
diff --git a/...s/gallery_code/general/plot_global_map.py → docs/gallery_code/general/plot_global_map.py b/...s/gallery_code/general/plot_global_map.py → docs/gallery_code/general/plot_global_map.py
diff --git a/docs/iris/gallery_code/general/plot_inset.py → docs/gallery_code/general/plot_inset.py b/docs/iris/gallery_code/general/plot_inset.py → docs/gallery_code/general/plot_inset.py
diff --git a/...code/general/plot_lineplot_with_legend.py → ...code/general/plot_lineplot_with_legend.py b/...code/general/plot_lineplot_with_legend.py → ...code/general/plot_lineplot_with_legend.py
diff --git a/...gallery_code/general/plot_polar_stereo.py → ...gallery_code/general/plot_polar_stereo.py b/...gallery_code/general/plot_polar_stereo.py → ...gallery_code/general/plot_polar_stereo.py
diff --git a/...llery_code/general/plot_polynomial_fit.py → ...llery_code/general/plot_polynomial_fit.py b/...llery_code/general/plot_polynomial_fit.py → ...llery_code/general/plot_polynomial_fit.py
diff --git a/...neral/plot_projections_and_annotations.py → ...neral/plot_projections_and_annotations.py b/...neral/plot_projections_and_annotations.py → ...neral/plot_projections_and_annotations.py
diff --git a/...code/general/plot_rotated_pole_mapping.py → ...code/general/plot_rotated_pole_mapping.py b/...code/general/plot_rotated_pole_mapping.py → ...code/general/plot_rotated_pole_mapping.py
diff --git a/.../iris/gallery_code/meteorology/README.rst → docs/gallery_code/meteorology/README.rst b/.../iris/gallery_code/meteorology/README.rst → docs/gallery_code/meteorology/README.rst
diff --git a/...s/gallery_code/meteorology/plot_COP_1d.py → docs/gallery_code/meteorology/plot_COP_1d.py b/...s/gallery_code/meteorology/plot_COP_1d.py → docs/gallery_code/meteorology/plot_COP_1d.py
diff --git a/...gallery_code/meteorology/plot_COP_maps.py → ...gallery_code/meteorology/plot_COP_maps.py b/...gallery_code/meteorology/plot_COP_maps.py → ...gallery_code/meteorology/plot_COP_maps.py
diff --git a/...iris/gallery_code/meteorology/plot_TEC.py → docs/gallery_code/meteorology/plot_TEC.py b/...iris/gallery_code/meteorology/plot_TEC.py → docs/gallery_code/meteorology/plot_TEC.py
diff --git a/...de/meteorology/plot_deriving_phenomena.py → ...de/meteorology/plot_deriving_phenomena.py b/...de/meteorology/plot_deriving_phenomena.py → ...de/meteorology/plot_deriving_phenomena.py
diff --git a/...allery_code/meteorology/plot_hovmoller.py → ...allery_code/meteorology/plot_hovmoller.py b/...allery_code/meteorology/plot_hovmoller.py → ...allery_code/meteorology/plot_hovmoller.py
diff --git a/..._code/meteorology/plot_lagged_ensemble.py → ..._code/meteorology/plot_lagged_ensemble.py b/..._code/meteorology/plot_lagged_ensemble.py → ..._code/meteorology/plot_lagged_ensemble.py
diff --git a/...llery_code/meteorology/plot_wind_speed.py → ...llery_code/meteorology/plot_wind_speed.py b/...llery_code/meteorology/plot_wind_speed.py → ...llery_code/meteorology/plot_wind_speed.py
diff --git a/...iris/gallery_code/oceanography/README.rst → docs/gallery_code/oceanography/README.rst b/...iris/gallery_code/oceanography/README.rst → docs/gallery_code/oceanography/README.rst
diff --git a/...de/oceanography/plot_atlantic_profiles.py → ...de/oceanography/plot_atlantic_profiles.py b/...de/oceanography/plot_atlantic_profiles.py → ...de/oceanography/plot_atlantic_profiles.py
diff --git a/...llery_code/oceanography/plot_load_nemo.py → ...llery_code/oceanography/plot_load_nemo.py b/...llery_code/oceanography/plot_load_nemo.py → ...llery_code/oceanography/plot_load_nemo.py
diff --git a/...code/oceanography/plot_orca_projection.py → ...code/oceanography/plot_orca_projection.py b/...code/oceanography/plot_orca_projection.py → ...code/oceanography/plot_orca_projection.py
diff --git a/docs/iris/gallery_tests/__init__.py → docs/gallery_tests/__init__.py b/docs/iris/gallery_tests/__init__.py → docs/gallery_tests/__init__.py
diff --git a/docs/iris/gallery_tests/gallerytest_util.py → docs/gallery_tests/gallerytest_util.py b/docs/iris/gallery_tests/gallerytest_util.py → docs/gallery_tests/gallerytest_util.py
diff --git a/docs/iris/gallery_tests/test_plot_COP_1d.py → docs/gallery_tests/test_plot_COP_1d.py b/docs/iris/gallery_tests/test_plot_COP_1d.py → docs/gallery_tests/test_plot_COP_1d.py
diff --git a/.../iris/gallery_tests/test_plot_COP_maps.py → docs/gallery_tests/test_plot_COP_maps.py b/.../iris/gallery_tests/test_plot_COP_maps.py → docs/gallery_tests/test_plot_COP_maps.py
diff --git a/.../gallery_tests/test_plot_SOI_filtering.py → .../gallery_tests/test_plot_SOI_filtering.py b/.../gallery_tests/test_plot_SOI_filtering.py → .../gallery_tests/test_plot_SOI_filtering.py
diff --git a/docs/iris/gallery_tests/test_plot_TEC.py → docs/gallery_tests/test_plot_TEC.py b/docs/iris/gallery_tests/test_plot_TEC.py → docs/gallery_tests/test_plot_TEC.py
diff --git a/..._tests/test_plot_anomaly_log_colouring.py → ..._tests/test_plot_anomaly_log_colouring.py b/..._tests/test_plot_anomaly_log_colouring.py → ..._tests/test_plot_anomaly_log_colouring.py
diff --git a/...lery_tests/test_plot_atlantic_profiles.py → ...lery_tests/test_plot_atlantic_profiles.py b/...lery_tests/test_plot_atlantic_profiles.py → ...lery_tests/test_plot_atlantic_profiles.py
diff --git a/.../iris/gallery_tests/test_plot_coriolis.py → docs/gallery_tests/test_plot_coriolis.py b/.../iris/gallery_tests/test_plot_coriolis.py → docs/gallery_tests/test_plot_coriolis.py
diff --git a/.../gallery_tests/test_plot_cross_section.py → .../gallery_tests/test_plot_cross_section.py b/.../gallery_tests/test_plot_cross_section.py → .../gallery_tests/test_plot_cross_section.py
diff --git a/...ery_tests/test_plot_custom_aggregation.py → ...ery_tests/test_plot_custom_aggregation.py b/...ery_tests/test_plot_custom_aggregation.py → ...ery_tests/test_plot_custom_aggregation.py
diff --git a/...ry_tests/test_plot_custom_file_loading.py → ...ry_tests/test_plot_custom_file_loading.py b/...ry_tests/test_plot_custom_file_loading.py → ...ry_tests/test_plot_custom_file_loading.py
diff --git a/...ery_tests/test_plot_deriving_phenomena.py → ...ery_tests/test_plot_deriving_phenomena.py b/...ery_tests/test_plot_deriving_phenomena.py → ...ery_tests/test_plot_deriving_phenomena.py
diff --git a/...ris/gallery_tests/test_plot_global_map.py → docs/gallery_tests/test_plot_global_map.py b/...ris/gallery_tests/test_plot_global_map.py → docs/gallery_tests/test_plot_global_map.py
diff --git a/...iris/gallery_tests/test_plot_hovmoller.py → docs/gallery_tests/test_plot_hovmoller.py b/...iris/gallery_tests/test_plot_hovmoller.py → docs/gallery_tests/test_plot_hovmoller.py
diff --git a/docs/iris/gallery_tests/test_plot_inset.py → docs/gallery_tests/test_plot_inset.py b/docs/iris/gallery_tests/test_plot_inset.py → docs/gallery_tests/test_plot_inset.py
diff --git a/...allery_tests/test_plot_lagged_ensemble.py → ...allery_tests/test_plot_lagged_ensemble.py b/...allery_tests/test_plot_lagged_ensemble.py → ...allery_tests/test_plot_lagged_ensemble.py
diff --git a/...y_tests/test_plot_lineplot_with_legend.py → ...y_tests/test_plot_lineplot_with_legend.py b/...y_tests/test_plot_lineplot_with_legend.py → ...y_tests/test_plot_lineplot_with_legend.py
diff --git a/...iris/gallery_tests/test_plot_load_nemo.py → docs/gallery_tests/test_plot_load_nemo.py b/...iris/gallery_tests/test_plot_load_nemo.py → docs/gallery_tests/test_plot_load_nemo.py
diff --git a/...allery_tests/test_plot_orca_projection.py → ...allery_tests/test_plot_orca_projection.py b/...allery_tests/test_plot_orca_projection.py → ...allery_tests/test_plot_orca_projection.py
diff --git a/...s/gallery_tests/test_plot_polar_stereo.py → docs/gallery_tests/test_plot_polar_stereo.py b/...s/gallery_tests/test_plot_polar_stereo.py → docs/gallery_tests/test_plot_polar_stereo.py
diff --git a/...gallery_tests/test_plot_polynomial_fit.py → ...gallery_tests/test_plot_polynomial_fit.py b/...gallery_tests/test_plot_polynomial_fit.py → ...gallery_tests/test_plot_polynomial_fit.py
diff --git a/.../test_plot_projections_and_annotations.py → .../test_plot_projections_and_annotations.py b/.../test_plot_projections_and_annotations.py → .../test_plot_projections_and_annotations.py
diff --git a/...y_tests/test_plot_rotated_pole_mapping.py → ...y_tests/test_plot_rotated_pole_mapping.py b/...y_tests/test_plot_rotated_pole_mapping.py → ...y_tests/test_plot_rotated_pole_mapping.py
diff --git a/...ris/gallery_tests/test_plot_wind_speed.py → docs/gallery_tests/test_plot_wind_speed.py b/...ris/gallery_tests/test_plot_wind_speed.py → docs/gallery_tests/test_plot_wind_speed.py
diff --git a/.../IEP/IEP0000-what-and-how-to-use-ieps.rst → .../IEP/IEP0000-what-and-how-to-use-ieps.rst b/.../IEP/IEP0000-what-and-how-to-use-ieps.rst → .../IEP/IEP0000-what-and-how-to-use-ieps.rst
diff --git a/...d-how-to-use-ieps/IEP-status-workflow.svg → ...d-how-to-use-ieps/IEP-status-workflow.svg b/...d-how-to-use-ieps/IEP-status-workflow.svg → ...d-how-to-use-ieps/IEP-status-workflow.svg
diff --git a/docs/iris/src/IEP/IEPXXXX-template.rst → docs/src/IEP/IEPXXXX-template.rst b/docs/iris/src/IEP/IEPXXXX-template.rst → docs/src/IEP/IEPXXXX-template.rst
diff --git a/docs/iris/src/IEP/index.rst.tmpl → docs/src/IEP/index.rst.tmpl b/docs/iris/src/IEP/index.rst.tmpl → docs/src/IEP/index.rst.tmpl
diff --git a/docs/iris/src/IEP/legacy/IEP001.adoc → docs/src/IEP/legacy/IEP001.adoc b/docs/iris/src/IEP/legacy/IEP001.adoc → docs/src/IEP/legacy/IEP001.adoc
diff --git a/docs/iris/src/Makefile → docs/src/Makefile b/docs/iris/src/Makefile → docs/src/Makefile
diff --git a/docs/iris/src/_static/Iris7_1_trim_100.png → docs/src/_static/Iris7_1_trim_100.png b/docs/iris/src/_static/Iris7_1_trim_100.png → docs/src/_static/Iris7_1_trim_100.png
diff --git a/docs/iris/src/_static/Iris7_1_trim_full.png → docs/src/_static/Iris7_1_trim_full.png b/docs/iris/src/_static/Iris7_1_trim_full.png → docs/src/_static/Iris7_1_trim_full.png
diff --git a/docs/iris/src/_static/favicon.ico → docs/src/_static/favicon.ico b/docs/iris/src/_static/favicon.ico → docs/src/_static/favicon.ico
diff --git a/docs/iris/src/_static/iris-logo-title.png → docs/src/_static/iris-logo-title.png b/docs/iris/src/_static/iris-logo-title.png → docs/src/_static/iris-logo-title.png
diff --git a/docs/iris/src/_static/iris-logo-title.svg → docs/src/_static/iris-logo-title.svg b/docs/iris/src/_static/iris-logo-title.svg → docs/src/_static/iris-logo-title.svg
diff --git a/docs/iris/src/_static/theme_override.css → docs/src/_static/theme_override.css b/docs/iris/src/_static/theme_override.css → docs/src/_static/theme_override.css
diff --git a/docs/iris/src/_templates/layout.html → docs/src/_templates/layout.html b/docs/iris/src/_templates/layout.html → docs/src/_templates/layout.html
diff --git a/docs/iris/src/common_links.inc → docs/src/common_links.inc b/docs/iris/src/common_links.inc → docs/src/common_links.inc
@@ -42,6 +42,7 @@
 .. _@djkirkham: https://github.com/djkirkham
 .. _@DPeterK: https://github.com/DPeterK
 .. _@esc24: https://github.com/esc24
+.. _@jamesp: https://github.com/jamesp
 .. _@jonseddon: https://github.com/jonseddon
 .. _@jvegasbsc: https://github.com/jvegasbsc
 .. _@lbdreyer: https://github.com/lbdreyer

diff --git a/docs/iris/src/conf.py → docs/src/conf.py b/docs/iris/src/conf.py → docs/src/conf.py
diff --git a/docs/iris/src/copyright.rst → docs/src/copyright.rst b/docs/iris/src/copyright.rst → docs/src/copyright.rst
diff --git a/docs/iris/src/developers_guide/ci_checks.png → docs/src/developers_guide/ci_checks.png b/docs/iris/src/developers_guide/ci_checks.png → docs/src/developers_guide/ci_checks.png
diff --git a/...developers_guide/contributing_changes.rst → ...developers_guide/contributing_changes.rst b/...developers_guide/contributing_changes.rst → ...developers_guide/contributing_changes.rst
diff --git a/...evelopers_guide/contributing_ci_tests.rst → ...evelopers_guide/contributing_ci_tests.rst b/...evelopers_guide/contributing_ci_tests.rst → ...evelopers_guide/contributing_ci_tests.rst
diff --git a/...rs_guide/contributing_code_formatting.rst → ...rs_guide/contributing_code_formatting.rst b/...rs_guide/contributing_code_formatting.rst → ...rs_guide/contributing_code_formatting.rst
diff --git a/...ers_guide/contributing_codebase_index.rst → ...ers_guide/contributing_codebase_index.rst b/...ers_guide/contributing_codebase_index.rst → ...ers_guide/contributing_codebase_index.rst
diff --git a/...opers_guide/contributing_deprecations.rst → ...opers_guide/contributing_deprecations.rst b/...opers_guide/contributing_deprecations.rst → ...opers_guide/contributing_deprecations.rst
diff --git a/...pers_guide/contributing_documentation.rst → ...pers_guide/contributing_documentation.rst b/...pers_guide/contributing_documentation.rst → ...pers_guide/contributing_documentation.rst
@@ -24,7 +24,7 @@ The documentation uses specific packages that need to be present.  Please see
 Building
 ~~~~~~~~
 
-The build can be run from the documentation directory ``iris/docs/iris/src``.
+The build can be run from the documentation directory ``docs/src``.
 
 The build output for the html is found in the ``_build/html`` sub directory.
 When updating the documentation ensure the html build has *no errors* or
@@ -58,8 +58,8 @@ Testing
 ~~~~~~~
 
 There are a ways to test various aspects of the documentation.  The
-``make`` commands shown below can be run in the ``iris/docs/iris`` or
-``iris/docs/iris/src`` directory.
+``make`` commands shown below can be run in the ``docs`` or
+``docs/src`` directory.
 
 Each :ref:`contributing.documentation.gallery` entry has a corresponding test.
 To run the tests::
@@ -107,7 +107,7 @@ or ignore the url.
           ``.readthedocs.yml``.
 
 
-.. _conf.py: https://github.com/SciTools/iris/blob/master/docs/iris/src/conf.py
+.. _conf.py: https://github.com/SciTools/iris/blob/master/docs/src/conf.py
 
 
 .. _contributing.documentation.api:
@@ -117,14 +117,14 @@ Generating API Documentation
 
 In order to auto generate the API documentation based upon the docstrings a
 custom set of python scripts are used, these are located in the directory
-``iris/docs/iris/src/sphinxext``.  Once the ``make html`` command has been run,
+``docs/src/sphinxext``.  Once the ``make html`` command has been run,
 the output of these scripts can be found in
-``iris/docs/iris/src/generated/api``.
+``docs/src/generated/api``.
 
 If there is a particularly troublesome module that breaks the ``make html`` you
 can exclude the module from the API documentation.  Add the entry to the
 ``exclude_modules`` tuple list in the
-``iris/docs/iris/src/sphinxext/generate_package_rst.py`` file.
+``docs/src/sphinxext/generate_package_rst.py`` file.
 
 
 .. _contributing.documentation.gallery:
@@ -137,20 +137,20 @@ The Iris :ref:`sphx_glr_generated_gallery` uses a sphinx extension named
 that auto generates reStructuredText (rst) files based upon a gallery source
 directory that abides directory and filename convention.
 
-The code for the gallery entries are in ``iris/docs/iris/gallery_code``.
+The code for the gallery entries are in ``docs/gallery_code``.
 Each sub directory in this directory is a sub section of the gallery.  The
 respective ``README.rst`` in each folder is included in the gallery output.
 
 For each gallery entry there must be a corresponding test script located in
-``iris/docs/iris/gallery_tests``.
+``docs/gallery_tests``.
 
 To add an entry to the gallery simple place your python code into the
 appropriate sub directory and name it with a prefix of ``plot_``.  If your
 gallery entry does not fit into any existing sub directories then create a new
 directory and place it in there.
 
 The reStructuredText (rst) output of the gallery is located in
-``iris/docs/iris/src/generated/gallery``.
+``docs/src/generated/gallery``.
 
 For more information on the directory structure and options please see the
 `sphinx-gallery getting started

diff --git a/...s_guide/contributing_getting_involved.rst → ...s_guide/contributing_getting_involved.rst b/...s_guide/contributing_getting_involved.rst → ...s_guide/contributing_getting_involved.rst
diff --git a/...ers_guide/contributing_graphics_tests.rst → ...ers_guide/contributing_graphics_tests.rst b/...ers_guide/contributing_graphics_tests.rst → ...ers_guide/contributing_graphics_tests.rst
@@ -15,7 +15,7 @@ At present graphical tests are used in the following areas of Iris:
 * Module ``iris.tests.test_plot``
 * Module ``iris.tests.test_quickplot``
 * :ref:`sphx_glr_generated_gallery` plots contained in
-  ``docs/iris/gallery_tests``.
+  ``docs/gallery_tests``.
 
 
 Challenges

diff --git a/...e/contributing_pull_request_checklist.rst → ...e/contributing_pull_request_checklist.rst b/...e/contributing_pull_request_checklist.rst → ...e/contributing_pull_request_checklist.rst
diff --git a/...pers_guide/contributing_running_tests.rst → ...pers_guide/contributing_running_tests.rst b/...pers_guide/contributing_running_tests.rst → ...pers_guide/contributing_running_tests.rst
diff --git a/...developers_guide/contributing_testing.rst → ...developers_guide/contributing_testing.rst b/...developers_guide/contributing_testing.rst → ...developers_guide/contributing_testing.rst
diff --git a/...pers_guide/contributing_testing_index.rst → ...pers_guide/contributing_testing_index.rst b/...pers_guide/contributing_testing_index.rst → ...pers_guide/contributing_testing_index.rst
diff --git a/.../developers_guide/documenting/__init__.py → .../developers_guide/documenting/__init__.py b/.../developers_guide/documenting/__init__.py → .../developers_guide/documenting/__init__.py
diff --git a/...velopers_guide/documenting/docstrings.rst → ...velopers_guide/documenting/docstrings.rst b/...velopers_guide/documenting/docstrings.rst → ...velopers_guide/documenting/docstrings.rst
diff --git a/...guide/documenting/docstrings_attribute.py → ...guide/documenting/docstrings_attribute.py b/...guide/documenting/docstrings_attribute.py → ...guide/documenting/docstrings_attribute.py
diff --git a/.../documenting/docstrings_sample_routine.py → .../documenting/docstrings_sample_routine.py b/.../documenting/docstrings_sample_routine.py → .../documenting/docstrings_sample_routine.py
diff --git a/...velopers_guide/documenting/rest_guide.rst → ...velopers_guide/documenting/rest_guide.rst b/...velopers_guide/documenting/rest_guide.rst → ...velopers_guide/documenting/rest_guide.rst
diff --git a/...e/documenting/whats_new_contributions.rst → ...e/documenting/whats_new_contributions.rst b/...e/documenting/whats_new_contributions.rst → ...e/documenting/whats_new_contributions.rst
@@ -11,7 +11,7 @@ The contribution should be included as part of the Iris Pull Request that
 introduces the change.
 
 The ``latest.rst`` and the past release notes are kept in
-``docs/iris/src/whatsnew/``. If you are writing the first contribution after
+``docs/src/whatsnew/``. If you are writing the first contribution after
 an Iris release: **create the new** ``latest.rst`` by copying the content from
 ``latest.rst.template`` in the same directory.
 

diff --git a/...iris/src/developers_guide/gitwash/LICENSE → docs/src/developers_guide/gitwash/LICENSE b/...iris/src/developers_guide/gitwash/LICENSE → docs/src/developers_guide/gitwash/LICENSE
diff --git a/...elopers_guide/gitwash/branch_dropdown.png → ...elopers_guide/gitwash/branch_dropdown.png b/...elopers_guide/gitwash/branch_dropdown.png → ...elopers_guide/gitwash/branch_dropdown.png
diff --git a/...evelopers_guide/gitwash/configure_git.rst → ...evelopers_guide/gitwash/configure_git.rst b/...evelopers_guide/gitwash/configure_git.rst → ...evelopers_guide/gitwash/configure_git.rst
diff --git a/...rs_guide/gitwash/development_workflow.rst → ...rs_guide/gitwash/development_workflow.rst b/...rs_guide/gitwash/development_workflow.rst → ...rs_guide/gitwash/development_workflow.rst
diff --git a/.../src/developers_guide/gitwash/forking.rst → .../src/developers_guide/gitwash/forking.rst b/.../src/developers_guide/gitwash/forking.rst → .../src/developers_guide/gitwash/forking.rst
diff --git a/...velopers_guide/gitwash/forking_button.png → ...velopers_guide/gitwash/forking_button.png b/...velopers_guide/gitwash/forking_button.png → ...velopers_guide/gitwash/forking_button.png
diff --git a/...rc/developers_guide/gitwash/git_intro.rst → ...rc/developers_guide/gitwash/git_intro.rst b/...rc/developers_guide/gitwash/git_intro.rst → ...rc/developers_guide/gitwash/git_intro.rst
diff --git a/...rc/developers_guide/gitwash/git_links.inc → ...rc/developers_guide/gitwash/git_links.inc b/...rc/developers_guide/gitwash/git_links.inc → ...rc/developers_guide/gitwash/git_links.inc
diff --git a/...is/src/developers_guide/gitwash/index.rst → docs/src/developers_guide/gitwash/index.rst b/...is/src/developers_guide/gitwash/index.rst → docs/src/developers_guide/gitwash/index.rst
diff --git a/...is/src/developers_guide/gitwash/links.inc → docs/src/developers_guide/gitwash/links.inc b/...is/src/developers_guide/gitwash/links.inc → docs/src/developers_guide/gitwash/links.inc
diff --git a/.../developers_guide/gitwash/pull_button.png → .../developers_guide/gitwash/pull_button.png b/.../developers_guide/gitwash/pull_button.png → .../developers_guide/gitwash/pull_button.png
diff --git a/.../developers_guide/gitwash/set_up_fork.rst → .../developers_guide/gitwash/set_up_fork.rst b/.../developers_guide/gitwash/set_up_fork.rst → .../developers_guide/gitwash/set_up_fork.rst
diff --git a/docs/iris/src/developers_guide/release.rst → docs/src/developers_guide/release.rst b/docs/iris/src/developers_guide/release.rst → docs/src/developers_guide/release.rst
@@ -131,9 +131,9 @@ Release Steps
    release as it should already exist
 #. Update the what's new for the release:
 
-    * Copy ``docs/iris/src/whatsnew/latest.rst`` to a file named
+    * Copy ``docs/src/whatsnew/latest.rst`` to a file named
       ``v1.9.rst``
-    * Delete the ``docs/iris/src/whatsnew/latest.rst`` file so it will not
+    * Delete the ``docs/src/whatsnew/latest.rst`` file so it will not
       cause an issue in the build
     * In ``v1.9.rst`` update the page title (first line of the file) to show
       the date and version in the format of ``v1.9 (DD MMM YYYY)``.  For
@@ -144,7 +144,7 @@ Release Steps
     * Add ``v1.9.rst`` to git and commit all changes, including removal of
       ``latest.rst``
 
-#. Update the what's new index ``docs/iris/src/whatsnew/index.rst``
+#. Update the what's new index ``docs/src/whatsnew/index.rst``
 
    * Temporarily remove reference to ``latest.rst``
    * Add a reference to ``v1.9.rst`` to the top of the list
@@ -164,12 +164,12 @@ Post Release Steps
    available in the pop out menu in the bottom left corner include the new
    release version.  If it is not present you will need to configure the
    versions available in the **admin** dashboard in Read The Docs
-#. Copy ``docs/iris/src/whatsnew/latest.rst.template`` to
-   ``docs/iris/src/whatsnew/latest.rst``.  This will reset
+#. Copy ``docs/src/whatsnew/latest.rst.template`` to
+   ``docs/src/whatsnew/latest.rst``.  This will reset
    the file with the ``unreleased`` heading and placeholders for the what's
    new headings
 #. Add back in the reference to ``latest.rst`` to the what's new index
-   ``docs/iris/src/whatsnew/index.rst``
+   ``docs/src/whatsnew/index.rst``
 #. Update ``Iris.__init__.py`` version string to show as ``1.10.dev0``
 #. Merge back to master
 

diff --git a/docs/iris/src/further_topics/index.rst → docs/src/further_topics/index.rst b/docs/iris/src/further_topics/index.rst → docs/src/further_topics/index.rst
diff --git a/...iris/src/further_topics/lenient_maths.rst → docs/src/further_topics/lenient_maths.rst b/...iris/src/further_topics/lenient_maths.rst → docs/src/further_topics/lenient_maths.rst
diff --git a/...s/src/further_topics/lenient_metadata.rst → docs/src/further_topics/lenient_metadata.rst b/...s/src/further_topics/lenient_metadata.rst → docs/src/further_topics/lenient_metadata.rst
diff --git a/docs/iris/src/further_topics/metadata.rst → docs/src/further_topics/metadata.rst b/docs/iris/src/further_topics/metadata.rst → docs/src/further_topics/metadata.rst
diff --git a/docs/iris/src/index.rst → docs/src/index.rst b/docs/iris/src/index.rst → docs/src/index.rst
diff --git a/docs/iris/src/installing.rst → docs/src/installing.rst b/docs/iris/src/installing.rst → docs/src/installing.rst
diff --git a/docs/iris/src/spelling_allow.txt → docs/src/spelling_allow.txt b/docs/iris/src/spelling_allow.txt → docs/src/spelling_allow.txt
diff --git a/docs/iris/src/sphinxext/build_iep_index.py → docs/src/sphinxext/build_iep_index.py b/docs/iris/src/sphinxext/build_iep_index.py → docs/src/sphinxext/build_iep_index.py
diff --git a/...ris/src/sphinxext/custom_class_autodoc.py → docs/src/sphinxext/custom_class_autodoc.py b/...ris/src/sphinxext/custom_class_autodoc.py → docs/src/sphinxext/custom_class_autodoc.py
diff --git a/...iris/src/sphinxext/custom_data_autodoc.py → docs/src/sphinxext/custom_data_autodoc.py b/...iris/src/sphinxext/custom_data_autodoc.py → docs/src/sphinxext/custom_data_autodoc.py
diff --git a/...ris/src/sphinxext/generate_package_rst.py → docs/src/sphinxext/generate_package_rst.py b/...ris/src/sphinxext/generate_package_rst.py → docs/src/sphinxext/generate_package_rst.py
diff --git a/...iris/src/techpapers/change_management.rst → docs/src/techpapers/change_management.rst b/...iris/src/techpapers/change_management.rst → docs/src/techpapers/change_management.rst
diff --git a/docs/iris/src/techpapers/index.rst → docs/src/techpapers/index.rst b/docs/iris/src/techpapers/index.rst → docs/src/techpapers/index.rst
diff --git a/.../src/techpapers/missing_data_handling.rst → .../src/techpapers/missing_data_handling.rst b/.../src/techpapers/missing_data_handling.rst → .../src/techpapers/missing_data_handling.rst
diff --git a/.../iris/src/techpapers/um_files_loading.rst → docs/src/techpapers/um_files_loading.rst b/.../iris/src/techpapers/um_files_loading.rst → docs/src/techpapers/um_files_loading.rst
diff --git a/...src/userguide/change_management_goals.txt → ...src/userguide/change_management_goals.txt b/...src/userguide/change_management_goals.txt → ...src/userguide/change_management_goals.txt
diff --git a/docs/iris/src/userguide/citation.rst → docs/src/userguide/citation.rst b/docs/iris/src/userguide/citation.rst → docs/src/userguide/citation.rst
diff --git a/docs/iris/src/userguide/code_maintenance.rst → docs/src/userguide/code_maintenance.rst b/docs/iris/src/userguide/code_maintenance.rst → docs/src/userguide/code_maintenance.rst
diff --git a/docs/iris/src/userguide/concat.png → docs/src/userguide/concat.png b/docs/iris/src/userguide/concat.png → docs/src/userguide/concat.png
diff --git a/docs/iris/src/userguide/concat.svg → docs/src/userguide/concat.svg b/docs/iris/src/userguide/concat.svg → docs/src/userguide/concat.svg
diff --git a/docs/iris/src/userguide/cube_diagram.dia → docs/src/userguide/cube_diagram.dia b/docs/iris/src/userguide/cube_diagram.dia → docs/src/userguide/cube_diagram.dia
diff --git a/docs/iris/src/userguide/cube_diagram.png → docs/src/userguide/cube_diagram.png b/docs/iris/src/userguide/cube_diagram.png → docs/src/userguide/cube_diagram.png
diff --git a/docs/iris/src/userguide/cube_maths.rst → docs/src/userguide/cube_maths.rst b/docs/iris/src/userguide/cube_maths.rst → docs/src/userguide/cube_maths.rst
diff --git a/docs/iris/src/userguide/cube_statistics.rst → docs/src/userguide/cube_statistics.rst b/docs/iris/src/userguide/cube_statistics.rst → docs/src/userguide/cube_statistics.rst
diff --git a/docs/iris/src/userguide/index.rst → docs/src/userguide/index.rst b/docs/iris/src/userguide/index.rst → docs/src/userguide/index.rst
diff --git a/...serguide/interpolation_and_regridding.rst → ...serguide/interpolation_and_regridding.rst b/...serguide/interpolation_and_regridding.rst → ...serguide/interpolation_and_regridding.rst
diff --git a/docs/iris/src/userguide/iris_cubes.rst → docs/src/userguide/iris_cubes.rst b/docs/iris/src/userguide/iris_cubes.rst → docs/src/userguide/iris_cubes.rst
diff --git a/...iris/src/userguide/loading_iris_cubes.rst → docs/src/userguide/loading_iris_cubes.rst b/...iris/src/userguide/loading_iris_cubes.rst → docs/src/userguide/loading_iris_cubes.rst
diff --git a/docs/iris/src/userguide/merge.png → docs/src/userguide/merge.png b/docs/iris/src/userguide/merge.png → docs/src/userguide/merge.png
diff --git a/docs/iris/src/userguide/merge.svg → docs/src/userguide/merge.svg b/docs/iris/src/userguide/merge.svg → docs/src/userguide/merge.svg
diff --git a/docs/iris/src/userguide/merge_and_concat.png → docs/src/userguide/merge_and_concat.png b/docs/iris/src/userguide/merge_and_concat.png → docs/src/userguide/merge_and_concat.png
diff --git a/docs/iris/src/userguide/merge_and_concat.rst → docs/src/userguide/merge_and_concat.rst b/docs/iris/src/userguide/merge_and_concat.rst → docs/src/userguide/merge_and_concat.rst
diff --git a/docs/iris/src/userguide/merge_and_concat.svg → docs/src/userguide/merge_and_concat.svg b/docs/iris/src/userguide/merge_and_concat.svg → docs/src/userguide/merge_and_concat.svg
diff --git a/docs/iris/src/userguide/multi_array.png → docs/src/userguide/multi_array.png b/docs/iris/src/userguide/multi_array.png → docs/src/userguide/multi_array.png
diff --git a/docs/iris/src/userguide/multi_array.svg → docs/src/userguide/multi_array.svg b/docs/iris/src/userguide/multi_array.svg → docs/src/userguide/multi_array.svg
diff --git a/...ris/src/userguide/multi_array_to_cube.png → docs/src/userguide/multi_array_to_cube.png b/...ris/src/userguide/multi_array_to_cube.png → docs/src/userguide/multi_array_to_cube.png
diff --git a/...ris/src/userguide/multi_array_to_cube.svg → docs/src/userguide/multi_array_to_cube.svg b/...ris/src/userguide/multi_array_to_cube.svg → docs/src/userguide/multi_array_to_cube.svg
diff --git a/.../iris/src/userguide/navigating_a_cube.rst → docs/src/userguide/navigating_a_cube.rst b/.../iris/src/userguide/navigating_a_cube.rst → docs/src/userguide/navigating_a_cube.rst
diff --git a/docs/iris/src/userguide/plotting_a_cube.rst → docs/src/userguide/plotting_a_cube.rst b/docs/iris/src/userguide/plotting_a_cube.rst → docs/src/userguide/plotting_a_cube.rst
diff --git a/.../plotting_examples/1d_quickplot_simple.py → .../plotting_examples/1d_quickplot_simple.py b/.../plotting_examples/1d_quickplot_simple.py → .../plotting_examples/1d_quickplot_simple.py
diff --git a/.../userguide/plotting_examples/1d_simple.py → .../userguide/plotting_examples/1d_simple.py b/.../userguide/plotting_examples/1d_simple.py → .../userguide/plotting_examples/1d_simple.py
diff --git a/...guide/plotting_examples/1d_with_legend.py → ...guide/plotting_examples/1d_with_legend.py b/...guide/plotting_examples/1d_with_legend.py → ...guide/plotting_examples/1d_with_legend.py
diff --git a/...src/userguide/plotting_examples/brewer.py → ...src/userguide/plotting_examples/brewer.py b/...src/userguide/plotting_examples/brewer.py → ...src/userguide/plotting_examples/brewer.py
diff --git a/...guide/plotting_examples/cube_blockplot.py → ...guide/plotting_examples/cube_blockplot.py b/...guide/plotting_examples/cube_blockplot.py → ...guide/plotting_examples/cube_blockplot.py
diff --git a/...ing_examples/cube_brewer_cite_contourf.py → ...ing_examples/cube_brewer_cite_contourf.py b/...ing_examples/cube_brewer_cite_contourf.py → ...ing_examples/cube_brewer_cite_contourf.py
diff --git a/...plotting_examples/cube_brewer_contourf.py → ...plotting_examples/cube_brewer_contourf.py b/...plotting_examples/cube_brewer_contourf.py → ...plotting_examples/cube_brewer_contourf.py
diff --git a/...erguide/plotting_examples/cube_contour.py → ...erguide/plotting_examples/cube_contour.py b/...erguide/plotting_examples/cube_contour.py → ...erguide/plotting_examples/cube_contour.py
diff --git a/...rguide/plotting_examples/cube_contourf.py → ...rguide/plotting_examples/cube_contourf.py b/...rguide/plotting_examples/cube_contourf.py → ...rguide/plotting_examples/cube_contourf.py
diff --git a/...iris/src/userguide/real_and_lazy_data.rst → docs/src/userguide/real_and_lazy_data.rst b/...iris/src/userguide/real_and_lazy_data.rst → docs/src/userguide/real_and_lazy_data.rst
diff --git a/...de/regridding_plots/interpolate_column.py → ...de/regridding_plots/interpolate_column.py b/...de/regridding_plots/interpolate_column.py → ...de/regridding_plots/interpolate_column.py
diff --git a/...e/regridding_plots/regridded_to_global.py → ...e/regridding_plots/regridded_to_global.py b/...e/regridding_plots/regridded_to_global.py → ...e/regridding_plots/regridded_to_global.py
diff --git a/...lots/regridded_to_global_area_weighted.py → ...lots/regridded_to_global_area_weighted.py b/...lots/regridded_to_global_area_weighted.py → ...lots/regridded_to_global_area_weighted.py
diff --git a/.../regridding_plots/regridded_to_rotated.py → .../regridding_plots/regridded_to_rotated.py b/.../regridding_plots/regridded_to_rotated.py → .../regridding_plots/regridded_to_rotated.py
diff --git a/...guide/regridding_plots/regridding_plot.py → ...guide/regridding_plots/regridding_plot.py b/...guide/regridding_plots/regridding_plot.py → ...guide/regridding_plots/regridding_plot.py
diff --git a/.../iris/src/userguide/saving_iris_cubes.rst → docs/src/userguide/saving_iris_cubes.rst b/.../iris/src/userguide/saving_iris_cubes.rst → docs/src/userguide/saving_iris_cubes.rst
diff --git a/.../iris/src/userguide/subsetting_a_cube.rst → docs/src/userguide/subsetting_a_cube.rst b/.../iris/src/userguide/subsetting_a_cube.rst → docs/src/userguide/subsetting_a_cube.rst
diff --git a/docs/iris/src/whatsnew/1.0.rst → docs/src/whatsnew/1.0.rst b/docs/iris/src/whatsnew/1.0.rst → docs/src/whatsnew/1.0.rst
diff --git a/docs/iris/src/whatsnew/1.1.rst → docs/src/whatsnew/1.1.rst b/docs/iris/src/whatsnew/1.1.rst → docs/src/whatsnew/1.1.rst
diff --git a/docs/iris/src/whatsnew/1.10.rst → docs/src/whatsnew/1.10.rst b/docs/iris/src/whatsnew/1.10.rst → docs/src/whatsnew/1.10.rst
diff --git a/docs/iris/src/whatsnew/1.11.rst → docs/src/whatsnew/1.11.rst b/docs/iris/src/whatsnew/1.11.rst → docs/src/whatsnew/1.11.rst
diff --git a/docs/iris/src/whatsnew/1.12.rst → docs/src/whatsnew/1.12.rst b/docs/iris/src/whatsnew/1.12.rst → docs/src/whatsnew/1.12.rst
diff --git a/docs/iris/src/whatsnew/1.13.rst → docs/src/whatsnew/1.13.rst b/docs/iris/src/whatsnew/1.13.rst → docs/src/whatsnew/1.13.rst
diff --git a/docs/iris/src/whatsnew/1.2.rst → docs/src/whatsnew/1.2.rst b/docs/iris/src/whatsnew/1.2.rst → docs/src/whatsnew/1.2.rst
diff --git a/docs/iris/src/whatsnew/1.3.rst → docs/src/whatsnew/1.3.rst b/docs/iris/src/whatsnew/1.3.rst → docs/src/whatsnew/1.3.rst
diff --git a/docs/iris/src/whatsnew/1.4.rst → docs/src/whatsnew/1.4.rst b/docs/iris/src/whatsnew/1.4.rst → docs/src/whatsnew/1.4.rst
diff --git a/docs/iris/src/whatsnew/1.5.rst → docs/src/whatsnew/1.5.rst b/docs/iris/src/whatsnew/1.5.rst → docs/src/whatsnew/1.5.rst
diff --git a/docs/iris/src/whatsnew/1.6.rst → docs/src/whatsnew/1.6.rst b/docs/iris/src/whatsnew/1.6.rst → docs/src/whatsnew/1.6.rst
diff --git a/docs/iris/src/whatsnew/1.7.rst → docs/src/whatsnew/1.7.rst b/docs/iris/src/whatsnew/1.7.rst → docs/src/whatsnew/1.7.rst
diff --git a/docs/iris/src/whatsnew/1.8.rst → docs/src/whatsnew/1.8.rst b/docs/iris/src/whatsnew/1.8.rst → docs/src/whatsnew/1.8.rst
diff --git a/docs/iris/src/whatsnew/1.9.rst → docs/src/whatsnew/1.9.rst b/docs/iris/src/whatsnew/1.9.rst → docs/src/whatsnew/1.9.rst
diff --git a/docs/iris/src/whatsnew/2.0.rst → docs/src/whatsnew/2.0.rst b/docs/iris/src/whatsnew/2.0.rst → docs/src/whatsnew/2.0.rst
diff --git a/docs/iris/src/whatsnew/2.1.rst → docs/src/whatsnew/2.1.rst b/docs/iris/src/whatsnew/2.1.rst → docs/src/whatsnew/2.1.rst
diff --git a/docs/iris/src/whatsnew/2.2.rst → docs/src/whatsnew/2.2.rst b/docs/iris/src/whatsnew/2.2.rst → docs/src/whatsnew/2.2.rst
diff --git a/docs/iris/src/whatsnew/2.3.rst → docs/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst → docs/src/whatsnew/2.3.rst
@@ -238,7 +238,7 @@ Documentation
 =============
 
 * Adopted a
-  `new colour logo for Iris <https://github.com/SciTools/iris/blob/master/docs/iris/src/_static/Iris7_1_trim_100.png>`_
+  `new colour logo for Iris <https://github.com/SciTools/iris/blob/master/docs/src/_static/Iris7_1_trim_100.png>`_
 
 * Added a gallery example showing how to concatenate NEMO ocean model data,
   see :ref:`sphx_glr_generated_gallery_oceanography_plot_load_nemo.py`.

diff --git a/docs/iris/src/whatsnew/2.4.rst → docs/src/whatsnew/2.4.rst b/docs/iris/src/whatsnew/2.4.rst → docs/src/whatsnew/2.4.rst
diff --git a/docs/iris/src/whatsnew/3.0.1.rst → docs/src/whatsnew/3.0.1.rst b/docs/iris/src/whatsnew/3.0.1.rst → docs/src/whatsnew/3.0.1.rst
diff --git a/docs/iris/src/whatsnew/3.0.rst → docs/src/whatsnew/3.0.rst b/docs/iris/src/whatsnew/3.0.rst → docs/src/whatsnew/3.0.rst
diff --git a/...ris/src/whatsnew/images/notebook_repr.png → docs/src/whatsnew/images/notebook_repr.png b/...ris/src/whatsnew/images/notebook_repr.png → docs/src/whatsnew/images/notebook_repr.png
diff --git a/...s/src/whatsnew/images/transverse_merc.png → docs/src/whatsnew/images/transverse_merc.png b/...s/src/whatsnew/images/transverse_merc.png → docs/src/whatsnew/images/transverse_merc.png
diff --git a/docs/iris/src/whatsnew/index.rst → docs/src/whatsnew/index.rst b/docs/iris/src/whatsnew/index.rst → docs/src/whatsnew/index.rst
diff --git a/docs/iris/src/whatsnew/latest.rst → docs/src/whatsnew/latest.rst b/docs/iris/src/whatsnew/latest.rst → docs/src/whatsnew/latest.rst
@@ -25,14 +25,15 @@ This document explains the changes made to Iris for this release
 📢 Announcements
 ================
 
-#. N/A
+#. Congratulations to `@jamesp`_ who recently became an Iris core developer
+   after joining the Iris development team at the `Met Office`_. 🎉
 
 
 ✨ Features
 ===========
 
-#. `@pelson`_ and `@trexfeathers`_ enhanced :meth:iris.plot.plot and
-   :meth:iris.quickplot.plot to automatically place the cube on the x axis if
+#. `@pelson`_ and `@trexfeathers`_ enhanced :meth:`iris.plot.plot` and
+   :meth:`iris.quickplot.plot` to automatically place the cube on the x axis if
    the primary coordinate being plotted against is a vertical coordinate. E.g.
    ``iris.plot.plot(z_cube)`` will produce a z-vs-phenomenon plot, where before
    it would have produced a phenomenon-vs-z plot. (:pull:`3906`)
@@ -69,19 +70,27 @@ This document explains the changes made to Iris for this release
 📚 Documentation
 ================
 
-#. `@rcomer`_ updated the "Seasonal ensemble model plots" Gallery example. (:pull:`3933`)
+#. `@rcomer`_ updated the "Seasonal ensemble model plots" Gallery example.
+   (:pull:`3933`)
 
-#. `@MHBalsmeier`_ described non-conda installation on Debian-based distros. (:pull:`3958`)
+#. `@MHBalsmeier`_ described non-conda installation on Debian-based distros.
+   (:pull:`3958`)
 
-#. `@bjlittle`_ clarified in the doc-string that :class:`~iris.coords.Coord` is now an `abstract base class`_ of
-   coordinates since ``v3.0.0``, and it is **not** possible to create an instance of it. (:pull:`3971`)
+#. `@bjlittle`_ clarified in the doc-string that :class:`~iris.coords.Coord`
+   is now an `abstract base class`_ of coordinates since Iris ``3.0.0``, and
+   it is **not** possible to create an instance of it. (:pull:`3971`)
 
 
 💼 Internal
 ===========
 
 #. `@rcomer`_ removed an old unused test file. (:pull:`3913`)
 
+#. `@tkknight`_ moved the ``docs/iris`` directory to be in the parent
+   directory ``docs``.  (:pull:`3975`)
+
+#. `@jamesp`_ updated a test to the latest numpy version (:pull:`3977`)
+
 
 .. comment
     Whatsnew author names (@github name) in alphabetical order. Note that,
@@ -96,3 +105,4 @@ This document explains the changes made to Iris for this release
 
 .. _abstract base class: https://docs.python.org/3/library/abc.html
 .. _GitHub: https://github.com/SciTools/iris/issues/new/choose
+.. _Met Office: https://www.metoffice.gov.uk/
diff --git a/docs/iris/src/whatsnew/latest.rst.template → docs/src/whatsnew/latest.rst.template b/docs/iris/src/whatsnew/latest.rst.template → docs/src/whatsnew/latest.rst.template
diff --git a/lib/iris/tests/test_basic_maths.py b/lib/iris/tests/test_basic_maths.py
@@ -853,7 +853,7 @@ def setUp(self):
 
     def test_incompatible_dimensions(self):
         data3 = ma.MaskedArray(
-            [[3, 3, 3, 4], [2, 2, 2]], mask=[[0, 1, 0, 0], [0, 1, 1]]
+            [[3, 3, 3, 4], [2, 2, 2, 2]], mask=[[0, 1, 0, 0], [0, 1, 1, 1]]
         )
         with self.assertRaises(ValueError):
             # Incompatible dimensions.

diff --git a/lib/iris/tests/test_coding_standards.py b/lib/iris/tests/test_coding_standards.py
@@ -105,12 +105,11 @@ def test_license_headers(self):
             "noxfile.py",
             "build/*",
             "dist/*",
-            "docs/iris/gallery_code/*/*.py",
-            "docs/iris/src/developers_guide/documenting/*.py",
-            "docs/iris/src/userguide/plotting_examples/*.py",
-            "docs/iris/src/userguide/regridding_plots/*.py",
-            "docs/iris/src/developers_guide/gitwash_dumper.py",
-            "docs/iris/src/_build/*",
+            "docs/gallery_code/*/*.py",
+            "docs/src/developers_guide/documenting/*.py",
+            "docs/src/userguide/plotting_examples/*.py",
+            "docs/src/userguide/regridding_plots/*.py",
+            "docs/src/_build/*",
             "lib/iris/analysis/_scipy_interpolate.py",
             "lib/iris/fileformats/_pyke_rules/*",
         )

diff --git a/noxfile.py b/noxfile.py
@@ -250,7 +250,7 @@ def doctest(session):
 
     cache_cartopy(session)
     session.install("--no-deps", "--editable", ".")
-    session.cd("docs/iris")
+    session.cd("docs")
     session.run(
         "make",
         "clean",
@@ -298,7 +298,7 @@ def linkcheck(session):
 
     cache_cartopy(session)
     session.install("--no-deps", "--editable", ".")
-    session.cd("docs/iris")
+    session.cd("docs")
     session.run(
         "make",
         "clean",