From 6eb2fcc0643e856a45f6bfb96d370f0f674f668b Mon Sep 17 00:00:00 2001
From: Jessica Tomechak <jessica.tomechak@gmail.com>
Date: Wed, 17 Oct 2012 12:39:30 -0700
Subject: [PATCH] Docs: Add the sections on building from code to the Install
 Guide. The files were contributed, but never included in the book. This
 caused a build error as well as missing information.

---
 docs/en-US/build-packages.xml                 | 31 +++++++++++++++++++
 docs/en-US/configure-package-repository.xml   | 22 ++++++-------
 docs/en-US/management-server-install-flow.xml |  1 +
 3 files changed, 42 insertions(+), 12 deletions(-)
 create mode 100644 docs/en-US/build-packages.xml

diff --git a/docs/en-US/build-packages.xml b/docs/en-US/build-packages.xml
new file mode 100644
index 00000000000..0e09267542c
--- /dev/null
+++ b/docs/en-US/build-packages.xml
@@ -0,0 +1,31 @@
+<?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="build-packages">
+    <title>Build Software Packages from Code</title>
+    <para>Follow these steps to build your own packages from source. Alternatively, you can find a pre-built package
+    provided by a third party and use the steps in <xref linkend="configure-package-repository"/>.</para>
+    <xi:include href="build-deb.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="build-rpm.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+</section>
diff --git a/docs/en-US/configure-package-repository.xml b/docs/en-US/configure-package-repository.xml
index 4907ce08e1c..eee1b6fb131 100644
--- a/docs/en-US/configure-package-repository.xml
+++ b/docs/en-US/configure-package-repository.xml
@@ -23,23 +23,21 @@
 -->
 
 <section id="configure-package-repository">
-    <title>Configure package repository</title>
-    <para>&PRODUCT; is only distributed from source from the official mirrors. 
-        If you didn't follow the steps to build your own packages from source 
-        in the sections for <xref linkend="sect-source-buildrpm" /> or
-        <xref linkend="sect-source-builddebs" /> you can find pre-build
-        DEB and RPM packages for your convience by third-parties.
-    </para>
-    <para>
-       When installing &PRODUCT; it is recommended you use these package
-       repositories for easy installation.
-    </para>
+    <title>Configure the Package Repository</title>
+    <para>&PRODUCT; is only distributed from source from the official mirrors. If you didn't follow
+        the steps to build your own packages from source in the sections for <xref
+            linkend="sect-source-buildrpm"/> or <xref linkend="sect-source-builddebs"/> you can find
+        pre-built DEB and RPM packages provided for your convience by third parties. </para>
+    <para>When installing &PRODUCT; it is recommended you use these package repositories for easy
+        installation. </para>
     <note>
         <para>These repositories contain both the Management Server and KVM Hypervisor packages.</para>
     </note>
     <section id="configure-package-repository-deb">
         <title>DEB package repository</title>
-        <para>You can add a DEB package repository to your apt sources with the following commands. Please note that currently only packages for Ubuntu 12.04 (precise) are being build.</para>
+        <para>You can add a DEB package repository to your apt sources with the following commands.
+            Please note that currently only packages for Ubuntu 12.04 (precise) are being
+            built.</para>
         <programlisting language="Bash">echo "deb http://cloudstack.apt-get.eu/ubuntu $(lsb_release -s -c) 4.0" > /etc/apt/sources.list.d/cloudstack.list</programlisting>
         <para>We now have to add the public key to the trusted keys.</para>
         <programlisting language="Bash"><prompt>#</prompt> <command>wget</command> -O - http://cloudstack.apt-get.eu/release.asc|apt-key add -</programlisting>
diff --git a/docs/en-US/management-server-install-flow.xml b/docs/en-US/management-server-install-flow.xml
index 33bcac9c85b..5d9d663c3a3 100644
--- a/docs/en-US/management-server-install-flow.xml
+++ b/docs/en-US/management-server-install-flow.xml
@@ -26,6 +26,7 @@
     <title>Management Server Installation</title>
     <xi:include href="management-server-install-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="management-server-install-prepare-os.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="build-packages.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="management-server-install-client.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="management-server-install-db.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="management-server-install-nfs-shares.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />