cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject git commit: more tweaks to the admin guide
Date Mon, 24 Feb 2014 23:01:52 GMT
Repository: cloudstack-docs-admin
Updated Branches:
  refs/heads/master 767f408f1 -> 947ff0591


more tweaks to the admin guide


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/947ff059
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/947ff059
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/947ff059

Branch: refs/heads/master
Commit: 947ff0591631fd78fb5c78727be7953bfd01a594
Parents: 767f408
Author: Sebastien Goasguen <runseb@gmail.com>
Authored: Mon Feb 24 18:01:38 2014 -0500
Committer: Sebastien Goasguen <runseb@gmail.com>
Committed: Mon Feb 24 18:01:38 2014 -0500

----------------------------------------------------------------------
 source/accounts.rst         |  55 ++----
 source/hosts.rst            |  68 ++------
 source/index.rst            |  50 ++----
 source/networking.rst       | 160 +++--------------
 source/projects.rst         |  27 +--
 source/storage.rst          |  50 ++----
 source/templates.rst        |  50 ++----
 source/user_services.rst    | 360 ---------------------------------------
 source/virtual_machines.rst |  50 ++----
 9 files changed, 130 insertions(+), 740 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/947ff059/source/accounts.rst
----------------------------------------------------------------------
diff --git a/source/accounts.rst b/source/accounts.rst
index a223b62..ebe3d49 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -128,8 +128,7 @@ choose a domain or account to own the resource.
 
 To explicitly dedicate an existing zone, pod, cluster, or host: log in
 as the root admin, find the resource in the UI, and click the Dedicate
-button. |dedicate-resource-button.png: button to dedicate a zone, pod,
-cluster, or host|
+button. |button to dedicate a zone, pod,cluster, or host|
 
 For implicit dedication: The administrator creates a compute service
 offering and in the Deployment Planner field, chooses
@@ -269,17 +268,10 @@ you are using. A full discussion of distinguished names is outside the
 scope of our documentation. The following table shows some examples of
 search bases to find users in the testing department..
 
-LDAP Server
-
-Example Search Base DN
-
-ApacheDS
-
-ou=testing,o=project
-
-Active Directory
-
-OU=testing, DC=company
+LDAP Server       Example Search Base DN
+================  =======================
+ApacheDS          OU=testing, O=project
+Active Directory  OU=testing, DC=company
 
 Query Filter
 ~~~~~~~~~~~~~~~~~~~
@@ -291,21 +283,11 @@ filter syntax, consult the documentation for your LDAP server.
 
 The CloudStack query filter wildcards are:
 
-Query Filter Wildcard
-
-Description
-
-%u
-
-User name
-
-%e
-
-Email address
-
-%n
-
-First and last name
+Query Filter Wildcard  Description
+=====================  ====================
+%u                     User name
+%e                     Email address
+%n                     First and last name
 
 The following examples assume you are using Active Directory, and refer
 to user attributes from the Active Directory schema.
@@ -338,17 +320,10 @@ CloudStack user with an LDAP bind. A full discussion of bind DNs is
 outside the scope of our documentation. The following table shows some
 examples of bind DNs.
 
-LDAP Server
-
-Example Bind DN
-
-ApacheDS
-
-cn=Administrator,dc=testing,ou=project,ou=org
-
-Active Directory
-
-CN=Administrator, OU=testing, DC=company, DC=com
+LDAP Server       Example Bind DN
+================  =================================================
+ApacheDS          CN=Administrator,DC=testing,OU=project,OU=org
+Active Directory  CN=Administrator, OU=testing, DC=company, DC=com
 
 SSL Keystore Path and Password
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -358,3 +333,5 @@ command by setting the parameters ssl, truststore, and truststorepass.
 Before enabling SSL for ldapConfig, you need to get the certificate
 which the LDAP server is using and add it to a trusted keystore. You
 will need to know the path to the keystore and the password.
+
+.. |button to dedicate a zone, pod,cluster, or host| image:: _static/images/dedicate-resource-button.png

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/947ff059/source/hosts.rst
----------------------------------------------------------------------
diff --git a/source/hosts.rst b/source/hosts.rst
index 1130cec..ae73057 100644
--- a/source/hosts.rst
+++ b/source/hosts.rst
@@ -247,8 +247,7 @@ essential that your hosts are completely up to date with the provided
 hypervisor patches. The hypervisor vendor is likely to refuse to support
 any system that is not up to date with patches.
 
