svn commit: r44415 - head/en_US.ISO8859-1/books/handbook/advanced-networking

Dru Lavigne dru at FreeBSD.org
Tue Apr 1 23:24:54 UTC 2014


Author: dru
Date: Tue Apr  1 23:24:54 2014
New Revision: 44415
URL: http://svnweb.freebsd.org/changeset/doc/44415

Log:
  White space fix only. Translators can ignore.
  
  Sponsored by:	iXsystems

Modified:
  head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Tue Apr  1 23:03:08 2014	(r44414)
+++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Tue Apr  1 23:24:54 2014	(r44415)
@@ -489,10 +489,10 @@ static_routes="internalnet2"
 route_internalnet2="-net 192.168.2.0/24 192.168.1.2"</programlisting>
 
       <para>The <literal>static_routes</literal> configuration
-	variable is a list of strings separated by a space, where
-	each string references a route name.  The variable
-	<literal>route_<replaceable>internalnet2</replaceable></literal> contains the static
-	route for that route name.</para>
+	variable is a list of strings separated by a space, where each
+	string references a route name.  The variable
+	<literal>route_<replaceable>internalnet2</replaceable></literal>
+	contains the static route for that route name.</para>
 
       <para>Using more than one string in
 	<literal>static_routes</literal> creates multiple static
@@ -2009,7 +2009,8 @@ wpa_pairwise=CCMP TKIP <co xml:id="co-ap
 	    clients can associate with it.  See <xref
 	      linkend="network-wireless-wpa"/> for more details.  It
 	    is possible to see the stations associated with the
-	    <acronym>AP</acronym> using <command>ifconfig <replaceable>wlan0</replaceable> list
+	    <acronym>AP</acronym> using <command>ifconfig
+	      <replaceable>wlan0</replaceable> list
 	      sta</command>.</para>
 	</sect4>
       </sect3>
@@ -2143,7 +2144,8 @@ freebsdap       00:11:95:c3:0d:ac    1  
 	    Debugging messages can be enabled in the 802.11 protocol
 	    support layer using &man.wlandebug.8;.  On a &os; system
 	    prior to &os; 9.1, this program can be found in
-	    <filename class="directory">/usr/src/tools/tools/net80211</filename>.
+	    <filename
+	      class="directory">/usr/src/tools/tools/net80211</filename>.
 	    For example, to enable console messages related to
 	    scanning for access points and the 802.11 protocol
 	    handshakes required to arrange communication:</para>
@@ -2151,9 +2153,9 @@ freebsdap       00:11:95:c3:0d:ac    1  
 	  <screen>&prompt.root; <userinput>wlandebug -i <replaceable>ath0</replaceable> +scan+auth+debug+assoc</userinput>
   net.wlan.0.debug: 0 => 0xc80000<assoc,auth,scan></screen>
 
-	  <para>Many useful statistics are maintained by
-	    the 802.11 layer and <command>wlanstats</command>, found
-	    in <filename class="directory">/usr/src/tools/tools/net80211</filename>,
+	  <para>Many useful statistics are maintained by the 802.11
+	    layer and <command>wlanstats</command>, found in <filename
+	      class="directory">/usr/src/tools/tools/net80211</filename>,
 	    will dump this information.  These statistics should
 	    display all errors identified by the 802.11 layer.
 	    However, some errors are identified in the device drivers
@@ -3211,7 +3213,7 @@ bridge0: flags=8843<UP,BROADCAST,RUNN
 	beginning <literal>#</literal> symbol:</para>
 
       <programlisting>begemotSnmpdModulePath."bridge" = "/usr/lib/snmp_bridge.so"</programlisting>
-	  
+
       <para>Other configuration settings, such as community names and
 	access lists, may need to be modified in this file.  See
 	&man.bsnmpd.1; and &man.snmp.bridge.3; for more information.
@@ -3329,16 +3331,17 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault
     <para>&os; provides the &man.lagg.4; interface which can be used
       to aggregate multiple network interfaces into one virtual
       interface in order to provide failover and link aggregation.
