Merge branch 'main' into varlen_str_type

SciTools · Mar 3, 2025 · f094cba · f094cba
2 parents 252fa63 + 9f83a9a
commit f094cba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/docs/src/whatsnew/latest.rst b/docs/src/whatsnew/latest.rst
@@ -119,7 +119,10 @@ This document explains the changes made to Iris for this release
 
 #. `@ESadek-MO`_ and `@trexfeathers`_ created a style guide for ``pytest`` tests,
    and consolidated ``Test Categories`` and ``Testing Tools`` into
-   :ref:`contributing_tests` (:issue:`5574`, :pull:`5785`)
+   :ref:`contributing_tests`. (:issue:`5574`, :pull:`5785`)
+
+#. `@jfrost-mo`_ corrected ``unit`` to ``units`` in the docstring for
+   :class:`iris.coords.AuxCoord`. (:issue:`6347`, :pull:`6348`)
 
 
 💼 Internal
@@ -151,6 +154,7 @@ This document explains the changes made to Iris for this release
     core dev names are automatically included by the common_links.inc:
 
 .. _@fnattino: https://github.com/fnattino
+.. _@jfrost-mo: https://github.com/jfrost-mo
 .. _@jrackham-mo: https://github.com/jrackham-mo
 .. _@stefsmeets: https://github.com/stefsmeets
 .. _@valeriupredoi: https://github.com/valeriupredoi

diff --git a/lib/iris/coords.py b/lib/iris/coords.py
@@ -2956,7 +2956,7 @@ def __init__(self, *args, **kwargs):
             Descriptive name of the coordinate.
         var_name : optional
             The netCDF variable name for the coordinate.
-        unit : :class:`~cf_units.Unit`, optional
+        units : :class:`~cf_units.Unit`, optional
             The :class:`~cf_units.Unit` of the coordinate's values.
             Can be a string, which will be converted to a Unit object.
         bounds : optional