Recent changes to this wiki:

Set my e-mail address to the @NetBSD.org one.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- wikisrc/users/wiz/authorslist.mdwn	28 Aug 2015 16:21:15 -0000	1.59
+++ wikisrc/users/wiz/authorslist.mdwn	30 Aug 2015 14:44:13 -0000	1.60
@@ -151,7 +151,7 @@
 - haad = haad <haad@users.sourceforge.net>
 - harenber = Torsten Harenberg <harenber@users.sourceforge.net>
 - hdpfeiffer = Heather D Pfeiffer <hdpfeiffer@users.sourceforge.net>
-- heidnes = Havard Eidnes <heidnes@users.sourceforge.net>
+- heidnes = Havard Eidnes <he@NetBSD.org>
 - helgoman = Helge Muehlmeier <helgoman@users.sourceforge.net>
 - hfath = Hauke Fath <hfath@users.sourceforge.net>
 - hftmarkand = David DEMELIER <hftmarkand@users.sourceforge.net>

Alistair Crooks
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- wikisrc/users/wiz/authorslist.mdwn	25 Aug 2015 21:40:04 -0000	1.58
+++ wikisrc/users/wiz/authorslist.mdwn	28 Aug 2015 16:21:15 -0000	1.59
@@ -7,7 +7,7 @@
 - ada-pkgsrc = Adrien Auzanneau <ada-pkgsrc@users.sourceforge.net>
 - adanbsd = ada <adanbsd@users.sourceforge.net>
 - adrian_p = Adrian Portelli <adrian_p@users.sourceforge.net>
-- agc = Alistair Crooks <agc@users.sourceforge.net>
+- agc = Alistair Crooks <agc@NetBSD.org>
 - agrier = Aaron J. Grier <agrier@users.sourceforge.net>
 - ahallmann = Andreas Hallmann <ahallmann@users.sourceforge.net>
 - ahp-nils = Nils Ratusznik <nils@NetBSD.org>

I don't think this is a project someone should really spend time on.
Talk to me if you disagree.
--- wikisrc/projects/project/pkgsrc-apache-openoffice.mdwn	2015-08-26 21:32:57.000000000 +0000
+++ /dev/null	2015-08-26 21:32:00.000000000 +0000
@@ -1,20 +0,0 @@
-[[!template id=project
-
-title="Packaging Apache OpenOffice productivity suite to pkgsrc"
-
-contact="""
-[tech-pkg](mailto:tech-pkg@NetBSD.org)
-"""
-
-category="pkgsrc"
-difficulty="medium"
-
-description="""
-[Apache OpenOffice](https://www.openoffice.org/) is another child of
-OpenOffice.org.
-Apache OpenOffice is licensed under Apache License 2.
-
-Another child, LibreOffice licensed under LGPL3 is categorized
-as pkgsrc/misc/libreoffice4.
-"""
-]]

