Merge head from 7/28

5 files changed, 28 insertions, 11 deletions

diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree
index a1d3d12..930c91d 100644
--- a/share/misc/bsd-family-tree
+++ b/share/misc/bsd-family-tree
@@ -296,14 +296,14 @@ FreeBSD 5.2           |      |                 |                       |
  |                    |      |       |         |                       |
  *--FreeBSD           |      |    NetBSD 6.1.3 |                       |
  |   10.0             |      |       |         |                       |
- |                    |      |    NetBSD 6.1.4 |               DragonFly 3.6.1
- |                    |      |                 |                       |
- |                    |      |                 |                       |
- |                    |      |                 |               DragonFly 3.6.2
- |                    |      |                 |                       |
- |                    |      |                 |                       |
- |                    |      |                 |                       |
+ |                    |      |       |         |               DragonFly 3.6.1
+ |                    |      |       |         |                       |
+ |                    |      |       |         |                       |
+ |                    |      |       |         |               DragonFly 3.6.2
+ |                    |      |    NetBSD 6.1.4 |                       |
  |                    |      |                 |                       |
+ |                    |      |            OpenBSD 5.5                  |
+ |                    |      |                 |               DragonFly 3.8.0
  |                    |      |                 |                       |
  |                    |      |                 |                       |
  |                    |      |                 |                       |
@@ -638,6 +638,8 @@ DragonFly 3.6.1 	2014-02-22 [DFB]
 DragonFly 3.6.2		2014-04-10 [DFB]
 NetBSD 6.0.5		2014-04-19 [NDB]
 NetBSD 6.1.4		2014-04-19 [NDB]
+OpenBSD 5.5		2014-05-01 [OBD]
+DragonFly 3.8.0		2014-06-04 [DFB]
 
 Bibliography
 ------------------------
diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot
index 49b6e07..42ab60b 100644
--- a/share/misc/committers-doc.dot
+++ b/share/misc/committers-doc.dot
@@ -51,6 +51,7 @@ node [color=lightblue2, style=filled, bgcolor=black];
 # Current doc committers go here. Try to keep things sorted.
 
 ale [label="Alex Dupre\nale@FreeBSD.org\n2003/12/22"]
+allanjude [label="Allan Jude\nallanjude@FreeBSD.org\n2014/05/17"]
 bcr [label="Benedict Reuschling\nbcr@FreeBSD.org\n2009/12/24"]
 blackend [label="Marc Fonvieille\nblackend@FreeBSD.org\n2002/06/16"]
 brd [label="Brad Davis\nbrd@FreeBSD.org\n2005/06/01"]
@@ -100,6 +101,7 @@ bcr -> eadler
 bcr -> dru
 bcr -> crees
 bcr -> jgh
+bcr -> allanjude
 
 blackend -> ale
 
@@ -116,6 +118,8 @@ den -> marck
 delphij -> chinsan
 delphij -> loader
 
+eadler -> allanjude
+
 gabor -> pgj
 gabor -> manolis
 gabor -> taras
@@ -176,4 +180,5 @@ trhodes -> danger
 trhodes -> jcamou
 
 wblock -> jgh
+wblock -> allanjude
 }
diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot
index 778d86b..02c303e 100644
--- a/share/misc/committers-ports.dot
+++ b/share/misc/committers-ports.dot
@@ -183,6 +183,7 @@ rene [label="Rene Ladan\nrene@FreeBSD.org\n2010/04/11"]
 riggs [label="Thomas Zander\nriggs@FreeBSD.org\n2014/01/09"]
 rm [label="Ruslan Makhmatkhanov\nrm@FreeBSD.org\n2011/11/06"]
 rnoland [label="Robert Noland\nrnoland@FreeBSD.org\n2008/07/21"]
+robak [label="Bartek Rutkowski\nrobak@FreeBSD.org\n2014/06/10"]
 rodrigo [label="Rodrigo Osorio\nrodrigo@FreeBSD.org\n2014/01/15"]
 romain [label="Romain Tartiere\nromain@FreeBSD.org\n2010/01/24"]
 sahil [label="Sahil Tandon\nsahil@FreeBSD.org\n2010/04/11"]
@@ -416,6 +417,8 @@ marcus -> bland
 marcus -> eik
 marcus -> jmallett
 
+marino -> robak
+
 makc -> bf
 makc -> jhale
 makc -> rakuco
