You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/09/21 01:31:27 UTC
[2/2] Applying additional admin guide changes-
https://reviews.apache.org/r/7119
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/74e4b787/docs/en-US/automatic-snapshot-creation-retention.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/automatic-snapshot-creation-retention.xml b/docs/en-US/automatic-snapshot-creation-retention.xml
index ee4cf73..54fbe68 100644
--- a/docs/en-US/automatic-snapshot-creation-retention.xml
+++ b/docs/en-US/automatic-snapshot-creation-retention.xml
@@ -3,28 +3,34 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
%BOOK_ENTITIES;
]>
-
<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
-
<section id="automatic-snapshot-creation-retention">
- <title>Automatic Snapshot Creation and Retention</title>
- <para>(Supported for the following hypervisors: <emphasis role="bold">XenServer</emphasis>, <emphasis role="bold">VMware vSphere</emphasis>, and <emphasis role="bold">KVM</emphasis>)</para>
- <para>Users can set up a recurring snapshot policy to automatically create multiple snapshots of a disk at regular intervals. Snapshots can be created on an hourly, daily, weekly, or monthly interval. One snapshot policy can be set up per disk volume. For example, a user can set up a daily snapshot at 02:30.</para>
- <para>With each snapshot schedule, users can also specify the number of scheduled snapshots to be retained. Older snapshots that exceed the retention limit are automatically deleted. This user-defined limit must be equal to or lower than the global limit set by the &PRODUCT; administrator. See <xref linkend="globally-configured-limits"/>. The limit applies only to those snapshots that are taken as part of an automatic recurring snapshot policy. Additional manual snapshots can be created and retained.</para>
- </section>
+ <title>Automatic Snapshot Creation and Retention</title>
+ <para>(Supported for the following hypervisors: <emphasis role="bold">XenServer</emphasis>,
+ <emphasis role="bold">VMware vSphere</emphasis>, and <emphasis role="bold"
+ >KVM</emphasis>)</para>
+ <para>Users can set up a recurring snapshot policy to automatically create multiple snapshots of a
+ disk at regular intervals. Snapshots can be created on an hourly, daily, weekly, or monthly
+ interval. One snapshot policy can be set up per disk volume. For example, a user can set up a
+ daily snapshot at 02:30.</para>
+ <para>With each snapshot schedule, users can also specify the number of scheduled snapshots to be
+ retained. Older snapshots that exceed the retention limit are automatically deleted. This
+ user-defined limit must be equal to or lower than the global limit set by the &PRODUCT;
+ administrator. See <xref linkend="globally-configured-limits"/>. The limit applies only to those
+ snapshots that are taken as part of an automatic recurring snapshot policy. Additional manual
+ snapshots can be created and retained.</para>
+</section>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/74e4b787/docs/en-US/configure-guest-traffic-in-advanced-zone.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-guest-traffic-in-advanced-zone.xml b/docs/en-US/configure-guest-traffic-in-advanced-zone.xml
index 95df473..fb66850 100644
--- a/docs/en-US/configure-guest-traffic-in-advanced-zone.xml
+++ b/docs/en-US/configure-guest-traffic-in-advanced-zone.xml
@@ -3,48 +3,77 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
%BOOK_ENTITIES;
]>
-
<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
-
<section id="configure-guest-traffic-in-advanced-zone">
- <title>Configure Guest Traffic in an Advanced Zone</title>
- <para>These steps assume you have already logged in to the &PRODUCT; UI. To configure the base guest network:</para>
- <orderedlist>
- <listitem><para>In the left navigation, choose Infrastructure. On Zones, click View More, then click the zone to which you want to add a network.</para></listitem>
- <listitem><para>Click the Network tab.</para></listitem>
- <listitem><para>Click Add network.</para></listitem>
- <listitem><para>Provide the following information:</para>
- <itemizedlist>
- <listitem><para>Name. The name of the network. This will be user-visible</para></listitem>
- <listitem><para>Description: The description of the network. This will be user-visible</para></listitem>
- <listitem><para>VLAN ID: Enter an administrator-configured VLAN ID so you can create different networks for use by different VM users in the zone</para></listitem>
- <listitem><para>Scope: Choose account-specific or domain-specific if you would like to make the network accessible to only a single account or domain. Choose zone-wide if all accounts with access to the zone should be able to access the network.</para></listitem>
- <listitem><para>Domain/Account: If Scope is account-specific, enter the domain and account name for the account</para></listitem>
- <listitem><para>Network offering: If the administrator has configured multiple network offerings, select the one you want to use for this network</para></listitem>
- <listitem><para>Gateway: The gateway that the guests should use</para></listitem>
- <listitem><para>Netmask: The netmask in use on the subnet the guests will use</para></listitem>
- <listitem><para>Start IP/End IP: Enter the first and last IP addresses that define a range that &PRODUCT; can assign to guests. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR. If multiple NICs are used, they may be in a different subnet.</para></listitem>
- <listitem><para>Network Domain: (Optional) If you want to assign a special domain name to this network, specify the DNS suffix.</para></listitem>
- </itemizedlist>
+ <title>Configure Guest Traffic in an Advanced Zone</title>
+ <para>These steps assume you have already logged in to the &PRODUCT; UI. To configure the base
+ guest network:</para>
+ <orderedlist>
+ <listitem>
+ <para>In the left navigation, choose Infrastructure. On Zones, click View More, then click the
+ zone to which you want to add a network.</para>
+ </listitem>
+ <listitem>
+ <para>Click the Network tab.</para>
+ </listitem>
+ <listitem>
+ <para>Click Add guest network.</para>
+ <para>The Add guest network window is displayed:</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="./images/add-guest-network.png"/>
+ </imageobject>
+ <textobject>
+ <phrase>networksetupzone.png: Depicts network setup in a single zone</phrase>
+ </textobject>
+ </mediaobject>
+ </listitem>
+ <listitem>
+ <para>Provide the following information:</para>
+ <itemizedlist>
+ <listitem>
+ <para><emphasis role="bold">Name</emphasis>. The name of the network. This will be
+ user-visible</para>
</listitem>
- <listitem><para>Click OK.</para></listitem>
- </orderedlist>
-
-
- </section>
+ <listitem>
+ <para><emphasis role="bold">Display Text</emphasis>: The description of the network. This
+ will be user-visible</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Zone</emphasis>: The zone in which you are configuring the
+ guest network.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Network offering</emphasis>: If the administrator has
+ configured multiple network offerings, select the one you want to use for this
+ network</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Guest Gateway</emphasis>: The gateway that the guests should
+ use</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Guest Netmask</emphasis>: The netmask in use on the subnet the
+ guests will use</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>Click OK.</para>
+ </listitem>
+ </orderedlist>
+</section>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/74e4b787/docs/en-US/configure-public-traffic-in-an-advanced-zone.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-public-traffic-in-an-advanced-zone.xml b/docs/en-US/configure-public-traffic-in-an-advanced-zone.xml
index 960a1a3..7a61cd3 100644
--- a/docs/en-US/configure-public-traffic-in-an-advanced-zone.xml
+++ b/docs/en-US/configure-public-traffic-in-an-advanced-zone.xml
@@ -3,7 +3,6 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
%BOOK_ENTITIES;
]>
-
<!-- Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -11,9 +10,7 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
http://www.apache.org/licenses/LICENSE-2.0
-
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,8 +18,8 @@
specific language governing permissions and limitations
under the License.
-->
-
<section id="configure-public-traffic-in-an-advanced-zone">
- <title>Configure Public Traffic in an Advanced Zone</title>
- <para>In a zone that uses advanced networking, you need to configure at least one range of IP addresses for Internet traffic.</para>
-</section>
+ <title>Configure Public Traffic in an Advanced Zone</title>
+ <para>In a zone that uses advanced networking, you need to configure at least one range of IP
+ addresses for Internet traffic.</para>
+</section>
\ No newline at end of file