incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jtomec...@apache.org
Subject [4/5] git commit: refs/heads/4.1 - Docs. Fix broken hyperlink to Creating Network Offerings. Add the section to the book, and add conditional cross-references so it will build in either book (admin or install). This section was already in the repo, but w
Date Tue, 05 Feb 2013 13:41:22 GMT
Docs. Fix broken hyperlink to Creating Network Offerings. Add the section to the book, and
add conditional cross-references so it will build in either book (admin or install). This
section was already in the repo, but was not previously included in any book. Also removes
stray reference to obsolete software version number 3.0.3 in the Creating Network Offerings
section.


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

Branch: refs/heads/4.1
Commit: e6e09eb23046011a05ff9ad4348b6d9b33f319da
Parents: aca52b1
Author: Jessica Tomechak <jessica.tomechak@gmail.com>
Authored: Tue Feb 5 05:38:53 2013 -0800
Committer: Jessica Tomechak <jessica.tomechak@gmail.com>
Committed: Tue Feb 5 05:40:59 2013 -0800

----------------------------------------------------------------------
 docs/en-US/creating-network-offerings.xml          |    6 +++---
 docs/en-US/network-offerings.xml                   |    2 +-
 ...pgrade-virtual-router-with-service-offering.xml |    4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e6e09eb2/docs/en-US/creating-network-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-network-offerings.xml b/docs/en-US/creating-network-offerings.xml
index d733924..e90c512 100644
--- a/docs/en-US/creating-network-offerings.xml
+++ b/docs/en-US/creating-network-offerings.xml
@@ -138,7 +138,7 @@
                         &PRODUCT; default system service offering and any custom system
service
                         offerings that have been defined by the &PRODUCT; root administrator.
                         For more information, see System Service Offerings.</para></listitem>
-            <listitem><para><emphasis role="bold">Redundant router capability</emphasis>.
(v3.0.3 and greater) Available
+            <listitem><para><emphasis role="bold">Redundant router capability</emphasis>.
Available
                         only when Virtual Router is selected as the Source NAT provider.
Select this
                         option if you want to use two virtual routers in the network for
                         uninterrupted connection: one operating as the master virtual router
and the
@@ -159,8 +159,8 @@
                             the firewall rules by using the createFirewallRule command.</para></note></listitem>
             <listitem><para><emphasis role="bold">Tags</emphasis>.
Network tag to specify which physical network to
                         use.</para></listitem>
-        </itemizedlist></listitem> 
-        <listitem><para>Click Add.</para></listitem>        
+        </itemizedlist></listitem>
+        <listitem><para>Click Add.</para></listitem>
     </orderedlist>                
     
     

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e6e09eb2/docs/en-US/network-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/network-offerings.xml b/docs/en-US/network-offerings.xml
index 7386e10..0a7b8e7 100644
--- a/docs/en-US/network-offerings.xml
+++ b/docs/en-US/network-offerings.xml
@@ -42,5 +42,5 @@
     <note><para>If you create load balancing rules while using a network service
offering that includes an external load balancer device such as NetScaler, and later change
the network service offering to one that uses the &PRODUCT; virtual router, you must create
a firewall rule on the virtual router for each of your existing load balancing rules so that
they continue to function.</para></note>
     <para>When creating a new virtual network, the &PRODUCT; administrator chooses
which network offering to enable for that network. Each virtual network is associated with
one network offering. A virtual network can be upgraded or downgraded by changing its associated
network offering.  If you do this, be sure to reprogram the physical network to match.</para>
     <para>&PRODUCT; also has internal network offerings for use by &PRODUCT;
system VMs. These network offerings are not visible to users but can be modified by administrators.</para>
-    
+    <xi:include href="creating-network-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e6e09eb2/docs/en-US/upgrade-virtual-router-with-service-offering.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/upgrade-virtual-router-with-service-offering.xml b/docs/en-US/upgrade-virtual-router-with-service-offering.xml
index 8291c3a..8d7a7f7 100644
--- a/docs/en-US/upgrade-virtual-router-with-service-offering.xml
+++ b/docs/en-US/upgrade-virtual-router-with-service-offering.xml
@@ -27,7 +27,9 @@
     <para>When &PRODUCT; creates a virtual router, it uses default settings which
are defined in a default system service offering. See <xref linkend="system-service-offerings"/>.
All the virtual routers in a single guest network use the same system service offering. You
can upgrade the capabilities of the virtual router by creating and applying a custom system
service offering.</para>
     <orderedlist>
         <listitem><para>Define your custom system service offering. See <xref
linkend="creating-system-service-offerings"/>. In System VM Type, choose Domain Router.</para></listitem>
-        <listitem><para>Associate the system service offering with a network
offering. See <xref linkend="creating-network-offerings"/></para></listitem>
+        <listitem><para>Associate the system service offering with a network
offering. 
+          <phrase condition="install">See "Creating Network Offerings" in the Administrator's
Guide.</phrase>
+          <phrase condition="admin">See <xref linkend="creating-network-offerings"/>.</phrase></para></listitem>
         <listitem><para>Apply the network offering to the network where you want
the virtual routers to use the new system service offering. If this is a new network, follow
the steps in Adding an Additional Guest Network on page 66. To change the service offering
for existing virtual routers, follow the steps in <xref linkend="change-network-offering-on-guest-network"/>.</para></listitem>
         </orderedlist>
 </section>


Mime
View raw message