incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [44/51] [abbrv] Revert "Feature Documentation for s2svpn interVlan and Autoscale"
Date Fri, 14 Sep 2012 21:16:46 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/event-types.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/event-types.xml b/docs/en-US/event-types.xml
index 56059e1..9a71055 100644
--- a/docs/en-US/event-types.xml
+++ b/docs/en-US/event-types.xml
@@ -5,215 +5,216 @@
 ]>
 
 <!-- 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.
--->	
-<appendix id="event-types">
-		<title>Event Types</title>
-		<informaltable frame="all">
-			<tgroup cols="3" align="left" colsep="1" rowsep="1">
-				<colspec colname="c1" />
-					<colspec colname="c2" />
-				<tbody>
-					<row>
-						<entry><para>VM.CREATE</para></entry>
-						<entry><para>TEMPLATE.EXTRACT</para></entry>
-						<entry><para>SG.REVOKE.INGRESS</para></entry>
-					</row>
-					<row>
-						<entry><para>VM.DESTROY</para></entry>
-						<entry><para>TEMPLATE.UPLOAD</para></entry>
-						<entry><para>HOST.RECONNECT</para></entry>
-					</row>
-					<row>
-						<entry><para>VM.START</para></entry>
-						<entry><para>TEMPLATE.CLEANUP</para></entry>
-						<entry><para>MAINT.CANCEL</para></entry>
-					</row>
-					<row>
-						<entry><para>VM.STOP</para></entry>
-						<entry><para>VOLUME.CREATE</para></entry>
-						<entry><para>MAINT.CANCEL.PS</para></entry>
-					</row>
-					<row>
-						<entry><para>VM.REBOOT</para></entry>
-						<entry><para>VOLUME.DELETE</para></entry>
-						<entry><para>MAINT.PREPARE</para></entry>
-					</row>
-					<row>
-						<entry><para>VM.UPGRADE</para></entry>
-						<entry><para>VOLUME.ATTACH</para></entry>
-						<entry><para>MAINT.PREPARE.PS</para></entry>
-					</row>
-					<row>
-						<entry><para>VM.RESETPASSWORD</para></entry>
-						<entry><para>VOLUME.DETACH</para></entry>
-						<entry><para>VPN.REMOTE.ACCESS.CREATE</para></entry>
-					</row>
-					<row>
-						<entry><para>ROUTER.CREATE</para></entry>
-						<entry><para>VOLUME.UPLOAD</para></entry>
-						<entry><para>VPN.USER.ADD</para></entry>
-					</row>
-					<row>
-						<entry><para>ROUTER.DESTROY</para></entry>
-						<entry><para>SERVICEOFFERING.CREATE</para></entry>
-						<entry><para>VPN.USER.REMOVE</para></entry>
-					</row>
-					<row>
-						<entry><para>ROUTER.START</para></entry>
-						<entry><para>SERVICEOFFERING.UPDATE</para></entry>
-						<entry><para>NETWORK.RESTART</para></entry>
-					</row>
-					<row>
-						<entry><para>ROUTER.STOP</para></entry>
-						<entry><para>SERVICEOFFERING.DELETE</para></entry>
-						<entry><para>UPLOAD.CUSTOM.CERTIFICATE</para></entry>
-					</row>
-					<row>
-						<entry><para>ROUTER.REBOOT</para></entry>
-						<entry><para>DOMAIN.CREATE</para></entry>
-						<entry><para>UPLOAD.CUSTOM.CERTIFICATE</para></entry>
-					</row>
-					<row>
-						<entry><para>ROUTER.HA</para></entry>
-						<entry><para>DOMAIN.DELETE</para></entry>
-						<entry><para>STATICNAT.DISABLE</para></entry>
-					</row>
-					<row>
-						<entry><para>PROXY.CREATE</para></entry>
-						<entry><para>DOMAIN.UPDATE</para></entry>
-						<entry><para>SSVM.CREATE</para></entry>
-					</row>
-					<row>
-						<entry><para>PROXY.DESTROY</para></entry>
-						<entry><para>SNAPSHOT.CREATE</para></entry>
-						<entry><para>SSVM.DESTROY</para></entry>
-					</row>
-					<row>
-						<entry><para>PROXY.START</para></entry>
-						<entry><para>SNAPSHOT.DELETE</para></entry>
-						<entry><para>SSVM.START</para></entry>
-					</row>
-					<row>
-						<entry><para>PROXY.STOP</para></entry>
-						<entry><para>SNAPSHOTPOLICY.CREATE</para></entry>
-						<entry><para>SSVM.STOP</para></entry>
-					</row>
-					<row>
-						<entry><para>PROXY.REBOOT</para></entry>
-						<entry><para>SNAPSHOTPOLICY.UPDATE</para></entry>
-						<entry><para>SSVM.REBOOT</para></entry>
-					</row>
-					<row>
-						<entry><para>PROXY.HA</para></entry>
-						<entry><para>SNAPSHOTPOLICY.DELETE</para></entry>
-						<entry><para>SSVM.H</para></entry>
-					</row>
-					<row>
-						<entry><para>VNC.CONNECT</para></entry>
-						<entry><para>VNC.DISCONNECT</para></entry>
-						<entry><para>NET.IPASSIGN</para></entry>
-					</row>
-					<row>
-						<entry><para>NET.IPRELEASE</para></entry>
-						<entry><para>NET.RULEADD</para></entry>
-						<entry><para>NET.RULEDELETE</para></entry>
-					</row>
-					<row>
-						<entry><para>NET.RULEMODIFY</para></entry>
-						<entry><para>NETWORK.CREATE</para></entry>
-						<entry><para>NETWORK.DELETE</para></entry>
-					</row>
-					<row>
-						<entry><para>LB.ASSIGN.TO.RULE</para></entry>
-						<entry><para>LB.REMOVE.FROM.RULE</para></entry>
-						<entry><para>LB.CREATE</para></entry>
-					</row>
-					<row>
-						<entry><para>LB.DELETE</para></entry>
-						<entry><para>LB.UPDATE</para></entry>
-						<entry><para>USER.LOGIN</para></entry>
-					</row>
-					<row>
-						<entry><para>USER.LOGOUT</para></entry>
-						<entry><para>USER.CREATE</para></entry>
-						<entry><para>USER.DELETE</para></entry>
-					</row>
-					<row>
-						<entry><para>USER.UPDATE</para></entry>
-						<entry><para>USER.DISABLE</para></entry>
-						<entry><para>TEMPLATE.CREATE</para></entry>
-					</row>
-					<row>
-						<entry><para>TEMPLATE.DELETE</para></entry>
-						<entry><para>TEMPLATE.UPDATE</para></entry>
-						<entry><para>TEMPLATE.COPY</para></entry>
-					</row>
-					<row>
-						<entry><para>TEMPLATE.DOWNLOAD.START</para></entry>
-						<entry><para>TEMPLATE.DOWNLOAD.SUCCESS</para></entry>
-						<entry><para>TEMPLATE.DOWNLOAD.FAILED</para></entry>
-					</row>
-					<row>
-						<entry><para>ISO.CREATE</para></entry>
-						<entry><para>ISO.DELETE</para></entry>
-						<entry><para>ISO.COPY</para></entry>
-					</row>
-					<row>
-						<entry><para>ISO.ATTACH</para></entry>
-						<entry><para>ISO.DETACH</para></entry>
-						<entry><para>ISO.EXTRACT</para></entry>
-					</row>
-					<row>
-						<entry><para>ISO.UPLOAD</para></entry>
-						<entry><para>SERVICE.OFFERING.CREATE</para></entry>
-						<entry><para>SERVICE.OFFERING.EDIT</para></entry>
-					</row>
-					<row>
-						<entry><para>SERVICE.OFFERING.DELETE</para></entry>
-						<entry><para>DISK.OFFERING.CREATE</para></entry>
-						<entry><para>DISK.OFFERING.EDIT</para></entry>
-					</row>
-					<row>
-						<entry><para>DISK.OFFERING.DELETE</para></entry>
-						<entry><para>NETWORK.OFFERING.CREATE</para></entry>
-						<entry><para>NETWORK.OFFERING.EDIT</para></entry>
-					</row>
-					<row>
-						<entry><para>NETWORK.OFFERING.DELETE</para></entry>
-						<entry><para>POD.CREATE</para></entry>
-						<entry><para>POD.EDIT</para></entry>
-					</row>
-					<row>
-						<entry><para>POD.DELETE</para></entry>
-						<entry><para>ZONE.CREATE</para></entry>
-						<entry><para>ZONE.EDIT</para></entry>
-					</row>
-					<row>
-						<entry><para>ZONE.DELETE</para></entry>
-						<entry><para>VLAN.IP.RANGE.CREATE</para></entry>
-						<entry><para>VLAN.IP.RANGE.DELETE</para></entry>
-					</row>
-					<row>
-						<entry><para>CONFIGURATION.VALUE.EDIT</para></entry>
-						<entry><para>SG.AUTH.INGRESS</para></entry>
-						<entry><para></para></entry>
-					</row>
-				</tbody>
-				</tgroup>
-		</informaltable>
-	</appendix>
\ No newline at end of file
+ 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="event-types">
+        <title>Event Types</title>
+        <informaltable frame="all">
+            <tgroup cols="3" align="left" colsep="1" rowsep="1">
+                <colspec colname="c1" />
+                    <colspec colname="c2" />
+                <tbody>
+                    <row>
+                        <entry><para>VM.CREATE</para></entry>
+                        <entry><para>TEMPLATE.EXTRACT</para></entry>
+                        <entry><para>SG.REVOKE.INGRESS</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>VM.DESTROY</para></entry>
+                        <entry><para>TEMPLATE.UPLOAD</para></entry>
+                        <entry><para>HOST.RECONNECT</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>VM.START</para></entry>
+                        <entry><para>TEMPLATE.CLEANUP</para></entry>
+                        <entry><para>MAINT.CANCEL</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>VM.STOP</para></entry>
+                        <entry><para>VOLUME.CREATE</para></entry>
+                        <entry><para>MAINT.CANCEL.PS</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>VM.REBOOT</para></entry>
+                        <entry><para>VOLUME.DELETE</para></entry>
+                        <entry><para>MAINT.PREPARE</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>VM.UPGRADE</para></entry>
+                        <entry><para>VOLUME.ATTACH</para></entry>
+                        <entry><para>MAINT.PREPARE.PS</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>VM.RESETPASSWORD</para></entry>
+                        <entry><para>VOLUME.DETACH</para></entry>
+                        <entry><para>VPN.REMOTE.ACCESS.CREATE</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>ROUTER.CREATE</para></entry>
+                        <entry><para>VOLUME.UPLOAD</para></entry>
+                        <entry><para>VPN.USER.ADD</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>ROUTER.DESTROY</para></entry>
+                        <entry><para>SERVICEOFFERING.CREATE</para></entry>
+                        <entry><para>VPN.USER.REMOVE</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>ROUTER.START</para></entry>
+                        <entry><para>SERVICEOFFERING.UPDATE</para></entry>
+                        <entry><para>NETWORK.RESTART</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>ROUTER.STOP</para></entry>
+                        <entry><para>SERVICEOFFERING.DELETE</para></entry>
+                        <entry><para>UPLOAD.CUSTOM.CERTIFICATE</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>ROUTER.REBOOT</para></entry>
+                        <entry><para>DOMAIN.CREATE</para></entry>
+                        <entry><para>UPLOAD.CUSTOM.CERTIFICATE</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>ROUTER.HA</para></entry>
+                        <entry><para>DOMAIN.DELETE</para></entry>
+                        <entry><para>STATICNAT.DISABLE</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>PROXY.CREATE</para></entry>
+                        <entry><para>DOMAIN.UPDATE</para></entry>
+                        <entry><para>SSVM.CREATE</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>PROXY.DESTROY</para></entry>
+                        <entry><para>SNAPSHOT.CREATE</para></entry>
+                        <entry><para>SSVM.DESTROY</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>PROXY.START</para></entry>
+                        <entry><para>SNAPSHOT.DELETE</para></entry>
+                        <entry><para>SSVM.START</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>PROXY.STOP</para></entry>
+                        <entry><para>SNAPSHOTPOLICY.CREATE</para></entry>
+                        <entry><para>SSVM.STOP</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>PROXY.REBOOT</para></entry>
+                        <entry><para>SNAPSHOTPOLICY.UPDATE</para></entry>
+                        <entry><para>SSVM.REBOOT</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>PROXY.HA</para></entry>
+                        <entry><para>SNAPSHOTPOLICY.DELETE</para></entry>
+                        <entry><para>SSVM.H</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>VNC.CONNECT</para></entry>
+                        <entry><para>VNC.DISCONNECT</para></entry>
+                        <entry><para>NET.IPASSIGN</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>NET.IPRELEASE</para></entry>
+                        <entry><para>NET.RULEADD</para></entry>
+                        <entry><para>NET.RULEDELETE</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>NET.RULEMODIFY</para></entry>
+                        <entry><para>NETWORK.CREATE</para></entry>
+                        <entry><para>NETWORK.DELETE</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>LB.ASSIGN.TO.RULE</para></entry>
+                        <entry><para>LB.REMOVE.FROM.RULE</para></entry>
+                        <entry><para>LB.CREATE</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>LB.DELETE</para></entry>
+                        <entry><para>LB.UPDATE</para></entry>
+                        <entry><para>USER.LOGIN</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>USER.LOGOUT</para></entry>
+                        <entry><para>USER.CREATE</para></entry>
+                        <entry><para>USER.DELETE</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>USER.UPDATE</para></entry>
+                        <entry><para>USER.DISABLE</para></entry>
+                        <entry><para>TEMPLATE.CREATE</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>TEMPLATE.DELETE</para></entry>
+                        <entry><para>TEMPLATE.UPDATE</para></entry>
+                        <entry><para>TEMPLATE.COPY</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>TEMPLATE.DOWNLOAD.START</para></entry>
+                        <entry><para>TEMPLATE.DOWNLOAD.SUCCESS</para></entry>
+                        <entry><para>TEMPLATE.DOWNLOAD.FAILED</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>ISO.CREATE</para></entry>
+                        <entry><para>ISO.DELETE</para></entry>
+                        <entry><para>ISO.COPY</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>ISO.ATTACH</para></entry>
+                        <entry><para>ISO.DETACH</para></entry>
+                        <entry><para>ISO.EXTRACT</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>ISO.UPLOAD</para></entry>
+                        <entry><para>SERVICE.OFFERING.CREATE</para></entry>
+                        <entry><para>SERVICE.OFFERING.EDIT</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>SERVICE.OFFERING.DELETE</para></entry>
+                        <entry><para>DISK.OFFERING.CREATE</para></entry>
+                        <entry><para>DISK.OFFERING.EDIT</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>DISK.OFFERING.DELETE</para></entry>
+                        <entry><para>NETWORK.OFFERING.CREATE</para></entry>
+                        <entry><para>NETWORK.OFFERING.EDIT</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>NETWORK.OFFERING.DELETE</para></entry>
+                        <entry><para>POD.CREATE</para></entry>
+                        <entry><para>POD.EDIT</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>POD.DELETE</para></entry>
+                        <entry><para>ZONE.CREATE</para></entry>
+                        <entry><para>ZONE.EDIT</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>ZONE.DELETE</para></entry>
+                        <entry><para>VLAN.IP.RANGE.CREATE</para></entry>
+                        <entry><para>VLAN.IP.RANGE.DELETE</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>CONFIGURATION.VALUE.EDIT</para></entry>
+                        <entry><para>SG.AUTH.INGRESS</para></entry>
+                        <entry><para></para></entry>
+                    </row>
+                </tbody>
+                </tgroup>
+        </informaltable>
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/events-log.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/events-log.xml b/docs/en-US/events-log.xml
index fa97db4..9de679e 100644
--- a/docs/en-US/events-log.xml
+++ b/docs/en-US/events-log.xml
@@ -5,31 +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="events-log">
     <title>Event Logs</title>
