Merge from head

6 files changed, 113 insertions, 46 deletions

diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree
index 47a41bd..f32f136 100644
--- a/share/misc/bsd-family-tree
+++ b/share/misc/bsd-family-tree
@@ -62,9 +62,9 @@ Tenth Edition     |                      |
    |                    |                  4.4BSD            |
    |                    |                    / |             |
    |                    |   4.4BSD-Encumbered  |             |
-   |                 NetBSD 0.8                |           BSD/386 1.0
-   |                    |                      |             |
-FreeBSD 1.0          NetBSD 0.9                |           BSD/386 1.1
+   |                -NetBSD 0.8                |           BSD/386 1.0
+   |               /    |                      |             |
+FreeBSD 1.0 <-----'  NetBSD 0.9                |           BSD/386 1.1
    |                    |           .----- 4.4BSD Lite       |
 FreeBSD 1.1             |          /   /       |     \       |
    |                    |         /   /        |      \      |
@@ -216,50 +216,62 @@ FreeBSD 5.2           |      |                 |                       |
  |     |             10.5    |                 |                       |
  |     |              |      |             OpenBSD 4.2                 |
  |     |              |   NetBSD 4.0           |                       |
- | FreeBSD 6.3        |      |                 |                       |
- |            \       |      |                 |                       |
- *--FreeBSD    |      |      |                 |                DragonFly 1.12.0
- |    7.0      |      |      |                 |                       |
- |     |       |      |      |             OpenBSD 4.3                 |
- |     |       |      |      |                 |                DragonFly 2.0.0
- |     |    FreeBSD   |      |             OpenBSD 4.4                 |
+ | FreeBSD 6.3        |      |    |            |                       |
+ |            \       |      |    |            |                       |
+ *--FreeBSD    |      |      |    |            |                DragonFly 1.12.0
+ |    7.0      |      |      |    |            |                       |
+ |     |       |      |      |    |        OpenBSD 4.3                 |
+ |     |       |      |      | NetBSD          |                DragonFly 2.0.0
+ |     |    FreeBSD   |      |  4.0.1      OpenBSD 4.4                 |
  |     |      6.4     |      |                 |                       |
  |     |              |      |                 |                       |
  |  FreeBSD 7.1       |      |                 |                       |
  |     |              |      |                 |                DragonFly 2.2.0
  |  FreeBSD 7.2       |   NetBSD 5.0       OpenBSD 4.5                 |
