diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index a7f3c2b33b..006e943738 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -585,11 +585,11 @@ You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.103 2002-03-25 16:56:38 rwatson Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.104 2002-03-25 17:04:25 rwatson 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.103 2002-03-25 16:56:38 rwatson Exp $ line, leaving the original - $Id: article.sgml,v 1.103 2002-03-25 16:56:38 rwatson Exp $ line intact). + the second $Id: article.sgml,v 1.104 2002-03-25 17:04:25 rwatson Exp $ line, leaving the original + $Id: article.sgml,v 1.104 2002-03-25 17:04:25 rwatson Exp $ line intact). @@ -1158,6 +1158,15 @@ docs:Documentation Bug:nik: + + &a.jake;, &a.tmm; + + + Jake and Thomas are the maintainers of the sparc64 hardware + port. + + + &a.nik; @@ -1268,6 +1277,14 @@ docs:Documentation Bug:nik: + + &a.benno; + + + Benno is the official maintainer of the PowerPC port. + + + &a.brian;