Minor changes to the scripts & slides in 1st module.

22 files changed, 588 insertions, 405 deletions

diff --git a/additional_features_of_ipython/script.rst b/additional_features_of_ipython/script.rst
index 087f43f..f178e88 100644
--- a/additional_features_of_ipython/script.rst
+++ b/additional_features_of_ipython/script.rst
@@ -14,6 +14,7 @@
 
 ..   1. Embellishing Plots
      
+     
 .. Author              : Nishanth Amuluru
    Internal Reviewer   : Amit
    External Reviewer   :
@@ -30,7 +31,8 @@ team along with the logo of MHRD }}}
 
 .. R1
 
-Hello friends and welcome to the tutorial on "Additional Features of IPython".
+Hello friends and welcome to the tutorial on 
+"Additional Features of IPython".
 
 .. L2
 
@@ -47,10 +49,16 @@ At the end of this tutorial, you will be able to,
 
 .. R3
 
-Let us start ipython with pylab loaded, by typing ipython -pylab on the terminal.
+Before beginning this tutorial,we would suggest you to complete the 
+tutorial on "Embellishing a plot".
+
+Let us start ipython with pylab loaded, by typing ipython -pylab on 
+the terminal.
 
 .. L3
 
+{{{ Show slide with pre-requisite }}}
+
 {{{ shift to terminal and type ipython -pylab }}}
 
 ::
@@ -85,8 +93,9 @@ xsin(x) is actually x * sin(x)
 
 .. R6
 
-We now have the plot. Let us look at the commands that we have typed in. The
-history can be retreived by using =%hist= command.Type %hist in your terminal.
+We now have the plot. Let us look at the commands that we have typed in. 
+The history can be retrieved by using =%hist= command.Type %hist in your 
+terminal.
 
 .. L6
 
@@ -96,24 +105,28 @@ history can be retreived by using =%hist= command.Type %hist in your terminal.
 
 .. R7
 
-As you can see, it displays a list of recent commands that we typed. Every
-command has a number in front, to specify in which order and when it was typed.
+As you can see, it displays a list of recent commands that we typed. 
+Every command has a number in front, to specify in which order and when 
+it was typed.
 
-Please note that there is a % sign before the hist command. This implies that 
-%hist is a command that is specific to IPython only and not to any other version of python.
+Please note that there is a % sign before the hist command. This implies 
+that %hist is a command that is specific to IPython only and not to any 
+other version of python.
 These type of commands are called as magic commands.
 
-Also note that, the =%hist= itself is a command and is displayed as the most
-recent command. We should note that anything we type in is stored as history, 
-irrespective of whether it is command or an error or IPython magic command.
+Also note that, the =%hist= itself is a command and is displayed as 
+the most ecent command. We should note that anything we type in is 
+stored as history, irrespective of whether it is command or an error or 
+IPython magic command.
 
 .. L7
 
 .. R8
 
-If we want only the recent 5 commands to be displayed, we pass the number as an argument
-to =%hist= command. Hence %hist 5 displays the recent 5 commands, inclusive of the =%hist= command.
-The default number is 40.
+If we want only the recent 5 commands to be displayed, we pass the 
+number as an argument to =%hist= command.
+Hence %hist 5 displays the recent 5 commands, inclusive of the =%hist= 
+command.The default number is 40.
 
 .. L8
 
@@ -130,7 +143,7 @@ The default number is 40.
 
 .. L9
 
-{{{ Show slide with question 1 }}}
+{{{ Show slide with exercise 1 }}}
 
 .. L10
 
@@ -142,14 +155,16 @@ The default number is 40.
 
 .. R10
 
-As we can see from =%hist= documentation,%hist 5 10 displays the commands from 5 to 10
+As we can see from =%hist= documentation,%hist 5 10 displays the 
+commands from 5 to 10
 
-Now that we have the history, we would like to save the required line of code
-from history. This is possible by using the =%save= command.
+Now that we have the history, we would like to save the required line 
+of code from history. This is possible by using the =%save= command.
 
 .. R11
 
-Before we do that, let us first look at history and identify what lines of code we require.Type %hist again.
+Before we do that, let us first look at history and identify what 
+lines of code we require.Type %hist again.
 
 .. L11
 
@@ -163,10 +178,10 @@ Before we do that, let us first look at history and identify what lines of code
 
 .. R12
 
-The first command is linspace. But second command is a command that gave us an
-error. Hence we do not need second command. The commands from third to sixth are 
-required. The seventh command although is correct, we do not need it since we
-are setting the title correctly in the eighth command.
+The first command is linspace. But second command is a command that gave 
+us an error. Hence we do not need second command. The commands from third 
+to sixth are required. The seventh command although is correct, we do not
+need it since we are setting the title correctly in the eighth command.
 
 .. R13
 
@@ -187,11 +202,11 @@ Hence the syntax of =%save= will be
 
 .. R14
 
-The command saves the first line of code and then third to sixth followed by the eighth lines of code into
-the specified file.
+The command saves the first line of code and then third to sixth followed
+by the eighth lines of code into the specified file.
 
-The first argument to %save is the path of file to save the commands and the
-arguments there after are the commands to be saved in the given order.
+The first argument to %save is the path of file to save the commands and
+the arguments there after are the commands to be saved in the given order.
 
 .. L15
 
@@ -203,11 +218,11 @@ arguments there after are the commands to be saved in the given order.
 
 Pause the video here, try out the following exercise and resume the video.
 
-    Change the label on y-axis to "y" and save the lines of code accordingly.
+ Change the label on y-axis to "y" and save the lines of code accordingly.
 
 .. L16
 
-{{{ Show slide with question 2 }}}
+{{{ Show slide with exercise 2 }}}
 
 .. L17
 
@@ -235,8 +250,8 @@ and then do
 
 .. R19
 
-Now that we have the required lines of code in a file, let us learn how to run
-the file as a python script.
+Now that we have the required lines of code in a file, let us learn how 
+to run the file as a python script.
 
 We use the IPython magic command =%run= to do this. Type
 
@@ -248,8 +263,8 @@ We use the IPython magic command =%run= to do this. Type
 
 .. R20
 
-The script runs but we do not see the plot. This happens because when we are running
-a script and we are not in interactive mode anymore.
+The script runs but we do not see the plot. This happens because when we
+are running a script, we are not in the interactive mode anymore.
 
 Hence to view the plot type ``show()`` on your terminal 
 
@@ -261,10 +276,10 @@ Hence to view the plot type ``show()`` on your terminal
 
 .. R21
 
- Pause the video here, try out the following exercise and resume the video.
+Pause the video here, try out the following exercise and resume the video.
 
-     Use %hist and %save and create a script that has the function show() in it.Run the
-     script to produce the plot and display the same.
+  Use %hist and %save and create a script that has the function show() 
+  in it.Run the script to produce the plot and display the same.
 
 <Pause>
 
@@ -272,7 +287,7 @@ We first look at the history using
 
 .. L21
 
-{{{ Show slide with question 3 }}}
+{{{ Show slide with exercise 3 }}}
 
 ::
 
@@ -296,24 +311,24 @@ Then save the script using
 
 We get the desired plot.
 
-The reason for including a -i after run is to tell the interpreter that if any
-name is not found in script, search for it in the interpreter. Hence all these
-sin, plot, pi and show which are not available in script, are taken from the
-interpreter and used to run the script.
+The reason for including a -i after run is to tell the interpreter that 
+if any name is not found in script, search for it in the interpreter.
+Hence all these sin, plot, pi and show which are not available in script,
+are taken from the interpreter and used to run the script.
 
 .. L23
 
 .. R24
 
- Pause the video here, try out the following exercise and resume the video.
+Pause the video here, try out the following exercise and resume the video.
 
-   Run the script without using the -i option. Do you find any difference?
+  Run the script without using the -i option. Do you find any difference?
 
 <Pause>
 
 .. L24
 
-{{{ Show slide with question 4 }}}
+{{{ Show slide with exercise 4 }}}
 
 .. L25
 
@@ -331,16 +346,18 @@ We see that it raises NameError saying that the name linspace is not found.
 
 .. R26
 
