Skip to content

Commit 4b2b6a8

Browse files
committed
Docstring fixes.
1 parent 73c666e commit 4b2b6a8

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

lib/iris/util.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2340,9 +2340,9 @@ def combine_cubes(
23402340
A list of cubes to combine.
23412341
23422342
options : str or dict, optional
2343-
Name of a CombineOptions "setting", or a dictionary of settings options, as
2344-
described for :class:`~iris.CombineOptions`.
2345-
Defaults to :meth:`iris.LOAD_POLICY.settings`.
2343+
Name of one of the :class:`iris.CombineOptions.SETTINGS`, or a dictionary of
2344+
settings options, as described for :class:`~iris.CombineOptions`.
2345+
Defaults to the current state of :data:`iris.LOAD_POLICY`.
23462346
23472347
kwargs : dict
23482348
Individual option setting values. These take precedence over those defined by
@@ -2353,8 +2353,8 @@ def combine_cubes(
23532353
:class:`~iris.cube.CubeList`
23542354
23552355
.. Note::
2356-
The ``support_multiple_references`` keyword/property has **no** effect on
2357-
:func:`_combine_cubes` : this only acts during load operations.
2356+
The ``support_multiple_references`` keyword/property has *no* effect on
2357+
:func:`combine_cubes` : this only acts during load operations.
23582358
23592359
Examples
23602360
--------

0 commit comments

Comments
 (0)