diff --git a/share/sgml/libcommon.xsl b/share/sgml/libcommon.xsl
index b2693966e0..9b54e0e53d 100644
--- a/share/sgml/libcommon.xsl
+++ b/share/sgml/libcommon.xsl
@@ -1,1490 +1,1496 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
-<!-- $FreeBSD: www/share/sgml/libcommon.xsl,v 1.16 2008/03/01 01:55:27 simon Exp $ -->
+<!-- $FreeBSD: www/share/sgml/libcommon.xsl,v 1.17 2008/04/20 01:28:57 murray Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
   xmlns:date="http://exslt.org/dates-and-times"
   extension-element-prefixes="date"
   exclude-result-prefixes="date cvs">
 
   <xsl:import href="./transtable-common.xsl" />
 
   <!-- default format for date string -->
   <xsl:param name="param-l10n-date-format-YMD"
              select="'%Y-%M-%D'" />
   <xsl:param name="param-l10n-date-format-YM"
              select="'%M %Y'" />
   <xsl:param name="param-l10n-date-format-MD"
              select="'%D %M'" />
   <xsl:param name="param-l10n-date-format-rfc822"
              select="'%W, %D %m %Y 00:00:00 PST'" />
 
   <xsl:variable name="curdate.year" select="date:year()"/>
   <xsl:variable name="curdate.month" select="date:month-in-year()"/>
   <xsl:variable name="curdate.day" select="date:day-in-month()"/>
 
   <!--
      template name                               used in
 
      html-usergroups-list-regions                templates.usergroups.xsl
      html-usergroups-list-entries                templates.usergroups.xsl
      html-usergroups-list-header                 templates.usergroups.xsl (for l10n)
 
      html-news-list-newsflash-preface            templates.newsflash.xsl (for l10n)
      html-news-list-newsflash                    templates.newsflash.xsl
      html-news-list-press                        templates.press.xsl
      html-news-list-datelabel                    templates.newsflash.xsl
      html-news-generate-anchor                   templates.newsflash.xsl
      html-news-make-olditems-list                templates.newsflash.xsl (for l10n)
      html-news-list-newsflash-homelink           templates.newsflash.xsl (for l10n)
 
      html-news-list-press-preface                templates.press.xsl (for l10n)
      html-news-list-press                        templates.press.xsl
 
      html-events-list-preface                    templates.events.xsl (for l10n)
      html-events-list-upcoming-heading           templates.events.xsl (for l10n)
      html-events-list-past-heading               templates.events.xsl (for l10n)
 
      html-list-advisories                        security/mkindex.xsl
      html-list-advisories-putitems               security/mkindex.xsl
      html-list-advisories-release-label          security/mkindex.xsl (for l10n)
      rdf-security-advisories                     security/security-rdf.xsl
      rdf-security-advisories-title               security/security-rdf.xsl (for l10n)
      rdf-security-advisories-items               security/security-rdf.xsl
 
      rss-security-advisories                     security/security-rss.xsl
      rss-security-advisories-title               security/security-rss.xsl (for l10n)
      rss-security-advisories-items               security/security-rss.xsl
 
      html-index-advisories-items                   index.xsl
      html-index-advisories-items-lastmodified      index.xsl (for i10n)
      html-index-news-project-items                 index.xsl
      html-index-news-project-items-lastmodified    index.xsl (for i10n)
      html-index-news-press-items                   index.xsl
      html-index-news-press-items-lastmodified      index.xsl (for i10n)
      html-index-events-items                       index.xsl
      html-index-mirrors-options-list               index.xsl
 
      misc-format-date-string                     generic
      calculate-dow                               generic
 
      gen-long-en-month                           templates.events.xsl
      gen-short-en-month                          templates.news-rss.xsl
      gen-date-interval                           templates.events.xsl
      generate-event-anchor                       templates.events.xsl
 
      generate-story-anchor                       templates.press.xsl
 
   -->
 
   <!-- template: "html-usergroups-list-regions"
        list all regions in a usergroup database -->
 
-  <xsl:key name="html-usergroups-regions-key" match="entry" use="@continent" />
+  <xsl:key name="html-usergroups-regions-key" match="entry" use="../../@name" />
   <xsl:key name="html-usergroups-id-key" match="entry" use="@id" />
 
   <xsl:template name="html-usergroups-list-regions">
     <xsl:param name="usergroups.xml" select="'usergroups.xml'" />
 
     <ul>
-      <xsl:for-each select="document($usergroups.xml)//entry[
-	generate-id() =
-	generate-id(key('html-usergroups-regions-key', @continent)[1])]">
+      <xsl:for-each select="document($usergroups.xml)//continent">
+      <xsl:sort select="format-number(count(country/entry), '000')"
+      		order="descending"/>
 
 	<xsl:variable name="id" select="
-	  translate(@continent,
+	  translate(@name,
 	  ' ,ABCDEFGHIJKLMNOPQRSTUVWXYZ',
 	  '--abcdefghijklmnopqrstuvwxyz')" />
 
 	<li>
 	  <p><xsl:element name="a">
 	      <xsl:attribute name="href">
 		<xsl:value-of select="concat('#', $id)" />
 	      </xsl:attribute>
 
 	      <xsl:call-template name="transtable-lookup">
 		<xsl:with-param name="word-group" select="'continents'" />
-		<xsl:with-param name="word" select="@continent" />
+		<xsl:with-param name="word" select="@name" />
 	      </xsl:call-template>
-	    </xsl:element></p>
+	    </xsl:element>
+	    ( <xsl:value-of select="count(country/entry)" /> user groups )</p>
 	</li>
       </xsl:for-each>
     </ul>
   </xsl:template>
 
   <!-- template: "html-usergroups-list-entries"
        list all entries in a usergroup database -->
 
   <xsl:template name="html-usergroups-list-entries">
     <xsl:param name="usergroups.xml" select="'usergroups.xml'" />
     <xsl:param name="usergroups-local.xml" select="'usergroups-local.xml'" />
 
-    <xsl:for-each select="document($usergroups.xml)//entry[
-      generate-id() =
-      generate-id(key('html-usergroups-regions-key', @continent)[1])]">
+    <xsl:for-each select="document($usergroups.xml)//continent">
+      <xsl:sort select="format-number(count(country/entry), '000')"
+      		order="descending"/>
 
-      <xsl:variable name="continent" select="@continent" />
+      <xsl:variable name="continent" select="@name" />
       <xsl:variable name="continent-lc" select="