-      Failover allows traffic to continue to flow as long as at least one
-      aggregated network interface has an established link.  Link aggregation works best on
-      switches which support <acronym>LACP</acronym>, as this
-      protocol distributes traffic bi-directionally while responding
-      to the failure of individual links.</para>
+      Failover allows traffic to continue to flow as long as at least
+      one aggregated network interface has an established link.  Link
+      aggregation works best on switches which support
+      <acronym>LACP</acronym>, as this protocol distributes traffic
+      bi-directionally while responding to the failure of individual
+      links.</para>
 
     <para>The aggregation protocols supported by the lagg interface
-      determine which ports are used for outgoing traffic and
-      whether or not a specific port accepts incoming traffic.  The
-      following protocols are supported by &man.lagg.4;:</para>
+      determine which ports are used for outgoing traffic and whether
+      or not a specific port accepts incoming traffic.  The following
+      protocols are supported by &man.lagg.4;:</para>
 
     <variablelist>
       <varlistentry>
@@ -4905,74 +4908,71 @@ route_hostD="192.168.173.4 hatm0 0 102 l
       (<acronym>CARP</acronym>) allows multiple hosts to share the
       same <acronym>IP</acronym> address and Virtual Host ID
       (<acronym>VHID</acronym>) in order to provide <firstterm>high
-      availability</firstterm> for one or more services.  This means that one or more
-      hosts can fail, and the
-      other hosts will transparently take over so that users do not see a service
+      availability</firstterm> for one or more services.  This means
+      that one or more hosts can fail, and the other hosts will
+      transparently take over so that users do not see a service
       failure.</para>
-	
-    <para>In 
-      addition to the shared <acronym>IP</acronym> address, each host
-      has its own <acronym>IP</acronym> address for management and
-      configuration.  All of the machines that share an
-	<acronym>IP</acronym> address have the same
-	<acronym>VHID</acronym>.  The <acronym>VHID</acronym> for each
-	virtual <acronym>IP</acronym> address must be unique across
-	the broadcast domain of the network interface.</para>
+
+    <para>In addition to the shared <acronym>IP</acronym> address,
+      each host has its own <acronym>IP</acronym> address for
+      management and configuration.  All of the machines that share an
+      <acronym>IP</acronym> address have the same
+      <acronym>VHID</acronym>.  The <acronym>VHID</acronym> for each
+      virtual <acronym>IP</acronym> address must be unique across the
+      broadcast domain of the network interface.</para>
 
     <para>High availability using <acronym>CARP</acronym> is built
       into &os;, though the steps to configure it vary slightly
       depending upon the &os; version.  This section provides the same
       example configuration for versions before and equal to or after
-      &os; 10.</para>  
+      &os; 10.</para>
 
-    <para>This example
-	configures failover support with three hosts, all with unique
-	<acronym>IP</acronym> addresses, but providing the same web
-	content.  It has two different masters named
-	<systemitem>hosta.example.org</systemitem> and
-	<systemitem>hostb.example.org</systemitem>, with
-	a shared backup named
-	<systemitem>hostc.example.org</systemitem>.</para>
+    <para>This example configures failover support with three hosts,
+      all with unique <acronym>IP</acronym> addresses, but providing
+      the same web content.  It has two different masters named
+      <systemitem>hosta.example.org</systemitem> and
+      <systemitem>hostb.example.org</systemitem>, with a shared backup
+      named <systemitem>hostc.example.org</systemitem>.</para>
 
     <para>These machines are load balanced with a Round Robin
-	<acronym>DNS</acronym> configuration.  The master and backup
-	machines are configured identically except for their hostnames
-	and management <acronym>IP</acronym> addresses.  These servers
-	must have the same configuration and run the same services.
-	When the failover occurs, requests to the service on the
-	shared <acronym>IP</acronym> address can only be answered
-	correctly if the backup server has access to the same content.
-	The backup machine has two additional <acronym>CARP</acronym>
-	interfaces, one for each of the master content server's
-	<acronym>IP</acronym> addresses.  When a failure occurs, the
-	backup server will pick up the failed master machine's
-	<acronym>IP</acronym> address.</para>
+      <acronym>DNS</acronym> configuration.  The master and backup
+      machines are configured identically except for their hostnames
+      and management <acronym>IP</acronym> addresses.  These servers
+      must have the same configuration and run the same services.
+      When the failover occurs, requests to the service on the shared
+      <acronym>IP</acronym> address can only be answered correctly if
+      the backup server has access to the same content.  The backup
+      machine has two additional <acronym>CARP</acronym> interfaces,
+      one for each of the master content server's
+      <acronym>IP</acronym> addresses.  When a failure occurs, the
+      backup server will pick up the failed master machine's
+      <acronym>IP</acronym> address.</para>
 
     <sect2 xml:id="carp-10x">
       <title>Using <acronym>CARP</acronym> on &os; 10 and
 	Later</title>
 
