cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject git commit: fix some URLs, internal links, fix un visible tables: Closes #5
Date Wed, 26 Mar 2014 13:00:45 GMT
Repository: cloudstack-docs-install
Updated Branches:
  refs/heads/master aed977157 -> cb6fc7350


fix some URLs, internal links, fix un visible tables: Closes #5

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>


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

Branch: refs/heads/master
Commit: cb6fc7350108cd447c9aa9de7b462d1eb40ac7c8
Parents: aed9771
Author: Pierre-Luc Dion <pdion@cloudops.com>
Authored: Wed Mar 26 00:13:13 2014 -0400
Committer: Sebastien Goasguen <runseb@gmail.com>
Committed: Wed Mar 26 09:00:26 2014 -0400

----------------------------------------------------------------------
 source/building_from_source.rst             |  69 +++++++------
 source/choosing_deployment_architecture.rst |   2 +-
 source/configuration.rst                    | 121 ++++++++++++-----------
 source/optional_installation.rst            |  12 +--
 4 files changed, 101 insertions(+), 103 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/cb6fc735/source/building_from_source.rst
----------------------------------------------------------------------
diff --git a/source/building_from_source.rst b/source/building_from_source.rst
index 7f5ff5e..7ce77d7 100644
--- a/source/building_from_source.rst
+++ b/source/building_from_source.rst
@@ -38,8 +38,7 @@ Getting the release
 -------------------
 
 You can download the latest CloudStack release from the `Apache
-CloudStack project download
-page <http://cloudstack.apache.org/downloads.html>`__.
+CloudStack project download page <http://cloudstack.apache.org/downloads.html>`_.
 
 Prior releases are available via archive.apache.org as well. See the
 downloads page for more information on archived releases.
@@ -78,7 +77,7 @@ Getting the KEYS
 ~~~~~~~~~~~~~~~~
 
 To enable you to verify the GPG signature, you will need to download the
-`KEYS <http://www.apache.org/dist/incubator/cloudstack/KEYS>`__ file.
+`KEYS <http://www.apache.org/dist/cloudstack/KEYS>`_ file.
 
 You next need to import those keys, which you can do by running:
 
@@ -94,7 +93,7 @@ To check the signature, run the following command:
 
 .. sourcecode:: bash
 
-    $ gpg --verify apache-cloudstack-4.0.0-incubating-src.tar.bz2.asc
+    $ gpg --verify apache-cloudstack-4.3.0-src.tar.bz2.asc
 
 If the signature is valid you will see a line of output that contains
 'Good signature'.
@@ -108,7 +107,7 @@ You can verify this hash by executing the following command:
 
 .. sourcecode:: bash
 
-    $ gpg --print-md MD5 apache-cloudstack-4.0.0-incubating-src.tar.bz2 | diff - apache-cloudstack-4.0.0-incubating-src.tar.bz2.md5
+    $ gpg --print-md MD5 apache-cloudstack-4.3.0-src.tar.bz2 | diff - apache-cloudstack-4.3.0-src.tar.bz2.md5
 
 If this successfully completes you should see no output. If there is any
 output from them, then there is a difference between the hash you
@@ -123,7 +122,7 @@ release. You can verify this hash by executing the following command:
 
 .. sourcecode:: bash
 
-    $ gpg --print-md SHA512 apache-cloudstack-4.0.0-incubating-src.tar.bz2 | diff - apache-cloudstack-4.0.0-incubating-src.tar.bz2.sha
+    $ gpg --print-md SHA512 apache-cloudstack-4.3.0-src.tar.bz2 | diff - apache-cloudstack-4.3.0-src.tar.bz2.sha
 
 If this command successfully completes you should see no output. If
 there is any output from them, then there is a difference between the
@@ -179,13 +178,13 @@ with a single command as follows:
 
 .. sourcecode:: bash
 
-    $ tar -jxvf apache-cloudstack-4.1.0.src.tar.bz2
+    $ tar -jxvf apache-cloudstack-4.3.0-src.tar.bz2
 
 You can now move into the directory:
 
 .. sourcecode:: bash
 
