Diff for /wikisrc/events.mdwn between versions 1.14 and 1.16

version 1.14, 2015/08/14 12:15:01 version 1.16, 2015/08/24 01:54:37
Line 20  Europe and other parts of the world. The Line 20  Europe and other parts of the world. The
 exchange knowledge about the BSD operating systems, facilitate  exchange knowledge about the BSD operating systems, facilitate
 coordination and cooperation among users and developers.  coordination and cooperation among users and developers.
   
 ### `Aug 2015` - Open Source Conference 2015 Shimane  ### `Sep 2015` - vBSDCon 2015, Virginia, United States
   
 *Aug. 22, 2015, [MATSUE TERRSA](http://www.sanbg.com/terrsa/e/index.html), Shimane, Japan*  *Sep. 11-13, 2015, Virginia, United States*
   
   On September 11-13, 2015 at the Sheraton in Reston, Virginia for the second biennial [vBSDCon](http://vbsdcon.com) event. This exciting weekend will bring together members of the BSD community for a series of roundtable discussions, educational sessions, best practice conversations, and exclusive networking opportunities.
   
   ### `Sep 2015` - Open Source Conference 2015 Niigata
   
   *Sep. 5, 2015, [HON-PORT NIIGATA CITY PUBLIC LIBRARY](http://www.niigatacitylib.jp/?page_id=166), Shimane, Japan*
   
 At the [Open Source Conference 2015  At the [Open Source Conference 2015
 Shimane](http://www.ospn.jp/osc2015-shimane/) , there will a NetBSD booth  Niigata](http://www.ospn.jp/osc2015-niigata/) , there will be a NetBSD booth
 staffed by members of the [Japan NetBSD Users'  staffed by members of the [Japan NetBSD Users'
 Group](http://www.jp.NetBSD.org/ja/JP/JNUG/) with many gadget  Group](http://www.jp.NetBSD.org/ja/JP/JNUG/) with many gadget
 demonstrations.  demonstrations.
Line 33  demonstrations. Line 39  demonstrations.
 Past Events  Past Events
 -----------  -----------
   
   ### `Aug 2015` - Open Source Conference 2015 Shimane
   
   *Aug. 22, 2015, [MATSUE TERRSA](http://www.sanbg.com/terrsa/e/index.html), Shimane, Japan*
   
   At the [Open Source Conference 2015
   Shimane](http://www.ospn.jp/osc2015-shimane/) , there was a NetBSD booth
   staffed by members of the [Japan NetBSD Users'
   Group](http://www.jp.NetBSD.org/ja/JP/JNUG/) with many gadget
   demonstrations.[Report on netbsd-advocacy](http://mail-index.netbsd.org/netbsd-advocacy/2015/08/22/msg000692.html).
   
 ### `Mar 2015` - AsiaBSDCon 2015  ### `Mar 2015` - AsiaBSDCon 2015
   
 *Mar. 12-15, 2015, Tokyo, Japan*  *Mar. 12-15, 2015, Tokyo, Japan*

Removed from v.1.14  
changed lines
  Added in v.1.16


CVSweb for NetBSD wikisrc <wikimaster@NetBSD.org> software: FreeBSD-CVSweb