cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject [1/3] Closes #2: fixed images links, tables, toctree
Date Thu, 20 Mar 2014 08:08:18 GMT
Repository: cloudstack-docs-admin
Updated Branches:
  refs/heads/master 947ff0591 -> 08b01f0d6


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/08b01f0d/source/projects.rst
----------------------------------------------------------------------
diff --git a/source/projects.rst b/source/projects.rst
index 6e256a9..b2eebb4 100644
--- a/source/projects.rst
+++ b/source/projects.rst
@@ -18,7 +18,7 @@ Using Projects to Organize Users and Resources
 ==============================================
 
 Overview of Projects
--------------------------
+--------------------
 
 Projects are used to organize people and resources. CloudStack users
 within a single domain can group themselves into project teams so they
@@ -69,7 +69,7 @@ domain; however, you can not create private service and disk offerings
 at the project level..
 
 Configuring Projects
--------------------------
+--------------------
 
 Before CloudStack users start using projects, the CloudStack
 administrator must set up various systems to support them, including
@@ -77,7 +77,7 @@ membership invitations, limits on project resources, and controls on who
 can create projects.
 
 Setting Up Invitations
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~
 
 CloudStack can be set up either so that project administrators can add
 people directly to a project, or so that it is necessary to send an
@@ -135,7 +135,7 @@ and set up the invitations feature in CloudStack.
        service cloudstack-management restart
 
 Setting Resource Limits for Projects
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The CloudStack administrator can set global default limits to control
 the amount of resources that can be owned by each project in the cloud.
@@ -148,7 +148,7 @@ administrator can also set lower resource limits for any project in the
 cloud
 
 Setting Per-Project Resource Limits
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The CloudStack root administrator or the domain administrator of the
 domain where the project resides can set new resource limits for an
@@ -193,7 +193,7 @@ new limit.
    Click Apply.
 
 Setting the Global Project Resource Limits
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 #. 
 
@@ -237,7 +237,7 @@ Setting the Global Project Resource Limits
        # service cloudstack-management restart
 
 Setting Project Creator Permissions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You can configure CloudStack to allow any user to create a new project,
 or you can restrict that ability to just CloudStack administrators.
@@ -273,7 +273,7 @@ or you can restrict that ability to just CloudStack administrators.
        # service cloudstack-management restart
 
 Creating a New Project
----------------------------
+----------------------
 
 CloudStack administrators and domain administrators can create projects.
 If the global configuration parameter allow.user.create.projects is set
@@ -310,7 +310,7 @@ to true, end users can also create projects.
    Click Save.
 
 Adding Members to a Project
---------------------------------
+---------------------------
 
 New members can be added to a project by the project’s administrator,
 the domain administrator of the domain where the project resides or any
@@ -328,11 +328,11 @@ to add members in CloudStack, but only one way is enabled at a time:
    the UI.
 
 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” <#set-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” <#set-up-invitations>`_.
 
 #. 
 
@@ -389,14 +389,14 @@ not turned on, use the procedure in Adding Project Members From the UI.
    project’s Accounts tab.
 
 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” <#set-up-invitations>`_, use the procedure in
 `“Sending Project Membership
-Invitations” <#send-projects-membership-invitation>`__.
+Invitations” <#send-projects-membership-invitation>`_.
 
 #. 
 
@@ -426,7 +426,7 @@ Invitations” <#send-projects-membership-invitation>`__.
    cloud and within the same domain as the project.
 
 Accepting a Membership Invitation
---------------------------------------
+---------------------------------
 
 If you have received an invitation to join a CloudStack project, and you
 want to accept the invitation, follow these steps:
@@ -456,7 +456,7 @@ want to accept the invitation, follow these steps:
    and provide the project ID and unique ID code (token) from the email.
 
 Suspending or Deleting a Project
--------------------------------------
+--------------------------------
 
 When a project is suspended, it retains the resources it owns, but they
 can no longer be used. No new resources or members can be added to a
@@ -495,7 +495,7 @@ parent domain, or the CloudStack root administrator.
    To suspend, use |Suspends a project|
 
 Using the Project View
----------------------------
+----------------------
 
 If you are a member of a project, you can use CloudStack’s project view
 to see project members, resources consumed, and more. The project view

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/08b01f0d/source/reliability.rst
----------------------------------------------------------------------
diff --git a/source/reliability.rst b/source/reliability.rst
index 05c92e2..0cd4073 100644
--- a/source/reliability.rst
+++ b/source/reliability.rst
@@ -18,7 +18,7 @@ System Reliability and High Availability
 ========================================
 
 HA for Management Server
-------------------------------
+------------------------
 
 The CloudStack Management Server should be deployed in a multi-node
 configuration such that it is not susceptible to individual server
@@ -33,7 +33,7 @@ end user and admin UI, API, dynamic load distribution, and HA will cease
 to work.
 
 Management Server Load Balancing
---------------------------------------
+--------------------------------
 
 CloudStack can use a load balancer to provide a virtual IP for multiple
 Management Servers. The administrator is responsible for creating the
@@ -44,37 +44,13 @@ persistence is required.
 
 Even if persistence is not required, enabling it is permitted.
 
-Source Port
-
-Destination Port
-
-Protocol
-
-Persistence Required?
-
-80 or 443
-
-8080 (or 20400 with AJP)
-
-HTTP (or AJP)
-
-Yes
-
-8250
-
-8250
-
-TCP
-
-Yes
-
-8096
-
-8096
-
-HTTP
-
-No
+============== ======================== ================ =====================
+Source Port    Destination Port         Protocol         Persistence Required?
+============== ======================== ================ =====================
+80 or 443      8080 (or 20400 with AJP) HTTP (or AJP)    Yes
+8250           8250                     TCP              Yes
+8096           8096                     HTTP             No
+============== ======================== ================ =====================
 
 In addition to above settings, the administrator is responsible for
 setting the 'host' global config value from the management server IP to
@@ -84,7 +60,7 @@ still available but the system VMs will not be able to contact the
 management server.
 
 HA-Enabled Virtual Machines
----------------------------------
+---------------------------
 
 The user can specify a virtual machine as HA-enabled. By default, all
 virtual router VMs and Elastic Load Balancing VMs are automatically
@@ -100,7 +76,7 @@ HA features work with iSCSI or NFS primary storage. HA with local
 storage is not supported.
 
 HA for Hosts
-------------------
+------------
 
 The user can specify a virtual machine as HA-enabled. By default, all
 virtual router VMs and Elastic Load Balancing VMs are automatically
@@ -116,7 +92,7 @@ HA features work with iSCSI or NFS primary storage. HA with local
 storage is not supported.
 
 Dedicated HA Hosts
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~
 
 One or more hosts can be designated for use only by HA-enabled VMs that
 are restarting due to a host failure. Setting up a pool of such
@@ -143,10 +119,11 @@ desired tag (for example, "ha\_host"), and restart the Management
 Server. Enter the value in the Host Tags field when adding the host(s)
 that you want to dedicate to HA-enabled VMs.
 
-.. note:: If you set ha.tag, be sure to actually use that tag on at least one host in your cloud. If the tag specified in ha.tag is not set for any host in the cloud, the HA-enabled VMs will fail to restart after a crash.
+.. note:: 
+   If you set ha.tag, be sure to actually use that tag on at least one host in your cloud. If the tag specified in ha.tag is not set for any host in the cloud, the HA-enabled VMs will fail to restart after a crash.
 
 Primary Storage Outage and Data Loss
-------------------------------------------
+------------------------------------
 
 When a primary storage outage occurs the hypervisor immediately stops
 all VMs stored on that storage device. Guests that are marked for HA
@@ -159,7 +136,7 @@ up. Individual volumes in primary storage can be backed up using
 snapshots.
 
 Secondary Storage Outage and Data Loss
---------------------------------------------
+--------------------------------------
 
 For a Zone that has only one secondary storage server, a secondary
 storage outage will have feature level impact to the system but will not
@@ -174,7 +151,7 @@ be backed up periodically. Multiple secondary storage servers can be
 provisioned within each zone to increase the scalability of the system.
 
 Database High Availability
---------------------------------
+--------------------------
 
 To help ensure high availability of the databases that store the
 internal data for CloudStack, you can set up database replication. This
@@ -183,7 +160,7 @@ Replication is achieved using the MySQL connector parameters and two-way
 replication. Tested with MySQL 5.1 and 5.5.
 
 How to Set Up Database Replication
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Database replication in CloudStack is provided using the MySQL
 replication capabilities. The steps to set up replication can be found
