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

Expand a contraction that I bogusly included in my last commit here

Browse source 
and claim my share of the pointy hat pool.

Spotted by:	simon
This commit is contained in:
Giorgos Keramidas 2004-10-11 17:06:14 +00:00
parent 22d00e050e
commit 3960e8c10a
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=22595
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -727,11 +727,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.214 2004-10-11 16:48:38 keramida Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.215 2004-10-11 17:06:14 keramida Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.214 2004-10-11 16:48:38 keramida Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.214 2004-10-11 16:48:38 keramida Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.215 2004-10-11 17:06:14 keramida Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.215 2004-10-11 17:06:14 keramida Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -1025,7 +1025,7 @@ checkout -P</programlisting>
<para>This is the fastest way of passing a commit message to CVS but
you should be careful when editing the <filename>logmsg</filename>
file before the commit, because CVS won't give you a chance to edit
file before the commit, because CVS will not give you a chance to edit
the message when you do the actual commit.</para>
</listitem>
</orderedlist>