cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [1/7] git commit: CLOUDSTACK-403: New Doc file on About password and key encryption. In the Install guide, fixed references to the same section.
Date Thu, 08 Nov 2012 05:30:37 GMT
Updated Branches:
  refs/heads/master d118a3d76 -> 35dcda2e8


CLOUDSTACK-403: New Doc file on About password and key encryption. In the Install guide, fixed references to the same section.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/35dcda2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/35dcda2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/35dcda2e

Branch: refs/heads/master
Commit: 35dcda2e88dc8f9dc9a933533c8758778de409bf
Parents: ffdf19d
Author: Radhika PC <radhika.puthiyetath@citrix.com>
Authored: Wed Nov 7 23:29:55 2012 -0600
Committer: Joe Brockmeier <jzb@zonker.net>
Committed: Wed Nov 7 23:29:55 2012 -0600

----------------------------------------------------------------------
 docs/tmp/en-US/html/accounts-users-domains.html    |   10 +-
 docs/tmp/en-US/html/configure-vpc.html             |    8 +-
 docs/tmp/en-US/html/host-add.html                  |    8 +-
 docs/tmp/en-US/html/index.html                     |    4 +-
 docs/tmp/en-US/html/log-in.html                    |    6 +-
 docs/tmp/en-US/html/network-service-providers.html |    2 +-
 ...oting-dataloss-on-exported-primary-storage.html |    8 +-
 .../en-US/html/troubleshooting-lb-rules-fails.html |    6 +-
 ...ng-maintenance-mode-not-working-on-vCenter.html |    8 +-
 ...roubleshooting-recover-lost-virtual-router.html |    6 +-
 .../html/troubleshooting-unable-to-deploy-vms.html |    6 +-
 .../troubleshooting-unable-to-power-on-vm.html     |    6 +-
 docs/tmp/en-US/html/upgrade-instructions.html      |    4 +-
 docs/tmp/en-US/html/vpn.html                       |    2 +-
 ...4.0.0-incubating-API_Developers_Guide-en-US.pdf |  Bin 463686 -> 463683 bytes
 ...oudStack-4.0.0-incubating-Admin_Guide-en-US.pdf |  Bin 1913994 -> 1913997 bytes
 ...dStack-4.0.0-incubating-Release_Notes-en-US.pdf |  Bin 274657 -> 274651 bytes
 docs/tmp/en-US/xml/API_Developers_Guide.fo         |  470 ++--
 docs/tmp/en-US/xml/Admin_Guide.fo                  | 2522 +++++++-------
 docs/tmp/en-US/xml/Release_Notes.fo                |  494 ++--
 .../xml/management-server-install-db-external.xml  |   20 +-
 .../xml/management-server-install-db-local.xml     |   20 +-
 .../en-US/xml/management-server-install-flow.xml   |    1 +
 docs/tmp/en-US/xml/prepare-system-vm-template.xml  |   12 +-
 .../management-server-install-db-external.xml      |  181 +-
 .../xml_tmp/management-server-install-db-local.xml |  144 +-
 .../xml_tmp/management-server-install-flow.xml     |    1 +
 .../en-US/xml_tmp/prepare-system-vm-template.xml   |   15 +-
 28 files changed, 2024 insertions(+), 1940 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35dcda2e/docs/tmp/en-US/html/accounts-users-domains.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/accounts-users-domains.html b/docs/tmp/en-US/html/accounts-users-domains.html
index 360c8b2..19b5e83 100644
--- a/docs/tmp/en-US/html/accounts-users-domains.html
+++ b/docs/tmp/en-US/html/accounts-users-domains.html
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>3.1. Accounts, Users, and Domains</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="accounts.html" title="Chapter 3. Accounts" /><link rel="prev" href="accounts.html" title="Chapter 3. Accounts" /><link rel="next" href="LDAPserver-for-user-authentication.html" title="3.2. Using an LDAP Server for User Authentication" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cl
 oudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="accounts.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="LDAPserver-for-user-authentication.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="accounts-users-domains" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="accounts-users-domains">3.1. Accounts, Users, and Domains</h2></div></div></div><div class="formalpara"><h5 class="formalpara" id="idp29528968">Accounts</h5>
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>3.1. Accounts, Users, and Domains</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="accounts.html" title="Chapter 3. Accounts" /><link rel="prev" href="accounts.html" title="Chapter 3. Accounts" /><link rel="next" href="LDAPserver-for-user-authentication.html" title="3.2. Using an LDAP Server for User Authentication" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cl
 oudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="accounts.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="LDAPserver-for-user-authentication.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="accounts-users-domains" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="accounts-users-domains">3.1. Accounts, Users, and Domains</h2></div></div></div><div class="formalpara"><h5 class="formalpara" id="idp24194632">Accounts</h5>
 			An account typically represents a customer of the service provider or a department in a large organization. Multiple users can exist in an account.
-		</div><div class="formalpara"><h5 class="formalpara" id="idp32299080">Domains</h5>
+		</div><div class="formalpara"><h5 class="formalpara" id="idp12742856">Domains</h5>
 			Accounts are grouped by domains. Domains usually contain multiple accounts that have some logical relationship to each other and a set of delegated administrators with some authority over the domain and its subdomains. For example, a service provider with several resellers could create a domain for each reseller.
 		</div><div class="para">
 		For each account created, the Cloud installation creates three different types of user accounts: root administrator, domain administrator, and user.
-	</div><div class="formalpara"><h5 class="formalpara" id="idp22320776">Users</h5>
+	</div><div class="formalpara"><h5 class="formalpara" id="idp33273016">Users</h5>
 			Users are like aliases in the account. Users in the same account are not isolated from each other, but they are isolated from users in other accounts. Most installations need not surface the notion of users; they just have one user per account. The same user cannot belong to multiple accounts.
 		</div><div class="para">
 		Username is unique in a domain across accounts in that domain. The same username can exist in other domains, including sub-domains. Domain name can repeat only if the full pathname from root is unique. For example, you can create root/d1, as well as root/foo/d1, and root/sales/d1.
 	</div><div class="para">
 		Administrators are accounts with special privileges in the system. There may be multiple administrators in the system. Administrators can create or delete other administrators, and change the password for any user in the system.
-	</div><div class="formalpara"><h5 class="formalpara" id="idp12497392">Domain Administrators</h5>
+	</div><div class="formalpara"><h5 class="formalpara" id="idp11323152">Domain Administrators</h5>
 			Domain administrators can perform administrative operations for users who belong to that domain. Domain administrators do not have visibility into physical servers or other domains.
-		</div><div class="formalpara"><h5 class="formalpara" id="idp27524088">Root Administrator</h5>
+		</div><div class="formalpara"><h5 class="formalpara" id="idp31236600">Root Administrator</h5>
 			Root administrators have complete access to the system, including managing templates, service offerings, customer care administrators, and domains
 		</div><div class="para">
 		The resources belong to the account, not individual users in that account. For example, billing, resource limits, and so on are maintained by the account, not the users. A user can operate on any resource in the account provided the user has privileges for that operation. The privileges are determined by the role.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35dcda2e/docs/tmp/en-US/html/configure-vpc.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/configure-vpc.html b/docs/tmp/en-US/html/configure-vpc.html
index 2748895..02d902e 100644
--- a/docs/tmp/en-US/html/configure-vpc.html
+++ b/docs/tmp/en-US/html/configure-vpc.html
@@ -4,7 +4,7 @@
 		CloudStack Virtual Private Cloud is a private, isolated part of CloudStack. A VPC can have its own virtual network topology that resembles a traditional physical network. You can launch VMs in the virtual network that can have private addresses in the range of your choice, for example: 10.0.0.0/16. You can define network tiers within your VPC network range, which in turn enables you to group similar kinds of instances based on IP address range.
 	</div><div class="para">
 		For example, if a VPC has the private range 10.0.0.0/16, its guest networks can have the network ranges 10.0.1.0/24, 10.0.2.0/24, 10.0.3.0/24, and so on.
-	</div><div class="formalpara"><h5 class="formalpara" id="idm2465312">Major Components of a VPC:</h5>
+	</div><div class="formalpara"><h5 class="formalpara" id="idp22264960">Major Components of a VPC:</h5>
 			A VPC is comprised of the following network components:
 		</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
 				<span class="bold bold"><strong>VPC</strong></span>: A VPC acts as a container for multiple isolated networks that can communicate with each other via its virtual router.
@@ -24,7 +24,7 @@
 				<span class="bold bold"><strong>Customer Gateway</strong></span>: The customer side of a VPN Connection. For more information, see <a class="xref" href="vpn.html#create-vpn-customer-gateway">Section 15.17.4.1, “Creating and Updating a VPN Customer Gateway”</a>.
 			</div></li><li class="listitem"><div class="para">
 				<span class="bold bold"><strong>NAT Instance</strong></span>: An instance that provides Port Address Translation for instances to access the Internet via the public gateway. For more information, see <a class="xref" href="configure-vpc.html#enable-disable-static-nat-vpc">Section 15.19.9, “Enabling or Disabling Static NAT on a VPC”</a>.
-			</div></li></ul></div><div class="formalpara"><h5 class="formalpara" id="idp18245304">Network Architecture in a VPC</h5>
+			</div></li></ul></div><div class="formalpara"><h5 class="formalpara" id="idp20947848">Network Architecture in a VPC</h5>
 			In a VPC, the following four basic options of network architectures are present:
 		</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
 				VPC with a public gateway only
@@ -34,7 +34,7 @@
 				VPC with public and private gateways and site-to-site VPN access
 			</div></li><li class="listitem"><div class="para">
 				VPC with a private gateway only and site-to-site VPN access
-			</div></li></ul></div><div class="formalpara"><h5 class="formalpara" id="idp11431504">Connectivity Options for a VPC</h5>
+			</div></li></ul></div><div class="formalpara"><h5 class="formalpara" id="idp39595544">Connectivity Options for a VPC</h5>
 			You can connect your VPC to:
 		</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
 				The Internet through the public gateway.
@@ -42,7 +42,7 @@
 				The corporate datacenter by using a site-to-site VPN connection through the VPN gateway.
 			</div></li><li class="listitem"><div class="para">
 				Both the Internet and your corporate datacenter by using both the public gateway and a VPN gateway.
-			</div></li></ul></div><div class="formalpara"><h5 class="formalpara" id="idp26490768">VPC Network Considerations</h5>
+			</div></li></ul></div><div class="formalpara"><h5 class="formalpara" id="idp18549888">VPC Network Considerations</h5>
 			Consider the following before you create a VPC:
 		</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
 				A VPC, by default, is created in the enabled state.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35dcda2e/docs/tmp/en-US/html/host-add.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/host-add.html b/docs/tmp/en-US/html/host-add.html
index 31aab80..2d27af7 100644
--- a/docs/tmp/en-US/html/host-add.html
+++ b/docs/tmp/en-US/html/host-add.html
@@ -14,7 +14,7 @@
 						<a class="xref" href="host-add.html#host-add-vsphere">Section 7.5.2, “Adding a Host (vSphere)”</a>
 					</div></li></ul></div></li></ol></div><div xml:lang="en-US" class="section" id="host-add-xenserver-kvm-ovm" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="host-add-xenserver-kvm-ovm">7.5.1. Adding a Host (XenServer or KVM)</h3></div></div></div><div class="para">
 		XenServer and KVM hosts can be added to a cluster at any time.
