diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 6c6bed5d3c..6b7941c508 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -583,11 +583,11 @@ You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.116 2002-05-11 23:32:01 jedgar Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.117 2002-05-12 02:09:18 jedgar 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.116 2002-05-11 23:32:01 jedgar Exp $ line, leaving the original - $Id: article.sgml,v 1.116 2002-05-11 23:32:01 jedgar Exp $ line intact). + the second $Id: article.sgml,v 1.117 2002-05-12 02:09:18 jedgar Exp $ line, leaving the original + $Id: article.sgml,v 1.117 2002-05-12 02:09:18 jedgar Exp $ line intact). @@ -2231,9 +2231,9 @@ docs:Documentation Bug:nik: - What is proper procedure for updating checksum for a - port's distfile when the file changes without a version - change? + What is the proper procedure for updating the checksum + for a port's distfile when the file changes without a + version change?