@@ -208,7 +185,7 @@ References:
    `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
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To control the database high availability behavior, use the following
 configuration settings in the file
@@ -275,7 +252,7 @@ tuning purposes:
    Example: ``db.cloud.initialTimeout=3600``
 
 Limitations on Database High Availability
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The following limitations exist in the current implementation of this
 feature.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/08b01f0d/source/service_offerings.rst
----------------------------------------------------------------------
diff --git a/source/service_offerings.rst b/source/service_offerings.rst
index d370275..4e794c2 100644
--- a/source/service_offerings.rst
+++ b/source/service_offerings.rst
@@ -30,7 +30,7 @@ just friends who are sharing your cloud – you can still keep track of
 what services they use and how much of them.
 
 Service Offerings, Disk Offerings, Network Offerings, and Templates
-------------------------------------------------------------------------
+-------------------------------------------------------------------
 
 A user creating a new instance can make a variety of choices about its
 characteristics and capabilities. CloudStack provides several ways to
@@ -62,7 +62,7 @@ System Service Offerings.
 
 
 Compute and Disk Service Offerings
----------------------------------------
+----------------------------------
 
 A service offering is a set of virtual hardware features such as CPU
 core count and speed, memory, and disk size. The CloudStack administrator
@@ -146,7 +146,7 @@ parameters, such as CPU, speed, RAM are recorded.
 
 
 Creating a New Compute Offering
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To create a new compute offering:
 
@@ -318,7 +318,7 @@ To create a new compute offering:
    Click Add.
 
 Creating a New Disk Offering
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To create a new disk offering:
 
@@ -414,7 +414,7 @@ To create a new disk offering:
    Click Add.
 
 Modifying or Deleting a Service Offering
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Service offerings cannot be changed once created. This applies to both
 compute offerings and disk offerings.
@@ -427,7 +427,7 @@ service offering will not be available to end users that are creating
 new instances.
 
 System Service Offerings
------------------------------
+------------------------
 
 System service offerings provide a choice of CPU speed, number of CPUs,
 tags, and RAM size, just as other service offerings do. But rather than
@@ -446,7 +446,7 @@ different system service offering. All virtual routers in that network
 will begin using the settings from the new service offering.
 
 Creating a New System Service Offering
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To create a system service offering:
 
@@ -542,7 +542,7 @@ To create a system service offering:
    Click Add.
 
 Network Throttling
------------------------
+------------------
 
 Network throttling is the process of controlling the network access and
 bandwidth usage based on certain rules. CloudStack controls this
@@ -583,57 +583,23 @@ defaulted to the global parameter value.
 The following table gives you an overview of how network rate is applied
 on different types of networks in CloudStack.
 
-Networks
-
-Network Rate Is Taken from
-
-Guest network of Virtual Router
-
-Guest Network Offering
-
-Public network of Virtual Router
-
-Guest Network Offering
-
-Storage network of Secondary Storage VM
-
-System Network Offering
-
-Management network of Secondary Storage VM
-
-System Network Offering
-
-Storage network of Console Proxy VM
-
-System Network Offering
-
-Management network of Console Proxy VM
-
-System Network Offering
-
-Storage network of Virtual Router
-
-System Network Offering
-
-Management network of Virtual Router
-
-System Network Offering
-
-Public network of Secondary Storage VM
-
-System Network Offering
-
-Public network of Console Proxy VM
-
-System Network Offering
-
-Default network of a guest VM
-
-Compute Offering
-
-Additional networks of a guest VM
+=============================================== ===============================
+Networks                                        Network Rate Is Taken from
+=============================================== ===============================
+Guest network of Virtual Router                 Guest Network Offering
+Public network of Virtual Router                Guest Network Offering
+Storage network of Secondary Storage VM         System Network Offering
+Management network of Secondary Storage VM      System Network Offering
+Storage network of Console Proxy VM             System Network Offering
+Management network of Console Proxy VM          System Network Offering
+Storage network of Virtual Router               System Network Offering
+Management network of Virtual Router            System Network Offering
+Public network of Secondary Storage VM          System Network Offering
+Public network of Console Proxy VM              System Network Offering
+Default network of a guest VM                   Compute Offering
+Additional networks of a guest VM               Corresponding Network Offerings
+=============================================== ===============================
 
-Corresponding Network Offerings
 
 A guest VM must have a default network, and can also have many
 additional networks. Depending on various parameters, such as the host
@@ -680,7 +646,7 @@ network, ingress traffic will be limited to 10 Mbps and egress to 200
 Mbps.
 
 Changing the Default System Offering for System VMs
---------------------------------------------------------
+---------------------------------------------------
 
 You can manually change the system offering for a particular System VM.
 Additionally, as a CloudStack administrator, you can also change the

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/08b01f0d/source/storage.rst
----------------------------------------------------------------------
diff --git a/source/storage.rst b/source/storage.rst
index 433adc9..7185935 100644
--- a/source/storage.rst
+++ b/source/storage.rst
@@ -29,7 +29,7 @@ There is no ephemeral storage in CloudStack. All volumes on all nodes
 are persistent.
 
 Primary Storage
----------------------
+---------------
 
 This section gives concepts and technical details about CloudStack
 primary storage. For information about how to install and configure
@@ -38,7 +38,7 @@ primary storage through the CloudStack UI, see the Installation Guide.
 `Section 2.6, “About Primary Storage” <#about-primary-storage>`__
 
 Best Practices for Primary Storage
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 -  
 
@@ -68,7 +68,7 @@ Best Practices for Primary Storage
    Offerings).
 
 Runtime Behavior of Primary Storage
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Root volumes are created automatically when a virtual machine is
 created. Root volumes are deleted when the VM is destroyed. Data volumes
@@ -92,90 +92,23 @@ storage or from a storage system (ex. a SAN), depending on how the
 primary storage was added to CloudStack).
 
 Hypervisor Support for Primary Storage
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The following table shows storage options and parameters for different
 hypervisors.
 
-VMware vSphere
-
-Citrix XenServer
-
-KVM
-
-Hyper-V
-
-****Format for Disks, Templates, and Snapshots****
-
-VMDK
-
-VHD
-
-QCOW2
-
-VHD
-
-Snapshots are not supported.
-
-**iSCSI support**
-
-VMFS
-
-Clustered LVM
-
-Yes, via Shared Mountpoint
-
-No
-
-**Fiber Channel support**
-
-VMFS
-
-Yes, via Existing SR
-
-Yes, via Shared Mountpoint
-
-No
-
-**NFS support**
-
-Y
-
-Y
-
-Y
-
-No
-
-**Local storage support**
-
-Y
-
-Y
-
-Y
-
-Y
-
-**Storage over-provisioning**
-
-NFS and iSCSI
-
-NFS
-
-NFS
-
-No
-
-**SMB/CIFS**
-
-No
-
-No
-
-No
-
-Yes
+============================================== ================ ==================== =========================== ============================
+                                               VMware vSphere   Citrix XenServer     KVM                         Hyper-V
+============================================== ================ ==================== =========================== ============================
+**Format for Disks, Templates, and Snapshots** VMDK             VHD                  QCOW2                       VHD
+                                                                                                                 Snapshots are not supported.
+**iSCSI support**                              VMFS             Clustered LVM        Yes, via Shared Mountpoint  No
+**Fiber Channel support**                      VMFS             Yes, via Existing SR Yes, via Shared Mountpoint  No
+**NFS support**                                Yes              Yes                  Yes                         No
+**Local storage support**                      Yes              Yes                  Yes                         Yes
+**Storage over-provisioning**                  NFS and iSCSI    NFS                  NFS                         No
+**SMB/CIFS**                                   No               No                   No                          Yes
+============================================== ================ ==================== =========================== ============================
 
 XenServer uses a clustered LVM system to store VM images on iSCSI and
 Fiber Channel volumes and does not support over-provisioning in the
@@ -208,7 +141,7 @@ could provision 1 iSCSI LUN initially and then add a second iSCSI LUN
 when the first approaches capacity.
 
 Storage Tags
-~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~
 
 Storage may be "tagged". A tag is a text string attribute associated
 with primary storage, a Disk Offering, or a Service Offering. Tags allow
@@ -229,7 +162,7 @@ if different devices are used to present those tags, the set of exposed
 tags can be the same.
 
 Maintenance Mode for Primary Storage
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Primary storage may be placed into maintenance mode. This is useful, for
 example, to replace faulty RAM in a storage device. Maintenance mode for
@@ -243,7 +176,7 @@ all guests that were running at the time of the entry into maintenance
 mode.
 
 Secondary Storage
------------------------
+-----------------
 
 This section gives concepts and technical details about CloudStack
 secondary storage. For information about how to install and configure
@@ -253,7 +186,7 @@ Installation Guide.
 `Section 2.7, “About Secondary Storage” <#about-secondary-storage>`__
 
 Working With Volumes
---------------------------
+--------------------
 
 A volume provides storage to a guest VM. The volume can provide for a
 root disk or an additional data disk. CloudStack supports additional
