cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject [4/6] git commit: fixed internal links, tables, CLOUDSTACK-5954
Date Mon, 24 Mar 2014 22:17:10 GMT
fixed internal links, tables, CLOUDSTACK-5954

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


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

Branch: refs/heads/master
Commit: b3975f634f58671820a8849ce652600ff7ebd335
Parents: f267609
Author: Pierre-Luc Dion <pdion@cloudops.com>
Authored: Thu Mar 20 21:30:33 2014 -0400
Committer: Sebastien Goasguen <runseb@gmail.com>
Committed: Mon Mar 24 18:16:14 2014 -0400

----------------------------------------------------------------------
 .gitignore                                |  12 +
 source/_static/images/update-ssl-icon.png | Bin 0 -> 8812 bytes
 source/_static/images/update-ssl.png      | Bin 0 -> 30619 bytes
 source/accounts.rst                       |   2 +-
 source/hosts.rst                          |   4 +-
 source/management.rst                     |   5 +-
 source/networking.rst                     |  74 +++----
 source/networking2.rst                    | 296 ++++++++++++-------------
 source/projects.rst                       |  12 +-
 source/reliability.rst                    |   4 +-
 source/service_offerings.rst              |   4 +-
 source/storage.rst                        |  30 +--
 source/systemvm.rst                       |  20 +-
 source/templates.rst                      |  66 +++---
 source/tuning.rst                         |   4 +-
 source/ui.rst                             |   4 +-
 source/usage.rst                          |  71 ++----
 source/virtual_machines.rst               |  37 ++--
 18 files changed, 300 insertions(+), 345 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/b3975f63/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index b885e35..a5819d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,15 @@
 # under the License.
 
 /build
+
+# OS generated files #
+######################
+*/.DS_Store
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/b3975f63/source/_static/images/update-ssl-icon.png
----------------------------------------------------------------------
diff --git a/source/_static/images/update-ssl-icon.png b/source/_static/images/update-ssl-icon.png
new file mode 100644
index 0000000..f5f923d
Binary files /dev/null and b/source/_static/images/update-ssl-icon.png differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/b3975f63/source/_static/images/update-ssl.png
----------------------------------------------------------------------
diff --git a/source/_static/images/update-ssl.png b/source/_static/images/update-ssl.png
new file mode 100644
index 0000000..2f2ee53
Binary files /dev/null and b/source/_static/images/update-ssl.png differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/b3975f63/source/accounts.rst
----------------------------------------------------------------------
diff --git a/source/accounts.rst b/source/accounts.rst
index 41e6524..88181de 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -143,7 +143,7 @@ How to Use Dedicated Hosts
 
 To use an explicitly dedicated host, use the explicit-dedicated type of
 affinity group (see `“Affinity
-Groups” <#affinity-groups>`__). For example, when creating a new VM, an
+Groups” <virtual_machines.html#affinity-groups>`_). For example, when creating a new VM, an
 end user can choose to place it on dedicated infrastructure. This
 operation will succeed only if some infrastructure has already been
 assigned as dedicated to the user's account or domain.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/b3975f63/source/hosts.rst
----------------------------------------------------------------------
diff --git a/source/hosts.rst b/source/hosts.rst
index d63555c..3af41ba 100644
--- a/source/hosts.rst
+++ b/source/hosts.rst
@@ -21,8 +21,8 @@ Adding Hosts
 ------------
 
 Additional hosts can be added at any time to provide more capacity for
-guest VMs. For requirements and instructions, see `Section 7.6, “Adding
-a Host” <#host-add>`__.
+guest VMs. For requirements and instructions, see `“Adding
+a Host” <http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/latest/configuration.html#adding-a-host>`_.
 
 Scheduled Maintenance and Maintenance Mode for Hosts
 ----------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/b3975f63/source/management.rst
----------------------------------------------------------------------
diff --git a/source/management.rst b/source/management.rst
index 9b90659..9b7b346 100644
--- a/source/management.rst
+++ b/source/management.rst
@@ -502,9 +502,8 @@ these steps.
    -  
 
       At the network level, the DNS suffix can be assigned through the
-      UI when creating a new network, as described in `Section 15.6.1,
-      “Adding an Additional Guest
-      Network” <#add-additional-guest-network>`__ or with the
+      UI when creating a new network, as described in 
+      `“Adding an Additional Guest Network” <networking2#adding-an-additional-guest-network>`_ or with the
       updateNetwork command in the CloudStack API.
 
    -  

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/b3975f63/source/networking.rst
----------------------------------------------------------------------
diff --git a/source/networking.rst b/source/networking.rst
index 0ec0fcf..f8f8932 100644
--- a/source/networking.rst
+++ b/source/networking.rst
@@ -58,7 +58,7 @@ single physical network. In CloudStack a virtual network can be shared
 or isolated.
 
 Isolated Networks
-~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~
 
 An isolated network can be accessed only by virtual machines of a single
 account. Isolated networks have the following properties.
@@ -77,11 +77,11 @@ account. Isolated networks have the following properties.
    The network offering can be upgraded or downgraded but it is for the
    entire network
 
-For more information, see `Section 15.5.1, “Configure Guest Traffic in
-an Advanced Zone” <#configure-guest-traffic-in-advanced-zone>`_.
+For more information, see `“Configure Guest Traffic in
+an Advanced Zone” <networking2.html#configure-guest-traffic-in-an-advanced-zone>`_.
 
 Shared Networks
-~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~
 
 A shared network can be accessed by virtual machines that belong to many
 different accounts. Network Isolation on shared networks is accomplished
@@ -115,11 +115,11 @@ Basic zones in CloudStack 3.0.3 and later versions.
    service provider is virtual router. However, Source NAT per account
    is supported.
 
-For information, see `Section 15.5.3, “Configuring a Shared Guest
-Network” <#creating-shared-network>`_.
+For information, see `“Configuring a Shared Guest
+Network” <networking2.html#configuring-a-shared-guest-network>`_.
 
 Runtime Allocation of Virtual Network Resources
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 When you define a new virtual network, all your settings for that
 network are stored in CloudStack. The actual network resources are
@@ -129,7 +129,7 @@ resources are garbage collected so they can be allocated again. This
 helps to conserve network resources.
 
 Network Service Providers
-------------------------------
+-------------------------
 
 .. note:: 
    For the most up-to-date list of supported network service providers, see the CloudStack UI or call `listNetworkServiceProviders`.
@@ -180,7 +180,7 @@ offering.
 +----------------------+-----------+------------+----------+-------------+-------------+
 
 Network Offerings
-----------------------
+-----------------
 
 .. note:: 
    For the most up-to-date list of supported network services, see the CloudStack UI or call listNetworkServices.
@@ -298,16 +298,16 @@ To create a network offering:
       **Guest Type**. Choose whether the guest network is isolated or
       shared.
 
-      For a description of this term, see `Section 9.2, “About Virtual
-      Networks” <#about-virtual-networks>`__.
+      For a description of this term, see `“About Virtual
+      Networks” <#about-virtual-networks>`_.
 
    -  
 
       **Persistent**. Indicate whether the guest network is persistent
       or not. The network that you can provision without having to
       deploy a VM on it is termed persistent network. For more
-      information, see `Section 15.28, “Persistent
-      Networks” <#persistent-network>`__.
+      information, see `“Persistent
+      Networks” <networking2.html#persistent-networks>`_.
 
    -  
 
@@ -323,8 +323,8 @@ To create a network offering:
       Private Cloud-enabled. A Virtual Private Cloud (VPC) is a private,
       isolated part of CloudStack. A VPC can have its own virtual
       network topology that resembles a traditional physical network.
-      For more information on VPCs, see `Section 15.27.1, “About Virtual
-      Private Clouds” <#vpc>`__.
+      For more information on VPCs, see `“About Virtual
+      Private Clouds” <networking2.html#about-virtual-private-clouds>`_.
 
    -  
 
@@ -339,33 +339,33 @@ To create a network offering:
       Based on the guest network type selected, you can see the
       following supported services:
 
-      =================== ======================================================================= ============= =============
-      Supported Services  Description                                                              Isolated     Shared   
-      =================== ======================================================================= ============= =============
-      DHCP                For more information, see `Section 15.24, “DNS and DHCP” <#dns-dhcp>`_. Supported     Supported
-      DNS                 For more information, see `Section 15.24, “DNS and DHCP” <#dns-dhcp>`_. Supported     Supported
-      Load Balancer       If you select Load Balancer, you can choose the CloudStack virtual      Supported     Supported
+      =================== ============================================================================ ============= =============
+      Supported Services  Description                                                                  Isolated      Shared   
+      =================== ============================================================================ ============= =============
+      DHCP                For more information, see `“DNS and DHCP” <networking2.html#dns-and-dhcp>`_. Supported     Supported
+      DNS                 For more information, see `“DNS and DHCP” <networking2.html#dns-and-dhcp>`_. Supported     Supported
+      Load Balancer       If you select Load Balancer, you can choose the CloudStack virtual           Supported     Supported
                           router or any other load balancers that have been configured in
                           the cloud.
-      Firewall            For more information, see the Administration Guide.                     Supported     Supported
-      Source NAT          If you select Source NAT, you can choose the CloudStack virtual         Supported     Supported
+      Firewall            For more information, see the Administration Guide.                          Supported     Supported
+      Source NAT          If you select Source NAT, you can choose the CloudStack virtual              Supported     Supported
                           router or any other Source NAT providers that have been configured
                           in the cloud.
