Merge branch 'next' into barnhark/issue_38

Author: kbarnhart

lithology/lithology_and_litholayers.ipynb

@@ -2317,7 +2317,7 @@
     "\n",
     "Here we will explore making inverted topography by eroding Lithology with constant properties for half of the model evaluation time, and then filling Lithology in with resistant material only where the drainage area is large. This is meant as a simple example of filling in valleys with volcanic material. \n",
     "\n",
-    "All of the details of the options for creating a [Lithology](http://landlab.readthedocs.io/en/release/landlab.layers.lithology.html) can be found here. \n",
+    "All of the details of the options for creating a [Lithology](https://landlab.readthedocs.io/en/master/landlab.components.lithology.html) can be found here. \n",
     "\n",
     "In the next code block we make a new model and run it. There are two important differences between this next example and the one we just worked through in Part 2. \n",
     "\n",
@@ -2542,7 +2542,7 @@
     "\n",
     "Nice work getting to the end of the tutorial!\n",
     "\n",
-    "For more detailed information about the [Lithology](http://landlab.readthedocs.io/en/release/landlab.layers.lithology.html) and [LithoLayers](http://landlab.readthedocs.io/en/release/landlab.layers.litholayers.html) objects, check out their detailed documentation. \n",
+    "For more detailed information about the [Lithology](https://landlab.readthedocs.io/en/master/landlab.components.lithology.html) and [LithoLayers](https://landlab.readthedocs.io/en/master/landlab.components.litholayers.html) objects, check out their detailed documentation. \n",
     "\n",
     "# **Click [here](https://github.com/landlab/landlab/wiki/Tutorials) for more Landlab tutorials**"
    ]