Merge lp:~annegentle/openstackbook/minoredits into lp:openstackbook/trunk

[Anne Gentle]

Just a few minor fixes based on Doc Blitz comments. Next set of revisions will be oriented toward Diablo.

[Kiran Murari (kiranm)]

review: Approve

=== modified file 'Installation.xml'
--- Installation.xml	2011-09-20 09:30:11 +0000
+++ Installation.xml	2011-09-21 21:48:23 +0000
@@ -2,7 +2,12 @@
  <title>Installation and Configuration</title>
 <section xml:id="Introduction-d1e390">
 <title>Introduction</title>
-<para>The following section describes how to set up a minimal cloud infrastructure based on OpenStack using 3 machines. These machines are referred to in this and subsequent chapters as Server1 and Server2 and Client1. Server1 runs all the 7 components of Nova as well as Glance and OpenStack dashboard. Server2 runs only nova-compute. Since OpenStack components follow a shared-nothing policy, each component or any group of components can be installed on any server.</para>
+<para>The following section describes how to set up a minimal cloud infrastructure based on
+   OpenStack using 3 machines. These machines are referred to in this and subsequent chapters as
+   Server1 and Server2 and Client1. Server1 runs all the components of Nova as well as Glance and
+   OpenStack dashboard. Server2 runs only nova-compute. Since OpenStack components follow a
+   shared-nothing policy, each component or any group of components can be installed on any
+   server.</para>
 
 <para>Client1 is not a required component. In our sample setup, it is used for bundling images, as a client to the web interface, and to run euca commands to manage the infrastructure. Having this client ensures that you do not need to meddle with the servers for tasks such as bundling. Also, bundling of Desktop Systems including Windows will require a GUI and it is better to have a dedicated machine for this purpose. We would recommend this machine to be VT-Enabled so that KVM can be run which allows for Windows VMs during image creation for bundling.</para>
 <para>
@@ -73,7 +78,9 @@
 </section>
 <section xml:id="Server1-d1e537">
 <title>Server1</title>
- <para>As shown in the figure above, Server1 contains all nova- services including nova-compute, nova-api, nova-volume, nova-network, nova-objectstore as well as the Image Service Glance and the Dashboard. </para>
+ <para>As shown in the figure above, Server1 contains all nova- services including nova-compute,
+   nova-api, nova-volume, nova-network, nova-objectstore as well as the Image Service Glance and the
+   Dashboard. It contains two Network Interface Cards (NICs)</para>
 <section xml:id="Base_OS-d1e542">
 <title>Base OS</title>
 <para>Boot the server off the Ubuntu server 11.04 CD. At the graphical menu select Install Ubuntu server and proceed with basic installation steps.

=== modified file 'Role.xml'
--- Role.xml	2011-08-10 18:06:53 +0000
+++ Role.xml	2011-09-21 21:48:23 +0000
@@ -15,8 +15,9 @@
 </section>
 <section xml:id="IT_security_itsec_-d1e2188">
 <title>IT security(itsec)</title>
-<para>This is a global role. It permits role holders to quarantine instances.
-Project Manager (projectmanager)</para>
+<para>This is a global role. It permits role holders to quarantine instances.</para></section>
+  <section xml:id="projectmanager-d1b4209">
+    <title>Project Manager (projectmanager)</title>
 
 <para>This is the default role for project owners. It permits the following tasks:</para>
 <itemizedlist>