diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 2f3d424df7..dfebf6ba9f 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -16,7 +16,7 @@ - $Date: 2000-07-26 01:17:18 $ + $Date: 2000-07-26 17:53:17 $ 1999 @@ -166,13 +166,14 @@ - Check out a module with the "co" or "checkout" command. + Check out a module with the co or + checkout command. &prompt.user; cvs checkout shazam - This checks out a copy of the "shazam" module. If - there is no "shazam" module in the modules file, looks for a - top-level directory named "shazam" instead. + This checks out a copy of the shazam module. If + there is no shazam module in the modules file, looks for a + top-level directory named shazam instead. Useful options: @@ -239,7 +240,7 @@ &prompt.user; cvs co -P miscfs You now have a directory named - miscfs with sub- directories + miscfs with subdirectories CVS, deadfs, devfs... but note that there is no linprocfs subdirectory, because there @@ -306,7 +307,7 @@ Check the status of checked-out files with the - command command. + status command. &prompt.user; cvs status shazam @@ -519,11 +520,11 @@ You'll almost certainly get a conflict because - of the $Id: article.sgml,v 1.29 2000-07-26 01:17:18 ben Exp $ (or in FreeBSD's case, - $FreeBSD$) lines, so you'll have to edit + of the $Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $ (or in FreeBSD's case, + $FreeBSD$) lines, so you'll have to edit the file to resolve the conflict (remove the marker lines and - the second $Id: article.sgml,v 1.29 2000-07-26 01:17:18 ben Exp $ line, leaving the original - $Id: article.sgml,v 1.29 2000-07-26 01:17:18 ben Exp $ line intact). + the second $Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $ line, leaving the original + $Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $ line intact). @@ -744,7 +745,7 @@ checkout -P CVS is old, arcane, crufty and buggy, and sometimes exhibits non-deterministic behavior which some claim as proof that it's actually merely the newtonian manifestation of a - sentient trans- dimensional entity. It's not humanly possible + sentient transdimensional entity. It's not humanly possible to know its every quirk inside out, so don't be afraid to ask the resident AI (cvs@FreeBSD.org) for help when you screw up. diff --git a/en_US.ISO_8859-1/articles/committers-guide/article.sgml b/en_US.ISO_8859-1/articles/committers-guide/article.sgml index 2f3d424df7..dfebf6ba9f 100644 --- a/en_US.ISO_8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO_8859-1/articles/committers-guide/article.sgml @@ -16,7 +16,7 @@ - $Date: 2000-07-26 01:17:18 $ + $Date: 2000-07-26 17:53:17 $ 1999 @@ -166,13 +166,14 @@ - Check out a module with the "co" or "checkout" command. + Check out a module with the co or + checkout command. &prompt.user; cvs checkout shazam - This checks out a copy of the "shazam" module. If - there is no "shazam" module in the modules file, looks for a - top-level directory named "shazam" instead. + This checks out a copy of the shazam module. If + there is no shazam module in the modules file, looks for a + top-level directory named shazam instead. Useful options: @@ -239,7 +240,7 @@ &prompt.user; cvs co -P miscfs You now have a directory named - miscfs with sub- directories + miscfs with subdirectories CVS, deadfs, devfs... but note that there is no linprocfs subdirectory, because there @@ -306,7 +307,7 @@ Check the status of checked-out files with the - command command. + status command. &prompt.user; cvs status shazam @@ -519,11 +520,11 @@ You'll almost certainly get a conflict because - of the $Id: article.sgml,v 1.29 2000-07-26 01:17:18 ben Exp $ (or in FreeBSD's case, - $FreeBSD$) lines, so you'll have to edit + of the $Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $ (or in FreeBSD's case, + $FreeBSD$) lines, so you'll have to edit the file to resolve the conflict (remove the marker lines and - the second $Id: article.sgml,v 1.29 2000-07-26 01:17:18 ben Exp $ line, leaving the original - $Id: article.sgml,v 1.29 2000-07-26 01:17:18 ben Exp $ line intact). + the second $Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $ line, leaving the original + $Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $ line intact). @@ -744,7 +745,7 @@ checkout -P CVS is old, arcane, crufty and buggy, and sometimes exhibits non-deterministic behavior which some claim as proof that it's actually merely the newtonian manifestation of a - sentient trans- dimensional entity. It's not humanly possible + sentient transdimensional entity. It's not humanly possible to know its every quirk inside out, so don't be afraid to ask the resident AI (cvs@FreeBSD.org) for help when you screw up.