-This brings us to the end of the tutorial.let's revise quickly what we have learnt today- 
+This brings us to the end of this tutorial.In this tutorial,we have learnt to,
 
- 1. to retreive the history using =%hist= command.
- #. to view only a part of history by passing an argument to %hist.
- #. to save the required lines of code in required order using %save command.
- #. to use %run -i command to run the saved script.
+ 1. Retrieve the history using =%hist= command.
+ #. View only a part of history by passing an argument to '%hist'
+    command.
+ #. Save the required lines of code in required order using '%save' 
+    command.
+ #. Use '%run -i' command to run the saved script.
 
 .. L27
 
-{{Show self assessment questions slide}}
+{{Show self assessment questionss slide}}
 
 .. R27
 
@@ -364,12 +381,14 @@ Here are some self assessment questions for you to solve
 
 3. What will the command ``%hist 5 10`` display.
 
-    - The recently typed commands from 5 to 10 inclusive of the history command	
-    - The recently typed commands from 5 to 10 excluding the history command
+   - The recently typed commands from 5 to 10 inclusive of the 
+     history command	
+   - The recently typed commands from 5 to 10 excluding the 
+     history command
 
 .. L28
 
-(solution of self assessment questions on slide)
+{{{solution of self assessment questions on slide}}}
 
 .. R28
 
@@ -377,9 +396,11 @@ And the answers,
 
 1. In order to retrieve the recently typed 5 commands,we say ``%hist 5``.
 
-2. ``%save filepath 2-5 7 9-11`` is the correct option to the specified lines of codes.
+2. ``%save filepath 2-5 7 9-11`` is the correct option to the specified 
+   lines of codes.
 
-3. ``%hist 5 10`` will display the recently typed commands from 5 to 10 inclusive of the history command.
+3. ``%hist 5 10`` will display the recently typed commands from 5 to 10 
+   inclusive of the history command.
 
 .. L29
 
diff --git a/additional_features_of_ipython/slides.org b/additional_features_of_ipython/slides.org
index 93a595b..46ed74b 100644
--- a/additional_features_of_ipython/slides.org
+++ b/additional_features_of_ipython/slides.org
@@ -53,17 +53,20 @@
   - View a part of the history. 
   - Save a part of your history to a file. 
   - Run a script from within ipython. 
-* Question 1
+* Pre-requisite
+  Spoken tuorial on -
+  - Embellishing a Plot
+* Exercise 1
   Read through the documentation of =%hist= and find out how to
   list all the commands between 5 and 10.
-* Question 2
+* Exercise 2
   Change the label on y-axis to "y" and save the lines of code
   accordingly
-* Question 3
+* Exercise 3
   Use =%hist= and =%save= and create a script that has the function show()
   in it.Run the script to produce the plot and display the same.
 
-* Question 4
+* Exercise 4
   Run the script without using the -i option. Do you find any
   difference?
 * Solution 4
diff --git a/additional_features_of_ipython/slides.tex b/additional_features_of_ipython/slides.tex
index cfd731c..bf0668f 100644
--- a/additional_features_of_ipython/slides.tex
+++ b/additional_features_of_ipython/slides.tex
@@ -1,4 +1,4 @@
-% Created 2011-05-03 Tue 12:39
+% Created 2011-05-19 Thu 13:48
 \documentclass[presentation]{beamer}
 \usepackage[utf8]{inputenc}
 \usepackage[T1]{fontenc}
@@ -43,14 +43,18 @@ showstringspaces=false, keywordstyle=\color{blue}\bfseries}
 \begin{frame}
 
 \begin{center}
-\textcolor{blue}{Additional Features of  \texttt{ipython}}
+\vspace{12pt}
+\textcolor{blue}{\huge Additional features of \texttt{ipython}}
 \end{center}
+\vspace{18pt}
 \begin{center}
-\includegraphics[scale=0.25]{../images/iitb-logo.png}\\
-Developed by FOSSEE Team, IIT-Bombay. \\ 
-Funded by National Mission on Education through ICT
-
-MHRD, Govt. of India
+\vspace{10pt}
+\includegraphics[scale=0.95]{../images/fossee-logo.png}\\
+\vspace{5pt}
+\scriptsize Developed by FOSSEE Team, IIT-Bombay. \\ 
+\scriptsize Funded by National Mission on Education through ICT\\
+\scriptsize  MHRD,Govt. of India\\
+\includegraphics[scale=0.30]{../images/iitb-logo.png}\\
 \end{center}
 \end{frame}
 \begin{frame}
@@ -68,43 +72,53 @@ MHRD, Govt. of India
 \end{itemize}
 \end{frame}
 \begin{frame}
-\frametitle{Question 1}
+\frametitle{Pre-requisite}
 \label{sec-3}
 
+  Spoken tuorial on -
+
+\begin{itemize}
+\item Embellishing a Plot
+\end{itemize}
+\end{frame}
+\begin{frame}
+\frametitle{Exercise 1}
+\label{sec-4}
+
   Read through the documentation of \texttt{\%hist} and find out how to
   list all the commands between 5 and 10.
 \end{frame}
 \begin{frame}
-\frametitle{Question 2}
-\label{sec-4}
+\frametitle{Exercise 2}
+\label{sec-5}
 
   Change the label on y-axis to ``y'' and save the lines of code
   accordingly
 \end{frame}
 \begin{frame}
-\frametitle{Question 3}
-\label{sec-5}
+\frametitle{Exercise 3}
+\label{sec-6}
 
   Use \texttt{\%hist} and \texttt{\%save} and create a script that has the function show()
   in it.Run the script to produce the plot and display the same.
 \end{frame}
 \begin{frame}
-\frametitle{Question 4}
-\label{sec-6}
+\frametitle{Exercise 4}
+\label{sec-7}
 
   Run the script without using the -i option. Do you find any
   difference?
 \end{frame}
 \begin{frame}
 \frametitle{Solution 4}
-\label{sec-7}
+\label{sec-8}
 
   We see that it raises \verb~NameError~ saying the name \verb~linspace~ is not
   found.
 \end{frame}
 \begin{frame}
 \frametitle{Summary}
-\label{sec-8}
+\label{sec-9}
 
   In this tutorial, we have learnt to –
 
@@ -117,7 +131,7 @@ MHRD, Govt. of India
 \end{frame}
 \begin{frame}
 \frametitle{Evaluation}
-\label{sec-9}
+\label{sec-10}
 
 
 \begin{enumerate}
@@ -146,7 +160,7 @@ MHRD, Govt. of India
 \end{frame}
 \begin{frame}
 \frametitle{Solutions}
-\label{sec-10}
+\label{sec-11}
 
 
 \begin{enumerate}
@@ -156,8 +170,6 @@ MHRD, Govt. of India
 \end{enumerate}
 \end{frame}
 \begin{frame}
-\frametitle{Acknowledgement}
-\label{sec-11}
 
   \begin{block}{}
   \begin{center}
diff --git a/embellishing_a_plot/script.rst b/embellishing_a_plot/script.rst
index c6729e5..cd5c03f 100644
--- a/embellishing_a_plot/script.rst
+++ b/embellishing_a_plot/script.rst
@@ -127,7 +127,7 @@ Plot sin(x) in blue color along with linewidth as 3.
 
 .. L9
 
-{{{ Show slide with Question1 }}}
+{{{ Show slide with exercise1 }}}
 
 .. R10
 Switch to terminal for solution
@@ -189,7 +189,7 @@ documentation of plot.
 
 .. L15
 
-{{{Show slide containing question 2}}}
+{{{Show slide containing exercise 2}}}
 
 .. R15
 
@@ -212,7 +212,7 @@ We use a combination of linestyle and color.
 
 .. L17
 
-{{{Show slide containing question 3}}}
+{{{Show slide containing exercise 3}}}
 
 .. R17
 
@@ -298,7 +298,7 @@ As we can see, the polynomial is now formatted.
 
 .. L24
 
-{{{Show slide containing question 4}}}
+{{{Show slide containing exercise 4}}}
 
 .. R24
 
@@ -350,7 +350,7 @@ as 'f(x)'.
 
 .. L29
 
-{{{Show slide containing question 5}}}
+{{{Show slide containing exercise 5}}}
 
 .. R29
 
