summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2018-04-20 12:31:31 -0600
committerGitHub <noreply@github.com>2018-04-20 12:31:31 -0600
commit67b9a768a7e6f373bbba02df302622773559ca4b (patch)
treefa52e4c8346e5232b76013fe0f69a8a3dd973ff9 /doc/source
parentde62ef91ff92a5118cee9c1aa236eb672cc96c84 (diff)
parent953fbda6c22af1ea0269ed533265268b805e324c (diff)
downloadnumpy-67b9a768a7e6f373bbba02df302622773559ca4b.tar.gz
Merge pull request #10921 from mattip/percentile-graph
DOC: clear up warnings, fix matplotlib plot
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/conf.py2
-rw-r--r--doc/source/user/quickstart.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 9e1d1a142..fd8a8e551 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -215,7 +215,7 @@ texinfo_documents = [
intersphinx_mapping = {
'python': ('https://docs.python.org/dev', None),
'scipy': ('https://docs.scipy.org/doc/scipy/reference', None),
- 'matplotlib': ('http://matplotlib.org', None)
+ 'matplotlib': ('https://matplotlib.org', None)
}
diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst
index 7e1c381d2..de4079080 100644
--- a/doc/source/user/quickstart.rst
+++ b/doc/source/user/quickstart.rst
@@ -800,7 +800,7 @@ Copies and Views
When operating and manipulating arrays, their data is sometimes copied
into a new array and sometimes not. This is often a source of confusion
-for beginners. There are three cases::
+for beginners. There are three cases:
No Copy at All
--------------