Skip to content

Commit

Permalink
Fix spelling (#3903)
Browse files Browse the repository at this point in the history
  • Loading branch information
tkknight authored Oct 5, 2020
1 parent 1b59ffe commit a9c1e79
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions docs/iris/src/further_topics/lenient_metadata.rst
Original file line number Diff line number Diff line change
Expand Up @@ -335,10 +335,10 @@ Lenient combination

The behaviour of the lenient ``combine`` metadata class method is outlined
in :numref:`lenient combine table`, and as with :ref:`lenient equality` and
:ref:`lenient difference` is enabled throught the ``lenient`` keyword argument.
:ref:`lenient difference` is enabled through the ``lenient`` keyword argument.

The difference in behaviour between **lenient** and
:ref:`strict combination <strict combine table>` is centered around the lenient
:ref:`strict combination <strict combine table>` is centred around the lenient
handling of combining **something** with **nothing** (``None``) to return
**something**. Whereas strict
combination will only return a result from combining identical objects.
Expand Down
2 changes: 1 addition & 1 deletion docs/iris/src/whatsnew/3.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ This document explains the changes made to Iris for this release
* We've finally dropped support for ``Python 2``, so welcome to ``Iris 3``
and ``Python 3``!
* We've extended our coverage of the `CF Conventions and Metadata`_ by
introducting support for `CF Ancillary Data`_ and `Quality Flags`_,
introducing support for `CF Ancillary Data`_ and `Quality Flags`_,
* Lazy regridding is now available for several regridding schemes,
* Managing and manipulating metadata within Iris is now easier and more
consistent thanks to the introduction of a new common metadata API,
Expand Down

0 comments on commit a9c1e79

Please sign in to comment.