diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 0e6298eb2a..6bd4cc0fec 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -685,11 +685,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.201 2004-07-19 20:49:07 krion Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.202 2004-07-27 14:34:49 krion 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.201 2004-07-19 20:49:07 krion Exp $ line, - leaving the original $Id: article.sgml,v 1.201 2004-07-19 20:49:07 krion Exp $ line intact). + (remove the marker lines and the second $Id: article.sgml,v 1.202 2004-07-27 14:34:49 krion Exp $ line, + leaving the original $Id: article.sgml,v 1.202 2004-07-27 14:34:49 krion Exp $ line intact). @@ -2766,7 +2766,7 @@ docs:Documentation Bug:freebsd-doc: First, go check - . + . There you will find error logs from the latest package building runs on all supported platforms for the most recent branches. @@ -2774,7 +2774,7 @@ docs:Documentation Bug:freebsd-doc: However, just because the port does not show up there does not mean it is building correctly. (One of the dependencies may have failed, for instance.) The relevant - directories are available on bento under + directories are available on pointyhat under /a/asami/portbuild/<arch>/<major_version> so feel free to dig around. Each architecture and version has the following subdirectories: