Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Oct 2013 01:53:43 +0000 (UTC)
From:      Dru Lavigne <dru@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org
Subject:   svn commit: r42979 - head/en_US.ISO8859-1/books/handbook/network-servers
Message-ID:  <201310170153.r9H1rhT3031576@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dru
Date: Thu Oct 17 01:53:43 2013
New Revision: 42979
URL: http://svnweb.freebsd.org/changeset/doc/42979

Log:
  White space fix only. Translators can ignore.

Modified:
  head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Wed Oct 16 23:41:26 2013	(r42978)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Thu Oct 17 01:53:43 2013	(r42979)
@@ -2646,29 +2646,29 @@ result: 0 Success
     <para>This section describes how to use the built-in
       <acronym>DHCP</acronym> client.  It then describes how to
       install and configure a <acronym>DHCP</acronym> server.</para>
- 
-    <note>     
-     <para>In &os;, the &man.bpf.4; device is needed by both the 
-       <acronym>DHCP</acronym> server and <acronym>DHCP</acronym> client.
-	This device is included in the <filename>GENERIC</filename> 
-	kernel that is installed with &os;.  Users who prefer to create
-	a custom kernel need to keep this device if 
-	<acronym>DHCP</acronym> is used.</para>
-
-	<para>Those who are security conscious should
-	  note that <devicename>bpf</devicename> also
-	  allows packet sniffers to function correctly.</para>
-      </note>
+
+    <note>
+      <para>In &os;, the &man.bpf.4; device is needed by both the
+	<acronym>DHCP</acronym> server and <acronym>DHCP</acronym>
+	client.  This device is included in the
+	<filename>GENERIC</filename>  kernel that is installed with
+	&os;.  Users who prefer to create a custom kernel need to keep
+	this device if  <acronym>DHCP</acronym> is used.</para>
+
+      <para>Those who are security conscious should note that
+	<devicename>bpf</devicename> also allows packet sniffers to
+	function correctly.</para>
+    </note>
 
     <sect2>
       <title>Configuring a <acronym>DHCP</acronym> Client</title>
 
       <para><acronym>DHCP</acronym> client support is included in the
-	&os; installer, making it easy to configure a newly installed system to
-	automatically receive its networking addressing information
-	from an existing <acronym>DHCP</acronym> server.  Refer to
-	<xref linkend="bsdinstall-post"/> for examples of network
-	configuration.</para>
+	&os; installer, making it easy to configure a newly installed
+	system to automatically receive its networking addressing
+	information from an existing <acronym>DHCP</acronym> server.
+	Refer to <xref linkend="bsdinstall-post"/> for examples of
+	network configuration.</para>
 
       <indexterm><primary><acronym>UDP</acronym></primary></indexterm>
       <para>When <command>dhclient</command> is executed on the client
@@ -2682,49 +2682,48 @@ result: 0 Success
 	in the form of a <acronym>DHCP</acronym>
 	<quote>lease</quote> and is valid for a configurable time.
 	This allows stale <acronym>IP</acronym> addresses for clients
-	no longer connected to the network to automatically be
-	reused.  <acronym>DHCP</acronym> clients can obtain a great deal of
+	no longer connected to the network to automatically be reused.
+	<acronym>DHCP</acronym> clients can obtain a great deal of
 	information from the server.  An exhaustive list may be found
 	in &man.dhcp-options.5;.</para>
 
-      <para>By default, when a &os; system boots, its <acronym>DHCP</acronym> client
-	runs in the background, or
+      <para>By default, when a &os; system boots, its
+	<acronym>DHCP</acronym> client runs in the background, or
 	<firstterm>asynchronously</firstterm>.  Other startup scripts
-	continue to run while the <acronym>DHCP</acronym> process completes,
-	which speeds up system startup.</para>
+	continue to run while the <acronym>DHCP</acronym> process
+	completes, which speeds up system startup.</para>
 
       <para>Background <acronym>DHCP</acronym> works well when the
-	<acronym>DHCP</acronym> server responds quickly to the client's requests.
-	However, <acronym>DHCP</acronym> may take a long
-	time to complete on some systems.  If network services attempt
-	to run before <acronym>DHCP</acronym> has assigned the network addressing information, they will
-	fail.  Using <acronym>DHCP</acronym> in
-	<firstterm>synchronous</firstterm> mode prevents this problem as it
-	pauses startup until the <acronym>DHCP</acronym> configuration
-	has completed.</para>
+	<acronym>DHCP</acronym> server responds quickly to the
+	client's requests.  However, <acronym>DHCP</acronym> may take
+	a long time to complete on some systems.  If network services
+	attempt to run before <acronym>DHCP</acronym> has assigned the
+	network addressing information, they will fail.  Using
+	<acronym>DHCP</acronym> in <firstterm>synchronous</firstterm>
+	mode prevents this problem as it pauses startup until the
+	<acronym>DHCP</acronym> configuration has completed.</para>
 
       <para>This line in <filename>/etc/rc.conf</filename> is used to
