os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix some stupid mistakes I made when adding des' CVS primer:

Browse source 
* $FreeBSD$ shouldn't be expanded when used in the explanation of
   conflicts.
 * Add some markup bits I missed, fix typoes, fix broken hyphenation
   caused by joining lines together which had hyphenated words split over
   them.
This commit is contained in:
Ben Smithurst 2000-07-26 17:53:17 +00:00
parent 115a84d651
commit ff5aaba5d8
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=7729
2 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -16,7 +16,7 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>$Date: 2000-07-26 01:17:18 $</pubdate> <pubdate>$Date: 2000-07-26 17:53:17 $</pubdate>
<copyright> <copyright>
<year>1999</year> <year>1999</year>
@ -166,13 +166,14 @@
<orderedlist> <orderedlist>
<listitem> <listitem>
<para>Check out a module with the "co" or "checkout" command.</para> <para>Check out a module with the <literal>co</literal> or
<literal>checkout</literal> command.</para>
<screen>&prompt.user; <userinput>cvs checkout shazam</userinput></screen> <screen>&prompt.user; <userinput>cvs checkout shazam</userinput></screen>
<para>This checks out a copy of the "shazam" module. If <para>This checks out a copy of the <filename>shazam</filename> module. If
there is no "shazam" module in the modules file, looks for a there is no <filename>shazam</filename> module in the modules file, looks for a
top-level directory named "shazam" instead.</para> top-level directory named <filename>shazam</filename> instead.</para>
<para>Useful options:</para> <para>Useful options:</para>
@ -239,7 +240,7 @@
<screen>&prompt.user; <userinput>cvs co -P miscfs</userinput></screen> <screen>&prompt.user; <userinput>cvs co -P miscfs</userinput></screen>
<para>You now have a directory named <para>You now have a directory named
<filename>miscfs</filename> with sub- directories <filename>miscfs</filename> with subdirectories
<filename>CVS</filename>, <filename>deadfs</filename>, <filename>CVS</filename>, <filename>deadfs</filename>,
<filename>devfs</filename>... but note that there is no <filename>devfs</filename>... but note that there is no
<filename>linprocfs</filename> subdirectory, because there <filename>linprocfs</filename> subdirectory, because there
@ -306,7 +307,7 @@
<listitem> <listitem>
<para>Check the status of checked-out files with the <para>Check the status of checked-out files with the
<literal>command</literal> command.</para> <literal>status</literal> command.</para>
<screen>&prompt.user; <userinput>cvs status shazam</userinput></screen> <screen>&prompt.user; <userinput>cvs status shazam</userinput></screen>
@ -519,11 +520,11 @@
</itemizedlist> </itemizedlist>
<para>You'll almost certainly get a conflict because <para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.29 2000-07-26 01:17:18 ben Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD$</literal>) lines, so you'll have to edit <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.29 2000-07-26 01:17:18 ben Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.29 2000-07-26 01:17:18 ben Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -744,7 +745,7 @@ checkout -P</programlisting>
<para>CVS is old, arcane, crufty and buggy, and sometimes <para>CVS is old, arcane, crufty and buggy, and sometimes
exhibits non-deterministic behavior which some claim as proof exhibits non-deterministic behavior which some claim as proof
that it's actually merely the newtonian manifestation of a 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 to know its every quirk inside out, so don't be afraid to ask
the resident AI (<email>cvs@FreeBSD.org</email>) for help when the resident AI (<email>cvs@FreeBSD.org</email>) for help when
you screw up.</para> you screw up.</para>

25
en_US.ISO_8859-1/articles/committers-guide/article.sgml
View file

@ -16,7 +16,7 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>$Date: 2000-07-26 01:17:18 $</pubdate> <pubdate>$Date: 2000-07-26 17:53:17 $</pubdate>
<copyright> <copyright>
<year>1999</year> <year>1999</year>
@ -166,13 +166,14 @@
<orderedlist> <orderedlist>
<listitem> <listitem>
<para>Check out a module with the "co" or "checkout" command.</para> <para>Check out a module with the <literal>co</literal> or
<literal>checkout</literal> command.</para>
<screen>&prompt.user; <userinput>cvs checkout shazam</userinput></screen> <screen>&prompt.user; <userinput>cvs checkout shazam</userinput></screen>
<para>This checks out a copy of the "shazam" module. If <para>This checks out a copy of the <filename>shazam</filename> module. If
there is no "shazam" module in the modules file, looks for a there is no <filename>shazam</filename> module in the modules file, looks for a
top-level directory named "shazam" instead.</para> top-level directory named <filename>shazam</filename> instead.</para>
<para>Useful options:</para> <para>Useful options:</para>
@ -239,7 +240,7 @@
<screen>&prompt.user; <userinput>cvs co -P miscfs</userinput></screen> <screen>&prompt.user; <userinput>cvs co -P miscfs</userinput></screen>
<para>You now have a directory named <para>You now have a directory named
<filename>miscfs</filename> with sub- directories <filename>miscfs</filename> with subdirectories
<filename>CVS</filename>, <filename>deadfs</filename>, <filename>CVS</filename>, <filename>deadfs</filename>,
<filename>devfs</filename>... but note that there is no <filename>devfs</filename>... but note that there is no
<filename>linprocfs</filename> subdirectory, because there <filename>linprocfs</filename> subdirectory, because there
@ -306,7 +307,7 @@
<listitem> <listitem>
<para>Check the status of checked-out files with the <para>Check the status of checked-out files with the
<literal>command</literal> command.</para> <literal>status</literal> command.</para>
<screen>&prompt.user; <userinput>cvs status shazam</userinput></screen> <screen>&prompt.user; <userinput>cvs status shazam</userinput></screen>
@ -519,11 +520,11 @@
</itemizedlist> </itemizedlist>
<para>You'll almost certainly get a conflict because <para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.29 2000-07-26 01:17:18 ben Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD$</literal>) lines, so you'll have to edit <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.29 2000-07-26 01:17:18 ben Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.29 2000-07-26 01:17:18 ben Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -744,7 +745,7 @@ checkout -P</programlisting>
<para>CVS is old, arcane, crufty and buggy, and sometimes <para>CVS is old, arcane, crufty and buggy, and sometimes
exhibits non-deterministic behavior which some claim as proof exhibits non-deterministic behavior which some claim as proof
that it's actually merely the newtonian manifestation of a 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 to know its every quirk inside out, so don't be afraid to ask
the resident AI (<email>cvs@FreeBSD.org</email>) for help when the resident AI (<email>cvs@FreeBSD.org</email>) for help when
you screw up.</para> you screw up.</para>