-.. note:: The lack of up-do-date hotfixes can lead to data corruption and lost
-VMs.
+.. note:: The lack of up-do-date hotfixes can lead to data corruption and lost VMs.
 
 (XenServer) For more information, see `Highly Recommended Hotfixes for
 XenServer in the CloudStack Knowledge
@@ -319,15 +318,12 @@ Over-provisioning ratios are dynamically substituted in CloudStack's
 capacity calculations. For example:
 
 Capacity = 2 GB
-
 Over-provisioning factor = 2
-
 Capacity after over-provisioning = 4 GB
 
 With this configuration, suppose you deploy 3 VMs of 1 GB each:
 
 Used = 3 GB
-
 Free = 1 GB
 
 The administrator can specify a memory over-provisioning ratio, and can
@@ -380,7 +376,7 @@ capabilities, and certain scripts. It is the administrator's
 responsibility to ensure that these requirements are met.
 
 Balloon Driver
-^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^
 
 All VMs should have a balloon driver installed in them. The hypervisor
 communicates with the balloon driver to free up and make the memory
@@ -439,11 +435,7 @@ done, CloudStack recalculates or scales the used and reserved capacities
 based on the new over-provisioning ratios, to ensure that CloudStack is
 correctly tracking the amount of free capacity.
 
-.. note:: It is safer not to deploy additional new VMs while the capacity
-recalculation is underway, in case the new values for available capacity
-are not high enough to accommodate the new VMs. Just wait for the new
-used/available values to become available, to be sure there is room for
-all the new VMs you want.
+.. note:: It is safer not to deploy additional new VMs while the capacity recalculation is underway, in case the new values for available capacity are not high enough to accommodate the new VMs. Just wait for the new used/available values to become available, to be sure there is room for all the new VMs you want.
 
 To change the over-provisioning ratios for an existing cluster:
 
@@ -470,8 +462,7 @@ To change the over-provisioning ratios for an existing cluster:
    intially shown in these fields is the default value inherited from
    the global configuration settings.
 
-   .. note:: In XenServer, due to a constraint of this hypervisor, you can not use
-   an over-provisioning factor greater than 4.
+   .. note:: In XenServer, due to a constraint of this hypervisor, you can not use an over-provisioning factor greater than 4.
 
 Service Offering Limits and Over-Provisioning
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -528,46 +519,14 @@ VLAN Allocation Example
 VLANs are required for public and guest traffic. The following is an
 example of a VLAN allocation scheme:
 
-VLAN IDs
-
-Traffic type
-
-Scope
-
-less than 500
-
-Management traffic. Reserved for administrative purposes.
-
-CloudStack software can access this, hypervisors, system VMs.
-
-500-599
-
-VLAN carrying public traffic.
-
-CloudStack accounts.
-
-600-799
-
-VLANs carrying guest traffic.
-
-CloudStack accounts. Account-specific VLAN is chosen from this pool.
-
-800-899
-
-VLANs carrying guest traffic.
-
-CloudStack accounts. Account-specific VLAN chosen by CloudStack admin to
-assign to that account.
-
-900-999
-
-VLAN carrying guest traffic
-
-CloudStack accounts. Can be scoped by project, domain, or all accounts.
-
-greater than 1000
-
-Reserved for future use
+VLAN IDs            Traffic type                    Scope
+=================   =============================   ====================================================================================================
+less than 500       Management traffic.             Reserved for administrative purposes.  CloudStack software can access this, hypervisors, system VMs.
+500-599             VLAN carrying public traffic.   CloudStack accounts.
+600-799             VLANs carrying guest traffic.   CloudStack accounts. Account-specific VLAN is chosen from this pool.
+800-899             VLANs carrying guest traffic.   CloudStack accounts. Account-specific VLAN chosen by CloudStack admin to assign to that account.
+900-999             VLAN carrying guest traffic     CloudStack accounts. Can be scoped by project, domain, or all accounts.
+greater than 1000   Reserved for future use
 
 Adding Non Contiguous VLAN Ranges
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -669,6 +628,5 @@ To enable you to assign VLANs to Isolated networks,
    network and the state is changed to Setup. In this state, the network
    will not be garbage collected.
 
-.. note:: You cannot change a VLAN once it's assigned to the network. The VLAN
-remains with the network for its entire life cycle.
+.. note:: You cannot change a VLAN once it's assigned to the network. The VLAN remains with the network for its entire life cycle.
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/947ff059/source/index.rst
----------------------------------------------------------------------
diff --git a/source/index.rst b/source/index.rst
index 4f9c460..5210991 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -22,7 +22,6 @@ Welcome to CloudStack Administration Documentation
 ==================================================
 
 
-
 Managing Accounts, Users and Domains
 ------------------------------------
 
@@ -31,13 +30,6 @@ Managing Accounts, Users and Domains
 
    accounts
 
-User Interface
---------------
-.. toctree::
-   :maxdepth: 2
-
-   ui
-
 Using Projects to Organize User Resources
 ------------------------------------------
 .. toctree::
@@ -69,21 +61,21 @@ Working with Virtual Machines
 
    virtual_machines
 
-Working with Hosts
-------------------
+Working with Templates
+----------------------
 
 .. toctree::
    :maxdepth: 2
 
-   hosts
+   templates
 
-Working with Templates
-----------------------
+Working with Hosts
+------------------
 
 .. toctree::
    :maxdepth: 2
 
-   templates
+   hosts
 
 Working with Storage
 --------------------
@@ -93,6 +85,14 @@ Working with Storage
 
    storage
 
+Working with System Virtual Machines
+------------------------------------
+
+.. toctree::
+   :maxdepth: 2
+
+   systemvm
+
 Working with Usage
 ------------------
 
@@ -109,22 +109,6 @@ Managing Networks and Traffic
 
    networking2
 
-Working with System Virtual Machines
-------------------------------------
-
-.. toctree::
-   :maxdepth: 2
-
-   systemvm
-
-System Reliability and Availability
------------------------------------
-
-.. toctree::
-   :maxdepth: 2
-
-   reliability
-
 Managing the Cloud
 ------------------
 
@@ -133,13 +117,13 @@ Managing the Cloud
 
    management
 
-CloudStack API
---------------
+System Reliability and Availability
+-----------------------------------
 
 .. toctree::
    :maxdepth: 2
 
-   api
+   reliability
 
 Tuning
 ------

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/947ff059/source/networking.rst
----------------------------------------------------------------------
diff --git a/source/networking.rst b/source/networking.rst
index 97532df..583ed70 100644
--- a/source/networking.rst
+++ b/source/networking.rst
@@ -131,8 +131,7 @@ 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.
+.. note:: For the most up-to-date list of supported network service providers, see the CloudStack UI or call `listNetworkServiceProviders`.
 
 A service provider (also called a network element) is hardware or
 virtual appliance that makes a network service possible; for example, a
@@ -150,136 +149,39 @@ specify which network service provider they prefer (along with the other
 choices offered in network offerings). Otherwise, CloudStack will choose
 which provider to use whenever the service is called for.
 
-Supported Network Service Providers
-'''''''''''''''''''''''''''''''''''
+*Supported Network Service Providers*
 
 CloudStack ships with an internal list of the supported service
 providers, and you can choose from this list when creating a network
 offering.
 
-Virtual Router
-
-Citrix NetScaler
-
-Juniper SRX
-
-F5 BigIP
-
-Host based (KVM/Xen)
-
-Remote Access VPN
-
-Yes
-
-No
-
-No
-
-No
-
-No
-
-DNS/DHCP/User Data
-
-Yes
-
-No
-
-No
-
-No
-
-No
-
-Firewall
-
-Yes
-
-No
-
-Yes
-
-No
-
-No
-
-Load Balancing
-
-Yes
-
-Yes
-
-No
-
-Yes
-
-No
-
-Elastic IP
-
-No
-
-Yes
-
-No
-
-No
-
-No
-
-Elastic LB
-
-No
-
-Yes
-
-No
-
-No
-
-No
-
-Source NAT
-
-Yes
-
-No
-
-Yes
-
-No
-
-No
-
-Static NAT
-
-Yes
-
-Yes
-
-Yes
-
-No
-
-No
-
-Port Forwarding
-
-Yes
-
-No
-
-Yes
-
-No
-
-No
++----------------------+-----------+------------+----------+-------------+-------------+
+|                      | Virtual   | Citrix     | Juniper  | F5 BigIP    | Host based  |
+|                      | Router    | NetScaler  | SRX      |             | (KVM/Xen)   |
++======================+===========+============+==========+=============+=============+
+| Remote Access VPN    | Yes       | No         | No       | No          | No          |
++----------------------+-----------+------------+----------+-------------+-------------+
+| DNS/DHCP/User Data   | Yes       | No         | No       | No          | No          |
++----------------------+-----------+------------+----------+-------------+-------------+
+| Firewall             | Yes       | No         | Yes      | No          | No          |
++----------------------+-----------+------------+----------+-------------+-------------+
+| Load Balancing       | Yes       | Yes        | No       | Yes         | No          |
++----------------------+-----------+------------+----------+-------------+-------------+
+| Elastic IP           | No        | Yes        | No       | No          | No          |
++----------------------+-----------+------------+----------+-------------+-------------+
+| Elastic LB           | No        | Yes        | No       | No          | No          |
++----------------------+-----------+------------+----------+-------------+-------------+
+| Source NAT           | Yes       | No         | Yes      | No          | No          |
++----------------------+-----------+------------+----------+-------------+-------------+
+| Static NAT           | Yes       | Yes        | Yes      | No          | No          |
++----------------------+-----------+------------+----------+-------------+-------------+
+| Port Forwarding      | Yes       | No         | Yes      | No          | No          |
++----------------------+-----------+------------+----------+-------------+-------------+
 
 Network Offerings
 ----------------------
 
-.. note:: For the most up-to-date list of supported network services, see the
-CloudStack UI or call listNetworkServices.
+.. note:: For the most up-to-date list of supported network services, see the CloudStack UI or call listNetworkServices.
 
 A network offering is a named set of network services, such as:
 
@@ -338,12 +240,7 @@ running a web server farm and require a scalable firewall solution, load
 balancing solution, and alternate networks for accessing the database
 backend.
 
-.. note:: If you create load balancing rules while using a network service
-offering that includes an external load balancer device such as
-NetScaler, and later change the network service offering to one that
-uses the CloudStack virtual router, you must create a firewall rule on
-the virtual router for each of your existing load balancing rules so
-that they continue to function.
+.. note:: If you create load balancing rules while using a network service offering that includes an external load balancer device such as NetScaler, and later change the network service offering to one that uses the CloudStack virtual router, you must create a firewall rule on the virtual router for each of your existing load balancing rules so that they continue to function.
 
 When creating a new virtual network, the CloudStack administrator
 chooses which network offering to enable for that network. Each virtual
@@ -647,10 +544,7 @@ To create a network offering:
       the conserve mode is on, you can define more than one service on
       the same public IP.
 
-      .. note:: If StaticNAT is enabled, irrespective of the status of the
-      conserve mode, no port forwarding or load balancing rule can be
-      created for the IP. However, you can add the firewall rules by
-      using the createFirewallRule command.
+      .. note:: If StaticNAT is enabled, irrespective of the status of the conserve mode, no port forwarding or load balancing rule can be created for the IP. However, you can add the firewall rules by using the createFirewallRule command.
 
    -  
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/947ff059/source/projects.rst
----------------------------------------------------------------------
diff --git a/source/projects.rst b/source/projects.rst
index 6d788dd..6e256a9 100644
--- a/source/projects.rst
+++ b/source/projects.rst
@@ -97,7 +97,7 @@ and set up the invitations feature in CloudStack.
 #. 
 
    In the search box, type project and click the search button.
-   |searchbutton.png: Searches projects|
+   |Searches projects|
 
 #. 
 
@@ -106,7 +106,7 @@ and set up the invitations feature in CloudStack.
    configuration parameters related to project invitations. Click the
    edit button to set each parameter.
 
-  +----------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------+
+   +----------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------+
    | Configuration Parameters   | Description                                                                                                                                           |
    +============================+=======================================================================================================================================================+
    | project.invite.required    | Set to true to turn on the invitations feature.                                                                                                       |
@@ -126,7 +126,6 @@ and set up the invitations feature in CloudStack.
    | project.smtp.username      | (Optional) User name required by the SMTP server for authentication. You must also set project.smtp.password and set project.smtp.useAuth to true..   |
    +----------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------+
 
-
 #. 
 
    Restart the Management Server:
@@ -214,7 +213,7 @@ Setting the Global Project Resource Limits
    per-project maximum resource amounts that apply to all projects in
    the cloud. No project can have more resources, but an individual
    project can have lower limits. Click the edit button to set each
-   parameter. |editbutton.png: Edits parameters|
+   parameter. |Edits parameters|
 
    +--------------------------+------------------------------------------------------------------------------------------------------------------------------+
    | max.project.public.ips   | Maximum number of public IP addresses that can be owned by any project in the cloud. See About Public IP Addresses.          |
@@ -257,8 +256,7 @@ or you can restrict that ability to just CloudStack administrators.
 
 #. 
 
-   Click the edit button to set the parameter. |editbutton.png: Edits
-   parameters|
+   Click the edit button to set the parameter. |Edits parameters|
 
    ``allow.user.create.projects``
 
@@ -333,7 +331,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 `Section 6.2.1, “Setting
+feature is enabled in the cloud as described in `“Setting
 Up Invitations” <#set-up-invitations>`__. If the invitations feature is
 not turned on, use the procedure in Adding Project Members From the UI.
 
@@ -373,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
-      `Section 6.2.1, “Setting Up Invitations” <#set-up-invitations>`__.
+      `“Setting Up Invitations” <#set-up-invitations>`__.
 
 #. 
 
@@ -395,9 +393,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 `Section 6.2.1, “Setting Up
+feature is enabled cloud,as described in `“Setting Up
 Invitations” <#set-up-invitations>`__, use the procedure in
-`Section 6.4.1, “Sending Project Membership
+`“Sending Project Membership
 Invitations” <#send-projects-membership-invitation>`__.
 
 #. 
@@ -492,9 +490,9 @@ parent domain, or the CloudStack root administrator.
 
    Click one of the buttons:
 
-   To delete, use |deletebutton.png: Removes a project|
+   To delete, use |Removes a project|
 
-   To suspend, use |deletebutton.png: suspends a project|
+   To suspend, use |Suspends a project|
 
 Using the Project View
 ---------------------------
@@ -535,3 +533,8 @@ and resources.
       not yet accepted. Pending invitations will remain in this list
       until the new member accepts, the invitation timeout is reached,
       or you cancel the invitation.
+
+.. |Edits Parameters| image:: _static/images/edit-icon.png
+.. |Searches projects| image:: _static/images/search-button.png
+.. |Removes a project| image:: _static/images/delete-button.png
+.. |Suspends a project| image:: _static/images/suspend-icon.png

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/947ff059/source/storage.rst
----------------------------------------------------------------------
diff --git a/source/storage.rst b/source/storage.rst
index 15b71c7..433adc9 100644
--- a/source/storage.rst
+++ b/source/storage.rst
@@ -276,9 +276,7 @@ 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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -414,21 +412,11 @@ 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
+      Hypervisor  Disk Image Format
+      ==========  =================
+      XenServer   VHD
+      VMware      OVA
+      KVM         QCOW2
 
    -  
 
