Index: head/share/xml/events2015.xml =================================================================== --- head/share/xml/events2015.xml (revision 45951) +++ head/share/xml/events2015.xml (revision 45952) @@ -1,72 +1,72 @@ $FreeBSD$ AsiaBSDCon 2015 http://2015.asiabsdcon.org/ 2015 3 12 2015 3 15 Japan Tokyo Tokyo University of Science 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. BSDCan 2015 http://www.bsdcan.org/ 2015 6 10 2015 6 13 Canada Ottawa University of Ottawa BSDCan is a technical conference for people working on and with BSD operating systems and related projects. It is a developers conference 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. Features tracks on System - Administration, Security, Hacking and Embedded. Followed + from commercial vendors. + BSDCan is followed immediately by PGCon at the same location.