incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [1/2] git commit: Prepare docs for transifex translation
Date Sun, 09 Dec 2012 17:30:57 GMT
Updated Branches:
  refs/heads/master 2bd877616 -> 400d29be8


Prepare docs for transifex translation


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

Branch: refs/heads/master
Commit: 18d7595292f336093e5c586b544d911f5a70ac5d
Parents: 2bd8776
Author: Sebastien Goasguen <runseb@gmail.com>
Authored: Fri Dec 7 17:58:18 2012 +0100
Committer: Joe Brockmeier <jzb@zonker.net>
Committed: Sun Dec 9 11:30:18 2012 -0600

----------------------------------------------------------------------
 docs/en-US/Book_Info_Release_Notes_4-0.xml         |   39 ++
 docs/en-US/Book_Info_Release_Notes_4.0.xml         |   39 --
 docs/en-US/Release_Notes.xml                       |    2 +-
 docs/en-US/added-API-commands-4-0.xml              |  164 +++++++++
 docs/en-US/added-API-commands-4.0.xml              |  164 ---------
 docs/en-US/changed-apicommands-4-0.xml             |  268 +++++++++++++++
 docs/en-US/changed-apicommands-4.0.xml             |  268 ---------------
 .../lb-policy-pfwd-rule-usage-record-format.xml    |   40 +++
 ...cy-port-forwarding-rule-usage-record-format.xml |   40 ---
 docs/en-US/ongoing-config-of-ext-firewalls-lb.xml  |   34 ++
 ...guration-of-external-firewalls-loadbalancer.xml |   34 --
 docs/en-US/provisioning-steps.xml.orig             |   42 ---
 ...ooting-dataloss-on-exported-primary-storage.xml |   45 ---
 ...ing-maintenance-mode-not-working-on-vCenter.xml |   43 ---
 docs/en-US/troubleshooting.xml                     |    6 +-
 .../troublesht-dataloss-on-exp-primary-storage.xml |   45 +++
 .../troublesht-mtn-mode-not-working-on-vCenter.xml |   43 +++
 17 files changed, 637 insertions(+), 679 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/18d75952/docs/en-US/Book_Info_Release_Notes_4-0.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Book_Info_Release_Notes_4-0.xml b/docs/en-US/Book_Info_Release_Notes_4-0.xml
new file mode 100644
index 0000000..0d57fb6
--- /dev/null
+++ b/docs/en-US/Book_Info_Release_Notes_4-0.xml
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!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.
+-->
+<bookinfo id="book-release-notes-4.0">
+  <title>Version 4.0.0-incubating Release Notes</title>
+  <subtitle>Revised October 17, 2012 19:49 UTC</subtitle>
+  <productname>Apache CloudStack</productname>
+  <productnumber/>
+  <pubsnumber/>
+  <abstract>
+    <para>Release notes for the Apache CloudStack 4.0.0-incubating release.</para>
+  </abstract>
+  <corpauthor>
+    <inlinemediaobject>
+      <imageobject>
+        <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"/>
+      </imageobject>
+    </inlinemediaobject>
+  </corpauthor>
+  <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+</bookinfo>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/18d75952/docs/en-US/Book_Info_Release_Notes_4.0.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Book_Info_Release_Notes_4.0.xml b/docs/en-US/Book_Info_Release_Notes_4.0.xml
deleted file mode 100644
index 0d57fb6..0000000
--- a/docs/en-US/Book_Info_Release_Notes_4.0.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!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.
--->
-<bookinfo id="book-release-notes-4.0">
-  <title>Version 4.0.0-incubating Release Notes</title>
-  <subtitle>Revised October 17, 2012 19:49 UTC</subtitle>
-  <productname>Apache CloudStack</productname>
-  <productnumber/>
-  <pubsnumber/>
-  <abstract>
-    <para>Release notes for the Apache CloudStack 4.0.0-incubating release.</para>
-  </abstract>
-  <corpauthor>
-    <inlinemediaobject>
-      <imageobject>
-        <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"/>
-      </imageobject>
-    </inlinemediaobject>
-  </corpauthor>
-  <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-</bookinfo>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/18d75952/docs/en-US/Release_Notes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Release_Notes.xml b/docs/en-US/Release_Notes.xml
index 17f9079..c8cc686 100644
--- a/docs/en-US/Release_Notes.xml
+++ b/docs/en-US/Release_Notes.xml
@@ -19,7 +19,7 @@
   under the License.
 -->
 <book>