-    $ cd ./apache-cloudstack-4.1.0-src
+    $ cd ./apache-cloudstack-4.3.0-src
 
 Building DEB packages
 ---------------------
@@ -228,13 +227,13 @@ all of the following:
 
 .. sourcecode:: bash
 
-    cloudstack-common-4.2.0.amd64.deb
-    cloudstack-management-4.2.0.amd64.deb
-    cloudstack-agent-4.2.0.amd64.deb
-    cloudstack-usage-4.2.0.amd64.deb
-    cloudstack-awsapi-4.2.0.amd64.deb
-    cloudstack-cli-4.2.0.amd64.deb
-    cloudstack-docs-4.2.0.amd64.deb
+    cloudstack-common-4.3.0.amd64.deb
+    cloudstack-management-4.3.0.amd64.deb
+    cloudstack-agent-4.3.0.amd64.deb
+    cloudstack-usage-4.3.0.amd64.deb
+    cloudstack-awsapi-4.3.0.amd64.deb
+    cloudstack-cli-4.3.0.amd64.deb
+    cloudstack-docs-4.3.0.amd64.deb
 
 Setting up an APT repo
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -300,8 +299,8 @@ You can now move on to the instructions under Install on Ubuntu.
 Building RPMs from Source
 -------------------------
 
-As mentioned previously in `Section 3.3, “Prerequisites for building
-Apache CloudStack” <#sect-source-prereq>`__, you will need to install
+As mentioned previously in `“Prerequisites for building
+Apache CloudStack” <#prerequisites-for-building-apache-cloudstack>`_, you will need
to install
 several prerequisites before you can build packages for CloudStack. Here
 we'll assume you're working with a 64-bit build of CentOS or Red Hat
 Enterprise Linux.
@@ -316,7 +315,7 @@ Enterprise Linux.
 
 Next, you'll need to install build-time dependencies for CloudStack with
 Maven. We're using Maven 3, so you'll want to `grab a Maven 3
-tarball <http://maven.apache.org/download.cgi>`__ and uncompress it in
+tarball <http://maven.apache.org/download.cgi>`_ and uncompress it in
 your home directory (or whatever location you prefer):
 
 .. sourcecode:: bash
@@ -325,7 +324,7 @@ your home directory (or whatever location you prefer):
 
 .. sourcecode:: bash
 
-    $ export PATH=/usr/local/apache-maven-3.0.4//bin:$PATH
+    $ export PATH=/usr/local/apache-maven-3.0.4/bin:$PATH
 
 Maven also needs to know where Java is, and expects the JAVA\_HOME
 environment variable to be set:
@@ -375,13 +374,13 @@ You should see the following RPMs in that directory:
 
 .. sourcecode:: bash
 
-    cloudstack-agent-4.2.0.el6.x86_64.rpm
-    cloudstack-awsapi-4.2.0.el6.x86_64.rpm
-    cloudstack-cli-4.2.0.el6.x86_64.rpm
-    cloudstack-common-4.2.0.el6.x86_64.rpm
-    cloudstack-docs-4.2.0.el6.x86_64.rpm
-    cloudstack-management-4.2.0.el6.x86_64.rpm
-    cloudstack-usage-4.2.0.el6.x86_64.rpm
+    cloudstack-agent-4.3.0.el6.x86_64.rpm
+    cloudstack-awsapi-4.3.0.el6.x86_64.rpm
+    cloudstack-cli-4.3.0.el6.x86_64.rpm
+    cloudstack-common-4.3.0.el6.x86_64.rpm
+    cloudstack-docs-4.3.0.el6.x86_64.rpm
+    cloudstack-management-4.3.0.el6.x86_64.rpm
+    cloudstack-usage-4.3.0.el6.x86_64.rpm
 
 Creating a yum repo
 ^^^^^^^^^^^^^^^^^^^
@@ -433,7 +432,7 @@ to build from source.
 
 .. warning::
 