-	configure
-	background or asynchronous mode:</para>
+	configure background or asynchronous mode:</para>
 
       <programlisting>ifconfig_<replaceable>fxp0</replaceable>="DHCP"</programlisting>
 
-      <para>This line may already exist if the system was configured 
-	to use <acronym>DHCP</acronym> during installation.  Replace 
-	the <replaceable>fxp0</replaceable> shown
-	in these examples with the name of the interface to be
-	dynamically configured, as described in
-	<xref linkend="config-network-setup"/>.</para>      
-      
-      <para>To instead configure the system to use synchronous mode, 
-	and to pause during startup while <acronym>DHCP</acronym> completes,
-	use
+      <para>This line may already exist if the system was configured
+	to use <acronym>DHCP</acronym> during installation.  Replace
+	the <replaceable>fxp0</replaceable> shown in these examples
+	with the name of the interface to be dynamically configured,
+	as described in <xref linkend="config-network-setup"/>.</para>
+
+      <para>To instead configure the system to use synchronous mode,
+	and to pause during startup while <acronym>DHCP</acronym>
+	completes, use
 	<quote><literal>SYNCDHCP</literal></quote>:</para>
 
       <programlisting>ifconfig_<replaceable>fxp0</replaceable>="SYNCDHCP"</programlisting>
 
       <para>Additional client options are available.  Search for
-	<literal>dhclient</literal> in &man.rc.conf.5; for details.</para>
+	<literal>dhclient</literal> in &man.rc.conf.5; for
+	details.</para>
 
       <indexterm>
 	<primary><acronym>DHCP</acronym></primary>
@@ -2738,9 +2737,10 @@ result: 0 Success
 	<listitem>
 	  <para><filename>/etc/dhclient.conf</filename></para>
 
-	  <para>The configuration file used by <command>dhclient</command>.  Typically,
-	    this file contains only comments as the defaults are suitable for most clients.
-	    This configuration file is described in
+	  <para>The configuration file used by
+	    <command>dhclient</command>.  Typically, this file
+	    contains only comments as the defaults are suitable for
+	    most clients.  This configuration file is described in
 	    &man.dhclient.conf.5;.</para>
 	</listitem>
 
@@ -2765,8 +2765,8 @@ result: 0 Success
 	  <para><filename>/var/db/dhclient.leases.<replaceable>interface</replaceable></filename></para>
 
 	  <para>The <acronym>DHCP</acronym> client keeps a database of
-	    valid leases in this file, which is written as a log and is described in
-	    &man.dhclient.leases.5;.</para>
+	    valid leases in this file, which is written as a log and
+	    is described in &man.dhclient.leases.5;.</para>
 	</listitem>
       </itemizedlist>
     </sect2>
@@ -2775,12 +2775,12 @@ result: 0 Success
       <title>Installing and Configuring a <acronym>DHCP</acronym>
 	Server</title>
 
-      <para>This section demonstrates how to configure a
-	&os; system to act as a <acronym>DHCP</acronym> server using
-	the Internet Systems Consortium (<acronym>ISC</acronym>) implementation of the
-	<acronym>DHCP</acronym> server.  This implementation and its documentation can be
-	installed using the <filename 
-	  role="package">net/isc-dhcp42-server</filename> package or 
+      <para>This section demonstrates how to configure a &os; system
+	to act as a <acronym>DHCP</acronym> server using the Internet
+	Systems Consortium (<acronym>ISC</acronym>) implementation of
+	the <acronym>DHCP</acronym> server.  This implementation and
+	its documentation can be installed using the <filename
+	  role="package">net/isc-dhcp42-server</filename> package or
 	port.</para>
 
       <indexterm>
@@ -2793,25 +2793,23 @@ result: 0 Success
 	  <secondary>installation</secondary>
       </indexterm>
 
-      <para>The installation of
-	<filename role="package">net/isc-dhcp42-server</filename>
-	installs a sample configuration file.  Copy
-	<filename>/usr/local/etc/dhcpd.conf.example</filename>
-	to
-	<filename>/usr/local/etc/dhcpd.conf</filename> and make any edits
-	to this new file.</para>
+      <para>The installation of <filename
+	  role="package">net/isc-dhcp42-server</filename> installs a
+	sample configuration file.  Copy
+	<filename>/usr/local/etc/dhcpd.conf.example</filename> to
+	<filename>/usr/local/etc/dhcpd.conf</filename> and make any
+	edits to this new file.</para>
 