@@ -413,7 +413,7 @@ What happens to the first annotation ?
 
 .. L33
 
-{{{Show slide containing question 6}}}
+{{{Show slide containing exercise 6}}}
 
 .. L34
 
@@ -469,7 +469,7 @@ Similarly set the limits of y-axis appropriately.
 
 .. L38
 
-{{{Show slide containing question 7 }}}
+{{{Show slide containing exercise 7 }}}
 
 .. R38
 
@@ -481,7 +481,7 @@ rectangle (-1, -15) and (3, 0)
 .. R39
 
 Switch to the terminal for the solution.
-As we can see, the lower and upper limits of x-axis in the question 
+As we can see, the lower and upper limits of x-axis in the exercise 
 are -1 and 3 respectively.
 The lower and upper limits of y-axis are -15 and 0 respectively.
 
@@ -505,7 +505,7 @@ This gives us the required rectangle.
 
 .. R41
 
-Let's quickly revise what we have learnt today. In this tutorial we have learnt to, 
+This brings us to the end of this tutorial.In this tutorial,we have learnt to,
 
  1. Modify the attributes of plot like color, line width, 
     line style by passing additional arguments.
diff --git a/embellishing_a_plot/slides.org b/embellishing_a_plot/slides.org
index 7f01e2a..58bd85b 100644
--- a/embellishing_a_plot/slides.org
+++ b/embellishing_a_plot/slides.org
@@ -55,21 +55,21 @@
  - Set and Get the limits of axes.
 * Pre-requisite
   - Spoken tutorial on "Using plot interactively"
-* Question 1
+* Exercise 1
   Plot sin(x) in blue colour alongwith linewidth as 3
-* Question 2
+* Exercise 2
   Plot the sine curve with green filled circles.
-* Question 3
+* Exercise 3
   Plot the curve of x vs tan(x) in red dashed line and linewidth 3
-* Question 4
+* Exercise 4
   Change the title of the figure such that the whole title is
   formatted in LaTex style
-* Question 5
+* Exercise 5
   Set the x and y labels as "x" and "f(x)" in LaTex style.
-* Question 6
+* Exercise 6
   Make an annotation called "root" at the point (-4, 0). What happens
   to the first annotation?
-* Question 7
+* Exercise 7
   Set the limits of axes such that the area of interest is the
   rectangle (-1, -15) and (3, 0)
 * Summary
diff --git a/embellishing_a_plot/slides.tex b/embellishing_a_plot/slides.tex
index 4504d1c..8fb701f 100644
--- a/embellishing_a_plot/slides.tex
+++ b/embellishing_a_plot/slides.tex
@@ -1,4 +1,4 @@
-% Created 2011-05-18 Wed 16:31
+% Created 2011-05-19 Thu 13:46
 \documentclass[presentation]{beamer}
 \usepackage[latin1]{inputenc}
 \usepackage[T1]{fontenc}
@@ -81,45 +81,45 @@ showstringspaces=false, keywordstyle=\color{blue}\bfseries}
 \end{itemize}
 \end{frame}
 \begin{frame}
-\frametitle{Question 1}
+\frametitle{Exercise 1}
 \label{sec-4}
 
   Plot sin(x) in blue colour alongwith linewidth as 3
 \end{frame}
 \begin{frame}
-\frametitle{Question 2}
+\frametitle{Exercise 2}
 \label{sec-5}
 
   Plot the sine curve with green filled circles.
 \end{frame}
 \begin{frame}
-\frametitle{Question 3}
+\frametitle{Exercise 3}
 \label{sec-6}
 
   Plot the curve of x vs tan(x) in red dashed line and linewidth 3
 \end{frame}
 \begin{frame}
-\frametitle{Question 4}
+\frametitle{Exercise 4}
 \label{sec-7}
 
   Change the title of the figure such that the whole title is
   formatted in LaTex style
 \end{frame}
 \begin{frame}
-\frametitle{Question 5}
+\frametitle{Exercise 5}
 \label{sec-8}
 
   Set the x and y labels as ``x'' and ``f(x)'' in LaTex style.
 \end{frame}
 \begin{frame}
-\frametitle{Question 6}
+\frametitle{Exercise 6}
 \label{sec-9}
 
   Make an annotation called ``root'' at the point (-4, 0). What happens
   to the first annotation?
 \end{frame}
 \begin{frame}
-\frametitle{Question 7}
+\frametitle{Exercise 7}
 \label{sec-10}
 
   Set the limits of axes such that the area of interest is the
diff --git a/getting_started_with_ipython/script.rst b/getting_started_with_ipython/script.rst
index cd50c23..c72bde7 100644
--- a/getting_started_with_ipython/script.rst
+++ b/getting_started_with_ipython/script.rst
@@ -220,7 +220,7 @@ out all the possible completions of r.
 
 .. L16
 
-{{{Show slide with question 1}}}
+{{{Show slide with exercise 1}}}
 
 .. R16
 
@@ -248,7 +248,7 @@ the commands starting with a.
 
 Now, let's see what the functions abs is used for.  We will use the
 help features of ipython to find out this.  To see the documentation
-of a function, type the function name followed by a question mark.
+of a function, type the function name followed by a exercise mark.
 Ipython interpreter will show the documentation for the
 function.  Let us see the documentation of the function abs, type
 abs? and press enter
@@ -297,7 +297,7 @@ Look-up the documentation of ``round`` and see how to use it.
 
 .. L21   
 
-{{{Show slide with question 2}}}
+{{{Show slide with exercise 2}}}
 
 .. L22
 
@@ -309,7 +309,7 @@ Look-up the documentation of ``round`` and see how to use it.
 
 Switch to the terminal for solution.
 And you can look up the documentation of the function round by typing
-round question mark in the ipython interpreter.
+round exercise mark in the ipython interpreter.
 
 .. L23
 
@@ -339,7 +339,7 @@ round(2.484, 2)
 
 .. L24
 
-{{{Show slide with question 3}}}
+{{{Show slide with exercise 3}}}
 
 .. L25
 
@@ -413,7 +413,7 @@ Pause the video here, try out the following exercise and resume the video.
 
 .. L29
 
-{{{Show slide with question 4}}}
+{{{Show slide with exercise 4}}}
  
 .. L30
 
@@ -434,18 +434,18 @@ Pause the video here, try out the following exercise and resume the video.
 
 .. R31 
 
-let's revise quickly what we have learnt today.In this tutorial we learnt 
+This brings us to the end of this tutorial.In this tutorial,we have learnt to,
 
-  1. to invoke the ``ipython`` interpreter by typing ipython. 
-  #. to quit the ``ipython`` interpreter by using <ctrl>d. 
-  #. to navigate in the history of ``ipython`` by using the arrow keys. 
-  #. what is tab-completion. 
-  #. to see the documentation of functions using question mark.
-  #. to interrupt using <ctrl>c when we make an error.
+  1. Invoke the ``ipython`` interpreter by typing ipython. 
+  #. Quit the ``ipython`` interpreter by using <ctrl>d. 
+  #. Navigate in the history of ``ipython`` by using the arrow keys. 
+  #. Use the tab-completion feauture for writing python functions. 
+  #. See the documentation of functions using exercise mark.
+  #. Interrupt using <ctrl>c when we make an error.
 
 .. R32
   
-Here are some self assessment questions for you to solve
+Here are some self assessment questionss for you to solve
 
 1. ``ipython`` is a programming language similar to Python.
      True or False
@@ -461,7 +461,7 @@ Here are some self assessment questions for you to solve
    display the documentation.
 
    - under score (_)
-   - question mark (?)
+   - exercise mark (?)
    - exclamation mark (!)
    - ampersand (&)
 
@@ -472,7 +472,7 @@ Here are some self assessment questions for you to solve
 
 .. L33
 
-{{{solution of self assessment questions on slide}}}
+{{{solution of self assessment questiones on slide}}}
 
 .. R33
 
diff --git a/getting_started_with_ipython/slides.org b/getting_started_with_ipython/slides.org
index c4a7190..e359bad 100644
--- a/getting_started_with_ipython/slides.org
+++ b/getting_started_with_ipython/slides.org
@@ -55,12 +55,12 @@
    - use tab-completion.
    - look-up documentation of functions.
    - interrupt incomplete or incorrect commands.
