From 819b531c919337691850f9838d4cdadee93b3543 Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Tue, 17 May 2016 19:20:08 +0000
Subject: [PATCH] Sort events by start date, clarify instructions.

---
 share/xml/events2016.xml | 170 +++++++++++++++++++--------------------
 1 file changed, 85 insertions(+), 85 deletions(-)

diff --git a/share/xml/events2016.xml b/share/xml/events2016.xml
index beb7fc72b7..2ebc6ac244 100644
--- a/share/xml/events2016.xml
+++ b/share/xml/events2016.xml
@@ -4,7 +4,7 @@
 <!--
      Events which might be interesting for FreeBSD users.
 
-     Please sort the events by start date, with recent events earlier in the file.
+     Sort events by start date, with more recent events earlier in the file.
 -->
 
 <events>
@@ -12,6 +12,90 @@
       $FreeBSD$
     </cvs:keyword>
 
+  <event id="bsdcan-2016">
+    <name>BSDCan 2016</name>
+    <url>http://www.bsdcan.org/2016/</url>
+    <startdate>
+      <year>2016</year>
+      <month>6</month>
+      <day>8</day>
+    </startdate>
+    <enddate>
+      <year>2016</year>
+      <month>6</month>
+      <day>11</day>
+    </enddate>
+    <location>
+      <country code="CA">Canada</country>
+      <city>Ottawa</city>
+      <site>University of Ottawa</site>
+    </location>
+    <description>BSDCan is a technical conference for people working
+      on and with BSD operating systems and related projects.  It is
+      a conference for users and developers with a strong focus on
+      emerging technologies, research projects, and works in progress.
+      It also features Userland infrastructure projects and invites
+      contributions from both free software developers and those
+      from commercial vendors.  BSDCan is followed immediately by
+      PGCon at the same location.</description>
+  </event>
+
+  <event id="asiabsdcon-2016">
+    <name>AsiaBSDCon 2016</name>
+    <url>http://2016.asiabsdcon.org/</url>
+    <startdate>
+      <year>2016</year>
+      <month>3</month>
+      <day>10</day>
+    </startdate>
+    <enddate>
+      <year>2016</year>
+      <month>3</month>
+      <day>13</day>
+    </enddate>
+    <location>
+      <country code="JP">Japan</country>
+      <city>Tokyo</city>
+      <site>Tokyo University of Science</site>
+    </location>
+    <description>AsiaBSDCon is a conference for users and developers
+      on BSD based systems.  The conference is for anyone developing,
+      deploying and using systems based on &os;, NetBSD, OpenBSD,
+      DragonFlyBSD, Darwin and MacOS X.  AsiaBSDCon is a technical
+      conference and aims to collect the best technical papers and
+      presentations available to ensure that the latest developments
+      in our open source community are shared with the widest
+      possible audience.
+    </description>
+  </event>
+
+  <event id="fosdem-2016">
+    <name>Fosdem 2016</name>
+    <url>https://fosdem.org/2016/</url>
+    <startdate>
+      <year>2016</year>
+      <month>1</month>
+      <day>30</day>
+    </startdate>
+    <enddate>
+      <year>2016</year>
+      <month>1</month>
+      <day>31</day>
+    </enddate>
+    <location>
+      <country code="BE">Belgium</country>
+      <city>Brussels</city>
+      <site>ULB Campus Solbosch</site>
+    </location>
+    <description>FOSDEM is a free event for software developers to
+    meet, share ideas and attend interesting talks and presentations
+    on various topics by project leaders and committers. The BSDs will
+    be there, you can visit us during the two days in our booth, try to
+    pass the <a href="https://fosdem.org/2016/schedule/event/cert_bsdcg/">BSDCG Exam</a>
+    on Saturday, and come to the <a href="https://fosdem.org/2016/schedule/track/bsd/">BSD devroom</a>
+    on Sunday to attend talks about your favorite BSDs.</description>
+  </event>
+
   <event id="mckusick-kernel-2016">
     <name>FreeBSD Kernel Internals: An Intensive Code
       Walkthrough</name>
@@ -46,33 +130,6 @@
       classes week-by-week as they are recorded.</description>
   </event>
 
-  <event id="fosdem-2016">
-    <name>Fosdem 2016</name>
-    <url>https://fosdem.org/2016/</url>
-    <startdate>
-      <year>2016</year>
-      <month>1</month>
-      <day>30</day>
-    </startdate>
-    <enddate>
-      <year>2016</year>
-      <month>1</month>
-      <day>31</day>
-    </enddate>
-    <location>
-      <country code="BE">Belgium</country>
-      <city>Brussels</city>
-      <site>ULB Campus Solbosch</site>
-    </location>
-    <description>FOSDEM is a free event for software developers to
-    meet, share ideas and attend interesting talks and presentations
-    on various topics by project leaders and committers. The BSDs will
-    be there, you can visit us during the two days in our booth, try to
-    pass the <a href="https://fosdem.org/2016/schedule/event/cert_bsdcg/">BSDCG Exam</a>
-    on Saturday, and come to the <a href="https://fosdem.org/2016/schedule/track/bsd/">BSD devroom</a>
-    on Sunday to attend talks about your favorite BSDs.</description>
-  </event>
-
   <event id="scale">
     <name>SCaLE 14x: The Southern California Linux Expo</name>
     <url>https://www.socallinuxexpo.org</url>
@@ -108,61 +165,4 @@
       <a href="https://www.socallinuxexpo.org">https://www.socallinuxexpo.org</a>.
     </description>
   </event>
-
-  <event id="asiabsdcon-2016">
-    <name>AsiaBSDCon 2016</name>
-    <url>http://2016.asiabsdcon.org/</url>
-    <startdate>
-      <year>2016</year>
-      <month>3</month>
-      <day>10</day>
-    </startdate>
-    <enddate>
-      <year>2016</year>
-      <month>3</month>
-      <day>13</day>
-    </enddate>
-    <location>
-      <country code="JP">Japan</country>
-      <city>Tokyo</city>
-      <site>Tokyo University of Science</site>
-    </location>
-    <description>AsiaBSDCon is a conference for users and developers
-      on BSD based systems.  The conference is for anyone developing,
-      deploying and using systems based on &os;, NetBSD, OpenBSD,
-      DragonFlyBSD, Darwin and MacOS X.  AsiaBSDCon is a technical
-      conference and aims to collect the best technical papers and
-      presentations available to ensure that the latest developments
-      in our open source community are shared with the widest
-      possible audience.
-    </description>
-  </event>
-
-  <event id="bsdcan-2016">
-    <name>BSDCan 2016</name>
-    <url>http://www.bsdcan.org/2016/</url>
-    <startdate>
-      <year>2016</year>
-      <month>6</month>
-      <day>8</day>
-    </startdate>
-    <enddate>
-      <year>2016</year>
-      <month>6</month>
-      <day>11</day>
-    </enddate>
-    <location>
-      <country code="CA">Canada</country>
-      <city>Ottawa</city>
-      <site>University of Ottawa</site>
-    </location>
-    <description>BSDCan is a technical conference for people working
-      on and with BSD operating systems and related projects.  It is
-      a conference for users and developers with a strong focus on
-      emerging technologies, research projects, and works in progress.
-      It also features Userland infrastructure projects and invites
-      contributions from both free software developers and those
-      from commercial vendors.  BSDCan is followed immediately by
-      PGCon at the same location.</description>
-  </event>
 </events>