svn commit: r837336 - in /websites/staging/cloudstack/trunk/content: ./ cloudstack/cloudstack-faq.html

[bu...@apache.org]

Author: buildbot
Date: Mon Nov  5 13:50:18 2012
New Revision: 837336

Log:
Staging update by buildbot for cloudstack

Modified:
    websites/staging/cloudstack/trunk/content/   (props changed)
    websites/staging/cloudstack/trunk/content/cloudstack/cloudstack-faq.html

Propchange: websites/staging/cloudstack/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Nov  5 13:50:18 2012
@@ -1 +1 @@
-1405787
+1405788

Modified: websites/staging/cloudstack/trunk/content/cloudstack/cloudstack-faq.html
==============================================================================
--- websites/staging/cloudstack/trunk/content/cloudstack/cloudstack-faq.html (original)
+++ websites/staging/cloudstack/trunk/content/cloudstack/cloudstack-faq.html Mon Nov  5 13:50:18 2012
@@ -134,7 +134,7 @@
 <li>The Apache CloudStack platform enables enterprises to set up a private cloud for use by their own employees. The current generation of virtualization infrastructure targets enterprise IT departments who manage virtual machines the same way they would manage physical machines. The Apache CloudStack platform, on the other hand, enables self-service of virtual machines by users outside of the IT department. </li>
 <li>As an open source IaaS, Apache CloudStack is available to individuals and organizations that wish to study and implement an IaaS for personal, educational, and/or production use.</li>
 </ul>
-<p>The Cloud.com CloudStack platform includes the Management Server and extensions to industry-standard hypervisor software (<em>e.g.</em> XenServer, vSphere, KVM) installed on Hosts running in the cloud. The Management Server is deployed on a farm of management servers. The administrator provisions resources (Hosts, storage devices, IP addresses, etc.) into the Management Server and the Management Server manages those resources. The Management server presents web interfaces to end users and administrators that enable them to take actions on some or all of their instances in the IaaS cloud.</p>
+<p>The CloudStack platform includes the Management Server and extensions to industry-standard hypervisor software (<em>e.g.</em> XenServer, vSphere, KVM) installed on Hosts running in the cloud. The Management Server is deployed on a farm of management servers. The administrator provisions resources (Hosts, storage devices, IP addresses, etc.) into the Management Server and the Management Server manages those resources. The Management server presents web interfaces to end users and administrators that enable them to take actions on some or all of their instances in the IaaS cloud.</p>
 <h2 id="can-i-create-my-own-private-templates">Can I create my own private templates?</h2>
 <p><a name="private">Yes. Every template has a privacy level associated with it. Privacy levels include:</a></p>
 <ul>