os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Various grammatical fixes.

Browse source 
PR:		docs/53913
Submitted by:	Chris Pepper <pepper@rockefeller.edu>
This commit is contained in:
Ceri Davies 2003-06-30 18:34:41 +00:00
parent 26be019ec6
commit 770ecf336f
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=17449
1 changed files with 14 additions and 14 deletions

28
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -607,11 +607,11 @@
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.166 2003-05-08 10:21:18 blackend Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.167 2003-06-30 18:34:41 ceri Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.166 2003-05-08 10:21:18 blackend Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.166 2003-05-08 10:21:18 blackend Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.167 2003-06-30 18:34:41 ceri Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.167 2003-06-30 18:34:41 ceri Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -1572,7 +1572,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
request a review of the decision after 30 days and every 30 days
thereafter (unless the total suspension period is less than 30
days). A committer whose privileges have been revoked entirely
may request a review after a period of 6 months have elapsed.
may request a review after a period of 6 months has elapsed.
This review policy is <emphasis>strictly informal</emphasis>
and, in all cases, core reserves the right to either act on or
disregard requests for review if they feel their original
@ -1998,7 +1998,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
<para>FreeBSD is a highly portable operating system intended to
function on many different types of hardware architectures.
Maintaining clean separation of Machine Dependent (MD) and Machine
Independent (MI) code, as well as minimizing MD code is an important
Independent (MI) code, as well as minimizing MD code, is an important
part of our strategy to remain agile with regards to current
hardware trends. Each new hardware architecture supported by
FreeBSD adds substantially to the cost of code maintenance,
@ -2018,12 +2018,12 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
of interest in these environments, the FreeBSD Project is able
to maintain high levels of quality, stability, and performance,
as well as minimize the load on various support teams on the
project, such as the ports team, documentation team, as well as
security officer and release engineering teams. Diversity in
project, such as the ports team, documentation team,
security officer, and release engineering teams. Diversity in
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
benefits always be carefully considered in terms of the real-world
for 64-bit CPUs, use in embedded environments, etc.), but these
benefits must always be carefully considered in terms of the real-world
maintenance cost associated with additional platform support.
</para>
@ -2032,7 +2032,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
requirements for an architecture to be in that tier,
as well as specifying the obligations of developers with
regards to the platform. In addition, a policy is defined
regarding under the circumstances required to change the tier
regarding the circumstances required to change the tier
of an architecture.</para>
</sect2>
@ -2082,7 +2082,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
2 status as the availability of resources to continue to maintain
the system in a Production Quality state diminishes.</para>
<para>Current Tier 2 platforms are PowerPC, and ia64.</para>
<para>Current Tier 2 platforms are PowerPC and ia64.</para>
</sect2>
<sect2>
@ -2094,7 +2094,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
platforms are architectures for which hardware is not or will not
be available to the project in the foreseeable future, for which
there are two or fewer active developers, that can not boot to at
least single-user mode on real hardware (or simulator for new
least single-user mode on real hardware (or a simulator for new
hardware platforms), or which are considered legacy systems
unlikely to see broad future use. Tier 3 systems will not be
committed to the base source tree, although support for Tier 3
@ -2118,7 +2118,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
<sect2>
<title>Policy on Changing the Tier of an Architecture</title>
<para>Systems may only be moved from one tier to another tier by
<para>Systems may only be moved from one tier to another by
approval of the FreeBSD Core Team, which shall make that
decision in collaboration with the Security Officer, Release
Engineering, and toolchain maintenance teams.</para>
@ -2668,7 +2668,7 @@ cvs add: use 'cvs commit' to add this file permanently
well.</para>
<para>This information consists of one or more lines containing the
the key word or phrase, a colon, tabs for formatting, and then the
key word or phrase, a colon, tabs for formatting, and then the
additional information.</para>
<para>The key words or phrases are:</para>