diff --git a/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml b/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml
index a159b91332..f30e86a2d9 100644
--- a/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml
+++ b/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml
@@ -115,13 +115,11 @@ FAQ</ulink>,
 	python and updating your sources (eg <filename>/usr/ports</filename>),
 	you can check them thus:</para>
 
-        <screen>&prompt.user; <filename>/path/to/</filename><userinput>cvsupchk
--d /usr -c /usr/sup/ports-all/checkouts.cvs:. | more</userinput></screen>
+        <screen>&prompt.user; <filename>/path/to/</filename><userinput>cvsupchk -d /usr -c /usr/sup/ports-all/checkouts.cvs:. | more</userinput></screen>
 
       <para>If you want to check your RELENG_4 sources:</para>
 
-        <screen>&prompt.user; <filename>/path/to/</filename><userinput>cvsupchk
--d /usr -c /usr/sup/src-all/checkouts.cvs:RELENG_4 | more</userinput></screen>
+        <screen>&prompt.user; <filename>/path/to/</filename><userinput>cvsupchk -d /usr -c /usr/sup/src-all/checkouts.cvs:RELENG_4 | more</userinput></screen>
 
       <para>In each case, cvsupchk will inspect your sources for 
 	inconsistencies by utilizing the information contained in the 
@@ -146,8 +144,8 @@ FAQ</ulink>,
 	  a checkouts file called <filename>checkouts.cvs:A</filename>: 
 	  for instance, if tag=RELENG_4, a checkouts file called
           <filename>checkouts.cvs:RELENG_4</filename> is generated. 
-	   This file will be used to retrieve and/or store identification
-	   information on your 4-STABLE sources.</para>
+           This file will be used to retrieve and/or store information
+           identifying your 4-STABLE sources.</para>
 
          <para>When tracking <literal>src-all</literal>, if you wish to
 	   pass from tag=A to tag=B (A less/greater than B not making 
@@ -226,15 +224,14 @@ checkouts.cvs:B</userinput>
 	   you write the line:</para>
 
 
-         <programlisting>src-all tag=RELENG_4
-date=2000.08.27.10.00.00</programlisting>
+         <programlisting>src-all tag=RELENG_4 date=2000.08.27.10.00.00</programlisting>
 
-         <para>N.B. The format of a date is rigid. You have to specify 
+         <note><para>The format of a date is rigid. You have to specify 
 	   all the components of the date: century (20, ie the 20th 
 	   century, must be supplied whereas 19, the past century, can 
 	   be omitted), year, month, day, hour, minutes, seconds -- as 
 	   shown in the above example.  For more information, please 
-	   see &man.cvsup.1;.</para>
+	   see &man.cvsup.1;.</para></note>
 
          <para>Whether or not a date is specified, the checkouts file 
 	   is called <filename>checkouts.cvs:A</filename> (eg