-	</div><div class="section"><div class="titlepage"><div><div><h4 class="title" id="idp18965080">7.5.1.1. Requirements for XenServer and KVM Hosts</h4></div></div></div><div class="warning"><div class="admonition_header"><h2>Warning</h2></div><div class="admonition"><div class="para">
+	</div><div class="section"><div class="titlepage"><div><div><h4 class="title" id="idp20707040">7.5.1.1. Requirements for XenServer and KVM Hosts</h4></div></div></div><div class="warning"><div class="admonition_header"><h2>Warning</h2></div><div class="admonition"><div class="para">
 				Make sure the hypervisor host does not have any VMs already running before you add it to CloudStack.
 			</div></div></div><div class="para">
 			Configuration requirements:
@@ -26,7 +26,7 @@
 					For KVM, do not put more than 16 hosts in a cluster.
 				</div></li></ul></div><div class="para">
 			For hardware requirements, see the installation section for your hypervisor in the CloudStack Installation Guide.
-		</div><div class="section"><div class="titlepage"><div><div><h5 class="title" id="idp15274064">7.5.1.1.1. XenServer Host Additional Requirements</h5></div></div></div><div class="para">
+		</div><div class="section"><div class="titlepage"><div><div><h5 class="title" id="idp12944944">7.5.1.1.1. XenServer Host Additional Requirements</h5></div></div></div><div class="para">
 				If network bonding is in use, the administrator must cable the new host identically to other hosts in the cluster.
 			</div><div class="para">
 				For all additional hosts to be added to the cluster, run the following command. This will cause the host to join the master in a XenServer pool.
@@ -38,11 +38,11 @@
 						Copy the script from the Management Server in /usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh to the master host and ensure it is executable.
 					</div></li><li class="listitem"><div class="para">
 						Run the script:
-					</div><pre class="programlisting"># ./cloud-setup-bonding.sh</pre></li></ol></div></div><div class="section"><div class="titlepage"><div><div><h5 class="title" id="idp30637992">7.5.1.1.2. KVM Host Additional Requirements</h5></div></div></div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
+					</div><pre class="programlisting"># ./cloud-setup-bonding.sh</pre></li></ol></div></div><div class="section"><div class="titlepage"><div><div><h5 class="title" id="idp19413968">7.5.1.1.2. KVM Host Additional Requirements</h5></div></div></div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
 						If shared mountpoint storage is in use, the administrator should ensure that the new host has all the same mountpoints (with storage mounted) as the other hosts in the cluster.
 					</div></li><li class="listitem"><div class="para">
 						Make sure the new host has the same network configuration (guest, private, and public network) as other hosts in the cluster.
-					</div></li></ul></div></div></div><div class="section"><div class="titlepage"><div><div><h4 class="title" id="idp17980992">7.5.1.2. Adding a XenServer or KVM Host</h4></div></div></div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
+					</div></li></ul></div></div></div><div class="section"><div class="titlepage"><div><div><h4 class="title" id="idp9596568">7.5.1.2. Adding a XenServer or KVM Host</h4></div></div></div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
 					If you have not already done so, install the hypervisor software on the host. You will need to know which version of the hypervisor software version is supported by CloudStack and what additional configuration is required to ensure the host will work with CloudStack. To find these installation details, see the appropriate section for your hypervisor in the CloudStack Installation Guide.
 				</div></li><li class="listitem"><div class="para">
 					Log in to the CloudStack UI as administrator.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35dcda2e/docs/tmp/en-US/html/index.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/index.html b/docs/tmp/en-US/html/index.html
index 229192f..89a0e0c 100644
--- a/docs/tmp/en-US/html/index.html
+++ b/docs/tmp/en-US/html/index.html
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Version 4.0.0-incubating Release Notes</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Release_Notes-4.0.0-incubating-en-US-1-" /><meta name="description" content="Release notes for the Apache CloudStack 4.0.0-incubating release." /><link rel="home" href="index.html" title="Version 4.0.0-incubating Release Notes" /><link rel="next" href="submitting-feedback.html" title="Chapter 1. Submitting Feedback and Getting Help" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/
 images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"></li><li class="next"><a accesskey="n" href="submitting-feedback.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="book" id="idm7823368" lang="en-US"><div class="titlepage"><div><div class="producttitle"><span class="productname">Apache CloudStack</span> <span class="productnumber"></span></div><div><h1 id="idm7823368" class="title">Version 4.0.0-incubating Release Notes</h1></div><div><h2 class="subtitle">Revised October 17, 2012 19:49 UTC</h2></div><div><h3 class="corpauthor">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Version 4.0.0-incubating Release Notes</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Release_Notes-4.0.0-incubating-en-US-1-" /><meta name="description" content="Release notes for the Apache CloudStack 4.0.0-incubating release." /><link rel="home" href="index.html" title="Version 4.0.0-incubating Release Notes" /><link rel="next" href="submitting-feedback.html" title="Chapter 1. Submitting Feedback and Getting Help" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/
 images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"></li><li class="next"><a accesskey="n" href="submitting-feedback.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="book" id="idp33482072" lang="en-US"><div class="titlepage"><div><div class="producttitle"><span class="productname">Apache CloudStack</span> <span class="productnumber"></span></div><div><h1 id="idp33482072" class="title">Version 4.0.0-incubating Release Notes</h1></div><div><h2 class="subtitle">Revised October 17, 2012 19:49 UTC</h2></div><div><h3 class="corpauthor">
 		<span class="inlinemediaobject"><object data="Common_Content/images/title_logo.svg" type="image/svg+xml"> </object></span>
 
