Skip to content

DOC: fix options table #18730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 11, 2017
+2 −2
Merged

DOC: fix options table #18730

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d85987
DOC: fix options table
jorisvandenbossche Dec 11, 2017
6c963a5
additional fix
jorisvandenbossche Dec 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/source/computation.rst
View file
Original file line number Diff line number Diff line change
@@ -340,7 +340,7 @@ The following methods are available:

The weights used in the window are specified by the ``win_type`` keyword.
The list of recognized types are the `scipy.signal window functions
<https://docs.scipy.org/doc/scipy/reference/signal.html#window-functions>`__:
<https://docs.scipy.org/doc/scipy/reference/signal.html#window-functions>`__:

- ``boxcar``
- ``triang``
2 changes: 1 addition & 1 deletion doc/source/options.rst
View file
Original file line number Diff line number Diff line change
@@ -433,7 +433,7 @@ compute.use_numexpr True Use the numexpr library to
computation if it is installed.
plotting.matplotlib.register_converters True Register custom converters with
matplotlib. Set to False to de-register.
======================================= ============ ========================================
======================================= ============ ==================================


.. _basics.console_output: