[system-administrators-guide] Markup improvements: DHCP, IP, DHCP, SLIP, PLIP are all protocols. Also some root username needed ma

stephenw stephenw at fedoraproject.org
Thu Dec 12 20:00:16 UTC 2013


commit 6cd7f9f166c2f6d231c9c03ce1e5c62b3617a715
Author: Stephen Wadeley <swadeley at redhat.com>
Date:   Thu Nov 28 10:53:53 2013 +0100

    Markup improvements: DHCP, IP, DHCP, SLIP, PLIP are all protocols.
    Also some root username needed markup.

 en-US/Network_Interfaces.xml |   86 +++++++++++++++++++++---------------------
 1 files changed, 43 insertions(+), 43 deletions(-)
---
diff --git a/en-US/Network_Interfaces.xml b/en-US/Network_Interfaces.xml
index 25ad3f8..c77bd21 100644
--- a/en-US/Network_Interfaces.xml
+++ b/en-US/Network_Interfaces.xml
@@ -62,7 +62,7 @@
         </term>
         <listitem>
           <para>
-          The main purpose of this file is to resolve hostnames that cannot be resolved any other way. It can also be used to resolve hostnames on small networks with no DNS server. Regardless of the type of network the computer is on, this file should contain a line specifying the IP address of the loopback device (<systemitem class="ipaddress">127.0.0.1</systemitem>) as <systemitem class="ipaddress">localhost.localdomain</systemitem>. For more information, refer to the <emphasis role="bold">hosts</emphasis>(5) manual page.
+          The main purpose of this file is to resolve hostnames that cannot be resolved any other way. It can also be used to resolve hostnames on small networks with no DNS server. Regardless of the type of network the computer is on, this file should contain a line specifying the <systemitem class="protocol">IP</systemitem> address of the loopback device (<systemitem class="ipaddress">127.0.0.1</systemitem>) as <systemitem class="ipaddress">localhost.localdomain</systemitem>. For more information, refer to the <emphasis role="bold">hosts</emphasis>(5) manual page.
           </para>
         </listitem>
       </varlistentry>
@@ -82,7 +82,7 @@
         </term>
         <listitem>
           <para>
-            This file specifies the IP addresses of DNS servers and the search domain. Unless configured to do otherwise, the network initialization scripts populate this file. For more information about this file, refer to the <emphasis role="bold">resolv.conf</emphasis>(5) manual page.
+            This file specifies the <systemitem class="protocol">IP</systemitem> addresses of DNS servers and the search domain. Unless configured to do otherwise, the network initialization scripts populate this file. For more information about this file, refer to the <emphasis role="bold">resolv.conf</emphasis>(5) manual page.
           </para>
         </listitem>
       </varlistentry>
@@ -155,7 +155,7 @@ effect and not to be interface specific. For more information about this file an
       <para>
         One of the most common interface files is <filename>/etc/sysconfig/network-scripts/ifcfg-eth0</filename>, which controls the first Ethernet <firstterm>network interface card</firstterm> or <acronym>NIC</acronym> in the system. In a system with multiple NICs, there are multiple <filename>ifcfg-eth<replaceable>X</replaceable></filename> files (where <replaceable>X</replaceable> is a unique number corresponding to a specific interface). Because each device has its own configuration file, an administrator can control how each interface functions individually.
       </para>
-      <para>The following is a sample <filename>ifcfg-eth0</filename> file for a system using a fixed IP address:
+      <para>The following is a sample <filename>ifcfg-eth0</filename> file for a system using a fixed <systemitem class="protocol">IP</systemitem> address:
       </para>
       <programlisting>DEVICE=eth0
 BOOTPROTO=none
@@ -164,7 +164,7 @@ NETMASK=255.255.255.0
 IPADDR=10.0.1.27
 USERCTL=no</programlisting>
       <para>
-      The values required in an interface configuration file can change based on other values. For example, the <filename>ifcfg-eth0</filename> file for an interface using DHCP looks different because IP information is provided by the DHCP server:
+      The values required in an interface configuration file can change based on other values. For example, the <filename>ifcfg-eth0</filename> file for an interface using <systemitem class="protocol">DHCP</systemitem> looks different because <systemitem class="protocol">IP</systemitem> information is provided by the <systemitem class="protocol">DHCP</systemitem> server:
       </para>
       <programlisting>DEVICE=eth0
 BOOTPROTO=dhcp
