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

Be a bit more verbose about adding new module entries.

Browse source 
PR:		docs/100323
Submitted by:	clsung
This commit is contained in:
Joel Dahl 2006-07-20 15:34:20 +00:00
parent 1732d94ec6
commit d644e2cb4f
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=28351
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -729,11 +729,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.242 2006-06-09 20:44:21 pav Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.243 2006-07-20 15:34:20 joel 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.242 2006-06-09 20:44:21 pav Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.242 2006-06-09 20:44:21 pav Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.243 2006-07-20 15:34:20 joel Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.243 2006-07-20 15:34:20 joel Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -2599,7 +2599,8 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
</step>
<step>
<para>Add the new module entry.</para>
<para>Add the new module entry to
<filename>CVSROOT/modules</filename>.</para>
</step>
<step>