From f7af52cd373bac47368e43f85c40fa3855bb10b6 Mon Sep 17 00:00:00 2001
From: Remko Lodder <remko@FreeBSD.org>
Date: Sat, 16 Jul 2005 12:57:36 +0000
Subject: [PATCH] Merge 1.353 to 1.356 from usergroups.sgml:

Add: AlbaBUG
Add: Augusta
Add: CDBUG
Remove: FrankfurtBSD
Remove: New Orleans *BSD Users Group
---
 share/sgml/usergroups.xml | 59 +++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 21 deletions(-)

diff --git a/share/sgml/usergroups.xml b/share/sgml/usergroups.xml
index bbcca44c42..707ad16980 100644
--- a/share/sgml/usergroups.xml
+++ b/share/sgml/usergroups.xml
@@ -4,7 +4,7 @@
 <entries>
   <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.1 2005/07/16 09:58:17 hrs Exp $
+      $FreeBSD: www/share/sgml/usergroups.xml,v 1.2 2005/07/16 10:07:02 hrs Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -83,6 +83,16 @@
     </description>
   </entry>
 
+  <entry id="albabug" continent="Europe">
+    <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 Albania.
+    </description>
+  </entry>
+
   <entry id="aauug" continent="Europe">
     <name>AaUUG</name>
     <url>http://www.aauug.dk/</url>
@@ -93,6 +103,18 @@
     </description>
   </entry>
 
+  <entry id="augusta" continent="Europe">
+    <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 Augsburg,
+      Germany.
+    </description>
+  </entry>
+
   <entry id="freebsd-fr" continent="Europe">
     <name>The French FreeBSD UG</name>
     <url>http://www.FreeBSD-fr.org/</url>
@@ -140,16 +162,6 @@
     </description>
   </entry>
 
-  <entry id="frankfurtbsd" continent="Europe">
-    <name>FrankfurtBSD</name>
-    <url>http://www.morix.de/frankfurtbsd/</url>
-    <description>FrankfurtBSD is a User Group for the Rhein-Main area.
-      We are currently looking for new members.  As soon as we have
-      grown later, we would like to meet monthly and maintain minor
-      projects.  Located in Germany, Frankfurt.
-    </description>
-  </entry>
-
   <entry id="bsdhh" continent="Europe">
     <name>BSD User Group Hamburg (BSDHH)</name>
     <url>http://www.bsdhhh.org/bsdhh-faq.en.html/</url>
@@ -410,6 +422,21 @@
     </description>
   </entry>
 
+  <entry id="cdbug" continent="North America">
+    <name>The Capitals District *BSD Users Group</name>
+    <url>http://lists.nycbug.org/mailman/listinfo/cdbug-talk</url>
+    <description>The Capital 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">
     <name>The Users of Free Operating Systems (UFO Chicago)</name>
     <url>http://www.chifug.org</url>
@@ -518,16 +545,6 @@
     </description>
   </entry>
 
-  <entry id="new-orleans-bug" continent="North America">
-    <name>New Orleans *BSD User Group</name>
-    <url>mailto:krzeszut@cs.uno.edu</url>
-    <description>The New Orleans *BSD User Group meets twice a month.
-      contact <a href="mailto:krzeszut@cs.uno.edu">Konrad Rzeszutek</a>
-      for more details.  A web page will be posted soon. Located in
-      New Orleans, LA
-    </description>
-  </entry>
-
   <entry id="nycbug" continent="North America">
     <name>New York City *BSD User Group (NYCBUG)</name>
     <url>http://www.nycbug.org</url>