Return-Path: 
 <cloudstack-commits-return-4467-apmail-incubator-cloudstack-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 7966FD2B6
	for <apmail-incubator-cloudstack-commits-archive@minotaur.apache.org>;
 Thu,  4 Oct 2012 23:55:10 +0000 (UTC)
Received: (qmail 20666 invoked by uid 500); 4 Oct 2012 23:55:10 -0000
Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org
Received: (qmail 20598 invoked by uid 500); 4 Oct 2012 23:55:10 -0000
Mailing-List: contact cloudstack-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:cloudstack-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cloudstack-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cloudstack-commits@incubator.apache.org>
List-Id: <cloudstack-commits.incubator.apache.org>
Reply-To: cloudstack-dev@incubator.apache.org
Delivered-To: mailing list cloudstack-commits@incubator.apache.org
Received: (qmail 20591 invoked by uid 99); 4 Oct 2012 23:55:10 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Oct 2012 23:55:10 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 228DB3A414; Thu,  4 Oct 2012 23:55:10 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jtomechak@apache.org
To: cloudstack-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: checkin doc changes
Message-Id: <20121004235510.228DB3A414@tyr.zones.apache.org>
Date: Thu,  4 Oct 2012 23:55:10 +0000 (UTC)

Updated Branches:
  refs/heads/4.0 bd384829d -> 1c64ebc36


checkin doc changes


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

Branch: refs/heads/4.0
Commit: 1c64ebc364ceea21ff3a480dace55365c3fbf513
Parents: bd38482
Author: Jessica Tomechak <jessica.tomechak@gmail.com>
Authored: Thu Oct 4 16:51:52 2012 -0700
Committer: Jessica Tomechak <jessica.tomechak@gmail.com>
Committed: Thu Oct 4 16:54:33 2012 -0700

----------------------------------------------------------------------
 docs/en-US/Installation_Guide.xml           |    3 +
 docs/en-US/host-add.xml                     |   50 ++++++++++++++--------
 docs/en-US/hypervisor-host-install-flow.xml |   34 ---------------
 docs/en-US/installation.xml                 |    1 -
 docs/publican-install.cfg                   |   27 ------------
 docs/publican-installation.cfg              |    1 +
 6 files changed, 36 insertions(+), 80 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1c64ebc3/docs/en-US/Installation_Guide.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Installation_Guide.xml b/docs/en-US/Installation_Guide.xml
index 06ba791..99d77f1 100644
--- a/docs/en-US/Installation_Guide.xml
+++ b/docs/en-US/Installation_Guide.xml
@@ -46,5 +46,8 @@
     </bookinfo>
     <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="provisioning.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="hypervisor-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </book>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1c64ebc3/docs/en-US/host-add.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/host-add.xml b/docs/en-US/host-add.xml
index 2a984fd..37cf28d 100644
--- a/docs/en-US/host-add.xml
+++ b/docs/en-US/host-add.xml
@@ -5,24 +5,38 @@
 ]>
 
 <!-- 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.
+    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.
 -->
 
 <section id="host-add">
-    <title>Adding a Host</title>
-    <para>TODO</para>
-</section>
+	<title>Adding a Host</title>
+        <orderedlist>
+            <listitem><para>Before adding a host to the &PRODUCT; configuration, you must first install your chosen hypervisor on the host. &PRODUCT; can manage hosts running VMs under a variety of hypervisors.</para> 
+              <para>The &PRODUCT; Installation Guide provides instructions on how to install each supported hypervisor
+                  and configure it for use with &PRODUCT;. See the appropriate section in the Installation Guide for information about which version of your chosen hypervisor is supported, as well as crucial additional steps to configure the hypervisor hosts for use with &PRODUCT;.</para>
+                <warning><para>Be sure you have performed the additional &PRODUCT;-specific configuration steps described in the hypervisor installation section for your particular hypervisor.</para></warning>
+            </listitem>
+            <listitem><para>Now add the hypervisor host to &PRODUCT;. The technique to use varies depending on the hypervisor.</para>
+                <itemizedlist>
+                    <listitem><para><xref linkend="host-add-xenserver-kvm-ovm" /></para></listitem>
+                    <listitem><para><xref linkend="host-add-vsphere" /></para></listitem>
+                </itemizedlist>
+            </listitem>
+        </orderedlist>
+    <xi:include href="host-add-xenserver-kvm-ovm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="host-add-vsphere.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1c64ebc3/docs/en-US/hypervisor-host-install-flow.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-host-install-flow.xml b/docs/en-US/hypervisor-host-install-flow.xml
deleted file mode 100644
index 74668c8..0000000
--- a/docs/en-US/hypervisor-host-install-flow.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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" [
-<!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.
--->
-
-<section id="hypervisor-host-install-flow">
-    <title>Hypervisor Host installation</title>
-    <xi:include href="hypervisor-host-install-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="hypervisor-host-install-prepare-os.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="hypervisor-host-install-libvirt.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="hypervisor-host-install-security-policies.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="hypervisor-host-install-network.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="hypervisor-host-install-firewall.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="hypervisor-host-install-agent.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1c64ebc3/docs/en-US/installation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/installation.xml b/docs/en-US/installation.xml
index c5b1afb..5fc550e 100644
--- a/docs/en-US/installation.xml
+++ b/docs/en-US/installation.xml
@@ -29,5 +29,4 @@
     <xi:include href="minimum-system-requirements.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
     <xi:include href="configure-package-repository.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="management-server-install-flow.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="hypervisor-host-install-flow.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 </chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1c64ebc3/docs/publican-install.cfg
----------------------------------------------------------------------
diff --git a/docs/publican-install.cfg b/docs/publican-install.cfg
deleted file mode 100644
index 64eeed9..0000000
--- a/docs/publican-install.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-# Publican configuration file for CloudStack Installation Guide
-# Config::Simple 4.58
-# Tue May 29 00:57:27 2012
-#
-# 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.
-
-xml_lang: en-US
-type: Book
-docname: cloudstack_installation
-brand: cloudstack
-chunk_first: 1
-chunk_section_depth: 1
-condition: install

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1c64ebc3/docs/publican-installation.cfg
----------------------------------------------------------------------
diff --git a/docs/publican-installation.cfg b/docs/publican-installation.cfg
index 6f10a90..e94044d 100644
--- a/docs/publican-installation.cfg
+++ b/docs/publican-installation.cfg
@@ -24,6 +24,7 @@ docname: Installation_Guide
 brand: cloudstack
 chunk_first: 1
 chunk_section_depth: 1
+condition: install