You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2014/02/14 11:14:31 UTC

[1/2] fix list of images and sourcecode directives

Updated Branches:
  refs/heads/master 3d2a4e997 -> 7f2027bb3


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/7f2027bb/source/installation.rst
----------------------------------------------------------------------
diff --git a/source/installation.rst b/source/installation.rst
index b3dd5ed..482c0aa 100644
--- a/source/installation.rst
+++ b/source/installation.rst
@@ -179,7 +179,9 @@ requirements:
 
    At least 1 NIC
 
-.. note:: If DHCP is used for hosts, ensure that no conflict occurs between DHCP server used for these hosts and the DHCP router created by CloudStack.
+.. note::
+
+   If DHCP is used for hosts, ensure that no conflict occurs between DHCP server used for these hosts and the DHCP router created by CloudStack.
 
 -  
 
@@ -199,7 +201,9 @@ Hosts have additional requirements depending on the hypervisor. See the
 requirements listed at the top of the Installation section for your
 chosen hypervisor:
 
-.. warning:: Be sure you fulfill the additional hypervisor requirements and installation steps provided in this Guide. Hypervisor hosts must be properly prepared to work with CloudStack. For example, the requirements for XenServer are listed under Citrix XenServer Installation.
+.. warning::
+
+   Be sure you fulfill the additional hypervisor requirements and installation steps provided in this Guide. Hypervisor hosts must be properly prepared to        work with CloudStack. For example, the requirements for XenServer are listed under Citrix XenServer Installation.
 
 Configure package repository
 ----------------------------
@@ -216,7 +220,9 @@ packages” <#sect-source-builddebs>`__ you may find pre-built DEB and RPM
 packages for your convenience linked from the
 `downloads <http://cloudstack.apache.org/downloads.html>`__ page.
 
-.. note:: These repositories contain both the Management Server and KVM Hypervisor packages.
+.. note::
+
+   These repositories contain both the Management Server and KVM Hypervisor packages.
 
 DEB package repository
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -229,19 +235,19 @@ Use your preferred editor and open (or create)
 ``/etc/apt/sources.list.d/cloudstack.list``. Add the community provided
 repository to the file:
 
-::
+.. sourcecode:: bash
 
     deb http://cloudstack.apt-get.eu/ubuntu precise 4.2
 
 We now have to add the public key to the trusted keys.
 
-::
+.. sourcecode:: bash
 
     $ wget -O - http://cloudstack.apt-get.eu/release.asc|apt-key add -
 
 Now update your local apt cache.
 
-::
+.. sourcecode:: bash
 
     $ apt-get update
 
@@ -264,7 +270,7 @@ To add the CloudStack repository, create
 ``/etc/yum.repos.d/cloudstack.repo`` and insert the following
 information.
 
-::
+.. sourcecode:: bash
 
     [cloudstack]
     name=cloudstack
@@ -296,7 +302,9 @@ Server nodes will be in your cloud:
 In either case, each machine must meet the system requirements described
 in System Requirements.
 
-.. warning:: For the sake of security, be sure the public Internet can not access port 8096 or port 8250 on the Management Server.
+.. warning::
+
+   For the sake of security, be sure the public Internet can not access port 8096 or port 8250 on the Management Server.
 
 The procedure for installing the Management Server is:
 
@@ -343,7 +351,7 @@ node.
 
    Check for a fully qualified hostname.
 
-   ::
+   .. sourcecode:: bash
 
     hostname --fqdn
 
@@ -355,7 +363,7 @@ node.
 
    Make sure that the machine can reach the Internet.
 
-   ::
+   .. sourcecode:: bash
 
     ping www.cloudstack.org
 
@@ -363,15 +371,17 @@ node.
 
    Turn on NTP for time synchronization.
 
-    .. note:: NTP is required to synchronize the clocks of the servers in your cloud.
+    .. note::
+	
+	   NTP is required to synchronize the clocks of the servers in your cloud.
 
     Install NTP.
 
-    ::
+    .. sourcecode:: bash
 
       yum install ntp
 
-    ::
+    .. sourcecode:: bash
 
       apt-get install openntpd
 
@@ -387,7 +397,9 @@ The first step in installation, whether you are installing the
 Management Server on one host or many, is to install the software on a
 single node.
 
-.. note:: If you are planning to install the Management Server on multiple nodes for high availability, do not proceed to the additional nodes yet. That step will come later.
+.. note::
+
+   If you are planning to install the Management Server on multiple nodes for high availability, do not proceed to the additional nodes yet. That step will       come later.
 
 The CloudStack Management server can be installed using either RPM or
 DEB packages. These packages will depend on everything you need to run
@@ -398,14 +410,14 @@ Install on CentOS/RHEL
 
 We start by installing the required packages:
 
-::
+.. sourcecode:: bash
 
     yum install cloudstack-management
 
 Install on Ubuntu
 ^^^^^^^^^^^^^^^^^
 
-::
+.. sourcecode:: bash
 
     apt-get install cloudstack-management
 
@@ -448,11 +460,11 @@ Node” <#management-server-install-db-external>`__.
 
    Install MySQL from the package repository of your distribution:
 
-   ::
+   :.. sourcecode:: bash
 
      yum install mysql-server
 
-   ::
+   .. sourcecode:: bash
 
      apt-get install mysql-server
 
@@ -472,7 +484,7 @@ Node” <#management-server-install-db-external>`__.
 
    .. note:: On Ubuntu, you can also create a file `/etc/mysql/conf.d/cloudstack.cnf` and add these directives there. Don't forget to add [mysqld] on the first line of the file.
 
-   ::
+   .. sourcecode:: bash
 
     innodb_rollback_on_timeout=1
     innodb_lock_wait_timeout=600
@@ -487,13 +499,13 @@ Node” <#management-server-install-db-external>`__.
    On RHEL/CentOS, MySQL doesn't automatically start after installation.
    Start it manually.
 
-   ::
+   .. sourcecode:: bash
 
     service mysqld start
 
    On Ubuntu, restart MySQL.
 
-   ::
+   .. sourcecode:: bash
 
     service mysql restart
 
@@ -501,11 +513,13 @@ Node” <#management-server-install-db-external>`__.
 
    (CentOS and RHEL only; not required on Ubuntu)
 
-   .. warning:: On RHEL and CentOS, MySQL does not set a root password by default. It is very strongly recommended that you set a root password as a security precaution.
+   .. warning::
+   
+      On RHEL and CentOS, MySQL does not set a root password by default. It is very strongly recommended that you set a root password as a security precaution.
 
    Run the following command to secure your installation. You can answer "Y" to all questions.
 
-   ::
+   .. sourcecode:: bash
 
      mysql_secure_installation
 
@@ -525,7 +539,7 @@ Node” <#management-server-install-db-external>`__.
       In RHEL or CentOS, SELinux is installed and enabled by default.
       You can verify this with:
 
-      ::
+      .. sourcecode:: bash
 
           $ rpm -qa | grep selinux
 
@@ -537,19 +551,19 @@ Node” <#management-server-install-db-external>`__.
 
       In RHEL or CentOS:
 
-      ::
+      .. sourcecode:: bash
 
           vi /etc/selinux/config
 
       Change the following line
 
-      ::
+      .. sourcecode:: bash
 
           SELINUX=enforcing
 
       to this:
 
-      ::
+      .. sourcecode:: bash
 
           SELINUX=permissive
 
@@ -558,7 +572,7 @@ Node” <#management-server-install-db-external>`__.
       Set SELinux to permissive starting immediately, without requiring
       a system reboot.
 
-      ::
+      .. sourcecode:: bash
 
           $ setenforce permissive
 
@@ -610,7 +624,7 @@ Node” <#management-server-install-db-external>`__.
       cluster management server node IP. If not specified, the local IP
       address will be used.
 
-   ::
+   .. sourcecode:: bash
 
     cloudstack-setup-databases cloud:<dbpassword>@localhost \
     --deploy-as=root:<password> \
@@ -622,14 +636,16 @@ Node” <#management-server-install-db-external>`__.
    When this script is finished, you should see a message like
    “Successfully initialized the database.”
 
-   .. note:: If the script is unable to connect to the MySQL database, check the "localhost" loopback address in ``/etc/hosts``. It should be pointing to the IPv4 loopback address "127.0.0.1" and not the IPv6 loopback address ::1. Alternatively, reconfigure MySQL to bind to the IPv6 loopback interface.
+   .. note::
+   
+      If the script is unable to connect to the MySQL database, check the "localhost" loopback address in ``/etc/hosts``. It should be pointing to the IPv4 loopback address "127.0.0.1" and not the IPv6 loopback address ::1. Alternatively, reconfigure MySQL to bind to the IPv6 loopback interface.
 
 #. 
 
    If you are running the KVM hypervisor on the same machine with the
    Management Server, edit /etc/sudoers and add the following line:
 
-   ::
+   .. sourcecode:: bash
 
        Defaults:cloud !requiretty
 
@@ -639,7 +655,7 @@ Node” <#management-server-install-db-external>`__.
    for the Management Server. This command will set up iptables,
    sudoers, and start the Management Server.
 
-   ::
+   .. sourcecode:: bash
 
        # cloudstack-setup-management
 
@@ -662,11 +678,11 @@ Management Server Node” <#management-server-install-db-local>`__.
 
    Install MySQL from the package repository from your distribution:
 
-   ::
+   .. sourcecode:: bash
 
        yum install mysql-server
 
-   ::
+   .. sourcecode:: bash
 
        apt-get install mysql-server
 
@@ -679,9 +695,11 @@ Management Server Node” <#management-server-install-db-local>`__.
    number of Management Servers you are deploying. This example assumes
    two Management Servers.
 
-   .. note:: On Ubuntu, you can also create /etc/mysql/conf.d/cloudstack.cnf file and add these directives there. Don't forget to add [mysqld] on the first line of the file.
+   .. note::
+   
+      On Ubuntu, you can also create /etc/mysql/conf.d/cloudstack.cnf file and add these directives there. Don't forget to add [mysqld] on the first line of the file.
 
-   ::
+   .. sourcecode:: bash
 
        innodb_rollback_on_timeout=1
        innodb_lock_wait_timeout=600
@@ -697,13 +715,13 @@ Management Server Node” <#management-server-install-db-local>`__.
    On RHEL/CentOS, MySQL doesn't automatically start after installation.
    Start it manually.
 
-   ::
+   .. sourcecode:: bash
 
        service mysqld start
 
    On Ubuntu, restart MySQL.
 
-   ::
+   .. sourcecode:: bash
 
        service mysql restart
 
@@ -711,9 +729,11 @@ Management Server Node” <#management-server-install-db-local>`__.
 
    (CentOS and RHEL only; not required on Ubuntu)
 
-   .. warning:: On RHEL and CentOS, MySQL does not set a root password by default. It is very strongly recommended that you set a root password as a security precaution. Run the following command to secure your installation. You can answer "Y" to all questions except "Disallow root login remotely?". Remote root login is required to set up the databases.
+   .. warning::
+   
+      On RHEL and CentOS, MySQL does not set a root password by default. It is very strongly recommended that you set a root password as a security precaution. Run the following command to secure your installation. You can answer "Y" to all questions except "Disallow root login remotely?". Remote root login is required to set up the databases.
 
-   ::
+   .. sourcecode:: bash
 
        mysql_secure_installation
 
@@ -725,7 +745,7 @@ Management Server Node” <#management-server-install-db-local>`__.
    On Ubuntu, UFW is the default firewall. Open the port with this
    command:
 
-   ::
+   .. sourcecode:: bash
 
        ufw allow mysql
 
@@ -736,7 +756,7 @@ Management Server Node” <#management-server-install-db-local>`__.
       Edit the /etc/sysconfig/iptables file and add the following line
       at the beginning of the INPUT chain.
 
-      ::
+      .. sourcecode:: bash
 
           -A INPUT -p tcp --dport 3306 -j ACCEPT
 
@@ -744,7 +764,7 @@ Management Server Node” <#management-server-install-db-local>`__.
 
       Now reload the iptables rules.
 
-      ::
+      .. sourcecode:: bash
 
           service iptables restart
 
@@ -798,7 +818,7 @@ Management Server Node” <#management-server-install-db-local>`__.
       cluster management server node IP. If not specified, the local IP
       address will be used.
 
-   ::
+   .. sourcecode:: bash
 
        cloudstack-setup-databases cloud:<dbpassword>@<ip address mysql server> \
        --deploy-as=root:<password> \
@@ -908,7 +928,7 @@ Modify the following list properties available in
 ``client/tomcatconf/componentContext.xml.in`` as applicable, to the
 desired order:
 
-::
+.. sourcecode:: xml
 
         <property name="UserAuthenticators">
              <list>
@@ -944,8 +964,9 @@ Cloud Infrastructure Overview). Both of these can be NFS shares. This
 section tells how to set up the NFS shares before adding the storage to
 CloudStack.
 
-.. note:: NFS is not the only option for primary or secondary storage. For example, you may use Ceph RBD, GlusterFS, iSCSI, and others. The choice of storage system will depend on the choice of hypervisor and whether
-you are dealing with primary or secondary storage.
+.. note::
+
+   NFS is not the only option for primary or secondary storage. For example, you may use Ceph RBD, GlusterFS, iSCSI, and others. The choice of storage system     will depend on the choice of hypervisor and whether you are dealing with primary or secondary storage.
 
 The requirements for primary and secondary storage are described in:
 
@@ -976,8 +997,9 @@ from the Management Server.
 The exact commands for the following steps may vary depending on your
 operating system version.
 
-.. warning:: (KVM only) Ensure that no volume is already mounted at your NFS mount
-point.
+.. warning::
+
+   (KVM only) Ensure that no volume is already mounted at your NFS mount point.
 
 #. 
 
@@ -985,7 +1007,7 @@ point.
    if you are using NFS for primary storage as well, create a second NFS
    share. For example:
 
-   ::
+   .. sourcecode:: bash
 
        # mkdir -p /export/primary
        # mkdir -p /export/secondary
@@ -996,13 +1018,13 @@ point.
    Export the NFS share(s) with
    rw,async,no\_root\_squash,no\_subtree\_check. For example:
 
-   ::
+   .. sourcecode:: bash
 
        # vi /etc/exports
 
    Insert the following line.
 
-   ::
+   .. sourcecode:: bash
 
        /export  *(rw,async,no_root_squash,no_subtree_check)
 
@@ -1010,7 +1032,7 @@ point.
 
    Export the /export directory.
 
-   ::
+   .. sourcecode:: bash
 
        # exportfs -a
 
@@ -1019,7 +1041,7 @@ point.
    On the management server, create a mount point for secondary storage.
    For example:
 
-   ::
+   .. sourcecode:: bash
 
        # mkdir -p /mnt/secondary
 
@@ -1028,7 +1050,7 @@ point.
    Mount the secondary storage on your Management Server. Replace the
    example NFS server name and NFS share paths below with your own.
 
-   ::
+   .. sourcecode:: bash
 
        # mount -t nfs nfsservername:/nfs/share/secondary /mnt/secondary
 
@@ -1048,7 +1070,7 @@ operating system version.
 
    On RHEL/CentOS systems, you'll need to install the nfs-utils package:
 
-   ::
+   .. sourcecode:: bash
 
        $ sudo yum install nfs-utils
 
@@ -1057,7 +1079,7 @@ operating system version.
    On the Management Server host, create two directories that you will
    use for primary and secondary storage. For example:
 
-   ::
+   .. sourcecode:: bash
 
        # mkdir -p /export/primary
        # mkdir -p /export/secondary
@@ -1068,13 +1090,13 @@ operating system version.
    Export the NFS share(s) with
    rw,async,no\_root\_squash,no\_subtree\_check. For example:
 
-   ::
+   .. sourcecode:: bash
 
        # vi /etc/exports
 
    Insert the following line.
 
-   ::
+   .. sourcecode:: bash
 
        /export  *(rw,async,no_root_squash,no_subtree_check)
 
@@ -1082,7 +1104,7 @@ operating system version.
 
    Export the /export directory.
 
-   ::
+   .. sourcecode:: bash
 
        # exportfs -a
 
@@ -1090,13 +1112,13 @@ operating system version.
 
    Edit the /etc/sysconfig/nfs file.
 
-   ::
+   .. sourcecode:: bash
 
        # vi /etc/sysconfig/nfs
 
    Uncomment the following lines:
 
-   ::
+   .. sourcecode:: bash
 
        LOCKD_TCPPORT=32803
        LOCKD_UDPPORT=32769
@@ -1109,14 +1131,14 @@ operating system version.
 
    Edit the /etc/sysconfig/iptables file.
 
-   ::
+   .. sourcecode:: bash
 
        # vi /etc/sysconfig/iptables
 
    Add the following lines at the beginning of the INPUT chain, where
    <NETWORK> is the network that you'll be using:
 
-   ::
+   .. sourcecode:: bash
 
        -A INPUT -s <NETWORK> -m state --state NEW -p udp --dport 111 -j ACCEPT
        -A INPUT -s <NETWORK> -m state --state NEW -p tcp --dport 111 -j ACCEPT
@@ -1134,7 +1156,7 @@ operating system version.
 
    Run the following commands:
 
-   ::
+   .. sourcecode:: bash
 
        # service iptables restart
        # service iptables save
@@ -1145,7 +1167,7 @@ operating system version.
    domain to /etc/idmapd.conf on both the hypervisor host and Management
    Server.
 
-   ::
+   .. sourcecode:: bash
 
        # vi /etc/idmapd.conf
 
@@ -1153,7 +1175,7 @@ operating system version.
    idmapd.conf and replace the value in the file with your own domain.
    In the example below, the domain is company.com.
 
-   ::
+   .. sourcecode:: bash
 
        Domain = company.com
 
@@ -1178,7 +1200,7 @@ operating system version.
       Be sure NFS and rpcbind are running. The commands might be
       different depending on your OS. For example:
 
-      ::
+      .. sourcecode:: bash
 
           # service rpcbind start
           # service nfs start
@@ -1192,7 +1214,7 @@ operating system version.
       directories. For example, substitute your own management server
       name:
 
-      ::
+      .. sourcecode:: bash
 
           # mkdir /primary
           # mount -t nfs <management-server-name>:/export/primary
@@ -1230,7 +1252,7 @@ OS for the Management Server.
 
    Ensure that necessary services are started and set to start on boot.
 
-   ::
+   .. sourcecode:: bash
 
        # service rpcbind start
        # service nfs start
@@ -1244,7 +1266,7 @@ OS for the Management Server.
    command, see `Section 4.5.4.2, “Install the Database on a Separate
    Node” <#management-server-install-db-external>`__.)
 
-   ::
+   .. sourcecode:: bash
 
        # cloudstack-setup-databases cloud:dbpassword@dbhost -e encryption_type -m management_server_key -k database_key -i management_server_ip
 
@@ -1252,7 +1274,7 @@ OS for the Management Server.
 
    Configure the OS and start the Management Server:
 
-   ::
+   .. sourcecode:: bash
 
        # cloudstack-setup-management
 
@@ -1274,7 +1296,9 @@ Prepare the System VM Template
 Secondary storage must be seeded with a template that is used for
 CloudStack system VMs.
 
-.. 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.
 
 #. 
 
@@ -1298,7 +1322,7 @@ CloudStack system VMs.
 
       For Hyper-V
 
-   ::
+   .. sourcecode:: bash
 
           # /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/4.3/systemvm64template-2013-12-23-hyperv.vhd.bz2 -h hyperv -s <optional-management-server-secret-key> -F
 
@@ -1306,7 +1330,7 @@ CloudStack system VMs.
 
       For XenServer:
 
-   ::
+   .. sourcecode:: bash
 
           # /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/acton/acton-systemvm-02062012.vhd.bz2 -h xenserver -s <optional-management-server-secret-key> -F
 
@@ -1314,7 +1338,7 @@ CloudStack system VMs.
 
       For vSphere:
 