- |             \      |      |    |            |                       |
- |              |  Mac OS X  |    |            |                       |
- |              |    10.6    |    |            |                       |
- |              |     |      |    |            |                DragonFly 2.4.0
- |              |     |      |    |        OpenBSD 4.6                 |
- |              |     |      |    |            |                       |
- *--FreeBSD     |     |      |    |            |                       |
- |    8.0       |     |      |    |            |                       |
- |     |     FreeBSD  |      |    |            |                       |
- |     |       7.3    |      |    |            |                DragonFly 2.6.0
- |     |        |     |      |    |        OpenBSD 4.7                 |
- |  FreeBSD     |     |      |    |            |                       |
- |    8.1       |     |      |    |            |                       |
- |     |        |     |      |    |            |                DragonFly 2.8.2
- |     |        |     |      |    |        OpenBSD 4.8                 |
- |     |        |     |      | NetBSD 5.1      |                       |
- |  FreeBSD  FreeBSD  |      |                 |                       |
- |    8.2      7.4    |      |                 |               DragonFly 2.10.1
- |     |              |      |             OpenBSD 4.9                 |
- |     `-----.     Mac OS X  |                 |                       |
- |            \      10.7    |                 |                       |
- |             |      |      |             OpenBSD 5.0                 |
- *--FreeBSD    |      |      |                 |                       |
- |    9.0      |      |      |                 |               DragonFly 3.0.1
- |     |    FreeBSD   |      |                 |                       |
- |     |      8.3     |      |             OpenBSD 5.1                 |
- |     |           Mac OS X  |                 |                       |
- |     |             10.8    |                 |                       |
- |     |              |   NetBSD 6.0           |                       |
- |     |              |      |             OpenBSD 5.2         DragonFly 3.2.1
- |  FreeBSD           |      |                 |                       |
- |    9.1             |      |                 |                       |
+ |             \      |      | |    \          |                       |
+ |              |  Mac OS X  | |     \         |                       |
+ |              |    10.6    | |      \        |                       |
+ |              |     |      | |   NetBSD      |                DragonFly 2.4.0
+ |              |     |      | |    5.0.1  OpenBSD 4.6                 |
+ |              |     |      | |       |       |                       |
+ *--FreeBSD     |     |      | |       |       |                       |
+ |    8.0       |     |      | |       |       |                       |
+ |     |     FreeBSD  |      | |   NetBSD      |                       |
+ |     |       7.3    |      | |    5.0.2      |                DragonFly 2.6.0
+ |     |        |     |      | |           OpenBSD 4.7                 |
+ |  FreeBSD     |     |      | |               |                       |
+ |    8.1       |     |      | |               |                       |
+ |     |        |     |      | |               |                DragonFly 2.8.2
+ |     |        |     |      | |           OpenBSD 4.8                 |
+ |     |        |     |      | *--NetBSD       |                       |
+ |  FreeBSD  FreeBSD  |      | |    5.1        |                       |
+ |    8.2      7.4    |      | |      |        |               DragonFly 2.10.1
+ |     |              |      | |      |    OpenBSD 4.9                 |
+ |     `-----.     Mac OS X  | |      |        |                       |
+ |            \      10.7    | |      |        |                       |
+ |             |      |      | |      |    OpenBSD 5.0                 |
+ *--FreeBSD    |      |      | |      |        |                       |
+ |    9.0      |      |      | |   NetBSD      |               DragonFly 3.0.1
+ |     |    FreeBSD   |      | |    5.1.2      |                       |
+ |     |      8.3     |      | |           OpenBSD 5.1                 |
+ |     |       |   Mac OS X  | `----.          |                       |
+ |     |       |     10.8    |       \         |                       |
+ |     |       |      |   NetBSD 6.0  |        |                       |
+ |     |       |      |      | | |    |    OpenBSD 5.2         DragonFly 3.2.1
+ |  FreeBSD    |      |      | | | NetBSD      |                       |
+ |    9.1      |      |      | | |   5.2       |                       |
+ |             |      |      | |  \            |                       |
+ |             |      |      | |   NetBSD      |                       |
+ |             |      |      | |    6.0.1      |                       |
+ |             |      |      | |      |   OpenBSD 5.3          DragonFly 3.4.1
+ |             |      |      | |   NetBSD      |                       |
+ |             |      |      | |    6.0.2      |                       |
+ |             |      |      | |               |                       |
+ |             |      |      |  `-NetBSD 6.1   |                       |
+ |          FreeBSD   |      |                 |                       |
+ |            8.4     |      |                 |                       |
+ |                    |      |                 |                       |
+ |                    |      |                 |                       |
  |                    |      |                 |                       |
 FreeBSD 10 -current   |  NetBSD -current  OpenBSD -current             |
  |                    |      |                 |                       |
@@ -533,9 +545,11 @@ NetBSD 5.0		2009-04-29 [NBD]
 OpenBSD 4.5		2009-05-01 [OBD]
 FreeBSD 7.2		2009-05-04 [FBD]
 Mac OS X 10.6		2009-06-08 [APL]
+NetBSD 5.0.1		2009-08-02 [NBD] (security/critical release)
 DragonFly 2.4.0		2009-09-16 [DFB]
 OpenBSD 4.6		2009-10-18 [OBD]
 FreeBSD 8.0		2009-11-26 [FBD]
+NetBSD 5.0.2		2010-02-12 [NBD] (security/critical release)
 FreeBSD 7.3		2010-03-23 [FBD]
 DragonFly 2.6.0		2010-03-28 [DFB]
 OpenBSD 4.7		2010-05-19 [OBD]