@@ -241,7 +241,7 @@ ONBOOT=yes</programlisting>
           <term><option>DHCP_HOSTNAME</option>=<replaceable>name</replaceable></term>
           <listitem>
             <para>
-              where <replaceable>name</replaceable> is a short host name to be sent to the <systemitem class="protocol">DHCP</systemitem> server. Use this option only if the <systemitem class="protocol">DHCP</systemitem> server requires the client to specify a host name before receiving an IP address.
+              where <replaceable>name</replaceable> is a short host name to be sent to the <systemitem class="protocol">DHCP</systemitem> server. Use this option only if the <systemitem class="protocol">DHCP</systemitem> server requires the client to specify a host name before receiving an <systemitem class="protocol">IP</systemitem> address.
             </para>
           </listitem>
         </varlistentry>
@@ -344,7 +344,7 @@ ONBOOT=yes</programlisting>
           <term><option>GATEWAY</option>=<replaceable>address</replaceable></term>
           <listitem>
             <para>
-              where <replaceable>address</replaceable> is the IP address of the network router or gateway device (if any).
+              where <replaceable>address</replaceable> is the <systemitem class="protocol">IP</systemitem> address of the network router or gateway device (if any).
             </para>
           </listitem>
         </varlistentry> -->
@@ -439,12 +439,12 @@ ONBOOT=yes</programlisting>
             <itemizedlist>
               <listitem>
                 <para>
-                  <literal>yes</literal> &mdash; Prefer the public IP address.
+                  <literal>yes</literal> &mdash; Prefer the public <systemitem class="protocol">IP</systemitem> address.
                 </para>
               </listitem>
               <listitem>
                 <para>
-                  <literal>no</literal> &mdash; Do <emphasis>not</emphasis> prefer the public IP address, prefer a temporary address.
+                  <literal>no</literal> &mdash; Do <emphasis>not</emphasis> prefer the public <systemitem class="protocol">IP</systemitem> address, prefer a temporary address.
                 </para>
               </listitem>
           </itemizedlist>
@@ -564,7 +564,7 @@ ONBOOT=yes</programlisting>
             <itemizedlist>
               <listitem>
                 <para>
-                  <literal>yes</literal> — Modify <filename>/etc/resolv.conf</filename> if the DNS directive is set. If using DHCP, then <literal>yes</literal> is the default.
+                  <literal>yes</literal> — Modify <filename>/etc/resolv.conf</filename> if the DNS directive is set. If using <systemitem class="protocol">DHCP</systemitem>, then <literal>yes</literal> is the default.
                 </para>
               </listitem>
               <listitem>
@@ -607,7 +607,7 @@ ONBOOT=yes</programlisting>
           </term>
           <listitem>
             <para>where <replaceable>address</replaceable>
-               is the specified source IP address for outgoing packets.</para>
+               is the specified source <systemitem class="protocol">IP</systemitem> address for outgoing packets.</para>
           </listitem>
         </varlistentry>
 
@@ -1866,7 +1866,7 @@ USERCTL=no</programlisting>
         </listitem>
         <listitem>
         <para>
-        The bridge interface configuration file now has the IP address and the physical interface has only a MAC address.
+        The bridge interface configuration file now has the <systemitem class="protocol">IP</systemitem> address and the physical interface has only a MAC address.
         </para>
         </listitem>
         <listitem>
@@ -1880,7 +1880,7 @@ USERCTL=no</programlisting>
         </itemizedlist>
       </para>
       <para>
-        The following is a sample bridge interface configuration file using a static IP address:
+        The following is a sample bridge interface configuration file using a static <systemitem class="protocol">IP</systemitem> address:
       </para>
       <example id="ex-Sample_ifcfg-br0_interface_configuration_file">
         <title>Sample ifcfg-br0 interface configuration file</title>