mention openbsd patches
Index: wikisrc/projects/project/pkgsrc-chromium.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/pkgsrc-chromium.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/projects/project/pkgsrc-chromium.mdwn	14 Feb 2015 06:55:37 -0000	1.1
+++ wikisrc/projects/project/pkgsrc-chromium.mdwn	26 Aug 2015 21:20:36 -0000	1.2
@@ -16,7 +16,9 @@
 [Chromium web browser](http://www.chromium.org/Home) is open source
 edition of Google Chrome.
 
-FreeBSD Ports has Chromium package
+FreeBSD and OpenBSD Ports have Chromium packaged
 as [www/chromium](https://svnweb.freebsd.org/ports/head/www/chromium/).
+
+A good place to start would be the OpenBSD [package repository entry for chromium](http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/www/chromium/).
 """
 ]]

Fix a recurring typo. Thanks, wen!
Index: wikisrc/users/wiz/wip-users.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-users.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/users/wiz/wip-users.mdwn	24 Aug 2015 21:18:53 -0000	1.12
+++ wikisrc/users/wiz/wip-users.mdwn	26 Aug 2015 08:46:35 -0000	1.13
@@ -82,21 +82,21 @@
 Assuming you have a pkgsrc checkout in */usr/pkgsrc*, do the following:
 
 	cd /usr/pkgsrc/
-	git clone git://wip.pkgsrc.org:/pkgsrc-wip wip
+	git clone git://wip.pkgsrc.org/pkgsrc-wip wip
 
 ### Getting via git -- with an account
 
 You'll have to change your config if you previously had an anonymous
 checkout.  Otherwise you'll run into commit problems later on:
 
-	git remote set-url origin username@wip.pkgsrc.org:/pkgsrc-wip
+	git remote set-url origin username@wip.pkgsrc.org/pkgsrc-wip
 
 Of course, *username* is *your* username.
 
 If you have no clone yet, use:
 
 	cd /usr/pkgsrc/
-	git clone username@wip.pkgsrc.org:/pkgsrc-wip wip
+	git clone username@wip.pkgsrc.org/pkgsrc-wip wip
 
 
 ### Web-based CVS browsing

blef
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- wikisrc/users/wiz/authorslist.mdwn	25 Aug 2015 20:55:59 -0000	1.57
+++ wikisrc/users/wiz/authorslist.mdwn	25 Aug 2015 21:40:04 -0000	1.58
@@ -43,7 +43,7 @@
 - bjan2 = Bruce J.A. Nourish <bjan2@users.sourceforge.net>
 - bjcosta = Brendon Costa <bjcosta@users.sourceforge.net>
 - blckmaxima = MatthewD <blckmaxima@users.sourceforge.net>
-- blef = Soren Jacobsen <blef@users.sourceforge.net>
+- blef = Soren Jacobsen <snj@NetBSD.org>
 - bmeurer = Benedikt Meurer <bmeurer@users.sourceforge.net>
 - bradv = Brad Volz <bradv@users.sourceforge.net>
 - briandealwis = Brian de Alwis <briandealwis@users.sourceforge.net>

Pick the same email address that I use on GitHub.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- wikisrc/users/wiz/authorslist.mdwn	25 Aug 2015 20:50:46 -0000	1.56
+++ wikisrc/users/wiz/authorslist.mdwn	25 Aug 2015 20:55:59 -0000	1.57
@@ -216,7 +216,7 @@
 - kheinz = Klaus Heinz <kheinz@users.sourceforge.net>
 - khorben = Pierre Pronchery <khorben@defora.org>
 - kibumh = Kibum Han <kibumh@users.sourceforge.net>
-- kimmo = Kimmo Suominen <kim@tac.nyc.ny.us>
+- kimmo = Kimmo Suominen <kimmo@suominen.com>
 - kirtai = Douglas Brebner <kirtai@users.sourceforge.net>
 - kirussel = Kirk Russell <kirussel@users.sourceforge.net>
 - koifren = Mihai Chelaru <koifren@users.sourceforge.net>

Update my email address. I don't like to type it mixed case.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- wikisrc/users/wiz/authorslist.mdwn	25 Aug 2015 14:01:35 -0000	1.55
+++ wikisrc/users/wiz/authorslist.mdwn	25 Aug 2015 20:50:46 -0000	1.56
@@ -216,7 +216,7 @@
 - kheinz = Klaus Heinz <kheinz@users.sourceforge.net>
 - khorben = Pierre Pronchery <khorben@defora.org>
 - kibumh = Kibum Han <kibumh@users.sourceforge.net>
-- kimmo = Kimmo Suominen <kim@NetBSD.org>
+- kimmo = Kimmo Suominen <kim@tac.nyc.ny.us>
 - kirtai = Douglas Brebner <kirtai@users.sourceforge.net>
 - kirussel = Kirk Russell <kirussel@users.sourceforge.net>
 - koifren = Mihai Chelaru <koifren@users.sourceforge.net>

As asked on packages@, edited my entry to my
preferred (non-sourceforge) email address.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- wikisrc/users/wiz/authorslist.mdwn	25 Aug 2015 09:33:05 -0000	1.54
+++ wikisrc/users/wiz/authorslist.mdwn	25 Aug 2015 14:01:35 -0000	1.55
@@ -186,7 +186,7 @@
 - jdwhite = Jason White <jdwhite@users.sourceforge.net>
 - jejcic = Jaka Jejcic <jejcic@users.sourceforge.net>
 - jellehermsen = Jelle Hermsen <jellehermsen@users.sourceforge.net>
-- jeremy-c-reed = Jeremy C. Reed <jeremy-c-reed@users.sourceforge.net>
+- jeremy-c-reed = Jeremy C. Reed <reed@reedmedia.net>
 - jessepeterson = Jesse Peterson <jessepeterson@users.sourceforge.net>
 - jgoamakf = Hiramatsu Yoshifumi <jgoamakf@users.sourceforge.net>
 - jh88 = Johannes Hofmann <jh88@users.sourceforge.net>

add some TODOs.
Index: wikisrc/users/wiz/wip-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-migration.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/users/wiz/wip-migration.mdwn	25 Aug 2015 09:33:51 -0000	1.9
+++ wikisrc/users/wiz/wip-migration.mdwn	25 Aug 2015 13:31:59 -0000	1.10
@@ -35,8 +35,16 @@
 
 - add script that generates commit emails -- done
 
+- improve script that generates commit emails: subject should contain useful path
+
 - add script that checks no new branches are created -- done
 
+- add script that checks no new tags are created
+
+- add SSL support
+
+- add IPv6 support
+
 ## sourceforge shutdown
 
 - shut down remaining mailing lists

Update status.
Index: wikisrc/users/wiz/wip-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-migration.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/users/wiz/wip-migration.mdwn	24 Aug 2015 07:07:45 -0000	1.8
+++ wikisrc/users/wiz/wip-migration.mdwn	25 Aug 2015 09:33:51 -0000	1.9
@@ -25,12 +25,7 @@
 
 - set up git server (SSH) -- done
 
-- set up HTTP server for repository
-
-	but which?
-	- git serve(r)
-	- cgit
-	- gitolite
+- set up HTTP server for repository -- done (gitweb)
 
 - add user accounts
 
@@ -65,5 +60,4 @@
 
 ## various
 
-- snapshots
-    should the snapshots include .git?  Doesn't seem worth it.
+- snapshots -- done (webgit)

Petar Bogdanovic
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- wikisrc/users/wiz/authorslist.mdwn	24 Aug 2015 07:06:10 -0000	1.53
+++ wikisrc/users/wiz/authorslist.mdwn	25 Aug 2015 09:33:05 -0000	1.54
@@ -310,7 +310,7 @@
 - pbhenson = Paul B. Henson <henson@acm.org>
 - pbraun9 = Pierre-Philipp Braun <pbraun9@users.sourceforge.net>
 - pdtafti = Pouya Tafti <pdtafti@users.sourceforge.net>
-- pebog = Petar Bogdanovic <pebog@users.sourceforge.net>
+- pebog = Petar Bogdanovic <petar@smokva.net>
 - peterih = Peter Ibsen Hansen <peterih@users.sourceforge.net>
 - pettai = Fredrik Pettai <pettai@users.sourceforge.net>
 - phabrics = Ruben Agin <phabrics@phabrics.com>

Mention that the existing repository will not survive the real migration.
Index: wikisrc/users/wiz/wip-users.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-users.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/users/wiz/wip-users.mdwn	21 Aug 2015 09:35:55 -0000	1.11
+++ wikisrc/users/wiz/wip-users.mdwn	24 Aug 2015 21:18:53 -0000	1.12
@@ -1,4 +1,10 @@
 # The pkgsrc-wip project
+
+## NOTE: There is a repository there, but it's not the final one
+
+You can play around with it, but the data will not survive the real
+migration.
+
 ## What is pkgsrc-wip?
 
 pkgsrc-wip (work in progress) is a project to get more people actively

Testing browser edits.
Index: wikisrc/users/riz.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/riz.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/users/riz.mdwn	15 Mar 2013 21:44:32 -0000	1.3
+++ wikisrc/users/riz.mdwn	24 Aug 2015 19:29:09 -0000	1.4
@@ -4,7 +4,7 @@
 
 ## Release Engineering
 
-* NetBSD 6.1 is coming!
+* NetBSD 7.0 is coming!
 * [[top issues being tracked|issues-6]]
 
 ## Personal stuff

Remove one, mark one done -- we are getting there.
Index: wikisrc/users/wiz/wip-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-migration.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/users/wiz/wip-migration.mdwn	23 Aug 2015 18:32:29 -0000	1.7
+++ wikisrc/users/wiz/wip-migration.mdwn	24 Aug 2015 07:07:45 -0000	1.8
@@ -38,13 +38,9 @@
 
 	done in [[http://mail-index.netbsd.org/pkgsrc-users/2015/08/21/msg022059.html]]
 
-- add script that generates commit emails
+- add script that generates commit emails -- done
 
-- add script that checks no new branches are created (done)
-
-- add script that complains about pulling without -r?
-
-	like libreoffice does if you have local commits
+- add script that checks no new branches are created -- done
 
 ## sourceforge shutdown
 

Adrian Steinmann
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- wikisrc/users/wiz/authorslist.mdwn	23 Aug 2015 20:09:10 -0000	1.52
+++ wikisrc/users/wiz/authorslist.mdwn	24 Aug 2015 07:06:10 -0000	1.53
@@ -30,7 +30,7 @@
 - apost = Alan Post <apost@users.sourceforge.net>
 - arved = Tilman Keskinöz <arved@users.sourceforge.net>
 - asau = Aleksej Saushev <asau@users.sourceforge.net>
-- astforge = Adrian Steinmann <astforge@users.sourceforge.net>
+- astforge = Adrian Steinmann <ast@NetBSD.org>
 - atamaniuk = Patrick Atamaniuk <atamaniuk@users.sourceforge.net>
 - athaba = Christian St. <athaba@users.sourceforge.net>
 - atomicules = atomicules <atomicules@users.sourceforge.net>

add BSDCon Brasil 2015
Index: wikisrc/events.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/events.mdwn,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wikisrc/events.mdwn	24 Aug 2015 01:54:37 -0000	1.16
+++ wikisrc/events.mdwn	24 Aug 2015 02:10:31 -0000	1.17
@@ -8,6 +8,12 @@
 Future Events
 -------------
 
+### `Oct 2015` - BSDCon Brasil 2015, Ceará, Brasil
+
+*Oct. 9-10, 2015, University of Fortaleza ,Ceará, Brasil*
+
+A primeira edição da [BSDCon Brasil](http://2015.bsdcon.com.br/) ocorreu em 2003. Durante todos esses anos que se passaram, o Brasil ainda não tinha reunido sua comunidade com tanta força como agora. Todos os envolvidos na conferência terão contato direto com o mundo dos usuários, entusiastas e desenvolvedores, o que lhes permitirá melhor compreender sistemas FreeBSD, OpenBSD, NetBSD, DragonflyBSD e outros sistemas de linhagem BSD UNIX.
+
 ### `Oct 2015` - EuroBSDcon 2015, Stockholm, Sweden
 
 *Oct. 1-4, 2015, Stockholm, Sweden*

add vBSDCon 2015
Index: wikisrc/events.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/events.mdwn,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wikisrc/events.mdwn	22 Aug 2015 15:34:51 -0000	1.15
+++ wikisrc/events.mdwn	24 Aug 2015 01:54:37 -0000	1.16
@@ -20,6 +20,12 @@
 exchange knowledge about the BSD operating systems, facilitate
 coordination and cooperation among users and developers.
 
+### `Sep 2015` - vBSDCon 2015, Virginia, United States
+
+*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*

NetBSD.org police.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- wikisrc/users/wiz/authorslist.mdwn	23 Aug 2015 18:08:11 -0000	1.51
+++ wikisrc/users/wiz/authorslist.mdwn	23 Aug 2015 20:09:10 -0000	1.52
@@ -216,7 +216,7 @@
 - kheinz = Klaus Heinz <kheinz@users.sourceforge.net>
 - khorben = Pierre Pronchery <khorben@defora.org>
 - kibumh = Kibum Han <kibumh@users.sourceforge.net>
-- kimmo = Kimmo Suominen <kim@netbsd.org>
+- kimmo = Kimmo Suominen <kim@NetBSD.org>
 - kirtai = Douglas Brebner <kirtai@users.sourceforge.net>
 - kirussel = Kirk Russell <kirussel@users.sourceforge.net>
 - koifren = Mihai Chelaru <koifren@users.sourceforge.net>

Fix syntax of useradd.
Index: wikisrc/users/wiz/wip-admin.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-admin.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/users/wiz/wip-admin.mdwn	23 Aug 2015 09:42:56 -0000	1.5
+++ wikisrc/users/wiz/wip-admin.mdwn	23 Aug 2015 20:03:10 -0000	1.6
@@ -6,7 +6,7 @@
 - export USERNAME=foo
 - export NAME="Name of User"
 - echo 'key_from_user' > $USERNAME.key
-- useradd -d /home/git-shell -s /usr/pkg/bin/git-shell -g git $USERNAME -c "$NAME"
+- useradd -d /home/git-shell -s /usr/pkg/bin/git-shell -g git -c "$NAME" $USERNAME
 - chown $USERNAME $USERNAME.key
 - chmod 600 $USERNAME.key
 - git add $USERNAME.key

Index: wikisrc/users/wiz/wip-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-migration.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/users/wiz/wip-migration.mdwn	21 Aug 2015 09:57:03 -0000	1.6
+++ wikisrc/users/wiz/wip-migration.mdwn	23 Aug 2015 18:32:29 -0000	1.7
@@ -40,7 +40,7 @@
 
 - add script that generates commit emails
 
-- add script that checks no new branches are created
+- add script that checks no new branches are created (done)
 
 - add script that complains about pulling without -r?
 
@@ -70,6 +70,4 @@
 ## various
 
 - snapshots
-
-	are they still necessary or is the 'download tar.gz' button enough
-	(does it even exist in plain git?)
+    should the snapshots include .git?  Doesn't seem worth it.

Fix my email address.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- wikisrc/users/wiz/authorslist.mdwn	23 Aug 2015 16:32:00 -0000	1.50
+++ wikisrc/users/wiz/authorslist.mdwn	23 Aug 2015 18:08:11 -0000	1.51
@@ -216,7 +216,7 @@
 - kheinz = Klaus Heinz <kheinz@users.sourceforge.net>
 - khorben = Pierre Pronchery <khorben@defora.org>
 - kibumh = Kibum Han <kibumh@users.sourceforge.net>
-- kimmo = Kimmo Suominen <kimmo@users.sourceforge.net>
+- kimmo = Kimmo Suominen <kim@netbsd.org>
 - kirtai = Douglas Brebner <kirtai@users.sourceforge.net>
 - kirussel = Kirk Russell <kirussel@users.sourceforge.net>
 - koifren = Mihai Chelaru <koifren@users.sourceforge.net>

Update my desired e-mail
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- wikisrc/users/wiz/authorslist.mdwn	23 Aug 2015 08:47:09 -0000	1.49
+++ wikisrc/users/wiz/authorslist.mdwn	23 Aug 2015 16:32:00 -0000	1.50
@@ -214,7 +214,7 @@
 - kethzer-08 = Keth Pierre <kethzer-08@users.sourceforge.net>
 - kh-p = Khalil Petit <kh-p@users.sourceforge.net>
 - kheinz = Klaus Heinz <kheinz@users.sourceforge.net>
-- khorben = Pierre Pronchery <khorben@users.sourceforge.net>
+- khorben = Pierre Pronchery <khorben@defora.org>
 - kibumh = Kibum Han <kibumh@users.sourceforge.net>
 - kimmo = Kimmo Suominen <kimmo@users.sourceforge.net>
 - kirtai = Douglas Brebner <kirtai@users.sourceforge.net>

Lists need an empty line before.
Index: wikisrc/users/wiz/wip-admin.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-admin.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/users/wiz/wip-admin.mdwn	23 Aug 2015 09:38:02 -0000	1.4
+++ wikisrc/users/wiz/wip-admin.mdwn	23 Aug 2015 09:42:56 -0000	1.5
@@ -13,5 +13,6 @@
 - git commit -m "adding key for $USERNAME"
 
 For NetBSD developers, sync the UID with the one used everywhere else:
+
 - vipw
 - chown $USERNAME $USERNAME.key

Update instructions: include name, use NetBSD UIDs for developers.
Index: wikisrc/users/wiz/wip-admin.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-admin.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/users/wiz/wip-admin.mdwn	21 Aug 2015 10:56:18 -0000	1.3
+++ wikisrc/users/wiz/wip-admin.mdwn	23 Aug 2015 09:38:02 -0000	1.4
@@ -4,9 +4,14 @@
 
 - cd /etc/sshkeys
 - export USERNAME=foo
+- export NAME="Name of User"
 - echo 'key_from_user' > $USERNAME.key
-- useradd -d /home/git-shell -s /usr/pkg/bin/git-shell -g git $USERNAME
+- useradd -d /home/git-shell -s /usr/pkg/bin/git-shell -g git $USERNAME -c "$NAME"
 - chown $USERNAME $USERNAME.key
 - chmod 600 $USERNAME.key
 - git add $USERNAME.key
 - git commit -m "adding key for $USERNAME"
+
+For NetBSD developers, sync the UID with the one used everywhere else:
+- vipw
+- chown $USERNAME $USERNAME.key

Put the correct email address on my entry.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- wikisrc/users/wiz/authorslist.mdwn	22 Aug 2015 22:57:01 -0000	1.48
+++ wikisrc/users/wiz/authorslist.mdwn	23 Aug 2015 08:47:09 -0000	1.49
@@ -50,7 +50,7 @@
 - brook1 = Brook <brook1@users.sourceforge.net>
 - bsadewitz = Blair Sadewitz <bsadewitz@users.sourceforge.net>
 - bseklecki = Brian A. Seklecki <bseklecki@users.sourceforge.net>
-- bsiegert = Benny Siegert <bsiegert@users.sourceforge.net>
+- bsiegert = Benny Siegert <bsiegert@NetBSD.org>
 - bubuchka = Mike M. Volokhov <bubuchka@users.sourceforge.net>
 - bwulf = Berndt Josef Wulf <bwulf@users.sourceforge.net>
 - c3-xmldb = Sergey N. Bashkirev <c3-xmldb@users.sourceforge.net>

Sergey Svishchev.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- wikisrc/users/wiz/authorslist.mdwn	22 Aug 2015 13:57:58 -0000	1.47
+++ wikisrc/users/wiz/authorslist.mdwn	22 Aug 2015 22:57:01 -0000	1.48
@@ -363,7 +363,7 @@
 - sebpierrel = Sébastien Pierrel <sebpierrel@users.sourceforge.net>
 - sfberry = Chris Lloyd <sfberry@users.sourceforge.net>
 - sfis = Ignatios Souvatzis <sfis@users.sourceforge.net>
-- shattered = Sergey Svishchev <shattered@users.sourceforge.net>
+- shattered = Sergey Svishchev <shattered@NetBSD.org>
 - shindenmorr = Daniel Horecki <shindenmorr@users.sourceforge.net>
 - sifu = Siegmund Führinger <sifu@users.sourceforge.net>
 - silasdb = Silas Silva <silasdb@users.sourceforge.net>

move past OSC2015shimane,add OSC2015niigata
Index: wikisrc/events.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/events.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/events.mdwn	14 Aug 2015 12:15:01 -0000	1.14
+++ wikisrc/events.mdwn	22 Aug 2015 15:34:51 -0000	1.15
@@ -20,12 +20,12 @@
 exchange knowledge about the BSD operating systems, facilitate
 coordination and cooperation among users and developers.
 
-### `Aug 2015` - Open Source Conference 2015 Shimane
+### `Sep 2015` - Open Source Conference 2015 Niigata
 
-*Aug. 22, 2015, [MATSUE TERRSA](http://www.sanbg.com/terrsa/e/index.html), Shimane, Japan*
+*Sep. 5, 2015, [HON-PORT NIIGATA CITY PUBLIC LIBRARY](http://www.niigatacitylib.jp/?page_id=166), Shimane, Japan*
 
 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'
 Group](http://www.jp.NetBSD.org/ja/JP/JNUG/) with many gadget
 demonstrations.
@@ -33,6 +33,16 @@
 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. 12-15, 2015, Tokyo, Japan*

Jason Bacon.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- wikisrc/users/wiz/authorslist.mdwn	22 Aug 2015 10:44:10 -0000	1.46
+++ wikisrc/users/wiz/authorslist.mdwn	22 Aug 2015 13:57:58 -0000	1.47
@@ -303,7 +303,7 @@
 - ondratu = Ondrej Tuma <ondratu@users.sourceforge.net>
 - ora8_ = Jose Diaz Fernandez <ora8_@users.sourceforge.net>
 - othyro = othyro <othyro@users.sourceforge.net>
-- outpaddling = Jason Bacon <outpaddling@users.sourceforge.net>
+- outpaddling = Jason Bacon <jwbacon@tds.net>
 - pallegra = Pierre Allegraud <pallegra@users.sourceforge.net>
 - pallelyckegaard = Palle Lyckegaard <pallelyckegaard@users.sourceforge.net>
 - paperbook = paperbook <paperbook@users.sourceforge.net>

dieter roelants
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- wikisrc/users/wiz/authorslist.mdwn	22 Aug 2015 09:58:35 -0000	1.45
+++ wikisrc/users/wiz/authorslist.mdwn	22 Aug 2015 10:44:10 -0000	1.46
@@ -343,7 +343,7 @@
 - rmottola = Riccardo Mottola <rmottola@users.sourceforge.net>
 - rockpiper = Robert Lillack <rockpiper@users.sourceforge.net>
 - rodo6510 = Robert Doerfler <rodo6510@users.sourceforge.net>
-- roelants = Dieter Roelants <roelants@users.sourceforge.net>
+- roelants = dieter roelants <dieter@bsdusr.net>
 - rootcho = rootcho <rootcho@users.sourceforge.net>
 - rpereyra = Roberto Pereyra <rpereyra@users.sourceforge.net>
 - rsmarples = Roy Marples <roy@marples.name>

Paul B. Henson
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- wikisrc/users/wiz/authorslist.mdwn	21 Aug 2015 21:58:41 -0000	1.44
+++ wikisrc/users/wiz/authorslist.mdwn	22 Aug 2015 09:58:35 -0000	1.45
@@ -307,7 +307,7 @@
 - pallegra = Pierre Allegraud <pallegra@users.sourceforge.net>
 - pallelyckegaard = Palle Lyckegaard <pallelyckegaard@users.sourceforge.net>
 - paperbook = paperbook <paperbook@users.sourceforge.net>
-- pbhenson = Paul Henson <pbhenson@users.sourceforge.net>
+- pbhenson = Paul B. Henson <henson@acm.org>
 - pbraun9 = Pierre-Philipp Braun <pbraun9@users.sourceforge.net>
 - pdtafti = Pouya Tafti <pdtafti@users.sourceforge.net>
 - pebog = Petar Bogdanovic <pebog@users.sourceforge.net>

Travis Paul
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- wikisrc/users/wiz/authorslist.mdwn	21 Aug 2015 21:34:52 -0000	1.43
+++ wikisrc/users/wiz/authorslist.mdwn	21 Aug 2015 21:58:41 -0000	1.44
@@ -395,7 +395,7 @@
 - tomhensel = tom hensel <tomhensel@users.sourceforge.net>
 - tonnerre = Tonnerre <tonnerre@users.sourceforge.net>
 - tqcla = Bloðøx <tqcla@users.sourceforge.net>
-- travis-paul = Travis Paul <travis-paul@users.sourceforge.net>
+- travis-paul = Travis Paul <Tr@vispaul.me>
 - triaxx = Frédéric Fauberteau <triaxx@users.sourceforge.net>
 - tripledes = Sergio Jimenez <tripledes@users.sourceforge.net>
 - trontor = Matthias Scheler <trontor@users.sourceforge.net>

David Carlier
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- wikisrc/users/wiz/authorslist.mdwn	21 Aug 2015 21:15:47 -0000	1.42
+++ wikisrc/users/wiz/authorslist.mdwn	21 Aug 2015 21:34:52 -0000	1.43
@@ -88,7 +88,7 @@
 - dcherkassov = Dmitry Cherkassov <dcherkassov@users.sourceforge.net>
 - ddeus = Oleksandr Kozachuk <ddeus@users.sourceforge.net>
 - debolaz = Anders Nor Berle <debolaz@users.sourceforge.net>
-- devnexen = David Carlier <devnexen@users.sourceforge.net>
+- devnexen = David Carlier <devnexen@gmail.com>
 - dhowland = David Howland <dhowland@users.sourceforge.net>
 - dillo = Dieter Baron <dillo@users.sourceforge.net>
 - dive = Sean Davis <dive@users.sourceforge.net>

Nils Ratusznik
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- wikisrc/users/wiz/authorslist.mdwn	21 Aug 2015 09:02:34 -0000	1.41
+++ wikisrc/users/wiz/authorslist.mdwn	21 Aug 2015 21:15:47 -0000	1.42
@@ -10,7 +10,7 @@
 - agc = Alistair Crooks <agc@users.sourceforge.net>
 - agrier = Aaron J. Grier <agrier@users.sourceforge.net>
 - ahallmann = Andreas Hallmann <ahallmann@users.sourceforge.net>
-- ahp-nils = Nils <ahp-nils@users.sourceforge.net>
+- ahp-nils = Nils Ratusznik <nils@NetBSD.org>
 - airhead = Peter Bex <airhead@users.sourceforge.net>
 - akihabara = Neil Booth <akihabara@users.sourceforge.net>
 - alchow = alchow <alchow@users.sourceforge.net>
@@ -355,8 +355,8 @@
 - samott = Shaun Amott <samott@users.sourceforge.net>
 - sborrill = Stephen Borrill <sborrill@users.sourceforge.net>
 - schaecsn = Stefan <schaecsn@users.sourceforge.net>
-- schmonz = Amitai Schlair <schmonz@netbsd.org>
-- schnoebe = Eric Schnoebelen <schnoebe@netbsd.org>
+- schmonz = Amitai Schlair <schmonz@NetBSD.org>
+- schnoebe = Eric Schnoebelen <schnoebe@NetBSD.org>
 - scode = Peter Schuller <scode@users.sourceforge.net>
 - scott8586 = Scott Presnell <scott8586@users.sourceforge.net>
 - seanboudreau = Sean Boudreau <seanboudreau@users.sourceforge.net>

No -git suffix needed.
Index: wikisrc/users/wiz/wip-admin.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-admin.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/users/wiz/wip-admin.mdwn	21 Aug 2015 09:03:08 -0000	1.2
+++ wikisrc/users/wiz/wip-admin.mdwn	21 Aug 2015 10:56:18 -0000	1.3
@@ -3,7 +3,7 @@
 ## adding users
 
 - cd /etc/sshkeys
-- export USERNAME=foo-git
+- export USERNAME=foo
 - echo 'key_from_user' > $USERNAME.key
 - useradd -d /home/git-shell -s /usr/pkg/bin/git-shell -g git $USERNAME
 - chown $USERNAME $USERNAME.key

update
Index: wikisrc/users/wiz/wip-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-migration.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/users/wiz/wip-migration.mdwn	11 Aug 2015 18:00:37 -0000	1.5
+++ wikisrc/users/wiz/wip-migration.mdwn	21 Aug 2015 09:57:03 -0000	1.6
@@ -23,7 +23,7 @@
 
 ## git setup
 
-- set up git server (SSH)
+- set up git server (SSH) -- done
 
 - set up HTTP server for repository
 
@@ -34,7 +34,9 @@
 
 - add user accounts
 
-	ask for SSH keys on pkgsrc-users, and update htdocs-wip 
+	ask for SSH keys on pkgsrc-user
+
+	done in [[http://mail-index.netbsd.org/pkgsrc-users/2015/08/21/msg022059.html]]
 
 - add script that generates commit emails
 
@@ -50,16 +52,16 @@
 
 - clean up htdocs-wip
 
-	make htdocs-wip a redirect to a wip page in the wiki
+	make htdocs-wip a redirect to [[wip-users]]
 	and link the new location
 
 ## documentation
 
-- how users should set up their global git config
+- how users should set up their global git config -- done
 
-- how to pull
+- how to pull -- done
 
-- how to push
+- how to push -- done
 
 - how to rebase
 

Document how to generate and use a separate SSH key.
Index: wikisrc/users/wiz/wip-users.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-users.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/users/wiz/wip-users.mdwn	21 Aug 2015 08:34:39 -0000	1.10
+++ wikisrc/users/wiz/wip-users.mdwn	21 Aug 2015 09:35:55 -0000	1.11
@@ -38,6 +38,37 @@
 send mail to [[Thomas Klausner|mailto:wiz@NetBSD.org]] with your
 public SSH key, suggested user name and perhaps ideas for your first packages.
 
+### Generating and using a separate SSH key
+
+To generate an SSH key it is suggested to use RSA with at least 1024 bits and a
+passphrase via ssh-keygen(1).
+We can select RSA as the type of the key via the `-t rsa` and the number of bits
+(we choose 2048 bits) via the `-b` option:
+
+	$ ssh-keygen -b 2048 -t rsa
+	Generating public/private rsa key pair.
+	Enter file in which to save the key (/home/user/.ssh/id_rsa): /home/user/.ssh/pkgsrc-wip-id_rsa
+	Enter passphrase (empty for no passphrase):
+	Enter same passphrase again:
+	Your identification has been saved in /home/user/.ssh/pkgsrc-wip-id_rsa.
+	Your public key has been saved in /home/user/.ssh/pkgsrc-wip-id_rsa.pub.
+	[...]
+
+The pkgsrc-wip-id_rsa is the private key and the pkgsrc-wip-id_rsa.pub is the
+public key.
+Please remember to just attach the public key pkgsrc-wip-id_rsa.pub when you are
+sending your email to request an user account!
+
+In order to use it adjust the ~/.ssh/config as follow, adding:
+
+	[...]
+	Host wip.pkgsrc.org
+		PubkeyAuthentication yes
+		IdentityFile ~/.ssh/pkgsrc-wip_id_rsa
+	[...]
+
+You can then use ssh-agent(1) in order to not type the SSH key password each time.
+
 ## Getting the "source"
 
 ### Getting via git -- without an account

Re-order for easier cut-n-paste
Index: wikisrc/users/wiz/wip-admin.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-admin.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/users/wiz/wip-admin.mdwn	20 Aug 2015 20:36:29 -0000	1.1
+++ wikisrc/users/wiz/wip-admin.mdwn	21 Aug 2015 09:03:08 -0000	1.2
@@ -2,10 +2,10 @@
 
 ## adding users
 
-- export USERNAME=foo-git
-- useradd -d /home/git-shell -s /usr/pkg/bin/git-shell -g git $USERNAME
 - cd /etc/sshkeys
+- export USERNAME=foo-git
 - echo 'key_from_user' > $USERNAME.key
+- useradd -d /home/git-shell -s /usr/pkg/bin/git-shell -g git $USERNAME
 - chown $USERNAME $USERNAME.key
 - chmod 600 $USERNAME.key
 - git add $USERNAME.key

Roy Marples
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- wikisrc/users/wiz/authorslist.mdwn	21 Aug 2015 08:50:51 -0000	1.40
+++ wikisrc/users/wiz/authorslist.mdwn	21 Aug 2015 09:02:34 -0000	1.41
@@ -346,7 +346,7 @@
 - roelants = Dieter Roelants <roelants@users.sourceforge.net>
 - rootcho = rootcho <rootcho@users.sourceforge.net>
 - rpereyra = Roberto Pereyra <rpereyra@users.sourceforge.net>
-- rsmarples = Roy Marples <rsmarples@users.sourceforge.net>
+- rsmarples = Roy Marples <roy@marples.name>
 - rubengonzalez = Ruben Gonzalez Arnau <rubengonzalez@users.sourceforge.net>
 - rumko = Rumko <rumko@users.sourceforge.net>
 - rxg = Rui-Xiang Guo <rxg@users.sourceforge.net>

Hubert Feyrer.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- wikisrc/users/wiz/authorslist.mdwn	20 Aug 2015 07:31:54 -0000	1.39
+++ wikisrc/users/wiz/authorslist.mdwn	21 Aug 2015 08:50:51 -0000	1.40
@@ -161,7 +161,7 @@
 - hoka_adam = Adam Hoka <hoka_adam@users.sourceforge.net>
 - hsaliak = hsaliak <hsaliak@users.sourceforge.net>
 - htepper = Hasso Tepper <htepper@users.sourceforge.net>
-- hubertf = Hubert Feyrer <hubertf@users.sourceforge.net>
+- hubertf = Hubert Feyrer <hubertf@NetBSD.org>
 - hugor = Hugo Rivera <hugor@users.sourceforge.net>
 - hweiss = Holger Weiß <holger@zedat.fu-berlin.de>
 - i3enedek = Ben Gergely <i3enedek@users.sourceforge.net>

How to set up username/email.
Index: wikisrc/users/wiz/wip-users.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-users.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/users/wiz/wip-users.mdwn	20 Aug 2015 21:52:18 -0000	1.9
+++ wikisrc/users/wiz/wip-users.mdwn	21 Aug 2015 08:34:39 -0000	1.10
@@ -61,6 +61,7 @@
 	cd /usr/pkgsrc/
 	git clone username@wip.pkgsrc.org:/pkgsrc-wip wip
 
+
 ### Web-based CVS browsing
 
 Of course, you can also browse the CVS repository on the pkgsrc-wip
@@ -68,6 +69,18 @@
 or its pkgsrc.se
 [[mirror|http://cvsweb.netbsd.se/cgi-bin/bsdweb.cgi/wip/]].
 
+## Setting up git
+
+### Username/Email
+
+You can set the email address and user name used in the commits this way:
+
+	git config --global user.email "your_email@example.com"
+	git config --global user.name "Your Name"
+
+If you just want to set this up for wip, run this command inside
+the repository and leave out the *--global*.
+
 ## Keeping up-to-date
 
 ### Upgrading your clone

Mention how to clone directly with an account.
Index: wikisrc/users/wiz/wip-users.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-users.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/users/wiz/wip-users.mdwn	20 Aug 2015 21:50:28 -0000	1.8
+++ wikisrc/users/wiz/wip-users.mdwn	20 Aug 2015 21:52:18 -0000	1.9
@@ -56,6 +56,11 @@
 
 Of course, *username* is *your* username.
 
+If you have no clone yet, use:
+
+	cd /usr/pkgsrc/
+	git clone username@wip.pkgsrc.org:/pkgsrc-wip wip
+
 ### Web-based CVS browsing
 
 Of course, you can also browse the CVS repository on the pkgsrc-wip

Simplify instructions.
Index: wikisrc/users/wiz/wip-users.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-users.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/users/wiz/wip-users.mdwn	20 Aug 2015 21:35:43 -0000	1.7
+++ wikisrc/users/wiz/wip-users.mdwn	20 Aug 2015 21:50:28 -0000	1.8
@@ -42,27 +42,19 @@
 
 ### Getting via git -- without an account
 
-Assuming you have a pkgsrc checkout in <tt>/usr/pkgsrc</tt> and you're currently
-in your home directory, do the following:
+Assuming you have a pkgsrc checkout in */usr/pkgsrc*, do the following:
 
 	cd /usr/pkgsrc/
-	git clone wip.pkgsrc.org:/pkgsrc-wip wip
+	git clone git://wip.pkgsrc.org:/pkgsrc-wip wip
 
 ### Getting via git -- with an account
 
 You'll have to change your config if you previously had an anonymous
-checkout.  Otherwise you'll run into commit problems later on.
+checkout.  Otherwise you'll run into commit problems later on:
 
-Assuming you have a pkgsrc checkout in <tt>/usr/pkgsrc</tt>, you're
-currently in your home directory, and you have commit rights to
-pkgsrc-wip (see "Getting started" above for details), do the
-following:
+	git remote set-url origin username@wip.pkgsrc.org:/pkgsrc-wip
 
-	cd /usr/pkgsrc/
-	git clone username@wip.pkgsrc.org:/pkgsrc-wip wip
-
-*username* is of course *your* username you requested in "Getting
-started" above.  That's all.
+Of course, *username* is *your* username.
 
 ### Web-based CVS browsing
 
@@ -86,7 +78,7 @@
 
 	cd /usr/pkgsrc/wip/<packagename>
 
-Take a look at the <tt>TODO</tt> file there. If the package seems finished enough, install, and try it out:
+Take a look at the *TODO* file there. If the package seems finished enough, install, and try it out:
 
 	make install
 
@@ -98,7 +90,7 @@
 ### Creating and testing
 
 If you haven't read it yet, take a look at
-[[the pkgsrc Guide|http://NetBSD.org/docs/pkgsrc/index.html]] (also in <tt>/usr/pkgsrc/doc/pkgsrc.txt</tt>).
+[[the pkgsrc Guide|http://NetBSD.org/docs/pkgsrc/index.html]] (also in */usr/pkgsrc/doc/pkgsrc.txt*).
 
 Create a package.
 
@@ -144,7 +136,7 @@
 
 ### Further changes
 
-Include a <tt>TODO</tt> file detailing what you think is missing or
+Include a *TODO* file detailing what you think is missing or
 needs more work, or just noting that it's finished.
 
 For any further changes to the package, go the the newpkg
@@ -169,7 +161,7 @@
 afterwards -- enjoy your fame in that case!
 
 You will find [[pkgsrc.se|http://pkgsrc.se]] very useful while working on packages.
-Also try the tools that come with <tt>meta-pkgs/pkg_developer</tt>.
+Also try the tools that come with *meta-pkgs/pkg_developer*.
 
 ## Statistics
 

Fix formatting.
Index: wikisrc/users/wiz/wip-users.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-users.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/users/wiz/wip-users.mdwn	20 Aug 2015 21:31:50 -0000	1.6
+++ wikisrc/users/wiz/wip-users.mdwn	20 Aug 2015 21:35:43 -0000	1.7
@@ -8,7 +8,9 @@
 for NetBSD, [[SmartOS|http://www.smartos.org/]], and
 [[MINIX 3|http://www.minix3.org/]] and has also been ported to many
 additional operating systems, including Linux, Darwin, FreeBSD,
-OpenBSD, Illumos, and others. ## What's in it?
+OpenBSD, Illumos, and others.
+
+## What's in it?
 
 You can get an overview of the packages currently in pkgsrc-wip on the
 [[cvsweb|http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/]] page

Add an URL. Remove snapshot section for now.
Index: wikisrc/users/wiz/wip-users.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-users.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/users/wiz/wip-users.mdwn	20 Aug 2015 21:24:19 -0000	1.5
+++ wikisrc/users/wiz/wip-users.mdwn	20 Aug 2015 21:31:50 -0000	1.6
@@ -37,15 +37,6 @@
 public SSH key, suggested user name and perhaps ideas for your first packages.
 
 ## Getting the "source"
-### Downloading a snapshot
-
-The easiest way probably is to download a snapshot. Just select the
-newest one from the
-[[snapshot directory|http://pkgsrc-wip.sf.net/snapshots/]] and extract
-it in <tt>/usr/pkgsrc</tt>:
-
-	cd /usr/pkgsrc
-	tar xvzf /path/to/pkgsrc-wip-$DATE-snapshot.tar.gz
 
 ### Getting via git -- without an account
 
@@ -66,7 +57,7 @@
 following:
 
 	cd /usr/pkgsrc/
-	git clone $SOMETHING wip
+	git clone username@wip.pkgsrc.org:/pkgsrc-wip wip
 
 *username* is of course *your* username you requested in "Getting
 started" above.  That's all.

Start converting instructions from CVS to git.
XXX: don't do it yet, the repository is not yet officially there and
will change.
Members: 
	users/wiz/wip-users.mdwn:1.4->1.5 

Index: wikisrc/users/wiz/wip-users.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-users.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/users/wiz/wip-users.mdwn	20 Aug 2015 20:56:19 -0000	1.4
+++ wikisrc/users/wiz/wip-users.mdwn	20 Aug 2015 21:24:19 -0000	1.5
@@ -20,8 +20,7 @@
 This project already assumes you know what pkgsrc is and how to use
 it, so if you don't, please read the
 [[reference|http://www.pkgsrc.org/]] and use it. We'll also assume a
-basic knowledge of
-[[CVS|http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cederqvist-1.12.13.pdf]].
+basic knowledge of [[git|https://git-scm.com/]].
 
 You should subscribe to the
 [[tech-pkg|http://www.netbsd.org/mailinglists/#tech-pkg]] mailing
@@ -35,7 +34,7 @@
 
 If you're interested in committing packages (and not only testing),
 send mail to [[Thomas Klausner|mailto:wiz@NetBSD.org]] with your
-SourceForge user name and perhaps ideas for your first packages.
+public SSH key, suggested user name and perhaps ideas for your first packages.
 
 ## Getting the "source"
 ### Downloading a snapshot
@@ -48,53 +47,29 @@
 	cd /usr/pkgsrc
 	tar xvzf /path/to/pkgsrc-wip-$DATE-snapshot.tar.gz
 
-### Getting via CVS -- without a SourceForge account
+### Getting via git -- without an account
 
 Assuming you have a pkgsrc checkout in <tt>/usr/pkgsrc</tt> and you're currently
 in your home directory, do the following:
 
-	cvs -d:pserver:anonymous@pkgsrc-wip.cvs.sourceforge.net:/cvsroot/pkgsrc-wip login
+	cd /usr/pkgsrc/
+	git clone wip.pkgsrc.org:/pkgsrc-wip wip
 
-Just press ENTER when prompted for password.
+### Getting via git -- with an account
 
-	cvs -z3 -d:pserver:anonymous@pkgsrc-wip.cvs.sourceforge.net:/cvsroot/pkgsrc-wip checkout -P wip
-	mv wip /usr/pkgsrc/
-
-There is a anoncvs mirror using ssh (CVS_RSH=ssh; but its the default
-nowadays) at:
-
-	CVSROOT=anoncvs@anoncvs.netbsd.se:/cvsroot
-
-Its fingerprint is:
-
-	SSH RSAv2 fingerprint: b6:6b:fc:a6:24:a0:2a:32:d0:d3:25:83:ca:33:64:08
-
-### Getting via CVS -- with a SourceForge account
-
-You'll have to re-check out pkgsrc-wip if you previously had an anonymous
+You'll have to change your config if you previously had an anonymous
 checkout.  Otherwise you'll run into commit problems later on.
 
-You'll also have to set up your sourceforge ssh keys per the [[instructions
-from sourceforge|http://sourceforge.net/p/forge/documentation/SSH%20Keys/]].
-
 Assuming you have a pkgsrc checkout in <tt>/usr/pkgsrc</tt>, you're
 currently in your home directory, and you have commit rights to
 pkgsrc-wip (see "Getting started" above for details), do the
 following:
 
-	export CVS_RSH=ssh
-
-or, if you are using a csh like shell:
-
-	setenv CVS_RSH ssh
+	cd /usr/pkgsrc/
+	git clone $SOMETHING wip
 
-If you have successfully set your remote shell to ssh, just do:
-
-	cvs -d :ext:username@pkgsrc-wip.cvs.sourceforge.net:/cvsroot/pkgsrc-wip checkout -P wip
-	mv wip /usr/pkgsrc/
-
-<em>username</em> is of course <em>your</em> username on sourceforge.
-That's all.
+*username* is of course *your* username you requested in "Getting
+started" above.  That's all.
 
 ### Web-based CVS browsing
 
@@ -104,20 +79,16 @@
 [[mirror|http://cvsweb.netbsd.se/cgi-bin/bsdweb.cgi/wip/]].
 
 ## Keeping up-to-date
-### Upgrading with CVS
+
+### Upgrading your clone
 
 Just invoke the following:
 
 	cd /usr/pkgsrc/wip
-	cvs update -dP
-
-In case you downloaded a snapshot, you'll probably have to do:
-
-	cvs -d:pserver:anonymous@pkgsrc-wip.cvs.sourceforge.net:/cvsroot/pkgsrc-wip login
+	git pull -r
 
-Just press ENTER when prompted for password.
-Note: You only have to do this once (not once per update, just once).
 ## Trying packages
+
 Change to the package's directory:
 
 	cd /usr/pkgsrc/wip/<packagename>
@@ -130,6 +101,7 @@
 mailing list.
 
 ## Creating packages
+
 ### Creating and testing
 
 If you haven't read it yet, take a look at
@@ -146,87 +118,56 @@
 list.
 
 ### Importing the package
-The recommended way to import packages is to use the import script,
-located in <tt>wip/import-package.sh</tt>:
-
-	cd wip/newpkg
-	# optional, but recommended
-	pkglint		
-	../import-package.sh
-
-The import script will present an editor session where you will be
-given the opportunity to describe the new package (for mailing list readers).
-After saving and reviewing the final settings, hit 'y', enter to proceed.
 
-If you know your way around CVS or prefer to import packages manually,
-follow the instructions below instead.
+Make sure you have a current checkout:
 
-### Importing the package manually
+	git pull -r
 
-Add the files to <tt>wip/&lt;packagename&gt;</tt>. If the complete package is
-in <tt>wip/newpkg</tt> then you would do the following:
+Add your package:
 
-	export CVS_RSH=ssh
 	cd /usr/pkgsrc/wip
-	cvs add newpkg
-	cd newpkg
+	git add newpkg
 
-if not run previously:
+where *newpkg* is the name of your new package.
 
-	pkglint
+Then add the directory to the list of all subdirectories:
 
-if all went well, you can safely add the files now:
-
-	cvs add DESCR Makefile PLIST distinfo
-
-if you have patches, also add them:
-
-	cvs add patches
-	cvs add patches/p*
-
-similarly for <tt>files</tt> or <tt>buildlink3.mk</tt>:
-
-	cvs add files
-	cvs add files/[ABD-z]*
-	cvs add buildlink3.mk
-
-Then commit the files:
-
-	cvs commit
-
-As message, use the DESCR, or at least the COMMENT -- something to
-give a commit message reader a good impression what the package does.
-Afterwards check the import:
+	vi Makefile
+	# add "SUBDIR+=<TAB>newpkg"
+	git add Makefile
 
-	cvs update
+Check that you commit only what you intend to commit:
 
-Nothing should be reported -- if you overlooked files, you can add
-them as described previously.
-Finally add the directory to the list of all subdirectories:
+	git status
 
-	vi Makefile

(Diff truncated)
Add missing indent.
Index: wikisrc/users/wiz/wip-users.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-users.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/users/wiz/wip-users.mdwn	20 Aug 2015 20:53:45 -0000	1.3
+++ wikisrc/users/wiz/wip-users.mdwn	20 Aug 2015 20:56:19 -0000	1.4
@@ -53,7 +53,7 @@
 Assuming you have a pkgsrc checkout in <tt>/usr/pkgsrc</tt> and you're currently
 in your home directory, do the following:
 
-cvs -d:pserver:anonymous@pkgsrc-wip.cvs.sourceforge.net:/cvsroot/pkgsrc-wip login
+	cvs -d:pserver:anonymous@pkgsrc-wip.cvs.sourceforge.net:/cvsroot/pkgsrc-wip login
 
 Just press ENTER when prompted for password.
 

Boldness fixes.
Index: wikisrc/users/wiz/wip-users.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-users.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/users/wiz/wip-users.mdwn	20 Aug 2015 20:53:12 -0000	1.2
+++ wikisrc/users/wiz/wip-users.mdwn	20 Aug 2015 20:53:45 -0000	1.3
@@ -150,7 +150,7 @@
 located in <tt>wip/import-package.sh</tt>:
 
 	cd wip/newpkg
-	# optional, but recommended*
+	# optional, but recommended
 	pkglint		
 	../import-package.sh
 
@@ -211,9 +211,9 @@
 Note: be sure to replace "newpkg" references (as shown above) with your
 package's real name.
 
-*If you get a permission error while committing the Makefile,
+**If you get a permission error while committing the Makefile,
 make sure you checked out the repository with your developer
-permissions and are not trying to commit to anoncvs.*
+permissions and are not trying to commit to anoncvs.**
 
 ### Further changes
 

Remove <em>
Index: wikisrc/users/wiz/wip-users.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-users.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/users/wiz/wip-users.mdwn	20 Aug 2015 20:50:37 -0000	1.1
+++ wikisrc/users/wiz/wip-users.mdwn	20 Aug 2015 20:53:12 -0000	1.2
@@ -46,7 +46,7 @@
 it in <tt>/usr/pkgsrc</tt>:
 
 	cd /usr/pkgsrc
-	tar xvzf /path/to/pkgsrc-wip-<em>DATEHERE</em>-snapshot.tar.gz
+	tar xvzf /path/to/pkgsrc-wip-$DATE-snapshot.tar.gz
 
 ### Getting via CVS -- without a SourceForge account
 
@@ -90,7 +90,7 @@
 
 If you have successfully set your remote shell to ssh, just do:
 
-	cvs -d :ext:<em>username</em>@pkgsrc-wip.cvs.sourceforge.net:/cvsroot/pkgsrc-wip checkout -P wip
+	cvs -d :ext:username@pkgsrc-wip.cvs.sourceforge.net:/cvsroot/pkgsrc-wip checkout -P wip
 	mv wip /usr/pkgsrc/
 
 <em>username</em> is of course <em>your</em> username on sourceforge.
@@ -149,7 +149,7 @@
 The recommended way to import packages is to use the import script,
 located in <tt>wip/import-package.sh</tt>:
 
-	cd wip/<em>newpkg</em>
+	cd wip/newpkg
 	# optional, but recommended*
 	pkglint		
 	../import-package.sh
@@ -164,12 +164,12 @@
 ### Importing the package manually
 
 Add the files to <tt>wip/&lt;packagename&gt;</tt>. If the complete package is
-in <tt>wip/<em>newpkg</em></tt> then you would do the following:
+in <tt>wip/newpkg</tt> then you would do the following:
 
 	export CVS_RSH=ssh
 	cd /usr/pkgsrc/wip
-	cvs add <em>newpkg</em>
-	cd <em>newpkg</em>
+	cvs add newpkg
+	cd newpkg
 
 if not run previously:
 
@@ -205,7 +205,7 @@
 Finally add the directory to the list of all subdirectories:
 
 	vi Makefile
-	# add "SUBDIR+= <em>newpkg</em>"
+	# add "SUBDIR+=<TAB>newpkg"
 	cvs commit Makefile
 
 Note: be sure to replace "newpkg" references (as shown above) with your
@@ -221,7 +221,7 @@
 needs more work, or just noting that it's finished.
 
 
-For any further changes to the package, go the the <em>newpkg</em>
+For any further changes to the package, go the the newpkg
 directory, edit, <tt>cvs add</tt> any new files and <tt>cvs remove</tt>
 any no-longer-needed ones, and then do <tt>cvs commit</tt> to submit
 your changes to the public repository. <tt>cvs import</tt> is only for

Plain conversion of sourceforge instructions to markdown, first try.
Remove sections on cvsup though.
Members: 
	users/wiz/wip-users.mdwn:INITIAL->1.1 

--- /dev/null	2015-08-20 20:50:00.000000000 +0000
+++ wikisrc/users/wiz/wip-users.mdwn	2015-08-20 20:50:40.000000000 +0000
@@ -0,0 +1,257 @@
+# The pkgsrc-wip project
+## What is pkgsrc-wip?
+
+pkgsrc-wip (work in progress) is a project to get more people actively
+involved with creating packages for [[pkgsrc|http://www.pkgsrc.org/]],
+a portable packaging system coming from
+[[NetBSD|http://www.NetBSD.org/]]. It is the default packaging system
+for NetBSD, [[SmartOS|http://www.smartos.org/]], and
+[[MINIX 3|http://www.minix3.org/]] and has also been ported to many
+additional operating systems, including Linux, Darwin, FreeBSD,
+OpenBSD, Illumos, and others. ## What's in it?
+
+You can get an overview of the packages currently in pkgsrc-wip on the
+[[cvsweb|http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/]] page
+for pkgsrc-wip, or a nicer-looking page at
+[[pkgsrc.se|http://pkgsrc.se/wip]].
+
+## Getting started
+
+This project already assumes you know what pkgsrc is and how to use
+it, so if you don't, please read the
+[[reference|http://www.pkgsrc.org/]] and use it. We'll also assume a
+basic knowledge of
+[[CVS|http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cederqvist-1.12.13.pdf]].
+
+You should subscribe to the
+[[tech-pkg|http://www.netbsd.org/mailinglists/#tech-pkg]] mailing
+lists. You can ask for questions about packaging here, or for comments
+and import to pkgsrc, if you think a package is finished.
+
+Additionally, there is the
+[[pkgsrc-wip-cvs|http://lists.sourceforge.net/lists/listinfo/pkgsrc-wip-cvs]]
+mailing list. Its subscribers receive a mail message for every commit
+to the pkgsrc-wip repository. This is for addicts only. ;)
+
+If you're interested in committing packages (and not only testing),
+send mail to [[Thomas Klausner|mailto:wiz@NetBSD.org]] with your
+SourceForge user name and perhaps ideas for your first packages.
+
+## Getting the "source"
+### Downloading a snapshot
+
+The easiest way probably is to download a snapshot. Just select the
+newest one from the
+[[snapshot directory|http://pkgsrc-wip.sf.net/snapshots/]] and extract
+it in <tt>/usr/pkgsrc</tt>:
+
+	cd /usr/pkgsrc
+	tar xvzf /path/to/pkgsrc-wip-<em>DATEHERE</em>-snapshot.tar.gz
+
+### Getting via CVS -- without a SourceForge account
+
+Assuming you have a pkgsrc checkout in <tt>/usr/pkgsrc</tt> and you're currently
+in your home directory, do the following:
+
+cvs -d:pserver:anonymous@pkgsrc-wip.cvs.sourceforge.net:/cvsroot/pkgsrc-wip login
+
+Just press ENTER when prompted for password.
+
+	cvs -z3 -d:pserver:anonymous@pkgsrc-wip.cvs.sourceforge.net:/cvsroot/pkgsrc-wip checkout -P wip
+	mv wip /usr/pkgsrc/
+
+There is a anoncvs mirror using ssh (CVS_RSH=ssh; but its the default
+nowadays) at:
+
+	CVSROOT=anoncvs@anoncvs.netbsd.se:/cvsroot
+
+Its fingerprint is:
+
+	SSH RSAv2 fingerprint: b6:6b:fc:a6:24:a0:2a:32:d0:d3:25:83:ca:33:64:08
+
+### Getting via CVS -- with a SourceForge account
+
+You'll have to re-check out pkgsrc-wip if you previously had an anonymous
+checkout.  Otherwise you'll run into commit problems later on.
+
+You'll also have to set up your sourceforge ssh keys per the [[instructions
+from sourceforge|http://sourceforge.net/p/forge/documentation/SSH%20Keys/]].
+
+Assuming you have a pkgsrc checkout in <tt>/usr/pkgsrc</tt>, you're
+currently in your home directory, and you have commit rights to
+pkgsrc-wip (see "Getting started" above for details), do the
+following:
+
+	export CVS_RSH=ssh
+
+or, if you are using a csh like shell:
+
+	setenv CVS_RSH ssh
+
+If you have successfully set your remote shell to ssh, just do:
+
+	cvs -d :ext:<em>username</em>@pkgsrc-wip.cvs.sourceforge.net:/cvsroot/pkgsrc-wip checkout -P wip
+	mv wip /usr/pkgsrc/
+
+<em>username</em> is of course <em>your</em> username on sourceforge.
+That's all.
+
+### Web-based CVS browsing
+
+Of course, you can also browse the CVS repository on the pkgsrc-wip
+[[cvsweb|http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/]]
+or its pkgsrc.se
+[[mirror|http://cvsweb.netbsd.se/cgi-bin/bsdweb.cgi/wip/]].
+
+## Keeping up-to-date
+### Upgrading with CVS
+
+Just invoke the following:
+
+	cd /usr/pkgsrc/wip
+	cvs update -dP
+
+In case you downloaded a snapshot, you'll probably have to do:
+
+	cvs -d:pserver:anonymous@pkgsrc-wip.cvs.sourceforge.net:/cvsroot/pkgsrc-wip login
+
+Just press ENTER when prompted for password.
+Note: You only have to do this once (not once per update, just once).
+## Trying packages
+Change to the package's directory:
+
+	cd /usr/pkgsrc/wip/<packagename>
+
+Take a look at the <tt>TODO</tt> file there. If the package seems finished enough, install, and try it out:
+
+	make install
+
+Report your experiences to the [[tech-pkg|http://www.netbsd.org/mailinglists/#tech-pkg]]
+mailing list.
+
+## Creating packages
+### Creating and testing
+
+If you haven't read it yet, take a look at
+[[the pkgsrc Guide|http://NetBSD.org/docs/pkgsrc/index.html]] (also in <tt>/usr/pkgsrc/doc/pkgsrc.txt</tt>).
+
+Create a package.
+
+Test it with
+[[pkglint|ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/pkgtools/pkglint/README.html]]
+-- not all reported warnings and errors need to be fixed, but you
+should try to at least understand the reported ones. In case of
+trouble, ask on the
+[[tech-pkg|http://www.netbsd.org/mailinglists/#tech-pkg]] mailing
+list.
+
+### Importing the package
+The recommended way to import packages is to use the import script,
+located in <tt>wip/import-package.sh</tt>:
+
+	cd wip/<em>newpkg</em>
+	# optional, but recommended*
+	pkglint		
+	../import-package.sh
+
+The import script will present an editor session where you will be
+given the opportunity to describe the new package (for mailing list readers).
+After saving and reviewing the final settings, hit 'y', enter to proceed.
+
+If you know your way around CVS or prefer to import packages manually,
+follow the instructions below instead.
+
+### Importing the package manually
+
+Add the files to <tt>wip/&lt;packagename&gt;</tt>. If the complete package is
+in <tt>wip/<em>newpkg</em></tt> then you would do the following:
+
+	export CVS_RSH=ssh
+	cd /usr/pkgsrc/wip
+	cvs add <em>newpkg</em>
+	cd <em>newpkg</em>
+
+if not run previously:
+
+	pkglint
+
+if all went well, you can safely add the files now:
+
+	cvs add DESCR Makefile PLIST distinfo
+
+if you have patches, also add them:
+
+	cvs add patches
+	cvs add patches/p*
+
+similarly for <tt>files</tt> or <tt>buildlink3.mk</tt>:
+
+	cvs add files
+	cvs add files/[ABD-z]*
+	cvs add buildlink3.mk
+
+Then commit the files:
+

(Diff truncated)
wip administration -- how to add a user (untested)
--- /dev/null	2015-08-20 20:32:00.000000000 +0000
+++ wikisrc/users/wiz/wip-admin.mdwn	2015-08-20 20:36:35.000000000 +0000
@@ -0,0 +1,12 @@
+# pkgsrc-wip administration
+
+## adding users
+
+- export USERNAME=foo-git
+- useradd -d /home/git-shell -s /usr/pkg/bin/git-shell -g git $USERNAME
+- cd /etc/sshkeys
+- echo 'key_from_user' > $USERNAME.key
+- chown $USERNAME $USERNAME.key
+- chmod 600 $USERNAME.key
+- git add $USERNAME.key
+- git commit -m "adding key for $USERNAME"

Kamil Rytarowski, Carsten Kunze.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- wikisrc/users/wiz/authorslist.mdwn	18 Aug 2015 23:52:50 -0000	1.38
+++ wikisrc/users/wiz/authorslist.mdwn	20 Aug 2015 07:31:54 -0000	1.39
@@ -224,7 +224,7 @@
 - kralian = Anders Mundt Due <kralian@users.sourceforge.net>
 - kristerw = Krister Walfridsson <kristerw@users.sourceforge.net>
 - krub1 = Mark Kirby <krub1@users.sourceforge.net>
-- krytarowski = Kamil Rytarowski <krytarowski@users.sourceforge.net>
+- krytarowski = Kamil Rytarowski <kamil@NetBSD.org>
 - kuli0020 = Roman Kulik <kuli0020@users.sourceforge.net>
 - larnor = Lars Nordlund <larnor@users.sourceforge.net>
 - leonardschmidt = Leonard Schmidt <leonardschmidt@users.sourceforge.net>
@@ -281,7 +281,7 @@
 - mweckbecker = Matthias Weckbecker <mweckbecker@users.sourceforge.net>
 - mwicks = Mark A. Wicks <mwicks@users.sourceforge.net>
 - mwilhelmy = Moritz Wilhelmy <mwilhelmy@users.sourceforge.net>
-- n-t-roff = Carsten Kunze <n-t-roff@users.sourceforge.net>
+- n-t-roff = Carsten Kunze <troff@arcor.de>
 - narke_versatile = Konstantin Tcholokachvili <narke_versatile@users.sourceforge.net>
 - nbrkv = Nikolay A. Burkov <nbrkv@users.sourceforge.net>
 - neimal = Nikita Melnikov <neimal@users.sourceforge.net>

add more xen related projects
this was provided to board
Members: 
	projects/project/xen-arm.mdwn:INITIAL->1.1 
	projects/project/xen-blktap2.mdwn:INITIAL->1.1 
	projects/project/xen-boot-cleanup.mdwn:INITIAL->1.1 
	projects/project/xen-dom0-pvh.mdwn:INITIAL->1.1 
	projects/project/xen-dom0-smp.mdwn:INITIAL->1.1 
	projects/project/xen-domU-pv-on-hvm.mdwn:INITIAL->1.1 
	projects/project/xen-domU-pvops-pvh.mdwn:INITIAL->1.1 
	projects/project/xen-domu-acpi.mdwn:INITIAL->1.1 
	projects/project/xen-domu-pvfb.mdwn:INITIAL->1.1 
	projects/project/xen-drmkms.mdwn:INITIAL->1.1 
	projects/project/xen-hot-add.mdwn:INITIAL->1.1 
	projects/project/xen-module-support.mdwn:INITIAL->1.1 
	projects/project/xen-pvscsi.mdwn:INITIAL->1.1 
	projects/project/xen-pvusb.mdwn:INITIAL->1.1 
	projects/project/xen-toolstack-libvirt.mdwn:INITIAL->1.1 

--- /dev/null	2015-08-19 00:10:07.000000000 +0000
+++ wikisrc/projects/project/xen-arm.mdwn	2015-08-19 00:12:11.000000000 +0000
@@ -0,0 +1,37 @@
+[[!template id=project
+
+title="Port dom0 to the ARM cpu architecture"
+
+contact="""
+[port-xen](mailto:port-xen@NetBSD.org)
+[port-arm](mailto:port-arm@NetBSD.org)
+"""
+
+mentors="""
+"""
+
+category="kernel"
+difficulty="hard"
+duration=""
+
+description="""
+Abstract: 
+
+Xen now supports the ARM cpu architecture. We still don't have
+support in NetBSD for this architecture. A dom0 would be the first
+start in this direction.
+
+Deliverables:
+
+* toolstack port to arm
+* Fully functioning dom0
+
+This project would be much easier once pvops/pvh 
+is ready, since the Xen ARM
+implementation only supports PVH.
+
+See <http://wiki.xenproject.org/wiki/Xen_ARM_with_Virtualization_Extensions>
+"""
+
+]]
+
--- /dev/null	2015-08-19 00:10:07.000000000 +0000
+++ wikisrc/projects/project/xen-blktap2.mdwn	2015-08-19 00:12:11.000000000 +0000
@@ -0,0 +1,40 @@
+[[!template id=project
+
+title="Blktap2 driver support"
+
+contact="""
+[port-xen](mailto:port-xen@NetBSD.org)
+"""
+
+mentors="""
+"""
+
+category="kernel"
+difficulty="hard"
+duration=""
+
+description="""
+Abstract: The blktap2 method provides a userland daemon to provide access to on disk files, arbitrated by the kernel. The NetBSD kernel lacks this support and currently disables blktap in xentools.
+
+Deliverables:
+
+* blktap2 driver for /dev/blktapX
+* Tool support to be enabled in xentools
+* Enable access to various file formats (Qcow, VHD etc) , via the
+[ tap: ] disk specification.
+
+Implementation:
+
+The driver interacts with some areas of the kernel that are different
+from linux - eg: inter-domain page mapping, interdomain
+signalling. This may make it more challenging than a simple driver,
+especially with test/debug/performance risk.
+
+Note: There's opportunity to compare notes with the FUSE/rump implementations.
+
+See <http://wiki.xenproject.org/wiki/Blktap> and
+<http://xenbits.xensource.com/hg/xen-unstable.hg/file/tip/tools/blktap2/README>
+"""
+
+]]
+
--- /dev/null	2015-08-19 00:10:07.000000000 +0000
+++ wikisrc/projects/project/xen-boot-cleanup.mdwn	2015-08-19 00:12:11.000000000 +0000
@@ -0,0 +1,51 @@
+[[!template id=project
+
+title="Boot path cleanup to remove #ifdef XEN clutter"
+
+contact="""
+[port-xen](mailto:port-xen@NetBSD.org)
+"""
+
+mentors="""
+[Cherry G. Mathew](mailto:cherry@NetBSD.org)
+"""
+
+category="kernel"
+difficulty="hard"
+duration="37 hours"
+
+description="""
+Abstract: 
+
+The NetBSD boot path contains conditional compiled code for XEN. In
+the interests of moving towards unified pvops kernels, the code can be
+modified to be conditionally executed at runtime.
+
+Deliverables: 
+
+* Removal of #ifdef conditional code from all source files.
+* New minor internal API definitions, where required, to encapsulate
+  platform specific conditional execution.
+* Performance comparison figures for before and after.
+* Clear up the API clutter to make way for pvops.
+
+Note: Header files are exempt from #ifdef removal requirement.
+
+Implementation: 
+
+The number of changes required are estimated as follows:
+
+    drone.sorcerer> pwd
+    /home/sorcerer/src/sys
+    drone.sorcerer> find . -type f -name '*.[cSs]' -exec grep -H "^#if.* *\\bXEN\\b" '{}' \; | wc -l
+         222
+    drone.sorcerer>
+
+The effort required in this task is likely to be highly variable,
+depending on the case. In some cases, minor API design may be required.
+
+Most of the changes are likely to be mechanical.
+"""
+
+]]
+
--- /dev/null	2015-08-19 00:10:07.000000000 +0000
+++ wikisrc/projects/project/xen-dom0-pvh.mdwn	2015-08-19 00:12:11.000000000 +0000
@@ -0,0 +1,48 @@
+[[!template id=project
+
+title="Dom0 hvm container support (PVH)"
+
+contact="""
+[port-xen](mailto:port-xen@NetBSD.org)
+"""
+
+mentors="""
+"""
+
+category="kernel"
+difficulty="hard"
+duration="32 hours"
+
+description="""
+Abstract:
+
+NetBSD Dom0 kernels currently operate in fully PV mode.
+On amd64, this has the same performance drawbacks as for PV
+mode in domU.
+Instead, PVH mode provides a HVM container over pagetable
+management, while virtualising everything else. This mode is
+available on dom0, we attempt to support it.
+
+Note: Xen/Linux is moving to this dom0 pvh support model.
+
+Deliverables: PVH mode dom0 operation.
+
+Implementation:
+
+This project depends on the domU pvops/pvh
+project. The main work is in configuration and
+testing related (bringing in native device drivers as
+well as backend ones).
+
+The bootstrap path may need to be tweaked for dom0
+specific things.
+
+Dependencies:    This project depends on completion of the domU
+pvops/pvh project. 
+This project can enable the NetBSD/Xen/ARM dom0 port.
+

(Diff truncated)
set my mailaddress
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- wikisrc/users/wiz/authorslist.mdwn	17 Aug 2015 18:05:01 -0000	1.37
+++ wikisrc/users/wiz/authorslist.mdwn	18 Aug 2015 23:52:50 -0000	1.38
@@ -412,7 +412,7 @@
 - virtus = Douwe Kiela <virtus@users.sourceforge.net>
 - vstakhov = Vsevolod Stakhov <vstakhov@users.sourceforge.net>
 - wa1ter = walt <wa1ter@users.sourceforge.net>
-- wiedi = Sebastian Wiedenroth <wiedi@users.sourceforge.net>
+- wiedi = Sebastian Wiedenroth <wiedi@frubar.net>
 - wilouf = wilouf <wilouf@users.sourceforge.net>
 - wjc-sf = Bill Chiarchiaro <wjc-sf@users.sourceforge.net>
 - wongk = Ken Wong <wongk@users.sourceforge.net>

try to fix bullets again
add a blank line before start
Members: 
	projects/project/xen-pmap-superpage.mdwn:1.2->1.3 

Index: wikisrc/projects/project/xen-pmap-superpage.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/xen-pmap-superpage.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/projects/project/xen-pmap-superpage.mdwn	18 Aug 2015 23:27:27 -0000	1.2
+++ wikisrc/projects/project/xen-pmap-superpage.mdwn	18 Aug 2015 23:29:37 -0000	1.3
@@ -18,6 +18,7 @@
 Abstract: NetBSD/Xen currently doesn't support __HAVE_DIRECT_MAP
 
 Deliverables: 
+
 * Direct Mapped functioning NetBSD/Xen, both dom0 and domU
 * Demonstrable performance numbers
 * Reduce TLB contention and clean up code for pvops/pvh

fix difficulty, contact, and bullets
Index: wikisrc/projects/project/xen-pmap-superpage.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/xen-pmap-superpage.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/projects/project/xen-pmap-superpage.mdwn	18 Aug 2015 23:24:29 -0000	1.1
+++ wikisrc/projects/project/xen-pmap-superpage.mdwn	18 Aug 2015 23:27:27 -0000	1.2
@@ -3,7 +3,7 @@
 title="pmap: Direct Map (Superpage support (1G))"
 
 contact="""
-[tech-kern](mailto:tech-kern@NetBSD.org)
+[port-xen](mailto:port-xen@NetBSD.org)
 """
 
 mentors="""
@@ -11,16 +11,16 @@
 """
 
 category="kernel"
-difficulty="high"
+difficulty="hard"
 duration="16 hours"
 
 description="""
 Abstract: NetBSD/Xen currently doesn't support __HAVE_DIRECT_MAP
 
 Deliverables: 
-- Direct Mapped functioning NetBSD/Xen, both dom0 and domU
-- Demonstrable performance numbers
-- Reduce TLB contention and clean up code for pvops/pvh
+* Direct Mapped functioning NetBSD/Xen, both dom0 and domU
+* Demonstrable performance numbers
+* Reduce TLB contention and clean up code for pvops/pvh
 
 Implementation: 
 This change involves testing for the Xen and CPU featureset, and tweaking the pmap code so that 1G superpages can be requested from the hypervisor and direct mapped the same way native code does.

add a project submitted to board
This wikification is a test; have several more to add.
Members: 
	projects/project/xen-pmap-superpage.mdwn:INITIAL->1.1 

--- /dev/null	2015-08-18 23:20:00.000000000 +0000
+++ wikisrc/projects/project/xen-pmap-superpage.mdwn	2015-08-18 23:24:33.000000000 +0000
@@ -0,0 +1,31 @@
+[[!template id=project
+
+title="pmap: Direct Map (Superpage support (1G))"
+
+contact="""
+[tech-kern](mailto:tech-kern@NetBSD.org)
+"""
+
+mentors="""
+[Cherry G. Mathew](mailto:cherry@NetBSD.org)
+"""
+
+category="kernel"
+difficulty="high"
+duration="16 hours"
+
+description="""
+Abstract: NetBSD/Xen currently doesn't support __HAVE_DIRECT_MAP
+
+Deliverables: 
+- Direct Mapped functioning NetBSD/Xen, both dom0 and domU
+- Demonstrable performance numbers
+- Reduce TLB contention and clean up code for pvops/pvh
+
+Implementation: 
+This change involves testing for the Xen and CPU featureset, and tweaking the pmap code so that 1G superpages can be requested from the hypervisor and direct mapped the same way native code does.
+
+"""
+
+]]
+

fix page location
--- /dev/null	2015-08-18 01:32:00.000000000 +0000
+++ wikisrc/summits/asiabsdcon_2016_netbsd_summit.mdwn	2015-08-18 01:32:07.000000000 +0000
@@ -0,0 +1,30 @@
+<!-- we are supposed to use all lowercase letters in the link, so set a proper title for the page: -->
+[[!meta title="AsiaBSDCon 2016 NetBSD Summit"]]
+
+## Details
+
+The NetBSD developer summit at AsiaBSDCon 2016 will be held Friday,
+09:30-13:00.
+
+### NetBSD Dinner
+
+Saizeriya or not Saizeriya.
+
+## Planning to attend?
+
+[[!table data="""
+First Last | `login@` | join dinner? | comment(s)
+Jun Ebihara | `jun` |
+"""]]
+
+## Planning to present something?
+
+[[!table data="""
+Speaker  |Title
+`all` | Self introduction (5minutes in each person)
+`login@` |_Very Interesting Thing_
+"""]]
+
+## Discussions
+
+## Varia

removed
--- wikisrc/summits/asiabsdcon__95__2016__95__netbsd__95__summit.mdwn	2015-08-18 01:28:54.000000000 +0000
+++ /dev/null	2015-08-18 01:20:01.000000000 +0000
@@ -1,30 +0,0 @@
-<!-- we are supposed to use all lowercase letters in the link, so set a proper title for the page: -->
-[[!meta title="AsiaBSDCon 2016 NetBSD Summit"]]
-
-## Details
-
-The NetBSD developer summit at AsiaBSDCon 2016 will be held Friday,
-09:30-13:00.
-
-### NetBSD Dinner
-
-Saizeriya or not Saizeriya.
-
-## Planning to attend?
-
-[[!table data="""
-First Last | `login@` | join dinner? | comment(s)
-Jun Ebihara | `jun` |
-"""]]
-
-## Planning to present something?
-
-[[!table data="""
-Speaker  |Title
-`all` | Self introduction (5minutes in each person)
-`login@` |_Very Interesting Thing_
-"""]]
-
-## Discussions
-
-## Varia

Initial page for asiabsdcon_2016_netbsd_summit XXX:make BoF page some where.
--- /dev/null	2015-08-18 01:20:01.000000000 +0000
+++ wikisrc/summits/asiabsdcon__95__2016__95__netbsd__95__summit.mdwn	2015-08-18 01:26:46.000000000 +0000
@@ -0,0 +1,30 @@
+<!-- we are supposed to use all lowercase letters in the link, so set a proper title for the page: -->
+[[!meta title="AsiaBSDCon 2016 NetBSD Summit"]]
+
+## Details
+
+The NetBSD developer summit at AsiaBSDCon 2016 will be held Friday,
+09:30-13:00.
+
+### NetBSD Dinner
+
+Saizeriya or not Saizeriya.
+
+## Planning to attend?
+
+[[!table data="""
+First Last | `login@` | join dinner? | comment(s)
+Jun Ebihara | `jun` |
+"""]]
+
+## Planning to present something?
+
+[[!table data="""
+Speaker  |Title
+`all` | Self introduction (5minutes in each person)
+`login@` |_Very Interesting Thing_
+"""]]
+
+## Discussions
+
+## Varia

Tim Zingelman
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- wikisrc/users/wiz/authorslist.mdwn	16 Aug 2015 19:09:05 -0000	1.36
+++ wikisrc/users/wiz/authorslist.mdwn	17 Aug 2015 18:05:01 -0000	1.37
@@ -384,7 +384,7 @@
 - szptvlfn = Ryosuke Moro <szptvlfn@NetBSD.org>
 - taca = Takahiro Kambe <taca@NetBSD.org>
 - takasan-tt = Toru TAKAMIZU <takasan-tt@users.sourceforge.net>
-- tezdog = tez <tez@NetBSD.org>
+- tezdog = Tim Zingelman <tez@NetBSD.org>
 - thomasklausner = Thomas Klausner <wiz@NetBSD.org>
 - thomaspfaff = Thomas Pfaff <thomaspfaff@users.sourceforge.net>
 - thorman = Thorbjörn Jemander <thorman@users.sourceforge.net>

Add jdc@.
Index: wikisrc/summits/eurobsdcon_2015.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2015.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/summits/eurobsdcon_2015.mdwn	7 Aug 2015 20:16:45 -0000	1.9
+++ wikisrc/summits/eurobsdcon_2015.mdwn	17 Aug 2015 09:50:41 -0000	1.10
@@ -28,6 +28,7 @@
 Justin Cormack | justin | yes | none |
 Marc Balmer | mbalmer | yes | same as pettai |
 Tobias Nygren | tnn  | yes | 
+Julian Coleman | jdc  | yes | vegetarian
 """]]
 
 ## Planning to present something?