@@ -550,6 +564,7 @@ OpenBSD 4.9		2011-05-01 [OBD]
 Mac OS X 10.7		2011-07-20 [APL]
 OpenBSD 5.0		2011-11-01 [OBD]
 FreeBSD 9.0		2012-01-12 [FBD]
+NetBSD 5.1.2		2012-02-02 [NBD] (security/critical release)
 DragonFly 3.0.1		2012-02-21 [DFB]
 FreeBSD 8.3		2012-04-18 [FBD]
 OpenBSD 5.1		2012-05-01 [OBD]
@@ -557,7 +572,14 @@ Mac OS X 10.8		2012-07-25 [APL]
 NetBSD 6.0		2012-10-17 [NBD]
 OpenBSD 5.2		2012-11-01 [OBD]
 DragonFly 3.2.1		2012-11-02 [DFB]
+NetBSD 5.2		2012-12-03 [NBD]
+NetBSD 6.0.1		2012-12-26 [NBD] (security/critical release)
 FreeBSD 9.1		2012-12-30 [FBD]
+DragonFly 3.4.1		2013-04-29 [DFB]
+OpenBSD 5.3		2013-05-01 [OBD]
+NetBSD 6.0.2		2013-05-18 [NBD] (security/critical release)
+NetBSD 6.1		2013-05-18 [NBD]
+FreeBSD 8.4		2013-06-07 [FBD]
 
 Bibliography
 ------------------------
@@ -616,6 +638,6 @@ Steven M. Schultz for providing 2.8BSD, 2.10BSD, 2.11BSD manual pages.
 
 --
 Copyright (c) 1997-2012 Wolfram Schneider <wosch@FreeBSD.ORG>
-URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree
+URL: http://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree
 
 $FreeBSD$
diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot
index 168dcd2..e408eb1 100644
--- a/share/misc/committers-doc.dot
+++ b/share/misc/committers-doc.dot
@@ -56,6 +56,7 @@ blackend [label="Marc Fonvieille\nblackend@FreeBSD.org\n2002/06/16"]
 brd [label="Brad Davis\nbrd@FreeBSD.org\n2005/06/01"]
 brueffer [label="Christian Brueffer\nbrueffer@FreeBSD.org\n2003/01/13"]
 chinsan [label="Chinsan Huang\nchinsan@FreeBSD.org\n2006/09/20"]
+crees [label="Chris Rees\ncrees@FreeBSD.org\n2013/05/27"]
 danger [label="Daniel Gerzo\ndanger@FreeBSD.org\n2006/08/20"]
 delphij [label="Xin Li\ndelphij@FreeBSD.org\n2004/09/14"]
 dru [label="Dru Lavigne\ndru@FreeBSD.org\n2013/01/22"]
@@ -95,6 +96,7 @@ bcr -> gavin
 bcr -> wblock
 bcr -> eadler
 bcr -> dru
+bcr -> crees
 
 blackend -> ale
 
@@ -120,6 +122,7 @@ gabor -> ebrandi
 gjb -> wblock
 gjb -> rene
 gjb -> dru
+gjb -> crees
 
 hrs -> ryusuke
 hrs -> dru
diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot
index 5de4d84..79831dc 100644
--- a/share/misc/committers-ports.dot
+++ b/share/misc/committers-ports.dot
@@ -90,6 +90,7 @@ ehaupt [label="Emanuel Haupt\nehaupt@FreeBSD.org\n2005/10/03"]
 eik [label="Oliver Eikemeier\neik@FreeBSD.org\n2003/11/12"]
 erwin [label="Erwin Lansing\nerwin@FreeBSD.org\n2003/06/04"]
 farrokhi [label="Babak Farrokhi\nfarrokhi@FreeBSD.org\n2006/11/07"]
+feld [label="Mark Felder\nfeld@FreeBSD.org\n2013/06/25"]
 fjoe [label="Max Khon\nfjoe@FreeBSD.org\n2001/08/06"]
 flo [label="Florian Smeets\nflo@FreeBSD.org\n2010/12/07"]
 fluffy [label="Dima Panov\nfluffy@FreeBSD.org\n2009/08/10"]