-   ::
+   .. sourcecode:: bash
 
           # /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/burbank/burbank-systemvm-08012012.ova -h vmware -s <optional-management-server-secret-key>  -F
 
@@ -1322,7 +1346,7 @@ CloudStack system VMs.
 
       For KVM:
 
-   ::
+   .. sourcecode:: bash
 
           # /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2 -h kvm -s <optional-management-server-secret-key> -F
 
@@ -1330,13 +1354,13 @@ CloudStack system VMs.
 
       For LXC:
 
-   ::
+   .. sourcecode:: bash
 
           # /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2 -h lxc -s <optional-management-server-secret-key> -F
 
    On Ubuntu, use the following path instead:
 
-   ::
+   .. sourcecode:: bash
 
        # /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt
 
@@ -1349,7 +1373,7 @@ CloudStack system VMs.
    When the script has finished, unmount secondary storage and remove
    the created directory.
 
-   ::
+   .. sourcecode:: bash
 
        # umount /mnt/secondary
        # rmdir /mnt/secondary
@@ -1382,72 +1406,4 @@ What should you do next?
    infrastructure. See Provision Your Cloud Infrastructure.
 
 
-.. |1000-foot-view.png: Overview of CloudStack| image:: ./_static/images/1000-foot-view.png
-.. |basic-deployment.png: Basic two-machine deployment| image:: ./_static/images/basic-deployment.png
-.. |infrastructure_overview.png: Nested organization of a zone| image:: ./_static/images/infrastructure-overview.png
-.. |region-overview.png: Nested structure of a region.| image:: ./_static/images/region-overview.png
-.. |zone-overview.png: Nested structure of a simple zone.| image:: ./_static/images/zone-overview.png
-.. |pod-overview.png: Nested structure of a simple pod| image:: ./_static/images/pod-overview.png
-.. |cluster-overview.png: Structure of a simple cluster| image:: ./_static/images/cluster-overview.png
-.. |installation-complete.png: Finished installs with single Management Server and multiple Management Servers| image:: ./_static/images/installation-complete.png
-.. |change-password.png: button to change a user's password| image:: ./_static/images/change-password.png
-.. |provisioning-overview.png: Conceptual overview of a basic deployment| image:: ./_static/images/provisioning-overview.png
-.. |vsphereclient.png: vSphere client| image:: ./_static/images/vsphere-client.png
-.. |addcluster.png: add a cluster| image:: ./_static/images/add-cluster.png
-.. |ConsoleButton.png: button to launch a console| image:: ./_static/images/console-icon.png
-.. |DeleteButton.png: button to delete dvSwitch| image:: ./_static/images/delete-button.png
-.. |vds-name.png: Name of the dvSwitch as specified in the vCenter.| image:: ./_static/images/vds-name.png
-.. |traffic-type.png: virtual switch type| image:: ./_static/images/traffic-type.png
-.. |dvSwitchConfig.png: Configuring dvSwitch| image:: ./_static/images/dvSwitch-config.png
-.. |Small-Scale Deployment| image:: ./_static/images/small-scale-deployment.png
-.. |Large-Scale Redundant Setup| image:: ./_static/images/large-scale-redundant-setup.png
-.. |Multi-Node Management Server| image:: ./_static/images/multi-node-management-server.png
-.. |Example Of A Multi-Site Deployment| image:: ./_static/images/multi-site-deployment.png
-.. |Separate Storage Network| image:: ./_static/images/separate-storage-network.png
-.. |NIC Bonding And Multipath I/O| image:: ./_static/images/nic-bonding-and-multipath-io.png
-.. |Use the GUI to set the configuration variable to true| image:: ./_static/images/ec2-s3-configuration.png
-.. |Use the GUI to set the name of a compute service offering to an EC2 instance type API name.| image:: ./_static/images/compute-service-offerings.png
-.. |parallel-mode.png: adding a firewall and load balancer in parallel mode.| image:: ./_static/images/parallel-mode.png
-.. |guest-traffic-setup.png: Depicts a guest traffic setup| image:: ./_static/images/guest-traffic-setup.png
-.. |networksinglepod.png: diagram showing logical view of network in a pod| image:: ./_static/images/network-singlepod.png
-.. |networksetupzone.png: Depicts network setup in a single zone| image:: ./_static/images/network-setup-zone.png
-.. |addguestnetwork.png: Add Guest network setup in a single zone| image:: ./_static/images/add-guest-network.png
-.. |remove-nic.png: button to remove a NIC| image:: ./_static/images/remove-nic.png
-.. |set-default-nic.png: button to set a NIC as default one.| image:: ./_static/images/set-default-nic.png
-.. |EditButton.png: button to edit a network| image:: ./_static/images/edit-icon.png
-.. |edit-icon.png: button to edit a network| image:: ./_static/images/edit-icon.png
-.. |addAccount-icon.png: button to assign an IP range to an account.| image:: ./_static/images/addAccount-icon.png
-.. |eip-ns-basiczone.png: Elastic IP in a NetScaler-enabled Basic Zone.| image:: ./_static/images/eip-ns-basiczone.png
-.. |add-ip-range.png: adding an IP range to a network.| image:: ./_static/images/add-ip-range.png
-.. |httpaccess.png: allows inbound HTTP access from anywhere| image:: ./_static/images/http-access.png
-.. |autoscaleateconfig.png: Configuring AutoScale| image:: ./_static/images/autoscale-config.png
-.. |EnableDisable.png: button to enable or disable AutoScale.| image:: ./_static/images/enable-disable-autoscale.png
-.. |gslb.png: GSLB architecture| image:: ./_static/images/gslb.png
-.. |gslb-add.png: adding a gslb rule| image:: ./_static/images/add-gslb.png
-.. |ReleaseIPButton.png: button to release an IP| image:: ./_static/images/release-ip-icon.png
-.. |EnableNATButton.png: button to enable NAT| image:: ./_static/images/enable-disable.png
-.. |egress-firewall-rule.png: adding an egress firewall rule| image:: ./_static/images/egress-firewall-rule.png
-.. |AttachDiskButton.png: button to attach a volume| image:: ./_static/images/vpn-icon.png
-.. |vpn-icon.png: button to enable VPN| image:: ./_static/images/vpn-icon.png
-.. |addvpncustomergateway.png: adding a customer gateway.| image:: ./_static/images/add-vpn-customer-gateway.png
-.. |edit.png: button to edit a VPN customer gateway| image:: ./_static/images/edit-icon.png
-.. |delete.png: button to remove a VPN customer gateway| image:: ./_static/images/delete-button.png
-.. |createvpnconnection.png: creating a VPN connection to the customer gateway.| image:: ./_static/images/create-vpn-connection.png
-.. |remove-vpn.png: button to remove a VPN connection| image:: ./_static/images/remove-vpn.png
-.. |reset-vpn.png: button to reset a VPN connection| image:: ./_static/images/reset-vpn.png
-.. |mutltier.png: a multi-tier setup.| image:: ./_static/images/multi-tier-app.png
-.. |add-vpc.png: adding a vpc.| image:: ./_static/images/add-vpc.png
-.. |add-tier.png: adding a tier to a vpc.| image:: ./_static/images/add-tier.png
-.. |replace-acl-icon.png: button to replace an ACL list| image:: ./_static/images/replace-acl-icon.png
-.. |add-new-gateway-vpc.png: adding a private gateway for the VPC.| image:: ./_static/images/add-new-gateway-vpc.png
-.. |replace-acl-icon.png: button to replace the default ACL behaviour.| image:: ./_static/images/replace-acl-icon.png
-.. |add-vm-vpc.png: adding a VM to a vpc.| image:: ./_static/images/add-vm-vpc.png
-.. |addvm-tier-sharednw.png: adding a VM to a VPC tier and shared network.| image:: ./_static/images/addvm-tier-sharednw.png
-.. |release-ip-icon.png: button to release an IP.| image:: ./_static/images/release-ip-icon.png
-.. |enable-disable.png: button to enable Static NAT.| image:: ./_static/images/enable-disable.png
-.. |select-vmstatic-nat.png: selecting a tier to apply staticNAT.| image:: ./_static/images/select-vm-staticnat-vpc.png
-.. |vpc-lb.png: Configuring internal LB for VPC| image:: ./_static/images/vpc-lb.png
-.. |del-tier.png: button to remove a tier| image:: ./_static/images/del-tier.png
-.. |remove-vpc.png: button to remove a VPC| image:: ./_static/images/remove-vpc.png
-.. |edit-icon.png: button to edit a VPC| image:: ./_static/images/edit-icon.png
-.. |restart-vpc.png: button to restart a VPC| image:: ./_static/images/restart-vpc.png
+.. |installation-complete.png: Finished installs with single Management Server and multiple Management Servers| image:: ./_static/images/installation-complete.png
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/7f2027bb/source/network_setup.rst
----------------------------------------------------------------------
diff --git a/source/network_setup.rst b/source/network_setup.rst
index 35e6d82..2c46513 100644
--- a/source/network_setup.rst
+++ b/source/network_setup.rst
@@ -103,7 +103,7 @@ The Dell 62xx Series switch supports up to 1024 VLANs.
 
    Configure all the VLANs in the database.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        vlan database
        vlan 200-999
@@ -113,7 +113,7 @@ The Dell 62xx Series switch supports up to 1024 VLANs.
 
    Configure Ethernet port 1/g1.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        interface ethernet 1/g1
        switchport mode general
@@ -146,7 +146,7 @@ GigabitEthernet1/0/1.
    1000. Since we only use VLANs up to 999, vtp transparent mode is not
    strictly required.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        vtp mode transparent
        vlan 200-999
@@ -156,7 +156,7 @@ GigabitEthernet1/0/1.
 
    Configure GigabitEthernet1/0/1.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        interface GigabitEthernet1/0/1
        switchport trunk encapsulation dot1q
@@ -205,7 +205,7 @@ layer-2 switching.
 
    Configure all the VLANs in the database.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        vlan database
        vlan 300-999
@@ -216,7 +216,7 @@ layer-2 switching.
    VLAN 201 is used to route untagged private IP addresses for pod 1,
    and pod 1 is connected to this layer-2 switch.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        interface range ethernet all
        switchport mode general
@@ -246,7 +246,7 @@ layer-2 switching.
    1000. Since we only use VLANs up to 999, vtp transparent mode is not
    strictly required.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        vtp mode transparent
        vlan 300-999
@@ -256,7 +256,7 @@ layer-2 switching.
 
    Configure all ports to dot1q and set 201 as the native VLAN.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        interface range GigabitEthernet 1/0/1-24
        switchport trunk encapsulation dot1q
@@ -303,7 +303,9 @@ NAT and site-to-site VPN can be used.
 External Guest Firewall Integration for Juniper SRX (Optional)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. note:: Available only for guests using advanced networking.
+.. note::
+
+   Available only for guests using advanced networking.
 
 CloudStack provides for direct management of the Juniper SRX series of
 firewalls. This enables CloudStack to establish static NAT mappings from
@@ -321,7 +323,9 @@ mode.|
 
 CloudStack requires the Juniper SRX firewall to be configured as follows:
 
-.. note:: Supported SRX software version is 10.3 or higher.
+.. note::
+
+   Supported SRX software version is 10.3 or higher.
 
 #. 
 
