You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/11/19 15:11:28 UTC

[11/29] cleaning up docs temp, publish directories - adding gitignore entries for them for the future

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35666a52/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/accounts-users-domains.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/accounts-users-domains.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/accounts-users-domains.html
deleted file mode 100644
index f9503b9..0000000
--- a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/accounts-users-domains.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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-" /><script type="text/javascript" src="../../../../../toc.js"></script><script type="text/javascript">
-              addID('Apache_CloudStack');
-              
-	      addID('Apache_CloudStack.4.0.0-incubating');
-              
-              addID('Apache_CloudStack.4.0.0-incubating.books');
-	      addID('Apache_CloudStack.4.0.0-incubating.Admin_Guide');
-              </script><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 class="toc_embeded "><div id="tocdiv" class="toc"><iframe id="tocframe" class="toc" src="../../../../toc.html">This is an iframe, to view it upgrade your browser or enable iframe display.</iframe></div><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="accounts.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="LDA
 Pserver-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="idp9581280">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="idp14464944">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="idp9727712">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="idp20156808">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="idp18595200">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.
-	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="accounts.html"><strong>Prev</strong>Chapter 3. Accounts</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="LDAPserver-for-user-authentication.html"><strong>Next</strong>3.2. Using an LDAP Server for User Authentication</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35666a52/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/accounts.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/accounts.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/accounts.html
deleted file mode 100644
index ba836fc..0000000
--- a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/accounts.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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>Chapter 3. Accounts</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-" /><script type="text/javascript" src="../../../../../toc.js"></script><script type="text/javascript">
-              addID('Apache_CloudStack');
-              
-	      addID('Apache_CloudStack.4.0.0-incubating');
-              
-              addID('Apache_CloudStack.4.0.0-incubating.books');
-	      addID('Apache_CloudStack.4.0.0-incubating.Admin_Guide');
-              </script><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="index.html" title="CloudStack Administrator's Guide" /><link rel="prev" href="about-physical-networks.html" title="2.7. About Physical Networks" /><link rel="next" href="accounts-users-domains.html" title="3.1. Accounts, Users, and Domains" /></head><body class="toc_embeded "><div id="tocdiv" class="toc"><iframe id="tocframe" class="toc" src="../../../../toc.html">This is an iframe, to view it upgrade your browser or enable iframe display.</iframe></div><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="about-physical-networks.html"><strong>Prev</strong></a></li><li class="next"><a acces
 skey="n" href="accounts-users-domains.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="chapter" id="accounts" lang="en-US"><div class="titlepage"><div><div><h2 class="title">Chapter 3. Accounts</h2></div></div></div><div class="toc"><dl><dt><span class="section"><a href="accounts-users-domains.html">3.1. Accounts, Users, and Domains</a></span></dt><dt><span class="section"><a href="LDAPserver-for-user-authentication.html">3.2. Using an LDAP Server for User Authentication</a></span></dt><dd><dl><dt><span class="section"><a href="LDAPserver-for-user-authentication.html#example-LDAP-configuration-commands">3.2.1. Example LDAP Configuration Commands</a></span></dt><dt><span class="section"><a href="LDAPserver-for-user-authentication.html#search-base">3.2.2. Search Base</a></span></dt><dt><span class="section"><a href="LDAPserver-for-user-authentication.html#query-filter">3.2.3. Query Filter</a></span></dt><dt><span class="section"><a href="LDAPserver-for-user-auth
 entication.html#search-user-bind-dn">3.2.4. Search User Bind DN</a></span></dt><dt><span class="section"><a href="LDAPserver-for-user-authentication.html#SSL-keystore-path-and-password">3.2.5. SSL Keystore Path and Password</a></span></dt></dl></dd></dl></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="about-physical-networks.html"><strong>Prev</strong>2.7. About Physical 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="accounts-users-domains.html"><strong>Next</strong>3.1. Accounts, Users, and Domains</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35666a52/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/acquire-new-ip-address.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/acquire-new-ip-address.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/acquire-new-ip-address.html
deleted file mode 100644
index fc5fb40..0000000
--- a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/acquire-new-ip-address.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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>15.11. Acquiring a New IP Address</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-" /><script type="text/javascript" src="../../../../../toc.js"></script><script type="text/javascript">
-              addID('Apache_CloudStack');
-              
-	      addID('Apache_CloudStack.4.0.0-incubating');
-              
-              addID('Apache_CloudStack.4.0.0-incubating.books');
-	      addID('Apache_CloudStack.4.0.0-incubating.Admin_Guide');
-              </script><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="networks.html" title="Chapter 15. Managing Networks and Traffic" /><link rel="prev" href="guest-ip-ranges.html" title="15.10. Guest IP Ranges" /><link rel="next" href="release-ip-address.html" title="15.12. Releasing an IP Address" /></head><body class="toc_embeded "><div id="tocdiv" class="toc"><iframe id="tocframe" class="toc" src="../../../../toc.html">This is an iframe, to view it upgrade your browser or enable iframe display.</iframe></div><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="guest-ip-ranges.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="
 release-ip-address.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="acquire-new-ip-address" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="acquire-new-ip-address">15.11. Acquiring a New IP Address</h2></div></div></div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				Log in to the CloudStack UI as an administrator or end user.
-			</div></li><li class="listitem"><div class="para">
-				In the left navigation, choose Network.
-			</div></li><li class="listitem"><div class="para">
-				Click the name of the network where you want to work with.
-			</div></li><li class="listitem"><div class="para">
-				Click View IP Addresses.
-			</div></li><li class="listitem"><div class="para">
-				Click Acquire New IP, and click Yes in the confirmation dialog.
-			</div><div class="para">
-				You are prompted for confirmation because, typically, IP addresses are a limited resource. Within a few moments, the new IP address should appear with the state Allocated. You can now use the IP address in port forwarding or static NAT rules.
-			</div></li></ol></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="guest-ip-ranges.html"><strong>Prev</strong>15.10. Guest IP Ranges</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="release-ip-address.html"><strong>Next</strong>15.12. Releasing an IP Address</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35666a52/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/add-members-to-projects.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/add-members-to-projects.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/add-members-to-projects.html
deleted file mode 100644
index 8309cab..0000000
--- a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/add-members-to-projects.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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>6.4. Adding Members to a Project</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-" /><script type="text/javascript" src="../../../../../toc.js"></script><script type="text/javascript">
-              addID('Apache_CloudStack');
-              
-	      addID('Apache_CloudStack.4.0.0-incubating');
-              
-              addID('Apache_CloudStack.4.0.0-incubating.books');
-	      addID('Apache_CloudStack.4.0.0-incubating.Admin_Guide');
-              </script><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="projects.html" title="Chapter 6. Using Projects to Organize Users and Resources" /><link rel="prev" href="create-new-projects.html" title="6.3. Creating a New Project" /><link rel="next" href="accept-membership-invite.html" title="6.5. Accepting a Membership Invitation" /></head><body class="toc_embeded "><div id="tocdiv" class="toc"><iframe id="tocframe" class="toc" src="../../../../toc.html">This is an iframe, to view it upgrade your browser or enable iframe display.</iframe></div><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="create-new-projects.html"><strong>Prev</strong></a></
 li><li class="next"><a accesskey="n" href="accept-membership-invite.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="add-members-to-projects" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="add-members-to-projects">6.4. Adding Members to a Project</h2></div></div></div><div class="para">