-   Some of the plugins supported by CloudStack cannot be distributed with CloudStack for
licensing reasons. In some cases, some of the required libraries/JARs are under a proprietary
license. In other cases, the required libraries may be under a license that's not compatible
with `Apache's licensing guidelines for third-party products <http://www.apache.org/legal/resolved.html#category-x>`__.
+   Some of the plugins supported by CloudStack cannot be distributed with CloudStack for
licensing reasons. In some cases, some of the required libraries/JARs are under a proprietary
license. In other cases, the required libraries may be under a license that's not compatible
with `Apache's licensing guidelines for third-party products <http://www.apache.org/legal/resolved.html#category-x>`_.
 
 #. 
 
@@ -442,30 +441,28 @@ to build from source.
 
    Because these modules require dependencies that can't be distributed
    with CloudStack you'll need to download them yourself. Links to the
-   most recent dependencies are listed on the `*How to build on master
-   branch* <https://cwiki.apache.org/CLOUDSTACK/how-to-build-on-master-branch.html>`__
+   most recent dependencies are listed on the `*How to build CloudStack* <https://cwiki.apache.org/confluence/display/CLOUDSTACK/How+to+build+CloudStack>`_
    page on the wiki.
 
 #. 
 
    You may also need to download
-   `vhd-util <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`__,
+   `vhd-util <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_,
    which was removed due to licensing issues. You'll copy vhd-util to
    the ``scripts/vm/hypervisor/xenserver/`` directory.
 
 #. 
 
    Once you have all the dependencies copied over, you'll be able to
-   build CloudStack with the ``nonoss`` option:
+   build CloudStack with the ``noredist`` option:
 
 .. sourcecode:: bash
 
     $ mvn clean
-    $ mvn install -Dnonoss
+    $ mvn install -Dnoredist
 
 #. 
 
-   Once you've built CloudStack with the ``nonoss`` profile, you can
-   package it using the `Section 3.6, “Building RPMs from
-   Source” <#sect-source-buildrpm>`__ or `Section 3.5, “Building DEB
-   packages” <#sect-source-builddebs>`__ instructions.
\ No newline at end of file
+   Once you've built CloudStack with the ``noredist`` profile, you can
+   package it using the `“Building RPMs from Source” <#building-rpms-from-source>`_

+   or `“Building DEB packages” <#building-deb-packages>`_ instructions.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/cb6fc735/source/choosing_deployment_architecture.rst
----------------------------------------------------------------------
diff --git a/source/choosing_deployment_architecture.rst b/source/choosing_deployment_architecture.rst
index fd965fe..11c4c03 100644
--- a/source/choosing_deployment_architecture.rst
+++ b/source/choosing_deployment_architecture.rst
@@ -288,7 +288,7 @@ Setup Best Practices
    memory to dom0. This can enable XenServer to handle larger numbers of
    virtual machines. We recommend 2940 MB of RAM for XenServer dom0. For
    instructions on how to do this, see
-   `http://support.citrix.com/article/CTX126531 <http://support.citrix.com/article/CTX126531>`__.
+   `http://support.citrix.com/article/CTX126531 <http://support.citrix.com/article/CTX126531>`_.
    The article refers to XenServer 5.6, but the same information applies
    to XenServer 6.0.
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/cb6fc735/source/configuration.rst
----------------------------------------------------------------------
diff --git a/source/configuration.rst b/source/configuration.rst
index bfcf2b3..25c7eff 100644
--- a/source/configuration.rst
+++ b/source/configuration.rst
@@ -18,71 +18,63 @@ Configuring your CloudStack Installation
 
 This section tells how to add regions, zones, pods, clusters, hosts,
 storage, and networks to your cloud. If you are unfamiliar with these
