# HG changeset patch
# User Prabhu Ramachandran <prabhu@aero.iitb.ac.in>
# Date 1277106450 14400
# Node ID 94955d4900d004ae522baa243dbb2d9ffebb3c54
# Parent  caec361e3a862fb595244ae2d78da2c2ad72aee0# Parent  3ec547912b3c7fa44ef6043442885513584daa66
Merging changes from Chris.

diff -r caec361e3a86 -r 94955d4900d0 day1/exercise/four_plot.py
--- a/day1/exercise/four_plot.py	Mon Jun 21 03:40:59 2010 -0400
+++ b/day1/exercise/four_plot.py	Mon Jun 21 03:47:30 2010 -0400
@@ -1,4 +1,4 @@
-x=linspace(-5*pi, 5*pi, 500)
+x = linspace(-5*pi, 5*pi, 500)
 plot(x, x, 'b')
 plot(x, -x, 'b')
 plot(x, sin(x), 'g', linewidth=2)
diff -r caec361e3a86 -r 94955d4900d0 day1/session1.tex
--- a/day1/session1.tex	Mon Jun 21 03:40:59 2010 -0400
+++ b/day1/session1.tex	Mon Jun 21 03:47:30 2010 -0400
@@ -159,11 +159,11 @@
     \item Editor - we recommend \alert{scite}
     \item Data files: 
       \begin{itemize}
-      \item \typ{sslc1.txt}
+      \item \typ{anag.txt}
+      \item \typ{holmes.txt}
       \item \typ{pendulum.txt}
       \item \typ{pos.txt}
-      \item \typ{holmes.txt}
-      \item \typ{anag.txt}
+      \item \typ{sslc1.txt}
       \end{itemize}
     \item Python scripts: 
       \begin{itemize}
@@ -531,9 +531,9 @@
         \vspace*{0.5in}
     \item Try: 
 \begin{lstlisting}
-In []: plot?
+In []: plot??
 \end{lstlisting}
-    to see source code
+    to see the source code for \typ{plot}
 
 \end{itemize}
 
@@ -558,7 +558,7 @@
 \frametitle{Review Problem \ldots}
 \alert{Plotting \ldots}
 \begin{lstlisting}
-In []: x=linspace(-5*pi, 5*pi, 500)
+In []: x = linspace(-5*pi, 5*pi, 500)
 In []: plot(x, x, 'b')
 In []: plot(x, -x, 'b')
 In []: plot(x, sin(x), 'g', linewidth=2)
@@ -602,7 +602,7 @@
 \begin{block}{}
 \typ{\%save script_name line_numbers}
 \end{block}
-Line numbers can be specified individually separated by commas or as a range separated by a dash.\\
+Line numbers can be specified individually separated by spaces or as a range separated by a dash.\\
 \begin{block}{}
 \typ{\%save four_plot.py} \alert{\typ{  16 18-27}} \\  
 \end{block}