Bug 31412

Summary: [PATCH] Minor modifications to cvsup-advanced article
Product: Documentation Reporter: Salvo Bartolotta <bartequi>
Component: Books & ArticlesAssignee: freebsd-doc (Nobody) <doc>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   

Description Salvo Bartolotta 2001-10-21 20:00:01 UTC
 There are minor format problems; I gather that "information identifying
 your 4-STABLE sources" sounds better than "identification information on
 your 4-STABLE sources" (somewhat clumsy).

Fix: 

The attached patch should fix the problems.
---MOQ10036906211f411000eb18769ec3e08b0624b93fdb
Content-Type: application/octet-stream; name="patch"
Content-Transfer-Encoding: base64
Content-Disposition: inline; filename="patch"


PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQpSQ1MgZmlsZTogL215anVuay9ob21lL25jdnMvZG9jL2VuX1VTLklTTzg4NTkt
MS9hcnRpY2xlcy9jdnN1cC1hZHZhbmNlZC9hcnRpY2xlLnNnbWwsdgpyZXRyaWV2aW5nIHJldmlz
aW9uIDEuMgpkaWZmIC11IC1yMS4yIGFydGljbGUuc2dtbAotLS0gYXJ0aWNsZS5zZ21sCTIwMDEv
MTAvMTUgMTM6MjE6NTIJMS4yCisrKyBhcnRpY2xlLnNnbWwJMjAwMS8xMC8yMSAxODoyNjoyMwpA
QCAtMTE1LDEzICsxMTUsMTEgQEAKIAlweXRob24gYW5kIHVwZGF0aW5nIHlvdXIgc291cmNlcyAo
ZWcgPGZpbGVuYW1lPi91c3IvcG9ydHM8L2ZpbGVuYW1lPiksCiAJeW91IGNhbiBjaGVjayB0aGVt
IHRodXM6PC9wYXJhPgogCi0gICAgICAgIDxzY3JlZW4+JnByb21wdC51c2VyOyA8ZmlsZW5hbWU+
L3BhdGgvdG8vPC9maWxlbmFtZT48dXNlcmlucHV0PmN2c3VwY2hrCi0tZCAvdXNyIC1jIC91c3Iv
c3VwL3BvcnRzLWFsbC9jaGVja291dHMuY3ZzOi4gfCBtb3JlPC91c2VyaW5wdXQ+PC9zY3JlZW4+
CisgICAgICAgIDxzY3JlZW4+JnByb21wdC51c2VyOyA8ZmlsZW5hbWU+L3BhdGgvdG8vPC9maWxl
bmFtZT48dXNlcmlucHV0PmN2c3VwY2hrIC1kIC91c3IgLWMgL3Vzci9zdXAvcG9ydHMtYWxsL2No
ZWNrb3V0cy5jdnM6LiB8IG1vcmU8L3VzZXJpbnB1dD48L3NjcmVlbj4KIAogICAgICAgPHBhcmE+
SWYgeW91IHdhbnQgdG8gY2hlY2sgeW91ciBSRUxFTkdfNCBzb3VyY2VzOjwvcGFyYT4KIAotICAg
ICAgICA8c2NyZWVuPiZwcm9tcHQudXNlcjsgPGZpbGVuYW1lPi9wYXRoL3RvLzwvZmlsZW5hbWU+
PHVzZXJpbnB1dD5jdnN1cGNoawotLWQgL3VzciAtYyAvdXNyL3N1cC9zcmMtYWxsL2NoZWNrb3V0
cy5jdnM6UkVMRU5HXzQgfCBtb3JlPC91c2VyaW5wdXQ+PC9zY3JlZW4+CisgICAgICAgIDxzY3Jl
ZW4+JnByb21wdC51c2VyOyA8ZmlsZW5hbWU+L3BhdGgvdG8vPC9maWxlbmFtZT48dXNlcmlucHV0
PmN2c3VwY2hrIC1kIC91c3IgLWMgL3Vzci9zdXAvc3JjLWFsbC9jaGVja291dHMuY3ZzOlJFTEVO
R180IHwgbW9yZTwvdXNlcmlucHV0Pjwvc2NyZWVuPgogCiAgICAgICA8cGFyYT5JbiBlYWNoIGNh
c2UsIGN2c3VwY2hrIHdpbGwgaW5zcGVjdCB5b3VyIHNvdXJjZXMgZm9yIAogCWluY29uc2lzdGVu
Y2llcyBieSB1dGlsaXppbmcgdGhlIGluZm9ybWF0aW9uIGNvbnRhaW5lZCBpbiB0aGUgCkBAIC0x
NDYsOCArMTQ0LDggQEAKIAkgIGEgY2hlY2tvdXRzIGZpbGUgY2FsbGVkIDxmaWxlbmFtZT5jaGVj
a291dHMuY3ZzOkE8L2ZpbGVuYW1lPjogCiAJICBmb3IgaW5zdGFuY2UsIGlmIHRhZz1SRUxFTkdf
NCwgYSBjaGVja291dHMgZmlsZSBjYWxsZWQKICAgICAgICAgICA8ZmlsZW5hbWU+Y2hlY2tvdXRz
LmN2czpSRUxFTkdfNDwvZmlsZW5hbWU+IGlzIGdlbmVyYXRlZC4gCi0JICAgVGhpcyBmaWxlIHdp
bGwgYmUgdXNlZCB0byByZXRyaWV2ZSBhbmQvb3Igc3RvcmUgaWRlbnRpZmljYXRpb24KLQkgICBp
bmZvcm1hdGlvbiBvbiB5b3VyIDQtU1RBQkxFIHNvdXJjZXMuPC9wYXJhPgorCSAgIFRoaXMgZmls
ZSB3aWxsIGJlIHVzZWQgdG8gcmV0cmlldmUgYW5kL29yIHN0b3JlIGluZm9ybWF0aW9uCisJICAg
aWRlbnRpZnlpbmcgeW91ciA0LVNUQUJMRSBzb3VyY2VzLjwvcGFyYT4KIAogICAgICAgICAgPHBh
cmE+V2hlbiB0cmFja2luZyA8bGl0ZXJhbD5zcmMtYWxsPC9saXRlcmFsPiwgaWYgeW91IHdpc2gg
dG8KIAkgICBwYXNzIGZyb20gdGFnPUEgdG8gdGFnPUIgKEEgbGVzcy9ncmVhdGVyIHRoYW4gQiBu
b3QgbWFraW5nIApAQCAtMjI2LDE1ICsyMjQsMTQgQEAKIAkgICB5b3Ugd3JpdGUgdGhlIGxpbmU6
PC9wYXJhPgogCiAKLSAgICAgICAgIDxwcm9ncmFtbGlzdGluZz5zcmMtYWxsIHRhZz1SRUxFTkdf
NAotZGF0ZT0yMDAwLjA4LjI3LjEwLjAwLjAwPC9wcm9ncmFtbGlzdGluZz4KKyAgICAgICAgIDxw
cm9ncmFtbGlzdGluZz5zcmMtYWxsIHRhZz1SRUxFTkdfNCBkYXRlPTIwMDAuMDguMjcuMTAuMDAu
MDA8L3Byb2dyYW1saXN0aW5nPgogCi0gICAgICAgICA8cGFyYT5OLkIuIFRoZSBmb3JtYXQgb2Yg
YSBkYXRlIGlzIHJpZ2lkLiBZb3UgaGF2ZSB0byBzcGVjaWZ5IAorICAgICAgICAgPG5vdGU+PHBh
cmE+VGhlIGZvcm1hdCBvZiBhIGRhdGUgaXMgcmlnaWQuIFlvdSBoYXZlIHRvIHNwZWNpZnkgCiAJ
ICAgYWxsIHRoZSBjb21wb25lbnRzIG9mIHRoZSBkYXRlOiBjZW50dXJ5ICgyMCwgaWUgdGhlIDIw
dGggCiAJICAgY2VudHVyeSwgbXVzdCBiZSBzdXBwbGllZCB3aGVyZWFzIDE5LCB0aGUgcGFzdCBj
ZW50dXJ5LCBjYW4gCiAJICAgYmUgb21pdHRlZCksIHllYXIsIG1vbnRoLCBkYXksIGhvdXIsIG1p
bnV0ZXMsIHNlY29uZHMgLS0gYXMgCiAJICAgc2hvd24gaW4gdGhlIGFib3ZlIGV4YW1wbGUuICBG
b3IgbW9yZSBpbmZvcm1hdGlvbiwgcGxlYXNlIAotCSAgIHNlZSAmbWFuLmN2c3VwLjE7LjwvcGFy
YT4KKwkgICBzZWUgJm1hbi5jdnN1cC4xOy48L3BhcmE+PC9ub3RlPgogCiAgICAgICAgICA8cGFy
YT5XaGV0aGVyIG9yIG5vdCBhIGRhdGUgaXMgc3BlY2lmaWVkLCB0aGUgY2hlY2tvdXRzIGZpbGUg
CiAJICAgaXMgY2FsbGVkIDxmaWxlbmFtZT5jaGVja291dHMuY3ZzOkE8L2ZpbGVuYW1lPiAoZWcK


