[networking-guide] master: DHCP: Style and formating improvements (4b533a0)

stephenw at fedoraproject.org stephenw at fedoraproject.org
Mon Aug 4 09:49:54 UTC 2014


Repository : http://git.fedorahosted.org/cgit/docs/networking-guide.git

On branch  : master

>---------------------------------------------------------------

commit 4b533a00e906e02ff648a2c96315ee98145d166d
Author: Stephen Wadeley <swadeley at redhat.com>
Date:   Mon Aug 4 11:45:39 2014 +0200

    DHCP: Style and formating improvements
    
    and removing now redundent systemctl start dhcpd6


>---------------------------------------------------------------

 en-US/DHCP_Servers.xml |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/en-US/DHCP_Servers.xml b/en-US/DHCP_Servers.xml
index 5cf12e9..6a28696 100644
--- a/en-US/DHCP_Servers.xml
+++ b/en-US/DHCP_Servers.xml
@@ -188,8 +188,8 @@ subnet 192.168.1.0 netmask 255.255.255.0 {
       <note>
         <title>Using the Example Configuration File</title>
         <para>You can use the provided example configuration file as a starting point and add custom configuration options to it. To copy this file to the proper location, use the following command as <systemitem class="username">root</systemitem>:</para>
- <screen>~]# <command>cp /usr/share/doc/dhcp-<replaceable>&lt;version_number&gt;</replaceable>/dhcpd.conf.example /etc/dhcp/dhcpd.conf</command></screen>
-      <para>... where <replaceable>&lt;version_number&gt;</replaceable> is the <systemitem class="protocol">DHCP</systemitem> version number.</para>
+ <screen>~]# <command>cp /usr/share/doc/dhcp-<replaceable>version_number</replaceable>/dhcpd.conf.example /etc/dhcp/dhcpd.conf</command></screen>
+      <para>... where <replaceable>version_number</replaceable> is the <systemitem class="protocol">DHCP</systemitem> version number.</para>
       </note>
       <para>For a complete list of option statements and what they do, see the <filename>dhcp-options(5)</filename> man page.</para>
     </section>
@@ -229,7 +229,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 {
       <screen><command>systemctl start dhcpd.service</command></screen>
       <para>To stop the <systemitem class="protocol">DHCP</systemitem> server, type:</para>
       <screen><command>systemctl stop dhcpd.service</command></screen>
-      <para>By default, the DHCP service does not start at boot time. To configure the daemon to start automatically at boot time, run:</para>
+      <para>By default, the <systemitem class="protocol">DHCP</systemitem> service does not start at boot time. To configure the daemon to start automatically at boot time, run:</para>
       <screen><command>systemctl enable dhcpd.service</command></screen>
       <para>
         <!-- Refer to <xref linkend="ch-Services_and_Daemons" /> for more information on how to configure services in &MAJOROS;.-->
@@ -259,7 +259,7 @@ Then, as the <systemitem class="username">root</systemitem> user, restart the se
       <itemizedlist>
         <listitem>
           <para>
-            <command>-p <replaceable>&lt;portnum&gt;</replaceable></command> — Specifies the UDP port number on which <command>dhcpd</command> should listen. The default is port 67. The <systemitem class="protocol">DHCP</systemitem> server transmits responses to the <systemitem class="protocol">DHCP</systemitem> clients at a port number one greater than the UDP port specified. For example, if the default port 67 is used, the server listens on port 67 for requests and responds to the client on port 68. If a port is specified here and the <systemitem class="protocol">DHCP</systemitem> relay agent is used, the same port on which the <systemitem class="protocol">DHCP</systemitem> relay agent should listen must be specified. See <xref linkend="dhcp-relay-agent" /> for details.</para>
+            <command>-p <replaceable>portnum</replaceable></command> — Specifies the UDP port number on which <command>dhcpd</command> should listen. The default is port 67. The <systemitem class="protocol">DHCP</systemitem> server transmits responses to the <systemitem class="protocol">DHCP</systemitem> clients at a port number one greater than the UDP port specified. For example, if the default port 67 is used, the server listens on port 67 for requests and responds to the client on port 68. If a port is specified here and the <systemitem class="protocol">DHCP</systemitem> relay agent is used, the same port on which the <systemitem class="protocol">DHCP</systemitem> relay agent should listen must be specified. See <xref linkend="dhcp-relay-agent" /> for details.</para>
         </listitem>
         <listitem>
           <para>
@@ -317,7 +317,7 @@ Then, as the <systemitem class="username">root</systemitem> user, restart the se
       <screen><command>systemctl start dhcrelay.service</command></screen>
     </section>
 
-<section id="Configure_dhcrelay_as_a_DHCPv4_and_BOOTP_relay_agent">
+<section id="sec-Configure_dhcrelay_as_a_DHCPv4_and_BOOTP_relay_agent">
       <title>Configure dhcrelay as a DHCPv4 and BOOTP relay agent</title>
 <para>
   To run <application>dhcrelay</application> in <systemitem class="protocol">DHCPv4</systemitem> and <systemitem class="protocol">BOOTP</systemitem> mode specify the servers to which the requests should be forwarded to.
@@ -340,7 +340,7 @@ To activate the changes made, as the <systemitem class="username">root</systemit
 ~]# <command>systemctl restart dhcrelay</command></screen>
 </para>
    </section>
-   <section id="Configure_dhcrelay_as_a_DHCPv6_relay_agent">
+   <section id="sec-Configure_dhcrelay_as_a_DHCPv6_relay_agent">
       <title>Configure dhcrelay as a DHCPv6 relay agent</title>
 <para>
   To run <application>dhcrelay</application> in <systemitem class="protocol">DHCPv6</systemitem> mode add the <option>-6</option> argument and specify the <quote>lower interface</quote> (on which queries will be received from clients or from other relay agents) and the <quote>upper interface</quote> (to which queries from clients and other relay agents should be forwarded).
@@ -551,10 +551,7 @@ dhcpd: Configuration file errors encountered -- exiting</programlisting>
     <para>
       The example server configuration file can be found at <filename>/usr/share/doc/dhcp/dhcpd6.conf.example</filename>.
     </para>
-    <para>
-      To start the <systemitem class="protocol">DHCPv6</systemitem> service, use the following command:
-    </para>
-    <screen><command>systemctl start dhcpd6</command></screen>
+
     <para>
       A simple <systemitem class="protocol">DHCPv6</systemitem> server configuration file can look like this:
     </para>



More information about the docs-commits mailing list