diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 404469d5df..2a44630d7d 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -727,11 +727,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.211 2004-09-09 11:42:07 josef Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.212 2004-09-13 02:41:24 marcus 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.211 2004-09-09 11:42:07 josef Exp $ line, - leaving the original $Id: article.sgml,v 1.211 2004-09-09 11:42:07 josef Exp $ line intact). + (remove the marker lines and the second $Id: article.sgml,v 1.212 2004-09-13 02:41:24 marcus Exp $ line, + leaving the original $Id: article.sgml,v 1.212 2004-09-13 02:41:24 marcus Exp $ line intact). @@ -2450,7 +2450,9 @@ docs:Documentation Bug:freebsd-doc: reasons for the repository copy request. Assign it to portmgr and set state to repocopy. If &a.portmgr; approves it, - it will be reassigned to cvs. &a.cvsadm; will + it will be reassigned to pcvs. + If so inclined, portmgr may do + the copy directly; otherwise, &a.pcvs; will do a repository copy from the old to the new location, and reassign the PR back to you. Once everything is done, perform the following: