diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index a76dfceeb3..d800ed962b 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -729,11 +729,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.243 2006-07-20 15:34:20 joel Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.244 2006-07-22 00:31:01 obrien 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.243 2006-07-20 15:34:20 joel Exp $ line, - leaving the original $Id: article.sgml,v 1.243 2006-07-20 15:34:20 joel Exp $ line intact). + (remove the marker lines and the second $Id: article.sgml,v 1.244 2006-07-22 00:31:01 obrien Exp $ line, + leaving the original $Id: article.sgml,v 1.244 2006-07-22 00:31:01 obrien Exp $ line intact). @@ -1501,18 +1501,6 @@ docs:Documentation Bug:freebsd-doc: - - &a.gallatin; - &a.mjacob; - &a.dfr; - &a.obrien; - - - These are the primary developers and overseers of the - DEC Alpha AXP platform. - - - &a.dg; @@ -2326,7 +2314,7 @@ docs:Documentation Bug:freebsd-doc: 2 status as the availability of resources to continue to maintain the system in a Production Quality state diminishes. - Current Tier 2 platforms are Alpha, PowerPC and ia64. + Current Tier 2 platforms are PowerPC and ia64.