svn commit: r46440 - in head: en_US.ISO8859-1/articles/committers-guide share/xml

[Eitan Adler]

Author: eadler
Date: Fri Apr  3 01:33:54 2015
New Revision: 46440
URL: https://svnweb.freebsd.org/changeset/doc/46440

Log:
  committer-guide:
  	- move perks into a question rather than its own section
  	- stop directing people to email me directly and instead direct people
  	  to email the liasion alias

Modified:
  head/en_US.ISO8859-1/articles/committers-guide/article.xml
  head/share/xml/authors.ent

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Fri Apr  3 01:18:57 2015	(r46439)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Fri Apr  3 01:33:54 2015	(r46440)
@@ -3531,7 +3531,7 @@ Relnotes:           yes</programlisting>
       <title>Policy on Multiple Architectures</title>
 
       <para>&os; has added several new architecture ports during
-	recent release cycles and is truly no longer an &i386; centric
+	recent release cycles and is truly no longer a &i386; centric
 	operating system.  In an effort to make it easier to keep
 	&os; portable across the platforms we support, core has
 	developed the following mandate:</para>
@@ -4869,45 +4869,6 @@ Do you want to commit? (no = start a she
     </sect2>
   </sect1>
 
-  <sect1 xml:id="perks">
-    <title>Perks of the Job</title>
-
-    <para>Unfortunately, there are not many perks involved with being
-      a committer.  Recognition as a competent software engineer is
-      probably the only thing that will be of benefit in the long run.
-      However, there are at least some perks:</para>
-
-    <variablelist>
-      <varlistentry>
-	<term>Free 4-CD and DVD Sets</term>
-
-	<listitem>
-	  <para>&os; committers can get a free 4-CD or DVD set at
-	    conferences from
-	    <link xlink:href="http://www.freebsdmall.com">&os; Mall,
-	      Inc.</link>.  The sets are no longer available as a
-	    subscription due to the high shipment costs to countries
-	    outside the USA.</para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>Freenode IRC Cloaks</term>
-
-	<listitem>
-	  <para>&os; developers may request a cloaked hostmask for
-	    their account on the Freenode IRC network in the form of
-	    <literal>freebsd/developer/</literal><replaceable>freefall
-	      name</replaceable> or
-	    <literal>freebsd/developer/</literal><replaceable>NickServ
-	      name</replaceable>.  To request a cloak, send an email
-	    to &a.eadler.email; with your requested hostmask and
-	    NickServ account name.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-  </sect1>
-
   <sect1 xml:id="misc">
     <title>Miscellaneous Questions</title>
 
@@ -5001,6 +4962,34 @@ Do you want to commit? (no = start a she
 	    internal pages.</para>
 	</answer>
       </qandaentry>
+
+      <qandaentry>
+	<question>
+	  <para>Are there any perks of being an &os; committer?</para>
+	</question>
+	
+	<answer>
+	  <para>Recognition as a competent software engineer is the
+	    longest lasting value.  In addition, getting to a chance
+	    to work with some of the best people that every engineer
+	    would dream to meet is a great perk!</para>
+
+	  <para>&os; committers can get a free 4-CD or DVD set at
+	    conferences from
+	    <link xlink:href="http://www.freebsdmall.com">&os; Mall,
+	      Inc.</link>.</para>
+
+	  <para>In addition, developers may request a cloaked hostmask
+	    for their account on the Freenode IRC network in the form
+	    of
+	    <literal>freebsd/developer/</literal><replaceable>freefall name</replaceable>
+	    or
+	    <literal>freebsd/developer/</literal><replaceable>NickServ name</replaceable>.
+	    To request a cloak, send an email
+	    to &a.irc.email; with your requested hostmask and
+	    NickServ account name.</para>
+	</answer>
+      </qandaentry>
     </qandaset>
   </sect1>
 </article>

Modified: head/share/xml/authors.ent
==============================================================================
--- head/share/xml/authors.ent	Fri Apr  3 01:18:57 2015	(r46439)
+++ head/share/xml/authors.ent	Fri Apr  3 01:33:54 2015	(r46440)
@@ -2361,6 +2361,9 @@
 <!-- FreeBSD Donations Liaison -->
 <!ENTITY a.donations.members '&a.tabthorpe;, &a.gjb;, &a.gahr;, &a.pgollucci;, &a.skreuzer;, &a.obrien;, &a.trhodes;, &a.ds;, &a.rwatson;'>
 
+<!-- FreeBSD Freenode IRC Liasons -->
+<!ENTITY a.irc.email "<email xmlns='http://docbook.org/ns/docbook'>irc at FreeBSD.org</email>">
+
 <!-- FreeBSD Ports Manager Team -->
 <!ENTITY a.portmgr.members '&a.mat;, &a.antoine;, &a.bapt;, &a.bdrewery;, &a.erwin;, &a.swills;'>