-    <para>There are two types of events logged in the &PRODUCT; Event Log. Standard events log
-        the success or failure of an event and can be used to identify jobs or processes that have
-        failed. There are also long running job events. Events for asynchronous jobs log when a job
-        is scheduled, when it starts, and when it completes. Other long running synchronous jobs log
-        when a job starts, and when it completes. Long running synchronous and asynchronous event
-        logs can be used to gain more information on the status of a pending job or can be used to
-        identify a job that is hanging or has not started. The following sections provide more
-        information on these events..</para>
-</section>
-
+    <para>There are two types of events logged in the &PRODUCT; Event Log. Standard events log the success or failure of an event and can be used to identify jobs or processes that have failed. There are also long running job events. Events for asynchronous jobs log when a job is scheduled, when it starts, and when it completes. Other long running synchronous jobs log when a job starts, and when it completes. Long running synchronous and asynchronous event logs can be used to gain more information on the status of a pending job or can be used to identify a job that is hanging or has not started. The following sections provide more information on these events..</para>
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/events.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/events.xml b/docs/en-US/events.xml
index 242ff45..cbefc54 100644
--- a/docs/en-US/events.xml
+++ b/docs/en-US/events.xml
@@ -5,25 +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="events">
-    <title>Events</title>
     <xi:include href="events-log.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="standard-events.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="long-running-job-events.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/external-firewalls-and-load-balancers.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/external-firewalls-and-load-balancers.xml b/docs/en-US/external-firewalls-and-load-balancers.xml