-	translate(@continent,
+	translate(@name,
 	' ,ABCDEFGHIJKLMNOPQRSTUVWXYZ',
 	'--abcdefghijklmnopqrstuvwxyz')" />
 
       <h3><a name="{$continent-lc}" id="{$continent-lc}">
 	  <xsl:call-template name="transtable-lookup">
 	    <xsl:with-param name="word-group" select="'continents'" />
 	    <xsl:with-param name="word" select="$continent" />
 	  </xsl:call-template></a></h3>
 
       <dl>
-	<xsl:for-each select="key('html-usergroups-regions-key', $continent)">
-	  <xsl:sort select="name" order="ascending"/>
+        <xsl:for-each select="country/entry">
+<!--	  <xsl:sort select="@name" order="ascending"/>
+
+          <h4><xsl:value-of select="@name" /></h4>
+          <xsl:for-each select="entry">
+	    <xsl:sort select="name" order="ascending"/>
+-->
 
 	  <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
 
 	  <xsl:variable name="name">
 	    <xsl:for-each select="document($usergroups-local.xml)">
 	      <xsl:choose>
 		<!-- $p[count(.|$q) = count($q)] means product set of $p and $q-->
 		<xsl:when test="
 		  key('html-usergroups-regions-key', string($continent))
 		  [count(.|key('html-usergroups-id-key', string($id)))
 		  = count(key('html-usergroups-id-key', string($id)))]
 		  ">
 		  <xsl:copy-of select="
 		    key('html-usergroups-regions-key', string($continent))
 		    [count(.|key('html-usergroups-id-key', string($id)))
 		    = count(key('html-usergroups-id-key', string($id)))]/name/node()
 		    " />
 		</xsl:when>
 		<xsl:otherwise>
 		  <xsl:for-each select="document($usergroups.xml)">
 		    <xsl:copy-of select="key('html-usergroups-id-key', string($id))/name/node()" />
 		  </xsl:for-each>
 		</xsl:otherwise>
 	      </xsl:choose>
 	    </xsl:for-each>
 	  </xsl:variable>
 
 	  <xsl:variable name="desc">
 	    <xsl:for-each select="document($usergroups-local.xml)">
 	      <xsl:choose>
 		<!-- $p[count(.|$q) = count($q)] means product set of $p and $q-->
 		<xsl:when test="
 		  key('html-usergroups-regions-key', string($continent))
 		  [count(.|key('html-usergroups-id-key', string($id)))
 		  = count(key('html-usergroups-id-key', string($id)))]
 		  ">
 		  <xsl:copy-of select="
 		    key('html-usergroups-regions-key', string($continent))
 		    [count(.|key('html-usergroups-id-key', string($id)))
 		    = count(key('html-usergroups-id-key', string($id)))]/description/node()
 		    " />
 		</xsl:when>
 		<xsl:otherwise>
 		  <xsl:for-each select="document($usergroups.xml)">
 		    <xsl:copy-of select="key('html-usergroups-id-key', string($id))/description/node()" />
 		  </xsl:for-each>
 		</xsl:otherwise>
 	      </xsl:choose>
 	    </xsl:for-each>
 	  </xsl:variable>
 
 	  <dt><a name="{$continent-lc}-{$id}" href="{url}"><xsl:copy-of select="$name" /></a></dt>
 
 	  <dd><p><xsl:copy-of select="$desc" /></p></dd>
 	</xsl:for-each>
       </dl>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-usergroups-list-header"
        print header part of usergroup listing (l10n) -->
 
   <xsl:template name="html-usergroups-list-header">
     <p>FreeBSD's widespread popularity has spawned a number of user groups
       around the world.</p>
     <p>If you know of a FreeBSD user group not listed here,
       please fill out a <a href="http://www.freebsd.org/send-pr.html">
 	problem report</a> for category www with the following information:</p>
     <ol>
       <li>A URL for the user group's website.</li>
       <li>An email contact address of a human in charge,
          for use by our visitors and website administrators.</li>
       <li>A short (one paragraph) description of the user group.</li>
     </ol>
     <p>Submissions should be in HTML. In keeping with the spirit of FreeBSD,
       we prefer user groups that are active and which conduct their business
       in public.</p>
 
     <h3>Regions:</h3>
   </xsl:template>
 
   <!-- template: "calculate-dow"
        calculate the RFC822 day of the week for a given
        date between 1/1/2000 and 12/31/2099 -->
 
   <xsl:template name="calculate-dow">
     <xsl:param name="year" select="'none'" />
     <xsl:param name="month" select="'none'" />
     <xsl:param name="day" select="'none'" />
 
     <!-- whether the current year is a leap year -->
     <xsl:variable name="leap">
       <xsl:choose>
         <xsl:when test="(number($year) mod 4)=0">1</xsl:when>
         <xsl:otherwise>0</xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
 
     <!-- number of days since Jan 1 of the current year -->
     <xsl:variable name="daysthisyear">
       <xsl:choose>
         <xsl:when test="$month=1"><xsl:value-of select="number($day)"/></xsl:when>
         <xsl:when test="$month=2"><xsl:value-of select="31 + number($day)"/></xsl:when>
         <xsl:when test="$month=3"><xsl:value-of select="59 + $leap + number($day)"/></xsl:when>
         <xsl:when test="$month=4"><xsl:value-of select="90 + $leap + number($day)"/></xsl:when>
         <xsl:when test="$month=5"><xsl:value-of select="120 + $leap + number($day)"/></xsl:when>
         <xsl:when test="$month=6"><xsl:value-of select="151 + $leap + number($day)"/></xsl:when>
         <xsl:when test="$month=7"><xsl:value-of select="181 + $leap + number($day)"/></xsl:when>
         <xsl:when test="$month=8"><xsl:value-of select="212 + $leap + number($day)"/></xsl:when>
         <xsl:when test="$month=9"><xsl:value-of select="243 + $leap + number($day)"/></xsl:when>
         <xsl:when test="$month=10"><xsl:value-of select="273 + $leap + number($day)"/></xsl:when>
         <xsl:when test="$month=11"><xsl:value-of select="304 + $leap + number($day)"/></xsl:when>
         <xsl:when test="$month=12"><xsl:value-of select="334 + $leap + number($day)"/></xsl:when>
 	<xsl:otherwise><xsl:value-of select="number(0)"/></xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
 
     <!-- number of leap years prior to current year (after 2000). -->
     <xsl:variable name="leapyears" select="floor((number($year + 3) - 2000) div 4)"/>
 
     <xsl:variable name="totaldayssince2000" select="(number($year)-2000)*365 + $leapyears + $daysthisyear"/>
 
     <!-- 5 is constant for day of week Jan 1 2000. -->
     <xsl:variable name="dow" select="(5 + $totaldayssince2000) mod 7"/>
 
     <xsl:choose>
       <xsl:when test="$dow=0">Sun</xsl:when>
       <xsl:when test="$dow=1">Mon</xsl:when>
       <xsl:when test="$dow=2">Tue</xsl:when>
       <xsl:when test="$dow=3">Wed</xsl:when>
       <xsl:when test="$dow=4">Thu</xsl:when>
       <xsl:when test="$dow=5">Fri</xsl:when>
       <xsl:when test="$dow=6">Sat</xsl:when>
       <xsl:when test="$dow=7">Sun</xsl:when>
       <xsl:otherwise>???</xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
   <!-- template: "misc-format-date-string"
        format date string with localization if needed -->
 
   <xsl:template name="misc-format-date-string">
     <xsl:param name="year" select="'none'" />
     <xsl:param name="month" select="'none'" />
     <xsl:param name="day" select="'none'" />
     <xsl:param name="date-format" select="$param-l10n-date-format-YMD" />
 
     <xsl:param name="dow">
       <xsl:call-template name="calculate-dow">
         <xsl:with-param name="year" select="$year" />
         <xsl:with-param name="month" select="$month" />
         <xsl:with-param name="day" select="$day" />
       </xsl:call-template>
     </xsl:param>
 
     <xsl:param name="lmonth">
       <xsl:call-template name="transtable-lookup">
 	<xsl:with-param name="word-group" select="'number-month'" />
 	<xsl:with-param name="word" select="$month" />
       </xsl:call-template>
     </xsl:param>
 
     <xsl:param name="smonth">
       <xsl:call-template name="gen-short-en-month">
 	<xsl:with-param name="nummonth" select="$month" />
       </xsl:call-template>
     </xsl:param>
 
     <xsl:param name="tmp-replace-year">
       <xsl:call-template name="misc-format-date-string-replace">
 	<xsl:with-param name="target" select="$date-format" />
 	<xsl:with-param name="before" select="'%Y'" />
 	<xsl:with-param name="after" select="$year" />
       </xsl:call-template>
     </xsl:param>
 
     <xsl:param name="tmp-replace-day">
       <xsl:call-template name="misc-format-date-string-replace">
 	<xsl:with-param name="target" select="$tmp-replace-year" />
 	<xsl:with-param name="before" select="'%D'" />
 	<xsl:with-param name="after" select="$day" />
       </xsl:call-template>
     </xsl:param>
 
     <xsl:param name="tmp-replace-day-of-week">
       <xsl:call-template name="misc-format-date-string-replace">
 	<xsl:with-param name="target" select="$tmp-replace-day" />
 	<xsl:with-param name="before" select="'%W'" />
 	<xsl:with-param name="after" select="$dow" />
       </xsl:call-template>
     </xsl:param>
 
     <xsl:param name="tmp-replace-month">
       <xsl:call-template name="misc-format-date-string-replace">
 	<xsl:with-param name="target" select="$tmp-replace-day-of-week" />
 	<xsl:with-param name="before" select="'%M'" />
 	<xsl:with-param name="after" select="$lmonth" />
       </xsl:call-template>
     </xsl:param>
 
     <xsl:call-template name="misc-format-date-string-replace">
       <xsl:with-param name="target" select="$tmp-replace-month" />
       <xsl:with-param name="before" select="'%m'" />
       <xsl:with-param name="after" select="$smonth" />
     </xsl:call-template>
   </xsl:template>
 
   <xsl:template name="misc-format-date-string-replace">
     <xsl:param name="target" select="''" />
     <xsl:param name="before" select="''" />
     <xsl:param name="after" select="''" />
 
     <xsl:choose>
       <xsl:when test="contains($target, $before)">
 	<xsl:value-of select="substring-before($target, $before)" />
 	<xsl:value-of select="$after" />
 	<xsl:call-template name="misc-format-date-string-replace">
 	  <xsl:with-param name="target" select="substring-after($target, $before)" />
 	  <xsl:with-param name="before" select="$before" />
 	  <xsl:with-param name="after" select="$after" />
 	</xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
 	<xsl:value-of select="$target" />
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
   <!-- template: "html-news-make-olditems-list" -->
   <xsl:template name="html-news-make-olditems-list">
     <p>Old announcements:
       <a href="2006/index.html">2006</a>,
       <a href="2005/index.html">2005</a>,
       <a href="2004/index.html">2004</a>,
       <a href="2003/index.html">2003</a>,
       <a href="2002/index.html">2002</a>,
       <a href="2001/index.html">2001</a>,
       <a href="2000/index.html">2000</a>,
       <a href="1999/index.html">1999</a>,
       <a href="1998/index.html">1998</a>,
       <a href="1997/index.html">1997</a>,
       <a href="1996/index.html">1996</a></p>
   </xsl:template>
 
   <!-- template: "html-press-make-olditems-list" -->
   <xsl:template name="html-press-make-olditems-list">
     <p>Old press publications:
       <a href="2006/press.html">2006</a>,
       <a href="2005/press.html">2005</a>,
       <a href="2004/press.html">2004</a>,
       <a href="2003/press.html">2003</a>,
       <a href="2002/press.html">2002</a>,
       <a href="2001/press.html">2001</a>,
       <a href="2000/press.html">2000</a>,
       <a href="1999/press.html">1999</a>,
       <a href="1998/press.html">1998-1996</a></p>
   </xsl:template>
 
   <!-- template: "html-news-list-newsflash-preface" -->
   <xsl:template name="html-news-list-newsflash-preface">
     <img src="&base;/gifs/news.jpg" align="right" border="0" width="193"
       height="144" alt="FreeBSD News"/>
 
     <p>FreeBSD is a rapidly developing operating system.  Keeping up on
       the latest developments can be a chore!  To keep on top of things,
       be sure and check this page periodically.  Also, you may wish to
       subscribe to the
       <a href="&base;/doc/en_US.ISO8859-1/books/handbook/eresources.html#ERESOURCES-MAIL">freebsd-announce
 	mailing list</a> or the <a href="rss.xml">RSS feed</a>.</p>
 
     <p>The following projects have their own news pages, which should
       be checked for project specific updates.</p>
 
     <ul>
       <li><a href="&base;/java/newsflash.html">&java; on FreeBSD</a></li>
       <li><a href="http://freebsd.kde.org/">KDE on FreeBSD</a></li>
       <li><a href="&base;/gnome/newsflash.html">GNOME on FreeBSD</a></li>
     </ul>
 
     <p>For a detailed description of past, present, and future releases,
       see the <strong><a href="&base;/releases/index.html">Release
 	  Information</a></strong> page.</p>
 
     <p>For FreeBSD Security Advisories, please refer to the
       <a href="&base;/security/#adv">Security Information</a> page.</p>
   </xsl:template>
 
   <!-- template: "html-news-list-newsflash-homelink" -->
   <xsl:template name="html-news-list-newsflash-homelink">
     <a href="&base;/news/news.html">News Home</a>
   </xsl:template>
 
   <!-- template: "html-news-list-press-preface" -->
   <xsl:template name="html-news-list-press-preface">
     <p>If you know of any news stories featuring FreeBSD that we have not
       listed here, please send details to 
       <a href="mailto:www@FreeBSD.org">www@FreeBSD.org</a> so that we can
       include them.</p>
   </xsl:template>
 
   <xsl:template name="html-events-list-preface">
     <p>If you know of any FreeBSD related events, or events that
       are of interest for FreeBSD users, which are not listed
       here, please send details to <a href="mailto:www@FreeBSD.org"
 	>www@FreeBSD.org</a>, so they can be included.</p>
 
     <p>Users with organisational software that understands the
       iCalendar format can subscribe to the
       <a href="&base;/events/events.ics">FreeBSD events calendar</a>
       which contains all of the events listed here.</p>
   </xsl:template>
 
   <xsl:template name="html-events-map">
     <xsl:param name="mapurl" select="'none'" />
 
     <p>Countries and regions displayed in dark red on the map below
       are hosting upcoming FreeBSD-related events.  Countries that
       have hosted FreeBSD-related events in the past show up in yellow
       or orange, with darker colors representing a larger number of
       previous events.</p>
 
     <img>
       <xsl:attribute name="src">
         <xsl:value-of select="$mapurl" />
       </xsl:attribute>
     </img>
   </xsl:template>
 
   <xsl:template name="html-events-list-upcoming-heading">
     <h2 id="upcoming">Current/Upcoming Events:</h2>
   </xsl:template>
 
   <xsl:template name="html-events-list-past-heading">
     <h2 id="past">Past Events:</h2>
   </xsl:template>
 
   <!-- template: "html-news-list-newsflash" -->
   <xsl:template name="html-news-list-newsflash">
     <xsl:param name="news.project.xml-master" select="'none'" />
     <xsl:param name="news.project.xml" select="'none'" />
 
     <xsl:for-each select="document($news.project.xml-master)//descendant::year">
       <xsl:variable name="year" select="name" />
 
       <xsl:for-each select="month">
 	<xsl:variable name="month" select="name" />
 
 	<h1>
 	  <xsl:call-template name="misc-format-date-string">
 	    <xsl:with-param name="year" select="$year" />
 	    <xsl:with-param name="month" select="$month" />
 	    <xsl:with-param name="date-format" select="$param-l10n-date-format-YM" />
 	  </xsl:call-template>
 	</h1>
 
 	<ul>
 	  <xsl:for-each select="day">
 	    <xsl:variable name="day" select="name" />
 	    <xsl:variable name="index" select="position()" />
 
 	    <!-- search localized items per day basis -->
 	    <xsl:variable name="localizeditems"
 	      select="document($news.project.xml)
 	              //descendant::year[name = $year]
 	              /month[name = $month]
 	              /day[name = $day and position() = $index]" />
 
 	    <xsl:choose>
 	      <xsl:when test="$localizeditems">
 		<!-- when localized item exists -->
 		<xsl:for-each select="$localizeditems/event">
 		  <xsl:variable name="anchor-position" select="position()" />
 
 		  <li><p class="localized">
 		      <a><xsl:attribute name="name">
 			  <xsl:call-template name="html-news-generate-anchor">
 			    <xsl:with-param name="label" select="local-name()" />
 			    <xsl:with-param name="year" select="$year" />
 			    <xsl:with-param name="month" select="$month" />
 			    <xsl:with-param name="day" select="$day" />
 			    <xsl:with-param name="pos" select="$anchor-position" />
 			  </xsl:call-template>
 			</xsl:attribute></a>
 		      <b><xsl:call-template name="html-news-datelabel">
 			  <xsl:with-param name="year" select="$year" />
 			  <xsl:with-param name="month">
 			    <xsl:call-template name="transtable-lookup">
 			      <xsl:with-param name="word-group" select="'number-month'" />
 			      <xsl:with-param name="word" select="$month" />
 			    </xsl:call-template>
 			  </xsl:with-param>
 			  <xsl:with-param name="day" select="$day" />
 			</xsl:call-template></b>
 		      <!-- put localized text -->
 		      <xsl:text> </xsl:text>
 		      <xsl:for-each select="p">
 		      <xsl:if test="position() &gt; 1"><br /><br /></xsl:if>
 		      <xsl:copy-of select="child::node()" />
 		      </xsl:for-each>
 		    </p>
 		  </li>
 		</xsl:for-each>
 	      </xsl:when>
 
 	      <xsl:otherwise>
 		<!-- when localized item does not exist -->
 		<xsl:for-each select="event">
 		  <xsl:variable name="anchor-position" select="position()" />
 
 		  <li><p class="original">
 		      <a><xsl:attribute name="name">
 			  <xsl:call-template name="html-news-generate-anchor">
 			    <xsl:with-param name="label" select="local-name()" />
 			    <xsl:with-param name="year" select="$year" />
 			    <xsl:with-param name="month" select="$month" />
 			    <xsl:with-param name="day" select="$day" />
 			    <xsl:with-param name="pos" select="$anchor-position" />
 			  </xsl:call-template>
 			</xsl:attribute></a>
 		      <b><xsl:call-template name="html-news-datelabel">
 			  <xsl:with-param name="year" select="$year" />
 			  <xsl:with-param name="month">
 			    <xsl:call-template name="transtable-lookup">
 			      <xsl:with-param name="word-group" select="'number-month'" />
 			      <xsl:with-param name="word" select="$month" />
 			    </xsl:call-template>
 			  </xsl:with-param>
 			  <xsl:with-param name="day" select="$day" />
 			</xsl:call-template></b>
 		      <!-- put English text -->
 		      <xsl:text> </xsl:text>
 		      <xsl:for-each select="p">
 		      <xsl:if test="position() &gt; 1"><br /><br /></xsl:if>
 		      <xsl:copy-of select="child::node()" />
 		      </xsl:for-each>
 		    </p>
 		  </li>
 		</xsl:for-each>
 	      </xsl:otherwise>
 	    </xsl:choose>
 	  </xsl:for-each>
 	</ul>
       </xsl:for-each>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-news-list-press" -->
   <xsl:template name="html-news-list-press">
     <xsl:param name="news.press.xml-master" select="'none'" />
     <xsl:param name="news.press.xml" select="'none'" />
 
     <xsl:for-each select="document($news.press.xml-master)//descendant::year">
       <xsl:variable name="year" select="name" />
 
       <xsl:for-each select="month">
 	<xsl:variable name="month" select="name" />
 
 	<h1>
 	  <xsl:call-template name="misc-format-date-string">
 	    <xsl:with-param name="year" select="$year" />
 	    <xsl:with-param name="month" select="$month" />
 	    <xsl:with-param name="date-format" select="$param-l10n-date-format-YM" />
 	  </xsl:call-template>
 	</h1>
 
 	<ul>
 	  <xsl:for-each select="story">
 	    <xsl:variable name="url"><xsl:value-of select="url"/></xsl:variable>
 	    <xsl:variable name="site-url"><xsl:value-of select="site-url"/></xsl:variable>
 
 	    <!-- search localized items per story(URL) basis -->
 	    <xsl:variable name="localizeditems"
 	      select="document($news.press.xml)
 	              //descendant::year[name = $year]
 	              /month[name = $month]
 	              /story[url = $url]" />
 
 	    <xsl:variable name="anchor-position" select="position()" />
 
 	    <xsl:choose>
 	      <xsl:when test="$localizeditems">
 		<xsl:for-each select="$localizeditems">
 		  <li><p>
 		      <a><xsl:attribute name="name">
 			  <xsl:call-template name="html-news-generate-anchor">
 			    <xsl:with-param name="label" select="local-name()" />
 			    <xsl:with-param name="year" select="$year" />
 			    <xsl:with-param name="month" select="$month" />
 			    <xsl:with-param name="pos" select="$anchor-position" />
 			  </xsl:call-template>
 			</xsl:attribute></a>
 		      <a href="{$url}"><b><xsl:value-of select="name"/></b></a><br/>
 		      <a href="{$site-url}"><xsl:value-of select="site-name"/></a>,
 		      <xsl:value-of select="author"/><br/>
 		      <xsl:copy-of select="p/child::node()"/>
 		    </p>
 		  </li>
 		</xsl:for-each>
 	      </xsl:when>
 
 	      <xsl:otherwise>
 		<xsl:for-each select=".">
 		  <li><p>
 		      <a><xsl:attribute name="name">
 			  <xsl:call-template name="html-news-generate-anchor">
 			    <xsl:with-param name="label" select="local-name()" />
 			    <xsl:with-param name="year" select="$year" />
 			    <xsl:with-param name="month" select="$month" />
 			    <xsl:with-param name="pos" select="$anchor-position" />
 			  </xsl:call-template>
 			</xsl:attribute></a>
 
 		      <a href="{$url}"><b><xsl:value-of select="name"/></b></a><br/>
 		      <a href="{$site-url}"><xsl:value-of select="site-name"/></a>,
 		      <xsl:value-of select="author"/><br/>
 		      <xsl:copy-of select="p/child::node()"/>
 		    </p>
 		  </li>
 		</xsl:for-each>
 	      </xsl:otherwise>
 	    </xsl:choose>
 	  </xsl:for-each>
 	</ul>
       </xsl:for-each>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-news-datelabel" -->
   <xsl:template name="html-news-datelabel">
     <xsl:param name="year" />
     <xsl:param name="month" />
     <xsl:param name="day" />
 
     <xsl:call-template name="misc-format-date-string">
       <xsl:with-param name="month" select="$month" />
       <xsl:with-param name="day" select="$day" />
       <xsl:with-param name="date-format" select="$param-l10n-date-format-MD" />
     </xsl:call-template>
 
     <xsl:text>:</xsl:text>
   </xsl:template>
 
   <!-- template: "generate-month-num" -->
   <xsl:template name="generate-month-num">
     <xsl:param name="month" />
 
     <xsl:choose>
       <xsl:when test="$month='January'">1</xsl:when>
       <xsl:when test="$month='February'">2</xsl:when>
       <xsl:when test="$month='March'">3</xsl:when>
       <xsl:when test="$month='April'">4</xsl:when>
       <xsl:when test="$month='May'">5</xsl:when>
       <xsl:when test="$month='June'">6</xsl:when>
       <xsl:when test="$month='July'">7</xsl:when>
       <xsl:when test="$month='August'">8</xsl:when>
       <xsl:when test="$month='September'">9</xsl:when>
       <xsl:when test="$month='October'">10</xsl:when>
       <xsl:when test="$month='November'">11</xsl:when>
       <xsl:when test="$month='December'">12</xsl:when>
       <xsl:otherwise>???</xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
   <!-- template: "html-news-generate-anchor" (for l10n) -->
   <xsl:template name="html-news-generate-anchor">
     <xsl:param name="label" />
     <xsl:param name="year" />
     <xsl:param name="month" />
     <xsl:param name="day" />
     <xsl:param name="pos" />
 
     <xsl:value-of select="concat(
       $label,
       format-number($year, '0000'),
       format-number($month, '00'))" />
     <xsl:if test="$label = 'event'" >
       <xsl:value-of select="format-number($day, '00')" />
     </xsl:if>
     <xsl:value-of select="format-number($pos, ':00')" />
   </xsl:template>
 
   <!-- template: "html-list-advisories"
        generate a list of all security advisories -->
 
   <xsl:template name="html-list-advisories">
     <xsl:param name="advisories.xml" select="'none'" />
     <xsl:param name="type" select="'advisory'" />
 
     <xsl:choose>
       <xsl:when test="$type = 'advisory'">
         <xsl:call-template name="html-list-advisories-putitems">
           <xsl:with-param name="items" select="document($advisories.xml)//advisory" />
           <xsl:with-param name="prefix" select="'&ftpbase;'" />
           <xsl:with-param name="prefixold" select="'&ftpbaseold;'" />
         </xsl:call-template>
       </xsl:when>
 
       <xsl:when test="$type = 'notice'">
 	<xsl:for-each select="document($advisories.xml)
 	  /descendant::release">
 
 	  <xsl:variable name="relname" select="string(name)" />
 
 	  <xsl:call-template name="html-list-advisories-putitems">
 	    <xsl:with-param name="items" select="document($advisories.xml)
 	      //notice[$relname = string(following::release/name[1])]" />
 	    <xsl:with-param name="prefix" select="'&ftpbaseerrata;'" />
 	    <xsl:with-param name="prefixold" select="'&ftpbaseerrata;'" />
 	  </xsl:call-template>
 
 	  <xsl:call-template name="html-list-advisories-release-label">
 	    <xsl:with-param name="relname" select="name" />
 	  </xsl:call-template>
 	</xsl:for-each>
 
 	<xsl:call-template name="html-list-advisories-putitems">
 	  <xsl:with-param name="items" select="document($advisories.xml)
 	    //notice[not(following::release/name[1])]" />
 	  <xsl:with-param name="prefix" select="'&ftpbaseerrata;'" />
 	  <xsl:with-param name="prefixold" select="'&ftpbaseerrata;'" />
 	</xsl:call-template>
       </xsl:when>
     </xsl:choose>
   </xsl:template>
 
   <!-- template: "html-list-advisories-putitems"
        sub-routine to generate a list -->
 
   <xsl:template name="html-list-advisories-putitems">
     <xsl:param name="items" select="''" />
     <xsl:param name="prefix" select="''" />
     <xsl:param name="prefixold" select="''" />
 
     <xsl:if test="$items">
       <table>
         <tr><th>Date</th><th>Advisory name</th></tr>
         <xsl:for-each select="$items">
           <xsl:variable name="year" select="../../../name" />
           <xsl:variable name="month" select="../../name" />
           <xsl:variable name="day" select="../name" />
           <tr>
             <td class="txtdate">
 	      <xsl:value-of select='
 		concat(format-number($year, "####"), "-",
 		format-number($month, "00"), "-",
 		format-number($day, "00"))' />
             </td>
             <td>
 	    <xsl:choose>
 	      <xsl:when test="@type='release'">
                 <i><xsl:value-of select="name" /></i>
 	      </xsl:when>
 	      <xsl:when test="@omithref='yes'">
 		<xsl:value-of select="name" />
 	      </xsl:when>
 	      <xsl:when test="name/@role='old'">
 		<a><xsl:attribute name="href">
 		    <xsl:value-of select="concat($prefixold, name, '.asc')" />
 		  </xsl:attribute>
 		  <xsl:value-of select="concat(name, '.asc')" /></a>
 	      </xsl:when>
 	      <xsl:otherwise>
 		<a><xsl:attribute name="href">
 		    <xsl:value-of select="concat($prefix, name, '.asc')" />
 		  </xsl:attribute>
 		  <xsl:value-of select="name" /></a>
 	      </xsl:otherwise>
 	    </xsl:choose>
           </td></tr>
 	</xsl:for-each>
       </table>
     </xsl:if>
   </xsl:template>
 
   <!-- template: "html-list-advisories-release-label"
        put label for release -->
 
   <xsl:template name="html-list-advisories-release-label">
     <xsl:param name="relname" select="'none'" />
 
     <p><xsl:value-of select="$relname" /> released.</p>
   </xsl:template>
 
   <!-- template: "html-index-advisories-items"
        pulls in the 6 most recent security advisories -->
 
   <xsl:template name="html-index-advisories-items">
     <xsl:param name="advisories.xml" select="''" />
     <xsl:param name="type" select="'advisory'" />
 
     <xsl:choose>
       <xsl:when test="$type = 'advisory'">
 	<xsl:for-each select="document($advisories.xml)/descendant::advisory[position() &lt;= 3]">
 	  <xsl:variable name="year" select="../../../name" />
           <xsl:variable name="month" select="../../name" />
           <xsl:variable name="day" select="../name" />
 	<p>
 	  <span class="txtdate">
 	      <xsl:value-of select='
 		concat(format-number($year, "####"), "-",
 		format-number($month, "00"), "-",
 		format-number($day, "00"))' />
 	  </span><br />
 	  <xsl:choose>
 	    <xsl:when test="@omithref = 'yes'">
 	      <xsl:value-of select="name"/>
 	    </xsl:when>
 	    <xsl:otherwise>
 	      <a><xsl:attribute name="href">
 		  <xsl:value-of select="concat('&ftpbase;', name, '.asc')"/>
 		</xsl:attribute>
 		<xsl:value-of select="name"/></a>
 	    </xsl:otherwise>
 	  </xsl:choose>
 	  </p>
 	</xsl:for-each>
       </xsl:when>
       <xsl:when test="$type = 'notice'">
 	<xsl:for-each select="document($advisories.xml)/descendant::notice[position() &lt;= 3]">
 	<xsl:variable name="year" select="../../../name" />
 	<xsl:variable name="month" select="../../name" />
 	<xsl:variable name="day" select="../name" />
 	<p>
 	  <span class="txtdate">
 	      <xsl:value-of select='
 		concat(format-number($year, "####"), "-",
 		format-number($month, "00"), "-",
 		format-number($day, "00"))' />
 	  </span><br />
 	  <xsl:choose>
 	    <xsl:when test="@omithref = 'yes'">
 	      <xsl:value-of select="name"/>
 	    </xsl:when>
 	    <xsl:otherwise>
 	      <a><xsl:attribute name="href">
 		  <xsl:value-of select="concat('&ftpbaseerrata;', name, '.asc')"/>
 		</xsl:attribute>
 		<xsl:value-of select="name"/></a>
 	    </xsl:otherwise>
 	  </xsl:choose>
 	  </p>
 	</xsl:for-each>
       </xsl:when>
     </xsl:choose>
   </xsl:template>
 
   <!-- template: "html-index-advisories-items-lastmodified" -->
 
   <xsl:template name="html-index-advisories-items-lastmodified">
     <xsl:param name="advisories.xml" select="''" />
     <xsl:param name="type" select="'advisory'" />
 
     <xsl:choose>
       <xsl:when test="$type = 'advisory'">
 	<xsl:call-template name="misc-format-date-string">
 	  <xsl:with-param name="year"
 	    select="document($advisories.xml)/descendant::year[month/day/advisory[position() = 1]]/name" />
 	  <xsl:with-param name="month"
 	    select="document($advisories.xml)/descendant::month[day/advisory[position() = 1]]/name"/>
 	  <xsl:with-param name="day"
 	    select="document($advisories.xml)/descendant::day[advisory[position() = 1]]/name" />
 	</xsl:call-template>
       </xsl:when>
 
       <xsl:when test="$type = 'notice'">
 	<xsl:call-template name="misc-format-date-string">
 	  <xsl:with-param name="year"
 	    select="document($advisories.xml)/descendant::year[month/day/notice[position() = 1]]/name" />
 	  <xsl:with-param name="month"
 	    select="document($advisories.xml)/descendant::month[day/notice[position() = 1]]/name" />
 	  <xsl:with-param name="day"
 	    select="document($advisories.xml)/descendant::day[notice[position() = 1]]/name" />
 	</xsl:call-template>
       </xsl:when>
     </xsl:choose>
   </xsl:template>
 
   <!-- template: "rdf-security-advisories"
        generate a rdf of 10 most recent security advisories -->
 
   <xsl:template name="rdf-security-advisories">
     <xsl:param name="advisories.xml" select="''" />
 
     <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 	     xmlns="http://my.netscape.com/rdf/simple/0.9/">
 
       <xsl:call-template name="rdf-security-advisories-title" />
 
       <xsl:call-template name="rdf-security-advisories-items">
 	<xsl:with-param name="advisories.xml" select="$advisories.xml" />
       </xsl:call-template>
     </rdf:RDF>
   </xsl:template>
 
   <!-- template: "rdf-security-advisories-title"
        generate title for the security advisories rdf -->
 
   <xsl:template name="rdf-security-advisories-title"
                 xmlns="http://my.netscape.com/rdf/simple/0.9/">
     <channel>
       <title>FreeBSD Security Advisories</title>
       <link>http://www.FreeBSD.org/security/</link>
       <description>Security advisories published from the FreeBSD Project</description>
     </channel>
   </xsl:template>
 
   <!-- template: "rdf-security-advisories-items"
        pulls in the 10 most recent security advisories -->
 
   <xsl:template name="rdf-security-advisories-items"
                 xmlns="http://my.netscape.com/rdf/simple/0.9/">
     <xsl:param name="advisories.xml" select="''" />
 
     <xsl:for-each select="document($advisories.xml)/descendant::advisory[position() &lt;= 10]">
       <item>
 	<title><xsl:value-of select="name"/></title>
 	<xsl:choose>
 	  <xsl:when test="@omithref = 'yes'">
 	    <xsl:value-of select="name"/>
 	  </xsl:when>
 	  <xsl:otherwise>
 	    <link><xsl:value-of select="concat('&ftpbase;', name, '.asc')" /></link>
 	  </xsl:otherwise>
 	</xsl:choose>
 
       </item>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "rss-security-advisories"
        generate a rdf of 10 most recent security advisories -->
 
   <xsl:template name="rss-security-advisories">
     <xsl:param name="advisories.xml" select="''" />
 
     <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
       <channel>
         <xsl:call-template name="rss-security-advisories-title">
 	  <xsl:with-param name="advisories.xml" select="$advisories.xml" />
         </xsl:call-template>
         <xsl:call-template name="rss-security-advisories-items">
 	  <xsl:with-param name="advisories.xml" select="$advisories.xml" />
         </xsl:call-template>
       </channel>
     </rss>
 
   </xsl:template>
 
   <!-- template: "rss-security-advisories-title"
        pulls in the 10 most recent security advisories -->
 
   <xsl:template name="rss-security-advisories-title"
                 xmlns:atom="http://www.w3.org/2005/Atom">
     <xsl:param name="advisories.xml" select="''" />
 
     <xsl:variable name="title">FreeBSD Security Advisories</xsl:variable>
     <xsl:variable name="link">http://www.FreeBSD.org/security/</xsl:variable>
 
     <title><xsl:value-of select="$title" /></title>
     <link><xsl:value-of select="$link" /></link>
     <description>Security advisories published from the FreeBSD Project</description>
     <language>en-us</language>
     <webMaster>secteam@FreeBSD.org (FreeBSD Security Team)</webMaster>
     <managingEditor>secteam@FreeBSD.org (FreeBSD Security Team)</managingEditor>
     <docs>http://blogs.law.harvard.edu/tech/rss</docs>
     <ttl>120</ttl>
     <image>
       <url>http://www.FreeBSD.org/logo/logo-full.png</url>
       <title><xsl:value-of select="$title" /></title>
       <link><xsl:value-of select="$link" /></link>
     </image>
     <atom:link rel="self" type="application/rss+xml">
       <xsl:attribute name="href">
         <xsl:value-of select="$link" /><xsl:text>rss.xml</xsl:text>
       </xsl:attribute>
     </atom:link> 
   </xsl:template>
 
   <!-- template: "rss-security-advisories-items"
        pulls in the 10 most recent security advisories -->
 
   <xsl:template name="rss-security-advisories-items"
                 xmlns:atom="http://www.w3.org/2005/Atom">
     <xsl:param name="advisories.xml" select="''" />
 
     <xsl:for-each select="document($advisories.xml)/descendant::advisory[position() &lt;= 10]">
       <item>
 	<title><xsl:value-of select="name"/></title>
 	<xsl:choose>
 	  <xsl:when test="@omithref = 'yes'">
 	    <link>http://www.FreeBSD.org/security</link>
 	  </xsl:when>
 	  <xsl:otherwise>
 	    <link><xsl:value-of select="concat('&ftpbase;', name, '.asc')" /></link>
 	  </xsl:otherwise>
 	</xsl:choose>
         <guid><xsl:value-of select="concat('&ftpbase;', name, '.asc')" /></guid>
         <pubDate>
           <xsl:call-template name="misc-format-date-string">
             <xsl:with-param name="year" select="../../../name" />
             <xsl:with-param name="month" select="../../name" />
             <xsl:with-param name="day" select="../name" />
             <xsl:with-param name="date-format" select="$param-l10n-date-format-rfc822" />
           </xsl:call-template>
         </pubDate>
       </item>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-index-news-project-items"
        pulls in the 5 most recent project items -->
 
   <xsl:template name="html-index-news-project-items">
     <xsl:param name="news.project.xml-master" select="'none'" />
     <xsl:param name="news.project.xml" select="'none'" />
 
     <xsl:for-each select="document($news.project.xml-master)/descendant::day[position() &lt; 5]">
       <xsl:variable name="year" select="ancestor::year/name" />
       <xsl:variable name="month" select="ancestor::month/name" />
       <xsl:variable name="day" select="name" />
 
       <!-- search localized items per day basis -->
       <xsl:variable name="localizeditems"
 	select="document($news.project.xml)
 	//descendant::year[name = $year]
 	/month[name = $month]
 	/day[name = $day]" />
 
       <xsl:choose>
 	<xsl:when test="$localizeditems/event">
 	  <xsl:for-each select="$localizeditems/event">
 	    <xsl:variable name="anchor-position" select="position()" />
 
 	    <p>
 	    <span class="txtdate">
 		<xsl:value-of select='
 		  concat(format-number($year, "####"), "-",
 		  format-number($month, "00"), "-",
 		  format-number($day, "00"))' />
 	    </span><br />
 	    <a>
 	      <xsl:attribute name="href">
 		<xsl:text>news/newsflash.html#</xsl:text>
 		<xsl:call-template name="html-news-generate-anchor">
 		  <xsl:with-param name="label" select="'event'" />
 		  <xsl:with-param name="year" select="$year" />
 		  <xsl:with-param name="month" select="$month" />
 		  <xsl:with-param name="day" select="$day" />
 		  <xsl:with-param name="pos" select="$anchor-position" />
 		</xsl:call-template>
 	      </xsl:attribute>
 
 	      <xsl:choose>
 		<xsl:when test="count(child::title)">
 		  <xsl:value-of select="title"/><br/>
 		</xsl:when>
 		<xsl:otherwise>
 		  <xsl:value-of select="p"/><br/>
 		</xsl:otherwise>
 	      </xsl:choose>
 	    </a>
 	    </p>
 	  </xsl:for-each>
 	</xsl:when>
 
 	<xsl:otherwise>
 	  <xsl:for-each select="event">
 	    <xsl:variable name="anchor-position" select="position()" />
 
 	    <p>
 	    <span class="txtdate">
 	      <xsl:value-of select='
 		  concat(format-number($year, "####"), "-",
 		  format-number($month, "00"), "-",
 		  format-number($day, "00"))' />
 	    </span><br />
 	    <a>
 	      <xsl:attribute name="href">
 		<xsl:text>news/newsflash.html#</xsl:text>
 		<xsl:call-template name="html-news-generate-anchor">
 		  <xsl:with-param name="label" select="'event'" />
 		  <xsl:with-param name="year" select="$year" />
 		  <xsl:with-param name="month" select="$month" />
 		  <xsl:with-param name="day" select="$day" />
 		  <xsl:with-param name="pos" select="$anchor-position" />
 		</xsl:call-template>
 	      </xsl:attribute>
 
 	      <xsl:choose>
 		<xsl:when test="count(child::title)">
 		  <xsl:value-of select="title"/><br/>
 		</xsl:when>
 		<xsl:otherwise>
 		  <xsl:value-of select="p"/><br/>
 		</xsl:otherwise>
 	      </xsl:choose>
 	    </a>
 	    </p>
 	  </xsl:for-each>
 	</xsl:otherwise>
       </xsl:choose>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-index-news-project-items-lastmodified" -->
 
   <xsl:template name="html-index-news-project-items-lastmodified">
     <xsl:param name="news.project.xml-master" select="''" />
 
     <xsl:call-template name="misc-format-date-string">
       <xsl:with-param name="year"
 	select="document($news.project.xml-master)/descendant::year[position() = 1]/name" />
       <xsl:with-param name="month"
 	select="document($news.project.xml-master)/descendant::month[position() = 1]/name" />
       <xsl:with-param name="day"
 	select="document($news.project.xml-master)/descendant::day[position() = 1]/name" />
     </xsl:call-template>
   </xsl:template>
 
   <!-- template: "html-index-news-press-items"
        pulls in the 5 most recent press items -->
 
   <xsl:template name="html-index-news-press-items">
     <xsl:param name="news.press.xml-master" select="'none'" />
     <xsl:param name="news.press.xml" select="''" />
 
     <xsl:for-each select="document($news.press.xml-master)/descendant::story[position() &lt;= 5]">
       <xsl:variable name="year" select="../../name" />
       <xsl:variable name="month" select="../name" />
       <xsl:variable name="day" select="../name" />
       <xsl:variable name="url" select="url" />
       <xsl:variable name="site-url" select="site-url" />
 
       <xsl:variable name="pos">
 	<xsl:for-each select="../story">
 	  <xsl:if test="url = $url">
 	    <xsl:value-of select="position()" />
 	  </xsl:if>
 	</xsl:for-each>
       </xsl:variable>
 
       <!-- search localized items per story(URL) basis -->
       <xsl:variable name="localizeditems"
 	select="document($news.press.xml)
 	//descendant::year[name = $year]
 	/month[name = $month]
 	/story[url = $url]" />
       
       <p>
       <span class="txtdate">
 	<xsl:value-of select='
 	    concat(format-number($year, "####"), "-",
 	    format-number($month, "00"))' />
       </span><br />
       <a>
 	<xsl:attribute name="href">
 	  <xsl:text>news/press.html#</xsl:text>
 	  <xsl:call-template name="html-news-generate-anchor">
 	    <xsl:with-param name="label" select="'story'" />
 	    <xsl:with-param name="year" select="$year" />
 	    <xsl:with-param name="month" select="$month" />
 	    <xsl:with-param name="pos" select="$pos" />
 	  </xsl:call-template>
 	</xsl:attribute>
 
 	<xsl:choose>
 	  <xsl:when test="$localizeditems">
 	    <xsl:value-of select="$localizeditems/name"/>
 	  </xsl:when>
 
 	  <xsl:otherwise>
 	    <xsl:value-of select="name"/>
 	  </xsl:otherwise>
 	</xsl:choose>
       </a></p>
       
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-index-news-press-items-lastmodified" -->
 
   <xsl:template name="html-index-news-press-items-lastmodified">
     <xsl:param name="news.press.xml-master" select="''" />
 
     <xsl:call-template name="misc-format-date-string">
       <xsl:with-param name="year"
 	select="document($news.press.xml-master)/descendant::year[position() = 1]/name" />
       <xsl:with-param name="month"
 	select="document($news.press.xml-master)/descendant::month[position() = 1]/name" />
       <xsl:with-param name="date-format"
 	select="$param-l10n-date-format-YM" />
     </xsl:call-template>
   </xsl:template>
 
   <!-- template: "html-index-navigation-link-list"
        generates navigation bar in index.html -->
 
   <xsl:template name="html-index-navigation-link-list">
     <xsl:param name="navigation.xml" select="''" />
     <xsl:for-each select="document($navigation.xml)/navigation/category">
       <p>
 	<xsl:choose>
 	  <xsl:when test="boolean(@src)">
 	  <a>
 	    <xsl:attribute name="href">
 	      <xsl:choose>
 		<xsl:when test="@path = 'base'">&base;/</xsl:when>
 		<xsl:when test="@path = 'enbase'">&enbase;/</xsl:when>
 	      </xsl:choose>
 	      <xsl:value-of select="@src"/>
 	    </xsl:attribute>
 	    <font size="+1" color="#990000"><b><xsl:value-of select="@name"/></b></font>
 	  </a>
 	  </xsl:when>
 
 	  <xsl:otherwise>
 	    <font size="+1" color="#990000"><b><xsl:value-of select="@name"/></b></font>
 	  </xsl:otherwise>
 	</xsl:choose>
 	<br/>
 	<small>
 	  <xsl:apply-templates select="link"/>
 	</small>
       </p>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "link" generates links inside of category -->
   <xsl:template match="link">
     <xsl:value-of select="$leadingmark" />
     <a>
       <xsl:attribute name="href">
 	<xsl:choose>
 	  <xsl:when test="@path = 'base'">&base;/</xsl:when>
 	  <xsl:when test="@path = 'enbase'">&enbase;/</xsl:when>
 	</xsl:choose>
 	<xsl:value-of select="@src"/>
       </xsl:attribute>
       <xsl:value-of select="@name"/></a><br/>
   </xsl:template>
   
  <!-- template: "html-index-events-items"
        pulls in the 5 most recent events items -->
 
   <xsl:template name="html-index-events-items">
     <xsl:param name="events.xml-master" select="'none'" />
     <xsl:param name="events.xml" select="''" />
 
     <xsl:for-each select="document($events.xml-master)/descendant::event[
 									   ((number(enddate/year) &gt; number($curdate.year)) or
 								            (number(enddate/year) = number($curdate.year) and
 								             number(enddate/month) &gt; number($curdate.month)) or
 						          		    (number(enddate/year) = number($curdate.year) and
 								             number(enddate/month) = number($curdate.month) and
 						   	            	     enddate/day &gt;= $curdate.day))]">
       <xsl:sort select="startdate/year" order="ascending"/>
       <xsl:sort select="format-number(startdate/month, '00')" order="ascending"/>
       <xsl:sort select="format-number(startdate/day, '00')" order="ascending"/>
 
       <xsl:if test="position() &lt;= 5">
 
       <p>
       <span class="txtdate">
          <xsl:value-of select='
 	    concat(format-number(startdate/year, "####"), "-",
 	    format-number(startdate/month, "00"), "-",
 	    format-number(startdate/day, "00"), " -  ",
 	    format-number(enddate/year, "####"), "-",
 	    format-number(enddate/month, "00"), "-",
 	    format-number(enddate/day, "00"))' />
       </span><br />
       <a>
         <xsl:attribute name="href">
 	  <xsl:choose>
 	    <xsl:when test="$events.xml = 'none'">&enbase;/</xsl:when>
 	    <xsl:otherwise>&base;/</xsl:otherwise>
 	  </xsl:choose>
 	  <xsl:text>events/#</xsl:text>
 	  <xsl:call-template name="generate-event-anchor"/>
         </xsl:attribute>
 
         <xsl:value-of select="name"/>
 
 	<br />
 	(<xsl:value-of select='location/city' />, <xsl:value-of select='location/country' />)
       </a></p>
     </xsl:if>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-index-mirrors-options-list"
        generates mirror sites list in index.html -->
 
   <xsl:template name="html-index-mirrors-options-list">
     <xsl:param name="mirrors.xml" select="''" />
 
     <xsl:choose>
       <xsl:when test="$mirrors.xml = ''">
 	<option value="NONE">
 	  **No Data**
 	</option>
       </xsl:when>
 
       <xsl:otherwise>
 	<xsl:for-each select="document($mirrors.xml)/mirrors/entry[
                               (not(country/@role) or country/@role != 'primary') and
                               host[@type = 'www']/url[@proto = 'httpv6']]">
 	  <xsl:sort select="country/@sortkey" data-type="number" />
 	  <xsl:sort select="country" />
 
 	  <xsl:for-each select="host[@type = 'www']/url[@proto = 'httpv6']">
 	    <option><xsl:attribute name="value"><xsl:value-of select="." /></xsl:attribute>
 	      <xsl:choose>
 		<xsl:when test="last() = 1">
 		  <xsl:value-of select="concat('IPv6 ', ../../country)" />
 		</xsl:when>
 		<xsl:otherwise>
 		  <xsl:value-of select="concat('IPv6 ', ../../country, '/', position())" />
 		</xsl:otherwise>
 	      </xsl:choose>
 	    </option>
 	  </xsl:for-each>
 	</xsl:for-each>
 
 	<xsl:for-each select="document($mirrors.xml)/mirrors/entry[
                               (not(country/@role) or country/@role != 'primary') and
                               host[@type = 'www']/url[@proto = 'http']]">
 	  <xsl:sort select="country/@sortkey" data-type="number" />
 	  <xsl:sort select="country" />
 
 	  <xsl:for-each select="host[@type = 'www']/url[@proto = 'http']">
 	    <option><xsl:attribute name="value"><xsl:value-of select="." /></xsl:attribute>
 	      <xsl:choose>
 		<xsl:when test="last() = 1">
 		  <xsl:value-of select="../../country" />
 		</xsl:when>
 		<xsl:otherwise>
 		  <xsl:value-of select="concat(../../country, '/', position())" />
 		</xsl:otherwise>
 	      </xsl:choose>
 	    </option>
 	  </xsl:for-each>
 	</xsl:for-each>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
   <!-- Generate a unique anchor for this event. -->
   <xsl:template name="generate-event-anchor">
     <xsl:text>event</xsl:text>
     <xsl:value-of select="ancestor::year/name"/>
     <xsl:value-of select="ancestor::month/name"/>
     <xsl:value-of select="ancestor::day/name"/>:<xsl:value-of select="count(preceding-sibling::event)"/>
   </xsl:template>
 
   <!-- Generate a unique anchor for this story -->
   <xsl:template name="generate-story-anchor">
     <xsl:text>story</xsl:text>
     <xsl:value-of select="ancestor::year/name"/>
     <xsl:value-of select="ancestor::month/name"/>:<xsl:text/>
     <xsl:value-of select="count(following-sibling::story)"/>
   </xsl:template>
 
   <!-- Convert a month number to the corresponding long English name. -->
   <xsl:template name="gen-long-en-month">
     <xsl:param name="nummonth"/>
     <xsl:variable name="month" select="number($nummonth)"/>
     <xsl:choose>
       <xsl:when test="$month=1">January</xsl:when>
       <xsl:when test="$month=2">February</xsl:when>
       <xsl:when test="$month=3">March</xsl:when>
       <xsl:when test="$month=4">April</xsl:when>
       <xsl:when test="$month=5">May</xsl:when>
       <xsl:when test="$month=6">June</xsl:when>
       <xsl:when test="$month=7">July</xsl:when>
       <xsl:when test="$month=8">August</xsl:when>
       <xsl:when test="$month=9">September</xsl:when>
       <xsl:when test="$month=10">October</xsl:when>
       <xsl:when test="$month=11">November</xsl:when>
       <xsl:when test="$month=12">December</xsl:when>
       <xsl:otherwise>Invalid month</xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
   <!-- Convert a month number to the corresponding short English name. -->
   <xsl:template name="gen-short-en-month">
     <xsl:param name="nummonth"/>
     <xsl:variable name="month" select="number($nummonth)"/>
     <xsl:choose>
       <xsl:when test="$month=1">Jan</xsl:when>
       <xsl:when test="$month=2">Feb</xsl:when>
       <xsl:when test="$month=3">Mar</xsl:when>
       <xsl:when test="$month=4">Apr</xsl:when>
       <xsl:when test="$month=5">May</xsl:when>
       <xsl:when test="$month=6">Jun</xsl:when>
       <xsl:when test="$month=7">Jul</xsl:when>
       <xsl:when test="$month=8">Aug</xsl:when>
       <xsl:when test="$month=9">Sep</xsl:when>
       <xsl:when test="$month=10">Oct</xsl:when>
       <xsl:when test="$month=11">Nov</xsl:when>
       <xsl:when test="$month=12">Dec</xsl:when>
       <xsl:otherwise>Invalid month</xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
   <!-- Generate a date interval. -->
   <!-- Sample: 27 November, 2002 - 29 December, 2003 -->
   <xsl:template name="gen-date-interval">
     <xsl:param name="startdate"/>
     <xsl:param name="enddate"/>
 
     <xsl:value-of select="startdate/day"/>
 
     <xsl:if test="number(startdate/month) != number(enddate/month) or
 		  number(startdate/day) != number(enddate/day) or
 		  number(startdate/year) != number(enddate/year)">
 
       <xsl:if test="number(startdate/month) != number(enddate/month) or
 		    number(startdate/year) != number(enddate/year)">
 	<xsl:text> </xsl:text>
 	<xsl:call-template name="gen-long-en-month">
 	  <xsl:with-param name="nummonth" select="startdate/month"/>
 	</xsl:call-template>
       </xsl:if>
 
       <xsl:if test="number(startdate/year) != number(enddate/year)">
 	<xsl:text>, </xsl:text>
 	<xsl:value-of select="startdate/year"/>
       </xsl:if>
       <xsl:text> - </xsl:text>
 
       <xsl:if test="number(startdate/day) != number(enddate/day) or
 		    number(startdate/month) != number(enddate/month) or
 		    number(startdate/year) != number(enddate/year)">
 	<xsl:value-of select="enddate/day"/>
       </xsl:if>
     </xsl:if>
 
     <xsl:text> </xsl:text>
     <xsl:call-template name="gen-long-en-month">
       <xsl:with-param name="nummonth" select="enddate/month"/>
     </xsl:call-template>
 
     <xsl:text>, </xsl:text>
     <xsl:value-of select="enddate/year"/>
   </xsl:template>
 </xsl:stylesheet>
