From 3ed1f7ea58a26274ca25e065eea5ecf92d5fbc9c Mon Sep 17 00:00:00 2001
From: Nik Clayton <nik@FreeBSD.org>
Date: Wed, 11 Jul 2001 14:08:50 +0000
Subject: [PATCH] Favour <command> over <literal> when talking about CVS
 subcommands.

PR:		docs/28731
Submitted by:	Giorgos Keramidas <keramida@ceid.upatras.gr>
---
 .../articles/committers-guide/article.sgml    | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 6865c416cb..4995e4d784 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -19,7 +19,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.74 2001/07/08 01:17:53 dd Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.75 2001/07/11 13:22:17 nik Exp $</pubdate>
 
     <copyright>
       <year>1999</year>
@@ -123,7 +123,7 @@
 
     <para>Note that when you use CVS on <hostid>freefall</hostid>, you
       should set your <literal>umask</literal> to <literal>2</literal>,
-      as well as setting the <literal>CVSUMASK</literal> environment
+      as well as setting the <envar>CVSUMASK</envar> environment
       variable to <literal>2</literal>.  This ensures that any new
       files created by <command>cvs add</command> will have the correct
       permissions.  If you add a file or directory and discover that the
@@ -165,8 +165,8 @@
 
     <orderedlist>
       <listitem>
-        <para>Check out a module with the <literal>co</literal> or
-	  <literal>checkout</literal> command.</para>
+        <para>Check out a module with the <command>co</command> or
+	  <command>checkout</command> command.</para>
 
         <screen>&prompt.user; <userinput>cvs checkout shazam</userinput></screen>
 
@@ -306,7 +306,7 @@
 
       <listitem>
         <para>Check the status of checked-out files with the
-          <literal>status</literal> command.</para>
+          <command>status</command> command.</para>
 
         <screen>&prompt.user; <userinput>cvs status shazam</userinput></screen>
 
@@ -358,7 +358,7 @@
 
       <listitem>
         <para>Once you've checked something out, update it with the
-          <literal>update</literal> command.</para>
+          <command>update</command> command.</para>
 
         <screen>&prompt.user; <userinput>cvs update shazam</userinput></screen>
 
@@ -370,7 +370,7 @@
           stuff is going on.</para>
 
         <para>Useful options, in addition to those listed above for
-          <literal>checkout</literal>:</para>
+          <command>checkout</command>:</para>
 
         <informaltable frame="none">
           <tgroup cols=2>
@@ -519,16 +519,16 @@
         </itemizedlist>
 
         <para>You'll almost certainly get a conflict because
-          of the <literal>$Id: article.sgml,v 1.75 2001-07-11 13:22:17 nik Exp $</literal> (or in FreeBSD's case,
+          of the <literal>$Id: article.sgml,v 1.76 2001-07-11 14:08:50 nik Exp $</literal> (or in FreeBSD's case,
           <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
           the file to resolve the conflict (remove the marker lines and
-          the second <literal>$Id: article.sgml,v 1.75 2001-07-11 13:22:17 nik Exp $</literal> line, leaving the original
-          <literal>$Id: article.sgml,v 1.75 2001-07-11 13:22:17 nik Exp $</literal> line intact).</para>
+          the second <literal>$Id: article.sgml,v 1.76 2001-07-11 14:08:50 nik Exp $</literal> line, leaving the original
+          <literal>$Id: article.sgml,v 1.76 2001-07-11 14:08:50 nik Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
         <para>View differences between the local version and the
-          repository version with the <literal>diff</literal>
+          repository version with the <command>diff</command>
           command.</para>
 
         <screen>&prompt.user; <userinput>cvs diff shazam</userinput></screen>
@@ -569,7 +569,7 @@
         <para>You can also diff against a different version
           than the one you checked out by specifying a version
           with <option>-r</option> or <option>-D</option> as in
-          <literal>checkout</literal> or <literal>update</literal>,
+          <command>checkout</command> or <command>update</command>,
           or even view the diffs between two arbitrary versions
           (with no regard for what you have locally) by specifying
           <emphasis>two</emphasis> versions with <option>-r</option> or
@@ -577,7 +577,7 @@
       </listitem>
 
       <listitem>
-        <para>View log entries with the <literal>log</literal>
+        <para>View log entries with the <command>log</command>
           command.</para>
 
         <screen>&prompt.user; <userinput>cvs log shazam</userinput></screen>
@@ -595,15 +595,15 @@
         <para>If <filename>shazam</filename> is a directory, then the log
           information described above is printed for each file in the
           directory in turn.  Unless you give the <option>-l</option> to
-          <literal>log</literal>, the log for all subdirectories of
+          <command>log</command>, the log for all subdirectories of
           <filename>shazam</filename> is printed too, in a recursive
           manner.</para>
 
-        <para>Use the <literal>log</literal> command to view the history of
+        <para>Use the <command>log</command> command to view the history of
           one or more files, as it's stored in the CVS repository.  You can
           even use it to view the log message of a specific revision, if you
           add the <option>-r<replaceable>rev</replaceable></option> to the
-          <literal>log</literal> command:</para>
+          <command>log</command> command:</para>
 
         <screen>&prompt.user; <userinput>cvs log -r1.2 shazam</userinput></screen>
 
@@ -615,7 +615,7 @@
       </listitem>
 
       <listitem>
-        <para>See who did what with the <literal>annotate</literal> command.
+        <para>See who did what with the <command>annotate</command> command.
           This command shows you each line of the specified file or
           files, along with which user most recently changed that
           line.</para>
@@ -624,7 +624,7 @@
       </listitem>
 
       <listitem>
-        <para>Add new files with the <literal>add</literal> command.</para>
+        <para>Add new files with the <command>add</command> command.</para>
 
         <para>Create the file, <command>cvs add</command> it, then
           <command>cvs commit</command> it.</para>
@@ -635,15 +635,15 @@
       </listitem>
 
       <listitem>
-        <para>Remove obsolete files with the <literal>remove</literal> command.</para>
+        <para>Remove obsolete files with the <command>remove</command> command.</para>
 
         <para>Remove the file, then <command>cvs rm</command> it, then
           <command>cvs commit</command> it.</para>
       </listitem>
 
       <listitem>
-        <para>Commit with the <literal>commit</literal> or
-          <literal>checkin</literal> command.</para>
+        <para>Commit with the <command>commit</command> or
+          <command>checkin</command> command.</para>
 
         <table frame="none">
 	  <title>Useful <command>cvs commit</command> options</title>