incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [18/50] [abbrv] git commit: refs/heads/storage_refactor - Remove workarounds and fix hyperlinks that were preventing docs from building.
Date Wed, 06 Feb 2013 02:43:29 GMT
Remove workarounds and fix hyperlinks that were preventing docs from building.


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

Branch: refs/heads/storage_refactor
Commit: 48691bae66d5df1b5f9b47e9dc4db1cc7721657f
Parents: f97e2a6
Author: Jessica Tomechak <jessica.tomechak@gmail.com>
Authored: Tue Feb 5 05:03:49 2013 -0800
Committer: Jessica Tomechak <jessica.tomechak@gmail.com>
Committed: Tue Feb 5 05:11:53 2013 -0800

----------------------------------------------------------------------
 .../change-network-offering-on-guest-network.xml   |    4 +++-
 ...pgrade-virtual-router-with-service-offering.xml |    5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/48691bae/docs/en-US/change-network-offering-on-guest-network.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/change-network-offering-on-guest-network.xml b/docs/en-US/change-network-offering-on-guest-network.xml
index 3810b87..2c7db3e 100644
--- a/docs/en-US/change-network-offering-on-guest-network.xml
+++ b/docs/en-US/change-network-offering-on-guest-network.xml
@@ -28,7 +28,9 @@
 		<listitem><para>Log in to the &PRODUCT; UI as an administrator or end user.
</para></listitem>
 		<listitem><para>If you are changing from a network offering that uses the &PRODUCT;
virtual router to one
 				that uses external devices as network service providers, you must first stop all the
-				VMs on the network. See <!-- FIXME <xref linkend="stopping-and-starting-vms"/>-->.</para></listitem>
+				VMs on the network. 
+			<phrase condition="install">See "Stopping and Starting Virtual Machines" in the
Administrator's Guide.</phrase>
+			<phrase condition="admin">See <xref linkend="stopping-and-starting-vms"/>.</phrase></para></listitem>
 		<listitem><para>In the left navigation, choose Network.</para></listitem>
 		<listitem><para>Click the name of the network you want to modify.</para></listitem>
 		<listitem><para>In the Details tab, click Edit.<inlinemediaobject>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/48691bae/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 a6d0d0f..dad1d90 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,10 @@
     <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 <!-- FIXME <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