-	</h3></div><div><div xml:lang="en-US" class="authorgroup" lang="en-US"><div class="author"><h3 class="author"><span class="firstname">Apache</span> <span class="surname">CloudStack</span></h3></div></div></div><hr /><div><div id="idm10776560" class="legalnotice"><h1 class="legalnotice">Legal Notice</h1><div class="para">
+	</h3></div><div><div xml:lang="en-US" class="authorgroup" lang="en-US"><div class="author"><h3 class="author"><span class="firstname">Apache</span> <span class="surname">CloudStack</span></h3></div></div></div><hr /><div><div id="idm4223528" class="legalnotice"><h1 class="legalnotice">Legal Notice</h1><div class="para">
 		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
 	</div><div class="para">
 		http://www.apache.org/licenses/LICENSE-2.0

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35dcda2e/docs/tmp/en-US/html/log-in.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/log-in.html b/docs/tmp/en-US/html/log-in.html
index 6ece78e..30f6307 100644
--- a/docs/tmp/en-US/html/log-in.html
+++ b/docs/tmp/en-US/html/log-in.html
@@ -4,11 +4,11 @@
 		CloudStack provides a web-based UI that can be used by both administrators and end users. The appropriate version of the UI is displayed depending on the credentials used to log in. The UI is available in popular browsers including IE7, IE8, IE9, Firefox 3.5+, Firefox 4, Safari 4, and Safari 5. The URL is: (substitute your own management server IP address)
 	</div><pre class="programlisting">http://&lt;management-server-ip-address&gt;:8080/client</pre><div class="para">
 		On a fresh Management Server installation, a guided tour splash screen appears. On later visits, you’ll see a login screen where you specify the following to proceed to your Dashboard:
-	</div><div class="formalpara"><h5 class="formalpara" id="idp27394904">Username</h5>
+	</div><div class="formalpara"><h5 class="formalpara" id="idp26621976">Username</h5>
 			The user ID of your account. The default username is admin.
-		</div><div class="formalpara"><h5 class="formalpara" id="idp21659472">Password</h5>
+		</div><div class="formalpara"><h5 class="formalpara" id="idp44198600">Password</h5>
 			The password associated with the user ID. The password for the default username is password.
-		</div><div class="formalpara"><h5 class="formalpara" id="idp45767760">Domain</h5>
+		</div><div class="formalpara"><h5 class="formalpara" id="idp19700448">Domain</h5>
 			If you are a root user, leave this field blank.
 		</div><div class="para">
 		If you are a user in the sub-domains, enter the full path to the domain, excluding the root domain.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35dcda2e/docs/tmp/en-US/html/network-service-providers.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/network-service-providers.html b/docs/tmp/en-US/html/network-service-providers.html
index 4c59e84..48b4b54 100644
--- a/docs/tmp/en-US/html/network-service-providers.html
+++ b/docs/tmp/en-US/html/network-service-providers.html
@@ -8,6 +8,6 @@
 		You can have multiple instances of the same service provider in a network (say, more than one Juniper SRX device).
 	</div><div class="para">
 		If different providers are set up to provide the same service on the network, the administrator can create network offerings so users can specify which network service provider they prefer (along with the other choices offered in network offerings). Otherwise, CloudPlatform will choose which provider to use whenever the service is called for.
-	</div><div class="formalpara"><h5 class="formalpara" id="idp38586936">Supported Network Service Providers</h5>
+	</div><div class="formalpara"><h5 class="formalpara" id="idp21852344">Supported Network Service Providers</h5>
 			CloudPlatform ships with an internal list of the supported service providers, and you can choose from this list when creating a network offering.
 		</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="about-virtual-networks.html"><strong>Prev</strong>9.2. About Virtual Networks</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="network-offerings.html"><strong>Next</strong>9.4. Network Offerings</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35dcda2e/docs/tmp/en-US/html/troubleshooting-dataloss-on-exported-primary-storage.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/troubleshooting-dataloss-on-exported-primary-storage.html b/docs/tmp/en-US/html/troubleshooting-dataloss-on-exported-primary-storage.html
index 91bfe53..0981ebc 100644
--- a/docs/tmp/en-US/html/troubleshooting-dataloss-on-exported-primary-storage.html
+++ b/docs/tmp/en-US/html/troubleshooting-dataloss-on-exported-primary-storage.html
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>22.3. Data Loss on Exported Primary Storage</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="troubleshooting.html" title="Chapter 22. Troubleshooting" /><link rel="prev" href="troubleshooting-working-with-server-logs.html" title="22.2. Working with Server Logs" /><link rel="next" href="troubleshooting-recover-lost-virtual-router.html" title="22.4. Recovering a Lost Virtual Router" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.pn
 g" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="troubleshooting-working-with-server-logs.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="troubleshooting-recover-lost-virtual-router.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="troubleshooting-dataloss-on-exported-primary-storage" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="troubleshooting-dataloss-on-exported-primary-storage">22.3. Data Loss on Exported Primary Storage</h2></div></div></div><div class="formalpara"><h5 class="formalpara" id="idp42307296">Symptom</h5>
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>22.3. Data Loss on Exported Primary Storage</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="troubleshooting.html" title="Chapter 22. Troubleshooting" /><link rel="prev" href="troubleshooting-working-with-server-logs.html" title="22.2. Working with Server Logs" /><link rel="next" href="troubleshooting-recover-lost-virtual-router.html" title="22.4. Recovering a Lost Virtual Router" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.pn
 g" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="troubleshooting-working-with-server-logs.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="troubleshooting-recover-lost-virtual-router.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="troubleshooting-dataloss-on-exported-primary-storage" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="troubleshooting-dataloss-on-exported-primary-storage">22.3. Data Loss on Exported Primary Storage</h2></div></div></div><div class="formalpara"><h5 class="formalpara" id="idp29375576">Symptom</h5>
 			Loss of existing data on primary storage which has been exposed as a Linux NFS server export on an iSCSI volume.
