diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index d2c690da2c..d42680e6fc 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -529,7 +529,7 @@ P The file was updated without trouble (you will only see - this when working against a remote repo). + this when working against a remote repository). @@ -608,11 +608,11 @@ You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.152 2003-01-28 03:50:08 murray Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.153 2003-02-01 17:45:58 keramida 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.152 2003-01-28 03:50:08 murray Exp $ line, - leaving the original $Id: article.sgml,v 1.152 2003-01-28 03:50:08 murray Exp $ line intact). + (remove the marker lines and the second $Id: article.sgml,v 1.153 2003-02-01 17:45:58 keramida Exp $ line, + leaving the original $Id: article.sgml,v 1.153 2003-02-01 17:45:58 keramida Exp $ line intact). @@ -2450,7 +2450,7 @@ docs:Documentation Bug:nik: 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.) Here are - the relevant directories on bento, so feel free to dig + the relevant directories on bento, so feel free to dig around. /a/asami/portbuild/<arch>/<major_version>/errors error logs from latest <major_version> run on <arch>