incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [31/41] Feature Documentation for s2svpn interVlan and Autoscale
Date Wed, 12 Sep 2012 06:43:30 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/site-to-site-vpn.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/site-to-site-vpn.xml b/docs/en-US/site-to-site-vpn.xml
index 034fb42..9fb9eb7 100644
--- a/docs/en-US/site-to-site-vpn.xml
+++ b/docs/en-US/site-to-site-vpn.xml
@@ -5,41 +5,45 @@
 ]>
 
 <!-- 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="site-to-site-vpn">
-    <title>Site-to-Site VPN</title>
-    <para></para>
-    <para>To add a Virtual Private Cloud (VPC):</para>
+    <title>Setting Up a Site-to-Site VPN Connection</title>
+    <para>A Site-to-Site VPN connection helps you establish a secure connection from an enterprise
+        datacenter to the cloud infrastructure. This allows users to access the guest VMs by
+        establishing a VPN connection to the virtual router of the account from a device in the
+        datacenter of the enterprise.  Having this facility eliminates the need to establish VPN
+        connections to individual VMs.</para>
+     <para>The supported endpoints on the remote datacenters are: </para>
+    <itemizedlist>
+        <listitem><para>Cisco ISR with IOS 12.4 or later</para></listitem>
+        <listitem><para>Juniper J-Series routers with JunOS 9.5 or later</para></listitem>
+    </itemizedlist><note><para>In addition to the specific Cisco and Juniper devices listed above, the expectation is that
+            any Cisco or Juniper device running on the supported operating systems are able to
+            establish VPN connections.</para></note>
+    <para> To set up a Site-to-Site VPN connection, perform the following:</para>
     <orderedlist>
-        <listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
-        <listitem><para>In the left navigation, choose Network</para></listitem>
-        <listitem><para>In the Select view, select site-to-site VPN.</para></listitem>
-        <listitem><para>Click Add site-to-site VPN. Provide the following information:</para>
-            <itemizedlist>
-                <listitem><para><emphasis role="bold">IP Address</emphasis>:.</para></listitem>
-                <listitem><para><emphasis role="bold">Gateway</emphasis>: The IP address of the remote gateway.</para></listitem>
-                <listitem><para><emphasis role="bold">CIDR list</emphasis>: The guest CIDR list of the remote subnets. Enter a CIDR or a comma-separated list of CIDRs. </para></listitem>
-                <listitem><para><emphasis role="bold">IPsec Preshared Key</emphasis>: The preshared key of the remote gateway.</para></listitem>
-                <listitem><para><emphasis role="bold">IKE Policy</emphasis>: Internet Key Exchange (IKE) policy for phase 1. Specify it as a combination of the encryption algorithm(aes,3des,des) and hash algorithm(sha1,md5). For example: aes-sha1, 3des-sha1.</para></listitem>
-                <listitem><para><emphasis role="bold">ESP Policy</emphasis>: Encapsulating Security Payload (ESP) policy for phase 2. Specify it as a combination of the encryption algorithm(aes,3des,des) and hash algorithm(sha1,md5). For example: aes-sha1, 3des-sha1.</para></listitem>
-                <listitem><para><emphasis role="bold">Lifetime (seconds)</emphasis>: Lifetime of SA in seconds. Default is 86400 seconds(1day).</para></listitem>
-            </itemizedlist></listitem>
-        <listitem><para>Click OK.</para></listitem>
+        <listitem><para>Create a Virtual Private Cloud (VPC).</para><para>See <xref linkend="configure-vpc"/>.</para></listitem>
+        <listitem><para>Create a VPN Customer Gateway.</para></listitem>
+        <listitem><para>Create a VPN gateway for the VPC that you created.</para></listitem>
+        <listitem><para>Create VPN connection from the VPC VPN gateway to the customer VPN gateway.</para></listitem>
     </orderedlist>
-</section>
+    <xi:include href="create-vpn-customer-gateway.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="create-vpn-gateway-for-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="create-vpn-connection-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="delete-reset-vpn.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/standard-events.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/standard-events.xml b/docs/en-US/standard-events.xml
index b4a4c68..9c10f87 100644
--- a/docs/en-US/standard-events.xml
+++ b/docs/en-US/standard-events.xml
@@ -5,23 +5,22 @@
 ]>
 
 <!-- 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="standard-events">
     <title>Standard Events</title>
     <para>The events log records three types of standard events.</para>
@@ -36,4 +35,6 @@
         </listitem>
         <listitem><para>ERROR. This event is generated when an operation has not been successfully performed</para></listitem>
     </itemizedlist>
-</section>
+ 
+	</section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/static-nat.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/static-nat.xml b/docs/en-US/static-nat.xml
index ef9e2fc..4225d6e 100644
--- a/docs/en-US/static-nat.xml
+++ b/docs/en-US/static-nat.xml
@@ -5,24 +5,24 @@
 ]>
 
 <!-- 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="static-nat">
     <title>Static NAT</title>
-    <para>A static NAT rule maps a public IP address to the private IP address of a VM in order to allow Internet traffic into the VM. The public IP address always remains the same, which is why it is called "static" NAT. This section tells how to enable or disable static NAT for a particular IP address.</para>
+    <para>A static NAT rule maps a public IP address to the private IP address of a VM in order to allow Internet traffic into the VM. The public IP address always remains the same, which is why it is called “static” NAT. This section tells how to enable or disable static NAT for a particular IP address.</para>
+    <xi:include href="enable-disable-static-nat.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/stop-restart-management-server.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/stop-restart-management-server.xml b/docs/en-US/stop-restart-management-server.xml
index 2edc233..5c1bcec 100644
--- a/docs/en-US/stop-restart-management-server.xml
+++ b/docs/en-US/stop-restart-management-server.xml
@@ -5,27 +5,26 @@
 ]>
 
 <!-- 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="stop-restart-management-server">
     <title>Stopping and Restarting the Management Server</title>
     <para>The root administrator will need to stop and restart the Management Server from time to time.</para>
-    <para>For example, after changing a global configuration parameter, a restart is required. If you have multiple Management Server nodes, restart all of them to put the new parameter value into effect consistently throughout the cloud.</para>
+    <para>For example, after changing a global configuration parameter, a restart is required. If you have multiple Management Server nodes, restart all of them to put the new parameter value into effect consistently throughout the cloud..</para>
     <para>To stop the Management Server, issue the following command at the operating system prompt on the Management Server node:</para>
     <programlisting># service cloud-management stop</programlisting>
     <para>To start the Management Server:</para>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/stopping-and-starting-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/stopping-and-starting-vms.xml b/docs/en-US/stopping-and-starting-vms.xml