@@ -276,10 +209,11 @@ from a volume as well; this is the standard procedure for private
 template creation. Volumes are hypervisor-specific: a volume from one
 hypervisor type may not be used on a guest of another hypervisor type.
 
-.. note:: CloudStack supports attaching up to 13 data disks to a VM on XenServer hypervisor versions 6.0 and above. For the VMs on other hypervisor types, the data disk limit is 6.
+.. note:: 
+   CloudStack supports attaching up to 13 data disks to a VM on XenServer hypervisor versions 6.0 and above. For the VMs on other hypervisor types, the data disk limit is 6.
 
 Creating a New Volume
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~
 
 You can add more data disk volumes to a guest VM at any time, up to the
 limits of your storage capacity. Both CloudStack administrators and
@@ -290,7 +224,7 @@ volume. This optimization allows the CloudStack to provision the volume
 nearest to the guest that will use it when the first attachment is made.
 
 Using Local Storage for Data Volumes
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 You can create data volumes on local storage (supported with XenServer,
 KVM, and VMware). The data volume is placed on the same host as the VM
@@ -315,7 +249,7 @@ If you want to put a host into maintenance mode, you must first stop any
 VMs with local data volumes on that host.
 
 To Create a New Volume
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^
 
 #. 
 
@@ -356,7 +290,7 @@ To Create a New Volume
    To start using the volume, continue to Attaching a Volume
 
 Uploading an Existing Volume to a Virtual Machine
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Existing data can be made accessible to a virtual machine. This is
 called uploading a volume to the VM. For example, this is useful to
@@ -412,11 +346,13 @@ To upload a volume:
       Format. Choose one of the following to indicate the disk image
       format of the volume.
 
+      ==========  =================
       Hypervisor  Disk Image Format
       ==========  =================
       XenServer   VHD
       VMware      OVA
       KVM         QCOW2
+      ==========  =================
 
    -  
 
@@ -425,7 +361,7 @@ To upload a volume:
       chosen in Format. For example, if Format is VHD, the URL might
       look like the following:
 
-      http://yourFileServerIP/userdata/myDataDisk.vhd
+      ``http://yourFileServerIP/userdata/myDataDisk.vhd``
 
    -  
 
@@ -438,7 +374,7 @@ To upload a volume:
    step 5, and make sure the status is Uploaded.
 
 Attaching a Volume
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~
 
 You can attach a volume to a guest VM to provide extra disk storage.
 Attach a volume when you first create a new volume, when you are moving
@@ -460,7 +396,7 @@ volume from one storage pool to another.
 #. 
 
    Click the volume name in the Volumes list, then click the Attach Disk
-   button |AttachDiskButton.png: button to attach a volume|
+   button |AttachDiskButton.png|
 
 #. 
 
@@ -475,9 +411,10 @@ volume from one storage pool to another.
    clicking Instances, the instance name, and View Volumes.
 
 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>`__.
+.. 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>`__.
 
 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
@@ -500,7 +437,7 @@ may take several minutes for the volume to be moved to the new VM.
 #. 
 
    Click the name of the volume you want to detach, then click the
-   Detach Disk button. |DetachDiskButton.png: button to detach a volume|
+   Detach Disk button. |DetachDiskButton.png|
 
 #. 
 
@@ -508,11 +445,12 @@ may take several minutes for the volume to be moved to the new VM.
    `Section 13.4.3, “Attaching a Volume” <#attaching-volume>`__.
 
 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>`__.
+.. 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>`__.
 
 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.
@@ -532,10 +470,11 @@ another, or to migrate a VM whose disks are on local storage, or even to
 migrate a VM’s disks from one storage repository to another, all while
 the VM is running.
 
-.. note:: Because of a limitation in VMware, live migration of storage for a VM is allowed only if the source and target storage pool are accessible to the source host; that is, the host where the VM is running when the live migration operation is requested.
+.. note:: 
+   Because of a limitation in VMware, live migration of storage for a VM is allowed only if the source and target storage pool are accessible to the source host; that is, the host where the VM is running when the live migration operation is requested.
 
 Migrating a Data Volume to a New Storage Pool
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 There are two situations when you might want to migrate a disk:
 
@@ -550,7 +489,7 @@ There are two situations when you might want to migrate a disk:
    attach it to a new VM.
 
 Migrating Storage For a Running VM
-''''''''''''''''''''''''''''''''''''''''''''''
+''''''''''''''''''''''''''''''''''
 
 (Supported on XenServer and VMware)
 
@@ -575,8 +514,7 @@ Migrating Storage For a Running VM
 
 #. 
 
-   Click the Migrate Volume button |Migrateinstance.png: button to
-   migrate a volume| and choose the destination from the dropdown list.
+   Click the Migrate Volume button |Migrateinstance.png| and choose the destination from the dropdown list.
 
 #. 
 
@@ -584,7 +522,7 @@ Migrating Storage For a Running VM
    Ready.
 
 Migrating Storage and Attaching to a Different VM
-'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+'''''''''''''''''''''''''''''''''''''''''''''''''
 
 #. 
 
@@ -593,13 +531,12 @@ 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”
+   Moving Volumes” <#detach-move-volumes>`_ but skip the “reattach”
    step at the end. You will do that after migrating to new storage.
 
 #. 
 
-   Click the Migrate Volume button |Migrateinstance.png: button to
-   migrate a volume| and choose the destination from the dropdown list.
+   Click the Migrate Volume button |Migrateinstance.png| and choose the destination from the dropdown list.
 
 #. 
 
@@ -615,7 +552,7 @@ Migrating Storage and Attaching to a Different VM
    Volume” <#attaching-volume>`__
 
 Migrating a VM Root Volume to a New Storage Pool
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 (XenServer, VMware) You can live migrate a VM's root disk from one
 storage pool to another, without stopping the VM first.
@@ -638,10 +575,10 @@ be restarted.
 
 #. 
 
-   Click the Migrate button |Migrateinstance.png: button to migrate a VM
-   or volume| and choose the destination from the dropdown list.
+   Click the Migrate button |Migrateinstance.png| and choose the destination from the dropdown list.
 
-   .. note:: If the VM's storage has to be migrated along with the VM, this will be noted in the host list. CloudStack will take care of the storage migration for you.
+   .. note:: 
+      If the VM's storage has to be migrated along with the VM, this will be noted in the host list. CloudStack will take care of the storage migration for you.
 
 #. 
 
@@ -653,7 +590,7 @@ be restarted.
    (KVM only) Restart the VM.
 
 Resizing Volumes
-~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~
 
 CloudStack provides the ability to resize data disks; CloudStack
 controls volume size by using disk offerings. This provides CloudStack
@@ -709,15 +646,14 @@ To resize a volume:
 #. 
 
    Select the volume name in the Volumes list, then click the Resize
-   Volume button |resize-volume-icon.png: button to display the resize
-   volume option.|
+   Volume button |resize-volume-icon.png|
 
 #. 
 
    In the Resize Volume pop-up, choose desired characteristics for the
    storage.
 
-   |resize-volume.png: option to resize a volume.|
+   |resize-volume.png|
 
    #. 
 
@@ -737,7 +673,7 @@ To resize a volume:
    Click OK.
 
 Reset VM to New Root Disk on Reboot
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You can specify that you want to discard the root disk and create a new
 one whenever a given VM is rebooted. This is useful for secure
@@ -753,7 +689,7 @@ upon reboot. See `Section 8.1.1, “Creating a New Compute
 Offering” <#creating-compute-offerings>`__.
 
 Volume Deletion and Garbage Collection
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The deletion of a volume does not delete the snapshots that have been
 created from the volume
@@ -779,7 +715,7 @@ Administrators should adjust these values depending on site policies
 around data retention.
 
 Working with Volume Snapshots
------------------------------------
+-----------------------------
 
 (Supported for the following hypervisors: **XenServer**, **VMware
 vSphere**, and **KVM**)
@@ -809,7 +745,7 @@ A completed snapshot is copied from primary storage to secondary
 storage, where it is stored until deleted or purged by newer snapshot.
 
 How to Snapshot a Volume
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 #. 
 
@@ -829,10 +765,10 @@ How to Snapshot a Volume
 
 #. 
 
-   Click the Snapshot button. |image43|
+   Click the Snapshot button. |SnapshotButton.png|
 
 Automatic Snapshot Creation and Retention
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 (Supported for the following hypervisors: **XenServer**, **VMware
 vSphere**, and **KVM**)
@@ -854,7 +790,7 @@ snapshot policy. Additional manual snapshots can be created and
 retained.
 
 Incremental Snapshots and Backup
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Snapshots are created on primary storage where a disk resides. After a
 snapshot is created, it is immediately backed up to secondary storage
@@ -864,22 +800,16 @@ primary storage.
 CloudStack does incremental backups for some hypervisors. When
 incremental backups are supported, every N backup is a full backup.
 
-VMware vSphere
 
