Page MenuHomeFreeBSD
Files F137871889

D11670.id31004.diff
No OneTemporary
Actions

D11670.id31004.diff
View Options

Index: en_US.ISO8859-1/articles/contributors/contrib.committers.xml
===================================================================
--- en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -557,6 +557,10 @@
</listitem>
<listitem>
+ <para>&a.mjoras.email;</para>
+ </listitem>
+
+ <listitem>
<para>&a.erj.email;</para>
</listitem>
Index: share/pgpkeys/mjoras.key
===================================================================
--- /dev/null
+++ share/pgpkeys/mjoras.key
@@ -0,0 +1,43 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh mjoras 2C6A6CC114C8452F ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub rsa2048/2C6A6CC114C8452F 2017-07-20 [SC] [expires: 2020-07-19]
+ Key fingerprint = 09D6 82BA 15B1 C6E5 FFF1 6CBE 2C6A 6CC1 14C8 452F
+uid Matt Joras <mjoras@FreeBSD.org>
+sub rsa2048/6E246E33D1C375F3 2017-07-20 [E] [expires: 2020-07-19]
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFlwHtABCADUFzIMckRGlqx6y0hHUg21Bw7R9TKh/snEs8ZpVEpVf7hxtQ3Y
+0wqZrjj2MEdqoDFp+4itFd21kWJ3D3TtrJ+qH5eFaWhijpMR48GKokXVRqLY7WzT
+yTh5Kily8R9W+ba2T8b6tzAml9pVPuctrMLAYM/6ZtrEZ7WhFb7rRRh3crzvEZWa
++/kKsmE7prv28eVgz/HHD9ZnWR0yttbrcJsmtIm44BdK1fapm5l3i3Q4gPcwJG+V
+8YHH6jh8DregfRQ4PrKmrk5JXTk1BH2B53R2TXYYxpyEDByKqOYASUAmkxBfO4la
+FaIDRTV9bDoDrLe0uGfrSMIPaUShjq5Y8vZdABEBAAG0H01hdHQgSm9yYXMgPG1q
+b3Jhc0BGcmVlQlNELm9yZz6JAVQEEwEIAD4WIQQJ1oK6FbHG5f/xbL4samzBFMhF
+LwUCWXAe0AIbAwUJBaOagAULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAAKCRAsamzB
+FMhFL7+iB/4ncXzmAQbJKINpJxY1fyizzvzbvXEj/ZJlE4PlZO27SOEDJz8tmwX5
+2c1h0WK1Nrz3k7l/GR5Cs2KqzG5dEObf0WVqLh5PzL0PqbHPa9DvSzjklnuyaqEV
+9DH72eZwpQ+5xORVtwTxGV6Y0HEdmMIjQua5Dq81sXakvlAw/gAc6gZLA2cYnvJv
+yd1RNDYqz0DrHmsEfHhIUaVk8+fGvWNOQwhJCpxokqLsPHEgWZ9jHXt0gylNmrwo
+51VBxJ/WmDruKwmuZhhpaONKKFNZoeahUOml84+Ac5EeMW7OR4FRp+tPQKeD6yoX
+MPIQjxxbUeis7d4X2sdzLUSOSNCkECaauQENBFlwHtABCADmnNMp2OE6Qc3OJbMD
+5BVI5nRT7EAQJ741zL/nU20F98Dq9zeKvzG5ML3ImZ5gMvvb0ZXzT0ecdK49r2HH
+ZpAcXZWwl6KdbqNjyRH8QcEgHJiYS3fV8uWtiIExjgOnsycrd8TGOU29Zo2x3xgJ
+3rrc/jOx3ASlcll0EQ0d3zt7/D0Zc0RSD++arGrnb/flVkU/B2/6ImuJ6++zPNhZ
+hgvbpIm91MBCAZ7pDNHlwE0cXltT0hDZVOlP3kzDjU7b3t8KW98BRC/sDjjx+rga
+MIroZngcOv+cOYht1yzoDg8UBnvmbjDw9kpVuo4nwrmiyUGn4kiOIsPDADImiNrh
+85GFABEBAAGJATwEGAEIACYWIQQJ1oK6FbHG5f/xbL4samzBFMhFLwUCWXAe0AIb
+DAUJBaOagAAKCRAsamzBFMhFL0msB/99R7J850UVmvsem0rc4pkDFWVjdLJEvQnP
+8mYH0FgADpviEn3RulZqrUzq0+axCNnBQNpu4plY8p06hxwQHUEE4BnZA85bWSay
+UpsvQIFmaKgmMLhNj3L8CB4Igz84BwhCp9A0KACyzlXReQC/g0kYF44T9njKlRz4
+0N87SxINrq+pqlT2PerPTKaUIv29Kq5os0D4wJ6KGhBsPuSnLC6XyPGk8Gn/5eXe
+8HTahjghVOQHOm5lVkv/HEzCDvlB0GwBecXSbiSGvQHZWEWoCw0uvY9CKP+2CELz
+bxcdOyM61zVKAIvp7tPjYkKi6ey+wcVzBCviwOVuO8Tudex/2TM3
+=mSTP
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
Index: share/pgpkeys/pgpkeys-developers.xml
===================================================================
--- share/pgpkeys/pgpkeys-developers.xml
+++ share/pgpkeys/pgpkeys-developers.xml
@@ -971,6 +971,11 @@
&pgpkey.trevor;
</sect2>
+ <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-mjoras">
+ <title>&a.mjoras.email;</title>
+ &pgpkey.mjoras;
+ </sect2>
+
<sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-erj">
<title>&a.erj.email;</title>
&pgpkey.erj;
Index: share/pgpkeys/pgpkeys.ent
===================================================================
--- share/pgpkeys/pgpkeys.ent
+++ share/pgpkeys/pgpkeys.ent
@@ -332,6 +332,7 @@
<!ENTITY pgpkey.miwi SYSTEM "miwi.key">
<!ENTITY pgpkey.mizhka SYSTEM "mizhka.key">
<!ENTITY pgpkey.mjg SYSTEM "mjg.key">
+<!ENTITY pgpkey.mjoras SYSTEM "mjoras.key">
<!ENTITY pgpkey.mlaier SYSTEM "mlaier.key">
<!ENTITY pgpkey.mm SYSTEM "mm.key">
<!ENTITY pgpkey.mmel SYSTEM "mmel.key">
Index: share/xml/authors.ent
===================================================================
--- share/xml/authors.ent
+++ share/xml/authors.ent
@@ -1545,6 +1545,9 @@
<!ENTITY a.mjg "Mateusz Guzik">
<!ENTITY a.mjg.email "&a.mjg; <email xmlns='http://docbook.org/ns/docbook'>mjg@FreeBSD.org</email>">
+<!ENTITY a.mjoras "Matt Joras">
+<!ENTITY a.mjoras.email "&a.mjoras; <email xmlns='http://docbook.org/ns/docbook'>mjoras@FreeBSD.org</email>">
+
<!ENTITY a.mks "Mike Spengler">
<!ENTITY a.mks.email "&a.mks; <email xmlns='http://docbook.org/ns/docbook'>mks@FreeBSD.org</email>">
Index: share/xml/news.xml
===================================================================
--- share/xml/news.xml
+++ share/xml/news.xml
@@ -52,6 +52,16 @@
</day>
<day>
+ <name>12</name>
+
+ <event>
+ <p>New committer:
+ <a href="mailto:mjoras@FreeBSD.org">Matt Joras</a>
+ (src)</p>
+ </event>
+ </day>
+
+ <day>
<name>8</name>
<event>

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 27, 4:56 PM (15 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26259380
Default Alt Text
D11670.id31004.diff (4 KB)

Event Timeline