Fix broken doc links.

6 files changed, 10 insertions, 9 deletions

diff --git a/lib/spack/docs/basic_usage.rst b/lib/spack/docs/basic_usage.rst
index 03e6d581a4..12f48dde4e 100644
--- a/lib/spack/docs/basic_usage.rst
+++ b/lib/spack/docs/basic_usage.rst
@@ -838,8 +838,6 @@ add a version specifier to the spec:
 Notice that the package versions that provide insufficient MPI
 versions are now filtered out.
 
-.. _shell-support:
-
 ---------------------------
 Extensions & Python support
 ---------------------------
diff --git a/lib/spack/docs/getting_started.rst b/lib/spack/docs/getting_started.rst
index 34cbf453e1..6ec55cca48 100644
--- a/lib/spack/docs/getting_started.rst
+++ b/lib/spack/docs/getting_started.rst
@@ -47,8 +47,7 @@ to your path and you're ready to go:
    $ export PATH=$SPACK_ROOT/bin:$PATH
    $ spack install libelf
 
-For a richer experience, use Spack's `shell support
-<http://software.llnl.gov/spack/basic_usage.html#environment-modules>`_:
+For a richer experience, use Spack's shell support:
 
 .. code-block:: console
 
@@ -60,7 +59,9 @@ For a richer experience, use Spack's `shell support
    $ setenv SPACK_ROOT /path/to/spack
    $ source $SPACK_ROOT/share/spack/setup-env.csh
 
-This automatically adds Spack to your ``PATH``.
+This automatically adds Spack to your ``PATH`` and allows the ``spack``
+command to :ref:`load environment modules <shell-support>` and execute
+:ref:`useful packaging commands <packaging-shell-support>`.
 
 ^^^^^^^^^^^^^^^^^
 Clean Environment
diff --git a/lib/spack/docs/module_file_support.rst b/lib/spack/docs/module_file_support.rst
index f07bd31c2e..0daa9232ed 100644
--- a/lib/spack/docs/module_file_support.rst
+++ b/lib/spack/docs/module_file_support.rst
@@ -24,7 +24,7 @@ directly with automatically generated module files.
    we advise you to use either Environment Modules or LMod. See :ref:`InstallEnvironmentModules`
    for more details.
 
-.. _shell_support:
+.. _shell-support:
 
 -------------
 Shell support
diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst
index a22fcd71ba..aa9a3874bb 100644
--- a/lib/spack/docs/packaging_guide.rst
+++ b/lib/spack/docs/packaging_guide.rst
@@ -3120,6 +3120,8 @@ example:
 This graph can be provided as input to other graphing tools, such as
 those in `Graphviz <http://www.graphviz.org>`_.
 
+.. _packaging-shell-support:
+
 -------------------------
 Interactive shell support
 -------------------------
diff --git a/lib/spack/docs/tutorial_sc16.rst b/lib/spack/docs/tutorial_sc16.rst
index 6fa630c57b..39d602bda0 100644
--- a/lib/spack/docs/tutorial_sc16.rst
+++ b/lib/spack/docs/tutorial_sc16.rst
@@ -15,12 +15,12 @@ the live demo scripts to see how Spack is used in practice.
 .. rubric:: Slides
 
 .. figure:: tutorial/sc16-tutorial-slide-preview.png
-   :target: http://software.llnl.gov/spack/files/Spack-SC16-Tutorial.pdf
+   :target: http://llnl.github.io/spack/files/Spack-SC16-Tutorial.pdf
    :height: 72px
    :align: left
    :alt: Slide Preview
 
-`Download Slides <software.llnl.gov/spack/files/Spack-SC16-Tutorial.pdf>`_.
+`Download Slides <llnl.github.io/spack/files/Spack-SC16-Tutorial.pdf>`_.
 
 **Full citation:** Todd Gamblin, Massimiliano Culpo, Gregory Becker, Matt
 Legendre, Greg Lee, Elizabeth Fischer, and Benedikt Hegner.
diff --git a/lib/spack/docs/tutorial_sc16_modules.rst b/lib/spack/docs/tutorial_sc16_modules.rst
index 1e786674bb..00684223cd 100644
--- a/lib/spack/docs/tutorial_sc16_modules.rst
+++ b/lib/spack/docs/tutorial_sc16_modules.rst
@@ -34,7 +34,7 @@ Prerequisites
 Before proceeding further ensure:
 
 - you have LMod or Environment Modules available
-- have :ref:`shell support <shell_support>` activated in Spack
+- have :ref:`shell support <shell-support>` activated in Spack
 
 If you need to install Lmod or Environment module you can refer
 to the documentation :ref:`here <InstallEnvironmentModules>`.