-Citrix XenServer
++------------------------------+------------------+------------------+-----+
+|                              | VMware vSphere   | Citrix XenServer | KVM |
++==============================+==================+==================+=====+
+| Support incremental backup   | No               | Yes              | No  |
++------------------------------+------------------+------------------+-----+
 
-KVM
-
-Support incremental backup
-
-N
-
-Y
-
-N
 
 Volume Status
-~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~
 
 When a snapshot operation is triggered by means of a recurring snapshot
 policy, a snapshot is skipped if a volume has remained inactive since
@@ -892,7 +822,7 @@ When a snapshot is taken manually, a snapshot is always created
 regardless of whether a volume has been active or not.
 
 Snapshot Restore
-~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~
 
 There are two paths to restoring snapshots. Users can create a volume
 from the snapshot. The volume can then be mounted to a VM and files
@@ -901,7 +831,7 @@ snapshot of a root disk. The user can then boot a VM from this template
 to effect recovery of the root disk.
 
 Snapshot Job Throttling
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~
 
 When a snapshot of a virtual machine is requested, the snapshot job runs
 on the same host where the VM is running or, in the case of a stopped
@@ -930,7 +860,7 @@ a snapshot request will wait in the queue. If this limit is reached, the
 snapshot request fails and returns an error message.
 
 VMware Volume Snapshot Performance
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 When you take a snapshot of a data or root volume on VMware, CloudStack
 uses an efficient storage technique to improve performance.
@@ -943,5 +873,19 @@ needed, on demand. To generate the OVA, CloudStack uses information in a
 properties file (\*.ova.meta) which it stored along with the original
 snapshot data.
 
-.. note:: For upgrading customers: This process applies only to newly created snapshots after upgrade to CloudStack 4.2. Snapshots that have already been taken and stored in OVA format will continue to exist in that format, and will continue to work as expected.
-
+.. note:: 
+   For upgrading customers: This process applies only to newly created snapshots after upgrade to CloudStack 4.2. Snapshots that have already been taken and stored in OVA format will continue to exist in that format, and will continue to work as expected.
+
+
+.. |AttachDiskButton.png| image:: _static/images/attach-disk-icon.png
+   :alt: Attach Disk Button.
+.. |resize-volume-icon.png| image:: _static/images/resize-volume-icon.png
+   :alt: button to display the resize volume option.
+.. |resize-volume.png| image:: _static/images/resize-volume.png
+   :alt: option to resize a volume.
+.. |SnapshotButton.png| image:: _static/images/SnapshotButton.png
+   :alt: Snapshot Button.
+.. |DetachDiskButton.png| image:: _static/images/detach-disk-icon.png
+   :alt: Detach Disk Button.
+.. |Migrateinstance.png| image:: _static/images/migrate-instance.png
+   :alt: button to migrate a volume.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/08b01f0d/source/systemvm.rst
----------------------------------------------------------------------
diff --git a/source/systemvm.rst b/source/systemvm.rst
index bd4f41b..481437b 100644
--- a/source/systemvm.rst
+++ b/source/systemvm.rst
@@ -24,7 +24,7 @@ needs. However, the administrator should be aware of them and their
 roles to assist in debugging issues.
 
 The System VM Template
-----------------------------
+----------------------
 
 The System VMs come from a single template. The System VM has the
 following characteristics:
@@ -63,7 +63,7 @@ following characteristics:
    speed
 
 Changing the Default System VM Template
----------------------------------------------
+---------------------------------------
 
 CloudStack allows you to change the default 32-bit System VM template to
 64-bit one. Using the 64-bit template, upgrade the virtual router to
@@ -74,10 +74,12 @@ manage larger number of connection in your network.
    Based on the hypervisor you use, download the 64-bit template from
    the following location:
 
+   ==========  ================================================================================================
    Hypervisor  Download Location
-   ==========  ===============================================================================================
+   ==========  ================================================================================================
    XenServer   http://download.cloud.com/templates/4.2/64bit/systemvmtemplate64-2013-07-15-master-xen.vhd.bz2
    KVM         http://download.cloud.com/templates/4.2/64bit/systemvmtemplate64-2013-07-15-master-kvm.qcow2.bz2
+   ==========  ================================================================================================
 
 #. 
 
@@ -126,7 +128,7 @@ System VMs and performs dynamic load balancing and scaling-up of more
 System VMs.
 
 Console Proxy
--------------------
+-------------
 
 The Console Proxy is a type of System Virtual Machine that has a role in
 presenting a console view via the web UI. It connects the user’s browser
@@ -141,7 +143,8 @@ The AJAX application connects to this IP. The console proxy then proxies
 the connection to the VNC port for the requested VM on the Host hosting
 the guest.
 
-.. note:: The hypervisors will have many ports assigned to VNC usage so that multiple VNC sessions can occur simultaneously.
+.. note:: 
+   The hypervisors will have many ports assigned to VNC usage so that multiple VNC sessions can occur simultaneously.
 
 There is never any traffic to the guest virtual IP, and there is no need
 to enable VNC within the guest.
@@ -162,7 +165,7 @@ Console proxies can be restarted by administrators but this will
 interrupt existing console sessions for users.
 
 Using a SSL Certificate for the Console Proxy
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The console viewing functionality uses a dynamic DNS service under the
 domain name ``realhostip.com`` to assist in providing SSL security to
@@ -181,7 +184,7 @@ IP, where it then expects and receives a SSL certificate for
 realhostip.com, and SSL is set up without browser warnings.
 
 Changing the Console Proxy SSL Certificate and Domain
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If the administrator prefers, it is possible for the URL of the
 customer's console session to show a domain other than realhostip.com.
@@ -261,7 +264,7 @@ the console proxy domain, SSL certificate, and private key:
 
       The desired new domain name; for example, company.com
 
-   ..   |updatessl.png: Updating Console Proxy SSL Certificate|
+   ..   |updatessl.png|
 
 #. 
 
@@ -277,7 +280,7 @@ requests will be served with the new DNS domain name, certificate, and
 key.
 
 Virtual Router
---------------------
+--------------
 
 The virtual router is a type of System Virtual Machine. The virtual
 router is one of the most frequently used service providers in
@@ -294,7 +297,7 @@ virtual router from a guest VM. Some of the characteristics of the
 virtual router are determined by its associated system service offering.
 
 Configuring the Virtual Router
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You can set the following:
 
@@ -323,7 +326,7 @@ You can set the following:
    gather network usage statistics, set it to 0.
 
 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,
@@ -355,7 +358,7 @@ creating and applying a custom system service offering.
    on a Guest Network” <#change-network-offering-on-guest-network>`__.
 
 Best Practices for Virtual Routers
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 -  
 
@@ -365,7 +368,8 @@ Best Practices for Virtual Routers
 
 -  
 
-   .. warning:: Do not use the destroyRouter API when only one router is available in the network, because restartNetwork API with the cleanup=false parameter can't recreate it later. If you want to destroy and recreate the single router available in the network, use the restartNetwork API with the cleanup=true parameter.
+   .. warning:: 
+      Do not use the destroyRouter API when only one router is available in the network, because restartNetwork API with the cleanup=false parameter can't recreate it later. If you want to destroy and recreate the single router available in the network, use the restartNetwork API with the cleanup=true parameter.
 
 Service Monitoring Tool for Virtual Router
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -386,7 +390,8 @@ an unexpected reason. For example:
    The services that are terminated by the OS when memory or CPU is not
    sufficiently available for the service.
 
-.. note:: Only those services with daemons are monitored. The services that are failed due to errors in the service/daemon configuration file cannot be restarted by the Monitoring tool. VPC networks are not supported.
+.. note:: 
+   Only those services with daemons are monitored. The services that are failed due to errors in the service/daemon configuration file cannot be restarted by the Monitoring tool. VPC networks are not supported.
 
 The following services are monitored in a VR:
 
@@ -422,7 +427,7 @@ This feature is supported on the following hypervisors: XenServer,
 VMware, and KVM.
 
 Enhanced Upgrade for Virtual Routers
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Upgrading VR is made flexible. The CloudStack administrators will be
 able to control the sequence of the VR upgrades. The sequencing is based
@@ -596,15 +601,14 @@ Upgrading Virtual Routers
 
    #. 
 
-      Click the Upgrade button to upgrade all the VRs. |vr-upgrade.png:
-      Button to upgrade VR to use the new template.|
+      Click the Upgrade button to upgrade all the VRs. |vr-upgrade.png|
 
    #. 
 
       Click OK to confirm.
 
 Secondary Storage VM
----------------------
+--------------------
 
 In addition to the hosts, CloudStack’s Secondary Storage VM mounts and
 writes to secondary storage.
