[deployment-guide: 36/36] Merge branch 'master' into comm

[Jaromir Hradilek]

commit 6b012348141e0ff37951d05cc4e47d7cb684d6d8
Merge: d37fb55... 4e8a525...
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Mon Nov 15 01:16:44 2010 +0100

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

 en-US/AUTHORS                                      |   14 +-
 en-US/Author_Group.xml                             |   83 +-
 en-US/Book_Info.xml                                |   16 +-
 en-US/Introduction.xml                             |   60 +-
 .../Lightweight_Directory_Access_Protocol_LDAP.xml | 1055 +++++++++-----------
 en-US/Manually_Upgrading_the_Kernel.xml            |    2 +-
 en-US/OProfile.xml                                 |   35 -
 en-US/Preface.xml                                  |    3 +-
 en-US/Revision_History.xml                         |   16 +-
 en-US/The_Apache_HTTP_Server.xml                   |   19 +-
 en-US/The_X_Window_System.xml                      |  184 ----
 en-US/The_sysconfig_Directory.xml                  |  180 ----
 en-US/Working_with_Kernel_Modules.xml              |   17 +-
 en-US/Yum.xml                                      |   17 +-
 en-US/images/authentication_configuration.png      |  Bin 0 -> 24892 bytes
 publican.cfg                                       |    2 +-
 16 files changed, 632 insertions(+), 1071 deletions(-)
---
diff --cc en-US/Book_Info.xml
index f209e0a,ee4990a..0b59c01
--- 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>
-   <productname>Fedora Documentation</productname>
-   <productnumber>13</productnumber>
-   <edition>0.5</edition>
-   <pubsnumber>59</pubsnumber>
+   <subtitle>Deployment, Configuration and Administration of &MAJOROSVER;</subtitle>
 -  <productname>Red Hat Enterprise Linux</productname>
 -  <productnumber>6</productnumber>
++  <productname>Fedora</productname>
++  <productnumber>14</productnumber>
+   <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 publican.cfg
index 2feeadf,55645a6..84fe19a
--- a/publican.cfg
+++ b/publican.cfg
@@@ -9,8 -9,8 +9,8 @@@ xml_lang: en-U
  #type
  #    specifies the type of document — a DocBook <article>, DocBook <book>, or DocBook <set>, as set by the --type option for publican create.
  
 -brand: RedHat
 +brand: fedora
- #    sets the brand of the docume	nt, for example, RedHat, fedora, JBoss, oVirt or GIMP , as set by the --brand option for publican create. If you do not specify a brand, Publican uses its default brand. Refer to Chapter 4, Branding for more information. 
+ #    sets the brand of the document, for example, RedHat, fedora, JBoss, oVirt or GIMP , as set by the --brand option for publican create. If you do not specify a brand, Publican uses its default brand. Refer to Chapter 4, Branding for more information. 
  
  # ADVANCED PARAMETERS