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

[Glen Barber]

Author: gjb
Date: Wed May 30 00:33:27 2012
New Revision: 38938
URL: http://svn.freebsd.org/changeset/doc/38938

Log:
  Add trailing comma to 'i.e.' and 'e.g.'.
  Fix a typo.
  
  Translators can likely ignore this change.

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

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.sgml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.sgml	Wed May 30 00:05:46 2012	(r38937)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.sgml	Wed May 30 00:33:27 2012	(r38938)
@@ -315,7 +315,7 @@
       <literal>CVSROOT</literal> when distributed via
       <application>CVSup</application> for the convenience of our
       users.  The <literal>src</literal> tree is automatically
-      exported to CVS for compatibility reasons only (e.g.
+      exported to CVS for compatibility reasons only (e.g.,
       <application>CVSup</application>).  The <quote>official</quote>
       <literal>src</literal> repository is not stored in
       <application>CVS</application> but in Subversion.  The official
@@ -542,7 +542,7 @@ alias projcvs cvs -d <replaceable>user</
 	  <filename>.svn</filename>.</para>
 
 	<para>Arguments to <option>-D</option> and <option>-r</option>
-	  are sticky, which means cvs will remember them later, e.g.
+	  are sticky, which means cvs will remember them later, e.g.,
 	  when you do a <command>cvs update</command>.</para>
       </listitem>
 
@@ -1048,7 +1048,7 @@ checkout -P</programlisting>
 	    commit</command> and insert it into the commit message or
 	  save it in a file before committing and use the
 	  <option>-F</option> option of CVS to read the commit message
-	  from that file, i.e.</para>
+	  from that file, i.e.,</para>
 
 	  <screen>&prompt.user; <userinput>vi logmsg</userinput>
 &prompt.user; <userinput>cvs ci -F logmsg shazam</userinput></screen>
@@ -1290,7 +1290,7 @@ Host projcvs.FreeBSD.org
 
 	<para>Any path can be used, not just the one in the example
 	  above.  A common pattern is to place mirrors under
-	  <literal>//mirror</literal>, e.g.
+	  <literal>//mirror</literal>, e.g.,
 	  <filename
 	    class="directory">//mirror/freebsd/base/</filename>, and
 	  local branches under <literal>//local</literal>.</para>
@@ -2348,9 +2348,9 @@ $target - head/$source:$P,$Q,$R</screen>
 	    <title>Bootstrapping merge history</title>
 
 	    <para>If importing for the first time after the switch to
-	      Subversion, bootstrapping
+	      Subversion, bootstrap
 	      <literal>svn:mergeinfo</literal> on the target directory
-	      in the main tree to the to the revision that corresponds
+	      in the main tree to the revision that corresponds
 	      to the last related change to the vendor tree, prior to
 	      importing new sources:</para>
 
@@ -2477,7 +2477,7 @@ $target - head/$source:$P,$Q,$R</screen>
 
 	  <para>The <literal>--no-diff-deleted</literal> tells
 	    Subversion not to complain about files that are in the
-	    vendor tree but not in the main tree, i.e. things that
+	    vendor tree but not in the main tree, i.e., things that
 	    would have previously been removed before the vendor
 	    import, like for example the like the vendor's makefiles
 	    and configure scripts.</para>
@@ -2753,7 +2753,7 @@ $target - head/$source:$P,$Q,$R</screen>
 	count as abuse of the working copy client code!</para>
 
       <para>Checking out a working copy with a stock Subversion client
-	withouth &os;-specific patches
+	without &os;-specific patches
 	(<makevar>WITH_FREEBSD_TEMPLATE</makevar>) will mean that
 	<literal>&dollar;FreeBSD&dollar;</literal> tags will not be
 	expanded.  Once the correct version has been installed, trick
@@ -2772,7 +2772,7 @@ $target - head/$source:$P,$Q,$R</screen>
 
     <para>As a new developer there are a number of things you should do
       first.  The first set is specific to committers only.  (If you are
-      not a committer, e.g. have GNATS-only access, then your mentor needs
+      not a committer, e.g., have GNATS-only access, then your mentor needs
       to do these things for you.)</para>
 
     <sect2 id="conventions-committers">
@@ -2854,7 +2854,7 @@ $target - head/$source:$P,$Q,$R</screen>
 	<note>
 	  <para>It is important to have an up-to-date PGP/GnuPG key in
 	    the Handbook, since the key may be required for positive
-	    identification of a committer, e.g. by the &a.admins; for
+	    identification of a committer, e.g., by the &a.admins; for
 	    account recovery.  A complete keyring of <hostid
 	    role="domainname">FreeBSD.org</hostid> users is available
 	    for download from <ulink
@@ -3310,7 +3310,7 @@ $target - head/$source:$P,$Q,$R</screen>
 	    when they are short and are directly related to a commit.</para>
 
 	  <para>There is a similar list, svn-committers, which has a
-	    similar purpose but is a normal list, i.e. you are free to
+	    similar purpose but is a normal list, i.e., you are free to
 	    send any suitable message to this list.</para>
 	</listitem>
       </varlistentry>
@@ -4447,7 +4447,7 @@ $target - head/$source:$P,$Q,$R</screen>
 		      In some rare cases it may be necessary to change the
 		      <makevar>PORTNAME</makevar> instead of
 		      <makevar>LATEST_LINK</makevar>, but this should only
-		      be done when it is really needed &mdash; e.g. using
+		      be done when it is really needed &mdash; e.g., using
 		      an existing port as the base for a very similar
 		      program with a different name, or upgrading a port to
 		      a new upstream version which actually changes the