@@ -489,9 +477,7 @@ volume from one storage pool to another.
 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
@@ -526,9 +512,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>`__.
+.. 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.
@@ -548,10 +532,7 @@ 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
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -660,9 +641,7 @@ be restarted.
    Click the Migrate button |Migrateinstance.png: button to migrate a VM
    or volume| 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.
 
 #. 
 
@@ -788,12 +767,12 @@ determine when the physical deletion of volumes will occur.
 
 -  
 
-   expunge.delay: determines how old the volume must be before it is
+   `expunge.delay`: determines how old the volume must be before it is
    destroyed, in seconds
 
 -  
 
-   expunge.interval: determines how often to run the garbage collection
+   `expunge.interval`: determines how often to run the garbage collection
    check
 
 Administrators should adjust these values depending on site policies
@@ -964,8 +943,5 @@ 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.
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/947ff059/source/templates.rst
----------------------------------------------------------------------
diff --git a/source/templates.rst b/source/templates.rst
index a487b3a..c2da0d5 100644
--- a/source/templates.rst
+++ b/source/templates.rst
@@ -191,10 +191,7 @@ 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.
 
    -  
 
@@ -285,10 +282,7 @@ 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.
 
    -  
 
@@ -425,10 +419,7 @@ 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
 
@@ -460,16 +451,16 @@ templating.
       Ubuntu
 
       The hostname of a Templated VM is set by a custom script in
-      /etc/dhcp/dhclient-exit-hooks.d, this script first checks if the
+      `/etc/dhcp/dhclient-exit-hooks.d`, this script first checks if the
       current hostname is localhost, if true, it will get the host-name,
       domain-name and fixed-ip from the DHCP lease file and use those
-      values to set the hostname and append the /etc/hosts file for
+      values to set the hostname and append the `/etc/hosts` file for
       local hostname resolution. Once this script, or a user has changed
       the hostname from localhost, it will no longer adjust system files
       regardless of it's new hostname. The script also recreates
       openssh-server keys, which should have been deleted before
       templating (shown below). Save the following script to
-      /etc/dhcp/dhclient-exit-hooks.d/sethostname, and adjust the
+      `/etc/dhcp/dhclient-exit-hooks.d/sethostname`, and adjust the
       permissions.
 
       .. code:: bash
@@ -499,11 +490,7 @@ templating.
                   
                            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.
+   .. 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.
 
 #. 
 
@@ -611,8 +598,7 @@ templating.
    `Section 12.6, “Creating a Template from an Existing Virtual
    Machine” <#create-template-from-existing-vm>`__.
 
