cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [16/50] [abbrv] Merge branch 'api_refactoring' into javelin
Date Wed, 09 Jan 2013 13:26:48 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/30f2565d/docs/en-US/detach-move-volumes.xml
----------------------------------------------------------------------
diff --cc docs/en-US/detach-move-volumes.xml
index a902fdb,25323c9..fda6e66
--- a/docs/en-US/detach-move-volumes.xml
+++ b/docs/en-US/detach-move-volumes.xml
@@@ -5,42 -5,39 +5,42 @@@
  ]>
  
  <!-- 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="detach-move-volumes">
 -    <title>Attaching a Volume</title>
 -        <note><para>This procedure is different from moving disk volumes from one storage pool to another. See VM Storage Migration </para></note>
 -        <para>A volume can be detached from a guest VM and attached to another guest. Both &PRODUCT; administrators and users can detach volumes from VMs and move them to other VMs.</para>
 -        <para>If the two VMs are in different clusters, and the volume is large, it may take several minutes for the volume to be moved to the new VM.</para>
 +	<title>Detaching and Moving Volumes</title>
 +		<note><para>This procedure is different from moving disk volumes from one storage pool to another. See VM Storage Migration </para></note>
 +		<para>A volume can be detached from a guest VM and attached to another guest. Both &PRODUCT; administrators and users can detach volumes from VMs and move them to other VMs.</para>
 +		<para>If the two VMs are in different clusters, and the volume is large, it may take several minutes for the volume to be moved to the new VM.</para>
- 		<para>If the destination VM is running in the OVM hypervisor, the VM must be stopped before a new volume can be attached to it.</para>
+         <!-- <para>If the destination VM is running in the OVM hypervisor, the VM must be stopped before a new volume can be attached to it.</para> -->
 -        <orderedlist>
 -            <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
 -            <listitem><para>In the left navigation bar, click Storage, and choose Volumes in Select View. Alternatively, if you know which VM the volume is attached to, you can click Instances, click the VM name, and click View Volumes.</para></listitem>
 -            <listitem><para>Click the name of the volume you want to detach, then click the Detach Disk button <inlinemediaobject>
 -                <imageobject>
 -                    <imagedata fileref="./images/detach-disk-icon.png" />
 -                </imageobject>
 -                <textobject><phrase>DetachDiskButton.png: button to detach a volume</phrase></textobject>
 -            </inlinemediaobject>
 -                </para></listitem>
 -            <listitem><para>To move the volume to another VM, follow the steps in Attaching a Volume <xref linkend="attaching-volume"/>.</para></listitem>
 -        </orderedlist>
 -    </section>
 +		<orderedlist>
 +			<listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
 +			<listitem><para>In the left navigation bar, click Storage, and choose Volumes in Select View. Alternatively, if you know which VM the volume is attached to, you can click Instances, click the VM name, and click View Volumes.</para></listitem>
 +			<listitem><para>Click the name of the volume you want to detach, then click the Detach Disk button. <inlinemediaobject>
 +					<imageobject>
 +						<imagedata fileref="./images/detach-disk-icon.png"/>
 +					</imageobject>
 +					<textobject>
 +						<phrase>DetachDiskButton.png: button to detach a volume</phrase>
 +					</textobject>
 +				</inlinemediaobject>
 +			</para></listitem>
 +			<listitem><para>To move the volume to another VM, follow the steps in <xref linkend="attaching-volume"
 +				/>.</para></listitem>
 +		</orderedlist>
 +	</section>
 +

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/30f2565d/docs/en-US/event-types.xml
----------------------------------------------------------------------
diff --cc docs/en-US/event-types.xml
index 56059e1,2ccd553..5ce5857
--- a/docs/en-US/event-types.xml
+++ b/docs/en-US/event-types.xml
@@@ -5,215 -5,216 +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.
 --->
 +	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>
 +		<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>
+ </appendix>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/30f2565d/docs/en-US/feature-overview.xml
----------------------------------------------------------------------
diff --cc docs/en-US/feature-overview.xml
index f0739ca,501bca8..a05078f
--- a/docs/en-US/feature-overview.xml
+++ b/docs/en-US/feature-overview.xml
@@@ -5,63 -5,78 +5,77 @@@
  ]>
  
  <!-- 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>
 +	<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>
+         &PRODUCT; works with a variety of hypervisors, and a single cloud deployment can contain multiple hypervisor implementations. The current release of &PRODUCT; supports pre-packaged enterprise solutions like Citrix XenServer and VMware vSphere, as well as KVM or Xen running on Ubuntu or CentOS. 
+     </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>
 +	<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.
