[deployment-guide/comm-rel-16-tx: 45/45] Merge branch 'comm-rel-16' into comm-rel-16-tx

[Jaromir Hradilek]

commit ac5ffb93f954a6ad5421424740ff9cd6b656c924
Merge: 748501b e5c06db
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Wed Sep 28 23:12:29 2011 +0200

    Merge branch 'comm-rel-16' into comm-rel-16-tx
    
    Conflicts:
    	en-US/Author_Group.xml

 en-US/Author_Group.xml                        |   27 +
 en-US/Automatic_Bug_Reporting_Tool_ABRT.xml   | 1891 ++++++++----
 en-US/Book_Info.xml                           |    2 +-
 en-US/Deployment_Guide.ent                    |    6 +-
 en-US/Deployment_Guide.xml                    |    4 +-
 en-US/Managing_Users_and_Groups.xml           | 4332 ++++---------------------
 en-US/OProfile.xml                            |  520 ++--
 en-US/Preface.xml                             |    4 -
 en-US/Revision_History.xml                    |    4 +-
 en-US/The_X_Window_System.xml                 | 1368 ++++----
 en-US/Yum.xml                                 | 1272 ++++++--
 en-US/images/abrt-applet_setting.png          |  Bin 0 -> 503175 bytes
 en-US/images/abrt-applet_setting2.png         |  Bin 0 -> 47291 bytes
 en-US/images/abrt-gui_access.png              |  Bin 0 -> 499229 bytes
 en-US/images/abrt-gui_backtrace_review.png    |  Bin 0 -> 174340 bytes
 en-US/images/abrt-gui_event_configuration.png |  Bin 0 -> 38253 bytes
 en-US/images/abrt-gui_main_screen.png         |  Bin 0 -> 186829 bytes
 en-US/images/abrt-gui_problem_analyzing.png   |  Bin 0 -> 67724 bytes
 en-US/images/abrt-gui_problem_description.png |  Bin 0 -> 134413 bytes
 en-US/images/abrt-gui_report_confirmation.png |  Bin 0 -> 155420 bytes
 en-US/images/abrt-gui_select_analyzer.png     |  Bin 0 -> 77605 bytes
 en-US/images/abrt-gui_select_reporter.png     |  Bin 0 -> 55173 bytes
 en-US/images/oprof-start-config.png           |  Bin 25828 -> 36871 bytes
 en-US/images/oprof-start-setup.png            |  Bin 49050 -> 52775 bytes
 en-US/images/user-manager-add-group.png       |  Bin 8717 -> 8926 bytes
 en-US/images/user-manager-add-user.png        |  Bin 28869 -> 28633 bytes
 en-US/images/user-manager.png                 |  Bin 108608 -> 27870 bytes
 publican.cfg                                  |    2 +-
 28 files changed, 4059 insertions(+), 5373 deletions(-)
---
diff --cc en-US/Book_Info.xml
index 9415a56,024b9d9..d235e89
--- a/en-US/Book_Info.xml
+++ b/en-US/Book_Info.xml
@@@ -5,9 -5,9 +5,9 @@@
    <title>Deployment Guide</title>
    <subtitle>Deployment, Configuration and Administration of &MAJOROSVER;</subtitle>
    <productname>Fedora</productname>
-   <productnumber>15</productnumber>
+   <productnumber>16</productnumber>
    <edition>1</edition>
 -  <pubsnumber>0</pubsnumber>
 +  <pubsnumber>3</pubsnumber>
    <abstract>
      <para>
        The <citetitle pubwork="book">Deployment Guide</citetitle> documents relevant information regarding the deployment, configuration, and administration of &MAJOROSVER;. It is oriented towards system administrators with a basic understanding of the system.
diff --cc en-US/Revision_History.xml
index 6735be0,2f8be3c..366ca8c
--- a/en-US/Revision_History.xml
+++ b/en-US/Revision_History.xml
@@@ -6,53 -6,8 +6,53 @@@
    <simpara>
      <revhistory>
        <revision>
 +        <revnumber>1-3</revnumber>
 +        <date>Mon Aug 29 2011</date>
 +        <author>
 +          <firstname>Jaromír</firstname>
 +          <surname>Hradílek</surname>
 +          <email>jhradilek at redhat.com</email>
 +        </author>
 +        <revdescription>
 +          <simplelist>
 +            <member>Added <xref linkend="sec-Printer_Configuration" />.</member>
 +          </simplelist>
 +        </revdescription>
 +      </revision>
 +      <revision>
 +        <revnumber>1-2</revnumber>
 +        <date>Tue Jul 12 2011 </date>
 +        <author>
 +          <firstname>Jaromír</firstname>
 +          <surname>Hradílek</surname>
 +          <email>jhradilek at redhat.com</email>
 +        </author>
 +        <revdescription>
 +          <simplelist>
 +            <member>Corrected a command synopsis in <xref linkend="sect-dhcp-starting_and_stopping" />.</member>
 +            <member>Added missing information to <xref linkend="s3-services-running-checking" />.</member>
 +          </simplelist>
 +        </revdescription>
 +      </revision>
 +      <revision>
 +        <revnumber>1-1</revnumber>
 +        <date>Mon Jun 20 2011</date>
 +        <author>
 +          <firstname>Jaromír</firstname>
 +          <surname>Hradílek</surname>
 +          <email>jhradilek at redhat.com</email>
 +        </author>
 +        <revdescription>
 +          <simplelist>
 +            <member>Added missing <literal>via</literal> keywords to <xref linkend="s1-networkscripts-static-routes" />.</member>
 +            <member>Described the <option>HOTPLUG</option> configuration option in <xref linkend="s2-networkscripts-interfaces-eth0" />.</member>
 +            <member>Corrected a typing error in <xref linkend="s2-networkscripts-interfaces-eth0" />.</member>
 +          </simplelist>
 +        </revdescription>
 +      </revision>
 +      <revision>
          <revnumber>1-0</revnumber>
-         <date>Tue May 24 2011</date>
+         <date>Tue Nov 8 2011</date>
          <author>
            <firstname>Jaromír</firstname>
            <surname>Hradílek</surname>