Attachment 140216 Details for Bug 186731 – docs.advanced-networking.whitespace_round2.diff

[patch] docs.advanced-networking.whitespace_round2.diff

docs.advanced-networking.whitespace_round2.diff (text/plain; charset=windows-1252), 15.12 KB, created by Allan Jude on 2014-02-14 21:08:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Allan Jude

Created: 2014-02-14 21:08:19 UTC

Size: 15.12 KB

patch

obsolete

>Index: advanced-networking/chapter.xml
>===================================================================
>--- advanced-networking/chapter.xml	(revision 43921)
>+++ advanced-networking/chapter.xml	(working copy)
>@@ -103,9 +103,15 @@
>       </authorgroup>
>     </info>
> 
>-    <indexterm><primary>routing</primary></indexterm>
>-    <indexterm><primary>gateway</primary></indexterm>
>-    <indexterm><primary>subnet</primary></indexterm>
>+    <indexterm>
>+      <primary>routing</primary>
>+    </indexterm>
>+    <indexterm>
>+      <primary>gateway</primary>
>+    </indexterm>
>+    <indexterm>
>+      <primary>subnet</primary>
>+    </indexterm>
> 
>     <para>For one machine to be able to find another over a network,
>       there must be a mechanism in place to describe how to get from
>@@ -143,12 +149,18 @@
> host2.example.com link#1             UC          0        0
> 224              link#1             UC          0        0</screen>
> 
>-      <indexterm><primary>default route</primary></indexterm>
>+      <indexterm>
>+	<primary>default route</primary>
>+      </indexterm>
>+
>       <para>The first two lines specify the default route, described
> 	in more detail in <xref linkend="network-routing-default"/>,
> 	and the <systemitem>localhost</systemitem> route.</para>
> 
>-      <indexterm><primary>loopback device</primary></indexterm>
>+      <indexterm>
>+	<primary>loopback device</primary>
>+      </indexterm>
>+
>       <para>The interface (<literal>Netif</literal> column) that this
> 	routing table specifies to use for
> 	<literal>localhost</literal> is <filename>lo0</filename>,
>@@ -160,6 +172,7 @@
> 	<primary>Ethernet</primary>
> 	<secondary>MAC address</secondary>
>       </indexterm>
>+
>       <para>The addresses beginning with <systemitem
> 	  class="etheraddress">0:e0:</systemitem> are Ethernet
> 	hardware addresses, also known as <acronym>MAC</acronym>
>@@ -175,7 +188,9 @@
> 	calculates routes to local hosts based upon a shortest path
> 	determination.</para>
> 
>-      <indexterm><primary>subnet</primary></indexterm>
>+      <indexterm>
>+	<primary>subnet</primary>
>+      </indexterm>
> 
>       <para>&os; will add subnet routes for the local subnet.
> 	<systemitem class="ipaddress">10.20.30.255</systemitem> is the
>@@ -271,7 +286,9 @@
>     <sect2 xml:id="network-routing-default">
>       <title>Default Routes</title>
> 
>-      <indexterm><primary>default route</primary></indexterm>
>+      <indexterm>
>+	<primary>default route</primary>
>+      </indexterm>
> 
>       <para>When the local system needs to make a connection to a
> 	remote host, it checks the routing table to determine if a
>@@ -408,7 +425,9 @@
>     <sect2 xml:id="network-dual-homed-hosts">
>       <title>Dual Homed Hosts</title>
> 
>-      <indexterm><primary>dual homed hosts</primary></indexterm>
>+      <indexterm>
>+	<primary>dual homed hosts</primary>
>+      </indexterm>
> 
>       <para>A dual-homed system is a host which resides on two
> 	different networks.</para>
>@@ -436,7 +455,9 @@
>     <sect2 xml:id="network-dedicated-router">
>       <title>Building a Router</title>
> 
>-      <indexterm><primary>router</primary></indexterm>
>+      <indexterm>
>+	<primary>router</primary>
>+      </indexterm>
> 
>       <para>A network router is a system that forwards packets from
> 	one interface to another.  Internet standards and good
>@@ -452,9 +473,16 @@
> 	<literal>1</literal>.  To stop routing, reset this to
> 	<literal>0</literal>.</para>
> 
>-      <indexterm><primary>BGP</primary></indexterm>
>-      <indexterm><primary>RIP</primary></indexterm>
>-      <indexterm><primary>OSPF</primary></indexterm>
>+      <indexterm>
>+	<primary>BGP</primary>
>+      </indexterm>
>+      <indexterm>
>+	<primary>RIP</primary>
>+      </indexterm>
>+      <indexterm>
>+	<primary>OSPF</primary>
>+      </indexterm>
>+
>       <para>The new router will need routes to know where to send the
> 	traffic.  If the network is simple enough, static routes can
> 	be used.  &os; comes with the standard BSD routing daemon
>@@ -471,8 +499,13 @@
> 	<title>Setting Up Static Routes</title>
> 
> 	<authorgroup>
>-	  <author><personname><firstname>Al</firstname><surname>Hoang</surname></personname><contrib>Contributed
>-	    by </contrib></author>
>+	  <author>
>+	    <personname>
>+	      <firstname>Al</firstname>
>+	      <surname>Hoang</surname>
>+	    </personname>
>+	    <contrib>Contributed by </contrib>
>+	  </author>
> 	</authorgroup>
>       </info>
>       
>@@ -649,6 +682,7 @@
> 	<primary>kernel options</primary>
> 	<secondary>MROUTING</secondary>
>       </indexterm>
>+
>       <para>&os; natively supports both multicast applications and
> 	multicast routing.  Multicast applications do not require any
> 	special configuration of &os;; as applications will generally
>@@ -680,16 +714,30 @@
>       <title>Wireless Networking</title>
> 
>       <authorgroup>
>-	<author><personname><othername>Loader</othername></personname></author>
>-
>-	<author><personname><firstname>Marc</firstname><surname>Fonvieille</surname></personname></author>
>-
>-	<author><personname><firstname>Murray</firstname><surname>Stokely</surname></personname></author>
>+	<author>
>+	  <personname>
>+	    <othername>Loader</othername>
>+	  </personname>
>+	</author>
>+	<author>
>+	  <personname>
>+	    <firstname>Marc</firstname>
>+	    <surname>Fonvieille</surname>
>+	  </personname>
>+	</author>
>+	<author>
>+	  <personname>
>+	    <firstname>Murray</firstname>
>+	    <surname>Stokely</surname>
>+	  </personname>
>+	</author>
>       </authorgroup>
>     </info>
> 
>-    <indexterm><primary>wireless networking</primary></indexterm>
>     <indexterm>
>+      <primary>wireless networking</primary>
>+    </indexterm>
>+    <indexterm>
>       <primary>802.11</primary>
>       <see>wireless networking</see>
>     </indexterm>
>@@ -2247,7 +2295,9 @@
>       <title>USB Tethering</title>
>     </info>
> 
>-    <indexterm><primary>tether</primary></indexterm>
>+    <indexterm>
>+      <primary>tether</primary>
>+    </indexterm>
> 
>     <para>Many cellphones provide the option to share their data
>       connection over USB (often called "tethering").  This feature
>@@ -2278,16 +2328,15 @@
> 	    <surname>Lucistnik</surname>
> 	  </personname>
> 	  <contrib>Written by </contrib>
>-	  <affiliation>
>-	    <address>
>-	      <email>pav@FreeBSD.org</email>
>-	    </address>
>-	  </affiliation>
>+	  <email>pav@FreeBSD.org</email>
> 	</author>
>       </authorgroup>
>     </info>
> 
>-    <indexterm><primary>Bluetooth</primary></indexterm>
>+    <indexterm>
>+      <primary>Bluetooth</primary>
>+    </indexterm>
>+
>     <sect2>
>       <title>Introduction</title>
> 
>@@ -2359,7 +2408,9 @@
>       <title>Host Controller Interface
> 	(<acronym>HCI</acronym>)</title>
> 
>-      <indexterm><primary>HCI</primary></indexterm>
>+      <indexterm>
>+	<primary>HCI</primary>
>+      </indexterm>
> 
>       <para>The Host Controller Interface (<acronym>HCI</acronym>)
> 	provides a command interface to the baseband controller and
>@@ -2453,7 +2504,9 @@
>       <title>Logical Link Control and Adaptation Protocol
> 	(<acronym>L2CAP</acronym>)</title>
> 
>-      <indexterm><primary>L2CAP</primary></indexterm>
>+      <indexterm>
>+	<primary>L2CAP</primary>
>+      </indexterm>
> 
>       <para>The Logical Link Control and Adaptation Protocol
> 	(<acronym>L2CAP</acronym>) provides connection-oriented and
>@@ -2627,7 +2680,9 @@
>       <title>Service Discovery Protocol
> 	(<acronym>SDP</acronym>)</title>
> 
>-      <indexterm><primary>SDP</primary></indexterm>
>+      <indexterm>
>+	<primary>SDP</primary>
>+      </indexterm>
> 
>       <para>The Service Discovery Protocol (<acronym>SDP</acronym>)
> 	provides the means for client applications to discover the
>@@ -2811,7 +2866,10 @@
>       <title><acronym>OBEX</acronym> Object Push
> 	(<acronym>OPUSH</acronym>) Profile</title>
> 
>-      <indexterm><primary>OBEX</primary></indexterm>
>+      <indexterm>
>+	<primary>OBEX</primary>
>+      </indexterm>
>+
>       <para><acronym>OBEX</acronym> is a widely used protocol for
> 	simple file transfers between mobile devices.  Its main use
> 	is in infrared communication, where it is used for generic
>@@ -2931,8 +2989,13 @@
>       <title>Bridging</title>
> 
>       <authorgroup>
>-	<author><personname><firstname>Andrew</firstname><surname>Thompson</surname></personname><contrib>Written
>-	  by </contrib></author>
>+	<author>
>+	  <personname>
>+	    <firstname>Andrew</firstname>
>+	    <surname>Thompson</surname>
>+	  </personname>
>+	  <contrib>Written by </contrib>
>+	</author>
>       </authorgroup>
>     </info>
> 
>@@ -2939,9 +3002,13 @@
>     <sect2>
>       <title>Introduction</title>
> 
>-      <indexterm><primary><acronym>IP</acronym>
>-	  subnet</primary></indexterm>
>-      <indexterm><primary>bridge</primary></indexterm>
>+      <indexterm>
>+	<primary><acronym>IP</acronym> subnet</primary>
>+      </indexterm>
>+      <indexterm>
>+	<primary>bridge</primary>
>+      </indexterm>
>+
>       <para>It is sometimes useful to divide one physical network,
> 	such as an Ethernet segment, into two separate network
> 	segments without having to create <acronym>IP</acronym>
>@@ -2981,8 +3048,12 @@
>       <sect3>
> 	<title>Filtering/Traffic Shaping Firewall</title>
> 
>-	<indexterm><primary>firewall</primary></indexterm>
>-	<indexterm><primary>NAT</primary></indexterm>
>+	<indexterm>
>+	  <primary>firewall</primary>
>+	</indexterm>
>+	<indexterm>
>+	  <primary>NAT</primary>
>+	</indexterm>
> 
> 	<para>A common situation is where firewall functionality is
> 	  needed without routing or Network Address Translation
>@@ -2996,9 +3067,16 @@
> 	  on the network.  In this situation, using a router-based
> 	  firewall is difficult because of subnetting issues.</para>
> 
>-	<indexterm><primary>router</primary></indexterm>
>-	<indexterm><primary><acronym>DSL</acronym></primary></indexterm>
>-	<indexterm><primary><acronym>ISDN</acronym></primary></indexterm>
>+	<indexterm>
>+	  <primary>router</primary>
>+	</indexterm>
>+	<indexterm>
>+	  <primary><acronym>DSL</acronym></primary>
>+	</indexterm>
>+	<indexterm>
>+	  <primary><acronym>ISDN</acronym></primary>
>+	</indexterm>
>+
> 	<para>A bridge-based firewall can be configured and dropped
> 	  into the path just downstream of the <acronym>DSL</acronym>
> 	  or <acronym>ISDN</acronym> router without any
>@@ -3119,7 +3197,9 @@
>     <sect2>
>       <title>Firewalling</title>
> 
>-      <indexterm><primary>firewall</primary></indexterm>
>+      <indexterm>
>+	<primary>firewall</primary>
>+      </indexterm>
> 
>       <para>When packet filtering is enabled, bridged packets will
> 	pass through the filter inbound on the originating interface
>@@ -3401,17 +3481,34 @@
>       <title>Link Aggregation and Failover</title>
> 
>       <authorgroup>
>-	<author><personname><firstname>Andrew</firstname><surname>Thompson</surname></personname><contrib>Written
>-	  by </contrib></author>
>+	<author>
>+	  <personname>
>+	    <firstname>Andrew</firstname>
>+	    <surname>Thompson</surname>
>+	  </personname>
>+	  <contrib>Written by </contrib>
>+	</author>
>       </authorgroup>
>     </info>
> 
>-    <indexterm><primary>lagg</primary></indexterm>
>-    <indexterm><primary>failover</primary></indexterm>
>-    <indexterm><primary><acronym>FEC</acronym></primary></indexterm>
>-    <indexterm><primary><acronym>LACP</acronym></primary></indexterm>
>-    <indexterm><primary>loadbalance</primary></indexterm>
>-    <indexterm><primary>roundrobin</primary></indexterm>
>+    <indexterm>
>+      <primary>lagg</primary>
>+    </indexterm>
>+    <indexterm>
>+      <primary>failover</primary>
>+    </indexterm>
>+    <indexterm>
>+      <primary><acronym>FEC</acronym></primary>
>+    </indexterm>
>+    <indexterm>
>+      <primary><acronym>LACP</acronym></primary>
>+    </indexterm>
>+    <indexterm>
>+      <primary>loadbalance</primary>
>+    </indexterm>
>+    <indexterm>
>+      <primary>roundrobin</primary>
>+    </indexterm>
> 
>     <para>&os; provides the &man.lagg.4; interface which can be used
>       to aggregate multiple network interfaces into one virtual
>@@ -3743,17 +3840,31 @@
>       <title>Diskless Operation</title>
> 
>       <authorgroup>
>-	<author><personname><firstname>Jean-Fran&ccedil;ois</firstname><surname>Dock&egrave;s</surname></personname><contrib>Updated
>-	  by </contrib></author>
>+	<author>
>+	  <personname>
>+	    <firstname>Jean-Fran&ccedil;ois</firstname>
>+	    <surname>Dock&egrave;s</surname>
>+	  </personname>
>+	  <contrib>Updated by </contrib>
>+	</author>
>       </authorgroup>
>       <authorgroup>
>-	<author><personname><firstname>Alex</firstname><surname>Dupre</surname></personname><contrib>Reorganized
>-	  and enhanced by </contrib></author>
>+	<author>
>+	  <personname>
>+	    <firstname>Alex</firstname>
>+	    <surname>Dupre</surname>
>+	  </personname>
>+	  <contrib>Reorganized and enhanced by </contrib>
>+	</author>
>       </authorgroup>
>     </info>
> 
>-    <indexterm><primary>diskless workstation</primary></indexterm>
>-    <indexterm><primary>diskless operation</primary></indexterm>
>+    <indexterm>
>+      <primary>diskless workstation</primary>
>+    </indexterm>
>+    <indexterm>
>+      <primary>diskless operation</primary>
>+    </indexterm>
> 
>     <para>A &os; machine can boot over the network and operate
>       without a local disk, using file systems mounted from an
>@@ -4634,8 +4745,13 @@
>       <title>Network Address Translation</title>
> 
>       <authorgroup>
>-	<author><personname><firstname>Chern</firstname><surname>Lee</surname></personname><contrib>Contributed
>-	  by </contrib></author>
>+	<author>
>+	  <personname>
>+	    <firstname>Chern</firstname>
>+	    <surname>Lee</surname>
>+	  </personname>
>+	  <contrib>Contributed by </contrib>
>+	</author>
>       </authorgroup>
>     </info>
> 
>@@ -4645,6 +4761,7 @@
>       <indexterm>
> 	<primary>&man.natd.8;</primary>
>       </indexterm>
>+
>       <para>&os;'s Network Address Translation
> 	(<acronym>NAT</acronym>) daemon, &man.natd.8;, accepts
> 	incoming raw <acronym>IP</acronym> packets, changes the
>@@ -4661,6 +4778,7 @@
>       <indexterm>
> 	<primary><acronym>NAT</acronym></primary>
>       </indexterm>
>+
>       <para>The most common use of <acronym>NAT</acronym> is to
> 	perform what is commonly known as Internet Connection
> 	Sharing.</para>
>@@ -4766,6 +4884,7 @@
> 	<primary>kernel</primary>
> 	<secondary>configuration</secondary>
>       </indexterm>
>+
>       <para>When modules are not an option or if it is preferable to
> 	build all the required features into a custom kernel, the
> 	following options must be in the custom kernel configuration
>@@ -4931,7 +5050,10 @@
>     <sect2 xml:id="network-natdaddress-redirection">
>       <title>Address Redirection</title>
> 
>-      <indexterm><primary>address redirection</primary></indexterm>
>+      <indexterm>
>+	<primary>address redirection</primary>
>+      </indexterm>
>+
>       <para>Address redirection is useful if more than one
> 	<acronym>IP</acronym> address is available.  Each
> 	<acronym>LAN</acronym> client can be assigned its own
>@@ -5531,7 +5653,13 @@
>   <sect1 xml:id="network-atm">
>     <info><title>Asynchronous Transfer Mode (<acronym>ATM</acronym>)</title>
>       <authorgroup>
>-	<author><personname><firstname>Harti</firstname><surname>Brandt</surname></personname><contrib>Contributed by </contrib></author>
>+	<author>
>+	  <personname>
>+	    <firstname>Harti</firstname>
>+	    <surname>Brandt</surname>
>+	  </personname>
>+	  <contrib>Contributed by </contrib>
>+	</author>
>       </authorgroup>
>     </info>
> 
>@@ -5730,7 +5858,8 @@
> 	  </personname>
> 	  <contrib>Contributed by </contrib>
> 	</author>
>-
>+      </authorgroup>
>+      <authorgroup>
> 	<author>
> 	  <personname>
> 	    <firstname>Allan</firstname>

Actions: View | Diff

Attachments on bug 186731: 140215 | 140216 | 140217