-* Question 1
+* Exercise 1
   1. Type =ab= and hit tab to see what happens.
   2. Next, just type =a= and hit tab to see what happens.
-* Question 2
+* Exercise 2
   Look-up the documentation of =round= and see how to use it
-* Question 3
+* Exercise 3
   Check the output of
   #+begin_src python
     round(2.48)
@@ -73,7 +73,7 @@
   #+end_src 
 * Solution 3
   We get 2.0, 2.5 and 2.48, which are what we expect. 
-* Question 4
+* Exercise 4
   1. Type =round(2.484=, and hit enter and then cancel the command
      using Ctrl-C.
   2. Then, type the command, =round(2.484, 2)= and resume
diff --git a/getting_started_with_ipython/slides.tex b/getting_started_with_ipython/slides.tex
index e6e5222..be811c6 100644
--- a/getting_started_with_ipython/slides.tex
+++ b/getting_started_with_ipython/slides.tex
@@ -1,4 +1,4 @@
-% Created 2011-05-19 Thu 10:47
+% Created 2011-05-19 Thu 13:42
 \documentclass[presentation]{beamer}
 \usepackage[utf8]{inputenc}
 \usepackage[T1]{fontenc}
@@ -73,7 +73,7 @@ showstringspaces=false, keywordstyle=\color{blue}\bfseries}
 \end{itemize}
 \end{frame}
 \begin{frame}
-\frametitle{Question 1}
+\frametitle{Exercise 1}
 \label{sec-3}
 
 
@@ -83,13 +83,13 @@ showstringspaces=false, keywordstyle=\color{blue}\bfseries}
 \end{enumerate}
 \end{frame}
 \begin{frame}
-\frametitle{Question 2}
+\frametitle{Exercise 2}
 \label{sec-4}
 
   Look-up the documentation of \texttt{round} and see how to use it
 \end{frame}
 \begin{frame}[fragile]
-\frametitle{Question 3}
+\frametitle{Exercise 3}
 \label{sec-5}
 
   Check the output of
@@ -111,7 +111,7 @@ round(2.484, 2)
   We get 2.0, 2.5 and 2.48, which are what we expect. 
 \end{frame}
 \begin{frame}
-\frametitle{Question 4}
+\frametitle{Exercise 4}
 \label{sec-7}
 
 
diff --git a/multiple_plots/script.rst b/multiple_plots/script.rst
index d154ca5..0f52808 100644
--- a/multiple_plots/script.rst
+++ b/multiple_plots/script.rst
@@ -36,17 +36,22 @@ At the end of this tutorial, you will be able to,
  1. draw multiple plots which are overlaid. 
  #. use the figure command. 
  #. use the legend command 
- #. switch between the plots and perform some operations on each of them like
-    saving the plots.
+ #. switch between the plots and perform some operations on each of them 
+    like saving the plots.
  #. create and switch between subplots
  
 .. R3
 
+Before beginning this tutorial,we would suggest you to complete the 
+tutorial on "Using plot interactively" , "Embellishing a plot" and "Saving plots".
+
 To begin with let us start ipython with pylab, by typing ipython -pylab
 on the terminal.
 
 .. L3
 
+{{{ Show slide with pre-requisite }}}
+
 {{{ Shift to terminal and start ipython -pylab }}}
 
 ::
@@ -146,6 +151,10 @@ serial number.
 Now we can see the legends being displayed for the respective sine and
 cosine plots on the plot area.
 
+.. L11
+
+{{{ Show slide with exercise 1 }}}
+
 .. R11
 
 We have learnt quite a lot of things now, so let us take up an
@@ -157,13 +166,9 @@ exercise.Pause the video here,do the exercise and resume the video.
    colors to differentiate between the plots and use legends to
    indicate what each plot is doing.
 
-.. L11
-
-{{{ Show slide with question 1 }}}
-
-
 .. R12
 
+Switch to the terminal for solution.
 We can obtain the two plots in different colors using the following
 commands
 
@@ -246,8 +251,8 @@ figures.
 The figure command takes an integer as an argument which is the serial
 number of the plot. This selects the corresponding plot. All the plot
 commands we run hereafter are applied to the selected plot. In this
-example figure 1 is the sine plot and figure 2 is the cosine plot.For example,we can
-save each plot separately
+example figure 1 is the sine plot and figure 2 is the cosine plot.
+For example,we cansave each plot separately
 
 .. L19
 
@@ -269,16 +274,17 @@ the second plot.
 
 .. R20
 
-Let us attempt another exercise problem.Pause here,try to solve the problem and resume the video.
+Let us attempt another exercise problem.Pause here,try to solve the 
+problem and resume the video.
 
    Draw a line of the form y = x as one figure and another line
-   of the form y = 2x + 3. Switch back to the first figure, annotate
+   of the form y = 2x + 3. Switch back to the first figure,annotate
    the x and y intercepts. Now switch to the second figure and
    annotate its x and y intercepts. Save each of them.
 
 .. L20
 
-{{{ Show slide with question 2 }}}
+{{{ Show slide with exercise 2 }}}
  
 .. R21
 
@@ -311,11 +317,11 @@ the figure
 
 .. R23
 
-Now to switch between the figures we can use figure command. So let us now
-switch to figure 1. We are asked to annotate x and y intercepts of the
-figure 1, but since figure 1 passes through origin,this means, we will have to
-annotate the origin. We will annotate the intercepts for the second
-figure and save them as follows
+Now to switch between the figures we can use figure command. So let us 
+now switch to figure 1. We are asked to annotate x and y intercepts of 
+the figure 1, but since figure 1 passes through origin,this means, we
+will have to annotate the origin. We will annotate the intercepts for 
+the second figure and save them as follows
 
 .. L23
 
@@ -352,9 +358,9 @@ We use subplot command to accomplish this
 
 .. R25
 
-As we can see subplot command takes three arguments, the first being the number of
-rows of subplots that must be created,
-in this case we have 2 as the first argument so it spilts the plotting area horizontally for
+As we can see subplot command takes three arguments, the first being 
+the number ofrows of subplots that must be created,in this case we have 
+2 as the first argument so it spilts the plotting area horizontally for
 two subplots. The second argument specifies the number of coloumns of
 subplots that must be created. We passed 1 as the argument so the
 plotting area won't be split vertically and the last argument
@@ -409,7 +415,8 @@ x-axis varies from 0 to 10 and y-axis varies from 0 to 100.
 
 .. R28
 
-Let us try one more exercise.Pause the video here, try out the exercise and resume the video.
+Let us try one more exercise.Pause the video here, try out the exercise 
+and resume the video.
 
   We know that the Pressure, Volume and Temperatures are held by
   the equation PV = nRT where nR is a constant. Let us assume nR =0.01
@@ -420,7 +427,7 @@ Let us try one more exercise.Pause the video here, try out the exercise and resu
 
 .. L28
 
-{{{ Show slide with question 3 }}}
+{{{ Show slide with exercise 3 }}}
 
 .. R29
 
@@ -493,14 +500,14 @@ this data, we get the required plot
 
 .. R34
 
-This brings us to the end of another session.let's revise quickly what we have learnt today,
+This brings us to the end of this tutorial.In this tutorial,we have learnt to,
 
- 1. to draw multiple plots which are overlaid.
- #. to use the figure command.
- #. to use the legend command.
- #. to switch between the plots and perform some operations on each
+ 1. Draw multiple plots which are overlaid.
+ #. Use the figure command.
+ #. Use the legend command.
+ #. Switch between the plots and perform some operations on each
     of them like saving the plots.
- #. to create subplots and to switch between them.
+ #. Create subplots and to switch between them.
 
 .. L35
 
@@ -520,7 +527,7 @@ Here are some self assessment questions for you to solve
 
 .. L36
 
-(solution of self assessment questions on slide)
+{{{solution of self assessment questions on slide}}}
 
 .. R36
 
@@ -528,8 +535,9 @@ And the answers,
 
 1. The command "figure()" can get us the individual plots seperately.
 