index 64f5ac3..1452804 100644
--- a/docs/en-US/external-firewalls-and-load-balancers.xml
+++ b/docs/en-US/external-firewalls-and-load-balancers.xml
@@ -5,28 +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="external-firewalls-and-load-balancers">
     <title>External Firewalls and Load Balancers</title>
     <para>&PRODUCT; is capable of replacing its Virtual Router with an external Juniper SRX device and an optional external NetScaler or F5 load balancer for gateway and load balancing services.  In this case, the VMs use the SRX as their gateway.</para>
-    <xi:include href="using-netscaler-load-balancers.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="configure-snmp-rhel.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="initial-setup-of-external-firewalls-loadbalancers.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="ongoing-configuration-of-external-firewalls-loadbalancer.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="autoscale.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/feature-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/feature-overview.xml b/docs/en-US/feature-overview.xml
index f0739ca..236d78b 100644
--- a/docs/en-US/feature-overview.xml
+++ b/docs/en-US/feature-overview.xml
@@ -1,67 +1,68 @@
 <?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 bookinfo 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="feature-overview">
-	<title>What Can &PRODUCT; Do?</title>
-	<para>
-		<emphasis role="bold">Multiple Hypervisor Support</emphasis>
-	</para>
-	<para>
-		&PRODUCT; works with a variety of hypervisors. A single cloud deployment can contain multiple hypervisor implementations. You have the complete freedom to choose the right hypervisor for your workload.
-	</para>
-	<para> &PRODUCT; is designed to work with open source Xen and KVM hypervisors as well as
-		enterprise-grade hypervisors such as Citrix XenServer, VMware vSphere, and Oracle VM
-		(OVM).</para>
-	<para>
-		<emphasis role="bold">Massively Scalable Infrastructure Management</emphasis>
-	</para>
-	<para>
-		&PRODUCT; can manage tens of thousands of servers installed in multiple geographically distributed datacenters. The centralized management server scales linearly, eliminating the need for intermediate cluster-level management servers. No single component failure can cause cloud-wide outage. Periodic maintenance of the management server can be performed without affecting the functioning of virtual machines running in the cloud.
-	</para>
-	<para>
-		<emphasis role="bold">Automatic Configuration Management</emphasis>
-	</para>
-	<para>&PRODUCT; automatically configures each guest virtual machine’s networking and storage settings.
-	</para>
-	<para>&PRODUCT; internally manages a pool of virtual appliances to support the cloud itself. These appliances offer services such as firewalling, routing, DHCP, VPN access, console proxy, storage access, and storage replication. The extensive use of virtual appliances simplifies the installation, configuration, and ongoing management of a cloud deployment.
-	</para>
-	<para>
-		<emphasis role="bold">Graphical User Interface</emphasis>
-	</para>
-	<para>&PRODUCT; offers an administrator's Web interface, used for provisioning and managing the cloud, as well as an end-user's Web interface, used for running VMs and managing VM templates. The UI can be customized to reflect the desired service provider or enterprise look and feel.
-	</para>
-	<para>
-		<emphasis role="bold">API and Extensibility</emphasis>
-	</para>
-	<para>
-		&PRODUCT; provides an API that gives programmatic access to all the management features available in the UI. The API is maintained and documented. This API enables the creation of command line tools and new user interfaces to suit particular needs. See the Developer’s Guide and API Reference, both available at http://docs.cloud.com/CloudStack_Documentation.
-	</para>
-	<para>
-		The &PRODUCT; pluggable allocation architecture allows the creation of new types of allocators for the selection of storage and Hosts. See the Allocator Implementation Guide (<ulink url="http://docs.cloudstack.org/CloudStack_Documentation/Allocator_Implementation_Guide">http://docs.cloudstack.org/CloudStack_Documentation/Allocator_Implementation_Guide</ulink>).
-	</para>
-	<para>
-		<emphasis role="bold">High Availability</emphasis>
-	</para>
-	<para>&PRODUCT; has a number of features to increase the availability of the system. The Management Server itself may be deployed in a multi-node installation where the servers are load balanced. MySQL may be configured to use replication to provide for a manual failover in the event of database loss. For the hosts, &PRODUCT; supports NIC bonding and the use of separate networks for storage as well as iSCSI Multipath.
-	</para>
+    <title>What Can &PRODUCT; Do?</title>
+    <para>
+        <emphasis role="bold">Multiple Hypervisor Support</emphasis>
+    </para>
+    <para>
+        &PRODUCT; works with a variety of hypervisors. A single cloud deployment can contain multiple hypervisor implementations. You have the complete freedom to choose the right hypervisor for your workload.
+    </para>
+    <para>
+        &PRODUCT; is designed to work with open source Xen and KVM hypervisors as well as enterprise-grade hypervisors such as Citrix XenServer, VMware vSphere, and Oracle VM (OVM). You can also provision “bare metal” hosts with no hypervisor (Beta feature. Untested in &PRODUCT; 3.0.x.)
+    </para>
+    <para>
+        <emphasis role="bold">Massively Scalable Infrastructure Management</emphasis>
+    </para>
+    <para>
+        &PRODUCT; can manage tens of thousands of servers installed in multiple geographically distributed datacenters. The centralized management server scales linearly, eliminating the need for intermediate cluster-level management servers. No single component failure can cause cloud-wide outage. Periodic maintenance of the management server can be performed without affecting the functioning of virtual machines running in the cloud.
+    </para>
+    <para>
+        <emphasis role="bold">Automatic Configuration Management</emphasis>
+    </para>
+    <para>&PRODUCT; automatically configures each guest virtual machine’s networking and storage settings.
+    </para>
+    <para>&PRODUCT; internally manages a pool of virtual appliances to support the cloud itself. These appliances offer services such as firewalling, routing, DHCP, VPN access, console proxy, storage access, and storage replication. The extensive use of virtual appliances simplifies the installation, configuration, and ongoing management of a cloud deployment.
+    </para>
+    <para>
+        <emphasis role="bold">Graphical User Interface</emphasis>
+    </para>
+    <para>&PRODUCT; offers an administrator's Web interface, used for provisioning and managing the cloud, as well as an end-user's Web interface, used for running VMs and managing VM templates. The UI can be customized to reflect the desired service provider or enterprise look and feel.
+    </para>
+    <para>
+        <emphasis role="bold">API and Extensibility</emphasis>
+    </para>
+    <para>
+        &PRODUCT; provides an API that gives programmatic access to all the management features available in the UI. The API is maintained and documented. This API enables the creation of command line tools and new user interfaces to suit particular needs. See the Developer’s Guide and API Reference, both available at <ulink url="http://docs.cloudstack.org/Apache_CloudStack_Documentation">http://docs.cloudstack.org/Apache_CloudStack_Documentation</ulink>.
+    </para>
+    <para>
+        The &PRODUCT; pluggable allocation architecture allows the creation of new types of allocators for the selection of storage and Hosts. See the Allocator Implementation Guide (<ulink url="http://docs.cloudstack.org/CloudStack_Documentation/Allocator_Implementation_Guide">http://docs.cloudstack.org/CloudStack_Documentation/Allocator_Implementation_Guide</ulink>).
+    </para>
+    <para>
+        <emphasis role="bold">High Availability</emphasis>
+    </para>
+    <para>&PRODUCT; has a number of features to increase the availability of the system. The Management Server itself may be deployed in a multi-node installation where the servers are load balanced. MySQL may be configured to use replication to provide for a manual failover in the event of database loss. For the hosts, &PRODUCT; supports NIC bonding and the use of separate networks for storage as well as iSCSI Multipath.
+    </para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/firewall-rules.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/firewall-rules.xml b/docs/en-US/firewall-rules.xml
index 01d072b..388bf7e 100644
--- a/docs/en-US/firewall-rules.xml
+++ b/docs/en-US/firewall-rules.xml
@@ -5,51 +5,52 @@
 ]>
 
 <!-- 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="firewall-rules">
-	<title>Firewall Rules</title>
-	<para>By default, all incoming traffic to the public IP address is rejected by the firewall. To allow external traffic, you can open firewall ports by specifying firewall rules.  You can optionally specify one or more CIDRs to filter the source IPs. This is useful when you want to allow only incoming requests from certain IP addresses.</para>
-	<para>You cannot use firewall rules to open ports for an elastic IP address. When elastic IP is used, outside access is instead controlled through the use of security groups. See <xref linkend="add-security-group"/>.</para>
-	<para>Firewall rules can be created using the Firewall tab in the Management Server UI. This tab is not displayed by default when &PRODUCT; is installed. To display the Firewall tab, the &PRODUCT; administrator must set the global configuration parameter firewall.rule.ui.enabled to "true."</para>
-	<para>To create a firewall rule:</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>Click the name of the network where you want to work with.</para></listitem>
-		<listitem><para>Click View IP Addresses.</para></listitem>
-		<listitem><para>Click the IP address you want to work with.</para>
-		</listitem>
-		<listitem><para>Click the Configuration tab and fill in the following values.</para>
-		<itemizedlist>
-			<listitem><para><emphasis role="bold">Source CIDR</emphasis>. (Optional) To accept only traffic from IP
-						addresses within a particular address block, enter a CIDR or a
-						comma-separated list of CIDRs. Example: 192.168.0.0/22. Leave empty to allow
-						all CIDRs.</para></listitem>
-			<listitem><para><emphasis role="bold">Protocol</emphasis>. The communication protocol in use on the opened
-						port(s).</para></listitem>
-			<listitem><para><emphasis role="bold">Start Port and End Port</emphasis>. The port(s) you want to open on the
-						firewall. If you are opening a single port, use the same number in both
-						fields</para></listitem>
-			<listitem><para><emphasis role="bold">ICMP Type and ICMP Code</emphasis>. Used only if Protocol is set to
-						ICMP. Provide the type and code required by the ICMP protocol to fill out
-						the ICMP header. Refer to ICMP documentation for more details if you are not
-						sure what to enter</para></listitem>
-		</itemizedlist></listitem>
-		<listitem><para>Click Add.</para></listitem>		
-	</orderedlist>
+    <title>Firewall Rules</title>
+    <para>By default, all incoming traffic to the public IP address is rejected by the firewall. To allow external traffic, you can open firewall ports by specifying firewall rules.  You can optionally specify one or more CIDRs to filter the source IPs. This is useful when you want to allow only incoming requests from certain IP addresses.</para>
+    <para>You cannot use firewall rules to open ports for an elastic IP address. When elastic IP is used, outside access is instead controlled through the use of security groups. See <xref linkend="add-security-group"/>.</para>
+    <para>Firewall rules can be created using the Firewall tab in the Management Server UI. This tab is not displayed by default when &PRODUCT; is installed. To display the Firewall tab, the &PRODUCT; administrator must set the global configuration parameter firewall.rule.ui.enabled to "true."</para>
+    <para>To create a firewall rule:</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>Click the name of the network where you want to work with.</para></listitem>
+        <listitem><para>Click View IP Addresses.</para></listitem>
+        <listitem><para>Click the IP address you want to work with.</para>
+        </listitem>
+        <listitem><para>Click the Configuration tab and fill in the following values.</para>
+        <itemizedlist>
+            <listitem><para><emphasis role="bold">Source CIDR</emphasis>. (Optional) To accept only traffic from IP
+                        addresses within a particular address block, enter a CIDR or a
+                        comma-separated list of CIDRs. Example: 192.168.0.0/22. Leave empty to allow
+                        all CIDRs.</para></listitem>
+            <listitem><para><emphasis role="bold">Protocol</emphasis>. The communication protocol in use on the opened
+                        port(s).</para></listitem>
+            <listitem><para><emphasis role="bold">Start Port and End Port</emphasis>. The port(s) you want to open on the
+                        firewall. If you are opening a single port, use the same number in both
+                        fields</para></listitem>
+            <listitem><para><emphasis role="bold">ICMP Type and ICMP Code</emphasis>. Used only if Protocol is set to
+                        ICMP. Provide the type and code required by the ICMP protocol to fill out
+                        the ICMP header. Refer to ICMP documentation for more details if you are not
+                        sure what to enter</para></listitem>
+        </itemizedlist></listitem>
+        <listitem><para>Click Add</para></listitem>        
+    </orderedlist>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/globally-configured-limits.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/globally-configured-limits.xml b/docs/en-US/globally-configured-limits.xml
index 2445d1a..ac71112 100644
--- a/docs/en-US/globally-configured-limits.xml
+++ b/docs/en-US/globally-configured-limits.xml
@@ -5,96 +5,96 @@
 ]>
 
 <!-- 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="globally-configured-limits">