-		New members can be added to a project by the project’s administrator, the domain administrator of the domain where the project resides or any parent domain, or the CloudStack root administrator. There are two ways to add members in CloudStack, but only one way is enabled at a time:
-	</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-				If invitations have been enabled, you can send invitations to new members.
-			</div></li><li class="listitem"><div class="para">
-				If invitations are not enabled, you can add members directly through the UI.
-			</div></li></ul></div><div xml:lang="en-US" class="section" id="send-projects-membership-invitation" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="send-projects-membership-invitation">6.4.1. Sending Project Membership Invitations</h3></div></div></div><div class="para">
-		Use these steps to add a new member to a project if the invitations feature is enabled in the cloud as described in <a class="xref" href="configuring-projects.html#set-up-invitations">Section 6.2.1, “Setting Up Invitations”</a>. If the invitations feature is not turned on, use the procedure in Adding Project Members From the UI.
-	</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				Log in to the CloudStack UI.
-			</div></li><li class="listitem"><div class="para">
-				In the left navigation, click Projects.
-			</div></li><li class="listitem"><div class="para">
-				In Select View, choose Projects.
-			</div></li><li class="listitem"><div class="para">
-				Click the name of the project you want to work with.
-			</div></li><li class="listitem"><div class="para">
-				Click the Invitations tab.
-			</div></li><li class="listitem"><div class="para">
-				In Add by, select one of the following:
-			</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-						Account – The invitation will appear in the user’s Invitations tab in the Project View. See Using the Project View.
-					</div></li><li class="listitem"><div class="para">
-						Email – The invitation will be sent to the user’s email address. Each emailed invitation includes a unique code called a token which the recipient will provide back to CloudStack when accepting the invitation. Email invitations will work only if the global parameters related to the SMTP server have been set. See <a class="xref" href="configuring-projects.html#set-up-invitations">Section 6.2.1, “Setting Up Invitations”</a>.
-					</div></li></ol></div></li><li class="listitem"><div class="para">
-				Type the user name or email address of the new member you want to add, and click Invite. Type the CloudStack user name if you chose Account in the previous step. If you chose Email, type the email address. You can invite only people who have an account in this cloud within the same domain as the project. However, you can send the invitation to any email address.
-			</div></li><li class="listitem"><div class="para">
-				To view and manage the invitations you have sent, return to this tab. When an invitation is accepted, the new member will appear in the project’s Accounts tab.
-			</div></li></ol></div></div><div xml:lang="en-US" class="section" id="add-projects-members-from-ui" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="add-projects-members-from-ui">6.4.2. Adding Project Members From the UI</h3></div></div></div><div class="para">
-		The steps below tell how to add a new member to a project if the invitations feature is not enabled in the cloud. If the invitations feature is enabled cloud,as described in <a class="xref" href="configuring-projects.html#set-up-invitations">Section 6.2.1, “Setting Up Invitations”</a>, use the procedure in <a class="xref" href="add-members-to-projects.html#send-projects-membership-invitation">Section 6.4.1, “Sending Project Membership Invitations”</a>.
-	</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				Log in to the CloudStack UI.
-			</div></li><li class="listitem"><div class="para">
-				In the left navigation, click Projects.
-			</div></li><li class="listitem"><div class="para">
-				In Select View, choose Projects.
-			</div></li><li class="listitem"><div class="para">
-				Click the name of the project you want to work with.
-			</div></li><li class="listitem"><div class="para">
-				Click the Accounts tab. The current members of the project are listed.
-			</div></li><li class="listitem"><div class="para">
-				Type the account name of the new member you want to add, and click Add Account. You can add only people who have an account in this cloud and within the same domain as the project.
-			</div></li></ol></div></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="create-new-projects.html"><strong>Prev</strong>6.3. Creating a New Project</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="accept-membership-invite.html"><strong>Next</strong>6.5. Accepting a Membership Invitation</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35666a52/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/add-password-management-to-templates.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/add-password-management-to-templates.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/add-password-management-to-templates.html
deleted file mode 100644
index 8756ee8..0000000
--- a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/add-password-management-to-templates.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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>12.13. Adding Password Management to Your Templates</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-" /><script type="text/javascript" src="../../../../../toc.js"></script><script type="text/javascript">
-              addID('Apache_CloudStack');
-              
-	      addID('Apache_CloudStack.4.0.0-incubating');
-              
-              addID('Apache_CloudStack.4.0.0-incubating.books');
-	      addID('Apache_CloudStack.4.0.0-incubating.Admin_Guide');
-              </script><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="working-with-templates.html" title="Chapter 12. Working with Templates" /><link rel="prev" href="convert-hyperv-vm-to-template.html" title="12.12. Converting a Hyper-V VM to a Template" /><link rel="next" href="delete-templates.html" title="12.14. Deleting Templates" /></head><body class="toc_embeded "><div id="tocdiv" class="toc"><iframe id="tocframe" class="toc" src="../../../../toc.html">This is an iframe, to view it upgrade your browser or enable iframe display.</iframe></div><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="convert-hyperv-vm-to-template.html"><strong>Prev</strong
 ></a></li><li class="next"><a accesskey="n" href="delete-templates.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="add-password-management-to-templates" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="add-password-management-to-templates">12.13. Adding Password Management to Your Templates</h2></div></div></div><div class="para">