-2. The subplot command takes three arguments namely the number of rows followed by the
-   the number of columns and the plot number.Hence the first option is correct.
+2. The subplot command takes three arguments namely the number of 
+   rows followed by the number of columns and the plot number.
+   Hence the first option is correct.
 
 .. L37
 
diff --git a/multiple_plots/slides.org b/multiple_plots/slides.org
index a6194a0..7057616 100644
--- a/multiple_plots/slides.org
+++ b/multiple_plots/slides.org
@@ -56,19 +56,25 @@
     saving the plots.
   - create and switch between subplots
 
-* Question1
+* Pre-requisite
+  Spoken tutorial on -
+  - Using plot interactively.
+  - Embellishing a plot.
+  - Saving plots.
+
+* Exercise 1
   - Draw two plots overlaid upon each other, with the first plot
     being a parabola of the form y = 4(x ^ 2) and the second being a
     straight line of the form y = 2x + 3 in the interval -5 to 5.
   - Use colors to differentiate between the plots and use legends to
     indicate what each plot is doing.
-* Question2
+* Exercise 2
   - Draw a line of the form y = x as one figure and another line
     of the form y = 2x + 3.
   - Switch back to the first figure, annotate the x and y intercepts.
   - Now switch to the second figure and annotate its x and y intercepts.
     Save each of them.
-* Question3
+* Exercise 3
   - We know that the Pressure, Volume and Temperatures are held by
     the equation PV = nRT where nR is a constant. Let us assume
     nR=0.01 Joules/Kelvin and T = 200K.
diff --git a/multiple_plots/slides.tex b/multiple_plots/slides.tex
index 538c6c9..3b472a9 100644
--- a/multiple_plots/slides.tex
+++ b/multiple_plots/slides.tex
@@ -1,4 +1,4 @@
-% Created 2011-05-03 Tue 11:51
+% Created 2011-05-19 Thu 13:47
 \documentclass[presentation]{beamer}
 \usepackage[utf8]{inputenc}
 \usepackage[T1]{fontenc}
@@ -43,14 +43,18 @@ showstringspaces=false, keywordstyle=\color{blue}\bfseries}
 \begin{frame}
 
 \begin{center}
-\textcolor{blue}{Multiple Plots}
+\vspace{12pt}
+\textcolor{blue}{\huge Multiple Plots }
 \end{center}
+\vspace{18pt}
 \begin{center}
-\includegraphics[scale=0.25]{../images/iitb-logo.png}\\
-Developed by FOSSEE Team, IIT-Bombay. \\ 
-Funded by National Mission on Education through ICT
-
-MHRD, Govt. of India
+\vspace{10pt}
+\includegraphics[scale=0.95]{../images/fossee-logo.png}\\
+\vspace{5pt}
+\scriptsize Developed by FOSSEE Team, IIT-Bombay. \\ 
+\scriptsize Funded by National Mission on Education through ICT\\
+\scriptsize  MHRD,Govt. of India\\
+\includegraphics[scale=0.30]{../images/iitb-logo.png}\\
 \end{center}
 \end{frame}
 \begin{frame}
@@ -69,9 +73,21 @@ MHRD, Govt. of India
 \end{itemize}
 \end{frame}
 \begin{frame}
-\frametitle{Question1}
+\frametitle{Pre-requisite}
 \label{sec-3}
 
+  Spoken tutorial on -
+
+\begin{itemize}
+\item Using plot interactively.
+\item Embellishing a plot.
+\item Saving plots.
+\end{itemize}
+\end{frame}
+\begin{frame}
+\frametitle{Exercise 1}
+\label{sec-4}
+
 
 \begin{itemize}
 \item Draw two plots overlaid upon each other, with the first plot
@@ -82,8 +98,8 @@ MHRD, Govt. of India
 \end{itemize}
 \end{frame}
 \begin{frame}
-\frametitle{Question2}
-\label{sec-4}
+\frametitle{Exercise 2}
+\label{sec-5}
 
 
 \begin{itemize}
@@ -95,8 +111,8 @@ MHRD, Govt. of India
 \end{itemize}
 \end{frame}
 \begin{frame}
-\frametitle{Question3}
-\label{sec-5}
+\frametitle{Exercise 3}
+\label{sec-6}
 
 
 \begin{itemize}
@@ -111,7 +127,7 @@ MHRD, Govt. of India
 \end{frame}
 \begin{frame}
 \frametitle{Summary}
-\label{sec-6}
+\label{sec-7}
 
   In this tutorial, we have learnt to –
 
@@ -125,8 +141,31 @@ MHRD, Govt. of India
 \end{itemize}
 \end{frame}
 \begin{frame}
-\frametitle{Acknowledgement}
-\label{sec-7}
+\frametitle{Evaluation}
+\label{sec-8}
+
+
+\begin{enumerate}
+\item What command is used to get individual plots separately?.
+\item Which of the following is correct.
+\begin{itemize}
+\item subplot(numRows, numCols, plotNum)
+\item subplot(numRows, numCols)
+\item subplot(numCols, numRows)
+\end{itemize}
+\end{enumerate}
+\end{frame}
+\begin{frame}
+\frametitle{Solutions}
+\label{sec-9}
+
+
+\begin{enumerate}
+\item figure()
+\item subplot(numRows, numCols, plotNum)
+\end{enumerate}
+\end{frame}
+\begin{frame}
 
   \begin{block}{}
   \begin{center}
diff --git a/saving_plots/script.rst b/saving_plots/script.rst
index ca8382a..a6a371d 100644
--- a/saving_plots/script.rst
+++ b/saving_plots/script.rst
@@ -47,11 +47,22 @@ At the end of this tutorial, you will be able to,
 
 .. R3
 
+Before beginning this tutorial,we would suggest you to complete the 
+tutorial on "Using plot interactively".
+
 Start your IPython interpreter with the command 
 ipython -pylab
+<Pause>
+
+As you know, it will start your IPython interpreter with the required
+python modules for plotting and saving your plots.
 
 .. L3
 
+{{{ Show slide with pre-requisite }}}
+
+{{{ Shift to terminal and start ipython -pylab }}}
+
 ::
 
     ipython -pylab
@@ -62,9 +73,6 @@ ipython -pylab
 
 .. R4
 
-As you know, it will start your IPython interpreter with the required
-python modules for plotting and saving your plots.
-
 To start with, let us plot a sine wave from minus 3 pi to 3 pi.
 Let us start by calculating the required points for the plot. It
 can be done using linspace as, 
@@ -100,8 +108,8 @@ reports.
 
 .. R7
 
-For saving the plot, we will use ``savefig()`` function.For this we shall keep the 
-plot window open alongside the terminal. The statement is, 
+For saving the plot, we will use ``savefig()`` function.For this we shall 
+keep the plot window open alongside the terminal. The statement is, 
 
 .. L8
 
@@ -136,9 +144,9 @@ want to save the file.
 Here we have used an extension ``.png`` which means we want to save the
 image as a PNG file.
 
-Now let us locate the file ``sine.png`` which we had saved a while ago.We have saved the file to
-``/home/fossee`` so let us navigate to ``/home/fossee`` using the
-file browser.
+Now let us locate the file ``sine.png`` which we had saved a while ago.
+We have saved the file to ``/home/fossee`` so let us navigate to 
+``/home/fossee`` using thefile browser.
 
 .. L11
 
@@ -171,7 +179,10 @@ support transparency etc.
 
 .. R13
 
-Save the sine plot in the EPS format which can be embedded in LaTeX documents.
+Pause the video here, try out the following exercise and resume the video.
+
+Save the sine plot in the EPS format which can be embedded in 
+LaTeX documents.
 
 .. L14
 
@@ -217,7 +228,9 @@ Yes! the new file ``sine.eps`` is here.
 
 .. R18
 
-Now you may try saving the same in pdf, ps, svg formats.
+Pause the video here, try out the following exercise and resume the video.
+
+Save the sine plot in PDF, PS and SVG formats.
 
 .. L19
 
@@ -225,17 +238,15 @@ Now you may try saving the same in pdf, ps, svg formats.
 
 .. R19
 
-This brings us to the end of this tutorial,
-let's revise quickly what we have learnt today
+This brings us to the end of this tutorial.In this tutorial,we have learnt to,
 