-	<title>Globally Configured Limits</title>
-	<para>In a zone, the guest virtual network has a 24 bit CIDR by default. This limits the guest virtual network to 254 running instances. It can be adjusted as needed, but this must be done before any instances are created in the zone. For example, 10.1.1.0/22 would provide for ~1000 addresses.</para>
-	<para>The following table lists limits set in the Global Configuration:</para>
-	<informaltable>
-		<tgroup cols="2">
-			<thead>
-				<row>
-					<entry><para>Parameter Name</para></entry>
-					<entry><para>Definition</para></entry>
-					
-				</row>
-			</thead>
-			<tbody>
-				<row>
-					<entry><para>max.account.public.ips</para></entry>
-					<entry><para>Number of public IP addresses that can be owned by an account</para></entry>
-					
-				</row>
-				<row>
-					<entry><para>max.account.snapshots</para></entry>
-					<entry><para>Number of snapshots that can exist for an account</para></entry>
-					
-				</row>
-				
-				<row>
-					<entry><para>max.account.templates</para></entry>
-					<entry><para>Number of templates that can exist for an account</para></entry>
-					
-				</row>
-				<row>
-					<entry><para>max.account.user.vms</para></entry>
-					<entry><para>Number of virtual machine instances that can exist for an account</para></entry>
-				</row>
-				
-				<row>
-					<entry><para>max.account.volumes</para></entry>
-					<entry><para>Number of disk volumes that can exist for an account</para></entry>
-				</row>
-				
-				<row>
-					<entry><para>max.template.iso.size</para></entry>
-					<entry><para>Maximum size for a downloaded template or ISO in GB</para></entry>
-				</row>
-				
-				<row>
-					<entry><para>max.volume.size.gb</para></entry>
-					<entry><para>Maximum size for a volume in GB</para></entry>
-				</row>
-				<row>
-					<entry><para>network.throttling.rate</para></entry>
-					<entry><para>Default data transfer rate in megabits per second allowed per user (supported on XenServer)</para></entry>
-				</row>
-				<row>
-					<entry><para>snapshot.max.hourly</para></entry>
-					<entry><para>Maximum recurring hourly snapshots to be retained for a volume. If the limit is reached, early snapshots from the start of the hour are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring hourly snapshots can not be scheduled</para></entry>
-				</row>
-				
-				<row>
-					<entry><para>snapshot.max.daily</para></entry>
-					<entry><para>Maximum recurring daily snapshots to be retained for a volume. If the limit is reached, snapshots from the start of the day are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring daily snapshots can not be scheduled</para></entry>
-				</row>
-				<row>
-					<entry><para>snapshot.max.weekly</para></entry>
-					<entry><para>Maximum recurring weekly snapshots to be retained for a volume. If the limit is reached, snapshots from the beginning of the week are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring weekly snapshots can not be scheduled</para></entry>
-				</row>
-				
-				<row>
-					<entry><para>snapshot.max.monthly</para></entry>
-					<entry><para>Maximum recurring monthly snapshots to be retained for a volume. If the limit is reached, snapshots from the beginning of the month are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring monthly snapshots can not be scheduled.</para></entry>
-			    </row>		
-			</tbody>
-		</tgroup>
-	</informaltable>
-	<para>To modify global configuration parameters, use the global configuration screen in the &PRODUCT; UI. See Setting Global Configuration Parameters </para>
+    <title>Globally Configured Limits</title>
+    <para>In a zone, the guest virtual network has a 24 bit CIDR by default. This limits the guest virtual network to 254 running instances. It can be adjusted as needed, but this must be done before any instances are created in the zone. For example, 10.1.1.0/22 would provide for ~1000 addresses.</para>
+    <para>The following table lists limits set in the Global Configuration:</para>
+    <informaltable>
+        <tgroup cols="2">
+            <thead>
+                <row>
+                    <entry><para>Parameter Name</para></entry>
+                    <entry><para>Definition</para></entry>
+                    
+                </row>
+            </thead>
+            <tbody>
+                <row>
+                    <entry><para>max.account.public.ips</para></entry>
+                    <entry><para>Number of public IP addresses that can be owned by an account</para></entry>
+                    
+                </row>
+                <row>
+                    <entry><para>max.account.snapshots</para></entry>
+                    <entry><para>Number of snapshots that can exist for an account</para></entry>
+                    
+                </row>
+                
+                <row>
+                    <entry><para>max.account.templates</para></entry>
+                    <entry><para>Number of templates that can exist for an account</para></entry>
+                    
+                </row>
+                <row>
+                    <entry><para>max.account.user.vms</para></entry>
+                    <entry><para>Number of virtual machine instances that can exist for an account</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para>max.account.volumes</para></entry>
+                    <entry><para>Number of disk volumes that can exist for an account</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para>max.template.iso.size</para></entry>
+                    <entry><para>Maximum size for a downloaded template or ISO in GB</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para>max.volume.size.gb</para></entry>
+                    <entry><para>Maximum size for a volume in GB</para></entry>
+                </row>
+                <row>
+                    <entry><para>network.throttling.rate</para></entry>
+                    <entry><para>Default data transfer rate in megabits per second allowed per user (supported on XenServer)</para></entry>
+                </row>
+                <row>
+                    <entry><para>snapshot.max.hourly</para></entry>
+                    <entry><para>Maximum recurring hourly snapshots to be retained for a volume. If the limit is reached, early snapshots from the start of the hour are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring hourly snapshots can not be scheduled</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para>snapshot.max.daily</para></entry>
+                    <entry><para>Maximum recurring daily snapshots to be retained for a volume. If the limit is reached, snapshots from the start of the day are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring daily snapshots can not be scheduled</para></entry>
+                </row>
+                <row>
+                    <entry><para>snapshot.max.weekly</para></entry>
+                    <entry><para>Maximum recurring weekly snapshots to be retained for a volume. If the limit is reached, snapshots from the beginning of the week are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring weekly snapshots can not be scheduled</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para>snapshot.max.monthly</para></entry>
+                    <entry><para>Maximum recurring monthly snapshots to be retained for a volume. If the limit is reached, snapshots from the beginning of the month are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring monthly snapshots can not be scheduled.</para></entry>
+                </row>        
+            </tbody>
+        </tgroup>
+    </informaltable>
+    <para>To modify global configuration parameters, use the global configuration screen in the &PRODUCT; UI. See Setting Global Configuration Parameters </para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/guest-traffic.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/guest-traffic.xml b/docs/en-US/guest-traffic.xml
index ebee698..96f9c06 100644
--- a/docs/en-US/guest-traffic.xml
+++ b/docs/en-US/guest-traffic.xml
@@ -5,33 +5,34 @@
 ]>
 
 <!-- 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="guest-traffic">