-  <xi:include href="Book_Info_Release_Notes_4.0.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="Book_Info_Release_Notes_4-0.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <chapter id="submitting-feedback">
     <title>Submitting Feedback and Getting Help</title>
     <para>The Apache CloudStack project has mailing lists for users and developers. These are the

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/18d75952/docs/en-US/added-API-commands-4-0.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/added-API-commands-4-0.xml b/docs/en-US/added-API-commands-4-0.xml
new file mode 100644
index 0000000..2d86ba4
--- /dev/null
+++ b/docs/en-US/added-API-commands-4-0.xml
@@ -0,0 +1,164 @@
+<?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="added-API-commands-4.0">
+  <title>Added API Commands in 4.0.0-incubating</title>
+  <itemizedlist>
+    <listitem>
+      <para>createCounter (Adds metric counter)</para>
+    </listitem>
+    <listitem>
+      <para>deleteCounter (Deletes a counter)</para>
+    </listitem>
+    <listitem>
+      <para>listCounters (List the counters)</para>
+    </listitem>
+    <listitem>
+      <para>createCondition (Creates a condition)</para>
+    </listitem>
+    <listitem>
+      <para>deleteCondition (Removes a condition)</para>
+    </listitem>
+    <listitem>
+      <para>listConditions (List Conditions for the specific user)</para>
+    </listitem>
+    <listitem>
+      <para>createTags. Add tags to one or more resources. Example:
+        <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				</programlisting></para>
+    </listitem>
+    <listitem>
+      <para>deleteTags. Remove tags from one or more resources. Example:
+        <programlisting>command=deleteTags
+&amp;resourceIds=1,12
+&amp;resourceType=Snapshot
+&amp;tags[0].key=city								</programlisting></para>
+    </listitem>
+    <listitem>
+      <para>listTags (Show currently defined resource tags)</para>
+    </listitem>
+    <listitem>
+      <para>createVPC (Creates a VPC)</para>
+    </listitem>
+    <listitem>
+      <para>listVPCs (Lists VPCs)</para>
+    </listitem>
+    <listitem>
+      <para>deleteVPC (Deletes a VPC)</para>
+    </listitem>
+    <listitem>
+      <para>updateVPC (Updates a VPC)</para>
+    </listitem>
+    <listitem>
+      <para>restartVPC (Restarts a VPC)</para>
+    </listitem>
+    <listitem>
+      <para>createVPCOffering (Creates VPC offering)</para>
+    </listitem>
+    <listitem>
+      <para>updateVPCOffering (Updates VPC offering)</para>
+    </listitem>
+    <listitem>
+      <para>deleteVPCOffering (Deletes VPC offering)</para>
+    </listitem>
+    <listitem>
+      <para>listVPCOfferings (Lists VPC offerings)</para>
+    </listitem>
+    <listitem>
+      <para>createPrivateGateway (Creates a private gateway)</para>
+    </listitem>
+    <listitem>
+      <para>listPrivateGateways (List private gateways)</para>
+    </listitem>
+    <listitem>
+      <para>deletePrivateGateway (Deletes a Private gateway)</para>
+    </listitem>
+    <listitem>
+      <para>createNetworkACL (Creates a ACL rule the given network (the network has to belong to
+        VPC))</para>
+    </listitem>
+    <listitem>
+      <para>deleteNetworkACL (Deletes a Network ACL)</para>
+    </listitem>
+    <listitem>
+      <para>listNetworkACLs (Lists all network ACLs)</para>
+    </listitem>
+    <listitem>
+      <para>createStaticRoute (Creates a static route)</para>
+    </listitem>
+    <listitem>
+      <para>deleteStaticRoute (Deletes a static route)</para>
+    </listitem>
+    <listitem>
+      <para>listStaticRoutes (Lists all static routes)</para>
+    </listitem>
+    <listitem>
+      <para>createVpnCustomerGateway (Creates site to site vpn customer gateway)</para>
+    </listitem>
+    <listitem>
+      <para>createVpnGateway (Creates site to site vpn local gateway)</para>
+    </listitem>
+    <listitem>
+      <para>createVpnConnection (Create site to site vpn connection)</para>
+    </listitem>
+    <listitem>
+      <para>deleteVpnCustomerGateway (Delete site to site vpn customer gateway)</para>
+    </listitem>
+    <listitem>
+      <para>deleteVpnGateway (Delete site to site vpn gateway)</para>
+    </listitem>
+    <listitem>
+      <para>deleteVpnConnection (Delete site to site vpn connection)</para>
+    </listitem>
+    <listitem>
+      <para>updateVpnCustomerGateway (Update site to site vpn customer gateway)</para>
+    </listitem>
+    <listitem>
+      <para>resetVpnConnection (Reset site to site vpn connection)</para>
+    </listitem>
+    <listitem>
+      <para>listVpnCustomerGateways (Lists site to site vpn customer gateways)</para>
+    </listitem>
+    <listitem>
+      <para>listVpnGateways (Lists site 2 site vpn gateways)</para>
+    </listitem>
+    <listitem>
+      <para>listVpnConnections (Lists site to site vpn connection gateways)</para>
+    </listitem>
+    <listitem>
+      <para>enableCiscoNexusVSM (Enables Nexus 1000v dvSwitch in &PRODUCT;.)</para>
+    </listitem>
+    <listitem>
+      <para>disableCiscoNexusVSM (Disables Nexus 1000v dvSwitch in &PRODUCT;.)</para>
+    </listitem>
+    <listitem>
+      <para>deleteCiscoNexusVSM (Deletes Nexus 1000v dvSwitch in &PRODUCT;.)</para>
+    </listitem>
+    <listitem>
+      <para>listCiscoNexusVSMs (Lists the control VLAN ID, packet VLAN ID, and data VLAN ID, as well
+        as the IP address of the Nexus 1000v dvSwitch.)</para>
+    </listitem>
+  </itemizedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/18d75952/docs/en-US/added-API-commands-4.0.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/added-API-commands-4.0.xml b/docs/en-US/added-API-commands-4.0.xml
deleted file mode 100644
index 2d86ba4..0000000
--- a/docs/en-US/added-API-commands-4.0.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?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="added-API-commands-4.0">
-  <title>Added API Commands in 4.0.0-incubating</title>
-  <itemizedlist>
-    <listitem>
-      <para>createCounter (Adds metric counter)</para>
-    </listitem>
-    <listitem>
-      <para>deleteCounter (Deletes a counter)</para>
-    </listitem>
-    <listitem>
-      <para>listCounters (List the counters)</para>
-    </listitem>
-    <listitem>
-      <para>createCondition (Creates a condition)</para>
-    </listitem>
-    <listitem>
-      <para>deleteCondition (Removes a condition)</para>
-    </listitem>
-    <listitem>
-      <para>listConditions (List Conditions for the specific user)</para>
-    </listitem>
-    <listitem>
-      <para>createTags. Add tags to one or more resources. Example:
-        <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				</programlisting></para>
-    </listitem>
-    <listitem>
-      <para>deleteTags. Remove tags from one or more resources. Example:
-        <programlisting>command=deleteTags
-&amp;resourceIds=1,12
-&amp;resourceType=Snapshot
-&amp;tags[0].key=city								</programlisting></para>
-    </listitem>
-    <listitem>
-      <para>listTags (Show currently defined resource tags)</para>
-    </listitem>
-    <listitem>
-      <para>createVPC (Creates a VPC)</para>
-    </listitem>
-    <listitem>
-      <para>listVPCs (Lists VPCs)</para>
-    </listitem>
-    <listitem>
-      <para>deleteVPC (Deletes a VPC)</para>
-    </listitem>
-    <listitem>
-      <para>updateVPC (Updates a VPC)</para>
-    </listitem>
-    <listitem>
-      <para>restartVPC (Restarts a VPC)</para>
-    </listitem>
-    <listitem>
-      <para>createVPCOffering (Creates VPC offering)</para>
-    </listitem>
-    <listitem>
-      <para>updateVPCOffering (Updates VPC offering)</para>
-    </listitem>
-    <listitem>
-      <para>deleteVPCOffering (Deletes VPC offering)</para>
-    </listitem>
-    <listitem>
-      <para>listVPCOfferings (Lists VPC offerings)</para>
-    </listitem>
-    <listitem>
-      <para>createPrivateGateway (Creates a private gateway)</para>
-    </listitem>
-    <listitem>
-      <para>listPrivateGateways (List private gateways)</para>
-    </listitem>
-    <listitem>
-      <para>deletePrivateGateway (Deletes a Private gateway)</para>
-    </listitem>
-    <listitem>
-      <para>createNetworkACL (Creates a ACL rule the given network (the network has to belong to
-        VPC))</para>
-    </listitem>
-    <listitem>
-      <para>deleteNetworkACL (Deletes a Network ACL)</para>
-    </listitem>
-    <listitem>
-      <para>listNetworkACLs (Lists all network ACLs)</para>
-    </listitem>
-    <listitem>
-      <para>createStaticRoute (Creates a static route)</para>
-    </listitem>
-    <listitem>
-      <para>deleteStaticRoute (Deletes a static route)</para>
-    </listitem>
-    <listitem>
-      <para>listStaticRoutes (Lists all static routes)</para>
-    </listitem>
-    <listitem>
-      <para>createVpnCustomerGateway (Creates site to site vpn customer gateway)</para>
-    </listitem>
-    <listitem>
-      <para>createVpnGateway (Creates site to site vpn local gateway)</para>
-    </listitem>
-    <listitem>
-      <para>createVpnConnection (Create site to site vpn connection)</para>
-    </listitem>
-    <listitem>
-      <para>deleteVpnCustomerGateway (Delete site to site vpn customer gateway)</para>
-    </listitem>
-    <listitem>
-      <para>deleteVpnGateway (Delete site to site vpn gateway)</para>
-    </listitem>
-    <listitem>
-      <para>deleteVpnConnection (Delete site to site vpn connection)</para>
-    </listitem>
-    <listitem>
-      <para>updateVpnCustomerGateway (Update site to site vpn customer gateway)</para>
-    </listitem>
-    <listitem>
-      <para>resetVpnConnection (Reset site to site vpn connection)</para>
-    </listitem>
-    <listitem>
-      <para>listVpnCustomerGateways (Lists site to site vpn customer gateways)</para>
-    </listitem>
-    <listitem>
-      <para>listVpnGateways (Lists site 2 site vpn gateways)</para>
-    </listitem>
-    <listitem>
-      <para>listVpnConnections (Lists site to site vpn connection gateways)</para>
-    </listitem>
-    <listitem>
-      <para>enableCiscoNexusVSM (Enables Nexus 1000v dvSwitch in &PRODUCT;.)</para>
-    </listitem>
-    <listitem>
-      <para>disableCiscoNexusVSM (Disables Nexus 1000v dvSwitch in &PRODUCT;.)</para>
-    </listitem>
-    <listitem>
-      <para>deleteCiscoNexusVSM (Deletes Nexus 1000v dvSwitch in &PRODUCT;.)</para>
-    </listitem>
-    <listitem>
-      <para>listCiscoNexusVSMs (Lists the control VLAN ID, packet VLAN ID, and data VLAN ID, as well
-        as the IP address of the Nexus 1000v dvSwitch.)</para>
-    </listitem>
-  </itemizedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/18d75952/docs/en-US/changed-apicommands-4-0.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changed-apicommands-4-0.xml b/docs/en-US/changed-apicommands-4-0.xml
new file mode 100644
index 0000000..042d5e2
--- /dev/null
+++ b/docs/en-US/changed-apicommands-4-0.xml
@@ -0,0 +1,268 @@
+<?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="changed-apicommands-4.0">
+  <title>Changed API Commands in 4.0.0-incubating</title>
+  <informaltable>
+    <tgroup cols="2" align="left" colsep="1" rowsep="1">
+      <colspec colwidth="1" colname="1" colnum="1"/>
+      <colspec colwidth="2*" colname="2" colnum="2"/>
+      <thead>
+        <row>
+          <entry><para>API Commands</para></entry>
+          <entry><para>Description</para></entry>
+        </row>
+      </thead>
+      <tbody>
+        <row>
+          <entry>
+            <para>copyTemplate</para>
+            <para>prepareTemplate</para>
+            <para>registerTemplate</para>
+            <para>updateTemplate</para>
+            <para>createProject</para>
+            <para>activateProject</para>
+            <para>suspendProject</para>
+            <para>updateProject</para>
+            <para>listProjectAccounts</para>
+            <para>createVolume</para>
+            <para>migrateVolume</para>
+            <para>attachVolume</para>
+            <para>detachVolume</para>
+            <para>uploadVolume</para>
+            <para>createSecurityGroup</para>
+            <para>registerIso</para>
+            <para>copyIso</para>
+            <para>updateIso</para>
+            <para>createIpForwardingRule</para>
+            <para>listIpForwardingRules</para>
+            <para>createLoadBalancerRule</para>
+            <para>updateLoadBalancerRule</para>
+            <para>createSnapshot</para>
+          </entry>
+          <entry>
+            <para>The commands in this list have a single new response parameter, and no other
+              changes.</para>
+            <para>New response parameter: tags(*)</para>
+            <note>
+              <para>Many other commands also have the new tags(*) parameter in addition to other
+                changes; those commands are listed separately.</para>
+            </note></entry>
+        </row>
+        <row>
+          <entry>
+            <para>rebootVirtualMachine</para>
+            <para>attachIso</para>
+            <para>detachIso</para>
+            <para>listLoadBalancerRuleInstances</para>
+            <para>resetPasswordForVirtualMachine</para>
+            <para>changeServiceForVirtualMachine</para>
+            <para>recoverVirtualMachine</para>
+            <para>startVirtualMachine</para>
+            <para>migrateVirtualMachine</para>
+            <para>deployVirtualMachine</para>
+            <para>assignVirtualMachine</para>
+            <para>updateVirtualMachine</para>
+            <para>restoreVirtualMachine</para>
+            <para>stopVirtualMachine</para>
+            <para>destroyVirtualMachine</para>
+          </entry>
+          <entry>
+            <para>The commands in this list have two new response parameters, and no other
+              changes.</para>
+            <para>New response parameters: keypair, tags(*)</para>
+          </entry>
+        </row>
+        <row>
+          <entry>
+            <para>listSecurityGroups</para>
+            <para>listFirewallRules</para>
+            <para>listPortForwardingRules</para>
+            <para>listSnapshots</para>
+            <para>listIsos</para>
+            <para>listProjects</para>
+            <para>listTemplates</para>
+            <para>listLoadBalancerRules</para>
+          </entry>
+          <entry><para>The commands in this list have the following new parameters, and no other
+              changes.</para>
+            <para>New request parameter: tags (optional)</para>
+            <para>New response parameter: tags(*)</para>
+          </entry>
+        </row>
+        <row>
+          <entry>
+            <para>listF5LoadBalancerNetworks</para>
+            <para>listNetscalerLoadBalancerNetworks</para>
+            <para>listSrxFirewallNetworks</para>
+            <para>updateNetwork</para>
+          </entry>
+          <entry>
+            <para>The commands in this list have three new response parameters, and no other
+              changes.</para>
+            <para>New response parameters: canusefordeploy, vpcid, tags(*)</para>
+          </entry>
+        </row>
+        <row>
+          <entry>
+            <para>createZone</para>
+            <para>updateZone</para>
+          </entry>
+          <entry><para>The commands in this list have the following new parameters, and no other
+              changes.</para>
+            <para>New request parameter: localstorageenabled (optional)</para>
+            <para>New response parameter: localstorageenabled</para>
+          </entry>
+        </row>
+        <row>
+          <entry><para>listZones</para></entry>
+          <entry><para>New response parameter: localstorageenabled</para></entry>
+        </row>
+        <row>
+          <entry>
+            <para>rebootRouter</para>
+            <para>changeServiceForRouter</para>
+            <para>startRouter</para>
+            <para>destroyRouter</para>
+            <para>stopRouter</para>
+          </entry>
+          <entry><para>The commands in this list have two new response parameters, and no other
+              changes.</para>
+            <para>New response parameters: vpcid, nic(*)</para></entry>
+        </row>
+        <row>
+          <entry>
+            <para>updateAccount</para>
+            <para>disableAccount</para>
+            <para>listAccounts</para>
+            <para>markDefaultZoneForAccount</para>
+            <para>enableAccount</para>
+          </entry>
+          <entry><para>The commands in this list have three new response parameters, and no other
+              changes.</para>
+            <para>New response parameters: vpcavailable, vpclimit, vpctotal</para></entry>
+        </row>
+        <row>
+          <entry><para>listRouters</para></entry>
+          <entry>
+            <para>New request parameters: forvpc (optional), vpcid (optional)</para>
+            <para>New response parameters: vpcid, nic(*)</para>
+          </entry>
+        </row>
+        <row>
+          <entry><para>listNetworkOfferings</para></entry>
+          <entry>
+            <para>New request parameters: forvpc (optional)</para>
+            <para>New response parameters: forvpc </para>
+          </entry>
+        </row>
+        <row>
+          <entry><para>listVolumes</para></entry>
+          <entry>
+            <para>New request parameters: details (optional), tags (optional)</para>
+            <para>New response parameters: tags(*)</para>
+          </entry>
+        </row>
+        <row>
+          <entry><para>addTrafficMonitor</para></entry>
+          <entry>
+            <para>New request parameters: excludezones (optional), includezones (optional)</para>
+          </entry>
+        </row>
+        <row>
+          <entry><para>createNetwork</para></entry>
+          <entry>
+            <para>New request parameters: vpcid (optional)</para>
+            <para>New response parameters: canusefordeploy, vpcid, tags(*)</para>
+          </entry>
+        </row>
+        <row>
+          <entry><para>listPublicIpAddresses</para></entry>
+          <entry>
+            <para>New request parameters: tags (optional), vpcid (optional)</para>
+            <para>New response parameters: vpcid, tags(*)</para>
+          </entry>
+        </row>
+        <row>
+          <entry><para>listNetworks</para></entry>
+          <entry>
+            <para>New request parameters: canusefordeploy (optional), forvpc (optional), tags
+              (optional), vpcid (optional)</para>
+            <para>New response parameters: canusefordeploy, vpcid, tags(*)</para>
+          </entry>
+        </row>
+        <row>
+          <entry><para>restartNetwork</para></entry>
+          <entry>
+            <para>New response parameters: vpcid, tags(*)</para>
+          </entry>
+        </row>
+        <row>
+          <entry><para>enableStaticNat</para></entry>
+          <entry>
+            <para>New request parameter: networkid (optional)</para>
+          </entry>
+        </row>
+        <row>
+          <entry><para>createDiskOffering</para></entry>
+          <entry>
+            <para>New request parameter: storagetype (optional)</para>
+            <para>New response parameter: storagetype</para>
+          </entry>
+        </row>
+        <row>
+          <entry><para>listDiskOfferings</para></entry>
+          <entry>
+            <para>New response parameter: storagetype</para>
+          </entry>
+        </row>
+        <row>
+          <entry><para>updateDiskOffering</para></entry>
+          <entry>
+            <para>New response parameter: storagetype</para>
+          </entry>
+        </row>
+        <row>
+          <entry><para>createFirewallRule</para></entry>
+          <entry>
+            <para>Changed request parameters: ipaddressid (old version - optional, new version -
+              required)</para>
+            <para>New response parameter: tags(*)</para>
+          </entry>
+        </row>
+        <row>
+          <entry><para>listVirtualMachines</para></entry>
+          <entry>
+            <para>New request parameters: isoid (optional), tags (optional), templateid
+              (optional)</para>
+            <para>New response parameters: keypair, tags(*)</para>
+          </entry>
+        </row>
+        <row>
+          <entry><para>updateStorageNetworkIpRange</para></entry>
+          <entry>
+            <para>New response parameters: id, endip, gateway, netmask, networkid, podid, startip,
+              vlan, zoneid</para>
+          </entry>
+        </row>
+      </tbody>
+    </tgroup>
+  </informaltable>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/18d75952/docs/en-US/changed-apicommands-4.0.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changed-apicommands-4.0.xml b/docs/en-US/changed-apicommands-4.0.xml
deleted file mode 100644
index 042d5e2..0000000
--- a/docs/en-US/changed-apicommands-4.0.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?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="changed-apicommands-4.0">
-  <title>Changed API Commands in 4.0.0-incubating</title>
-  <informaltable>
-    <tgroup cols="2" align="left" colsep="1" rowsep="1">
-      <colspec colwidth="1" colname="1" colnum="1"/>
-      <colspec colwidth="2*" colname="2" colnum="2"/>
-      <thead>
-        <row>
-          <entry><para>API Commands</para></entry>
-          <entry><para>Description</para></entry>
-        </row>
-      </thead>
-      <tbody>
-        <row>
-          <entry>
-            <para>copyTemplate</para>
-            <para>prepareTemplate</para>
-            <para>registerTemplate</para>
-            <para>updateTemplate</para>
-            <para>createProject</para>
-            <para>activateProject</para>
-            <para>suspendProject</para>
-            <para>updateProject</para>
-            <para>listProjectAccounts</para>
-            <para>createVolume</para>
-            <para>migrateVolume</para>
-            <para>attachVolume</para>
-            <para>detachVolume</para>
-            <para>uploadVolume</para>
-            <para>createSecurityGroup</para>
-            <para>registerIso</para>
-            <para>copyIso</para>
-            <para>updateIso</para>
-            <para>createIpForwardingRule</para>
-            <para>listIpForwardingRules</para>
-            <para>createLoadBalancerRule</para>
-            <para>updateLoadBalancerRule</para>
-            <para>createSnapshot</para>
-          </entry>
-          <entry>
-            <para>The commands in this list have a single new response parameter, and no other
-              changes.</para>
-            <para>New response parameter: tags(*)</para>
-            <note>
-              <para>Many other commands also have the new tags(*) parameter in addition to other
-                changes; those commands are listed separately.</para>
-            </note></entry>
-        </row>
-        <row>
-          <entry>
-            <para>rebootVirtualMachine</para>
-            <para>attachIso</para>
-            <para>detachIso</para>
-            <para>listLoadBalancerRuleInstances</para>
-            <para>resetPasswordForVirtualMachine</para>
-            <para>changeServiceForVirtualMachine</para>
-            <para>recoverVirtualMachine</para>
-            <para>startVirtualMachine</para>
-            <para>migrateVirtualMachine</para>
-            <para>deployVirtualMachine</para>
-            <para>assignVirtualMachine</para>
-            <para>updateVirtualMachine</para>
-            <para>restoreVirtualMachine</para>
-            <para>stopVirtualMachine</para>
-            <para>destroyVirtualMachine</para>
-          </entry>
-          <entry>
-            <para>The commands in this list have two new response parameters, and no other
-              changes.</para>
-            <para>New response parameters: keypair, tags(*)</para>
-          </entry>
-        </row>
-        <row>
-          <entry>
-            <para>listSecurityGroups</para>
-            <para>listFirewallRules</para>
-            <para>listPortForwardingRules</para>
-            <para>listSnapshots</para>
-            <para>listIsos</para>
-            <para>listProjects</para>
-            <para>listTemplates</para>
-            <para>listLoadBalancerRules</para>
-          </entry>
-          <entry><para>The commands in this list have the following new parameters, and no other
-              changes.</para>
-            <para>New request parameter: tags (optional)</para>
-            <para>New response parameter: tags(*)</para>
-          </entry>
-        </row>
-        <row>
-          <entry>
-            <para>listF5LoadBalancerNetworks</para>
-            <para>listNetscalerLoadBalancerNetworks</para>
-            <para>listSrxFirewallNetworks</para>
-            <para>updateNetwork</para>
-          </entry>
-          <entry>
-            <para>The commands in this list have three new response parameters, and no other
-              changes.</para>
-            <para>New response parameters: canusefordeploy, vpcid, tags(*)</para>
-          </entry>
-        </row>
-        <row>
-          <entry>
-            <para>createZone</para>
-            <para>updateZone</para>
-          </entry>
-          <entry><para>The commands in this list have the following new parameters, and no other
-              changes.</para>
-            <para>New request parameter: localstorageenabled (optional)</para>
-            <para>New response parameter: localstorageenabled</para>
-          </entry>
-        </row>
-        <row>
-          <entry><para>listZones</para></entry>
-          <entry><para>New response parameter: localstorageenabled</para></entry>
-        </row>
-        <row>
-          <entry>
-            <para>rebootRouter</para>
-            <para>changeServiceForRouter</para>
-            <para>startRouter</para>
-            <para>destroyRouter</para>
-            <para>stopRouter</para>
-          </entry>
-          <entry><para>The commands in this list have two new response parameters, and no other
-              changes.</para>
-            <para>New response parameters: vpcid, nic(*)</para></entry>
-        </row>
-        <row>
-          <entry>
-            <para>updateAccount</para>
-            <para>disableAccount</para>
-            <para>listAccounts</para>
-            <para>markDefaultZoneForAccount</para>
-            <para>enableAccount</para>
-          </entry>
-          <entry><para>The commands in this list have three new response parameters, and no other
-              changes.</para>
-            <para>New response parameters: vpcavailable, vpclimit, vpctotal</para></entry>
-        </row>
-        <row>
-          <entry><para>listRouters</para></entry>
-          <entry>
-            <para>New request parameters: forvpc (optional), vpcid (optional)</para>
-            <para>New response parameters: vpcid, nic(*)</para>
-          </entry>
-        </row>
-        <row>
-          <entry><para>listNetworkOfferings</para></entry>
-          <entry>
-            <para>New request parameters: forvpc (optional)</para>
-            <para>New response parameters: forvpc </para>
-          </entry>
-        </row>
-        <row>
-          <entry><para>listVolumes</para></entry>
-          <entry>
-            <para>New request parameters: details (optional), tags (optional)</para>
-            <para>New response parameters: tags(*)</para>
-          </entry>
-        </row>
-        <row>
-          <entry><para>addTrafficMonitor</para></entry>
-          <entry>
-            <para>New request parameters: excludezones (optional), includezones (optional)</para>
-          </entry>
-        </row>
-        <row>
-          <entry><para>createNetwork</para></entry>
-          <entry>
-            <para>New request parameters: vpcid (optional)</para>
-            <para>New response parameters: canusefordeploy, vpcid, tags(*)</para>
-          </entry>
-        </row>
-        <row>
-          <entry><para>listPublicIpAddresses</para></entry>
-          <entry>
-            <para>New request parameters: tags (optional), vpcid (optional)</para>
-            <para>New response parameters: vpcid, tags(*)</para>
-          </entry>
-        </row>
-        <row>
-          <entry><para>listNetworks</para></entry>
-          <entry>
-            <para>New request parameters: canusefordeploy (optional), forvpc (optional), tags
-              (optional), vpcid (optional)</para>
-            <para>New response parameters: canusefordeploy, vpcid, tags(*)</para>
-          </entry>
-        </row>
-        <row>
-          <entry><para>restartNetwork</para></entry>
-          <entry>
-            <para>New response parameters: vpcid, tags(*)</para>
-          </entry>
-        </row>
-        <row>
-          <entry><para>enableStaticNat</para></entry>
-          <entry>
-            <para>New request parameter: networkid (optional)</para>
-          </entry>
-        </row>
-        <row>
-          <entry><para>createDiskOffering</para></entry>
-          <entry>
-            <para>New request parameter: storagetype (optional)</para>
-            <para>New response parameter: storagetype</para>
-          </entry>
-        </row>
-        <row>
-          <entry><para>listDiskOfferings</para></entry>
-          <entry>
-            <para>New response parameter: storagetype</para>
-          </entry>
-        </row>
-        <row>
-          <entry><para>updateDiskOffering</para></entry>
-          <entry>
-            <para>New response parameter: storagetype</para>
-          </entry>
-        </row>
-        <row>
-          <entry><para>createFirewallRule</para></entry>
-          <entry>
-            <para>Changed request parameters: ipaddressid (old version - optional, new version -
-              required)</para>
-            <para>New response parameter: tags(*)</para>
-          </entry>
-        </row>
-        <row>
-          <entry><para>listVirtualMachines</para></entry>
-          <entry>
-            <para>New request parameters: isoid (optional), tags (optional), templateid
-              (optional)</para>
-            <para>New response parameters: keypair, tags(*)</para>
-          </entry>
-        </row>
-        <row>
-          <entry><para>updateStorageNetworkIpRange</para></entry>
-          <entry>
-            <para>New response parameters: id, endip, gateway, netmask, networkid, podid, startip,
-              vlan, zoneid</para>
-          </entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </informaltable>
-</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/18d75952/docs/en-US/lb-policy-pfwd-rule-usage-record-format.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/lb-policy-pfwd-rule-usage-record-format.xml b/docs/en-US/lb-policy-pfwd-rule-usage-record-format.xml
new file mode 100644
index 0000000..e27a49d
--- /dev/null
+++ b/docs/en-US/lb-policy-pfwd-rule-usage-record-format.xml
@@ -0,0 +1,40 @@
+<?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="loadbalancer-policy-port-forwarding-rule-usage-record-format">
+    <title>Load Balancer Policy or Port Forwarding Rule Usage Record Format</title>
+    <itemizedlist>
+            <listitem><para>account - name of the account</para></listitem>
+            <listitem><para>accountid - ID of the account</para></listitem>
+            <listitem><para>domainid - ID of the domain in which this account resides</para></listitem>
+            <listitem><para>zoneid - Zone where the usage occurred</para></listitem>
+            <listitem><para>description - A string describing what the usage record is tracking</para></listitem>
+            <listitem><para>usage - String representation of the usage, including the units of usage (e.g. 'Hrs' for hours)</para></listitem>
+            <listitem><para>usagetype - A number representing the usage type (see Usage Types)</para></listitem>
+            <listitem><para>rawusage - A number representing the actual usage in hours</para></listitem>
+            <listitem><para>usageid - ID of the load balancer policy or port forwarding rule</para></listitem>
+            <listitem><para>usagetype - A number representing the usage type (see Usage Types)</para></listitem>
+            <listitem><para>startdate, enddate - The range of time for which the usage is aggregated; see Dates in the Usage Record</para></listitem>
+        </itemizedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/18d75952/docs/en-US/loadbalancer-policy-port-forwarding-rule-usage-record-format.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/loadbalancer-policy-port-forwarding-rule-usage-record-format.xml b/docs/en-US/loadbalancer-policy-port-forwarding-rule-usage-record-format.xml
deleted file mode 100644
index e27a49d..0000000
--- a/docs/en-US/loadbalancer-policy-port-forwarding-rule-usage-record-format.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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="loadbalancer-policy-port-forwarding-rule-usage-record-format">
-    <title>Load Balancer Policy or Port Forwarding Rule Usage Record Format</title>
-    <itemizedlist>
-            <listitem><para>account - name of the account</para></listitem>
-            <listitem><para>accountid - ID of the account</para></listitem>
-            <listitem><para>domainid - ID of the domain in which this account resides</para></listitem>
-            <listitem><para>zoneid - Zone where the usage occurred</para></listitem>
-            <listitem><para>description - A string describing what the usage record is tracking</para></listitem>
-            <listitem><para>usage - String representation of the usage, including the units of usage (e.g. 'Hrs' for hours)</para></listitem>
-            <listitem><para>usagetype - A number representing the usage type (see Usage Types)</para></listitem>
-            <listitem><para>rawusage - A number representing the actual usage in hours</para></listitem>
-            <listitem><para>usageid - ID of the load balancer policy or port forwarding rule</para></listitem>
-            <listitem><para>usagetype - A number representing the usage type (see Usage Types)</para></listitem>
-            <listitem><para>startdate, enddate - The range of time for which the usage is aggregated; see Dates in the Usage Record</para></listitem>
-        </itemizedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/18d75952/docs/en-US/ongoing-config-of-ext-firewalls-lb.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/ongoing-config-of-ext-firewalls-lb.xml b/docs/en-US/ongoing-config-of-ext-firewalls-lb.xml
new file mode 100644
index 0000000..6a02d27
--- /dev/null
+++ b/docs/en-US/ongoing-config-of-ext-firewalls-lb.xml
@@ -0,0 +1,34 @@
+<?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="ongoing-configuration-of-external-firewalls-loadbalancer">
+    <title>Ongoing Configuration of External Firewalls and Load Balancers</title>
+    <para>Additional user actions (e.g. setting a port forward) will cause further programming of the firewall and load balancer.  A user may request additional public IP addresses and forward traffic received at these IPs to specific VMs. This is accomplished by enabling static NAT for a public IP address, assigning the IP to a VM, and specifying a set of protocols and port ranges to open. When a static NAT rule is created, &PRODUCT; programs the zone's external firewall with the following objects:</para>
+    <itemizedlist>
+        <listitem><para>A static NAT rule that maps the public IP address to the private IP address of a VM.</para></listitem>
+        <listitem><para>A security policy that allows traffic within the set of protocols and port ranges that are specified.</para></listitem>
+        <listitem><para>A firewall filter counter that measures the number of bytes of incoming traffic to the public IP.</para></listitem>
+    </itemizedlist>
+    <para>The number of incoming and outgoing bytes through source NAT, static NAT, and load balancing rules is measured and saved on each external element. This data is collected on a regular basis and stored in the &PRODUCT; database.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/18d75952/docs/en-US/ongoing-configuration-of-external-firewalls-loadbalancer.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/ongoing-configuration-of-external-firewalls-loadbalancer.xml b/docs/en-US/ongoing-configuration-of-external-firewalls-loadbalancer.xml
deleted file mode 100644
index 6a02d27..0000000
--- a/docs/en-US/ongoing-configuration-of-external-firewalls-loadbalancer.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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="ongoing-configuration-of-external-firewalls-loadbalancer">
-    <title>Ongoing Configuration of External Firewalls and Load Balancers</title>
-    <para>Additional user actions (e.g. setting a port forward) will cause further programming of the firewall and load balancer.  A user may request additional public IP addresses and forward traffic received at these IPs to specific VMs. This is accomplished by enabling static NAT for a public IP address, assigning the IP to a VM, and specifying a set of protocols and port ranges to open. When a static NAT rule is created, &PRODUCT; programs the zone's external firewall with the following objects:</para>
-    <itemizedlist>
-        <listitem><para>A static NAT rule that maps the public IP address to the private IP address of a VM.</para></listitem>
-        <listitem><para>A security policy that allows traffic within the set of protocols and port ranges that are specified.</para></listitem>
-        <listitem><para>A firewall filter counter that measures the number of bytes of incoming traffic to the public IP.</para></listitem>
-    </itemizedlist>
-    <para>The number of incoming and outgoing bytes through source NAT, static NAT, and load balancing rules is measured and saved on each external element. This data is collected on a regular basis and stored in the &PRODUCT; database.</para>
-</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/18d75952/docs/en-US/provisioning-steps.xml.orig
----------------------------------------------------------------------
diff --git a/docs/en-US/provisioning-steps.xml.orig b/docs/en-US/provisioning-steps.xml.orig
deleted file mode 100644
index b532783..0000000
--- a/docs/en-US/provisioning-steps.xml.orig
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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.
--->
-
-<chapter id="provisioning-steps">
-    <title>Steps to Provisioning Your Cloud Infrastructure</title>
-    <para>This section tells how to add zones, pods, clusters, hosts, storage, and networks to your cloud. If you are unfamiliar with these entities, please begin by looking through <xref linkend="cloud-infrastructure-concepts" />.</para>
-    <xi:include href="provisioning-steps-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="changing-root-password.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="zone-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="pod-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="cluster-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="host-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="primary-storage-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="secondary-storage-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="initialize-and-test.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-<<<<<<< HEAD
-    <xi:include href="citrix-xenserver-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>
-=======
-</chapter>
->>>>>>> Promote sections to chapters: Cloud Infrastructure Concepts and Provisioning Steps.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/18d75952/docs/en-US/troubleshooting-dataloss-on-exported-primary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/troubleshooting-dataloss-on-exported-primary-storage.xml b/docs/en-US/troubleshooting-dataloss-on-exported-primary-storage.xml
deleted file mode 100644
index 4a94f60..0000000
--- a/docs/en-US/troubleshooting-dataloss-on-exported-primary-storage.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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="troubleshooting-dataloss-on-exported-primary-storage">
-    <title>Data Loss on Exported Primary Storage</title>
-    <formalpara>
-        <title>Symptom</title>
-        <para>Loss of existing data on primary storage which has been exposed as a Linux NFS server export on an iSCSI volume. </para>
-    </formalpara>
-    <formalpara>
-        <title>Cause</title>
-        <para>It is possible that a client from outside the intended pool has mounted the storage. When this occurs, the LVM is wiped and all data in the volume is lost</para>
-    </formalpara>
-    <formalpara>
-        <title>Solution</title>
-        <para>When setting up LUN exports, restrict the range of IP addresses that are allowed access by specifying a subnet mask. For example:</para>
-    </formalpara>
-    <programlisting>echo “/export 192.168.1.0/24(rw,async,no_root_squash)” &gt; /etc/exports</programlisting>
-    <para>Adjust the above command to suit your deployment needs.</para>
-    <formalpara>
-        <title>More Information</title>
-        <para>See the export procedure in the "Secondary Storage" section of the &PRODUCT; Installation Guide</para>
-    </formalpara>
-</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/18d75952/docs/en-US/troubleshooting-maintenance-mode-not-working-on-vCenter.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/troubleshooting-maintenance-mode-not-working-on-vCenter.xml b/docs/en-US/troubleshooting-maintenance-mode-not-working-on-vCenter.xml
deleted file mode 100644
index 764d188..0000000
--- a/docs/en-US/troubleshooting-maintenance-mode-not-working-on-vCenter.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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="troubleshooting-maintenance-mode-not-working-on-vCenter">
-    <title>Maintenance mode not working on vCenter</title>
-    <formalpara>
-        <title>Symptom</title>
-        <para>Host was placed in maintenance mode, but still appears live in vCenter. </para>
-    </formalpara>
-    <formalpara>
-        <title>Cause</title>
-        <para>The &PRODUCT; administrator UI was used to place the host in scheduled maintenance mode. This mode is separate from vCenter's maintenance mode.</para>
-    </formalpara>
-    <formalpara>
-        <title>Solution</title>
-        <para>Use vCenter to place the host in maintenance mode.</para>
-    </formalpara>
-    <formalpara>
-        <title>More Information</title>
-        <para>See <xref linkend="scheduled-maintenance-maintenance-mode-hosts"/></para>
-    </formalpara>
-</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/18d75952/docs/en-US/troubleshooting.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/troubleshooting.xml b/docs/en-US/troubleshooting.xml
index dd736fe..24ecab5 100644
--- a/docs/en-US/troubleshooting.xml
+++ b/docs/en-US/troubleshooting.xml
@@ -26,10 +26,10 @@
   <title>Troubleshooting</title>
   <xi:include href="events.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="troubleshooting-working-with-server-logs.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="troubleshooting-dataloss-on-exported-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+  <xi:include href="troublesht-dataloss-on-exp-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="troubleshooting-recover-lost-virtual-router.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="troubleshooting-maintenance-mode-not-working-on-vCenter.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+  <xi:include href="troublesht-mtn-mode-not-working-on-vCenter.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="troubleshooting-unable-to-deploy-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="troubleshooting-unable-to-power-on-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="troubleshooting-lb-rules-fails.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</chapter>