-      Static NAT          If you select Static NAT, you can choose the CloudStack virtual         Supported     Supported
+      Static NAT          If you select Static NAT, you can choose the CloudStack virtual              Supported     Supported
                           router or any other Static NAT providers that have been configured
                           in the cloud.
-      Port Forwarding     If you select Port Forwarding, you can choose the CloudStack            Supported     Not Supported
+      Port Forwarding     If you select Port Forwarding, you can choose the CloudStack                 Supported     Not Supported
                           virtual router or any other Port Forwarding providers that have
                           been configured in the cloud.
-      VPN                 For more information, see `Section 15.25, “Remote Access                Supported     Not Supported
-                          VPN” <#vpn>`__.
-      User Data           For more information, see `Section 20.2, “User Data and Meta            Not Supported Supported
-                          Data” <#user-data-and-meta-data>`_.
-      Network ACL         For more information, see `Section 15.27.4, “Configuring Network        Supported     Not Supported
-                          Access Control List” <#configure-acl>`_.
-      Security Groups     For more information, see `Section 15.15.2, “Adding a Security          Not Supported Supported
-                          Group” <#add-security-group>`__.
-      =================== ======================================================================= ============= =============
+      VPN                 For more information, see `“Remote Access                                    Supported     Not Supported
+                          VPN” <networking2.html#remote-access-vpn>`_.
+      User Data           For more information, see `“User Data and Meta                               Not Supported Supported
+                          Data” <api.html#user-data-and-meta-data>`_.
+      Network ACL         For more information, see `“Configuring Network Access                       Supported     Not Supported
+                          Control List” <networking2.html#configuring-network-access-control-list>`_.
+      Security Groups     For more information, see `“Adding a Security                                Not Supported Supported
+                          Group” <networking2.html#adding-a-security-group>`_.
+      =================== ============================================================================ ============= =============
 
 
    -  
@@ -380,8 +380,7 @@ To create a network offering:
       system service offering and any custom system service offerings
       that have been defined by the CloudStack root administrator.
 
-      For more information, see `Section 8.2, “System Service
-      Offerings” <#system-service-offerings>`_.
+      For more information, see `“System Service Offerings” <service_offerings.html#system-service-offerings>`_.
 
    -  
 
@@ -439,8 +438,7 @@ To create a network offering:
 
          Elastic IP is enabled.
 
-      For information on Elastic IP, see `Section 15.11, “About Elastic
-      IP” <#elastic-ip>`_.
+      For information on Elastic IP, see `“About Elastic IP” <networking2.html#about-elastic-ip>`_.
 
    -  
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/b3975f63/source/networking2.rst
----------------------------------------------------------------------
diff --git a/source/networking2.rst b/source/networking2.rst
index cfdab2b..225de25 100644
--- a/source/networking2.rst
+++ b/source/networking2.rst
@@ -575,7 +575,7 @@ associated with an existing guest network.
 
 #. 
 
-   Wait for the update to complete. Don’t try to restart VMs until the
+   Wait for the update to complete. Don't try to restart VMs until the
    network change is complete.
 
 #. 
@@ -645,49 +645,17 @@ machines:
    For example, the following table describes three scenarios of guest
    network creation:
 
-   Case
-
-   CIDR
-
-   Network CIDR
-
-   Reserved IP Range for Non-CloudStack VMs
-
-   Description
-
-   1
-
-   10.1.1.0/24
-
-   None
-
-   None
-
-   No IP Reservation.
-
-   2
-
-   10.1.1.0/26
-
-   10.1.1.0/24
-
-   10.1.1.64 to 10.1.1.254
-
-   IP Reservation configured by the UpdateNetwork API with
-   guestvmcidr=10.1.1.0/26 or enter 10.1.1.0/26 in the CIDR field in the
-   UI.
-
-   3
-
-   10.1.1.0/24
-
-   None
-
-   None
-
-   Removing IP Reservation by the UpdateNetwork API with
-   guestvmcidr=10.1.1.0/24 or enter 10.1.1.0/24 in the CIDR field in the
-   UI.
+   ===== ============= =============== =========================================== ========================================================
+   Case  CIDR          Network CIDR    Reserved IP Range for Non-CloudStack VMs    Description
+   ===== ============= =============== =========================================== ========================================================
+   1     10.1.1.0/24   None            None                                        No IP Reservation.
+   2     10.1.1.0/26   10.1.1.0/24     10.1.1.64 to 10.1.1.254                     IP Reservation configured by the UpdateNetwork API with
+                                                                                   guestvmcidr=10.1.1.0/26 or enter 10.1.1.0/26 in the CIDR 
+                                                                                   field in the UI.
+   3     10.1.1.0/24   None            None                                        Removing IP Reservation by the UpdateNetwork API with
+                                                                                   guestvmcidr=10.1.1.0/24 or enter 10.1.1.0/24 in the CIDR 
+                                                                                   field in the UI.
+   ===== ============= =============== =========================================== ========================================================
 
 Limitations
 ~~~~~~~~~~~
@@ -756,7 +724,7 @@ set of VLANs and guest IP addresses for a tenant.
 Note that if an account has consumed all the VLANs and IPs dedicated to
 it, the account can acquire two more resources from the system.
 CloudStack provides the root admin with two configuration parameter to
-modify this default behavior—use.system.public.ips and
+modify this default behavior—use.system.public.ips and
 use.system.guest.vlans. These global parameters enable the root admin to
 disallow an account from acquiring public IPs and guest VLANs from the
 system, if the account has dedicated resources and these dedicated
@@ -967,7 +935,7 @@ Configuring Multiple IP Addresses on a Single NIC
 CloudStack provides you the ability to associate multiple private IP
 addresses per guest VM NIC. In addition to the primary IP, you can
 assign additional IPs to the guest VM NIC. This feature is supported on
-all the network configurations—Basic, Advanced, and VPC. Security
+all the network configurations—Basic, Advanced, and VPC. Security
 Groups, Static NAT and Port forwarding services are supported on these
 additional IPs.
 
@@ -1170,8 +1138,8 @@ offering. Later, the user can acquire an IP for the VM and enable static
 NAT.
 
 For more information on the Associate Public IP option, see
-`Section 9.4.1, “Creating a New Network
-Offering” <#creating-network-offerings>`__.
+`"Creating a New Network
+Offering" <networking.html#creating-a-new-network-offering>`_.
 
 .. note:: 
    The Associate Public IP feature is designed only for use with user VMs.
@@ -1469,7 +1437,7 @@ within the same VLAN. In a PVLAN-enabled shared network, a user VM
 cannot reach other user VM though they can reach the DHCP server and
 gateway, this would in turn allow users to control traffic within a
 network and help them deploy multiple applications without communication
-between application as well as prevent communication with other users’
+between application as well as prevent communication with other users'
 VMs.
 
 -  
@@ -1659,7 +1627,7 @@ Creating a PVLAN-Enabled Guest Network
       Isolated VLAN.
 
       For the description on Secondary Isolated VLAN, see
-      `Section 15.14.1, “About Private VLAN” <#about-pvlan>`_.
+      `About Private VLAN" <#about-private-vlan>`_.
 
    -  
 
@@ -1981,7 +1949,7 @@ About Using a NetScaler Load Balancer
 Citrix NetScaler is supported as an external network element for load
 balancing in zones that use isolated networking in advanced zones. Set
 up an external load balancer when you want to provide load balancing
-through means other than CloudStack’s provided virtual router.
+through means other than CloudStack's provided virtual router.
 
 .. note:: 
    In a Basic zone, load balancing service is supported only if Elastic IP or Elastic LB services are enabled.
@@ -1998,7 +1966,7 @@ policy-based route must be set up so that all traffic originated from
 the guest VM's are directed to NetScaler device. This is required to
 ensure that the outbound traffic from the guest VM's is routed to a
 public IP by using NAT.For more information on Elastic IP, see
-`Section 15.11, “About Elastic IP” <#elastic-ip>`_.
+`"About Elastic IP" <#about-elastic-ip>`_.
 
 The NetScaler can be set up in direct (outside the firewall) mode. It
 must be added before any load balancing rules are deployed on guest VMs
@@ -2046,7 +2014,7 @@ a single appliance to support multi-tenant usage
 
 CloudStack will dynamically provision, configure, and manage the life
 cycle of VPX instances on the SDX. Provisioned instances are added into
-CloudStack automatically – no manual configuration by the administrator
+CloudStack automatically - no manual configuration by the administrator
 is required. Once a VPX instance is added into CloudStack, it is treated
 the same as a VPX on an ESXi host.
 
@@ -2233,6 +2201,8 @@ VMs.
    the virtual router for each of your existing load balancing rules so
    that they continue to function.
 
+.. _adding-lb-rule:
+
 Adding a Load Balancer Rule
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -2268,7 +2238,7 @@ Adding a Load Balancer Rule
    Addresses page when the rule is created.
 
    To do that, select the name of the network, then click Add Load
-   Balancer tab. Continue with `7 <#config-lb>`_.
+   Balancer tab. Continue with #7.
 
 #. 
 
@@ -2304,15 +2274,13 @@ Adding a Load Balancer Rule
    -  
 
       **AutoScale**: Click Configure and complete the AutoScale