-	<title>Guest Traffic</title>
-	<para>A network can carry guest traffic only between VMs within one zone. Virtual machines in different zones cannot communicate with each other using their IP addresses; they must communicate with each other by routing through a public IP address.</para>
-	<para>See a typical guest traffic setup given below:</para>
-	<mediaobject>
-		<imageobject>
-			<imagedata fileref="./images/guest-traffic-setup.png" />
-		</imageobject>
-		<textobject><phrase>guesttraffic.png: Depicts a guest traffic setup</phrase></textobject>
-	</mediaobject>
-	<para>The Management Server automatically creates a virtual router for each network. A virtual router is a special virtual machine that runs on the hosts. Each virtual router has three network interfaces. Its eth0 interface serves as the gateway for the guest traffic and has the IP address of 10.1.1.1. Its eth1 interface is used by the system to configure the virtual router. Its eth2 interface is assigned a public IP address for public traffic.</para>
-	<para>The virtual router provides DHCP and will automatically assign an IP address for each guest VM within the IP range assigned for the network. The user can manually reconfigure guest VMs to assume different IP addresses.</para>
-	<para>Source NAT is automatically configured in the virtual router to forward outbound traffic for all guest VMs</para>
+    <title>Guest Traffic</title>
+    <para>A network can carry guest traffic only between VMs within one zone. Virtual machines in different zones cannot communicate with each other using their IP addresses; they must communicate with each other by routing through a public IP address.</para>
+    <para>Figure 1 illustrates a typical guest traffic setup:</para>
+    <mediaobject>
+        <imageobject>
+            <imagedata fileref="./images/basic-deployment.png" />
+        </imageobject>
+        <textobject><phrase>guesttraffic.png: Depicts a guest traffic setup</phrase></textobject>
+    </mediaobject>
+    <para>The Management Server automatically creates a virtual router for each network. A virtual router is a special virtual machine that runs on the hosts. Each virtual router has three network interfaces. Its eth0 interface serves as the gateway for the guest traffic and has the IP address of 10.1.1.1. Its eth1 interface is used by the system to configure the virtual router. Its eth2 interface is assigned a public IP address for public traffic.</para>
+    <para>The virtual router provides DHCP and will automatically assign an IP address for each guest VM within the IP range assigned for the network. The user can manually reconfigure guest VMs to assume different IP addresses.</para>
+    <para>Source NAT is automatically configured in the virtual router to forward outbound traffic for all guest VMs</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/ha-for-hosts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/ha-for-hosts.xml b/docs/en-US/ha-for-hosts.xml
index 15b5fa7..e395d22 100644
--- a/docs/en-US/ha-for-hosts.xml
+++ b/docs/en-US/ha-for-hosts.xml
@@ -1,30 +1,29 @@
 <?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;
 ]>
 
 <!-- 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="ha-for-hosts">
     <title>HA for Hosts</title>
     <para>The user can specify a virtual machine as HA-enabled. By default, all virtual router VMs and Elastic Load Balancing VMs are automatically configured as HA-enabled. When an HA-enabled VM crashes, &PRODUCT; detects the crash and restarts the VM automatically within the same Availability Zone. HA is never performed across different Availability Zones. &PRODUCT; has a conservative policy towards restarting VMs and ensures that there will never be two instances of the same VM running at the same time. The Management Server attempts to start the VM on another Host in the same cluster.</para>
     <para>HA features work with iSCSI or NFS primary storage.  HA with local storage is not supported.</para>