-		</div><div class="formalpara"><h5 class="formalpara" id="idp21953984">Cause</h5>
+		</div><div class="formalpara"><h5 class="formalpara" id="idp32790744">Cause</h5>
 			It is possible that a client from outside the intended pool has mounted the storage. When this occurs, the LVM is wiped and all data in the volume is lost
-		</div><div class="formalpara"><h5 class="formalpara" id="idp38832632">Solution</h5>
+		</div><div class="formalpara"><h5 class="formalpara" id="idp18593888">Solution</h5>
 			When setting up LUN exports, restrict the range of IP addresses that are allowed access by specifying a subnet mask. For example:
 		</div><pre class="programlisting">echo “/export 192.168.1.0/24(rw,async,no_root_squash)” &gt; /etc/exports</pre><div class="para">
 		Adjust the above command to suit your deployment needs.
-	</div><div class="formalpara"><h5 class="formalpara" id="idp41867584">More Information</h5>
+	</div><div class="formalpara"><h5 class="formalpara" id="idp12092944">More Information</h5>
 			See the export procedure in the "Secondary Storage" section of the CloudStack Installation Guide
 		</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="troubleshooting-working-with-server-logs.html"><strong>Prev</strong>22.2. Working with Server Logs</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="troubleshooting-recover-lost-virtual-router.html"><strong>Next</strong>22.4. Recovering a Lost Virtual Router </a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35dcda2e/docs/tmp/en-US/html/troubleshooting-lb-rules-fails.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/troubleshooting-lb-rules-fails.html b/docs/tmp/en-US/html/troubleshooting-lb-rules-fails.html
index adb82ff..fc73fba 100644
--- a/docs/tmp/en-US/html/troubleshooting-lb-rules-fails.html
+++ b/docs/tmp/en-US/html/troubleshooting-lb-rules-fails.html
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>22.8. Load balancer rules fail after changing network offering</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="troubleshooting.html" title="Chapter 22. Troubleshooting" /><link rel="prev" href="troubleshooting-unable-to-power-on-vm.html" title="22.7. Unable to power on virtual machine on VMware" /><link rel="next" href="time-zones.html" title="Appendix A. Time Zones" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.png" alt="Prod
 uct Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="troubleshooting-unable-to-power-on-vm.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="time-zones.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="troubleshooting-lb-rules-fails" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="troubleshooting-lb-rules-fails">22.8. Load balancer rules fail after changing network offering</h2></div></div></div><div class="formalpara"><h5 class="formalpara" id="idp35401992">Symptom</h5>
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>22.8. Load balancer rules fail after changing network offering</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="troubleshooting.html" title="Chapter 22. Troubleshooting" /><link rel="prev" href="troubleshooting-unable-to-power-on-vm.html" title="22.7. Unable to power on virtual machine on VMware" /><link rel="next" href="time-zones.html" title="Appendix A. Time Zones" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.png" alt="Prod
 uct Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="troubleshooting-unable-to-power-on-vm.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="time-zones.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="troubleshooting-lb-rules-fails" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="troubleshooting-lb-rules-fails">22.8. Load balancer rules fail after changing network offering</h2></div></div></div><div class="formalpara"><h5 class="formalpara" id="idp23974856">Symptom</h5>
 			After changing the network offering on a network, load balancer rules stop working.
-		</div><div class="formalpara"><h5 class="formalpara" id="idp31426232">Cause</h5>
+		</div><div class="formalpara"><h5 class="formalpara" id="idp29376160">Cause</h5>
 			Load balancing rules were created while using a network service offering that includes an external load balancer device such as NetScaler, and later the network service offering changed to one that uses the CloudPlatform virtual router.
-		</div><div class="formalpara"><h5 class="formalpara" id="idp12407424">Solution</h5>
+		</div><div class="formalpara"><h5 class="formalpara" id="idp10923016">Solution</h5>
 			Create a firewall rule on the virtual router for each of your existing load balancing rules so that they continue to function.
 		</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="troubleshooting-unable-to-power-on-vm.html"><strong>Prev</strong>22.7. Unable to power on virtual machine on VMware</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="time-zones.html"><strong>Next</strong>Appendix A. Time Zones</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35dcda2e/docs/tmp/en-US/html/troubleshooting-maintenance-mode-not-working-on-vCenter.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/troubleshooting-maintenance-mode-not-working-on-vCenter.html b/docs/tmp/en-US/html/troubleshooting-maintenance-mode-not-working-on-vCenter.html