-      configuration as explained in `Section 15.16.6, “Configuring
-      AutoScale” <#autoscale>`__.
+      configuration as explained in :ref:`conf-autoscale`.
 
    -  
 
       **Health Check**: (Optional; NetScaler load balancers only) Click
       Configure and fill in the characteristics of the health check
-      policy. See `Section 15.16.5.3, “Health Checks for Load Balancer
-      Rules” <#health-checks-for-lb-rules>`__.
+      policy. See :ref:`health-check`.
 
       -  
 
@@ -2366,7 +2334,7 @@ parameters. The parameters are name-value pairs or flags, which are
 defined by the load balancer vendor. The stickiness method could be load
 balancer-generated cookie, application-generated cookie, or
 source-based. In the source-based method, the source IP address is used
-to identify the user and locate the user’s stored data. In the other
+to identify the user and locate the user's stored data. In the other
 methods, cookies are used. The cookie generated by the load balancer or
 application is included in request and response URLs to create
 persistence. The cookie name can be specified by the administrator or
@@ -2378,6 +2346,8 @@ For the most up to date list of available stickiness methods, see the
 CloudStack UI or call listNetworks and check the
 SupportedStickinessMethods capability.
 
+.. _health-check:
+
 Health Checks for Load Balancer Rules
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -2413,8 +2383,9 @@ is 600 seconds). You can override this value for an individual health
 check policy.
 
 For details on how to set a health check policy using the UI, see
-`Section 15.16.5.1, “Adding a Load Balancer
-Rule” <#add-load-balancer-rule>`__.
+:ref:`adding-lb-rule`.
+
+.. _conf-autoscale:
 
 Configuring AutoScale
 ~~~~~~~~~~~~~~~~~~~~~
@@ -2472,25 +2443,23 @@ Before you configure an AutoScale rule, consider the following:
    monitor the SNMP-based counter, ensure that the SNMP agent is
    installed in the template used for creating the AutoScale VMs, and
    the SNMP operations work with the configured SNMP community and port
-   by using standard SNMP managers. For example, see `Section 15.16.2,
-   “Configuring SNMP Community String on a RHEL
-   Server” <#configure-snmp-rhel>`__ to configure SNMP on a RHEL
+   by using standard SNMP managers. For example, see `"Configuring SNMP Community String on a RHEL
+   Server" <#configuring-snmp-community-string-on-a-rhel-server>`_ to configure SNMP on a RHEL
    machine.
 
 -  
 
    Ensure that the endpointe.url parameter present in the Global
    Settings is set to the Management Server API URL. For example,
-   http://10.102.102.22:8080/client/api. In a multi-node Management
+   ``http://10.102.102.22:8080/client/api``. In a multi-node Management
    Server deployment, use the virtual IP address configured in the load
-   balancer for the management server’s cluster. Additionally, ensure
+   balancer for the management server's cluster. Additionally, ensure
    that the NetScaler device has access to this IP address to provide
    AutoScale support.
 
    If you update the endpointe.url, disable the AutoScale functionality
    of the load balancer rules in the system, then enable them back to
-   reflect the changes. For more information see `Updating an AutoScale
-   Configuration <#update-autoscale>`__
+   reflect the changes. For more information see :ref:`update-autoscale`.
 
 -  
 
@@ -2684,6 +2653,8 @@ are done, you can enable the AutoScale configuration back. To enable,
 open the AutoScale configuration page again, then click the Enable
 AutoScale |EnableDisable.png| button.
 
+.. _update-autoscale:
+
 Updating an AutoScale Configuration
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -2795,11 +2766,11 @@ A typical GSLB environment is comprised of the following components:
    Citrix NetScaler terminology, a load balancing or content switching
    virtual server represents one or many servers on the local network.
    Clients send their requests to the load balancing or content
-   switching virtual server’s virtual IP (VIP) address, and the virtual
+   switching virtual server's virtual IP (VIP) address, and the virtual
    server balances the load across the local servers. After a GSLB
    virtual server selects a GSLB service representing either a local or
    a remote load balancing or content switching virtual server, the
-   client sends the request to that virtual server’s VIP address.
+   client sends the request to that virtual server's VIP address.
 
 -  
 
@@ -2973,8 +2944,7 @@ above, the administrator of xyztelco is the one who sets up GSLB:
    In each zone that are participating in GSLB, add GSLB-enabled
    NetScaler device.
 
-   For more information, see `Section 15.17.2.2, “Enabling GSLB in
-   NetScaler” <#enable-glsb-ns>`_.
+   For more information, see :ref:`enabling-gslb-in-ns`.
 
 As a domain administrator/ user perform the following:
 
@@ -2982,14 +2952,13 @@ As a domain administrator/ user perform the following:
 
    Add a GSLB rule on both the sites.
 
-   See `Section 15.17.2.3, “Adding a GSLB Rule” <#gslb-add>`_.
+   See ":ref:`adding-gslb-rule`".
 
 #. 
 
    Assign load balancer rules.
 
-   See `Section 15.17.2.4, “Assigning Load Balancing Rules to
-   GSLB” <#assign-lb-gslb>`_.
+   See ":ref:`assigning-lb-rule-gslb`".
 
 Prerequisites and Guidelines
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -3070,6 +3039,8 @@ Prerequisites and Guidelines
 
    Statistics is collected from each GSLB virtual server.
 
+.. _enabling-gslb-in-ns:
+
 Enabling GSLB in NetScaler
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -3173,6 +3144,8 @@ In each zone, add GSLB-enabled NetScaler device for load balancing.
 
    Click OK.
 
+.. _adding-gslb-rule:
+
 Adding a GSLB Rule
 ^^^^^^^^^^^^^^^^^^
 
@@ -3242,6 +3215,8 @@ Adding a GSLB Rule
 
    Click OK to confirm.
 
+.. _assigning-lb-rule-gslb:
+
 Assigning Load Balancing Rules to GSLB
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -3299,8 +3274,8 @@ their clients.
 In shared networks in Basic zone and Security Group-enabled Advanced
 networks, you will have the flexibility to add multiple guest IP ranges
 from different subnets. You can add or remove one IP range at a time.
-For more information, see `Section 15.10, “About Multiple IP
-Ranges” <#multiple-ip-range>`__.
+For more information, see `"About Multiple IP
+Ranges" <#about-multiple-ip-ranges>`_.
 
 Acquiring a New IP Address
 --------------------------
@@ -3334,8 +3309,8 @@ Acquiring a New IP Address
    If you want Portable IP click Yes in the confirmation dialog. If you
    want a normal Public IP click No.
 
-   For more information on Portable IP, see `Section 15.12, “Portable
-   IPs” <#portable-ip>`_.
+   For more information on Portable IP, see `"Portable
+   IPs" <#portable-ips>`_.
 
    Within a few moments, the new IP address should appear with the state
    Allocated. You can now use the IP address in port forwarding or
@@ -3378,7 +3353,7 @@ Static NAT
 
 A static NAT rule maps a public IP address to the private IP address of
 a VM in order to allow Internet traffic into the VM. The public IP
-address always remains the same, which is why it is called “static” NAT.
+address always remains the same, which is why it is called “static” NAT.
 This section tells how to enable or disable static NAT for a particular
 IP address.
 
@@ -3430,8 +3405,7 @@ IP Forwarding and Firewalling
 By default, all incoming traffic to the public IP address is rejected.
 All outgoing traffic from the guests is also blocked by default.
 
-To allow outgoing traffic, follow the procedure in `Section 15.22.2,
-“Egress Firewall Rules in an Advanced Zone” <#egress-firewall-rule>`__.
+To allow outgoing traffic, follow the procedure in :ref:`egress-fw-rules`.
 
 To allow incoming traffic, users may set up firewall rules and/or port
 forwarding rules. For example, you can use a firewall rule to open a
@@ -3452,12 +3426,11 @@ incoming requests from certain IP addresses.
 
 You cannot use firewall rules to open ports for an elastic IP address.
 When elastic IP is used, outside access is instead controlled through
-the use of security groups. See `Section 15.15.2, “Adding a Security
-Group” <#add-security-group>`_.
+the use of security groups. See `"Adding a Security
+Group" <#adding-a-security-group>`_.
 
 In an advanced zone, you can also create egress firewall rules by using
-the virtual router. For more information, see `Section 15.22.2, “Egress
-Firewall Rules in an Advanced Zone” <#egress-firewall-rule>`_.
+the virtual router. For more information, see ":ref:`egress-fw-rules`".
 
 Firewall rules can be created using the Firewall tab in the Management
 Server UI. This tab is not displayed by default when CloudStack is
@@ -3520,6 +3493,8 @@ To create a firewall rule:
 
    Click Add.
 
+.. _egress-fw-rules:
+
 Egress Firewall Rules in an Advanced Zone
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -3741,8 +3716,8 @@ To set up port forwarding:
 #. 
 
    Choose an existing IP address or acquire a new IP address. See
-   `Section 15.19, “Acquiring a New IP
-   Address” <#acquire-new-ip-address>`__. Click the name of the IP
+   `"Acquiring a New IP
+   Address" <#acquiring-a-new-ip-address>`_. Click the name of the IP
    address in the list.
 
 #. 
@@ -3837,14 +3812,13 @@ account owner.
 -  
 
    **Site to Site**. In this scenario, two private subnets are connected
-   over the public Internet with a secure VPN tunnel. The cloud user’s
+   over the public Internet with a secure VPN tunnel. The cloud user's
    subnet (for example, an office network) is connected through a