index 8b294af..1c8bd80 100644
--- a/docs/en-US/stopping-and-starting-vms.xml
+++ b/docs/en-US/stopping-and-starting-vms.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
@@ -23,6 +23,7 @@
 -->
 
 <section id="stopping-and-starting-vms">
-    <title>Stopping and Starting VMs</title>
-    <para>Any user can access their own virtual machines. The administrator can access all VMs running in the cloud.</para>
+	<title>Stopping and Starting VMs</title>
+    <para>Once a VM instance is created, you can stop, restart, or delete it as needed. In the &PRODUCT; UI, click Instances, select the VM, and use the Stop, Start, Reboot, and Destroy links.</para>
 </section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/storage.xml b/docs/en-US/storage.xml
index c4df50f..49ebed9 100644
--- a/docs/en-US/storage.xml
+++ b/docs/en-US/storage.xml
@@ -5,26 +5,29 @@
 ]>
 
 <!-- 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="storage">
-    <title>Deleting VMs</title>
-    <para>&PRODUCT; defines two types of storage: primary and secondary. Primary storage can be accessed by either iSCSI or NFS. Additionally, direct attached storage may be used for primary storage. Secondary storage is always accessed using NFS.</para>
-    <para>There is no ephemeral storage in &PRODUCT;. All volumes on all nodes are persistent</para>    
-</section>
+<chapter id="storage">
+	<title>Working With Storage</title>
+    <xi:include href="storage-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="secondary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="working-with-volumes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="working-with-snapshots.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/suspend-project.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/suspend-project.xml b/docs/en-US/suspend-project.xml
index bfaa12a..93d5066 100644
--- a/docs/en-US/suspend-project.xml
+++ b/docs/en-US/suspend-project.xml
@@ -5,23 +5,22 @@
 ]>
 
 <!-- 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="suspend-project">
     <title>Suspending or Deleting a Project</title>
     <para>When a project is suspended, it retains the resources it owns, but they can no longer be used. No new resources or members can be added to a suspended project.</para>
@@ -32,17 +31,22 @@
       <listitem><para>In the left navigation, click Projects.</para></listitem>
       <listitem><para>In Select View, choose Projects.</para></listitem>
         <listitem><para>Click the name of the project.</para></listitem>
-        <listitem><para>Click one of the buttons:<inlinemediaobject>
+        <listitem><para>Click one of the buttons:</para><para>To delete, use <inlinemediaobject>
             <imageobject>
                 <imagedata fileref="./images/delete-button.png" />
             </imageobject>
-            <textobject><phrase>deletebutton.png: Removes a member</phrase></textobject>
-        </inlinemediaobject></para>
-            <para><inlinemediaobject>
+            <textobject>
+                        <phrase>deletebutton.png: Removes a project</phrase>
+                    </textobject>
+        </inlinemediaobject></para>                       
+            <para>To suspend, use<inlinemediaobject>
                 <imageobject>
                     <imagedata fileref="./images/suspend-icon.png" />
                 </imageobject>
-                <textobject><phrase>deletebutton.png: Removes a member</phrase></textobject>
+                <textobject>
+                        <phrase>deletebutton.png: suspends a project</phrase>
+                    </textobject>
             </inlinemediaobject></para></listitem>
    </orderedlist>
-</section>
+   </section>
+      

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/sys-reliability-and-ha.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/sys-reliability-and-ha.xml b/docs/en-US/sys-reliability-and-ha.xml
index bdb36d0..94385ff 100644
--- a/docs/en-US/sys-reliability-and-ha.xml
+++ b/docs/en-US/sys-reliability-and-ha.xml
@@ -1,31 +1,32 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!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="sys-reliability-and-ha">
+<chapter id="sys-reliability-and-ha">
     <title>System Reliability and High Availability</title>
-    <para><xref linkend="ha-management-server" />vCenter Maintenance Mode</para>
-    <para><xref linkend="ha-enabled-vm" />XenServer and Maintenance Mode</para>
-    <para><xref linkend="ha-for-hosts" />vCenter Maintenance Mode</para>
-    <para><xref linkend="dedicated-ha-hosts" />XenServer and Maintenance Mode</para>
-</section>
+    <xi:include href="ha-management-server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> 
+    <xi:include href="ha-enabled-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> 
+    <xi:include href="ha-for-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="primary-storage-outage-and-data-loss.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />     
+    <xi:include href="secondary-storage-outage-and-data-loss.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> 
+</chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/sysprep-for-windows-server-2003R2.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/sysprep-for-windows-server-2003R2.xml b/docs/en-US/sysprep-for-windows-server-2003R2.xml
index 86e1667..5f8a389 100644
--- a/docs/en-US/sysprep-for-windows-server-2003R2.xml
+++ b/docs/en-US/sysprep-for-windows-server-2003R2.xml
@@ -5,53 +5,53 @@
 ]>
 
 <!-- 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="sysprep-for-windows-server-2003R2">
