You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2012/10/05 01:16:10 UTC
[5/5] Merged over docs from master
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/release-notes.ent
----------------------------------------------------------------------
diff --git a/docs/en-US/release-notes.ent b/docs/en-US/release-notes.ent
new file mode 100644
index 0000000..7858ad5
--- /dev/null
+++ b/docs/en-US/release-notes.ent
@@ -0,0 +1,22 @@
+<!-- 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.
+-->
+
+<!ENTITY PRODUCT "CloudStack">
+<!ENTITY BOOKID "Technical Documentation">
+<!ENTITY YEAR "2012">
+<!ENTITY HOLDER "Apache Software Foundation">
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/remove-tier.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/remove-tier.xml b/docs/en-US/remove-tier.xml
new file mode 100644
index 0000000..b5996eb
--- /dev/null
+++ b/docs/en-US/remove-tier.xml
@@ -0,0 +1,55 @@
+<?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="remove-tier">
+ <title>Removing Tiers</title>
+ <para>You can remove a tier from a VPC. A removed tier cannot be revoked. When a tier is removed,
+ only the resources of the tier are expunged. All the network rules (port forwarding, load
+ balancing and staticNAT) and the IP addresses associated to the tier are removed. The IP address
+ still be belonging to the same VPC.</para>
+ <orderedlist>
+ <listitem>
+ <para>Log in to the &PRODUCT; UI as an administrator or end user.</para>
+ </listitem>
+ <listitem>
+ <para>In the left navigation, choose Network.</para>
+ </listitem>
+ <listitem>
+ <para>In the Select view, select VPC.</para>
+ <para>All the VPC that you have created for the account is listed in the page.</para>
+ </listitem>
+ <listitem>
+ <para>Click the Configure button of the VPC for which you want to set up tiers.</para>
+ <para>The Configure VPC page is displayed. Locate the tier you want to work with.</para>
+ </listitem>
+ <listitem>
+ <para>Click the Remove VPC button:</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="./images/remove-tier.png"/>
+ </imageobject>
+ <textobject>
+ <phrase>remove-tier.png: removing a tier from a vpc.</phrase>
+ </textobject>
+ </mediaobject>
+ <para>Wait for some time for the tier to be removed.</para>
+ </listitem>
+ </orderedlist>
+</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/remove-vpc.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/remove-vpc.xml b/docs/en-US/remove-vpc.xml
new file mode 100644
index 0000000..c5eff85
--- /dev/null
+++ b/docs/en-US/remove-vpc.xml
@@ -0,0 +1,68 @@
+<?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="remove-vpc">
+ <title>Editing, Restarting, and Removing a Virtual Private Cloud</title>
+ <note>
+ <para>Ensure that all the tiers are removed before you remove a VPC.</para>
+ </note>
+ <orderedlist>
+ <listitem>
+ <para>Log in to the &PRODUCT; UI as an administrator or end user. </para>
+ </listitem>
+ <listitem>
+ <para>In the left navigation, choose Network.</para>
+ </listitem>
+ <listitem>
+ <para>In the Select view, select VPC.</para>
+ <para>All the VPCs that you have created for the account is listed in the page.</para>
+ </listitem>
+ <listitem>
+ <para>Select the VPC you want to work with.</para>
+ </listitem>
+ <listitem>
+ <para>To remove, click the Remove VPC button<inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="./images/remove-vpc.png"/>
+ </imageobject>
+ <textobject>
+ <phrase>remove-vpc.png: button to remove a VPC</phrase>
+ </textobject>
+ </inlinemediaobject></para>
+ <para>You can edit the name and description of a VPC. To do that, select the VPC, then click
+ the Edit button. <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="./images/edit-icon.png"/>
+ </imageobject>
+ <textobject>
+ <phrase>edit-icon.png: button to edit a VPC</phrase>
+ </textobject>
+ </inlinemediaobject></para>
+ <para>To restart a VPC, select the VPC, then click the Restart button.<inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="./images/restart-vpc.png"/>
+ </imageobject>
+ <textobject>
+ <phrase>restart-vpc.png: button to restart a VPC</phrase>
+ </textobject>
+ </inlinemediaobject></para>
+ </listitem>
+ </orderedlist>
+</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/separate_storage_network.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/separate_storage_network.xml b/docs/en-US/separate_storage_network.xml
new file mode 100644
index 0000000..c3f6330
--- /dev/null
+++ b/docs/en-US/separate_storage_network.xml
@@ -0,0 +1,24 @@
+<!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="separate_storage_network">
+ <title>Separate Storage Network</title>
+ <para>In the large-scale redundant setup described in the previous section, storage traffic can overload the management network. A separate storage network is optional for deployments. Storage protocols such as iSCSI are sensitive to network delays. A separate storage network ensures guest network traffic contention does not impact storage performance.</para>
+</section>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/set-global-project-resource-limits.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/set-global-project-resource-limits.xml b/docs/en-US/set-global-project-resource-limits.xml
new file mode 100644
index 0000000..d91942a
--- /dev/null
+++ b/docs/en-US/set-global-project-resource-limits.xml
@@ -0,0 +1,82 @@
+<?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="set-global-project-resource-limits">
+ <title>Setting the Global Project Resource Limits</title>
+ <orderedlist>
+ <listitem>
+ <para>Log in as administrator to the &PRODUCT; UI.</para>
+ </listitem>
+ <listitem>
+ <para>In the left navigation, click Global Settings.</para>
+ </listitem>
+ <listitem>
+ <para>In the search box, type max.projects and click the search button.</para>
+ </listitem>
+ <listitem>
+ <para>In the search results, you will see the parameters you can use to set per-project
+ maximum resource amounts that apply to all projects in the cloud. No project can have more
+ resources, but an individual project can have lower limits. Click the edit button to set
+ each parameter. <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="./images/edit-icon.png"/>
+ </imageobject>
+ <textobject>
+ <phrase>editbutton.png: Edits parameters</phrase>
+ </textobject>
+ </inlinemediaobject></para>
+ <informaltable>
+ <tgroup cols="2" align="left" colsep="1" rowsep="1">
+ <tbody>
+ <row>
+ <entry><para>max.project.public.ips</para></entry>
+ <entry><para>Maximum number of public IP addresses that can be owned by any project in
+ the cloud. See About Public IP Addresses.</para></entry>
+ </row>
+ <row>
+ <entry><para>max.project.snapshots</para></entry>
+ <entry><para>Maximum number of snapshots that can be owned by any project in the
+ cloud. See Working with Snapshots.</para></entry>
+ </row>
+ <row>
+ <entry><para>max.project.templates</para></entry>
+ <entry><para>Maximum number of templates that can be owned by any project in the
+ cloud. See Working with Templates.</para></entry>
+ </row>
+ <row>
+ <entry><para>max.project.uservms</para></entry>
+ <entry><para>Maximum number of guest virtual machines that can be owned by any project
+ in the cloud. See Working With Virtual Machines.</para></entry>
+ </row>
+ <row>
+ <entry><para>max.project.volumes</para></entry>
+ <entry><para>Maximum number of data volumes that can be owned by any project in the
+ cloud. See Working with Volumes.</para></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </listitem>
+ <listitem>
+ <para>Restart the Management Server.</para>
+ <programlisting># service cloud-management restart</programlisting>
+ </listitem>
+ </orderedlist>
+</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/set-per-project-resource-limits.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/set-per-project-resource-limits.xml b/docs/en-US/set-per-project-resource-limits.xml
new file mode 100644
index 0000000..a0f64ea
--- /dev/null
+++ b/docs/en-US/set-per-project-resource-limits.xml
@@ -0,0 +1,55 @@
+<?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="set-per-project-resource-limits">
+ <title>Setting Per-Project Resource Limits</title>
+ <para>The &PRODUCT; root administrator or the domain administrator of the domain where the project
+ resides can set new resource limits for an individual project. The project owner can set
+ resource limits only if the owner is also a domain or root administrator.</para>
+ <para>The new limits must be below the global default limits set by the &PRODUCT; administrator
+ (as described in <xref linkend="set-resource-limits-for-projects"/>). If the project already
+ owns more of a given type of resource than the new maximum, the resources are not affected;
+ however, the project can not add any new resources of that type until the total drops below the
+ new limit.</para>
+ <orderedlist>
+ <listitem>
+ <para>Log in as administrator to the &PRODUCT; UI.</para>
+ </listitem>
+ <listitem>
+ <para>In the left navigation, click Projects.</para>
+ </listitem>
+ <listitem>
+ <para>In Select View, choose Projects.</para>
+ </listitem>
+ <listitem>
+ <para>Click the name of the project you want to work with.</para>
+ </listitem>
+ <listitem>
+ <para>Click the Resources tab. This tab lists the current maximum amount that the project is
+ allowed to own for each type of resource.</para>
+ </listitem>
+ <listitem>
+ <para>Type new values for one or more resources.</para>
+ </listitem>
+ <listitem>
+ <para>Click Apply.</para>
+ </listitem>
+ </orderedlist>
+</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/set-projects-creator-permissions.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/set-projects-creator-permissions.xml b/docs/en-US/set-projects-creator-permissions.xml
index 1d9309f..9b272f6 100644
--- a/docs/en-US/set-projects-creator-permissions.xml
+++ b/docs/en-US/set-projects-creator-permissions.xml
@@ -3,45 +3,60 @@
<!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.
+ 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="set-projects-creator-permissions">
- <title>Setting Project Creator Permissions</title>
- <para>You can configure &PRODUCT; to allow any user to create a new project, or you can restrict that ability to just &PRODUCT; administrators.</para>
- <orderedlist>
- <listitem><para>Log in as administrator to the &PRODUCT; UI.</para></listitem>
- <listitem><para>In the left navigation, click Global Settings.</para></listitem>
- <listitem><para>In the search box, type allow.user.create.projects.</para></listitem>
- <listitem><para>Click the edit button to set the parameter. <inlinemediaobject>
- <imageobject>
- <imagedata fileref="./images/edit-icon.png" />
- </imageobject>
- <textobject><phrase>editbutton.png: Edits parameters</phrase></textobject>
- </inlinemediaobject></para><informaltable>
- <tgroup cols="2" align="left" colsep="1" rowsep="1">
- <tbody>
- <row>
- <entry><para>allow.user.create.projects</para></entry>
- <entry><para>Set to true to allow end users to create projects. Set to false if you want only the &PRODUCT; root administrator and domain administrators to create projects.</para></entry>
- </row>
- </tbody></tgroup></informaltable></listitem>
- <listitem><para>Restart the Management Server.</para><programlisting># service cloud-management restart</programlisting></listitem>
- </orderedlist>
+ <title>Setting Project Creator Permissions</title>
+ <para>You can configure &PRODUCT; to allow any user to create a new project, or you can restrict
+ that ability to just &PRODUCT; administrators.</para>
+ <orderedlist>
+ <listitem>
+ <para>Log in as administrator to the &PRODUCT; UI.</para>
+ </listitem>
+ <listitem>
+ <para>In the left navigation, click Global Settings.</para>
+ </listitem>
+ <listitem>
+ <para>In the search box, type allow.user.create.projects.</para>
+ </listitem>
+ <listitem>
+ <para>Click the edit button to set the parameter.<inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="./images/edit-icon.png"/>
+ </imageobject>
+ <textobject>
+ <phrase>editbutton.png: Edits parameters</phrase>
+ </textobject>
+ </inlinemediaobject></para>
+ <informaltable>
+ <tgroup cols="2" align="left" colsep="1" rowsep="1">
+ <tbody>
+ <row>
+ <entry><para>allow.user.create.projects</para></entry>
+ <entry><para>Set to true to allow end users to create projects. Set to false if you
+ want only the &PRODUCT; root administrator and domain administrators to create
+ projects.</para></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </listitem>
+ <listitem>
+ <para>Restart the Management Server.</para>
+ <programlisting># service cloud-management restart</programlisting>
+ </listitem>
+ </orderedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/set-resource-limits-for-projects.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/set-resource-limits-for-projects.xml b/docs/en-US/set-resource-limits-for-projects.xml
index 2c331ac..669ca25 100644
--- a/docs/en-US/set-resource-limits-for-projects.xml
+++ b/docs/en-US/set-resource-limits-for-projects.xml
@@ -3,26 +3,30 @@
<!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.
+ 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="set-resource-limits-for-projects">
- <title>Setting Resource Limits for Projects</title>
- <para>The &PRODUCT; administrator can set global default limits to control the amount of resources that can be owned by each project in the cloud. This serves to prevent uncontrolled usage of resources such as snapshots, IP addresses, and virtual machine instances. Domain administrators can override these resource limits for individual projects with their domains, as long as the new limits are below the global defaults set by the &PRODUCT; root administrator. The root administrator can also set lower resource limits for any project in the cloud</para>
+ <title>Setting Resource Limits for Projects</title>
+ <para>The &PRODUCT; administrator can set global default limits to control the amount of resources
+ that can be owned by each project in the cloud. This serves to prevent uncontrolled usage of
+ resources such as snapshots, IP addresses, and virtual machine instances. Domain administrators
+ can override these resource limits for individual projects with their domains, as long as the
+ new limits are below the global defaults set by the &PRODUCT; root administrator. The root
+ administrator can also set lower resource limits for any project in the cloud</para>
+ <xi:include href="set-per-project-resource-limits.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="set-global-project-resource-limits.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/small_scale_deployment.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/small_scale_deployment.xml b/docs/en-US/small_scale_deployment.xml
new file mode 100644
index 0000000..eb509a7
--- /dev/null
+++ b/docs/en-US/small_scale_deployment.xml
@@ -0,0 +1,37 @@
+<!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="small_scale_deployment">
+ <title>Small-Scale Deployment</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="./images/small_scale_deployment.png" />
+ </imageobject>
+ <textobject><phrase>Small-Scale Deployment</phrase></textobject>
+ </mediaobject>
+ <para>This diagram illustrates the network architecture of a small-scale &PRODUCT; deployment.</para>
+ <itemizedlist>
+ <listitem><para>A firewall provides a connection to the Internet. The firewall is configured in NAT mode. The firewall forwards HTTP requests and API calls from the Internet to the Management Server. The Management Server resides on the management network.</para></listitem>
+ <listitem><para>A layer-2 switch connects all physical servers and storage.</para></listitem>
+ <listitem><para>A single NFS server functions as both the primary and secondary storage.</para></listitem>
+ <listitem><para>The Management Server is connected to the management network.</para></listitem>
+ </itemizedlist>
+</section>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/storage-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/storage-overview.xml b/docs/en-US/storage-overview.xml
new file mode 100644
index 0000000..bebf441
--- /dev/null
+++ b/docs/en-US/storage-overview.xml
@@ -0,0 +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="storage-overview">
+ <title>Storage Overview</title>
+ <para>&PRODUCT; defines two types of storage: primary and secondary. Primary storage can be
+ accessed by either iSCSI or NFS. Additionally, direct attached storage may be used for primary
+ storage. Secondary storage is always accessed using NFS.</para>
+ <para>There is no ephemeral storage in &PRODUCT;. All volumes on all nodes are persistent.</para>
+</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/suspend-project.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/suspend-project.xml b/docs/en-US/suspend-project.xml
index bfaa12a..b4f821b 100644
--- a/docs/en-US/suspend-project.xml
+++ b/docs/en-US/suspend-project.xml
@@ -32,17 +32,21 @@
<listitem><para>In the left navigation, click Projects.</para></listitem>
<listitem><para>In Select View, choose Projects.</para></listitem>
<listitem><para>Click the name of the project.</para></listitem>
- <listitem><para>Click one of the buttons:<inlinemediaobject>
+ <listitem><para>Click one of the buttons:</para><para>To delete, use <inlinemediaobject>
<imageobject>
<imagedata fileref="./images/delete-button.png" />
</imageobject>
- <textobject><phrase>deletebutton.png: Removes a member</phrase></textobject>
- </inlinemediaobject></para>
- <para><inlinemediaobject>
+ <textobject>
+ <phrase>deletebutton.png: Removes a project</phrase>
+ </textobject>
+ </inlinemediaobject></para>
+ <para>To suspend, use<inlinemediaobject>
<imageobject>
<imagedata fileref="./images/suspend-icon.png" />
</imageobject>
- <textobject><phrase>deletebutton.png: Removes a member</phrase></textobject>
+ <textobject>
+ <phrase>deletebutton.png: suspends a project</phrase>
+ </textobject>
</inlinemediaobject></para></listitem>
</orderedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/system-service-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/system-service-offerings.xml b/docs/en-US/system-service-offerings.xml
index 75aa128..c41aa2e 100644
--- a/docs/en-US/system-service-offerings.xml
+++ b/docs/en-US/system-service-offerings.xml
@@ -26,4 +26,4 @@
<title>System Service Offerings</title>
<para>System service offerings provide a choice of CPU speed, number of CPUs, tags, and RAM size, just as other service offerings do. But rather than being used for virtual machine instances and exposed to users, system service offerings are used to change the default properties of virtual routers, console proxies, and other system VMs. System service offerings are visible only to the &PRODUCT; root administrator. &PRODUCT; provides default system service offerings. The &PRODUCT; root administrator can create additional custom system service offerings.</para>
<para>When &PRODUCT; creates a virtual router for a guest network, it uses default settings which are defined in the system service offering associated with the network offering. You can upgrade the capabilities of the virtual router by applying a new network offering that contains a different system service offering. All virtual routers in that network will begin using the settings from the new service offering.</para>
- </section>
+</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/ui.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/ui.xml b/docs/en-US/ui.xml
index 4f7f327..94ea4ea 100644
--- a/docs/en-US/ui.xml
+++ b/docs/en-US/ui.xml
@@ -5,24 +5,25 @@
]>
<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
<chapter id="ui">
- <title>User Interface</title>
- <xi:include href="log-in.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <title>User Interface</title>
+ <xi:include href="log-in.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="using-sshkeys.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</chapter>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/user-services-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/user-services-overview.xml b/docs/en-US/user-services-overview.xml
index f9e38c0..9576121 100644
--- a/docs/en-US/user-services-overview.xml
+++ b/docs/en-US/user-services-overview.xml
@@ -5,94 +5,35 @@
]>
<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
-<section id="user-services-overview">
- <title>User Services Overview</title>
- <para>In addition to the physical and logical infrastructure of your cloud, and the &PRODUCT; software and servers, you also need a layer of user services so that people can actually make use of the cloud. This means not just a user UI, but a set of options and resources that users can choose from, such as templates for creating virtual machines, disk storage, and more. If you are running a commercial service, you will be keeping track of what services and resources users are consuming and charging them for that usage. Even if you do not charge anything for people to use your cloud – say, if the users are strictly internal to your organization, or just friends who are sharing your cloud – you can still keep track of what services they use and how much of them.</para>
- <section id="offerings-and-templates">
- <title>Service Offerings, Disk Offerings, Network Offerings, and Templates</title>
- <para>A user creating a new instance can make a variety of choices about its characteristics and capabilities. &PRODUCT; provides several ways to present users with choices when creating a new instance:</para>
- <itemizedlist>
- <listitem><para>Service Offerings, defined by the &PRODUCT; administrator, provide a choice of CPU speed, number of CPUs, RAM size, tags on the root disk, and other choices. See Creating a New Compute Offering.</para></listitem>
- <listitem><para>Disk Offerings, defined by the &PRODUCT; administrator, provide a choice of disk size for primary data storage. See Creating a New Disk Offering.</para></listitem>
- <listitem><para>Network Offerings, defined by the &PRODUCT; administrator, describe the feature set that is available to end users from the virtual router or external networking devices on a given guest network. See Network Offerings.</para></listitem>
- <listitem><para>Templates, defined by the &PRODUCT; administrator or by any &PRODUCT; user, are the base OS images that the user can choose from when creating a new instance. For example, &PRODUCT; includes CentOS as a template. See Working with Templates.</para></listitem>
- </itemizedlist>
- <para>In addition to these choices that are provided for users, there is another type of service offering which is available only to the &PRODUCT; root administrator, and is used for configuring virtual infrastructure resources. For more information, see Upgrading a Virtual Router with System Service Offerings.</para>
- </section>
- <section id="accounts-users-domains">
- <title>Accounts, Users, and Domains</title>
- <para>An account typically represents a customer of the service provider or a department in a large organization. Multiple users can exist in an account. 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.</para>
- <para>Accounts are grouped by domains. Domains usually contain 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.</para>
- <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. Root administrators have complete access to the system, including managing templates, service offerings, customer care administrators, and domains. 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.</para>
- </section>
- <section id="using-ldap-server">
- <title>Using an LDAP Server for User Authentication</title>
- <para>You can use an external LDAP server such as Microsoft Active Directory or ApacheDS to authenticate &PRODUCT; end-users. Just map &PRODUCT; accounts to the corresponding LDAP accounts using a query filter. The query filter is written using the query syntax of the particular LDAP server, and can include special wildcard characters provided by &PRODUCT; for matching common values such as the user’s email address and name. &PRODUCT; will search the external LDAP directory tree starting at a specified base directory and return the distinguished name (DN) and password of the matching user. This information along with the given password is used to authenticate the user.</para>
- <para>To set up LDAP authentication in &PRODUCT;, call the &PRODUCT; API command ldapConfig and provide the following:</para>
- <itemizedlist>
- <listitem><para>Hostname or IP address and listening port of the LDAP server</para></listitem>
- <listitem><para>Base directory and query filter</para></listitem>
- <listitem><para>Search user DN credentials, which give &PRODUCT; permission to search on the LDAP server</para></listitem>
- <listitem><para>SSL keystore and password, if SSL is used</para></listitem>
- </itemizedlist>
- <section id="example-ldap-commands">
- <title>Example LDAP Configuration Commands</title>
- <para>To understand the examples in this section, you need to know the basic concepts behind calling the &PRODUCT; API, which are explained in the Developer’s Guide.</para>
- <para>The following shows an example invocation of ldapConfig with an ApacheDS LDAP server.</para>
- <programlisting>http://127.0.0.1:8080/client/api?command=ldapConfig&hostname=127.0.0.1&searchbase=ou%3Dtesting%2Co%3Dproject&queryfilter=%28%26%28uid%3D%25u%29%29&binddn=cn%3DJohn+Singh%2Cou%3Dtesting%2Co%project&bindpass=secret&port=10389&ssl=true&truststore=C%3A%2Fcompany%2Finfo%2Ftrusted.ks&truststorepass=secret&response=json&apiKey=YourAPIKey&signature=YourSignatureHash
- </programlisting>
- <para>The command must be URL-encoded. Here is the same example without the URL encoding:</para>
- <programlisting>
-http://127.0.0.1:8080/client/api?command=ldapConfig
-&hostname=127.0.0.1
-&searchbase=ou=testing,o=project
-&queryfilter=(&(%uid=%u))
-&binddn=cn=John+Singh,ou=testing,o=project
-&bindpass=secret
-&port=10389
-&ssl=true
-&truststore=C:/company/info/trusted.ks
-&truststorepass=secret
-&response=json
-&apiKey=YourAPIKey
-&signature=YourSignatureHash
- </programlisting>
- <para>The following shows a similar command for Active Directory. Here, the search base is the testing group within a company, and the users are matched up based on email address.</para>
- <programlisting>http://10.147.29.101:8080/client/api?command=ldapConfig&hostname=10.147.28.250&searchbase=OU%3Dtesting%2CDC%3Dcompany&queryfilter=%28%26%28mail%3D%25e%29%29&binddn=CN%3DAdministrator%2COU%3Dtesting%2CDC%3Dcompany&bindpass=1111_aaaa&port=389&response=json&apiKey=YourAPIKey&signature=YourSignatureHash</programlisting>
- <para>The next few sections explain some of the concepts you will need to know when filling out the ldapConfig parameters.</para>
- </section>
- <section id="search-base">
- <title>Search Base</title>
- <para>Coming soon: TODO</para>
- </section>
- <section id="query-filter">
- <title>Query Filter</title>
- <para>Coming soon: TODO</para>
- </section>
- <section id="search-user-bind-dn">
- <title>Search User Bind DN</title>
- <para>Coming soon: TODO</para>
- </section>
- <section id="ssl-keystore-path-and-password">
- <title>SSL Keystore Path and Password</title>
- <para>Coming soon: TODO</para>
- </section>
- </section>
-</section>
+<chapter id="user-services-overview">
+ <title>User Services Overview</title>
+ <para>In addition to the physical and logical infrastructure of your cloud, and the &PRODUCT; software and servers, you also need a layer of user services so that people can actually make use of the cloud. This means not just a user UI, but a set of options and resources that users can choose from, such as templates for creating virtual machines, disk storage, and more. If you are running a commercial service, you will be keeping track of what services and resources users are consuming and charging them for that usage. Even if you do not charge anything for people to use your cloud – say, if the users are strictly internal to your organization, or just friends who are sharing your cloud – you can still keep track of what services they use and how much of them.</para>
+ <section id="offerings-and-templates">
+ <title>Service Offerings, Disk Offerings, Network Offerings, and Templates</title>
+ <para>A user creating a new instance can make a variety of choices about its characteristics and capabilities. &PRODUCT; provides several ways to present users with choices when creating a new instance:</para>
+ <itemizedlist>
+ <listitem><para>Service Offerings, defined by the &PRODUCT; administrator, provide a choice of CPU speed, number of CPUs, RAM size, tags on the root disk, and other choices. See Creating a New Compute Offering.</para></listitem>
+ <listitem><para>Disk Offerings, defined by the &PRODUCT; administrator, provide a choice of disk size for primary data storage. See Creating a New Disk Offering.</para></listitem>
+ <listitem><para>Network Offerings, defined by the &PRODUCT; administrator, describe the feature set that is available to end users from the virtual router or external networking devices on a given guest network. See Network Offerings.</para></listitem>
+ <listitem><para>Templates, defined by the &PRODUCT; administrator or by any &PRODUCT; user, are the base OS images that the user can choose from when creating a new instance. For example, &PRODUCT; includes CentOS as a template. See Working with Templates.</para></listitem>
+ </itemizedlist>
+ <para>In addition to these choices that are provided for users, there is another type of service offering which is available only to the &PRODUCT; root administrator, and is used for configuring virtual infrastructure resources. For more information, see Upgrading a Virtual Router with System Service Offerings.</para>
+ </section>
+</chapter>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/virtual-machines.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/virtual-machines.xml b/docs/en-US/virtual-machines.xml
new file mode 100644
index 0000000..7c74932
--- /dev/null
+++ b/docs/en-US/virtual-machines.xml
@@ -0,0 +1,34 @@
+<?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.
+-->
+<chapter id="virtual-machines">
+ <title>Working With Virtual Machines</title>
+ <xi:include href="about-working-with-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="best-practices-for-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="vm-lifecycle.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="creating-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="accessing-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="stopping-and-starting-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="changing-vm-name-os-group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="changing-service-offering-for-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="manual-live-migration.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="deleting-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="working-with-iso.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+</chapter>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/publican-adminguide.cfg
----------------------------------------------------------------------
diff --git a/docs/publican-adminguide.cfg b/docs/publican-adminguide.cfg
index a599782..7a8a203 100644
--- a/docs/publican-adminguide.cfg
+++ b/docs/publican-adminguide.cfg
@@ -20,10 +20,11 @@
xml_lang: en-US
type: Book
-docname: cloudstack_admin
+docname: Admin_Guide
brand: cloudstack
chunk_first: 1
chunk_section_depth: 1
+condition: admin
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/publican-devguide.cfg
----------------------------------------------------------------------
diff --git a/docs/publican-devguide.cfg b/docs/publican-devguide.cfg
index 3b364d9..006c0d1 100644
--- a/docs/publican-devguide.cfg
+++ b/docs/publican-devguide.cfg
@@ -20,7 +20,7 @@
xml_lang: en-US
type: Book
-docname: cloudstack_developers
+docname: API_Developers_Guide
brand: cloudstack
chunk_first: 1
chunk_section_depth: 1
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/publican-installation.cfg
----------------------------------------------------------------------
diff --git a/docs/publican-installation.cfg b/docs/publican-installation.cfg
index 708200d..6f10a90 100644
--- a/docs/publican-installation.cfg
+++ b/docs/publican-installation.cfg
@@ -20,7 +20,7 @@
xml_lang: en-US
type: Book
-docname: cloudstack_installation
+docname: Installation_Guide
brand: cloudstack
chunk_first: 1
chunk_section_depth: 1
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/publican-plugin-niciranvp.cfg
----------------------------------------------------------------------
diff --git a/docs/publican-plugin-niciranvp.cfg b/docs/publican-plugin-niciranvp.cfg
new file mode 100644
index 0000000..2e3696d
--- /dev/null
+++ b/docs/publican-plugin-niciranvp.cfg
@@ -0,0 +1,28 @@
+# Publican configuration file for CloudStack Complete Documentation Set
+# Contains all technical docs except release notes
+# Config::Simple 4.58
+# Tue May 29 00:57:27 2012
+#
+# 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.
+
+xml_lang: en-US
+type: Book
+docname: CloudStack_Nicira_NVP_Guide
+brand: cloudstack
+chunk_first: 1
+chunk_section_depth: 1
+condition: install
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/publican-release-notes-4_0.cfg
----------------------------------------------------------------------
diff --git a/docs/publican-release-notes-4_0.cfg b/docs/publican-release-notes-4_0.cfg
deleted file mode 100644
index 07c9002..0000000
--- a/docs/publican-release-notes-4_0.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-# Publican configuration file for CloudStack 4.0 Release Notes
-# Config::Simple 4.58
-# Tue May 29 00:57:27 2012
-#
-# 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.
-
-xml_lang: en-US
-type: Book
-docname: release-notes-4.0
-brand: cloudstack
-chunk_first: 0
-chunk_section_depth: 0
-toc_section_depth: 1
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/publican-release-notes.cfg
----------------------------------------------------------------------
diff --git a/docs/publican-release-notes.cfg b/docs/publican-release-notes.cfg
new file mode 100644
index 0000000..cabf1ea
--- /dev/null
+++ b/docs/publican-release-notes.cfg
@@ -0,0 +1,27 @@
+# Publican configuration file for CloudStack 4.0 Release Notes
+# Config::Simple 4.58
+# Tue May 29 00:57:27 2012
+#
+# 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.
+
+xml_lang: en-US
+type: Book
+docname: release-notes
+brand: cloudstack
+chunk_first: 0
+chunk_section_depth: 0
+toc_section_depth: 1