-   gateway to the network in the cloud. The address of the user’s
+   gateway to the network in the cloud. The address of the user's
    gateway must be preconfigured on the VPN server in the cloud. Note
    that although L2TP-over-IPsec can be used to set up Site-to-Site
    VPNs, this is not the primary intent of this feature. For more
-   information, see `Section 15.25.5, “Setting Up a Site-to-Site VPN
-   Connection” <#site-to-site-vpn>`__
+   information, see ":ref:`setting-s2s-vpn-conn`".
 
 Configuring Remote Access VPN
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -3865,17 +3839,17 @@ To set up VPN for the cloud:
 
    -  
 
-      remote.access.vpn.client.ip.range – The range of IP addresses to
+      remote.access.vpn.client.ip.range - The range of IP addresses to
       be allocated to remote access VPN clients. The first IP in the
       range is used by the VPN server.
 
    -  
 
-      remote.access.vpn.psk.length – Length of the IPSec key.
+      remote.access.vpn.psk.length - Length of the IPSec key.
 
    -  
 
-      remote.access.vpn.user.limit – Maximum number of VPN users per
+      remote.access.vpn.user.limit - Maximum number of VPN users per
       account.
 
 To enable VPN for a particular network:
@@ -4046,13 +4020,13 @@ Vista. The commands should be similar for other Windows versions.
 #. 
 
    In the next dialog, enter the source NAT IP from step
-   `1 <#source-nat>`__ and give the connection a name. Check Don't
+   #1 and give the connection a name. Check Don't
    connect now.
 
 #. 
 
    In the next dialog, enter the user name and password selected in step
-   `1 <#source-nat>`__.
+   #1.
 
 #. 
 
@@ -4072,7 +4046,7 @@ Vista. The commands should be similar for other Windows versions.
 
    In Type of VPN, choose L2TP IPsec VPN, then click IPsec settings.
    Select Use preshared key. Enter the preshared key from step
-   `1 <#source-nat>`_.
+   #1.
 
 #. 
 
@@ -4081,7 +4055,7 @@ Vista. The commands should be similar for other Windows versions.
 
 #. 
 
-   Enter the user name and password from step `1 <#source-nat>`_.
+   Enter the user name and password from step #1.
 
 Using Remote Access VPN with Mac OS X
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -4139,6 +4113,8 @@ differ slightly in older or newer releases of Mac OS X.
 
    Now click "Connect" and you will be connected to the CloudStack VPN.
 
+.. _setting-s2s-vpn-conn:
+
 Setting Up a Site-to-Site VPN Connection
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -4182,8 +4158,7 @@ To set up a Site-to-Site VPN connection, perform the following:
 
    Create a Virtual Private Cloud (VPC).
 
-   See `Section 15.27, “Configuring a Virtual Private
-   Cloud” <#configure-vpc>`_.
+   See ":ref:`configuring-vpc`".
 
 #. 
 
@@ -4238,7 +4213,7 @@ To add a VPN Customer Gateway:
 
       **CIDR list**: The guest CIDR list of the remote subnets. Enter a
       CIDR or a comma-separated list of CIDRs. Ensure that a guest CIDR
-      list is not overlapped with the VPC’s CIDR, or another guest CIDR.
+      list is not overlapped with the VPC's CIDR, or another guest CIDR.
       The CIDR must be RFC1918-compliant.
 
    -  
@@ -4317,7 +4292,7 @@ To add a VPN Customer Gateway:
          When PFS is turned on, for every negotiation of a new phase-2 SA
          the two gateways must generate a new set of phase-1 keys. This
          adds an extra layer of protection that PFS adds, which ensures if
-         the phase-2 SA’s have expired, the keys used for new phase-2 SA’s
+         the phase-2 SA's have expired, the keys used for new phase-2 SA's
          have not been generated from the current phase-1 keying material.
 
    -  
@@ -4338,7 +4313,7 @@ To add a VPN Customer Gateway:
       **Dead Peer Detection**: A method to detect an unavailable
       Internet Key Exchange (IKE) peer. Select this option if you want
       the virtual router to query the liveliness of its IKE peer at
-      regular intervals. It’s recommended to have the same configuration
+      regular intervals. It's recommended to have the same configuration
       of DPD on both side of VPN connection.
 
 #. 
@@ -4628,29 +4603,28 @@ This feature is supported on all the hypervisors.
 
    Create two VPCs. For example, VPC A and VPC B.
 
-   For more information, see `Section 15.27, “Configuring a Virtual
-   Private Cloud” <#configure-vpc>`__.
+   For more information, see ":ref:`configuring-vpc`".
 
 #. 
 
    Create VPN gateways on both the VPCs you created.
 
-   For more information, see `Section 15.25.5.2, “Creating a VPN gateway
-   for the VPC” <#create-vpn-gateway-for-vpc>`__.
+   For more information, see `"Creating a VPN gateway
+   for the VPC" <#creating-a-vpn-gateway-for-the-vpc>`_.
 
 #. 
 
    Create VPN customer gateway for both the VPCs.
 
-   For more information, see `Section 15.25.5.1, “Creating and Updating
-   a VPN Customer Gateway” <#create-vpn-customer-gateway>`__.
+   For more information, see `"Creating and Updating
+   a VPN Customer Gateway" <#creating-and-updating-a-vpn-customer-gateway>`_.
 
 #. 
 
    Enable a VPN connection on VPC A in passive mode.
 
-   For more information, see `Section 15.25.5.3, “Creating a VPN
-   Connection” <#create-vpn-connection-vpc>`__.
+   For more information, see `"Creating a VPN
+   Connection" <#creating-a-vpn-connection>`_.
 
    Ensure that the customer gateway is pointed to VPC B. The VPN
    connection is shown in the Disconnected state.
@@ -4816,9 +4790,8 @@ The major advantages are:
 
    -  
 
-      **VPN Gateway**: For more information, see `Section 15.25.5.2,
-      “Creating a VPN gateway for the
-      VPC” <#create-vpn-gateway-for-vpc>`_.
+      **VPN Gateway**: For more information, see `"Creating a VPN gateway for the
+      VPC" <#creating-a-vpn-gateway-for-the-vpc>`_.
 
    -  
 
@@ -4829,8 +4802,7 @@ The major advantages are:
 
    -  
 
-      **Private Gateway**: For more information, see `Section 15.27.5,
-      “Adding a Private Gateway to a VPC” <#add-gateway-vpc>`_.
+      **Private Gateway**: For more information, see ":ref:`adding-priv-gw-vpc`".
 
 -  
 
@@ -4866,8 +4838,9 @@ Inter-VLAN setup:
 
 |mutltier.png|
 
-To set up a multi-tier Inter-VLAN deployment, see `Section 15.27,
-“Configuring a Virtual Private Cloud” <#configure-vpc>`_.
+To set up a multi-tier Inter-VLAN deployment, see ":ref:`configuring-vpc`".
+
+.. _configuring-vpc:
 
 Configuring a Virtual Private Cloud
 -----------------------------------
@@ -4924,8 +4897,7 @@ A VPC is comprised of the following network components:
 
    **Private Gateway**: All the traffic to and from a private network
    routed to the VPC through the private gateway. For more information,
-   see `Section 15.27.5, “Adding a Private Gateway to a
-   VPC” <#add-gateway-vpc>`_.
+   see ":ref:`adding-priv-gw-vpc`".
 
 -  
 
@@ -4935,21 +4907,19 @@ A VPC is comprised of the following network components:
 
    **Site-to-Site VPN Connection**: A hardware-based VPN connection
    between your VPC and your datacenter, home network, or co-location
-   facility. For more information, see `Section 15.25.5, “Setting Up a
-   Site-to-Site VPN Connection” <#site-to-site-vpn>`_.
+   facility. For more information, see ":ref:`setting-s2s-vpn-conn`".
 
 -  
 
    **Customer Gateway**: The customer side of a VPN Connection. For more
-   information, see `Section 15.25.5.1, “Creating and Updating a VPN
-   Customer Gateway” <#create-vpn-customer-gateway>`_.
+   information, see `"Creating and Updating a VPN
+   Customer Gateway" <#creating-and-updating-a-vpn-customer-gateway>`_.
 
 -  
 
    **NAT Instance**: An instance that provides Port Address Translation
    for instances to access the Internet via the public gateway. For more
-   information, see `Section 15.27.10, “Enabling or Disabling Static NAT
-   on a VPC” <#enable-disable-static-nat-vpc>`_.
+   information, see ":ref:`enabling-disabling-static-nat-on-vpc`".
 
 -  
 
@@ -4957,8 +4927,7 @@ A VPC is comprised of the following network components:
    ACL items are nothing but numbered rules that are evaluated in order,
    starting with the lowest numbered rule. These rules determine whether
    traffic is allowed in or out of any tier associated with the network
-   ACL. For more information, see `Section 15.27.4, “Configuring Network
-   Access Control List” <#configure-acl>`_.
+   ACL. For more information, see ":ref:`conf-net-acl`".
 
 Network Architecture in a VPC
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -5228,8 +5197,8 @@ other tiers within the VPC.
       This option is only visible if the network offering you selected
       is VLAN-enabled.
 
-      For more information, see `Section 11.9.3, “Assigning VLANs to
-      Isolated Networks” <#vlan-assign-isolated-nw>`__.
+      For more information, see `"Assigning VLANs to
+      Isolated Networks" <hosts.html#assigning-vlans-to-isolated-networks>`_.
 
    -  
 
