docs: Move DEB / RPM repository to general installation section Since it is required for both the Management Server and KVM Hypervisor
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2d33d942 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2d33d942 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2d33d942 Branch: refs/heads/4.0 Commit: 2d33d942831a78e036bc0d9de7732352a6ef18d2 Parents: 0c39761 Author: Wido den Hollander <[email protected]> Authored: Mon Sep 24 16:33:58 2012 +0200 Committer: Edison Su <[email protected]> Committed: Mon Sep 24 10:26:48 2012 -0700 ---------------------------------------------------------------------- docs/en-US/configure-package-repository.xml | 3 +++ docs/en-US/hypervisor-host-install-flow.xml | 1 - docs/en-US/hypervisor-host-install-overview.xml | 1 - docs/en-US/installation.xml | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2d33d942/docs/en-US/configure-package-repository.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/configure-package-repository.xml b/docs/en-US/configure-package-repository.xml index ef558ec..0678d20 100644 --- a/docs/en-US/configure-package-repository.xml +++ b/docs/en-US/configure-package-repository.xml @@ -26,6 +26,9 @@ <title>Configure package repository</title> <para>&PRODUCT; is only distributed from source from the official mirrors. DEB and RPM packages are however build 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.</para> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2d33d942/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 index 60837b8..35145fd 100644 --- a/docs/en-US/hypervisor-host-install-flow.xml +++ b/docs/en-US/hypervisor-host-install-flow.xml @@ -26,7 +26,6 @@ <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="configure-package-repository.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"; /> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2d33d942/docs/en-US/hypervisor-host-install-overview.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/hypervisor-host-install-overview.xml b/docs/en-US/hypervisor-host-install-overview.xml index 0b11845..faba416 100644 --- a/docs/en-US/hypervisor-host-install-overview.xml +++ b/docs/en-US/hypervisor-host-install-overview.xml @@ -30,7 +30,6 @@ <para>The procedure for installing the Hypervisor Host is:</para> <orderedlist> <listitem><para>Prepare the Operating System</para></listitem> - <listitem><para>Configure the DEB / RPM repository</para></listitem> <listitem><para>Install and configure libvirt</para></listitem> <listitem><para>Configure Security Policies (AppArmor and SELinux)</para></listitem> <listitem><para>Install and configure the Agent</para></listitem> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2d33d942/docs/en-US/installation.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/installation.xml b/docs/en-US/installation.xml index 948931e..c5b1afb 100644 --- a/docs/en-US/installation.xml +++ b/docs/en-US/installation.xml @@ -27,6 +27,7 @@ <xi:include href="who-should-read-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="installation-steps-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <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>