-    <title>Sysprep for Windows Server 2003 R2</title>
-    <para>Earlier versions of Windows have a different sysprep tool. Follow these steps for Windows Server 2003 R2.</para>
-    <orderedlist>
-        <listitem><para>Extract the content of \support\tools\deploy.cab on the Windows installation CD into a directory called c:\sysprep on the Windows 2003 R2 VM.</para></listitem>
-        <listitem><para>Run c:\sysprep\setupmgr.exe to create the sysprep.inf file.</para>
-            <orderedlist numeration="loweralpha">
-                <listitem><para>Select Create New to create a new Answer File.</para></listitem>
-                <listitem><para>Enter “Sysprep setup” for the Type of Setup.</para></listitem>
-                <listitem><para>Select the appropriate OS version and edition.</para></listitem>
-                <listitem><para>On the License Agreement screen, select “Yes fully automate the installation”.</para></listitem>
-                <listitem><para>Provide your name and organization.</para></listitem>
-                <listitem><para>Leave display settings at default.</para></listitem>
-                <listitem><para>Set the appropriate time zone.</para></listitem>
-                <listitem><para>Provide your product key.</para></listitem>
-                <listitem><para>Select an appropriate license mode for your deployment</para></listitem>
-                <listitem><para>Select “Automatically generate computer name”.</para></listitem>
-                <listitem><para>Type a default administrator password. If you enable the password reset feature, the users will not actually use this password. This password will be reset by the instance manager after the guest boots up.</para></listitem>
-                <listitem><para>Leave Network Components at “Typical Settings”.</para></listitem>
-                <listitem><para>Select the “WORKGROUP” option.</para></listitem>
-                <listitem><para>Leave Telephony options at default.</para></listitem>
-                <listitem><para>Select appropriate Regional Settings.</para></listitem>
-                <listitem><para>Select appropriate language settings.</para></listitem>
-                <listitem><para>Do not install printers.</para></listitem>
-                <listitem><para>Do not specify “Run Once commands”.</para></listitem>
-                <listitem><para>You need not specify an identification string.</para></listitem>
-                <listitem><para>Save the Answer File as c:\sysprep\sysprep.inf.</para></listitem>
-            </orderedlist>
-        </listitem>
-        <listitem><para>Run the following command to sysprep the image:</para><programlisting>c:\sysprep\sysprep.exe -reseal -mini -activated</programlisting>
-            <para>After this step the machine will automatically shut down</para></listitem>
-            </orderedlist>
-</section>
+	<title>System Preparation for Windows Server 2003 R2</title>
+	<para>Earlier versions of Windows have a different sysprep tool. Follow these steps for Windows Server 2003 R2.</para>
+	<orderedlist>
+		<listitem><para>Extract the content of \support\tools\deploy.cab on the Windows installation CD into a directory called c:\sysprep on the Windows 2003 R2 VM.</para></listitem>
+		<listitem><para>Run c:\sysprep\setupmgr.exe to create the sysprep.inf file.</para>
+			<orderedlist numeration="loweralpha">
+				<listitem><para>Select Create New to create a new Answer File.</para></listitem>
+				<listitem><para>Enter “Sysprep setup” for the Type of Setup.</para></listitem>
+				<listitem><para>Select the appropriate OS version and edition.</para></listitem>		
+				<listitem><para>On the License Agreement screen, select “Yes fully automate the installation”.</para></listitem>
+				<listitem><para>Provide your name and organization.</para></listitem>
+				<listitem><para>Leave display settings at default.</para></listitem>
+				<listitem><para>Set the appropriate time zone.</para></listitem>		
+				<listitem><para>Provide your product key.</para></listitem>
+				<listitem><para>Select an appropriate license mode for your deployment</para></listitem>
+				<listitem><para>Select “Automatically generate computer name”.</para></listitem>
+				<listitem><para>Type a default administrator password. If you enable the password reset feature, the users will not actually use this password. This password will be reset by the instance manager after the guest boots up.</para></listitem>
+				<listitem><para>Leave Network Components at “Typical Settings”.</para></listitem>
+				<listitem><para>Select the “WORKGROUP” option.</para></listitem>
+				<listitem><para>Leave Telephony options at default.</para></listitem>
+				<listitem><para>Select appropriate Regional Settings.</para></listitem>
+				<listitem><para>Select appropriate language settings.</para></listitem>
+				<listitem><para>Do not install printers.</para></listitem>
+				<listitem><para>Do not specify “Run Once commands”.</para></listitem>
+				<listitem><para>You need not specify an identification string.</para></listitem>
+				<listitem><para>Save the Answer File as c:\sysprep\sysprep.inf.</para></listitem>
+				
+			</orderedlist>
+		</listitem>
+		<listitem><para>Run the following command to sysprep the image:</para><programlisting>c:\sysprep\sysprep.exe -reseal -mini -activated</programlisting>
+			<para>After this step the machine will automatically shut down</para></listitem>
+			</orderedlist>
+	</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/sysprep-windows-server-2008R2.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/sysprep-windows-server-2008R2.xml b/docs/en-US/sysprep-windows-server-2008R2.xml
index af36d15..49e7477 100644
--- a/docs/en-US/sysprep-windows-server-2008R2.xml
+++ b/docs/en-US/sysprep-windows-server-2008R2.xml
@@ -5,34 +5,35 @@
 ]>
 
 <!-- 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="sysprep-windows-server-2008R2">
-    <title>System Preparation for Windows Server 2008 R2</title>
-    <para>For Windows 2008 R2, you run Windows System Image Manager to create a custom sysprep response XML file. Windows System Image Manager is installed as part of the Windows Automated Installation Kit (AIK). Windows AIK can be downloaded from the Microsoft Download Center at the following location:</para>
-    <para><ulink url="http://www.microsoft.com/en-us/download/details.aspx?id=9085"></ulink>Microsoft Download Center.</para>
-    <para>Use the following steps to run sysprep for Windows 2008 R2:</para><note><para>The steps outlined here are derived from the excellent guide by Charity Shelbourne, originally published at <ulink url="http://blogs.technet.com/askcore/archive/2008/10/31/automating-the-oobe-process-during-windows-server-2008-sysprep-mini-setup.aspx"></ulink>Windows Server 2008 Sysprep Mini-Setup</para></note>
+	<title>System Preparation for Windows Server 2008 R2</title>
+    <para>For Windows 2008 R2, you run Windows System Image Manager to create a custom sysprep response XML file. Windows System Image Manager is installed as part of the Windows Automated Installation Kit (AIK). Windows AIK can be downloaded from <ulink url="http://www.microsoft.com/en-us/download/details.aspx?id=9085">Microsoft Download Center</ulink>.</para>
+    <para>Use the following steps to run sysprep for Windows 2008 R2:</para><note><para>The steps outlined here are derived from the excellent guide by Charity Shelbourne, originally published at <ulink url="http://blogs.technet.com/askcore/archive/2008/10/31/automating-the-oobe-process-during-windows-server-2008-sysprep-mini-setup.aspx">Windows Server 2008 Sysprep Mini-Setup.</ulink></para>
+        </note>
+    <para></para>
     <orderedlist>
         <listitem><para>Download and install the Windows AIK</para><note><para>Windows AIK should not be installed on the Windows 2008 R2 VM you just created. Windows AIK should not be part of the template you create. It is only used to create the sysprep answer file.</para></note></listitem>
         <listitem><para>Copy the install.wim file in the \sources directory of the Windows 2008 R2 installation DVD to the hard disk. This is a very large file and may take a long time to copy. Windows AIK requires the WIM file to be writable.</para></listitem>
         <listitem><para>Start the Windows System Image Manager, which is part of the Windows AIK.</para></listitem>