-    <xi:include href="dedicated-ha-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/host-add.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/host-add.xml b/docs/en-US/host-add.xml
index b112d07..2a984fd 100644
--- a/docs/en-US/host-add.xml
+++ b/docs/en-US/host-add.xml
@@ -5,38 +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="host-add">
-	<title>Adding a Host</title>
-        <orderedlist>
-            <listitem><para>Before adding a host to the &PRODUCT; configuration, you must first install your chosen hypervisor on the host. &PRODUCT; can manage hosts running VMs under a variety of hypervisors.</para> 
-              <para>The &PRODUCT; Installation Guide provides instructions on how to install each supported hypervisor
-                  and configure it for use with &PRODUCT;. See the Installation Guide for information about which version of your chosen hypervisor is supported, as well as crucial additional steps to configure the hosts for use with &PRODUCT;.</para>
-                <warning><para>Be sure you have performed the additional &PRODUCT;-specific configuration steps described in the hypervisor installation section for your particular hypervisor.</para></warning>
-            </listitem>
-            <listitem><para>Now add the hypervisor host to &PRODUCT;. The technique to use varies depending on the hypervisor.</para>
-                <itemizedlist>
-                    <listitem><para><xref linkend="host-add-xenserver-kvm-ovm" /></para></listitem>
-                    <listitem><para><xref linkend="host-add-vsphere" /></para></listitem>
-                </itemizedlist>
-            </listitem>
-        </orderedlist>
-    <xi:include href="host-add-xenserver-kvm-ovm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="host-add-vsphere.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <title>Adding a Host</title>
+    <para>TODO</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/host-allocation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/host-allocation.xml b/docs/en-US/host-allocation.xml
index f5bc53c..8a362e6 100644
--- a/docs/en-US/host-allocation.xml
+++ b/docs/en-US/host-allocation.xml
@@ -1,25 +1,25 @@
 <?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;
 ]>
 
 <!-- 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="host-allocation">
