Add trademark symbols and attributions:
- Add trademark tags as needed, generally on first use in each article. - Add an attribution to the legal section mentioning all trademarks referenced. - Always use correct case for trademarks. - Don't join trademarks with other words, e.g. using hyphens. trademark.ent: - Commonly used trademarks are defined as entities for ease of use. - All trademark attributions are defined as entities for ease of use. Approved by: ceri (mentor)
This commit is contained in:
Simon L. B. Nielsen
parent
a6ce5d5629
commit
5421dc303f
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=17781
6 changed files with 79 additions and 24 deletions
en_US.ISO8859-1
articles
5-roadmap
checkpoint
committers-guide
contributing
contributors
share/sgml
|
|
@ -14,6 +14,9 @@
|
|||
<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
|
||||
%mailing-lists;
|
||||
|
||||
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
|
||||
%trademarks;
|
||||
|
||||
<!ENTITY t.releng.3 "<literal>RELENG_3</literal>">
|
||||
<!ENTITY t.releng.4 "<literal>RELENG_4</literal>">
|
||||
<!ENTITY t.releng.5 "<literal>RELENG_5</literal>">
|
||||
|
|
@ -38,6 +41,16 @@
|
|||
<holder role="mailto:re@FreeBSD.org">The &os; Release
|
||||
Engineering Team</holder>
|
||||
</copyright>
|
||||
|
||||
<legalnotice id="trademarks" role="trademarks">
|
||||
&tm-attrib.freebsd;
|
||||
&tm-attrib.ieee;
|
||||
&tm-attrib.intel;
|
||||
&tm-attrib.sparc;
|
||||
&tm-attrib.sun;
|
||||
&tm-attrib.opengroup;
|
||||
&tm-attrib.general;
|
||||
</legalnotice>
|
||||
</articleinfo>
|
||||
|
||||
<sect1 id="intro">
|
||||
|
|
@ -45,7 +58,7 @@
|
|||
|
||||
<para>After nearly three years of work, &os; 5.0 was released in January
|
||||
of 2003. Features like the GEOM block layer, Mandatory Access Controls,
|
||||
ACPI, sparc64 and ia64 platform support, and UFS snapshots, background
|
||||
ACPI, &sparc64; and ia64 platform support, and UFS snapshots, background
|
||||
filesystem checks, and 64-bit inode sizes make it an exciting operating
|
||||
system for both desktop and production users. However, some important
|
||||
features are not complete. The foundations for fine-grained locking
|
||||
|
|
@ -284,7 +297,7 @@
|
|||
decision on which parts of the network stack should be locked and
|
||||
taken out from under Giant for &t.releng.5; should be made no later
|
||||
than March 15. Work on the IP, TCP, UDP,raw IP, routing sockets,
|
||||
and Unix domain sockets stands a good chance of being complete in
|
||||
and &unix; domain sockets stands a good chance of being complete in
|
||||
time for &t.releng.5;.</para>
|
||||
|
||||
<para>If the decision is made to not lift Giant from the stack,
|
||||
|
|
@ -329,8 +342,8 @@
|
|||
<para>KSE: The kernel side of KSE must be functionally complete and
|
||||
have undergone a security audit. libkse must be complete enough to
|
||||
demonstrate a real-world application running correctly on it using
|
||||
the standard POSIX Threads API. Examples would be apache 2.0,
|
||||
Java, and/or mozilla. A functional regression test suite is also a
|
||||
the standard &posix; Threads API. Examples would be apache 2.0,
|
||||
&java;, and/or mozilla. A functional regression test suite is also a
|
||||
requirement for &t.releng.5; and should test signal delivery,
|
||||
scheduling, performance, and process security/credentials for both
|
||||
KSE and non-KSE processes. KSE kernel and userland components must
|
||||
|
|
@ -341,7 +354,7 @@
|
|||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>busdma interface and drivers: architectures like PAE/i386 and
|
||||
<para>busdma interface and drivers: architectures like PAE/&i386; and
|
||||
sparc64 which don't have a direct mapping between host memory
|
||||
address space and expansion bus address space require the
|
||||
elimination for vtophys() and friends. The busdma interface was
|
||||
|
|
|
|||
|
|
@ -32,11 +32,14 @@
|
|||
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
|
||||
%man;
|
||||
<!ENTITY legalnotice SYSTEM "../../share/sgml/legalnotice.sgml">
|
||||
|
||||
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
|
||||
%trademarks;
|
||||
]>
|
||||
|
||||
<article>
|
||||
<articleinfo>
|
||||
<title>Integration of Checkpoint VPN-1/Firewall-1 and FreeBSD IPsec</title>
|
||||
<title>Integration of Check Point <trademark class='registered'>VPN-1</trademark>/<trademark class='registered'>Firewall-1</trademark> and FreeBSD IPsec</title>
|
||||
|
||||
<authorgroup>
|
||||
<author>
|
||||
|
|
@ -67,9 +70,17 @@
|
|||
|
||||
&legalnotice;
|
||||
|
||||
<legalnotice id="trademarks" role="trademarks">
|
||||
&tm-attrib.freebsd;
|
||||
&tm-attrib.check-point;
|
||||
&tm-attrib.general;
|
||||
</legalnotice>
|
||||
|
||||
<abstract>
|
||||
<para>This document explains how to configure a <acronym>VPN</acronym>
|
||||
tunnel between FreeBSD and Checkpoint's VPN-1/Firewall-1. Other
|
||||
tunnel between FreeBSD and Check Point's
|
||||
<trademark class='registered'>VPN-1</trademark>/
|
||||
<trademark class='registered'>Firewall-1</trademark>. Other
|
||||
documents provide similar information, but do not contain instructions
|
||||
specific to VPN-1/Firewall-1 and its integration with FreeBSD. These
|
||||
documents are listed at the conclusion of this paper for further
|
||||
|
|
@ -117,7 +128,7 @@ options IPSEC_DEBUG</programlisting>
|
|||
<ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html">FreeBSD
|
||||
handbook</ulink>. Please note that <acronym>IP</acronym>
|
||||
protocol 50 (<acronym>ESP</acronym>) and <acronym>UDP</acronym>
|
||||
port <literal>500</literal> must be open between the Firewall-1
|
||||
port <literal>500</literal> must be open between the <trademark class='registered'>Firewall-1</trademark>
|
||||
host and the FreeBSD <acronym>GW</acronym>.</para>
|
||||
|
||||
<para>Also, <application>racoon</application> must be installed to support
|
||||
|
|
@ -264,7 +275,7 @@ END
|
|||
Please make sure you fully understand this file before using it in a
|
||||
production environment.</para>
|
||||
|
||||
<programlisting># racoon.conf for use with Checkpoint VPN-1/Firewall-1
|
||||
<programlisting># racoon.conf for use with Check Point VPN-1/Firewall-1
|
||||
#
|
||||
# search this file for pre_shared_key with various ID key.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -13,6 +13,9 @@
|
|||
|
||||
<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
|
||||
%mailing-lists;
|
||||
|
||||
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
|
||||
%trademarks;
|
||||
]>
|
||||
|
||||
<article>
|
||||
|
|
@ -36,6 +39,14 @@
|
|||
<holder>The FreeBSD Documentation Project</holder>
|
||||
</copyright>
|
||||
|
||||
<legalnotice id="trademarks" role="trademarks">
|
||||
&tm-attrib.freebsd;
|
||||
&tm-attrib.ibm;
|
||||
&tm-attrib.intel;
|
||||
&tm-attrib.sparc;
|
||||
&tm-attrib.general;
|
||||
</legalnotice>
|
||||
|
||||
<abstract>
|
||||
<para>This document provides information for the FreeBSD committer
|
||||
community. All new committers should read this document before they
|
||||
|
|
@ -665,11 +676,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.freebsd.o
|
|||
</itemizedlist>
|
||||
|
||||
<para>You will almost certainly get a conflict because
|
||||
of the <literal>$Id: article.sgml,v 1.172 2003-07-23 13:11:14 alex Exp $</literal> (or in FreeBSD's case,
|
||||
of the <literal>$Id: article.sgml,v 1.173 2003-08-06 21:48:38 simon 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.172 2003-07-23 13:11:14 alex Exp $</literal> line,
|
||||
leaving the original <literal>$Id: article.sgml,v 1.172 2003-07-23 13:11:14 alex Exp $</literal> line intact).</para>
|
||||
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.173 2003-08-06 21:48:38 simon Exp $</literal> line,
|
||||
leaving the original <literal>$Id: article.sgml,v 1.173 2003-08-06 21:48:38 simon Exp $</literal> line intact).</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
|
@ -1282,7 +1293,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
|
|||
<term>&a.jake;, &a.tmm;</term>
|
||||
|
||||
<listitem>
|
||||
<para>Jake and Thomas are the maintainers of the sparc64 hardware
|
||||
<para>Jake and Thomas are the maintainers of the &sparc64; hardware
|
||||
port.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
|
@ -1356,7 +1367,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
|
|||
|
||||
<listitem>
|
||||
<para>These are the primary developers and overseers of the
|
||||
Intel IA-64 platform, officially known as the Itanium Processor
|
||||
Intel IA-64 platform, officially known as the &itanium; Processor
|
||||
Family (IPF).</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
|
@ -1391,7 +1402,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
|
|||
<term>&a.benno;</term>
|
||||
|
||||
<listitem>
|
||||
<para>Benno is the official maintainer of the PowerPC port.</para>
|
||||
<para>Benno is the official maintainer of the &powerpc; port.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
|
|
@ -1953,21 +1964,21 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
|
|||
<title>Policy on Multiple Architectures</title>
|
||||
|
||||
<para>FreeBSD has added several new arch ports during the 5.0
|
||||
release cycle and is truly no longer an i386-centric operating
|
||||
release cycle and is truly no longer an &i386; centric operating
|
||||
system. In an effort to make it easier to keep FreeBSD portable
|
||||
across the platforms we support, core has developed the following
|
||||
mandate:</para>
|
||||
|
||||
<blockquote>
|
||||
<para>Our 32 bit reference platform is i386, and our 64 bit
|
||||
reference platform is sparc64. Major design work (including
|
||||
reference platform is Sparc64. Major design work (including
|
||||
major API and ABI changes) must prove itself on at least one
|
||||
32 bit and at least one 64 bit platform, preferably the
|
||||
primary reference platforms, before it may be committed
|
||||
to the source tree.</para>
|
||||
</blockquote>
|
||||
|
||||
<para>The i386 and sparc64 platforms were chosen due to being more
|
||||
<para>The i386 and Sparc64 platforms were chosen due to being more
|
||||
readily available to developers and as representatives of more
|
||||
diverse processor and system designs - big vs little endian,
|
||||
register file vs register stack, different DMA and cache
|
||||
|
|
@ -1978,7 +1989,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
|
|||
traditional processor design and does not provide as good a testbed
|
||||
for many of the challenges that the other 64 bit platform ports
|
||||
face. The ia64 platform has many of the same complications that
|
||||
sparc64 has, but is still limited in availability to
|
||||
Sparc64 has, but is still limited in availability to
|
||||
developers.</para>
|
||||
|
||||
<para>We will continue to re-evaluate this policy as cost and
|
||||
|
|
@ -2111,7 +2122,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
|
|||
with respects to all aspects of the FreeBSD operating system,
|
||||
including installation and development environments.</para>
|
||||
|
||||
<para>Current Tier 1 platforms are i386, sparc64, PC98, and
|
||||
<para>Current Tier 1 platforms are i386, Sparc64, PC98, and
|
||||
Alpha.</para>
|
||||
</sect2>
|
||||
|
||||
|
|
@ -2160,7 +2171,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
|
|||
providing source control and easier change integration from the
|
||||
main FreeBSD tree.</para>
|
||||
|
||||
<para>Current Tier 3 platforms are S/390.</para>
|
||||
<para>Current Tier 3 platforms are &s390;.</para>
|
||||
</sect2>
|
||||
|
||||
<sect2>
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ FreeBSD Entities//EN"> %freebsd;
|
|||
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
|
||||
%authors;
|
||||
<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"> %mailing-lists;
|
||||
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
|
||||
%trademarks;
|
||||
<!ENTITY % not.published "IGNORE">
|
||||
]>
|
||||
|
||||
|
|
@ -29,6 +31,13 @@ FreeBSD Entities//EN"> %freebsd;
|
|||
<contrib>Contributed by </contrib>
|
||||
</author>
|
||||
</authorgroup>
|
||||
|
||||
<legalnotice id="trademarks" role="trademarks">
|
||||
&tm-attrib.freebsd;
|
||||
&tm-attrib.ieee;
|
||||
&tm-attrib.general;
|
||||
</legalnotice>
|
||||
|
||||
</articleinfo>
|
||||
|
||||
<indexterm><primary>contributing</primary></indexterm>
|
||||
|
|
@ -177,10 +186,10 @@ FreeBSD Entities//EN"> %freebsd;
|
|||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>Get copies of formal standards like POSIX. You can
|
||||
<para>Get copies of formal standards like &posix;. You can
|
||||
get some links about these standards at the <ulink
|
||||
url="http://www.FreeBSD.org/projects/c99/index.html">FreeBSD
|
||||
C99 & Posix Standards Conformance Project</ulink> web
|
||||
C99 & POSIX Standards Conformance Project</ulink> web
|
||||
site. Compare FreeBSD's behavior to that required by the
|
||||
standard. If the behavior differs, particularly in subtle
|
||||
or obscure corners of the specification, send in a PR
|
||||
|
|
|
|||
|
|
@ -8,6 +8,9 @@
|
|||
<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
|
||||
%mailing-lists;
|
||||
|
||||
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
|
||||
%trademarks;
|
||||
|
||||
<!ENTITY % contrib.ent SYSTEM "contrib.ent">
|
||||
%contrib.ent;
|
||||
<!ENTITY % not.published "IGNORE">
|
||||
|
|
@ -19,6 +22,12 @@
|
|||
|
||||
<pubdate>$FreeBSD$</pubdate>
|
||||
|
||||
<legalnotice id="trademarks" role="trademarks">
|
||||
&tm-attrib.freebsd;
|
||||
&tm-attrib.sun;
|
||||
&tm-attrib.general;
|
||||
</legalnotice>
|
||||
|
||||
<abstract>
|
||||
<para>This article lists individuals and organizations who have
|
||||
made a contribution to FreeBSD.</para>
|
||||
|
|
@ -436,7 +445,7 @@
|
|||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>FreeBSD Java Project</term>
|
||||
<term>FreeBSD &java; Project</term>
|
||||
|
||||
<listitem>
|
||||
<para>&a.patrick;</para>
|
||||
|
|
|
|||
|
|
@ -13,3 +13,5 @@ PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
|
|||
PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
|
||||
"l10n.ent"
|
||||
|
||||
PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
|
||||
"trademarks.ent"
|
||||
|
|
|
|||
Loading…
Reference in a new issue