PERFORCE change 155689 for review
Rene Ladan
rene at FreeBSD.org
Mon Jan 5 23:47:46 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=155689
Change 155689 by rene at rene_self on 2009/01/05 23:47:43
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#13 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#13 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#14 integrate
.. //depot/projects/docproj_nl/share/sgml/trademarks.ent#2 integrate
.. //depot/projects/docproj_nl/www/en/cgi/man.cgi#7 integrate
.. //depot/projects/docproj_nl/www/en/releases/7.1R/errata.html#3 integrate
.. //depot/projects/docproj_nl/www/en/security/security.sgml#4 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#13 (text+ko) ====
@@ -12,7 +12,7 @@
<corpauthor>The &os; Documentation Project</corpauthor>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1104 2008/12/24 10:32:40 pgj Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1106 2009/01/05 15:44:57 remko Exp $</pubdate>
<copyright>
<year>1995</year>
@@ -29,6 +29,7 @@
<year>2006</year>
<year>2007</year>
<year>2008</year>
+ <year>2009</year>
<holder>The &os; Documentation Project</holder>
</copyright>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#13 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.419 2008/12/23 12:45:59 trhodes Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.420 2009/01/05 21:30:43 brd Exp $
-->
<chapter id="advanced-networking">
@@ -21,7 +21,7 @@
</listitem>
<listitem>
- <para>How to set up IEEE 802.11 and &bluetooth; devices.</para>
+ <para>How to set up &ieee; 802.11 and &bluetooth; devices.</para>
</listitem>
<listitem>
@@ -700,7 +700,7 @@
<sect2>
<title>Wireless Networking Basics</title>
- <para>Most wireless networks are based on the IEEE 802.11
+ <para>Most wireless networks are based on the &ieee; 802.11
standards. A basic wireless network consists of multiple
stations communicating with radios that broadcast in either
the 2.4GHz or 5GHz band (though this varies according to the
@@ -720,7 +720,7 @@
network</emphasis>.</para>
<para>802.11 networks were first deployed in the 2.4GHz band
- using protocols defined by the IEEE 802.11 and 802.11b
+ using protocols defined by the &ieee; 802.11 and 802.11b
standard. These specifications include the operating
frequencies, MAC layer characteristics including framing and
transmission rates (communication can be done at various
@@ -740,7 +740,7 @@
to communicate. This scheme was shown to be easily broken and
is now rarely used except to discourage transient users from
joining networks. Current security practice is given by the
- IEEE 802.11i specification that defines new cryptographic
+ &ieee; 802.11i specification that defines new cryptographic
ciphers and an additional protocol to authenticate stations to
an access point and exchange keys for doing data
communication. Further, cryptographic keys are periodically
@@ -1378,7 +1378,7 @@
</callout>
<callout arearefs="co-tls-proto">
- <para>Here, we use RSN (IEEE 802.11i) protocol, i.e.,
+ <para>Here, we use RSN (&ieee; 802.11i) protocol, i.e.,
WPA2.</para>
</callout>
@@ -3216,7 +3216,7 @@
<variablelist>
- <varlistentry><term>failover</term>
+ <varlistentry><term>Failover</term>
<listitem>
<para>Sends and receives traffic only through the master port. If the
@@ -3226,15 +3226,15 @@
</listitem>
</varlistentry>
- <varlistentry><term>fec</term>
+ <varlistentry><term>&cisco; Fast ðerchannel;</term>
<listitem>
- <para>Supports Cisco EtherChannel. This is a static setup and does not
+ <para>&cisco; Fast ðerchannel; (FEC), is a static setup and does not
negotiate aggregation with the peer or exchange frames to monitor the
- link, if the switch supports LACP then that should be used
+ link. If the switch supports LACP then that should be used
instead.</para>
- <para>Balances outgoing traffic across the active ports based on hashed
+ <para><acronym>FEC</acronym> balances outgoing traffic across the active ports based on hashed
protocol header information and accepts incoming traffic from any
active port. The hash includes the Ethernet source and destination
address, and, if available, the VLAN tag, and the IPv4/IPv6 source
@@ -3242,20 +3242,20 @@
</listitem>
</varlistentry>
- <varlistentry><term>lacp</term>
+ <varlistentry><term>LACP</term>
<listitem>
- <para>Supports the IEEE 802.3ad Link Aggregation Control Protocol
+ <para>The &ieee; 802.3ad Link Aggregation Control Protocol
(LACP) and the Marker Protocol. LACP will negotiate a set of
aggregable links with the peer in to one or more Link Aggregated
- Groups. Each LAG is composed of ports of the same speed, set to
+ Groups (LAG). Each LAG is composed of ports of the same speed, set to
full-duplex operation. The traffic will be balanced across the ports
in the LAG with the greatest total speed, in most cases there will
- only be one LAG which contains all ports. In the event of changes in
+ only be one LAG which contains all ports. In the event of changes in
physical connectivity, Link Aggregation will quickly converge to a
new configuration.</para>
- <para>Balances outgoing traffic across the active ports based on hashed
+ <para><acronym>LACP</acronym> balances outgoing traffic across the active ports based on hashed
protocol header information and accepts incoming traffic from any
active port. The hash includes the Ethernet source and destination
address, and, if available, the VLAN tag, and the IPv4/IPv6 source
@@ -3263,19 +3263,19 @@
</listitem>
</varlistentry>
- <varlistentry><term>loadbalance</term>
+ <varlistentry><term>Loadbalance</term>
<listitem>
- <para>This is an alias of <emphasis>fec</emphasis> mode.</para>
+ <para>This is an alias of <emphasis>FEC</emphasis> mode.</para>
</listitem>
</varlistentry>
- <varlistentry><term>roundrobin</term>
+ <varlistentry><term>Round-robin</term>
<listitem>
<para>Distributes outgoing traffic using a round-robin scheduler
through all active ports and accepts incoming traffic from any active
- port. This mode will violate Ethernet frame ordering and should be
+ port. This mode violates Ethernet Frame ordering and should be
used with caution.</para>
</listitem>
</varlistentry>
@@ -3286,7 +3286,7 @@
<title>Examples</title>
<example id="networking-lacp-aggregation-cisco">
- <title>LACP aggregation with a Cisco switch</title>
+ <title>LACP aggregation with a &cisco; Switch</title>
<para>This example connects two interfaces on a &os; machine to the
switch as a single load balanced and fault tolerant link. More interfaces
@@ -3297,23 +3297,31 @@
much information as it can to distinguish different traffic flows and
balance across the available interfaces.</para>
- <para>On the Cisco switch add the interfaces to the channel group.</para>
+ <para>On the &cisco; switch add the
+ <replaceable>FastEthernet0/1</replaceable> and
+ <replaceable>FastEthernet0/2</replaceable> interfaces to the
+ channel-group <replaceable>1</replaceable>:</para>
- <screen>interface FastEthernet0/1
- channel-group 1 mode active
- channel-protocol lacp
+ <screen><userinput>interface <replaceable>FastEthernet0/1</replaceable>
+ channel-group <replaceable>1</replaceable> mode active
+ channel-protocol lacp</userinput>
!
-interface FastEthernet0/2
- channel-group 1 mode active
- channel-protocol lacp
-!</screen>
+<userinput>interface <replaceable>FastEthernet0/2</replaceable>
+ channel-group <replaceable>1</replaceable> mode active
+ channel-protocol lacp</userinput></screen>
- <para>On the &os; machine create the lagg interface.</para>
+ <para>On the &os; machine create the &man.lagg.4; interface using
+ <replaceable>fxp0</replaceable> and
+ <replaceable>fxp1</replaceable>:</para>
- <screen>&prompt.root; <userinput>ifconfig lagg0 create</userinput>
-&prompt.root; <userinput>ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1</userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>lagg0</replaceable> create </userinput>
+&prompt.root; <userinput>ifconfig <replaceable>lagg0</replaceable> up laggproto lacp laggport <replaceable>fxp0</replaceable> laggport <replaceable>fxp1</replaceable></userinput></screen>
- <para>View the interface status from ifconfig; ports marked as
+ <para>View the interface status by running:</para>
+
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>lagg0</replaceable></userinput></screen>
+
+ <para>Ports marked as
<emphasis>ACTIVE</emphasis> are part of the active aggregation group
that has been negotiated with the remote switch and traffic will be
transmitted and received. Use the verbose output of &man.ifconfig.8;
@@ -3328,8 +3336,8 @@
laggport: fxp1 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING>
laggport: fxp0 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING></screen>
- <para>The switch will show which ports are active. For more detail use
- <userinput>show lacp neighbor detail</userinput>.</para>
+ <para>To see the port status on the switch, use <userinput>show
+ lacp neighbor</userinput>:</para>
<screen>switch# show lacp neighbor
Flags: S - Device is requesting Slow LACPDUs
@@ -3345,17 +3353,27 @@
Fa0/1 SA 32768 0005.5d71.8db8 29s 0x146 0x3 0x3D
Fa0/2 SA 32768 0005.5d71.8db8 29s 0x146 0x4 0x3D</screen>
+ <para>For more detail use the <userinput>show lacp neighbor
+ detail</userinput> command.</para>
</example>
<example id="networking-lagg-failover">
<title>Failover mode</title>
- <para>Failover mode can be used to switch over to another interface if
- the link is lost on the master.</para>
+ <para>Failover mode can be used to switch over to a secondary interface if
+ the link is lost on the master interface. Create and configure the
+ <replaceable>lagg0</replaceable> interface, with
+ <replaceable>fxp0</replaceable> as the master interface and
+ <replaceable>fxp1</replaceable> as the secondary interface:</para>
+
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>lagg0</replaceable> create</userinput>
+&prompt.root; <userinput>ifconfig <replaceable>lagg0</replaceable> up laggproto failover laggport <replaceable>fxp0</replaceable> laggport <replaceable>fxp1</replaceable></userinput></screen>
- <screen>&prompt.root; <userinput>ifconfig lagg0 create</userinput>
-&prompt.root; <userinput>ifconfig lagg0 up laggproto failover laggport fxp0 laggport fxp1</userinput></screen>
+ <para>The interface will look something like this, the major
+ differences will be the <acronym>MAC</acronym> address and the
+ device names:</para>
- <screen>lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>lagg0</replaceable></userinput>
+lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
options=8<VLAN_MTU>
ether 00:05:5d:71:8d:b8
media: Ethernet autoselect
@@ -3365,8 +3383,8 @@
laggport: fxp0 flags=5<MASTER,ACTIVE></screen>
<para>Traffic will be transmitted and received on
- <devicename>fxp0</devicename>. If the link is lost on
- <devicename>fxp0</devicename> then <devicename>fxp1</devicename> will
+ <replaceable>fxp0</replaceable>. If the link is lost on
+ <replaceable>fxp0</replaceable> then <replaceable>fxp1</replaceable> will
become the active link. If the link is restored on the master
interface then it will once again become the active link.</para>
</example>
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#14 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.13 2009/01/01 23:00:26 rene Exp $
+ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.14 2009/01/05 11:49:57 rene Exp $
$FreeBSDnl: nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.35 2005/09/23 17:03:10 siebrand Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
==== //depot/projects/docproj_nl/share/sgml/trademarks.ent#2 (text+ko) ====
@@ -8,7 +8,7 @@
Please keep this file sorted.
- $FreeBSD: doc/share/sgml/trademarks.ent,v 1.43 2007/08/11 20:05:53 bmah Exp $
+ $FreeBSD: doc/share/sgml/trademarks.ent,v 1.44 2009/01/05 21:30:43 brd Exp $
-->
<!ENTITY tm-attrib.3com "<para>3Com and HomeConnect are registered
@@ -86,7 +86,9 @@
<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, and IOS are
registered trademarks of Cisco Systems, Inc. and/or its affiliates
in the United States and certain other countries.</para>">
+<!ENTITY cisco "<trademark class='registered'>Cisco</trademark>">
<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>">
+<!ENTITY etherchannel "<trademark class='registered'>EtherChannel</trademark>">
<!ENTITY ios "<trademark class='registered'>IOS</trademark>">
<!ENTITY tm-attrib.corel "<para>Corel and WordPerfect are trademarks
@@ -151,6 +153,7 @@
<!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, and 802 are registered
trademarks of Institute of Electrical and Electronics Engineers,
Inc. in the United States.</para>">
+<!ENTITY ieee "<trademark class='registered'>IEEE</trademark>">
<!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
<!-- http://www.intel.com/intel/legal/tmnouns2.htm -->
==== //depot/projects/docproj_nl/www/en/cgi/man.cgi#7 (text+ko) ====
@@ -34,7 +34,7 @@
# Dual CGI/Plexus mode and new interface by sanders at bsdi.com 9/22/1995
#
# $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $
-# $FreeBSD: www/en/cgi/man.cgi,v 1.226 2008/12/21 23:04:17 wosch Exp $
+# $FreeBSD: www/en/cgi/man.cgi,v 1.227 2009/01/05 20:46:44 hrs Exp $
############################################################################
# !!! man.cgi is stale perl4 code !!!
@@ -159,19 +159,22 @@
);
$manLocalDir = '/usr/local/www/bsddoc/man';
-$manPathDefault = 'FreeBSD 7.0-RELEASE';
+$manPathDefault = 'FreeBSD 7.1-RELEASE';
%manPath = (
- 'FreeBSD 7.0-RELEASE and Ports',
+ 'FreeBSD 7.1-RELEASE and Ports',
"$manLocalDir/FreeBSD-7.0-RELEASE/man:$manLocalDir/FreeBSD-7.0-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports",
'FreeBSD 6.4-RELEASE and Ports',
"$manLocalDir/FreeBSD-6.4-RELEASE/man:$manLocalDir/FreeBSD-6.4-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports",
'FreeBSD 8-current', "$manLocalDir/FreeBSD-8-current/man:$manLocalDir/FreeBSD-8-current/openssl/man",
- 'FreeBSD 7.0-stable', "$manLocalDir/FreeBSD-7.0-stable",
- 'FreeBSD 7.0-RELEASE',
-"$manLocalDir/FreeBSD-7.0-RELEASE/man:$manLocalDir/FreeBSD-7.0-RELEASE/openssl/man",
+
+ 'FreeBSD 7.1-stable', "$manLocalDir/FreeBSD-7.1-stable",
+ 'FreeBSD 7.1-RELEASE', "$manLocalDir/FreeBSD-7.1-RELEASE/man:$manLocalDir/FreeBSD-7.1-RELEASE/openssl/man",
+ 'FreeBSD Ports 7.1-RELEASE', "$manLocalDir/FreeBSD-ports-7.1-RELEASE",
+
+ 'FreeBSD 7.0-RELEASE', "$manLocalDir/FreeBSD-7.0-RELEASE/man:$manLocalDir/FreeBSD-7.0-RELEASE/openssl/man",
'FreeBSD Ports 7.0-RELEASE', "$manLocalDir/FreeBSD-ports-7.0-RELEASE",
'FreeBSD 6.4-stable', "$manLocalDir/FreeBSD-6.4-stable",
@@ -461,15 +464,15 @@
# keywords must be in lower cases.
%manPathAliases = (
- 'freebsd', 'FreeBSD 7.0-RELEASE',
- 'freebsd-release', 'FreeBSD 7.0-RELEASE',
+ 'freebsd', 'FreeBSD 7.1-RELEASE',
+ 'freebsd-release', 'FreeBSD 7.1-RELEASE',
- 'freebsd-stable', 'FreeBSD 7.0-stable',
- 'freebsd-stable7', 'FreeBSD 7.0-stable',
+ 'freebsd-stable', 'FreeBSD 7.1-stable',
+ 'freebsd-stable7', 'FreeBSD 7.1-stable',
'freebsd-stable6', 'FreeBSD 6.4-stable',
'freebsd-current', 'FreeBSD 8-current',
- 'freebsd-release-ports', 'FreeBSD 7.0-RELEASE and Ports',
+ 'freebsd-release-ports', 'FreeBSD 7.1-RELEASE and Ports',
'slackware', 'Linux Slackware 3.1',
'redhat', 'Red Hat Linux/i386 9',
@@ -1375,7 +1378,7 @@
}
local $id =
- '$FreeBSD: www/en/cgi/man.cgi,v 1.226 2008/12/21 23:04:17 wosch Exp $';
+ '$FreeBSD: www/en/cgi/man.cgi,v 1.227 2009/01/05 20:46:44 hrs Exp $';
return qq{\
<pre>
Copyright (c) 1996-2008 <a href="$mailtoURL">Wolfram Schneider</a>
==== //depot/projects/docproj_nl/www/en/releases/7.1R/errata.html#3 (text+ko) ====
@@ -19,7 +19,7 @@
<p class="COPYRIGHT">Copyright © 2008, 2009 The FreeBSD Documentation Project</p>
<p class="PUBDATE">$FreeBSD: stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml
-186764 2009-01-05 08:56:45Z hrs $<br />
+186782 2009-01-05 15:38:45Z hrs $<br />
</p>
<div class="LEGALNOTICE"><a id="TRADEMARKS" name="TRADEMARKS"></a>
@@ -142,6 +142,15 @@
<h2 class="SECT1"><a id="LATE-NEWS" name="LATE-NEWS">4 Late-Breaking News and
Corrections</a></h2>
+<p>[20090105] The Release Notes for 7.1-RELEASE should have mentioned that the <a
+href="http://www.FreeBSD.org/cgi/man.cgi?query=procstat&sektion=1&manpath=FreeBSD+7.1-stable">
+<span class="CITEREFENTRY"><span class="REFENTRYTITLE">procstat</span>(1)</span></a>
+utility has been added. This is a process inspection utility which provides both some of
+the missing functionality from <a
+href="http://www.FreeBSD.org/cgi/man.cgi?query=procfs&sektion=5&manpath=FreeBSD+7.1-stable">
+<span class="CITEREFENTRY"><span class="REFENTRYTITLE">procfs</span>(5)</span></a> and
+new functionality for monitoring and debugging specific processes.</p>
+
<p>[20090105] The Release Notes for 7.1-RELEASE should have mentioned changes that the <a
href="http://www.FreeBSD.org/cgi/man.cgi?query=ae&sektion=4&manpath=FreeBSD+7.1-stable"><span
class="CITEREFENTRY"><span class="REFENTRYTITLE">ae</span>(4)</span></a> driver has been
==== //depot/projects/docproj_nl/www/en/security/security.sgml#4 (text+ko) ====
@@ -1,12 +1,12 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.203 2008/11/29 13:44:15 cperciva Exp $">
+<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.204 2009/01/05 20:52:36 cperciva Exp $">
<!ENTITY title "FreeBSD Security Information">
<!ENTITY % navinclude.support "INCLUDE">
<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
<!ENTITY advisories.html.inc SYSTEM "advisories.html.inc">
]>
-<!-- $FreeBSD: www/en/security/security.sgml,v 1.203 2008/11/29 13:44:15 cperciva Exp $ -->
+<!-- $FreeBSD: www/en/security/security.sgml,v 1.204 2009/01/05 20:52:36 cperciva Exp $ -->
<html>
&header;
@@ -208,10 +208,18 @@
<dt>Normal</dt>
<dd>Releases which are published from a -STABLE branch will be
supported by the Security Officer for a minimum of 12 months after the
- release.</dd>
+ release, and for sufficient additional time (if needed) to ensure
+ that there is a newer release for at least 3 months before the
+ older Normal relase expires.
+ </dd>
<dt>Extended</dt>
- <dd>Selected releases will be supported by the Security Officer for a
- minimum of 24 months after the release.</dd>
+ <dd>Selected releases (normally every second release plus the last
+ release from each -STABLE branch) will be supported by the
+ Security Officer for a minimum of 24 months after the release,
+ and for sufficient additional time (if needed) to ensure that
+ there is a newer Extended release for at least 3 months before the
+ older Extended release expires.
+ </dd>
</dl>
<a name="supported-branches"></a>
@@ -269,7 +277,14 @@
<td>7.0-RELEASE</td>
<td>Normal</td>
<td>February 27, 2008</td>
- <td>February 28, 2009</td>
+ <td>April 30, 2009</td>
+ </tr>
+ <tr>
+ <td>RELENG_7_1</td>
+ <td>7.1-RELEASE</td>
+ <td>Extended</td>
+ <td>January 4, 2009</td>
+ <td>January 31, 2011</td>
</tr>
</table>
More information about the p4-projects
mailing list