-.. note:: Templated VMs for both Ubuntu and CentOS may require a reboot after
-provisioning in order to pickup the hostname.
+.. note:: Templated VMs for both Ubuntu and CentOS may require a reboot after provisioning in order to pickup the hostname.
 
 Creating a Windows Template
 ----------------------------------
@@ -621,11 +607,7 @@ 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:
 
@@ -665,17 +647,13 @@ 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>`__
 
 #. 
 
    Download and install the Windows AIK
 
-   .. note:: Windows AIK should not be installed on the Windows 2008 R2 VM you
-   just created. Windows AIK should not be part of the template you
-   create. It is only used to create the sysprep answer file.
+   .. note:: Windows AIK should not be installed on the Windows 2008 R2 VM you just created. Windows AIK should not be part of the template you create. It is only used to create the sysprep answer file.
 
 #. 
 
@@ -909,9 +887,7 @@ 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:
 
@@ -1040,7 +1016,7 @@ To import an AMI:
 
 #. 
 
-   Check etc/ssh/sshd\_config for lines allowing ssh login using a
+   Check `etc/ssh/sshd_config` for lines allowing ssh login using a
    password.
 
    .. code:: bash

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/947ff059/source/user_services.rst
----------------------------------------------------------------------
diff --git a/source/user_services.rst b/source/user_services.rst
deleted file mode 100644
index 99af80f..0000000
--- a/source/user_services.rst
+++ /dev/null
@@ -1,360 +0,0 @@
-.. Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information#
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.
-   
-
-Managing Accounts, Users and Domains
-====================================
-
-Accounts, Users, and Domains
----------------------------------
-
-Accounts
-''''''''
-
-An account typically represents a customer of the service provider or a
-department in a large organization. Multiple users can exist in an
-account.
-
-Domains
-'''''''
-
-Accounts are grouped by domains. Domains usually contain multiple
-accounts that have some logical relationship to each other and a set of
-delegated administrators with some authority over the domain and its
-subdomains. For example, a service provider with several resellers could
-create a domain for each reseller.
-
-For each account created, the Cloud installation creates three different
-types of user accounts: root administrator, domain administrator, and
-user.
-
-Users
-'''''
-
-Users are like aliases in the account. Users in the same account are not
-isolated from each other, but they are isolated from users in other
-accounts. Most installations need not surface the notion of users; they
-just have one user per account. The same user cannot belong to multiple
-accounts.
-
-Username is unique in a domain across accounts in that domain. The same
-username can exist in other domains, including sub-domains. Domain name
-can repeat only if the full pathname from root is unique. For example,
-you can create root/d1, as well as root/foo/d1, and root/sales/d1.
-
-Administrators are accounts with special privileges in the system. There
-may be multiple administrators in the system. Administrators can create
-or delete other administrators, and change the password for any user in
-the system.
-
-Domain Administrators
-'''''''''''''''''''''
-
-Domain administrators can perform administrative operations for users
-who belong to that domain. Domain administrators do not have visibility
-into physical servers or other domains.
-
-Root Administrator
-''''''''''''''''''
-
-Root administrators have complete access to the system, including
-managing templates, service offerings, customer care administrators, and
-domains
-
-Resource Ownership
-''''''''''''''''''
-
-Resources belong to the account, not individual users in that account.
-For example, billing, resource limits, and so on are maintained by the
-account, not the users. A user can operate on any resource in the
-account provided the user has privileges for that operation. The
-privileges are determined by the role. A root administrator can change
-the ownership of any virtual machine from one account to any other
-account by using the assignVirtualMachine API. A domain or sub-domain
-administrator can do the same for VMs within the domain from one account
-to any other account in the domain or any of its sub-domains.
-
-Dedicating Resources to Accounts and Domains
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The root administrator can dedicate resources to a specific domain or
-account that needs private infrastructure for additional security or
-performance guarantees. A zone, pod, cluster, or host can be reserved by
-the root administrator for a specific domain or account. Only users in
-that domain or its subdomain may use the infrastructure. For example,
-only users in a given domain can create guests in a zone dedicated to
-that domain.
-
-There are several types of dedication available:
-
--  
-
-   Explicit dedication. A zone, pod, cluster, or host is dedicated to an
-   account or domain by the root administrator during initial deployment
-   and configuration.
-
--  
-
-   Strict implicit dedication. A host will not be shared across multiple
-   accounts. For example, strict implicit dedication is useful for
-   deployment of certain types of applications, such as desktops, where
-   no host can be shared between different accounts without violating
-   the desktop software's terms of license.
-
--  
-
-   Preferred implicit dedication. The VM will be deployed in dedicated
-   infrastructure if possible. Otherwise, the VM can be deployed in
-   shared infrastructure.
-
-How to Dedicate a Zone, Cluster, Pod, or Host to an Account or Domain
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-For explicit dedication: When deploying a new zone, pod, cluster, or
-host, the root administrator can click the Dedicated checkbox, then
-choose a domain or account to own the resource.
-
-To explicitly dedicate an existing zone, pod, cluster, or host: log in
-as the root admin, find the resource in the UI, and click the Dedicate
-button. |dedicate-resource-button.png: button to dedicate a zone, pod,
-cluster, or host|
-
-For implicit dedication: The administrator creates a compute service
-offering and in the Deployment Planner field, chooses
-ImplicitDedicationPlanner. Then in Planner Mode, the administrator
-specifies either Strict or Preferred, depending on whether it is
-permissible to allow some use of shared resources when dedicated
-resources are not available. Whenever a user creates a VM based on this
-service offering, it is allocated on one of the dedicated hosts.
-
-How to Use Dedicated Hosts
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-To use an explicitly dedicated host, use the explicit-dedicated type of
-affinity group (see `Section 10.7.1, “Affinity
-Groups” <#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.
-
-Behavior of Dedicated Hosts, Clusters, Pods, and Zones
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The administrator can live migrate VMs away from dedicated hosts if
-desired, whether the destination is a host reserved for a different
-account/domain or a host that is shared (not dedicated to any particular
-account or domain). CloudStack will generate an alert, but the operation
-is allowed.
-
-Dedicated hosts can be used in conjunction with host tags. If both a
-host tag and dedication are requested, the VM will be placed only on a
-host that meets both requirements. If there is no dedicated resource
-available to that user that also has the host tag requested by the user,
-then the VM will not deploy.
-
-If you delete an account or domain, any hosts, clusters, pods, and zones
-that were dedicated to it are freed up. They will now be available to be
-shared by any account or domain, or the administrator may choose to
-re-dedicate them to a different account or domain.
-
-System VMs and virtual routers affect the behavior of host dedication.
-System VMs and virtual routers are owned by the CloudStack system
-account, and they can be deployed on any host. They do not adhere to
-explicit dedication. The presence of system vms and virtual routers on a
-host makes it unsuitable for strict implicit dedication. The host can
-not be used for strict implicit dedication, because the host already has
-VMs of a specific account (the default system account). However, a host
-with system VMs or virtual routers can be used for preferred implicit
-dedication.
-
-Using an LDAP Server for User Authentication
--------------------------------------------------
-
-You can use an external LDAP server such as Microsoft Active Directory
-or ApacheDS to authenticate CloudStack end-users. Just map CloudStack
-accounts to the corresponding LDAP accounts using a query filter. The
-query filter is written using the query syntax of the particular LDAP
-server, and can include special wildcard characters provided by
-CloudStack for matching common values such as the user’s email address
-and name. CloudStack will search the external LDAP directory tree
-starting at a specified base directory and return the distinguished name
-(DN) and password of the matching user. This information along with the
-given password is used to authenticate the user..
-
-To set up LDAP authentication in CloudStack, call the CloudStack API
-command ldapConfig and provide the following:
-
--  
-
-   Hostname or IP address and listening port of the LDAP server
-
--  
-
-   Base directory and query filter
-
--  
-
-   Search user DN credentials, which give CloudStack permission to
-   search on the LDAP server
-
--  
-
-   SSL keystore and password, if SSL is used
-
-Example LDAP Configuration Commands
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-To understand the examples in this section, you need to know the basic
-concepts behind calling the CloudStack API, which are explained in the
-Developer’s Guide.
-
-The following shows an example invocation of ldapConfig with an ApacheDS
-LDAP server
-
-.. code:: bash
-
-    http://127.0.0.1:8080/client/api?command=ldapConfig&hostname=127.0.0.1&searchbase=ou%3Dtesting%2Co%3Dproject&queryfilter=%28%26%28uid%3D%25u%29%29&binddn=cn%3DJohn+Singh%2Cou%3Dtesting%2Co%project&bindpass=secret&port=10389&ssl=true&truststore=C%3A%2Fcompany%2Finfo%2Ftrusted.ks&truststorepass=secret&response=json&apiKey=YourAPIKey&signature=YourSignatureHash
-
-The command must be URL-encoded. Here is the same example without the
-URL encoding:
-
-.. code:: bash
-
-    http://127.0.0.1:8080/client/api?command=ldapConfig
-    &hostname=127.0.0.1
-    &searchbase=ou=testing,o=project
-    &queryfilter=(&(%uid=%u))
-    &binddn=cn=John+Singh,ou=testing,o=project
-    &bindpass=secret
-    &port=10389
-    &ssl=true
-    &truststore=C:/company/info/trusted.ks
-    &truststorepass=secret
-    &response=json
-    &apiKey=YourAPIKey&signature=YourSignatureHash
-
-The following shows a similar command for Active Directory. Here, the
-search base is the testing group within a company, and the users are
-matched up based on email address.
-
-.. code:: bash
-
-    http://10.147.29.101:8080/client/api?command=ldapConfig&hostname=10.147.28.250&searchbase=OU%3Dtesting%2CDC%3Dcompany&queryfilter=%28%26%28mail%3D%25e%29%29 &binddn=CN%3DAdministrator%2COU%3Dtesting%2CDC%3Dcompany&bindpass=1111_aaaa&port=389&response=json&apiKey=YourAPIKey&signature=YourSignatureHash
-
-The next few sections explain some of the concepts you will need to know
-when filling out the ldapConfig parameters.
-
-Search Base
-~~~~~~~~~~~~~~~~~~
-
-An LDAP query is relative to a given node of the LDAP directory tree,
-called the search base. The search base is the distinguished name (DN)
-of a level of the directory tree below which all users can be found. The
-users can be in the immediate base directory or in some subdirectory.
-The search base may be equivalent to the organization, group, or domain
-name. The syntax for writing a DN varies depending on which LDAP server
-you are using. A full discussion of distinguished names is outside the
-scope of our documentation. The following table shows some examples of
-search bases to find users in the testing department..
-
-LDAP Server
-
-Example Search Base DN
-
-ApacheDS
-
-ou=testing,o=project
-
-Active Directory
-
-OU=testing, DC=company
-
-Query Filter
-~~~~~~~~~~~~~~~~~~~
-
-The query filter is used to find a mapped user in the external LDAP
-server. The query filter should uniquely map the CloudStack user to LDAP
-user for a meaningful authentication. For more information about query
-filter syntax, consult the documentation for your LDAP server.
-
-The CloudStack query filter wildcards are:
-
-Query Filter Wildcard
-
-Description
-
-%u
-
-User name
-
-%e
-
-Email address
-
-%n
-
-First and last name
-
-The following examples assume you are using Active Directory, and refer
-to user attributes from the Active Directory schema.
-
-If the CloudStack user name is the same as the LDAP user ID:
-
-.. code:: bash
-
-    (uid=%u)
-
-If the CloudStack user name is the LDAP display name:
-
-.. code:: bash
-
-    (displayName=%u)
-
-To find a user by email address:
-
-.. code:: bash
-
-    (mail=%e)
-
-Search User Bind DN
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The bind DN is the user on the external LDAP server permitted to search
-the LDAP directory within the defined search base. When the DN is
-returned, the DN and passed password are used to authenticate the
-CloudStack user with an LDAP bind. A full discussion of bind DNs is
-outside the scope of our documentation. The following table shows some
-examples of bind DNs.
-
-LDAP Server
-
-Example Bind DN
-
-ApacheDS
-
-cn=Administrator,dc=testing,ou=project,ou=org
-
-Active Directory
-
-CN=Administrator, OU=testing, DC=company, DC=com
-
-SSL Keystore Path and Password
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If the LDAP server requires SSL, you need to enable it in the ldapConfig
-command by setting the parameters ssl, truststore, and truststorepass.
-Before enabling SSL for ldapConfig, you need to get the certificate
-which the LDAP server is using and add it to a trusted keystore. You
-will need to know the path to the keystore and the password.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/947ff059/source/virtual_machines.rst
----------------------------------------------------------------------
diff --git a/source/virtual_machines.rst b/source/virtual_machines.rst
index db80f45..37a2863 100644
--- a/source/virtual_machines.rst
+++ b/source/virtual_machines.rst
@@ -46,9 +46,7 @@ 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
@@ -78,8 +76,7 @@ through the CloudStack UI or API.
 Best Practices for Virtual Machines
 -----------------------------------------
 
