Skip to content

Commit 46cc309

Browse files
author
Christopher C. Aycock
committed
Update documentation
1 parent f01142c commit 46cc309

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

doc/source/whatsnew/v0.19.2.txt

+12
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,15 @@ Bug Fixes
7171

7272

7373
- Explicit check in ``to_stata`` and ``StataWriter`` for out-of-range values when writing doubles (:issue:`14618`)
74+
75+
76+
77+
78+
.. _whatsnew_0192.enhancements.other:
79+
80+
Other enhancements
81+
^^^^^^^^^^^^^^^^^^
82+
83+
- ``pd.merge_asof()`` can take multiple columns in ``by`` parameter and has specialized types (:issue:`13936`)
84+
85+

pandas/tools/merge.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ def merge_asof(left, right, on=None,
271271
DataFrame whose 'on' key is less than or equal to the left's key. Both
272272
DataFrames must be sorted by the key.
273273
274-
Optionally perform group-wise merge. This searches for the nearest match
275-
on the 'on' key within the same group according to 'by'.
274+
Optionally match on equivalent keys with 'by' before searching for nearest
275+
match with 'on'.
276276
277277
.. versionadded:: 0.19.0
278278
@@ -289,9 +289,8 @@ def merge_asof(left, right, on=None,
289289
Field name to join on in left DataFrame.
290290
right_on : label
291291
Field name to join on in right DataFrame.
292-
by : column name
293-
Group both the left and right DataFrames by the group column; perform
294-
the merge operation on these pieces and recombine.
292+
by : column name or list of column names
293+
Match on these columns before performing merge operation.
295294
suffixes : 2-length sequence (tuple, list, ...)
296295
Suffix to apply to overlapping column names in the left and right
297296
side, respectively

0 commit comments

Comments
 (0)