@@ -102,6 +103,7 @@ gerald [label="Gerald Pfeifer\ngerald@FreeBSD.org\n2002/04/03"]
 gjb [label="Glen Barber\ngjb@FreeBSD.org\n2012/06/19"]
 glarkin [label="Greg Larkin\nglarkin@FreeBSD.org\n2008/07/17"]
 glewis [label="Greg Lewis\nglewis@FreeBSD.org\n2002/04/08"]
+gnn [label="George Neville-Neil\ngnn@FreeBSD.org\n2013/09/04"]
 hq [label="Herve Quiroz\nhq@FreeBSD.org\n2004/08/05"]
 ijliao [label="Ying-Chieh Liao\nijliao@FreeBSD.org\n2001/01/20"]
 itetcu [label="Ion-Mihai Tetcu\nitetcu@FreeBSD.org\n2006/06/07"]
@@ -142,6 +144,7 @@ maho [label="Maho Nakata\nmaho@FreeBSD.org\n2002/10/17"]
 makc [label="Max Brazhnikov\nmakc@FreeBSD.org\n2008/08/25"]
 mandree [label="Matthias Andree\nmandree@FreeBSD.org\n2009/11/18"]
 marcus [label="Joe Marcus Clarke\nmarcus@FreeBSD.org\n2002/04/05"]
+marino [label="John Marino\nmarino@FreeBSD.org\n2013/07/04"]
 marius [label="Marius Strobl\nmarius@FreeBSD.org\n2012/12/29"]
 markus [label="Markus Brueffer\nmarkus@FreeBSD.org\n2004/02/21"]
 martymac [label="Ganael Laplanche\nmartymac@FreeBSD.org\n2010/09/24"]
@@ -153,6 +156,7 @@ miwi [label="Martin Wilke\nmiwi@FreeBSD.org\n2006/06/04"]
 mm [label="Martin Matuska\nmm@FreeBSD.org\n2007/04/04"]
 mnag [label="Marcus Alves Grando\nmnag@FreeBSD.org\n2005/09/15"]
 mva [label="Marcus von Appen\nmva@FreeBSD.org\n2009/02/16"]
+nemysis [label="Rusmir Dusko\nnemysis@FreeBSD.org\n2013/07/31"]
 nemoliu [label="Tong Liu\nnemoliu@FreeBSD.org\n2007/04/25"]
 netchild [label="Alexander Leidinger\nnetchild@FreeBSD.org\n2002/03/19"]
 nobutaka [label="Nobutaka Mantani\nnobutaka@FreeBSD.org\n2001/11/02"]
@@ -204,6 +208,7 @@ trasz [label="Edward Tomasz Napierala\ntrasz@FreeBSD.org\n2007/04/12"]
 trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2004/07/06"]
 uqs [label="Ulrich Spoerlein\nuqs@FreeBSD.org\n2012/01/19"]
 vd [label="Vasil Dimov\nvd@FreeBSD.org\n2006/01/19"]
+vg [label="Veniamin Gvozdikov\nvg@FreeBSD.org\n2013/06/11"]
 wen [label="Wen Heping\nwen@FreeBSD.org\n2010/12/13"]
 wg [label="William Grzybowski\nwg@FreeBSD.org\n2013/04/01"]
 wxs [label="Wesley Shields\nwxs@FreeBSD.org\n2008/01/03"]
@@ -245,6 +250,7 @@ bapt -> bdrewery
 bapt -> eadler
 bapt -> jlaffaye
 bapt -> marius
+bapt -> marino
 
 beat -> decke
 beat -> marius
@@ -265,6 +271,7 @@ clement -> lawrance
 clsung -> lwhsu
 clsung -> tabthorpe
 
+crees -> feld
 crees -> gjb
 crees -> jgh
 crees -> madpilot
@@ -273,6 +280,7 @@ crees -> tijl
 
 culot -> jase
 culot -> wg
+culot -> marino
 
 db -> tj
 
@@ -289,6 +297,7 @@ eadler -> dbn
 eadler -> bdrewery
 eadler -> gjb
 eadler -> tj
