Sync with HEAD.

7 files changed, 54 insertions, 13 deletions

diff --git a/share/misc/Makefile b/share/misc/Makefile
index 305baf6..3e2afc4 100644
--- a/share/misc/Makefile
+++ b/share/misc/Makefile
@@ -6,7 +6,8 @@
 FILES=	ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \
 	committers-src.dot eqnchar flowers init.ee \
 	iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \
-	scsi_modes usb_hid_usages usbdevs
+	scsi_modes usb_hid_usages usbdevs \
+	organization.dot
 
 NO_OBJ=
 FILESDIR=	${BINDIR}/misc
diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot
index 0d896b3..168dcd2 100644
--- a/share/misc/committers-doc.dot
+++ b/share/misc/committers-doc.dot
@@ -58,6 +58,7 @@ brueffer [label="Christian Brueffer\nbrueffer@FreeBSD.org\n2003/01/13"]
 chinsan [label="Chinsan Huang\nchinsan@FreeBSD.org\n2006/09/20"]
 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"]
 eadler [label="Eitan Adler\neadler@FreeBSD.org\n2012/10/15"]
 ebrandi [label="Edson Brandi\nebrandi@FreeBSD.org\n2012/09/13"]
 gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2007/02/02"]
@@ -93,6 +94,7 @@ zeising [label="Niclas Zeising\nzeising@FreeBSD.org\n2012/07/03"]
 bcr -> gavin
 bcr -> wblock
 bcr -> eadler
+bcr -> dru
 
 blackend -> ale
 
@@ -116,8 +118,11 @@ gabor -> issyl0
 gabor -> ebrandi
 
 gjb -> wblock
+gjb -> rene
+gjb -> dru
 
 hrs -> ryusuke
+hrs -> dru
 
 jesusr -> jcamou
 
diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot
index f2901f3..cf48d6a 100644
--- a/share/misc/committers-ports.dot
+++ b/share/misc/committers-ports.dot
@@ -58,6 +58,7 @@ avilla [label="Alberto Villa\navilla@FreeBSD.org\n2010/01/24"]
 avl [label="Alexander Logvinov\navl@FreeBSD.org\n2009/05/27"]
 az [label="Andrej Zverev\naz@FreeBSD.org\n2005/10/03"]
 bapt [label="Baptiste Daroussin\nbapt@FreeBSD.org\n2010/07/27"]
+bar [label="Barbara Guida\nbar@FreeBSD.org\n2012/11/25"]
 bdrewery [label="Bryan Drewery\nbdrewery@FreeBSD.org\n2012/07/31"]
 beat [label="Beat Gaetzi\nbeat@FreeBSD.org\n2009/01/28"]
 beech [label="Beech Rintoul\nbeech@FreeBSD.org\n2007/05/30"]
@@ -76,6 +77,7 @@ culot [label="Frederic Culot\nculot@FreeBSD.org\n2010/10/16"]
 daichi [label="Daichi Goto\ndaichi@FreeBSD.org\n2002/10/17"]
 danfe [label="Alexey Dokuchaev\ndanfe@FreeBSD.org\n2004/08/20"]
 db [label="Diane Bruce\ndb@FreeBSD.org\n2007/01/18"]
+dbn [label="David Naylor\ndbn@FreeBSD.org\n2013/01/14"]
 decke [label="Bernhard Froehlich\ndecke@FreeBSD.org\n2010/03/21"]
 delphij [label="Xin Li\ndelphij@FreeBSD.org\n2006/05/01"]
 demon [label="Dmitry Sivachenko\ndemon@FreeBSD.org\n2000/11/13"]
@@ -94,6 +96,7 @@ flz [label="Florent Thoumie\nflz@FreeBSD.org\n2005/03/01"]
 gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2006/12/05"]
 gahr [label="Pietro Cerutti\ngahr@FreeBSD.org\n2008/02/20"]
 garga [label="Renato Botelho\ngarga@FreeBSD.org\n2005/07/11"]
+gblach [label="Grzegorz Blach\ngblach@FreeBSD.org\n2012/11/03"]
 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"]