@@ -5247,6 +5216,8 @@ other tiers within the VPC.
 
    Continue with configuring access control list for the tier.
 
+.. _conf-net-acl:
+
 Configuring Network Access Control List
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -5444,7 +5415,7 @@ Creating an ACL Rule
 
       **Protocol Number**: The protocol number associated with IPv4 or
       IPv6. For more information, see `Protocol
-      Numbers <http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml>`__.
+      Numbers <http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml>`_.
 
    -  
 
@@ -5529,6 +5500,8 @@ Assigning a Custom ACL List to a Tier
 
    Click OK.
 
+.. _adding-priv-gw-vpc:
+
 Adding a Private Gateway to a VPC
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -5647,20 +5620,20 @@ with duplicated VLAN and IP are allowed in the same data center.
       **Source NAT**: Select this option to enable the source NAT
       service on the VPC private gateway.
 
-      See `Section 15.27.5.1, “Source NAT on Private
-      Gateway” <#sourcenat-private-gateway>`__.
+      See ":ref:`source-nat-priv-gw`".
 
    -  
 
       **ACL**: Controls both ingress and egress traffic on a VPC private
       gateway. By default, all the traffic is blocked.
 
-      See `Section 15.27.5.2, “ACL on Private
-      Gateway” <#acl-private-gateway>`__.
+      See ":ref:`acl-priv-gw`".
 
    The new gateway appears in the list. You can repeat these steps to
    add more gateway for this VPC.
 
+.. _source-nat-priv-gw:
+
 Source NAT on Private Gateway
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -5679,6 +5652,8 @@ specific to the private gateway are deleted.
 To enable source NAT on existing private gateways, delete them and
 create afresh with source NAT.
 
+.. _acl-priv-gw:
+
 ACL on Private Gateway
 ^^^^^^^^^^^^^^^^^^^^^^
 
@@ -5701,11 +5676,11 @@ Alternatively, you can do the following:
 
    -  
 
-      Use the Quickview. See `3 <#quickview>`_.
+      Use the Quickview. See 3.
 
    -  
 
-      Use the Details tab. See `4 <#details-tab>`_ through .
+      Use the Details tab. See 4 through .
 
 #. 
 
@@ -6029,6 +6004,8 @@ still belongs to the same VPC.
 
    In the Details tab, click the Release IP button |release-ip-icon.png|
 
+.. _enabling-disabling-static-nat-on-vpc:
+
 Enabling or Disabling Static NAT on a VPC
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -6135,7 +6112,7 @@ function only if they are defined on the default network.
 Adding Load Balancing Rules on a VPC
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-In a VPC, you can configure two types of load balancing—external LB and
+In a VPC, you can configure two types of load balancing—external LB and
 internal LB. External LB is nothing but a LB rule created to redirect
 the traffic received at a public IP of the VPC virtual router. The
 traffic is load balanced within a tier based on your configuration.
@@ -6167,15 +6144,14 @@ Enabling NetScaler as the LB Provider on a VPC Tier
 
 #. 
 
-   Create a network offering, as given in `Section 15.27.11.1.2,
-   “Creating a Network Offering for External LB” <#ext-lb-offering>`__.
+   Create a network offering, as given in ":ref:`create-net-offering-ext-lb`".
 
 #. 
 
    Create a VPC with Netscaler as the Public LB provider.
 
-   For more information, see `Section 15.27.2, “Adding a Virtual Private
-   Cloud” <#add-vpc>`__.
+   For more information, see `"Adding a Virtual Private
+   Cloud" <#adding-a-virtual-private-cloud>`_.
 
 #. 
 
@@ -6184,8 +6160,9 @@ Enabling NetScaler as the LB Provider on a VPC Tier
 #. 
 
    Create an external load balancing rule and apply, as given in
-   `Section 15.27.11.1.3, “Creating an External LB
-   Rule” <#ext-lb-vpc>`__.
+   :ref:`create-ext-lb-rule`.
+
+.. _create-net-offering-ext-lb:
 
 Creating a Network Offering for External LB
 '''''''''''''''''''''''''''''''''''''''''''
@@ -6244,8 +6221,8 @@ follows:
       Private Cloud-enabled. A Virtual Private Cloud (VPC) is a private,
       isolated part of CloudStack. A VPC can have its own virtual
       network topology that resembles a traditional physical network.
-      For more information on VPCs, see `Section 15.27.1, “About Virtual
-      Private Clouds” <#vpc>`_.
+      For more information on VPCs, see `"About Virtual
+      Private Clouds" <#about-virtual-private-clouds>`_.
 
    -  
 
@@ -6281,6 +6258,8 @@ follows:
 
    Click OK and the network offering is created.
 
+.. _create-ext-lb-rule:
+
 Creating an External LB Rule
 ''''''''''''''''''''''''''''
 
@@ -6423,8 +6402,8 @@ CloudStack supports sharing workload across different tiers within your
 VPC. Assume that multiple tiers are set up in your environment, such as
 Web tier and Application tier. Traffic to each tier is balanced on the
 VPC virtual router on the public side, as explained in
-`Section 15.27.11, “Adding Load Balancing Rules on a
-VPC” <#add-loadbalancer-rule-vpc>`_. If you want the traffic coming
+`"Adding Load Balancing Rules on a
+VPC" <#adding-load-balancing-rules-on-a-vpc>`_. If you want the traffic coming
 from the Web tier to the Application tier to be balanced, use the
 internal load balancing feature offered by CloudStack.
 
@@ -6481,14 +6460,14 @@ Enabling Internal LB on a VPC Tier
 
 #. 
 
-   Create a network offering, as given in `Section 15.27.11.2.5,
-   “Creating an Internal LB Rule” <#int-lb-vpc>`__.
+   Create a network offering, as given in :ref:`creating-net-offering-internal-lb`.
 
 #. 
 
-   Create an internal load balancing rule and apply, as given in
-   `Section 15.27.11.2.5, “Creating an Internal LB
-   Rule” <#int-lb-vpc>`__.
+   Create an internal load balancing rule and apply, as given in :ref:`create-int-lb-rule`.
+
+
+.. _creating-net-offering-internal-lb:
 
 Creating a Network Offering for Internal LB
 '''''''''''''''''''''''''''''''''''''''''''
@@ -6548,8 +6527,8 @@ network offering as follows:
       Private Cloud-enabled. A Virtual Private Cloud (VPC) is a private,
       isolated part of CloudStack. A VPC can have its own virtual
       network topology that resembles a traditional physical network.
-      For more information on VPCs, see `Section 15.27.1, “About Virtual
-      Private Clouds” <#vpc>`__.
+      For more information on VPCs, see `"About Virtual
+      Private Clouds" <#about-virtual-private-clouds>`_.
 
    -  
 
@@ -6580,6 +6559,8 @@ network offering as follows:
 
    Click OK and the network offering is created.
 
+.. _create-int-lb-rule:
+
 Creating an Internal LB Rule
 ''''''''''''''''''''''''''''
 
@@ -6950,8 +6931,7 @@ To create a persistent network, perform the following:
 
    Create a network offering with the Persistent option enabled.
 
-   See `Section 9.4.1, “Creating a New Network
-   Offering” <#creating-network-offerings>`_.
+   See `"Creating a New Network Offering" <networking.html#creating-a-new-network-offering>`_.
 
 #. 
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/b3975f63/source/projects.rst
----------------------------------------------------------------------
diff --git a/source/projects.rst b/source/projects.rst
index b2eebb4..7d8d766 100644
--- a/source/projects.rst
+++ b/source/projects.rst
@@ -156,8 +156,8 @@ individual project. The project owner can set resource limits only if
 the owner is also a domain or root administrator.
 
 The new limits must be below the global default limits set by the
-CloudStack administrator (as described in `Section 6.2.2, “Setting
-Resource Limits for Projects” <#set-resource-limits-for-projects>`__).
+CloudStack administrator (as described in `“Setting
+Resource Limits for Projects” <#setting-resource-limits-for-projects>`_).
 If the project already owns more of a given type of resource than the
 new maximum, the resources are not affected; however, the project can
 not add any new resources of that type until the total drops below the
@@ -332,7 +332,7 @@ Sending Project Membership Invitations
 
 Use these steps to add a new member to a project if the invitations
 feature is enabled in the cloud as described in `“Setting
-Up Invitations” <#set-up-invitations>`_. If the invitations feature is
+Up Invitations” <#setting-up-invitations>`_. If the invitations feature is
 not turned on, use the procedure in Adding Project Members From the UI.
 
 #. 
@@ -371,7 +371,7 @@ not turned on, use the procedure in Adding Project Members From the UI.
       which the recipient will provide back to CloudStack when accepting
       the invitation. Email invitations will work only if the global
       parameters related to the SMTP server have been set. See
-      `“Setting Up Invitations” <#set-up-invitations>`_.
+      `“Setting Up Invitations” <#setting-up-invitations>`_.
 
 #. 
 
@@ -394,9 +394,9 @@ Adding Project Members From the UI
 The steps below tell how to add a new member to a project if the
 invitations feature is not enabled in the cloud. If the invitations
 feature is enabled cloud,as described in `“Setting Up
-Invitations” <#set-up-invitations>`_, use the procedure in
+Invitations” <#setting-up-invitations>`_, use the procedure in
 `“Sending Project Membership
-Invitations” <#send-projects-membership-invitation>`_.
+Invitations” <#sending-project-membership-invitations>`_.
 
 #. 
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/b3975f63/source/reliability.rst
----------------------------------------------------------------------
diff --git a/source/reliability.rst b/source/reliability.rst
index 0cd4073..7293867 100644
--- a/source/reliability.rst
+++ b/source/reliability.rst
@@ -178,11 +178,11 @@ References:
 
 -  
 