@@ -1968,7 +1968,7 @@ NM_CONTROLLED=no</programlisting>
         <textobject><para>A diagram of two Ethernet interfaces on the left feeding into a virtual interface labeled <literal>bond 0</literal>. This in turn leads to a virtual interface called <literal>BR Bond 0</literal> on the right. From there a path leads to a virtual network below.</para></textobject>
       </mediaobject>
       </figure>
-      <para>We now have two or more interface configuration files with the <option>MASTER=bond0</option> directive. These point to the configuration file named <filename>/etc/sysconfig/network-scripts/ifcfg-bond0</filename>, which contains the <option>DEVICE=bond0</option> directive. This <filename>ifcfg-bond0</filename>  in turn points to the <filename>/etc/sysconfig/network-scripts/ifcfg-brbond0</filename> configuration file, which contains the IP address, and acts as an interface to the virtual networks inside the host.</para>
+      <para>We now have two or more interface configuration files with the <option>MASTER=bond0</option> directive. These point to the configuration file named <filename>/etc/sysconfig/network-scripts/ifcfg-bond0</filename>, which contains the <option>DEVICE=bond0</option> directive. This <filename>ifcfg-bond0</filename>  in turn points to the <filename>/etc/sysconfig/network-scripts/ifcfg-brbond0</filename> configuration file, which contains the <systemitem class="protocol">IP</systemitem> address, and acts as an interface to the virtual networks inside the host.</para>
       <para>
       Restart the networking service, in order for the changes to take effect by running as <systemitem class="username">root</systemitem>:</para>
       <screen><command>
@@ -2050,26 +2050,26 @@ VLAN=yes</screen>
         </para>
         <note>
         <title>Note</title>
-        <para>At the time of writing, <application>NetworkManager</application> does not detect IP aliases in <filename>ifcfg</filename> files. For example, if <filename>ifcfg-eth0</filename> and <filename>ifcfg-eth0:1</filename> files are present, <application>NetworkManager</application> creates two connections, which will cause confusion.
+        <para>At the time of writing, <application>NetworkManager</application> does not detect <systemitem class="protocol">IP</systemitem> aliases in <filename>ifcfg</filename> files. For example, if <filename>ifcfg-eth0</filename> and <filename>ifcfg-eth0:1</filename> files are present, <application>NetworkManager</application> creates two connections, which will cause confusion.
         </para>
         </note>
         <para>
-        For new installations, users should select the <guilabel>Manual</guilabel> method on the <systemitem class="protocol">IPv4</systemitem> or <systemitem class="protocol">IPv6</systemitem> tab in <application>NetworkManager</application> to assign multiple IP address to the same interface. For more information on using this tool, refer to <xref linkend="ch-NetworkManager" />.
+        For new installations, users should select the <guilabel>Manual</guilabel> method on the <systemitem class="protocol">IPv4</systemitem> or <systemitem class="protocol">IPv6</systemitem> tab in <application>NetworkManager</application> to assign multiple <systemitem class="protocol">IP</systemitem> address to the same interface. For more information on using this tool, refer to <xref linkend="ch-NetworkManager" />.
       </para>
       <para>
         Alias interface configuration files, which are used to bind multiple addresses to a single interface, use the <filename>ifcfg-<replaceable>if-name</replaceable>:<replaceable>alias-value</replaceable></filename> naming scheme.
       </para>
       <para>
-        For example, an <filename>ifcfg-eth0:0</filename> file could be configured to specify <literal>DEVICE=eth0:0</literal> and a static IP address of <systemitem class="ipaddress">10.0.0.2</systemitem>, serving as an alias of an Ethernet interface already configured to receive its IP information via DHCP in <filename>ifcfg-eth0</filename>. Under this configuration, <systemitem class="etheraddress">eth0</systemitem> is bound to a dynamic IP address, but the same physical network card can receive requests via the fixed, <systemitem class="ipaddress">10.0.0.2</systemitem> IP address.
+        For example, an <filename>ifcfg-eth0:0</filename> file could be configured to specify <literal>DEVICE=eth0:0</literal> and a static <systemitem class="protocol">IP</systemitem> address of <systemitem class="ipaddress">10.0.0.2</systemitem>, serving as an alias of an Ethernet interface already configured to receive its <systemitem class="protocol">IP</systemitem> information via <systemitem class="protocol">DHCP</systemitem> in <filename>ifcfg-eth0</filename>. Under this configuration, <systemitem class="etheraddress">eth0</systemitem> is bound to a dynamic <systemitem class="protocol">IP</systemitem> address, but the same physical network card can receive requests via the fixed, <systemitem class="ipaddress">10.0.0.2</systemitem> <systemitem class="protocol">IP</systemitem> address.
       </para>
       <warning>
         <title>Warning</title>
         <para>