@@ -138,6 +141,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"]
+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"]
 mat [label="Mathieu Arnold\nmat@FreeBSD.org\n2003/08/15"]
@@ -230,11 +234,15 @@ asami -> obrien
 avilla -> jhale
 avilla -> rakuco
 
+bdrewery -> dbn
+
 bapt -> bdrewery
 bapt -> eadler
 bapt -> jlaffaye
+bapt -> marius
 
 beat -> decke
+beat -> marius
 beat -> sperber
 beat -> uqs
 
@@ -255,6 +263,7 @@ clsung -> tabthorpe
 crees -> gjb
 crees -> jgh
 crees -> madpilot
+crees -> gblach
 
 culot -> jase
 
@@ -268,6 +277,7 @@ delphij -> rafan
 demon -> mat
 
 eadler -> ak
+eadler -> dbn
 eadler -> bdrewery
 eadler -> gjb
 eadler -> tj
@@ -295,6 +305,7 @@ fjoe -> flo
 fjoe -> krion
 fjoe -> osa
 
+flo -> bar
 flo -> jase
 
 flz -> garga
@@ -435,6 +446,7 @@ philip -> koitsu
 
 rafan -> chinsan
 
+rene -> bar
 rene -> crees
 rene -> jgh
 rene -> olivierd
@@ -476,6 +488,7 @@ tabthorpe -> madpilot
 tabthorpe -> pgj
 tabthorpe -> rene
 tabthorpe -> zi
+tabthorpe -> gblach
 
 thierry -> jadawin
 
diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot
index ce7661c..5bb8791 100644
--- a/share/misc/committers-src.dot
+++ b/share/misc/committers-src.dot
@@ -93,6 +93,7 @@ node [color=lightblue2, style=filled, bgcolor=black];
 # Current src committers go here. Try to keep things sorted.
 
 ache [label="Andrey Chernov\nache@FreeBSD.org\n1993/10/31"]
+achim [label="Achim Leubner\nachim@FreeBSD.org\n2013/01/23"]
 adrian [label="Adrian Chadd\nadrian@FreeBSD.org\n2000/07/03"]
 ae [label="Andrey V. Elsukov\nae@FreeBSD.org\n2010/06/03"]
 akiyama [label="Shunsuke Akiyama\nakiyama@FreeBSD.org\n2000/06/19"]
@@ -114,8 +115,10 @@ brooks [label="Brooks Davis\nbrooks@FreeBSD.org\n2001/06/21"]
 brucec [label="Bruce Cran\nbrucec@FreeBSD.org\n2010/01/29"]
 brueffer [label="Christian Brueffer\nbrueffer@FreeBSD.org\n2006/02/28"]
 bruno [label="Bruno Ducrot\nbruno@FreeBSD.org\n2005/07/18"]
+bryanv [label="Bryan Venteicher\nbryanv@FreeBSD.org\n2012/11/03"]
 bschmidt [label="Bernhard Schmidt\nbschmidt@FreeBSD.org\n2010/02/06"]
 bz [label="Bjoern A. Zeeb\nbz@FreeBSD.org\n2004/07/27"]
+carl [label="Carl Delsey\ncarl@FreeBSD.org\n2013/01/14"]
 cognet [label="Olivier Houchard\ncognet@FreeBSD.org\n2002/10/09"]
 cokane [label="Coleman Kane\ncokane@FreeBSD.org\n2000/06/19"]
 cperciva [label="Colin Percival\ncperciva@FreeBSD.org\n2004/01/20"]
@@ -158,6 +161,7 @@ grog [label="Greg Lehey\ngrog@FreeBSD.org\n1998/08/30"]
 gshapiro [label="Gregory Shapiro\ngshapiro@FreeBSD.org\n2000/07/12"]
 harti [label="Hartmut Brandt\nharti@FreeBSD.org\n2003/01/29"]
 hmp [label="Hiten Pandya\nhmp@FreeBSD.org\n2004/03/23"]