-        <listitem><para>In the Windows Image pane, right click “Select a Windows image or catalog file” to load the install.wim file you just copied.</para></listitem>
-        <listitem><para>Select the Windows 2008 R2 Edition</para><para>You may be prompted with a warning that the catalog file cannot be opened. Click Yes to create a new catalog file.</para></listitem>
+        <listitem><para>In the Windows Image pane, right click the Select a Windows image or catalog file option to
+                load the install.wim file you just copied.</para></listitem>
+        <listitem><para>Select the Windows 2008 R2 Edition.</para><para>You may be prompted with a warning that the catalog file cannot be opened. Click Yes to create a new catalog file.</para></listitem>
         <listitem><para>In the Answer File pane, right click to create a new answer file.</para></listitem>
         <listitem><para>Generate the answer file from the Windows System Image Manager using the following steps:</para>
             <orderedlist numeration="loweralpha">
@@ -63,5 +64,8 @@
             <programlisting>cd c:\Windows\System32\sysprep
 sysprep.exe /oobe /generalize /shutdown
 </programlisting><para>The Windows 2008 R2 VM will automatically shut down after sysprep is complete.</para></listitem>
+         
+     
     </orderedlist>
+  
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/system-reserved-ip-addresses.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/system-reserved-ip-addresses.xml b/docs/en-US/system-reserved-ip-addresses.xml
index 2f49225..7f49817 100644
--- a/docs/en-US/system-reserved-ip-addresses.xml
+++ b/docs/en-US/system-reserved-ip-addresses.xml
@@ -5,23 +5,22 @@
 ]>
 
 <!-- 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="system-reserved-ip-addresses">
     <title>System Reserved IP Addresses</title>
     <para>In each zone, you need to configure a range of reserved IP addresses for the management network. This network carries communication between the &PRODUCT; Management Server and various system VMs, such as Secondary Storage VMs, Console Proxy VMs, and DHCP. </para>
@@ -35,5 +34,8 @@
     <para>For vSphere with advanced networking, we recommend provisioning enough private IPs for your total number of customers, plus enough for the required &PRODUCT; System VMs. Typically, about 10 additional IPs are required for the System VMs. For more information about System VMs, see Working with System Virtual Machines in the Administrator's Guide.</para>
     <para>When advanced networking is being used, the number of private IP addresses available in each pod varies depending on which hypervisor is running on the nodes in that pod. Citrix XenServer and KVM use link-local addresses, which in theory provide more than 65,000 private IP addresses within the address block. As the pod grows over time, this should be more than enough for any reasonable number of hosts as well as IP addresses for guest virtual routers. VMWare ESXi, by contrast uses any administrator-specified subnetting scheme, and the typical administrator provides only 255 IPs per pod. Since these are shared by physical machines, the guest virtual router, and other entities, it is possible to run out of private IPs when scaling up a pod whose nodes are running ESXi.</para>
     <para>To ensure adequate headroom to scale private IP space in an ESXi pod that uses advanced networking, use one or more of the following techniques:</para>
-    <para>TODO</para>
+    <itemizedlist>
+        <listitem><para>Specify a larger CIDR block for the subnet. A subnet mask with a /20 suffix will provide more than 4,000 IP addresses.</para></listitem>
+        <listitem><para>Create multiple pods, each with its own subnet. For example, if you create 10 pods and each pod has 255 IPs, this will provide 2,550 IP addresses.</para></listitem>
+    </itemizedlist>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/system-service-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/system-service-offerings.xml b/docs/en-US/system-service-offerings.xml
index 75aa128..1e4f8f9 100644
--- a/docs/en-US/system-service-offerings.xml
+++ b/docs/en-US/system-service-offerings.xml
@@ -5,25 +5,27 @@
 ]>
 
 <!-- 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="system-service-offerings">
     <title>System Service Offerings</title>
     <para>System service offerings provide a choice of CPU speed, number of CPUs, tags, and RAM size, just as other service offerings do. But rather than being used for virtual machine instances and exposed to users, system service offerings are used to change the default properties of virtual routers, console proxies, and other system VMs. System service offerings are visible only to the &PRODUCT; root administrator. &PRODUCT; provides default system service offerings. The &PRODUCT; root administrator can create additional custom system service offerings.</para>
     <para>When &PRODUCT; creates a virtual router for a guest network, it uses default settings which are defined in the system service offering associated with the network offering. You can upgrade the capabilities of the virtual router by applying a new network offering that contains a different system service offering. All virtual routers in that network will begin using the settings from the new service offering.</para>