-      <para>Enable boot-time support for <acronym>CARP</acronym> by adding an entry for the
-	<filename>carp.ko</filename> kernel module in
-	<filename>/boot/loader.conf</filename>:</para>
+      <para>Enable boot-time support for <acronym>CARP</acronym> by
+	adding an entry for the <filename>carp.ko</filename> kernel
+	module in <filename>/boot/loader.conf</filename>:</para>
 
       <programlisting>carp_load="YES"</programlisting>
-      
+
       <para>To load the module now without rebooting:</para>
-      
+
       <screen>&prompt.root; <userinput>kldload carp</userinput></screen>
 
       <para>For users who prefer to use a custom kernel, include the
 	following line in the custom kernel configuration file and
-	compile the kernel as described in
-	<xref linkend="kernelconfig"/>:</para>
+	compile the kernel as described in <xref
+	  linkend="kernelconfig"/>:</para>
 
       <programlisting>device	carp</programlisting>
 
-      <para>The hostname, management <acronym>IP</acronym> address and subnet mask,
-	shared <acronym>IP</acronym> address, and <acronym>VHID</acronym> are all set by
-	adding entries to <filename>/etc/rc.conf</filename>.  This
-	example is for
+      <para>The hostname, management <acronym>IP</acronym> address and
+	subnet mask, shared <acronym>IP</acronym> address, and
+	<acronym>VHID</acronym> are all set by adding entries to
+	<filename>/etc/rc.conf</filename>.  This example is for
 	<systemitem>hosta.example.org</systemitem>:</para>
 
       <programlisting>hostname="<replaceable>hosta.example.org</replaceable>"
@@ -4982,12 +4982,11 @@ ifconfig_<replaceable>em0</replaceable>_
       <para>The next set of entries are for
 	<systemitem>hostb.example.org</systemitem>.  Since it
 	represents a second master, it uses a different shared
-	<acronym>IP</acronym> address and
-	<acronym>VHID</acronym>.  However, the passwords specified with
-	  <option>pass</option> must be identical as
-	  <acronym>CARP</acronym> will only listen to and accept
-	  advertisements from machines with the correct
-	  password.</para>
+	<acronym>IP</acronym> address and <acronym>VHID</acronym>.
+	However, the passwords specified with <option>pass</option>
+	must be identical as <acronym>CARP</acronym> will only listen
+	to and accept advertisements from machines with the correct
+	password.</para>
 
       <programlisting>hostname="<replaceable>hostb.example.org</replaceable>"
 ifconfig_<replaceable>em0</replaceable>="inet <replaceable>192.168.1.4</replaceable> netmask <replaceable>255.255.255.0</replaceable>"
@@ -4995,15 +4994,15 @@ ifconfig_<replaceable>em0</replaceable>_
 
       <para>The third machine,
 	<systemitem>hostc.example.org</systemitem>, is configured to
-	handle failover from either master.  This
-	machine is configured with two <acronym>CARP</acronym>
+	handle failover from either master.  This machine is
+	configured with two <acronym>CARP</acronym>
 	<acronym>VHID</acronym>s, one to handle the virtual
 	<acronym>IP</acronym> address for each of the master hosts.