correct my email address
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- wikisrc/users/wiz/authorslist.mdwn	15 Aug 2015 23:08:49 -0000	1.35
+++ wikisrc/users/wiz/authorslist.mdwn	16 Aug 2015 19:09:05 -0000	1.36
@@ -384,7 +384,7 @@
 - szptvlfn = Ryosuke Moro <szptvlfn@NetBSD.org>
 - taca = Takahiro Kambe <taca@NetBSD.org>
 - takasan-tt = Toru TAKAMIZU <takasan-tt@users.sourceforge.net>
-- tezdog = tez <tezdog@users.sourceforge.net>
+- tezdog = tez <tez@NetBSD.org>
 - thomasklausner = Thomas Klausner <wiz@NetBSD.org>
 - thomaspfaff = Thomas Pfaff <thomaspfaff@users.sourceforge.net>
 - thorman = Thorbjörn Jemander <thorman@users.sourceforge.net>

Update my email address.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- wikisrc/users/wiz/authorslist.mdwn	15 Aug 2015 05:13:15 -0000	1.34
+++ wikisrc/users/wiz/authorslist.mdwn	15 Aug 2015 23:08:49 -0000	1.35
@@ -228,7 +228,7 @@
 - kuli0020 = Roman Kulik <kuli0020@users.sourceforge.net>
 - larnor = Lars Nordlund <larnor@users.sourceforge.net>
 - leonardschmidt = Leonard Schmidt <leonardschmidt@users.sourceforge.net>
