From b387e113331d903ccbf84a71f5118f01c34282d5 Mon Sep 17 00:00:00 2001 From: Joe Brockmeier Date: Sat, 20 Oct 2012 13:55:23 -0500 Subject: [PATCH] Fixed instances of 4.0 instead of 4.0.0-incubating referring to version numbers. --- 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(-) diff --git a/docs/en-US/API_Developers_Guide.xml b/docs/en-US/API_Developers_Guide.xml index 802c50e8790..c691ad02cf6 100644 --- a/docs/en-US/API_Developers_Guide.xml +++ b/docs/en-US/API_Developers_Guide.xml @@ -26,7 +26,7 @@ &PRODUCT; API Developer's Guide Apache CloudStack - 4.0 + 4.0.0-incubating @@ -53,4 +53,4 @@ - \ No newline at end of file + diff --git a/docs/en-US/Admin_Guide.xml b/docs/en-US/Admin_Guide.xml index 3728b106ef6..07f5e889fc8 100644 --- a/docs/en-US/Admin_Guide.xml +++ b/docs/en-US/Admin_Guide.xml @@ -26,7 +26,7 @@ &PRODUCT; Administrator's Guide Apache CloudStack - 4.0 + 4.0.0-incubating 1 diff --git a/docs/en-US/Book_Info.xml b/docs/en-US/Book_Info.xml index 3bd6efa176f..c125ab8de2b 100644 --- a/docs/en-US/Book_Info.xml +++ b/docs/en-US/Book_Info.xml @@ -27,7 +27,7 @@ &PRODUCT; Guide Revised August 9, 2012 10:48 pm Pacific Apache CloudStack - 4.0 + 4.0.0-incubating 1 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 411eba9e6d3..0d57fb6d9a8 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. --> - Version 4.0 Release Notes + Version 4.0.0-incubating Release Notes Revised October 17, 2012 19:49 UTC Apache CloudStack - Release notes for the Apache CloudStack 4.0 release. + Release notes for the Apache CloudStack 4.0.0-incubating release. diff --git a/docs/en-US/CloudStack_Nicira_NVP_Guide.xml b/docs/en-US/CloudStack_Nicira_NVP_Guide.xml index c535c7cb891..a4c367c26f7 100644 --- a/docs/en-US/CloudStack_Nicira_NVP_Guide.xml +++ b/docs/en-US/CloudStack_Nicira_NVP_Guide.xml @@ -28,7 +28,7 @@ &PRODUCT; Plugin Guide for the Nicira NVP Plugin Apache CloudStack - 4.0 + 4.0.0-incubating 1 diff --git a/docs/en-US/added-API-commands-4.0.xml b/docs/en-US/added-API-commands-4.0.xml index 5dab9ca3e3d..2d86ba4d6dc 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. -->
- Added API Commands in 4.0 + Added API Commands in 4.0.0-incubating createCounter (Adds metric counter) @@ -161,4 +161,4 @@ as the IP address of the Nexus 1000v dvSwitch.) -
\ No newline at end of file + diff --git a/docs/en-US/castor-with-cs.xml b/docs/en-US/castor-with-cs.xml index 6385452b1ee..5049d33d638 100644 --- a/docs/en-US/castor-with-cs.xml +++ b/docs/en-US/castor-with-cs.xml @@ -34,7 +34,7 @@ To configure CAStor: - Install &PRODUCT; 4.0 by following the instructions given in the INSTALL.txt + Install &PRODUCT; 4.0.0-incubating by following the instructions given in the INSTALL.txt file. You can use the S3 storage system in &PRODUCT; without setting up and installing the diff --git a/docs/en-US/changed-apicommands-4.0.xml b/docs/en-US/changed-apicommands-4.0.xml index f851bf71b46..042d5e2611e 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. -->
- Changed API Commands in 4.0 + Changed API Commands in 4.0.0-incubating diff --git a/docs/en-US/cloudstack.xml b/docs/en-US/cloudstack.xml index d9dca66bc57..c745bc95fe7 100644 --- a/docs/en-US/cloudstack.xml +++ b/docs/en-US/cloudstack.xml @@ -26,7 +26,7 @@ &PRODUCT; Complete Documentation Apache CloudStack - 4.0 + 4.0.0-incubating 1 @@ -76,4 +76,4 @@ - \ No newline at end of file + diff --git a/docs/en-US/configure-package-repository.xml b/docs/en-US/configure-package-repository.xml index 4907ce08e1c..996b9362535 100644 --- a/docs/en-US/configure-package-repository.xml +++ b/docs/en-US/configure-package-repository.xml @@ -40,7 +40,8 @@
DEB package repository 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. - echo "deb http://cloudstack.apt-get.eu/ubuntu $(lsb_release -s -c) 4.0" > /etc/apt/sources.list.d/cloudstack.list + Use your preferred editor and open (or create) /etc/apt/sources.list.d/cloudstack. Add the community provided repository to the file: +deb http://cloudstack.apt-get.eu/ubuntu precise 4.0 We now have to add the public key to the trusted keys. # wget -O - http://cloudstack.apt-get.eu/release.asc|apt-key add - Now update your local apt cache. diff --git a/docs/en-US/create-vpn-customer-gateway.xml b/docs/en-US/create-vpn-customer-gateway.xml index bf56e36e8b9..8bcd488160c 100644 --- a/docs/en-US/create-vpn-customer-gateway.xml +++ b/docs/en-US/create-vpn-customer-gateway.xml @@ -188,4 +188,4 @@ Click OK. -
\ No newline at end of file +
diff --git a/docs/en-US/plugin-niciranvp-features.xml b/docs/en-US/plugin-niciranvp-features.xml index cdcda9e2aa6..b67323d56d2 100644 --- a/docs/en-US/plugin-niciranvp-features.xml +++ b/docs/en-US/plugin-niciranvp-features.xml @@ -22,8 +22,8 @@ -->
Features of the Nicira NVP Plugin - 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. + 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. The plugin has been tested with Nicira NVP versions 2.1.0, 2.2.0 and 2.2.1 - In CloudStack 4.0.x only the XenServer hypervisor is supported for use in combination with Nicira NVP - In CloudStack 4.0.x the UI components for this plugin are not complete, configuration is done by sending commands to the API -
\ No newline at end of file + In CloudStack 4.0.0-incubating only the XenServer hypervisor is supported for use in combination with Nicira NVP + In CloudStack 4.0.0-incubating the UI components for this plugin are not complete, configuration is done by sending commands to the API + diff --git a/docs/en-US/plugin-niciranvp-revisions.xml b/docs/en-US/plugin-niciranvp-revisions.xml index 6e455cafaf7..b8e6935c5d1 100644 --- a/docs/en-US/plugin-niciranvp-revisions.xml +++ b/docs/en-US/plugin-niciranvp-revisions.xml @@ -36,7 +36,7 @@ - Documentation created for 4.0.x version of the NVP Plugin + Documentation created for 4.0.0-incubating version of the NVP Plugin diff --git a/docs/en-US/whats-new.xml b/docs/en-US/whats-new.xml index cdb12c78950..5f13db3a854 100644 --- a/docs/en-US/whats-new.xml +++ b/docs/en-US/whats-new.xml @@ -39,4 +39,4 @@ - \ No newline at end of file +