diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 173b560d26..b52cbefa01 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 env CVS_RSH=ssh cvs -d user@ncvs.FreeBSD.o You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.230 2005-11-09 01:25:27 linimon Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.231 2005-11-09 22:17:39 linimon Exp $ (or in FreeBSD's case, $FreeBSD$) lines, so you will have to edit the file to resolve the conflict - (remove the marker lines and the second $Id: article.sgml,v 1.230 2005-11-09 01:25:27 linimon Exp $ line, - leaving the original $Id: article.sgml,v 1.230 2005-11-09 01:25:27 linimon Exp $ line intact). + (remove the marker lines and the second $Id: article.sgml,v 1.231 2005-11-09 22:17:39 linimon Exp $ line, + leaving the original $Id: article.sgml,v 1.231 2005-11-09 22:17:39 linimon Exp $ line intact). @@ -2792,12 +2792,34 @@ docs:Documentation Bug:freebsd-doc: - Update the instructions for &man.cvsup.1; by - modifying distrib/cvsup/sup/README - and adding the following files into - cvsup/sup/ports-categoryname: + Update the instructions for &man.cvsup.1;: + + + + + add the category to + distrib/cvsup/sup/README + + + + + + adding the following files into + cvsup/sup/ports-categoryname: list.cvs and - releases. (Note: these are + releases. + + + + + add the category to + src/share/examples/cvsup/ports-supfile + + + + + + (Note: these are in the src, not the ports, repository). If you are not a src committer, you will need to submit a PR for this.