- 1. to save plots using the ``savefig()`` function.
- #. to save the plots in different formats like
+ 1. Save plots using the ``savefig()`` function.
+ #. Save the plots in different formats like
     - pdf
     - ps
     - png
     - svg
     - eps
- #. to locate files in the file system.
 
 .. R20
 
@@ -263,7 +274,7 @@ Here are some self assessment questions for you to solve
 
 .. L21
 
-(solution of self assessment questions on slide)
+{{{solution of self assessment questions on slide}}}
 
 .. R21
 
diff --git a/saving_plots/slides.org b/saving_plots/slides.org
index 26febd2..358c3ee 100644
--- a/saving_plots/slides.org
+++ b/saving_plots/slides.org
@@ -51,6 +51,9 @@
   - Save plots using ``savefig()`` function.
   - Save plots in different formats.
   
+* Pre-requisite
+  Spoken tutorial on -
+  - Using plot interactively.
 * Creating a basic plot
   Plot a sine wave from -3pi to 3pi.
   #+begin_src python
@@ -78,9 +81,9 @@
     ~vector graphics~
 *** .png - Portable Network Graphics
     ~supports transparency~
-* Question 1
+* Exercise 1
   Save the sine plot in the format EPS which can be embedded in LaTeX documents.
-* Question 2
+* Exercise 2
   Save the sine plot in PDF, PS and SVG formats.
 
 * Summary
diff --git a/saving_plots/slides.tex b/saving_plots/slides.tex
index 5e37bc2..62c4a67 100644
--- a/saving_plots/slides.tex
+++ b/saving_plots/slides.tex
@@ -1,4 +1,4 @@
-% Created 2011-05-03 Tue 14:50
+% Created 2011-05-19 Thu 13:28
 \documentclass[presentation]{beamer}
 \usepackage[utf8]{inputenc}
 \usepackage[T1]{fontenc}
@@ -43,14 +43,18 @@ showstringspaces=false, keywordstyle=\color{blue}\bfseries}
 \begin{frame}
 
 \begin{center}
-\textcolor{blue}{Saving Plots}
+\vspace{12pt}
+\textcolor{blue}{\huge Saving Plots}
 \end{center}
+\vspace{18pt}
 \begin{center}
-\includegraphics[scale=0.25]{../images/iitb-logo.png}\\
-Developed by FOSSEE Team, IIT-Bombay. \\ 
-Funded by National Mission on Education through ICT
-
-MHRD, Govt. of India
+\vspace{10pt}
+\includegraphics[scale=0.95]{../images/fossee-logo.png}\\
+\vspace{5pt}
+\scriptsize Developed by FOSSEE Team, IIT-Bombay. \\ 
+\scriptsize Funded by National Mission on Education through ICT\\
+\scriptsize  MHRD,Govt. of India\\
+\includegraphics[scale=0.30]{../images/iitb-logo.png}\\
 \end{center}
 \end{frame}
 \begin{frame}
@@ -65,9 +69,19 @@ MHRD, Govt. of India
 \end{itemize}
   
 \end{frame}
+\begin{frame}
+\frametitle{Pre-requisite}
+\label{sec-3}
+
+  Spoken tutorial on -
+
+\begin{itemize}
+\item Using plot interactively.
+\end{itemize}
+\end{frame}
 \begin{frame}[fragile]
 \frametitle{Creating a basic plot}
-\label{sec-3}
+\label{sec-4}
 
   Plot a sine wave from -3pi to 3pi.
 \lstset{language=Python}
@@ -79,22 +93,22 @@ In []: plot(x, sin(x))
 \end{frame}
 \begin{frame}[fragile]
 \frametitle{savefig()}
-\label{sec-4}
+\label{sec-5}
 \begin{itemize}
 
 \item savefig() - to save plots
-\label{sec-4_1}%
+\label{sec-5_1}%
 \begin{verbatim}
     syntax: savefig(fname)
 \end{verbatim}
 
 
 \item example
-\label{sec-4_2}%
+\label{sec-5_2}%
 \begin{itemize}
 
 \item savefig('/home/fossee/sine.png')\\
-\label{sec-4_2_1}%
+\label{sec-5_2_1}%
 \begin{itemize}
 \item file sine.png saved to the folder /home/fossee
 \item .png - file type
@@ -105,52 +119,52 @@ In []: plot(x, sin(x))
 \end{frame}
 \begin{frame}
 \frametitle{More on savefig()}
-\label{sec-5}
+\label{sec-6}
 \begin{itemize}
 
 \item Recall\\
-\label{sec-5_1}%
+\label{sec-6_1}%
 \begin{itemize}
 \item .png - file type
 \end{itemize}
 
 \item File types supported
-\label{sec-5_2}%
+\label{sec-6_2}%
 \begin{itemize}
 
 \item .pdf - PDF(Portable Document Format)\\
-\label{sec-5_2_1}%
+\label{sec-6_2_1}%
 \item .ps - PS(Post Script)\\
-\label{sec-5_2_2}%
+\label{sec-6_2_2}%
 \item .eps - Encapsulated Post Script\\
-\label{sec-5_2_3}%
+\label{sec-6_2_3}%
 \verb~to be used with~ \LaTeX{} \verb~documents~
 
 \item .svg - Scalable Vector Graphics\\
-\label{sec-5_2_4}%
+\label{sec-6_2_4}%
 \verb~vector graphics~
 
 \item .png - Portable Network Graphics\\
-\label{sec-5_2_5}%
+\label{sec-6_2_5}%
 \verb~supports transparency~
 \end{itemize} % ends low level
 \end{itemize} % ends low level
 \end{frame}
 \begin{frame}
 \frametitle{Exercise 1}
-\label{sec-6}
+\label{sec-7}
 
   Save the sine plot in the format EPS which can be embedded in \LaTeX{} documents.
 \end{frame}
 \begin{frame}
 \frametitle{Exercise 2}
-\label{sec-7}
+\label{sec-8}
 
   Save the sine plot in PDF, PS and SVG formats.
 \end{frame}
 \begin{frame}
 \frametitle{Summary}
-\label{sec-8}
+\label{sec-9}
 
   In this tutorial, we have learnt to –
 
@@ -162,14 +176,45 @@ In []: plot(x, sin(x))
 \item ps
 \item png
 \item svg
-\item epg
+\item eps
 \end{itemize}
 \item Locate files in the file system.
 \end{itemize}
 \end{frame}
 \begin{frame}
