PERFORCE change 202700 for review
Rene Ladan
rene at FreeBSD.org
Tue Dec 6 18:39:19 UTC 2011
http://p4web.freebsd.org/@@202700?ac=10
Change 202700 by rene at rene_acer on 2011/12/06 18:38:53
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#71 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#40 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#33 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#22 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#116 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#64 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#17 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#24 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/jhibbits.key#1 branch
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#64 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#62 integrate
.. //depot/projects/docproj_nl/www/en/administration.sgml#23 integrate
.. //depot/projects/docproj_nl/www/en/developers.sgml#65 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#124 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#71 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.344 2011/11/14 20:10:32 crees Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.345 2011/12/03 14:01:37 jhibbits Exp $ -->
<!--
NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
alphabetical order by last name. Please keep in mind that fact while
@@ -515,6 +515,10 @@
</listitem>
<listitem>
+ <para>&a.jhibbits;</para>
+ </listitem>
+
+ <listitem>
<para>&a.nhibma;</para>
</listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#40 (text+ko) ====
@@ -11,7 +11,7 @@
<corpauthor>The &os; Ports Management Team</corpauthor>
</authorgroup>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.77 2011/10/27 09:05:07 linimon Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.78 2011/12/04 14:29:00 manolis Exp $</pubdate>
<copyright>
<year>2003</year>
@@ -72,9 +72,9 @@
</note>
<para>The scripts that control all of this live in
- <filename>/var/portbuild/scripts/</filename>. These are the
- checked-out copies from
- <filename>/usr/ports/Tools/portbuild/scripts/</filename>.</para>
+ <filename class="directory">/var/portbuild/scripts/</filename>.
+ These are the checked-out copies from the Subversion repository
+ <filename class="directory">base/projects/portbuild/scripts/</filename>.</para>
<para>Typically, incremental builds are done that use previous
packages as dependencies; this takes less time, and puts less
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#33 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.441 2011/10/19 18:04:34 manolis Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.442 2011/12/04 20:54:59 wblock Exp $
-->
<chapter id="advanced-networking">
@@ -1168,7 +1168,7 @@
authentication parameters, you will have to get an IP
address to communicate. Most of time you will obtain
your wireless IP address via DHCP. To achieve that,
- simply edit <filename>/etc/rc.conf</filename> and add
+ edit <filename>/etc/rc.conf</filename> and add
<literal>DHCP</literal> to the configuration for your
device as shown in various examples above:</para>
@@ -1229,7 +1229,7 @@
the 802.1X authentication protocol and uses one of several
ciphers instead of WEP for data integrity. The only
cipher required by WPA is TKIP (Temporary Key Integrity
- Protocol) which is a cipher that extends the basic RC4
+ Protocol). TKIP is a cipher that extends the basic RC4
cipher used by WEP by adding integrity checking, tamper
detection, and measures for responding to any detected
intrusions. TKIP is designed to work on legacy hardware
@@ -1247,7 +1247,7 @@
station and the access point using a pre-shared secret.
The former is commonly termed WPA Enterprise with the
latter known as WPA Personal. Since most people will not
- set up a RADIUS backend server for wireless network,
+ set up a RADIUS backend server for their wireless network,
WPA-PSK is by far the most commonly encountered
configuration for WPA.</para>
@@ -1262,7 +1262,7 @@
<sect5 id="network-wireless-wpa-wpa-psk">
<title>WPA-PSK</title>
- <para>WPA-PSK also known as WPA-Personal is based on a
+ <para>WPA-PSK, also known as WPA-Personal, is based on a
pre-shared key (PSK) generated from a given password and
that will be used as the master key in the wireless
network. This means every wireless user will share the
@@ -1293,7 +1293,7 @@
<programlisting>wlans_ath0="wlan0"
ifconfig_wlan0="WPA DHCP"</programlisting>
- <para>Then, we can bring up the interface:</para>
+ <para>Then we can bring up the interface:</para>
<screen>&prompt.root; <userinput><filename>/etc/rc.d/netif</filename> start</userinput>
Starting wpa_supplicant.
@@ -1346,16 +1346,16 @@
wme burst roaming MANUAL</screen>
<note>
- <para>If the <filename>/etc/rc.conf</filename> is set up
- with the line <literal>ifconfig_wlan0="DHCP"</literal>
- then it is no need to run the
- <command>dhclient</command> command manually,
- <command>dhclient</command> will be launched after
- <command>wpa_supplicant</command> plumbs the
- keys.</para>
+ <para>If <filename>/etc/rc.conf</filename> has an
+ <literal>ifconfig_wlan0</literal> entry with the
+ <literal>DHCP</literal> string (like
+ <literal>ifconfig_wlan0="DHCP"</literal>),
+ <command>dhclient</command> will be launched
+ automatically after <command>wpa_supplicant</command>
+ associates with the access point.</para>
</note>
- <para>In the case where the use of DHCP is not possible,
+ <para>If DHCP is not possible or desired,
you can set a static IP address after
<command>wpa_supplicant</command> has authenticated the
station:</para>
@@ -1374,7 +1374,7 @@
wme burst roaming MANUAL</screen>
<para>When DHCP is not used, you also have to manually set
- up the default gateway and the nameserver:</para>
+ the default gateway and the nameserver:</para>
<screen>&prompt.root; <userinput>route add default <replaceable>your_default_router</replaceable></userinput>
&prompt.root; <userinput>echo "nameserver <replaceable>your_DNS_server</replaceable>" >> /etc/resolv.conf</userinput></screen>
@@ -1384,17 +1384,17 @@
<title>WPA with EAP-TLS</title>
<para>The second way to use WPA is with an 802.1X backend
- authentication server, in this case WPA is called
- WPA-Enterprise to make difference with the less secure
- WPA-Personal with its pre-shared key. The
- authentication in WPA-Enterprise is based on EAP
- (Extensible Authentication Protocol).</para>
+ authentication server. In this case WPA is called
+ WPA-Enterprise to differentiate it from the less secure
+ WPA-Personal with its pre-shared key.
+ Authentication in WPA-Enterprise is based on the
+ Extensible Authentication Protocol (EAP).</para>
- <para>EAP does not come with an encryption method, it was
- decided to embed EAP inside an encrypted tunnel. Many
- types of EAP authentication methods have been designed,
- the most common methods are EAP-TLS, EAP-TTLS and
- EAP-PEAP.</para>
+ <para>EAP does not come with an encryption method.
+ Instead, it was decided to embed EAP inside an encrypted
+ tunnel. There are many EAP authentication methods, but
+ EAP-TLS, EAP-TTLS, and EAP-PEAP are the most
+ common.</para>
<para>EAP-TLS (EAP with Transport Layer Security) is a
very well-supported authentication protocol in the
@@ -1559,7 +1559,7 @@
<callout arearefs="co-ttls-cacert">
<para>The <literal>ca_cert</literal> field indicates
the pathname of the CA certificate file. This file
- is needed to verify the server certificat.</para>
+ is needed to verify the server certificate.</para>
</callout>
<callout arearefs="co-ttls-pha2">
@@ -1601,23 +1601,26 @@
<sect5 id="network-wireless-wpa-eap-peap">
<title>WPA with EAP-PEAP</title>
+ <note>
+ <para>PEAPv0/EAP-MSCHAPv2 is the most common PEAP method.
+ In the rest of this document, we will use the PEAP term
+ to refer to that method.</para>
+ </note>
+
<para>PEAP (Protected EAP) has been designed as an
- alternative to EAP-TTLS. There are two types of PEAP
- methods, the most common one is PEAPv0/EAP-MSCHAPv2. In
- the rest of this document, we will use the PEAP term to
- refer to that EAP method. PEAP is the most used EAP
- standard after EAP-TLS, in other words if you have a
- network with mixed OSes, PEAP should be the most
- supported standard after EAP-TLS.</para>
+ alternative to EAP-TTLS, and is the most used EAP
+ standard after EAP-TLS. In other words, if you have a
+ network with mixed OSes, PEAP should be the
+ most supported standard after EAP-TLS.</para>
<para>PEAP is similar to EAP-TTLS: it uses a server-side
certificate to authenticate clients by creating an
encrypted TLS tunnel between the client and the
authentication server, which protects the ensuing
- exchange of authentication information. In term of
- security the difference between EAP-TTLS and PEAP is
- that PEAP authentication broadcasts the username in
- clear, only the password is sent in the encrypted TLS
+ exchange of authentication information. In terms of
+ security, the difference between EAP-TTLS and PEAP is
+ that PEAP authentication broadcasts the username in the
+ clear, with only the password sent in the encrypted TLS
tunnel. EAP-TTLS will use the TLS tunnel for both
username and password.</para>
@@ -1662,10 +1665,10 @@
<callout arearefs="co-peap-pha1">
<para>This field contains the parameters for the
- first phase of the authentication (the TLS
+ first phase of authentication (the TLS
tunnel). According to the authentication server
used, you will have to specify a specific label
- for the authentication. Most of time, the label
+ for authentication. Most of the time, the label
will be <quote>client EAP encryption</quote> which
is set by using <literal>peaplabel=0</literal>.
More information can be found in the
@@ -1686,7 +1689,7 @@
<programlisting>wlans_ath0="wlan0"
ifconfig_wlan0="WPA DHCP"</programlisting>
- <para>Then, we can bring up the interface:</para>
+ <para>Then we can bring up the interface:</para>
<screen>&prompt.root; <userinput>/etc/rc.d/netif start</userinput>
Starting wpa_supplicant.
@@ -1713,7 +1716,7 @@
<para>WEP (Wired Equivalent Privacy) is part of the original
802.11 standard. There is no authentication mechanism,
- only a weak form of access control, and it is easily to be
+ only a weak form of access control, and it is easily
cracked.</para>
<para>WEP can be set up with
@@ -1728,18 +1731,18 @@
<para>The <literal>weptxkey</literal> means which WEP
key will be used in the transmission. Here we used the
third key. This must match the setting in the access
- point. If you do not have any idea of what is the key
- used by the access point, you should try to use
+ point. If you do not have any idea of which key is
+ used by the access point, try
<literal>1</literal> (i.e., the first key) for this
value.</para>
</listitem>
<listitem>
- <para>The <literal>wepkey</literal> means setting the
- selected WEP key. It should in the format
- <replaceable>index:key</replaceable>, if the index is
- not given, key <literal>1</literal> is set. That is
- to say we need to set the index if we use keys other
+ <para>The <literal>wepkey</literal> selects one of the
+ WEP keys. It should be in the format
+ <replaceable>index:key</replaceable>. Key
+ <literal>1</literal> is used by default; the index
+ only needs to be set if we use a key other
than the first key.</para>
<note>
@@ -1750,7 +1753,7 @@
</listitem>
</itemizedlist>
- <para>You are encouraged to read &man.ifconfig.8; manual
+ <para>You are encouraged to read the &man.ifconfig.8; manual
page for further information.</para>
<para>The <command>wpa_supplicant</command> facility also
@@ -1781,7 +1784,7 @@
<para>IBSS mode, also called ad-hoc mode, is designed for point
to point connections. For example, to establish an ad-hoc
network between the machine <hostid>A</hostid> and the machine
- <hostid>B</hostid> we will just need to choose two IP addresses
+ <hostid>B</hostid>, we will just need to choose two IP addresses
and a SSID.</para>
<para>On the box <hostid>A</hostid>:</para>
@@ -1826,7 +1829,7 @@
protmode CTS wme burst</screen>
<para>Both <hostid>A</hostid> and <hostid>B</hostid> are now
- ready to exchange informations.</para>
+ ready to exchange information.</para>
</sect2>
<sect2 id="network-wireless-ap">
@@ -1843,19 +1846,19 @@
<para>Before configuring your &os; machine as an AP, the
kernel must be configured with the appropriate wireless
networking support for your wireless card. You also have to
- add the support for the security protocols you intend to
+ add support for the security protocols you intend to
use. For more details, see <xref
linkend="network-wireless-basic">.</para>
<note>
<para>The use of the NDIS driver wrapper and the &windows;
- drivers do not allow currently the AP operation. Only
+ drivers do not currently allow AP operation. Only
native &os; wireless drivers support AP mode.</para>
</note>
- <para>Once the wireless networking support is loaded, you can
+ <para>Once wireless networking support is loaded, you can
check if your wireless device supports the host-based access
- point mode (also know as hostap mode):</para>
+ point mode (also known as hostap mode):</para>
<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> list caps</userinput>
@@ -1865,8 +1868,8 @@
<para>This output displays the card capabilities; the
<literal>HOSTAP</literal> word confirms this wireless card
can act as an Access Point. Various supported ciphers are
- also mentioned: WEP, TKIP, AES, etc., these informations
- are important to know what security protocols could be set
+ also mentioned: WEP, TKIP, AES, etc. This information
+ is important to know what security protocols can be used
on the Access Point.</para>
<para>The wireless device can only be put into hostap mode
@@ -1881,7 +1884,7 @@
<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable> wlanmode hostap</userinput>
&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable> ssid <replaceable>freebsdap</replaceable> mode 11g channel 1</userinput></screen>
- <para>Use again <command>ifconfig</command> to see the status
+ <para>Use <command>ifconfig</command> again to see the status
of the <devicename>wlan0</devicename> interface:</para>
<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
@@ -2154,7 +2157,7 @@
<para>On &os;, it is possible to combine two or even more network
interfaces together in a <quote>failover</quote> fashion, that
is, to use the most preferred and available connection from a
- group of network interfaces, and have the operating system to
+ group of network interfaces, and have the operating system
switch automatically when the link state changes.</para>
<para>We will cover link aggregation and failover in <xref linkend="network-aggregation">
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#22 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.309 2011/05/27 10:22:55 bcr Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.310 2011/12/05 23:46:43 wblock Exp $
-->
<chapter id="disks">
@@ -4038,7 +4038,7 @@
<sect2>
<title>Synopsis</title>
- <para>High-availability is one of the main requirements in serious
+ <para>High availability is one of the main requirements in serious
business applications and highly-available storage is a key
component in such environments. Highly Available STorage, or
<acronym>HAST<remark role="acronym">Highly Available
@@ -4109,7 +4109,7 @@
drives.</para>
</listitem>
<listitem>
- <para>File system agnostic, thus allowing to use any file
+ <para>File system agnostic; works with any file
system supported by &os;.</para>
</listitem>
<listitem>
@@ -4152,7 +4152,7 @@
total.</para>
</note>
- <para>Since the <acronym>HAST</acronym> works in
+ <para>Since <acronym>HAST</acronym> works in a
primary-secondary configuration, it allows only one of the
cluster nodes to be active at any given time. The
<literal>primary</literal> node, also called
@@ -4175,7 +4175,7 @@
</itemizedlist>
<para><acronym>HAST</acronym> operates synchronously on a block
- level, which makes it transparent for file systems and
+ level, making it transparent to file systems and
applications. <acronym>HAST</acronym> provides regular GEOM
providers in <filename class="directory">/dev/hast/</filename>
directory for use by other tools or applications, thus there is
@@ -4252,7 +4252,7 @@
For stripped-down systems, make sure this module is available.
Alternatively, it is possible to build
<literal>GEOM_GATE</literal> support into the kernel
- statically, by adding the following line to the custom kernel
+ statically, by adding this line to the custom kernel
configuration file:</para>
<programlisting>options GEOM_GATE</programlisting>
@@ -4290,10 +4290,10 @@
class="directory">/dev/hast/</filename>) will be called
<filename><replaceable>test</replaceable></filename>.</para>
- <para>The configuration of <acronym>HAST</acronym> is being done
+ <para>Configuration of <acronym>HAST</acronym> is done
in the <filename>/etc/hast.conf</filename> file. This file
should be the same on both nodes. The simplest configuration
- possible is following:</para>
+ possible is:</para>
<programlisting>resource test {
on hasta {
@@ -4317,9 +4317,9 @@
alternatively in the local <acronym>DNS</acronym>.</para>
</tip>
- <para>Now that the configuration exists on both nodes, it is
- possible to create the <acronym>HAST</acronym> pool. Run the
- following commands on both nodes to place the initial metadata
+ <para>Now that the configuration exists on both nodes,
+ the <acronym>HAST</acronym> pool can be created. Run these
+ commands on both nodes to place the initial metadata
onto the local disk, and start the &man.hastd.8; daemon:</para>
<screen>&prompt.root; <userinput>hastctl create test</userinput>
@@ -4334,52 +4334,52 @@
available.</para>
</note>
- <para>HAST is not responsible for selecting node's role
- (<literal>primary</literal> or <literal>secondary</literal>).
- Node's role has to be configured by an administrator or other
- software like <application>Heartbeat</application> using the
+ <para>A HAST node's role (<literal>primary</literal> or
+ <literal>secondary</literal>) is selected by an administrator
+ or other
+ software like <application>Heartbeat</application> using the
&man.hastctl.8; utility. Move to the primary node
(<literal><replaceable>hasta</replaceable></literal>) and
- issue the following command:</para>
+ issue this command:</para>
<screen>&prompt.root; <userinput>hastctl role primary test</userinput></screen>
- <para>Similarly, run the following command on the secondary node
+ <para>Similarly, run this command on the secondary node
(<literal><replaceable>hastb</replaceable></literal>):</para>
<screen>&prompt.root; <userinput>hastctl role secondary test</userinput></screen>
<caution>
- <para>It may happen that both of the nodes are not able to
- communicate with each other and both are configured as
- primary nodes; the consequence of this condition is called
- <literal>split-brain</literal>. In order to troubleshoot
+ <para>When the nodes are unable to
+ communicate with each other, and both are configured as
+ primary nodes, the condition is called
+ <literal>split-brain</literal>. To troubleshoot
this situation, follow the steps described in <xref
linkend="disks-hast-sb">.</para>
</caution>
- <para>It is possible to verify the result with the
+ <para>Verify the result with the
&man.hastctl.8; utility on each node:</para>
<screen>&prompt.root; <userinput>hastctl status test</userinput></screen>
- <para>The important text is the <literal>status</literal> line
- from its output and it should say <literal>complete</literal>
+ <para>The important text is the <literal>status</literal> line,
+ which should say <literal>complete</literal>
on each of the nodes. If it says <literal>degraded</literal>,
something went wrong. At this point, the synchronization
between the nodes has already started. The synchronization
- completes when the <command>hastctl status</command> command
+ completes when <command>hastctl status</command>
reports 0 bytes of <literal>dirty</literal> extents.</para>
- <para>The last step is to create a filesystem on the
+ <para>The next step is to create a filesystem on the
<devicename>/dev/hast/<replaceable>test</replaceable></devicename>
- GEOM provider and mount it. This has to be done on the
- <literal>primary</literal> node (as the
+ GEOM provider and mount it. This must be done on the
+ <literal>primary</literal> node, as
<filename>/dev/hast/<replaceable>test</replaceable></filename>
- appears only on the <literal>primary</literal> node), and
- it can take a few minutes depending on the size of the hard
- drive:</para>
+ appears only on the <literal>primary</literal> node.
+ Creating the filesystem can take a few minutes, depending on the
+ size of the hard drive:</para>
<screen>&prompt.root; <userinput>newfs -U /dev/hast/test</userinput>
&prompt.root; <userinput>mkdir /hast/test</userinput>
@@ -4387,9 +4387,9 @@
<para>Once the <acronym>HAST</acronym> framework is configured
properly, the final step is to make sure that
- <acronym>HAST</acronym> is started during the system boot time
- automatically. The following line should be added to the
- <filename>/etc/rc.conf</filename> file:</para>
+ <acronym>HAST</acronym> is started automatically during the system
+ boot. Add this line to
+ <filename>/etc/rc.conf</filename>:</para>
<programlisting>hastd_enable="YES"</programlisting>
@@ -4397,26 +4397,25 @@
<title>Failover Configuration</title>
<para>The goal of this example is to build a robust storage
- system which is resistant from the failures of any given node.
- The key task here is to remedy a scenario when a
- <literal>primary</literal> node of the cluster fails. Should
- it happen, the <literal>secondary</literal> node is there to
+ system which is resistant to the failure of any given node.
+ The scenario is that a
+ <literal>primary</literal> node of the cluster fails. If
+ this happens, the <literal>secondary</literal> node is there to
take over seamlessly, check and mount the file system, and
continue to work without missing a single bit of data.</para>
- <para>In order to accomplish this task, it will be required to
- utilize another feature available under &os; which provides
+ <para>To accomplish this task, another &os; feature provides
for automatic failover on the IP layer —
- <acronym>CARP</acronym>. <acronym>CARP</acronym> stands for
- Common Address Redundancy Protocol and allows multiple hosts
+ <acronym>CARP</acronym>. <acronym>CARP</acronym> (Common Address
+ Redundancy Protocol) allows multiple hosts
on the same network segment to share an IP address. Set up
<acronym>CARP</acronym> on both nodes of the cluster according
to the documentation available in <xref linkend="carp">.
- After completing this task, each node should have its own
+ After setup, each node will have its own
<devicename>carp0</devicename> interface with a shared IP
address <replaceable>172.16.0.254</replaceable>.
- Obviously, the primary <acronym>HAST</acronym> node of the
- cluster has to be the master <acronym>CARP</acronym>
+ The primary <acronym>HAST</acronym> node of the
+ cluster must be the master <acronym>CARP</acronym>
node.</para>
<para>The <acronym>HAST</acronym> pool created in the previous
@@ -4430,17 +4429,17 @@
<para>In the event of <acronym>CARP</acronym> interfaces going
up or down, the &os; operating system generates a &man.devd.8;
- event, which makes it possible to watch for the state changes
+ event, making it possible to watch for the state changes
on the <acronym>CARP</acronym> interfaces. A state change on
the <acronym>CARP</acronym> interface is an indication that
- one of the nodes failed or came back online. In such a case,
- it is possible to run a particular script which will
- automatically handle the failover.</para>
+ one of the nodes failed or came back online. These state change
+ events make it possible to run a script which will
+ automatically handle the HAST failover.</para>
- <para>To be able to catch the state changes on the
- <acronym>CARP</acronym> interfaces, the following
- configuration has to be added to the
- <filename>/etc/devd.conf</filename> file on each node:</para>
+ <para>To be able to catch state changes on the
+ <acronym>CARP</acronym> interfaces, add this
+ configuration to
+ <filename>/etc/devd.conf</filename> on each node:</para>
<programlisting>notify 30 {
match "system" "IFNET";
@@ -4456,12 +4455,12 @@
action "/usr/local/sbin/carp-hast-switch slave";
};</programlisting>
- <para>To put the new configuration into effect, run the
- following command on both nodes:</para>
+ <para>Restart &man.devd.8; on both nodes to put the new configuration
+ into effect:</para>
<screen>&prompt.root; <userinput>/etc/rc.d/devd restart</userinput></screen>
- <para>In the event that the <devicename>carp0</devicename>
+ <para>When the <devicename>carp0</devicename>
interface goes up or down (i.e. the interface state changes),
the system generates a notification, allowing the &man.devd.8;
subsystem to run an arbitrary script, in this case
@@ -4471,7 +4470,7 @@
&man.devd.8; configuration, please consult the
&man.devd.conf.5; manual page.</para>
- <para>An example of such a script could be following:</para>
+ <para>An example of such a script could be:</para>
<programlisting>#!/bin/sh
@@ -4557,13 +4556,13 @@
;;
esac</programlisting>
- <para>In a nutshell, the script does the following when a node
+ <para>In a nutshell, the script takes these actions when a node
becomes <literal>master</literal> /
<literal>primary</literal>:</para>
<itemizedlist>
<listitem>
- <para>Promotes the <acronym>HAST</acronym> pools as
+ <para>Promotes the <acronym>HAST</acronym> pools to
primary on a given node.</para>
</listitem>
<listitem>
@@ -4571,7 +4570,7 @@
<acronym>HAST</acronym> pool.</para>
</listitem>
<listitem>
- <para>Mounts the pools at appropriate place.</para>
+ <para>Mounts the pools at an appropriate place.</para>
</listitem>
</itemizedlist>
@@ -4590,15 +4589,15 @@
<caution>
<para>Keep in mind that this is just an example script which
- should serve as a proof of concept solution. It does not
+ should serve as a proof of concept. It does not
handle all the possible scenarios and can be extended or
altered in any way, for example it can start/stop required
- services etc.</para>
+ services, etc.</para>
</caution>
<tip>
- <para>For the purpose of this example we used a standard UFS
- file system. In order to reduce the time needed for
+ <para>For this example, we used a standard UFS
+ file system. To reduce the time needed for
recovery, a journal-enabled UFS or ZFS file system can
be used.</para>
</tip>
@@ -4615,41 +4614,40 @@
<sect3>
<title>General Troubleshooting Tips</title>
- <para><acronym>HAST</acronym> should be generally working
- without any issues, however as with any other software
+ <para><acronym>HAST</acronym> should generally work
+ without issues. However, as with any other software
product, there may be times when it does not work as
supposed. The sources of the problems may be different, but
the rule of thumb is to ensure that the time is synchronized
between all nodes of the cluster.</para>
- <para>The debugging level of the &man.hastd.8; should be
- increased when troubleshooting <acronym>HAST</acronym>
- problems. This can be accomplished by starting the
+ <para>When troubleshooting <acronym>HAST</acronym> problems,
+ the debugging level of &man.hastd.8; should be increased
+ by starting the
&man.hastd.8; daemon with the <literal>-d</literal>
- argument. Note, that this argument may be specified
+ argument. Note that this argument may be specified
multiple times to further increase the debugging level. A
- lot of useful information may be obtained this way. It
- should be also considered to use <literal>-F</literal>
- argument, which will start the &man.hastd.8; daemon in
+ lot of useful information may be obtained this way. Consider
+ also using the <literal>-F</literal>
+ argument, which starts the &man.hastd.8; daemon in the
foreground.</para>
</sect3>
<sect3 id="disks-hast-sb">
<title>Recovering from the Split-brain Condition</title>
- <para>The consequence of a situation when both nodes of the
- cluster are not able to communicate with each other and both
- are configured as primary nodes is called
- <literal>split-brain</literal>. This is a dangerous
+ <para><literal>Split-brain</literal> is when the nodes of the
+ cluster are unable to communicate with each other, and both
+ are configured as primary. This is a dangerous
condition because it allows both nodes to make incompatible
- changes to the data. This situation has to be handled by
- the system administrator manually.</para>
+ changes to the data. This problem must be corrected
+ manually by the system administrator.</para>
- <para>In order to fix this situation the administrator has to
+ <para>The administrator must
decide which node has more important changes (or merge them
- manually) and let the <acronym>HAST</acronym> perform
- the full synchronization of the node which has the broken
- data. To do this, issue the following commands on the node
+ manually) and let <acronym>HAST</acronym> perform
+ full synchronization of the node which has the broken
+ data. To do this, issue these commands on the node
which needs to be resynchronized:</para>
<screen>&prompt.root; <userinput>hastctl role init <resource></userinput>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#116 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1122 2011/12/02 22:24:30 dougb Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1123 2011/12/06 02:16:09 dougb Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -8910,6 +8910,21 @@
<para>All boolean tests should utilize the checkyesno function.
No hand-rolled tests for [Yy][Ee][Ss], etc.</para>
</step>
+
+ <step>
+ <para>If there is a loop (for example, waiting for something to
+ start) does it have a counter to terminate the loop? We do
+ not want the boot to be stuck forever if there is an error.</para>
+ </step>
+
+ <step>
+ <para>Does the script create files or directories that need
+ specific permissions, for example, a pid file that needs
+ to be owned by the user that runs the process? Rather than
+ the traditional touch/chown/chmod routine consider using
+ &man.install.1; with the proper command line arguments to
+ do the whole procedure with one step.</para>
+ </step>
</procedure>
</sect2>
</sect1>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#64 (text+ko) ====
@@ -13,7 +13,7 @@
builds for the other languages, and we will poke fun of you
in public.
- $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.560 2011/11/16 19:49:58 brueffer Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.561 2011/12/03 14:01:37 jhibbits Exp $
-->
<!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">
@@ -578,6 +578,8 @@
<!ENTITY a.jhb "John Baldwin <email>jhb at FreeBSD.org</email>">
+<!ENTITY a.jhibbits "Justin Hibbits <email>jhibbits at FreeBSD.org</email>">
+
<!ENTITY a.jhs "Julian Stacey <email>jhs at FreeBSD.org</email>">
<!ENTITY a.jilles "Jilles Tjoelker <email>jilles at FreeBSD.org</email>">
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#17 (text+ko) ====
@@ -1,5 +1,5 @@
<!--
- $FreeBSD: doc/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml,v 1.7 2011/10/02 19:34:56 rene Exp $
+ $FreeBSD: doc/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml,v 1.8 2011/12/03 12:26:40 rene Exp $
%SOURCE% en_US.ISO8859-1/articles/contributing-ports/article.sgml
%SRCID% 1.9
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#24 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml,v 1.11 2010/07/04 18:35:22 rene Exp $
+ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml,v 1.12 2011/12/03 17:49:02 rene Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
%SRCID% 1.26
==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#64 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.167 2011/11/19 16:40:29 scheidell Exp $
+ $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.168 2011/12/03 14:01:37 jhibbits Exp $
-->
<sect2 id="pgpkey-ariff">
@@ -591,6 +591,11 @@
&pgpkey.dhn;
</sect2>
+ <sect2 id="pgpkey-jhibbits">
+ <title>&a.jhibbits;</title>
+ &pgpkey.jhibbits;
+ </sect2>
+
<sect2 id="pgpkey-pho">
<title>&a.pho;</title>
&pgpkey.pho;
==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#62 (text+ko) ====
@@ -1,5 +1,5 @@
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.258 2011/11/19 16:40:30 scheidell Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.259 2011/12/03 14:01:37 jhibbits Exp $ -->
<!-- PGP keyblocks -->
<!ENTITY pgpkey.aaron SYSTEM "aaron.key">
<!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -150,6 +150,7 @@
<!ENTITY pgpkey.jh SYSTEM "jh.key">
<!ENTITY pgpkey.jhay SYSTEM "jhay.key">
<!ENTITY pgpkey.jhb SYSTEM "jhb.key">
+<!ENTITY pgpkey.jhibbits SYSTEM "jhibbits.key">
<!ENTITY pgpkey.jilles SYSTEM "jilles.key">
<!ENTITY pgpkey.jim SYSTEM "jim.key">
<!ENTITY pgpkey.jinmei SYSTEM "jinmei.key">
==== //depot/projects/docproj_nl/www/en/administration.sgml#23 (text+ko) ====
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/en/administration.sgml,v 1.44 2011/08/06 00:17:39 gjb Exp $">
+<!ENTITY date "$FreeBSD: www/en/administration.sgml,v 1.45 2011/12/04 05:38:01 tabthorpe Exp $">
<!ENTITY title "FreeBSD Project Administration and Management">
<!ENTITY % navinclude.about "INCLUDE">
<!ENTITY % developers SYSTEM "developers.sgml"> %developers;
@@ -123,6 +123,7 @@
<li>&a.tabthorpe; <<a href="mailto:tabthorpe at FreeBSD.org">tabthorpe at FreeBSD.org</a>></li>
<li>&a.marcus; <<a href="mailto:marcus at FreeBSD.org">marcus at FreeBSD.org</a>></li>
<li>&a.bapt; <<a href="mailto:bapt at FreeBSD.org">bapt at FreeBSD.org</a>></li>
+ <li>&a.beat; <<a href="mailto:beat at FreeBSD.org">beat at FreeBSD.org</a>></li>
<li>&a.erwin; <<a href="mailto:erwin at FreeBSD.org">erwin at FreeBSD.org</a>></li>
<li>&a.linimon; <<a href="mailto:linimon at FreeBSD.org">linimon at FreeBSD.org</a>></li>
<li>&a.pav; <<a href="mailto:pav at FreeBSD.org">pav at FreeBSD.org</a>></li>
==== //depot/projects/docproj_nl/www/en/developers.sgml#65 (text+ko) ====
@@ -6,7 +6,7 @@
us to update author names, or the representation of those names (such
as adding email addresses), by just editing a single file.
-$FreeBSD: www/en/developers.sgml,v 1.302 2011/11/12 16:49:42 scheidell Exp $
+$FreeBSD: www/en/developers.sgml,v 1.304 2011/12/04 05:38:01 tabthorpe Exp $
-->
@@ -278,6 +278,7 @@
<!ENTITY a.jh "Jaakko Heinonen">
<!ENTITY a.jhay "John Hay">
<!ENTITY a.jhb "John Baldwin">
+<!ENTITY a.jhibbits "Justin Hibbits">
<!ENTITY a.jhs "Julian Stacey">
<!ENTITY a.jilles "Jilles Tjoelker">
<!ENTITY a.jim "Jim Mock">
@@ -682,7 +683,7 @@
<!ENTITY a.donations '&a.gjb;, &a.wilko;, &a.gahr;, &a.pgollucci;, &a.skreuzer;, &a.obrien;, &a.trhodes;, Daniel Seuffert, &a.rwatson;'>
<!-- FreeBSD Ports Manager Team -->
-<!ENTITY a.portmgr '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.erwin;, &a.linimon;, &a.pav;, &a.itetcu;, &a.flz;, &a.miwi;'>
+<!ENTITY a.portmgr '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.beat;, &a.erwin;, &a.linimon;, &a.pav;, &a.itetcu;, &a.flz;, &a.miwi;'>
<!-- FreeBSD Release Engineering Teams -->
<!ENTITY a.re.members '&a.kib;, &a.blackend;, &a.jpaetzel;, &a.hrs;, &a.kensmith;, &a.rwatson;, &a.bz;'>
==== //depot/projects/docproj_nl/www/share/sgml/news.xml#124 (text+ko) ====
@@ -25,7 +25,7 @@
<news>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $FreeBSD: www/share/sgml/news.xml,v 1.407 2011/11/18 14:43:32 jkois Exp $
+ $FreeBSD: www/share/sgml/news.xml,v 1.410 2011/12/04 06:29:22 ryusuke Exp $
</cvs:keyword>
</cvs:keywords>
@@ -33,9 +33,30 @@
<name>2011</name>
<month>
+ <name>12</name>
+
+ <day>
+ <name>2</name>
+ <event>
+ <p>New member for the Ports Management team:
+ <a href="mailto:beat at FreeBSD.org">Beat Gätzi</a></p>
+ </event>
+ </day>
+ </month>
+
+ <month>
<name>11</name>
<day>
+ <name>30</name>
+
+ <event>
+ <p>New committer:
+ <a href="mailto:jhibbits at FreeBSD.org">Justin Hibbits</a> (src)</p>
+ </event>
+ </day>
+
+ <day>
<name>17</name>
<event>
More information about the p4-projects
mailing list