Skip to content

Commit c6a557b

Browse files
committed
Tighten up language
1 parent 7dbdd4a commit c6a557b

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

doc/user-guide/combining.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ expensive if you are manipulating your dataset lazily using :ref:`dask`.
7979

8080
.. note::
8181

82-
The default values for many of these options will be changing in a future
83-
version of xarray. You can opt into the new default values early using
82+
In a future version of xarray the default values for many of these options
83+
will change. You can opt into the new default values early using
8484
``xr.set_options(use_new_combine_kwarg_defaults=True)``.
8585

8686
.. _merge:
@@ -104,11 +104,11 @@ coordinates:
104104

105105
.. note::
106106

107-
The default value for ``join`` and ``compat`` will be changing in a future
108-
version of xarray. This change will mean that the resulting dataset will be
109-
not be aligned. You can opt into the new default values early using
110-
``xr.set_options(use_new_combine_kwarg_defaults=True)``. Or explicitly set
111-
``join='outer'`` to preserve old behavior.
107+
In a future version of xarray the default value for ``join`` and ``compat``
108+
will change. This change will mean that xarray will no longer attempt
109+
to align the indices of the merged dataset. You can opt into the new default
110+
values early using ``xr.set_options(use_new_combine_kwarg_defaults=True)``.
111+
Or explicitly set ``join='outer'`` to preserve old behavior.
112112

113113
.. ipython:: python
114114
@@ -132,9 +132,9 @@ if you attempt to merge two variables with the same name but different values:
132132

133133
.. note::
134134

135-
In the future the default value for ``compat`` will change from
136-
``compat='no_conflicts'`` to ``compat='override'``. In this scenario the
137-
values in the first object override all the values in other objects.
135+
In a future version of xarray the default value for ``compat`` will change
136+
from ``compat='no_conflicts'`` to ``compat='override'``. In this scenario
137+
the values in the first object override all the values in other objects.
138138

139139
.. ipython:: python
140140

0 commit comments

Comments
 (0)