diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index e7879c9713..5e2cae8822 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -592,11 +592,11 @@ You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.140 2002-10-24 18:54:17 alex Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.141 2002-11-02 00:28: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.140 2002-10-24 18:54:17 alex Exp $ line, leaving the original - $Id: article.sgml,v 1.140 2002-10-24 18:54:17 alex Exp $ line intact). + the second $Id: article.sgml,v 1.141 2002-11-02 00:28:25 rwatson Exp $ line, leaving the original + $Id: article.sgml,v 1.141 2002-11-02 00:28:25 rwatson Exp $ line intact). @@ -2026,7 +2026,8 @@ docs:Documentation Bug:nik: with respects to all aspects of the FreeBSD operating system, including installation and development environments. - Current Tier 1 platforms are i386, PC98, and Alpha. + Current Tier 1 platforms are i386, sparc65, PC98, and + Alpha. @@ -2054,7 +2055,7 @@ docs:Documentation Bug:nik: 2 status as the availability of resources to continue to maintain the system in a Production Quality state diminishes. - Current Tier 2 platforms are sparc64, PowerPC, and ia64. + Current Tier 2 platforms are PowerPC, and ia64. @@ -2074,7 +2075,7 @@ docs:Documentation Bug:nik: providing source control and easier change integration from the main FreeBSD tree. - Currently, the only Tier 3 platform is x86-64. + Current Tier 3 platforms are S/390 and x86-64.