diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2006-09-06 09:22:10 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2006-09-06 09:22:10 +0000 |
| commit | eda795dcd2b83d3b732fc281731277e909289a47 (patch) | |
| tree | 5c72a75e48dbfe500fba5ec21580737f002fc5f2 | |
| parent | f0eeff66c49a2cb716c1e687d6a00dfbd4e6e239 (diff) | |
Notes
| -rw-r--r-- | en_US.ISO8859-1/articles/committers-guide/article.sgml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 8a3572ec7b..e3f64b03bf 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -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> |