Merge pull request #110 from marujore/master

Fix URLs in Documentation

Py6S/Params/atmosprofile.py

@@ -37,13 +37,13 @@ def FromLatitudeAndDate(cls, latitude, date):
         """Automatically pick the atmospheric profile based on the latitude
         and date.
 
-        Based on the table provided at http://www.exelisvis.com/docs/FLAASH.html
+        Based on the table provided at https://www.nv5geospatialsoftware.com/docs/FLAASH.html
         """
         dt = dateutil.parser.parse(date, dayfirst=True)
 
         rounded_lat = round(latitude, -1)
 
-        # Data from Table 2-2 in http://www.exelisvis.com/docs/FLAASH.html
+        # Data from Table 2-2 in https://www.nv5geospatialsoftware.com/docs/FLAASH.html
         SAW = cls.PredefinedType(cls.SubarcticWinter)
         SAS = cls.PredefinedType(cls.SubarcticSummer)
         MLS = cls.PredefinedType(cls.MidlatitudeSummer)

doc/source/audience.rst

@@ -5,8 +5,8 @@ Py6S is an interface to the Second Simulation of the Satellite Signal in the Sol
 
 The best resources to gain some familiarity with these topics are:
 
-* A basic remote sensing textbook for information on the use of Radiative Transfer Models (look in your local academic library) 
-* The original paper on 6S by `Vermote et al <http://www2.geog.ucl.ac.uk/~mdisney/teaching/PPRS/papers/vermote_etal_IEEE_1997.pdf>`_
-* The 6S manual, particularly the first section which introduces the conceptual basis of the model (the later parts document each function in the original Fortran code, which may be less useful), `here <http://6s.ltdri.org/pages/manual.html>`_.
+* A basic remote sensing textbook for information on the use of Radiative Transfer Models (look in your local academic library)
+* The original paper on 6S by `Vermote et al <https://ieeexplore.ieee.org/document/581987>`_
+* The 6S manual, particularly the first section which introduces the conceptual basis of the model (the later parts document each function in the original Fortran code, which may be less useful), `here <https://ltdri.org/6spage.html>`_.
 
 Py6S is a Python module, so you will need to have a basic understanding of Python programming to use the model. Don't worry too much though - you can use the model without being a Python expert! Some good tutorials for basic Python programming include `LearnPython <http://www.learnpython.org/>`_ and the `Google Python class <https://developers.google.com/edu/python/>`_.

doc/source/installation.rst

@@ -17,7 +17,7 @@ the environment, which you should now do. You can now skip to `Testing Py6S`_.
 
 If you don't already have ``conda`` installed then:
 
-#. Install either `Miniconda <https://conda.io/miniconda.html>`_ or `Anaconda <https://www.continuum.io/downloads>`_.
+#. Install either `Miniconda <https://conda.io/miniconda.html>`_ or `Anaconda <https://www.anaconda.com/download>`_.
     These are two different distributions of Python, both of which include
     the ``conda`` package manager. Miniconda comes with the 'bare minimum' of Python, conda and
     a few essential libraries, whereas Anaconda comes with many libraries required for data science
@@ -83,8 +83,8 @@ Python modules
 * ``pandas`` (optional: only required for importing AERONET data)
 * ``ipython`` (recommended)
 
-An easy way to sort all of this out is to use  
-`Anaconda <https://www.continuum.io/downloads>`_ or the `Enthought Python
+An easy way to sort all of this out is to use
+`Anaconda <https://www.anaconda.com/download>`_ or the `Enthought Python
 Distribution <http://enthought.com/products/epd.php>`_, either of which will install
 Python plus many modules which are often used for scientific computing.