Updated Branches: refs/heads/master dffe67085 -> b387e1133
Fixed instances of 4.0 instead of 4.0.0-incubating referring to version numbers. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b387e113 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b387e113 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b387e113 Branch: refs/heads/master Commit: b387e113331d903ccbf84a71f5118f01c34282d5 Parents: dffe670 Author: Joe Brockmeier <[email protected]> Authored: Sat Oct 20 13:55:23 2012 -0500 Committer: Joe Brockmeier <[email protected]> Committed: Sat Oct 20 13:55:23 2012 -0500 ---------------------------------------------------------------------- docs/en-US/API_Developers_Guide.xml | 4 ++-- docs/en-US/Admin_Guide.xml | 2 +- docs/en-US/Book_Info.xml | 2 +- docs/en-US/Book_Info_Release_Notes_4.0.xml | 4 ++-- docs/en-US/CloudStack_Nicira_NVP_Guide.xml | 2 +- docs/en-US/added-API-commands-4.0.xml | 4 ++-- docs/en-US/castor-with-cs.xml | 2 +- docs/en-US/changed-apicommands-4.0.xml | 2 +- docs/en-US/cloudstack.xml | 4 ++-- docs/en-US/configure-package-repository.xml | 3 ++- docs/en-US/create-vpn-customer-gateway.xml | 2 +- docs/en-US/plugin-niciranvp-features.xml | 8 ++++---- docs/en-US/plugin-niciranvp-revisions.xml | 2 +- docs/en-US/whats-new.xml | 2 +- 14 files changed, 22 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b387e113/docs/en-US/API_Developers_Guide.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/API_Developers_Guide.xml b/docs/en-US/API_Developers_Guide.xml index 802c50e..c691ad0 100644 --- a/docs/en-US/API_Developers_Guide.xml +++ b/docs/en-US/API_Developers_Guide.xml @@ -26,7 +26,7 @@ <bookinfo id="cloudstack_developers"> <title>&PRODUCT; API Developer's Guide</title> <productname>Apache CloudStack</productname> - <productnumber>4.0</productnumber> + <productnumber>4.0.0-incubating</productnumber> <edition></edition> <pubsnumber></pubsnumber> <abstract> @@ -53,4 +53,4 @@ <xi:include href="alerts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="time-zones.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -</book> \ No newline at end of file +</book> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b387e113/docs/en-US/Admin_Guide.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/Admin_Guide.xml b/docs/en-US/Admin_Guide.xml index 3728b10..07f5e88 100644 --- a/docs/en-US/Admin_Guide.xml +++ b/docs/en-US/Admin_Guide.xml @@ -26,7 +26,7 @@ <bookinfo id="cloudstack_admin"> <title>&PRODUCT; Administrator's Guide</title> <productname>Apache CloudStack</productname> - <productnumber>4.0</productnumber> + <productnumber>4.0.0-incubating</productnumber> <edition>1</edition> <pubsnumber></pubsnumber> <abstract> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b387e113/docs/en-US/Book_Info.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/Book_Info.xml b/docs/en-US/Book_Info.xml index 3bd6efa..c125ab8 100644 --- a/docs/en-US/Book_Info.xml +++ b/docs/en-US/Book_Info.xml @@ -27,7 +27,7 @@ <title>&PRODUCT; Guide</title> <subtitle>Revised August 9, 2012 10:48 pm Pacific</subtitle> <productname>Apache CloudStack</productname> - <productnumber>4.0</productnumber> + <productnumber>4.0.0-incubating</productnumber> <edition>1</edition> <pubsnumber></pubsnumber> <abstract> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b387e113/docs/en-US/Book_Info_Release_Notes_4.0.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/Book_Info_Release_Notes_4.0.xml b/docs/en-US/Book_Info_Release_Notes_4.0.xml index 411eba9..0d57fb6 100644 --- a/docs/en-US/Book_Info_Release_Notes_4.0.xml +++ b/docs/en-US/Book_Info_Release_Notes_4.0.xml @@ -19,13 +19,13 @@ under the License. --> <bookinfo id="book-release-notes-4.0"> - <title>Version 4.0 Release Notes</title> + <title>Version 4.0.0-incubating Release Notes</title> <subtitle>Revised October 17, 2012 19:49 UTC</subtitle> <productname>Apache CloudStack</productname> <productnumber/> <pubsnumber/> <abstract> - <para>Release notes for the Apache CloudStack 4.0 release.</para> + <para>Release notes for the Apache CloudStack 4.0.0-incubating release.</para> </abstract> <corpauthor> <inlinemediaobject> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b387e113/docs/en-US/CloudStack_Nicira_NVP_Guide.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/CloudStack_Nicira_NVP_Guide.xml b/docs/en-US/CloudStack_Nicira_NVP_Guide.xml index c535c7c..a4c367c 100644 --- a/docs/en-US/CloudStack_Nicira_NVP_Guide.xml +++ b/docs/en-US/CloudStack_Nicira_NVP_Guide.xml @@ -28,7 +28,7 @@ <bookinfo id="cloudstack_plugin_niciranvp"> <title>&PRODUCT; Plugin Guide for the Nicira NVP Plugin</title> <productname>Apache CloudStack</productname> - <productnumber>4.0</productnumber> + <productnumber>4.0.0-incubating</productnumber> <edition>1</edition> <pubsnumber></pubsnumber> <abstract> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b387e113/docs/en-US/added-API-commands-4.0.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/added-API-commands-4.0.xml b/docs/en-US/added-API-commands-4.0.xml index 5dab9ca..2d86ba4 100644 --- a/docs/en-US/added-API-commands-4.0.xml +++ b/docs/en-US/added-API-commands-4.0.xml @@ -19,7 +19,7 @@ under the License. --> <section id="added-API-commands-4.0"> - <title>Added API Commands in 4.0</title> + <title>Added API Commands in 4.0.0-incubating</title> <itemizedlist> <listitem> <para>createCounter (Adds metric counter)</para> @@ -161,4 +161,4 @@ as the IP address of the Nexus 1000v dvSwitch.)</para> </listitem> </itemizedlist> -</section> \ No newline at end of file +</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b387e113/docs/en-US/castor-with-cs.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/castor-with-cs.xml b/docs/en-US/castor-with-cs.xml index 6385452..5049d33 100644 --- a/docs/en-US/castor-with-cs.xml +++ b/docs/en-US/castor-with-cs.xml @@ -34,7 +34,7 @@ <para>To configure CAStor:</para> <orderedlist> <listitem> - <para>Install &PRODUCT; 4.0 by following the instructions given in the INSTALL.txt + <para>Install &PRODUCT; 4.0.0-incubating by following the instructions given in the INSTALL.txt file.</para> <note> <para>You can use the S3 storage system in &PRODUCT; without setting up and installing the http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b387e113/docs/en-US/changed-apicommands-4.0.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/changed-apicommands-4.0.xml b/docs/en-US/changed-apicommands-4.0.xml index f851bf7..042d5e2 100644 --- a/docs/en-US/changed-apicommands-4.0.xml +++ b/docs/en-US/changed-apicommands-4.0.xml @@ -19,7 +19,7 @@ under the License. --> <section id="changed-apicommands-4.0"> - <title>Changed API Commands in 4.0</title> + <title>Changed API Commands in 4.0.0-incubating</title> <informaltable> <tgroup cols="2" align="left" colsep="1" rowsep="1"> <colspec colwidth="1" colname="1" colnum="1"/> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b387e113/docs/en-US/cloudstack.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/cloudstack.xml b/docs/en-US/cloudstack.xml index d9dca66..c745bc9 100644 --- a/docs/en-US/cloudstack.xml +++ b/docs/en-US/cloudstack.xml @@ -26,7 +26,7 @@ <bookinfo id="cloudstack_all"> <title>&PRODUCT; Complete Documentation</title> <productname>Apache CloudStack</productname> - <productnumber>4.0</productnumber> + <productnumber>4.0.0-incubating</productnumber> <edition>1</edition> <pubsnumber></pubsnumber> <abstract> @@ -76,4 +76,4 @@ <xi:include href="time-zones.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="event-types.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="alerts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -</book> \ No newline at end of file +</book> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b387e113/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 4907ce0..996b936 100644 --- a/docs/en-US/configure-package-repository.xml +++ b/docs/en-US/configure-package-repository.xml @@ -40,7 +40,8 @@ <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> - <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>Use your preferred editor and open (or create) <filename>/etc/apt/sources.list.d/cloudstack</filename>. Add the community provided repository to the file:</para> +<programlisting>deb http://cloudstack.apt-get.eu/ubuntu precise 4.0</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> <para>Now update your local apt cache.</para> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b387e113/docs/en-US/create-vpn-customer-gateway.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/create-vpn-customer-gateway.xml b/docs/en-US/create-vpn-customer-gateway.xml index bf56e36..8bcd488 100644 --- a/docs/en-US/create-vpn-customer-gateway.xml +++ b/docs/en-US/create-vpn-customer-gateway.xml @@ -188,4 +188,4 @@ <para>Click OK.</para> </listitem> </orderedlist> -</section> \ No newline at end of file +</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b387e113/docs/en-US/plugin-niciranvp-features.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/plugin-niciranvp-features.xml b/docs/en-US/plugin-niciranvp-features.xml index cdcda9e..b67323d 100644 --- a/docs/en-US/plugin-niciranvp-features.xml +++ b/docs/en-US/plugin-niciranvp-features.xml @@ -22,8 +22,8 @@ --> <section id="Features-of-the-Nicira-NVP-Plugin"> <title>Features of the Nicira NVP Plugin</title> - <para>In CloudStack release 4.0.x this plugin supports the Connectivity service. This service is responsible for creating Layer 2 networks supporting the networks created by Guests. In other words when an tennant creates a new network, instead of the traditional VLAN a logical network will be created by sending the appropriate calls to the Nicira NVP Controller.</para> + <para>In CloudStack release 4.0.0-incubating this plugin supports the Connectivity service. This service is responsible for creating Layer 2 networks supporting the networks created by Guests. In other words when an tennant creates a new network, instead of the traditional VLAN a logical network will be created by sending the appropriate calls to the Nicira NVP Controller.</para> <para>The plugin has been tested with Nicira NVP versions 2.1.0, 2.2.0 and 2.2.1</para> - <note><para>In CloudStack 4.0.x only the XenServer hypervisor is supported for use in combination with Nicira NVP</para></note> - <note><para>In CloudStack 4.0.x the UI components for this plugin are not complete, configuration is done by sending commands to the API</para></note> -</section> \ No newline at end of file + <note><para>In CloudStack 4.0.0-incubating only the XenServer hypervisor is supported for use in combination with Nicira NVP</para></note> + <note><para>In CloudStack 4.0.0-incubating the UI components for this plugin are not complete, configuration is done by sending commands to the API</para></note> +</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b387e113/docs/en-US/plugin-niciranvp-revisions.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/plugin-niciranvp-revisions.xml b/docs/en-US/plugin-niciranvp-revisions.xml index 6e455ca..b8e6935 100644 --- a/docs/en-US/plugin-niciranvp-revisions.xml +++ b/docs/en-US/plugin-niciranvp-revisions.xml @@ -36,7 +36,7 @@ </author> <revdescription> <simplelist> - <member>Documentation created for 4.0.x version of the NVP Plugin</member> + <member>Documentation created for 4.0.0-incubating version of the NVP Plugin</member> </simplelist> </revdescription> </revision> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b387e113/docs/en-US/whats-new.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/whats-new.xml b/docs/en-US/whats-new.xml index cdb12c7..5f13db3 100644 --- a/docs/en-US/whats-new.xml +++ b/docs/en-US/whats-new.xml @@ -39,4 +39,4 @@ <xi:include href="added-API-commands.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="added-error-codes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> </section> -</chapter> \ No newline at end of file +</chapter>