@@ -524,6 +527,7 @@ steve -> netchild
 swills -> feld
 swills -> milki
 swills -> pclin
+swills -> robak
 swills -> xmj
 
 tabthorpe -> ashish
diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot
index 3ea6b0b..891efa3 100644
--- a/share/misc/committers-src.dot
+++ b/share/misc/committers-src.dot
@@ -241,6 +241,7 @@ philip [label="Philip Paeps\nphilip@FreeBSD.org\n2004/01/21"]
 phk [label="Poul-Henning Kamp\nphk@FreeBSD.org\n1994/02/21"]
 pho [label="Peter Holm\npho@FreeBSD.org\n2008/11/16"]
 pjd [label="Pawel Jakub Dawidek\npjd@FreeBSD.org\n2004/02/02"]
+pkelsey [label="Patrick Kelsey\pkelsey@FreeBSD.org\n2014/05/29"]
 pluknet [label="Sergey Kandaurov\npluknet@FreeBSD.org\n2010/10/05"]
 ps [label="Paul Saab\nps@FreeBSD.org\n2000/02/23"]
 qingli [label="Qing Li\nqingli@FreeBSD.org\n2005/04/13"]
@@ -270,6 +271,7 @@ sephe [label="Sepherosa Ziehau\nsephe@FreeBSD.org\n2007/03/28"]
 sepotvin [label="Stephane E. Potvin\nsepotvin@FreeBSD.org\n2007/02/15"]
 simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2006/03/07"]
 sjg [label="Simon J. Gerraty\nsjg@FreeBSD.org\n2012/10/23"]
+slm [label="Stephen McConnell\nslm@FreeBSD.org\n2014/05/07"]
 smh [label="Steven Hartland\nsmh@FreeBSD.org\n2012/11/12"]
 sobomax [label="Maxim Sobolev\nsobomax@FreeBSD.org\n2001/07/25"]
 sos [label="Soren Schmidt\nsos@FreeBSD.org\n????/??/??"]
@@ -508,6 +510,8 @@ jkoshy -> rstone
 jlemon -> bmilekic
 jlemon -> brooks
 
+jmallett -> pkelsey
+
 joerg -> brian
 joerg -> eik
 joerg -> jmg
@@ -525,6 +529,7 @@ julian -> mp
 kan -> kib
 
 ken -> asomers
+ken -> slm
 
 kib -> ae
 kib -> dchagin
@@ -664,6 +669,7 @@ scottl -> jimharris
 scottl -> pjd
 scottl -> sah
 scottl -> sbruno
+scottl -> slm
 scottl -> yongari
 
 sheldonh -> dwmalone
diff --git a/share/misc/organization.dot b/share/misc/organization.dot
index 84b9014..ece8a0d 100644
--- a/share/misc/organization.dot
+++ b/share/misc/organization.dot
@@ -25,13 +25,13 @@ _misc [label="Miscellaneous Hats"]
 
 # Development teams go here alphabetically sorted
 
-core [label="Core Team\ncore@FreeBSD.org\ntabthorpe, gavin, jhb, kib,\ntheraven, hrs, peter, miwi"]
-coresecretary [label="Core Team Secretary\ncore-secretary@FreeBSD.org\npgj"]
+core [label="Core Team\ncore@FreeBSD.org\nbapt, emaste, gavin,\nglebius, gnn, hrs,\npeter, rwatson, theraven"]
+coresecretary [label="Core Team Secretary\ncore-secretary@FreeBSD.org\nmatthew"]
 doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"]
 doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\ngjb, blackend,\ngabor, hrs"]
 portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"]
-portmgr [label="Port Management Team\nportmgr@FreeBSD.org\ntabthorpe, marcus, bapt,\nerwin, bdrewery,\nitetcu, miwi"]
-portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\ntabthorpe"]
+portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nantoine, bapt, bdrewery,\ndecke, erwin, mat,\nmiwi, swills, tabthorpe"]
+portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\nculot"]
 re [label="Primary Release Engineering Team\nre@FreeBSD.org\nkib, blackend, jpaetzel, hrs, kensmith"]
 secteam [label="Security Team\nsecteam@FreeBSD.org\nsimon, qingli, delphij,\nremko, philip, stas, cperciva,\ncsjp, rwatson, miwi, bz"]
 portssecteam [label="Ports Security Team\nports-secteam@FreeBSD.org\nmiwi, rea, swills, wxs,\njgh, sbz, eadler, zi, remko, simon"]