@@ -380,7 +384,7 @@ CloudStack requires the Juniper SRX firewall to be configured as follows:
       here is the configuration where the public zone is "untrust" and
       the private zone is "trust":
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           root@cloud-srx# show firewall
           filter trust {
@@ -396,7 +400,7 @@ CloudStack requires the Juniper SRX firewall to be configured as follows:
       sample configuration output (for public interface ge-0/0/3.0,
       public security zone untrust, and private security zone trust) is:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           ge-0/0/3 {
               unit 0 {
@@ -632,9 +636,7 @@ Prerequisites
 
    Deploy and configure Cisco VNMC.
 
-   For more information, see `Installing Cisco Virtual Network
-   Management
-   Center <http://www.cisco.com/en/US/docs/switches/datacenter/vsg/sw/4_2_1_VSG_2_1_1/install_upgrade/guide/b_Cisco_VSG_for_VMware_vSphere_Rel_4_2_1_VSG_2_1_1_and_Cisco_VNMC_Rel_2_1_Installation_and_Upgrade_Guide_chapter_011.html>`__
+   For more information, see `Installing Cisco Virtual Network Management Center <http://www.cisco.com/en/US/docs/switches/datacenter/vsg/sw/4_2_1_VSG_2_1_1/install_upgrade/guide/b_Cisco_VSG_for_VMware_vSphere_Rel_4_2_1_VSG_2_1_1_and_Cisco_VNMC_Rel_2_1_Installation_and_Upgrade_Guide_chapter_011.html>`__
    and `Configuring Cisco Virtual Network Management
    Center <http://www.cisco.com/en/US/docs/unified_computing/vnmc/sw/1.2/VNMC_GUI_Configuration/b_VNMC_GUI_Configuration_Guide_1_2_chapter_010.html>`__.
 
@@ -965,13 +967,13 @@ the SSH credentials by registering on VNMC.
 
       Run the following:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           ASA1000V(config)# reload
 
       You are prompted with the following message:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           System config has been modified. Save? [Y]es/[N]o:"
 
@@ -981,7 +983,7 @@ the SSH credentials by registering on VNMC.
 
       You will get the following confirmation message:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           "Proceed with reload? [confirm]"
 
@@ -993,7 +995,7 @@ the SSH credentials by registering on VNMC.
 
    Register the ASA 1000v appliance with the VNMC:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        ASA1000V(config)# vnmc policy-agent
        ASA1000V(config-vnmc-policy-agent)# registration host vnmc_ip_address
@@ -1332,73 +1334,4 @@ Based on your deployment's needs, choose the appropriate value of
 guest.vlan.bits. Set it as described in Edit the Global Configuration
 Settings (Optional) section and restart the Management Server.
 
-
-.. |1000-foot-view.png: Overview of CloudStack| image:: ./_static/images/1000-foot-view.png
-.. |basic-deployment.png: Basic two-machine deployment| image:: ./_static/images/basic-deployment.png
-.. |infrastructure_overview.png: Nested organization of a zone| image:: ./_static/images/infrastructure-overview.png
-.. |region-overview.png: Nested structure of a region.| image:: ./_static/images/region-overview.png
-.. |zone-overview.png: Nested structure of a simple zone.| image:: ./_static/images/zone-overview.png
-.. |pod-overview.png: Nested structure of a simple pod| image:: ./_static/images/pod-overview.png
-.. |cluster-overview.png: Structure of a simple cluster| image:: ./_static/images/cluster-overview.png
-.. |installation-complete.png: Finished installs with single Management Server and multiple Management Servers| image:: ./_static/images/installation-complete.png
-.. |change-password.png: button to change a user's password| image:: ./_static/images/change-password.png
-.. |provisioning-overview.png: Conceptual overview of a basic deployment| image:: ./_static/images/provisioning-overview.png
-.. |vsphereclient.png: vSphere client| image:: ./_static/images/vsphere-client.png
-.. |addcluster.png: add a cluster| image:: ./_static/images/add-cluster.png
-.. |ConsoleButton.png: button to launch a console| image:: ./_static/images/console-icon.png
-.. |DeleteButton.png: button to delete dvSwitch| image:: ./_static/images/delete-button.png
-.. |vds-name.png: Name of the dvSwitch as specified in the vCenter.| image:: ./_static/images/vds-name.png
-.. |traffic-type.png: virtual switch type| image:: ./_static/images/traffic-type.png
-.. |dvSwitchConfig.png: Configuring dvSwitch| image:: ./_static/images/dvSwitch-config.png
-.. |Small-Scale Deployment| image:: ./_static/images/small-scale-deployment.png
-.. |Large-Scale Redundant Setup| image:: ./_static/images/large-scale-redundant-setup.png
-.. |Multi-Node Management Server| image:: ./_static/images/multi-node-management-server.png
-.. |Example Of A Multi-Site Deployment| image:: ./_static/images/multi-site-deployment.png
-.. |Separate Storage Network| image:: ./_static/images/separate-storage-network.png
-.. |NIC Bonding And Multipath I/O| image:: ./_static/images/nic-bonding-and-multipath-io.png
-.. |Use the GUI to set the configuration variable to true| image:: ./_static/images/ec2-s3-configuration.png
-.. |Use the GUI to set the name of a compute service offering to an EC2 instance type API name.| image:: ./_static/images/compute-service-offerings.png
 .. |parallel-mode.png: adding a firewall and load balancer in parallel mode.| image:: ./_static/images/parallel-mode.png
-.. |guest-traffic-setup.png: Depicts a guest traffic setup| image:: ./_static/images/guest-traffic-setup.png
-.. |networksinglepod.png: diagram showing logical view of network in a pod| image:: ./_static/images/network-singlepod.png
-.. |networksetupzone.png: Depicts network setup in a single zone| image:: ./_static/images/network-setup-zone.png
-.. |addguestnetwork.png: Add Guest network setup in a single zone| image:: ./_static/images/add-guest-network.png
-.. |remove-nic.png: button to remove a NIC| image:: ./_static/images/remove-nic.png
-.. |set-default-nic.png: button to set a NIC as default one.| image:: ./_static/images/set-default-nic.png
-.. |EditButton.png: button to edit a network| image:: ./_static/images/edit-icon.png
-.. |edit-icon.png: button to edit a network| image:: ./_static/images/edit-icon.png
-.. |addAccount-icon.png: button to assign an IP range to an account.| image:: ./_static/images/addAccount-icon.png
-.. |eip-ns-basiczone.png: Elastic IP in a NetScaler-enabled Basic Zone.| image:: ./_static/images/eip-ns-basiczone.png
-.. |add-ip-range.png: adding an IP range to a network.| image:: ./_static/images/add-ip-range.png
-.. |httpaccess.png: allows inbound HTTP access from anywhere| image:: ./_static/images/http-access.png
-.. |autoscaleateconfig.png: Configuring AutoScale| image:: ./_static/images/autoscale-config.png
-.. |EnableDisable.png: button to enable or disable AutoScale.| image:: ./_static/images/enable-disable-autoscale.png
-.. |gslb.png: GSLB architecture| image:: ./_static/images/gslb.png
-.. |gslb-add.png: adding a gslb rule| image:: ./_static/images/add-gslb.png
-.. |ReleaseIPButton.png: button to release an IP| image:: ./_static/images/release-ip-icon.png
-.. |EnableNATButton.png: button to enable NAT| image:: ./_static/images/enable-disable.png
-.. |egress-firewall-rule.png: adding an egress firewall rule| image:: ./_static/images/egress-firewall-rule.png
-.. |AttachDiskButton.png: button to attach a volume| image:: ./_static/images/vpn-icon.png
-.. |vpn-icon.png: button to enable VPN| image:: ./_static/images/vpn-icon.png
-.. |addvpncustomergateway.png: adding a customer gateway.| image:: ./_static/images/add-vpn-customer-gateway.png
-.. |edit.png: button to edit a VPN customer gateway| image:: ./_static/images/edit-icon.png
-.. |delete.png: button to remove a VPN customer gateway| image:: ./_static/images/delete-button.png
-.. |createvpnconnection.png: creating a VPN connection to the customer gateway.| image:: ./_static/images/create-vpn-connection.png
-.. |remove-vpn.png: button to remove a VPN connection| image:: ./_static/images/remove-vpn.png
-.. |reset-vpn.png: button to reset a VPN connection| image:: ./_static/images/reset-vpn.png
-.. |mutltier.png: a multi-tier setup.| image:: ./_static/images/multi-tier-app.png
-.. |add-vpc.png: adding a vpc.| image:: ./_static/images/add-vpc.png
-.. |add-tier.png: adding a tier to a vpc.| image:: ./_static/images/add-tier.png
-.. |replace-acl-icon.png: button to replace an ACL list| image:: ./_static/images/replace-acl-icon.png
-.. |add-new-gateway-vpc.png: adding a private gateway for the VPC.| image:: ./_static/images/add-new-gateway-vpc.png
-.. |replace-acl-icon.png: button to replace the default ACL behaviour.| image:: ./_static/images/replace-acl-icon.png
-.. |add-vm-vpc.png: adding a VM to a vpc.| image:: ./_static/images/add-vm-vpc.png
-.. |addvm-tier-sharednw.png: adding a VM to a VPC tier and shared network.| image:: ./_static/images/addvm-tier-sharednw.png
-.. |release-ip-icon.png: button to release an IP.| image:: ./_static/images/release-ip-icon.png
-.. |enable-disable.png: button to enable Static NAT.| image:: ./_static/images/enable-disable.png
-.. |select-vmstatic-nat.png: selecting a tier to apply staticNAT.| image:: ./_static/images/select-vm-staticnat-vpc.png
-.. |vpc-lb.png: Configuring internal LB for VPC| image:: ./_static/images/vpc-lb.png
-.. |del-tier.png: button to remove a tier| image:: ./_static/images/del-tier.png
-.. |remove-vpc.png: button to remove a VPC| image:: ./_static/images/remove-vpc.png
-.. |edit-icon.png: button to edit a VPC| image:: ./_static/images/edit-icon.png
-.. |restart-vpc.png: button to restart a VPC| image:: ./_static/images/restart-vpc.png

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/7f2027bb/source/optional_installation.rst
----------------------------------------------------------------------
diff --git a/source/optional_installation.rst b/source/optional_installation.rst
index 6d69733..f6555e7 100644
--- a/source/optional_installation.rst
+++ b/source/optional_installation.rst
@@ -51,7 +51,7 @@ Steps to Install the Usage Server
 
    Run ./install.sh (NOT VALID, NEED CORRECTION)
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # ./install.sh
 
@@ -62,7 +62,7 @@ Steps to Install the Usage Server
 
    Choose "S" to install the Usage Server.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
           > S
 
@@ -70,7 +70,7 @@ Steps to Install the Usage Server
 
    Once installed, start the Usage Server with the following command.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # service cloudstack-usage start
 
@@ -102,7 +102,9 @@ standby node that receives all write operations from the master and
 applies them to a local, redundant copy of the database. The following
 steps are a guide to implementing MySQL replication.
 
-.. note:: Creating a replica is not a backup solution. You should develop a backup procedure for the MySQL data that is distinct from replication.
+.. note:: 
+
+   Creating a replica is not a backup solution. You should develop a backup procedure for the MySQL data that is distinct from replication.
 
 #. 
 
@@ -113,7 +115,7 @@ steps are a guide to implementing MySQL replication.
    Edit my.cnf on the master and add the following in the [mysqld]
    section below datadir.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        log_bin=mysql-bin
        server_id=1
@@ -127,13 +129,13 @@ steps are a guide to implementing MySQL replication.
 
    Restart the MySQL service. On RHEL/CentOS systems, use:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # service mysqld restart
 
    On Debian/Ubuntu systems, use:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # service mysql restart
 
@@ -143,7 +145,7 @@ steps are a guide to implementing MySQL replication.
    will use the "cloud-repl" user with the password "password". This
    assumes that master and slave run on the 172.16.1.0/24 network.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # mysql -u root
        mysql> create user 'cloud-repl'@'172.16.1.%' identified by 'password';
@@ -163,7 +165,7 @@ steps are a guide to implementing MySQL replication.
 
    Retrieve the current position of the database.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # mysql -u root
        mysql> show master status;
@@ -186,7 +188,7 @@ steps are a guide to implementing MySQL replication.
    Complete the master setup. Returning to your first session on the
    master, release the locks and exit MySQL.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        mysql> unlock tables;
 
@@ -195,7 +197,7 @@ steps are a guide to implementing MySQL replication.
    Install and configure the slave. On the slave server, run the
    following commands.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # yum install mysql-server
        # chkconfig mysqld on
@@ -205,7 +207,7 @@ steps are a guide to implementing MySQL replication.
    Edit my.cnf and add the following lines in the [mysqld] section below
    datadir.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        server_id=2
        innodb_rollback_on_timeout=1
@@ -215,13 +217,13 @@ steps are a guide to implementing MySQL replication.
 
    Restart MySQL. Use "mysqld" on RHEL/CentOS systems:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # service mysqld restart
 
    On Ubuntu/Debian systems use "mysql."
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # service mysql restart
 
@@ -231,7 +233,7 @@ steps are a guide to implementing MySQL replication.
    Replace the IP address, password, log file, and position with the
    values you have used in the previous steps.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        mysql> change master to
            -> master_host='172.16.1.217',
@@ -244,7 +246,7 @@ steps are a guide to implementing MySQL replication.
 
    Then start replication on the slave.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        mysql> start slave;
 
@@ -289,7 +291,7 @@ administrator. In the event of a database failure you should:
 
    Restart the Management Servers:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # service cloudstack-management start
 
@@ -308,9 +310,13 @@ CloudStack, listening on a different port. The Amazon Web Services (AWS)
 compatible interface provides the EC2 SOAP and Query APIs as well as the
 S3 REST API.
 
-.. note:: This service was previously enabled by separate software called CloudBridge. It is now fully integrated with the CloudStack management server.
+.. note::
+
+   This service was previously enabled by separate software called CloudBridge. It is now fully integrated with the CloudStack management server.
+
+.. warning::
 
-.. warning:: The compatible interface for the EC2 Query API and the S3 API are Work In Progress. The S3 compatible API offers a way to store data on the management server file system, it is not an implementation of the S3 backend.
+   The compatible interface for the EC2 Query API and the S3 API are Work In Progress. The S3 compatible API offers a way to store data on the management         server file system, it is not an implementation of the S3 backend.
 
 Limitations
 
@@ -346,7 +352,9 @@ Supported API Version
    tools v. 1.3.6230*, which can be downloaded at
    `http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip <http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip>`__.
 
-.. note:: Work is underway to support a more recent version of the EC2 API
+.. note:: 
+
+   Work is underway to support a more recent version of the EC2 API
 
 Enabling the EC2 and S3 Compatible Interface
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -366,14 +374,16 @@ prior to using it.
    the Amazon service offerings. You can do this through the CloudStack
    UI as described in the Administration Guide.
 
-   .. warning:: Be sure you have included the Amazon default service offering, m1.small. As well as any EC2 instance types that you will use.
+   .. warning::
+   
+      Be sure you have included the Amazon default service offering, m1.small. As well as any EC2 instance types that you will use.
 
 #. 
 
    If you did not already do so when you set the configuration parameter
    in step `1 <#set-global-config>`__, restart the Management Server.
 
-   ::
+   .. sourcecode:: bash
 
      # service cloudstack-management restart
 
@@ -397,7 +407,7 @@ integration port on which you can make unauthenticated calls. In Global
 Settings set the port to 8096 and subsequently call the
 *updateConfiguration* method. The following urls shows you how:
 
-::
+.. sourcecode:: bash
 
     http://localhost:8096/client/api?command=updateConfiguration&name=enable.ec2.api&value=true
     http://localhost:8096/client/api?command=updateConfiguration&name=enable.ec2.api&value=true
@@ -421,7 +431,9 @@ instance type API name.|
 Modifying the AWS API Port
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. note:: (Optional) The AWS API listens for requests on port 7080. If you prefer AWS API to listen on another port, you can change it as follows:
+.. note::
+
+   (Optional) The AWS API listens for requests on port 7080. If you prefer AWS API to listen on another port, you can change it as follows:
 
    #. 
 
@@ -489,7 +501,7 @@ To use the EC2 command-line tools, the user must perform these steps:
    CloudStack management server and port. In a bash shell do the
    following.
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ export EC2_CERT=/path/to/cert.pem
     $ export EC2_PRIVATE_KEY=/path/to/private_key.pem
@@ -507,23 +519,25 @@ command-line parameters to any CloudStack-supported EC2 command:
 
 Specifies a connection timeout (in seconds)
 
-.. code:: bash
+.. sourcecode:: bash
                                
      --connection-timeout TIMEOUT
 
 Specifies a request timeout (in seconds)
 
-.. code:: bash
+.. sourcecode:: bash
 
     --request-timeout TIMEOUT
 
 Example:
 
-.. code:: bash
+.. sourcecode:: bash
 
     ec2-run-instances 2 –z us-test1 –n 1-3 --connection-timeout 120 --request-timeout 120
 
-.. note:: The timeouts optional arguments are not specific to CloudStack.
+.. note::
+
+    The timeouts optional arguments are not specific to CloudStack.
 
 Supported AWS API Calls
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -730,7 +744,7 @@ own and update the endpoint.
 Example 1. An EC2 Boto example
                                  
 
-.. code:: python
+.. sourcecode:: python
 
     #!/usr/bin/env python
 
@@ -771,7 +785,7 @@ Second is an S3 example. The S3 interface in CloudStack is obsolete. If you need
 Example 2. An S3 Boto Example
                                 
 
-.. code:: python
+.. sourcecode:: python
 
     #!/usr/bin/env python
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/7f2027bb/source/storage_setup.rst
----------------------------------------------------------------------
diff --git a/source/storage_setup.rst b/source/storage_setup.rst
index 39be232..1b46e25 100644
--- a/source/storage_setup.rst
+++ b/source/storage_setup.rst
@@ -47,7 +47,9 @@ CloudStack is designed to work with any scalable secondary storage
 system. The only requirement is the secondary storage system supports
 the NFS protocol.
 
-.. note:: The storage server should be a machine with a large number of disks. The disks should ideally be managed by a hardware RAID controller. Modern hardware RAID controllers support hot plug functionality independent of the operating system so you can replace faulty disks without impacting the running operating system.
+.. note::
+
+   The storage server should be a machine with a large number of disks. The disks should ideally be managed by a hardware RAID controller. Modern hardware RAID    controllers support hot plug functionality independent of the operating system so you can replace faulty disks without impacting the running operating          system.
 
 Example Configurations
 ----------------------
@@ -89,7 +91,7 @@ operating system version.
    After /export directory is created, run the following command to
    configure it as an NFS export.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # echo "/export <CIDR>(rw,async,no_root_squash,no_subtree_check)" >> /etc/exports
 
@@ -109,7 +111,7 @@ operating system version.
 
       The following is an example with separate CIDRs:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           /export 192.168.1.0/24(rw,async,no_root_squash,no_subtree_check) 10.50.1.0/24(rw,async,no_root_squash,no_subtree_check)
 
@@ -124,7 +126,7 @@ operating system version.
 
    Run the following command to enable NFS service.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # chkconfig nfs on
 
@@ -132,7 +134,7 @@ operating system version.
 
    Edit the /etc/sysconfig/nfs file and uncomment the following lines.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        LOCKD_TCPPORT=32803
        LOCKD_UDPPORT=32769
@@ -146,7 +148,7 @@ operating system version.
    Edit the /etc/sysconfig/iptables file and add the following lines at
    the beginning of the INPUT chain.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        -A INPUT -m state --state NEW -p udp --dport 111 -j ACCEPT
        -A INPUT -m state --state NEW -p tcp --dport 111 -j ACCEPT
@@ -166,7 +168,9 @@ operating system version.
 
    An NFS share called /export is now set up.
 
-.. 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.
 
 Linux NFS on iSCSI
 ~~~~~~~~~~~~~~~~~~
@@ -178,7 +182,7 @@ volume. These steps apply to RHEL/CentOS 5 distributions.
 
    Install iscsiadm.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # yum install iscsi-initiator-utils
        # service iscsi start
@@ -189,28 +193,27 @@ volume. These steps apply to RHEL/CentOS 5 distributions.
 
    Discover the iSCSI target.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # iscsiadm -m discovery -t st -p <iSCSI Server IP address>:3260
 
    For example:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
-       # iscsiadm -m discovery -t st -p 172.23.10.240:3260
-                 172.23.10.240:3260,1 iqn.2001-05.com.equallogic:0-8a0906-83bcb3401-16e0002fd0a46f3d-rhel5-test
+       # iscsiadm -m discovery -t st -p 172.23.10.240:3260 172.23.10.240:3260,1 iqn.2001-05.com.equallogic:0-8a0906-83bcb3401-16e0002fd0a46f3d-rhel5-test
 
 #. 
 
    Log in.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # iscsiadm -m node -T <Complete Target Name> -l -p <Group IP>:3260
 
    For example:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # iscsiadm -m node -l -T iqn.2001-05.com.equallogic:83bcb3401-16e0002fd0a46f3d-rhel5-test -p 172.23.10.240:3260
 
@@ -218,7 +221,7 @@ volume. These steps apply to RHEL/CentOS 5 distributions.
 
    Discover the SCSI disk. For example:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # iscsiadm -m session -P3 | grep Attached
        Attached scsi disk sdb State: running
@@ -227,7 +230,7 @@ volume. These steps apply to RHEL/CentOS 5 distributions.
 
    Format the disk as ext3 and mount the volume.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # mkfs.ext3 /dev/sdb
        # mkdir -p /export
@@ -237,7 +240,7 @@ volume. These steps apply to RHEL/CentOS 5 distributions.
 
    Add the disk to /etc/fstab to make sure it gets mounted on boot.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        /dev/sdb /export ext3 _netdev 0 0
 
@@ -258,7 +261,7 @@ Now you can set up /export as an NFS share.
 
    The following is an example with separate CIDRs:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        /export 192.168.1.0/24(rw,async,no_root_squash,no_subtree_check) 10.50.1.0/24(rw,async,no_root_squash,no_subtree_check)
 
@@ -267,75 +270,4 @@ Now you can set up /export as an NFS share.
    **Removing the async flag.** The async flag improves performance by
    allowing the NFS server to respond before writes are committed to the
    disk. Remove the async flag in your mission critical production
-   deployment.
-
-
-.. |1000-foot-view.png: Overview of CloudStack| image:: ./_static/images/1000-foot-view.png
-.. |basic-deployment.png: Basic two-machine deployment| image:: ./_static/images/basic-deployment.png
-.. |infrastructure_overview.png: Nested organization of a zone| image:: ./_static/images/infrastructure-overview.png
-.. |region-overview.png: Nested structure of a region.| image:: ./_static/images/region-overview.png
-.. |zone-overview.png: Nested structure of a simple zone.| image:: ./_static/images/zone-overview.png
-.. |pod-overview.png: Nested structure of a simple pod| image:: ./_static/images/pod-overview.png
-.. |cluster-overview.png: Structure of a simple cluster| image:: ./_static/images/cluster-overview.png
-.. |installation-complete.png: Finished installs with single Management Server and multiple Management Servers| image:: ./_static/images/installation-complete.png
-.. |change-password.png: button to change a user's password| image:: ./_static/images/change-password.png
-.. |provisioning-overview.png: Conceptual overview of a basic deployment| image:: ./_static/images/provisioning-overview.png
-.. |vsphereclient.png: vSphere client| image:: ./_static/images/vsphere-client.png
-.. |addcluster.png: add a cluster| image:: ./_static/images/add-cluster.png
-.. |ConsoleButton.png: button to launch a console| image:: ./_static/images/console-icon.png
-.. |DeleteButton.png: button to delete dvSwitch| image:: ./_static/images/delete-button.png
-.. |vds-name.png: Name of the dvSwitch as specified in the vCenter.| image:: ./_static/images/vds-name.png
-.. |traffic-type.png: virtual switch type| image:: ./_static/images/traffic-type.png
-.. |dvSwitchConfig.png: Configuring dvSwitch| image:: ./_static/images/dvSwitch-config.png
-.. |Small-Scale Deployment| image:: ./_static/images/small-scale-deployment.png
-.. |Large-Scale Redundant Setup| image:: ./_static/images/large-scale-redundant-setup.png
-.. |Multi-Node Management Server| image:: ./_static/images/multi-node-management-server.png
-.. |Example Of A Multi-Site Deployment| image:: ./_static/images/multi-site-deployment.png
-.. |Separate Storage Network| image:: ./_static/images/separate-storage-network.png
-.. |NIC Bonding And Multipath I/O| image:: ./_static/images/nic-bonding-and-multipath-io.png
-.. |Use the GUI to set the configuration variable to true| image:: ./_static/images/ec2-s3-configuration.png
-.. |Use the GUI to set the name of a compute service offering to an EC2 instance type API name.| image:: ./_static/images/compute-service-offerings.png
-.. |parallel-mode.png: adding a firewall and load balancer in parallel mode.| image:: ./_static/images/parallel-mode.png
-.. |guest-traffic-setup.png: Depicts a guest traffic setup| image:: ./_static/images/guest-traffic-setup.png
-.. |networksinglepod.png: diagram showing logical view of network in a pod| image:: ./_static/images/network-singlepod.png
-.. |networksetupzone.png: Depicts network setup in a single zone| image:: ./_static/images/network-setup-zone.png
-.. |addguestnetwork.png: Add Guest network setup in a single zone| image:: ./_static/images/add-guest-network.png
-.. |remove-nic.png: button to remove a NIC| image:: ./_static/images/remove-nic.png
-.. |set-default-nic.png: button to set a NIC as default one.| image:: ./_static/images/set-default-nic.png
-.. |EditButton.png: button to edit a network| image:: ./_static/images/edit-icon.png
-.. |edit-icon.png: button to edit a network| image:: ./_static/images/edit-icon.png
-.. |addAccount-icon.png: button to assign an IP range to an account.| image:: ./_static/images/addAccount-icon.png
-.. |eip-ns-basiczone.png: Elastic IP in a NetScaler-enabled Basic Zone.| image:: ./_static/images/eip-ns-basiczone.png
-.. |add-ip-range.png: adding an IP range to a network.| image:: ./_static/images/add-ip-range.png
-.. |httpaccess.png: allows inbound HTTP access from anywhere| image:: ./_static/images/http-access.png
-.. |autoscaleateconfig.png: Configuring AutoScale| image:: ./_static/images/autoscale-config.png
-.. |EnableDisable.png: button to enable or disable AutoScale.| image:: ./_static/images/enable-disable-autoscale.png
-.. |gslb.png: GSLB architecture| image:: ./_static/images/gslb.png
-.. |gslb-add.png: adding a gslb rule| image:: ./_static/images/add-gslb.png
-.. |ReleaseIPButton.png: button to release an IP| image:: ./_static/images/release-ip-icon.png
-.. |EnableNATButton.png: button to enable NAT| image:: ./_static/images/enable-disable.png
-.. |egress-firewall-rule.png: adding an egress firewall rule| image:: ./_static/images/egress-firewall-rule.png
-.. |AttachDiskButton.png: button to attach a volume| image:: ./_static/images/vpn-icon.png
-.. |vpn-icon.png: button to enable VPN| image:: ./_static/images/vpn-icon.png
-.. |addvpncustomergateway.png: adding a customer gateway.| image:: ./_static/images/add-vpn-customer-gateway.png
-.. |edit.png: button to edit a VPN customer gateway| image:: ./_static/images/edit-icon.png
-.. |delete.png: button to remove a VPN customer gateway| image:: ./_static/images/delete-button.png
-.. |createvpnconnection.png: creating a VPN connection to the customer gateway.| image:: ./_static/images/create-vpn-connection.png
-.. |remove-vpn.png: button to remove a VPN connection| image:: ./_static/images/remove-vpn.png
-.. |reset-vpn.png: button to reset a VPN connection| image:: ./_static/images/reset-vpn.png
-.. |mutltier.png: a multi-tier setup.| image:: ./_static/images/multi-tier-app.png
-.. |add-vpc.png: adding a vpc.| image:: ./_static/images/add-vpc.png
-.. |add-tier.png: adding a tier to a vpc.| image:: ./_static/images/add-tier.png
-.. |replace-acl-icon.png: button to replace an ACL list| image:: ./_static/images/replace-acl-icon.png
-.. |add-new-gateway-vpc.png: adding a private gateway for the VPC.| image:: ./_static/images/add-new-gateway-vpc.png
-.. |replace-acl-icon.png: button to replace the default ACL behaviour.| image:: ./_static/images/replace-acl-icon.png
-.. |add-vm-vpc.png: adding a VM to a vpc.| image:: ./_static/images/add-vm-vpc.png
-.. |addvm-tier-sharednw.png: adding a VM to a VPC tier and shared network.| image:: ./_static/images/addvm-tier-sharednw.png
-.. |release-ip-icon.png: button to release an IP.| image:: ./_static/images/release-ip-icon.png
-.. |enable-disable.png: button to enable Static NAT.| image:: ./_static/images/enable-disable.png
-.. |select-vmstatic-nat.png: selecting a tier to apply staticNAT.| image:: ./_static/images/select-vm-staticnat-vpc.png
-.. |vpc-lb.png: Configuring internal LB for VPC| image:: ./_static/images/vpc-lb.png
-.. |del-tier.png: button to remove a tier| image:: ./_static/images/del-tier.png
-.. |remove-vpc.png: button to remove a VPC| image:: ./_static/images/remove-vpc.png
-.. |edit-icon.png: button to edit a VPC| image:: ./_static/images/edit-icon.png
-.. |restart-vpc.png: button to restart a VPC| image:: ./_static/images/restart-vpc.png
+   deployment.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/7f2027bb/source/ui.rst
----------------------------------------------------------------------
diff --git a/source/ui.rst b/source/ui.rst
index d2c8abe..49354db 100644
--- a/source/ui.rst
+++ b/source/ui.rst
@@ -26,7 +26,7 @@ available in popular browsers including IE7, IE8, IE9, Firefox 3.5+,
 Firefox 4, Safari 4, and Safari 5. The URL is: (substitute your own
 management server IP address)
 
-::
+.. sourcecode:: bash
 
     http://<management-server-ip-address>:8080/client
 
@@ -86,7 +86,7 @@ provision, view, and manage your cloud infrastructure.
    Open your favorite Web browser and go to this URL. Substitute the IP
    address of your own Management Server:
 
-   ::
+   .. sourcecode:: bash
 
        http://<management-server-ip-address>:8080/client
 
@@ -133,7 +133,9 @@ provision, view, and manage your cloud infrastructure.
    chose experienced user, use the steps in `Section 5.1.4, “Changing
    the Root Password” <#changing-root-password>`__.
 
-.. warning:: You are logging in as the root administrator. This account manages the CloudStack deployment, including physical infrastructure. The root administrator can modify configuration settings to change basic functionality, create or delete user accounts, and take many actions that should be performed only by an authorized person. Please change the default password to a new, unique password.
+.. warning:: 
+
+   You are logging in as the root administrator. This account manages the CloudStack deployment, including physical infrastructure. The root administrator can modify configuration settings to change basic functionality, create or delete user accounts, and take many actions that should be performed only by an authorized person. Please change the default password to a new, unique password.
 
 Changing the Root Password
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -152,7 +154,7 @@ new, unique value.
    Open your favorite Web browser and go to this URL. Substitute the IP
    address of your own Management Server:
 
-   ::
+   .. sourcecode:: bash
 
        http://<management-server-ip-address>:8080/client
 
@@ -215,7 +217,7 @@ Create an instance template that supports SSH Keys.
    Script <http://sourceforge.net/projects/cloudstack/files/SSH%20Key%20Gen%20Script/>`__\ to
    the instance you have created.
 
-   ::
+   .. sourcecode:: bash
 
        wget http://downloads.sourceforge.net/project/cloudstack/SSH%20Key%20Gen%20Script/cloud-set-guest-sshkey.in?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fcloudstack%2Ffiles%2FSSH%2520Key%2520Gen%2520Script%2F&ts=1331225219&use_mirror=iweb
 
@@ -223,7 +225,7 @@ Create an instance template that supports SSH Keys.
 
    Copy the file to /etc/init.d.
 
-   ::
+   .. sourcecode:: bash
 
        cp cloud-set-guest-sshkey.in /etc/init.d/
 
@@ -231,7 +233,7 @@ Create an instance template that supports SSH Keys.
 
    Give the necessary permissions on the script:
 
-   ::
+   .. sourcecode:: bash
 
        chmod +x /etc/init.d/cloud-set-guest-sshkey.in
 
@@ -239,7 +241,7 @@ Create an instance template that supports SSH Keys.
 
    Run the script while starting up the operating system:
 
-   ::
+   .. sourcecode:: bash
 
        chkconfig --add cloud-set-guest-sshkey.in
 
@@ -263,13 +265,13 @@ keypair called "keypair-doc" for the admin account in the root domain:
 
    Run the following curl command:
 
-   ::
+   .. sourcecode:: bash
 
        curl --globoff "http://localhost:8096/?command=createSSHKeyPair&name=keypair-doc&account=admin&domainid=5163440e-c44b-42b5-9109-ad75cae8e8a2"
 
    The output is something similar to what is given below:
 
-   ::
+   .. sourcecode:: bash
 
        <?xml version="1.0" encoding="ISO-8859-1"?><createsshkeypairresponse cloud-stack-version="3.0.0.20120228045507"><keypair><name>keypair-doc</name><fingerprint>f6:77:39:d5:5e:77:02:22:6a:d8:7f:ce:ab:cd:b3:56</fingerprint><privatekey>-----BEGIN RSA PRIVATE KEY-----
        MIICXQIBAAKBgQCSydmnQ67jP6lNoXdX3noZjQdrMAWNQZ7y5SrEu4wDxplvhYci
@@ -289,7 +291,7 @@ keypair called "keypair-doc" for the admin account in the root domain:
 
    Copy the key data into a file. The file looks like this:
 
-   ::
+   .. sourcecode:: bash
 
        -----BEGIN RSA PRIVATE KEY-----
        MIICXQIBAAKBgQCSydmnQ67jP6lNoXdX3noZjQdrMAWNQZ7y5SrEu4wDxplvhYci
@@ -317,11 +319,13 @@ Instance Template that Supports SSH Keys” <#create-ssh-template>`__.
 Ensure that you use the same SSH key name that you created at
 `Section 5.2.2, “Creating the SSH Keypair” <#create-ssh-keypair>`__.
 
-.. note:: You cannot create the instance by using the GUI at this time and associate the instance with the newly created SSH keypair.
+.. note:: 
+
+   You cannot create the instance by using the GUI at this time and associate the instance with the newly created SSH keypair.
 
 A sample curl command to create a new instance is:
 
-::
+.. sourcecode:: bash
 
     curl --globoff http://localhost:<port number>/?command=deployVirtualMachine\&zoneId=1\&serviceOfferingId=18727021-7556-4110-9322-d625b52e0813\&templateId=e899c18a-ce13-4bbf-98a9-625c5026e0b5\&securitygroupids=ff03f02f-9e3b-48f8-834d-91b822da40c5\&account=admin\&domainid=1\&keypair=keypair-doc
 
@@ -337,7 +341,7 @@ in to the cloud setup.
 
 For example, from a Linux OS, run:
 
-::
+.. sourcecode:: bash
 
     ssh -i ~/.ssh/keypair-doc <ip address>
 
@@ -351,75 +355,4 @@ 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.
-
-
-.. |1000-foot-view.png: Overview of CloudStack| image:: ./_static/images/1000-foot-view.png
-.. |basic-deployment.png: Basic two-machine deployment| image:: ./_static/images/basic-deployment.png
-.. |infrastructure_overview.png: Nested organization of a zone| image:: ./_static/images/infrastructure-overview.png
-.. |region-overview.png: Nested structure of a region.| image:: ./_static/images/region-overview.png
-.. |zone-overview.png: Nested structure of a simple zone.| image:: ./_static/images/zone-overview.png
-.. |pod-overview.png: Nested structure of a simple pod| image:: ./_static/images/pod-overview.png
-.. |cluster-overview.png: Structure of a simple cluster| image:: ./_static/images/cluster-overview.png
-.. |installation-complete.png: Finished installs with single Management Server and multiple Management Servers| image:: ./_static/images/installation-complete.png
-.. |change-password.png: button to change a user's password| image:: ./_static/images/change-password.png
-.. |provisioning-overview.png: Conceptual overview of a basic deployment| image:: ./_static/images/provisioning-overview.png
-.. |vsphereclient.png: vSphere client| image:: ./_static/images/vsphere-client.png
-.. |addcluster.png: add a cluster| image:: ./_static/images/add-cluster.png
-.. |ConsoleButton.png: button to launch a console| image:: ./_static/images/console-icon.png
-.. |DeleteButton.png: button to delete dvSwitch| image:: ./_static/images/delete-button.png
-.. |vds-name.png: Name of the dvSwitch as specified in the vCenter.| image:: ./_static/images/vds-name.png
-.. |traffic-type.png: virtual switch type| image:: ./_static/images/traffic-type.png
-.. |dvSwitchConfig.png: Configuring dvSwitch| image:: ./_static/images/dvSwitch-config.png
-.. |Small-Scale Deployment| image:: ./_static/images/small-scale-deployment.png
-.. |Large-Scale Redundant Setup| image:: ./_static/images/large-scale-redundant-setup.png
-.. |Multi-Node Management Server| image:: ./_static/images/multi-node-management-server.png
-.. |Example Of A Multi-Site Deployment| image:: ./_static/images/multi-site-deployment.png
-.. |Separate Storage Network| image:: ./_static/images/separate-storage-network.png
-.. |NIC Bonding And Multipath I/O| image:: ./_static/images/nic-bonding-and-multipath-io.png
-.. |Use the GUI to set the configuration variable to true| image:: ./_static/images/ec2-s3-configuration.png
-.. |Use the GUI to set the name of a compute service offering to an EC2 instance type API name.| image:: ./_static/images/compute-service-offerings.png
-.. |parallel-mode.png: adding a firewall and load balancer in parallel mode.| image:: ./_static/images/parallel-mode.png
-.. |guest-traffic-setup.png: Depicts a guest traffic setup| image:: ./_static/images/guest-traffic-setup.png
-.. |networksinglepod.png: diagram showing logical view of network in a pod| image:: ./_static/images/network-singlepod.png
-.. |networksetupzone.png: Depicts network setup in a single zone| image:: ./_static/images/network-setup-zone.png
-.. |addguestnetwork.png: Add Guest network setup in a single zone| image:: ./_static/images/add-guest-network.png
-.. |remove-nic.png: button to remove a NIC| image:: ./_static/images/remove-nic.png
-.. |set-default-nic.png: button to set a NIC as default one.| image:: ./_static/images/set-default-nic.png
-.. |EditButton.png: button to edit a network| image:: ./_static/images/edit-icon.png
-.. |edit-icon.png: button to edit a network| image:: ./_static/images/edit-icon.png
-.. |addAccount-icon.png: button to assign an IP range to an account.| image:: ./_static/images/addAccount-icon.png
-.. |eip-ns-basiczone.png: Elastic IP in a NetScaler-enabled Basic Zone.| image:: ./_static/images/eip-ns-basiczone.png
-.. |add-ip-range.png: adding an IP range to a network.| image:: ./_static/images/add-ip-range.png
-.. |httpaccess.png: allows inbound HTTP access from anywhere| image:: ./_static/images/http-access.png
-.. |autoscaleateconfig.png: Configuring AutoScale| image:: ./_static/images/autoscale-config.png
-.. |EnableDisable.png: button to enable or disable AutoScale.| image:: ./_static/images/enable-disable-autoscale.png
-.. |gslb.png: GSLB architecture| image:: ./_static/images/gslb.png
-.. |gslb-add.png: adding a gslb rule| image:: ./_static/images/add-gslb.png
-.. |ReleaseIPButton.png: button to release an IP| image:: ./_static/images/release-ip-icon.png
-.. |EnableNATButton.png: button to enable NAT| image:: ./_static/images/enable-disable.png
-.. |egress-firewall-rule.png: adding an egress firewall rule| image:: ./_static/images/egress-firewall-rule.png
-.. |AttachDiskButton.png: button to attach a volume| image:: ./_static/images/vpn-icon.png
-.. |vpn-icon.png: button to enable VPN| image:: ./_static/images/vpn-icon.png
-.. |addvpncustomergateway.png: adding a customer gateway.| image:: ./_static/images/add-vpn-customer-gateway.png
-.. |edit.png: button to edit a VPN customer gateway| image:: ./_static/images/edit-icon.png
-.. |delete.png: button to remove a VPN customer gateway| image:: ./_static/images/delete-button.png
-.. |createvpnconnection.png: creating a VPN connection to the customer gateway.| image:: ./_static/images/create-vpn-connection.png
-.. |remove-vpn.png: button to remove a VPN connection| image:: ./_static/images/remove-vpn.png
-.. |reset-vpn.png: button to reset a VPN connection| image:: ./_static/images/reset-vpn.png
-.. |mutltier.png: a multi-tier setup.| image:: ./_static/images/multi-tier-app.png
-.. |add-vpc.png: adding a vpc.| image:: ./_static/images/add-vpc.png
-.. |add-tier.png: adding a tier to a vpc.| image:: ./_static/images/add-tier.png
-.. |replace-acl-icon.png: button to replace an ACL list| image:: ./_static/images/replace-acl-icon.png
-.. |add-new-gateway-vpc.png: adding a private gateway for the VPC.| image:: ./_static/images/add-new-gateway-vpc.png
-.. |replace-acl-icon.png: button to replace the default ACL behaviour.| image:: ./_static/images/replace-acl-icon.png
-.. |add-vm-vpc.png: adding a VM to a vpc.| image:: ./_static/images/add-vm-vpc.png
-.. |addvm-tier-sharednw.png: adding a VM to a VPC tier and shared network.| image:: ./_static/images/addvm-tier-sharednw.png
-.. |release-ip-icon.png: button to release an IP.| image:: ./_static/images/release-ip-icon.png
-.. |enable-disable.png: button to enable Static NAT.| image:: ./_static/images/enable-disable.png
-.. |select-vmstatic-nat.png: selecting a tier to apply staticNAT.| image:: ./_static/images/select-vm-staticnat-vpc.png
-.. |vpc-lb.png: Configuring internal LB for VPC| image:: ./_static/images/vpc-lb.png
-.. |del-tier.png: button to remove a tier| image:: ./_static/images/del-tier.png
-.. |remove-vpc.png: button to remove a VPC| image:: ./_static/images/remove-vpc.png
-.. |edit-icon.png: button to edit a VPC| image:: ./_static/images/edit-icon.png
-.. |restart-vpc.png: button to restart a VPC| image:: ./_static/images/restart-vpc.png
+call resetSSHKeyForVirtualMachine.
\ No newline at end of file


[2/2] git commit: fix list of images and sourcecode directives

Posted by se...@apache.org.
fix list of images and sourcecode directives


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

Branch: refs/heads/master
Commit: 7f2027bb3f9e75e775b2a697cc9c0b517d92162c
Parents: 3d2a4e9
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Fri Feb 14 11:14:22 2014 +0100
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Fri Feb 14 11:14:22 2014 +0100

----------------------------------------------------------------------
 source/building_from_source.rst             | 146 +++-----
 source/choosing_deployment_architecture.rst |  29 +-
 source/concepts.rst                         |  76 +----
 source/configuration.rst                    | 154 ++++-----
 source/hypervisor_installation.rst          | 416 ++++++++++-------------
 source/installation.rst                     | 254 ++++++--------
 source/network_setup.rst                    | 109 ++----
 source/optional_installation.rst            |  76 +++--
 source/storage_setup.rst                    | 112 ++----
 source/ui.rst                               | 105 ++----
 10 files changed, 497 insertions(+), 980 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/7f2027bb/source/building_from_source.rst
----------------------------------------------------------------------
diff --git a/source/building_from_source.rst b/source/building_from_source.rst
index 49afd9c..7f5ff5e 100644
--- a/source/building_from_source.rst
+++ b/source/building_from_source.rst
@@ -39,7 +39,7 @@ Getting the release
 
 You can download the latest CloudStack release from the `Apache
 CloudStack project download
-page <http://incubator.apache.org/cloudstack/downloads.html>`__.
+page <http://cloudstack.apache.org/downloads.html>`__.
 
 Prior releases are available via archive.apache.org as well. See the
 downloads page for more information on archived releases.
@@ -82,7 +82,7 @@ To enable you to verify the GPG signature, you will need to download the
 
 You next need to import those keys, which you can do by running:
 
-::
+.. sourcecode:: bash
 
     # gpg --import KEYS
 
@@ -92,7 +92,7 @@ GPG
 The CloudStack project provides a detached GPG signature of the release.
 To check the signature, run the following command:
 
-::
+.. sourcecode:: bash
 
     $ gpg --verify apache-cloudstack-4.0.0-incubating-src.tar.bz2.asc
 
@@ -106,7 +106,7 @@ In addition to the cryptographic signature, CloudStack has an MD5
 checksum that you can use to verify the download matches the release.
 You can verify this hash by executing the following command:
 
-::
+.. sourcecode:: bash
 
     $ gpg --print-md MD5 apache-cloudstack-4.0.0-incubating-src.tar.bz2 | diff - apache-cloudstack-4.0.0-incubating-src.tar.bz2.md5
 
@@ -121,7 +121,7 @@ In addition to the MD5 hash, the CloudStack project provides a SHA512
 cryptographic hash to aid in assurance of the validity of the downloaded
 release. You can verify this hash by executing the following command:
 
-::
+.. sourcecode:: bash
 
     $ gpg --print-md SHA512 apache-cloudstack-4.0.0-incubating-src.tar.bz2 | diff - apache-cloudstack-4.0.0-incubating-src.tar.bz2.sha
 
@@ -177,13 +177,13 @@ Extracting source
 Extracting the CloudStack release is relatively simple and can be done
 with a single command as follows:
 
-::
+.. sourcecode:: bash
 
     $ tar -jxvf apache-cloudstack-4.1.0.src.tar.bz2
 
 You can now move into the directory:
 
-::
+.. sourcecode:: bash
 
     $ cd ./apache-cloudstack-4.1.0-src
 
@@ -197,7 +197,7 @@ PPA repository that includes Maven 3. After running the command
 ``add-apt-repository``, you will be prompted to continue and a GPG key
 will be added.
 
-::
+.. sourcecode:: bash
 
     $ sudo apt-get update
     $ sudo apt-get install python-software-properties
@@ -211,7 +211,7 @@ that need to be resolved. CloudStack uses maven for dependency
 resolution. You can resolve the buildtime depdencies for CloudStack by
 running:
 
-::
+.. sourcecode:: bash
 
     $ mvn3 -P deps
 
@@ -219,14 +219,14 @@ Now that we have resolved the dependencies we can move on to building
 CloudStack and packaging them into DEBs by issuing the following
 command.
 
-::
+.. sourcecode:: bash
 
     $ dpkg-buildpackage -uc -us
 
 This command will build the following debian packages. You should have
 all of the following:
 
-::
+.. sourcecode:: bash
 
     cloudstack-common-4.2.0.amd64.deb
     cloudstack-management-4.2.0.amd64.deb
@@ -252,7 +252,7 @@ installed. This should have been installed when you pulled in the
 ``Packages.gz`` on a different system, be sure that it's installed there
 as well.
 
-::
+.. sourcecode:: bash
 
     $ sudo apt-get install dpkg-dev
 
@@ -260,14 +260,16 @@ The next step is to copy the DEBs to the directory where they can be
 served over HTTP. We'll use ``/var/www/cloudstack/repo`` in the
 examples, but change the directory to whatever works for you.
 
-::
+.. sourcecode:: bash
 
     sudo mkdir -p /var/www/cloudstack/repo/binary
     sudo cp *.deb /var/www/cloudstack/repo/binary
     sudo cd /var/www/cloudstack/repo/binary
     sudo dpkg-scanpackages . /dev/null | tee Packages | gzip -9 > Packages.gz
 
-.. note:: You can safely ignore the warning about a missing override file.
+.. note:: 
+
+   You can safely ignore the warning about a missing override file.
 
 Now you should have all of the DEB packages and ``Packages.gz`` in the
 ``binary`` directory and available over HTTP. (You may want to use
@@ -282,14 +284,14 @@ repository file under ``/etc/apt/sources.list.d``. Use your preferred
 editor to create ``/etc/apt/sources.list.d/cloudstack.list`` with this
 line:
 
-::
+.. sourcecode:: bash
 
     deb http://server.url/cloudstack/repo binary ./
 
 Now that you have the repository info in place, you'll want to run
 another update so that APT knows where to find the CloudStack packages.
 
-::
+.. sourcecode:: bash
 
     $ sudo apt-get update
 
@@ -304,11 +306,11 @@ several prerequisites before you can build packages for CloudStack. Here
 we'll assume you're working with a 64-bit build of CentOS or Red Hat
 Enterprise Linux.
 
-::
+.. sourcecode:: bash
 
     # yum groupinstall "Development Tools"
 
-::
+.. sourcecode:: bash
 
     # yum install java-1.6.0-openjdk-devel.x86_64 genisoimage mysql mysql-server ws-commons-util MySQL-python tomcat6 createrepo
 
@@ -317,24 +319,24 @@ Maven. We're using Maven 3, so you'll want to `grab a Maven 3
 tarball <http://maven.apache.org/download.cgi>`__ and uncompress it in
 your home directory (or whatever location you prefer):
 
-::
+.. sourcecode:: bash
 
     $ tar zxvf apache-maven-3.0.4-bin.tar.gz
 
-::
+.. sourcecode:: bash
 
     $ export PATH=/usr/local/apache-maven-3.0.4//bin:$PATH
 
 Maven also needs to know where Java is, and expects the JAVA\_HOME
 environment variable to be set:
 
-::
+.. sourcecode:: bash
 
     $ export JAVA_HOME=/usr/lib/jvm/jre-1.6.0-openjdk.x86_64/
 
 Verify that Maven is installed correctly:
 
-::
+.. sourcecode:: bash
 
     $ mvn --version
 
@@ -347,21 +349,22 @@ the source downloaded and have uncompressed the tarball into a local
 directory, you're going to be able to generate packages in just a few
 minutes.
 
-.. note:: Packaging has Changed. If you've created packages for CloudStack previously, you should be
-aware that the process has changed considerably since the project has moved to using Apache Maven. Please be sure to follow the steps in this section closely.
+.. note::
+
+   Packaging has Changed. If you've created packages for CloudStack previously, you should be aware that the process has changed considerably since the project has moved to using Apache Maven. Please be sure to follow the steps in this section closely.
 
 Generating RPMS
 ~~~~~~~~~~~~~~~
 
 Now that we have the prerequisites and source, you will cd to the `packaging/centos63/` directory.
 
-::
+.. sourcecode:: bash
 
     $ cd packaging/centos63
 
 Generating RPMs is done using the ``package.sh`` script:
 
-::
+.. sourcecode:: bash
 
     $./package.sh
 
@@ -370,7 +373,7 @@ That will run for a bit and then place the finished packages in
 
 You should see the following RPMs in that directory:
 
-::
+.. sourcecode:: bash
 
     cloudstack-agent-4.2.0.el6.x86_64.rpm
     cloudstack-awsapi-4.2.0.el6.x86_64.rpm
@@ -387,15 +390,15 @@ While RPMs is a useful packaging format - it's most easily consumed from
 Yum repositories over a network. The next step is to create a Yum Repo
 with the finished packages:
 
-::
+.. sourcecode:: bash
 
     $ mkdir -p ~/tmp/repo
 
-::
+.. sourcecode:: bash
 
     $ cp dist/rpmbuild/RPMS/x86_64/*rpm ~/tmp/repo/
 
-::
+.. sourcecode:: bash
 
     $ createrepo ~/tmp/repo
 
@@ -409,7 +412,7 @@ Now that your yum repository is populated with RPMs and metadata we need
 to configure the machines that need to install CloudStack. Create a file
 named ``/etc/yum.repos.d/cloudstack.repo`` with this information:
 
-::
+.. sourcecode:: bash
 
    [apache-cloudstack]
    name=Apache CloudStack
@@ -428,7 +431,9 @@ other non-Open Source Software (nonoss) plugins, you'll need to download
 a few components on your own and follow a slightly different procedure
 to build from source.
 
-.. warning:: Some of the plugins supported by CloudStack cannot be distributed with CloudStack for licensing reasons. In some cases, some of the required libraries/JARs are under a proprietary license. In other cases, the required libraries may be under a license that's not compatible with `Apache's licensing guidelines for third-party products <http://www.apache.org/legal/resolved.html#category-x>`__.
+.. warning::
+
+   Some of the plugins supported by CloudStack cannot be distributed with CloudStack for licensing reasons. In some cases, some of the required libraries/JARs are under a proprietary license. In other cases, the required libraries may be under a license that's not compatible with `Apache's licensing guidelines for third-party products <http://www.apache.org/legal/resolved.html#category-x>`__.
 
 #. 
 
@@ -453,7 +458,7 @@ to build from source.
    Once you have all the dependencies copied over, you'll be able to
    build CloudStack with the ``nonoss`` option:
 
-::
+.. sourcecode:: bash
 
     $ mvn clean
     $ mvn install -Dnonoss
@@ -463,77 +468,4 @@ to build from source.
    Once you've built CloudStack with the ``nonoss`` profile, you can
    package it using the `Section 3.6, “Building RPMs from
    Source” <#sect-source-buildrpm>`__ or `Section 3.5, “Building DEB
-   packages” <#sect-source-builddebs>`__ instructions.
-
-
-
-
-.. |1000-foot-view.png: Overview of CloudStack| image:: ./_static/images/1000-foot-view.png
-.. |basic-deployment.png: Basic two-machine deployment| image:: ./_static/images/basic-deployment.png
-.. |infrastructure_overview.png: Nested organization of a zone| image:: ./_static/images/infrastructure-overview.png
-.. |region-overview.png: Nested structure of a region.| image:: ./_static/images/region-overview.png
-.. |zone-overview.png: Nested structure of a simple zone.| image:: ./_static/images/zone-overview.png
-.. |pod-overview.png: Nested structure of a simple pod| image:: ./_static/images/pod-overview.png
-.. |cluster-overview.png: Structure of a simple cluster| image:: ./_static/images/cluster-overview.png
-.. |installation-complete.png: Finished installs with single Management Server and multiple Management Servers| image:: ./_static/images/installation-complete.png
-.. |change-password.png: button to change a user's password| image:: ./_static/images/change-password.png
-.. |provisioning-overview.png: Conceptual overview of a basic deployment| image:: ./_static/images/provisioning-overview.png
-.. |vsphereclient.png: vSphere client| image:: ./_static/images/vsphere-client.png
-.. |addcluster.png: add a cluster| image:: ./_static/images/add-cluster.png
-.. |ConsoleButton.png: button to launch a console| image:: ./_static/images/console-icon.png
-.. |DeleteButton.png: button to delete dvSwitch| image:: ./_static/images/delete-button.png
-.. |vds-name.png: Name of the dvSwitch as specified in the vCenter.| image:: ./_static/images/vds-name.png
-.. |traffic-type.png: virtual switch type| image:: ./_static/images/traffic-type.png
-.. |dvSwitchConfig.png: Configuring dvSwitch| image:: ./_static/images/dvSwitch-config.png
-.. |Small-Scale Deployment| image:: ./_static/images/small-scale-deployment.png
-.. |Large-Scale Redundant Setup| image:: ./_static/images/large-scale-redundant-setup.png
-.. |Multi-Node Management Server| image:: ./_static/images/multi-node-management-server.png
-.. |Example Of A Multi-Site Deployment| image:: ./_static/images/multi-site-deployment.png
-.. |Separate Storage Network| image:: ./_static/images/separate-storage-network.png
-.. |NIC Bonding And Multipath I/O| image:: ./_static/images/nic-bonding-and-multipath-io.png
-.. |Use the GUI to set the configuration variable to true| image:: ./_static/images/ec2-s3-configuration.png
-.. |Use the GUI to set the name of a compute service offering to an EC2 instance type API name.| image:: ./_static/images/compute-service-offerings.png
-.. |parallel-mode.png: adding a firewall and load balancer in parallel mode.| image:: ./_static/images/parallel-mode.png
-.. |guest-traffic-setup.png: Depicts a guest traffic setup| image:: ./_static/images/guest-traffic-setup.png
-.. |networksinglepod.png: diagram showing logical view of network in a pod| image:: ./_static/images/network-singlepod.png
-.. |networksetupzone.png: Depicts network setup in a single zone| image:: ./_static/images/network-setup-zone.png
-.. |addguestnetwork.png: Add Guest network setup in a single zone| image:: ./_static/images/add-guest-network.png
-.. |remove-nic.png: button to remove a NIC| image:: ./_static/images/remove-nic.png
-.. |set-default-nic.png: button to set a NIC as default one.| image:: ./_static/images/set-default-nic.png
-.. |EditButton.png: button to edit a network| image:: ./_static/images/edit-icon.png
-.. |edit-icon.png: button to edit a network| image:: ./_static/images/edit-icon.png
-.. |addAccount-icon.png: button to assign an IP range to an account.| image:: ./_static/images/addAccount-icon.png
-.. |eip-ns-basiczone.png: Elastic IP in a NetScaler-enabled Basic Zone.| image:: ./_static/images/eip-ns-basiczone.png
-.. |add-ip-range.png: adding an IP range to a network.| image:: ./_static/images/add-ip-range.png
-.. |httpaccess.png: allows inbound HTTP access from anywhere| image:: ./_static/images/http-access.png
-.. |autoscaleateconfig.png: Configuring AutoScale| image:: ./_static/images/autoscale-config.png
-.. |EnableDisable.png: button to enable or disable AutoScale.| image:: ./_static/images/enable-disable-autoscale.png
-.. |gslb.png: GSLB architecture| image:: ./_static/images/gslb.png
-.. |gslb-add.png: adding a gslb rule| image:: ./_static/images/add-gslb.png
-.. |ReleaseIPButton.png: button to release an IP| image:: ./_static/images/release-ip-icon.png
-.. |EnableNATButton.png: button to enable NAT| image:: ./_static/images/enable-disable.png
-.. |egress-firewall-rule.png: adding an egress firewall rule| image:: ./_static/images/egress-firewall-rule.png
-.. |AttachDiskButton.png: button to attach a volume| image:: ./_static/images/vpn-icon.png
-.. |vpn-icon.png: button to enable VPN| image:: ./_static/images/vpn-icon.png
-.. |addvpncustomergateway.png: adding a customer gateway.| image:: ./_static/images/add-vpn-customer-gateway.png
-.. |edit.png: button to edit a VPN customer gateway| image:: ./_static/images/edit-icon.png
-.. |delete.png: button to remove a VPN customer gateway| image:: ./_static/images/delete-button.png
-.. |createvpnconnection.png: creating a VPN connection to the customer gateway.| image:: ./_static/images/create-vpn-connection.png
-.. |remove-vpn.png: button to remove a VPN connection| image:: ./_static/images/remove-vpn.png
-.. |reset-vpn.png: button to reset a VPN connection| image:: ./_static/images/reset-vpn.png
-.. |mutltier.png: a multi-tier setup.| image:: ./_static/images/multi-tier-app.png
-.. |add-vpc.png: adding a vpc.| image:: ./_static/images/add-vpc.png
-.. |add-tier.png: adding a tier to a vpc.| image:: ./_static/images/add-tier.png
-.. |replace-acl-icon.png: button to replace an ACL list| image:: ./_static/images/replace-acl-icon.png
-.. |add-new-gateway-vpc.png: adding a private gateway for the VPC.| image:: ./_static/images/add-new-gateway-vpc.png
-.. |replace-acl-icon.png: button to replace the default ACL behaviour.| image:: ./_static/images/replace-acl-icon.png
-.. |add-vm-vpc.png: adding a VM to a vpc.| image:: ./_static/images/add-vm-vpc.png
-.. |addvm-tier-sharednw.png: adding a VM to a VPC tier and shared network.| image:: ./_static/images/addvm-tier-sharednw.png
-.. |release-ip-icon.png: button to release an IP.| image:: ./_static/images/release-ip-icon.png
-.. |enable-disable.png: button to enable Static NAT.| image:: ./_static/images/enable-disable.png
-.. |select-vmstatic-nat.png: selecting a tier to apply staticNAT.| image:: ./_static/images/select-vm-staticnat-vpc.png
-.. |vpc-lb.png: Configuring internal LB for VPC| image:: ./_static/images/vpc-lb.png
-.. |del-tier.png: button to remove a tier| image:: ./_static/images/del-tier.png
-.. |remove-vpc.png: button to remove a VPC| image:: ./_static/images/remove-vpc.png
-.. |edit-icon.png: button to edit a VPC| image:: ./_static/images/edit-icon.png
-.. |restart-vpc.png: button to restart a VPC| image:: ./_static/images/restart-vpc.png
+   packages” <#sect-source-builddebs>`__ instructions.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/7f2027bb/source/choosing_deployment_architecture.rst
----------------------------------------------------------------------
diff --git a/source/choosing_deployment_architecture.rst b/source/choosing_deployment_architecture.rst
index c0fe699..fd965fe 100644
--- a/source/choosing_deployment_architecture.rst
+++ b/source/choosing_deployment_architecture.rst
@@ -318,40 +318,17 @@ Maintenance Best Practices
    (per-host-limit). Once a cluster reaches this number of VMs, use the
    CloudStack UI to disable allocation to the cluster.
 
-.. warning:: The lack of up-do-date hotfixes can lead to data corruption and lost VMs.
+.. warning::
 
-Be sure all the hotfixes provided by the hypervisor vendor are applied. Track the release of hypervisor patches through your hypervisor vendor’s support channel, and apply patches as soon as possible after they are released. CloudStack will not track or notify you of required hypervisor patches. It is 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.
+   The lack of up-do-date hotfixes can lead to data corruption and lost VMs.
 
+Be sure all the hotfixes provided by the hypervisor vendor are applied. Track the release of hypervisor patches through your hypervisor vendor’s support channel, and apply patches as soon as possible after they are released. CloudStack will not track or notify you of required hypervisor patches. It is 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.
 
 
-.. |1000-foot-view.png: Overview of CloudStack| image:: ./_static/images/1000-foot-view.png
-.. |basic-deployment.png: Basic two-machine deployment| image:: ./_static/images/basic-deployment.png
-.. |infrastructure_overview.png: Nested organization of a zone| image:: ./_static/images/infrastructure-overview.png
-.. |region-overview.png: Nested structure of a region.| image:: ./_static/images/region-overview.png
-.. |zone-overview.png: Nested structure of a simple zone.| image:: ./_static/images/zone-overview.png
-.. |pod-overview.png: Nested structure of a simple pod| image:: ./_static/images/pod-overview.png
-.. |cluster-overview.png: Structure of a simple cluster| image:: ./_static/images/cluster-overview.png
-.. |installation-complete.png: Finished installs with single Management Server and multiple Management Servers| image:: ./_static/images/installation-complete.png
-.. |change-password.png: button to change a user's password| image:: ./_static/images/change-password.png
-.. |provisioning-overview.png: Conceptual overview of a basic deployment| image:: ./_static/images/provisioning-overview.png
-.. |vsphereclient.png: vSphere client| image:: ./_static/images/vsphere-client.png
-.. |addcluster.png: add a cluster| image:: ./_static/images/add-cluster.png
-.. |ConsoleButton.png: button to launch a console| image:: ./_static/images/console-icon.png
-.. |DeleteButton.png: button to delete dvSwitch| image:: ./_static/images/delete-button.png
-.. |vds-name.png: Name of the dvSwitch as specified in the vCenter.| image:: ./_static/images/vds-name.png
-.. |traffic-type.png: virtual switch type| image:: ./_static/images/traffic-type.png
-.. |dvSwitchConfig.png: Configuring dvSwitch| image:: ./_static/images/dvSwitch-config.png
 .. |Small-Scale Deployment| image:: ./_static/images/small-scale-deployment.png
 .. |Large-Scale Redundant Setup| image:: ./_static/images/large-scale-redundant-setup.png
 .. |Multi-Node Management Server| image:: ./_static/images/multi-node-management-server.png
 .. |Example Of A Multi-Site Deployment| image:: ./_static/images/multi-site-deployment.png
 .. |Separate Storage Network| image:: ./_static/images/separate-storage-network.png
 .. |NIC Bonding And Multipath I/O| image:: ./_static/images/nic-bonding-and-multipath-io.png
-.. |Use the GUI to set the configuration variable to true| image:: ./_static/images/ec2-s3-configuration.png
-.. |Use the GUI to set the name of a compute service offering to an EC2 instance type API name.| image:: ./_static/images/compute-service-offerings.png
-.. |parallel-mode.png: adding a firewall and load balancer in parallel mode.| image:: ./_static/images/parallel-mode.png
-.. |guest-traffic-setup.png: Depicts a guest traffic setup| image:: ./_static/images/guest-traffic-setup.png
-.. |networksinglepod.png: diagram showing logical view of network in a pod| image:: ./_static/images/network-singlepod.png
-.. |networksetupzone.png: Depicts network setup in a single zone| image:: ./_static/images/network-setup-zone.png
-.. |addguestnetwork.png: Add Guest network setup in a single zone| image:: ./_static/images/add-guest-network.png
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/7f2027bb/source/concepts.rst
----------------------------------------------------------------------
diff --git a/source/concepts.rst b/source/concepts.rst
index 34e9b8d..817d0b5 100644
--- a/source/concepts.rst
+++ b/source/concepts.rst
@@ -512,7 +512,9 @@ creating a new CloudStack zone, you can select a VMware Datacenter for
 the zone. If you are provisioning multiple VMware Datacenters, each one
 will be set up as a single zone in CloudStack.
 
-.. note:: If you are upgrading from a previous CloudStack version, and your existing deployment contains a zone with clusters from multiple VMware Datacenters, that zone will not be forcibly migrated to the new model. It will continue to function as before. However, any new zone-wide operations, such as zone-wide primary storage and live storage migration, will not be available in that zone.
+.. note::
+
+   If you are upgrading from a previous CloudStack version, and your existing deployment contains a zone with clusters from multiple VMware Datacenters, that zone will not be forcibly migrated to the new model. It will continue to function as before. However, any new zone-wide operations, such as zone-wide primary storage and live storage migration, will not be available in that zone.
 
 About Pods
 ~~~~~~~~~~
@@ -706,7 +708,9 @@ to Swift or S3. The backing object storage acts as a cloud-wide
 resource, making templates and other data available to any zone in the
 cloud.
 
-.. warning:: Heterogeneous Secondary Storage is not supported in Regions. For example, you cannot set up multiple zones, one using NFS secondary and the other using S3 or Swift secondary.
+.. warning::
+
+   Heterogeneous Secondary Storage is not supported in Regions. For example, you cannot set up multiple zones, one using NFS secondary and the other using S3 or Swift secondary.
 
 About Physical Networks
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -770,7 +774,9 @@ the zone. That physical network carries the following traffic types:
    communicates directly with the CloudStack Management Server. You must
    configure the IP range for the system VMs to use.
 
-.. note:: We strongly recommend the use of separate NICs for management traffic
+.. note::
+
+   We strongly recommend the use of separate NICs for management traffic
    and guest traffic.
 
 -  
@@ -961,66 +967,4 @@ techniques:
 .. |region-overview.png: Nested structure of a region.| image:: ./_static/images/region-overview.png
 .. |zone-overview.png: Nested structure of a simple zone.| image:: ./_static/images/zone-overview.png
 .. |pod-overview.png: Nested structure of a simple pod| image:: ./_static/images/pod-overview.png
-.. |cluster-overview.png: Structure of a simple cluster| image:: ./_static/images/cluster-overview.png
-.. |installation-complete.png: Finished installs with single Management Server and multiple Management Servers| image:: ./_static/images/installation-complete.png
-.. |change-password.png: button to change a user's password| image:: ./_static/images/change-password.png
-.. |provisioning-overview.png: Conceptual overview of a basic deployment| image:: ./_static/images/provisioning-overview.png
-.. |vsphereclient.png: vSphere client| image:: ./_static/images/vsphere-client.png
-.. |addcluster.png: add a cluster| image:: ./_static/images/add-cluster.png
-.. |ConsoleButton.png: button to launch a console| image:: ./_static/images/console-icon.png
-.. |DeleteButton.png: button to delete dvSwitch| image:: ./_static/images/delete-button.png
-.. |vds-name.png: Name of the dvSwitch as specified in the vCenter.| image:: ./_static/images/vds-name.png
-.. |traffic-type.png: virtual switch type| image:: ./_static/images/traffic-type.png
-.. |dvSwitchConfig.png: Configuring dvSwitch| image:: ./_static/images/dvSwitch-config.png
-.. |Small-Scale Deployment| image:: ./_static/images/small-scale-deployment.png
-.. |Large-Scale Redundant Setup| image:: ./_static/images/large-scale-redundant-setup.png
-.. |Multi-Node Management Server| image:: ./_static/images/multi-node-management-server.png
-.. |Example Of A Multi-Site Deployment| image:: ./_static/images/multi-site-deployment.png
-.. |Separate Storage Network| image:: ./_static/images/separate-storage-network.png
-.. |NIC Bonding And Multipath I/O| image:: ./_static/images/nic-bonding-and-multipath-io.png
-.. |Use the GUI to set the configuration variable to true| image:: ./_static/images/ec2-s3-configuration.png
-.. |Use the GUI to set the name of a compute service offering to an EC2 instance type API name.| image:: ./_static/images/compute-service-offerings.png
-.. |parallel-mode.png: adding a firewall and load balancer in parallel mode.| image:: ./_static/images/parallel-mode.png
-.. |guest-traffic-setup.png: Depicts a guest traffic setup| image:: ./_static/images/guest-traffic-setup.png
-.. |networksinglepod.png: diagram showing logical view of network in a pod| image:: ./_static/images/network-singlepod.png
-.. |networksetupzone.png: Depicts network setup in a single zone| image:: ./_static/images/network-setup-zone.png
-.. |addguestnetwork.png: Add Guest network setup in a single zone| image:: ./_static/images/add-guest-network.png
-.. |remove-nic.png: button to remove a NIC| image:: ./_static/images/remove-nic.png
-.. |set-default-nic.png: button to set a NIC as default one.| image:: ./_static/images/set-default-nic.png
-.. |EditButton.png: button to edit a network| image:: ./_static/images/edit-icon.png
-.. |edit-icon.png: button to edit a network| image:: ./_static/images/edit-icon.png
-.. |addAccount-icon.png: button to assign an IP range to an account.| image:: ./_static/images/addAccount-icon.png
-.. |eip-ns-basiczone.png: Elastic IP in a NetScaler-enabled Basic Zone.| image:: ./_static/images/eip-ns-basiczone.png
-.. |add-ip-range.png: adding an IP range to a network.| image:: ./_static/images/add-ip-range.png
-.. |httpaccess.png: allows inbound HTTP access from anywhere| image:: ./_static/images/http-access.png
-.. |autoscaleateconfig.png: Configuring AutoScale| image:: ./_static/images/autoscale-config.png
-.. |EnableDisable.png: button to enable or disable AutoScale.| image:: ./_static/images/enable-disable-autoscale.png
-.. |gslb.png: GSLB architecture| image:: ./_static/images/gslb.png
-.. |gslb-add.png: adding a gslb rule| image:: ./_static/images/add-gslb.png
-.. |ReleaseIPButton.png: button to release an IP| image:: ./_static/images/release-ip-icon.png
-.. |EnableNATButton.png: button to enable NAT| image:: ./_static/images/enable-disable.png
-.. |egress-firewall-rule.png: adding an egress firewall rule| image:: ./_static/images/egress-firewall-rule.png
-.. |AttachDiskButton.png: button to attach a volume| image:: ./_static/images/vpn-icon.png
-.. |vpn-icon.png: button to enable VPN| image:: ./_static/images/vpn-icon.png
-.. |addvpncustomergateway.png: adding a customer gateway.| image:: ./_static/images/add-vpn-customer-gateway.png
-.. |edit.png: button to edit a VPN customer gateway| image:: ./_static/images/edit-icon.png
-.. |delete.png: button to remove a VPN customer gateway| image:: ./_static/images/delete-button.png
-.. |createvpnconnection.png: creating a VPN connection to the customer gateway.| image:: ./_static/images/create-vpn-connection.png
-.. |remove-vpn.png: button to remove a VPN connection| image:: ./_static/images/remove-vpn.png
-.. |reset-vpn.png: button to reset a VPN connection| image:: ./_static/images/reset-vpn.png
-.. |mutltier.png: a multi-tier setup.| image:: ./_static/images/multi-tier-app.png
-.. |add-vpc.png: adding a vpc.| image:: ./_static/images/add-vpc.png
-.. |add-tier.png: adding a tier to a vpc.| image:: ./_static/images/add-tier.png
-.. |replace-acl-icon.png: button to replace an ACL list| image:: ./_static/images/replace-acl-icon.png
-.. |add-new-gateway-vpc.png: adding a private gateway for the VPC.| image:: ./_static/images/add-new-gateway-vpc.png
-.. |replace-acl-icon.png: button to replace the default ACL behaviour.| image:: ./_static/images/replace-acl-icon.png
-.. |add-vm-vpc.png: adding a VM to a vpc.| image:: ./_static/images/add-vm-vpc.png
-.. |addvm-tier-sharednw.png: adding a VM to a VPC tier and shared network.| image:: ./_static/images/addvm-tier-sharednw.png
-.. |release-ip-icon.png: button to release an IP.| image:: ./_static/images/release-ip-icon.png
-.. |enable-disable.png: button to enable Static NAT.| image:: ./_static/images/enable-disable.png
-.. |select-vmstatic-nat.png: selecting a tier to apply staticNAT.| image:: ./_static/images/select-vm-staticnat-vpc.png
-.. |vpc-lb.png: Configuring internal LB for VPC| image:: ./_static/images/vpc-lb.png
-.. |del-tier.png: button to remove a tier| image:: ./_static/images/del-tier.png
-.. |remove-vpc.png: button to remove a VPC| image:: ./_static/images/remove-vpc.png
-.. |edit-icon.png: button to edit a VPC| image:: ./_static/images/edit-icon.png
-.. |restart-vpc.png: button to restart a VPC| image:: ./_static/images/restart-vpc.png
+.. |cluster-overview.png: Structure of a simple cluster| image:: ./_static/images/cluster-overview.png
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/7f2027bb/source/configuration.rst
----------------------------------------------------------------------
diff --git a/source/configuration.rst b/source/configuration.rst
index f2b0dce..bfcf2b3 100644
--- a/source/configuration.rst
+++ b/source/configuration.rst
@@ -110,7 +110,7 @@ region.
    for the new region. The default region is automatically assigned a
    region ID of 1, so your first additional region might be region 2.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
       # cloudstack-setup-databases cloud:<dbpassword>@localhost --deploy-as=root:<password> -e <encryption_type> -m <management_server_key> -k <database_key> -r <region_id>
 
@@ -171,7 +171,7 @@ region.
 
       First, run this command to copy the contents of the database:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           # mysqldump -u root -p<mysql_password> -h <region1_db_host> cloud account user domain > region1.sql
 
@@ -179,7 +179,7 @@ region.
 
       Then run this command to put the data onto the region 2 database:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           # mysql -u root -p<mysql_password> -h <region2_db_host> cloud < region1.sql
 
@@ -187,7 +187,7 @@ region.
 
    Remove project accounts. Run these commands on the region 2 database:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
           # mysql> delete from account where type = 5;
 
@@ -195,7 +195,7 @@ region.
 
    Set the default zone as null:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
           # mysql> update account set default_zone_id = null;
 
@@ -215,9 +215,9 @@ repeat certain steps additional times for each additional region:
    Install CloudStack in each additional region. Set the region ID for
    each region during the database setup step.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
-       cloudstack-setup-databases cloud:<dbpassword>@localhost --deploy-as=root:<password> -e <encryption_type> -m <management_server_key> -k <database_key> -r <region_id>
+      cloudstack-setup-databases cloud:<dbpassword>@localhost --deploy-as=root:<password> -e <encryption_type> -m <management_server_key> -k <database_key> -r <region_id>
 
 #. 
 
@@ -273,7 +273,7 @@ repeat certain steps additional times for each additional region:
 
       First, run this command to copy the contents of the database:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           # mysqldump -u root -p<mysql_password> -h <region1_db_host> cloud account user domain > region1.sql
 
@@ -282,7 +282,7 @@ repeat certain steps additional times for each additional region:
       Then run this command to put the data onto the new region's
       database. For example, for region 3:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           # mysql -u root -p<mysql_password> -h <region3_db_host> cloud < region1.sql
 
@@ -290,7 +290,7 @@ repeat certain steps additional times for each additional region:
 
    Remove project accounts. Run these commands on the region 3 database:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        mysql> delete from account where type = 5;
 
@@ -298,7 +298,7 @@ repeat certain steps additional times for each additional region:
 
    Set the default zone as null:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        mysql> update account set default_zone_id = null;
 
@@ -641,8 +641,10 @@ Basic Zone Configuration
    always add more hosts later. For an overview of what a host is, see
    About Hosts.
 
-   ..  note:: When you add a hypervisor host to CloudStack, the host must not have
-              any VMs already running.
+   ..  note::
+   
+        When you add a hypervisor host to CloudStack, the host must not have
+        any VMs already running.
 
    Before you can configure the host, you need to install the hypervisor
    software on the host. You will need to know which version of the
@@ -894,8 +896,10 @@ Advanced Zone Configuration
    always add more hosts later. For an overview of what a host is, see
    `Section 2.5, “About Hosts” <#about-hosts>`__.
 
-   .. note:: When you deploy CloudStack, the hypervisor host must not have any VMs
-             already running.
+   .. note::
+   
+       When you deploy CloudStack, the hypervisor host must not have any VMs
+       already running.
 
    Before you can configure the host, you need to install the hypervisor
    software on the host. You will need to know which version of the
@@ -1356,8 +1360,10 @@ Adding a Host
    supported, as well as crucial additional steps to configure the
    hypervisor hosts for use with CloudStack.
 
-   .. warning:: Be sure you have performed the additional CloudStack-specific configuration steps described in the hypervisor installation section
-                for your particular hypervisor.
+   .. warning::
+       
+	  Be sure you have performed the additional CloudStack-specific configuration steps described in the hypervisor installation section
+      for your particular hypervisor.
 
 #. 
 
@@ -1381,7 +1387,9 @@ XenServer and KVM hosts can be added to a cluster at any time.
 Requirements for XenServer and KVM Hosts
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. warning:: Make sure the hypervisor host does not have any VMs already running before you add it to CloudStack.
+.. warning::
+
+   Make sure the hypervisor host does not have any VMs already running before you add it to CloudStack.
 
 Configuration requirements:
 
@@ -1410,11 +1418,13 @@ For all additional hosts to be added to the cluster, run the following
 command. This will cause the host to join the master in a XenServer
 pool.
 
-.. code:: bash
+.. sourcecode:: bash
 
     # xe pool-join master-address=[master IP] master-username=root master-password=[your password]
 
-.. 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.
 
 With all hosts added to the XenServer pool, run the cloud-setup-bond
 script. This script will complete the configuration and setup of the
@@ -1430,7 +1440,7 @@ bonds on the new hosts in the cluster.
 
    Run the script:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # ./cloud-setup-bonding.sh
 
@@ -1574,9 +1584,13 @@ of that procedure. You can add primary storage servers at any time, such
 as when adding a new cluster or adding more servers to an existing
 cluster.
 
-.. warning:: When using preallocated storage for primary storage, be sure there is nothing on the storage (ex. you have an empty SAN volume or an empty NFS share). Adding              the storage to CloudStack will destroy any existing data.
+.. warning:: 
+
+   When using preallocated storage for primary storage, be sure there is nothing on the storage (ex. you have an empty SAN volume or an empty NFS share).         Adding the storage to CloudStack will destroy any existing data.
 
-.. note:: Primary storage can also be added at the zone level through the CloudStack API (adding zone-level primary storage is not yet supported through the CloudStack              UI).
+.. note:: 
+
+   Primary storage can also be added at the zone level through the CloudStack API (adding zone-level primary storage is not yet supported through the             CloudStack UI).
 
 Once primary storage has been added at the zone level, it can be managed
 through the CloudStack UI.
@@ -1714,11 +1728,17 @@ through the CloudStack UI.
 Configuring a Storage Plug-in
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. note:: Primary storage that is based on a custom plug-in (ex. SolidFire) must be added through the CloudStack API (described later in this section). There is no support at this time through the CloudStack UI to add this type of primary storage (although most of its features are available through the CloudStack UI).
+.. note::
+
+   Primary storage that is based on a custom plug-in (ex. SolidFire) must be added through the CloudStack API (described later in this section). There is no      support at this time through the CloudStack UI to add this type of primary storage (although most of its features are available through the CloudStack UI).
 
-.. note::  At this time, a custom storage plug-in, such as the SolidFire storage plug-in, can only be leveraged for data disks (through Disk Offerings).
+.. note::
 
-.. note:: The SolidFire storage plug-in for CloudStack is part of the standard CloudStack install. There is no additional work required to add this component.
+   At this time, a custom storage plug-in, such as the SolidFire storage plug-in, can only be leveraged for data disks (through Disk Offerings).
+
+.. note::
+
+   The SolidFire storage plug-in for CloudStack is part of the standard CloudStack install. There is no additional work required to add this component.
 
 Adding primary storage that is based on the SolidFire plug-in enables
 CloudStack to provide hard quality-of-service (QoS) guarantees.
@@ -1849,7 +1869,9 @@ When you create a new zone, the first secondary storage is added as part
 of that procedure. You can add secondary storage servers at any time to
 add more servers to an existing zone.
 
-.. warning:: Ensure that nothing is stored on the server. Adding the server to CloudStack will destroy any existing data.
+.. warning::
+
+   Ensure that nothing is stored on the server. Adding the server to CloudStack will destroy any existing data.
 
 #. 
 
@@ -1900,15 +1922,19 @@ add more servers to an existing zone.
       for zone-based storage, and the others for region-wide storage.
       For Hyper-V, select SMB/CIFS.
 
-      .. warning:: Heterogeneous Secondary Storage is not supported in Regions. You can use only a single NFS, S3, or Swift account per region.
+      .. warning::
+	  
+	     Heterogeneous Secondary Storage is not supported in Regions. You can use only a single NFS, S3, or Swift account per region.
 
    -  
 
       Create NFS Secondary Staging Store. This box must always be
       checked.
 
-      .. warning:: Even if the UI allows you to uncheck this box, do not do so. This checkbox and the three fields below it must be filled in. Even
-      when Swift or S3 is used as the secondary storage provider, an NFS staging storage in each zone is still required.
+      .. warning:: 
+	  
+	     Even if the UI allows you to uncheck this box, do not do so. This checkbox and the three fields below it must be filled in. Even
+         when Swift or S3 is used as the secondary storage provider, an NFS staging storage in each zone is still required.
 
    -  
 
@@ -2216,73 +2242,7 @@ zone      blacklisted.routes                                         Routes that
 ========  =========================================================  ======================================================================================================================================  
 
 
-
-.. |1000-foot-view.png: Overview of CloudStack| image:: ./_static/images/1000-foot-view.png
-.. |basic-deployment.png: Basic two-machine deployment| image:: ./_static/images/basic-deployment.png
-.. |infrastructure_overview.png: Nested organization of a zone| image:: ./_static/images/infrastructure-overview.png
-.. |region-overview.png: Nested structure of a region.| image:: ./_static/images/region-overview.png
-.. |zone-overview.png: Nested structure of a simple zone.| image:: ./_static/images/zone-overview.png
-.. |pod-overview.png: Nested structure of a simple pod| image:: ./_static/images/pod-overview.png
-.. |cluster-overview.png: Structure of a simple cluster| image:: ./_static/images/cluster-overview.png
-.. |installation-complete.png: Finished installs with single Management Server and multiple Management Servers| image:: ./_static/images/installation-complete.png
-.. |change-password.png: button to change a user's password| image:: ./_static/images/change-password.png
 .. |provisioning-overview.png: Conceptual overview of a basic deployment| image:: ./_static/images/provisioning-overview.png
 .. |vsphereclient.png: vSphere client| image:: ./_static/images/vsphere-client.png
 .. |addcluster.png: add a cluster| image:: ./_static/images/add-cluster.png
-.. |ConsoleButton.png: button to launch a console| image:: ./_static/images/console-icon.png
-.. |DeleteButton.png: button to delete dvSwitch| image:: ./_static/images/delete-button.png
-.. |vds-name.png: Name of the dvSwitch as specified in the vCenter.| image:: ./_static/images/vds-name.png
-.. |traffic-type.png: virtual switch type| image:: ./_static/images/traffic-type.png
-.. |dvSwitchConfig.png: Configuring dvSwitch| image:: ./_static/images/dvSwitch-config.png
-.. |Small-Scale Deployment| image:: ./_static/images/small-scale-deployment.png
-.. |Large-Scale Redundant Setup| image:: ./_static/images/large-scale-redundant-setup.png
-.. |Multi-Node Management Server| image:: ./_static/images/multi-node-management-server.png
-.. |Example Of A Multi-Site Deployment| image:: ./_static/images/multi-site-deployment.png
-.. |Separate Storage Network| image:: ./_static/images/separate-storage-network.png
-.. |NIC Bonding And Multipath I/O| image:: ./_static/images/nic-bonding-and-multipath-io.png
-.. |Use the GUI to set the configuration variable to true| image:: ./_static/images/ec2-s3-configuration.png
-.. |Use the GUI to set the name of a compute service offering to an EC2 instance type API name.| image:: ./_static/images/compute-service-offerings.png
-.. |parallel-mode.png: adding a firewall and load balancer in parallel mode.| image:: ./_static/images/parallel-mode.png
-.. |guest-traffic-setup.png: Depicts a guest traffic setup| image:: ./_static/images/guest-traffic-setup.png
-.. |networksinglepod.png: diagram showing logical view of network in a pod| image:: ./_static/images/network-singlepod.png
-.. |networksetupzone.png: Depicts network setup in a single zone| image:: ./_static/images/network-setup-zone.png
-.. |addguestnetwork.png: Add Guest network setup in a single zone| image:: ./_static/images/add-guest-network.png
-.. |remove-nic.png: button to remove a NIC| image:: ./_static/images/remove-nic.png
-.. |set-default-nic.png: button to set a NIC as default one.| image:: ./_static/images/set-default-nic.png
-.. |EditButton.png: button to edit a network| image:: ./_static/images/edit-icon.png
-.. |edit-icon.png: button to edit a network| image:: ./_static/images/edit-icon.png
-.. |addAccount-icon.png: button to assign an IP range to an account.| image:: ./_static/images/addAccount-icon.png
-.. |eip-ns-basiczone.png: Elastic IP in a NetScaler-enabled Basic Zone.| image:: ./_static/images/eip-ns-basiczone.png
-.. |add-ip-range.png: adding an IP range to a network.| image:: ./_static/images/add-ip-range.png
-.. |httpaccess.png: allows inbound HTTP access from anywhere| image:: ./_static/images/http-access.png
-.. |autoscaleateconfig.png: Configuring AutoScale| image:: ./_static/images/autoscale-config.png
-.. |EnableDisable.png: button to enable or disable AutoScale.| image:: ./_static/images/enable-disable-autoscale.png
-.. |gslb.png: GSLB architecture| image:: ./_static/images/gslb.png
-.. |gslb-add.png: adding a gslb rule| image:: ./_static/images/add-gslb.png
-.. |ReleaseIPButton.png: button to release an IP| image:: ./_static/images/release-ip-icon.png
-.. |EnableNATButton.png: button to enable NAT| image:: ./_static/images/enable-disable.png
-.. |egress-firewall-rule.png: adding an egress firewall rule| image:: ./_static/images/egress-firewall-rule.png
-.. |AttachDiskButton.png: button to attach a volume| image:: ./_static/images/vpn-icon.png
-.. |vpn-icon.png: button to enable VPN| image:: ./_static/images/vpn-icon.png
-.. |addvpncustomergateway.png: adding a customer gateway.| image:: ./_static/images/add-vpn-customer-gateway.png
-.. |edit.png: button to edit a VPN customer gateway| image:: ./_static/images/edit-icon.png
-.. |delete.png: button to remove a VPN customer gateway| image:: ./_static/images/delete-button.png
-.. |createvpnconnection.png: creating a VPN connection to the customer gateway.| image:: ./_static/images/create-vpn-connection.png
-.. |remove-vpn.png: button to remove a VPN connection| image:: ./_static/images/remove-vpn.png
-.. |reset-vpn.png: button to reset a VPN connection| image:: ./_static/images/reset-vpn.png
-.. |mutltier.png: a multi-tier setup.| image:: ./_static/images/multi-tier-app.png
-.. |add-vpc.png: adding a vpc.| image:: ./_static/images/add-vpc.png
-.. |add-tier.png: adding a tier to a vpc.| image:: ./_static/images/add-tier.png
-.. |replace-acl-icon.png: button to replace an ACL list| image:: ./_static/images/replace-acl-icon.png
-.. |add-new-gateway-vpc.png: adding a private gateway for the VPC.| image:: ./_static/images/add-new-gateway-vpc.png
-.. |replace-acl-icon.png: button to replace the default ACL behaviour.| image:: ./_static/images/replace-acl-icon.png
-.. |add-vm-vpc.png: adding a VM to a vpc.| image:: ./_static/images/add-vm-vpc.png
-.. |addvm-tier-sharednw.png: adding a VM to a VPC tier and shared network.| image:: ./_static/images/addvm-tier-sharednw.png
-.. |release-ip-icon.png: button to release an IP.| image:: ./_static/images/release-ip-icon.png
-.. |enable-disable.png: button to enable Static NAT.| image:: ./_static/images/enable-disable.png
-.. |select-vmstatic-nat.png: selecting a tier to apply staticNAT.| image:: ./_static/images/select-vm-staticnat-vpc.png
-.. |vpc-lb.png: Configuring internal LB for VPC| image:: ./_static/images/vpc-lb.png
-.. |del-tier.png: button to remove a tier| image:: ./_static/images/del-tier.png
-.. |remove-vpc.png: button to remove a VPC| image:: ./_static/images/remove-vpc.png
-.. |edit-icon.png: button to edit a VPC| image:: ./_static/images/edit-icon.png
-.. |restart-vpc.png: button to restart a VPC| image:: ./_static/images/restart-vpc.png
+.. |ConsoleButton.png: button to launch a console| image:: ./_static/images/console-icon.png
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/7f2027bb/source/hypervisor_installation.rst
----------------------------------------------------------------------
diff --git a/source/hypervisor_installation.rst b/source/hypervisor_installation.rst
index cd89b7a..0614b71 100644
--- a/source/hypervisor_installation.rst
+++ b/source/hypervisor_installation.rst
@@ -100,9 +100,13 @@ The material in this section doesn't duplicate KVM installation docs. It
 provides the CloudStack-specific steps that are needed to prepare a KVM
 host to work with CloudStack.
 
-.. warning:: Before continuing, make sure that you have applied the latest updates to your host.
+.. warning::
 
-.. warning:: It is NOT recommended to run services on this host not controlled by CloudStack.
+   Before continuing, make sure that you have applied the latest updates to your host.
+
+.. warning::
+
+   It is NOT recommended to run services on this host not controlled by CloudStack.
 
 The procedure for installing a KVM Hypervisor Host is:
 
@@ -136,7 +140,7 @@ KVM instances.
 
    Check for a fully qualified hostname.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        $ hostname --fqdn
 
@@ -148,7 +152,7 @@ KVM instances.
 
    Make sure that the machine can reach the Internet.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        $ ping www.cloudstack.org
 
@@ -156,18 +160,20 @@ KVM instances.
 
    Turn on NTP for time synchronization.
 
-   .. note:: NTP is required to synchronize the clocks of the servers in your
-   cloud. Unsynchronized clocks can cause unexpected problems.
+   .. note::
+   
+      NTP is required to synchronize the clocks of the servers in your
+      cloud. Unsynchronized clocks can cause unexpected problems.
 
    #. 
 
       Install NTP
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           $ yum install ntp
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           $ apt-get install openntpd
 
@@ -186,13 +192,13 @@ First we start by installing the agent:
 
 In RHEL or CentOS:
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ yum install cloudstack-agent
 
 In Ubuntu:
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ apt-get install cloudstack-agent
 
@@ -225,7 +231,7 @@ specify the guest CPU config in the per-host configuration file
 (/etc/cloudstack/agent/agent.properties). This will be achieved by
 introducing two new configuration parameters:
 
-.. code:: bash
+.. sourcecode:: bash
 
     guest.cpu.mode=custom|host-model|host-passthrough
     guest.cpu.model=from /usr/share/libvirt/cpu_map.xml(only valid when guest.cpu.mode=custom)
@@ -262,7 +268,7 @@ Here are some examples:
 
    custom
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        guest.cpu.mode=custom
        guest.cpu.model=SandyBridge
@@ -271,7 +277,7 @@ Here are some examples:
 
    host-model
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        guest.cpu.mode=host-model
 
@@ -279,7 +285,7 @@ Here are some examples:
 
    host-passthrough
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        guest.cpu.mode=host-passthrough
 
@@ -301,23 +307,23 @@ cloudstack-agent and should already be installed.
 
    Set the following parameters:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        listen_tls = 0
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        listen_tcp = 1
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        tcp_port = "16509"
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        auth_tcp = "none"
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        mdns_adv = 0
 
@@ -330,7 +336,7 @@ cloudstack-agent and should already be installed.
 
    Uncomment the following line:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        #LIBVIRTD_ARGS="--listen"
 
@@ -338,13 +344,13 @@ cloudstack-agent and should already be installed.
 
    Add "-l" to the following line
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        libvirtd_opts="-d"
 
    so it looks like:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        libvirtd_opts="-d -l"
 
@@ -355,7 +361,7 @@ cloudstack-agent and should already be installed.
 
    Make sure this parameter is set:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        vnc_listen = "0.0.0.0"
 
@@ -365,13 +371,13 @@ cloudstack-agent and should already be installed.
 
    In RHEL or CentOS:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        $ service libvirtd restart
 
    In Ubuntu:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        $ service libvirt-bin restart
 
@@ -394,7 +400,7 @@ ensure the Agent has all the required permissions.
       In RHEL or CentOS, SELinux is installed and enabled by default.
       You can verify this with:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           $ rpm -qa | grep selinux
 
@@ -406,19 +412,19 @@ ensure the Agent has all the required permissions.
 
       In RHEL or CentOS:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           vi /etc/selinux/config
 
       Change the following line
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           SELINUX=enforcing
 
       to this
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           SELINUX=permissive
 
@@ -427,7 +433,7 @@ ensure the Agent has all the required permissions.
       Then set SELinux to permissive starting immediately, without
       requiring a system reboot.
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           $ setenforce permissive
 
@@ -443,7 +449,7 @@ ensure the Agent has all the required permissions.
       In Ubuntu AppArmor is installed and enabled by default. You can
       verify this with:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           $ dpkg --list 'apparmor'
 
@@ -451,19 +457,19 @@ ensure the Agent has all the required permissions.
 
       Disable the AppArmor profiles for libvirt
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           $ ln -s /etc/apparmor.d/usr.sbin.libvirtd /etc/apparmor.d/disable/
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           $ ln -s /etc/apparmor.d/usr.lib.libvirt.virt-aa-helper /etc/apparmor.d/disable/
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           $ apparmor_parser -R /etc/apparmor.d/usr.sbin.libvirtd
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           $ apparmor_parser -R /etc/apparmor.d/usr.lib.libvirt.virt-aa-helper
 
@@ -526,13 +532,13 @@ proceed to configuring the network.
 
 First we configure eth0
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/sysconfig/network-scripts/ifcfg-eth0
 
 Make sure it looks similar to:
 
-.. code:: bash
+.. sourcecode:: bash
 
     DEVICE=eth0
     HWADDR=00:04:xx:xx:xx:xx
@@ -543,11 +549,11 @@ Make sure it looks similar to:
 
 We now have to configure the three VLAN interfaces:
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/sysconfig/network-scripts/ifcfg-eth0.100
 
-.. code:: bash
+.. sourcecode:: bash
 
     DEVICE=eth0.100
     HWADDR=00:04:xx:xx:xx:xx
@@ -560,11 +566,11 @@ We now have to configure the three VLAN interfaces:
     GATEWAY=192.168.42.1
     NETMASK=255.255.255.0
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/sysconfig/network-scripts/ifcfg-eth0.200
 
-.. code:: bash
+.. sourcecode:: bash
 
     DEVICE=eth0.200
     HWADDR=00:04:xx:xx:xx:xx
@@ -575,11 +581,11 @@ We now have to configure the three VLAN interfaces:
     VLAN=yes
     BRIDGE=cloudbr0
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/sysconfig/network-scripts/ifcfg-eth0.300
 
-.. code:: bash
+.. sourcecode:: bash
 
     DEVICE=eth0.300
     HWADDR=00:04:xx:xx:xx:xx
@@ -593,13 +599,13 @@ We now have to configure the three VLAN interfaces:
 Now we have the VLAN interfaces configured we can add the bridges on top
 of them.
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/sysconfig/network-scripts/ifcfg-cloudbr0
 
 Now we just configure it is a plain bridge without an IP-Address
 
-.. code:: bash
+.. sourcecode:: bash
 
     DEVICE=cloudbr0
     TYPE=Bridge
@@ -612,11 +618,11 @@ Now we just configure it is a plain bridge without an IP-Address
 
 We do the same for cloudbr1
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/sysconfig/network-scripts/ifcfg-cloudbr1
 
-.. code:: bash
+.. sourcecode:: bash
 
     DEVICE=cloudbr1
     TYPE=Bridge
@@ -638,13 +644,13 @@ Configure in Ubuntu
 All the required packages were installed when you installed libvirt, so
 we only have to configure the network.
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/network/interfaces
 
 Modify the interfaces file to look like this:
 
-.. code:: bash
+.. sourcecode:: bash
 
     auto lo
     iface lo inet loopback
@@ -751,7 +757,7 @@ the OpenVswitch database.
 First we create a main bridge connected to the eth0 interface. Next we
 create three fake bridges, each connected to a specific vlan tag.
 
-.. code:: bash
+.. sourcecode:: bash
 
     # ovs-vsctl add-br cloudbr
     # ovs-vsctl add-port cloudbr eth0 
@@ -768,13 +774,13 @@ installed, we can proceed to configuring the network.
 
 First we configure eth0
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/sysconfig/network-scripts/ifcfg-eth0
 
 Make sure it looks similar to:
 
-.. code:: bash
+.. sourcecode:: bash
 
     DEVICE=eth0
     HWADDR=00:04:xx:xx:xx:xx
@@ -785,11 +791,11 @@ Make sure it looks similar to:
 
 We have to configure the base bridge with the trunk.
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/sysconfig/network-scripts/ifcfg-cloudbr
 
-.. code:: bash
+.. sourcecode:: bash
 
     DEVICE=cloudbr
     ONBOOT=yes
@@ -800,11 +806,11 @@ We have to configure the base bridge with the trunk.
 
 We now have to configure the three VLAN bridges:
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/sysconfig/network-scripts/ifcfg-mgmt0
 
-.. code:: bash
+.. sourcecode:: bash
 
     DEVICE=mgmt0
     ONBOOT=yes
@@ -816,11 +822,11 @@ We now have to configure the three VLAN bridges:
     GATEWAY=192.168.42.1
     NETMASK=255.255.255.0
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/sysconfig/network-scripts/ifcfg-cloudbr0
 
-.. code:: bash
+.. sourcecode:: bash
 
     DEVICE=cloudbr0
     ONBOOT=yes
@@ -829,11 +835,11 @@ We now have to configure the three VLAN bridges:
     DEVICETYPE=ovs
     TYPE=OVSBridge
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/sysconfig/network-scripts/ifcfg-cloudbr1
 
-.. code:: bash
+.. sourcecode:: bash
 
     DEVICE=cloudbr1
     ONBOOT=yes
@@ -885,30 +891,30 @@ Open ports in RHEL/CentOS
 RHEL and CentOS use iptables for firewalling the system, you can open
 extra ports by executing the following iptable commands:
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ iptables -I INPUT -p tcp -m tcp --dport 22 -j ACCEPT
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ iptables -I INPUT -p tcp -m tcp --dport 1798 -j ACCEPT
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ iptables -I INPUT -p tcp -m tcp --dport 16509 -j ACCEPT
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ iptables -I INPUT -p tcp -m tcp --dport 5900:6100 -j ACCEPT
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ iptables -I INPUT -p tcp -m tcp --dport 49152:49216 -j ACCEPT
 
 These iptable settings are not persistent accross reboots, we have to
 save them first.
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ iptables-save > /etc/sysconfig/iptables
 
@@ -920,23 +926,23 @@ is a Python wrapper around iptables.
 
 To open the required ports, execute the following commands:
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ ufw allow proto tcp from any to any port 22
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ ufw allow proto tcp from any to any port 1798
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ ufw allow proto tcp from any to any port 16509
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ ufw allow proto tcp from any to any port 5900:6100
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ ufw allow proto tcp from any to any port 49152:49216
 
@@ -1135,7 +1141,7 @@ time.
 
    Install NTP.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # yum install ntp
 
@@ -1143,14 +1149,14 @@ time.
 
    Edit the NTP configuration file to point to your NTP server.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # vi /etc/ntp.conf
 
    Add one or more server lines in this file with the names of the NTP
    servers you want to use. For example:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        server 0.xenserver.pool.ntp.org
        server 1.xenserver.pool.ntp.org
@@ -1161,7 +1167,7 @@ time.
 
    Restart the NTP client.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # service ntpd restart
 
@@ -1169,7 +1175,7 @@ time.
 
    Make sure NTP will start again upon reboot.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # chkconfig ntpd on
 
@@ -1205,7 +1211,7 @@ steps on each XenServer host.
 
    Extract the file:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # tar xf xenserver-cloud-supp.tgz
 
@@ -1213,7 +1219,7 @@ steps on each XenServer host.
 
    Run the following script:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # xe-install-supplemental-pack xenserver-cloud-supp.iso
 
@@ -1222,7 +1228,7 @@ steps on each XenServer host.
    If the XenServer host is part of a zone that uses basic networking,
    disable Open vSwitch (OVS):
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # xe-switch-network-backend  bridge
 
@@ -1254,7 +1260,7 @@ that XenServer.
    Rescan the SCSI bus. Either use the following command or use
    XenCenter to perform an HBA rescan.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # scsi-rescan
 
@@ -1266,14 +1272,14 @@ that XenServer.
 
    Check to be sure you see the new SCSI disk.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # ls /dev/disk/by-id/scsi-360a98000503365344e6f6177615a516b -l
 
    The output should look like this, although the specific file name
    will be different (scsi-<scsiID>):
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        lrwxrwxrwx 1 root root 9 Mar 16 13:47
        /dev/disk/by-id/scsi-360a98000503365344e6f6177615a516b -> ../../sdc
@@ -1287,14 +1293,14 @@ that XenServer.
    On the storage server, run this command to get a unique ID for the
    new SR.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # uuidgen
 
    The output should look like this, although the specific ID will be
    different:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        e6849e96-86c3-4f2c-8fcc-350cc711be3d
 
@@ -1303,7 +1309,7 @@ that XenServer.
    Create the FiberChannel SR. In name-label, use the unique ID you just
    generated.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # xe sr-create type=lvmohba shared=true
        device-config:SCSIid=360a98000503365344e6f6177615a516b
@@ -1312,7 +1318,7 @@ that XenServer.
    This command returns a unique ID for the SR, like the following
    example (your ID will be different):
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        7a143820-e893-6c6a-236e-472da6ee66bf
 
@@ -1322,7 +1328,7 @@ that XenServer.
    command. In uuid, use the SR ID returned by the previous command. In
    name-description, set whatever friendly text you prefer.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # xe sr-param-set uuid=7a143820-e893-6c6a-236e-472da6ee66bf name-description="Fiber Channel storage repository"
 
@@ -1400,7 +1406,7 @@ name-label of the XenServer network must match the XenServer traffic
 label specified while creating the CloudStack network. This is set by
 running the following command:
 
-.. code:: bash
+.. sourcecode:: bash
 
     xe network-param-set uuid=<network id> name-label=<CloudStack traffic label>
 
@@ -1438,7 +1444,7 @@ CloudStack before adding the host.
 
    Run the following command.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # xe network-param-set name-label=cloud-public uuid=<UUID-Public>
 
@@ -1465,7 +1471,7 @@ CloudStack:
    Run the following command, substituting your own name-label and uuid
    values.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # xe network-param-set name-label=<cloud-guestN> uuid=<UUID-Guest>
 
@@ -1505,7 +1511,7 @@ separate storage network on all hosts (masters and slaves).
 Here is an example to set up eth5 to access a storage network on
 172.16.0.0/24.
 
-.. code:: bash
+.. sourcecode:: bash
 
     # xe pif-list host-name-label='hostname' device=eth5
     uuid(RO): ab0d3dd4-5744-8fae-9693-a022c7a3471d
@@ -1576,7 +1582,7 @@ into it.
 
    Find the physical NICs that you want to bond together.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # xe pif-list host-name-label='hostname' device=eth0
        # xe pif-list host-name-label='hostname' device=eth1
@@ -1594,7 +1600,7 @@ into it.
    you configure. You must use the same name-label for all hosts in the
    cloud for the management network.**
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # xe network-create name-label=cloud-private
        # xe bond-create network-uuid=[uuid of cloud-private created above]
@@ -1622,7 +1628,7 @@ and eth3) bonded into it.
 
    Find the physical NICs that you want to bond together.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        #xe pif-list host-name-label='hostname' device=eth2
        # xe pif-list host-name-label='hostname' device=eth3
@@ -1640,7 +1646,7 @@ and eth3) bonded into it.
    you configure. You must use the same name-label for all hosts in the
    cloud for the public network.**
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # xe network-create name-label=cloud-public
        # xe bond-create network-uuid=[uuid of cloud-public created above]
@@ -1657,7 +1663,7 @@ additional, slave hosts. Run the following command for all additional
 hosts to be added to the cluster. This will cause the host to join the
 master in a single XenServer pool.
 
-.. code:: bash
+.. sourcecode:: bash
 
     # xe pool-join master-address=[master IP] master-username=root
     master-password=[your password]
@@ -1679,7 +1685,7 @@ all hosts in the cluster.
 
    Run the script:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # ./cloud-setup-bonding.sh
 
@@ -1705,7 +1711,7 @@ To upgrade XenServer:
 
       Back up the database:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           # mysqldump --user=root --databases cloud > cloud.backup.sql
           # mysqldump --user=root --databases cloud_usage > cloud_usage.backup.sql
@@ -1744,7 +1750,7 @@ To upgrade XenServer:
       Restart the Management Server and Usage Server. You only need to
       do this once for all clusters.
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           # service cloudstack-management start
           # service cloudstack-usage start
@@ -1770,7 +1776,7 @@ To upgrade XenServer:
    Log in to one of the hosts in the cluster, and run this command to
    clean up the VLAN:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # . /opt/xensource/bin/cloud-clean-vlan.sh
 
@@ -1778,7 +1784,7 @@ To upgrade XenServer:
 
    Still logged in to the host, run the upgrade preparation script:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # /opt/xensource/bin/cloud-prepare-upgrade.sh
 
@@ -1798,7 +1804,7 @@ To upgrade XenServer:
       Troubleshooting: You might see the following error when you
       migrate a VM:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           [root@xenserver-qa-2-49-4 ~]# xe vm-migrate live=true host=xenserver-qa-2-49-5 vm=i-2-8-VM
           You attempted an operation on a VM which requires PV drivers to be installed but the drivers were not detected.
@@ -1806,7 +1812,7 @@ To upgrade XenServer:
 
       To solve this issue, run the following:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           # /opt/xensource/bin/make_migratable.sh  b6cf79c8-02ee-050b-922f-49583d9f1a14
 
@@ -1838,14 +1844,14 @@ To upgrade XenServer:
 
       Run the following script:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           # /opt/xensource/bin/setupxenserver.sh
 
       Troubleshooting: If you see the following error message, you can
       safely ignore it.
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           mv: cannot stat `/etc/cron.daily/logrotate`: No such file or directory
 
@@ -1854,7 +1860,7 @@ To upgrade XenServer:
       Plug in the storage repositories (physical block devices) to the
       XenServer host:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           # for pbd in `xe pbd-list currently-attached=false| grep ^uuid | awk '{print $NF}'`; do xe pbd-plug uuid=$pbd ; done
 
@@ -1870,7 +1876,7 @@ To upgrade XenServer:
    Run the following command on one host in the XenServer cluster to
    clean up the host tags:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # for host in $(xe host-list | grep ^uuid | awk '{print $NF}') ; do xe host-param-clear uuid=$host param-name=tags; done;
 
@@ -1898,7 +1904,7 @@ To upgrade XenServer:
 
    After all hosts are up, run the following on one host in the cluster:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        # /opt/xensource/bin/cloud-clean-vlan.sh
 
@@ -2138,7 +2144,7 @@ host, install a self-signed certificate on port 8250.
 
       Create A self-signed SSL certificate:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           #  New-SelfSignedCertificate -DnsName apachecloudstack -CertStoreLocation Cert:\LocalMachine\My
 
@@ -2149,7 +2155,7 @@ host, install a self-signed certificate on port 8250.
 
       Add the created certificate to port 8250 for https communication:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           netsh http add sslcert ipport=0.0.0.0:8250 certhash=<thumbprint> appid="{727beb1c-6e7c-49b2-8fbd-f03dbe481b08}"
 
@@ -2597,7 +2603,7 @@ with VMware-based VMs. The default additional port range is 59000-60000.
 To extend the port range, log in to the VMware ESX service console on
 each host and run the following commands:
 
-.. code:: bash
+.. sourcecode:: bash
 
     esxcfg-firewall -o 59000-60000,tcp,in,vncextras
     esxcfg-firewall -o 59000-60000,tcp,out,vncextras
@@ -2851,7 +2857,7 @@ vlan<range> command to add the VLAN ranges to the port profile.
 
 For example:
 
-.. code:: bash
+.. sourcecode:: bash
 
     switchport trunk allowed vlan 1,140-147,196-203
 
@@ -2867,14 +2873,14 @@ For example:
 If you want the VLAN 200 to be used on the switch, run the following
 command:
 
-.. code:: bash
+.. sourcecode:: bash
 
     vlan 200
 
 If you want the VLAN range 1350-1750 to be used on the switch, run the
 following command:
 
-.. code:: bash
+.. sourcecode:: bash
 
     vlan 1350-1750
 
@@ -3454,7 +3460,7 @@ KVM instances.
 
    Check for a fully qualified hostname.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        $ hostname --fqdn
 
@@ -3466,7 +3472,7 @@ KVM instances.
 
    Make sure that the machine can reach the Internet.
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        $ ping www.cloudstack.org
 
@@ -3481,11 +3487,11 @@ KVM instances.
 
       Install NTP
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           $ yum install ntp
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           $ apt-get install openntpd
 
@@ -3504,13 +3510,13 @@ First we start by installing the agent:
 
 In RHEL or CentOS:
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ yum install cloudstack-agent
 
 In Ubuntu:
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ apt-get install cloudstack-agent
 
@@ -3521,7 +3527,7 @@ are in ``/etc/cloudstack/agent/agent.properties``
 
    Set the Agent to run in LXC mode:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        hypervisor.type=lxc
 
@@ -3530,15 +3536,15 @@ are in ``/etc/cloudstack/agent/agent.properties``
    Optional: If you would like to use direct networking (instead of the
    default bridge networking), configure these lines:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        libvirt.vif.driver=com.cloud.hypervisor.kvm.resource.DirectVifDriver
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        network.direct.source.mode=private
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        network.direct.device=eth0
 
@@ -3563,23 +3569,23 @@ cloudstack-agent and should already be installed.
 
    Set the following parameters:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        listen_tls = 0
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        listen_tcp = 1
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        tcp_port = "16509"
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        auth_tcp = "none"
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        mdns_adv = 0
 
@@ -3592,7 +3598,7 @@ cloudstack-agent and should already be installed.
 
    Uncomment the following line:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        #LIBVIRTD_ARGS="--listen"
 
@@ -3600,13 +3606,13 @@ cloudstack-agent and should already be installed.
 
    Add "-l" to the following line
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        libvirtd_opts="-d"
 
    so it looks like:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        libvirtd_opts="-d -l"
 
@@ -3617,7 +3623,7 @@ cloudstack-agent and should already be installed.
 
    Make sure this parameter is set:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        vnc_listen = "0.0.0.0"
 
@@ -3627,13 +3633,13 @@ cloudstack-agent and should already be installed.
 
    In RHEL or CentOS:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        $ service libvirtd restart
 
    In Ubuntu:
 
-   .. code:: bash
+   .. sourcecode:: bash
 
        $ service libvirt-bin restart
 
@@ -3656,7 +3662,7 @@ ensure the Agent has all the required permissions.
       In RHEL or CentOS, SELinux is installed and enabled by default.
       You can verify this with:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           $ rpm -qa | grep selinux
 
@@ -3668,19 +3674,19 @@ ensure the Agent has all the required permissions.
 
       In RHEL or CentOS:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           vi /etc/selinux/config
 
       Change the following line
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           SELINUX=enforcing
 
       to this
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           SELINUX=permissive
 
@@ -3689,7 +3695,7 @@ ensure the Agent has all the required permissions.
       Then set SELinux to permissive starting immediately, without
       requiring a system reboot.
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           $ setenforce permissive
 
@@ -3705,7 +3711,7 @@ ensure the Agent has all the required permissions.
       In Ubuntu AppArmor is installed and enabled by default. You can
       verify this with:
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           $ dpkg --list 'apparmor'
 
@@ -3713,19 +3719,19 @@ ensure the Agent has all the required permissions.
 
       Disable the AppArmor profiles for libvirt
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           $ ln -s /etc/apparmor.d/usr.sbin.libvirtd /etc/apparmor.d/disable/
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           $ ln -s /etc/apparmor.d/usr.lib.libvirt.virt-aa-helper /etc/apparmor.d/disable/
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           $ apparmor_parser -R /etc/apparmor.d/usr.sbin.libvirtd
 
-      .. code:: bash
+      .. sourcecode:: bash
 
           $ apparmor_parser -R /etc/apparmor.d/usr.lib.libvirt.virt-aa-helper
 
@@ -3788,13 +3794,13 @@ proceed to configuring the network.
 
 First we configure eth0
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/sysconfig/network-scripts/ifcfg-eth0
 
 Make sure it looks similar to:
 
-.. code:: bash
+.. sourcecode:: bash
 
     DEVICE=eth0
     HWADDR=00:04:xx:xx:xx:xx
@@ -3805,11 +3811,11 @@ Make sure it looks similar to:
 
 We now have to configure the three VLAN interfaces:
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/sysconfig/network-scripts/ifcfg-eth0.100
 
-.. code:: bash
+.. sourcecode:: bash
 
     DEVICE=eth0.100
     HWADDR=00:04:xx:xx:xx:xx
@@ -3822,11 +3828,11 @@ We now have to configure the three VLAN interfaces:
     GATEWAY=192.168.42.1
     NETMASK=255.255.255.0
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/sysconfig/network-scripts/ifcfg-eth0.200
 
-.. code:: bash
+.. sourcecode:: bash
 
     DEVICE=eth0.200
     HWADDR=00:04:xx:xx:xx:xx
@@ -3837,11 +3843,11 @@ We now have to configure the three VLAN interfaces:
     VLAN=yes
     BRIDGE=cloudbr0
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/sysconfig/network-scripts/ifcfg-eth0.300
 
-.. code:: bash
+.. sourcecode:: bash
 
     DEVICE=eth0.300
     HWADDR=00:04:xx:xx:xx:xx
@@ -3855,13 +3861,13 @@ We now have to configure the three VLAN interfaces:
 Now we have the VLAN interfaces configured we can add the bridges on top
 of them.
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/sysconfig/network-scripts/ifcfg-cloudbr0
 
 Now we just configure it is a plain bridge without an IP-Address
 
-.. code:: bash
+.. sourcecode:: bash
 
     DEVICE=cloudbr0
     TYPE=Bridge
@@ -3874,11 +3880,11 @@ Now we just configure it is a plain bridge without an IP-Address
 
 We do the same for cloudbr1
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/sysconfig/network-scripts/ifcfg-cloudbr1
 
-.. code:: bash
+.. sourcecode:: bash
 
     DEVICE=cloudbr1
     TYPE=Bridge
@@ -3900,13 +3906,13 @@ Configure in Ubuntu
 All the required packages were installed when you installed libvirt, so
 we only have to configure the network.
 
-.. code:: bash
+.. sourcecode:: bash
 
     vi /etc/network/interfaces
 
 Modify the interfaces file to look like this:
 
-.. code:: bash
+.. sourcecode:: bash
 
     auto lo
     iface lo inet loopback
@@ -3979,30 +3985,30 @@ Open ports in RHEL/CentOS
 RHEL and CentOS use iptables for firewalling the system, you can open
 extra ports by executing the following iptable commands:
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ iptables -I INPUT -p tcp -m tcp --dport 22 -j ACCEPT
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ iptables -I INPUT -p tcp -m tcp --dport 1798 -j ACCEPT
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ iptables -I INPUT -p tcp -m tcp --dport 16509 -j ACCEPT
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ iptables -I INPUT -p tcp -m tcp --dport 5900:6100 -j ACCEPT
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ iptables -I INPUT -p tcp -m tcp --dport 49152:49216 -j ACCEPT
 
 These iptable settings are not persistent accross reboots, we have to
 save them first.
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ iptables-save > /etc/sysconfig/iptables
 
@@ -4014,23 +4020,23 @@ is a Python wrapper around iptables.
 
 To open the required ports, execute the following commands:
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ ufw allow proto tcp from any to any port 22
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ ufw allow proto tcp from any to any port 1798
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ ufw allow proto tcp from any to any port 16509
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ ufw allow proto tcp from any to any port 5900:6100
 
-.. code:: bash
+.. sourcecode:: bash
 
     $ ufw allow proto tcp from any to any port 49152:49216
 
@@ -4045,18 +4051,6 @@ later section, see `Section 6.6, “Adding a Host” <#host-add>`__. It is
 recommended that you continue to read the documentation before adding
 the host!
 
-
-
-.. |1000-foot-view.png: Overview of CloudStack| image:: ./_static/images/1000-foot-view.png
-.. |basic-deployment.png: Basic two-machine deployment| image:: ./_static/images/basic-deployment.png
-.. |infrastructure_overview.png: Nested organization of a zone| image:: ./_static/images/infrastructure-overview.png
-.. |region-overview.png: Nested structure of a region.| image:: ./_static/images/region-overview.png
-.. |zone-overview.png: Nested structure of a simple zone.| image:: ./_static/images/zone-overview.png
-.. |pod-overview.png: Nested structure of a simple pod| image:: ./_static/images/pod-overview.png
-.. |cluster-overview.png: Structure of a simple cluster| image:: ./_static/images/cluster-overview.png
-.. |installation-complete.png: Finished installs with single Management Server and multiple Management Servers| image:: ./_static/images/installation-complete.png
-.. |change-password.png: button to change a user's password| image:: ./_static/images/change-password.png
-.. |provisioning-overview.png: Conceptual overview of a basic deployment| image:: ./_static/images/provisioning-overview.png
 .. |vsphereclient.png: vSphere client| image:: ./_static/images/vsphere-client.png
 .. |vspherephysicalnetwork.png: vSphere client| image:: ./_static/images/vmware-physical-network.png
 .. |vsphereincreaseports.png: vSphere client| image:: ./_static/images/vmware-increase-ports.png
@@ -4069,61 +4063,3 @@ the host!
 .. |vmwareiscsigeneral.png: iscsi general| image:: ./_static/images/vmware-iscsi-general.png
 .. |vmwareiscsitargetadd.png: iscsi target add| image:: ./_static/images/vmware-iscsi-target-add.png
 .. |vmwareiscsidatastore.png: iscsi datastore| image:: ./_static/images/vmware-iscsi-datastore.png
-.. |addcluster.png: add a cluster| image:: ./_static/images/add-cluster.png
-.. |ConsoleButton.png: button to launch a console| image:: ./_static/images/console-icon.png
-.. |DeleteButton.png: button to delete dvSwitch| image:: ./_static/images/delete-button.png
-.. |vds-name.png: Name of the dvSwitch as specified in the vCenter.| image:: ./_static/images/vds-name.png
-.. |traffic-type.png: virtual switch type| image:: ./_static/images/traffic-type.png
-.. |dvSwitchConfig.png: Configuring dvSwitch| image:: ./_static/images/dvSwitch-config.png
-.. |Small-Scale Deployment| image:: ./_static/images/small-scale-deployment.png
-.. |Large-Scale Redundant Setup| image:: ./_static/images/large-scale-redundant-setup.png
-.. |Multi-Node Management Server| image:: ./_static/images/multi-node-management-server.png
-.. |Example Of A Multi-Site Deployment| image:: ./_static/images/multi-site-deployment.png
-.. |Separate Storage Network| image:: ./_static/images/separate-storage-network.png
-.. |NIC Bonding And Multipath I/O| image:: ./_static/images/nic-bonding-and-multipath-io.png
-.. |Use the GUI to set the configuration variable to true| image:: ./_static/images/ec2-s3-configuration.png
-.. |Use the GUI to set the name of a compute service offering to an EC2 instance type API name.| image:: ./_static/images/compute-service-offerings.png
-.. |parallel-mode.png: adding a firewall and load balancer in parallel mode.| image:: ./_static/images/parallel-mode.png
-.. |guest-traffic-setup.png: Depicts a guest traffic setup| image:: ./_static/images/guest-traffic-setup.png
-.. |networksinglepod.png: diagram showing logical view of network in a pod| image:: ./_static/images/network-singlepod.png
-.. |networksetupzone.png: Depicts network setup in a single zone| image:: ./_static/images/network-setup-zone.png
-.. |addguestnetwork.png: Add Guest network setup in a single zone| image:: ./_static/images/add-guest-network.png
-.. |remove-nic.png: button to remove a NIC| image:: ./_static/images/remove-nic.png
-.. |set-default-nic.png: button to set a NIC as default one.| image:: ./_static/images/set-default-nic.png
-.. |EditButton.png: button to edit a network| image:: ./_static/images/edit-icon.png
-.. |edit-icon.png: button to edit a network| image:: ./_static/images/edit-icon.png
-.. |addAccount-icon.png: button to assign an IP range to an account.| image:: ./_static/images/addAccount-icon.png
-.. |eip-ns-basiczone.png: Elastic IP in a NetScaler-enabled Basic Zone.| image:: ./_static/images/eip-ns-basiczone.png
-.. |add-ip-range.png: adding an IP range to a network.| image:: ./_static/images/add-ip-range.png
-.. |httpaccess.png: allows inbound HTTP access from anywhere| image:: ./_static/images/http-access.png
-.. |autoscaleateconfig.png: Configuring AutoScale| image:: ./_static/images/autoscale-config.png
-.. |EnableDisable.png: button to enable or disable AutoScale.| image:: ./_static/images/enable-disable-autoscale.png
-.. |gslb.png: GSLB architecture| image:: ./_static/images/gslb.png
-.. |gslb-add.png: adding a gslb rule| image:: ./_static/images/add-gslb.png
-.. |ReleaseIPButton.png: button to release an IP| image:: ./_static/images/release-ip-icon.png
-.. |EnableNATButton.png: button to enable NAT| image:: ./_static/images/enable-disable.png
-.. |egress-firewall-rule.png: adding an egress firewall rule| image:: ./_static/images/egress-firewall-rule.png
-.. |AttachDiskButton.png: button to attach a volume| image:: ./_static/images/vpn-icon.png
-.. |vpn-icon.png: button to enable VPN| image:: ./_static/images/vpn-icon.png
-.. |addvpncustomergateway.png: adding a customer gateway.| image:: ./_static/images/add-vpn-customer-gateway.png
-.. |edit.png: button to edit a VPN customer gateway| image:: ./_static/images/edit-icon.png
-.. |delete.png: button to remove a VPN customer gateway| image:: ./_static/images/delete-button.png
-.. |createvpnconnection.png: creating a VPN connection to the customer gateway.| image:: ./_static/images/create-vpn-connection.png
-.. |remove-vpn.png: button to remove a VPN connection| image:: ./_static/images/remove-vpn.png
-.. |reset-vpn.png: button to reset a VPN connection| image:: ./_static/images/reset-vpn.png
-.. |mutltier.png: a multi-tier setup.| image:: ./_static/images/multi-tier-app.png
-.. |add-vpc.png: adding a vpc.| image:: ./_static/images/add-vpc.png
-.. |add-tier.png: adding a tier to a vpc.| image:: ./_static/images/add-tier.png
-.. |replace-acl-icon.png: button to replace an ACL list| image:: ./_static/images/replace-acl-icon.png
-.. |add-new-gateway-vpc.png: adding a private gateway for the VPC.| image:: ./_static/images/add-new-gateway-vpc.png
-.. |replace-acl-icon.png: button to replace the default ACL behaviour.| image:: ./_static/images/replace-acl-icon.png
-.. |add-vm-vpc.png: adding a VM to a vpc.| image:: ./_static/images/add-vm-vpc.png
-.. |addvm-tier-sharednw.png: adding a VM to a VPC tier and shared network.| image:: ./_static/images/addvm-tier-sharednw.png
-.. |release-ip-icon.png: button to release an IP.| image:: ./_static/images/release-ip-icon.png
-.. |enable-disable.png: button to enable Static NAT.| image:: ./_static/images/enable-disable.png
-.. |select-vmstatic-nat.png: selecting a tier to apply staticNAT.| image:: ./_static/images/select-vm-staticnat-vpc.png
-.. |vpc-lb.png: Configuring internal LB for VPC| image:: ./_static/images/vpc-lb.png
-.. |del-tier.png: button to remove a tier| image:: ./_static/images/del-tier.png
-.. |remove-vpc.png: button to remove a VPC| image:: ./_static/images/remove-vpc.png
-.. |edit-icon.png: button to edit a VPC| image:: ./_static/images/edit-icon.png
-.. |restart-vpc.png: button to restart a VPC| image:: ./_static/images/restart-vpc.png