fix links

Author: ocefpaf

docs/source/credits.rst

@@ -2,9 +2,9 @@ Credits
 -------
 
 This work was supported by National Science Foundation Grants
-`EAR-1224638 <http://www.nsf.gov/awardsearch/showAward?AWD_ID=1224638>`__
+`EAR-1224638 <https://www.nsf.gov/awardsearch/showAward?AWD_ID=1224638>`__
 and
-`ACI-1339834 <http://www.nsf.gov/awardsearch/showAward?AWD_ID=1339834>`__.
+`ACI-1339834 <https://www.nsf.gov/awardsearch/showAward?AWD_ID=1339834>`__.
 Any opinions, findings, and conclusions or recommendations expressed in
 this material are those of the author(s) and do not necessarily reflect
 the views of the National Science Foundation.

docs/source/index.rst

@@ -1,7 +1,7 @@
 ODM2 Python API
 ===============
 
-A Python-based application programmer's interface for the `Observations Data Model 2 (ODM2) <http://odm2.org>`__.
+A Python-based application programmer's interface for the `Observations Data Model 2 (ODM2) <http://www.odm2.org>`__.
 `List of current and planned functions included in the
 API <https://github.com/ODM2/ODM2PythonAPI/blob/master/doc/APIFunctionList.md>`__
 

docs/source/installing.rst

@@ -3,11 +3,11 @@ Installation
 
 The easiest and most reliable way to install the ODM2 Python API
 (``odm2api``) is using the `Conda package management
-system <http://conda.pydata.org/docs/>`__ via either
-`Anaconda <https://www.continuum.io/downloads>`__ or
-`Miniconda <http://conda.pydata.org/miniconda.html>`__. To start using
+system <https://conda.io/docs/>`__ via either
+`Anaconda <https://www.anaconda.com/download/>`__ or
+`Miniconda <https://conda.io/miniconda.html>`__. To start using
 conda (if it's not your system default), add conda to the PATH; on
-MacOSX and Linux, it's something like
+OS X and Linux, it's something like
 ``export PATH=$HOME/miniconda/bin:$PATH``, but the exact path may vary.
 
 To activate a conda environment, say, "myenv":
@@ -27,7 +27,7 @@ Latest release, from ODM2 anaconda.org channel
 The `latest ``odm2api``
 release <https://github.com/ODM2/ODM2PythonAPI/releases>`__ is available
 on the `ODM2 anaconda.org channel <https://anaconda.org/odm2/odm2api>`__
-for all major OS paltforms (linux, OSX, win32/win64). To install it on
+for all major OS paltforms (linux, OS X, win32/win64). To install it on
 an existing conda environment:
 
 ::
@@ -47,19 +47,13 @@ To create a new environment "myenv" with the ``odm2api`` package:
 Installing the development version from the ``master`` branch on GitHub
 -----------------------------------------------------------------------
 
-**Note from 4/26/2016:** These instructions may be slightly outdated.
-Follow these directions for installing the bleeding edge GitHub master
-branch, mainly for development and testing purposes.
-
-To create a new environment "myenv" with ``odm2api``, first download the
-conda environment file
-`condaenvironment\_1.yml <https://raw.githubusercontent.com/ODM2/ODM2PythonAPI/master/condaenvironment_1.yml>`__.
-Go to the directory where ``condaenvironment_1.yml`` was downloaded.
+To create a new environment "myenv" with ``odm2api``, first clone the repository.
 Then, on a terminal shell:
 
 .. code:: bash
 
     conda env create -n myenv --file py2_conda_environment.yml
+    conda create --name myenv python=2.7 --file requirements.txt --file requirements-dev.txt
 
 Activate the new environment, then install ``odm2api`` into the
 environment:
@@ -68,5 +62,3 @@ environment:
 
     activate myenv  # On Windows
     source activate myenv  # On MacOSX or Linux
-
-    pip install --process-dependency-links git+https://github.com/ODM2/ODM2PythonAPI.git