-          Alias interfaces do not support DHCP.
+          Alias interfaces do not support <systemitem class="protocol">DHCP</systemitem>.
         </para>
       </warning>
       <para>
-        A clone interface configuration file should use the following naming convention: <filename>ifcfg-<replaceable>if-name</replaceable>-<replaceable>clone-name</replaceable></filename>. While an alias file allows multiple addresses for an existing interface, a clone file is used to specify additional options for an interface. For example, a standard DHCP Ethernet interface called <systemitem class="etheraddress">eth0</systemitem>, may look similar to this:
+        A clone interface configuration file should use the following naming convention: <filename>ifcfg-<replaceable>if-name</replaceable>-<replaceable>clone-name</replaceable></filename>. While an alias file allows multiple addresses for an existing interface, a clone file is used to specify additional options for an interface. For example, a standard <systemitem class="protocol">DHCP</systemitem> Ethernet interface called <systemitem class="etheraddress">eth0</systemitem>, may look similar to this:
       </para>
       <programlisting>DEVICE=eth0
 ONBOOT=yes
@@ -2082,7 +2082,7 @@ BOOTPROTO=dhcp</programlisting>
         This way a user can bring up the <systemitem class="etheraddress">eth0</systemitem> interface using the <command>/sbin/ifup eth0-user</command> command because the configuration options from <filename>ifcfg-eth0</filename> and <filename>ifcfg-eth0-user</filename> are combined. While this is a very basic example, this method can be used with a variety of options and interfaces.
       </para>
       <para>
-      It is no longer possible to create alias and clone interface configuration files using a graphical tool. However, as explained at the beginning of this section, it is no longer necessary to use this method as it is now possible to directly assign multiple IP address to the same interface. For new installations, users should select the <guilabel>Manual</guilabel> method on the <systemitem class="protocol">IPv4</systemitem> or <systemitem class="protocol">IPv6</systemitem> tab in <application>NetworkManager</application> to assign multiple IP address to the same interface. For more information on using this tool, refer to <xref linkend="ch-NetworkManager" />.
+      It is no longer possible to create alias and clone interface configuration files using a graphical tool. However, as explained at the beginning of this section, it is no longer necessary to use this method as it is now possible to directly assign multiple <systemitem class="protocol">IP</systemitem> address to the same interface. For new installations, users should select the <guilabel>Manual</guilabel> method on the <systemitem class="protocol">IPv4</systemitem> or <systemitem class="protocol">IPv6</systemitem> tab in <application>NetworkManager</application> to assign multiple <systemitem class="protocol">IP</systemitem> address to the same interface. For more information on using this tool, refer to <xref linkend="ch-NetworkManager" />.
       </para>
     </section>
     
@@ -2129,7 +2129,7 @@ DEMAND=no
 IDLETIMEOUT=600
 </programlisting>
       <para>
-        <firstterm>Serial Line Internet Protocol </firstterm> (<acronym>SLIP</acronym>) is another dialup interface, although it is used less frequently. SLIP files have interface configuration file names such as <filename>ifcfg-sl0</filename>.
+        <firstterm>Serial Line Internet Protocol </firstterm> (<acronym>SLIP</acronym>) is another dialup interface, although it is used less frequently. <systemitem class="protocol">SLIP</systemitem> files have interface configuration file names such as <filename>ifcfg-sl0</filename>.
         </para>
       <para>Other options that may be used in these files include:
       </para>
@@ -2188,7 +2188,7 @@ IDLETIMEOUT=600
           <term><option>INITSTRING</option>=<replaceable>string</replaceable></term>
           <listitem>
             <para>