-entities, please begin by looking through `Chapter 2, *Cloud
-Infrastructure Concepts* <#cloud-infrastructure-concepts>`__.
+entities, please begin by looking through `*Cloud Infrastructure Concepts* <http://docs.cloudstack.apache.org/en/latest/concepts.html#cloud-infrastructure-concepts>`_.
 
 Overview of Provisioning Steps
 ------------------------------
 
 After the Management Server is installed and running, you can add the
 compute resources for it to manage. For an overview of how a CloudStack
-cloud infrastructure is organized, see `Section 1.3.2, “Cloud
-Infrastructure Overview” <#cloud-infrastructure-overview>`__.
+cloud infrastructure is organized, see `“Cloud Infrastructure Overview” <http://docs.cloudstack.apache.org/en/latest/concepts.html#cloud-infrastructure-overview>`_.
 
 To provision the cloud infrastructure, or to scale it up at any time,
 follow these procedures:
 
 #. 
 
-   Define regions (optional). See `Section 6.2, “Adding Regions
-   (optional)” <#region-add>`__.
+   Define regions (optional). See :ref:`adding-regions`.
 
 #. 
 
-   Add a zone to the region. See `Section 6.3, “Adding a
-   Zone” <#zone-add>`__.
+   Add a zone to the region. See :ref:`adding-a-zone`.
 
 #. 
 
-   Add more pods to the zone (optional). See `Section 6.4, “Adding a
-   Pod” <#pod-add>`__.
+   Add more pods to the zone (optional). See :ref:`adding-a-pod`.
 
 #. 
 
-   Add more clusters to the pod (optional). See `Section 6.5, “Adding a
-   Cluster” <#cluster-add>`__.
+   Add more clusters to the pod (optional). See :ref:`adding-a-cluster`.
 
 #. 
 
-   Add more hosts to the cluster (optional). See `Section 6.6, “Adding a
-   Host” <#host-add>`__.
+   Add more hosts to the cluster (optional). See :ref:`adding-a-host`.
 
 #. 
 
-   Add primary storage to the cluster. See `Section 6.7, “Add Primary
-   Storage” <#primary-storage-add>`__.
+   Add primary storage to the cluster. See :ref:`add-primary-storage`.
 
 #. 
 
-   Add secondary storage to the zone. See `Section 6.8, “Add Secondary
-   Storage” <#secondary-storage-add>`__.
+   Add secondary storage to the zone. See :ref:`add-secondary-storage`.
 
 #. 
 
-   Initialize and test the new cloud. See `Section 6.9, “Initialize and
-   Test” <#initialize-and-test>`__.
+   Initialize and test the new cloud. See :ref:`initialize-and-test`.
 
 When you have finished these steps, you will have a deployment with the
 following basic structure:
 
 |provisioning-overview.png: Conceptual overview of a basic deployment|
 
+.. _adding-regions:
+
 Adding Regions (optional)
 -------------------------
 
 Grouping your cloud resources into geographic regions is an optional
 step when provisioning the cloud. For an overview of regions, see
-`Section 2.1, “About Regions” <#about-regions>`__.
+`“About Regions” <http://docs.cloudstack.apache.org/en/latest/concepts.html#about-regions>`_.
 
 The First Region: The Default Region
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -333,6 +325,8 @@ in a 3-region cloud:
 
    Repeat these steps for <region.2.IP.address>:8080/client.
 
+.. _adding-a-zone:
+
 Adding a Zone
 -------------
 
@@ -342,8 +336,7 @@ and secondary storage.
 
 #. 
 
-   Log in to the CloudStack UI as the root administrator. See
-   `Section 5.1, “Log In to the UI” <#log-in>`__.
+   Log in to the CloudStack UI as the root administrator. See `“Log In to the UI” <http://docs.cloudstack.apache.org/projects/cloudstack-administration/en/latest/ui.html#log-in-to-the-ui>`_.
 
 #. 
 
@@ -382,13 +375,11 @@ and secondary storage.
 
    -  
 
-      `Section 6.3.1, “Basic Zone
-      Configuration” <#basic-zone-configuration>`__
+      `“Basic Zone Configuration” <#basic-zone-configuration>`_
 
    -  
 
