diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 146310db76..7d91c74fa9 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -579,11 +579,11 @@ You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.135 2002-10-02 21:16:30 rwatson Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.136 2002-10-03 01:49:33 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.135 2002-10-02 21:16:30 rwatson Exp $ line, leaving the original - $Id: article.sgml,v 1.135 2002-10-02 21:16:30 rwatson Exp $ line intact). + the second $Id: article.sgml,v 1.136 2002-10-03 01:49:33 rwatson Exp $ line, leaving the original + $Id: article.sgml,v 1.136 2002-10-03 01:49:33 rwatson Exp $ line intact). @@ -1982,7 +1982,7 @@ docs:Documentation Bug:nik: hardware support broadens the options for FreeBSD consumers by offering new features and usage opportunities (such as support for 64-bit CPUs, use in embedded environments), but these - benfits always be carefully considered in terms of the real-world + benefits always be carefully considered in terms of the real-world maintenance cost associated with additional platform support. @@ -2002,7 +2002,7 @@ docs:Documentation Bug:nik: officer, release engineering, and toolchain maintenance staff. New features added to the operating system must be fully functional across all Tier 1 architectures for every release - (features which are inherrently architecture-specific, such as + (features which are inherently architecture-specific, such as support for hardware device drivers, may be exempt from this requirement). In general, all Tier 1 platforms must have build and tinderbox support either in the FreeBSD.org cluster, or @@ -2025,7 +2025,7 @@ docs:Documentation Bug:nik: platforms, but an implementation is not required before the feature may be added to the FreeBSD source tree. The implementation of a Tier 2 architecture may be committed to the - main FreeBSD tree as long as it does not interefere with + main FreeBSD tree as long as it does not interfere with production work on Tier 1 platforms, or substantially with other Tier 2 platforms. Before a Tier 2 platform can be added to the FreeBSD base source tree, the platform must be able to boot to at