-		CloudStack provides an optional password reset feature that allows users to set a temporary admin or root password as well as reset the existing admin or root password from the CloudStack UI.
-	</div><div class="para">
-		To enable the Reset Password feature, you will need to download an additional script to patch your template. When you later upload the template into CloudStack, you can specify whether reset admin/root password feature should be enabled for this template.
-	</div><div class="para">
-		The password management feature works always resets the account password on instance boot. The script does an HTTP call to the virtual router to retrieve the account password that should be set. As long as the virtual router is accessible the guest will have access to the account password that should be used. When the user requests a password reset the management server generates and sends a new password to the virtual router for the account. Thus an instance reboot is necessary to effect any password changes.
-	</div><div class="para">
-		If the script is unable to contact the virtual router during instance boot it will not set the password but boot will continue normally.
-	</div><div xml:lang="en-US" class="section" id="linux-installation" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="linux-installation">12.13.1. Linux OS Installation</h3></div></div></div><div class="para">
-		Use the following steps to begin the Linux OS installation:
-	</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				Download the script file cloud-set-guest-password:
-			</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-						Linux: <a href="http://cloudstack.org/dl/cloud-set-guest-password">http://cloudstack.org/dl/cloud-set-guest-password</a>
-					</div></li><li class="listitem"><div class="para">
-						Windows: <a href="http://sourceforge.net/projects/cloudstack/files/Password%20Management%20Scripts/CloudInstanceManager.msi/download">http://sourceforge.net/projects/cloudstack/files/Password%20Management%20Scripts/CloudInstanceManager.msi/download</a>
-					</div></li></ul></div></li><li class="listitem"><div class="para">
-				Copy this file to /etc/init.d.
-			</div><div class="para">
-				On some Linux distributions, copy the file to /etc/rc.d/init.d.
-			</div></li><li class="listitem"><div class="para">
-				Run the following command to make the script executable:
-			</div><pre class="programlisting">chmod +x /etc/init.d/cloud-set-guest-password</pre></li><li class="listitem"><div class="para">
-				Depending on the Linux distribution, continue with the appropriate step.
-			</div><div class="para">
-				On Fedora, CentOS/RHEL, and Debian, run:
-			</div><pre class="programlisting">chkconfig --add cloud-set-guest-password</pre></li></ol></div></div><div xml:lang="en-US" class="section" id="windows-installation" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="windows-installation">12.13.2. Windows OS Installation</h3></div></div></div><div class="para">
-		Download the installer, CloudInstanceManager.msi, from <a href="http://cloudstack.org/download.html">Download page</a> and run the installer in the newly created Windows VM.
-	</div></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="convert-hyperv-vm-to-template.html"><strong>Prev</strong>12.12. Converting a Hyper-V VM to a Template</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="delete-templates.html"><strong>Next</strong>12.14. Deleting Templates</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35666a52/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/adding-hosts.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/adding-hosts.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/adding-hosts.html
deleted file mode 100644
index 66497cb..0000000
--- a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/adding-hosts.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>11.1. Adding Hosts</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-" /><script type="text/javascript" src="../../../../../toc.js"></script><script type="text/javascript">
-              addID('Apache_CloudStack');
-              
-	      addID('Apache_CloudStack.4.0.0-incubating');
-              
-              addID('Apache_CloudStack.4.0.0-incubating.books');
-	      addID('Apache_CloudStack.4.0.0-incubating.Admin_Guide');
-              </script><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="working-with-hosts.html" title="Chapter 11. Working With Hosts" /><link rel="prev" href="working-with-hosts.html" title="Chapter 11. Working With Hosts" /><link rel="next" href="scheduled-maintenance-maintenance-mode-hosts.html" title="11.2. Scheduled Maintenance and Maintenance Mode for Hosts" /></head><body class="toc_embeded "><div id="tocdiv" class="toc"><iframe id="tocframe" class="toc" src="../../../../toc.html">This is an iframe, to view it upgrade your browser or enable iframe display.</iframe></div><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="working-with-hosts.html"><s
 trong>Prev</strong></a></li><li class="next"><a accesskey="n" href="scheduled-maintenance-maintenance-mode-hosts.html"><strong>Next</strong></a></li></ul><div class="section" id="adding-hosts"><div class="titlepage"><div><div><h2 class="title" id="adding-hosts">11.1. Adding Hosts</h2></div></div></div><div class="para">
-			Additional hosts can be added at any time to provide more capacity for guest VMs. For requirements and instructions, see <a class="xref" href="host-add.html">Section 7.5, “Adding a Host”</a>.
-		</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="working-with-hosts.html"><strong>Prev</strong>Chapter 11. Working With Hosts</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="scheduled-maintenance-maintenance-mode-hosts.html"><strong>Next</strong>11.2. Scheduled Maintenance and Maintenance Mode ...</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35666a52/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/admin-alerts.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/admin-alerts.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/admin-alerts.html
deleted file mode 100644
index 1cae413..0000000
--- a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/admin-alerts.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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>18.3. Administrator Alerts</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-" /><script type="text/javascript" src="../../../../../toc.js"></script><script type="text/javascript">
-              addID('Apache_CloudStack');
-              
-	      addID('Apache_CloudStack.4.0.0-incubating');
-              
-              addID('Apache_CloudStack.4.0.0-incubating.books');
-	      addID('Apache_CloudStack.4.0.0-incubating.Admin_Guide');
-              </script><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="manage-cloud.html" title="Chapter 18. Managing the Cloud" /><link rel="prev" href="change-database-config.html" title="18.2. Changing the Database Configuration" /><link rel="next" href="customizing-dns.html" title="18.4. Customizing the Network Domain Name" /></head><body class="toc_embeded "><div id="tocdiv" class="toc"><iframe id="tocframe" class="toc" src="../../../../toc.html">This is an iframe, to view it upgrade your browser or enable iframe display.</iframe></div><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="change-database-config.html"><strong>Prev</strong></a></li><li cl
 ass="next"><a accesskey="n" href="customizing-dns.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="admin-alerts" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="admin-alerts">18.3. Administrator Alerts</h2></div></div></div><div class="para">
