summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Nathanson <github@bigriver.xyz>2020-10-09 15:40:49 -0400
committerBen Nathanson <github@bigriver.xyz>2020-10-09 15:40:49 -0400
commitc6dc9d66ebc7dca16eb83686e74673668b276440 (patch)
treebbd25743dc94c798ac194e9cb27530dbf80950fa
parent328135c3a355baed063a1ccbb224c9dc1b71a464 (diff)
downloadnumpy-c6dc9d66ebc7dca16eb83686e74673668b276440.tar.gz
DOC: Update top links in landing page
Same intent as PR #17365 -- point "Installation" links to Hugo, start page with "What is NumPy", let Hugo page link to "Troubleshooting ImportError".
-rw-r--r--doc/source/_templates/indexcontent.html5
-rw-r--r--doc/source/user/index.rst11
-rw-r--r--doc/source/user/install.rst17
-rw-r--r--doc/source/user/troubleshooting-importerror.rst4
4 files changed, 18 insertions, 19 deletions
diff --git a/doc/source/_templates/indexcontent.html b/doc/source/_templates/indexcontent.html
index 2dba16ce8..6dd6bf9b0 100644
--- a/doc/source/_templates/indexcontent.html
+++ b/doc/source/_templates/indexcontent.html
@@ -12,8 +12,9 @@
<p><strong>For users:</strong></p>
<table class="contentstable" align="center"><tr>
<td width="50%">
- <p class="biglink"><a class="biglink" href="{{ pathto("user/setting-up") }}">Setting up</a><br/>
- <span class="linkdescr">Learn about what NumPy is and how to install it</span></p>
+ <p class="biglink"><a class="biglink" href="{{ pathto("user/whatisnumpy") }}">What is NumPy?</a><br/>
+ <span class="linkdescr">Who uses it and why</span></p>
+ <p class="biglink"><a class="biglink" href="https://numpy.org/install/">Installation</a><br/>
<p class="biglink"><a class="biglink" href="{{ pathto("user/quickstart") }}">Quickstart</a><br/>
<span class="linkdescr">Aimed at domain experts or people migrating to NumPy</span></p>
<p class="biglink"><a class="biglink" href="{{ pathto("user/absolute_beginners") }}">Absolute beginner's guide</a><br/>
diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst
index 11a019b48..28297d9ea 100644
--- a/doc/source/user/index.rst
+++ b/doc/source/user/index.rst
@@ -3,18 +3,17 @@
.. _user:
################
-NumPy User Guide
+NumPy user guide
################
-This guide is intended as an introductory overview of NumPy and
-explains how to install and make use of the most important features of
-NumPy. For detailed reference documentation of the functions and
-classes contained in the package, see the :ref:`reference`.
+This guide is an overview and explains the important features;
+details are found in :ref:`reference`.
.. toctree::
:maxdepth: 1
- setting-up
+ whatisnumpy
+ Installation <https://numpy.org/install/>
quickstart
absolute_beginners
basics
diff --git a/doc/source/user/install.rst b/doc/source/user/install.rst
index 52586f3d7..e05cee2f1 100644
--- a/doc/source/user/install.rst
+++ b/doc/source/user/install.rst
@@ -1,10 +1,7 @@
-****************
-Installing NumPy
-****************
-
-In most use cases the best way to install NumPy on your system is by using a
-pre-built package for your operating system. Please see
-https://scipy.org/install.html for links to available options.
-
-For instructions on building for source package, see
-:doc:`building`. This information is useful mainly for advanced users.
+:orphan:
+
+****************
+Installing NumPy
+****************
+
+See `Installing NumPy <https://numpy.org/install/>`_. \ No newline at end of file
diff --git a/doc/source/user/troubleshooting-importerror.rst b/doc/source/user/troubleshooting-importerror.rst
index 7d4846f77..d124e657a 100644
--- a/doc/source/user/troubleshooting-importerror.rst
+++ b/doc/source/user/troubleshooting-importerror.rst
@@ -1,3 +1,5 @@
+:orphan:
+
***************************
Troubleshooting ImportError
***************************
@@ -69,7 +71,7 @@ or conda.
Using Eclipse/PyDev with Anaconda/conda Python (or environments)
----------------------------------------------------------------
-Please see the
+Please see the
`Anaconda Documentation <https://docs.anaconda.com/anaconda/user-guide/tasks/integration/eclipse-pydev/>`_
on how to properly configure Eclipse/PyDev to use Anaconda Python with specific
conda environments.