-- leot1990 = Leonardo Taccari <leot1990@users.sourceforge.net>
+- leot1990 = Leonardo Taccari <leot@NetBSD.org>
 - leuzi = Christoph Leuzinger <leuzi@users.sourceforge.net>
 - lexort = Greg Troxel <gdt@lexort.com>
 - lkundrak = Lubomir Rintel <lkundrak@users.sourceforge.net>

Added a comment: Thanks
--- /dev/null	2015-08-15 07:16:00.000000000 +0000
+++ wikisrc/ports/evbarm/raspberry_pi/comment_8_abec5615a4422a671e582740e4003cba._comment	2015-08-15 07:17:25.000000000 +0000
@@ -0,0 +1,26 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/a/kHl_8WASy82MDC_5T.KtxP08kg--#034a2"
+ nickname="George"
+ subject="Thanks "
+ date="2015-08-15T07:16:05Z"
+ content="""
+Thanks for all the great work and for updating your instructions to reflect the new RPI2 images. Which by the way are awesome and right on par now with what the top competition has, in other words *dora has nothing us now with regards to tuning with gcc on this arch.
+
+Last week I took the armv7 gzimg and added the new RPI2 kernel from another snapshot. Wow it worked, and I felt pretty special until the next time I looked 5 minutes later...and I saw I had just took the long route to reproduce what was already done in the new armv7 rpi2 images. LOL.
+
+
+On a site note. Please consider updating the \"Installation\" section example to clarify HEAD/Current images vs Stable. If it's important.
+
+Currently it reads:
+
+\"The HEAD/current directory build will be under HEAD/YYYYMMDDHHMMZ/ (for example, http://nyftp.netbsd.org/pub/NetBSD-daily/netbsd-7/201508062150Z/evbarm-earmv7hf/binary/gzimg/)\"
+
+I would change the \"netbsd-7\" to \"HEAD\" as below, if I'm understanding correctly.
+
+\"The HEAD/current directory build will be under HEAD/YYYYMMDDHHMMZ/ (for example, http://nyftp.netbsd.org/pub/NetBSD-daily/HEAD/201508142040Z/evbarm-earmv7hf/binary/gzimg/)\"
+
+
+NetBSD 4 Ever!
+
+
+"""]]