-              where <replaceable>string</replaceable> is the initialization string passed to the modem device. This option is primarily used in conjunction with SLIP interfaces.
+              where <replaceable>string</replaceable> is the initialization string passed to the modem device. This option is primarily used in conjunction with <systemitem class="protocol">SLIP</systemitem> interfaces.
             </para>
           </listitem>
         </varlistentry>
@@ -2257,7 +2257,7 @@ IDLETIMEOUT=600
           <term><option>REMIP</option>=<replaceable>address</replaceable></term>
           <listitem>
             <para>
-              where <replaceable>address</replaceable> is the IP address of the remote system. This is usually left unspecified.
+              where <replaceable>address</replaceable> is the <systemitem class="protocol">IP</systemitem> address of the remote system. This is usually left unspecified.
             </para>
           </listitem>
         </varlistentry>
@@ -2283,7 +2283,7 @@ IDLETIMEOUT=600
             <filename>ifcfg-lo</filename>
           </term>
           <listitem>
-            <para>A local <firstterm>loopback interface</firstterm> is often used in testing, as well as being used in a variety of applications that require an IP address pointing back to the same system. Any data sent to the loopback device is immediately returned to the host's network layer.</para>
+            <para>A local <firstterm>loopback interface</firstterm> is often used in testing, as well as being used in a variety of applications that require an <systemitem class="protocol">IP</systemitem> address pointing back to the same system. Any data sent to the loopback device is immediately returned to the host's network layer.</para>
             <warning>
               <title>Do not manually edit the ifcfg-lo script</title>
               <para>The loopback interface script, <filename>/etc/sysconfig/network-scripts/ifcfg-lo</filename>, should never be edited manually. Doing so can prevent the system from operating correctly.</para>
@@ -2364,7 +2364,7 @@ IDLETIMEOUT=600
           <filename>ifup-aliases</filename>
         </term>
         <listitem>
-          <para>Configures IP aliases from interface configuration files when more than one IP address is associated with an interface.</para>
+          <para>Configures <systemitem class="protocol">IP</systemitem> aliases from interface configuration files when more than one <systemitem class="protocol">IP</systemitem> address is associated with an interface.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -2388,7 +2388,7 @@ IDLETIMEOUT=600
           <filename>ifup-plip</filename>
         </term>
         <listitem>
-          <para>Brings up a PLIP interface.</para>
+          <para>Brings up a <systemitem class="protocol">PLIP</systemitem> interface.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -2480,7 +2480,7 @@ IDLETIMEOUT=600
   <section id="s2_Set_All_the_Hostnames">
       <title>Set All The Hostnames</title>
       <para>
-        To set all the host names on a system, enter the following command as root:
+        To set all the host names on a system, enter the following command as <systemitem class="username">root</systemitem>:
         <screen>~]# <command>hostnamectl set-hostname <replaceable>name</replaceable></command></screen>
         This will alter the pretty, static, and transient host names alike. The static and transient host names will be simplified forms of the pretty host name. Spaces will be replaced with “-” and special characters will be removed.
       </para>
@@ -2488,7 +2488,7 @@ IDLETIMEOUT=600
          <section id="s2_Set_A_Particular_Hostname">
       <title>Set A Particular Hostname</title>
       <para>
-        To set a particular host name, enter the following command as root with the relevant option:
+        To set a particular host name, enter the following command as <systemitem class="username">root</systemitem> with the relevant option:
         <screen>~]# <command>hostnamectl set-hostname <replaceable>name</replaceable> <optional><replaceable>option</replaceable>...</optional></command></screen>
         Where <replaceable>option</replaceable> is one or more of: <option>--pretty</option>, <option>--static</option>, and <option>--transient</option>.
       </para>
@@ -2498,7 +2498,7 @@ IDLETIMEOUT=600
              <section id="s2_Clear_A_Particular_Hostname">
                <title>Clear A Particular Hostname</title>
       <para>
-        To clear a particular host name and to allow it to revert to the default, enter the following command as root with the relevant option:
+        To clear a particular host name and to allow it to revert to the default, enter the following command as <systemitem class="username">root</systemitem> with the relevant option:
         <screen>~]# <command>hostnamectl set-hostname <replaceable>""</replaceable> <optional><replaceable>option</replaceable>...</optional></command></screen>
         Where <replaceable>""</replaceable> is a quoted empty string and where <replaceable>option</replaceable> is one or more of: <option>--pretty</option>, <option>--static</option>, and <option>--transient</option>.
       </para>