+eadler -> vg
 
 edwin -> cperciva
 edwin -> erwin
@@ -414,6 +423,7 @@ miwi -> lme
 miwi -> makc
 miwi -> mandree
 miwi -> mva
+miwi -> nemysis
 miwi -> nox
 miwi -> olivierd
 miwi -> pawel
@@ -439,6 +449,8 @@ novel -> rm
 obrien -> mharo
 obrien -> gerald
 
+osa -> vg
+
 pat -> adamw
 
 pav -> ahze
@@ -447,6 +459,8 @@ pav -> josef
 pav -> kwm
 pav -> mnag
 
+pawel -> nemysis
+
 pgj -> ashish
 pgj -> jacula
 
@@ -462,6 +476,9 @@ rene -> crees
 rene -> jgh
 rene -> olivierd
 
+rm -> koobs
+rm -> vg
+
 sahil -> culot
 sahil -> eadler
 
@@ -475,6 +492,8 @@ sem -> stas
 shaun -> timur
 shaun -> matthew
 
+skreuzer -> gnn
+
 sobomax -> demon
 sobomax -> glewis
 sobomax -> lev
@@ -485,6 +504,7 @@ stas -> araujo
 
 steve -> netchild
 
+swills -> feld
 swills -> pclin
 
 tabthorpe -> ashish
@@ -512,9 +532,12 @@ wen -> cs
 wen -> culot
 wen -> pawel
 
+wg -> nemysis
+
 will -> lioux
 
 wxs -> jsa
+wxs -> nemysis
 wxs -> sahil
 wxs -> skreuzer
 wxs -> swills
diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot
index 45fac41..a273cf9 100644
--- a/share/misc/committers-src.dot
+++ b/share/misc/committers-src.dot
@@ -48,10 +48,11 @@ dmlb [label="Duncan Barclay\ndmlb@FreeBSD.org\n2001/12/14\n2008/11/10"]
 dougb [label="Doug Barton\ndougb@FreeBSD.org\n2000/10/26\n2012/10/08"]
 eik [label="Oliver Eikemeier\neik@FreeBSD.org\n2004/05/20\n2008/11/10"]
 furuta [label="Atsushi Furuta\nfuruta@FreeBSD.org\n2000/06/21\n2003/03/08"]
+gj [label="Gary L. Jennejohn\ngj@FreeBSD.org\n1994/??/??\n2006/04/28"]
 groudier [label="Gerard Roudier\ngroudier@FreeBSD.org\n1999/12/30\n2006/04/06"]
 jake [label="Jake Burkholder\njake@FreeBSD.org\n2000/05/16\n2008/11/10"]
 jayanth [label="Jayanth Vijayaraghavan\njayanth@FreeBSD.org\n2000/05/08\n2008/11/10"]
-jb [label="John Birrell\njb@FreeBSD.org\n????/??/??\n2009/12/15"]
+jb [label="John Birrell\njb@FreeBSD.org\n1997/03/27\n2009/12/15"]
 jdp [label="John Polstra\njdp@FreeBSD.org\n1995/12/07\n2008/02/26"]
 jedgar [label="Chris D. Faulhaber\njedgar@FreeBSD.org\n1999/12/15\n2006/04/07"]
 jkh [label="Jordan K. Hubbard\njkh@FreeBSD.org\n1993/06/12\n2008/06/13"]
@@ -110,11 +111,13 @@ andrew [label="Andrew Turner\nandrew@FreeBSD.org\n2010/07/19"]
 antoine [label="Antoine Brodin\nantoine@FreeBSD.org\n2008/02/03"]
 ariff [label="Ariff Abdullah\nariff@FreeBSD.org\n2005/11/14"]
 art [label="Artem Belevich\nart@FreeBSD.org\n2011/03/29"]