index 867ad3d..7b86c4a 100644
--- a/docs/tmp/en-US/html/troubleshooting-maintenance-mode-not-working-on-vCenter.html
+++ b/docs/tmp/en-US/html/troubleshooting-maintenance-mode-not-working-on-vCenter.html
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>22.5. Maintenance mode not working on vCenter</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="troubleshooting.html" title="Chapter 22. Troubleshooting" /><link rel="prev" href="troubleshooting-recover-lost-virtual-router.html" title="22.4. Recovering a Lost Virtual Router" /><link rel="next" href="troubleshooting-unable-to-deploy-vms.html" title="22.6. Unable to deploy VMs from uploaded vSphere template" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Con
 tent/images/image_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="troubleshooting-recover-lost-virtual-router.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="troubleshooting-unable-to-deploy-vms.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="troubleshooting-maintenance-mode-not-working-on-vCenter" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="troubleshooting-maintenance-mode-not-working-on-vCenter">22.5. Maintenance mode not working on vCenter</h2></div></div></div><div class="formalpara"><h5 class="formalpara" id="idp43883944">Symptom</h5>
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>22.5. Maintenance mode not working on vCenter</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="troubleshooting.html" title="Chapter 22. Troubleshooting" /><link rel="prev" href="troubleshooting-recover-lost-virtual-router.html" title="22.4. Recovering a Lost Virtual Router" /><link rel="next" href="troubleshooting-unable-to-deploy-vms.html" title="22.6. Unable to deploy VMs from uploaded vSphere template" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Con
 tent/images/image_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="troubleshooting-recover-lost-virtual-router.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="troubleshooting-unable-to-deploy-vms.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="troubleshooting-maintenance-mode-not-working-on-vCenter" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="troubleshooting-maintenance-mode-not-working-on-vCenter">22.5. Maintenance mode not working on vCenter</h2></div></div></div><div class="formalpara"><h5 class="formalpara" id="idp22134064">Symptom</h5>
 			Host was placed in maintenance mode, but still appears live in vCenter.
-		</div><div class="formalpara"><h5 class="formalpara" id="idp14711528">Cause</h5>
+		</div><div class="formalpara"><h5 class="formalpara" id="idp31219064">Cause</h5>
 			The CloudPlatform administrator UI was used to place the host in scheduled maintenance mode. This mode is separate from vCenter's maintenance mode.
-		</div><div class="formalpara"><h5 class="formalpara" id="idm3324016">Solution</h5>
+		</div><div class="formalpara"><h5 class="formalpara" id="idp39718816">Solution</h5>
 			Use vCenter to place the host in maintenance mode.
-		</div><div class="formalpara"><h5 class="formalpara" id="idp20550296">More Information</h5>
+		</div><div class="formalpara"><h5 class="formalpara" id="idp29442136">More Information</h5>
 			See <a class="xref" href="scheduled-maintenance-maintenance-mode-hosts.html">Section 11.2, “Scheduled Maintenance and Maintenance Mode for Hosts”</a>
 		</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="troubleshooting-recover-lost-virtual-router.html"><strong>Prev</strong>22.4. Recovering a Lost Virtual Router </a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="troubleshooting-unable-to-deploy-vms.html"><strong>Next</strong>22.6. Unable to deploy VMs from uploaded vSphere ...</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35dcda2e/docs/tmp/en-US/html/troubleshooting-recover-lost-virtual-router.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/troubleshooting-recover-lost-virtual-router.html b/docs/tmp/en-US/html/troubleshooting-recover-lost-virtual-router.html
index 8f16d7e..685f2f5 100644
--- a/docs/tmp/en-US/html/troubleshooting-recover-lost-virtual-router.html
+++ b/docs/tmp/en-US/html/troubleshooting-recover-lost-virtual-router.html
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>22.4. Recovering a Lost Virtual Router</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="troubleshooting.html" title="Chapter 22. Troubleshooting" /><link rel="prev" href="troubleshooting-dataloss-on-exported-primary-storage.html" title="22.3. Data Loss on Exported Primary Storage" /><link rel="next" href="troubleshooting-maintenance-mode-not-working-on-vCenter.html" title="22.5. Maintenance mode not working on vCenter" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img s
 rc="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="troubleshooting-dataloss-on-exported-primary-storage.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="troubleshooting-maintenance-mode-not-working-on-vCenter.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="troubleshooting-recover-lost-virtual-router" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="troubleshooting-recover-lost-virtual-router">22.4. Recovering a Lost Virtual Router </h2></div></div></div><div class="formalpara"><h5 class="formalpara" id="idp16714528">Symptom</h5>
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>22.4. Recovering a Lost Virtual Router</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="troubleshooting.html" title="Chapter 22. Troubleshooting" /><link rel="prev" href="troubleshooting-dataloss-on-exported-primary-storage.html" title="22.3. Data Loss on Exported Primary Storage" /><link rel="next" href="troubleshooting-maintenance-mode-not-working-on-vCenter.html" title="22.5. Maintenance mode not working on vCenter" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img s
 rc="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="troubleshooting-dataloss-on-exported-primary-storage.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="troubleshooting-maintenance-mode-not-working-on-vCenter.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="troubleshooting-recover-lost-virtual-router" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="troubleshooting-recover-lost-virtual-router">22.4. Recovering a Lost Virtual Router </h2></div></div></div><div class="formalpara"><h5 class="formalpara" id="idp36483568">Symptom</h5>
 			A virtual router is running, but the host is disconnected. A virtual router no longer functions as expected.
-		</div><div class="formalpara"><h5 class="formalpara" id="idp31348896">Cause</h5>
+		</div><div class="formalpara"><h5 class="formalpara" id="idp43392600">Cause</h5>
 			The Virtual router is lost or down.
-		</div><div class="formalpara"><h5 class="formalpara" id="idp21789256">Solution</h5>
+		</div><div class="formalpara"><h5 class="formalpara" id="idp28569512">Solution</h5>
 			If you are sure that a virtual router is down forever, or no longer functions as expected, destroy it. You must create one afresh while keeping the backup router up and running (it is assumed this is in a redundant router setup):
 		</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
 				Force stop the router. Use the stopRouter API with forced=true parameter to do so.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35dcda2e/docs/tmp/en-US/html/troubleshooting-unable-to-deploy-vms.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/troubleshooting-unable-to-deploy-vms.html b/docs/tmp/en-US/html/troubleshooting-unable-to-deploy-vms.html