@@ -2596,13 +2596,13 @@ Information on <systemitem class="daemon">systemd-hostnamed</systemitem>.
     <primary>static route</primary>
     </indexterm>
     <para>
-      Use the <command>ip route</command> command to display the IP routing table. If static routes are required, they can be added to the routing table by means of the <command>ip route add</command> command and removed using the <command>ip route del</command> command. To add a static route to a host address, that is to say to a single IP address, issue the following command as <systemitem class="username">root</systemitem>:
-      <screen>ip route add <replaceable>X.X.X.X</replaceable></screen> where X.X.X.X is the IP address of the host in dotted decimal notation. To add a static route to a network, that is to say to an IP address representing a range of IP addresses, issue the following command as <systemitem class="username">root</systemitem>:
-      <screen>ip route add <replaceable>X.X.X.X/Y</replaceable></screen> where X.X.X.X is the IP address of the network in dotted decimal notation and Y is the network prefix. The network prefix is the number of enabled bits in the subnet mask. This format of network address slash prefix length is referred to as CIDR notation.
+      Use the <command>ip route</command> command to display the <systemitem class="protocol">IP</systemitem> routing table. If static routes are required, they can be added to the routing table by means of the <command>ip route add</command> command and removed using the <command>ip route del</command> command. To add a static route to a host address, that is to say to a single <systemitem class="protocol">IP</systemitem> address, issue the following command as <systemitem class="username">root</systemitem>:
+      <screen>ip route add <replaceable>X.X.X.X</replaceable></screen> where X.X.X.X is the <systemitem class="protocol">IP</systemitem> address of the host in dotted decimal notation. To add a static route to a network, that is to say to an <systemitem class="protocol">IP</systemitem> address representing a range of <systemitem class="protocol">IP</systemitem> addresses, issue the following command as <systemitem class="username">root</systemitem>:
+      <screen>ip route add <replaceable>X.X.X.X/Y</replaceable></screen> where X.X.X.X is the <systemitem class="protocol">IP</systemitem> address of the network in dotted decimal notation and Y is the network prefix. The network prefix is the number of enabled bits in the subnet mask. This format of network address slash prefix length is referred to as CIDR notation.
       </para>
       
       <para>
-      Static route configuration is stored per-interface in a <filename>/etc/sysconfig/network-scripts/route-<replaceable>interface</replaceable></filename> file. For example, static routes for the <systemitem class="etheraddress">eth0</systemitem> interface would be stored in the <filename>/etc/sysconfig/network-scripts/route-eth0</filename> file. The <filename>route-<replaceable>interface</replaceable></filename> file has two formats: IP command arguments and network/netmask directives. These are described below.
+      Static route configuration is stored per-interface in a <filename>/etc/sysconfig/network-scripts/route-<replaceable>interface</replaceable></filename> file. For example, static routes for the <systemitem class="etheraddress">eth0</systemitem> interface would be stored in the <filename>/etc/sysconfig/network-scripts/route-eth0</filename> file. The <filename>route-<replaceable>interface</replaceable></filename> file has two formats: <systemitem class="protocol">IP</systemitem> command arguments and network/netmask directives. These are described below.
     </para>
       
       <bridgehead id="bh-networkscripts-default-gateway">
@@ -2616,7 +2616,7 @@ Information on <systemitem class="daemon">systemd-hostnamed</systemitem>.
       The default route can thus be indicated by means of the GATEWAY directive and can be specified either globally or in interface-specific configuration files. Specifying the gateway globally has certain advantages in static networking environments, especially if more than one network interface is present. It can make fault finding simpler if applied consistently. There is also the GATEWAYDEV directive, which is a global option. If multiple devices specify GATEWAY, and one interface uses the GATEWAYDEV directive, that directive will take precedence. This option is not recommend as it can have unexpected consequences if an interface goes down and it can complicate fault finding.
     </para>
     <para>