-\frametitle{Acknowledgement}
-\label{sec-9}
+\frametitle{Evaluation}
+\label{sec-10}
+
+
+\begin{enumerate}
+\item Which command is used to save a plot.
+\begin{itemize}
+\item saveplot()
+\item savefig()
+\item savefigure()
+\item saveplt()
+\end{itemize}
+\item ``savefig(`sine.png')`` saves the plot in,
+\begin{itemize}
+\item The root directory ``/`` (on GNU/Linux, Unix based systems),
+       ``c:\`` (on windows).
+\item Will result in an error as full path is not supplied.
+\item The current working directory.
+\item Predefined directory like ``/documents``.
+\end{itemize}
+\end{enumerate}
+\end{frame}
+\begin{frame}
+\frametitle{Solutions}
+\label{sec-11}
+
+
+\begin{enumerate}
+\item savefig()
+\item The current working directory
+\end{enumerate}
+\end{frame}
+\begin{frame}
 
   \begin{block}{}
   \begin{center}
diff --git a/template/.#slides.tex b/template/.#slides.tex
new file mode 120000
index 0000000..e41ec67
--- /dev/null
+++ b/template/.#slides.tex
@@ -0,0 +1 @@
+jovina@endymion.16688:1304395849
\ No newline at end of file
diff --git a/template/script.rst b/template/script.rst
index 6988d24..d3c81b6 100644
--- a/template/script.rst
+++ b/template/script.rst
@@ -24,7 +24,14 @@ Hello Friends. Welcome to the tutorial on (topic of the tutorial)
 
 
 {{{ show the objective slide }}}
+At the end of this tutorial, you will be able to,
+ 1.
+ #.
+ #.
 
+{{{ Show pre-requisite slide }}}
+Before beginning this tutorial,we would suggest you to complete the 
+tutorial on "(topic of tutorial)".
 
 
 Small chunk of content/concept is explained.{clear and concise}
@@ -54,8 +61,10 @@ Pause the video here, try out the following exercise and resume the video.
 
 
 {{{ Show summary slide }}}
-This brings us to the end of the tutorial.In this tutorial,we have learnt to,
-
+This brings us to the end of this tutorial.In this tutorial,we have learnt to,
+ 1. 
+ #.
+ #.
 
 
 {{{Show the self assessment questions slide}}}
diff --git a/template/slides.org b/template/slides.org
index 1eec6a9..c83960b 100644
--- a/template/slides.org
+++ b/template/slides.org
@@ -19,7 +19,7 @@
 #+LaTeX_HEADER:  commentstyle=\color{red}\itshape, stringstyle=\color{darkgreen},
 #+LaTeX_HEADER:  showstringspaces=false, keywordstyle=\color{blue}\bfseries}
 
-#+TITLE:    Accessing parts of arrays
+#+TITLE:    
 #+AUTHOR:    FOSSEE
 #+EMAIL:     
 #+DATE:    
@@ -30,93 +30,65 @@
 #+OPTIONS:   H:3 num:nil toc:nil \n:nil @:t ::t |:t ^:t -:t f:t *:t <:t
 #+OPTIONS:   TeX:t LaTeX:nil skip:nil d:nil todo:nil pri:nil tags:not-in-toc
 
-* Outline
-  - Manipulating one and multi dimensional arrays
-  - Access and change individual elements 
-  - Access and change rows and columns 
-  - Slicing and striding on arrays to access chunks 
-  - Read images into arrays and manipulations
-* Sample Arrays
-  #+begin_src python
-    In []: A = array([12, 23, 34, 45, 56])
-    
-    In []: C = array([[11, 12, 13, 14, 15],
-                      [21, 22, 23, 24, 25],
-                      [31, 32, 33, 34, 35],
-                      [41, 42, 43, 44, 45],
-                      [51, 52, 53, 54, 55]])
-    
-  #+end_src
-* Question 1
-  Change the last column of ~C~ to zeroes. 
+* 
+#+begin_latex
+\begin{center}
+\vspace{12pt}
+\textcolor{blue}{\huge Your Title Here}
+\end{center}
+\vspace{18pt}
+\begin{center}
+\vspace{10pt}
+\includegraphics[scale=0.95]{../images/fossee-logo.png}\\
+\vspace{5pt}
+\scriptsize Developed by FOSSEE Team, IIT-Bombay. \\ 
+\scriptsize Funded by National Mission on Education through ICT\\
+\scriptsize  MHRD,Govt. of India\\
+\includegraphics[scale=0.30]{../images/iitb-logo.png}\\
+\end{center}
+#+end_latex
+* Objectives
+  -
+  -
+* Title of slide
+  Description of a topic in short(optional)
+* Exercise 1
+  - 
 * Solution 1
-  #+begin_src python
-    In []:  C[:, -1] = 0
-  #+end_src
-* Question 2
-  Change ~A~ to ~[11, 12, 13, 14, 15]~. 
+  - Solution either on terminal or slide
+* Exercise 2
+  -
 * Solution 2
-  #+begin_src python
-    In []:  A[:] = [11, 12, 13, 14, 15]
-  #+end_src
-* squares.png
-  #+begin_latex
-    \begin{center}
-      \includegraphics[scale=0.6]{squares}    
-    \end{center}
-  #+end_latex
-* Question 3
-  - obtain ~[22, 23]~ from ~C~. 
-  - obtain ~[11, 21, 31, 41]~ from ~C~. 
-  - obtain ~[21, 31, 41, 0]~.   
-* Solution 3
-  #+begin_src python
-    In []:  C[1, 1:3]
-    In []:  C[0:4, 0]
-    In []:  C[1:5, 0]
-  #+end_src
-* Question 4
-  Obtain ~[[23, 24], [33, -34]]~ from ~C~
-* Solution 4
-  #+begin_src python
-    In []:  C[1:3, 2:4]
-  #+end_src
-* Question 5
-  Obtain the square in the center of the image
-* Solution 5
-  #+begin_src python
-    In []: imshow(I[75:225, 75:225])
-  #+end_src
-* Question 6
-  Obtain the following
-  #+begin_src python
-    [[12, 0], [42, 0]]
-    [[12, 13, 14], [0, 0, 0]]
-  #+end_src
-
-* Solution 6
-  #+begin_src python
-    In []: C[::3, 1::3]
-    In []: C[::4, 1:4]
-  #+end_src
+  - Solution either on terminal or slide
 * Summary
-  You should now be able to --
-  - Manipulate 1D \& Multi dimensional arrays
-      - Access and change individual elements 
-      - Access and change rows and columns 
-      - Slice and stride on arrays
-  - Read images into arrays and manipulate them.
-* Thank you!
+  In this tutorial, we have learnt to –
+  -
+  -
+  -
+  In this tutorial,we have learnt to -
+  -
+  -
+* Evaluation
+  Put self-assessment questions here
+  1.
+  2.
+  3.
+* Solutions
+  Put answers to the self-assessment questions here
+  1.
+  2.
+  3.
+* 
 #+begin_latex
   \begin{block}{}
   \begin{center}
-  This spoken tutorial has been produced by the
-  \textcolor{blue}{FOSSEE} team, which is funded by the 
+  \textcolor{blue}{\Large THANK YOU!} 
   \end{center}
+  \end{block}
+\begin{block}{}
   \begin{center}
-    \textcolor{blue}{National Mission on Education through \\
-      Information \& Communication Technology \\ 
-      MHRD, Govt. of India}.
+    For more Information, visit our website\\
+    \url{http://fossee.in/}
   \end{center}  
   \end{block}
 #+end_latex
diff --git a/template/slides.tex b/template/slides.tex
index df1462c..c921bd7 100644
--- a/template/slides.tex
+++ b/template/slides.tex
@@ -1,106 +1,153 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%Tutorial slides on Python.
-%
-% Author: FOSSEE 
-% Copyright (c) 2009, FOSSEE, IIT Bombay
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\documentclass[14pt,compress]{beamer}
-%\documentclass[draft]{beamer}
-%\documentclass[compress,handout]{beamer}
-%\usepackage{pgfpages} 
-%\pgfpagesuselayout{2 on 1}[a4paper,border shrink=5mm]
-
-% Modified from: generic-ornate-15min-45min.de.tex
-\mode<presentation>
-{
-  \usetheme{Warsaw}
-  \useoutertheme{infolines}
-  \setbeamercovered{transparent}
-}
-
-\usepackage[english]{babel}
-\usepackage[latin1]{inputenc}
-%\usepackage{times}
+% Created 2011-05-19 Thu 13:20
+\documentclass[presentation]{beamer}
+\usepackage[AUTO]{inputenc}
 \usepackage[T1]{fontenc}
-
-\usepackage{ae,aecompl}
-\usepackage{mathpazo,courier,euler}
-\usepackage[scaled=.95]{helvet}
-
-\definecolor{darkgreen}{rgb}{0,0.5,0}
-
+\usepackage{fixltx2e}
+\usepackage{graphicx}
+\usepackage{longtable}
+\usepackage{float}
+\usepackage{wrapfig}
+\usepackage{soul}
+\usepackage{textcomp}
+\usepackage{marvosym}
+\usepackage{wasysym}
+\usepackage{latexsym}
+\usepackage{amssymb}
+\usepackage{hyperref}
+\tolerance=1000
+\usepackage[english]{babel} \usepackage{ae,aecompl}
+\usepackage{mathpazo,courier,euler} \usepackage[scaled=.95]{helvet}
 \usepackage{listings}
-\lstset{language=Python,
-    basicstyle=\ttfamily\bfseries,
-    commentstyle=\color{red}\itshape,
-  stringstyle=\color{darkgreen},
-  showstringspaces=false,
-  keywordstyle=\color{blue}\bfseries}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Macros
-\setbeamercolor{emphbar}{bg=blue!20, fg=black}
-\newcommand{\emphbar}[1]
-{\begin{beamercolorbox}[rounded=true]{emphbar} 
-      {#1}
- \end{beamercolorbox}
-}
-\newcounter{time}
-\setcounter{time}{0}
-\newcommand{\inctime}[1]{\addtocounter{time}{#1}{\tiny \thetime\ m}}
-
-\newcommand{\typ}[1]{\lstinline{#1}}
-
-\newcommand{\kwrd}[1]{ \texttt{\textbf{\color{blue}{#1}}}  }
-
-% Title page
-\title{Your Title Here}
-
-\author[FOSSEE] {FOSSEE}
-
-\institute[IIT Bombay] {Department of Aerospace Engineering\\IIT Bombay}
+\lstset{language=Python, basicstyle=\ttfamily\bfseries,
+commentstyle=\color{red}\itshape, stringstyle=\color{darkgreen},
+showstringspaces=false, keywordstyle=\color{blue}\bfseries}
+\providecommand{\alert}[1]{\textbf{#1}}
+
+\title{}
+\author{FOSSEE}
 \date{}
 
-% DOCUMENT STARTS
 \begin{document}
 
+
+
+
+
+
+
+
+
+
+
+
 \begin{frame}
-  \maketitle
+
+\begin{center}
+\vspace{12pt}
+\textcolor{blue}{\huge Your Title Here}
+\end{center}
+\vspace{18pt}
+\begin{center}
+\vspace{10pt}
+\includegraphics[scale=0.95]{../images/fossee-logo.png}\\
+\vspace{5pt}
+\scriptsize Developed by FOSSEE Team, IIT-Bombay. \\ 
+\scriptsize Funded by National Mission on Education through ICT\\
+\scriptsize  MHRD,Govt. of India\\
+\includegraphics[scale=0.30]{../images/iitb-logo.png}\\
+\end{center}
 \end{frame}
+\begin{frame}
+\frametitle{Objectives}
+\label{sec-2}
 
-\begin{frame}[fragile]
-  \frametitle{Outline}
-  \begin{itemize}
-    \item 
-  \end{itemize}
+
+\begin{itemize}
+\item 
+\item  
+\end{itemize}
 \end{frame}
+\begin{frame}
+\frametitle{Title of slide}
+\label{sec-3}
+
+  Description of a topic in short(optional)
+\end{frame}
+\begin{frame}
+\frametitle{Question 1}
+\label{sec-4}
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%              All other slides here.                  %%
-%% The same slides will be used in a classroom setting. %% 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\begin{frame}[fragile]
-  \frametitle{Summary}
-  \begin{itemize}
-    \item 
-  \end{itemize}
+\begin{itemize}
+\item 
+\end{itemize}
 \end{frame}
+\begin{frame}
+\frametitle{Solution 1}
+\label{sec-5}
+
 
+\begin{itemize}
+\item Solution either on terminal or slide
+\end{itemize}
+\end{frame}
 \begin{frame}
-  \frametitle{Thank you!}  
-  \begin{block}{}
-  \begin{center}
-  This spoken tutorial has been produced by the
-  \textcolor{blue}{FOSSEE} team, which is funded by the 
-  \end{center}
-  \begin{center}
-    \textcolor{blue}{National Mission on Education through \\
-      Information \& Communication Technology \\ 
-      MHRD, Govt. of India}.
-  \end{center}  
-  \end{block}
+\frametitle{Question 2}
+\label{sec-6}
 \end{frame}
+\begin{frame}
+\frametitle{Solution 2}
+\label{sec-7}
+
 
-\end{document}
+\begin{itemize}
+\item Solution either on terminal or slide
+\end{itemize}
+\end{frame}
+\begin{frame}
+\frametitle{Summary}
+\label{sec-8}
+
+In this tutorial,we have learnt to -
+\begin{itemize}
+\item
+\item
+\end{itemize}
+\end{frame}
+\begin{frame}
+\frametitle{Evaluation}
+\label{sec-9}
+
+Put self-assessment questions here
+\begin{enumerate}
+1.
+2.
+3.
+\end{enumerate}
+\end{frame}
+\begin{frame}
+\frametitle{Solutions}
+\label{sec-10}
+
+Put answers to the self-assessment questions here
+\begin{enumerate}
+1.
+2.
+3.
+\end{enumerate}
+\end{frame}
+\begin{frame}
+\frametitle{}
+\label{sec-11}
+
+\begin{block}{}
+\begin{center}
+\textcolor{blue}{\Large THANK YOU!} 
+\end{center}
+\end{block}
+\begin{block}{}
+ \begin{center}
+    For more Information, visit our website\\
+    \url{http://fossee.in/}
+  \end{center}  
+\end{block}
\ No newline at end of file
diff --git a/using_plot_interactively/script.rst b/using_plot_interactively/script.rst
index f38d24e..85704c3 100644
--- a/using_plot_interactively/script.rst
+++ b/using_plot_interactively/script.rst
@@ -257,7 +257,7 @@ The last one is 'home' referring to the initial plot.
 
 .. L22
 
-{{{Show slide with question 1}}}
+{{{Show slide with exercise 1}}}
 
 .. R22
 
@@ -275,23 +275,25 @@ Pause the video here, try out the following exercise and resume the video.
 
 .. R23
 
-Let's revise quickly what we have learnt today 
+This brings us to the end of this tutorial.In this tutorial,we have learnt to,
 
- 1. To Start Ipython with pylab. 
- #. To Use the linspace function to create `num` equally spaced points 
+ 1. Start Ipython with pylab. 
+ #. Use the linspace function to create `num` equally spaced points 
     in a region.
- #. To Find the length of sequences using len function.
- #. To Plot mathematical functions using plot.
- #. To Clear drawing area using clf. 
- #. To Use the UI of plot for studying it better and using 
+ #. Find the length of sequences using len function.
+ #. Plot mathematical functions using plot.
+ #. Clear drawing area using clf. 
+ #. Use the UI of plot for studying it better and using 
     functionalities like save,zoom and moving the plots on x and y axis. 
 
 .. L24
 
-{{Show self assessment questions slide}}
+{{{Show self assessment questions slide}}}
 
 .. R24
 
+Here are some self assessment questions for you to solve
+
 1. Create 100 equally spaced points between -pi/2 and pi/2?
 
 2. What will the command ''linspace(-pi,pi,100)'' do.
diff --git a/using_plot_interactively/slides.org b/using_plot_interactively/slides.org
index 0d32b59..df1d97a 100644
--- a/using_plot_interactively/slides.org
+++ b/using_plot_interactively/slides.org
@@ -66,7 +66,7 @@
   - Back and Forward Button
   - Home
 
-* Question 1
+* Exercise 1
   Plot (sin(x)*sin(x))/x.
   1. Save the plot by the sinsquarebyx.pdf in pdf format.
   2. Zoom and find the maxima.
diff --git a/using_plot_interactively/slides.tex b/using_plot_interactively/slides.tex
index c39ed84..f26abeb 100644
--- a/using_plot_interactively/slides.tex
+++ b/using_plot_interactively/slides.tex
@@ -1,4 +1,4 @@
-% Created 2011-05-18 Wed 15:15
+% Created 2011-05-19 Thu 13:44
 \documentclass[presentation]{beamer}
 \usepackage[latin1]{inputenc}
 \usepackage[T1]{fontenc}
@@ -92,7 +92,7 @@ showstringspaces=false, keywordstyle=\color{blue}\bfseries}
 \end{itemize}
 \end{frame}
 \begin{frame}
-\frametitle{Question 1}
+\frametitle{Exercise 1}
 \label{sec-5}
 
   Plot (sin(x)*sin(x))/x.
@@ -151,7 +151,11 @@ showstringspaces=false, keywordstyle=\color{blue}\bfseries}
 
 \begin{enumerate}
 \item linspace(-pi/2,pi/2,100)
-\item returns 100 evenly spaced samples from -pi to pi including both -pi and pi
+\item 
+\end{enumerate}
+returns 100 evenly spaced samples from -pi to pi including both -pi and pi
+
+\begin{enumerate}
 \item len(sequence\_name)
 \end{enumerate}
 \end{frame}