+         &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://incubator.apache.org/cloudstack/docs">Apache CloudStack Guides</ulink> 
+         and
+         <ulink url="http://incubator.apache.org/cloudstack/docs/api">Apache CloudStack API Reference</ulink> 
+         respectively. 
 -    </para>
 -    <para>
 +	</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>).
+         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>
 +	<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>
+        &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>
 +	</para>
  </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/30f2565d/docs/en-US/guest-traffic.xml
----------------------------------------------------------------------
diff --cc docs/en-US/guest-traffic.xml
index ebee698,8404968..16dfa41
--- a/docs/en-US/guest-traffic.xml
+++ b/docs/en-US/guest-traffic.xml
@@@ -5,33 -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="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>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>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>
  </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/30f2565d/docs/en-US/hypervisor-support-for-primarystorage.xml
----------------------------------------------------------------------
diff --cc docs/en-US/hypervisor-support-for-primarystorage.xml
index 23c8eb5,055c182..7c2596e
--- a/docs/en-US/hypervisor-support-for-primarystorage.xml
+++ b/docs/en-US/hypervisor-support-for-primarystorage.xml
@@@ -5,95 -5,91 +5,88 @@@
  ]>
  
  <!-- 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="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>
 -                </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>
 -                </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>
 -                </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>
 -                </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>
 -                </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>
 -                </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>
 -                </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>
 +	<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>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>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>Local storage is an option for primary storage for vSphere, XenServer, 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>
 +	<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/30f2565d/docs/en-US/log-in-root-admin.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/30f2565d/docs/en-US/manage-cloud.xml
----------------------------------------------------------------------
diff --cc docs/en-US/manage-cloud.xml
index 06d4e3f,f5df2c6..d356673
--- a/docs/en-US/manage-cloud.xml
+++ b/docs/en-US/manage-cloud.xml
@@@ -5,28 -5,29 +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.
  -->
+ 
  <chapter id="manage-cloud">
-     <title>Managing the Cloud</title>
-     <xi:include href="tagging-resources.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-     <xi:include href="global-config.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-     <xi:include href="change-database-config.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+   <title>Managing the Cloud</title>
+   <xi:include href="tagging-resources.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+   <xi:include href="change-database-config.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+   <xi:include href="change-database-password.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 -  <xi:include href="admin-alerts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 -  <xi:include href="customizing-dns.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 -  <xi:include href="stop-restart-management-server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 +    <xi:include href="admin-alerts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 +    <xi:include href="customizing-dns.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 +    <xi:include href="stop-restart-management-server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
  </chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/30f2565d/docs/en-US/manual-live-migration.xml
----------------------------------------------------------------------
diff --cc docs/en-US/manual-live-migration.xml
index 677cfc4,52de4c4..225f0ba
--- a/docs/en-US/manual-live-migration.xml
+++ b/docs/en-US/manual-live-migration.xml
@@@ -5,47 -5,48 +5,47 @@@
  ]>
  
  <!-- 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="manual-live-migration">
 -    <title>Moving VMs Between Hosts (Manual Live Migration)</title>
 -        <para>The &PRODUCT; administrator can move a running VM from one host to another without interrupting service to users or going into maintenance mode. This is called manual live migration, and can be done under the following conditions:</para>
 -        <itemizedlist>
 -            <listitem><para>The root administrator is logged in. Domain admins and users can not perform manual live migration of VMs.</para></listitem>
 -            <listitem><para>The VM is running. Stopped VMs can not be live migrated.</para></listitem>
 -            <listitem><para>The destination host must be in the same cluster as the original host.</para></listitem>
 -            <listitem><para>The VM must not be using local disk storage.</para></listitem>    
 -            <listitem><para>The destination host must have enough available capacity. If not, the VM will remain in the "migrating" state until memory becomes available.</para></listitem>
 +	<title>Moving VMs Between Hosts (Manual Live Migration)</title>
 +		<para>The &PRODUCT; administrator can move a running VM from one host to another without interrupting service to users or going into maintenance mode. This is called manual live migration, and can be done under the following conditions:</para>
 +		<itemizedlist>
 +			<listitem><para>The root administrator is logged in. Domain admins and users can not perform manual live migration of VMs.</para></listitem>
 +			<listitem><para>The VM is running. Stopped VMs can not be live migrated.</para></listitem>
 +			<listitem><para>The destination host must be in the same cluster as the original host.</para></listitem>
 +			<listitem><para>The VM must not be using local disk storage.</para></listitem>	
 +			<listitem><para>The destination host must have enough available capacity. If not, the VM will remain in the "migrating" state until memory becomes available.</para></listitem>