+ian [label="Ian Lepore\nian@FreeBSD.org\n2013/01/07"]
 iedowse [label="Ian Dowse\niedowse@FreeBSD.org\n2000/12/01"]
 imp [label="Warner Losh\nimp@FreeBSD.org\n1996/09/20"]
 ivoras [label="Ivan Voras\nivoras@FreeBSD.org\n2008/06/10"]
@@ -193,6 +197,7 @@ le [label="Lukas Ertl\nle@FreeBSD.org\n2004/02/02"]
 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"]
+markj [label="Mark Johnston\nmarkj@FreeBSD.org\n2012/12/18"]
 markm [label="Mark Murray\nmarkm@FreeBSD.org\n199?/??/??"]
 markus [label="Markus Brueffer\nmarkus@FreeBSD.org\n2006/06/01"]
 matteo [label="Matteo Riondato\nmatteo@FreeBSD.org\n2006/01/18"]
@@ -240,6 +245,7 @@ rstone [label="Ryan Stone\nrstone@FreeBSD.org\n2010/04/19"]
 ru [label="Ruslan Ermilov\nru@FreeBSD.org\n1999/05/27"]
 rwatson [label="Robert N. M. Watson\nrwatson@FreeBSD.org\n1999/12/16"]
 sam [label="Sam Leffler\nsam@FreeBSD.org\n2002/07/02"]
+sbruno [label="Sean Bruno\nsbruno@FreeBSD.org\n????/??/??"]
 sanpei [label="MIHIRA Sanpei Yoshiro\nsanpei@FreeBSD.org\n2000/06/19"]
 scf [label="Sean C. Farley\nscf@FreeBSD.org\n2007/06/24"]
 schweikh [label="Jens Schweikhardt\nschweikh@FreeBSD.org\n2001/04/06"]
@@ -248,6 +254,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"]
+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????/??/??"]
 sson [label="Stacey Son\nsson@FreeBSD.org\n2008/07/08"]
@@ -306,6 +313,7 @@ anholt -> jkim
 
 avg -> art
 avg -> pluknet
+avg -> smh
 
 benno -> grehan
 
@@ -333,6 +341,7 @@ bz -> syrinx
 
 cognet -> jceel
 cognet -> kevlo
+cognet -> ian
 
 cperciva -> eadler
 cperciva -> flz
@@ -372,8 +381,10 @@ ed -> uqs
 eivind -> des
 eivind -> rwatson
 
+emaste -> achim
 emaste -> rstone
 emaste -> dteske
+emaste -> markj
 
 emax -> markus
 
@@ -396,6 +407,8 @@ gnn -> lstewart
 gnn -> np
 gnn -> davide
 
+grehan -> bryanv
+
 grog -> edwin
 grog -> le
 grog -> peterj
@@ -446,6 +459,8 @@ jhb -> peterj
 jhb -> pfg
 jhb -> rnoland
 
+jimharris -> carl
+
 jkh -> grog
 jkh -> imp
 jkh -> jlemon
@@ -552,6 +567,7 @@ philip -> uqs
 
 pjd -> kib
 pjd -> lulf
+pjd -> smh
 pjd -> trociny
 
 rgrimes -> markm
@@ -566,6 +582,8 @@ rrs -> brucec
 rrs -> jchandra
 rrs -> tuexen
 
+rstone -> markj
+
 ru -> ceri
 ru -> cjc
 ru -> eik
@@ -596,8 +614,12 @@ sam -> andre
 sam -> benjsc
 sam -> sephe
 
+sbruno -> jimharris
+
 schweikh -> dds
 
+scottl -> achim
+scottl -> jimharris
 scottl -> pjd
 scottl -> sah
 scottl -> yongari
diff --git a/share/misc/flowers b/share/misc/flowers
index 107551c..0cf0665 100644
--- a/share/misc/flowers
+++ b/share/misc/flowers
@@ -6,7 +6,7 @@ African violet:Such worth is rare.
 Apple blossom:Preference.
 Bachelor's button:Celibacy.
 Bay leaf:I change but in death.
-Camelia:Reflected loveliness.
+Camellia:Reflected loveliness.
 Chrysanthemum, other color:Slighted love.
 Chrysanthemum, red:I love.
 Chrysanthemum, white:Truth.
