From svnadmin@urchin.earth.li Tue Aug 19 17:58:36 2008
From: svnadmin@urchin.earth.li
To: openguides-commits@lists.openguides.org
Subject: [openguides-commits] r1220 - in website/publish: . includes
Date: Tue, 19 Aug 2008 17:58:36 +0100
Message-ID: <E1KVUXU-0006aU-L7@urchin.earth.li>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7209820935797300358=="

--===============7209820935797300358==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: kake
Date: 2008-08-19 17:58:36 +0100 (Tue, 19 Aug 2008)
New Revision: 1220

Modified:
   website/publish/includes/cities_list.inc
   website/publish/includes/latest_news.inc
   website/publish/index.shtml
   website/publish/news.shtml
Log:
Merged new news, updated city list, and updated mailing list address to publi=
sh.

Modified: website/publish/includes/cities_list.inc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- website/publish/includes/cities_list.inc	2008-08-19 16:56:29 UTC (rev 121=
9)
+++ website/publish/includes/cities_list.inc	2008-08-19 16:58:36 UTC (rev 122=
0)
@@ -10,38 +10,26 @@
   </tr>
=20
   <tr>
-    <td><a href=3D"http://birmingham.openguides.org/">Birmingham</a></td>
-    <td><a href=3D"http://miltonkeynes.openguides.org/">Milton Keynes</a></t=
d>
-  </tr>
-  <tr>
     <td><a href=3D"http://cambridge.openguides.org/">Cambridge</a></td>
-    <td><a href=3D"http://north-devon.openguides.org/">North Devon</a></td>
-
-  <tr>
-    <td><a href=3D"http://cotswolds.openguides.org/">Cotswolds</a></td>
     <td><a href=3D"http://norwich.openguides.org/">Norwich</a></td>
   </tr>
   <tr>
-    <td><a href=3D"http://glasgow.openguides.org/">Glasgow</a></td>
+    <td><a href=3D"http://cotswolds.openguides.org/">Cotswolds</a></td>
     <td><a href=3D"http://nottingham.openguides.org/">Nottingham</a></td>
-
-  </tr>
   <tr>
-    <td><a href=3D"http://lancaster.openguides.org/">Lancaster</a></td>
+    <td><a href=3D"http://london.openguides.org/">London</a></td>
     <td><a href=3D"http://oxford.openguides.org/">Oxford</a></td>
   </tr>
   <tr>
-    <td><a href=3D"http://london.openguides.org/">London</a></td>
-
+    <td><a href=3D"http://london.randomness.org.uk/">Randomness (London)</a>=
</td>
     <td><a href=3D"http://the.earth.li/~kake/cgi-bin/openguides/vegan-oxford=
.cgi">Vegan Oxford</a></td>
   </tr>
   <tr>
-    <td><a href=3D"http://london.randomness.org.uk/">Randomness (London)</a>=
</td>
+    <td><a href=3D"http://miltonkeynes.openguides.org/">Milton Keynes</a></t=
d>
     <td><a href=3D"http://reading.openguides.org/">Reading</a></td>
   </tr>
   <tr>
-
-    <td><a href=3D"http://manchester.openguides.org/">Manchester</a></td>
+    <td><a href=3D"http://north-devon.openguides.org/">North Devon</a></td>
     <td><a href=3D"http://southampton.openguides.org/">Southampton</a></td>
   </tr>
   <tr>
@@ -50,15 +38,10 @@
     <th>Europe</th>
   </tr>
   <tr>
-    <td><a href=3D"http://montreal.openguides.org/">Montreal, QC</a></td>
+    <td><a href=3D"http://victoria.openguides.org/">Victoria, BC</a></td>
     <td><a href=3D"http://www.justbiit.com/cgi-bin/openguides/">Brussels</a>=
</td>
   </tr>
   <tr>
-
-  <td><a href=3D"http://victoria.openguides.org/">Victoria, BC</a></td>
-    <td><a href=3D"http://vienna.openguides.org/">Vienna</a></td>
-  </tr>
-  <tr>
     <th>USA</th>
     <th>Worldwide</th>
   </tr>
@@ -71,9 +54,6 @@
     <td><a href=3D"http://saintpaul.openguides.org/">Saint Paul, MN</a></td>
   </tr>
=20
-  <tr>
-    <td><a href=3D"http://newyork.openguides.org/">New York, NY</a></td>
-  </tr>
 </table>
 </div>
=20

Modified: website/publish/includes/latest_news.inc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- website/publish/includes/latest_news.inc	2008-08-19 16:56:29 UTC (rev 121=
9)
+++ website/publish/includes/latest_news.inc	2008-08-19 16:58:36 UTC (rev 122=
0)
@@ -1,17 +1,17 @@
 <!-- begin latest_news -->
=20
-	<div class=3D"news_date">
-	May 28, 2007
-	</div>
-	<p>
- 	 We're pleased to announce that OpenGuides has been chosen as the subject =
of
-	 <a href=3D"http://vienna.yapceurope.org/ye2007/talk/668">a hackathon</a>
-	 at <a href=3D"http://vienna.yapceurope.org/ye2007/index.html">YAPC::Europe
-	 2007</a>, which takes place between 28 and 30 August in Vienna.  We're also
-	 holding
-	 <a href=3D"http://dev.openguides.org/cgi-bin/trac.fcgi/wiki/HackfestSummer=
2007">a
-	 hackfest</a> in London on 9&#8211;10 June, focusing on bug triage and bug
-	 fixing.
-	</p>
+<div class=3D"news_date">
+August 19, 2008
+</div>
=20
+<p>Apologies for the long delay since the last bit of news here; we
+<i>were</i> doing things, honest, but because of the way the website was set
+up, it was a faff to update.  This has now been fixed!</p>
+
+<p>In other exciting news, we're having another hackfest!  It'll be in <a
+href=3D"http://oxford.openguides.org/">Oxford</a> this time, on Saturday 18
+October and Sunday 19 October 2008.  Many more details can be found <a
+href=3D"http://dev.openguides.org/wiki/OxfordHackfest2008">on our dev wiki</=
a>.
+</p>
+
 <!-- end latest_news -->

Modified: website/publish/index.shtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- website/publish/index.shtml	2008-08-19 16:56:29 UTC (rev 1219)
+++ website/publish/index.shtml	2008-08-19 16:58:36 UTC (rev 1220)
@@ -57,7 +57,7 @@
 yourself and join us.
 </p>
 <p>
-Contact us by <a href=3D"mailto:openguides-dev(a)openguides.org">mailing the
+Contact us by <a href=3D"mailto:openguides-dev(a)lists.openguides.org">maili=
ng the
 developers</a>, joining the <a href=3D"lists">mailing list</a> or
 talking to us on <acronym title=3D"Internet Relay Chat"><a href=3D"irc">IRC<=
/a></acronym>.
=20

Modified: website/publish/news.shtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- website/publish/news.shtml	2008-08-19 16:56:29 UTC (rev 1219)
+++ website/publish/news.shtml	2008-08-19 16:58:36 UTC (rev 1220)
@@ -30,7 +30,16 @@
 notes</a>.
 </p>
 <!--#include virtual=3D"includes/latest_news.inc" -->
+
 <div class=3D"news_date">
+May 28, 2007
+</div>
+<p>We're holding <a href=3D"http://use.perl.org/~Kake/journal/33485">a
+hackfest</a> in London on 9&#8211;10 June, focusing on bug triage and bug
+fixing.
+</p>
+
+<div class=3D"news_date">
 May 22, 2007
 </div>
 <p>



--===============7209820935797300358==--