[deployment-guide/comm-rel: 32/35] Merge branch 'master' into comm

[dsilas]

commit da5d54ece37dcbc68d1a2a16febc63cff1a8ecf0
Merge: 7dafe62... 1a95315...
Author: Douglas Silas <dhensley at redhat.com>
Date:   Wed Jun 9 14:30:48 2010 +0200

    Merge branch 'master' into comm
    
    Conflicts:
    	en-US/Book_Info.xml

 .gitignore                                         |    1 +
 en-US/Book_Info.xml                                |    8 +-
 en-US/Date_and_Time_Configuration.xml              |  506 ++++++++++++++------
 en-US/Email.xml                                    |   12 +-
 en-US/The_X_Window_System.xml                      |  147 +++---
 en-US/images/date-and-time-authentication.png      |  Bin 0 -> 15591 bytes
 en-US/images/date-and-time-date_and_time.png       |  Bin 0 -> 165347 bytes
 .../images/date-and-time-network_time_protocol.png |  Bin 0 -> 173179 bytes
 en-US/images/date-and-time-time_zone.png           |  Bin 0 -> 209964 bytes
 en-US/images/date-time-ntp.png                     |  Bin 21611 -> 0 bytes
 en-US/images/date-time.png                         |  Bin 19805 -> 0 bytes
 en-US/images/timezone.png                          |  Bin 29020 -> 0 bytes
 12 files changed, 450 insertions(+), 224 deletions(-)
---
diff --cc en-US/Book_Info.xml
index 1962e82,645e8d7..aad0153
--- a/en-US/Book_Info.xml
+++ b/en-US/Book_Info.xml
@@@ -3,11 -3,11 +3,11 @@@
  ]>
  <bookinfo>
    <title>Deployment Guide</title>
-   <subtitle>Deployment, configuration and administration of Fedora 12</subtitle>
 -  <subtitle>Deployment, configuration and administration of Red Hat Enterprise Linux 6</subtitle>
 -  <productname>Red Hat Enterprise Linux</productname>
 -  <productnumber>6</productnumber>
 -  <edition>0.1</edition>
 -  <pubsnumber>5</pubsnumber>
++  <subtitle>Deployment, configuration and administration of &MAJOROSVER;</subtitle>
 +  <productname>Fedora Documentation</productname>
-   <productnumber>12</productnumber>
-   <edition>0</edition>
-   <pubsnumber>0</pubsnumber>
++  <productnumber>&VERSIONNUM;</productnumber>
++  <edition>1</edition>
++  <pubsnumber>0</pubsnu mber>
    <abstract>
      <para>The Deployment Guide documents relevant information regarding the deployment, configuration and administration of &MAJOROSVER;.</para>
    </abstract>