-      `Section 6.3.2, “Advanced Zone
-      Configuration” <#advanced-zone-configuration>`__
+      `“Advanced Zone Configuration” <#advanced-zone-configuration>`_
 
 Basic Zone Configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -435,7 +426,7 @@ Basic Zone Configuration
       Network Offering                                 Description 
       ===============================================  ===================================================================================================================
       DefaultSharedNetworkOfferingWithSGService        If you want to enable security groups
for guest traffic isolation, choose this. (See Using Security Groups to                  
                                           Control Traffic to VMs.)
-	  DefaultSharedNetworkOffering                     If you do not need security groups, choose
this.
+	  DefaultSharedNetworkOffering                      If you do not need security groups,
choose this.
       DefaultSharedNetscalerEIPandELBNetworkOffering   If you have installed a Citrix NetScaler
appliance as part of your zone network, and you will be using its Elastic                
                                        IP and Elastic Load Balancing features, choose this.
With the EIP and ELB features, a basic zone with security                                
                            groups enabled can offer 1:1 static NAT and load balancing. 
       ===============================================  ===================================================================================================================
 
@@ -558,7 +549,7 @@ Basic Zone Configuration
 
    In a new zone, CloudStack adds the first pod for you. You can always
    add more pods later. For an overview of what a pod is, see
-   `Section 2.3, “About Pods” <#about-pods>`__.
+   `“About Pods” <http://docs.cloudstack.apache.org/en/latest/concepts.html?highlight=about%20pods#about-pods>`_.
 
    To configure the first pod, enter the following, then click Next:
 
@@ -770,8 +761,7 @@ Advanced Zone Configuration
 
    The traffic types are management, public, guest, and storage traffic.
    For more information about the types, roll over the icons to display
-   their tool tips, or see `Section 2.8.3, “Advanced Zone Network
-   Traffic Types” <#advanced-zone-network-traffic-types>`__. This screen
+   their tool tips, or see `“Advanced Zone Network Traffic Types” <http://docs.cloudstack.apache.org/en/latest/concepts.html?highlight=about%20pods#advanced-zone-network-traffic-types>`_.
This screen
    starts out with one network already configured. If you have multiple
    physical networks, you need to add more. Drag and drop traffic types
    onto a greyed-out network and it will become active. You can move the
@@ -836,7 +826,7 @@ Advanced Zone Configuration
 
    In a new zone, CloudStack adds the first pod for you. You can always
    add more pods later. For an overview of what a pod is, see
-   `Section 2.3, “About Pods” <#about-pods>`__.
+   `“About Pods” <http://docs.cloudstack.apache.org/en/latest/concepts.html?highlight=about%20pods#about-pods>`_.
 
    To configure the first pod, enter the following, then click Next:
 
@@ -859,8 +849,7 @@ Advanced Zone Configuration
       **Start/End Reserved System IP.** The IP range in the management
       network that CloudStack uses to manage various system VMs, such as
       Secondary Storage VMs, Console Proxy VMs, and DHCP. For more
-      information, see `Section 2.8.6, “System Reserved IP
-      Addresses” <#system-reserved-ip-addresses>`__.
+      information, see `“System Reserved IP Addresses” <http://docs.cloudstack.apache.org/en/latest/concepts.html?highlight=about%20pods#id4>`_.
 
 #. 
 
@@ -871,7 +860,7 @@ Advanced Zone Configuration
 
    In a new pod, CloudStack adds the first cluster for you. You can
    always add more clusters later. For an overview of what a cluster is,
-   see `Section 2.4, “About Clusters” <#about-clusters>`__.
+   see `“About Clusters” <http://docs.cloudstack.apache.org/en/latest/concepts.html?highlight=about%20pods#about-clusters>`_.
 
    To configure the first cluster, enter the following, then click Next:
 
@@ -894,7 +883,7 @@ Advanced Zone Configuration
 
    In a new cluster, CloudStack adds the first host for you. You can
    always add more hosts later. For an overview of what a host is, see