diff --git a/share/sgml/templates.usergroups.xsl b/share/sgml/templates.usergroups.xsl
index c0c96726b5..7207291059 100644
--- a/share/sgml/templates.usergroups.xsl
+++ b/share/sgml/templates.usergroups.xsl
@@ -1,67 +1,68 @@
 <?xml version="1.0"?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
                                 "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
 <!ENTITY title "User Groups">
 <!ENTITY email "freebsd-www">
+<!ENTITY base "http://www.FreeBSD.org/">
 <!ENTITY % navinclude.community "INCLUDE">
 ]>
 
-<!-- $FreeBSD: www/share/sgml/templates.usergroups.xsl,v 1.7 2006/08/19 21:20:54 hrs Exp $ -->
+<!-- $FreeBSD: www/share/sgml/templates.usergroups.xsl,v 1.8 2006/08/21 18:27:43 hrs Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
   exclude-result-prefixes="cvs">
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
   <xsl:output method="xml"
     doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
     doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"/>
 
   <xsl:variable name="date">
     <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
   </xsl:variable>
 
   <xsl:template match="/">
     <html>
       &header1;
 
       <body>
 	<div id="CONTAINERWRAP">
 	  <div id="CONTAINER">
 	    &header2;
 
 	    <div id="CONTENT">
 	      <div id="SIDEWRAP">
 		&nav;
 	      </div> <!-- SIDEWRAP -->
 
 	      <div id="CONTENTWRAP">
 		&header3;
 
 	<xsl:call-template name="html-usergroups-list-header" />
 
 	<xsl:call-template name="html-usergroups-list-regions">
           <xsl:with-param name="usergroups.xml" select="$usergroups.xml" />
           <xsl:with-param name="usergroups-local.xml" select="$usergroups-local.xml" />
 	</xsl:call-template>
 
 	<xsl:call-template name="html-usergroups-list-entries">
           <xsl:with-param name="usergroups.xml" select="$usergroups.xml" />
           <xsl:with-param name="usergroups-local.xml" select="$usergroups-local.xml" />
 	</xsl:call-template>
 
 	      </div> <!-- CONTENTWRAP -->
 
 	      <br class="clearboth" />
 	    </div> <!-- CONTENT -->
 
 	    <div id="FOOTER">
 	      &copyright;<br />
 	      &date;
 	    </div> <!-- FOOTER -->
 	  </div> <!-- CONTAINER -->
 	</div> <!-- CONTAINERWRAP -->
       </body>
     </html>
   </xsl:template>
 </xsl:stylesheet>