---MOQ10036906211f411000eb18769ec3e08b0624b93fdb--
How-To-Repeat: Read the aforementioned article. :-)
Comment 1 Salvo Bartolotta 2001-10-21 20:21:09 UTC
>Submitter-Id:  current-users
>Originator:    Salvo Bartolotta
>Organization:  none of importance
>Confidential:  no
>Synopsis:      [PATCH] Minor modifications to cvsup-advanced article
>Severity:      non-critical
>Priority:      low
>Category:      docs
>Class:         doc-bug
>Release:       FreeBSD 4.4-STABLE i386
>Environment:
System: FreeBSD 4.4-STABLE FreeBSD 4.4-STABLE #0: Sat Sep 29 12:25:01 CEST 2001
>Description:
There are minor format problems (certain commands/instructions should stay on 
one single line; I gather that "information identifying your 4-STABLE sources" 
sounds better than "identification information on your 4-STABLE sources" 
(somewhat clumsy).
>How-To-Repeat:
Read the aforementioned article. :-)
>Fix:
[ Resent *sigh* ] The patch follows below (No MIME this time).

===================================================================
RCS file: 
/myjunk/home/ncvs/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml,v
retrieving revision 1.2
diff -u -r1.2 article.sgml
--- article.sgml        2001/10/15 13:21:52     1.2
+++ article.sgml        2001/10/21 18:26:23
@@ -115,13 +115,11 @@
        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 @@
          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 @@
           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
Comment 2 Murray Stokely freebsd_committer freebsd_triage 2001-10-23 21:40:36 UTC
State Changed
From-To: open->closed

Your change has been applied to r1.3 of article.sgml.  Thanks for the 
submission!