-   `Section 2.5, “About Hosts” <#about-hosts>`__.
+   `“About Hosts” <http://docs.cloudstack.apache.org/en/latest/concepts.html?highlight=about%20pods#about-hosts>`_.
 
    .. note::
    
@@ -948,8 +937,7 @@ Advanced Zone Configuration
 
    In a new cluster, CloudStack adds the first primary storage server
    for you. You can always add more servers later. For an overview of
-   what primary storage is, see `Section 2.6, “About Primary
-   Storage” <#about-primary-storage>`__.
+   what primary storage is, see `“About Primary Storage” <http://docs.cloudstack.apache.org/en/latest/concepts.html?highlight=about%20pods#about-primary-storage>`_.
 
    To configure the first primary storage server, enter the following,
    then click Next:
@@ -966,7 +954,7 @@ Advanced Zone Configuration
       remaining fields in the screen vary depending on what you choose
       here.
 
-      ===================  ==================================================================

+      ===================  ===========================================================================
       NFS                  -  
 
                              **Server.** The IP address or DNS name of the storage device.
@@ -980,6 +968,7 @@ Advanced Zone Configuration
                              **Tags (optional).** The comma-separated list of tags for this
                              storage device. It should be an equivalent set or superset of
                              the tags on your disk offerings.
+
       iSCSI                -  
 
                              **Server.** The IP address or DNS name of the storage device.
@@ -998,6 +987,7 @@ Advanced Zone Configuration
                              **Tags (optional).** The comma-separated list of tags for this
                              storage device. It should be an equivalent set or superset of
                              the tags on your disk offerings.
+
       preSetup             -  
 
                              **Server.** The IP address or DNS name of the storage device.
@@ -1012,6 +1002,7 @@ Advanced Zone Configuration
                              **Tags (optional).** The comma-separated list of tags for this
                              storage device. It should be an equivalent set or superset of
                              the tags on your disk offerings.
+
       SharedMountPoint     -  
 
                              **Path.** The path on each host that is where this primary
@@ -1022,6 +1013,7 @@ Advanced Zone Configuration
                              **Tags (optional).** The comma-separated list of tags for this
                              storage device. It should be an equivalent set or superset of
                              the tags on your disk offerings.
+
       VMFS                 -  
 
                              **Server.** The IP address or DNS name of the vCenter server.
@@ -1037,7 +1029,8 @@ Advanced Zone Configuration
                              **Tags (optional).** The comma-separated list of tags for this
                              storage device. It should be an equivalent set or superset of
                              the tags on your disk offerings.
-      ===================  ==========================================================
+      ===================  ===========================================================================
+
 
       The tag sets on primary storage across clusters in a Zone must be
       identical. For example, if cluster A provides primary storage that
@@ -1047,8 +1040,7 @@ Advanced Zone Configuration
 #. 
 
    In a new zone, CloudStack adds the first secondary storage server for
-   you. For an overview of what secondary storage is, see `Section 2.7,
-   “About Secondary Storage” <#about-secondary-storage>`__.
+   you. For an overview of what secondary storage is, see `“About Secondary Storage”
<http://docs.cloudstack.apache.org/en/latest/concepts.html?highlight=about%20pods#about-secondary-storage>`_.
 
    Before you can fill out this screen, you need to prepare the
    secondary storage by setting up NFS shares and installing the latest
@@ -1067,6 +1059,8 @@ Advanced Zone Configuration
 
    Click Launch.
 
+.. _adding-a-pod:
+
 Adding a Pod
 ------------
 
@@ -1075,8 +1069,7 @@ can add more pods at any time using the procedure in this section.
 
 #. 
 
-   Log in to the CloudStack UI. See `Section 5.1, “Log In to the
-   UI” <#log-in>`__.
+   Log in to the CloudStack UI. See `“Log In to the UI” <http://docs.cloudstack.apache.org/projects/cloudstack-administration/en/latest/ui.html#log-in-to-the-ui>`_.
 
 #. 
 
