Fix broken website links

doc/FAQ.rst

@@ -20,7 +20,7 @@ directly to disk, with custom options, like this:
   renderer.save(my_object, 'example_I', style=dict(Image={'cmap':'jet'}))
 
 This process is described in detail in the
-`Customizing Plots <user_guides/Customizing_Plots.html>`_ user guide.
+`Customizing Plots <user_guide/Customizing_Plots.html>`_ user guide.
 Of course, notebook-specific functionality like capturing the data in
 notebook cells or saving cleared notebooks is only for IPython/Jupyter.
 

doc/about.rst

@@ -1,7 +1,7 @@
 About Us
 ========
 
-HoloViews is supported and maintained by Continuum Analytics <https://continuum.io>`_.  
+HoloViews is supported and maintained by `Continuum Analytics <https://continuum.io>`_.
 
 The primary developers are Jean-Luc Stevens, Philipp Rudiger, and
 James A. Bednar, with bug reports and patches from numerous members of

doc/index.rst

@@ -53,10 +53,10 @@ If you have any `issues <https://github.com/ioam/holoviews/issues>`_ or wish to
 Installation
 ____________
 
-|PyPI|_ |Conda|_ |License|_ |Coveralls|_
+|CondaPkg|_ |PyPI|_ |License|_ |Coveralls|_
 
 
-HoloViews works with Python `2.7 and Python 3 <https://travis-ci.org/ioam/holoviews>`_ on Linux, Windows, or Mac, and provides optional extensions for working with the `Jupyter/IPython Notebook <http://jupyter.org>`_.
+HoloViews works with `Python 2.7 and Python 3 <https://travis-ci.org/ioam/holoviews>`_ on Linux, Windows, or Mac, and provides optional extensions for working with the `Jupyter/IPython Notebook <http://jupyter.org>`_.
 
 The recommended way to install HoloViews is using the `conda <http://conda.pydata.org/docs/>`_ command provided by `Anaconda <http://docs.continuum.io/anaconda/install>`_ or `Miniconda <http://conda.pydata.org/miniconda.html>`_::
 
@@ -86,8 +86,8 @@ And then you can launch Jupyter Notebook to explore them::
 .. |PyPI| image:: https://img.shields.io/pypi/v/holoviews.svg
 .. _PyPI: https://pypi.python.org/pypi/holoviews
 
-.. |Conda| image:: https://anaconda.org/ioam/holoviews/badges/installer/conda.svg
-.. _Conda: https://anaconda.org/ioam/holoviews
+.. |CondaPkg| image:: https://anaconda.org/ioam/holoviews/badges/installer/conda.svg
+.. _CondaPkg: https://anaconda.org/ioam/holoviews
 
 .. |License| image:: https://img.shields.io/pypi/l/holoviews.svg
 .. _License: https://github.com/ioam/holoviews/blob/master/LICENSE.txt

examples/user_guide/Installing_and_Configuring.ipynb

@@ -11,7 +11,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "HoloViews and its required dependencies [Numpy](http://numpy.org) and [Param](http://ioam.github.com/param) are pure Python packages, and can thus be installed on any platform that has Python 2.7 or Python3.\n",
+    "HoloViews can be installed on any platform where [NumPy](http://numpy.org) and Python 2.7 or 3 are available.\n",
     "\n",
     "That said, HoloViews is designed to work closely with many other libraries, which can make installation and configuration more complicated.  This user guide page describes some of these less-common or not-required options that may be helpful for some users."
    ]
@@ -22,7 +22,7 @@
    "source": [
     "## Other installation options\n",
     "\n",
-    "The main [installation instructions](http://holoviews.org/#installation) should be sufficient for most users, but you may also want the [Matplotlib](http://matplotlib.org) and Plotly backends, which are required for some of the examples:\n",
+    "The main [installation instructions](http://holoviews.org/#installation) should be sufficient for most users, but you may also want the [Matplotlib](http://matplotlib.org) and [Plotly](https://plot.ly/python/) backends, which are required for some of the examples:\n",
     "\n",
     "    conda install matplotlib plotly\n",
     "\n",
@@ -33,10 +33,9 @@
     "    pip install 'holoviews[extras]'\n",
     "    pip install 'holoviews[all]'\n",
     "\n",
-    "The first option installs just the bare library and the [Numpy](http://numpy.org) and [Param](http://ioam.github.com/param) libraries, which is all you need on your system to generate and work with HoloViews objects without visualizing them. The other options install additional libraries that are often useful, with the `recommended` option being similar to the `conda` install command above.\n",
+    "The first option installs just the bare library and the [NumPy](http://numpy.org) and [Param](http://ioam.github.com/param) libraries, which is all you need on your system to generate and work with HoloViews objects without visualizing them. The other options install additional libraries that are often useful, with the `recommended` option being similar to the `conda` install command above.\n",
     "\n",
-    "Between releases, development snapshots are made available on conda and\n",
-    "can be installed using:\n",
+    "Between releases, development snapshots are made available as conda packages:\n",
     "\n",
     "    conda install -c ioam/label/dev holoviews\n",
     "\n",
@@ -60,7 +59,7 @@
     "jupyter notebook --generate-config\n",
     "```\n",
     "\n",
-    "and then edit the resulting file .jupyter/jupyter_notebook_config.py with code that changes the limit:\n",
+    "and then edit the resulting file (most likely, ~/.jupyter/jupyter_notebook_config.py) with code that changes the limit:\n",
     "\n",
     "```\n",
     "c = get_config()\n",
@@ -135,17 +134,15 @@
    "source": [
     "## The holoviews.rc file\n",
     "\n",
-    "HoloViews supports an rc file that is searched for in the following places: ``\"~/.holoviews.rc\"``, ``\"~/.config/holoviews/holoviews.rc\"`` and the in parent directory of the top-level ``__init__.py`` file (useful for developers working out of the HoloViews git repo). A different location to find the rc file can be specified via the ``HOLOVIEWSRC`` environment variable.\n",
+    "HoloViews searches the following places (in order) for an rc file: ``~/.holoviews.rc``, ``~/.config/holoviews/holoviews.rc``, and then the parent directory of the top-level ``__init__.py`` file (useful for developers working out of the HoloViews git repo). The rc file location can be overridden via the ``HOLOVIEWSRC`` environment variable.\n",
     "\n",
-    "This rc file is executed right after HoloViews, imports. For instance you can use an rc file with code like:\n",
+    "The rc file is a Python script, executed as HoloViews is imported. An example rc file to include various options discussed above might look like this:\n",
     "\n",
     "```\n",
     "import holoviews as hv\n",
     "hv.config(warn_options_call=True)\n",
     "hv.extension.case_sensitive_completion=True\n",
-    "```\n",
-    "\n",
-    "to include the various options discussed on this page."
+    "```\n"
    ]
   }
  ],