+asomers [label="Alan Somers\nasomers@FreeBSD.org\n2013/04/24"]
 avg [label="Andriy Gapon\navg@FreeBSD.org\n2009/02/18"]
 bapt [label="Baptiste Daroussin\nbapt@FreeBSD.org\n2011/12/23"]
 benl [label="Ben Laurie\nbenl@FreeBSD.org\n2011/05/18"]
 benno [label="Benno Rice\nbenno@FreeBSD.org\n2000/11/02"]
 bms [label="Bruce M Simpson\nbms@FreeBSD.org\n2003/08/06"]
+br [label="Ruslan Bukin\nbr@FreeBSD.org\n2013/09/02"]
 brian [label="Brian Somers\nbrian@FreeBSD.org\n1996/12/16"]
 brooks [label="Brooks Davis\nbrooks@FreeBSD.org\n2001/06/21"]
 brucec [label="Bruce Cran\nbrucec@FreeBSD.org\n2010/01/29"]
@@ -143,7 +146,7 @@ dwmalone [label="David Malone\ndwmalone@FreeBSD.org\n2000/07/11"]
 eadler [label="Eitan Adler\neadler@FreeBSD.org\n2012/01/18"]
 ed [label="Ed Schouten\ned@FreeBSD.org\n2008/05/22"]
 edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2007/06/25"]
-eivind [label="Eivind Eklund\neivind@FreeBSD.org\n????/??/??"]
+eivind [label="Eivind Eklund\neivind@FreeBSD.org\n1997/02/02"]
 emaste [label="Ed Maste\nemaste@FreeBSD.org\n2005/10/04"]
 emax [label="Maksim Yevmenkin\nemax@FreeBSD.org\n2003/10/12"]
 eri [label="Ermal Luci\neri@FreeBSD.org\n2008/06/11"]
@@ -156,6 +159,7 @@ gad [label="Garance A. Drosehn\ngad@FreeBSD.org\n2000/10/27"]
 gallatin [label="Andrew Gallatin\ngallatin@FreeBSD.org\n1999/01/15"]
 gavin [label="Gavin Atkinson\ngavin@FreeBSD.org\n2009/12/07"]
 gibbs [label="Justin T. Gibbs\ngibbs@FreeBSD.org\n????/??/??"]
+gjb [label="Glen Barber\ngjb@FreeBSD.org\n2013/06/04"]
 gleb [label="Gleb Kurtsou\ngleb@FreeBSD.org\n2011/09/19"]
 glebius [label="Gleb Smirnoff\nglebius@FreeBSD.org\n2004/07/14"]
 gnn [label="George V. Neville-Neil\ngnn@FreeBSD.org\n2004/10/11"]
@@ -184,6 +188,7 @@ jkim [label="Jung-uk Kim\njkim@FreeBSD.org\n2005/07/06"]
 jkoshy [label="A. Joseph Koshy\njkoshy@FreeBSD.org\n1998/05/13"]
 jlh [label="Jeremie Le Hen\njlh@FreeBSD.org\n2012/04/22"]
 jls [label="Jordan Sissel\njls@FreeBSD.org\n2006/12/06"]
+jmg [label="John-Mark Gurney\njmg@FreeBSD.org\n1997/02/13"]
 joerg [label="Joerg Wunsch\njoerg@FreeBSD.org\n1993/11/14"]
 jon [label="Jonathan Chen\njon@FreeBSD.org\n2000/10/17"]
 jonathan [label="Jonathan Anderson\njonathan@FreeBSD.org\n2010/10/07"]
@@ -193,11 +198,13 @@ jwd [label="John De Boskey\njwd@FreeBSD.org\n2000/05/19"]
 kaiw [label="Kai Wang\nkaiw@FreeBSD.org\n2007/09/26"]
 kan [label="Alexander Kabaev\nkan@FreeBSD.org\n2002/07/21"]
 kargl [label="Steven G. Kargl\nkargl@FreeBSD.org\n2011/01/17"]
+ken [label="Ken Merry\nken@FreeBSD.org\n1998/09/08"]
 kensmith [label="Ken Smith\nkensmith@FreeBSD.org\n2004/01/23"]
 kevlo [label="Kevin Lo\nkevlo@FreeBSD.org\n2006/07/23"]
 kib [label="Konstantin Belousov\nkib@FreeBSD.org\n2006/06/03"]
 kmacy [label="Kip Macy\nkmacy@FreeBSD.org\n2005/06/01"]
 le [label="Lukas Ertl\nle@FreeBSD.org\n2004/02/02"]
