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

- Clarify repocopy instruction wrt MOVED file

Browse source 
PR:		docs/102925
Submitted by:	maho
This commit is contained in:
Pav Lucistnik 2006-09-06 09:22:10 +00:00
parent f0eeff66c4
commit eda795dcd2
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=28613
1 changed files with 5 additions and 4 deletions
Show stats 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 cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</p
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.247 2006-08-22 08:57:05 danger Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.248 2006-09-06 09:22:10 pav 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.247 2006-08-22 08:57:05 danger Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.247 2006-08-22 08:57:05 danger Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.248 2006-09-06 09:22:10 pav Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.248 2006-09-06 09:22:10 pav Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -2594,7 +2594,8 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
<step>
<para>Add an entry to
<filename>ports/MOVED</filename>.</para>
<filename>ports/MOVED</filename>, if you remove the
original port.</para>
</step>
</procedure>
</listitem>