@@ -21,8 +21,8 @@ Ivy:Friendship, fidelity, marriage.
 Jasmine:Amiability, transports of joy, sensuality.
 Leaves (dead):Melancholy.
 Lilac:Youthful innocence.
-Lilly of the valley:Return of happiness.
-Lilly:Purity, sweetness.
+Lily of the valley:Return of happiness.
+Lily:Purity, sweetness.
 Magnolia:Dignity, perseverance.
 Marigold:Jealousy.
 Mint:Virtue.
diff --git a/share/misc/iso639 b/share/misc/iso639
index 467add4..5793421 100644
--- a/share/misc/iso639
+++ b/share/misc/iso639
@@ -12,11 +12,11 @@
 #   existing ones according to criteria indicated in the standard. It
 #   maintains an accurate list of information associated with registered
 #   language codes, processes updates of registered language codes, and
-#   distributes them on a regular basis to subscribers and other parties. 
+#   distributes them on a regular basis to subscribers and other parties.
 #
 #   This is the official site of the ISO 639-2 Registration Authority and thus
 #   is the only one authorized by ISO. If you have questions concerning ISO
-#   639-2 please contact us at: 
+#   639-2 please contact us at:
 #
 #     Library of Congress
 #     Network Development and MARC Standards Office
@@ -90,7 +90,7 @@ be	bel	bel	Belarusian
 bn	ben	ben	Bengali
 	ber	ber	Berber languages
 	bho	bho	Bhojpuri
-bh	bih	bih	Bihari
+bh	bih	bih	Bihari languages
 	bik	bik	Bikol
 	bin	bin	Bini; Edo
 bi	bis	bis	Bislama
@@ -213,10 +213,10 @@ ha	hau	hau	Hausa
 he	heb	heb	Hebrew
 hz	her	her	Herero
 	hil	hil	Hiligaynon
-	him	him	Himachali
+	him	him	Himachali languages; Western Pahari languages
 hi	hin	hin	Hindi
 	hit	hit	Hittite
-	hmn	hmn	Hmong
+	hmn	hmn	Hmong; Mong
 ho	hmo	hmo	Hiri Motu
 hr	hrv	hrv	Croatian
 	hsb	hsb	Upper Sorbian
@@ -349,11 +349,11 @@ ne	nep	nep	Nepali
 	nia	nia	Nias
 	nic	nic	Niger-Kordofanian languages
 	niu	niu	Niuean
+nn	nno	nno	Norwegian Nynorsk; Nynorsk, Norwegian
+nb	nob	nob	Bokmål, Norwegian; Norwegian Bokmål
 	nog	nog	Nogai
 	non	non	Norse, Old
 no	nor	nor	Norwegian
-nn	nno	nno	Norwegian Nynorsk; Nynorsk, Norwegian
-nb	nob	nob	Bokmål, Norwegian; Norwegian Bokmål
 	nqo	nqo	N'Ko
 	nso	nso	Pedi; Sepedi; Northern Sotho
 	nub	nub	Nubian languages
@@ -469,8 +469,8 @@ bo	tib	bod	Tibetan
 ti	tir	tir	Tigrinya
 	tiv	tiv	Tiv
 	tkl	tkl	Tokelau
-	tli	tli	Tlingit
 	tlh	tlh	Klingon; tlhIngan-Hol
+	tli	tli	Tlingit
 	tmh	tmh	Tamashek
 	tog	tog	Tonga (Nyasa)
 to	ton	ton	Tonga (Tonga Islands)
diff --git a/share/misc/organization.dot b/share/misc/organization.dot
index 7870dd8..8561875 100644
--- a/share/misc/organization.dot
+++ b/share/misc/organization.dot
@@ -25,7 +25,7 @@ _misc [label="Miscellaneous Hats"]
 
 # Development teams go here alphabetically sorted
 
-core [label="Core Team\ncore@FreeBSD.org\ntabthorpe, gavin, jhb, kib,\ntheraven, attilio, hrs,\npeter, miwi"]
+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"]
 doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"]
 doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\ngjb, blackend,\ngabor, hrs"]