@@ -1120,6 +1113,8 @@ can add more pods at any time using the procedure in this section.
 
    Click OK.
 
+.. _adding-a-cluster:
+
 Adding a Cluster
 ----------------
 
@@ -1344,6 +1339,8 @@ To add a vSphere cluster to CloudStack:
       There might be a slight delay while the cluster is provisioned. It
       will automatically display in the UI.
 
+.. _adding-a-host:
+
 Adding a Host
 -------------
 
@@ -1362,8 +1359,7 @@ Adding a Host
 
    .. warning::
        
-	  Be sure you have performed the additional CloudStack-specific configuration steps described
in the hypervisor installation section
-      for your particular hypervisor.
+	  Be sure you have performed the additional CloudStack-specific configuration steps described
in the hypervisor installation section for your particular hypervisor.
 
 #. 
 
@@ -1372,12 +1368,13 @@ Adding a Host
 
    -  
 
-      `Section 6.6.1, “Adding a Host (XenServer or
-      KVM)” <#host-add-xenserver-kvm-ovm>`__
+      :ref:`adding-a-host-xenserver-kvm`
 
    -  
 
-      `Section 6.6.2, “Adding a Host (vSphere)” <#host-add-vsphere>`__
+      :ref:`adding-a-host-vsphere`
+
+.. _adding-a-host-xenserver-kvm:
 
 Adding a Host (XenServer or KVM)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1424,7 +1421,7 @@ pool.
 
 .. note:: 
 
-   When copying and pasting a command, be sure the command has pasted as a single line before
executing. Some document viewers may introduce unwanted line        breaks in copied text.
+   When copying and pasting a command, be sure the command has pasted as a single line before
executing. Some document viewers may introduce unwanted line breaks in copied text.
 
 With all hosts added to the XenServer pool, run the cloud-setup-bond
 script. This script will complete the configuration and setup of the
@@ -1534,6 +1531,8 @@ Adding a XenServer or KVM Host
 
    Repeat for additional hosts.
 
+.. _adding-a-host-vsphere:
+
 Adding a Host (vSphere)
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -1541,6 +1540,8 @@ For vSphere servers, we recommend creating the cluster of hosts in
 vCenter and then adding the entire cluster to CloudStack. See Add
 Cluster: vSphere.
 
+.. _add-primary-storage:
+
 Add Primary Storage
 -------------------
 
@@ -1586,19 +1587,18 @@ cluster.
 
 .. warning:: 
 
-   When using preallocated storage for primary storage, be sure there is nothing on the storage
(ex. you have an empty SAN volume or an empty NFS share).         Adding the storage to CloudStack
will destroy any existing data.
+   When using preallocated storage for primary storage, be sure there is nothing on the storage
(ex. you have an empty SAN volume or an empty NFS share). Adding the storage to CloudStack
will destroy any existing data.
 
 .. note:: 
 
-   Primary storage can also be added at the zone level through the CloudStack API (adding
zone-level primary storage is not yet supported through the             CloudStack UI).
+   Primary storage can also be added at the zone level through the CloudStack API (adding
zone-level primary storage is not yet supported through the CloudStack UI).
 
 Once primary storage has been added at the zone level, it can be managed
 through the CloudStack UI.
 
 #. 
 
-   Log in to the CloudStack UI (see `Section 5.1, “Log In to the
-   UI” <#log-in>`__).
+   Log in to the CloudStack UI (see `“Log In to the UI” <http://docs.cloudstack.apache.org/projects/cloudstack-administration/en/latest/ui.html#log-in-to-the-ui>`_).
 
 #. 
 
@@ -1829,6 +1829,8 @@ example, '=' is represented as '%3D')]
    by (Min IOPS \* clusterDefaultBurstIopsPercentOfMaxIops parameter)
    (can be a decimal value)]
 
+.. _add-secondary-storage:
+
 Add Secondary Storage
 ---------------------
 
