# HG changeset patch
# User Puneeth Chaganti <punchagan@fossee.in>
# Date 1255419316 -19800
# Node ID 324b617ce8cd5928495e3dd36e8e2eaaaf7d239c
# Parent  647239f95c4a5952b976f39d1c041695bb19b143# Parent  7b539cba0f04349d27a05d749f4947066ed1f595
Merged with mainline.

diff -r 647239f95c4a -r 324b617ce8cd day1/Session-1.tex
--- a/day1/Session-1.tex	Tue Oct 13 13:03:11 2009 +0530
+++ b/day1/Session-1.tex	Tue Oct 13 13:05:16 2009 +0530
@@ -507,7 +507,7 @@
 Out[6]: ['hello', 'world']
 In [7]: ''.join(['a', 'b', 'c'])
 Out[7]: 'abc'
-In [8] 'd' in ''.join( 'a', 'b', 'c')
+In [8] 'd' in ''.join(['a', 'b', 'c'])
 Out[8]: False
   \end{lstlisting}
   \begin{block}{Try:}
@@ -518,7 +518,7 @@
 
 \begin{frame}[fragile]\frametitle{String formatting}
   \begin{lstlisting}
-In [11]: x, y = 1, 1.2
+In [11]: x, y = 1, 1.234
 In [12]: 'x is %s, y is %s' %(x, y)
 Out[12]: 'x is 1, y is 1.234'
   \end{lstlisting}
@@ -568,7 +568,7 @@
 In [23]: if a > b:
    ....:    print 'Hello'
    ....: else:
-   ....:     print 'World'
+   ....:    print 'World'
    ....:
    ....:
 World
diff -r 647239f95c4a -r 324b617ce8cd day1/Session-3.tex
--- a/day1/Session-3.tex	Tue Oct 13 13:03:11 2009 +0530
+++ b/day1/Session-3.tex	Tue Oct 13 13:05:16 2009 +0530
@@ -308,7 +308,7 @@
 >>> from math import *
       \end{lstlisting}    
     \item What is the difference?
-    \item \alert{Use the later only in interactive mode}
+    \item \alert{Use the latter only in interactive mode}
     \end{itemize}
   \emphbar{Package hierarchies}
       \begin{lstlisting}
diff -r 647239f95c4a -r 324b617ce8cd session_plan.odt
Binary file session_plan.odt has changed