events2020: clean up cancelled events

While I was there, also cleaned up locations for online events.

Reviewed by:	debdrup
Differential Revision:	https://reviews.freebsd.org/D27989

1 files changed, 1 insertions, 62 deletions

diff --git a/share/xml/events2020.xml b/share/xml/events2020.xml
index e8b1d6faf2..f5bb1a90ef 100644
--- a/share/xml/events2020.xml
+++ b/share/xml/events2020.xml
@@ -64,34 +64,6 @@
       world gather at the event in Brussels.</description>
   </event>
 
-  <event id="asiabsdcon-2020">
-    <name>AsiaBSDCon 2020</name>
-    <url>https://2020.asiabsdcon.org/</url>
-    <startdate>
-      <year>2020</year>
-      <month>03</month>
-      <day>19</day>
-    </startdate>
-    <enddate>
-      <year>2020</year>
-      <month>03</month>
-      <day>22</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="freebsd-office-hours-2020-04-01">
     <name>FreeBSD Office Hours</name>
     <url>https://www.youtube.com/watch?v=6qBm5NM3zTQ</url>
@@ -106,9 +78,7 @@
       <day>01</day>
     </enddate>
     <location>
-      <country code="CA">Canada</country>
-      <city>Google Hangout</city>
-      <site>Online</site>
+      <site>Google Hangout</site>
     </location>
     <description>On April 1st at 18:00 UTC we will hold the first
       &quot;FreeBSD Office Hours&quot;, an interactive online event
@@ -131,8 +101,6 @@
       <day>16</day>
     </enddate>
     <location>
-      <country code="CA">Canada</country>
-      <city>Online</city>
       <site>live.FreeBSD.org</site>
     </location>
     <description>On April 16th at 02:00 UTC (April 15th in North America)
@@ -142,29 +110,6 @@
       posted to Youtube after its conclusion.</description>
   </event>
 
-  <event id="bsdcan-2020">
-    <name>BSDCan 2020</name>
-    <url>https://www.bsdcan.org</url>
-    <startdate>
-      <year>2020</year>
-      <month>06</month>
-      <day>03</day>
-    </startdate>
-    <enddate>
-      <year>2020</year>
-      <month>06</month>
-      <day>06</day>
-    </enddate>
-    <location>
-      <country code="CA">Canada</country>
-      <city>Ottawa</city>
-      <site>University of Ottawa</site>
-    </location>
-    <description>A four day BSD conference held in Ottawa, Canada.
-      BSDCan hosts talks and tutorials on a range of topics based
-      around the BSD family of operating systems.</description>
-  </event>
-
   <event id="freebsd-office-hours-2020-06-24">
     <name>FreeBSD Office Hours</name>
     <url>https://live.freebsd.org/FreeBSD/officehours/</url>
@@ -179,8 +124,6 @@
       <day>24</day>
     </enddate>
     <location>
-      <country code="CA">Canada</country>
-      <city>Online</city>
       <site>live.FreeBSD.org</site>
     </location>
     <description>On June 24th at 18:00 UTC we will hold the fifth
@@ -228,8 +171,6 @@
       <day>22</day>
     </enddate>
     <location>
-      <country code="CA">Canada</country>
-      <city>Online</city>
       <site>live.FreeBSD.org</site>
     </location>
     <description>On July 22nd at 18:00 UTC we will hold a
@@ -406,8 +347,6 @@
       <day>19</day>
     </enddate>
     <location>
-      <country code="CA">Canada</country>
-      <city>Online</city>
       <site>live.FreeBSD.org</site>
     </location>
     <description>On September 19th 2020 from 1400-2100 UTC we will be