You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2013/07/12 11:37:03 UTC

git commit: updated refs/heads/master to b948bbd

Updated Branches:
  refs/heads/master 1b373accf -> b948bbd55


CLOUDSTACK-906


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

Branch: refs/heads/master
Commit: b948bbd552fe72b3eb191359e46ac65cddd321e8
Parents: 1b373ac
Author: Radhika PC <ra...@citrix.com>
Authored: Fri Jul 12 15:06:15 2013 +0530
Committer: Radhika PC <ra...@citrix.com>
Committed: Fri Jul 12 15:06:15 2013 +0530

----------------------------------------------------------------------
 docs/en-US/hardware-firewall.xml | 1 +
 docs/en-US/vnmc-cisco.xml        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b948bbd5/docs/en-US/hardware-firewall.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hardware-firewall.xml b/docs/en-US/hardware-firewall.xml
index df0568a..f14a087 100644
--- a/docs/en-US/hardware-firewall.xml
+++ b/docs/en-US/hardware-firewall.xml
@@ -25,5 +25,6 @@
     be the default gateway for the guest networks; see <xref linkend="external-guest-firewall-integration"/>.</para>
   <xi:include href="generic-firewall-provisions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="external-guest-firewall-integration.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="cisco-vnmc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="external-guest-lb-integration.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 </section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b948bbd5/docs/en-US/vnmc-cisco.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/vnmc-cisco.xml b/docs/en-US/vnmc-cisco.xml
index 04994e5..6181348 100644
--- a/docs/en-US/vnmc-cisco.xml
+++ b/docs/en-US/vnmc-cisco.xml
@@ -19,7 +19,7 @@
     under the License.
 -->
 <section id="vnmc-cisco">
-  <title>Cisco VNMC Support</title>
+  <title>External Guest Firewall Integration for Cisco VNMC (Optional)</title>
   <para>Cisco Virtual Network Management Center (VNMC) provides centralized multi-device and
     policy management for Cisco Network Virtual Services. When Cisco VNMC is integrated with
     ASA 1000v Cloud Firewall and Cisco Nexus 1000v dvSwitch in &PRODUCT; you will be able to: </para>
@@ -303,4 +303,4 @@
         <para>The network offering is created.</para>
       </listitem>
     </orderedlist>
-  </section>
\ No newline at end of file
+  </section></section>
\ No newline at end of file