-  </section>
+    <xi:include href="creating-system-service-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="change-ssvm-service-offering.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/time-zones.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/time-zones.xml b/docs/en-US/time-zones.xml
index d6d4bc7..c187ad3 100644
--- a/docs/en-US/time-zones.xml
+++ b/docs/en-US/time-zones.xml
@@ -1,137 +1,138 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!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="time-zones">
-    <title>Time Zones</title>
-        <para>The following time zone identifiers are accepted by the &PRODUCT; API. There are several places that have a time zone as a required or optional parameter. These include scheduling recurring snapshots, creating a user, and specifying the usage time zone in the Configuration table. .</para>
-    <informaltable frame="all">
-        <tgroup cols="3" align="left" colsep="1" rowsep="1">
-            <colspec colname="c1" />
-                <colspec colname="c2" />
-            <colspec colname="c3" />
-            <tbody>
-                <row>
-                    <entry><para>Etc/GMT+12</para></entry>
-                    <entry><para>Etc/GMT+11</para></entry>
-                    <entry><para>Pacific/Samoa</para></entry>
-                </row>
-                <row>
-                    <entry><para>Pacific/Honolulu</para></entry>
-                    <entry><para>US/Alaska</para></entry>
-                    <entry><para>America/Los_Angeles</para></entry>
-                </row>
-                <row>
-                    <entry><para>Mexico/BajaNorte</para></entry>
-                    <entry><para>US/Arizona</para></entry>
-                    <entry><para>US/Mountain</para></entry>
-                </row>
-                <row>
-                    <entry><para>America/Chihuahua</para></entry>
-                    <entry><para>America/Chicago</para></entry>
-                    <entry><para>America/Costa_Rica</para></entry>
-                </row>
-                <row>
-                    <entry><para>America/Mexico_City</para></entry>
-                    <entry><para>Canada/Saskatchewan</para></entry>
-                    <entry><para>America/Bogota</para></entry>
-                </row>
-                <row>
-                    <entry><para>America/New_York</para></entry>
-                    <entry><para>America/Caracas</para></entry>
-                    <entry><para>America/Asuncion</para></entry>
-                </row>
-                <row>
-                    <entry><para>America/Cuiaba</para></entry>
-                    <entry><para>America/Halifax</para></entry>
-                    <entry><para>America/La_Paz</para></entry>
-                </row>
-                <row>
-                    <entry><para>America/Santiago</para></entry>
-                    <entry><para>America/St_Johns</para></entry>
-                    <entry><para>America/Araguaina</para></entry>
-                </row>
-                <row>
-                    <entry><para>America/Argentina/Buenos_Aires</para></entry>
-                    <entry><para>America/Cayenne</para></entry>
-                    <entry><para>America/Godthab</para></entry>
-                </row>
-                <row>
-                    <entry><para>America/Montevideo</para></entry>
-                    <entry><para>Etc/GMT+2</para></entry>
-                    <entry><para>Atlantic/Azores</para></entry>
-                </row>
-                <row>
-                    <entry><para>Atlantic/Cape_Verde</para></entry>
-                    <entry><para>Africa/Casablanca</para></entry>
-                    <entry><para>Etc/UTC</para></entry>
-                </row>
-                <row>
-                    <entry><para>Atlantic/Reykjavik</para></entry>
-                    <entry><para>Europe/London</para></entry>
-                    <entry><para>CET</para></entry>
-                </row>
-                <row>
-                    <entry><para>Europe/Bucharest</para></entry>
-                    <entry><para>Africa/Johannesburg</para></entry>
-                    <entry><para>Asia/Beirut</para></entry>
-                </row>
-                <row>
-                    <entry><para>Africa/Cairo</para></entry>
-                    <entry><para>Asia/Jerusalem</para></entry>
-                    <entry><para>Europe/Minsk</para></entry>
-                </row>
-                <row>
-                    <entry><para>Europe/Moscow</para></entry>
-                    <entry><para>Africa/Nairobi</para></entry>
-                    <entry><para>Asia/Karachi</para></entry>
-                </row>
-                <row>
-                    <entry><para>Asia/Kolkata</para></entry>
-                    <entry><para>Asia/Bangkok</para></entry>
-                    <entry><para>Asia/Shanghai</para></entry>
-                </row>
-                <row>
-                    <entry><para>Asia/Kuala_Lumpur</para></entry>
-                    <entry><para>Australia/Perth</para></entry>
-                    <entry><para>Asia/Taipei</para></entry>
-                </row>
-                <row>
-                    <entry><para>Asia/Tokyo</para></entry>
-                    <entry><para>Asia/Seoul</para></entry>
-                    <entry><para>Australia/Adelaide</para></entry>
-                </row>
-                <row>
-                    <entry><para>Australia/Darwin</para></entry>
-                    <entry><para>Australia/Brisbane</para></entry>
-                    <entry><para>Australia/Canberra</para></entry>
-                </row>
-                <row>
-                    <entry><para>Pacific/Guam</para></entry>
-                    <entry><para>Pacific/Auckland</para></entry>
-                    <entry><para></para></entry>
-                </row>
-            </tbody>
-        </tgroup>
-    </informaltable>    
-</section>
+<appendix id="time-zones">
+		<title>Time Zones</title>
+			<para>The following time zone identifiers are accepted by &PRODUCT;. There are several places that have a time zone as a required or optional parameter. These include scheduling recurring snapshots, creating a user, and specifying the usage time zone in the Configuration table. .</para>
+		<informaltable frame="all">
+			<tgroup cols="3" align="left" colsep="1" rowsep="1">
+				<colspec colname="c1" />
+					<colspec colname="c2" />
+				<colspec colname="c3" />
+				<tbody>
+					<row>
+						<entry><para>Etc/GMT+12</para></entry>
+						<entry><para>Etc/GMT+11</para></entry>
+						<entry><para>Pacific/Samoa</para></entry>
+					</row>
+					<row>
+						<entry><para>Pacific/Honolulu</para></entry>
+						<entry><para>US/Alaska</para></entry>
+						<entry><para>America/Los_Angeles</para></entry>
+					</row>
+					<row>
+						<entry><para>Mexico/BajaNorte</para></entry>
+						<entry><para>US/Arizona</para></entry>
+						<entry><para>US/Mountain</para></entry>
+					</row>
+					<row>
+						<entry><para>America/Chihuahua</para></entry>
+						<entry><para>America/Chicago</para></entry>
+						<entry><para>America/Costa_Rica</para></entry>
+					</row>
+					<row>
+						<entry><para>America/Mexico_City</para></entry>
+						<entry><para>Canada/Saskatchewan</para></entry>
+						<entry><para>America/Bogota</para></entry>
+					</row>
+					<row>
+						<entry><para>America/New_York</para></entry>
+						<entry><para>America/Caracas</para></entry>
+						<entry><para>America/Asuncion</para></entry>
+					</row>
+					<row>
+						<entry><para>America/Cuiaba</para></entry>
+						<entry><para>America/Halifax</para></entry>
+						<entry><para>America/La_Paz</para></entry>
+					</row>
+					<row>
+						<entry><para>America/Santiago</para></entry>
+						<entry><para>America/St_Johns</para></entry>
+						<entry><para>America/Araguaina</para></entry>
+					</row>
+					<row>
+						<entry><para>America/Argentina/Buenos_Aires</para></entry>
+						<entry><para>America/Cayenne</para></entry>
+						<entry><para>America/Godthab</para></entry>
+					</row>
+					<row>
+						<entry><para>America/Montevideo</para></entry>
+						<entry><para>Etc/GMT+2</para></entry>
+						<entry><para>Atlantic/Azores</para></entry>
+					</row>
+					<row>
+						<entry><para>Atlantic/Cape_Verde</para></entry>
+						<entry><para>Africa/Casablanca</para></entry>
+						<entry><para>Etc/UTC</para></entry>
+					</row>
+					<row>
+						<entry><para>Atlantic/Reykjavik</para></entry>
+						<entry><para>Europe/London</para></entry>
+						<entry><para>CET</para></entry>
+					</row>
+					<row>
+						<entry><para>Europe/Bucharest</para></entry>
+						<entry><para>Africa/Johannesburg</para></entry>
+						<entry><para>Asia/Beirut</para></entry>
+					</row>
+					<row>
+						<entry><para>Africa/Cairo</para></entry>
+						<entry><para>Asia/Jerusalem</para></entry>
+						<entry><para>Europe/Minsk</para></entry>
+					</row>
+					<row>
+						<entry><para>Europe/Moscow</para></entry>
+						<entry><para>Africa/Nairobi</para></entry>
+						<entry><para>Asia/Karachi</para></entry>
+					</row>
+					<row>
+						<entry><para>Asia/Kolkata</para></entry>
+						<entry><para>Asia/Bangkok</para></entry>
+						<entry><para>Asia/Shanghai</para></entry>
+					</row>
+					<row>
+						<entry><para>Asia/Kuala_Lumpur</para></entry>
+						<entry><para>Australia/Perth</para></entry>
+						<entry><para>Asia/Taipei</para></entry>
+					</row>
+					<row>
+						<entry><para>Asia/Tokyo</para></entry>
+						<entry><para>Asia/Seoul</para></entry>
+						<entry><para>Australia/Adelaide</para></entry>
+					</row>
+					<row>
+						<entry><para>Australia/Darwin</para></entry>
+						<entry><para>Australia/Brisbane</para></entry>
+						<entry><para>Australia/Canberra</para></entry>
+					</row>
+					<row>
+						<entry><para>Pacific/Guam</para></entry>
+						<entry><para>Pacific/Auckland</para></entry>
+						<entry><para></para></entry>
+					</row>
+				</tbody>
+			</tgroup>
+		</informaltable>	
+	</appendix>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/troubleshooting.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/troubleshooting.xml b/docs/en-US/troubleshooting.xml
index f3dc7d3..1fe0347 100644
--- a/docs/en-US/troubleshooting.xml
+++ b/docs/en-US/troubleshooting.xml
@@ -5,30 +5,30 @@
 ]>
 
 <!-- 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="troubleshooting">