Mark Davies.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- wikisrc/users/wiz/authorslist.mdwn	14 Aug 2015 05:33:58 -0000	1.33
+++ wikisrc/users/wiz/authorslist.mdwn	15 Aug 2015 05:13:15 -0000	1.34
@@ -277,7 +277,7 @@
 - mrohrer = Michael Rohrer <mrohrer@users.sourceforge.net>
 - msorc = Mykhaylo Sorochan <msorc@users.sourceforge.net>
 - mstapelberg = Michael Stapelberg <mstapelberg@users.sourceforge.net>
-- mwdavies = mwdavies <mwdavies@users.sourceforge.net>
+- mwdavies = Mark Davies <mark@ecs.vuw.ac.nz>
 - mweckbecker = Matthias Weckbecker <mweckbecker@users.sourceforge.net>
 - mwicks = Mark A. Wicks <mwicks@users.sourceforge.net>
 - mwilhelmy = Moritz Wilhelmy <mwilhelmy@users.sourceforge.net>

add Open Source Conference 2015 Shimane
Index: wikisrc/events.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/events.mdwn,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wikisrc/events.mdwn	30 Jul 2015 15:57:32 -0000	1.13
+++ wikisrc/events.mdwn	14 Aug 2015 12:15:01 -0000	1.14
@@ -20,6 +20,16 @@
 exchange knowledge about the BSD operating systems, facilitate
 coordination and cooperation among users and developers.
 