- 			<listitem><para>(OVM) If the VM is running on the OVM hypervisor, it must not have an ISO attached. Live migration of a VM with attached ISO is not supported in OVM.</para></listitem>				
+             <!--            <listitem><para>(OVM) If the VM is running on the OVM hypervisor, it must not have an ISO attached. Live migration of a VM with attached ISO is not supported in OVM.</para></listitem> -->
 -        </itemizedlist>
 -        <para>To manually live migrate a virtual machine</para>
 -        <orderedlist>
 -            <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
 -            <listitem><para>In the left navigation, click Instances.</para></listitem>
 -            <listitem><para>Choose the VM that you want to migrate.</para></listitem>
 -            <listitem><para>Click the Migrate Instance button <inlinemediaobject>
 -                <imageobject>
 -                    <imagedata fileref="./images/migrate-instance.png" />
 -                </imageobject>
 -                <textobject><phrase>Migrateinstance.png: button to migrate an instance</phrase></textobject>
 -            </inlinemediaobject>
 -                </para></listitem>
 -            <listitem><para>From the list of hosts, choose the one to which you want to move the VM.</para></listitem>
 -            <listitem><para>Click OK.</para></listitem>
 -        </orderedlist>
 -    </section>
 +		</itemizedlist>
 +		<para>To manually live migrate a virtual machine</para>
 +		<orderedlist>
 +			<listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
 +			<listitem><para>In the left navigation, click Instances.</para></listitem>
 +			<listitem><para>Choose the VM that you want to migrate.</para></listitem>
 +			<listitem><para>Click the Migrate Instance button.<inlinemediaobject>
 +				<imageobject>
 +					<imagedata fileref="./images/migrate-instance.png" />
 +				</imageobject>
 +				<textobject><phrase>Migrateinstance.png: button to migrate an instance</phrase></textobject>
 +			</inlinemediaobject>
 +				</para></listitem>
 +			<listitem><para>From the list of hosts, choose the one to which you want to move the VM.</para></listitem>
 +			<listitem><para>Click OK.</para></listitem>
 +		</orderedlist>
 +	</section>
  

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/30f2565d/docs/en-US/minimum-system-requirements.xml
----------------------------------------------------------------------
diff --cc docs/en-US/minimum-system-requirements.xml
index 1bbe1e2,dcab039..0e497dd
--- a/docs/en-US/minimum-system-requirements.xml
+++ b/docs/en-US/minimum-system-requirements.xml
@@@ -5,75 -5,66 +5,69 @@@
  ]>
  
  <!-- 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="minimum-system-requirements">
 -    <title>Minimum System Requirements</title>
 -    <section id="management-server-system-requirements">
 -        <title>Management Server, Database, and Storage System Requirements</title>
 -        <para>The machines that will run the Management Server and MySQL database must meet the following requirements. The same machines can also be used to provide primary and secondary storage, such as via localdisk or NFS. The Management Server may be placed on a virtual machine.</para>
 -        <itemizedlist>
 -            <listitem><para>Operating system:</para>
 -                <itemizedlist>
 +		<title>Minimum System Requirements</title>
 +		<section id="management-server-system-requirements">
 +			<title>Management Server, Database, and Storage System Requirements</title>
 +		<para>
 +			The machines that will run the Management Server and MySQL database must meet the following requirements. 
 +			The same machines can also be used to provide primary and secondary storage, such as via localdisk or NFS. 
 +			The Management Server may be placed on a virtual machine.
 +		</para>
 +		<itemizedlist>
 +			<listitem><para>Operating system:</para>
 +				<itemizedlist>