index 0f42235..c017acb 100644
--- a/docs/tmp/en-US/html/troubleshooting-unable-to-deploy-vms.html
+++ b/docs/tmp/en-US/html/troubleshooting-unable-to-deploy-vms.html
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>22.6. Unable to deploy VMs from uploaded vSphere template</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="troubleshooting.html" title="Chapter 22. Troubleshooting" /><link rel="prev" href="troubleshooting-maintenance-mode-not-working-on-vCenter.html" title="22.5. Maintenance mode not working on vCenter" /><link rel="next" href="troubleshooting-unable-to-power-on-vm.html" title="22.7. Unable to power on virtual machine on VMware" /></head><body><p id="title"><a class="left" href="http://cloudstack.
 org"><img src="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="troubleshooting-maintenance-mode-not-working-on-vCenter.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="troubleshooting-unable-to-power-on-vm.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="troubleshooting-unable-to-deploy-vms" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="troubleshooting-unable-to-deploy-vms">22.6. Unable to deploy VMs from uploaded vSphere template</h2></div></div></div><div class="formalpara"><h5 class="formalpara" id="idp20508408">Symptom</h5>
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>22.6. Unable to deploy VMs from uploaded vSphere template</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="troubleshooting.html" title="Chapter 22. Troubleshooting" /><link rel="prev" href="troubleshooting-maintenance-mode-not-working-on-vCenter.html" title="22.5. Maintenance mode not working on vCenter" /><link rel="next" href="troubleshooting-unable-to-power-on-vm.html" title="22.7. Unable to power on virtual machine on VMware" /></head><body><p id="title"><a class="left" href="http://cloudstack.
 org"><img src="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="troubleshooting-maintenance-mode-not-working-on-vCenter.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="troubleshooting-unable-to-power-on-vm.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="troubleshooting-unable-to-deploy-vms" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="troubleshooting-unable-to-deploy-vms">22.6. Unable to deploy VMs from uploaded vSphere template</h2></div></div></div><div class="formalpara"><h5 class="formalpara" id="idp31517752">Symptom</h5>
 			When attempting to create a VM, the VM will not deploy.
-		</div><div class="formalpara"><h5 class="formalpara" id="idp8641272">Cause</h5>
+		</div><div class="formalpara"><h5 class="formalpara" id="idp1611816">Cause</h5>
 			If the template was created by uploading an OVA file that was created using vSphere Client, it is possible the OVA contained an ISO image. If it does, the deployment of VMs from the template will fail.
-		</div><div class="formalpara"><h5 class="formalpara" id="idp25075000">Solution</h5>
+		</div><div class="formalpara"><h5 class="formalpara" id="idp15566912">Solution</h5>
 			Remove the ISO and re-upload the template.
 		</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="troubleshooting-maintenance-mode-not-working-on-vCenter.html"><strong>Prev</strong>22.5. Maintenance mode not working on vCenter</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="troubleshooting-unable-to-power-on-vm.html"><strong>Next</strong>22.7. Unable to power on virtual machine on VMware</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35dcda2e/docs/tmp/en-US/html/troubleshooting-unable-to-power-on-vm.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/troubleshooting-unable-to-power-on-vm.html b/docs/tmp/en-US/html/troubleshooting-unable-to-power-on-vm.html
index f5ad17c..2d53a1f 100644
--- a/docs/tmp/en-US/html/troubleshooting-unable-to-power-on-vm.html
+++ b/docs/tmp/en-US/html/troubleshooting-unable-to-power-on-vm.html
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>22.7. Unable to power on virtual machine on VMware</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="troubleshooting.html" title="Chapter 22. Troubleshooting" /><link rel="prev" href="troubleshooting-unable-to-deploy-vms.html" title="22.6. Unable to deploy VMs from uploaded vSphere template" /><link rel="next" href="troubleshooting-lb-rules-fails.html" title="22.8. Load balancer rules fail after changing network offering" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img
  src="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="troubleshooting-unable-to-deploy-vms.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="troubleshooting-lb-rules-fails.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="troubleshooting-unable-to-power-on-vm" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="troubleshooting-unable-to-power-on-vm">22.7. Unable to power on virtual machine on VMware</h2></div></div></div><div class="formalpara"><h5 class="formalpara" id="idp19088416">Symptom</h5>
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>22.7. Unable to power on virtual machine on VMware</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="troubleshooting.html" title="Chapter 22. Troubleshooting" /><link rel="prev" href="troubleshooting-unable-to-deploy-vms.html" title="22.6. Unable to deploy VMs from uploaded vSphere template" /><link rel="next" href="troubleshooting-lb-rules-fails.html" title="22.8. Load balancer rules fail after changing network offering" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img
  src="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="troubleshooting-unable-to-deploy-vms.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="troubleshooting-lb-rules-fails.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="troubleshooting-unable-to-power-on-vm" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="troubleshooting-unable-to-power-on-vm">22.7. Unable to power on virtual machine on VMware</h2></div></div></div><div class="formalpara"><h5 class="formalpara" id="idp36484064">Symptom</h5>
 			Virtual machine does not power on. You might see errors like:
 		</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
 				Unable to open Swap File
@@ -8,9 +8,9 @@
 				Unable to access a file since it is locked
 			</div></li><li class="listitem"><div class="para">
 				Unable to access Virtual machine configuration
-			</div></li></ul></div><div class="formalpara"><h5 class="formalpara" id="idp38700296">Cause</h5>
+			</div></li></ul></div><div class="formalpara"><h5 class="formalpara" id="idp46116352">Cause</h5>
 			A known issue on VMware machines. ESX hosts lock certain critical virtual machine files and file systems to prevent concurrent changes. Sometimes the files are not unlocked when the virtual machine is powered off. When a virtual machine attempts to power on, it can not access these critical files, and the virtual machine is unable to power on.
