commit f8f645ba682fa7c5e004f3265dbd3f91b5861c98 Author: Stephen Wadeley <swadeley(a)redhat.com&gt; Date: Thu Jan 10 11:38:38 2013 +0100 I changed and moved "Establishing Routes" to "Configuring Routes" and made it generic not VPN specific en-US/NetworkManager.xml | 113 +++++++++++++++++++++++++-------------------- 1 files changed, 63 insertions(+), 50 deletions(-) --- diff --git a/en-US/NetworkManager.xml b/en-US/NetworkManager.xml index 5744dcd..0e71b48 100644 --- a/en-US/NetworkManager.xml +++ b/en-US/NetworkManager.xml @@ -1125,37 +1125,6 @@ NetworkManager (pid 1527) is running... </listitem> </varlistentry> </variablelist> - </section> - <section - id="sec-Establishing_Routes"> - <title>Establishing Routes</title> - <figure id="exam-User_and_System_Connections_Static-Routes"> - <title>Configuring static network routes</title> - <mediaobject - id="mediaobj-Network_Configuration-NM-System_eth0-Routes"> - <imageobject> - <imagedata - scalefit="0" - fileref="images/Network_Configuration-NM-System_eth0-Routes_Gnome3.png" - format="PNG" /> - </imageobject> - <textobject><para>A screen shot of the static routes window</para></textobject> - </mediaobject> - </figure> - <variablelist> - <varlistentry> - <term> - <guilabel>Addresses</guilabel> - </term> - <listitem> - <para> - <guimenuitem>Address</guimenuitem> — The IP address of a network, sub-net or host.</para> - <para> - <guimenuitem>Netmask</guimenuitem> — The netmask or prefix length of the IP address just entered.</para> - <para> - <guimenuitem>Gateway</guimenuitem> — The IP address of the gateway leading to the network, sub-net or host.</para> - <para> - <guimenuitem>Metric</guimenuitem> — A network cost, that is to say a preference value to give to this route. Lower values will be preferred over higher values.</para> @@ -1183,25 +1152,10 @@ NetworkManager (pid 1527) is running... linkend="sec-Configuring_IPv4_Settings"/>. </para> </listitem> - </varlistentry> - <varlistentry> - <term> - <guilabel>Ignore automatically obtained routes</guilabel> - </term> - <listitem> - <para>Select this check box to only use manually entered routes for the VPN tunnel.</para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <guilabel>Use this connection only for resources on its network</guilabel> - </term> - <listitem> - <para>Select this checkbox to prevent the VPN from becoming the default route. Then only the specific routes sent by the VPN server (or routes entered here manually) will be routed over the VPN tunnel.</para> - </listitem> - </varlistentry> - </variablelist> - </section> + + </itemizedlist> + </section> + </section> <section id="sec-Configuring_Connection_Settings"> @@ -1627,6 +1581,65 @@ NetworkManager (pid 1527) is running... <!--<para>For information on configuring static routes for the network connection, go to <xref linkend="sec-Configuring_Routes"/>.</para> --> </section> + + + + + <section + id="sec-Configuring_Routes"> + <title>Configuring Routes</title> + <para>A hosts routing table will be automatically populated with routes to directly connected networks. The routes are learned by observing the network interfaces when they are <quote>up</quote>. This section is for entering static routes to networks or hosts which can be reached by traversing an intermediate network or connection, such as a VPN or leased line.</para> + <figure id="exam-User_and_System_Connections_Static-Routes"> + <title>Configuring static network routes</title> + <mediaobject + id="mediaobj-Network_Configuration-NM-System_eth0-Routes"> + <imageobject> + <imagedata + scalefit="0" + fileref="images/Network_Configuration-NM-System_eth0-Routes_Gnome3.png" + format="PNG" /> + </imageobject> + <textobject><para>A screen shot of the static routes window</para></textobject> + </mediaobject> + </figure> + <variablelist> + <varlistentry> + <term> + <guilabel>Addresses</guilabel> + </term> + <listitem> + <para> + <guimenuitem>Address</guimenuitem> — The IP address of a network, sub-net or host.</para> + <para> + <guimenuitem>Netmask</guimenuitem> — The netmask or prefix length of the IP address just entered.</para> + <para> + <guimenuitem>Gateway</guimenuitem> — The IP address of the gateway leading to the network, sub-net or host.</para> + <para> + <guimenuitem>Metric</guimenuitem> — A network cost, that is to say a preference value to give to this route. Lower values will be preferred over higher values.</para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <guilabel>Ignore automatically obtained routes</guilabel> + </term> + <listitem> + <para>Select this check box to only use manually entered routes for this conection.</para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <guilabel>Use this connection only for resources on its network</guilabel> + </term> + <listitem> + <para>Select this checkbox to prevent the connection from becoming the default route. Typical examples are where a connection is a VPN or a leased line to a head office and you do not want any Internet bound traffic to pass over the connection. Selecting this option means that only traffic specifically destined for routes learned automatically over the connection or entered here manually will be routed over the connection.</para> + </listitem> + </varlistentry> + </variablelist> + </section> + + + + </section> <section id="sec-NetworkManager_Architecture">