svn commit: r47025 - head/en_US.ISO8859-1/articles/committers-guide

[Patrick Kelsey]

Author: pkelsey (src committer)
Date: Mon Jul 20 18:27:34 2015
New Revision: 47025
URL: https://svnweb.freebsd.org/changeset/doc/47025

Log:
  Remove trailing "@" from team approval example in Committer's Guide,
  plus incorporate additional content and formatting suggestions made by
  wblock.
  
  Differential Revision: https://reviews.freebsd.org/D3128
  Reviewed by: wblock
  Approved by: doceng (wblock)
  Approved by: jmallett (mentor)

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

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Mon Jul 20 18:14:54 2015	(r47024)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Mon Jul 20 18:27:34 2015	(r47025)
@@ -2489,16 +2489,17 @@ ControlPersist yes</screen>
 	      <emphasis>must</emphasis> be approved by the release
 	      engineering team.</para>
 
-	    <para>If these are your first commits then you should have
-	      passed them past your mentor first, and you should list
-	      your mentor, as in
-	      ``<replaceable>username-of-mentor</replaceable>
-	      <literal>(mentor)</literal>''.</para>
+	    <para>While under mentorship, get mentor approval before
+	      the commit.  Enter the mentor's username in this field,
+	      and note that they are a mentor:</para>
+
+	    <screen>Approved by: <userinput><replaceable>username-of-mentor</replaceable> <literal>(mentor)</literal></userinput></screen>
 
 	    <para>If a team approved these commits then include the
 	      team name followed by the username of the approver in
-	      parentheses.  For example: ``<replaceable>re@
-		(username)</replaceable>``</para></entry>
+	      parentheses.  For example:</para>
+
+	    <screen>Approved by: <userinput><literal>re</literal> (<replaceable>username</replaceable>)</userinput></screen></entry>
 	  </row>
 
 	  <row>