@@ -1877,8 +1879,7 @@ add more servers to an existing zone.
 
    To prepare for the zone-based Secondary Staging Store, you should
    have created and mounted an NFS share during Management Server
-   installation. See `Section 4.5.7, “Prepare NFS
-   Shares” <#prepare-nfs-shares>`__.
+   installation. See `“Prepare NFS Shares” <installation.html#prepare-nfs-shares>`_.
 
    If you are using an Hyper-V host, ensure that you have created a SMB
    share.
@@ -1886,8 +1887,7 @@ add more servers to an existing zone.
 #. 
 
    Make sure you prepared the system VM template during Management
-   Server installation. See `Section 4.5.9, “Prepare the System VM
-   Template” <#prepare-system-vm-template>`__.
+   Server installation. See `“Prepare the System VM Template” <installation.html#prepare-the-system-vm-template>`_.
 
 #. 
 
@@ -1933,8 +1933,7 @@ add more servers to an existing zone.
 
       .. warning:: 
 	  
-	     Even if the UI allows you to uncheck this box, do not do so. This checkbox and the
three fields below it must be filled in. Even
-         when Swift or S3 is used as the secondary storage provider, an NFS staging storage
in each zone is still required.
+	     Even if the UI allows you to uncheck this box, do not do so. This checkbox and the
three fields below it must be filled in. Even when Swift or S3 is used as the secondary storage
provider, an NFS staging storage in each zone is still required.
 
    -  
 
@@ -2010,6 +2009,8 @@ zone:
 
       Path. The path to the zone's Secondary Staging Store.
 
+.. _initialize-and-test:
+
 Initialize and Test
 -------------------
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/cb6fc735/source/optional_installation.rst
----------------------------------------------------------------------
diff --git a/source/optional_installation.rst b/source/optional_installation.rst
index f6555e7..5f350f4 100644
--- a/source/optional_installation.rst
+++ b/source/optional_installation.rst
@@ -344,13 +344,13 @@ Supported API Version
 
    The EC2 interface complies with Amazon's WDSL version dated November
    15, 2010, available at
-   `http://ec2.amazonaws.com/doc/2010-11-15/ <http://ec2.amazonaws.com/doc/2010-11-15/>`__.
+   `http://ec2.amazonaws.com/doc/2010-11-15/ <http://ec2.amazonaws.com/doc/2010-11-15/>`_.
 
 -  
 
    The interface is compatible with the EC2 command-line tools *EC2
    tools v. 1.3.6230*, which can be downloaded at
-   `http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip <http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip>`__.
+   `http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip <http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip>`_.
 
 .. note:: 
 
@@ -366,7 +366,7 @@ prior to using it.
 #. 
 
    Set the global configuration parameters for each service to true. See
-   `Chapter 7, *Setting Configuration Parameters* <#global-config>`__.
+   `*Setting Global Configuration Parameters* <configuration.html#setting-global-configuration-parameters>`_.
 
 #. 
 
@@ -381,7 +381,7 @@ prior to using it.
 #. 
 
    If you did not already do so when you set the configuration parameter
-   in step `1 <#set-global-config>`__, restart the Management Server.
+   in step 1, restart the Management Server.
 
    .. sourcecode:: bash
 
@@ -419,7 +419,7 @@ Creating EC2 Compatible Service Offerings
 
 You will also need to define compute service offerings with names
 compatible with the `Amazon EC2 instance
-types <http://aws.amazon.com/ec2/instance-types/>`__ API names (e.g
+types <http://aws.amazon.com/ec2/instance-types/>`_ API names (e.g
 m1.small,m1.large). This can be done via the CloudStack GUI. Go under
 *Service Offerings* select *Compute offering* and either create a new
 compute offering or modify an existing one, ensuring that the name
@@ -491,7 +491,7 @@ To use the EC2 command-line tools, the user must perform these steps:
 
    Be sure you have the right version of EC2 Tools. The supported
    version is available at
-   `http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip <http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip>`__.
+   `http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip <http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip>`_.
 
 #. 
 


Mime
View raw message