diff --git a/share/sgml/usergroups.dtd b/share/sgml/usergroups.dtd
index 7b7a1563b3..b45d751f6e 100644
--- a/share/sgml/usergroups.dtd
+++ b/share/sgml/usergroups.dtd
@@ -1,39 +1,43 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/share/sgml/usergroups.dtd,v 1.1 2006/08/19 21:20:54 hrs Exp $ -->
 
 <!ENTITY % xml.features "INCLUDE">
 <!ENTITY % sgml.features "IGNORE">
 
-<!ELEMENT usergroups (entry)*>
+<!ELEMENT usergroups (continent, entry)*>
+
+<!ELEMENT continent (country, entry)*>
+
+<!ELEMENT country (entity)*>
 
 <!ELEMENT entry (name, url, description)>
 <!ATTLIST entry
   id		ID	#IMPLIED
   continent	CDATA	#IMPLIED
 >
 
 <!ELEMENT name (#PCDATA)>
 
 <!ELEMENT url (#PCDATA)>
 
 <!ELEMENT description (#PCDATA|a)*>
 
 <!ELEMENT a (#PCDATA)>
 <!ATTLIST a
   id		ID	#IMPLIED
   href		CDATA	#REQUIRED
 >
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
         "http://www.FreeBSD.org/XML/www/share/sgml/iso8879.ent">
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
         "http://www.FreeBSD.org/XML/www/share/sgml/l10n.ent">
 %l10n.ent;
 
 <!ENTITY % common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
         "http://www.FreeBSD.org/XML/www/share/sgml/common.ent">
 %common.ent;
diff --git a/share/sgml/usergroups.xml b/share/sgml/usergroups.xml
index 7a57843f12..fac4bbb071 100644
--- a/share/sgml/usergroups.xml
+++ b/share/sgml/usergroups.xml
@@ -1,1127 +1,1158 @@
 <?xml version="1.0"?>
 <!DOCTYPE usergroups PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for UserGroups//EN"
                             "http://www.FreeBSD.org/XML/www/share/sgml/usergoups.dtd">
 
 <usergroups>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/usergroups.xml,v 1.64 2008/04/14 18:14:47 jkois Exp $
+      $FreeBSD: www/share/sgml/usergroups.xml,v 1.65 2008/04/20 01:55:19 murray Exp $
     </cvs:keyword>
   </cvs:keywords>
 
-  <entry id="humbug" continent="Australia">
-    <country code="AU">Australia</country>
-    <name>Home Unix Users Group for Brisbane</name>
-    <url>http://www.humbug.org.au/</url>
-    <description>We meet fortnightly at meeting rooms provided by the
-      <a href="http://www.uq.edu.au/">University of Queensland</a>.
-      More information, including how to join the mailing lists, is
-      available at <a
-        href="http://www.humbug.org.au/">http://www.humbug.org.au</a>.
-      Located in Queensland.
-    </description>
-  </entry>
-
-  <entry id="buga" continent="Australia">
-    <country code="AU">Australia</country>
-    <name>BUGA, The BSD User Group of Adelaide</name>
-    <url>mailto:majordomo@lemis.com</url>
-    <description>We meet at irregular intervals. Join the mailing list
-      by sending a message to <a
-      href="mailto:majordomo@lemis.com">majordomo@lemis.com</a> with
-      the text <code>subscribe BUGA</code> in the body. Located in
-      South Australia.
+<continent name="Global">
+  <country name="Global">
+  <entry id="metabug" continent="North America">
+    <name>The Global BSD User Groups</name>
+    <url>http://metabug.org/</url>
+    <description>The Global BSD User Groups organization was founded to help
+      promote local BSD user groups by helping to share ideas and experiences
+      with other BUG organizations.  Our goals are:
+      <ul>
+	<li>Foster inter-BUG relations and communications to increase unity
+	  in the BSD user group communities.</li>
+	<li>Assist in increasing awareness of smaller user groups in the
+	  community.</li>
+	<li>Facilitate idea and resource sharing through common access to
+	  meeting presentation topics and materials.</li>
+	<li>Increase exposure to other BSD projects where local user
+	  groups may have less member interest or experience.</li>
+	<li>Offer a BSD user group for those without a local BUG.</li>
+      </ul>
+      We are working on ways to provide remote participation through streaming
+      video of presentations.  You can check our <a
+	href="http://metabug.org/">website</a> or contact us via <a
+	href="mailto:info@metabug">e-mail</a>.
     </description>
   </entry>
+  </country>
+  </continent>
 
-  <entry id="bugat" continent="Europe">
-    <country code="AT">Austria</country>
-    <name>The BSD User Group Austria (BUGAT)</name>
-    <url>http://www.bugat.at/</url>
-    <description>The BSD User Group Austria (BUGAT) is a
-      german-language oriented user group.  Visit our <a
-        href="http://www.bugat.at">server</a> for more
-      information.  Located in Austria.
-    </description>
-  </entry>
+  <continent name="Oceania">
+    <country name="Australia" code="AU">
 
-  <entry id="bsd-dk" continent="Europe">
-    <country code="DK">Denmark</country>
-    <name>BSD-DK</name>
-    <url>http://www.bsd-dk.dk/</url>
-    <description>The Danish BSD User Group. Promotion and support of the
-      BSD derived Operating Systems in Denmark. Mailing lists, lecture
-      and workshops. Send mail subscription requests to <a
+    <entry id="humbug">
+      <name>Home Unix Users Group for Brisbane</name>
+      <url>http://www.humbug.org.au/</url>
+      <description>We meet fortnightly at meeting rooms provided by the
+        <a href="http://www.uq.edu.au/">University of Queensland</a>.
+        More information, including how to join the mailing lists, is
+        available at <a
+        href="http://www.humbug.org.au/">http://www.humbug.org.au</a>.
+        Located in Queensland.
+      </description>
+    </entry>
+
+    <entry id="buga">
+      <name>BUGA, The BSD User Group of Adelaide</name>
+      <url>mailto:majordomo@lemis.com</url>
+      <description>We meet at irregular intervals. Join the mailing
+        list by sending a message to <a
+        href="mailto:majordomo@lemis.com">majordomo@lemis.com</a> with
+        the text <code>subscribe BUGA</code> in the body. Located in
+        South Australia.
+      </description>
+    </entry>
+
+    <entry id="bugs">
+      <name>BSD Users Group, Sydney (BUGS)</name>
+      <url>http://www.bugs.au.FreeBSD.org/</url>
+      <description>The BSD Users Group, Sydney (BUGS) meets occasionally
+        in Sydney and surrounds. We have members from all over NSW. To
+        join the mailing list or IRC channel, visit <a
+  	href="http://www.bugs.au.freebsd.org/">
+	http://www.bugs.au.freebsd.org/</a>.  Located in New South Wales.
+      </description>
+    </entry>
+  </country>
+
+  <country code="NZ" name="New Zealand">
+    <entry id="nzfug">
+      <name>New Zealand FreeBSD Users Group</name>
+      <url>http://nzfug.nz.freebsd.org/nzfug/</url>
+      <description>The NZ FreeBSD Users Group runs a mailing list and maintains
+        local mirrors.
+      </description>
+    </entry>
+  </country>
+</continent>
+
+<continent name="Europe">
+  <country code="AT" name="Austria">
+    <entry id="bugat">
+      <name>The BSD User Group Austria (BUGAT)</name>
+      <url>http://www.bugat.at/</url>
+
+      <description>The BSD User Group Austria (BUGAT) is a
+        german-language oriented user group.  Visit our <a
+        href="http://www.bugat.at">server</a> for more information.
+        Located in Austria.
+      </description>
+    </entry>
+  </country>
+
+  <country code="DK" name="Denmark">
+    <entry id="bsd-dk">
+      <name>BSD-DK</name>
+      <url>http://www.bsd-dk.dk/</url>
+      <description>The Danish BSD User Group. Promotion and support of the
+        BSD derived Operating Systems in Denmark. Mailing lists, lecture
+        and workshops. Send mail subscription requests to <a
         href="mailto:bsd-dk-request@bsd-dk.dk">
 	bsd-dk-request@bsd-dk.dk</a>.  Located in Denmark.
-    </description>
-  </entry>
-
-  <entry id="albabug" continent="Europe">
-    <country code="AL">Albania</country>
-    <name>AlbaBUG</name>
-    <url>http://www.AlbaBSD.org</url>
-    <description>The Albanian BSD Users Group is a group that represents
-      and supports *BSD in Albanian language.  More information is
-      available at <a href="http://www.AlbaBSD.org">
-	http://www.AlbaBSD.org</a>. Located in Prishtina, Kosova.
-    </description>
-  </entry>
-
-  <entry id="aauug" continent="Europe">
-    <country code="DK">Denmark</country>
-    <name>AaUUG</name>
-    <url>http://www.aauug.dk/</url>
-    <description>AaUUG is a general Unix Group with most interest in
-      Linux and BSD. <a href="http://aauug.dk/postlister.html">
+      </description>
+    </entry>
+
+    <entry id="aauug">
+      <name>AaUUG</name>
+      <url>http://www.aauug.dk/</url>
+      <description>AaUUG is a general Unix Group with most interest in
+        Linux and BSD. <a href="http://aauug.dk/postlister.html">
         Mailinglists</a>, lectures and meetings.  Located in Denmark,
-      Aarhus.
-    </description>
-  </entry>
-
-  <entry id="augusta" continent="Europe">
-    <country code="DE">Germany</country>
-    <name>Augusta</name>
-    <url>http://www.augusta.de/</url>
-    <description>The BSD User Group of the Augsburger Computer Forum
-      e.V. meets every second Saturday at 17.00.  Please visit our
-      <a href="http://www.augusta.de/">web site</a> for more
-      information on dates and our address.  We have all kinds of
-      BSD, but mainly FreeBSD and Mac OS X.  Located in Germany,
-      Augsburg.
-    </description>
-  </entry>
-
-  <entry id="Aachener-BSD" continent="Europe">
-    <country code="DE">Germany</country>
-    <name>The Aachener BSD Stammtisch</name>
-    <url>http://foldr.org/mailman/listinfo/bsd-ac/</url>
-    <description>The Aachener BSD Stammtisch is meeting infrequently
-      to discuss BSD and related matters over a glass of beer.
-      Meetings are coordinated through our <a
-      href="http://foldr.org/mailman/listinfo/bsd-ac">mailing
+        Aarhus.
+      </description>
+    </entry>
+  </country>
+
+  <country code="AL" name="Albania">
+    <entry id="albabug">
+      <name>AlbaBUG</name>
+      <url>http://www.AlbaBSD.org</url>
+      <description>The Albanian BSD Users Group is a group that represents
+        and supports *BSD in Albanian language.  More information is
+        available at <a href="http://www.AlbaBSD.org">
+  	http://www.AlbaBSD.org</a>. Located in Prishtina, Kosova.
+      </description>
+    </entry>
+  </country>
+
+  <country code="DE" name="Germany">
+    <entry id="augusta">
+      <name>Augusta</name>
+      <url>http://www.augusta.de/</url>
+      <description>The BSD User Group of the Augsburger Computer Forum
+        e.V. meets every second Saturday at 17.00.  Please visit our
+        <a href="http://www.augusta.de/">web site</a> for more
+        information on dates and our address.  We have all kinds of
+        BSD, but mainly FreeBSD and Mac OS X.  Located in Germany,
+        Augsburg.
+      </description>
+    </entry>
+
+    <entry id="Aachener-BSD">
+      <name>The Aachener BSD Stammtisch</name>
+      <url>http://foldr.org/mailman/listinfo/bsd-ac/</url>
+      <description>The Aachener BSD Stammtisch is meeting infrequently
+        to discuss BSD and related matters over a glass of beer.
+        Meetings are coordinated through our <a
+        href="http://foldr.org/mailman/listinfo/bsd-ac">mailing
         list</a>.  Located in Germany, Aachen.
-    </description>
-  </entry>
-
-  <entry id="bsd-crew" continent="Europe">
-    <country code="DE">Germany</country>
-    <name>BSD-Crew Dresden</name>
-    <url>http://www.bsd-crew.de/</url>
-    <description>BSD-Crew Dresden is a User Group who has some projects
-      related in bringing the BSD to the desktop and electronic
-      communication.  Located in Germany, Dresden.
-    </description>
-  </entry>
-
-  <entry id="cosmo-project" continent="Europe">
-    <country code="DE">Germany</country>
-    <name>The Cosmo-Project</name>
-    <url>http://www.cosmo-project.de/</url>
-    <description>The Cosmo-Project is a User Group with a difference.
-      Instead of just meeting, they actively develop project such as
-      robots.  Most users use FreeBSD, but it is not a specifically
-      FreeBSD-related group.  Located in Germany, Duisburg.
-    </description>
-  </entry>
-
-  <entry id="bsdhh" continent="Europe">
-    <country code="DE">Germany</country>
-    <name>BSD User Group Hamburg (BSDHH)</name>
-    <url>http://www.bsdhh.org/bsdhh-de-faq.html</url>
-    <description>The BSD User Group Hamburg (BSDHH) meets on the first
-      Wednesday of the month at 7.00pm in the Chinese restaurant
-      <em>Lotosblute</em>, Luwenstrasse 22 in Hamburg-Eppendorf.  Most
-      members are FreeBSD users, although users of all BSD flavors are
-      welcome.  Located in Germany, Hamburg.
-    </description>
-  </entry>
-
-  <entry id="uugrn" continent="Europe">
-    <country code="DE">Germany</country>
-    <name>Unix Users Group Rhein-Neckar eV (UUGRN eV)</name>
-    <url>http://www.uugrn.org/</url>
-    <description>The Unix Users Group Rhein-Neckar eV (UUGRN eV)
-      provides a regional forum for users of all Unix flavors, with a
-      stress on Linux and BSD. <a
-        href="http://www.uugrn.org/kalender.php">Meetings</a> are
-      held on the second Thursday of each month at the
-      "hafenschenke" in Mannheim and the fourth Wednesday of each
-      month at the "Vater Rhein" in Heidelberg.  Located in Germany,
-      Mannheim.
-    </description>
-  </entry>
-
-  <entry id="bim" continent="Europe">
-    <country code="DE">Germany</country>
-    <name>Berkeley in Munich (BIM)</name>
-    <url>http://berklix.org/bim/</url>
-    <description>The Berkeley in Munich (BIM) caters for users of BSD
-      based systems in Oberbayern.  Located in Germany, Munich.
-    </description>
-  </entry>
-
-  <entry id="e-bug" continent="Europe">
-    <country code="RU">Russia</country>
-    <name>BSD User Group Ekaterinburg (E#BUG)</name>
-    <url>http://bsdekaterinburg.ru/</url>
-    <description>The BSD User Group Ekaterinburg (E#BUG) is a community
-      of BSD users in Ekaterinburg, Russia.  We distribute BSD releases
-      to all who asks us for it in our city, and we are trying to help
-      everyone to discover and use BSD.  Please visit our web site and
-      learn more about us.
-    </description>
-  </entry>
-
-  <entry id="gufi" continent="Europe">
-    <country code="IT">Italy</country>
-    <name>Gruppo Utenti FreeBSD Italia (GUFI)</name>
-    <url>http://www.gufi.org/</url>
-    <description>The Gruppo Utenti FreeBSD Italia (GUFI) is a "italian
-      powered" FreeBSD User Group. It is intended to help Italian
-      FreeBSD users to find support and articles on/about FreeBSD in
-      the italian language. Please follow this <a
+      </description>
+    </entry>
+
+    <entry id="bsd-crew">
+      <name>BSD-Crew Dresden</name>
+      <url>http://www.bsd-crew.de/</url>
+      <description>BSD-Crew Dresden is a User Group who has some projects
+        related in bringing the BSD to the desktop and electronic
+        communication.  Located in Germany, Dresden.
+      </description>
+    </entry>
+
+    <entry id="cosmo-project">
+      <name>The Cosmo-Project</name>
+      <url>http://www.cosmo-project.de/</url>
+      <description>The Cosmo-Project is a User Group with a difference.
+        Instead of just meeting, they actively develop project such as
+        robots.  Most users use FreeBSD, but it is not a specifically
+        FreeBSD-related group.  Located in Germany, Duisburg.
+      </description>
+    </entry>
+
+    <entry id="bsdhh">
+      <name>BSD User Group Hamburg (BSDHH)</name>
+      <url>http://www.bsdhh.org/bsdhh-de-faq.html</url>
+
+      <description>The BSD User Group Hamburg (BSDHH) meets on the
+        first Wednesday of the month at 7.00pm in the Chinese
+        restaurant <em>Lotosblute</em>, Luwenstrasse 22 in
+        Hamburg-Eppendorf.  Most members are FreeBSD users, although
+        users of all BSD flavors are welcome.  Located in Germany,
+        Hamburg.
+      </description>
+    </entry>
+
+    <entry id="uugrn">
+      <name>Unix Users Group Rhein-Neckar eV (UUGRN eV)</name>
+      <url>http://www.uugrn.org/</url>
+      <description>The Unix Users Group Rhein-Neckar eV (UUGRN eV)
+        provides a regional forum for users of all Unix flavors, with
+        a stress on Linux and BSD. <a
+        href="http://www.uugrn.org/kalender.php">Meetings</a> are held
+        on the second Thursday of each month at the "hafenschenke" in
+        Mannheim and the fourth Wednesday of each month at the "Vater
+        Rhein" in Heidelberg.  Located in Germany, Mannheim.
+      </description>
+    </entry>
+
+    <entry id="bim">
+      <name>Berkeley in Munich (BIM)</name>
+      <url>http://berklix.org/bim/</url>
+      <description>The Berkeley in Munich (BIM) caters for users of
+        BSD based systems in Oberbayern.  Located in Germany, Munich.
+      </description>
+    </entry>
+
+    <entry id="u-bus">
+      <name>Ulmer BSD User Stammtisch</name>
+      <url>http://www.u-bus.de</url>
+
+      <description>The U-BUS meets every last Thursday of the month.
+        For more information about meetings and related issues, please
+        check the web page (<a href="http://www.u-bus.de">u-bus</a>).
+        Located in Germany, Ulm.
+      </description>
+    </entry>
+
+    <entry id="bluefrogs">
+      <name>Bluefrogs e.V.</name>
+      <url>http://www.bluefrogs.de/</url>
+
+      <description>Unix and Linux User Group in Bergisch Gladbach
+        (near Cologne), German.  Meetings are held twice a month.  We
+        are working with all Open Source Unix derivates: FreeBSD,
+        NetBSD, OpenBSD, Linux and others.  We give workshops,
+        lectures, talks and install parties.  For more information
+        please email us at: <a
+        href="mailto:info@bluefrogs.de">info@bluefrogs.de</a>
+      </description>
+    </entry>
+
+    <entry id="koeln-lug">
+      <name>The Koelner Linux und U.n.i.x Gruppe</name>
+      <url>http://www.koeln-lug.de/</url>
+
+      <description>The Koelner Linux und U.n.i.x Gruppe(Cologne Linux
+        and U.n.i.x Group) is a community of Linux and Unix users
+        located in Germany, Koeln (Cologne) with a mailing list and
+        meetings two times a month.
+      </description>
+    </entry> 
+
+    <entry id="bse">
+      <name>BSE M&uuml;nchen</name>
+      <url>http://bse.42.org/</url>
+
+      <description>BSE (BSD Social Event) is located in M&uuml;nchen
+        (Munich), Germany.  Feel free to visit our regular meetings
+        (every four weeks) or join the mailing list.  For more
+        information visit the <a href="http://bse.42.org/">BSE web
+        site</a>.
+      </description>
+    </entry>
+  </country>
+  <country code="FR" name="France">
+    <entry id="fug-fr">
+      <name>FUG-FR</name>
+      <url>http://www.fug-fr.org/</url>
+
+      <description>The FreeBSD User Group France (FUG-FR) is an group
+        of FreeBSD enthusiasts in France currently involved
+        translating marketing papers etc. They are also active in
+        helping out FOSDEM (held in Brussels).  For more information
+        please visit our web page <a
+        href="http://www.fug-fr.org/">http://www.fug-fr.org</a> or
+        contact <a href="mailto:rodrigo@bebik.net">Rodrigo Osorio</a>.
+      </description>
+    </entry>
+  </country>
+
+  <country code="RS" name="Serbia">
+    <entry id="bsd-srbija">
+      <name>The Serbian BSD User Group</name>
+      <url>http://www.bsd-srbija.org/</url>
+
+      <description>The Serbian BSD Users Group provides an open forum
+        for all things BSD-related in the Serbian language.  Located
+        in Serbia.
+      </description>
+    </entry>
+  </country>
+
+  <country code="RU" name="Russia">
+    <entry id="e-bug">
+      <name>BSD User Group Ekaterinburg (E#BUG)</name>
+      <url>http://bsdekaterinburg.ru/</url>
+
+      <description>The BSD User Group Ekaterinburg (E#BUG) is a
+        community of BSD users in Ekaterinburg, Russia.  We distribute
+        BSD releases to all who asks us for it in our city, and we are
+        trying to help everyone to discover and use BSD.  Please visit
+        our web site and learn more about us.
+      </description>
+    </entry>
+
+    <entry id="unixforums-ru">
+      <name>Russian UNIX Forums</name>
+      <url>http://unixforums.org.ru</url>
+
+      <description>Russian UNIX Forums provides a place for the
+        Russian Unix community to share knowledge.  There are some
+        articles and there is a maintained Unix Encyclopedia Project.
+        A specific *BSD section is available as well.
+      </description>
+    </entry>
+
+    <entry id="rfug">
+      <name>Russian FreeBSD User Group (RFUG)</name>
+      <url>http://bsdportal.ru</url>
+
+      <description>The Russian FreeBSD User Group (RFUG) is a Russian
+        language oriented user group for the Russian and ex-USSR
+        users.  Located in the Russia.
+      </description>
+    </entry>
+  </country>
+  <country code="IT" name="Italy">
+    <entry id="gufi">
+      <name>Gruppo Utenti FreeBSD Italia (GUFI)</name>
+      <url>http://www.gufi.org/</url>
+
+      <description>The Gruppo Utenti FreeBSD Italia (GUFI) is a
+        "italian powered" FreeBSD User Group. It is intended to help
+        Italian FreeBSD users to find support and articles on/about
+        FreeBSD in the italian language. Please follow this <a
         href="http://www.gufi.org/">link</a> to know more about us.
-      Located in Italia.
-    </description>
-  </entry>
-
-  <entry id="bsdforums" continent="Europe">
-    <country code="RO">Romania</country>
-    <name>Romanian BSD Forums</name>
-    <url>http://bsdforums.unixro.net/</url>
-    <description>Romanian BSD Forums provides a friendly place for the
-      Romanian *BSD community to share knowledge. A specific FreeBSD
-      section is available on the forum.
-    </description>
-  </entry>
-
-  <entry id="bug-lv" continent="Europe">
-    <country code="LV">Latvia</country>
-    <name>BSD User Group Latvia</name>
-    <url>http://www.bug.lv</url>
-    <description>To learn more about the BSD User Group Latvia,
-      please visit our <a href="http://www.bug.lv/">site</a> and
-      our <a href="http://www.bug.lv/">forums</a>.  Located in Latvia.
-    </description>
-  </entry>
-
-  <entry id="nlfug" continent="Europe">
-    <country code="NL">The Netherlands</country>
-    <name>The Dutch FreeBSD User Group (NLFUG)</name>
-    <url>http://www.nlfug.nl</url>
-    <description>The Dutch FreeBSD User Group (NLFUG) has had our first
-      meeting on oct 2, 1999. On this day 30 years before that, the
-      second IMP was installed in Doug Englebart's lab at SRI.  This,
-      as you all know, was the start of something that grew to be the
-      Internet (thanks to Edwin Kremer for bringing this to our
-      attention).  Located in the Netherlands.
-    </description>
-  </entry>
-
-  <entry id="nobug" continent="Europe">
-    <country code="NO">Norway</country>
-    <name>The Norwegian BSD User Group (NOBUG)</name>
-    <url>http://www.nobug.no/</url>
-    <description>The Norwegian BSD User Group (NOBUG) is a User Group
-      for BSD users and enthusiasts in Norway.  Meetings are currently
-      held in Oslo and Bergen.  Visit our website for more information.
-      There is also a Unix User Group (<a href="http://www.nuug.no/">
-        NUUG</a>) with more regular meetings, sometimes even with a BSD
-      subject.  Located in Norway.
-    </description>
-  </entry>
-
-  <entry id="lublin" continent="Europe">
-    <country code="PL">Poland</country>
-    <name>The Lublin BSD Users Group</name>
-    <url>http://www.FreeBSD.lublin.pl/</url>
-    <description>Please follow the link for details.  Located in Poland.
-    </description>
-  </entry>
-
-  <entry id="ptbsd" continent="Europe">
-    <country code="PT">Portuguese</country>
-    <name>The Portuguese *BSD Users Group</name>
-    <url>mailto:ptbsd@yahoo.com</url>
-    <description>The Portuguese *BSD Users Group is a User Group for
-      Portuguese users of BSD operating systems.  Contact Rui Pereira
-      <a href="mailto:ptbsd@yahoo.com">ptbsd@yahoo.com</a> for more
-      information.  Located in Portugal, Amadora.
-    </description>
-  </entry>
-
-  <entry id="npf" continent="Europe">
-    <country code="PT">Portuguese</country>
-    <name>N&uacute;cleo Portugu&ecirc;s de FreeBSD (NPF)</name>
-    <url>http://npf.pt.FreeBSD.org/</url>
-    <description>The N&uacute;cleo Portugu&ecirc;s de FreeBSD (NPF) is a Portuguese
-      FreeBSD User Group that is engaged in the production of
-      documentation in Portuguese language.  Currently the activities
-      are centred on the translation of the FreeBSD Handbook and on the
-      production of CF's (aka HowTos) that try to answer questions or
-      propose solutions to problems that are experienced by Portuguese
-      users. See <a href="http://npf.pt.FreeBSD.org/">
-        http://npf.pt.FreeBSD.org</a> for more information.  Located in
-      Portugal.
-    </description>
-  </entry>
-
-  <entry id="rofug" continent="Europe">
-    <country code="RO">Romanian</country>
-    <name>The Romanian FreeBSD Users Group/Free Unix Group
-      (ROFUG)</name>
-    <url>http://www.rofug.ro/</url>
-    <description>The ROFUG (Romanian FreeBSD Users Group/Free Unix Group)
-      is a User Group for the Romanian users of FreeBSD and Open Source
-      in general, promoting and supporting FreeBSD and Open Source usage.
-      To join the mailing lists, send an email to <a
-        href="mailto:listar@rofug.ro">listar@rofug.ro</a> with
-      <code>subscribe rofug</code> and/or <code>subscribe
+        Located in Italia.
+      </description>
+    </entry>
+  </country>
+
+  <country code="RO" name="Romania">
+    <entry id="bsdforums">
+      <name>Romanian BSD Forums</name>
+      <url>http://bsdforums.unixro.net/</url>
+
+      <description>Romanian BSD Forums provides a friendly place for
+        the Romanian *BSD community to share knowledge. A specific
+        FreeBSD section is available on the forum.
+      </description>
+    </entry>
+
+    <entry id="rofug">
+      <name>The Romanian FreeBSD Users Group/Free Unix Group
+        (ROFUG)</name>
+      <url>http://www.rofug.ro/</url>
+
+      <description>The ROFUG (Romanian FreeBSD Users Group/Free Unix
+        Group) is a User Group for the Romanian users of FreeBSD and
+        Open Source in general, promoting and supporting FreeBSD and
+        Open Source usage.  To join the mailing lists, send an email
+        to <a href="mailto:listar@rofug.ro">listar@rofug.ro</a> with
+        <code>subscribe rofug</code> and/or <code>subscribe
         rofug-announce</code> in the body of the message. Located in
-      Romania.
-    </description>
-  </entry>
-
-  <entry id="bus" continent="Europe">
-    <country code="SE">Sweden</country>
-    <name>BSD Users Sweden (BUS)</name>
-    <url>http://bsdusers.se/</url>
-    <description>The BSD Users Sweden (BUS) maintains a mailing list. To
-      join send an email to <a href="mailto:majordomo@stacken.kth.se">
+        Romania.
+      </description>
+    </entry>
+  </country>
+
+  <country code="LV" name="Latvia">
+    <entry id="bug-lv" >
+      <name>BSD User Group Latvia</name>
+      <url>http://www.bug.lv</url>
+
+      <description>To learn more about the BSD User Group Latvia,
+        please visit our <a href="http://www.bug.lv/">site</a> and our
+        <a href="http://www.bug.lv/">forums</a>.  Located in Latvia.
+      </description>
+    </entry>
+  </country>
+
+  <country code="NL" name="The Netherlands">
+    <entry id="nlfug" >
+      <name>The Dutch FreeBSD User Group (NLFUG)</name>
+      <url>http://www.nlfug.nl</url>
+
+      <description>The Dutch FreeBSD User Group (NLFUG) has had our
+        first meeting on oct 2, 1999. On this day 30 years before
+        that, the second IMP was installed in Doug Englebart's lab at
+        SRI.  This, as you all know, was the start of something that
+        grew to be the Internet (thanks to Edwin Kremer for bringing
+        this to our attention).  Located in the Netherlands.
+      </description>
+    </entry>
+  </country>
+
+  <country code="NO" name="Norway">
+    <entry id="nobug" >
+      <name>The Norwegian BSD User Group (NOBUG)</name>
+      <url>http://www.nobug.no/</url>
+
+      <description>The Norwegian BSD User Group (NOBUG) is a User
+        Group for BSD users and enthusiasts in Norway.  Meetings are
+        currently held in Oslo and Bergen.  Visit our website for more
+        information.  There is also a Unix User Group (<a
+        href="http://www.nuug.no/"> NUUG</a>) with more regular
+        meetings, sometimes even with a BSD subject.  Located in
+        Norway.
+      </description>
+    </entry>
+  </country>
+
+  <country code="PL" name="Poland">
+    <entry id="lublin" >
+      <name>The Lublin BSD Users Group</name>
+      <url>http://www.FreeBSD.lublin.pl/</url>
+      <description>Please follow the link for details.  Located in Poland.
+      </description>
+    </entry>
+  </country>
+
+  <country code="PT" name="Portuguese">
+    <entry id="ptbsd" >
+      <name>The Portuguese *BSD Users Group</name>
+      <url>mailto:ptbsd@yahoo.com</url>
+
+      <description>The Portuguese *BSD Users Group is a User Group for
+        Portuguese users of BSD operating systems.  Contact Rui
+        Pereira <a href="mailto:ptbsd@yahoo.com">ptbsd@yahoo.com</a>
+        for more information.  Located in Portugal, Amadora.
+      </description>
+    </entry>
+
+    <entry id="npf" >
+      <name>N&uacute;cleo Portugu&ecirc;s de FreeBSD (NPF)</name>
+      <url>http://npf.pt.FreeBSD.org/</url>
+
+      <description>The N&uacute;cleo Portugu&ecirc;s de FreeBSD (NPF)
+        is a Portuguese FreeBSD User Group that is engaged in the
+        production of documentation in Portuguese language.  Currently
+        the activities are centred on the translation of the FreeBSD
+        Handbook and on the production of CF's (aka HowTos) that try
+        to answer questions or propose solutions to problems that are
+        experienced by Portuguese users. See <a
+        href="http://npf.pt.FreeBSD.org/">
+        http://npf.pt.FreeBSD.org</a> for more information.  Located
+        in Portugal.
+      </description>
+    </entry>
+  </country>
+
+  <country code="HU" name="Hungary">
+    <entry id="bsdhu" >
+      <name>The Hungarian BSD Group</name>
+      <url>http://www.bsd.hu</url>
+
+      <description>The Hungarian BSD Group is a group of NetBSD,
+        FreeBSD and OpenBSD users located in Hungary.  Their meetings
+        occur on the second Friday of the month.  The website of the
+        group is <a href="http://www.bsd.hu">http://www.bsd.hu</a>.
+      </description>
+    </entry>
+  </country>
+
+  <country code="SE" name="Sweden">
+    <entry id="bus" >
+      <name>BSD Users Sweden (BUS)</name>
+      <url>http://bsdusers.se/</url>
+
+      <description>The BSD Users Sweden (BUS) maintains a mailing
+        list. To join send an email to <a
+        href="mailto:majordomo@stacken.kth.se">
         majordomo@stacken.kth.se</a> with <code>subscribe bus</code>
-      in the body. Located in Sweden.
-    </description>
-  </entry>
-
-  <entry id="swissbug" continent="Europe">
-    <country code="CH">Switzerland</country>
-    <name>Swiss BSD User Group (SwissBUG)</name>
-    <url>http://www.swissbug.org</url>
-    <description>The Swiss BSD User Group (SwissBUG) caters for users
-      of BSD-based systems in Switzerland. Located in Switzerland.
-    </description>
-  </entry>
-
-  <entry id="uafug" continent="Europe">
-    <country code="UK">Ukraine</country>
-    <name>Ukrainian FreeBSD User Group (UAFUG)</name>
-    <url>http://www.uafug.org.ua/</url>
-    <description>The Ukrainian FreeBSD User Group (UAFUG) is a
-      Russian/Ukrainian languages oriented user group for the
-      Ukrainian users of BSD-derivatives, promoting and
-      supporting BSD flavours and Open Source usage.  The UAFUG has
-      had its first meeting on 2 June 2002 and meets every 2-3 weeks.
-      We also provide an open forum for all BSD-related things in the
-      Russian and Ukrainian languages (though we can read/write in
-      english as well).  To join the mailing list send a message to <a
-        href="mailto:majordomo@FreeBSDDiary.org.ua">
+        in the body. Located in Sweden.
+      </description>
+    </entry>
+
+    <entry id="freebsd-se" >
+      <name>The Swedish FreeBSD Community</name>
+      <url>http://www.FreeBSD.se/</url>
+
+      <description>FreeBSD.se is a Swedish FreeBSD community in which
+        one can read and post articles and how-to:s in Swedish.  There
+        is also an active forum for asking questions and helping
+        others with problems related to FreeBSD.
+      </description>
+    </entry>
+  </country>
+
+
+  <country code="CH" name="Switzerland">
+    <entry id="swissbug" >
+      <name>Swiss BSD User Group (SwissBUG)</name>
+      <url>http://www.swissbug.org</url>
+
+      <description>The Swiss BSD User Group (SwissBUG) caters for
+        users of BSD-based systems in Switzerland. Located in
+        Switzerland.
+      </description>
+    </entry>
+  </country>
+  <country code="UA" name="Ukraine">
+    <entry id="uafug" >
+      <name>Ukrainian FreeBSD User Group (UAFUG)</name>
+      <url>http://www.uafug.org.ua/</url>
+
+      <description>The Ukrainian FreeBSD User Group (UAFUG) is a
+        Russian/Ukrainian languages oriented user group for the
+        Ukrainian users of BSD-derivatives, promoting and supporting
+        BSD flavours and Open Source usage.  The UAFUG has had its
+        first meeting on 2 June 2002 and meets every 2-3 weeks.  We
+        also provide an open forum for all BSD-related things in the
+        Russian and Ukrainian languages (though we can read/write in
+        english as well).  To join the mailing list send a message to
+        <a href="mailto:majordomo@FreeBSDDiary.org.ua">
         majordomo@FreeBSDDiary.org.ua</a> with <code>subscribe
-       	freebsd</code> in the body of the message. Check the <a
-	href="http://www.uafug.org.ua/">link</a> above for more
-      information.  Located in the Ukraine.
-    </description>
-  </entry>
-
-  <entry id="unixforums-ru" continent="Europe">
-    <country code="RU">Russia</country>
-    <name>Russian UNIX Forums</name>
-    <url>http://unixforums.org.ru</url>
-    <description>Russian UNIX Forums provides a place for the Russian
-      Unix community to share knowledge.  There are some articles and
-      there is a maintained Unix Encyclopedia Project.  A specific *BSD
-      section is available as well.
-    </description>
-  </entry>
-  
-  <entry id="bsdgroups" continent="Europe">
-    <country code="UK">UK</country>
-    <name>Manchester BSD Users Group</name>
-    <url>http://www.bsdgroups.org.uk/manchester</url>
-    <description>The Manchester BSD Users Group meets reasonably often in
-      the Lass O'Gowrie, on Charles Street, Manchester.  Contact <a
-        href="mailto:sams@bsdgroups.org.uk">Sam Smith</a> for more
-      information.  Located in The United Kingdom, Manchester.
-    </description>
-  </entry>
-
-  <entry id="ukug" continent="Europe">
-    <country code="UK">UK</country>
-    <name>FreeBSD UK Users group (FreeBSD UKUG)</name>
-    <url>http://ukug.uk.FreeBSD.org/</url>
-    <description>The FreeBSD UKUG (FreeBSD UK User's Group) exists for
-      the benefit of FreeBSD users in the United Kingdom.  Please
-      follow the link for details.  Located in The United Kingdom.
-    </description>
-  </entry>
-
-  <entry id="amesfug" continent="North America">
-    <country code="US">USA</country>
+        freebsd</code> in the body of the message. Check the <a
+        href="http://www.uafug.org.ua/">link</a> above for more
+        information.  Located in the Ukraine.
+      </description>
+    </entry>
+  </country>
+
+  <country code="UK" name="UK">
+    <entry id="bsdgroups" >
+      <name>Manchester BSD Users Group</name>
+      <url>http://www.bsdgroups.org.uk/manchester</url>
+
+      <description>The Manchester BSD Users Group meets reasonably
+        often in the Lass O'Gowrie, on Charles Street, Manchester.
+        Contact <a href="mailto:sams@bsdgroups.org.uk">Sam Smith</a>
+        for more information.  Located in The United Kingdom,
+        Manchester.
+      </description>
+    </entry>
+
+    <entry id="ukug">
+      <name>FreeBSD UK Users group (FreeBSD UKUG)</name>
+      <url>http://ukug.uk.FreeBSD.org/</url>
+
+      <description>The FreeBSD UKUG (FreeBSD UK User's Group) exists
+        for the benefit of FreeBSD users in the United Kingdom.
+        Please follow the link for details.  Located in The United
+        Kingdom.
+      </description>
+    </entry>
+  </country>
+</continent>
+
+<continent name="North America">
+  <country code="US" name="USA">
+  <entry id="amesfug">
     <name>The Ames Free-Unix Group (amesfug)</name>
     <url>http://www.amesfug.org</url>
     <description>The Ames Free-Unix Group aims to promote the use of
       Free Unix.  We meet on the campus of Iowa State University once a
       month and hold a presentation with an open question and answer
       session afterwards.  You can join our mailing list by visiting
       <a href="http://lists.amesfug.org/mailman/listinfo">
 	http://lists.amesfug.org/mailman/listinfo</a>.  Located in
       Ames, Iowa.
     </description>
   </entry>
 
-  <entry id="buug" continent="North America">
-    <country code="US">USA</country>
+  <entry id="buug">
     <name>The Berkeley Unix User Group</name>
     <url>http://www.weak.org/buug</url>
     <description>The Berkeley Unix User Group is a general Unix Users
       Group for anyone in the San Fransico Bay Area.  We meet on a
       weekly basis in downtown Berkeley.  Visit the web site or send a
       message to <a href="mailto:buug-request@weak.org">
         buug-request@weak.org</a> with <code>subscribe</code> in the
       body.  Located in Berkeley, CA.
     </description>
   </entry>
 
-  <entry id="cdbug" continent="North America">
-    <country code="US">USA</country>
+  <entry id="cdbug">
     <name>The Capitals District *BSD Users Group</name>
     <url>http://lists.nycbug.org/mailman/listinfo/cdbug-talk</url>
     <description>The Capitals District *BSD Users Group draws it's
       membership from New York's capital district and the surrounding
       communities.  CDBUG was founded in December of 2004 and has a
       small bug growing membership.  We currently meet on the last
       Sunday of every month in the Albany area.  Our mailing list is
       graciously being hosted by NYCBUG at: <a
 	href="http://lists.nycbug.org/mailman/listinfo/cdbug-talk">
 	http://lists.nycbug.org/mailman/listinfo/cdbug-talk</a>.
       Located in Albany, NY.
     </description>
   </entry>
 
-  <entry id="chifug" continent="North America">
-    <country code="US">USA</country>
+  <entry id="chifug">
     <name>The Users of Free Operating Systems (UFO Chicago)</name>
     <url>http://www.chifug.org</url>
     <description>The Users of Free Operating Systems (UFO Chicago) is
       an open-source Unix User Group that meets twice a month
       in Chicago.  For directions and mailing list information, please
       check our web site <a href="http://ufo.chicago.il.us">
         http://ufo.chicago.il.us</a>.  Chicago, IL.
     </description>
   </entry>
 
-  <entry id="cfug" continent="North America">
-    <country code="US">USA</country>
+  <entry id="cfug">
     <name>The Connecticut Free Unix Users Group (CFUG)</name>
     <url>http://www.cfug.org</url>
     <description>The Connecticut Free Unix Users Group (CFUG) is
       devoted to free Unix, but has resources for almost all Unixen.
       Their area of operation is Connecticut and Western Massachusetts.
       More information can be found at <a href="http://www.cfug.org/">
         http://www.cfug.org</a>.  Located in Connecticut.
     </description>
   </entry>
 
-  <entry id="kulua" continent="North America">
-    <country code="US">USA</country>
+  <entry id="kulua">
     <name>Kansas Unix &amp; Linux Users Association (KULUA)</name>
     <url>http://kulua.org</url>
     <description>The Kansas Unix &amp; Linux Users Association (KULUA)
       is a Free Unix User Group based in Lawrence, Kansas, but with
       users throughout eastern Kansas and western Missouri.  We have
       about 120 members and meet biweekly.  Visit the web site or email
       <a href="mailto:kulua@kulua.org">kulua@kulua.org</a> for more
       information.  Located in Lawrence, Kansas.
     </description>
   </entry>
 
-  <entry id="yahoo-club" continent="North America">
-    <country code="US">USA</country>
+  <entry id="yahoo-club">
     <name>The Yahoo Club</name>
     <url>http://clubs.yahoo.com/clubs/bsdusersoflosangeles</url>
     <description>The Yahoo Club group is a foundation for a Los Angeles
       based BSD User Group.  Located in Los Angeles, CA.
     </description>
   </entry>
 
-  <entry id="tcbug" continent="North America">
-    <country code="US">USA</country>
+  <entry id="tcbug">
     <name>Twin Cities BSD User Group (TCBUG)</name>
     <url>http://www.tcbug.org</url>
     <description>The Twin Cities BSD User Group (TCBUG) meets once a
       month to discuss issues important to the BSD community.  The
       website carries our major announcements, while you are encouraged
       to join the mailing list <a href="mailto:tcbug@tcbug.org">
         tcbug@tcbug.org</a> to keep up with general group discussion.
       Look at the site, join the mailing list, come to a meeting.  We
       look forward to learning from you and with you about BSD Unix.
       Located in Minneapolis/St. Paul, MN.
     </description>
   </entry>
 
-  <entry id="nmlug" continent="North America">
-    <country code="US">USA</country>
+  <entry id="nmlug">
     <name>NMLUG</name>
     <url>mailto:majordomo@swcp.com</url>
     <description>The NMLUG in Alburquerque meets once a month and
       supports both BSD and Linux users.  To join the mailing list,
       send a message to <a href="mailto:majordomo@swcp.com">
         majordomo@swcp.com</a> with <code>subscribe nmlug</code> in
       the body.  Located in New Mexico.
     </description>
   </entry>
 
-  <entry id="nycbug" continent="North America">
-    <country code="US">USA</country>
+  <entry id="nycbug">
     <name>New York City *BSD User Group (NYCBUG)</name>
     <url>http://www.nycbug.org</url>
     <description>The New York City *BSD User Group (NYCBUG) meets the
       first Wednesday of the month.  Mailing lists are available at
       <a href="http://lists.nycbug.org">http://lists.nycbug.org</a>.
       Located in New York, NY.
     </description>
   </entry>
 
-  <entry id="yfuug" continent="North America">
-    <country code="US">USA</country>
+  <entry id="yfuug">
     <name>Yavapai Free Unix Users Group</name>
     <url>mailto:rcarter@consys.com</url>
     <description>The Yavapai Free Unix Users Group is now forming for
       *BSD/Linux, etc., users in Northern Arizona.  Please contact
       Russel Carter (<a href="mailto:rcarter@consys.com">
         rcarter@consys.com</a>) for details.  Located in Northern
       Arizona.
     </description>
   </entry>
 
-  <entry id="wplug" continent="North America">
-    <country code="US">USA</country>
+  <entry id="wplug">
     <name>Western Pennsylvania Linux Users Group (WPLUG)</name>
     <url>http://www.wplug.org</url>
     <description>The Western Pennsylvania Linux Users Group (WPLUG)
       has a strong and growing community of BSD users that it supports.
       See our home page (<a href="http://www.wplug.org">
         http://www.wplug.org</a>) for information on regular meetings
       and join the mailing lists.  Located in Pennsylvania.
     </description>
   </entry>
 
-  <entry id="phoenix" continent="North America">
-    <country code="US">USA</country>
+  <entry id="phoenix">
     <name>Phoenix BSD Users Group</name>
     <url>http://bsd.phoenix.az.us</url>
     <description>The Phoenix BSD Users Group is fully open for business.
       Anyone from the Phoenix area please feel free to join in <a
         href="http://bsd.phoenix.az.us">http://bsd.phoenix.az.us</a>.
       Located in Phoenix, AZ.
     </description>
   </entry>
 
-  <entry id="portland" continent="North America">
-    <country code="US">USA</country>
+  <entry id="portland">
     <name>Portland (Oregon) FreeBSD Users Group</name>
     <url>mailto:pdx-freebsd@toybox.placo.com</url>
     <description>The Portland (Oregon) FreeBSD Users Group meets on the
       third Thursday of each month.  Mail <a
         href="mailto:pdx-freebsd@toybox.placo.com">The Portland FreeBSD
 	Users Group</a>.  Located in Portland, OR.
     </description>
   </entry>
 
-  <entry id="rlug" continent="North America">
-    <country code="US">USA</country>
+  <entry id="rlug">
     <name>Reno Linux Users Group (RLUG)</name>
     <url>http://www.rlug.org/wiki/FrontPage</url>
     <description>The Reno Linux Users Group (RLUG) meets monthly in
       Reno Nevada and discusses the use of BSD and Linux.  Contact
       <a href="mailto:info@rlug.org">info@rlug.org</a> for more
       information.  You may also want to join our mailing list at
       <a href="http://lists.rlug.org/mailman/listinfo/rlug">
         http://lists.rlug.org/mailman/listinfo/rlug</a>.  Located in
       Reno, NV.
     </description>
   </entry>
 
-  <entry id="tribug" continent="North America">
-    <country code="US">USA</country>
+  <entry id="tribug">
     <name>Triangle Area BSD Users Group</name>
     <url>http://www.tribug.org</url>
     <description>
       The Triangle Area BSD Users Group is a group for BSD users in the
       North Carolina Triangle area (Raleigh, Durham, and Chapel Hill)
       along with surrounding areas.  The website contains announcements,
       contact information, and directions for subscribing to the TriBUG
       membership mailing list.
     </description>
   </entry>
 
-  <entry id="seabug" continent="North America">
-    <country code="US">USA</country>
+  <entry id="seabug">
     <name>Seattle BSD Users Group (SeaBUG)</name>
     <url>http://www.seabug.org</url>
     <description>The Seattle BSD Users Group (SeaBUG) meets
       occasionally.  View our web site for more details and for
       information on how to join our mailing list.  Located in
       Seattle, WA.
     </description>
   </entry>
 
-  <entry id="sdbug" continent="North America">
-    <country code="US">USA</country>
+  <entry id="sdbug">
     <name>San Diego BSD Users Group</name>
     <url>http://www.sdbug.org</url>
     <description>The San Diego BSD Users Group for users of FreeBSD,
       OpenBSD and NetBSD.  The meeting is first Thursday of every month
       at Boll Weevil off Clairemont Mesa Blvd., near the intersection
       with Ruffin Road.  More information can be found <a
         href="http://www.sdbug.org">here</a>.  Located in San Diego, CA.
     </description>
   </entry>
 
-  <entry id="bafug" continent="North America">
-    <country code="US">USA</country>
+  <entry id="bafug">
     <name>Bay Area BSD Users Group (BABUG)</name>
     <url>http://www.bafug.org</url>
     <description>The Bay Area BSD Users Group (BABUG) has monthly
       meetings, alternating between San Fransisco and Berkeley.  Those
       interested in attending should visit the web site or send mail to
       the <a href="mailto:jgrosch@mooseriver.com">BABUG Web Master</a>.
       Located in North San Fransisco Bay Area.
     </description>
   </entry>
 
-  <entry id="svbug" continent="North America">
-    <country code="US">USA</country>
+  <entry id="svbug">
     <name>Silicon Valley BSD User Group (SVBUG)</name>
     <url>http://www.svbug.com</url>
     <description>The Silicon Valley BSD User Group (SVBUG), a forum for
       BSD and BSD embedded systems, meets on the first Thursday of the
       month.  Meetings are held at the Carl's JR. on First Street and
       Trimble Road in San Jose, California.  For details on events or
       what is going on visit the web site or send a message to <a
         href="mailto:webmaster@svbug.com">webmaster@svbug.com</a>.
       Located in Silicon Valley, CA.
     </description>
   </entry>
 
-  <entry id="gtabug" continent="North America">
-    <country code="CA">Canada</country>
-    <name>GTABUG</name>
-    <url>http://www.gtabug.com</url>
-    <description>The GTABUG User Group welcomes all BSD users.  Monthly
-      meetings give attendees a chance to share ideas, discussion and
-      information.  Installations and other events help preach the good
-      news of BSD to the community.  Come drop by for a meeting!
-      Located in Greater Toronto Area, Ontario.
-    </description>
-  </entry>
-
-  <entry id="tfug" continent="North America">
-    <country code="US">USA</country>
+  <entry id="tfug">
     <name>Tucson Free Unix Group (TFUG)</name>
     <url>http://www.tfug.org</url>
     <description>Tucson Free Unix Group, Arizona.  Located in Tucson,
       AZ.
     </description>
   </entry>
 
-  <entry id="gubug" continent="North America">
-    <country code="US">USA</country>
+  <entry id="gubug">
     <name>Greater Utah BSD Users Group (GUBUG)</name>
     <url>http://www.gubug.org</url>
     <description>The Greater Utah BSD Users Group (GUBUG), formerly
       known as SLLUG-BUG, and affiliated with the Salt Lake Linux Users
       Group, is based in Salt Lake City, Utah.  We welcome users of
       FreeBSD, OpenBSD, NetBSD or even Unix or Linux.
     </description>
   </entry>
 
-  <entry id="wcfug" continent="North America">
-    <country code="US">USA</country>
+  <entry id="wcfug">
     <name>Washington DC FreeBSD User Group</name>
     <url>mailto:rcramer@sytex.net</url>
     <description>Washington DC (DC Metropolitan Area) FreeBSD
       User Group.  Please contact Richard Cramer, Sytex Access Ltd.
       at 703-425-2515, or preferred, email at <a
         href="mailto:rcramer@sytex.net">rcramer@sytex.net</a> to be put
       on a member distribution list.  Located in Washington DC.
     </description>
   </entry>
-
-  <entry id="wuug" continent="North America">
-    <country code="CA">Canada</country>
-    <name>Windsor Unix Users Group</name>
-    <url>http://www.wuug.org</url>
-    <description>The Windsor Unix Users Group (Windsor, Ontario, Canada)
-      covers BSD, Solaris, SCO and others.  This is not specifically a
-      FreeBSD User Group, but we do already have members running
-      FreeBSD.  The group operates a mailing list
-      (wuug-list@unixpower.org).  More information can be found at <a
-      href="http://www.wuug.org">http://www.wuug.org</a>.
-    </description>
-  </entry>
-
-  <entry id="freebsd-mke" continent="North America">
-    <country code="US">USA</country>
+  <entry id="freebsd-mke">
     <name>FreeBSD-Milwaukee</name>
     <url>http://www.sol.net/freebsd-mke</url>
     <description>FreeBSD-Milwaukee Wisconsin meets occasionally and
       has a mailing list: <a href="mailto:freebsd-mke-l@ns.sol.net">
       freebsd-mke-l@ns.sol.net</a> send e-mail to <a
         href="mailto:freebsd-mke-l-request@ns.sol.net">
 	freebsd-mke-l-request@ns.sol.net</a> to subscribe.
     </description>
   </entry>
 
-  <entry id="uhacc" continent="North America">
-    <country code="US">USA</country>
+  <entry id="uhacc">
     <name>Unix Hobbyists' Administrators' &amp; Coders' Club</name>
     <url>http://uhacc.org</url>
     <description>
       U.H.A.C.C. is a fellowship of individuals united by a common
       interest in UNIX&reg; or Linux systems and open technologies.  At
       meetings you may find beginners and pros alike discussing system
       setup, networking, configuration, free/open source software,
       coding, tech culture, politics, upcoming events, games, or any
       other topic under the sun that pertains to operating "that" kind
       of system.  You can also find us applying what we learn each week
       in the form of diverse and interesting tech and development
       projects, all using UNIX&reg; or Linux platforms.
     </description>
   </entry>
 
-  <entry id="cnfug" continent="Other Areas">
-    <country code="CN">China</country>
-    <name>The China FreeBSD User Group (CNFUG)</name>
-    <url>http://www.cnfug.org</url>
-    <description>The China FreeBSD User Group (CNFUG) was formed May
-      2003.  It publishes the CNFUG Journal (A FreeBSD Technical Journal
-      in Simplified Chinese) monthly.  In addition, we offer a BSD
-      UNIX Support forum, IRC and several mailing lists in Chinese.
-      Located in China.
+  <entry id="su3g">
+    <name>The Southern Utah Unix Users Group (SU3G)</name>
+    <url>http://www.su3g.org</url>
+    <description>
+      The Southern Utah Unix Users Group (SU<sup>3</sup>G, SU^3G, SU3G,
+      or SUUUG) is for users of any version of Unix or Unix-like
+      operating system, commercial or open source.  So, whether you use
+      FreeBSD, Linux, Mac OS X, BSD/OS, Solaris, OpenBSD, or any other
+      Unix or Unix-like OS, and if you live, work, or associate with
+      someone who lives or works in southwestern Utah, then consider
+      joining the SU<sup>3</sup>G.  For more information send an email
+      to <a href="mailto:kendall@su3g.org">kendall@su3g.org</a> or
+      visit the website at <a href="http://www.su3g.org/">
+        http://www.su3g.org/</a>.
     </description>
   </entry>
 
-  <entry id="debug" continent="Other Areas">
-    <country code="JP">Japan</country>
-    <name>The Daibou East *BSD Users Group (DEBUG)</name>
-    <url>http://www.debug.gr.jp</url>
-    <description>The Daibou East *BSD Users Group (DEBUG) is now
-      forming for *BSD users in Tsukuba area.  Located in Ibaraki,
-      Japan.
+  <entry id="gllug">
+    <name>Greater Lansing Linux User Group</name>
+    <url>http://gllug.org</url>
+    <description>GLLUG is an organization for users of Linux, FreeBSD,
+      and associated free software in Lansing, Michigan (USA) and the
+      surrounding area.  As with the organization at large, the weekly
+      meetings are very informal.  We talk about what we've been working
+      on for the last few weeks and catch each other up with what is
+      going on.  Often there is an official topic proposed ahead of time
+      on the mailing list, but sometimes we just discuss what is on our
+      minds.
     </description>
   </entry>
 
-  <entry id="jfug" continent="Other Areas">
-    <country code="ID">Indonesia</country>
-    <name>The Jogja FreeBSD Users Group</name>
-    <url>mailto:22961476@students.ukdw.ac.id</url>
-    <description>The Jogja FreeBSD Users Group is based in Yogyakarta
-      City, Indonesia.  Send email to <a
-        href="mailto:22961476@students.ukdw.ac.id">
-	22961476@students.ukdw.ac.id</a> for more information.
+  <entry id="capbug">
+    <name>Capital Area BSD Users Group</name>
+    <url>http://capbug.org</url>
+    <description>We meet on the last Tuesday of the month.  Join
+      the mailing list by sending a message to
+      <a href="mailto:misc+subscribe@capbug.org">misc+subscribe@capbug.org</a>.
+      We meet in Maryland, but welcome anyone from MD, DC or VA.
     </description>
   </entry>
 
-  <entry id="ibug" continent="Other Areas">
-    <country code="IL">Israel</country>
-    <name>The Israeli *BSD Users Group</name>
-    <url>mailto:bsd-il@libagent.org</url>
-    <description>The Israeli *BSD Users Group has a mailing list for
-      general discussion of *BSD operating systems for Israeli users,
-      which includes topics such as setting up and working with
-      Hebrew in BSD and setting up Internet connections with ISPs.
-      The Israeli *BSD mailing list promotes the use of *BSD throughout
-      the country, and acts as an information center for all *BSD users.
-      Mailing list posts can be sent to <a
-        href="mailto:bsd-il@libagent.org">bsd-il@libagent.org</a>.
-      Visit <a href="http://www.libagent.org/mailman/listinfo/bsd-il">
-        http://www.libagent.org/mailman/listinfo/bsd-il</a> to
-      subscribe. Located in Israel.
+  <entry id="kcbug">
+    <name>Kansas City Area *BSD User.s Group</name>
+    <url>http://www.kcbug.org</url>
+    <description>We are a beginning BSD User Group with currently two
+      members. If you would like to join, please visit our web site
+      <a href="http://www.kcbug.org/">here</a>.  Our goals are to have
+      fun, help others to learn about and using *BSD and evangelize the
+      BSD operating systems.
     </description>
   </entry>
 
-  <entry id="kbug" continent="Other Areas">
-    <country code="JP">Japan</country>
-    <name>The Kansai *BSD Users Group (K*BUG)</name>
-    <url>http://www.kbug.gr.jp</url>
-    <description>The Kansai *BSD Users Group was established on
-      November 13, 1999.  It is expected to promote communication of
-      any of the BSD variants' users.  Some of its activitities are to
-      hold friendly parties of the members, and to hold seminars
-      covering wide variety of topics.  Please e-mail here (<a
-        href="mailto:kbug-admin@kbug.gr.jp">kbug-admin@kbug.gr.jp</a>).
-      Located in Kansai, Japan.
+  <entry id="wcosug">
+    <name>Western Connecticut's Open Source User Group (WCOSUG)</name>
+    <url>http://wcosug.org</url>
+    <description>WCOSUG is The Western Connecticut Open Source User
+      Group. Unlike Linux User Groups we also recognize the BSD's and
+      other operating systems. We are based in Fairfield County, CT,
+      we have several users based on the CT, NY border and due to lack
+      of an Eastern NY User Group we feel that it is our job to pull up
+      the slack and help these users out.
     </description>
   </entry>
 
-  <entry id="mybsd-malaysia" continent="Other Areas">
-    <country code="MY">Malaysia</country>
-    <name>The MyBSD Malaysia Project</name>
-    <url>http://www.mybsd.org.my</url>
-    <description>The MyBSD Malaysia Project is a Kuala Lumpur based User
-      Group for BSD users and open-source in general, promoting and
-      supporting FreeBSD, OpenBSD, NetBSD and open source usage.  We
-      meet once a month, usually at Universiti Malaya or Restaurant
-      Bahadur Shah.  One of our projects is to develop a <a
-        href="http://staff.mybsd.org.my/skywizard/bsd-explorer">Unix
-	file manager</a>.  Visit our web site or contact <a
-	href="mailto:info@mybsd.org.my">info@MyBSD.org.my</a> for more
-      information.
+  </country>
+
+  <country code="CA" name="Canada">
+  <entry id="gtabug">
+    <name>GTABUG</name>
+    <url>http://www.gtabug.com</url>
+    <description>The GTABUG User Group welcomes all BSD users.  Monthly
+      meetings give attendees a chance to share ideas, discussion and
+      information.  Installations and other events help preach the good
+      news of BSD to the community.  Come drop by for a meeting!
+      Located in Greater Toronto Area, Ontario.
+    </description>
+  </entry>
+  <entry id="wuug">
+    <name>Windsor Unix Users Group</name>
+    <url>http://www.wuug.org</url>
+    <description>The Windsor Unix Users Group (Windsor, Ontario, Canada)
+      covers BSD, Solaris, SCO and others.  This is not specifically a
+      FreeBSD User Group, but we do already have members running
+      FreeBSD.  The group operates a mailing list
+      (wuug-list@unixpower.org).  More information can be found at <a
+      href="http://www.wuug.org">http://www.wuug.org</a>.
     </description>
   </entry>
 
-  <entry id="freebsd-mexico" continent="North America">
-    <country code="MX">Mexico</country>
+  <entry id="ottawa">
+    <name>Ottawa-Carleton Unix Users Group</name>
+    <url>http://www.ocuug.on.ca/</url>
+    <description>The Ottawa Unix Users Group is a small group of
+      hobbyists, users, authors, sysadmins, and hackers that meet monthly to
+      discuss the latest topics in a very informal setting.  Check our
+      <a href="http://listserv.storm.ca/mailman/listinfo/ocuug">mailing list</a>
+      for the latest information.
+      Located in Ottawa, Ontario.
+    </description>
+  </entry>
+  </country>
+
+  <country code="MX" name="Mexico">
+  <entry id="freebsd-mexico">
     <name>FreeBSD Mexico</name>
     <url>http://www.freebsd.org.mx</url>
     <description>FreeBSD Mexico is a Spanish oriented User Group not
       only for people in Mexico but also in other Spanish speaking
       countries.  Please contact <a
 	href="mailto:acosta@tre-systems.com">Alejandro Acosta</a>
       for more information.
     </description>
   </entry>
+  </country>
+</continent>
 
-  <entry id="ebug" continent="Other Areas">
-    <country code="JP">Japan</country>
-    <name>The Echigo BSD Users Group (EBUG)</name>
-    <url>http://www.ebug.jp</url>
-    <description>The Echigo BSD Users Group is the users group for BSD
-      users around Echigo (aka Niigata).  For more information on our
-      events and mailing lists, please check the EBUG web site.
+<continent name="South America">
+  <country code="AR" name="Argentina">
+
+  <entry id="bsdargentina">
+    <name>BSD Argentina</name>
+    <url>http://www.bsdargentina.com.ar</url>
+    <description>We have the goal of promoting BSD systems in server,
+      office and home environments.  BSD Argentina serves as a base
+      for Argentine users of FreeBSD, PC-BSD, NetBSD, OpenBSD and
+      other BSD variations.  Join us!
     </description>
   </entry>
+  </country>
 
-  <entry id="bsdperu" continent="South America">
-    <country code="PE">Peru</country>
+  <country code="PE" name="Peru">
+  <entry id="bsdperu">
     <name>The BSD Users Group Peru</name>
     <url>http://www.bsd-peru.org</url>
     <description>The BSD Users Group Peru is a group of people with the
       objective to promote the use of the different *BSD systems in Peru.
       They provide information, documentation and forums for discussion.
       For more information you can use their web site <a 
 	href="http://www.bsd-peru.org">http://www.bsd-peru.org</a> or write to
       <a href="mailto:contacto@bsd-peru.org">contacto@bsd-peru.org</a>
     </description>
   </entry>
+  </country>
 
-  <entry id="fugspbr" continent="South America">
-    <country code="BR">Brazil</country>
+  <country code="BR" name="Brazil">
+  <entry id="fugspbr">
     <name>The Brazilian FreeBSD User Group (FUG-BR)</name>
     <url>http://www.fug.com.br</url>
     <description>The Brazilian FreeBSD User Group (FUG-BR) is a
       Portuguese language oriented User Group intended to help
       Brazilian FreeBSD users to find support and articles on and
       about FreeBSD in the Portuguese language.  We keep some projects
       such as the "<a href="http://www.sourceforge.net/projects/livecd">
 	FreeBSD LiveCD</a>".  Currently the group has over 800 members and
       our mailing list has an average traffic of 80 messages per day.
       To join FUG-BR mailing list, visit <a
 	href="https://www.fug.com.br/mailman/listinfo/www">
 	https://www.fug.com.br/mailman/listinfo/www</a>.
     </description>
   </entry>
 
-  <entry id="bsdsul" continent="South America">
-    <country code="BR">Brazil</country>
+  <entry id="bsdsul">
     <name>User Group BsdSul</name>
     <url>http://www.bsdsul.com.br/</url>
     <description>The User Group BsdSul (Grupo de Usuarios
       de FreeBSD du Sul do Brasil) is a South Brazilian
       User Group of FreeBSD.  They provide information,
       documentation and forums for discussion.  For more
       information you can use their web site.
     </description>
   </entry>
+  </country>
+</continent>
 
-  <entry id="bsdpakistan" continent="Other Areas">
-    <country code="PK">Pakistan</country>
-    <name>BSD Pakistan</name>
-    <url>http://bsdpakistan.org/</url>
-    <description>BSD Pakistan is a user community who aims to promote
-      and educate people about BSD Operating Systems; including FreeBSD,
-      NetBSD, OpenBSD, DragonFly BSD and Mac OS X.  For more information
-      please visit our web site.
+<continent name="Asia">
+  <country code="CN" name="China">
+  <entry id="cnfug">
+    <name>The China FreeBSD User Group (CNFUG)</name>
+    <url>http://www.cnfug.org</url>
+    <description>The China FreeBSD User Group (CNFUG) was formed May
+      2003.  It publishes the CNFUG Journal (A FreeBSD Technical Journal
+      in Simplified Chinese) monthly.  In addition, we offer a BSD
+      UNIX Support forum, IRC and several mailing lists in Chinese.
+      Located in China.
     </description>
   </entry>
+  </country>
 
-  <entry id="bsd-srbija" continent="Europe">
-    <country code="RS">Serbia</country>
-    <name>The Serbian BSD User Group</name>
-    <url>http://www.bsd-srbija.org/</url>
-    <description>The Serbian BSD Users Group provides an open forum for
-      all things BSD-related in the Serbian language.  Located in
-      Serbia.
+  <country code="JP" name="Japan">
+  <entry id="debug">
+    <name>The Daibou East *BSD Users Group (DEBUG)</name>
+    <url>http://www.debug.gr.jp</url>
+    <description>The Daibou East *BSD Users Group (DEBUG) is now
+      forming for *BSD users in Tsukuba area.  Located in Ibaraki,
+      Japan.
     </description>
   </entry>
-
-  <entry id="u-bus" continent="Europe">
-    <country code="DE">Germany</country>
-    <name>Ulmer BSD User Stammtisch</name>
-    <url>http://www.u-bus.de</url>
-    <description>The U-BUS meets every last Thursday of the month.  For
-      more information about meetings and related issues, please check
-      the web page (<a href="http://www.u-bus.de">u-bus</a>).  Located
-      in Germany, Ulm.
+  <entry id="kbug">
+    <name>The Kansai *BSD Users Group (K*BUG)</name>
+    <url>http://www.kbug.gr.jp</url>
+    <description>The Kansai *BSD Users Group was established on
+      November 13, 1999.  It is expected to promote communication of
+      any of the BSD variants' users.  Some of its activitities are to
+      hold friendly parties of the members, and to hold seminars
+      covering wide variety of topics.  Please e-mail here (<a
+        href="mailto:kbug-admin@kbug.gr.jp">kbug-admin@kbug.gr.jp</a>).
+      Located in Kansai, Japan.
     </description>
   </entry>
-
-  <entry id="bluefrogs" continent="Europe">
-    <country code="DE">Germany</country>
-    <name>Bluefrogs e.V.</name>
-    <url>http://www.bluefrogs.de/</url>
-    <description>Unix and Linux User Group in Bergisch Gladbach (near
-      Cologne), German.  Meetings are held twice a month.  We are
-      working with all Open Source Unix derivates: FreeBSD, NetBSD,
-      OpenBSD, Linux and others.  We give workshops, lectures, talks
-      and install parties.  For more information please email us at:
-      <a href="mailto:info@bluefrogs.de">info@bluefrogs.de</a>
+  <entry id="ebug">
+    <name>The Echigo BSD Users Group (EBUG)</name>
+    <url>http://www.ebug.jp</url>
+    <description>The Echigo BSD Users Group is the users group for BSD
+      users around Echigo (aka Niigata).  For more information on our
+      events and mailing lists, please check the EBUG web site.
     </description>
   </entry>
 
-  <entry id="koeln-lug" continent="Europe">
-    <country code="DE">Germany</country>
-    <name>The Koelner Linux und U.n.i.x Gruppe</name>
-    <url>http://www.koeln-lug.de/</url>
-    <description>The Koelner Linux und U.n.i.x Gruppe(Cologne Linux and
-      U.n.i.x Group) is a community of Linux and Unix users located in
-      Germany, Koeln (Cologne) with a mailing list and meetings two
-      times a month.
-    </description>
-  </entry> 
-
-  <entry id="bse" continent="Europe">
-    <country code="DE">Germany</country>
-    <name>BSE M&uuml;nchen</name>
-    <url>http://bse.42.org/</url>
-    <description>BSE (BSD Social Event) is located in M&uuml;nchen
-      (Munich), Germany.  Feel free to visit our regular meetings (every
-      four weeks) or join the mailing list.  For more information visit
-      the <a href="http://bse.42.org/">BSE web site</a>.
+  </country>
+
+  <country code="ID" name="Indonesia">
+  <entry id="jfug">
+    <name>The Jogja FreeBSD Users Group</name>
+    <url>mailto:22961476@students.ukdw.ac.id</url>
+    <description>The Jogja FreeBSD Users Group is based in Yogyakarta
+      City, Indonesia.  Send email to <a
+        href="mailto:22961476@students.ukdw.ac.id">
+	22961476@students.ukdw.ac.id</a> for more information.
     </description>
   </entry>
+  </country>
 
-  <entry id="su3g" continent="North America">
-    <country code="US">USA</country>
-    <name>The Southern Utah Unix Users Group (SU3G)</name>
-    <url>http://www.su3g.org</url>
-    <description>
-      The Southern Utah Unix Users Group (SU<sup>3</sup>G, SU^3G, SU3G,
-      or SUUUG) is for users of any version of Unix or Unix-like
-      operating system, commercial or open source.  So, whether you use
-      FreeBSD, Linux, Mac OS X, BSD/OS, Solaris, OpenBSD, or any other
-      Unix or Unix-like OS, and if you live, work, or associate with
-      someone who lives or works in southwestern Utah, then consider
-      joining the SU<sup>3</sup>G.  For more information send an email
-      to <a href="mailto:kendall@su3g.org">kendall@su3g.org</a> or
-      visit the website at <a href="http://www.su3g.org/">
-        http://www.su3g.org/</a>.
+  <country code="IL" name="Israel">
+
+  <entry id="ibug">
+    <name>The Israeli *BSD Users Group</name>
+    <url>mailto:bsd-il@libagent.org</url>
+    <description>The Israeli *BSD Users Group has a mailing list for
+      general discussion of *BSD operating systems for Israeli users,
+      which includes topics such as setting up and working with
+      Hebrew in BSD and setting up Internet connections with ISPs.
+      The Israeli *BSD mailing list promotes the use of *BSD throughout
+      the country, and acts as an information center for all *BSD users.
+      Mailing list posts can be sent to <a
+        href="mailto:bsd-il@libagent.org">bsd-il@libagent.org</a>.
+      Visit <a href="http://www.libagent.org/mailman/listinfo/bsd-il">
+        http://www.libagent.org/mailman/listinfo/bsd-il</a> to
+      subscribe. Located in Israel.
     </description>
   </entry>
+  </country>
 
-  <entry id="freebsd-se" continent="Europe">
-    <country code="SE">Sweden</country>
-    <name>The Swedish FreeBSD Community</name>
-    <url>http://www.FreeBSD.se/</url>
-    <description>FreeBSD.se is a Swedish FreeBSD community in which one
-      can read and post articles and how-to:s in Swedish.  There is also
-      an active forum for asking questions and helping others with
-      problems related to FreeBSD.
+  <country code="MY" name="Malaysia">
+  <entry id="mybsd-malaysia">
+    <name>The MyBSD Malaysia Project</name>
+    <url>http://www.mybsd.org.my</url>
+    <description>The MyBSD Malaysia Project is a Kuala Lumpur based User
+      Group for BSD users and open-source in general, promoting and
+      supporting FreeBSD, OpenBSD, NetBSD and open source usage.  We
+      meet once a month, usually at Universiti Malaya or Restaurant
+      Bahadur Shah.  One of our projects is to develop a <a
+        href="http://staff.mybsd.org.my/skywizard/bsd-explorer">Unix
+	file manager</a>.  Visit our web site or contact <a
+	href="mailto:info@mybsd.org.my">info@MyBSD.org.my</a> for more
+      information.
     </description>
   </entry>
+  </country>
 
-  <entry id="bsdhu" continent="Europe">
-    <country code="HU">Hungary</country>
-    <name>The Hungarian BSD Group</name>
-    <url>http://www.bsd.hu</url>
-    <description>The Hungarian BSD Group is a group of NetBSD, FreeBSD
-      and OpenBSD users located in Hungary.  Their meetings occur on
-      the second Friday of the month.  The website of the group is
-     <a href="http://www.bsd.hu">http://www.bsd.hu</a>.
+  <country code="PK" name="Pakistan">
+  <entry id="bsdpakistan">
+    <name>BSD Pakistan</name>
+    <url>http://bsdpakistan.org/</url>
+    <description>BSD Pakistan is a user community who aims to promote
+      and educate people about BSD Operating Systems; including FreeBSD,
+      NetBSD, OpenBSD, DragonFly BSD and Mac OS X.  For more information
+      please visit our web site.
     </description>
   </entry>
+  </country>
 
-  <entry id="bangbug" continent="Asia">
-    <country code="IN">India</country>
+  <country code="IN" name="India">
+  <entry id="bangbug">
     <name>Bangalore BSD User Group (BANGBUG)</name>
     <url>http://www.bangbug.org/</url>
     <description>BANGBUG - (Bangalore BSD User Group) is a users group
       for open source Unix-based systems in the Bangalore India area.
       Our primary emphasis is on FreeBSD, but enthusiasts of other open
       source Unix and Unix-like systems such as Linux, DragonFly BSD,
       OpenBSD, NetBSD, Darwin, MacOsX and OpenBSD are welcome.
     </description>
   </entry>
+  </country>
+
+  <country code="MO" name="Mongolia">
 
-  <entry id="muug" continent="Asia">
-    <country code="MO">Mongolia</country>
+  <entry id="muug">
     <name>Mongolian Unix User Group (MUUG)</name>
     <url>http://www.mnbsd.org/</url>
     <description>MUUG - (Mongolian Unix User Group) was formed in 2004
       and it is based in Ulaanbaatar, Mongolia.  Our objectives are to
       share the knowledge, and to promote and educate people about
       Unix, Linux, and BSD operating systems and open source software.
       We meet once a month.  We also operate a local Unix mailing list
       and maintain downloadable images of Unix/Linux/BSD distros. For
       more information please send email to
       <a href="mailto:admin@mnbsd.org">admin@mnbsd.org</a>
       or visit our web site at
       <a href="http://www.mnbsd.org/">http://www.mnbsd.org/</a>.
       The web site is in Mongolian only.</description>
   </entry>
+  </country>
 
-  <entry id="bsdargentina" continent="South America">
-    <country code="AR">Argentina</country>
-    <name>BSD Argentina</name>
-    <url>http://www.bsdargentina.com.ar</url>
-    <description>We have the goal of promoting BSD systems in server,
-      office and home environments.  BSD Argentina serves as a base
-      for Argentine users of FreeBSD, PC-BSD, NetBSD, OpenBSD and
-      other BSD variations.  Join us!
-    </description>
-  </entry>
-
-  <entry id="gllug" continent="North America">
-    <country code="US">USA</country>
-    <name>Greater Lansing Linux User Group</name>
-    <url>http://gllug.org</url>
-    <description>GLLUG is an organization for users of Linux, FreeBSD,
-      and associated free software in Lansing, Michigan (USA) and the
-      surrounding area.  As with the organization at large, the weekly
-      meetings are very informal.  We talk about what we've been working
-      on for the last few weeks and catch each other up with what is
-      going on.  Often there is an official topic proposed ahead of time
-      on the mailing list, but sometimes we just discuss what is on our
-      minds.
-    </description>
-  </entry>
-
-  <entry id="fug-fr" continent="Europe">
-    <country code="FR">France</country>
-    <name>FUG-FR</name>
-    <url>http://www.fug-fr.org/</url>
-    <description>
-      The FreeBSD User Group France (FUG-FR) is an group of FreeBSD
-      enthusiasts in France currently involved translating marketing
-      papers etc. They are also active in helping out FOSDEM (held
-      in Brussels).  For more information please visit our web page
-      <a href="http://www.fug-fr.org/">http://www.fug-fr.org</a> or
-      contact <a href="mailto:rodrigo@bebik.net">Rodrigo Osorio</a>.
-    </description>
-  </entry>
-
-  <entry id="capbug" continent="North America">
-    <country code="US">USA</country>
-    <name>Capital Area BSD Users Group</name>
-    <url>http://capbug.org</url>
-    <description>We meet on the last Tuesday of the month.  Join
-      the mailing list by sending a message to
-      <a href="mailto:misc+subscribe@capbug.org">misc+subscribe@capbug.org</a>.
-      We meet in Maryland, but welcome anyone from MD, DC or VA.
-    </description>
-  </entry>
-
-  <entry id="ottawa" continent="North America">
-    <country code="CA">Canada</country>
-    <name>Ottawa-Carleton Unix Users Group</name>
-    <url>http://www.ocuug.on.ca/</url>
-    <description>The Ottawa Unix Users Group is a small group of
-      hobbyists, users, authors, sysadmins, and hackers that meet monthly to
-      discuss the latest topics in a very informal setting.  Check our
-      <a href="http://listserv.storm.ca/mailman/listinfo/ocuug">mailing list</a>
-      for the latest information.
-      Located in Ottawa, Ontario.
-    </description>
-  </entry>
-
-  <entry id="bangladesh" continent="Asia">
-    <country code="BD">Bangladesh</country>
+  <country code="BD" name="Bangladesh">
+  <entry id="bangladesh">
     <name>Bangladeshi FreeBSD User Group</name>
     <url>http://www.freebsdmovement.org/</url>
     <description>The Bangladeshi FreeBSD User Group is a group of the FreBSD
       users in Bangladesh.  This group aims to build the scope of sharing
       knowledge and experiences on FreeBSD.
     </description>
   </entry>
-
-  <entry id="metabug" continent="North America">
-    <name>The Global BSD User Groups</name>
-    <url>http://metabug.org/</url>
-    <description>The Global BSD User Groups organization was founded to help
-      promote local BSD user groups by helping to share ideas and experiences
-      with other BUG organizations.  Our goals are:
-      <ul>
-	<li>Foster inter-BUG relations and communications to increase unity
-	  in the BSD user group communities.</li>
-	<li>Assist in increasing awareness of smaller user groups in the
-	  community.</li>
-	<li>Facilitate idea and resource sharing through common access to
-	  meeting presentation topics and materials.</li>
-	<li>Increase exposure to other BSD projects where local user
-	  groups may have less member interest or experience.</li>
-	<li>Offer a BSD user group for those without a local BUG.</li>
-      </ul>
-      We are working on ways to provide remote participation through streaming
-      video of presentations.  You can check our <a
-	href="http://metabug.org/">website</a> or contact us via <a
-	href="mailto:info@metabug">e-mail</a>.
-    </description>
-  </entry>
-
-  <entry id="nzfug" continent="Other Areas">
-    <country code="NZ">New Zealand</country>
-    <name>New Zealand FreeBSD Users Group</name>
-    <url>http://nzfug.nz.freebsd.org/nzfug/</url>
-    <description>The NZ FreeBSD Users Group runs a mailing list and maintains
-      local mirrors.
-    </description>
-  </entry>
-
-  <entry id="bugs" continent="Australia">
-    <country code="AU">Australia</country>
-    <name>BSD Users Group, Sydney (BUGS)</name>
-    <url>http://www.bugs.au.FreeBSD.org/</url>
-    <description>The BSD Users Group, Sydney (BUGS) meets occasionally
-      in Sydney and surrounds. We have members from all over NSW. To
-      join the mailing list or IRC channel, visit <a
-	href="http://www.bugs.au.freebsd.org/">
-	http://www.bugs.au.freebsd.org/</a>.  Located in New South Wales.
-    </description>
-  </entry>
-
-  <entry id="kcbug" continent="North America">
-    <country code="US">USA</country>
-    <name>Kansas City Area *BSD User.s Group</name>
-    <url>http://www.kcbug.org</url>
-    <description>We are a beginning BSD User Group with currently two
-      members. If you would like to join, please visit our web site
-      <a href="http://www.kcbug.org/">here</a>.  Our goals are to have
-      fun, help others to learn about and using *BSD and evangelize the
-      BSD operating systems.
-    </description>
-  </entry>
-
-  <entry id="wcosug" continent="North America">
-    <country code="US">USA</country>
-    <name>Western Connecticut's Open Source User Group (WCOSUG)</name>
-    <url>http://wcosug.org</url>
-    <description>WCOSUG is The Western Connecticut Open Source User
-      Group. Unlike Linux User Groups we also recognize the BSD's and
-      other operating systems. We are based in Fairfield County, CT,
-      we have several users based on the CT, NY border and due to lack
-      of an Eastern NY User Group we feel that it is our job to pull up
-      the slack and help these users out.
-    </description>
-  </entry>
-
-  <entry id="rfug" continent="Europe">
-    <country code="RU">Russia</country>
-    <name>Russian FreeBSD User Group (RFUG)</name>
-    <url>http://bsdportal.ru</url>
-    <description>The Russian FreeBSD User Group (RFUG) is a Russian
-      language oriented user group for the Russian and ex-USSR users.
-      Located in the Russia.
-    </description>
-  </entry>
+  </country>
+</continent>
 </usergroups>