From 306e208f5d5001dac5e73d09cb08288d21415e49 Mon Sep 17 00:00:00 2001
From: Marc Burns <m4burns@strombola.csclub.uwaterloo.ca>
Date: Mon, 24 Jan 2011 11:32:05 -0500
Subject: [PATCH] Added event 'Unix 101' for Winter 2011.

---
 events.xml | 18 ++++++++++++++++++
 news.xml   |  8 ++++++++
 2 files changed, 26 insertions(+)

diff --git a/events.xml b/events.xml
index 0717f6f..2a4dfe4 100644
--- a/events.xml
+++ b/events.xml
@@ -3,6 +3,24 @@
 <!DOCTYPE eventdefs SYSTEM "csc.dtd">
 <eventdefs>
 
+<!-- Winter 2011 -->
+<eventitem date="2011-01-26" time="04:30 PM" room="MC3003" title="UNIX 101: An Introduction to the Shell">
+  
+    <short><p><i>by Calum T. Dalek</i>. New to Unix? No problem, we'll teach you to power use circles around your friends!
+</p></short>
+  
+  
+    <abstract><p>This first tutorial is an introduction to the Unix shell environment, both on the student
+servers and on other Unix environments. Topics covered include: using the shell, both basic
+interaction and advanced topics like scripting and job control, the filesystem and manipulating
+it, and ssh. If you feel you're already familiar with these topics don't hesitate to come
+to Unix 102 to learn about documents, editing, and other related tasks, or watch out
+for Unix 103 and 104 that get much more in depth into power programming tools on Unix.
+</p></abstract>
+
+</eventitem>
+
+
 <!-- Fall 2010 -->
 <eventitem date="2010-11-17" time="04:30 PM" room="MC4061" title="Mathematics and aesthetics in maze design">
   
diff --git a/news.xml b/news.xml
index 12d3a6b..a274c26 100644
--- a/news.xml
+++ b/news.xml
@@ -2,6 +2,14 @@
 
 <!DOCTYPE newdefs SYSTEM "csc.dtd">
 <newsdefs>
+  <newsitem author="m4burns" date="2011-01-24">
+    Upcoming events:
+    <ul>
+      <li>UNIX 101: An Introduction to the Shell
+          Want to be a UNIX master? Drop by MC3003 at 4:30PM on Wednesday, January 26th!</li>
+    </ul>
+  </newsitem>
+
   <newsitem author="scshunt" date="2011-01-12">
     The election is over. The new executive are
     <ul>