-    <para><xref linkend="troubleshooting-alerts" />Alert Type Numbers</para>
-    <para><xref linkend="troubleshooting-dataloss-on-exported-primary-storage" />Data Loss on Exported Primary Storage</para>
-    <para><xref linkend="troubleshooting-lb-rules-fails" />Load balancer rules fail after changing network offering</para>
-    <para><xref linkend="troubleshooting-maintenance-mode-not-working-on-vCenter" />Maintenance mode not working on vCenter</para>
-    <para><xref linkend="troubleshooting-recover-lost-virtual-router" />Recovering a Lost Virtual Router</para>
-    <para><xref linkend="troubleshooting-unable-to-deploy-vms" />Unable to deploy VMs from uploaded vSphere template</para>
-    <para><xref linkend="troubleshooting-unable-to-power-on-vm" />Unable to power on virtual machine on VMware</para>
-    <para><xref linkend="troubleshooting-working-with-server-logs" />Working with Server Logs</para>
-</section>
+<chapter id="troubleshooting">
+    <title>Troubleshooting</title>
+    <xi:include href="events.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="troubleshooting-working-with-server-logs.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="troubleshooting-dataloss-on-exported-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="troubleshooting-recover-lost-virtual-router.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="troubleshooting-maintenance-mode-not-working-on-vCenter.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="troubleshooting-unable-to-deploy-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="troubleshooting-unable-to-power-on-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="troubleshooting-lb-rules-fails.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/tuning.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/tuning.xml b/docs/en-US/tuning.xml
index bcaaaa1..4f9dd01 100644
--- a/docs/en-US/tuning.xml
+++ b/docs/en-US/tuning.xml
@@ -1,28 +1,28 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!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="tuning">
+<chapter id="tuning">
     <title>Tuning</title>
     <para>This section provides tips on how to improve the performance of your cloud.</para>
     <xi:include href="performance-monitoring.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
@@ -30,4 +30,4 @@
     <xi:include href="set-database-buffer-pool-size.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="set-monitor-total-vm-limits-per-host.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="configure-xenserver-dom0-memory.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>
+</chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/ui.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/ui.xml b/docs/en-US/ui.xml
index 4f7f327..94ea4ea 100644
--- a/docs/en-US/ui.xml
+++ b/docs/en-US/ui.xml
@@ -5,24 +5,25 @@
 ]>
 
 <!-- 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.
 -->
 
 <chapter id="ui">
-    <title>User Interface</title>
-    <xi:include href="log-in.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<title>User Interface</title>
+	<xi:include href="log-in.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="using-sshkeys.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/upload-template.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/upload-template.xml b/docs/en-US/upload-template.xml
index 51aeb5a..9f0ae01 100644
--- a/docs/en-US/upload-template.xml
+++ b/docs/en-US/upload-template.xml
@@ -5,49 +5,63 @@
 ]>
 
 <!-- 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="upload-template">