@@ -619,3 +623,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
+   :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/08b01f0d/source/templates.rst
----------------------------------------------------------------------
diff --git a/source/templates.rst b/source/templates.rst
index c2da0d5..72302e8 100644
--- a/source/templates.rst
+++ b/source/templates.rst
@@ -31,7 +31,7 @@ choices to users, CloudStack administrators and users can create
 templates and add them to CloudStack.
 
 Creating Templates: Overview
-----------------------------------
+----------------------------
 
 CloudStack ships with a default template for the CentOS operating
 system. There are a variety of ways to add more templates.
@@ -59,7 +59,7 @@ The various techniques for creating templates are described in the next
 few sections.
 
 Requirements for Templates
---------------------------------
+--------------------------
 
 -  
 
@@ -72,14 +72,14 @@ Requirements for Templates
    This will enable console view to work properly.
 
 Best Practices for Templates
-----------------------------------
+----------------------------
 
 If you plan to use large templates (100 GB or larger), be sure you have
 a 10-gigabit network to support the large templates. A slower network
 can lead to timeouts and other errors when large templates are used.
 
 The Default Template
---------------------------
+--------------------
 
 CloudStack includes a CentOS template. This template is downloaded by
 the Secondary Storage VM after the primary and secondary storage are
@@ -124,7 +124,7 @@ block most access to the template excluding ssh.
     REJECT     all  --  anywhere        anywhere       reject-with icmp-host-
 
 Private and Public Templates
-----------------------------------
+----------------------------
 
 When a user creates a template, it can be designated private or public.
 
@@ -142,7 +142,7 @@ to that Zone. If a public template is created in a public Zone, it is
 available to all users in all domains.
 
 Creating a Template from an Existing Virtual Machine
-----------------------------------------------------------
+----------------------------------------------------
 
 Once you have at least one VM set up in the way you want, you can use it
 as the prototype for other VMs.
@@ -191,7 +191,8 @@ as the prototype for other VMs.
          PV (32-bit) or Other PV (64-bit). This choice is available only
          for XenServere:
 
-         .. note:: Generally you should not choose an older version of the OS than the version in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will in general not work. In those cases you should choose Other.
+         .. note:: 
+            Generally you should not choose an older version of the OS than the version in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will in general not work. In those cases you should choose Other.
 
    -  
 
@@ -216,7 +217,7 @@ template creation process has been completed. The template is then
 available when creating a new VM.
 
 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
@@ -225,7 +226,7 @@ can create a template directly from any snapshot through the CloudStack
 UI.
 
 Uploading Templates
--------------------------
+-------------------
 
 vSphere Templates and ISOs
 --------------------------
@@ -260,7 +261,7 @@ To upload a template:
    -  
 
       **URL**. The Management Server will download the file from the
-      specified URL, such as http://my.web.server/filename.vhd.gz.
+      specified URL, such as ``http://my.web.server/filename.vhd.gz``.
 
    -  
 
@@ -282,7 +283,8 @@ To upload a template:
 
          If the OS type of the stopped VM is not listed, choose Other.
 
-         .. note:: You should not choose an older version of the OS than the version in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will in general not work. In those cases you should choose Other.
+         .. note:: 
+            You should not choose an older version of the OS than the version in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will in general not work. In those cases you should choose Other.
 
    -  
 
@@ -321,14 +323,14 @@ To upload a template:
       template Featured.
 
 Exporting Templates
--------------------------
+-------------------
 
 End users and Administrators may export templates from the CloudStack.
 Navigate to the template in the UI and choose the Download function from
 the Actions menu.
 
 Creating a Linux Template
---------------------------------
+-------------------------
 
 Linux templates should be prepared using this documentation in order to
 prepare your linux VMs for template deployment. For ease of
@@ -365,7 +367,7 @@ An overview of the procedure is as follow:
    Existing Virtual Machine” <#create-template-from-existing-vm>`__.
 
 System preparation for Linux
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The following steps will prepare a basic Linux installation for
 templating.
@@ -379,10 +381,11 @@ templating.
    unique to a machine. It is recommended that the name of "localhost"
    is used for installation.
 
-   .. warning:: For CentOS, it is necessary to take unique identification out of the
-   interface configuration file, for this edit
-   /etc/sysconfig/network-scripts/ifcfg-eth0 and change the content to
-   the following.
+   .. warning:: 
+      For CentOS, it is necessary to take unique identification out of the
+      interface configuration file, for this edit
+      /etc/sysconfig/network-scripts/ifcfg-eth0 and change the content to
+      the following. 
 
    .. code:: bash
 
@@ -419,7 +422,8 @@ templating.
 
    **Password management**
 
-   .. note:: If preferred, custom users (such as ones created during the Ubuntu installation) should be removed. First ensure the root user account is enabled by giving it a password and then login as root to continue.
+   .. note:: 
+      If preferred, custom users (such as ones created during the Ubuntu installation) should be removed. First ensure the root user account is enabled by giving it a password and then login as root to continue.
 
    .. code:: bash
 
@@ -465,32 +469,33 @@ templating.
 
       .. code:: bash
 
-                           #!/bin/sh
-                           # dhclient change hostname script for Ubuntu
-                           oldhostname=$(hostname -s)
-                           if [ $oldhostname = 'localhost' ]
-                           then
-                            sleep 10 # Wait for configuration to be written to disk
-                            hostname=$(cat /var/lib/dhcp/dhclient.eth0.leases  |  awk ' /host-name/ { host = $3 }  END { printf host } ' | sed 's/[";]//g' )
-                            fqdn="$hostname.$(cat /var/lib/dhcp/dhclient.eth0.leases  |  awk ' /domain-name/ { domain = $3 }  END { printf domain } ' | sed 's/[";]//g')"
-                            ip=$(cat /var/lib/dhcp/dhclient.eth0.leases  |  awk ' /fixed-address/ { lease = $2 }  END { printf lease } ' | sed 's/[";]//g')
-                            echo "cloudstack-hostname: Hostname _localhost_ detected. Changing hostname and adding hosts."
-                            echo " Hostname: $hostname \n FQDN: $fqdn \n IP: $ip"
-                            # Update /etc/hosts
-                            awk -v i="$ip" -v f="$fqdn" -v h="$hostname" "/^127/{x=1} !/^127/ && x { x=0; print i,f,h; } { print $0; }" /etc/hosts > /etc/hosts.dhcp.tmp
-                            mv /etc/hosts /etc/hosts.dhcp.bak
-                            mv /etc/hosts.dhcp.tmp /etc/hosts
-                            # Rename Host
-                            echo $hostname > /etc/hostname
-                            hostname $hostname
-                            # Recreate SSH2
-                            dpkg-reconfig openssh-server
-                           fi
-                           ### End of Script ###
-                  
-                           chmod 774  /etc/dhcp/dhclient-exit-hooks.d/sethostname
-
-   .. warning:: The following steps should be run when you are ready to template your Template Master. If the Template Master is rebooted during these steps you will have to run all the steps again. At the end of this process the Template Master should be shutdown and the template created in order to create and deploy the final template.
+            #!/bin/sh
+            # dhclient change hostname script for Ubuntu
+            oldhostname=$(hostname -s)
+            if [ $oldhostname = 'localhost' ]
+            then
+                sleep 10 # Wait for configuration to be written to disk
+                hostname=$(cat /var/lib/dhcp/dhclient.eth0.leases  |  awk ' /host-name/ { host = $3 }  END { printf host } ' | sed     's/[";]//g' )
+                fqdn="$hostname.$(cat /var/lib/dhcp/dhclient.eth0.leases  |  awk ' /domain-name/ { domain = $3 }  END { printf     domain } ' | sed 's/[";]//g')"
+                ip=$(cat /var/lib/dhcp/dhclient.eth0.leases  |  awk ' /fixed-address/ { lease = $2 }  END { printf lease } ' | sed     's/[";]//g')
+                echo "cloudstack-hostname: Hostname _localhost_ detected. Changing hostname and adding hosts."
+                echo " Hostname: $hostname \n FQDN: $fqdn \n IP: $ip"
+                # Update /etc/hosts
+                awk -v i="$ip" -v f="$fqdn" -v h="$hostname" "/^127/{x=1} !/^127/ && x { x=0; print i,f,h; } { print $0; }" /etc/  hosts > /etc/hosts.dhcp.tmp
+                mv /etc/hosts /etc/hosts.dhcp.bak
+                mv /etc/hosts.dhcp.tmp /etc/hosts
+                # Rename Host
+                echo $hostname > /etc/hostname
+                hostname $hostname
+                # Recreate SSH2
+                dpkg-reconfig openssh-server
+            fi
+            ### End of Script ###
+            
+            chmod 774  /etc/dhcp/dhclient-exit-hooks.d/sethostname
+
+   .. warning:: 
+        The following steps should be run when you are ready to template your Template Master. If the Template Master is rebooted during these steps you will have to run all the steps again. At the end of this process the Template Master should be shutdown and the template created in order to create and deploy the final template.
 
 #. 
 
