cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [39/50] [abbrv] git commit: updated refs/heads/vmsync to f737019
Date Mon, 01 Jul 2013 21:25:23 GMT
build fix


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

Branch: refs/heads/vmsync
Commit: 030403482212801a1a6afeb294678d32bae19416
Parents: 9f12a25
Author: radhikap <radhika.puthiyetath@citrix.com>
Authored: Mon Jul 1 14:06:53 2013 +0530
Committer: radhikap <radhika.puthiyetath@citrix.com>
Committed: Mon Jul 1 14:07:21 2013 +0530

----------------------------------------------------------------------
 docs/en-US/networks.xml    | 1 +
 docs/en-US/portable-ip.xml | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/03040348/docs/en-US/networks.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/networks.xml b/docs/en-US/networks.xml
index d1fc541..e00beac 100644
--- a/docs/en-US/networks.xml
+++ b/docs/en-US/networks.xml
@@ -48,6 +48,7 @@
   <xi:include href="dns-dhcp.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="vpn.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="elastic-ip.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="portable-ip.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="pvlan.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="inter-vlan-routing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="configure-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/03040348/docs/en-US/portable-ip.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/portable-ip.xml b/docs/en-US/portable-ip.xml
index 3c87e54..83d5b43 100644
--- a/docs/en-US/portable-ip.xml
+++ b/docs/en-US/portable-ip.xml
@@ -33,17 +33,16 @@
           <para>IP is statically allocated </para>
         </listitem>
         <listitem>
-          <para>Not required to be associated with a network </para>
+          <para>IP need not be associated with a network </para>
         </listitem>
         <listitem>
-          <para>Can transfer association across the networks </para>
+          <para>Network association is transferable across networks </para>
         </listitem>
         <listitem>
-          <para>Transfer IP across basic/advanced zones </para>
+          <para>IP is transferable across both Basic and Advanced zones </para>
         </listitem>
         <listitem>
-          <para>Transfer across VPC, non-VPC isolated/shared networks
-          </para>
+          <para>IP is transferable across VPC, non-VPC Isolated and Shared networks
</para>
         </listitem>
         <listitem>
           <para/>


Mime
View raw message