[deployment-guide/comm-rel-14: 661/677] NetConf: remove some more unfinished business
Jaromir Hradilek
jhradile at fedoraproject.org
Sun Nov 14 23:58:01 UTC 2010
commit d27139be72ebaf2903103aaaaec59999e8e8b4b3
Author: Douglas Silas <dhensley at redhat.com>
Date: Tue Nov 9 18:52:00 2010 +0100
NetConf: remove some more unfinished business
en-US/Network_Configuration.xml | 44 ++------------------------------------
1 files changed, 3 insertions(+), 41 deletions(-)
---
diff --git a/en-US/Network_Configuration.xml b/en-US/Network_Configuration.xml
index 0b04b93..0a56d96 100644
--- a/en-US/Network_Configuration.xml
+++ b/en-US/Network_Configuration.xml
@@ -234,9 +234,9 @@ NetworkManager (pid 1527) is running...
<para>Editing the IPv4 Settings Tab</para>
</caption>
</mediaobject>
- <para>The <guilabel>IPv4 Settings</guilabel> tab allows you to configure the method by which you connect to the Internet and enter IP address, route, and DNS information as required. The <guilabel>IPv4 Settings</guilabel> tab is available when you create and modify one of the following connection types: wired, wireless, mobile broadband, VPN or DSL. If you need to configure IPv6 addresses, refer to <xref linkend="sec-Configuring_IPv6_Settings"/>.<!-- If you need to configure static routes, which can be done by clicking on the <guibutton>Routes</guibutton> button, refer to ???.--></para>
+ <para>The <guilabel>IPv4 Settings</guilabel> tab allows you to configure the method by which you connect to the Internet and enter IP address, route, and DNS information as required. The <guilabel>IPv4 Settings</guilabel> tab is available when you create and modify one of the following connection types: wired, wireless, mobile broadband, VPN or DSL.<!-- If you need to configure IPv6 addresses, refer to <xref linkend="sec-Configuring_IPv6_Settings"/>.--><!-- If you need to configure static routes, which can be done by clicking on the <guibutton>Routes</guibutton> button, refer to ???.--></para>
<para>If you are using DHCP to obtain a dynamic IP address from a DHCP server, you can simply set <guilabel>Method</guilabel> to <guimenuitem>Automatic (DHCP)</guimenuitem>.</para>
- <bridgehead
+ <!--<bridgehead
id="bh-Setting_the_Method">Setting the Method</bridgehead>
<variablelist
id="varlist-Available_IPv4_Methods_by_Connection_Type">
@@ -291,45 +291,7 @@ NetworkManager (pid 1527) is running...
<guimenuitem>Automatic (PPPoE) addresses only</guimenuitem> — </para>
</listitem>
</varlistentry>
- </variablelist>
- </section>
- <section
- id="sec-Configuring_IPv6_Settings">
- <title>Configuring IPv6 Settings</title>
- <variablelist>
- <varlistentry>
- <term>
- <guilabel>Method</guilabel>
- </term>
- <listitem>
- <para>
- <guimenuitem>Ignore</guimenuitem> — </para>
- <para>
- <guimenuitem>Automatic</guimenuitem> — </para>
- <para>
- <guimenuitem>Automatic, addresses only</guimenuitem> — </para>
- <para>
- <guimenuitem>Manual</guimenuitem> — </para>
- <para>
- <guimenuitem>Link-Local Only</guimenuitem> — </para>
- <para>
- <guimenuitem>Shared to other computers</guimenuitem> — </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <guilabel>Addresses</guilabel>
- </term>
- <listitem>
- <para>
- <guimenuitem>DNS servers</guimenuitem> — </para>
- <para>
- <guimenuitem>Search domains</guimenuitem> — </para>
- </listitem>
- </varlistentry>
- </variablelist>
- <!--<para>For information on configuring static routes for the network connection, go to <xref
- linkend="sec-Configuring_Routes"/>.</para>-->
+ </variablelist>-->
</section>
</section>
<section
More information about the docs-commits
mailing list