[deployment-guide: 34/36] Merge branch 'master' of git+ssh://git.engineering.redhat.com/srv/git/users/dhensley/Deployment_Guid

[Jaromir Hradilek]

commit 38b6c599ed564e224cafca0193b29872842cf442
Merge: b108bc6... fc052bd...
Author: Douglas Silas <dhensley at redhat.com>
Date:   Tue Nov 9 23:39:23 2010 +0100

    Merge branch 'master' of git+ssh://git.engineering.redhat.com/srv/git/users/dhensley/Deployment_Guide
    
    Conflicts:
    	en-US/Preface.xml
    	en-US/Revision_History.xml

 en-US/Author_Group.xml |   69 ++++++++++++++++++++++++-----------------------
 en-US/Book_Info.xml    |    2 +-
 en-US/Preface.xml      |    6 +---
 3 files changed, 38 insertions(+), 39 deletions(-)
---
diff --cc en-US/Book_Info.xml
index 3a1e2d7,492c2f9..ee4990a
--- a/en-US/Book_Info.xml
+++ b/en-US/Book_Info.xml
@@@ -3,13 -3,13 +3,13 @@@
  ]>
  <bookinfo>
    <title>Deployment Guide</title>
 -  <subtitle>Deployment, configuration and administration of &MAJOROSVER;</subtitle>
 +  <subtitle>Deployment, Configuration and Administration of &MAJOROSVER;</subtitle>
    <productname>Red Hat Enterprise Linux</productname>
    <productnumber>6</productnumber>
-   <edition>0.5</edition>
+   <edition>1</edition>
    <pubsnumber>60</pubsnumber>
    <abstract>
 -    <para>The Deployment Guide documents relevant information regarding the deployment, configuration and administration of &MAJOROSVER;.</para>
 +    <para>The <citetitle>Deployment Guide</citetitle> documents relevant information regarding the deployment, configuration and administration of &MAJOROSVER;.</para>
    </abstract>
    <corpauthor>
      <inlinemediaobject>
diff --cc en-US/Preface.xml
index 309b897,8f56e46..1c22358
--- a/en-US/Preface.xml
+++ b/en-US/Preface.xml
@@@ -16,13 -16,13 +16,11 @@@
          xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
      </xi:fallback>
    </xi:include>
 -  <section id="Acknowledgements">
 +  <section
 +    id="Acknowledgements">
      <title>Acknowledgements</title>
 -    <para>
 -      Certain portions of this text first appeared in the <citetitle>Deployment Guide</citetitle>, copyright &copy; 2007 Red Hat, Inc., available at <ulink url="http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/5/html/Deployment_Guide/index.html" />.
 -    </para>
 -    <para>
 -      The authors of this book would like to thank the following people for their valuable contributions: Adam Tkáč, Andrew Fitzsimon, Andrius Benokraitis, Brian Cleary Edward Bailey, Garrett LeSage, Jeffrey Fearn, Joe Orton, Joshua Wulf, KarstenWade, Lucy Ringland, Marcela Mašláňová, Mark Johnson, Michael Behm, Michael Behm, Miroslav Lichvár, Radek Vokál, Rahul Kavalapara, Rahul Sundaram, Sandra Moore, and Zbyšek Mráz.
 -    </para>
 +    <para>Certain portions of this text first appeared in the <citetitle>Deployment Guide</citetitle>, copyright &copy; 2007 Red Hat, Inc., available at <ulink
-         url="http://www.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/5.4/html/Deployment_Guide/index.html"></ulink>.</para>
- <para>
-       The authors of this book would like to thank the following people for their valuable contributions: Adam Tkáč, Andrew Fitzsimon, Andrius Benokraitis, Brian Cleary Edward Bailey, Garrett LeSage, Jeffrey Fearn, Joe Orton, Joshua Wulf, KarstenWade, Lucy Ringland, Marcela Mašláňová, Mark Johnson, Michael Behm, Michael Behm, Miroslav Lichvár, Radek Vokál, Rahul Kavalapara, Rahul Sundaram, Sandra Moore, and Zbyšek Mráz, among many others.
-     </para>
++        url="http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/5/html/Deployment_Guide/index.html"></ulink>.</para>
++    <para>The authors of this book would like to thank the following people for their valuable contributions: Adam Tkáč, Andrew Fitzsimon, Andrius Benokraitis, Brian Cleary Edward Bailey, Garrett LeSage, Jeffrey Fearn, Joe Orton, Joshua Wulf, KarstenWade, Lucy Ringland, Marcela Mašláňová, Mark Johnson, Michael Behm, Michael Behm, Miroslav Lichvár, Radek Vokál, Rahul Kavalapara, Rahul Sundaram, Sandra Moore and Zbyšek Mráz, among many others.</para>
    </section>
  </preface>