- 					<listitem><para>Preferred: RHEL 6.2+ 64-bit (https://access.redhat.com/downloads) or CentOS 6.2+ 64-bit (http://isoredirect.centos.org/centos/6/isos/x86_64/).</para></listitem>
- 					<listitem><para>Also supported (v3.0.3 and greater): RHEL and CentOS 5.4-5.x 64-bit</para></listitem>
- 					<listitem><para>It is highly recommended that you purchase a RHEL support license.
- 						Citrix support can not be responsible for helping fix issues with the underlying OS.</para></listitem>
+                     <listitem><para>Preferred: CentOS/RHEL 6.3+ or Ubuntu 12.04(.1)</para></listitem>
 -                </itemizedlist>
 -            </listitem>
 -            <listitem><para>64-bit x86 CPU (more cores results in better performance)</para></listitem>
 -            <listitem><para>4 GB of memory</para></listitem>
 -            <listitem><para>50 GB of local disk (When running secondary storage on the management server 500GB is recommended)</para></listitem>
 -            <listitem><para>At least 1 NIC</para></listitem>
 -            <listitem><para>Statically allocated IP address</para></listitem>
 -            <listitem><para>Fully qualified domain name as returned by the hostname command</para></listitem>
 -        </itemizedlist>
 -    </section>
 -    <section id="hypervisor-system-requirements">
 -        <title>Host/Hypervisor System Requirements</title>
 -        <para>The host is where the cloud services run in the form of guest virtual machines. Each host is one machine that meets the following requirements:</para>
 -        <itemizedlist>
 +				</itemizedlist>
 +			</listitem>
 +			<listitem><para>64-bit x86 CPU (more cores results in better performance)</para></listitem>
 +			<listitem><para>4 GB of memory</para></listitem>
 +			<listitem><para>250 GB of local disk (more results in better capability; 500 GB recommended)</para></listitem>
 +			<listitem><para>At least 1 NIC</para></listitem>
 +			<listitem><para>Statically allocated IP address</para></listitem>
 +			<listitem><para>Fully qualified domain name as returned by the hostname command</para></listitem>
 +		</itemizedlist>
 +		</section>
 +		<section id="hypervisor-system-requirements">
 +		<title>Host/Hypervisor System Requirements</title>
 +		<para>The host is where the cloud services run in the form of guest virtual machines. Each host is one machine that meets the following requirements:</para>
 +		<itemizedlist>
- 			<listitem><para>Must be 64-bit and must support HVM (Intel-VT or AMD-V enabled).</para></listitem> 
+             <listitem><para>Must support HVM (Intel-VT or AMD-V enabled).</para></listitem> 
 -            <listitem><para>64-bit x86 CPU (more cores results in better performance)</para></listitem>
 -            <listitem><para>Hardware virtualization support required</para></listitem>
 -            <listitem><para>4 GB of memory</para></listitem>
 -            <listitem><para>36 GB of local disk</para></listitem>
 -            <listitem><para>At least 1 NIC</para></listitem>
 +			<listitem><para>64-bit x86 CPU (more cores results in better performance)</para></listitem>
 +			<listitem><para>Hardware virtualization support required</para></listitem>
 +			<listitem><para>4 GB of memory</para></listitem>
 +			<listitem><para>36 GB of local disk</para></listitem>
 +			<listitem><para>At least 1 NIC</para></listitem>
- 			<listitem><para>Statically allocated IP Address</para></listitem>
+             <listitem><note><para>If DHCP is used for hosts, ensure that no conflict occurs between DHCP server used for these hosts and the DHCP router created by &PRODUCT;.</para></note></listitem>
 -            <listitem><para>Latest hotfixes applied to hypervisor software</para></listitem>
 -            <listitem><para>When you deploy &PRODUCT;, the hypervisor host must not have any VMs already running</para></listitem>
 +			<listitem><para>Latest hotfixes applied to hypervisor software</para></listitem>
 +			<listitem><para>When you deploy &PRODUCT;, the hypervisor host must not have any VMs already running</para></listitem>
+             <listitem><para>All hosts within a cluster must be homogenous. The CPUs must be of the same type, count, and feature flags.</para></listitem>
 -        </itemizedlist>
 -        <para>Hosts have additional requirements depending on the hypervisor. See the requirements listed at the top of the Installation section for your chosen hypervisor:</para>
 +		</itemizedlist>
 +		<para>Hosts have additional requirements depending on the hypervisor. See the requirements listed at the top of the Installation section for your chosen hypervisor:</para>
- 		<itemizedlist>
- 			<listitem><para>Citrix XenServer Installation</para></listitem>
- 			<listitem><para>VMware vSphere Installation and Configuration</para></listitem>
- 			<listitem><para>KVM Installation and Configuration</para></listitem>
- 			<listitem><para>Oracle VM (OVM) Installation and Configuration</para></listitem>
- 		</itemizedlist>
- 		<warning>
- 			<para>
- 				Be sure you fulfill the additional hypervisor requirements and installation steps provided in this Guide. Hypervisor hosts must be properly prepared to work with CloudStack. For example, the requirements for XenServer are listed under Citrix XenServer Installation.
- 			</para>
- 		</warning>
- 		</section>
- 	<xi:include href="compatibility-matrix.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- 	</section>
- 
+         <warning>
+             <para>Be sure you fulfill the additional hypervisor requirements and installation steps provided in this Guide. Hypervisor hosts must be properly prepared to work with CloudStack. For example, the requirements for XenServer are listed under Citrix XenServer Installation.</para>
+         </warning>
+         <itemizedlist>
+             <listitem><para><xref linkend="hypervisor-kvm-requirements"/></para></listitem>
+             <listitem><para><xref linkend="system-requirements-xenserver-hosts"/></para></listitem>
+             <listitem><para><xref linkend="vmware-requirements"/></para></listitem>
+             <!--            <listitem><para><xref linkend="ovm-requirements"/></para></listitem> -->
+         </itemizedlist>
+     </section>
+ </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/30f2565d/docs/en-US/network-offerings.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/30f2565d/docs/en-US/primary-storage.xml
----------------------------------------------------------------------
diff --cc docs/en-US/primary-storage.xml
index de4005e,e1736a9..4ab37ef
--- a/docs/en-US/primary-storage.xml
+++ b/docs/en-US/primary-storage.xml
@@@ -23,12 -23,12 +23,12 @@@
  -->
  
  <section id="primary-storage">
 -    <title>Primary Storage</title>
 +		<title>Primary Storage</title>
- 		<para>This section gives concepts and technical details about &PRODUCT; primary storage. For information about how to install and configure primary storage through the &PRODUCT; UI, see the Advanced Installation Guide.</para>
-     <xi:include href="best-practices-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-     <xi:include href="runtime-behavior-of-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-     <xi:include href="hypervisor-support-for-primarystorage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-     <xi:include href="storage-tags.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-     <xi:include href="maintenance-mode-for-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+     <para>This section gives concepts and technical details about &PRODUCT; primary storage. For information about how to install and configure primary storage through the &PRODUCT; UI, see the Installation Guide.</para>
+     <para><xref linkend="about-primary-storage"/></para> 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="best-practices-primary-storage.xml"/>
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="runtime-behavior-of-primary-storage.xml"/>
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hypervisor-support-for-primarystorage.xml"/>
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="storage-tags.xml"/>
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="maintenance-mode-for-primary-storage.xml"/>
  </section>
- 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/30f2565d/docs/en-US/secondary-storage.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/30f2565d/docs/en-US/security-groups.xml
----------------------------------------------------------------------
diff --cc docs/en-US/security-groups.xml
index 07b9f79,3c08965..b6eecc3
--- a/docs/en-US/security-groups.xml
+++ b/docs/en-US/security-groups.xml
@@@ -23,14 -23,9 +23,15 @@@
  -->
  
  <section id="security-groups">
 +<<<<<<< HEAD
 +    <title>Using Security Groups to Control Traffic to VMs</title>
 +    <xi:include href="about-security-groups.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 +=======
      <title>Security Groups</title>
+     <xi:include href="about-security-groups.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
      <xi:include href="add-security-group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 +>>>>>>> master
      <xi:include href="enable-security-groups.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 +    <xi:include href="add-security-group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />    
      <xi:include href="add-ingress-egress-rules.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
  </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/30f2565d/docs/en-US/storage.xml
----------------------------------------------------------------------
diff --cc docs/en-US/storage.xml
index 49ebed9,86d3f53..580fe59
--- a/docs/en-US/storage.xml
+++ b/docs/en-US/storage.xml
@@@ -23,11 -23,10 +23,10 @@@
  -->
  
  <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" />
 +	<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/30f2565d/docs/en-US/system-reserved-ip-addresses.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/30f2565d/docs/en-US/time-zones.xml
----------------------------------------------------------------------
diff --cc docs/en-US/time-zones.xml
index c187ad3,aa8eefb..6b3b64e
--- a/docs/en-US/time-zones.xml
+++ b/docs/en-US/time-zones.xml
@@@ -23,116 -23,115 +23,115 @@@
  -->
  
  <appendix id="time-zones">
 -    <title>Time Zones</title>
 +		<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>
+     <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>    
 +		<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>
- 
+ </appendix>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/30f2565d/docs/en-US/troubleshooting.xml
----------------------------------------------------------------------
diff --cc docs/en-US/troubleshooting.xml
index 1fe0347,24ecab5..570d02e
--- a/docs/en-US/troubleshooting.xml
+++ b/docs/en-US/troubleshooting.xml
@@@ -5,30 -5,31 +5,31 @@@
  ]>
  
  <!-- 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="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" />
 +    <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="troublesht-dataloss-on-exp-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="troublesht-mtn-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" />
 +    <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>


Mime
View raw message