[deployment-guide/comm-rel: 9/727] Merge branch 'ent' of git+ssh://git.engineering.redhat.com/srv/git/users/dhensley/Deployment_Guide i

[Jaromir Hradilek]

commit 96d5fc05b7da46157fa849c2071a8764082445df
Merge: 83e335d... acc1c0b...
Author: Martin Prpic <mprpic at redhat.com>
Date:   Fri Jun 11 10:26:50 2010 +0200

    Merge branch 'ent' of git+ssh://git.engineering.redhat.com/srv/git/users/dhensley/Deployment_Guide into ent
    
    Conflicts:
    	en-US/Book_Info.xml

 en-US/Book_Info.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc en-US/Book_Info.xml
index 84472c9,d0bb1e9..93513dc
--- a/en-US/Book_Info.xml
+++ b/en-US/Book_Info.xml
@@@ -5,9 -5,9 +5,15 @@@
    <title>Deployment Guide</title>
    <subtitle>Deployment, configuration and administration of &MAJOROSVER;</subtitle>
    <productname>Red Hat Enterprise Linux</productname>
++<<<<<<< HEAD
 +  <productnumber>&VERSIONNUM;</productnumber>
 +  <edition>0.1</edition>
 +  <pubsnumber>7</pubsnumber>
++=======
+   <productnumber>6</productnumber>
+   <edition>0.5</edition>
+   <pubsnumber>1</pubsnumber>
++>>>>>>> acc1c0b1958019074217ac99bbffefce34820e38
    <abstract>
      <para>The Deployment Guide documents relevant information regarding the deployment, configuration and administration of &MAJOROSVER;.</para>
    </abstract>