-      In dynamic network environments, where mobile hosts are managed by <application>NetworkManager</application>, gateway information is likely to be interface specific and is best left to be assigned by DHCP. In special cases where it is necessary to influence <application>NetworkManager</application>'s selection of the exit interface to be used to reach a gateway, make use of the <command>DEFROUTE=no</command> command in the <literal>ifcfg</literal> files for those interfaces which do not lead to the default gateway.
+      In dynamic network environments, where mobile hosts are managed by <application>NetworkManager</application>, gateway information is likely to be interface specific and is best left to be assigned by <systemitem class="protocol">DHCP</systemitem>. In special cases where it is necessary to influence <application>NetworkManager</application>'s selection of the exit interface to be used to reach a gateway, make use of the <command>DEFROUTE=no</command> command in the <literal>ifcfg</literal> files for those interfaces which do not lead to the default gateway.
     </para>
   
      <para>
@@ -2631,27 +2631,27 @@ Information on <systemitem class="daemon">systemd-hostnamed</systemitem>.
       IP Command Arguments Format
     </bridgehead>
     <para>
-      If required in a per-interface configuration file, define a gateway on the first line. This is only required if the gateway is not set via DHCP and is not set globally as mentioned above:
+      If required in a per-interface configuration file, define a gateway on the first line. This is only required if the gateway is not set via <systemitem class="protocol">DHCP</systemitem> and is not set globally as mentioned above:
     </para>
-    <synopsis>default via <replaceable>X.X.X.X</replaceable><option> dev </option><replaceable>interface</replaceable></synopsis>
+    <synopsis>default via <replaceable>X.X.X.X</replaceable> <option>dev</option> <replaceable>interface</replaceable></synopsis>
     <para>
-      <replaceable>X.X.X.X</replaceable> is the IP address of the default gateway. The <replaceable>interface</replaceable> is the interface that is connected to, or can reach, the default gateway. The <option>dev</option> option can be omitted, specifying the exit interface is optional.
+      <replaceable>X.X.X.X</replaceable> is the <systemitem class="protocol">IP</systemitem> address of the default gateway. The <replaceable>interface</replaceable> is the interface that is connected to, or can reach, the default gateway. The <option>dev</option> option can be omitted, specifying the exit interface is optional.
     </para>
     <para>
       Define a static route. Each line is parsed as an individual route:
     </para>
-    <synopsis><replaceable>X.X.X.X/Y</replaceable> via <replaceable>X.X.X.X</replaceable> dev <replaceable>interface</replaceable></synopsis>
+    <synopsis><replaceable>X.X.X.X/Y</replaceable> via <replaceable>X.X.X.X</replaceable> <option>dev</option> <replaceable>interface</replaceable></synopsis>
     <para>
-      <replaceable>X.X.X.X/Y</replaceable> is the network address and netmask for the static route. <replaceable>X.X.X.X</replaceable> and <replaceable>interface</replaceable> are the IP address and interface for the default gateway respectively. The <replaceable>X.X.X.X</replaceable> address does not have to be the default gateway IP address. In most cases, <replaceable>X.X.X.X</replaceable> will be an IP address in a different subnet, and <replaceable>interface</replaceable> will be the interface that is connected to, or can reach, that subnet. Add as many static routes as required.
+      <replaceable>X.X.X.X/Y</replaceable> is the network address and netmask for the static route. <replaceable>X.X.X.X</replaceable> and <replaceable>interface</replaceable> are the <systemitem class="protocol">IP</systemitem> address and interface for the default gateway respectively. The <replaceable>X.X.X.X</replaceable> address does not have to be the default gateway <systemitem class="protocol">IP</systemitem> address. In most cases, <replaceable>X.X.X.X</replaceable> will be an <systemitem class="protocol">IP</systemitem> address in a different subnet, and <replaceable>interface</replaceable> will be the interface that is connected to, or can reach, that subnet. Add as many static routes as required.
     </para>
     <para>
-      The following is a sample <filename>route-eth0</filename> file using the IP command arguments format. The default gateway is 192.168.0.1, interface eth0. The two static routes are for the 10.10.10.0/24 and 172.16.1.0/24 networks:
+      The following is a sample <filename>route-eth0</filename> file using the <systemitem class="protocol">IP</systemitem> command arguments format. The default gateway is 192.168.0.1, interface eth0. The two static routes are for the 10.10.10.0/24 and 172.16.1.0/24 networks:
     </para>
     <screen>default via 192.168.0.1 dev eth0
 10.10.10.0/24 via 192.168.0.1 dev eth0
 172.16.1.0/24 via 192.168.0.1 dev eth0</screen>
     <para>
