updated about page

diff --git a/include/about.inc.php b/include/about.inc.php
index 542044df712ff2601c048a64d9116ec0ae2e84c9..0b56e3d93bb71619cef0462f8aef69848c65c3ee 100644 (file)
--- a/include/about.inc.php
+++ b/include/about.inc.php
@@ -3,16 +3,17 @@ $serendipity['smarty']->assign('content_message','
 <h3 class="serendipity_date">about</h3>
 <p>A long list of not very interesting facts about me, in no particular order:</p>
 <ul>
-<li>I live in London.  I don\'t like it much, and next year hope to live somewhere in Europe.  Hire me to come do your e-learning stuff!</li>
-<li>I was born in Dunedin, New Zealand on the 19th of April, 1980</li>
-<li>Most of my life, and up until very recently, I lived in Wellington, New Zealand.  I identify very strongly as a New Zealander.</li>
-<li>I work at <a href="http://catalyst.net.nz">Catalyst IT</a>.  My focus is open source in Education, particularly e-learning. I\'ve been a <a href="http://moodle.org">Moodle</a> developer since mid 2004, and a <a href="http://mahara.org">Mahara</a> developer since its inception.</li>
+<li>I live in Fribourg, Switzerland.  It\'s a French-speaking town, I speak no French, but I am learning German.</li>
+<li>I am first and foremost, a <b>Wellingtonian</b>.  Like all Wellingtonians, I wear a lot of black, am a coffee snob and think the Matterhorn is somewhere to get a good gin & tonic.</li>
+<li>I was born in Dunedin, New Zealand on the 19th of April, 1980.</li>
+<li>I identify very strongly as a New Zealander.</li>
+<li>I lived in London for 6 months and completely loathed it.</li>
+<li>I work at <a href="http://liip.ch">Liip</a>.  My focus is open source in Education, particularly e-learning. I\'ve been a <a href="http://moodle.org">Moodle</a> developer since mid 2004, and a <a href="http://mahara.org">Mahara</a> developer since its inception.</li>
 <li>I have <a href="http://madduck.net">an awesome boyfriend</a></li>
 <li>I feel the cold, and love electric blankets, heaters, and fires</li>
-<li>I like <a href="http://httpd.apache.org/docs/1.3/mod/mod_rewrite.html">mod_rewrite</a> a whole lot</li>
 <li>I prefer command line interfaces to graphical ones. Really the only graphical UI I use now is a browser.  I often make scathing remarks about pointyclicky interfaces.</li>
 <li>I am one of those annoying outspoken version control system people. I like git.</li>
-<li>I have a cat called Nothing, named after a character in a book I read when I was 16.  She\'s still in Wellington.</li>
+<li>I have a cat called Nothing, named after a character in a book I read when I was 16.  She came all the way to Switzerland with me from  Wellington.</li>
 <li>I like my mail to arrive at least digitally signed</li>
 <li>I fight the urge to write an \'email etiquette\' article and point people to it frequently.  One day I\'m sure this will happen though as people who breach email etiquette make me grind my teeth with rage.  To summarise:
 <ul>
@@ -34,19 +35,19 @@ $serendipity['smarty']->assign('content_message','
 <li>I was vegan for a year and a half, and vegetarian on-and-off for about 5. Now I am a shameless meatmouth</li>
 <li>I make clothes and jewellery</li>
 <li>Spelling errors get me really embarrassed</li>
-<li>I am a foosball shark</li>
+<li>I used to be a foosball shark</li>
 <li>I try and convince everyone I know that they should install Linux, preferably Debian</li>
 <li>Which often means I end up being a one-woman helpdesk</li>
 <li>My favourite books are Still Life with Woodpecker, by Tom Robbins, and Kafka on the Shore, by Haruki Murakami</li>
 <li>My favourite movie is Am&eacute;lie and every time I watch it I cut my hair short again, even if I\'ve been trying to grow it</li>
-<li>I used to be an emacs fangirl.  These days I\'m using vim, but I still use emacs for diff mode.  I haven\'t so far found a good way to use vim for this purpose</li>
+<li>I used to be an emacs fangirl.  These days I\'m using and loving vim, but I still use emacs for diff mode.  I haven\'t so far found a good way to use vim for this purpose</li>
 <li>When I\'m really tired, I often incorporate the alarm clock noise into my dream and keep sleeping</li>
 <li>I can get obsessive about books, movies, and bands</li>
 <li>(Obviously) I like lists</li>
 <li>This website is based on <a href="http://s9y.org">Serendipity</a> which I track with <a href="http://git.or.cz/">git</a></li>
 <li>I have trouble staying on chairs and often find myself falling off and causing an avalanche of headphones, keyboards and mice that fall with me from my desk</li>
-<li>I am caf&eacute; and bar loyal, but it changes.  In Wellington it was <a href="http://www.mojocoffeecartel.com">Mojo</a> and <a href="http://mattherhorn.co.nz">Matterhorn</a>.  I have not found London equivalents.</li>
-<li>I drink far too much coffee, someone I work with describes me as \'gritty\' after too many coffees</li>
+<li>I am caf&eacute; and bar loyal, but it changes.  In Wellington it was <a href="http://www.mojocoffeecartel.com">Mojo</a> and <a href="http://mattherhorn.co.nz">Matterhorn</a>.  I have not yet found Fribourg equivalents, but I am considering the Belvedere for my bar.</li>
+<li>I drink far too much coffee, someone I work with describes me as \'gritty\' after too many coffees.   I sometimes give up for a few months, but inevitably return again.</li>
 <li>I <i>do not</i> like it when people end a parenthesised sentence with a smiley face (like this ;)</li>
 </ul>
 ');