Updated Branches: refs/heads/master 62a71e055 -> 68626f32d
CLOUDSTACK-478 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/68626f32 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/68626f32 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/68626f32 Branch: refs/heads/master Commit: 68626f32df80e7dac464aff26c881995359f8d39 Parents: 62a71e0 Author: Radhika PC <[email protected]> Authored: Tue Jul 30 16:55:48 2013 +0530 Committer: Radhika PC <[email protected]> Committed: Tue Jul 30 17:05:12 2013 +0530 ---------------------------------------------------------------------- docs/en-US/isolated-networks.xml | 25 +++++++++++++++--------- docs/en-US/shared-networks.xml | 36 ++++++++++++++++++++++------------- 2 files changed, 39 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68626f32/docs/en-US/isolated-networks.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/isolated-networks.xml b/docs/en-US/isolated-networks.xml index 671591d..c856044 100644 --- a/docs/en-US/isolated-networks.xml +++ b/docs/en-US/isolated-networks.xml @@ -22,13 +22,20 @@ under the License. --> <section id="isolated-networks"> - <title>Isolated Networks</title> - <para>An isolated network can be accessed only by virtual machines of a single account. Isolated networks have the following properties.</para> - <itemizedlist> - <listitem><para>Resources such as VLAN are allocated and garbage collected dynamically</para></listitem> - <listitem><para>There is one network offering for the entire network</para></listitem> - <listitem><para>The network offering can be upgraded or downgraded but it is for the entire network</para></listitem> - </itemizedlist> - - + <title>Isolated Networks</title> + <para>An isolated network can be accessed only by virtual machines of a single account. Isolated + networks have the following properties.</para> + <itemizedlist> + <listitem> + <para>Resources such as VLAN are allocated and garbage collected dynamically</para> + </listitem> + <listitem> + <para>There is one network offering for the entire network</para> + </listitem> + <listitem> + <para>The network offering can be upgraded or downgraded but it is for the entire + network</para> + </listitem> + </itemizedlist> + <para>For more information, see <xref linkend="configure-guest-traffic-in-advanced-zone"/>.</para> </section> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68626f32/docs/en-US/shared-networks.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/shared-networks.xml b/docs/en-US/shared-networks.xml index 4c32320..65657ce 100644 --- a/docs/en-US/shared-networks.xml +++ b/docs/en-US/shared-networks.xml @@ -22,17 +22,27 @@ under the License. --> <section id="shared-networks"> - <title>Shared Networks</title> - <para>A shared network can be accessed by virtual machines that belong to many different - accounts. Network Isolation on shared networks is accomplished using techniques such as - security groups (supported only in basic zones).</para> - <itemizedlist> - <listitem><para>Shared Networks are created by the administrator</para></listitem> - <listitem><para>Shared Networks can be designated to a certain domain</para></listitem> - <listitem><para>Shared Network resources such as VLAN and physical network that it maps to are designated by the administrator</para></listitem> - <listitem><para>Shared Networks are isolated by security groups</para></listitem> - <listitem><para>Public Network is a shared network that is not shown to the end users</para></listitem> - </itemizedlist> - - + <title>Shared Networks</title> + <para>A shared network can be accessed by virtual machines that belong to many different accounts. + Network Isolation on shared networks is accomplished using techniques such as security groups + (supported only in basic zones).</para> + <itemizedlist> + <listitem> + <para>Shared Networks are created by the administrator</para> + </listitem> + <listitem> + <para>Shared Networks can be designated to a certain domain</para> + </listitem> + <listitem> + <para>Shared Network resources such as VLAN and physical network that it maps to are + designated by the administrator</para> + </listitem> + <listitem> + <para>Shared Networks are isolated by security groups</para> + </listitem> + <listitem> + <para>Public Network is a shared network that is not shown to the end users</para> + </listitem> + </itemizedlist> + <para>For information, see <xref linkend="creating-shared-network"/>.</para> </section>
