Skip to content

Commit 79b9f6d

Browse files
author
tp
committed
Added changes according to comments
1 parent aee6a29 commit 79b9f6d

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

doc/source/indexing.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1773,7 +1773,7 @@ Evaluation order matters
17731773

17741774
Furthermore, in chained expressions, the order may determine whether a copy is returned or not.
17751775
If an expression will set values on a copy of a slice, then a ``SettingWithCopy``
1776-
exception will be raised.
1776+
warning will be issued.
17771777

17781778
You can control the action of a chained assignment via the option ``mode.chained_assignment``,
17791779
which can take the values ``['raise','warn',None]``, where showing a warning is the default.

doc/source/io.rst

-4
Original file line numberDiff line numberDiff line change
@@ -3851,11 +3851,7 @@ create a new table!)
38513851
Iterator
38523852
++++++++
38533853

3854-
<<<<<<< HEAD
38553854
You can pass ``iterator=True`` or ``chunksize=number_in_a_chunk``
3856-
=======
3857-
Note that you can pass ``iterator=True`` or ``chunksize=number_in_a_chunk``
3858-
>>>>>>> Cleaned references to versions <0.12 in docs
38593855
to ``select`` and ``select_as_multiple`` to return an iterator on the results.
38603856
The default is 50,000 rows returned in a chunk.
38613857

0 commit comments

Comments
 (0)