-   `http://dev.mysql.com/doc/refman/5.0/en/replication-howto.html <http://dev.mysql.com/doc/refman/5.0/en/replication-howto.html>`__
+   `http://dev.mysql.com/doc/refman/5.0/en/replication-howto.html <http://dev.mysql.com/doc/refman/5.0/en/replication-howto.html>`_
 
 -  
 
-   `https://wikis.oracle.com/display/CommSuite/MySQL+High+Availability+and+Replication+Information+For+Calendar+Server <https://wikis.oracle.com/display/CommSuite/MySQL+High+Availability+and+Replication+Information+For+Calendar+Server>`__
+   `https://wikis.oracle.com/display/CommSuite/MySQL+High+Availability+and+Replication+Information+For+Calendar+Server <https://wikis.oracle.com/display/CommSuite/MySQL+High+Availability+and+Replication+Information+For+Calendar+Server>`_
 
 Configuring Database High Availability
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/b3975f63/source/service_offerings.rst
----------------------------------------------------------------------
diff --git a/source/service_offerings.rst b/source/service_offerings.rst
index 4e794c2..e053f6a 100644
--- a/source/service_offerings.rst
+++ b/source/service_offerings.rst
@@ -290,8 +290,8 @@ To create a new compute offering:
       Implicit Dedication will deploy VMs on private infrastructure that
       is dedicated to a specific domain or account. If you choose this
       planner, then you must also pick a value for Planner Mode. See
-      `Section 3.1.1, “Dedicating Resources to Accounts and
-      Domains” <#dedicated-host-cluster-pod>`__.
+      `“Dedicating Resources to Accounts and
+      Domains” <accounts.html#dedicating-resources-to-accounts-and-domains>`_.
 
       Bare Metal is used with bare metal hosts. See Bare Metal
       Installation in the Installation Guide.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/b3975f63/source/storage.rst
----------------------------------------------------------------------
diff --git a/source/storage.rst b/source/storage.rst
index 7185935..cef4f9a 100644
--- a/source/storage.rst
+++ b/source/storage.rst
@@ -18,7 +18,7 @@ Working with Storage
 ====================
 
 Storage Overview
-----------------------
+----------------
 
 CloudStack defines two types of storage: primary and secondary. Primary
 storage can be accessed by either iSCSI or NFS. Additionally, direct
@@ -98,7 +98,7 @@ The following table shows storage options and parameters for different
 hypervisors.
 
 ============================================== ================ ==================== =========================== ============================
-                                               VMware vSphere   Citrix XenServer     KVM                         Hyper-V
+Storage media \\ hypervisor                    VMware vSphere   Citrix XenServer     KVM                         Hyper-V
 ============================================== ================ ==================== =========================== ============================
 **Format for Disks, Templates, and Snapshots** VMDK             VHD                  QCOW2                       VHD
                                                                                                                  Snapshots are not supported.
@@ -414,7 +414,7 @@ Detaching and Moving Volumes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. note:: 
-   This procedure is different from moving volumes from one storage pool to another as described in `Section 13.4.5, “VM Storage Migration” <#vm-storage-migration>`__.
+   This procedure is different from moving volumes from one storage pool to another as described in `“VM Storage Migration” <#vm-storage-migration>`_.
 
 A volume can be detached from a guest VM and attached to another guest.
 Both CloudStack administrators and users can detach volumes from VMs and
@@ -442,7 +442,7 @@ may take several minutes for the volume to be moved to the new VM.
 #. 
 
    To move the volume to another VM, follow the steps in
-   `Section 13.4.3, “Attaching a Volume” <#attaching-volume>`__.
+   `“Attaching a Volume” <#attaching-a-volume>`_.
 
 VM Storage Migration
 ~~~~~~~~~~~~~~~~~~~~
@@ -450,7 +450,7 @@ VM Storage Migration
 Supported in XenServer, KVM, and VMware.
 
 .. note:: 
-   This procedure is different from moving disk volumes from one VM to another as described in `Section 13.4.4, “Detaching and Moving Volumes” <#detach-move-volumes>`__.
+   This procedure is different from moving disk volumes from one VM to another as described in `“Detaching and Moving Volumes” <#detaching-and-moving-volumes>`_.
 
 You can migrate a virtual machine’s root disk volume or any additional
 data disk volume from one storage pool to another in the same zone.
@@ -508,8 +508,8 @@ Migrating Storage For a Running VM
 
 #. 
 
-   Detach the disk from the VM. See `Section 13.4.4, “Detaching and
-   Moving Volumes” <#detach-move-volumes>`__ but skip the “reattach”
+   Detach the disk from the VM. See `“Detaching and
+   Moving Volumes” <#detaching-and-moving-volumes>`_ but skip the “reattach”
    step at the end. You will do that after migrating to new storage.
 
 #. 
@@ -530,8 +530,8 @@ Migrating Storage and Attaching to a Different VM
 
 #. 
 
-   Detach the disk from the VM. See `Section 13.4.4, “Detaching and
-   Moving Volumes” <#detach-move-volumes>`_ but skip the “reattach”
+   Detach the disk from the VM. See `“Detaching and
+   Moving Volumes” <#detaching-and-moving-volumes>`_ but skip the “reattach”
    step at the end. You will do that after migrating to new storage.
 
 #. 
@@ -548,8 +548,8 @@ Migrating Storage and Attaching to a Different VM
 #. 
 
    Attach the volume to any desired VM running in the same cluster as
-   the new storage server. See `Section 13.4.3, “Attaching a
-   Volume” <#attaching-volume>`__
+   the new storage server. See `“Attaching a
+   Volume” <#attaching-a-volume>`_
 
 Migrating a VM Root Volume to a New Storage Pool
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -685,8 +685,8 @@ this operation.
 
 When creating a new service offering, set the parameter isVolatile to
 True. VMs created from this service offering will have their disks reset
-upon reboot. See `Section 8.1.1, “Creating a New Compute
-Offering” <#creating-compute-offerings>`__.
+upon reboot. See `“Creating a New Compute
+Offering” <service_offerings.html#creating-a-new-compute-offering>`_.
 
 Volume Deletion and Garbage Collection
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -783,8 +783,8 @@ With each snapshot schedule, users can also specify the number of
 scheduled snapshots to be retained. Older snapshots that exceed the
 retention limit are automatically deleted. This user-defined limit must
 be equal to or lower than the global limit set by the CloudStack
-administrator. See `Section 14.3, “Globally Configured
-Limits” <#globally-configured-limits>`__. The limit applies only to
+administrator. See `“Globally Configured
+Limits” <usage.html#globally-configured-limits>`_. The limit applies only to
 those snapshots that are taken as part of an automatic recurring
 snapshot policy. Additional manual snapshots can be created and
 retained.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/b3975f63/source/systemvm.rst
----------------------------------------------------------------------
diff --git a/source/systemvm.rst b/source/systemvm.rst
index 481437b..96f9a48 100644
--- a/source/systemvm.rst
+++ b/source/systemvm.rst
@@ -264,7 +264,7 @@ the console proxy domain, SSL certificate, and private key:
 
       The desired new domain name; for example, company.com
 
-   ..   |updatessl.png|
+     |update-ssl.png|
 
 #. 
 
@@ -329,24 +329,22 @@ Upgrading a Virtual Router with System Service Offerings
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 When CloudStack creates a virtual router, it uses default settings which
-are defined in a default system service offering. See `Section 8.2,
-“System Service Offerings” <#system-service-offerings>`__. All the
+are defined in a default system service offering. See `“System Service 
+Offerings” <#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.
 
 #. 
 
-   Define your custom system service offering. See `Section 8.2.1,
-   “Creating a New System Service
-   Offering” <#creating-system-service-offerings>`__. In System VM Type,
+   Define your custom system service offering. See `“Creating a New System Service
+   Offering” <#creating-a-new-system-service-offering>`_. In System VM Type,
    choose Domain Router.
 
 #. 
 
    Associate the system service offering with a network offering. See
-   `Section 9.4.1, “Creating a New Network
-   Offering” <#creating-network-offerings>`__.
+   `“Creating a New Network Offering” <networking.html#creating-a-new-network-offering>`_.
 
 #. 
 
@@ -354,8 +352,8 @@ creating and applying a custom system service offering.
    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 `Section 15.6.3, “Changing the Network Offering
-   on a Guest Network” <#change-network-offering-on-guest-network>`__.
+   follow the steps in `“Changing the Network Offering
+   on a Guest Network” <networking2.html#changing-the-network-offering-on-a-guest-network>`_.
 
 Best Practices for Virtual Routers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -623,7 +621,7 @@ Zone, copying templates between Zones, and snapshot backups.
 
 The administrator can log in to the secondary storage VM if needed.
 
-.. |updatessl.png| image:: _static/images/updatessl.png
+.. |update-ssl.png| image:: _static/images/update-ssl.png
    :alt: Updating Console Proxy SSL Certificate
 .. |vr-upgrade.png| image:: _static/images/vr-upgrade.png
    :alt: Button to upgrade VR to use the new template.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/b3975f63/source/templates.rst
