Merge branch 'master' of https://github.com/AllenDowney/ModSimPy

AllenDowney · AllenDowney · commit bd56b286a70a · 2019-08-22T08:57:07.000-04:00
diff --git a/README.md b/README.md
@@ -82,7 +82,7 @@ conda install jupyterlab pandas seaborn sympy beautifulsoup4 lxml html5lib pytab
 ```
 To install Pint, run this command:
 ```
-conda install -c unidata pint
+conda install -c conda-forge pint
 ```
 And to install the ModSim library, run this command:
 ```
@@ -164,7 +164,7 @@ To start Jupyter on macOS or Linux, open a Terminal; on Windows, open
 Git Bash. Use to “change directory" into the code directory in the
 repository:
 ```
-cd ModSimPy/code
+cd ModSimPy/notebooks
 ```
 Then launch the Jupyter notebook server:
 ```
diff --git a/book/book.tex b/book/book.tex
@@ -13,7 +13,7 @@
 \newcommand{\thetitle}{Modeling and Simulation in Python}
 \newcommand{\thesubtitle}{}
 \newcommand{\theauthors}{Allen B. Downey}
-\newcommand{\theversion}{3.4.1}
+\newcommand{\theversion}{3.4.2}
 
 
 %%%% Both LATEX and PLASTEX
@@ -445,7 +445,7 @@ \section{Installing Python}
 
 \section{Copying my files}
 
-The simplest way to get the files for this book is to download a Zip archive from \url{http://modsimpy.com/zip}.  You will need a program like WinZip or gzip to unpack the Zip file.  Make a note of the location of the files you download.
+The simplest way to get the files for this book is to download a Zip archive from \url{http://modsimpy.com/zip}.  You will need a program like WinZip or gzip to unpack the Zip file.  Make a note of the location of the files you unpack.
 
 If you download the Zip file, you can skip the rest of this section, which explains how to use Git.
 
@@ -494,10 +494,16 @@ \section{Running Jupyter}
 
 \index{Jupyter}
 
-To start Jupyter on macOS or Linux, open a Terminal; on Windows, open Git Bash.  Use \py{cd} to ``change directory" into the code directory in the repository:
+To start Jupyter on macOS or Linux, open a Terminal; on Windows, open Git Bash.  Use \py{cd} to ``change directory" into the directory in the repository that contains the notebooks.  If you downloaded the Zip file, it's probably:
 
 \begin{code}
-cd ModSimPy/code
+cd ModSimPy-master/notebooks
+\end{code}
+
+If you cloned it with Git, it's probably:
+
+\begin{code}
+cd ModSimPy/notebooks
 \end{code}
 
 Then launch the Jupyter notebook server:
@@ -506,7 +512,7 @@ \section{Running Jupyter}
 jupyter notebook
 \end{code}
 
-Jupyter should open a window in a browser, and you should see the list of notebooks in my repository.  Click on the first notebook, \py{chap01.ipynb} and follow the instructions to run the first few ``cells".  The first time you run a notebook, it might take several seconds to start, while some Python files get initialized.  After that, it should run faster.
+Jupyter should open a window in a browser, and you should see the list of notebooks in my repository.  Click on the first notebook, \py{chap01.ipynb} and follow the instructions to run the first few ``cells".  The first time you run a notebook, it might take several seconds to start while some Python files get initialized.  After that, it should run faster.
 
 Feel free to read through the notebook, but it might not make sense until you read Chapter~\ref{chap01}.
 
@@ -935,7 +941,7 @@ \section{Print statements}
 
 \begin{python}
 def bike_to_wellesley():
-	print('Moving a bike to Wellesley')
+    print('Moving a bike to Wellesley')
     bikeshare.olin -= 1
     bikeshare.wellesley += 1
 \end{python}
@@ -1395,7 +1401,7 @@ \section{Negative bikes}
     state.olin += 1
 \end{python}
 
-The first line checks whether the number of bikes at Wellesley is zero.  If so, it uses a a {\bf return statement}, which causes the function to end immediately, without running the rest of the statements.  So if there are no bikes at Wellesley, we ``return" from \py{bike_to_olin} without changing the state.
+The first line checks whether the number of bikes at Wellesley is zero.  If so, it uses a {\bf return statement}, which causes the function to end immediately, without running the rest of the statements.  So if there are no bikes at Wellesley, we ``return" from \py{bike_to_olin} without changing the state.
 
 \index{return statement}
 \index{statement!return}
diff --git a/notebooks/chap02.ipynb b/notebooks/chap02.ipynb
@@ -765,7 +765,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The suffix of the filename indicates the format you want.  This example saves the current figure in a PDF file named `chap01-fig01.pdf`."
+    "The suffix of the filename indicates the format you want.  This example saves the current figure in a PDF file."
    ]
   },
   {

Original file line number	Diff line number	Diff line change
`@@ -765,7 +765,7 @@`
`765`	`765`	`"cell_type": "markdown",`
`766`	`766`	`"metadata": {},`
`767`	`767`	`"source": [`
`768`		- "The suffix of the filename indicates the format you want. This example saves the current figure in a PDF file named `chap01-fig01.pdf`."
	`768`	`+ "The suffix of the filename indicates the format you want. This example saves the current figure in a PDF file."`
`769`	`769`	`]`
`770`	`770`	`},`
`771`	`771`	`{`