Skip to content

Commit 7185dd4

Browse files
Keep original gotchas label for references
1 parent c9e41cc commit 7185dd4

File tree

7 files changed

+11
-16
lines changed

7 files changed

+11
-16
lines changed

doc/source/10min.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -810,4 +810,4 @@ If you are trying an operation and you see an exception like:
810810
811811
See :ref:`Comparisons<basics.compare>` for an explanation and what to do.
812812

813-
See :ref:`FAQ<faq>` as well.
813+
See :ref:`Gotchas<gotchas>` as well.

doc/source/basics.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ To evaluate single-element pandas objects in a boolean context, use the method
313313
314314
ValueError: The truth value of an array is ambiguous. Use a.empty, a.any() or a.all().
315315
316-
See :ref:`FAQ<faq.truth>` for a more detailed discussion.
316+
See :ref:`gotchas<gotchas.truth>` for a more detailed discussion.
317317

318318
.. _basics.equals:
319319

@@ -1889,7 +1889,7 @@ gotchas
18891889

18901890
Performing selection operations on ``integer`` type data can easily upcast the data to ``floating``.
18911891
The dtype of the input data will be preserved in cases where ``nans`` are not introduced (starting in 0.11.0)
1892-
See also :ref:`Support for integer ``NA`` <faq.intna>`
1892+
See also :ref:`Support for integer ``NA`` <gotchas.intna>`
18931893

18941894
.. ipython:: python
18951895

doc/source/gotchas.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. currentmodule:: pandas
2-
.. _faq:
2+
.. _gotchas:
33

44
********************************
55
Frequently Asked Questions (FAQ)
@@ -88,7 +88,7 @@ representation; i.e., 1KB = 1024 bytes).
8888

8989
See also :ref:`Categorical Memory Usage <categorical.memory>`.
9090

91-
.. _faq.truth:
91+
.. _gotchas.truth:
9292

9393
Using If/Truth Statements with pandas
9494
-------------------------------------
@@ -208,7 +208,7 @@ detect NA values.
208208
However, it comes with it a couple of trade-offs which I most certainly have
209209
not ignored.
210210

211-
.. _faq.intna:
211+
.. _gotchas.intna:
212212

213213
Support for integer ``NA``
214214
~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -308,7 +308,7 @@ where the data copying occurs.
308308
See `this link <http://stackoverflow.com/questions/13592618/python-pandas-dataframe-thread-safe>`__
309309
for more information.
310310

311-
.. _faq.html:
311+
.. _gotchas.html:
312312

313313
HTML Table Parsing
314314
------------------

doc/source/install.rst

+1-6
Original file line numberDiff line numberDiff line change
@@ -294,16 +294,12 @@ Optional Dependencies
294294
`lxml`_ or `html5lib`_ or both.
295295
:func:`~pandas.read_html` will **not** work with *only*
296296
`BeautifulSoup4`_ installed.
297-
* You are highly encouraged to read :ref:`HTML Table Parsing <faq.html>`.
297+
* You are highly encouraged to read :ref:`HTML Table Parsing gotchas <gotchas.html>`.
298298
It explains issues surrounding the installation and
299299
usage of the above three libraries.
300-
Additionally, if you're using `Anaconda`_ you should definitely
301-
read.
302300
* You may need to install an older version of `BeautifulSoup4`_:
303301
Versions 4.2.1, 4.1.3 and 4.0.2 have been confirmed for 64 and 32-bit
304302
Ubuntu/Debian
305-
* Additionally, if you're using `Anaconda`_ you should definitely
306-
read :ref:`the gotchas about HTML parsing libraries <html-gotchas>`
307303

308304
.. note::
309305

@@ -320,7 +316,6 @@ Optional Dependencies
320316
.. _html5lib: https://github.com/html5lib/html5lib-python
321317
.. _BeautifulSoup4: http://www.crummy.com/software/BeautifulSoup
322318
.. _lxml: http://lxml.de
323-
.. _Anaconda: https://store.continuum.io/cshop/anaconda
324319

325320
.. note::
326321

doc/source/io.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -2043,7 +2043,7 @@ Reading HTML Content
20432043

20442044
.. warning::
20452045

2046-
We **highly encourage** you to read the :ref:`HTML Table Parsing<faq.html>`
2046+
We **highly encourage** you to read the :ref:`HTML Table Parsing gotchas<gotchas.html>`
20472047
regarding the issues surrounding the BeautifulSoup4/html5lib/lxml parsers.
20482048

20492049
.. versionadded:: 0.12.0

doc/source/whatsnew/v0.13.0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ API changes
111111

112112
- Infer and downcast dtype if ``downcast='infer'`` is passed to ``fillna/ffill/bfill`` (:issue:`4604`)
113113
- ``__nonzero__`` for all NDFrame objects, will now raise a ``ValueError``, this reverts back to (:issue:`1073`, :issue:`4633`)
114-
behavior. See :ref:`FAQ<faq.truth>` for a more detailed discussion.
114+
behavior. See :ref:`gotchas<gotchas.truth>` for a more detailed discussion.
115115

116116
This prevents doing boolean comparison on *entire* pandas objects, which is inherently ambiguous. These all will raise a ``ValueError``.
117117

doc/source/whatsnew/v0.15.0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ a transparent change with only very limited API implications (:issue:`5080`, :is
864864

865865
- you may need to unpickle pandas version < 0.15.0 pickles using ``pd.read_pickle`` rather than ``pickle.load``. See :ref:`pickle docs <io.pickle>`
866866
- when plotting with a ``PeriodIndex``, the matplotlib internal axes will now be arrays of ``Period`` rather than a ``PeriodIndex`` (this is similar to how a ``DatetimeIndex`` passes arrays of ``datetimes`` now)
867-
- MultiIndexes will now raise similary to other pandas objects w.r.t. truth testing, see :ref:`here <faq.truth>` (:issue:`7897`).
867+
- MultiIndexes will now raise similary to other pandas objects w.r.t. truth testing, see :ref:`here <gotchas.truth>` (:issue:`7897`).
868868
- When plotting a DatetimeIndex directly with matplotlib's `plot` function,
869869
the axis labels will no longer be formatted as dates but as integers (the
870870
internal representation of a ``datetime64``). **UPDATE** This is fixed

0 commit comments

Comments
 (0)