----------------------------------------------------------------------
diff --git a/source/templates.rst b/source/templates.rst
index 72302e8..5480279 100644
--- a/source/templates.rst
+++ b/source/templates.rst
@@ -150,7 +150,7 @@ as the prototype for other VMs.
 #. 
 
    Create and start a virtual machine using any of the techniques given
-   in `Section 10.4, “Creating VMs” <#creating-vms>`__.
+   in `“Creating VMs” <virtual_machines.html#creating-vms>`_.
 
 #. 
 
@@ -198,15 +198,14 @@ as the prototype for other VMs.
 
       **Public**. Choose Yes to make this template accessible to all
       users of this CloudStack installation. The template will appear in
-      the Community Templates list. See `Section 12.5, “Private and
-      Public Templates” <#private-public-template>`__.
+      the Community Templates list. See `“Private and
+      Public Templates” <#private-and-public-templates>`_.
 
    -  
 
       **Password Enabled**. Choose Yes if your template has the
-      CloudStack password change script installed. See `Section 12.14,
-      “Adding Password Management to Your
-      Templates” <#add-password-management-to-templates>`__.
+      CloudStack password change script installed. See 
+      :ref:`adding-password-management-to-templates`.
 
 #. 
 
@@ -220,8 +219,8 @@ Creating a Template from a Snapshot
 -----------------------------------
 
 If you do not want to stop the VM in order to use the Create Template
-menu item (as described in `Section 12.6, “Creating a Template from an
-Existing Virtual Machine” <#create-template-from-existing-vm>`__), you
+menu item (as described in `“Creating a Template from an
+Existing Virtual Machine” <#creating-a-template-from-an-existing-virtual-machine>`_), you
 can create a template directly from any snapshot through the CloudStack
 UI.
 
@@ -299,8 +298,7 @@ To upload a template:
    -  
 
       **Password Enabled**. Choose Yes if your template has the
-      CloudStack password change script installed. See Adding Password
-      Management to Your Templates
+      CloudStack password change script installed. See :ref:`adding-password-management-to-templates`.
 
    -  
 
@@ -312,8 +310,8 @@ To upload a template:
 
       **Public**. Choose Yes to make this template accessible to all
       users of this CloudStack installation. The template will appear in
-      the Community Templates list. See `Section 12.5, “Private and
-      Public Templates” <#private-public-template>`__.
+      the Community Templates list. See `“Private and
+      Public Templates” <#private-and-public-templates>`_.
 
    -  
 
@@ -345,15 +343,15 @@ An overview of the procedure is as follow:
 
    Upload your Linux ISO.
 
-   For more information, see `Section 10.15.1, “Adding an
-   ISO” <#add-iso>`__.
+   For more information, see `“Adding an
+   ISO” <virtual_machines.html#adding-an-iso>`_.
 
 #. 
 
    Create a VM Instance with this ISO.
 
-   For more information, see `Section 10.4, “Creating
-   VMs” <#creating-vms>`__.
+   For more information, see `“Creating
+   VMs” <virtual_machines.html#creating-vms>`_.
 
 #. 
 
@@ -363,8 +361,8 @@ An overview of the procedure is as follow:
 
    Create a template from the VM.
 
-   For more information, see `Section 12.6, “Creating a Template from an
-   Existing Virtual Machine” <#create-template-from-existing-vm>`__.
+   For more information, see `“Creating a Template from an
+   Existing Virtual Machine” <#creating-a-template-from-an-existing-virtual-machine>`_.
 
 System preparation for Linux
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -437,8 +435,7 @@ templating.
 
                 deluser myuser --remove-home
 
-   See `Section 12.14, “Adding Password Management to Your
-   Templates” <#add-password-management-to-templates>`__ for
+   See :ref:`adding-password-management-to-templates` for
    instructions to setup the password management script, this will allow
    CloudStack to change your root password from the web interface.
 
@@ -600,8 +597,8 @@ templating.
    **Create the template!**
 
    You are now ready to create the template, for more information see
-   `Section 12.6, “Creating a Template from an Existing Virtual
-   Machine” <#create-template-from-existing-vm>`__.
+   `“Creating a Template from an Existing Virtual
+   Machine” <#creating-a-template-from-an-existing-virtual-machine>`_.
 
 .. note:: Templated VMs for both Ubuntu and CentOS may require a reboot after provisioning in order to pickup the hostname.
 
@@ -621,15 +618,15 @@ An overview of the procedure is as follows:
 
    Upload your Windows ISO.
 
-   For more information, see `Section 10.15.1, “Adding an
-   ISO” <#add-iso>`__.
+   For more information, see `“Adding an
+   ISO” <virtual_machines.html#adding-an-iso>`_.
 
 #. 
 
    Create a VM Instance with this ISO.
 
-   For more information, see `Section 10.4, “Creating
-   VMs” <#creating-vms>`__.
+   For more information, see `“Creating
+   VMs” <virtual_machines.html#creating-vms>`_.
 
 #. 
 
@@ -649,12 +646,12 @@ For Windows 2008 R2, you run Windows System Image Manager to create a
 custom sysprep response XML file. Windows System Image Manager is
 installed as part of the Windows Automated Installation Kit (AIK).
 Windows AIK can be downloaded from `Microsoft Download
-Center <http://www.microsoft.com/en-us/download/details.aspx?id=9085>`__.
+Center <http://www.microsoft.com/en-us/download/details.aspx?id=9085>`_.
 
 Use the following steps to run sysprep for Windows 2008 R2:
 
 .. note:: 
-    The steps outlined here are derived from the excellent guide by Charity Shelbourne, originally published at `Windows Server 2008 Sysprep Mini-Setup. <http://blogs.technet.com/askcore/archive/2008/10/31/automating-the-oobe-process-during-windows-server-2008-sysprep-mini-setup.aspx>`__
+    The steps outlined here are derived from the excellent guide by Charity Shelbourne, originally published at `Windows Server 2008 Sysprep Mini-Setup. <http://blogs.technet.com/askcore/archive/2008/10/31/automating-the-oobe-process-during-windows-server-2008-sysprep-mini-setup.aspx>`_
 
 #. 
 
@@ -728,7 +725,7 @@ Use the following steps to run sysprep for Windows 2008 R2:
       input the MAK into the Windows System Image Manager. If you use
       KMS host for activation you need not enter the Product Key.
       Details of Windows Volume Activation can be found at
-      `http://technet.microsoft.com/en-us/library/bb892849.aspx <http://technet.microsoft.com/en-us/library/bb892849.aspx>`__
+      `http://technet.microsoft.com/en-us/library/bb892849.aspx <http://technet.microsoft.com/en-us/library/bb892849.aspx>`_
 
    #. 
 
@@ -1036,8 +1033,7 @@ To import an AMI:
 
    If you need the template to be enabled to reset passwords from the
    CloudStack UI or API, install the password change script into the
-   image at this point. See `Section 12.14, “Adding Password Management
-   to Your Templates” <#add-password-management-to-templates>`__.
+   image at this point. See :ref:`adding-password-management-to-templates`.
 
 #. 
 
@@ -1181,8 +1177,8 @@ following steps:
 #. 
 
    Prepare the VM as desired. For example, run sysprep on Windows VMs.
-   See `Section 12.11, “Creating a Windows
-   Template” <#create-windows-template>`__.
+   See `“Creating a Windows
+   Template” <#creating-a-windows-template>`_.
 
 Either option above will create a VM in HVM mode. This is fine for
 Windows VMs, but Linux VMs may not perform optimally. Converting a Linux
@@ -1220,6 +1216,8 @@ distribution.
 
 The template will be created, and you can create instances from it.
 
+.. _adding-password-management-to-templates:
+
 Adding Password Management to Your Templates
 --------------------------------------------
 
@@ -1286,7 +1284,7 @@ Windows OS Installation
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 Download the installer, CloudInstanceManager.msi, from the `Download
-page <http://sourceforge.net/projects/cloudstack/files/Password%20Management%20Scripts/CloudInstanceManager.msi/download>`__
+page <http://sourceforge.net/projects/cloudstack/files/Password%20Management%20Scripts/CloudInstanceManager.msi/download>`_
 and run the installer in the newly created Windows VM.
 
 Deleting Templates

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/b3975f63/source/tuning.rst
----------------------------------------------------------------------
diff --git a/source/tuning.rst b/source/tuning.rst
index 2d2261f..5ff2584 100644
--- a/source/tuning.rst
+++ b/source/tuning.rst
@@ -97,7 +97,7 @@ cache data and indexes:
 
 For more information about the buffer pool, see "The InnoDB Buffer Pool"
 at `MySQL Reference
-Manual <http://dev.mysql.com/doc/refman/5.5/en/innodb-buffer-pool.html>`__.
+Manual <http://dev.mysql.com/doc/refman/5.5/en/innodb-buffer-pool.html>`_.
 
 Set and Monitor Total VM Limits per Host
 ----------------------------------------
@@ -126,7 +126,7 @@ Configure the XenServer dom0 settings to allocate more 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 `Citrix Knowledgebase
-Article <http://support.citrix.com/article/CTX126531>`__.The article
+Article <http://support.citrix.com/article/CTX126531>`_.The article
 refers to XenServer 5.6, but the same information applies to XenServer 6
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/b3975f63/source/ui.rst
----------------------------------------------------------------------
diff --git a/source/ui.rst b/source/ui.rst
index a2fffff..14ed3d3 100644
--- a/source/ui.rst
+++ b/source/ui.rst
@@ -130,8 +130,8 @@ provision, view, and manage your cloud infrastructure.
 
    You should set a new root administrator password. If you chose basic
    setup, you’ll be prompted to create a new password right away. If you
