You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2012/10/06 00:23:54 UTC
[2/2] git commit: Trying out Jessica's new fix. Revert "Revert "Docs.
Add xrefs to Installation Steps Overview. Minor fixes to headings.""
Trying out Jessica's new fix.
Revert "Revert "Docs. Add xrefs to Installation Steps Overview. Minor fixes to headings.""
This reverts commit 77ae14aa6543b58d1da6448b6171d28003fde6b4.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c6a1f03a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c6a1f03a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c6a1f03a
Branch: refs/heads/4.0
Commit: c6a1f03aebafe4f0de2f5dce6542abed89b661f9
Parents: 5629e22
Author: Alex Huang <al...@citrix.com>
Authored: Fri Oct 5 15:23:07 2012 -0700
Committer: Alex Huang <al...@citrix.com>
Committed: Fri Oct 5 15:23:07 2012 -0700
----------------------------------------------------------------------
docs/en-US/add-clusters-ovm.xml | 2 +-
docs/en-US/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, 12 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c6a1f03a/docs/en-US/add-clusters-ovm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-clusters-ovm.xml b/docs/en-US/add-clusters-ovm.xml
index 0e00a7f..11e1a13 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 section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!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;
]>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c6a1f03a/docs/en-US/choosing_a_deployment_architecture.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/choosing_a_deployment_architecture.xml b/docs/en-US/choosing_a_deployment_architecture.xml
deleted file mode 100644
index ec59d8b..0000000
--- a/docs/en-US/choosing_a_deployment_architecture.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!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>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c6a1f03a/docs/en-US/host-add-vsphere.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/host-add-vsphere.xml b/docs/en-US/host-add-vsphere.xml
index 038d8a8..b478464 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 bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!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;
]>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c6a1f03a/docs/en-US/installation-steps-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/installation-steps-overview.xml b/docs/en-US/installation-steps-overview.xml
index ed2e3d1..a8fbb5e 100644
--- a/docs/en-US/installation-steps-overview.xml
+++ b/docs/en-US/installation-steps-overview.xml
@@ -34,49 +34,34 @@
</itemizedlist>
<orderedlist>
<listitem>
- <para>
- <emphasis role="bold">Prepare</emphasis>
- </para>
- <para>Make sure you have the required hardware ready</para>
+ <para>Make sure you have the required hardware ready. See <xref linkend="minimum-system-requirements"/></para>
</listitem>
<listitem>
- <para>(Optional) Fill out the preparation checklists</para>
+ <para>Install the Management Server (choose single-node or multi-node). See <xref linkend="management-server-install-flow"/></para>
</listitem>
<listitem>
- <para><emphasis role="bold">Install the &PRODUCT; software</emphasis></para>
+ <para>Log in to the UI. See <xref linkend="ui"/></para>
</listitem>
<listitem>
- <para>Install the Management Server (choose single-node or multi-node)</para>
+ <para>Add a zone. Includes the first pod, cluster, and host. See <xref linkend="zone-add"/></para>
</listitem>
<listitem>
- <para>Log in to the UI</para>
+ <para>Add more pods (optional). See <xref linkend="pod-add"/></para>
</listitem>
<listitem>
- <para><emphasis role="bold">Provision your cloud infrastructure</emphasis></para>
+ <para>Add more clusters (optional). See <xref linkend="cluster-add"/></para>
</listitem>
<listitem>
- <para>Add a zone. Includes the first pod, cluster, and host</para>
+ <para>Add more hosts (optional). See <xref linkend="host-add>"/></para>
</listitem>
<listitem>
- <para>Add more pods</para>
+ <para>Add more primary storage (optional). See <xref linkend="primary-storage-add"/></para>
</listitem>
<listitem>
- <para>Add more clusters</para>
+ <para>Add more secondary storage (optional). See <xref linkend="secondary-storage-add"/></para>
</listitem>
<listitem>
- <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>
+ <para>Try using the cloud. See <xref linkend="initialize-and-test"/></para>
</listitem>
</orderedlist>
</section>