@@ -28,5 +28,4 @@
     <para>&PRODUCT; administrators can specify that certain hosts should have a preference for particular types of guest instances. For example, an administrator could state that a host should have a preference to run Windows guests. The default host allocator will attempt to place guests of that OS type on such hosts first. If no such host is available, the allocator will place the instance wherever there is sufficient physical capacity.</para>
     <para>Both vertical and horizontal allocation is allowed. Vertical allocation consumes all the resources of a given host before allocating any guests on a second host. This reduces power consumption in the cloud. Horizontal allocation places a guest on each host in a round-robin fashion. This may yield better performance to the guests in some cases. &PRODUCT; also allows an element of CPU over-provisioning as configured by the administrator. Over-provisioning allows the administrator to commit more CPU cycles to the allocated guests than are actually available from the hardware.</para>
     <para>&PRODUCT; also provides a pluggable interface for adding new allocators. These custom allocators can provide any policy the administrator desires.</para>
-    <xi:include href="over-provisioning-service-offering-limits.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </section>    

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/hypervisor-support-for-primarystorage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-support-for-primarystorage.xml b/docs/en-US/hypervisor-support-for-primarystorage.xml
index 23c8eb5..ca266a4 100644
--- a/docs/en-US/hypervisor-support-for-primarystorage.xml
+++ b/docs/en-US/hypervisor-support-for-primarystorage.xml
@@ -5,95 +5,98 @@
 ]>
 
 <!-- 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="hypervisor-support-for-primarystorage">