-   chose experienced user, use the steps in `Section 5.1.4, “Changing
-   the Root Password” <#changing-root-password>`__.
+   chose experienced user, use the steps in `“Changing
+   the Root Password” <#changing-the-root-password>`_.
 
 .. warning:: 
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/b3975f63/source/usage.rst
----------------------------------------------------------------------
diff --git a/source/usage.rst b/source/usage.rst
index f860e7a..92aaa76 100644
--- a/source/usage.rst
+++ b/source/usage.rst
@@ -261,57 +261,26 @@ resource types for Domain, Project, and Accounts.
 To control the behaviour of this feature, the following configuration
 parameters have been added:
 
-Parameter Name
-
-Description
-
-max.account.cpus
-
-Maximum number of CPU cores that can be used for an account.
-
-Default is 40.
-
-max.account.ram (MB)
-
-Maximum RAM that can be used for an account.
-
-Default is 40960.
-
-max.account.primary.storage (GB)
-
-Maximum primary storage space that can be used for an account.
-
-Default is 200.
-
-max.account.secondary.storage (GB)
-
-Maximum secondary storage space that can be used for an account.
-
-Default is 400.
-
-max.project.cpus
-
-Maximum number of CPU cores that can be used for an account.
-
-Default is 40.
-
-max.project.ram (MB)
-
-Maximum RAM that can be used for an account.
-
-Default is 40960.
-
-max.project.primary.storage (GB)
-
-Maximum primary storage space that can be used for an account.
-
-Default is 200.
-
-max.project.secondary.storage (GB)
-
-Maximum secondary storage space that can be used for an account.
-
-Default is 400.
+=================================== =================================================================
+Parameter Name                      Description
+=================================== =================================================================
+max.account.cpus                    Maximum number of CPU cores that can be used for an account.
+                                    Default is 40.
+max.account.ram (MB)                Maximum RAM that can be used for an account.
+                                    Default is 40960.
+max.account.primary.storage (GB)    Maximum primary storage space that can be used for an account.
+                                    Default is 200.
+max.account.secondary.storage (GB)  Maximum secondary storage space that can be used for an account.
+                                    Default is 400.
+max.project.cpus                    Maximum number of CPU cores that can be used for an account.
+                                    Default is 40.
+max.project.ram (MB)                Maximum RAM that can be used for an account.
+                                    Default is 40960.
+max.project.primary.storage (GB)    Maximum primary storage space that can be used for an account.
+                                    Default is 200.
+max.project.secondary.storage (GB)  Maximum secondary storage space that can be used for an account.
+                                    Default is 400.
+=================================== =================================================================
 
 User Permission
 ~~~~~~~~~~~~~~~

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/b3975f63/source/virtual_machines.rst
----------------------------------------------------------------------
diff --git a/source/virtual_machines.rst b/source/virtual_machines.rst
index 964526b..b6faf60 100644
--- a/source/virtual_machines.rst
+++ b/source/virtual_machines.rst
@@ -47,7 +47,7 @@ names can be controlled by the user:
    by the user. Defaults to instance name
 
 .. note:: 
-   You can append the display name of a guest VM to its internal name. For more information, see `Section 10.10, “Appending a Display Name to the Guest VM’s Internal Name” <#append-displayname-vms>`__.
+   You can append the display name of a guest VM to its internal name. For more information, see `“Appending a Display Name to the Guest VM’s Internal Name” <#appending-a-display-name-to-the-guest-vms-internal-name>`_.
 
 Guest VMs can be configured to be Highly Available (HA). An HA-enabled
 VM is monitored by the system. If the system detects that the VM is
@@ -66,7 +66,7 @@ IP and the guest VM’s private IP. The VM’s original IP address is then
 released and returned to the pool of available public IPs. Optionally,
 you can also decide not to allocate a public IP to a VM in an
 EIP-enabled Basic zone. For more information on Elastic IP, see
-`Section 15.11, “About Elastic IP” <#elastic-ip>`__.
+`“About Elastic IP” <networking2.html#about-elastic-ip>`_.
 
 CloudStack cannot distinguish a guest VM that was shut down by the user
 (such as with the “shutdown” command in Linux) from a VM that shut down
@@ -204,7 +204,7 @@ To create a VM from a template:
 
    Select a template, then follow the steps in the wizard. For more
    information about how the templates came to be in this list, see
-   `Chapter 12, *Working with Templates* <#working-with-templates>`__.
+   `*Working with Templates* <templates.html>`_.
 
 #. 
 
@@ -275,8 +275,8 @@ To access a VM directly over the network:
    a basic zone, a new VM might be assigned to a security group which
    allows incoming traffic. This depends on what security group you
    picked when creating the VM. In other cases, you can open a port by
-   setting up a port forwarding policy. See `Section 15.22, “IP
-   Forwarding and Firewalling” <#ip-forwarding-firewalling>`__.
+   setting up a port forwarding policy. See `“IP
+   Forwarding and Firewalling” <networking2.html#ip-forwarding-and-firewalling>`_.
 
 #. 
 
@@ -289,8 +289,8 @@ To access a VM directly over the network:
 #. 
 
    If the network has an external firewall device, you will need to
-   create a firewall rule to allow access. See `Section 15.22, “IP
-   Forwarding and Firewalling” <#ip-forwarding-firewalling>`__.
+   create a firewall rule to allow access. See `“IP
+   Forwarding and Firewalling” <networking2.html#ip-forwarding-and-firewalling>`_.
 
 Stopping and Starting VMs
 -------------------------
@@ -412,8 +412,8 @@ To assign a new VM to an affinity group:
 
 -  
 
-   Create the VM as usual, as described in `Section 10.4, “Creating
-   VMs” <#creating-vms>`__. In the Add Instance wizard, there is a new
+   Create the VM as usual, as described in `“Creating
+   VMs” <virtual_machines.html#creating-vms>`_. In the Add Instance wizard, there is a new
    Affinity tab where you can select the affinity group.
 
 Change Affinity Group for an Existing VM
@@ -516,7 +516,7 @@ original.
 If you need more information about VM snapshots on VMware, check out the
 VMware documentation and the VMware Knowledge Base, especially
 `Understanding virtual machine
-snapshots <http://kb.vmware.com/selfservice/microsites/search.do?cmd=displayKC&externalId=1015180>`__.
+snapshots <http://kb.vmware.com/selfservice/microsites/search.do?cmd=displayKC&externalId=1015180>`_.
 
 Limitations on VM Snapshots
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -751,8 +751,7 @@ virtual machine, you can change the VM's compute offering.
 #. 
 
    (Skip this step if you have enabled dynamic VM scaling; see
-   `Section 10.11.1, “CPU and Memory Scaling for Running
-   VMs” <#change-cpu-ram-for-vm>`__.)
+   :ref:`cpu-and-memory-scaling`.)
 
    Click the Stop button to stop the VM. |StopButton.png|
 
@@ -770,6 +769,8 @@ virtual machine, you can change the VM's compute offering.
 
    Click OK.
 
+.. _cpu-and-memory-scaling:
+
 CPU and Memory Scaling for Running VMs
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -870,8 +871,8 @@ How to Dynamically Scale CPU and RAM
 To modify the CPU and/or RAM capacity of a virtual machine, you need to
 change the compute offering of the VM to a new compute offering that has
 the desired CPU and RAM values. You can use the same steps described
-above in `Section 10.11, “Changing the Service Offering for a
-VM” <#changing-service-offering-for-vm>`__, but skip the step where you
+above in `“Changing the Service Offering for a
+VM” <#changing-the-service-offering-for-a-vm>`_, but skip the step where you
 stop the virtual machine. Of course, you might have to create a new
 compute offering first.
 
@@ -899,7 +900,7 @@ Limitations
    When scaling memory or CPU for a Linux VM on VMware, you might need
    to run scripts in addition to the other steps mentioned above. For
    more information, see `Hot adding memory in Linux
-   (1012764) <http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1012764>`__
+   (1012764) <http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1012764>`_
    in the VMware Knowledge Base.
 
 -  
@@ -908,7 +909,7 @@ Limitations
    up will fail on VMware because of a known issue where CloudStack and
    vCenter calculate the available capacity differently. For more
    information, see
-   `https://issues.apache.org/jira/browse/CLOUDSTACK-1809 <https://issues.apache.org/jira/browse/CLOUDSTACK-1809>`__.
+   `https://issues.apache.org/jira/browse/CLOUDSTACK-1809 <https://issues.apache.org/jira/browse/CLOUDSTACK-1809>`_.
 
 -  
 
@@ -923,8 +924,8 @@ Resetting the Virtual Machine Root Volume on Reboot
 
 For secure environments, and to ensure that VM state is not persisted
 across reboots, you can reset the root disk. For more information, see
-`Section 13.4.7, “Reset VM to New Root Disk on
-Reboot” <#reset-vm-reboot>`__.
+`“Reset VM to New Root Disk on
+Reboot” <storage.html#reset-vm-to-new-root-disk-on-reboot>`_.
 
 Moving VMs Between Hosts (Manual Live Migration)
 ------------------------------------------------


Mime
View raw message