From 0fd34ec29290c6e61408516370c2408567b6b255 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Wed, 11 Sep 2013 21:53:14 +0200
Subject: [PATCH] Fix links in install guide

Some external links have changed, fix them.

Change-Id: I9db86433e5ac240c30618429955e40a0f8e4072f
---
 doc/install-guide/ap_configuration_files.xml                | 5 ++---
 doc/install-guide/ch_assumptions.xml                        | 6 +++---
 doc/install-guide/ch_externals.xml                          | 4 ++--
 doc/install-guide/ch_terminology.xml                        | 2 +-
 doc/install-guide/section_compute-minimum-configuration.xml | 5 ++---
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/doc/install-guide/ap_configuration_files.xml b/doc/install-guide/ap_configuration_files.xml
index a0d55dc820..fa03dc6650 100644
--- a/doc/install-guide/ap_configuration_files.xml
+++ b/doc/install-guide/ap_configuration_files.xml
@@ -77,9 +77,8 @@
                 class="directory">/etc/nova/nova.conf</filename>.</para>
         <para>For a list of configuration options for this file, see
             the List of Tables on this page: <link
-                xlink:href="http://docs.openstack.org/grizzly/openstack-compute/admin/content/"
-                    ><citetitle>OpenStack Compute Administration
-                    Manual</citetitle></link> .</para>
+                xlink:href="http://docs.openstack.org/trunk/config-reference/content/"
+                    ><citetitle>OpenStack Configuration Reference</citetitle></link>.</para>
         <para>This guide assumes that the IP address of the machine
             that runs the Identity Service is
                 <literal>192.168.206.130</literal>. If the IP address
diff --git a/doc/install-guide/ch_assumptions.xml b/doc/install-guide/ch_assumptions.xml
index 0448330fe4..335caa1e35 100644
--- a/doc/install-guide/ch_assumptions.xml
+++ b/doc/install-guide/ch_assumptions.xml
@@ -25,16 +25,16 @@
                   There are also
                     <phrase os="rhel;centos;fedora;opensuse">an
                             <link
-                            xlink:href="http://docs.openstack.org/trunk/openstack-compute/install/apt/content/"
+                            xlink:href="http://docs.openstack.org/trunk/install-guide/install/apt/content/"
                             >OpenStack Install and Deploy Manual for
                             Ubuntu</link> and </phrase>
                     <phrase os="ubuntu;opensuse">an <link
-                            xlink:href="http://docs.openstack.org/trunk/openstack-compute/install/yum/content/"
+                            xlink:href="http://docs.openstack.org/trunk/install-guide/install/yum/content/"
                             >OpenStack Install and Deploy Manual for
                             RHEL, CentOS and Fedora</link></phrase>
                     <phrase os="ubuntu"> and </phrase>
                     <phrase os="rhel;centos;fedora;ubuntu;">an <link
-                            xlink:href="http://docs.openstack.org/trunk/openstack-compute/install/zypper/content/"
+                            xlink:href="http://docs.openstack.org/trunk/install-guide/install/zypper/content/"
                             >OpenStack Install and Deploy Manual for
                             openSUSE</link></phrase>.
                     Debian also has OpenStack
diff --git a/doc/install-guide/ch_externals.xml b/doc/install-guide/ch_externals.xml
index e121070ab7..cfaca52837 100644
--- a/doc/install-guide/ch_externals.xml
+++ b/doc/install-guide/ch_externals.xml
@@ -100,7 +100,7 @@
     <simplesect>
         <title>OpenStack Networking (Neutron)</title>
         <para>The OpenStack Networking service also depends on Linux networking technologies, using
-            a plugin mechanism. Read more about it in the <link xlink:href="../../../openstack-network/admin/content/index.html">OpenStack Networking
+            a plugin mechanism. Read more about it in the <link xlink:href="http://docs.openstack.org/network-admin/admin/content/index.html">OpenStack Networking
                 Administration Guide</link>.</para>
     </simplesect>
            <simplesect>
@@ -109,7 +109,7 @@
            role="italic">LVM</emphasis> to create and manage local volumes, and exports them
            via iSCSI using <emphasis role="italic">IET</emphasis> or <emphasis role="italic">tgt</emphasis>.
            It can also be configured to use other iSCSI-based storage technologies.</para>
-	   </simplesect>
+           </simplesect>
         <simplesect>
         <title>openstack-dashboard (Horizon)</title>
         <para>The <systemitem class="service">openstack-dashboard</systemitem> is a Django-based
diff --git a/doc/install-guide/ch_terminology.xml b/doc/install-guide/ch_terminology.xml
index 23e730c034..f559eb9861 100644
--- a/doc/install-guide/ch_terminology.xml
+++ b/doc/install-guide/ch_terminology.xml
@@ -284,7 +284,7 @@
                 appropriate client software installed to be able to access the remote file system.</para>
             <para>Currently, OpenStack Compute does not have any native support for this type of
                 file storage inside of an instance. However, there is a <link
-                    xlink:href="http://gluster.org/community/documentation//index.php/OSConnect"
+                    xlink:href="http://gluster.org/community/documentation/index.php/OSConnect"
                     >Gluster storage connector for OpenStack</link> that enables the use of the
                 GlusterFS file system as a back-end for the Image service.</para>
         </section>
diff --git a/doc/install-guide/section_compute-minimum-configuration.xml b/doc/install-guide/section_compute-minimum-configuration.xml
index 2aa1621c8a..85ba43d837 100644
--- a/doc/install-guide/section_compute-minimum-configuration.xml
+++ b/doc/install-guide/section_compute-minimum-configuration.xml
@@ -73,9 +73,8 @@
         file by entering a new line with a <literal>#</literal> sign
         at the beginning of the line. To see a listing of all possible
         configuration option settings, see <link
-            xlink:href="http://docs.openstack.org/trunk/openstack-compute/admin/content/compute-options-reference.html"
-            >the reference in the OpenStack Compute Administration
-            Manual</link>.</para>
+            xlink:href="http://docs.openstack.org/trunk/config-reference/content/ch_configuring-openstack-compute.html"
+            >the reference in the <citetitle>OpenStack Configuration Reference</citetitle></link>.</para>
     <programlisting>auth_strategy=keystone
 network_manager=nova.network.manager.FlatDHCPManager
 fixed_range=192.168.100.0/24