Minor typo corrections in last commit (all spelling).
Submitted by: glewis
This commit is contained in:
parent
66f5756a50
commit
e93e6d4c7b
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=14463
1 changed files with 6 additions and 6 deletions
|
@ -579,11 +579,11 @@
|
|||
</itemizedlist>
|
||||
|
||||
<para>You will almost certainly get a conflict because
|
||||
of the <literal>$Id: article.sgml,v 1.135 2002-10-02 21:16:30 rwatson Exp $</literal> (or in FreeBSD's case,
|
||||
of the <literal>$Id: article.sgml,v 1.136 2002-10-03 01:49:33 rwatson 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.135 2002-10-02 21:16:30 rwatson Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.135 2002-10-02 21:16:30 rwatson Exp $</literal> line intact).</para>
|
||||
the second <literal>$Id: article.sgml,v 1.136 2002-10-03 01:49:33 rwatson Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.136 2002-10-03 01:49:33 rwatson Exp $</literal> line intact).</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
@ -1982,7 +1982,7 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
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.
|
||||
</para>
|
||||
|
||||
|
@ -2002,7 +2002,7 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
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:</programlisting>
|
|||
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
|
||||
|
|
Loading…
Reference in a new issue