-		The system provides alerts and events to help with the management of the cloud. Alerts are notices to an administrator, generally delivered by e-mail, notifying the administrator that an error has occurred in the cloud. Alert behavior is configurable.
-	</div><div class="para">
-		Events track all of the user and administrator actions in the cloud. For example, every guest VM start creates an associated event. Events are stored in the Management Server’s database.
-	</div><div class="para">
-		Emails will be sent to administrators under the following circumstances:
-	</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-				The Management Server cluster runs low on CPU, memory, or storage resources
-			</div></li><li class="listitem"><div class="para">
-				The Management Server loses heartbeat from a Host for more than 3 minutes
-			</div></li><li class="listitem"><div class="para">
-				The Host cluster runs low on CPU, memory, or storage resources
-			</div></li></ul></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="change-database-config.html"><strong>Prev</strong>18.2. Changing the Database Configuration</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="customizing-dns.html"><strong>Next</strong>18.4. Customizing the Network Domain Name</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35666a52/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/advanced-zone-physical-network-configuration.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/advanced-zone-physical-network-configuration.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/advanced-zone-physical-network-configuration.html
deleted file mode 100644
index 6518608..0000000
--- a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/advanced-zone-physical-network-configuration.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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>15.5. Advanced Zone Physical Network Configuration</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-" /><script type="text/javascript" src="../../../../../toc.js"></script><script type="text/javascript">
-              addID('Apache_CloudStack');
-              
-	      addID('Apache_CloudStack.4.0.0-incubating');
-              
-              addID('Apache_CloudStack.4.0.0-incubating.books');
-	      addID('Apache_CloudStack.4.0.0-incubating.Admin_Guide');
-              </script><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="networks.html" title="Chapter 15. Managing Networks and Traffic" /><link rel="prev" href="basic-zone-physical-network-configuration.html" title="15.4. Basic Zone Physical Network Configuration" /><link rel="next" href="using-multiple-guest-networks.html" title="15.6. Using Multiple Guest Networks" /></head><body class="toc_embeded "><div id="tocdiv" class="toc"><iframe id="tocframe" class="toc" src="../../../../toc.html">This is an iframe, to view it upgrade your browser or enable iframe display.</iframe></div><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="basic-zone-physical-netwo
 rk-configuration.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="using-multiple-guest-networks.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="advanced-zone-physical-network-configuration" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="advanced-zone-physical-network-configuration">15.5. Advanced Zone Physical Network Configuration</h2></div></div></div><div class="para">
-		Within a zone that uses advanced networking, you need to tell the Management Server how the physical network is set up to carry different kinds of traffic in isolation.
-	</div><div xml:lang="en-US" class="section" id="configure-guest-traffic-in-advanced-zone" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="configure-guest-traffic-in-advanced-zone">15.5.1. Configure Guest Traffic in an Advanced Zone</h3></div></div></div><div class="para">
-		These steps assume you have already logged in to the CloudStack UI. To configure the base guest network:
-	</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				In the left navigation, choose Infrastructure. On Zones, click View More, then click the zone to which you want to add a network.
-			</div></li><li class="listitem"><div class="para">
-				Click the Network tab.
-			</div></li><li class="listitem"><div class="para">
-				Click Add guest network.
-			</div><div class="para">
-				The Add guest network window is displayed:
-			</div><div class="mediaobject"><img src="./images/add-guest-network.png" alt="networksetupzone.png: Depicts network setup in a single zone" /></div></li><li class="listitem"><div class="para">
-				Provide the following information:
-			</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>Name</strong></span>. The name of the network. This will be user-visible
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>Display Text</strong></span>: The description of the network. This will be user-visible
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>Zone</strong></span>: The zone in which you are configuring the guest network.
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>Network offering</strong></span>: If the administrator has configured multiple network offerings, select the one you want to use for this network
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>Guest Gateway</strong></span>: The gateway that the guests should use
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>Guest Netmask</strong></span>: The netmask in use on the subnet the guests will use
-					</div></li></ul></div></li><li class="listitem"><div class="para">
-				Click OK.
-			</div></li></ol></div></div><div xml:lang="en-US" class="section" id="configure-public-traffic-in-an-advanced-zone" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="configure-public-traffic-in-an-advanced-zone">15.5.2. Configure Public Traffic in an Advanced Zone</h3></div></div></div><div class="para">
-		In a zone that uses advanced networking, you need to configure at least one range of IP addresses for Internet traffic.
-	</div></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="basic-zone-physical-network-configuration.html"><strong>Prev</strong>15.4. Basic Zone Physical Network Configuration</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="using-multiple-guest-networks.html"><strong>Next</strong>15.6. Using Multiple Guest Networks</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35666a52/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/alerts.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/alerts.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/alerts.html
deleted file mode 100644
index 7c0eb26..0000000
--- a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/alerts.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>Appendix C. Alerts</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-" /><script type="text/javascript" src="../../../../../toc.js"></script><script type="text/javascript">
-              addID('Apache_CloudStack');
-              
-	      addID('Apache_CloudStack.4.0.0-incubating');
-              
-              addID('Apache_CloudStack.4.0.0-incubating.books');
-	      addID('Apache_CloudStack.4.0.0-incubating.Admin_Guide');
-              </script><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="index.html" title="CloudStack Administrator's Guide" /><link rel="prev" href="event-types.html" title="Appendix B. Event Types" /><link rel="next" href="appe-cloudstack-Revision_History.html" title="Appendix D. Revision History" /></head><body class="toc_embeded "><div id="tocdiv" class="toc"><iframe id="tocframe" class="toc" src="../../../../toc.html">This is an iframe, to view it upgrade your browser or enable iframe display.</iframe></div><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="event-types.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="appe-cl
 oudstack-Revision_History.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="appendix" id="alerts" lang="en-US"><div class="titlepage"><div><div><h1 class="title">Alerts</h1></div></div></div><div class="para">
