From 77ae14aa6543b58d1da6448b6171d28003fde6b4 Mon Sep 17 00:00:00 2001
From: Alex Huang <alex.huang@citrix.com>
Date: Fri, 5 Oct 2012 15:11:16 -0700
Subject: [PATCH] Revert "Docs. Add xrefs to Installation Steps Overview. Minor
 fixes to headings." I cherry-picked this prematurely it seems.

This reverts commit baec0bd0a9b65e6d126dff889ce7d222a22f5508.
---
 docs/en-US/add-clusters-ovm.xml               |  2 +-
 .../choosing_a_deployment_architecture.xml    | 29 +++++++++++++++
 docs/en-US/host-add-vsphere.xml               |  2 +-
 docs/en-US/installation-steps-overview.xml    | 35 +++++++++++++------
 4 files changed, 56 insertions(+), 12 deletions(-)
 create mode 100644 docs/en-US/choosing_a_deployment_architecture.xml

diff --git a/docs/en-US/add-clusters-ovm.xml b/docs/en-US/add-clusters-ovm.xml
index 11e1a13555f..0e00a7f0799 100644
--- a/docs/en-US/add-clusters-ovm.xml
+++ b/docs/en-US/add-clusters-ovm.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
diff --git a/docs/en-US/choosing_a_deployment_architecture.xml b/docs/en-US/choosing_a_deployment_architecture.xml
new file mode 100644
index 00000000000..ec59d8b2bd3
--- /dev/null
+++ b/docs/en-US/choosing_a_deployment_architecture.xml
@@ -0,0 +1,29 @@
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<chapter id="choosing_a_deployment_architecture">
+    <title>Choosing a Deployment Architecture</title>
+    <para>The architecture used in a deployment will vary depending on the size and purpose of the deployment. This section contains examples of deployment architecture, including a small-scale deployment useful for test and trial deployments and a fully-redundant large-scale setup for production deployments.</para>
+    <xi:include href="small_scale_deployment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />   
+    <xi:include href="large_scale_redundant_setup.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="separate_storage_network.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="multi_node_management_server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="multi_site_deployment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>
diff --git a/docs/en-US/host-add-vsphere.xml b/docs/en-US/host-add-vsphere.xml
index b47846448d7..038d8a8c64a 100644
--- a/docs/en-US/host-add-vsphere.xml
+++ b/docs/en-US/host-add-vsphere.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
diff --git a/docs/en-US/installation-steps-overview.xml b/docs/en-US/installation-steps-overview.xml
index a8fbb5eb8b9..ed2e3d1617d 100644
--- a/docs/en-US/installation-steps-overview.xml
+++ b/docs/en-US/installation-steps-overview.xml
@@ -34,34 +34,49 @@
     </itemizedlist>
     <orderedlist>
     <listitem>
-    <para>Make sure you have the required hardware ready. See <xref linkend="minimum-system-requirements"/></para>
+    <para>
+        <emphasis role="bold">Prepare</emphasis>
+    </para>
+    <para>Make sure you have the required hardware ready</para>
     </listitem>
     <listitem>
-    <para>Install the Management Server (choose single-node or multi-node). See <xref linkend="management-server-install-flow"/></para>
+    <para>(Optional) Fill out the preparation checklists</para>
     </listitem>
     <listitem>
-    <para>Log in to the UI. See <xref linkend="ui"/></para>
+    <para><emphasis role="bold">Install the &PRODUCT; software</emphasis></para>
     </listitem>
     <listitem>
-    <para>Add a zone. Includes the first pod, cluster, and host. See <xref linkend="zone-add"/></para>
+    <para>Install the Management Server (choose single-node or multi-node)</para>
     </listitem>
     <listitem>
-    <para>Add more pods (optional). See <xref linkend="pod-add"/></para>
+    <para>Log in to the UI</para>
     </listitem>
     <listitem>
-    <para>Add more clusters (optional). See <xref linkend="cluster-add"/></para>
+    <para><emphasis role="bold">Provision your cloud infrastructure</emphasis></para>
     </listitem>
     <listitem>
-        <para>Add more hosts (optional). See <xref linkend="host-add>"/></para>
+    <para>Add a zone. Includes the first pod, cluster, and host</para>
     </listitem>
     <listitem>
-    <para>Add more primary storage (optional). See <xref linkend="primary-storage-add"/></para>
+    <para>Add more pods</para>
     </listitem>
     <listitem>
-    <para>Add more secondary storage (optional). See <xref linkend="secondary-storage-add"/></para>
+    <para>Add more clusters</para>
     </listitem>
     <listitem>
-    <para>Try using the cloud. See <xref linkend="initialize-and-test"/></para>
+    <para>Add more hosts</para>
+    </listitem>
+    <listitem>
+    <para>Add more primary storage</para>
+    </listitem>
+    <listitem>
+    <para>Add more secondary storage</para>
+    </listitem>
+    <listitem>
+    <para><emphasis role="bold">Try using the cloud</emphasis></para>
+    </listitem>
+    <listitem>
+    <para>Initialization and testing</para>
     </listitem>
     </orderedlist>
 </section>