merged branches 2011
authorPrimal Pappachan <primal007@gmail.com>
Thu, 01 Dec 2011 19:05:43 +0530
branch2011
changeset 473 5610783f66d6
parent 472 c8068bc1d7c3 (diff)
parent 466 bbb9a44c0c14 (current diff)
child 474 83ea39f44032
merged branches
project/templates/about/tutorial.html
--- a/project/templates/about/tutorial.html	Thu Dec 01 15:17:45 2011 +0530
+++ b/project/templates/about/tutorial.html	Thu Dec 01 19:05:43 2011 +0530
@@ -13,7 +13,7 @@
 <tr><th scope="col" class="right">Time</th><th scope="col" class="left">Speaker</th><th scope="col" class="left">Title</th></tr>
 </thead>
 <tbody>
-<tr><td class="right">09:00-11:00</td><td class="left">Jarrod Millman</td><td class="left"><a href="#sec2.1" >Git/Github + NumPy/SciPy/MPL basics</a></td></tr>
+<tr><td class="right">09:00-11:00</td><td class="left">Jarror Millman</td><td class="left"><a href="#sec2.1" >Gig/Github + NumPy/SciPy/MPL basics</a></td></tr>
 <tr><td class="right">11:00-13:00</td><td class="left">Emmanuelle Gouillart</td><td class="left"><a href="#sec2.2">Image processing using NumPy, SciPy and scikits-image</a></td></tr>
 <tr><td class="right">13:00-14:00</td><td class="left"></td><td class="left">Lunch</td></tr>
 <tr><td class="right">14:00-16:00</td><td class="left">Gael Varoquaux</td><td class="left"><a href="#sec2.3">Machine learning with scikit-learn</a></td></tr>
@@ -207,19 +207,19 @@
 	maps.
 	</li>
 	<li>
-	This tutorial will give a practical introduction to tools and techniques
+	T This tutorial will give a practical introduction to tools and techniques
  	available for processing spatial information and, through hands-on
-	exercises, give the participants a sense of how to manipulate spatial data
-	using Python. Depending on time, topics covered include reading and writing
-	of important data formats for both raster and vector data, looking at the
+	 exercises, give the participants a sense of how to manipulate spatial data
+	 using Python. Depending on time, topics covered include reading and writing
+	 of important data formats for both raster and vector data, looking at the
  	layers with qgis, awareness of issues with datums and projections,
  	calculating area and centroids of polygons, performance enhancement using
  	vector operations, numerical stability issues, calculation of distance
-	between points on the surface of Earth, interpolation from raster grids to
-	points etc. The tutorial has been developed for Ubuntu Linux 11.04/11.10 and
-	will provide source code, tests and data for this platform. However, the
-	content and messages should be general and apply to any self-respecting
-	platform.
+	 between points on the surface of Earth, interpolation from raster grids to
+	 points etc. The tutorial has been developed for Ubuntu Linux 11.04/11.10 and
+	 will provide source code, tests and data for this platform. However, the
+	 content and messages should be general and apply to any self-respecting
+	 platform.
 	</li>
 	<li>
 	I assume that participants know how to write and run Python scripts and are
@@ -228,9 +228,9 @@
  	Geographic Information Systems (GIS). The tutorial depends on the
  	packages qgis and gdal-bin as well as the python dependencies python-numpy
  	and python-gdal which are preloaded on the distributed live-DVD. The
- 	tutorial material itself will be available in the 
-	<a href="http://oles-tutorials.googlecode.com/svn/trunk/scipy2011">Subversion repository</a> 
-	and also on a usb stick that I will bring along.		
+ 	tutorial material itself will be available in the Subversion repository
+ 	http://oles-tutorials.googlecode.com/svn/trunk/scipy2011 and also on a USB
+ 	stick that I will bring along.		
 	</li>
 	<li>
 	If you have some spatial data you want to manipulate in Python feel free to
@@ -239,7 +239,6 @@
 </ul>
 
 
-
 <h3 id="sec2.6">Eric Jones: Traits + Traits UI (2 hrs)</h3> 
 <ul>
 	<li>