-		The following is the list of alert type numbers. The current alerts can be found by calling listAlerts.
-	</div><pre class="programlisting">MEMORY = 0</pre><pre class="programlisting">CPU = 1</pre><pre class="programlisting">STORAGE =2</pre><pre class="programlisting">STORAGE_ALLOCATED = 3</pre><pre class="programlisting">PUBLIC_IP = 4</pre><pre class="programlisting">PRIVATE_IP = 5</pre><pre class="programlisting">HOST = 6</pre><pre class="programlisting">USERVM = 7</pre><pre class="programlisting">DOMAIN_ROUTER = 8</pre><pre class="programlisting">CONSOLE_PROXY = 9</pre><pre class="programlisting">ROUTING = 10// lost connection to default route (to the gateway)</pre><pre class="programlisting">STORAGE_MISC = 11 // lost connection to default route (to the gateway)</pre><pre class="programlisting">USAGE_SERVER = 12 // lost connection to default route (to the gateway)</pre><pre class="programlisting">MANAGMENT_NODE = 13 // lost connection to default route (to the gateway)</pre><pre class="programlisting">DOMAIN_ROUTER_MIGRATE = 14</pre><pre class="programlisting">CONSOLE_PROXY_MIGRATE =
  15</pre><pre class="programlisting">USERVM_MIGRATE = 16</pre><pre class="programlisting">VLAN = 17</pre><pre class="programlisting">SSVM = 18</pre><pre class="programlisting">USAGE_SERVER_RESULT = 19</pre><pre class="programlisting">STORAGE_DELETE = 20;</pre><pre class="programlisting">UPDATE_RESOURCE_COUNT = 21; //Generated when we fail to update the resource count</pre><pre class="programlisting">USAGE_SANITY_RESULT = 22;</pre><pre class="programlisting">DIRECT_ATTACHED_PUBLIC_IP = 23;</pre><pre class="programlisting">LOCAL_STORAGE = 24;</pre><pre class="programlisting">RESOURCE_LIMIT_EXCEEDED = 25; //Generated when the resource limit exceeds the limit. Currently used for recurring snapshots only</pre></div><ul class="docnav"><li class="previous"><a accesskey="p" href="event-types.html"><strong>Prev</strong>Appendix B. Event Types</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="appe-cloudstack-Revision_History.html"><strong>Next</strong>Appendix D. Revision History</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35666a52/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/allocators.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/allocators.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/allocators.html
deleted file mode 100644
index 29d7e58..0000000
--- a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/allocators.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>20.2. Allocators</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-" /><script type="text/javascript" src="../../../../../toc.js"></script><script type="text/javascript">
-              addID('Apache_CloudStack');
-              
-	      addID('Apache_CloudStack.4.0.0-incubating');
-              
-              addID('Apache_CloudStack.4.0.0-incubating.books');
-	      addID('Apache_CloudStack.4.0.0-incubating.Admin_Guide');
-              </script><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="api-overview.html" title="Chapter 20. CloudStack API" /><link rel="prev" href="provisioning-auth-api.html" title="20.1. Provisioning and Authentication API" /><link rel="next" href="user-data-and-meta-data.html" title="20.3. User Data and Meta Data" /></head><body class="toc_embeded "><div id="tocdiv" class="toc"><iframe id="tocframe" class="toc" src="../../../../toc.html">This is an iframe, to view it upgrade your browser or enable iframe display.</iframe></div><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="provisioning-auth-api.html"><strong>Prev</strong></a></li><li class="next"
 ><a accesskey="n" href="user-data-and-meta-data.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="allocators" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="allocators">20.2. Allocators</h2></div></div></div><div class="para">
-		CloudStack enables administrators to write custom allocators that will choose the Host to place a new guest and the storage host from which to allocate guest virtual disk images.
-	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="provisioning-auth-api.html"><strong>Prev</strong>20.1. Provisioning and Authentication API</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="user-data-and-meta-data.html"><strong>Next</strong>20.3. User Data and Meta Data</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35666a52/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/api-calls.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/api-calls.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/api-calls.html
deleted file mode 100644
index 9fb03cc..0000000
--- a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/api-calls.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<?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>Chapter 4. Calling the CloudStack API</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-API_Developers_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack API Developer's Guide" /><link rel="up" href="index.html" title="CloudStack API Developer's Guide" /><link rel="prev" href="whats-new-in-api-3.0.html" title="3.2. What's New in the API for 3.0" /><link rel="next" href="making-api-request.html" title="4.1. Making API Requests" /></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="whats-new-in-api-3.0.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="making-api-request.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="chapter" id="api-calls" lang="en-US"><div class="titlepage"><div><div><h2 class="title">Chapter 4. Calling the CloudStack API</h2></div></div></div><div class="toc"><dl><dt><span class="section"><a href="making-api-request.html">4.1. Making API Requests</a></span></dt><dt><span class="section"><a href="enabling-api-call-expiration.html">4.2. Enabling API Call Expiration</a></span></dt><dt><span class="section"><a href="signing-api-requests.html">4.3. Signing API Requests</a></span></dt><dt><span class="section"><a href="responses.html">4.4. Responses</a></span></dt><dd><dl><dt><span class="section"><a href="responses.html#response-fo
 rmats">4.4.1. Response Formats: XML and JSON</a></span></dt><dt><span class="section"><a href="responses.html#max-result-page-returned">4.4.2. Maximum Result Pages Returned</a></span></dt><dt><span class="section"><a href="responses.html#error-handling">4.4.3. Error Handling</a></span></dt></dl></dd><dt><span class="section"><a href="asynchronous-commands.html">4.5. Asynchronous Commands</a></span></dt><dd><dl><dt><span class="section"><a href="asynchronous-commands.html#job-status">4.5.1. Job Status</a></span></dt><dt><span class="section"><a href="asynchronous-commands.html#asynchronous-commands-example">4.5.2. Example</a></span></dt></dl></dd></dl></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="whats-new-in-api-3.0.html"><strong>Prev</strong>3.2. What's New in the API for 3.0</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="making-api-request.html"><strong>Next</strong>4.1. Making API Requests</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35666a52/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/api-changes-4.0.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/api-changes-4.0.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/api-changes-4.0.html