-For VMs to work as expected and provide excellent service, follow these
-guidelines.
+For VMs to work as expected and provide excellent service, follow these guidelines.
 
 Monitor VMs for Max Capacity
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -181,10 +178,7 @@ 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:
 
@@ -219,16 +213,11 @@ 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.
 
 #. 
 
@@ -525,8 +514,8 @@ VMware documentation and the VMware Knowledge Base, especially
 `Understanding virtual machine
 snapshots <http://kb.vmware.com/selfservice/microsites/search.do?cmd=displayKC&externalId=1015180>`__.
 
-10.8.1. Limitations on VM Snapshots
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Limitations on VM Snapshots
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 -  
 
@@ -554,7 +543,7 @@ snapshots <http://kb.vmware.com/selfservice/microsites/search.do?cmd=displayKC&e
    hypervisor will not be tracked in CloudStack.
 
 Configuring VM Snapshots
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 The cloud administrator can use global configuration variables to
 control the behavior of VM snapshots. To set these variables, go through
@@ -578,7 +567,7 @@ Number of seconds to wait for a snapshot job to succeed before declaring
 failure and issuing an error.
 
 Using VM Snapshots
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~
 
 To create a VM snapshot using the CloudStack UI:
 
@@ -598,8 +587,7 @@ To create a VM snapshot using the CloudStack UI:
 
    Click the Take VM Snapshot button. |image22|
 
-   .. note:: If a snapshot is already in progress, then clicking this button will
-   have no effect.
+   .. note:: If a snapshot is already in progress, then clicking this button will have no effect.
 
 #. 
 
@@ -654,8 +642,7 @@ snapshot:
 
    To revert to the snapshot, click the Revert button. |image24|
 
-.. note:: VM snapshots are deleted automatically when a VM is destroyed. You don't
-have to manually delete the snapshots in this case.
+.. 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
 ----------------------------------------
@@ -1038,9 +1025,7 @@ To manually live migrate a virtual machine
    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.
 
 #. 
 
@@ -1207,10 +1192,7 @@ 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.
 
    -  
 
@@ -1244,8 +1226,8 @@ part of a template.
    fail. The entire ISO must be available before CloudStack can work
    with it.
 
-10.15.2. Attaching an ISO to a VM
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Attaching an ISO to a VM
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 #. 
 
@@ -1268,7 +1250,7 @@ part of a template.
    Click OK.
 
 Changing a VM's Base Image
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Every VM is created from a base image, which is a template or ISO which
 has been created and stored in CloudStack. Both cloud administrators and


Mime
View raw message