-	<indexterm>
-	  <primary><acronym>DHCP</acronym></primary>
+      <indexterm>
+	<primary><acronym>DHCP</acronym></primary>
 	  <secondary>dhcpd.conf</secondary>
-	</indexterm>
-	<para>The configuration file is comprised of
-	  declarations for subnets and hosts which define the 
-	  information that is provided to <acronym>DHCP</acronym> 
-	  clients.  For example, these 
-	  lines configure the following:</para>
+      </indexterm>
+      <para>The configuration file is comprised of declarations for
+	subnets and hosts which define the  information that is
+	provided to <acronym>DHCP</acronym>  clients.  For example,
+	these  lines configure the following:</para>
 
-	<programlisting>option domain-name "example.org";<co id="domain-name"/>
+      <programlisting>option domain-name "example.org";<co id="domain-name"/>
 option domain-name-servers ns1.example.org;<co id="domain-name-servers"/>
 option subnet-mask 255.255.255.0;<co id="subnet-mask"/>
 
@@ -2831,16 +2829,16 @@ host fantasia {
 
 	<calloutlist>
 	  <callout arearefs="domain-name">
-	    <para>This option specifies the default search domain that will be
-	      provided to clients.  Refer to
+	    <para>This option specifies the default search domain that
+	      will be provided to clients.  Refer to
 	      &man.resolv.conf.5; for more information.</para>
 	  </callout>
 
 	  <callout arearefs="domain-name-servers">
 	    <para>This option specifies a comma separated list of
 	      <acronym>DNS</acronym> servers that the client should
-	      use.  They can be listed by their Fully Qualified Domain 
-	      Names (<acronym>FQDN</acronym>), as seen in the example,  
+	      use.  They can be listed by their Fully Qualified Domain
+	      Names (<acronym>FQDN</acronym>), as seen in the example,
 	      or by their <acronym>IP</acronym> addresses.</para>
 	  </callout>
 
@@ -2850,68 +2848,68 @@ host fantasia {
 	  </callout>
 
 	  <callout arearefs="default-lease-time">
-	    <para>The default
-	      lease expiry time in
-	      seconds.  A client can be configured to override this
-	      value.  </para>
+	    <para>The default lease expiry time in seconds.  A client
+	      can be configured to override this value.  </para>
 	  </callout>
 
 	  <callout arearefs="max-lease-time">
-	    <para>The maximum allowed length of time, in seconds, for a
-	      lease.  Should a client request a longer
-	      lease, a lease will still be issued, but it will only
-	      be valid for <literal>max-lease-time</literal>.</para>
+	    <para>The maximum allowed length of time, in seconds, for
+	      a lease.  Should a client request a longer lease, a
+	      lease will still be issued, but it will only be valid
+	      for <literal>max-lease-time</literal>.</para>
 	  </callout>
 
 	  <callout arearefs="ddns-update-style">
-	    <para>The default of <option>none</option> disables dynamic DNS updates.
-	      Changing this to <option>interim</option> configures the 
-	      <acronym>DHCP</acronym> server to update a 
-	      <acronym>DNS</acronym> server whenever it hands out a 
-	      lease so that the <acronym>DNS</acronym> server knows 
-	      which <acronym>IP</acronym> addresses are associated 
-	      with which computers in the network. Do not change the default
-	      setting unless the <acronym>DNS</acronym> server has 
-	      been configured to support dynamic 
+	    <para>The default of <option>none</option> disables
+	      dynamic DNS updates.  Changing this to
+	      <option>interim</option> configures the
+	      <acronym>DHCP</acronym> server to update a
+	      <acronym>DNS</acronym> server whenever it hands out a
+	      lease so that the <acronym>DNS</acronym> server knows
+	      which <acronym>IP</acronym> addresses are associated
+	      with which computers in the network.  Do not change the
+	      default setting unless the <acronym>DNS</acronym> server
+	      has  been configured to support dynamic
 	      <acronym>DNS</acronym>.</para>
 	  </callout>
 
 	  <callout arearefs="range">
-	    <para>This line creates a pool of available <acronym>IP</acronym> addresses
-	      which are reserved for allocation to <acronym>DHCP</acronym>
-	      clients.  The range of addresses must be valid for the
-	      network or subnet specified in the previous line.</para>
+	    <para>This line creates a pool of available
+	      <acronym>IP</acronym> addresses which are reserved for
+	      allocation to <acronym>DHCP</acronym> clients.  The
+	      range of addresses must be valid for the network or
+	      subnet specified in the previous line.</para>
 	  </callout>
 
 	  <callout arearefs="routers">
 	    <para>Declares the default gateway that is valid for the
-	      network or subnet specified before the opening 
+	      network or subnet specified before the opening
 	      <literal>{</literal> bracket.</para>
 	  </callout>
 
 	  <callout arearefs="hardware">
-	    <para>Specifies the hardware <acronym>MAC</acronym> address of a client so that the
-	      <acronym>DHCP</acronym> server can recognize the client when
-	      it makes a request.</para>
+	    <para>Specifies the hardware <acronym>MAC</acronym>
+	      address of a client so that the
+	      <acronym>DHCP</acronym> server can recognize the client
+	      when it makes a request.</para>
 	  </callout>
 
 	  <callout arearefs="fixed-address">
 	    <para>Specifies that this host should always be given the
-	      same <acronym>IP</acronym> address.  Using the
-	      hostname is correct, since the
-	      <acronym>DHCP</acronym> server will resolve the
-	      hostname before returning the lease
+	      same <acronym>IP</acronym> address.  Using the hostname
+	      is correct, since the <acronym>DHCP</acronym> server
+	      will resolve the hostname before returning the lease
 	      information.</para>
 	  </callout>
 	</calloutlist>
 
-        <para>This configuration file supports many more options.  Refer 
-	  to dhcpd.conf(5), installed with the server, for details and
-	  examples.</para>
+	<para>This configuration file supports many more options.
+	  Refer  to dhcpd.conf(5), installed with the server, for
+	  details and examples.</para>
 
 	<para>Once the configuration of
-	  <filename>dhcpd.conf</filename> is complete,
-	  enable the <acronym>DHCP</acronym> server in
+	  <filename>dhcpd.conf</filename> is complete, enable the
+	  <acronym>DHCP</acronym> server in
 	  <filename>/etc/rc.conf</filename>:</para>
 
 	<programlisting>dhcpd_enable="YES"
@@ -2928,13 +2926,12 @@ dhcpd_ifaces="dc0"</programlisting>
 	<screen>&prompt.root; <userinput>service isc-dhcpd start</userinput></screen>
 
 	<para>Any future changes to the configuration of the server
-	  will require the
-	  <application>dhcpd</application> service to be stopped and then started using
-	  &man.service.8;.</para>
-
-      <para>The <acronym>DHCP</acronym> server uses the following
-	files.  Note that the manual pages are installed with the 
-	server software.</para>
+	  will require the <application>dhcpd</application> service to
+	  be stopped and then started using &man.service.8;.</para>
+
+	<para>The <acronym>DHCP</acronym> server uses the following
+	  files.  Note that the manual pages are installed with the
+	  server software.</para>
 
 	<indexterm>
 	  <primary><acronym>DHCP</acronym></primary>
@@ -2953,11 +2950,10 @@ dhcpd_ifaces="dc0"</programlisting>
 	  <listitem>
 	    <para><filename>/usr/local/etc/dhcpd.conf</filename></para>
 
-	    <para>The server configuration file
-	      needs to contain all the information that should be
-	      provided to clients, along with
-	      information regarding the operation of the server.  This
-	      configuration file is described in
+	    <para>The server configuration file needs to contain all
+	      the information that should be provided to clients,
+	      along with information regarding the operation of the
+	      server.  This configuration file is described in
 	      dhcpd.conf(5).</para>
 	  </listitem>
 
@@ -2966,21 +2962,21 @@ dhcpd_ifaces="dc0"</programlisting>
 
 	    <para>The <acronym>DHCP</acronym> server keeps a database
 	      of leases it has issued in this file, which is written
-	      as a log.  Refer to dhcpd.leases(5), which
-	      gives a slightly longer description.</para>
+	      as a log.  Refer to dhcpd.leases(5), which gives a
+	      slightly longer description.</para>
 	  </listitem>
 
 	  <listitem>
 	    <para><filename>/usr/local/sbin/dhcrelay</filename></para>
 
-	    <para>This daemon is used in
-	      advanced environments where one <acronym>DHCP</acronym>
-	      server forwards a request from a client to another
-	      <acronym>DHCP</acronym> server on a separate network.
-	      If this functionality is required, install the
-	      <filename role="package">net/isc-dhcp42-relay</filename>
-	      package or port.  The installation includes dhcrelay(8) which
-	      provides more detail.</para>
+	    <para>This daemon is used in advanced environments where
+	      one <acronym>DHCP</acronym> server forwards a request
+	      from a client to another <acronym>DHCP</acronym> server
+	      on a separate network.  If this functionality is
+	      required, install the <filename
+		role="package">net/isc-dhcp42-relay</filename>
+	      package or port.  The installation includes dhcrelay(8)
+	      which provides more detail.</para>
 	  </listitem>
 	</itemizedlist>
     </sect2>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310170153.r9H1rhT3031576>