deleted file mode 100644
index 5e8324e..0000000
--- a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/api-changes-4.0.html
+++ /dev/null
@@ -1,732 +0,0 @@
-<?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>Chapter 4. API Changes from 3.0.2 to 4.0.0-incubating</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-" /><link rel="home" href="index.html" title="Version 4.0.0-incubating Release Notes" /><link rel="up" href="index.html" title="Version 4.0.0-incubating Release Notes" /><link rel="prev" href="version-4.0.html" title="Chapter 3. Version 4.0.0-incubating" /></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="version-4.0.html"><strong>Prev</strong></a></li><li class="next"></li></ul><div class="chapter" id="api-changes-4.0"><div class="titlepage"><div><div><h2 class="title">Chapter 4. API Changes from 3.0.2 to 4.0.0-incubating</h2></div></div></div><div class="toc"><dl><dt><span class="section"><a href="api-changes-4.0.html#new-api-commands-4.0">4.1. New API Commands in 4.0.0-incubating</a></span></dt><dt><span class="section"><a href="api-changes-4.0.html#changed-api-commands-4.0">4.2. Changed API Commands in 4.0.0-incubating</a></span></dt></dl></div><div class="section" id="new-api-commands-4.0"><div class="titlepage"><div><div><h2 class="title" id="new-api-commands-4.0">4.1. New API Commands in 4.0.0-incubating</h2></div></div></div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-						createCounter (Adds metric counter)
-					</div></li><li class="listitem"><div class="para">
-						deleteCounter (Deletes a counter)
-					</div></li><li class="listitem"><div class="para">
-						listCounters (List the counters)
-					</div></li><li class="listitem"><div class="para">
-						createCondition (Creates a condition)
-					</div></li><li class="listitem"><div class="para">
-						deleteCondition (Removes a condition)
-					</div></li><li class="listitem"><div class="para">
-						listConditions (List Conditions for the specific user)
-					</div></li><li class="listitem"><div class="para">
-						createTags. Add tags to one or more resources. Example: 
-<pre class="programlisting">command=createTags
-&amp;resourceIds=1,10,12
-&amp;resourceType=userVm
-&amp;tags[0].key=region
-&amp;tags[0].value=canada
-&amp;tags[1].key=city
-&amp;tags[1].value=Toronto</pre>
-					</div></li><li class="listitem"><div class="para">
-						deleteTags. Remove tags from one or more resources. Example: 
-<pre class="programlisting">command=deleteTags
-&amp;resourceIds=1,12
-&amp;resourceType=Snapshot
-&amp;tags[0].key=city</pre>
-					</div></li><li class="listitem"><div class="para">
-						listTags (Show currently defined resource tags)
-					</div></li><li class="listitem"><div class="para">
-						createVPC (Creates a VPC)
-					</div></li><li class="listitem"><div class="para">
-						listVPCs (Lists VPCs)
-					</div></li><li class="listitem"><div class="para">
-						deleteVPC (Deletes a VPC)
-					</div></li><li class="listitem"><div class="para">
-						updateVPC (Updates a VPC)
-					</div></li><li class="listitem"><div class="para">
-						restartVPC (Restarts a VPC)
-					</div></li><li class="listitem"><div class="para">
-						createVPCOffering (Creates VPC offering)
-					</div></li><li class="listitem"><div class="para">
-						updateVPCOffering (Updates VPC offering)
-					</div></li><li class="listitem"><div class="para">
-						deleteVPCOffering (Deletes VPC offering)
-					</div></li><li class="listitem"><div class="para">
-						listVPCOfferings (Lists VPC offerings)
-					</div></li><li class="listitem"><div class="para">
-						createPrivateGateway (Creates a private gateway)
-					</div></li><li class="listitem"><div class="para">
-						listPrivateGateways (List private gateways)
-					</div></li><li class="listitem"><div class="para">
-						deletePrivateGateway (Deletes a Private gateway)
-					</div></li><li class="listitem"><div class="para">
-						createNetworkACL (Creates a ACL rule the given network (the network has to belong to VPC))
-					</div></li><li class="listitem"><div class="para">
-						deleteNetworkACL (Deletes a Network ACL)
-					</div></li><li class="listitem"><div class="para">
-						listNetworkACLs (Lists all network ACLs)
-					</div></li><li class="listitem"><div class="para">
-						createStaticRoute (Creates a static route)
-					</div></li><li class="listitem"><div class="para">
-						deleteStaticRoute (Deletes a static route)
-					</div></li><li class="listitem"><div class="para">
-						listStaticRoutes (Lists all static routes)
-					</div></li><li class="listitem"><div class="para">
-						createVpnCustomerGateway (Creates site to site vpn customer gateway)
-					</div></li><li class="listitem"><div class="para">
-						createVpnGateway (Creates site to site vpn local gateway)
-					</div></li><li class="listitem"><div class="para">
-						createVpnConnection (Create site to site vpn connection)
-					</div></li><li class="listitem"><div class="para">
-						deleteVpnCustomerGateway (Delete site to site vpn customer gateway)
-					</div></li><li class="listitem"><div class="para">
-						deleteVpnGateway (Delete site to site vpn gateway)
-					</div></li><li class="listitem"><div class="para">
-						deleteVpnConnection (Delete site to site vpn connection)
-					</div></li><li class="listitem"><div class="para">
-						updateVpnCustomerGateway (Update site to site vpn customer gateway)
-					</div></li><li class="listitem"><div class="para">
-						resetVpnConnection (Reset site to site vpn connection)
-					</div></li><li class="listitem"><div class="para">
-						listVpnCustomerGateways (Lists site to site vpn customer gateways)
-					</div></li><li class="listitem"><div class="para">
-						listVpnGateways (Lists site 2 site vpn gateways)
-					</div></li><li class="listitem"><div class="para">
-						listVpnConnections (Lists site to site vpn connection gateways)
-					</div></li><li class="listitem"><div class="para">
-						markDefaultZoneForAccount (Marks a default zone for the current account)
-					</div></li><li class="listitem"><div class="para">
-						uploadVolume (Uploads a data disk)
-					</div></li></ul></div></div><div class="section" id="changed-api-commands-4.0"><div class="titlepage"><div><div><h2 class="title" id="changed-api-commands-4.0">4.2. Changed API Commands in 4.0.0-incubating</h2></div></div></div><div class="informaltable"><table border="1"><colgroup><col width="50%" align="left" class="1" /><col width="50%" align="left" class="2" /></colgroup><thead><tr><th align="left">
-								<div class="para">
-									API Commands
-								</div>
-							</th><th align="left">
-								<div class="para">
-									Description
-								</div>
-							</th></tr></thead><tbody><tr><td align="left">
-								<div class="para">
-									copyTemplate
-								</div>
-								 <div class="para">
-									prepareTemplate
-								</div>
-								 <div class="para">
-									registerTemplate
-								</div>
-								 <div class="para">
-									updateTemplate
-								</div>
-								 <div class="para">
-									createProject
-								</div>
-								 <div class="para">
-									activateProject
-								</div>
-								 <div class="para">
-									suspendProject
-								</div>
-								 <div class="para">
-									updateProject
-								</div>
-								 <div class="para">
-									listProjectAccounts
-								</div>
-								 <div class="para">
-									createVolume
-								</div>
-								 <div class="para">
-									migrateVolume
-								</div>
-								 <div class="para">
-									attachVolume
-								</div>
-								 <div class="para">
-									detachVolume
-								</div>
-								 <div class="para">
-									uploadVolume
-								</div>
-								 <div class="para">
-									createSecurityGroup
-								</div>
-								 <div class="para">
-									registerIso
-								</div>
-								 <div class="para">
-									copyIso
-								</div>
-								 <div class="para">
-									updateIso
-								</div>
-								 <div class="para">
-									createIpForwardingRule
-								</div>
-								 <div class="para">
-									listIpForwardingRules
-								</div>
-								 <div class="para">
-									createLoadBalancerRule
-								</div>
-								 <div class="para">
-									updateLoadBalancerRule
-								</div>
-								 <div class="para">
-									createSnapshot
-								</div>
-
-							</td><td align="left">
-								<div class="para">
-									The commands in this list have a single new response parameter, and no other changes.
-								</div>
-								 <div class="para">
-									New response parameter: tags(*)
-								</div>
-								 <div class="note"><div class="admonition_header"><h2>Note</h2></div><div class="admonition"><div class="para">
-										Many other commands also have the new tags(*) parameter in addition to other changes; those commands are listed separately.
-									</div></div></div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									rebootVirtualMachine
-								</div>
-								 <div class="para">
-									attachIso
-								</div>
-								 <div class="para">
-									detachIso
-								</div>
-								 <div class="para">
-									listLoadBalancerRuleInstances
-								</div>
-								 <div class="para">
-									resetPasswordForVirtualMachine
-								</div>
-								 <div class="para">
-									changeServiceForVirtualMachine
-								</div>
-								 <div class="para">
-									recoverVirtualMachine
-								</div>
-								 <div class="para">
-									startVirtualMachine
-								</div>
-								 <div class="para">
-									migrateVirtualMachine
-								</div>
-								 <div class="para">
-									deployVirtualMachine
-								</div>
-								 <div class="para">
-									assignVirtualMachine
-								</div>
-								 <div class="para">
-									updateVirtualMachine
-								</div>
-								 <div class="para">
-									restoreVirtualMachine
-								</div>
-								 <div class="para">
-									stopVirtualMachine
-								</div>
-								 <div class="para">
-									destroyVirtualMachine
-								</div>
-
-							</td><td align="left">
-								<div class="para">
-									The commands in this list have two new response parameters, and no other changes.
-								</div>
-								 <div class="para">
-									New response parameters: keypair, tags(*)
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									listSecurityGroups
-								</div>
-								 <div class="para">
-									listFirewallRules
-								</div>
-								 <div class="para">
-									listPortForwardingRules
-								</div>
-								 <div class="para">
-									listSnapshots
-								</div>
-								 <div class="para">
-									listIsos
-								</div>
-								 <div class="para">
-									listProjects
-								</div>
-								 <div class="para">
-									listTemplates
-								</div>
-								 <div class="para">
-									listLoadBalancerRules
-								</div>
-
-							</td><td align="left">
-								<div class="para">
-									The commands in this list have the following new parameters, and no other changes.
-								</div>
-								 <div class="para">
-									New request parameter: tags (optional)
-								</div>
-								 <div class="para">
-									New response parameter: tags(*)
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									listF5LoadBalancerNetworks
-								</div>
-								 <div class="para">
-									listNetscalerLoadBalancerNetworks
-								</div>
-								 <div class="para">
-									listSrxFirewallNetworks
-								</div>
-								 <div class="para">
-									updateNetwork
-								</div>
-
-							</td><td align="left">
-								<div class="para">
-									The commands in this list have three new response parameters, and no other changes.
-								</div>
-								 <div class="para">
-									New response parameters: canusefordeploy, vpcid, tags(*)
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									createZone
-								</div>
-								 <div class="para">
-									updateZone
-								</div>
-
-							</td><td align="left">
-								<div class="para">
-									The commands in this list have the following new parameters, and no other changes.
-								</div>
-								 <div class="para">
-									New request parameter: localstorageenabled (optional)
-								</div>
-								 <div class="para">
-									New response parameter: localstorageenabled
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									listZones
-								</div>
-							</td><td align="left">
-								<div class="para">
-									New response parameter: localstorageenabled
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									rebootRouter
-								</div>
-								 <div class="para">
-									changeServiceForRouter
-								</div>
-								 <div class="para">
-									startRouter
-								</div>
-								 <div class="para">
-									destroyRouter
-								</div>
-								 <div class="para">
-									stopRouter
-								</div>
-
-							</td><td align="left">
-								<div class="para">
-									The commands in this list have two new response parameters, and no other changes.
-								</div>
-								 <div class="para">
-									New response parameters: vpcid, nic(*)
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									updateAccount
-								</div>
-								 <div class="para">
-									disableAccount
-								</div>
-								 <div class="para">
-									listAccounts
-								</div>
-								 <div class="para">
-									markDefaultZoneForAccount
-								</div>
-								 <div class="para">
-									enableAccount
-								</div>
-
-							</td><td align="left">
-								<div class="para">
-									The commands in this list have three new response parameters, and no other changes.
-								</div>
-								 <div class="para">
-									New response parameters: vpcavailable, vpclimit, vpctotal
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									listRouters
-								</div>
-							</td><td align="left">
-								<div class="para">
-									New request parameters: forvpc (optional), vpcid (optional)
-								</div>
-								 <div class="para">
-									New response parameters: vpcid, nic(*)
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									listNetworkOfferings
-								</div>
-							</td><td align="left">
-								<div class="para">
-									New request parameters: forvpc (optional)
-								</div>
-								 <div class="para">
-									New response parameters: forvpc
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									listVolumes
-								</div>
-							</td><td align="left">
-								<div class="para">
-									New request parameters: details (optional), tags (optional)
-								</div>
-								 <div class="para">
-									New response parameters: tags(*)
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									addTrafficMonitor
-								</div>
-							</td><td align="left">
-								<div class="para">
-									New request parameters: excludezones (optional), includezones (optional)
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									createNetwork
-								</div>
-							</td><td align="left">
-								<div class="para">
-									New request parameters: vpcid (optional)
-								</div>
-								 <div class="para">
-									New response parameters: canusefordeploy, vpcid, tags(*)
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									listPublicIpAddresses
-								</div>
-							</td><td align="left">
-								<div class="para">
-									New request parameters: tags (optional), vpcid (optional)
-								</div>
-								 <div class="para">
-									New response parameters: vpcid, tags(*)
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									listNetworks
-								</div>
-							</td><td align="left">
-								<div class="para">
-									New request parameters: canusefordeploy (optional), forvpc (optional), tags (optional), vpcid (optional)
-								</div>
-								 <div class="para">
-									New response parameters: canusefordeploy, vpcid, tags(*)
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									restartNetwork
-								</div>
-							</td><td align="left">
-								<div class="para">
-									New response parameters: vpcid, tags(*)
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									enableStaticNat
-								</div>
-							</td><td align="left">
-								<div class="para">
-									New request parameter: networkid (optional)
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									createDiskOffering
-								</div>
-							</td><td align="left">
-								<div class="para">
-									New request parameter: storagetype (optional)
-								</div>
-								 <div class="para">
-									New response parameter: storagetype
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									listDiskOfferings
-								</div>
-							</td><td align="left">
-								<div class="para">
-									New response parameter: storagetype
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									updateDiskOffering
-								</div>
-							</td><td align="left">
-								<div class="para">
-									New response parameter: storagetype
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									createFirewallRule
-								</div>
-							</td><td align="left">
-								<div class="para">
-									Changed request parameters: ipaddressid (old version - optional, new version - required)
-								</div>
-								 <div class="para">
-									New response parameter: tags(*)
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									listVirtualMachines
-								</div>
-							</td><td align="left">
-								<div class="para">
-									New request parameters: isoid (optional), tags (optional), templateid (optional)
-								</div>
-								 <div class="para">
-									New response parameters: keypair, tags(*)
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									updateStorageNetworkIpRange
-								</div>
-							</td><td align="left">
-								<div class="para">
-									New response parameters: id, endip, gateway, netmask, networkid, podid, startip, vlan, zoneid
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									reconnectHost
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: hahost.
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									addCluster
-								</div>
-							</td><td align="left">
-								<div class="para">
-									The following request parameters are added:
-								</div>
-								 <div class="itemizedlist"><ul><li class="listitem"><div class="para">
-											vsmipaddress (optional)
-										</div></li><li class="listitem"><div class="para">
-											vsmpassword (optional)
-										</div></li><li class="listitem"><div class="para">
-											vsmusername (optional)
-										</div></li></ul></div>
-								 <div class="para">
-									The following parameter is made mandatory: podid
-								</div>
-
-							</td></tr><tr><td align="left">
-								<div class="para">
-									listVolumes
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: status
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									migrateVolume
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: status
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									prepareHostForMaintenance
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: hahost.
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									addSecondaryStorage
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: hahost.
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									enableAccount
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: defaultzoneid
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									attachVolume
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: status
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									cancelHostMaintenance
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: hahost
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									addSwift
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: hahost
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									listSwifts
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: hahost
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									listExternalLoadBalancers
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: hahost
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									createVolume
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: status
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									listCapabilities
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: customdiskofferingmaxsize
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									disableAccount
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: defaultzoneid
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									deployVirtualMachine
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new request parameter is added: startvm (optional)
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									deleteStoragePool
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new request parameter is added: forced (optional)
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									updateAccount
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: defaultzoneid
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									addHost
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: hahost
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									updateHost
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: hahost
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									detachVolume
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: status
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									listAccounts
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: defaultzoneid
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									listHosts
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A new response parameter is added: hahost
-								</div>
-								<div class="para">
-									A new request parameter is added: hahost (optional)
-								</div>
-							</td></tr></tbody></table></div></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="version-4.0.html"><strong>Prev</strong>Chapter 3. Version 4.0.0-incubating</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></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35666a52/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/api-overview.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/api-overview.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/api-overview.html
deleted file mode 100644
index 33326b4..0000000
--- a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/api-overview.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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>Chapter 20. CloudStack API</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-" /><script type="text/javascript" src="../../../../../toc.js"></script><script type="text/javascript">
-              addID('Apache_CloudStack');
-              
-	      addID('Apache_CloudStack.4.0.0-incubating');
-              
-              addID('Apache_CloudStack.4.0.0-incubating.books');
-	      addID('Apache_CloudStack.4.0.0-incubating.Admin_Guide');
-              </script><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="index.html" title="CloudStack Administrator's Guide" /><link rel="prev" href="global-config.html" title="Chapter 19. Setting Global Configuration Parameters" /><link rel="next" href="provisioning-auth-api.html" title="20.1. Provisioning and Authentication API" /></head><body class="toc_embeded "><div id="tocdiv" class="toc"><iframe id="tocframe" class="toc" src="../../../../toc.html">This is an iframe, to view it upgrade your browser or enable iframe display.</iframe></div><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="global-config.html"><strong>Prev</strong></a></li><li class="nex
 t"><a accesskey="n" href="provisioning-auth-api.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="chapter" id="api-overview" lang="en-US"><div class="titlepage"><div><div><h2 class="title">Chapter 20. CloudStack API</h2></div></div></div><div class="toc"><dl><dt><span class="section"><a href="provisioning-auth-api.html">20.1. Provisioning and Authentication API</a></span></dt><dt><span class="section"><a href="allocators.html">20.2. Allocators</a></span></dt><dt><span class="section"><a href="user-data-and-meta-data.html">20.3. User Data and Meta Data</a></span></dt></dl></div><div class="para">
-		The CloudStack API is a low level API that has been used to implement the CloudStack web UIs. It is also a good basis for implementing other popular APIs such as EC2/S3 and emerging DMTF standards.
-	</div><div class="para">
-		Many CloudStack API calls are asynchronous. These will return a Job ID immediately when called. This Job ID can be used to query the status of the job later. Also, status calls on impacted resources will provide some indication of their state.
-	</div><div class="para">
-		The API has a REST-like query basis and returns results in XML or JSON.
-	</div><div class="para">
-		See <a href="http://docs.cloudstack.org/CloudStack_Documentation/Developer's_Guide%3A_CloudStack">the Developer’s Guide</a> and <a href="http://docs.cloudstack.org/CloudStack_Documentation/API_Reference%3A_CloudStack">the API Reference</a>.
-	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="global-config.html"><strong>Prev</strong>Chapter 19. Setting Global Configuration Paramete...</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="provisioning-auth-api.html"><strong>Next</strong>20.1. Provisioning and Authentication API</a></li></ul></body></html>