-		</div><div class="formalpara"><h5 class="formalpara" id="idp12372144">Solution</h5>
+		</div><div class="formalpara"><h5 class="formalpara" id="idp30231888">Solution</h5>
 			See the following:
 		</div><div class="para">
 		<a href="http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&amp;cmd=displayKC&amp;externalId=10051/">VMware Knowledge Base Article</a>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35dcda2e/docs/tmp/en-US/html/upgrade-instructions.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/upgrade-instructions.html b/docs/tmp/en-US/html/upgrade-instructions.html
index 442b2d7..0068516 100644
--- a/docs/tmp/en-US/html/upgrade-instructions.html
+++ b/docs/tmp/en-US/html/upgrade-instructions.html
@@ -574,14 +574,14 @@ Done restarting router(s).
 						If you would like additional confirmation that the new system VM templates were correctly applied when these system VMs were rebooted, SSH into the System VM and check the version.
 					</div><div class="para">
 						Use one of the following techniques, depending on the hypervisor.
-					</div><div class="formalpara"><h5 class="formalpara" id="idm10488952">XenServer or KVM:</h5>
+					</div><div class="formalpara"><h5 class="formalpara" id="idp17486672">XenServer or KVM:</h5>
 							SSH in by using the link local IP address of the system VM. For example, in the command below, substitute your own path to the private key used to log in to the system VM and your own link local IP.
 						</div><div class="para">
 						Run the following commands on the XenServer or KVM host on which the system VM is present:
 					</div><pre class="programlisting"><code class="prompt">#</code> <code class="command">ssh</code> -i <em class="replaceable"><code>private-key-path</code></em> <em class="replaceable"><code>link-local-ip</code></em> -p 3922
 # cat /etc/cloudstack-release</pre><div class="para">
 						The output should be like the following:
-					</div><pre class="programlisting">Cloudstack Release 4.0.0-incubating Mon Oct 9 15:10:04 PST 2012</pre><div class="formalpara"><h5 class="formalpara" id="idm7482664">ESXi</h5>
+					</div><pre class="programlisting">Cloudstack Release 4.0.0-incubating Mon Oct 9 15:10:04 PST 2012</pre><div class="formalpara"><h5 class="formalpara" id="idp20120864">ESXi</h5>
 							SSH in using the private IP address of the system VM. For example, in the command below, substitute your own path to the private key used to log in to the system VM and your own private IP.
 						</div><div class="para">
 						Run the following commands on the Management Server:

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35dcda2e/docs/tmp/en-US/html/vpn.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/vpn.html b/docs/tmp/en-US/html/vpn.html
index f873ebf..59b71e1 100644
--- a/docs/tmp/en-US/html/vpn.html
+++ b/docs/tmp/en-US/html/vpn.html
@@ -140,7 +140,7 @@
 						<span class="bold bold"><strong>Dead Peer Detection</strong></span>: A method to detect an unavailable Internet Key Exchange (IKE) peer. Select this option if you want the virtual router to query the liveliness of its IKE peer at regular intervals. It’s recommended to have the same configuration of DPD on both side of VPN connection.
 					</div></li></ul></div></li><li class="listitem"><div class="para">
 				Click OK.
-			</div></li></ol></div><div class="formalpara"><h5 class="formalpara" id="idp42965968">Updating and Removing a VPN Customer Gateway</h5>
+			</div></li></ol></div><div class="formalpara"><h5 class="formalpara" id="idp32485864">Updating and Removing a VPN Customer Gateway</h5>
 			You can update a customer gateway either with no VPN connection, or related VPN connection is in error state.
 		</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
 				Log in to the CloudStack UI as an administrator or end user.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35dcda2e/docs/tmp/en-US/pdf/Apache_CloudStack-4.0.0-incubating-API_Developers_Guide-en-US.pdf
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/pdf/Apache_CloudStack-4.0.0-incubating-API_Developers_Guide-en-US.pdf b/docs/tmp/en-US/pdf/Apache_CloudStack-4.0.0-incubating-API_Developers_Guide-en-US.pdf
index c4e90e6..0beeff2 100644
Binary files a/docs/tmp/en-US/pdf/Apache_CloudStack-4.0.0-incubating-API_Developers_Guide-en-US.pdf and b/docs/tmp/en-US/pdf/Apache_CloudStack-4.0.0-incubating-API_Developers_Guide-en-US.pdf differ

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35dcda2e/docs/tmp/en-US/pdf/Apache_CloudStack-4.0.0-incubating-Admin_Guide-en-US.pdf
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/pdf/Apache_CloudStack-4.0.0-incubating-Admin_Guide-en-US.pdf b/docs/tmp/en-US/pdf/Apache_CloudStack-4.0.0-incubating-Admin_Guide-en-US.pdf
index 6d4d06b..82cdd99 100644
Binary files a/docs/tmp/en-US/pdf/Apache_CloudStack-4.0.0-incubating-Admin_Guide-en-US.pdf and b/docs/tmp/en-US/pdf/Apache_CloudStack-4.0.0-incubating-Admin_Guide-en-US.pdf differ

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35dcda2e/docs/tmp/en-US/pdf/Apache_CloudStack-4.0.0-incubating-Release_Notes-en-US.pdf
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/pdf/Apache_CloudStack-4.0.0-incubating-Release_Notes-en-US.pdf b/docs/tmp/en-US/pdf/Apache_CloudStack-4.0.0-incubating-Release_Notes-en-US.pdf
index 82b5c89..283f880 100644
Binary files a/docs/tmp/en-US/pdf/Apache_CloudStack-4.0.0-incubating-Release_Notes-en-US.pdf and b/docs/tmp/en-US/pdf/Apache_CloudStack-4.0.0-incubating-Release_Notes-en-US.pdf differ


Mime
View raw message