[networking-guide] master: updates from my upstream version (52d64f4)

[stephenw at fedoraproject.org]

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

On branch  : master

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

commit 52d64f476b8c2122931ad753c42ff65fe54c8395
Author: Stephen Wadeley <swadeley at redhat.com>
Date:   Thu Jan 1 18:19:01 2015 +0100

    updates from my upstream version


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

 en-US/Configure_Network_Bridging.xml |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/en-US/Configure_Network_Bridging.xml b/en-US/Configure_Network_Bridging.xml
index 896bc53..2db1801 100644
--- a/en-US/Configure_Network_Bridging.xml
+++ b/en-US/Configure_Network_Bridging.xml
@@ -12,8 +12,9 @@
   Note that a bridge cannot be established over Wi-Fi networks operating in <firstterm>Ad-Hoc</firstterm> or <firstterm>Infrastructure</firstterm> modes. This is due to the IEEE 802.11 standard that specifies the use of 3-address frames in Wi-Fi for the efficient use of airtime. A system configured to be an <firstterm>access point</firstterm> (<acronym>AP</acronym>) running the <systemitem class="daemon">hostapd</systemitem> can support the necessary 4-address frames.
   </para>
 
-<section id="sec-Network_Bridging_Using_NetworkManager">
-  <title>Using NetworkManager</title>
+<section id="sec-Configure_Network_Bridging_Using_a_GUI">
+  <title>Configure Network Bridging Using a GUI</title>
+
     <para>
     When starting a bridge interface, <application>NetworkManager</application> waits for at least one port to enter the <quote>forwarding</quote> state before beginning any network-dependent <systemitem class="protocol">IP</systemitem> configuration such as <systemitem class="protocol">DHCP</systemitem> or <systemitem class="protocol">IPv6</systemitem> autoconfiguration. Static <systemitem class="protocol">IP</systemitem> addressing is allowed to proceed before any slaves or ports are connected or begin forwarding packets.
   </para>
@@ -25,11 +26,9 @@
       <procedure
         id="procedure-Adding_a_New_Bridge_Connection">
         <title>Adding a New Bridge Connection</title>
-         <step>
         <para>
         You can configure a new Bridge connection by opening the <guilabel>Network</guilabel> window and selecting the plus symbol below the menu.
             </para>
-            </step>
             <step>
             <para>
             To use the graphical <application>Network</application> settings tool, press the <keycap>Super</keycap> key to enter the Activities Overview, type <command>control network</command> and then press <keycap>Enter</keycap>. The <application>Network</application> settings tool appears.
@@ -55,7 +54,7 @@
           <para>Press the <keycap>Super</keycap> key to enter the Activities Overview, type <command>control network</command> and then press <keycap>Enter</keycap>. The <application>Network</application> settings tool appears.</para>
         </step>
         <step>
-          <para>Select the <guilabel>Bridge</guilabel> connection you wish to edit from the left hand menu.</para>
+          <para>Select the <guilabel>Bridge</guilabel> connection you want to edit from the left hand menu.</para>
         </step>
         <step>
           <para>Click the <guilabel>Options</guilabel> button.</para>
@@ -78,7 +77,7 @@
         </listitem>
         <listitem>
           <para>
-            <guilabel>All users may connect to this network</guilabel> — Select this box to create a connection available to all users on the system. Changing this setting may require root privileges. See <xref linkend="sec-System-wide_and_Private_Connection_Profiles"/> for details. To prevent unexpected behavior during installation, ensure that this check box remains selected for any network interface that you configure.
+            <guilabel>All users may connect to this network</guilabel> — Select this box to create a connection available to all users on the system. Changing this setting may require root privileges. See <xref linkend="sec-System-wide_and_Private_Connection_Profiles"/> for details.
             </para>
         </listitem>
         <listitem>
@@ -93,7 +92,8 @@
         </listitem>
       </itemizedlist>
 
-      <bridgehead id="bh-Configuring_the_Bridge_Tab">Configuring the Bridge Tab</bridgehead>
+      <section id="sec-Configuring_the_Bridge_Tab">
+      <title>Configuring the Bridge Tab</title>
       <variablelist>
         <varlistentry>
           <term>
@@ -140,7 +140,7 @@
             <guilabel>Forward delay</guilabel>
           </term>
           <listitem>
-            <para>The time, in seconds, spent in both the Listening and Learning states before entering the Forwarding state.</para>
+            <para>The time, in seconds, spent in both the Listening and Learning states before entering the Forwarding state. The default is 15 seconds.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
@@ -206,9 +206,9 @@
 
       <bridgehead
         id="bh-Saving_Your_New_or_Modified_Connection_and_Making_Further_Configurations-bridge">Saving Your New (or Modified) Connection and Making Further Configurations</bridgehead>
-      <para>Once you have finished editing your new bridge connection, click the <guibutton>Save</guibutton> button to save your customized configuration. To make <application>NetworkManager</application> apply the changes, power cycle the interface. See <xref
+      <para>Once you have finished editing your new bridge connection, click the <guibutton>Save</guibutton> button to save your customized configuration. If the profile was in use while being edited, power cycle the connection to make <application>NetworkManager</application> apply the changes. If the profile is OFF, set it to ON. See <xref
           linkend="sec-Connecting_to_a_Network_Using_a_GUI"/> for information on using your new or altered connection.</para>
-      <para>You can further configure an existing connection by selecting it in the <guilabel>Network</guilabel> window and clicking <guilabel>Configure</guilabel> to return to the <guilabel>Editing</guilabel> dialog.</para>
+      <para>You can further configure an existing connection by selecting it in the <guilabel>Network</guilabel> window and clicking <guilabel>Options</guilabel> to return to the <guilabel>Editing</guilabel> dialog.</para>
       <para>Then, to configure:</para>
       <itemizedlist>
         <listitem>
@@ -222,7 +222,7 @@
           </para>
         </listitem>
       </itemizedlist>
-
+      </section>
     </section>
 
 </section>