@@ -607,7 +612,8 @@ Windows templates must be prepared with Sysprep before they can be
 provisioned on multiple machines. Sysprep allows you to create a generic
 Windows template and avoid any possible SID conflicts.
 
-.. note:: (XenServer) Windows VMs running on XenServer require PV drivers, which may be provided in the template or added after the VM is created. The PV drivers are necessary for essential management functions such as mounting additional volumes and ISO images, live migration, and graceful shutdown.
+.. note:: 
+    (XenServer) Windows VMs running on XenServer require PV drivers, which may be provided in the template or added after the VM is created. The PV drivers are necessary for essential management functions such as mounting additional volumes and ISO images, live migration, and graceful shutdown.
 
 An overview of the procedure is as follows:
 
@@ -637,7 +643,7 @@ An overview of the procedure is as follows:
    template as described in Creating the Windows Template.
 
 System Preparation for Windows Server 2008 R2
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 For Windows 2008 R2, you run Windows System Image Manager to create a
 custom sysprep response XML file. Windows System Image Manager is
@@ -647,7 +653,8 @@ 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>`__
+.. 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>`__
 
 #. 
 
@@ -702,7 +709,7 @@ Use the following steps to run sysprep for Windows 2008 R2:
       more information, including examples on the setting you are
       attempting to configure.
 
-      |sysmanager.png: System Image Manager|
+      |sysmanager.png|
 
    #. 
 
@@ -712,7 +719,7 @@ Use the following steps to run sysprep for Windows 2008 R2:
       High-light the OOBE setting, and add the setting to the Pass 7
       oobeSystem. In Settings, set HideEULAPage true.
 
-      |software-license.png: Depicts hiding the EULA page.|
+      |software-license.png|
 
    #. 
 
@@ -732,8 +739,7 @@ Use the following steps to run sysprep for Windows 2008 R2:
       oobeSystem configuration pass of your answer file. Under Settings,
       specify a password next to Value.
 
-      |change-admin-password.png: Depicts changing the administrator
-      password|
+      |change-admin-password.png|
 
       You may read the AIK documentation and set many more options that
       suit your deployment. The steps above are the minimum needed to
@@ -764,7 +770,7 @@ Use the following steps to run sysprep for Windows 2008 R2:
    complete.
 
 System Preparation for Windows Server 2003 R2
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Earlier versions of Windows have a different sysprep tool. Follow these
 steps for Windows Server 2003 R2.
@@ -874,7 +880,7 @@ steps for Windows Server 2003 R2.
    After this step the machine will automatically shut down
 
 Importing Amazon Machine Images
---------------------------------------
+-------------------------------
 
 The following procedures describe how to import an Amazon Machine Image
 (AMI) into CloudStack when using the XenServer hypervisor.
@@ -887,7 +893,8 @@ You need to have a XenServer host with a file-based storage repository
 (either a local ext3 SR or an NFS SR) to convert to a VHD once the image
 file has been customized on the Centos/Fedora host.
 
-.. 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.
+.. 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.
 
 To import an AMI:
 
