Merge pull request #5090 from SciTools/v3.4.x

Merge-back `v3.4.x` to `main`
SciTools · Dec 1, 2022 · 7e15882 · 7e15882
2 parents aa2bfa9 + d9c0743
commit 7e15882
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/docs/src/conf.py b/docs/src/conf.py
@@ -364,6 +364,8 @@ def _dotv(version):
     "http://www.esrl.noaa.gov/psd/data/gridded/conventions/cdc_netcdf_standard.shtml",
     "http://www.nationalarchives.gov.uk/doc/open-government-licence",
     "https://www.metoffice.gov.uk/",
+    # TODO: try removing this again in future - was raising an SSLError.
+    "http://www.ecmwf.int/",
 ]
 
 # list of sources to exclude from the build.

diff --git a/docs/src/whatsnew/3.4.rst b/docs/src/whatsnew/3.4.rst
@@ -1,7 +1,7 @@
 .. include:: ../common_links.inc
 
-v3.4 (17 Nov 2022) [release candidate]
-**************************************
+v3.4 (01 Dec 2022)
+******************
 
 This document explains the changes made to Iris for this release
 (:doc:`View all changes <index>`.)