-	<title>Hypervisor Support for Primary Storage</title>
-	<para>The following table shows storage options and parameters for different hypervisors.</para>
-	<informaltable>
-		<tgroup cols="5">
-			<colspec colname="c1" colnum="1" colwidth="34%" />
-			<colspec colname="c2" colnum="2" colwidth="16%" />
-			<colspec colname="c3" colnum="3" colwidth="16%"/>
-			<colspec colname="c4" colnum="4" colwidth="17%"/>
-			<colspec colname="c5" colnum="5" colwidth="17%"/>
-			<thead>
-				<row>
-					<entry></entry>
-					<entry><para>VMware vSphere</para></entry>
-					<entry><para>Citrix XenServer</para></entry>
-					<entry><para>KVM</para></entry>
-					<entry><para>Oracle VM</para></entry>
-				</row>
-			</thead>
-			<tbody>
-				<row>
-					<entry><para><emphasis role="bold"><emphasis role="bold">Format for Disks, Templates, and
-									Snapshots</emphasis></emphasis></para></entry>
-					<entry><para>VMDK</para></entry>
-					<entry><para>VHD</para></entry>
-					<entry><para>QCOW2</para></entry>
-					<entry><para>RAW</para></entry>
-				</row>
-				<row>
-					<entry><para><emphasis role="bold">iSCSI support</emphasis></para></entry>
-					<entry><para>VMFS</para></entry>
-					<entry><para>Clustered LVM</para></entry>
-					<entry><para>Yes, via Shared Mountpoint</para></entry>
-					<entry><para>Yes, via OCFS2M</para></entry>
-				</row>
-				<row>
-					<entry><para><emphasis role="bold">Fiber Channel support</emphasis></para></entry>
-					<entry><para>VMFS</para></entry>
-					<entry><para>Yes, via Existing SR</para></entry>
-					<entry><para>Yes, via Shared Mountpoint</para></entry>
-					<entry><para>No</para></entry>
-				</row>
-				<row>
-					<entry><para><emphasis role="bold">NFS support</emphasis></para></entry>
-					<entry><para>Y</para></entry>
-					<entry><para>Y</para></entry>
-					<entry><para>Y</para></entry>
-					<entry><para>Y</para></entry>
-				</row>
-				
-				<row>
-					<entry><para><emphasis role="bold">Local storage support</emphasis></para></entry>
-					<entry><para>Y</para></entry>
-					<entry><para>Y</para></entry>
-					<entry><para>Y</para></entry>
-					<entry><para>Y</para></entry>
-				</row>
-				
-				<row>
-					<entry><para><emphasis role="bold">Storage over-provisioning</emphasis></para></entry>
-					<entry><para>NFS and iSCSI</para></entry>
-					<entry><para>NFS</para></entry>
-					<entry><para>NFS</para></entry>
-					<entry><para>No</para></entry>
-				</row>
-					
-			</tbody>
-		</tgroup>
-	</informaltable>
-	<para>XenServer uses a clustered LVM system to store VM images on iSCSI and Fiber Channel volumes and does not support over-provisioning in the hypervisor. The storage server itself, however, can support thin-provisioning.  As a result the &PRODUCT; can still support storage over-provisioning by running on thin-provisioned storage volumes.</para>
-	<para>KVM supports "Shared Mountpoint" storage.  A shared mountpoint is a file system path local to each server in a given cluster.  The path must be the same across all Hosts in the cluster, for example /mnt/primary1.  This shared mountpoint is assumed to be a clustered filesystem such as OCFS2.  In this case the &PRODUCT; does not attempt to mount or unmount the storage as is done with NFS.  The &PRODUCT; requires that the administrator insure that the storage is available</para>
-	<para>Oracle VM supports both iSCSI and NFS storage. When iSCSI is used with OVM, the &PRODUCT; administrator is responsible for setting up iSCSI on the host, including re-mounting the storage after the host recovers from a failure such as a network outage. With other hypervisors, &PRODUCT; takes care of mounting the iSCSI target on the host whenever it discovers a connection with an iSCSI server and unmounting the target when it discovers the connection is down.</para>
-	<para>With NFS storage, &PRODUCT; manages the overprovisioning. In this case the global configuration parameter storage.overprovisioning.factor controls the degree of overprovisioning. This is independent of hypervisor type.</para>
-	<para>Local storage is an option for primary storage for vSphere, XenServer, Oracle VM, and KVM. When the local disk option is enabled, a local disk storage pool is automatically created on each host. To use local storage for the System Virtual Machines (such as the Virtual Router), set system.vm.use.local.storage to true in global configuration.</para>
-	<para>&PRODUCT; supports multiple primary storage pools in a Cluster. For example, you could provision 2 NFS servers in primary storage. Or you could provision 1 iSCSI LUN initially and then add a second iSCSI LUN when the first approaches capacity.</para>
-	</section>
+    <title>Hypervisor Support for Primary Storage</title>
+    <para>The following table shows storage options and parameters for different hypervisors.</para>
+    <informaltable>
+        <tgroup cols="5">
+            <colspec colname="c1" colnum="1" colwidth="4.0cm"/>
+            <colspec colname="c2" colnum="2" colwidth="4cm" />
+            <colspec colname="c3" colnum="3" colwidth="5cm" />
+            <colspec colname="c4" colnum="2" colwidth="5.9cm"/>
+            <colspec colname="c5" colnum="3" colwidth="5.0cm"/>
+            <colspec colnum="4" colname="c4" colwidth="120.75pt"/>
+            <colspec colnum="5" colname="c5" colwidth="80.25pt"/>
+            <thead>
+                <row>
+                    <entry></entry>
+                    <entry><para>VMware vSphere</para></entry>
+                    <entry><para>Citrix XenServer</para></entry>
+                    <entry><para>KVM</para></entry>
+                    <entry><para>Oracle VM</para></entry>
+                </row>
+            </thead>
+            <tbody>
+                <row>
+                    <entry><para><emphasis role="bold"><emphasis role="bold">Format for Disks, Templates, and
+                                    Snapshots</emphasis></emphasis></para></entry>
+                    <entry><para>VMDK</para></entry>
+                    <entry><para>VHD</para></entry>
+                    <entry><para>QCOW2</para></entry>
+                    <entry><para>RAW</para></entry>
+                </row>
+                <row>
+                    <entry><para><emphasis role="bold">iSCSI support</emphasis></para></entry>
+                    <entry><para>VMFS</para></entry>
+                    <entry><para>Clustered LVM</para></entry>
+                    <entry><para>Yes, via Shared Mountpoint</para></entry>
+                    <entry><para>Yes, via OCFS2M</para></entry>
+                </row>
+                <row>
+                    <entry><para><emphasis role="bold">Fiber Channel support</emphasis></para></entry>
+                    <entry><para>VMFS</para></entry>
+                    <entry><para>Yes, via Existing SR</para></entry>
+                    <entry><para>Yes, via Shared Mountpoint</para></entry>
+                    <entry><para>No</para></entry>
+                </row>
+                <row>
+                    <entry><para><emphasis role="bold">NFS support</emphasis></para></entry>
+                    <entry><para>Y</para></entry>
+                    <entry><para>Y</para></entry>
+                    <entry><para>Y</para></entry>
+                    <entry><para>Y</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para><emphasis role="bold">Local storage support</emphasis></para></entry>
+                    <entry><para>Y</para></entry>
+                    <entry><para>Y</para></entry>
+                    <entry><para>Y</para></entry>
+                    <entry><para>Y</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para><emphasis role="bold">Storage over-provisioning</emphasis></para></entry>
+                    <entry><para>NFS and iSCSI</para></entry>
+                    <entry><para>NFS</para></entry>
+                    <entry><para>NFS</para></entry>
+                    <entry><para>No</para></entry>
+                </row>
+                    
+            </tbody>
+        </tgroup>
+    </informaltable>
+    <para>XenServer uses a clustered LVM system to store VM images on iSCSI and Fiber Channel volumes and does not support over-provisioning in the hypervisor. The storage server itself, however, can support thin-provisioning.  As a result the &PRODUCT; can still support storage over-provisioning by running on thin-provisioned storage volumes.</para>
+    <para>KVM supports "Shared Mountpoint" storage.  A shared mountpoint is a file system path local to each server in a given cluster.  The path must be the same across all Hosts in the cluster, for example /mnt/primary1.  This shared mountpoint is assumed to be a clustered filesystem such as OCFS2.  In this case the &PRODUCT; does not attempt to mount or unmount the storage as is done with NFS.  The &PRODUCT; requires that the administrator insure that the storage is available</para>
+    <para>Oracle VM supports both iSCSI and NFS storage. When iSCSI is used with OVM, the &PRODUCT; administrator is responsible for setting up iSCSI on the host, including re-mounting the storage after the host recovers from a failure such as a network outage. With other hypervisors, &PRODUCT; takes care of mounting the iSCSI target on the host whenever it discovers a connection with an iSCSI server and unmounting the target when it discovers the connection is down.</para>
+    <para>With NFS storage, &PRODUCT; manages the overprovisioning. In this case the global configuration parameter storage.overprovisioning.factor controls the degree of overprovisioning. This is independent of hypervisor type.</para>
+    <para>Local storage is an option for primary storage for vSphere, XenServer, Oracle VM, and KVM. When the local disk option is enabled, a local disk storage pool is automatically created on each host. To use local storage for the System Virtual Machines (such as the Virtual Router), set system.vm.use.local.storage to true in global configuration.</para>
+    <para>&PRODUCT; supports multiple primary storage pools in a Cluster. For example, you could provision 2 NFS servers in primary storage. Or you could provision 1 iSCSI LUN initially and then add a second iSCSI LUN when the first approaches capacity.</para>
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/images/cluster-overview.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/cluster-overview.png b/docs/en-US/images/cluster-overview.png
index 18a86c3..33f1a04 100644
Binary files a/docs/en-US/images/cluster-overview.png and b/docs/en-US/images/cluster-overview.png differ


Mime
View raw message