# HG changeset patch
# User primal primal007@gmail.com
# Date 1315739793 -19800
# Node ID bf3ce37fb45bbf37c6090d11899bbac329350c91
# Parent  fe49720e67bfe15fbbfb0193bf0e2d86374a2f90# Parent  c4ab8f8a08003da1ac1852f4f7b491f53da2daf6
Test Commit

diff -r fe49720e67bf -r bf3ce37fb45b project/templates/_menu.html
--- a/project/templates/_menu.html	Sun Sep 11 16:34:54 2011 +0530
+++ b/project/templates/_menu.html	Sun Sep 11 16:46:33 2011 +0530
@@ -23,7 +23,7 @@
     <a href="/{{ params.scope }}/about/dates/">Important Dates</a>
     </li>
     <li>
-      Conference & CfP
+      Conference & CFP
       <ul>
         <li>
           <a href="/{{ params.scope }}/talks-cfp/">Call for Papers</a>
@@ -33,11 +33,11 @@
             Schedule
           </a>
         </li>
-	<li>
+		<!-- <li>
           <a href="/{{ params.scope }}/talks-cfp/conference/">
             Conference
           </a>
-        </li>
+        </li> -->
         <!--
             <li>
               <a href="/{{ params.scope }}/talks-cfp/tutorial/">
diff -r fe49720e67bf -r bf3ce37fb45b project/templates/talk/schedule.html
--- a/project/templates/talk/schedule.html	Sun Sep 11 16:34:54 2011 +0530
+++ b/project/templates/talk/schedule.html	Sun Sep 11 16:46:33 2011 +0530
@@ -1,20 +1,18 @@
 {% extends "base.html" %}
 {% block content %}
-<h1>SciPy.in 2010 Schedule</h1>
-<p>SciPy.in is a 6-day programme from December 13th upto December 18th, of 2010
-comprising of two days of conference, three days of tutorials followed by corresponding sprints and a day dedicated completely to sprints.</p>
+<h1>SciPy.in 2011 Schedule</h1>
+<p>SciPy.in is a 4-day programme from December 4th upto December 7th, of 2011
+comprising of two days of conference, one day of tutorials followed by corresponding sprints and a day dedicated completely to sprints.</p>
 
 
     <strong>Over all break up of activites</strong>
 
     <table cellspacing="5">
       <tr> <td align=center><strong>Date</strong></td><td><strong>Activity</strong></td> </tr>
-      <tr > <td align=right>Monday, Dec. 13 2010</td><td><a href="/{{ params.scope }}/talks-cfp/conference/">Conference</a></td> </tr>
-      <tr> <td align=right>Tuesday, Dec. 14 2010</td><td><a href="/{{ params.scope }}/talks-cfp/conference/">Conference</a></td> </tr>
-      <tr> <td align=right>Wednesday, Dec. 15 2010</td><td><a href="/{{ params.scope }}/tutorial/">Tutorials</a>/<a href="/{{ params.scope }}/sprints/">Sprint</a></td> </tr>
-      <tr> <td align=right>Thursday, Dec. 16 2010</td><td><a href="/{{ params.scope }}/tutorial/">Tutorials</a>/<a href="/{{ params.scope }}/sprints/">Sprint</a></td> </tr>
-      <tr> <td align=right>Friday, Dec. 17 2010</td><td><a href="/{{ params.scope }}/tutorial/">Tutorials</a>/<a href="/{{ params.scope }}/sprints/">Sprint</a></td> </tr>
-      <tr> <td align=right>Saturday, Dec. 18 2010</td><td><a href="/{{ params.scope }}/sprints/">Full Sprint</a></td> </tr>
+      <tr > <td align=right>Sunday, Dec. 04 2011</td><td><a href="/{{ params.scope }}/talks-cfp/conference/">Conference</a></td> </tr>
+      <tr> <td align=right>Munday, Dec. 05 2011</td><td><a href="/{{ params.scope }}/talks-cfp/conference/">Conference</a></td> </tr>
+      <tr> <td align=right>Tuesday, Dec. 06 2011</td><td><a href="/{{ params.scope }}/tutorial/">Tutorials</a>/<a href="/{{ params.scope }}/sprints/">Sprint</a></td> </tr>
+      <tr> <td align=right>Wednesday, Dec. 07 2011</td><td><a href="/{{ params.scope }}/sprints/">Full Sprint</a></td> </tr>
     </table>
 <br />