Index: head/share/xml/events2016.xml
===================================================================
--- head/share/xml/events2016.xml	(revision 48823)
+++ head/share/xml/events2016.xml	(revision 48824)
@@ -1,197 +1,205 @@
 <?xml version="1.0"?>
-<!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-			"http://www.FreeBSD.org/XML/share/xml/events.dtd">
+
+<!DOCTYPE events PUBLIC
+  "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
+  "http://www.FreeBSD.org/XML/share/xml/events.dtd">
+
 <!--
-     Events which might be interesting for FreeBSD users.
+    Events which might be interesting for FreeBSD users.
 
-     Sort events by start date, with more recent events earlier in the file.
+    Sort events by start date, with more recent events earlier
+    in the file.
 -->
 
 <events>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
 
   <event id="eurobsdcon-2016">
     <name>EuroBSDcon 2016</name>
     <url>http://2016.eurobsdcon.org/</url>
     <startdate>
       <year>2016</year>
       <month>9</month>
       <day>22</day>
     </startdate>
     <enddate>
       <year>2016</year>
       <month>9</month>
       <day>25</day>
     </enddate>
     <location>
       <country code="RS">Serbia</country>
       <city>Belgrade</city>
       <site>Radisson Blu Old Mill Hotel</site>
     </location>
 
     <description>EuroBSDcon is the premier European conference on the
       open source BSD operating systems attracting about 250 highly
       skilled engineering professionals, software developers, computer
       science students and professors, and users from all over Europe
       and other parts of the world.  The goal of EuroBSDcon is to
       exchange knowledge about the BSD operating systems, facilitate
       coordination and cooperation among users and
       developers.</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>
 
   <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>
+      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>
     <url>https://www.mckusick.com/courses/adveveclass.html</url>
     <startdate>
       <year>2016</year>
       <month>1</month>
       <day>21</day>
     </startdate>
     <enddate>
       <year>2016</year>
       <month>5</month>
       <day>12</day>
     </enddate>
     <location>
       <country code="US">United States</country>
       <city>Berkeley</city>
       <site>Hillside Club</site>
     </location>
     <description>Marshall Kirk McKusick will be teaching his course
       &quot;FreeBSD Kernel Internals: An Intensive Code
       Walkthrough&quot; on Thursday evenings in Berkeley California
       beginning January 21, 2016.  The class will be held at the
       historic <a href="http://www.hillsideclub.org/">Hillside
 	Club</a> at 2286 Cedar Street, Berkeley, CA 94709 just three
       blocks north of the Berkeley campus once per week from 6:30PM
       to 10:00PM starting Thursday January 21st and finishing on
       Thursday May 12th.  You can sign up for the class at <a
 	href="https://www.mckusick.com/courses/advclassform.html">https://www.mckusick.com/courses/advclassform.html</a>.
       Those not living in the Bay Area that would like to take the
       class remotely can sign up for a subscription to receive the
       classes week-by-week as they are recorded.</description>
   </event>
 
   <event id="scale">
     <name>SCaLE 14x: The Southern California Linux Expo</name>
     <url>https://www.socallinuxexpo.org</url>
     <startdate>
       <year>2016</year>
       <month>1</month>
       <day>21</day>
     </startdate>
     <enddate>
       <year>2016</year>
       <month>1</month>
       <day>24</day>
     </enddate>
     <location>
       <country code="US">United States</country>
       <city>Pasadena</city>
       <site>Pasadena Convention Center</site>
     </location>
     <description>
       Now celebrating its 14th year, the Southern California Linux
       Expo SCALE 14X is the largest Linux and Open Source Software
-      show in North America. The four-day event -- from Jan 21-24,
+      show in North America.  The four-day event -- from Jan 21-24,
       2016, at the Pasadena Convention Center -- attracts top speakers
       and exhibitors from all over North America.  Sessions and
       workshops range from beginner tutorials to seminars for
       experienced system administrators or software developers.  In
       addition, specialty seminars prior to the weekend are conducted
       by various groups in the Free and Open Source Software
       community.  While Linux is in our name, we tend to have a fair
       amount of BSD content including booths from the FreeBSD
       Foundation and the FreeBSD project.  This year will also include
       onsite BSDA exams.  For more information, or to register, visit
-      <a href="https://www.socallinuxexpo.org">https://www.socallinuxexpo.org</a>.
+      <a
+	href="https://www.socallinuxexpo.org">https://www.socallinuxexpo.org</a>.
     </description>
   </event>
 </events>