@@ -1083,7 +1090,7 @@ To import an AMI:
        [root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# scp CentOS_6.2_x64.vhd.bz2 webserver:/var/www/html/templates/
 
 Converting a Hyper-V VM to a Template
---------------------------------------------
+-------------------------------------
 
 To convert a Hyper-V VM to a XenServer-compatible CloudStack template,
 you will need a standalone XenServer host with an attached NFS VHD SR.
@@ -1214,7 +1221,7 @@ distribution.
 The template will be created, and you can create instances from it.
 
 Adding Password Management to Your Templates
----------------------------------------------------
+--------------------------------------------
 
 CloudStack provides an optional password reset feature that allows users
 to set a temporary admin or root password as well as reset the existing
@@ -1238,7 +1245,7 @@ If the script is unable to contact the virtual router during instance
 boot it will not set the password but boot will continue normally.
 
 Linux OS Installation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~
 
 Use the following steps to begin the Linux OS installation:
 
@@ -1248,7 +1255,7 @@ Use the following steps to begin the Linux OS installation:
 
    -  
 
-      `http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in <http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in>`__
+      `http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in <http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in>`_
 
 #. 
 
@@ -1276,14 +1283,14 @@ Use the following steps to begin the Linux OS installation:
        chkconfig --add cloud-set-guest-password
 
 Windows OS Installation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~
 
 Download the installer, CloudInstanceManager.msi, from the `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
--------------------------
+------------------
 
 Templates may be deleted. In general, when a template spans multiple
 Zones, only the copy that is selected for deletion will be deleted; the
@@ -1295,3 +1302,9 @@ When templates are deleted, the VMs instantiated from them will continue
 to run. However, new VMs cannot be created based on the deleted
 template.
 
+.. |sysmanager.png| image:: _static/images/sysmanager.png
+   :alt: System Image Manager
+.. |software-license.png| image:: _static/images/software-license.png
+   :alt: Depicts hiding the EULA page.
+.. |change-admin-password.png| image:: _static/images/change-admin-password.png
+   :alt: Depicts changing the administrator password

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/08b01f0d/source/tuning.rst
----------------------------------------------------------------------
diff --git a/source/tuning.rst b/source/tuning.rst
index 759fe17..2d2261f 100644
--- a/source/tuning.rst
+++ b/source/tuning.rst
@@ -21,7 +21,7 @@ This section provides tips on how to improve the performance of your
 cloud.
 
 Performance Monitoring
-----------------------------
+----------------------
 
 Host and guest performance monitoring is available to end users and
 administrators. This allows the user to monitor their utilization of
@@ -29,7 +29,7 @@ resources and determine when it is appropriate to choose a more powerful
 service offering or larger disk.
 
 Increase Management Server Maximum Memory
------------------------------------------------
+-----------------------------------------
 
 If the Management Server is subject to high demand, the default maximum
 JVM memory allocation can be insufficient. To increase the memory:
@@ -58,7 +58,7 @@ JVM memory allocation can be insufficient. To increase the memory:
        # service cloudstack-management restart
 
 For more information about memory issues, see "FAQ: Memory" at `Tomcat
-Wiki. <http://wiki.apache.org/tomcat/FAQ/Memory>`__
+Wiki. <http://wiki.apache.org/tomcat/FAQ/Memory>`_
 
 Set Database Buffer Pool Size
 -----------------------------
@@ -100,7 +100,7 @@ at `MySQL Reference
 Manual <http://dev.mysql.com/doc/refman/5.5/en/innodb-buffer-pool.html>`__.
 
 Set and Monitor Total VM Limits per Host
-----------------------------------------------
+----------------------------------------
 
 The CloudStack administrator should monitor the total number of VM
 instances in each cluster, and disable allocation to the cluster if the
@@ -120,7 +120,7 @@ this number of VMs, use the CloudStack UI to disable allocation of more
 VMs to the cluster.
 
 Configure XenServer dom0 Memory
--------------------------------------
+-------------------------------
 
 Configure the XenServer dom0 settings to allocate more memory to dom0.
 This can enable XenServer to handle larger numbers of virtual machines.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/08b01f0d/source/ui.rst
----------------------------------------------------------------------
diff --git a/source/ui.rst b/source/ui.rst
index 49354db..a2fffff 100644
--- a/source/ui.rst
+++ b/source/ui.rst
@@ -181,8 +181,7 @@ new, unique value.
 
 #. 
 
-   Click the Change Password button. |change-password.png: button to
-   change a user's password|
+   Click the Change Password button. |change-password.png|
 
 #. 
 
@@ -259,7 +258,8 @@ call to the cloudstack api.
 For example, make a call from the cloudstack server to create a SSH
 keypair called "keypair-doc" for the admin account in the root domain:
 
-.. note:: Ensure that you adjust these values to meet your needs. If you are making the API call from a different server, your URL/PORT will be different, and you will need to use the API keys.
+.. note:: 
+    Ensure that you adjust these values to meet your needs. If you are making the API call from a different server, your URL/PORT will be different, and you will need to use the API keys.
 
 #. 
 
@@ -355,4 +355,7 @@ With the API command resetSSHKeyForVirtualMachine, a user can set or
 reset the SSH keypair assigned to a virtual machine. A lost or
 compromised SSH keypair can be changed, and the user can access the VM
 by using the new keypair. Just create or register a new keypair, then
-call resetSSHKeyForVirtualMachine.
\ No newline at end of file
+call resetSSHKeyForVirtualMachine.
+
+.. |change-password.png| image:: _static/images/change-password.png
+   :alt: button to change a user's password

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/08b01f0d/source/usage.rst
----------------------------------------------------------------------
diff --git a/source/usage.rst b/source/usage.rst
index ed27b86..f860e7a 100644
--- a/source/usage.rst
+++ b/source/usage.rst
@@ -30,7 +30,7 @@ The Usage Server runs at least once per day. It can be configured to run
 multiple times per day.
 
 Configuring the Usage Server
-----------------------------------
+----------------------------
 
 To configure the usage server:
 
@@ -173,13 +173,14 @@ With this configuration, the Usage job will run every night at 2 AM EST
 and will process records for the previous day’s midnight-midnight as
 defined by the EST (America/New\_York) time zone.
 
-.. note:: Because the special value 1440 has been used for
-usage.stats.job.aggregation.range, the Usage Server will ignore the data
-between midnight and 2 AM. That data will be included in the next day's
-run.
+.. note:: 
+    Because the special value 1440 has been used for
+    usage.stats.job.aggregation.range, the Usage Server will ignore the data
+    between midnight and 2 AM. That data will be included in the next day's
+    run.
 
 Setting Usage Limits
---------------------------
+--------------------
 
 CloudStack provides several administrator control points for capping
 resource usage by users. Some of these limits are global configuration
@@ -313,7 +314,7 @@ Maximum secondary storage space that can be used for an account.
 Default is 400.
 
 User Permission
-~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~
 
 The root administrator, domain administrators and users are able to list
 resources. Ensure that proper logs are maintained in the ``vmops.log``
@@ -336,7 +337,7 @@ and ``api.log`` files.
    listResourceLimits API.
 
 Limit Usage Considerations
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 -  
 
@@ -385,7 +386,7 @@ Limit Usage Considerations
    any more instances because the CPU limit has been exhausted.
 
 Limiting Resource Usage in a Domain
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 CloudStack allows the configuration of limits on a domain basis. With a
 domain limit in place, all users still have their account limits. They
@@ -415,7 +416,7 @@ To set a domain limit:
 
 #. 
 
-   Click the Edit button |editbutton.png: edits the settings.|
+   Click the Edit button |editbutton.png|
 
 #. 
 
@@ -470,7 +471,7 @@ To set a domain limit:
    Click Apply.
 
 Default Account Resource Limits
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You can limit resource use by accounts. The default limits are set by
 using Global configuration parameters, and they affect all accounts
@@ -497,7 +498,7 @@ resource limit.
 
 #. 
 
-   Click the Edit button. |editbutton.png: edits the settings|
+   Click the Edit button. |editbutton.png|
 
 #. 
 
@@ -1204,3 +1205,6 @@ aggregation period. The start date in the usage record will show the
 date and time of the earliest event. For other types of usage, such as
 IP addresses and VMs, the old unprocessed data is not included in daily
 aggregation.
+
+.. |editbutton.png| image:: _static/images/edit-icon.png
+   :alt: edits the settings.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/08b01f0d/source/virtual_machines.rst
----------------------------------------------------------------------
diff --git a/source/virtual_machines.rst b/source/virtual_machines.rst
index 37a2863..964526b 100644
--- a/source/virtual_machines.rst
+++ b/source/virtual_machines.rst
@@ -18,7 +18,7 @@ Working with Virtual Machines
 =============================
 
 About Working with Virtual Machines
------------------------------------------
+-----------------------------------
 
 CloudStack provides administrators with complete control over the
 lifecycle of all guest VMs executing in the cloud. CloudStack provides
@@ -46,7 +46,8 @@ names can be controlled by the user:
    Name – host name that the DHCP server assigns to the VM. Can be set
    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>`__.
+.. 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>`__.
 
 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
@@ -74,12 +75,12 @@ CloudStack will restart it. To shut down an HA-enabled VM, you must go
 through the CloudStack UI or API.
 
 Best Practices for Virtual Machines
------------------------------------------
+-----------------------------------
 
 For VMs to work as expected and provide excellent service, follow these guidelines.
 
 Monitor VMs for Max Capacity
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The CloudStack administrator should monitor the total number of VM
 instances in each cluster, and disable allocation to the cluster if the
@@ -99,7 +100,7 @@ this number of VMs, use the CloudStack UI to disable allocation of more
 VMs to the cluster.
 
 Install Required Tools and Drivers
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Be sure the following are installed on each VM:
 
@@ -138,11 +139,11 @@ following techniques:
    virtual machine, stop and start the VM.
 
 VM Lifecycle
-------------------
+------------
 
 Virtual machines can be in the following states:
 
-|basic-deployment.png: Basic two-machine CloudStack deployment|
+|basic-deployment.png|
 
 Once a virtual machine is destroyed, it cannot be recovered. All the
 resources used by the virtual machine will be reclaimed by the system.
@@ -171,14 +172,15 @@ The system will start the virtual machine from the down state
 automatically if the virtual machine is marked as HA-enabled.
 
 Creating VMs
-------------------
+------------
 
 Virtual machines are usually created from a template. Users can also
 create blank virtual machines. A blank virtual machine is a virtual
 machine without an OS template. Users can attach an ISO file and install
 the OS from the CD/DVD-ROM.
 
-.. note:: You can create a VM without starting it. You can determine whether the VM needs to be started as part of the VM deployment. A request parameter, startVM, in the deployVm API provides this feature. For more information, see the Developer's Guide.
+.. note:: 
+   You can create a VM without starting it. You can determine whether the VM needs to be started as part of the VM deployment. A request parameter, startVM, in the deployVm API provides this feature. For more information, see the Developer's Guide.
 
 To create a VM from a template:
 
@@ -213,11 +215,13 @@ To create a VM from a template:
 
    Click Submit and your VM will be created and started.
 
-   .. note:: For security reason, the internal name of the VM is visible only to the root admin.
+   .. note:: 
+      For security reason, the internal name of the VM is visible only to the root admin.
 
 To create a VM from an ISO:
 
-.. note:: (XenServer) Windows VMs running on XenServer require PV drivers, which may be provided in the template or added after the VM is created. The PV drivers are necessary for essential management functions such as mounting additional volumes and ISO images, live migration, and graceful shutdown.
+.. note:: 
+   (XenServer) Windows VMs running on XenServer require PV drivers, which may be provided in the template or added after the VM is created. The PV drivers are necessary for essential management functions such as mounting additional volumes and ISO images, live migration, and graceful shutdown.
 
 #. 
 
@@ -244,7 +248,7 @@ To create a VM from an ISO:
    Click Submit and your VM will be created and started.
 
 Accessing VMs
--------------------
+-------------
 
 Any user can access their own virtual machines. The administrator can
 access all VMs running in the cloud.
@@ -261,7 +265,7 @@ To access a VM through the CloudStack UI:
 
 #. 
 
-   Click the View Console button |image20|.
+   Click the View Console button |console-icon.png|.
 
 To access a VM directly over the network:
 
@@ -289,14 +293,14 @@ To access a VM directly over the network:
    Forwarding and Firewalling” <#ip-forwarding-firewalling>`__.
 
 Stopping and Starting VMs
--------------------------------
+-------------------------
 
 Once a VM instance is created, you can stop, restart, or delete it as
 needed. In the CloudStack UI, click Instances, select the VM, and use
 the Stop, Start, Reboot, and Destroy buttons.
 
 Assigning VMs to Hosts
-----------------------------
+----------------------
 
 At any point in time, each virtual machine instance is running on a
 single host. How does CloudStack determine which host to place a VM on?
@@ -353,7 +357,7 @@ There are several ways:
    administrator desires.
 
 Affinity Groups
-~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~
 
 By defining affinity groups and assigning VMs to them, the user or
 administrator can influence (but not dictate) which VMs should run on
@@ -435,8 +439,8 @@ To assign an existing VM to an affinity group:
 
 #. 
 
-   Click the Change Affinity button. |change-affinity-button.png: button
-   to assign an affinity group to a virtual machine|
+   Click the Change Affinity button. |change-affinity-button.png|
+
 
 View Members of an Affinity Group
 '''''''''''''''''''''''''''''''''
@@ -482,7 +486,7 @@ To delete an affinity group:
    group.
 
 Virtual Machine Snapshots
--------------------------------
+-------------------------
 
 (Supported on VMware and XenServer)
 
@@ -585,7 +589,7 @@ To create a VM snapshot using the CloudStack UI:
 
 #. 
 
-   Click the Take VM Snapshot button. |image22|
+   Click the Take VM Snapshot button. |VMSnapshotButton.png|
 
    .. note:: If a snapshot is already in progress, then clicking this button will have no effect.
 
@@ -638,14 +642,14 @@ snapshot:
 
    Depending on what you want to do:
 
-   To delete the snapshot, click the Delete button. |image23|
+   To delete the snapshot, click the Delete button. |delete-button.png|
 
-   To revert to the snapshot, click the Revert button. |image24|
+   To revert to the snapshot, click the Revert button. |revert-vm.png|
 
 .. note:: VM snapshots are deleted automatically when a VM is destroyed. You don't have to manually delete the snapshots in this case.
 
 Changing the VM Name, OS, or Group
-----------------------------------------
+----------------------------------
 
 After a VM is created, you can modify the display name, operating
 system, and the group it belongs to.
@@ -666,12 +670,11 @@ To access a VM through the CloudStack UI:
 
 #. 
 
-   Click the Stop button to stop the VM. |StopButton.png: button to stop
-   a VM|
+   Click the Stop button to stop the VM. |StopButton.png|
 
 #. 
 
-   Click Edit. |EditButton.png: button to edit the properties of a VM|
+   Click Edit. |EditButton.png|
 
 #. 
 
@@ -695,7 +698,7 @@ To access a VM through the CloudStack UI:
    Click Apply.
 
 Appending a Display Name to the Guest VM’s Internal Name
----------------------------------------------------------------
+--------------------------------------------------------
 
 Every guest VM has an internal name. The host uses the internal name to
 identify the guest VMs. CloudStack gives you an option to provide a
@@ -717,58 +720,18 @@ names easier in large data center deployments.
 The following table explains how a VM name is displayed in different
 scenarios.
 
-User-Provided Display Name
-
-vm.instancename.flag
-
-Hostname on the VM
-
-Name on vCenter
-
-Internal Name
-
-Yes
-
-True
-
-Display name
-
-i-<user\_id>-<vm\_id>-displayName
-
-i-<user\_id>-<vm\_id>-displayName
-
-No
-
-True
+============================= ======================= ==================== ===================================== ==========================
+User-Provided Display Name    vm.instancename.flag    Hostname on the VM   Name on vCenter                       Internal Name
+============================= ======================= ==================== ===================================== ==========================
+Yes                           True                    Display name         i-<user\_id>-<vm\_id>-displayName     i-<user\_id>-<vm\_id>-displayName
+No                            True                    UUID                 i-<user\_id>-<vm\_id>-<instance.name> i-<user\_id>-<vm\_id>-<instance.name>
+Yes                           False                   Display name         i-<user\_id>-<vm\_id>-<instance.name> i-<user\_id>-<vm\_id>-<instance.name>
+No                            False                   UUID                 i-<user\_id>-<vm\_id>-<instance.name> i-<user\_id>-<vm\_id>-<instance.name>
+============================= ======================= ==================== ===================================== ==========================
 
-UUID
-
-i-<user\_id>-<vm\_id>-<instance.name>
-
-i-<user\_id>-<vm\_id>-<instance.name>
-
-Yes
-
-False
-
-Display name
-
-i-<user\_id>-<vm\_id>-<instance.name>
-
-i-<user\_id>-<vm\_id>-<instance.name>
-
-No
-
-False
-
-UUID
-
-i-<user\_id>-<vm\_id>-<instance.name>
-
-i-<user\_id>-<vm\_id>-<instance.name>
 
 Changing the Service Offering for a VM
----------------------------------------------
+--------------------------------------
 
 To upgrade or downgrade the level of compute resources available to a
 virtual machine, you can change the VM's compute offering.
@@ -791,13 +754,11 @@ virtual machine, you can change the VM's compute offering.
    `Section 10.11.1, “CPU and Memory Scaling for Running
    VMs” <#change-cpu-ram-for-vm>`__.)
 
-   Click the Stop button to stop the VM. |StopButton.png: button to stop
-   a VM|
+   Click the Stop button to stop the VM. |StopButton.png|
 
 #. 
 
-   Click the Change Service button. |ChangeServiceButton.png: button to
-   change the service of a VM|
+   Click the Change Service button. |ChangeServiceButton.png|
 
    The Change service dialog box is displayed.
 
@@ -810,7 +771,7 @@ virtual machine, you can change the VM's compute offering.
    Click OK.
 
 CPU and Memory Scaling for Running VMs
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 (Supported on VMware and XenServer)
 
@@ -849,7 +810,7 @@ Dynamic CPU and RAM scaling can be used in the following cases:
    update them using the following procedure.
 
 Updating Existing VMs
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~
 
 If you are upgrading from a previous version of CloudStack, and you want
 your existing VMs created with previous versions to have the dynamic
@@ -888,7 +849,7 @@ scaling capability, update the VMs using the following steps:
    Restart the VM.
 
 Configuring Dynamic CPU and RAM Scaling
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To configure this feature, use the following new global configuration
 variables:
@@ -904,7 +865,7 @@ variables:
    = 2.
 
 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
@@ -922,7 +883,7 @@ requested level of CPU and RAM, the scaling operation will fail. The VM
 will continue to run as it was before.
 
 Limitations
-~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~
 
 -  
 
@@ -958,7 +919,7 @@ Limitations
    is made to dynamically scale from less than 3 GB to more than 3 GB.
 
 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
@@ -966,7 +927,7 @@ across reboots, you can reset the root disk. For more information, see
 Reboot” <#reset-vm-reboot>`__.
 
 Moving VMs Between Hosts (Manual Live Migration)
--------------------------------------------------------
+------------------------------------------------
 
 The CloudStack administrator can move a running VM from one host to
 another without interrupting service to users or going into maintenance
@@ -1017,22 +978,22 @@ To manually live migrate a virtual machine
 
 #. 
 
-   Click the Migrate Instance button. |Migrateinstance.png: button to
-   migrate an instance|
+   Click the Migrate Instance button. |Migrateinstance.png|
 
 #. 
 
    From the list of suitable hosts, choose the one to which you want to
    move the VM.
 
-   .. note:: If the VM's storage has to be migrated along with the VM, this will be noted in the host list. CloudStack will take care of the storage migration for you.
+   .. note:: 
+      If the VM's storage has to be migrated along with the VM, this will be noted in the host list. CloudStack will take care of the storage migration for you.
 
 #. 
 
    Click OK.
 
 Deleting VMs
--------------------
+------------
 
 Users can delete their own virtual machines. A running virtual machine
 will be abruptly stopped before it is deleted. Administrators can delete
@@ -1054,11 +1015,10 @@ To delete a virtual machine:
 
 #. 
 
-   Click the Destroy Instance button. |Destroyinstance.png: button to
-   destroy an instance|
+   Click the Destroy Instance button. |Destroyinstance.png|
 
 Working with ISOs
-------------------------
+-----------------
 
 CloudStack supports ISOs and their attachment to guest VMs. An ISO is a
 read-only file that has an ISO/CD-ROM style file system. Users can
@@ -1081,7 +1041,7 @@ installing PV drivers into Windows. ISO images are not
 hypervisor-specific.
 
 Adding an ISO
-~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~
 
 To make additional operating system or other software available for use
 with guest VMs, you can add an ISO. The ISO is typically thought of as
@@ -1192,7 +1152,8 @@ part of a template.
 
          Red Hat Enterprise Linux 6
 
-      .. note:: It is not recommended to choose an older version of the OS than the version in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will usually not work. In these cases, choose Other.
+      .. note:: 
+         It is not recommended to choose an older version of the OS than the version in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will usually not work. In these cases, choose Other.
 
    -  
 
@@ -1239,7 +1200,7 @@ Attaching an ISO to a VM
 
 #. 
 
-   Click the Attach ISO button. |iso.png: depicts adding an iso image|
+   Click the Attach ISO button. |iso.png|
 
 #. 
 
@@ -1281,3 +1242,26 @@ restoreVirtualMachine call. In this case, the VM's root disk is
 destroyed and recreated, but from the same template or ISO that was
 already in use by the VM.
 
+.. |basic-deployment.png| image:: _static/images/basic-deployment.png
+   :alt: Basic two-machine CloudStack deployment
+.. |VMSnapshotButton.png| image:: _static/images/VMSnapshotButton.png
+   :alt: button to restart a VPC
+.. |delete-button.png| image:: _static/images/delete-button.png
+.. |EditButton.png| image:: _static/images/edit-icon.png
+   :alt: button to edit the properties of a VM
+.. |change-affinity-button.png| image:: _static/images/change-affinity-button.png
+   :alt: button to assign an affinity group to a virtual machine.
+.. |ChangeServiceButton.png| image:: _static/images/change-service-icon.png
+   :alt: button to change the service of a VM
+.. |Migrateinstance.png| image:: _static/images/migrate-instance.png
+   :alt: button to migrate an instance
+.. |Destroyinstance.png| image:: _static/images/destroy-instance.png
+   :alt: button to destroy an instance
+.. |iso.png| image:: _static/images/iso-icon.png
+   :alt: depicts adding an iso image
+.. |console-icon.png| image:: _static/images/console-icon.png
+   :alt: depicts adding an iso image
+.. |revert-vm.png| image:: _static/images/revert-vm.png
+   :alt: depicts adding an iso image
+.. |StopButton.png| image:: _static/images/stop-instance-icon.png
+   :alt: depicts adding an iso image


Mime
View raw message