-    <title>Uploading Templates</title>
-    <note><para>If you are uploading a template that was created using vSphere Client, be sure the OVA file does not contain an ISO. If it does, the deployment of VMs from the template will fail.</para></note>
-    <para>Templates are uploaded based on a URL. HTTP is the supported access protocol. Templates are frequently large files. You can optionally gzip them to decrease upload times.</para>
-    <para>To upload a template:</para>
-    <orderedlist>
-        <listitem><para>In the left navigation bar, click Templates.</para></listitem>
-        <listitem><para>Click Create Template.</para></listitem>
-        <listitem><para>Provide the following:</para>
-        <itemizedlist>
-            <listitem><para><emphasis role="bold">Name and Display Text</emphasis>. These will be shown in the UI, so choose something descriptive.</para></listitem>
-            <listitem><para>URL. The Management Server will download the file from the specified URL, such as http://my.web.server/filename.vhd.gz.</para></listitem>
-            <listitem><para>Zone. Choose the zone where you want the template to be available, or All Zones to make it available throughout &PRODUCT;.</para></listitem>
-            <listitem><para>OS Type: This helps &PRODUCT; and the hypervisor perform certain operations and make assumptions that improve the performance of the guest. Select one of the following:</para>
-        <itemizedlist>
-            <listitem><para>If the operating system of the stopped VM is listed, choose it.</para></listitem>
-            <listitem><para>If the OS type of the stopped VM is not listed, choose Other.</para>
-            <note><para>Generally you should not choose an older version of the OS than the version in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will in general not work. In those cases you should choose Other.</para></note></listitem>
-        </itemizedlist>
-        </listitem>
-        <listitem><para><emphasis role="bold">Hypervisor</emphasis></para></listitem>
-        <listitem><para><emphasis role="bold">Format</emphasis>. The format of the template upload file, such as VHD or OVA.</para></listitem>
-        <listitem><para><emphasis role="bold">Password Enabled</emphasis>. Choose Yes if your template has the &PRODUCT; password change script installed. See Adding Password Management to Your Templates</para></listitem>
-        <listitem><para><emphasis role="bold">Extractable</emphasis>. Choose Yes if the template is available for extraction. If this option is selected, end users can download a full image of a template.</para></listitem>
-        <listitem><para><emphasis role="bold">Public</emphasis>. Choose Yes to make this template accessible to all users of this &PRODUCT; installation. The template will appear in the Community Templates list. See <xref linkend="private-public-template"/></para></listitem>
-        <listitem><para><emphasis role="bold">Featured</emphasis>. Choose Yes if you would like this template to be more prominent for users to select. The template will appear in the Featured Templates list. Only an administrator can make a template Featured.</para></listitem>
-        </itemizedlist></listitem>
-    </orderedlist>
+	<title>Uploading Templates</title>
+	<note><para>If you are uploading a template that was created using vSphere Client, be sure the OVA file does not contain an ISO. If it does, the deployment of VMs from the template will fail.</para></note>
+	<para>Templates are uploaded based on a URL. HTTP is the supported access protocol. Templates are frequently large files. You can optionally gzip them to decrease upload times.</para>
+	<para>To upload a template:</para>
+	<orderedlist>
+		<listitem><para>In the left navigation bar, click Templates.</para></listitem>
+		<listitem><para>Click Register Template.</para></listitem>
+		<listitem><para>Provide the following:</para>
+		<itemizedlist>
+			<listitem><para><emphasis role="bold">Name and Description</emphasis>. These will be shown in the UI, so
+						choose something descriptive.</para></listitem>
+			<listitem><para><emphasis role="bold">URL</emphasis>. The Management Server will download the file from the
+						specified URL, such as http://my.web.server/filename.vhd.gz.</para></listitem>
+			<listitem><para><emphasis role="bold">Zone</emphasis>. Choose the zone where you want the template to be
+						available, or All Zones to make it available throughout
+						&PRODUCT;.</para></listitem>
+			<listitem><para><emphasis role="bold">OS Type</emphasis>: This helps &PRODUCT; and the hypervisor perform
+						certain operations and make assumptions that improve the performance of the
+						guest. Select one of the following:</para>
+				<itemizedlist>
+					<listitem><para>If the operating system of the stopped VM is listed, choose it.</para></listitem>
+					<listitem><para>If the OS type of the stopped VM is not listed, choose Other.</para>
+					<note><para>Generally you should not choose an older version of the OS than the version in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will in general not work. In those cases you should choose Other.</para></note></listitem>
+				</itemizedlist>			
+			</listitem>	
+			<listitem><para><emphasis role="bold">Hypervisor</emphasis>: The supported hypervisors are listed. Select the desired one.</para></listitem>
+			<listitem><para><emphasis role="bold">Format</emphasis>. The format of the template upload file, such as VHD
+						or OVA.</para></listitem>
+			<listitem><para><emphasis role="bold">Password Enabled</emphasis>. Choose Yes if your template has the
+						&PRODUCT; password change script installed. See Adding Password
+						Management to Your Templates</para></listitem>
+			<listitem><para><emphasis role="bold">Extractable</emphasis>. Choose Yes if the template is available for extraction. If this option is selected, end users can 
+				 download a full image of a template.</para></listitem>
+			<listitem><para><emphasis role="bold">Public</emphasis>. Choose Yes to make this template accessible to all
+						users of this &PRODUCT; installation. The template will appear in the
+						Community Templates list. See <xref linkend="private-public-template"/>.</para></listitem>
+			<listitem><para><emphasis role="bold">Featured</emphasis>. Choose Yes if you would like this template to be
+						more prominent for users to select. The template will appear in the Featured
+						Templates list. Only an administrator can make a template Featured.</para></listitem>
+			</itemizedlist></listitem>
+		
+	</orderedlist>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/user-services-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/user-services-overview.xml b/docs/en-US/user-services-overview.xml
index f9e38c0..9576121 100644
--- a/docs/en-US/user-services-overview.xml
+++ b/docs/en-US/user-services-overview.xml
@@ -5,94 +5,35 @@
 ]>
 
 <!-- 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="user-services-overview">