+### `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 will a NetBSD booth
+staffed by members of the [Japan NetBSD Users'
+Group](http://www.jp.NetBSD.org/ja/JP/JNUG/) with many gadget
+demonstrations.
+
 Past Events
 -----------
 

Ruben Agin.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- wikisrc/users/wiz/authorslist.mdwn	13 Aug 2015 14:57:50 -0000	1.32
+++ wikisrc/users/wiz/authorslist.mdwn	14 Aug 2015 05:33:58 -0000	1.33
@@ -313,7 +313,7 @@
 - pebog = Petar Bogdanovic <pebog@users.sourceforge.net>
 - peterih = Peter Ibsen Hansen <peterih@users.sourceforge.net>
 - pettai = Fredrik Pettai <pettai@users.sourceforge.net>
-- phabrics = Ruben Agin <phabrics@users.sourceforge.net>
+- phabrics = Ruben Agin <phabrics@phabrics.com>
 - philnelson = Phil Nelson <philnelson@users.sourceforge.net>
 - philolegein = Chris <philolegein@users.sourceforge.net>
 - phonohawk = PHO / phonohawk <phonohawk@users.sourceforge.net>

Jonathan Buschmann
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- wikisrc/users/wiz/authorslist.mdwn	13 Aug 2015 14:56:17 -0000	1.31
+++ wikisrc/users/wiz/authorslist.mdwn	13 Aug 2015 14:57:50 -0000	1.32
@@ -201,7 +201,7 @@
 - jon_hamilton = Jon Hamilton <jon_hamilton@users.sourceforge.net>
 - jonlorusso = Jon Lorusso <jonlorusso@users.sourceforge.net>
 - jonperkin = Jonathan Perkin <jperkin@pkgsrc.org>
-- jonthn = jonthn <jonthn@users.sourceforge.net>
+- jonthn = Jonathan Buschmann <jonthn+pkgsrc@pinacea.com>
 - jsonn = Jörg Sonnenberger <jsonn@users.sourceforge.net>
 - jsrocket = Evan Hall <jsrocket@users.sourceforge.net>
 - jtonio = Antoine Reilles <jtonio@users.sourceforge.net>

Mateusz Poszwa, Christian Koch, Olaf Seibert
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- wikisrc/users/wiz/authorslist.mdwn	13 Aug 2015 00:24:35 -0000	1.30
+++ wikisrc/users/wiz/authorslist.mdwn	13 Aug 2015 14:56:17 -0000	1.31
@@ -57,7 +57,7 @@
 - c_turner = c_turner <c_turner@users.sourceforge.net>
 - cdqr = C.D. Richards <cdqr@users.sourceforge.net>
 - cetrox = César Catrián C. <cetrox@users.sourceforge.net>
-- cfkoch = Christian Koch <cfkoch@users.sourceforge.net>
+- cfkoch = Christian Koch <cfkoch@sdf.lonestar.org>
 - cherrymathew = Cherry G. Mathew <cherrymathew@users.sourceforge.net>
 - chet-s = chets <chet-s@users.sourceforge.net>
 - cheusov = Aleksey Cheusov <cheusov@users.sourceforge.net>
@@ -114,7 +114,7 @@
 - erinlalouve = Erin Nivelet <erinlalouve@users.sourceforge.net>
 - errellion = Bartosz Maciejewski <errellion@users.sourceforge.net>
 - estrabd1 = Brett Estrade <estrabd1@users.sourceforge.net>
-- f8l = Mateusz Poszwa <f8l@users.sourceforge.net>
+- f8l = Mateusz Poszwa <old4@o2.pl>
 - fabinator = Fabien Devaux <fabinator@users.sourceforge.net>
 - felix9x = Felix Zaslavskiy <felix9x@users.sourceforge.net>
 - fgudin = Francis Gudin <fgudin@users.sourceforge.net>
@@ -335,7 +335,7 @@
 - rewts = rewts <rewts@users.sourceforge.net>
 - rhaamo = Marc Lagrange <rhaamo@users.sourceforge.net>
 - rhaen = rhaen <rhaen@users.sourceforge.net>
-- rhialto = Olaf Seibert <rhialto@users.sourceforge.net>
+- rhialto = Olaf Seibert <rhialto@falu.nl>
 - rhx = Rene Hexel <rhx@users.sourceforge.net>
 - rillig = Roland Illig <rillig@users.sourceforge.net>
 - rixxx = rixxx <rixxx@users.sourceforge.net>

Update my e-mail address.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- wikisrc/users/wiz/authorslist.mdwn	12 Aug 2015 14:08:36 -0000	1.29
+++ wikisrc/users/wiz/authorslist.mdwn	13 Aug 2015 00:24:35 -0000	1.30
@@ -350,7 +350,7 @@
 - rubengonzalez = Ruben Gonzalez Arnau <rubengonzalez@users.sourceforge.net>
 - rumko = Rumko <rumko@users.sourceforge.net>
 - rxg = Rui-Xiang Guo <rxg@users.sourceforge.net>
-- ryo-on = Ryo ONODERA <ryo-on@users.sourceforge.net>
+- ryo-on = Ryo ONODERA <ryoon@NetBSD.org>
 - sadewitz = Blair Sadewitz <sadewitz@users.sourceforge.net>
 - samott = Shaun Amott <samott@users.sourceforge.net>
 - sborrill = Stephen Borrill <sborrill@users.sourceforge.net>

Switch my sf.net email to my NetBSD.org email, also add my middle initial.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- wikisrc/users/wiz/authorslist.mdwn	12 Aug 2015 12:55:50 -0000	1.28
+++ wikisrc/users/wiz/authorslist.mdwn	12 Aug 2015 14:08:36 -0000	1.29
@@ -177,7 +177,7 @@
 - ishit = ISIHARA Takanori <ishit@users.sourceforge.net>
 - ivaniclixx = Ivan Garcia Tora <ivaniclixx@users.sourceforge.net>
 - jafour1 = Jaime Fournier <jafour1@users.sourceforge.net>
-- jakllsch = Jonathan Kollasch <jakllsch@users.sourceforge.net>
+- jakllsch = Jonathan A. Kollasch <jakllsch@NetBSD.org>
 - jappelbaum = Jacob Appelbaum <jappelbaum@users.sourceforge.net>
 - jathis = Jonathan Gabris <jathis@users.sourceforge.net>
 - jcbecker = Jeff Becker <jcbecker@users.sourceforge.net>

Change my email to a more useful one
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- wikisrc/users/wiz/authorslist.mdwn	12 Aug 2015 11:19:29 -0000	1.27
+++ wikisrc/users/wiz/authorslist.mdwn	12 Aug 2015 12:55:50 -0000	1.28
@@ -401,7 +401,7 @@
 - trontor = Matthias Scheler <trontor@users.sourceforge.net>
 - ttys = tty` <ttys@users.sourceforge.net>
 - tvierling = Todd Vierling <tvierling@users.sourceforge.net>
-- uccwen = Wen Heping <uccwen@users.sourceforge.net>
+- uccwen = Wen Heping <wen@NetBSD.org>
 - udontknow = Evaldo Gardenali <udontknow@users.sourceforge.net>
 - uebayasi = Masao Uebayashi <uebayasi@users.sourceforge.net>
 - uhabel = Ulrich Habel <uhabel@users.sourceforge.net>

Index: wikisrc/xfce4.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/xfce4.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/xfce4.mdwn	31 Jul 2015 20:25:38 -0000	1.6
+++ wikisrc/xfce4.mdwn	12 Aug 2015 11:36:19 -0000	1.7
@@ -2,32 +2,20 @@
 
 - Add netbsd backend to upower and make it work with xfce4-power-manager app, settings, panel plugin.
 
-- commit xfce4-power-manager package
-
 - add pulseaudio option to xfce4-mixer ? 
 
 - commit local htdocs/docs/guide/en/chap-x.xml work to document xfce better
 
-- recommend login manager 
+- recommended login manager : SLiM; add in meta-pkg?
 
 - fix {hal, fam, gvfs, gnome-mount, ...} mess to handle removable devices in thunar. trash bin works.
 
-- Changing application menu icon hangs?
-
-- few hangs with gvfs/hal installed
-
-- consolekit/dbus config files for shutdown,...
-
-- gdm dependency to switch users ?
-
 - get genmon to work (just crashes at startup)
 
 - submit patches upstream
 
 - more panel plugins: [http://archive.xfce.org/src/panel-plugins/](http://archive.xfce.org/src/panel-plugin)
-        - cellmodem: linux only     
-        - linelight: depends on archived thunar-vfs    
-        - https://github.com/brianhsu/xfce4-hotcorner-plugin
+        - https://github.com/brianhsu/xfce4-hotcorner-plugin (should we import plugins not from the xfce website?)
 
 ##[Xfce](#Xfce) : [/src/xfce](http://archive.xfce.org/src/xfce)
 --------

update my email address
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- wikisrc/users/wiz/authorslist.mdwn	12 Aug 2015 10:44:40 -0000	1.26
+++ wikisrc/users/wiz/authorslist.mdwn	12 Aug 2015 11:19:29 -0000	1.27
@@ -381,7 +381,7 @@
 - spzeidler = S.P.Zeidler <spzeidler@users.sourceforge.net>
 - steven43126 = steven <steven43126@users.sourceforge.net>
 - sxn = Sebastian Yepes F. [ESN] <sxn@users.sourceforge.net>
-- szptvlfn = Ryosuke Moro <szptvlfn@users.sourceforge.net>
+- szptvlfn = Ryosuke Moro <szptvlfn@NetBSD.org>
 - taca = Takahiro Kambe <taca@NetBSD.org>
 - takasan-tt = Toru TAKAMIZU <takasan-tt@users.sourceforge.net>
 - tezdog = tez <tezdog@users.sourceforge.net>

Update my entry
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- wikisrc/users/wiz/authorslist.mdwn	12 Aug 2015 02:49:44 -0000	1.25
+++ wikisrc/users/wiz/authorslist.mdwn	12 Aug 2015 10:44:40 -0000	1.26
@@ -408,7 +408,7 @@
 - unex_linija = Unex <unex_linija@users.sourceforge.net>
 - ura = URA Hiroshi <ura@users.sourceforge.net>
 - uwe = Valery Ushakov <uwe@users.sourceforge.net>
-- venture37 = Venture37 <venture37@users.sourceforge.net>
+- venture37 = Sevan Janiyan <venture37@geeklan.co.uk>
 - virtus = Douwe Kiela <virtus@users.sourceforge.net>
 - vstakhov = Vsevolod Stakhov <vstakhov@users.sourceforge.net>
 - wa1ter = walt <wa1ter@users.sourceforge.net>

update my email address schnoebe => schnoebe@netbsd.org
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 22:58:24 -0000	1.24
+++ wikisrc/users/wiz/authorslist.mdwn	12 Aug 2015 02:49:44 -0000	1.25
@@ -356,7 +356,7 @@
 - sborrill = Stephen Borrill <sborrill@users.sourceforge.net>
 - schaecsn = Stefan <schaecsn@users.sourceforge.net>
 - schmonz = Amitai Schlair <schmonz@netbsd.org>
-- schnoebe = Eric Schnoebelen <schnoebe@users.sourceforge.net>
+- schnoebe = Eric Schnoebelen <schnoebe@netbsd.org>
 - scode = Peter Schuller <scode@users.sourceforge.net>
 - scott8586 = Scott Presnell <scott8586@users.sourceforge.net>
 - seanboudreau = Sean Boudreau <seanboudreau@users.sourceforge.net>

add SPI and PWM controller to TODO list
Index: wikisrc/ports/evbarm/tegra.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/tegra.mdwn,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- wikisrc/ports/evbarm/tegra.mdwn	2 Aug 2015 22:47:45 -0000	1.23
+++ wikisrc/ports/evbarm/tegra.mdwn	11 Aug 2015 23:11:50 -0000	1.24
@@ -40,6 +40,8 @@
  - AS3722 power management unit
  - GPU (nouveau)
  - USB 3.0 [[!template id=man name="xhci" section="4"]] controller
+ - SPI controller
+ - PWM controller
 
 # Generating a boot script
 

Update my email address
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 21:48:31 -0000	1.23
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 22:58:24 -0000	1.24
@@ -339,7 +339,7 @@
 - rhx = Rene Hexel <rhx@users.sourceforge.net>
 - rillig = Roland Illig <rillig@users.sourceforge.net>
 - rixxx = rixxx <rixxx@users.sourceforge.net>
-- riz = Jeff Rizzo <riz@users.sourceforge.net>
+- riz = Jeff Rizzo <riz@NetBSD.org>
 - rmottola = Riccardo Mottola <rmottola@users.sourceforge.net>
 - rockpiper = Robert Lillack <rockpiper@users.sourceforge.net>
 - rodo6510 = Robert Doerfler <rodo6510@users.sourceforge.net>

Update my email address
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 21:15:37 -0000	1.22
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 21:48:31 -0000	1.23
@@ -261,7 +261,7 @@
 - mike402 = Michael Danilov <mike402@users.sourceforge.net>
 - milleoiseaux = milleoiseaux <milleoiseaux@users.sourceforge.net>
 - milosn = M. Negovanovic <milosn@users.sourceforge.net>
-- minskim = Min Sik Kim <minskim@users.sourceforge.net>
+- minskim = Min Sik Kim <minskim@NetBSD.org>
 - mj_turner = Michael-John Turner <mj_turner@users.sourceforge.net>
 - mjasm = mjasm <mjasm@users.sourceforge.net>
 - mjoellnir = Volkmar Seifert <mjoellnir@users.sourceforge.net>

Holger Weiß
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 21:13:20 -0000	1.21
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 21:15:37 -0000	1.22
@@ -163,7 +163,7 @@
 - htepper = Hasso Tepper <htepper@users.sourceforge.net>
 - hubertf = Hubert Feyrer <hubertf@users.sourceforge.net>
 - hugor = Hugo Rivera <hugor@users.sourceforge.net>
-- hweiss = Holger Weiß <hweiss@users.sourceforge.net>
+- hweiss = Holger Weiß <holger@zedat.fu-berlin.de>
 - i3enedek = Ben Gergely <i3enedek@users.sourceforge.net>
 - iainmorgan = Iain Morgan <iainmorgan@users.sourceforge.net>
 - ianharding = Ian A. Harding <ianharding@users.sourceforge.net>

Full name for abs, ok abs
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 20:16:39 -0000	1.20
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 21:13:20 -0000	1.21
@@ -1,7 +1,7 @@
 # Author List for WIP migration
 
 - aborkowski = Alexander Borkowski <aborkowski@users.sourceforge.net>
-- absd = abs <abs@absd.org>
+- absd = David Brownlee <abs@absd.org>
 - acaro = Armando Caro <acaro@bbn.com>
 - achemze = Joshua Hamor <achemze@users.sourceforge.net>
 - ada-pkgsrc = Adrien Auzanneau <ada-pkgsrc@users.sourceforge.net>

Update rhansen email address.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 18:31:25 -0000	1.19
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 20:16:39 -0000	1.20
@@ -328,7 +328,7 @@
 - pseudo_anim = Pseudo Animalistic <pseudo_anim@users.sourceforge.net>
 - psychoschlumpf = Lars Hartmann <psychoschlumpf@users.sourceforge.net>
 - pulahti = Vesa Norrman <pulahti@users.sourceforge.net>
-- r-hansen = Richard Hansen <r-hansen@users.sourceforge.net>
+- r-hansen = Richard Hansen <rhansen@bbn.com>
 - rasputnik = Rich Davies <rasputnik@users.sourceforge.net>
 - realzhtw = Aleksej Lebedev <realzhtw@users.sourceforge.net>
 - reinoudz70 = Reinoud Zandijk <reinoudz70@users.sourceforge.net>

make that Ian D. Leroux.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 18:30:45 -0000	1.18
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 18:31:25 -0000	1.19
@@ -171,7 +171,7 @@
 - ianzag = Ian Zagorskih <ianzag@users.sourceforge.net>
 - icmp = icmp <icmp@users.sourceforge.net>
 - id9848949 = pavel arnost <id9848949@users.sourceforge.net>
-- idleroux = Ian Leroux <idleroux@fastmail.fm>
+- idleroux = Ian D. Leroux <idleroux@fastmail.fm>
 - imilh = iMil <imilh@users.sourceforge.net>
 - ingolf = Ingolf Steinbach <ingolf@users.sourceforge.net>
 - ishit = ISIHARA Takanori <ishit@users.sourceforge.net>

Ian Leroux.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 17:57:27 -0000	1.17
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 18:30:45 -0000	1.18
@@ -171,7 +171,7 @@
 - ianzag = Ian Zagorskih <ianzag@users.sourceforge.net>
 - icmp = icmp <icmp@users.sourceforge.net>
 - id9848949 = pavel arnost <id9848949@users.sourceforge.net>
-- idleroux = Ian Leroux <idleroux@users.sourceforge.net>
+- idleroux = Ian Leroux <idleroux@fastmail.fm>
 - imilh = iMil <imilh@users.sourceforge.net>
 - ingolf = Ingolf Steinbach <ingolf@users.sourceforge.net>
 - ishit = ISIHARA Takanori <ishit@users.sourceforge.net>

Add documentation section.
Index: wikisrc/users/wiz/wip-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/wip-migration.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/users/wiz/wip-migration.mdwn	11 Aug 2015 14:31:38 -0000	1.4
+++ wikisrc/users/wiz/wip-migration.mdwn	11 Aug 2015 18:00:37 -0000	1.5
@@ -53,6 +53,18 @@
 	make htdocs-wip a redirect to a wip page in the wiki
 	and link the new location
 
+## documentation
+
+- how users should set up their global git config
+
+- how to pull
+
+- how to push
+
+- how to rebase
+
+- what else?
+
 ## various
 
 - snapshots

Piotr Meyer
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 17:29:09 -0000	1.16
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 17:57:27 -0000	1.17
@@ -24,7 +24,7 @@
 - amoibos = Daniel Oelschlegel <amoibos@users.sourceforge.net>
 - anewsmurf = Franck MAHE <anewsmurf@users.sourceforge.net>
 - angelmm1 = AngelMM1 <angelmm1@users.sourceforge.net>
-- anielski = Piotr Meyer <anielski@users.sourceforge.net>
+- anielski = Piotr Meyer <aniou+pkgsrc@smutek.pl>
 - anthony_mallet = Anthony Mallet <anthony_mallet@users.sourceforge.net>
 - aolcarton = Miles Nordin <aolcarton@users.sourceforge.net>
 - apost = Alan Post <apost@users.sourceforge.net>

Mike Bowie, Ottavio Caruso, Yorick Hardy.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 16:23:39 -0000	1.15
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 17:29:09 -0000	1.16
@@ -253,7 +253,7 @@
 - matthewluckie = Matthew Luckie <matthewluckie@users.sourceforge.net>
 - mayureshw = Mayuresh <mayureshw@users.sourceforge.net>
 - mbarrera = Mauricio Barrera F. <mbarrera@users.sourceforge.net>
-- mbowie = Mike Bowie <mbowie@users.sourceforge.net>
+- mbowie = Mike Bowie <mbowie@buzmo.com>
 - mchittur = Mahesh Chittur <mchittur@users.sourceforge.net>
 - mdmw = Manuel Wiesinger <mdmw@users.sourceforge.net>
 - midar = Midar <midar@users.sourceforge.net>
@@ -297,7 +297,7 @@
 - nzasch = nzasch <nzasch@users.sourceforge.net>
 - o-oishi = Osamu OISHI <o-oishi@users.sourceforge.net>
 - obache = OBATA Akio <obache@users.sourceforge.net>
-- ocr = Ottavio Caruso <ocr@users.sourceforge.net>
+- ocr = Ottavio Caruso <ottavio2006-netbsd@yahoo.com>
 - oherrala = Ossi Herrala <oherrala@users.sourceforge.net>
 - oht = OHt <oht@users.sourceforge.net>
 - ondratu = Ondrej Tuma <ondratu@users.sourceforge.net>
@@ -424,7 +424,7 @@
 - yacht = yacht <yacht@users.sourceforge.net>
 - yazzy = Marcin M. Jessa <yazzy@users.sourceforge.net>
 - yeled = Charlie Allom <yeled@users.sourceforge.net>
-- yhardy = Yorick Hardy <yhardy@users.sourceforge.net>
+- yhardy = Yorick Hardy <yorickhardy@gmail.com>
 - ykomatsu = Yoshito Komatsu <ykomatsu@users.sourceforge.net>
 - yomram = yomram <yomram@users.sourceforge.net>
 - yrmt = Youri Mouton <youri@NetBSD.org>

tnn2
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 15:30:59 -0000	1.14
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 16:23:39 -0000	1.15
@@ -390,7 +390,7 @@
 - thorman = Thorbjörn Jemander <thorman@users.sourceforge.net>
 - timbishop = Tim Bishop <timbishop@users.sourceforge.net>
 - tir = Teemu Rinta-aho <tir@users.sourceforge.net>
-- tnn2 = Tobias Nygren <tnn2@users.sourceforge.net>
+- tnn2 = Tobias Nygren <tnn@NetBSD.org>
 - tomasbodzar = bodie <tomasbodzar@users.sourceforge.net>
 - tomhensel = tom hensel <tomhensel@users.sourceforge.net>
 - tonnerre = Tonnerre <tonnerre@users.sourceforge.net>

Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 15:28:28 -0000	1.13
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 15:30:59 -0000	1.14
@@ -1,7 +1,7 @@
 # Author List for WIP migration
 
 - aborkowski = Alexander Borkowski <aborkowski@users.sourceforge.net>
-- absd = abs <absd@users.sourceforge.net>
+- absd = abs <abs@absd.org>
 - acaro = Armando Caro <acaro@bbn.com>
 - achemze = Joshua Hamor <achemze@users.sourceforge.net>
 - ada-pkgsrc = Adrien Auzanneau <ada-pkgsrc@users.sourceforge.net>

Update my entry.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 15:12:07 -0000	1.12
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 15:28:28 -0000	1.13
@@ -382,7 +382,7 @@
 - steven43126 = steven <steven43126@users.sourceforge.net>
 - sxn = Sebastian Yepes F. [ESN] <sxn@users.sourceforge.net>
 - szptvlfn = Ryosuke Moro <szptvlfn@users.sourceforge.net>
-- taca = Takahiro Kambe <taca@users.sourceforge.net>
+- taca = Takahiro Kambe <taca@NetBSD.org>
 - takasan-tt = Toru TAKAMIZU <takasan-tt@users.sourceforge.net>
 - tezdog = tez <tezdog@users.sourceforge.net>
 - thomasklausner = Thomas Klausner <wiz@NetBSD.org>

Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 15:08:55 -0000	1.11
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 15:12:07 -0000	1.12
@@ -427,7 +427,7 @@
 - yhardy = Yorick Hardy <yhardy@users.sourceforge.net>
 - ykomatsu = Yoshito Komatsu <ykomatsu@users.sourceforge.net>
 - yomram = yomram <yomram@users.sourceforge.net>
-- yrmt = yrmt <youri@NetBSD.org>
+- yrmt = Youri Mouton <youri@NetBSD.org>
 - ysbeer = Schalk W. Cronjé <ysbeer@users.sourceforge.net>
 - yuripoloni = Yuri Poloni <yuripoloni@users.sourceforge.net>
 - yvs4sf = Yakovetsky VS <yvs4sf@users.sourceforge.net>

Add my netbsd mail
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 15:07:51 -0000	1.10
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 15:08:55 -0000	1.11
@@ -427,7 +427,7 @@
 - yhardy = Yorick Hardy <yhardy@users.sourceforge.net>
 - ykomatsu = Yoshito Komatsu <ykomatsu@users.sourceforge.net>
 - yomram = yomram <yomram@users.sourceforge.net>
-- yrmt = yrmt <yrmt@users.sourceforge.net>
+- yrmt = yrmt <youri@NetBSD.org>
 - ysbeer = Schalk W. Cronjé <ysbeer@users.sourceforge.net>
 - yuripoloni = Yuri Poloni <yuripoloni@users.sourceforge.net>
 - yvs4sf = Yakovetsky VS <yvs4sf@users.sourceforge.net>

J. Lewis Muir
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 14:56:40 -0000	1.9
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 15:07:51 -0000	1.10
@@ -195,7 +195,7 @@
 - jkryl = Jan Kryl <jkryl@users.sourceforge.net>
 - jkuittinen = Jari Kuittinen <jkuittinen@users.sourceforge.net>
 - jlamwww = Johnny C. Lam <jlamwww@users.sourceforge.net>
-- jlmuir0 = J. Lewis Muir <jlmuir0@users.sourceforge.net>
+- jlmuir0 = J. Lewis Muir <jlmuir@imca-cat.org>
 - jmmv = Julio Merino <jmmv@users.sourceforge.net>
 - johnrshannon = John R. Shannon <johnrshannon@users.sourceforge.net>
 - jon_hamilton = Jon Hamilton <jon_hamilton@users.sourceforge.net>

update acaro email address
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 14:49:21 -0000	1.8
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 14:56:40 -0000	1.9
@@ -2,7 +2,7 @@
 
 - aborkowski = Alexander Borkowski <aborkowski@users.sourceforge.net>
 - absd = abs <absd@users.sourceforge.net>
-- acaro = Armando L. Caro jr. <acaro@users.sourceforge.net>
+- acaro = Armando Caro <acaro@bbn.com>
 - achemze = Joshua Hamor <achemze@users.sourceforge.net>
 - ada-pkgsrc = Adrien Auzanneau <ada-pkgsrc@users.sourceforge.net>
 - adanbsd = ada <adanbsd@users.sourceforge.net>

update gdt address
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 14:39:41 -0000	1.7
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 14:49:21 -0000	1.8
@@ -230,7 +230,7 @@
 - leonardschmidt = Leonard Schmidt <leonardschmidt@users.sourceforge.net>
 - leot1990 = Leonardo Taccari <leot1990@users.sourceforge.net>
 - leuzi = Christoph Leuzinger <leuzi@users.sourceforge.net>
-- lexort = Greg Troxel <lexort@users.sourceforge.net>
+- lexort = Greg Troxel <gdt@lexort.com>
 - lkundrak = Lubomir Rintel <lkundrak@users.sourceforge.net>
 - locutus42 = Jan Danielsson <locutus42@users.sourceforge.net>
 - loic-hoguin = Loïc Hoguin <loic-hoguin@users.sourceforge.net>

jperkin
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 14:35:56 -0000	1.6
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 14:39:41 -0000	1.7
@@ -200,7 +200,7 @@
 - johnrshannon = John R. Shannon <johnrshannon@users.sourceforge.net>
 - jon_hamilton = Jon Hamilton <jon_hamilton@users.sourceforge.net>
 - jonlorusso = Jon Lorusso <jonlorusso@users.sourceforge.net>
-- jonperkin = Jonathan Perkin <jonperkin@users.sourceforge.net>
+- jonperkin = Jonathan Perkin <jperkin@pkgsrc.org>
 - jonthn = jonthn <jonthn@users.sourceforge.net>
 - jsonn = Jörg Sonnenberger <jsonn@users.sourceforge.net>
 - jsrocket = Evan Hall <jsrocket@users.sourceforge.net>

Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 14:34:36 -0000	1.5
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 14:35:56 -0000	1.6
@@ -118,7 +118,7 @@
 - fabinator = Fabien Devaux <fabinator@users.sourceforge.net>
 - felix9x = Felix Zaslavskiy <felix9x@users.sourceforge.net>
 - fgudin = Francis Gudin <fgudin@users.sourceforge.net>
-- fhajny = Filip Hajny <fhajny@users.sourceforge.net>
+- fhajny = Filip Hajny <filip@joyent.com>
 - ficovh = Francisco Valladolid H. <ficovh@users.sourceforge.net>
 - fjaeckel = Frederic Jaeckel <fjaeckel@users.sourceforge.net>
 - florian-geiges = Florian Geiges <florian-geiges@users.sourceforge.net>

my commits can be attributed to me @netbsd
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 14:33:19 -0000	1.4
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 14:34:36 -0000	1.5
@@ -355,7 +355,7 @@
 - samott = Shaun Amott <samott@users.sourceforge.net>
 - sborrill = Stephen Borrill <sborrill@users.sourceforge.net>
 - schaecsn = Stefan <schaecsn@users.sourceforge.net>
-- schmonz = Amitai Schlair <schmonz@users.sourceforge.net>
+- schmonz = Amitai Schlair <schmonz@netbsd.org>
 - schnoebe = Eric Schnoebelen <schnoebe@users.sourceforge.net>
 - scode = Peter Schuller <scode@users.sourceforge.net>
 - scott8586 = Scott Presnell <scott8586@users.sourceforge.net>

Just replace existing email, left hand side can be used for regenerating it.
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 14:30:28 -0000	1.3
+++ wikisrc/users/wiz/authorslist.mdwn	11 Aug 2015 14:33:19 -0000	1.4
@@ -132,7 +132,7 @@
 - fwsf = Florian Walpen <fwsf@users.sourceforge.net>
 - gduzan = Gary Duzan <gduzan@users.sourceforge.net>
 - geeohgeegeeoh = George Michaelson <geeohgeegeeoh@users.sourceforge.net>
-- genolopolis = Matthew Sporleder <genolopolis@users.sourceforge.net> | mspo (mspo@netbsd.org)
+- genolopolis = Matthew Sporleder <mspo@NetBSD.org>
 - ggergely = Gábor Gergely <ggergely@users.sourceforge.net>
 - ghen = Geert Hendrickx <ghen@users.sourceforge.net>
 - gizm00 = gizm0 <gizm00@users.sourceforge.net>

Add a comment