\ No newline at end of file
+</chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/18d75952/docs/en-US/troublesht-dataloss-on-exp-primary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/troublesht-dataloss-on-exp-primary-storage.xml b/docs/en-US/troublesht-dataloss-on-exp-primary-storage.xml
new file mode 100644
index 0000000..4a94f60
--- /dev/null
+++ b/docs/en-US/troublesht-dataloss-on-exp-primary-storage.xml
@@ -0,0 +1,45 @@
+<?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="troubleshooting-dataloss-on-exported-primary-storage">
+    <title>Data Loss on Exported Primary Storage</title>
+    <formalpara>
+        <title>Symptom</title>
+        <para>Loss of existing data on primary storage which has been exposed as a Linux NFS server export on an iSCSI volume. </para>
+    </formalpara>
+    <formalpara>
+        <title>Cause</title>
+        <para>It is possible that a client from outside the intended pool has mounted the storage. When this occurs, the LVM is wiped and all data in the volume is lost</para>
+    </formalpara>
+    <formalpara>
+        <title>Solution</title>
+        <para>When setting up LUN exports, restrict the range of IP addresses that are allowed access by specifying a subnet mask. For example:</para>
+    </formalpara>
+    <programlisting>echo “/export 192.168.1.0/24(rw,async,no_root_squash)” &gt; /etc/exports</programlisting>
+    <para>Adjust the above command to suit your deployment needs.</para>
+    <formalpara>
+        <title>More Information</title>
+        <para>See the export procedure in the "Secondary Storage" section of the &PRODUCT; Installation Guide</para>
+    </formalpara>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/18d75952/docs/en-US/troublesht-mtn-mode-not-working-on-vCenter.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/troublesht-mtn-mode-not-working-on-vCenter.xml b/docs/en-US/troublesht-mtn-mode-not-working-on-vCenter.xml
new file mode 100644
index 0000000..764d188
--- /dev/null
+++ b/docs/en-US/troublesht-mtn-mode-not-working-on-vCenter.xml
@@ -0,0 +1,43 @@
+<?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="troubleshooting-maintenance-mode-not-working-on-vCenter">
+    <title>Maintenance mode not working on vCenter</title>
+    <formalpara>
+        <title>Symptom</title>
+        <para>Host was placed in maintenance mode, but still appears live in vCenter. </para>
+    </formalpara>
+    <formalpara>
+        <title>Cause</title>
+        <para>The &PRODUCT; administrator UI was used to place the host in scheduled maintenance mode. This mode is separate from vCenter's maintenance mode.</para>
+    </formalpara>
+    <formalpara>
+        <title>Solution</title>
+        <para>Use vCenter to place the host in maintenance mode.</para>
+    </formalpara>
+    <formalpara>
+        <title>More Information</title>
+        <para>See <xref linkend="scheduled-maintenance-maintenance-mode-hosts"/></para>
+    </formalpara>
+</section>


Mime
View raw message