-	The <acronym>CARP</acronym>
-	advertising skew, <option>advskew</option>, is set to ensure that the backup host
-	advertises later than the master, since <option>advskew</option>
-	controls the order of precedence when there are multiple
-	backup servers.</para>
+	The <acronym>CARP</acronym> advertising skew,
+	<option>advskew</option>, is set to ensure that the backup
+	host advertises later than the master, since
+	<option>advskew</option> controls the order of precedence when
+	there are multiple backup servers.</para>
 
       <programlisting>hostname="hostc.example.org"
 ifconfig_<replaceable>em0</replaceable>="inet <replaceable>192.168.1.5</replaceable> netmask <replaceable>255.255.255.0</replaceable>"
@@ -5030,8 +5029,8 @@ ifconfig_<replaceable>em0</replaceable>_
 	<screen>&prompt.root; <userinput>ifconfig em0 vhid 1 state backup</userinput></screen>
       </note>
 
-      <para>Once the configuration is complete, either restart networking or reboot
-	each system.  High availability is now
+      <para>Once the configuration is complete, either restart
+	networking or reboot each system.  High availability is now
 	enabled.</para>
 
       <para><acronym>CARP</acronym> functionality can be controlled
@@ -5050,31 +5049,31 @@ ifconfig_<replaceable>em0</replaceable>_
 	<acronym>CARP</acronym> device must first be created and
 	referred to in the configuration.</para>
 
-      <para>Enable boot-time support for <acronym>CARP</acronym> by loading the
-	<filename>if_carp.ko</filename> kernel module in
+      <para>Enable boot-time support for <acronym>CARP</acronym> by
+	loading the <filename>if_carp.ko</filename> kernel module in
 	<filename>/boot/loader.conf</filename>:</para>
 
       <programlisting>if_carp_load="YES"</programlisting>
 
      <para>To load the module now without rebooting:</para>
-      
+
       <screen>&prompt.root; <userinput>kldload carp</userinput></screen>
 
       <para>For users who prefer to use a custom kernel, include the
 	following line in the custom kernel configuration file and
-	compile the kernel as described in
-	<xref linkend="kernelconfig"/>:</para>
+	compile the kernel as described in <xref
+	  linkend="kernelconfig"/>:</para>
 
       <programlisting>device	carp</programlisting>
 
-      <para>Next, on each host, create a <acronym>CARP</acronym> device:</para>
+      <para>Next, on each host, create a <acronym>CARP</acronym>
+	device:</para>
 
       <screen>&prompt.root; <userinput>ifconfig carp0 create</userinput></screen>
 
-      <para>Set the hostname, management
-	<acronym>IP</acronym> address, the shared
-	<acronym>IP</acronym> address, and <acronym>VHID</acronym>
-	by adding the required lines to
+      <para>Set the hostname, management <acronym>IP</acronym>
+	address, the shared <acronym>IP</acronym> address, and
+	<acronym>VHID</acronym> by adding the required lines to
 	<filename>/etc/rc.conf</filename>.  Since a virtual
 	<acronym>CARP</acronym> device is used instead of an alias,
 	the actual subnet mask of <literal>/24</literal> is used
@@ -5104,8 +5103,8 @@ ifconfig_carp0="vhid <replaceable>1</rep
 ifconfig_carp1="vhid <replaceable>2</replaceable> advskew <replaceable>100</replaceable> pass <replaceable>testpass</replaceable> <replaceable>192.168.1.51/24</replaceable>"</programlisting>
 
       <note>
-	<para>Preemption is disabled in the GENERIC &os; kernel.
-	  If Preemption has been enabled with a custom kernel,
+	<para>Preemption is disabled in the GENERIC &os; kernel. If
+	  Preemption has been enabled with a custom kernel,
 	  <systemitem>hostc.example.org</systemitem> may not release
 	  the <acronym>IP</acronym> address back to the original
 	  content server.  The administrator can force the backup
@@ -5118,10 +5117,9 @@ ifconfig_carp1="vhid <replaceable>2</rep
 	  interface which corresponds to the correct host.</para>
       </note>
 
-      <para>Once the configuration is complete, either restart networking or reboot
-	each system.  High availability is now
+      <para>Once the configuration is complete, either restart
+	networking or reboot each system.  High availability is now
 	enabled.</para>
-
     </sect2>
   </sect1>
 </chapter>


More information about the svn-doc-all mailing list