svn commit: r47958 - head/share/xml

[Allan Jude]

Author: allanjude
Date: Thu Jan  7 05:42:10 2016
New Revision: 47958
URL: https://svnweb.freebsd.org/changeset/doc/47958

Log:
  Add AsiaBSDCon and BSDCan 2016 to the events list
  
  Reviewed by:	bjk
  Sponsored by:	ScaleEngine Inc.
  Differential Revision:	https://reviews.freebsd.org/D4805

Modified:
  head/share/xml/events2016.xml

Modified: head/share/xml/events2016.xml
==============================================================================
--- head/share/xml/events2016.xml	Wed Jan  6 15:13:46 2016	(r47957)
+++ head/share/xml/events2016.xml	Thu Jan  7 05:42:10 2016	(r47958)
@@ -108,4 +108,61 @@
       <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>2015</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>