-    <title>User Services Overview</title>
-        <para>In addition to the physical and logical infrastructure of your cloud, and the &PRODUCT; software and servers, you also need a layer of user services so that people can actually make use of the cloud. This means not just a user UI, but a set of options and resources that users can choose from, such as templates for creating virtual machines, disk storage, and more. If you are running a commercial service, you will be keeping track of what services and resources users are consuming and charging them for that usage. Even if you do not charge anything for people to use your cloud – say, if the users are strictly internal to your organization, or just friends who are sharing your cloud – you can still keep track of what services they use and how much of them.</para>
-    <section id="offerings-and-templates">
-        <title>Service Offerings, Disk Offerings, Network Offerings, and Templates</title>
-        <para>A user creating a new instance can make a variety of choices about its characteristics and capabilities. &PRODUCT; provides several ways to present users with choices when creating a new instance:</para>
-        <itemizedlist>
-            <listitem><para>Service Offerings, defined by the &PRODUCT; administrator, provide a choice of CPU speed, number of CPUs, RAM size, tags on the root disk, and other choices. See Creating a New Compute Offering.</para></listitem>
-            <listitem><para>Disk Offerings, defined by the &PRODUCT; administrator, provide a choice of disk size for primary data storage. See Creating a New Disk Offering.</para></listitem>
-            <listitem><para>Network Offerings, defined by the &PRODUCT; administrator, describe the feature set that is available to end users from the virtual router or external networking devices on a given guest network. See Network Offerings.</para></listitem>
-            <listitem><para>Templates, defined by the &PRODUCT; administrator or by any &PRODUCT; user, are the base OS images that the user can choose from when creating a new instance. For example, &PRODUCT; includes CentOS as a template. See Working with Templates.</para></listitem>
-        </itemizedlist>
-        <para>In addition to these choices that are provided for users, there is another type of service offering which is available only to the &PRODUCT; root administrator, and is used for configuring virtual infrastructure resources. For more information, see Upgrading a Virtual Router with System Service Offerings.</para>
-    </section>
-    <section id="accounts-users-domains">
-        <title>Accounts, Users, and Domains</title>
-        <para>An account typically represents a customer of the service provider or a department in a large organization. Multiple users can exist in an account. Users are like aliases in the account. Users in the same account are not isolated from each other, but they are isolated from users in other accounts. Most installations need not surface the notion of users; they just have one user per account.</para>
-        <para>Accounts are grouped by domains. Domains usually contain accounts that have some logical relationship to each other and a set of delegated administrators with some authority over the domain and its subdomains. For example, a service provider with several resellers could create a domain for each reseller.</para>
-        <para>Administrators are accounts with special privileges in the system. There may be multiple administrators in the system. Administrators can create or delete other administrators, and change the password for any user in the system. Root administrators have complete access to the system, including managing templates, service offerings, customer care administrators, and domains. Domain administrators can perform administrative operations for users who belong to that domain. Domain administrators do not have visibility into physical servers or other domains.</para>
-    </section>
-    <section id="using-ldap-server">
-        <title>Using an LDAP Server for User Authentication</title>
-        <para>You can use an external LDAP server such as Microsoft Active Directory or ApacheDS to authenticate &PRODUCT; end-users. Just map &PRODUCT; accounts to the corresponding LDAP accounts using a query filter. The query filter is written using the query syntax of the particular LDAP server, and can include special wildcard characters provided by &PRODUCT; for matching common values such as the user’s email address and name. &PRODUCT; will search the external LDAP directory tree starting at a specified base directory and return the distinguished name (DN) and password of the matching user. This information along with the given password is used to authenticate the user.</para>
-        <para>To set up LDAP authentication in &PRODUCT;, call the &PRODUCT; API command ldapConfig and provide the following:</para>
-        <itemizedlist>
-            <listitem><para>Hostname or IP address and listening port of the LDAP server</para></listitem>
-            <listitem><para>Base directory and query filter</para></listitem>
-            <listitem><para>Search user DN credentials, which give &PRODUCT; permission to search on the LDAP server</para></listitem>
-            <listitem><para>SSL keystore and password, if SSL is used</para></listitem>
-        </itemizedlist>
-        <section id="example-ldap-commands">
-            <title>Example LDAP Configuration Commands</title>
-            <para>To understand the examples in this section, you need to know the basic concepts behind calling the &PRODUCT; API, which are explained in the Developer’s Guide.</para>
-            <para>The following shows an example invocation of ldapConfig with an ApacheDS LDAP server.</para>
-            <programlisting>http://127.0.0.1:8080/client/api?command=ldapConfig&amp;hostname=127.0.0.1&amp;searchbase=ou%3Dtesting%2Co%3Dproject&amp;queryfilter=%28%26%28uid%3D%25u%29%29&amp;binddn=cn%3DJohn+Singh%2Cou%3Dtesting%2Co%project&amp;bindpass=secret&amp;port=10389&amp;ssl=true&amp;truststore=C%3A%2Fcompany%2Finfo%2Ftrusted.ks&amp;truststorepass=secret&amp;response=json&amp;apiKey=YourAPIKey&amp;signature=YourSignatureHash
-            </programlisting>
-            <para>The command must be URL-encoded. Here is the same example without the URL encoding:</para>
-            <programlisting>
-http://127.0.0.1:8080/client/api?command=ldapConfig
-&amp;hostname=127.0.0.1
-&amp;searchbase=ou=testing,o=project
-&amp;queryfilter=(&amp;(%uid=%u))
-&amp;binddn=cn=John+Singh,ou=testing,o=project
-&amp;bindpass=secret
-&amp;port=10389
-&amp;ssl=true
-&amp;truststore=C:/company/info/trusted.ks
-&amp;truststorepass=secret
-&amp;response=json
-&amp;apiKey=YourAPIKey
-&amp;signature=YourSignatureHash
-            </programlisting>
-            <para>The following shows a similar command for Active Directory. Here, the search base is the testing group within a company, and the users are matched up based on email address.</para>
-            <programlisting>http://10.147.29.101:8080/client/api?command=ldapConfig&amp;hostname=10.147.28.250&amp;searchbase=OU%3Dtesting%2CDC%3Dcompany&amp;queryfilter=%28%26%28mail%3D%25e%29%29&amp;binddn=CN%3DAdministrator%2COU%3Dtesting%2CDC%3Dcompany&amp;bindpass=1111_aaaa&amp;port=389&amp;response=json&amp;apiKey=YourAPIKey&amp;signature=YourSignatureHash</programlisting>
-            <para>The next few sections explain some of the concepts you will need to know when filling out the ldapConfig parameters.</para>
-        </section>
-        <section id="search-base">
-            <title>Search Base</title>
-            <para>Coming soon: TODO</para>
-        </section>
-        <section id="query-filter">
-            <title>Query Filter</title>
-            <para>Coming soon: TODO</para>
-        </section>
-        <section id="search-user-bind-dn">
-            <title>Search User Bind DN</title>
-            <para>Coming soon: TODO</para>
-        </section>
-        <section id="ssl-keystore-path-and-password">
-            <title>SSL Keystore Path and Password</title>
-            <para>Coming soon: TODO</para>
-        </section>
-    </section>
-</section>
+<chapter id="user-services-overview">
+		<title>User Services Overview</title>
+	<para>In addition to the physical and logical infrastructure of your cloud, and the &PRODUCT; software and servers, you also need a layer of user services so that people can actually make use of the cloud. This means not just a user UI, but a set of options and resources that users can choose from, such as templates for creating virtual machines, disk storage, and more. If you are running a commercial service, you will be keeping track of what services and resources users are consuming and charging them for that usage. Even if you do not charge anything for people to use your cloud – say, if the users are strictly internal to your organization, or just friends who are sharing your cloud – you can still keep track of what services they use and how much of them.</para>
+	<section id="offerings-and-templates">
+		<title>Service Offerings, Disk Offerings, Network Offerings, and Templates</title>
+		<para>A user creating a new instance can make a variety of choices about its characteristics and capabilities. &PRODUCT; provides several ways to present users with choices when creating a new instance:</para>
+		<itemizedlist>
+			<listitem><para>Service Offerings, defined by the &PRODUCT; administrator, provide a choice of CPU speed, number of CPUs, RAM size, tags on the root disk, and other choices. See Creating a New Compute Offering.</para></listitem>
+			<listitem><para>Disk Offerings, defined by the &PRODUCT; administrator, provide a choice of disk size for primary data storage. See Creating a New Disk Offering.</para></listitem>
+			<listitem><para>Network Offerings, defined by the &PRODUCT; administrator, describe the feature set that is available to end users from the virtual router or external networking devices on a given guest network. See Network Offerings.</para></listitem>
+			<listitem><para>Templates, defined by the &PRODUCT; administrator or by any &PRODUCT; user, are the base OS images that the user can choose from when creating a new instance. For example, &PRODUCT; includes CentOS as a template. See Working with Templates.</para></listitem>
+		</itemizedlist>
+		<para>In addition to these choices that are provided for users, there is another type of service offering which is available only to the &PRODUCT; root administrator, and is used for configuring virtual infrastructure resources. For more information, see Upgrading a Virtual Router with System Service Offerings.</para>
+	</section>
+</chapter>
\ No newline at end of file


Mime
View raw message