Merge branch 'hotfix-2015.2'

README.md

@@ -2,7 +2,7 @@
 
 This project generates the website for the CS4HS Conference held at the University of Canterbury, New Zealand located at [cosc.canterbury.ac.nz/cs4hs](http://www.cosc.canterbury.ac.nz/cs4hs/index.html).
 
-**Current Version:** 2015.1 (CS4HS 2015 pre-conference)
+**Current Version:** 2015.2 (CS4HS 2015 pre-conference)
 
 ## Overview
 

about.html

@@ -19,7 +19,7 @@ <h4>Previous Conference Websites</h4>
 
   <h4>Other New Zealand CS4HS Conferences</h4>
   <p><a href="http://cs4hs.unitec.ac.nz/"><strong>Auckland</strong> - Date TBA</a></p>
-  <p><a href="http://ecs.victoria.ac.nz/Events/CS4HS2015"><strong>Wellington</strong> - Date TBA</a></p>
+  <p><a href="http://ecs.victoria.ac.nz/Events/CS4HS2015"><strong>Wellington</strong> - Wed 9th Dec to Fri 11th Dec</a></p>
   <p><a href="http://robocupjunior.org.nz/regions/teacher_workshops.php"><strong>Dunedin</strong> - Various dates</a></p>
 
   <h4>Contacts</h4>

register.html

@@ -7,7 +7,7 @@
   <h2>Register</h2>
 
   <p>
-    Registrations will be sent out to those on the waiting list in August 2015 (<a href="#waitlist">add your name to the waitlist here</a>). Funded places in this event are limited and first-in first-served so please add yourself to the waitlist as early as possible. It's ok to fine-tune parts of registration later e.g. changing the exact number of nights you'll be staying, contact <a href="mailto:[email protected]">Jack Morgan</a> if you need to change your registration.
+    Registrations will be sent out to those on the waiting list in August 2015 (<a href="#waitlist">add your name to the waitlist here</a>). Funded places in this event are limited and are offered on a first-in first-served basis so please add yourself to the waitlist as early as possible. It's ok to fine-tune parts of registration later e.g. changing the exact number of nights you'll be staying, contact <a href="mailto:[email protected]">Jack Morgan</a> if you need to change your registration.
   </p>
 
   <div class="panel radius clearfix">

workshops.html

@@ -28,9 +28,9 @@ <h2>Workshops</h2>
       Workshops events are subject to change.<a href="#" class="close">&times;</a>
   </div>
 
-  <h2 id="programming-workshops">Programming Workshops</h2>
+  <h2 id="programming-workshops">Programming Workshops (Optional)</h2>
 
-  <p>These workshops focus on learning the programming content and occur on the Monday and Tuesday before the conference. These are <em>optional paid</em> workshops ($140 without accommodation or $200 with accommodation), see the <a href="register.html">register page</a> for more details.</p>
+  <p>These full day workshops focus on learning the programming content and occur on the Monday and Tuesday before the conference. These are <em>optional paid</em> workshops ($140 without accommodation or $200 with accommodation), see the <a href="register.html">register page</a> for more details.</p>
 
   <div class="panel radius clearfix">
     <h4>Just for starters - Scratch and Python <small>with Tim Bell - University of Canterbury</small></h4>
@@ -39,7 +39,7 @@ <h4>Just for starters - Scratch and Python <small>with Tim Bell - University of
 
   <div class="panel radius clearfix">
     <h4>Crash course in Python <small>with Tanya Gray - Gather Workshops</small></h4>
-    <p>For those who are ready to take on a text based programming language, Tanya will take you through an introduction to Python to the point where you have written several working programs. While programming takes weeks to learn properly, this will give you a good idea of what is involved, and pointers to what to do next to become confident with the language.</p>
+    <p>This workshop will explore Python programming via a series of small projects. At the end of the two days you will walk away with a selection of programs which use Python to demonstrate a variety of programming concepts. If you already know a variable from a function and a String from an Integer but you're not really sure what to do with it all, then this workshop is for you.</p>
   </div>
 
   <div class="panel radius clearfix">
@@ -53,8 +53,8 @@ <h4>Databases for Level 2 &amp; 3 <small>with Amit Sarkar - CPIT</small></h4>
   </div>
 
   <div class="panel radius clearfix">
-    <h4>Electronics with the Raspberry Pi <small>with Ross Petersen - Skills Choice</small> (TBC)</h4>
-    <p>For those wishing to look at electronics and programming, this workshop will look at how to use the PICAXE Raspberry-Pi system for learning and NCEA assessments. This workshops primarily connects to the Electronics and Infrastructure standards.</p>
+    <h4>Electronics with the Raspberry Pi <small>with Ross Petersen, Andrew Hornblow and Les Black - Skills Choice</small></h4>
+    <p>For those wishing to look at electronics and simple programming, this interactive workshop will introduce the popular PICAXE microcontroller and Raspberry-Pi and explore how these could connect to the Electronics and Infrastructure standards.</p>
   </div>
 
   <h2 id="computer-science-workshops">Computer Science Workshops</h2>