From bd30b174728af228916ced6fea01f7f561735e4b Mon Sep 17 00:00:00 2001
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Thu, 12 Apr 2012 20:19:17 +0000
Subject: [PATCH] Add myself as a new committer. Move myself from additional
 controbutors.

Add my PGP key.

Approved by:	crees (mentor)
---
 .../contributors/contrib.additional.sgml      |  5 --
 .../contributors/contrib.committers.sgml      |  4 ++
 en_US.ISO8859-1/share/sgml/authors.ent        |  2 +
 share/pgpkeys/madpilot.key                    | 49 +++++++++++++++++++
 share/pgpkeys/pgpkeys-developers.sgml         |  5 ++
 share/pgpkeys/pgpkeys.ent                     |  1 +
 6 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 share/pgpkeys/madpilot.key

diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
index 46e6a8122c..0ba3455a01 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
@@ -3587,11 +3587,6 @@
 	<email>magik@roorback.net</email></para>
     </listitem>
 
-    <listitem>
-      <para>Guido Falsi
-	<email>mad@madpilot.net</email></para>
-    </listitem>
-
     <listitem>
       <para>Guillaume Paquet
 	<email>amyfoub@videotron.ca</email></para>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
index bbe9559c1d..020ec36a9d 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
@@ -374,6 +374,10 @@
       <para>&a.bf;</para>
     </listitem>
 
+    <listitem>
+      <para>&a.madpilot;</para>
+    </listitem>
+
     <listitem>
       <para>&a.rafan;</para>
     </listitem>
diff --git a/en_US.ISO8859-1/share/sgml/authors.ent b/en_US.ISO8859-1/share/sgml/authors.ent
index f621d993a4..9bfdd45fc5 100644
--- a/en_US.ISO8859-1/share/sgml/authors.ent
+++ b/en_US.ISO8859-1/share/sgml/authors.ent
@@ -768,6 +768,8 @@
 
 <!ENTITY a.lx "David Thiel <email>lx@FreeBSD.org</email>">
 
+<!ENTITY a.madpilot "Guido Falsi <email>madpilot@FreeBSD.org</email>">
+
 <!ENTITY a.maho "Maho Nakata <email>maho@FreeBSD.org</email>">
 
 <!ENTITY a.makc "Max Brazhnikov <email>makc@FreeBSD.org</email>">
diff --git a/share/pgpkeys/madpilot.key b/share/pgpkeys/madpilot.key
new file mode 100644
index 0000000000..742a2f5624
--- /dev/null
+++ b/share/pgpkeys/madpilot.key
@@ -0,0 +1,49 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh madpilot 56CBD293;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   2048R/56CBD293 2012-04-12
+      Key fingerprint = F317 2057 E17E 4E3A 3DA5  9E1D 1AE6 860E 56CB D293
+uid                  Guido Falsi <madpilot@FreeBSD.org>
+uid                  Guido Falsi <mad@madpilot.net>
+sub   2048R/1F9772C5 2012-04-12
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=pMfj
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.sgml
index 005a1f5504..418dcc6b90 100644
--- a/share/pgpkeys/pgpkeys-developers.sgml
+++ b/share/pgpkeys/pgpkeys-developers.sgml
@@ -431,6 +431,11 @@
       &pgpkey.bf;
     </sect2>
 
+    <sect2 id="pgpkey-madpilot">
+      <title>&a.madpilot;</title>
+      &pgpkey.madpilot;
+    </sect2>
+
     <sect2 id="pgpkey-rafan">
       <title>&a.rafan;</title>
       &pgpkey.rafan;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 18bbfc3b28..1acca3fc03 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -206,6 +206,7 @@
 <!ENTITY pgpkey.luoqi SYSTEM "luoqi.key">
 <!ENTITY pgpkey.lwhsu SYSTEM "lwhsu.key">
 <!ENTITY pgpkey.lx SYSTEM "lx.key">
+<!ENTITY pgpkey.madpilot SYSTEM "madpilot.key">
 <!ENTITY pgpkey.maho SYSTEM "maho.key">
 <!ENTITY pgpkey.makc SYSTEM "makc.key">
 <!ENTITY pgpkey.mandree SYSTEM "mandree.key">