nhsavage
diff --git a/‎.cirrus.yml
+4-4 b/‎.cirrus.yml
+4-4
diff --git a/‎.flake8
+1-1 b/‎.flake8
+1-1
diff --git a/‎.gitignore
+3-3 b/‎.gitignore
+3-3
diff --git a/‎.readthedocs.yml
+1-1 b/‎.readthedocs.yml
+1-1
diff --git a/‎CHANGES
+1-1 b/‎CHANGES
+1-1
diff --git a/‎MANIFEST.in
+1-1 b/‎MANIFEST.in
+1-1
diff --git a/‎README.md
+1-1 b/‎README.md
+1-1
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/‎docs/iris/gallery_code/general/plot_SOI_filtering.py ‎docs/gallery_code/general/plot_SOI_filtering.py b/‎docs/iris/gallery_code/general/plot_SOI_filtering.py ‎docs/gallery_code/general/plot_SOI_filtering.py
diff --git a/‎docs/iris/gallery_code/general/plot_anomaly_log_colouring.py ‎docs/gallery_code/general/plot_anomaly_log_colouring.py b/‎docs/iris/gallery_code/general/plot_anomaly_log_colouring.py ‎docs/gallery_code/general/plot_anomaly_log_colouring.py
diff --git a/‎docs/iris/gallery_code/general/plot_coriolis.py ‎docs/gallery_code/general/plot_coriolis.py b/‎docs/iris/gallery_code/general/plot_coriolis.py ‎docs/gallery_code/general/plot_coriolis.py
diff --git a/‎docs/iris/gallery_code/general/plot_cross_section.py ‎docs/gallery_code/general/plot_cross_section.py b/‎docs/iris/gallery_code/general/plot_cross_section.py ‎docs/gallery_code/general/plot_cross_section.py
diff --git a/‎docs/iris/gallery_code/general/plot_custom_aggregation.py ‎docs/gallery_code/general/plot_custom_aggregation.py b/‎docs/iris/gallery_code/general/plot_custom_aggregation.py ‎docs/gallery_code/general/plot_custom_aggregation.py
diff --git a/‎docs/iris/gallery_code/general/plot_custom_file_loading.py ‎docs/gallery_code/general/plot_custom_file_loading.py b/‎docs/iris/gallery_code/general/plot_custom_file_loading.py ‎docs/gallery_code/general/plot_custom_file_loading.py
diff --git a/‎docs/iris/gallery_code/general/plot_global_map.py ‎docs/gallery_code/general/plot_global_map.py b/‎docs/iris/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/‎docs/iris/gallery_code/general/plot_lineplot_with_legend.py ‎docs/gallery_code/general/plot_lineplot_with_legend.py b/‎docs/iris/gallery_code/general/plot_lineplot_with_legend.py ‎docs/gallery_code/general/plot_lineplot_with_legend.py
diff --git a/‎docs/iris/gallery_code/general/plot_polar_stereo.py ‎docs/gallery_code/general/plot_polar_stereo.py b/‎docs/iris/gallery_code/general/plot_polar_stereo.py ‎docs/gallery_code/general/plot_polar_stereo.py
diff --git a/‎docs/iris/gallery_code/general/plot_polynomial_fit.py ‎docs/gallery_code/general/plot_polynomial_fit.py b/‎docs/iris/gallery_code/general/plot_polynomial_fit.py ‎docs/gallery_code/general/plot_polynomial_fit.py
diff --git a/‎docs/iris/gallery_code/general/plot_projections_and_annotations.py ‎docs/gallery_code/general/plot_projections_and_annotations.py b/‎docs/iris/gallery_code/general/plot_projections_and_annotations.py ‎docs/gallery_code/general/plot_projections_and_annotations.py
diff --git a/‎docs/iris/gallery_code/general/plot_rotated_pole_mapping.py ‎docs/gallery_code/general/plot_rotated_pole_mapping.py b/‎docs/iris/gallery_code/general/plot_rotated_pole_mapping.py ‎docs/gallery_code/general/plot_rotated_pole_mapping.py
diff --git a/‎docs/iris/gallery_code/meteorology/README.rst ‎docs/gallery_code/meteorology/README.rst b/‎docs/iris/gallery_code/meteorology/README.rst ‎docs/gallery_code/meteorology/README.rst
diff --git a/‎docs/iris/gallery_code/meteorology/plot_COP_1d.py ‎docs/gallery_code/meteorology/plot_COP_1d.py b/‎docs/iris/gallery_code/meteorology/plot_COP_1d.py ‎docs/gallery_code/meteorology/plot_COP_1d.py
diff --git a/‎docs/iris/gallery_code/meteorology/plot_COP_maps.py ‎docs/gallery_code/meteorology/plot_COP_maps.py b/‎docs/iris/gallery_code/meteorology/plot_COP_maps.py ‎docs/gallery_code/meteorology/plot_COP_maps.py
diff --git a/‎docs/iris/gallery_code/meteorology/plot_TEC.py ‎docs/gallery_code/meteorology/plot_TEC.py b/‎docs/iris/gallery_code/meteorology/plot_TEC.py ‎docs/gallery_code/meteorology/plot_TEC.py
diff --git a/‎docs/iris/gallery_code/meteorology/plot_deriving_phenomena.py ‎docs/gallery_code/meteorology/plot_deriving_phenomena.py b/‎docs/iris/gallery_code/meteorology/plot_deriving_phenomena.py ‎docs/gallery_code/meteorology/plot_deriving_phenomena.py
diff --git a/‎docs/iris/gallery_code/meteorology/plot_hovmoller.py ‎docs/gallery_code/meteorology/plot_hovmoller.py b/‎docs/iris/gallery_code/meteorology/plot_hovmoller.py ‎docs/gallery_code/meteorology/plot_hovmoller.py
diff --git a/‎docs/iris/gallery_code/meteorology/plot_lagged_ensemble.py ‎docs/gallery_code/meteorology/plot_lagged_ensemble.py b/‎docs/iris/gallery_code/meteorology/plot_lagged_ensemble.py ‎docs/gallery_code/meteorology/plot_lagged_ensemble.py
diff --git a/‎docs/iris/gallery_code/meteorology/plot_wind_speed.py ‎docs/gallery_code/meteorology/plot_wind_speed.py b/‎docs/iris/gallery_code/meteorology/plot_wind_speed.py ‎docs/gallery_code/meteorology/plot_wind_speed.py
diff --git a/‎docs/iris/gallery_code/oceanography/README.rst ‎docs/gallery_code/oceanography/README.rst b/‎docs/iris/gallery_code/oceanography/README.rst ‎docs/gallery_code/oceanography/README.rst
diff --git a/‎docs/iris/gallery_code/oceanography/plot_atlantic_profiles.py ‎docs/gallery_code/oceanography/plot_atlantic_profiles.py b/‎docs/iris/gallery_code/oceanography/plot_atlantic_profiles.py ‎docs/gallery_code/oceanography/plot_atlantic_profiles.py
diff --git a/‎docs/iris/gallery_code/oceanography/plot_load_nemo.py ‎docs/gallery_code/oceanography/plot_load_nemo.py b/‎docs/iris/gallery_code/oceanography/plot_load_nemo.py ‎docs/gallery_code/oceanography/plot_load_nemo.py
diff --git a/‎docs/iris/gallery_code/oceanography/plot_orca_projection.py ‎docs/gallery_code/oceanography/plot_orca_projection.py b/‎docs/iris/gallery_code/oceanography/plot_orca_projection.py ‎docs/gallery_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/‎docs/iris/gallery_tests/test_plot_COP_maps.py ‎docs/gallery_tests/test_plot_COP_maps.py b/‎docs/iris/gallery_tests/test_plot_COP_maps.py ‎docs/gallery_tests/test_plot_COP_maps.py
diff --git a/‎docs/iris/gallery_tests/test_plot_SOI_filtering.py ‎docs/gallery_tests/test_plot_SOI_filtering.py b/‎docs/iris/gallery_tests/test_plot_SOI_filtering.py ‎docs/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/‎docs/iris/gallery_tests/test_plot_anomaly_log_colouring.py ‎docs/gallery_tests/test_plot_anomaly_log_colouring.py b/‎docs/iris/gallery_tests/test_plot_anomaly_log_colouring.py ‎docs/gallery_tests/test_plot_anomaly_log_colouring.py
diff --git a/‎docs/iris/gallery_tests/test_plot_atlantic_profiles.py ‎docs/gallery_tests/test_plot_atlantic_profiles.py b/‎docs/iris/gallery_tests/test_plot_atlantic_profiles.py ‎docs/gallery_tests/test_plot_atlantic_profiles.py
diff --git a/‎docs/iris/gallery_tests/test_plot_coriolis.py ‎docs/gallery_tests/test_plot_coriolis.py b/‎docs/iris/gallery_tests/test_plot_coriolis.py ‎docs/gallery_tests/test_plot_coriolis.py
diff --git a/‎docs/iris/gallery_tests/test_plot_cross_section.py ‎docs/gallery_tests/test_plot_cross_section.py b/‎docs/iris/gallery_tests/test_plot_cross_section.py ‎docs/gallery_tests/test_plot_cross_section.py
diff --git a/‎docs/iris/gallery_tests/test_plot_custom_aggregation.py ‎docs/gallery_tests/test_plot_custom_aggregation.py b/‎docs/iris/gallery_tests/test_plot_custom_aggregation.py ‎docs/gallery_tests/test_plot_custom_aggregation.py
diff --git a/‎docs/iris/gallery_tests/test_plot_custom_file_loading.py ‎docs/gallery_tests/test_plot_custom_file_loading.py b/‎docs/iris/gallery_tests/test_plot_custom_file_loading.py ‎docs/gallery_tests/test_plot_custom_file_loading.py
diff --git a/‎docs/iris/gallery_tests/test_plot_deriving_phenomena.py ‎docs/gallery_tests/test_plot_deriving_phenomena.py b/‎docs/iris/gallery_tests/test_plot_deriving_phenomena.py ‎docs/gallery_tests/test_plot_deriving_phenomena.py
diff --git a/‎docs/iris/gallery_tests/test_plot_global_map.py ‎docs/gallery_tests/test_plot_global_map.py b/‎docs/iris/gallery_tests/test_plot_global_map.py ‎docs/gallery_tests/test_plot_global_map.py
diff --git a/‎docs/iris/gallery_tests/test_plot_hovmoller.py ‎docs/gallery_tests/test_plot_hovmoller.py b/‎docs/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/‎docs/iris/gallery_tests/test_plot_lagged_ensemble.py ‎docs/gallery_tests/test_plot_lagged_ensemble.py b/‎docs/iris/gallery_tests/test_plot_lagged_ensemble.py ‎docs/gallery_tests/test_plot_lagged_ensemble.py
diff --git a/‎docs/iris/gallery_tests/test_plot_lineplot_with_legend.py ‎docs/gallery_tests/test_plot_lineplot_with_legend.py b/‎docs/iris/gallery_tests/test_plot_lineplot_with_legend.py ‎docs/gallery_tests/test_plot_lineplot_with_legend.py
diff --git a/‎docs/iris/gallery_tests/test_plot_load_nemo.py ‎docs/gallery_tests/test_plot_load_nemo.py b/‎docs/iris/gallery_tests/test_plot_load_nemo.py ‎docs/gallery_tests/test_plot_load_nemo.py
diff --git a/‎docs/iris/gallery_tests/test_plot_orca_projection.py ‎docs/gallery_tests/test_plot_orca_projection.py b/‎docs/iris/gallery_tests/test_plot_orca_projection.py ‎docs/gallery_tests/test_plot_orca_projection.py
diff --git a/‎docs/iris/gallery_tests/test_plot_polar_stereo.py ‎docs/gallery_tests/test_plot_polar_stereo.py b/‎docs/iris/gallery_tests/test_plot_polar_stereo.py ‎docs/gallery_tests/test_plot_polar_stereo.py
diff --git a/‎docs/iris/gallery_tests/test_plot_polynomial_fit.py ‎docs/gallery_tests/test_plot_polynomial_fit.py b/‎docs/iris/gallery_tests/test_plot_polynomial_fit.py ‎docs/gallery_tests/test_plot_polynomial_fit.py
diff --git a/‎docs/iris/gallery_tests/test_plot_projections_and_annotations.py ‎docs/gallery_tests/test_plot_projections_and_annotations.py b/‎docs/iris/gallery_tests/test_plot_projections_and_annotations.py ‎docs/gallery_tests/test_plot_projections_and_annotations.py
diff --git a/‎docs/iris/gallery_tests/test_plot_rotated_pole_mapping.py ‎docs/gallery_tests/test_plot_rotated_pole_mapping.py b/‎docs/iris/gallery_tests/test_plot_rotated_pole_mapping.py ‎docs/gallery_tests/test_plot_rotated_pole_mapping.py
diff --git a/‎docs/iris/gallery_tests/test_plot_wind_speed.py ‎docs/gallery_tests/test_plot_wind_speed.py b/‎docs/iris/gallery_tests/test_plot_wind_speed.py ‎docs/gallery_tests/test_plot_wind_speed.py
diff --git a/‎docs/iris/src/IEP/IEP001.adoc ‎docs/src/IEP/IEP001.adoc b/‎docs/iris/src/IEP/IEP001.adoc ‎docs/src/IEP/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
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/‎docs/iris/src/developers_guide/contributing_changes.rst ‎docs/src/developers_guide/contributing_changes.rst b/‎docs/iris/src/developers_guide/contributing_changes.rst ‎docs/src/developers_guide/contributing_changes.rst
diff --git a/‎docs/iris/src/developers_guide/contributing_ci_tests.rst ‎docs/src/developers_guide/contributing_ci_tests.rst b/‎docs/iris/src/developers_guide/contributing_ci_tests.rst ‎docs/src/developers_guide/contributing_ci_tests.rst
diff --git a/‎docs/iris/src/developers_guide/contributing_code_formatting.rst ‎docs/src/developers_guide/contributing_code_formatting.rst b/‎docs/iris/src/developers_guide/contributing_code_formatting.rst ‎docs/src/developers_guide/contributing_code_formatting.rst
diff --git a/‎docs/iris/src/developers_guide/contributing_codebase_index.rst ‎docs/src/developers_guide/contributing_codebase_index.rst b/‎docs/iris/src/developers_guide/contributing_codebase_index.rst ‎docs/src/developers_guide/contributing_codebase_index.rst
diff --git a/‎docs/iris/src/developers_guide/contributing_deprecations.rst ‎docs/src/developers_guide/contributing_deprecations.rst b/‎docs/iris/src/developers_guide/contributing_deprecations.rst ‎docs/src/developers_guide/contributing_deprecations.rst
diff --git a/‎docs/iris/src/developers_guide/contributing_documentation.rst ‎docs/src/developers_guide/contributing_documentation.rst
+10-10 b/‎docs/iris/src/developers_guide/contributing_documentation.rst ‎docs/src/developers_guide/contributing_documentation.rst
+10-10
diff --git a/‎docs/iris/src/developers_guide/contributing_getting_involved.rst ‎docs/src/developers_guide/contributing_getting_involved.rst b/‎docs/iris/src/developers_guide/contributing_getting_involved.rst ‎docs/src/developers_guide/contributing_getting_involved.rst
diff --git a/‎docs/iris/src/developers_guide/contributing_graphics_tests.rst ‎docs/src/developers_guide/contributing_graphics_tests.rst
+1-1 b/‎docs/iris/src/developers_guide/contributing_graphics_tests.rst ‎docs/src/developers_guide/contributing_graphics_tests.rst
+1-1
diff --git a/‎docs/iris/src/developers_guide/contributing_pull_request_checklist.rst ‎docs/src/developers_guide/contributing_pull_request_checklist.rst b/‎docs/iris/src/developers_guide/contributing_pull_request_checklist.rst ‎docs/src/developers_guide/contributing_pull_request_checklist.rst
diff --git a/‎docs/iris/src/developers_guide/contributing_running_tests.rst ‎docs/src/developers_guide/contributing_running_tests.rst b/‎docs/iris/src/developers_guide/contributing_running_tests.rst ‎docs/src/developers_guide/contributing_running_tests.rst
diff --git a/‎docs/iris/src/developers_guide/contributing_testing.rst ‎docs/src/developers_guide/contributing_testing.rst b/‎docs/iris/src/developers_guide/contributing_testing.rst ‎docs/src/developers_guide/contributing_testing.rst
diff --git a/‎docs/iris/src/developers_guide/contributing_testing_index.rst ‎docs/src/developers_guide/contributing_testing_index.rst b/‎docs/iris/src/developers_guide/contributing_testing_index.rst ‎docs/src/developers_guide/contributing_testing_index.rst
diff --git a/‎docs/iris/src/developers_guide/documenting/__init__.py ‎docs/src/developers_guide/documenting/__init__.py b/‎docs/iris/src/developers_guide/documenting/__init__.py ‎docs/src/developers_guide/documenting/__init__.py
diff --git a/‎docs/iris/src/developers_guide/documenting/docstrings.rst ‎docs/src/developers_guide/documenting/docstrings.rst b/‎docs/iris/src/developers_guide/documenting/docstrings.rst ‎docs/src/developers_guide/documenting/docstrings.rst
diff --git a/‎docs/iris/src/developers_guide/documenting/docstrings_attribute.py ‎docs/src/developers_guide/documenting/docstrings_attribute.py b/‎docs/iris/src/developers_guide/documenting/docstrings_attribute.py ‎docs/src/developers_guide/documenting/docstrings_attribute.py
diff --git a/‎docs/iris/src/developers_guide/documenting/docstrings_sample_routine.py ‎docs/src/developers_guide/documenting/docstrings_sample_routine.py b/‎docs/iris/src/developers_guide/documenting/docstrings_sample_routine.py ‎docs/src/developers_guide/documenting/docstrings_sample_routine.py
diff --git a/‎docs/iris/src/developers_guide/documenting/rest_guide.rst ‎docs/src/developers_guide/documenting/rest_guide.rst b/‎docs/iris/src/developers_guide/documenting/rest_guide.rst ‎docs/src/developers_guide/documenting/rest_guide.rst
diff --git a/‎docs/iris/src/developers_guide/documenting/whats_new_contributions.rst ‎docs/src/developers_guide/documenting/whats_new_contributions.rst
+1-1 b/‎docs/iris/src/developers_guide/documenting/whats_new_contributions.rst ‎docs/src/developers_guide/documenting/whats_new_contributions.rst
+1-1
diff --git a/‎docs/iris/src/developers_guide/gitwash/LICENSE ‎docs/src/developers_guide/gitwash/LICENSE b/‎docs/iris/src/developers_guide/gitwash/LICENSE ‎docs/src/developers_guide/gitwash/LICENSE
diff --git a/‎docs/iris/src/developers_guide/gitwash/branch_dropdown.png ‎docs/src/developers_guide/gitwash/branch_dropdown.png b/‎docs/iris/src/developers_guide/gitwash/branch_dropdown.png ‎docs/src/developers_guide/gitwash/branch_dropdown.png
diff --git a/‎docs/iris/src/developers_guide/gitwash/configure_git.rst ‎docs/src/developers_guide/gitwash/configure_git.rst b/‎docs/iris/src/developers_guide/gitwash/configure_git.rst ‎docs/src/developers_guide/gitwash/configure_git.rst
diff --git a/‎docs/iris/src/developers_guide/gitwash/development_workflow.rst ‎docs/src/developers_guide/gitwash/development_workflow.rst b/‎docs/iris/src/developers_guide/gitwash/development_workflow.rst ‎docs/src/developers_guide/gitwash/development_workflow.rst
diff --git a/‎docs/iris/src/developers_guide/gitwash/forking.rst ‎docs/src/developers_guide/gitwash/forking.rst b/‎docs/iris/src/developers_guide/gitwash/forking.rst ‎docs/src/developers_guide/gitwash/forking.rst
diff --git a/‎docs/iris/src/developers_guide/gitwash/forking_button.png ‎docs/src/developers_guide/gitwash/forking_button.png b/‎docs/iris/src/developers_guide/gitwash/forking_button.png ‎docs/src/developers_guide/gitwash/forking_button.png
diff --git a/‎docs/iris/src/developers_guide/gitwash/git_intro.rst ‎docs/src/developers_guide/gitwash/git_intro.rst b/‎docs/iris/src/developers_guide/gitwash/git_intro.rst ‎docs/src/developers_guide/gitwash/git_intro.rst
diff --git a/‎docs/iris/src/developers_guide/gitwash/git_links.inc ‎docs/src/developers_guide/gitwash/git_links.inc b/‎docs/iris/src/developers_guide/gitwash/git_links.inc ‎docs/src/developers_guide/gitwash/git_links.inc
diff --git a/‎docs/iris/src/developers_guide/gitwash/index.rst ‎docs/src/developers_guide/gitwash/index.rst b/‎docs/iris/src/developers_guide/gitwash/index.rst ‎docs/src/developers_guide/gitwash/index.rst
diff --git a/‎docs/iris/src/developers_guide/gitwash/links.inc ‎docs/src/developers_guide/gitwash/links.inc b/‎docs/iris/src/developers_guide/gitwash/links.inc ‎docs/src/developers_guide/gitwash/links.inc
diff --git a/‎docs/iris/src/developers_guide/gitwash/pull_button.png ‎docs/src/developers_guide/gitwash/pull_button.png b/‎docs/iris/src/developers_guide/gitwash/pull_button.png ‎docs/src/developers_guide/gitwash/pull_button.png
diff --git a/‎docs/iris/src/developers_guide/gitwash/set_up_fork.rst ‎docs/src/developers_guide/gitwash/set_up_fork.rst b/‎docs/iris/src/developers_guide/gitwash/set_up_fork.rst ‎docs/src/developers_guide/gitwash/set_up_fork.rst
diff --git a/‎docs/iris/src/developers_guide/release.rst ‎docs/src/developers_guide/release.rst
+6-6 b/‎docs/iris/src/developers_guide/release.rst ‎docs/src/developers_guide/release.rst
+6-6
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/‎docs/iris/src/further_topics/lenient_maths.rst ‎docs/src/further_topics/lenient_maths.rst b/‎docs/iris/src/further_topics/lenient_maths.rst ‎docs/src/further_topics/lenient_maths.rst
diff --git a/‎docs/iris/src/further_topics/lenient_metadata.rst ‎docs/src/further_topics/lenient_metadata.rst b/‎docs/iris/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/custom_class_autodoc.py ‎docs/src/sphinxext/custom_class_autodoc.py b/‎docs/iris/src/sphinxext/custom_class_autodoc.py ‎docs/src/sphinxext/custom_class_autodoc.py
diff --git a/‎docs/iris/src/sphinxext/custom_data_autodoc.py ‎docs/src/sphinxext/custom_data_autodoc.py b/‎docs/iris/src/sphinxext/custom_data_autodoc.py ‎docs/src/sphinxext/custom_data_autodoc.py
diff --git a/‎docs/iris/src/sphinxext/generate_package_rst.py ‎docs/src/sphinxext/generate_package_rst.py b/‎docs/iris/src/sphinxext/generate_package_rst.py ‎docs/src/sphinxext/generate_package_rst.py
diff --git a/‎docs/iris/src/techpapers/change_management.rst ‎docs/src/techpapers/change_management.rst b/‎docs/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/‎docs/iris/src/techpapers/missing_data_handling.rst ‎docs/src/techpapers/missing_data_handling.rst b/‎docs/iris/src/techpapers/missing_data_handling.rst ‎docs/src/techpapers/missing_data_handling.rst
diff --git a/‎docs/iris/src/techpapers/um_files_loading.rst ‎docs/src/techpapers/um_files_loading.rst b/‎docs/iris/src/techpapers/um_files_loading.rst ‎docs/src/techpapers/um_files_loading.rst
diff --git a/‎docs/iris/src/userguide/change_management_goals.txt ‎docs/src/userguide/change_management_goals.txt b/‎docs/iris/src/userguide/change_management_goals.txt ‎docs/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/‎docs/iris/src/userguide/interpolation_and_regridding.rst ‎docs/src/userguide/interpolation_and_regridding.rst b/‎docs/iris/src/userguide/interpolation_and_regridding.rst ‎docs/src/userguide/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/‎docs/iris/src/userguide/loading_iris_cubes.rst ‎docs/src/userguide/loading_iris_cubes.rst b/‎docs/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/‎docs/iris/src/userguide/multi_array_to_cube.png ‎docs/src/userguide/multi_array_to_cube.png b/‎docs/iris/src/userguide/multi_array_to_cube.png ‎docs/src/userguide/multi_array_to_cube.png
diff --git a/‎docs/iris/src/userguide/multi_array_to_cube.svg ‎docs/src/userguide/multi_array_to_cube.svg b/‎docs/iris/src/userguide/multi_array_to_cube.svg ‎docs/src/userguide/multi_array_to_cube.svg
diff --git a/‎docs/iris/src/userguide/navigating_a_cube.rst ‎docs/src/userguide/navigating_a_cube.rst b/‎docs/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/‎docs/iris/src/userguide/plotting_examples/1d_quickplot_simple.py ‎docs/src/userguide/plotting_examples/1d_quickplot_simple.py b/‎docs/iris/src/userguide/plotting_examples/1d_quickplot_simple.py ‎docs/src/userguide/plotting_examples/1d_quickplot_simple.py
diff --git a/‎docs/iris/src/userguide/plotting_examples/1d_simple.py ‎docs/src/userguide/plotting_examples/1d_simple.py b/‎docs/iris/src/userguide/plotting_examples/1d_simple.py ‎docs/src/userguide/plotting_examples/1d_simple.py
diff --git a/‎docs/iris/src/userguide/plotting_examples/1d_with_legend.py ‎docs/src/userguide/plotting_examples/1d_with_legend.py b/‎docs/iris/src/userguide/plotting_examples/1d_with_legend.py ‎docs/src/userguide/plotting_examples/1d_with_legend.py
diff --git a/‎docs/iris/src/userguide/plotting_examples/brewer.py ‎docs/src/userguide/plotting_examples/brewer.py b/‎docs/iris/src/userguide/plotting_examples/brewer.py ‎docs/src/userguide/plotting_examples/brewer.py
diff --git a/‎docs/iris/src/userguide/plotting_examples/cube_blockplot.py ‎docs/src/userguide/plotting_examples/cube_blockplot.py b/‎docs/iris/src/userguide/plotting_examples/cube_blockplot.py ‎docs/src/userguide/plotting_examples/cube_blockplot.py
diff --git a/‎docs/iris/src/userguide/plotting_examples/cube_brewer_cite_contourf.py ‎docs/src/userguide/plotting_examples/cube_brewer_cite_contourf.py b/‎docs/iris/src/userguide/plotting_examples/cube_brewer_cite_contourf.py ‎docs/src/userguide/plotting_examples/cube_brewer_cite_contourf.py
diff --git a/‎docs/iris/src/userguide/plotting_examples/cube_brewer_contourf.py ‎docs/src/userguide/plotting_examples/cube_brewer_contourf.py b/‎docs/iris/src/userguide/plotting_examples/cube_brewer_contourf.py ‎docs/src/userguide/plotting_examples/cube_brewer_contourf.py
diff --git a/‎docs/iris/src/userguide/plotting_examples/cube_contour.py ‎docs/src/userguide/plotting_examples/cube_contour.py b/‎docs/iris/src/userguide/plotting_examples/cube_contour.py ‎docs/src/userguide/plotting_examples/cube_contour.py
diff --git a/‎docs/iris/src/userguide/plotting_examples/cube_contourf.py ‎docs/src/userguide/plotting_examples/cube_contourf.py b/‎docs/iris/src/userguide/plotting_examples/cube_contourf.py ‎docs/src/userguide/plotting_examples/cube_contourf.py
diff --git a/‎docs/iris/src/userguide/real_and_lazy_data.rst ‎docs/src/userguide/real_and_lazy_data.rst b/‎docs/iris/src/userguide/real_and_lazy_data.rst ‎docs/src/userguide/real_and_lazy_data.rst
diff --git a/‎docs/iris/src/userguide/regridding_plots/interpolate_column.py ‎docs/src/userguide/regridding_plots/interpolate_column.py b/‎docs/iris/src/userguide/regridding_plots/interpolate_column.py ‎docs/src/userguide/regridding_plots/interpolate_column.py
diff --git a/‎docs/iris/src/userguide/regridding_plots/regridded_to_global.py ‎docs/src/userguide/regridding_plots/regridded_to_global.py b/‎docs/iris/src/userguide/regridding_plots/regridded_to_global.py ‎docs/src/userguide/regridding_plots/regridded_to_global.py
diff --git a/‎docs/iris/src/userguide/regridding_plots/regridded_to_global_area_weighted.py ‎docs/src/userguide/regridding_plots/regridded_to_global_area_weighted.py b/‎docs/iris/src/userguide/regridding_plots/regridded_to_global_area_weighted.py ‎docs/src/userguide/regridding_plots/regridded_to_global_area_weighted.py
diff --git a/‎docs/iris/src/userguide/regridding_plots/regridded_to_rotated.py ‎docs/src/userguide/regridding_plots/regridded_to_rotated.py b/‎docs/iris/src/userguide/regridding_plots/regridded_to_rotated.py ‎docs/src/userguide/regridding_plots/regridded_to_rotated.py
diff --git a/‎docs/iris/src/userguide/regridding_plots/regridding_plot.py ‎docs/src/userguide/regridding_plots/regridding_plot.py b/‎docs/iris/src/userguide/regridding_plots/regridding_plot.py ‎docs/src/userguide/regridding_plots/regridding_plot.py
diff --git a/‎docs/iris/src/userguide/saving_iris_cubes.rst ‎docs/src/userguide/saving_iris_cubes.rst b/‎docs/iris/src/userguide/saving_iris_cubes.rst ‎docs/src/userguide/saving_iris_cubes.rst
diff --git a/‎docs/iris/src/userguide/subsetting_a_cube.rst ‎docs/src/userguide/subsetting_a_cube.rst b/‎docs/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
+1-1 b/‎docs/iris/src/whatsnew/2.3.rst ‎docs/src/whatsnew/2.3.rst
+1-1
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/‎docs/iris/src/whatsnew/images/notebook_repr.png ‎docs/src/whatsnew/images/notebook_repr.png b/‎docs/iris/src/whatsnew/images/notebook_repr.png ‎docs/src/whatsnew/images/notebook_repr.png
diff --git a/‎docs/iris/src/whatsnew/images/transverse_merc.png ‎docs/src/whatsnew/images/transverse_merc.png b/‎docs/iris/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
+11-4 b/‎docs/iris/src/whatsnew/latest.rst ‎docs/src/whatsnew/latest.rst
+11-4
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_coding_standards.py
+5-6 b/‎lib/iris/tests/test_coding_standards.py
+5-6
diff --git a/‎noxfile.py
+2-2 b/‎noxfile.py
+2-2
@@ -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}
 
@@ -30,7 +30,7 @@ exclude =
     .eggs,
     build,
     compiled_krb,
-    docs/iris/src/sphinxext/*,
+    docs/src/sphinxext/*,
     tools/*,
     #
     # ignore auto-generated files
 
@@ -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
 *~
 
@@ -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:
 
@@ -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)
 
@@ -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
 
@@ -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/*",
         )
 
@@ -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",
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ exclude =`
`30`	`30`	`.eggs,`
`31`	`31`	`build,`
`32`	`32`	`compiled_krb,`
`33`		`- docs/iris/src/sphinxext/*,`
	`33`	`+ docs/src/sphinxext/*,`
`34`	`34`	`tools/*,`
`35`	`35`	`#`
`36`	`36`	`# ignore auto-generated files`