You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/08/08 20:55:23 UTC
[11/43] Patch from Joe Brockmeier for docs starting with i, j, l, m
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/562cace1/docs/en-US/management-server-installation-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-installation-overview.xml b/docs/en-US/management-server-installation-overview.xml
index f733141..7c000c5 100644
--- a/docs/en-US/management-server-installation-overview.xml
+++ b/docs/en-US/management-server-installation-overview.xml
@@ -1,8 +1,30 @@
- <section id="management-server-installation-overview">
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<section id="management-server-installation-overview">
<title>Management Server Installation Overview</title>
- <para>
- This section describes installing the Management Server. There are two slightly different installation flows,
- depending on how many Management Server nodes will be in your cloud:</para>
+ <para>This section describes installing the Management Server. There are two slightly different installation flows, depending on how many Management Server nodes will be in your cloud:</para>
<itemizedlist>
<listitem><para>A single Management Server node, with MySQL on the same node.</para></listitem>
<listitem><para>Multiple Management Server nodes, with MySQL on a node separate from the Management Servers.</para></listitem>
@@ -21,4 +43,3 @@
<listitem><para>Prepare the System VM Template</para></listitem>
</orderedlist>
</section>
-
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/562cace1/docs/en-US/management-server-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-overview.xml b/docs/en-US/management-server-overview.xml
index 40cbd53..12a5121 100644
--- a/docs/en-US/management-server-overview.xml
+++ b/docs/en-US/management-server-overview.xml
@@ -1,57 +1,58 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
%BOOK_ENTITIES;
]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
<section id="management-server-overview">
<title>Management Server Overview</title>
- <para>
- The Management Server is the &PRODUCT; software that manages cloud resources. By interacting with the Management Server through its UI or API, you can configure and manage your cloud infrastructure.
+ <para>The Management Server is the &PRODUCT; software that manages cloud resources. By interacting with the Management Server through its UI or API, you can configure and manage your cloud infrastructure.
</para>
- <para>
- The Management Server runs on a dedicated server or VM. It controls allocation of virtual machines to hosts and assigns storage and IP addresses to the virtual machine instances. The Management Server runs in a Tomcat container and requires a MySQL database for persistence.
+ <para>The Management Server runs on a dedicated server or VM. It controls allocation of virtual machines to hosts and assigns storage and IP addresses to the virtual machine instances. The Management Server runs in a Tomcat container and requires a MySQL database for persistence.
</para>
- <para>
- The machine must meet the system requirements described in System Requirements.
+ <para>The machine must meet the system requirements described in System Requirements.
</para>
- <para>
- The Management Server:
+ <para>The Management Server:
</para>
<itemizedlist>
<listitem>
- <para>
- Provides the web user interface for the administrator and a reference user interface for end users.
- </para>
+ <para>Provides the web user interface for the administrator and a reference user interface for end users.</para>
</listitem>
<listitem>
- <para>
- Provides the APIs for &PRODUCT;.
- </para>
+ <para>Provides the APIs for &PRODUCT;.</para>
</listitem>
<listitem>
- <para>
- Manages the assignment of guest VMs to particular hosts.
- </para>
+ <para>Manages the assignment of guest VMs to particular hosts.</para>
</listitem>
<listitem>
- <para>
- Manages the assignment of public and private IP addresses to particular accounts.
- </para>
+ <para>Manages the assignment of public and private IP addresses to particular accounts.</para>
</listitem>
<listitem>
- <para>
- Manages the allocation of storage to guests as virtual disks.
- </para>
+ <para>Manages the allocation of storage to guests as virtual disks.</para>
</listitem>
<listitem>
- <para>
- Manages snapshots, templates, and ISO images, possibly replicating them across data centers.
- </para>
+ <para>Manages snapshots, templates, and ISO images, possibly replicating them across data centers.</para>
</listitem>
<listitem>
- <para>
- Provides a single point of configuration for the cloud.
- </para>
+ <para>Provides a single point of configuration for the cloud.</para>
</listitem>
</itemizedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/562cace1/docs/en-US/management_server_multi_node_install.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management_server_multi_node_install.xml b/docs/en-US/management_server_multi_node_install.xml
index ba925bd..5b6555a 100644
--- a/docs/en-US/management_server_multi_node_install.xml
+++ b/docs/en-US/management_server_multi_node_install.xml
@@ -1,8 +1,27 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
%BOOK_ENTITIES;
]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
<chapter id="management_server_multi_node_install">
<title>Management Server Multi-Node Installation</title>
<xi:include href="multi_node_overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/562cace1/docs/en-US/management_server_overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management_server_overview.xml b/docs/en-US/management_server_overview.xml
index 19b32d7..6b5d6fe 100644
--- a/docs/en-US/management_server_overview.xml
+++ b/docs/en-US/management_server_overview.xml
@@ -1,52 +1,53 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<section id="management_server_overview">
<title>Management Server Overview</title>
- <para>
- The Management Server is the CloudStack software that manages cloud resources. By interacting with the Management Server through its UI or API, you can configure and manage your cloud infrastructure.
- </para>
- <para>
- The Management Server runs on a dedicated server or VM. It controls allocation of virtual machines to hosts and assigns storage and IP addresses to the virtual machine instances. The CloudStack Management Server runs in a Tomcat container and requires a MySQL database for persistence.
- </para>
- <para>
- The machine must meet the system requirements described in System Requirements.
- </para>
- <para>
- The Management Server:
- </para>
+ <para>The Management Server is the &PRODUCT; software that manages cloud resources. By interacting with the Management Server through its UI or API, you can configure and manage your cloud infrastructure.</para>
+ <para>The Management Server runs on a dedicated server or VM. It controls allocation of virtual machines to hosts and assigns storage and IP addresses to the virtual machine instances. The &PRODUCT; Management Server runs in a Tomcat container and requires a MySQL database for persistence.</para>
+ <para>The machine must meet the system requirements described in System Requirements.</para>
+ <para>The Management Server:</para>
<itemizedlist>
<listitem>
- <para>
- Provides the web user interface for the administrator and a reference user interface for end users.
- </para>
+ <para>Provides the web user interface for the administrator and a reference user interface for end users.</para>
</listitem>
<listitem>
- <para>
- Provides the APIs for the CloudStack platform.
- </para>
+ <para>Provides the APIs for the &PRODUCT; platform.</para>
</listitem>
<listitem>
- <para>
- Manages the assignment of guest VMs to particular hosts.
- </para>
+ <para>Manages the assignment of guest VMs to particular hosts.</para>
</listitem>
<listitem>
- <para>
- Manages the assignment of public and private IP addresses to particular accounts.
- </para>
+ <para>Manages the assignment of public and private IP addresses to particular accounts.</para>
</listitem>
<listitem>
- <para>
- Manages the allocation of storage to guests as virtual disks.
- </para>
+ <para>Manages the allocation of storage to guests as virtual disks.</para>
</listitem>
<listitem>
- <para>
- Manages snapshots, templates, and ISO images, possibly replicating them across data centers.
- </para>
+ <para>Manages snapshots, templates, and ISO images, possibly replicating them across data centers.</para>
</listitem>
<listitem>
- <para>
- Provides a single point of configuration for the cloud.
- </para>
+ <para>Provides a single point of configuration for the cloud.</para>
</listitem>
</itemizedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/562cace1/docs/en-US/manual-live-migration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/manual-live-migration.xml b/docs/en-US/manual-live-migration.xml
index 63a80e8..a82b52e 100644
--- a/docs/en-US/manual-live-migration.xml
+++ b/docs/en-US/manual-live-migration.xml
@@ -1,3 +1,27 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
<section id="manual-live-migration">
<title>Moving VMs Between Hosts (Manual Live Migration)</title>
<para>The CloudPlatform administrator can move a running VM from one host to another without interrupting service to users or going into maintenance mode. This is called manual live migration, and can be done under the following conditions:</para>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/562cace1/docs/en-US/max-result-page-returned.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/max-result-page-returned.xml b/docs/en-US/max-result-page-returned.xml
index ffbe60b..3c12415 100644
--- a/docs/en-US/max-result-page-returned.xml
+++ b/docs/en-US/max-result-page-returned.xml
@@ -1,3 +1,27 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
<section id="max-result-page-returned">
<title>Maximum Result Pages Returned</title>
<para>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/562cace1/docs/en-US/migrate-datadisk-volume-new-storage-pool.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/migrate-datadisk-volume-new-storage-pool.xml b/docs/en-US/migrate-datadisk-volume-new-storage-pool.xml
index 417eb71..0d545ba 100644
--- a/docs/en-US/migrate-datadisk-volume-new-storage-pool.xml
+++ b/docs/en-US/migrate-datadisk-volume-new-storage-pool.xml
@@ -1,14 +1,33 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
%BOOK_ENTITIES;
]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
<section id="migrate-datadisk-volume-new-storage-pool">
<title>Migrating a Data Disk Volume to a New Storage Pool</title>
<orderedlist>
- <listitem><para>Log in to the CloudPlatform UI as a user or admin.</para></listitem>
+ <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
<listitem><para>Detach the data disk from the VM. See Detaching and Moving Volumes <xref linkend="detach-move-volumes"/> (but skip the “reattach” step at the end. You will do that after migrating to new storage).</para></listitem>
- <listitem><para>Call the CloudPlatform API command migrateVolume and pass in the volume ID and the ID of any storage pool in the zone.</para></listitem>
+ <listitem><para>Call the &PRODUCT; API command migrateVolume and pass in the volume ID and the ID of any storage pool in the zone.</para></listitem>
<listitem><para>Watch for the volume status to change to Migrating, then back to Ready.</para></listitem>
<listitem><para>Attach the volume to any desired VM running in the same cluster as the new storage server. See Attaching a Volume <xref linkend="attaching-volume"/> </para></listitem>
</orderedlist>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/562cace1/docs/en-US/migrate-vm-rootvolume-volume-new-storage-pool.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/migrate-vm-rootvolume-volume-new-storage-pool.xml b/docs/en-US/migrate-vm-rootvolume-volume-new-storage-pool.xml
index dbf6138..0ce06b0 100644
--- a/docs/en-US/migrate-vm-rootvolume-volume-new-storage-pool.xml
+++ b/docs/en-US/migrate-vm-rootvolume-volume-new-storage-pool.xml
@@ -1,16 +1,35 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
%BOOK_ENTITIES;
]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
<section id="migrate-vm-rootvolume-volume-new-storage-pool">
<title>Migrating a VM Root Volume to a New Storage Pool</title>
<para>When migrating the root disk volume, the VM must first be stopped, and users can not access the VM. After migration is complete, the VM can be restarted.</para>
<orderedlist>
- <listitem><para>Log in to the CloudPlatform UI as a user or admin.</para></listitem>
+ <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
<listitem><para>Detach the data disk from the VM. See Detaching and Moving Volumes <xref linkend="detach-move-volumes"/> (but skip the “reattach” step at the end. You will do that after migrating to new storage).</para></listitem>
<listitem><para>Stop the VM.</para></listitem>
- <listitem><para>Call the CloudPlatform API command migrateVirtualMachine with the ID of the VM to migrate and the IDs of a destination host and destination storage pool in the same zone.</para></listitem>
+ <listitem><para>Call the &PRODUCT; API command migrateVirtualMachine with the ID of the VM to migrate and the IDs of a destination host and destination storage pool in the same zone.</para></listitem>
<listitem><para>Watch for the VM status to change to Migrating, then back to Stopped.</para></listitem>
<listitem><para>Restart the VM.</para></listitem>
</orderedlist>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/562cace1/docs/en-US/minimum-system-requirements.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/minimum-system-requirements.xml b/docs/en-US/minimum-system-requirements.xml
index 3973c30..6f8b4ab 100644
--- a/docs/en-US/minimum-system-requirements.xml
+++ b/docs/en-US/minimum-system-requirements.xml
@@ -1,17 +1,32 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
%BOOK_ENTITIES;
]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
<section id="minimum-system-requirements">
<title>Minimum System Requirements</title>
<section id="management-server-system-requirements">
<title>Management Server, Database, and Storage System Requirements</title>
- <para>
- The machines that will run the Management Server and MySQL database must meet the following requirements.
- The same machines can also be used to provide primary and secondary storage, such as via localdisk or NFS.
- The Management Server may be placed on a virtual machine.
- </para>
+ <para>The machines that will run the Management Server and MySQL database must meet the following requirements. The same machines can also be used to provide primary and secondary storage, such as via localdisk or NFS. The Management Server may be placed on a virtual machine.</para>
<itemizedlist>
<listitem><para>Operating system:</para>
<itemizedlist>
@@ -51,8 +66,7 @@
<listitem><para>Oracle VM (OVM) Installation and Configuration</para></listitem>
</itemizedlist>
<warning>
- <para>
- Be sure you fulfill the additional hypervisor requirements and installation steps provided in this Guide. Hypervisor hosts must be properly prepared to work with CloudStack. For example, the requirements for XenServer are listed under Citrix XenServer Installation.
+ <para>Be sure you fulfill the additional hypervisor requirements and installation steps provided in this Guide. Hypervisor hosts must be properly prepared to work with CloudStack. For example, the requirements for XenServer are listed under Citrix XenServer Installation.
</para>
</warning>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/562cace1/docs/en-US/modify-delete-service-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/modify-delete-service-offerings.xml b/docs/en-US/modify-delete-service-offerings.xml
index 601a8bd..b917af4 100644
--- a/docs/en-US/modify-delete-service-offerings.xml
+++ b/docs/en-US/modify-delete-service-offerings.xml
@@ -1,8 +1,27 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
%BOOK_ENTITIES;
]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
<section id="modify-delete-service-offerings">
<title>Modifying or Deleting a Service Offering</title>
<para>Service offerings cannot be changed once created. This applies to both compute offerings and disk offerings.</para>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/562cace1/docs/en-US/multi_node_overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/multi_node_overview.xml b/docs/en-US/multi_node_overview.xml
index b753340..92904cf 100644
--- a/docs/en-US/multi_node_overview.xml
+++ b/docs/en-US/multi_node_overview.xml
@@ -1,3 +1,27 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
<section id="multi_node_installation_overview">
<title>Management Server Multi-Node Installation Overview</title>
<para>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/562cace1/docs/en-US/multiple-system-vm-vmware.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/multiple-system-vm-vmware.xml b/docs/en-US/multiple-system-vm-vmware.xml
index a809b67..014dfa1 100644
--- a/docs/en-US/multiple-system-vm-vmware.xml
+++ b/docs/en-US/multiple-system-vm-vmware.xml
@@ -1,9 +1,28 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
%BOOK_ENTITIES;
]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
<section id="multiple-system-vm-vmware">
<title>Multiple System VM Support for VMware</title>
- <para>Every CloudPlatform zone has single System VM for template processing tasks such as downloading templates, uploading templates, and uploading ISOs. In a zone where VMware is being used, additional System VMs can be launched to process VMware-specific tasks such as taking snapshots and creating private templates. The CloudPlatform management server launches additional System VMs for VMware-specific tasks as the load increases. The management server monitors and weights all commands sent to these System VMs and performs dynamic load balancing and scaling-up of more System VMs.</para>
+ <para>Every &PRODUCT; zone has single System VM for template processing tasks such as downloading templates, uploading templates, and uploading ISOs. In a zone where VMware is being used, additional System VMs can be launched to process VMware-specific tasks such as taking snapshots and creating private templates. The &PRODUCT; management server launches additional System VMs for VMware-specific tasks as the load increases. The management server monitors and weights all commands sent to these System VMs and performs dynamic load balancing and scaling-up of more System VMs.</para>
</section>