+loos [label="Luiz Otavio O Souza\nloos@FreeBSD.org\n2013/07/03"]
 lstewart [label="Lawrence Stewart\nlstewart@FreeBSD.org\n2008/10/06"]
 marcel [label="Marcel Moolenaar\nmarcel@FreeBSD.org\n1999/07/03"]
 marius [label="Marius Strobl\nmarius@FreeBSD.org\n2004/04/17"]
@@ -283,6 +290,7 @@ wkoszek [label="Wojciech A. Koszek\nwkoszek@FreeBSD.org\n2006/02/21"]
 wollman [label="Garrett Wollman\nwollman@FreeBSD.org\n????/??/??"]
 wsalamon [label="Wayne Salamon\nwsalamon@FreeBSD.org\n2005/06/25"]
 yongari [label="Pyun YongHyeon\nyongari@FreeBSD.org\n2004/08/01"]
+zbb [label="Zbigniew Bodek\nzbb@FreeBSD.org\n2013/09/02"]
 zec [label="Marko Zec\nzec@FreeBSD.org\n2008/06/22"]
 zml [label="Zachary Loafman\nzml@FreeBSD.org\n2009/05/27"]
 zont [label="Andrey Zonov\nzont@FreeBSD.org\n2012/08/21"]
@@ -301,6 +309,7 @@ day1 -> rgrimes
 day1 -> alm
 day1 -> dg
 
+adrian -> loos
 adrian -> monthadar
 adrian -> ray
 adrian -> rmh
@@ -341,10 +350,12 @@ bz -> anchie
 bz -> jamie
 bz -> syrinx
 
+cognet -> br
 cognet -> jceel
 cognet -> kevlo
 cognet -> ian
 cognet -> wkoszek
+cognet -> zbb
 
 cperciva -> eadler
 cperciva -> flz
@@ -467,6 +478,8 @@ jhb -> rnoland
 
 jimharris -> carl
 
+jkh -> dfr
+jkh -> gj
 jkh -> grog
 jkh -> imp
 jkh -> jlemon
@@ -487,6 +500,7 @@ jlemon -> brooks
 
 joerg -> brian
 joerg -> eik
+joerg -> jmg
 joerg -> le
 joerg -> netchild
 joerg -> schweikh
@@ -499,8 +513,11 @@ julian -> zec
 
 kan -> kib
 
+ken -> asomers
+
 kib -> ae
 kib -> dchagin
+kib -> gjb
 kib -> jlh
 kib -> jpaetzel
 kib -> lulf
@@ -574,6 +591,7 @@ philip -> jls
 philip -> matteo
 philip -> uqs
 
+phk -> jkoshy
 phk -> mux
 
 pjd -> kib
diff --git a/share/misc/iso639 b/share/misc/iso639
index 5793421..1902e51 100644
--- a/share/misc/iso639
+++ b/share/misc/iso639
@@ -517,6 +517,7 @@ yo	yor	yor	Yoruba
 	zap	zap	Zapotec
 	zbl	zbl	Blissymbols; Blissymbolics; Bliss
 	zen	zen	Zenaga
+	zgh	zgh	Standard Moroccan Tamazight
 za	zha	zha	Zhuang; Chuang
 	znd	znd	Zande languages
 zu	zul	zul	Zulu
diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors
index 921f402..ca35435 100644
--- a/share/misc/pci_vendors
+++ b/share/misc/pci_vendors
@@ -11402,7 +11402,7 @@
 	0040  QSC-200/300
 	0050  ESC-100D
 	0060  ESC-100M
-	00f0  MPAC-100 Syncronous Serial Card (Zilog 85230)
+	00f0  MPAC-100 Synchronous Serial Card (Zilog 85230)
 	0170  QSCLP-100
 	0180  DSCLP-100
 	0190  SSCLP-100