-      Static routes should only be configured for other subnets. The above example is not necessary, since packets going to the 10.10.10.0/24 and 172.16.1.0/24 networks will use the default gateway anyway. Below is an example of setting static routes to a different subnet, on a machine in a 192.168.0.0/24 subnet. The example machine has an <systemitem class="etheraddress">eth0</systemitem> interface in the 192.168.0.0/24 subnet, and an <systemitem class="etheraddress">eth1</systemitem> interface (10.10.10.1) in the 10.10.10.0/24 subnet:
+      Static routes should only be configured for other subnetworks. The above example is not necessary, since packets going to the 10.10.10.0/24 and 172.16.1.0/24 networks will use the default gateway anyway. Below is an example of setting static routes to a different subnet, on a machine in a 192.168.0.0/24 subnet. The example machine has an <systemitem class="etheraddress">eth0</systemitem> interface in the 192.168.0.0/24 subnet, and an <systemitem class="etheraddress">eth1</systemitem> interface (10.10.10.1) in the 10.10.10.0/24 subnet:
     </para>
     <screen>10.10.10.0/24 via 10.10.10.1 dev eth1</screen>
     <!-- Adding in this comment as per [Bug 446997] Static routes and default gateway are interface -specific ? -->
@@ -2661,7 +2661,7 @@ Information on <systemitem class="daemon">systemd-hostnamed</systemitem>.
     <important>
       <title>Duplicate default gateways</title>
       <para>
-        If the default gateway is already assigned from DHCP, the IP command arguments format can cause one of two errors during start-up, or when bringing up an interface from the down state using the <command>ifup</command> command: "RTNETLINK answers: File exists" or 'Error: either "to" is a duplicate, or "<replaceable>X.X.X.X</replaceable>" is a garbage.', where <replaceable>X.X.X.X</replaceable> is the gateway, or a different IP address. These errors can also occur if you have another route to another network using the default gateway. Both of these errors are safe to ignore.
+        If the default gateway is already assigned from <systemitem class="protocol">DHCP</systemitem>, the <systemitem class="protocol">IP</systemitem> command arguments format can cause one of two errors during start-up, or when bringing up an interface from the down state using the <command>ifup</command> command: "RTNETLINK answers: File exists" or 'Error: either "to" is a duplicate, or "<replaceable>X.X.X.X</replaceable>" is a garbage.', where <replaceable>X.X.X.X</replaceable> is the gateway, or a different <systemitem class="protocol">IP</systemitem> address. These errors can also occur if you have another route to another network using the default gateway. Both of these errors are safe to ignore.
       </para>
     </important>
     <bridgehead id="bh-networkscripts-static-routes-network-netmask-directives">
@@ -2688,7 +2688,7 @@ Information on <systemitem class="daemon">systemd-hostnamed</systemitem>.
       </listitem>
       <listitem>
         <para>
-          <computeroutput>GATEWAY0=<replaceable>X.X.X.X</replaceable></computeroutput> is the default gateway, or an IP address that can be used to reach <computeroutput>ADDRESS0=<replaceable>X.X.X.X</replaceable></computeroutput>
+          <computeroutput>GATEWAY0=<replaceable>X.X.X.X</replaceable></computeroutput> is the default gateway, or an <systemitem class="protocol">IP</systemitem> address that can be used to reach <computeroutput>ADDRESS0=<replaceable>X.X.X.X</replaceable></computeroutput>
         </para>
       </listitem>
     </itemizedlist>
@@ -2711,7 +2711,7 @@ GATEWAY1=192.168.0.1</programlisting>
 NETMASK0=255.255.255.0
 GATEWAY0=10.10.10.1</programlisting>
     <para>
-      Note that if DHCP is used, it can assign these settings automatically.
+      Note that if <systemitem class="protocol">DHCP</systemitem> is used, it can assign these settings automatically.
     </para>
   </section>
   


More information about the docs-commits mailing list