Merge branch 'master' into notebooks

harpolea · web-flow · commit 8fcc8f5f3931 · 2018-08-31T14:29:11.000-04:00
diff --git a/docs/source/installation.rst b/docs/source/installation.rst
@@ -36,7 +36,7 @@ The following steps are needed before running pyro:
    ./mk.sh
 
 * define the environment variable ``PYRO_HOME`` to point to
-  the ``pyro2/`` directory (only needed for regression testing)
+  the ``pyro2/`` directory
 
 .. code-block:: none
 
diff --git a/examples/examples.ipynb b/examples/examples.ipynb
@@ -278,7 +278,7 @@
     {
      "data": {
       "text/plain": [
-       "<advection.simulation.Simulation at 0x110e6edd8>"
+       "<advection.simulation.Simulation at 0x7f293ebf2390>"
       ]
      },
      "execution_count": 9,

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@`
`278`	`278`	`{`
`279`	`279`	`"data": {`
`280`	`280`	`"text/plain": [`
`281`		`- "<advection.simulation.Simulation at 0x110e6edd8>"`
	`281`	`+ "<advection.simulation.Simulation at 0x7f293ebf2390>"`
`282`	`282`	`]`
`283`	`283`	`},`
`284`	`284`	`"execution_count": 9,`