Updated Branches:
  refs/heads/junit-tests c24bc0028 -> 8ec57494a
  refs/heads/master c5b8eaf68 -> a9bf92e40


some install guide cleanup


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a9bf92e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a9bf92e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a9bf92e4

Branch: refs/heads/master
Commit: a9bf92e40478600ef8795393b944eace5866ff9b
Parents: c5b8eaf
Author: David Nalley <[email protected]>
Authored: Wed Oct 17 20:18:31 2012 -0400
Committer: David Nalley <[email protected]>
Committed: Wed Oct 17 20:18:31 2012 -0400

----------------------------------------------------------------------
 docs/en-US/Book_Info_Release_Notes_4.0.xml      |    2 +-
 docs/en-US/deployment-architecture-overview.xml |   19 ++++++++++++--
 docs/en-US/feature-overview.xml                 |   23 +++++++++++++++--
 3 files changed, 37 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a9bf92e4/docs/en-US/Book_Info_Release_Notes_4.0.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Book_Info_Release_Notes_4.0.xml 
b/docs/en-US/Book_Info_Release_Notes_4.0.xml
index 9397014..411eba9 100644
--- a/docs/en-US/Book_Info_Release_Notes_4.0.xml
+++ b/docs/en-US/Book_Info_Release_Notes_4.0.xml
@@ -20,7 +20,7 @@
 -->
 <bookinfo id="book-release-notes-4.0">
   <title>Version 4.0 Release Notes</title>
-  <subtitle>Revised October 9, 2012 3:35 am Pacific</subtitle>
+  <subtitle>Revised October 17, 2012 19:49 UTC</subtitle>
   <productname>Apache CloudStack</productname>
   <productnumber/>
   <pubsnumber/>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a9bf92e4/docs/en-US/deployment-architecture-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/deployment-architecture-overview.xml 
b/docs/en-US/deployment-architecture-overview.xml
index 6a67a2c..2c5f30e 100644
--- a/docs/en-US/deployment-architecture-overview.xml
+++ b/docs/en-US/deployment-architecture-overview.xml
@@ -25,10 +25,19 @@
 <section id="deployment-architecture-overview">
     <title>Deployment Architecture Overview</title>
     <para>
-        A &PRODUCT; installation consists of two parts: the Management Server 
and the cloud infrastructure that it manages. When you set up and manage a 
&PRODUCT; cloud, you provision resources such as hosts, storage devices, and IP 
addresses into the Management Server, and the Management Server manages those 
resources.
+        A &PRODUCT; installation consists of two parts: the Management Server
+        and the cloud infrastructure that it manages. When you set up and 
+        manage a &PRODUCT; cloud, you provision resources such as hosts,
+        storage devices, and IP addresses into the Management Server, and
+        the Management Server manages those resources.
     </para>
     <para>
-        The minimum production installation consists of one machine running 
the &PRODUCT; Management Server and another machine to act as the cloud 
infrastructure (in this case, a very simple infrastructure consisting of one 
host running hypervisor software). In a trial installation, a single machine 
can act as both the Management Server and the hypervisor host (using the KVM 
hypervisor).
+        The minimum production installation consists of one machine running
+        the &PRODUCT; Management Server and another machine to act as the
+        cloud infrastructure (in this case, a very simple infrastructure
+        consisting of one host running hypervisor software). In its smallest 
+        deployment, a single machine can act as both the Management Server
+        and the hypervisor host (using the KVM hypervisor).
     </para>
     <mediaobject>
         <imageobject>
@@ -36,7 +45,11 @@
         </imageobject>
         <textobject><phrase>basic-deployment.png: Basic two-machine 
deployment</phrase></textobject>
     </mediaobject>
-    <para>A more full-featured installation consists of a highly-available 
multi-node Management Server installation and up to thousands of hosts using 
any of several advanced networking setups. For information about deployment 
options, see Choosing a Deployment Architecture.
+    <para>
+       A more full-featured installation consists of a highly-available
+       multi-node Management Server installation and up to tens of thousands of
+       hosts using any of several advanced networking setups. For 
+       information about deployment options, see Choosing a Deployment 
Architecture.
     </para>
     <xi:include href="management-server-overview.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
     <xi:include href="cloud-infrastructure-overview.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a9bf92e4/docs/en-US/feature-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/feature-overview.xml b/docs/en-US/feature-overview.xml
index 236d78b..a417839 100644
--- a/docs/en-US/feature-overview.xml
+++ b/docs/en-US/feature-overview.xml
@@ -55,14 +55,31 @@
         <emphasis role="bold">API and Extensibility</emphasis>
     </para>
     <para>
-        &PRODUCT; provides an API that gives programmatic access to all the 
management features available in the UI. The API is maintained and documented. 
This API enables the creation of command line tools and new user interfaces to 
suit particular needs. See the Developer’s Guide and API Reference, both 
available at <ulink 
url="http://docs.cloudstack.org/Apache_CloudStack_Documentation";>http://docs.cloudstack.org/Apache_CloudStack_Documentation</ulink>.
+        &PRODUCT; provides an API that gives programmatic access to all the
+        management features available in the UI. The API is maintained and
+        documented. This API enables the creation of command line tools and
+        new user interfaces to suit particular needs. See the Developer’s 
+        Guide and API Reference, both available at 
+        <ulink url="http://incubator.apache.org/cloudstack/docs";>Apache 
CloudStack Guides</ulink> 
+        and
+        <ulink url="http://incubator.apache.org/cloudstack/docs/api";>Apache 
CloudStack API Reference</ulink> 
+        respectively. 
     </para>
     <para>
-        The &PRODUCT; pluggable allocation architecture allows the creation of 
new types of allocators for the selection of storage and Hosts. See the 
Allocator Implementation Guide (<ulink 
url="http://docs.cloudstack.org/CloudStack_Documentation/Allocator_Implementation_Guide";>http://docs.cloudstack.org/CloudStack_Documentation/Allocator_Implementation_Guide</ulink>).
+        The &PRODUCT; pluggable allocation architecture allows the creation
+        of new types of allocators for the selection of storage and Hosts. 
+        See the Allocator Implementation Guide 
+        (<ulink 
url="http://docs.cloudstack.org/CloudStack_Documentation/Allocator_Implementation_Guide";>http://docs.cloudstack.org/CloudStack_Documentation/Allocator_Implementation_Guide</ulink>).
     </para>
     <para>
         <emphasis role="bold">High Availability</emphasis>
     </para>
-    <para>&PRODUCT; has a number of features to increase the availability of 
the system. The Management Server itself may be deployed in a multi-node 
installation where the servers are load balanced. MySQL may be configured to 
use replication to provide for a manual failover in the event of database loss. 
For the hosts, &PRODUCT; supports NIC bonding and the use of separate networks 
for storage as well as iSCSI Multipath.
+    <para>
+       &PRODUCT; has a number of features to increase the availability of the
+       system. The Management Server itself may be deployed in a multi-node 
+       installation where the servers are load balanced. MySQL may be 
configured
+       to use replication to provide for a manual failover in the event of
+       database loss. For the hosts, &PRODUCT; supports NIC bonding and the use
+       of separate networks for storage as well as iSCSI Multipath.
     </para>
 </section>

Reply via email to