Doc tables fixed

docs/topics/aws_mapping.rst

@@ -43,18 +43,25 @@ and the below screenshot shows how the switch between the various services.
 
 AWS - Labeled Resources
 -----------------------
-================ ================= ============== ============== ========
-Labeled Resource AWS Resource Type CB ID          CB Name        CB Label
-================ ================= ============== ============== ========
-AWSInstance      Instance          Instance ID    Instance ID    tag:Name
-AWSMachineImage  AMI               AMI ID         AMI Name       tag:Name
-AWSNetwork       VPC               VPC ID         VPC ID         tag:Name
-AWSSubnet        Subnet            Subnet ID      Subnet ID      tag:Name
-AWSRouter        Route Table       Route Table ID Route Table ID tag:Name
-AWSVolume        Volume            Volume ID      Volume ID      tag:Name
-AWSSnapshot      Snapshot          Snapshot ID    Snapshot ID    tag:Name
-AWSVMFirewall    Security Group    Group ID       Group Name     tag:Name
-================ ================= ============== ============== ========
++------------------------+-------------------+----------------+----------------+----------+
+| Labeled Resource       | AWS Resource Type | CB ID          | CB Name        | CB Label |
++========================+===================+================+================+==========+
+| AWSInstance            | Instance          | Instance ID    | Instance ID    | tag:Name |
++------------------------+-------------------+----------------+----------------+----------+
+| AWSMachineImage        | AMI               | AMI ID         | AMI Name       | tag:Name |
++------------------------+-------------------+----------------+----------------+----------+
+| AWSNetwork             | VPC               | VPC ID         | VPC ID         | tag:Name |
++------------------------+-------------------+----------------+----------------+----------+
+| AWSSubnet              | Subnet            | Subnet ID      | Subnet ID      | tag:Name |
++------------------------+-------------------+----------------+----------------+----------+
+| AWSRouter              | Route Table       | Route Table ID | Route Table ID | tag:Name |
++------------------------+-------------------+----------------+----------------+----------+
+| AWSVolume              | Volume            | Volume ID      | Volume ID      | tag:Name |
++------------------------+-------------------+----------------+----------------+----------+
+| AWSSnapshot            | Snapshot          | Snapshot ID    | Snapshot ID    | tag:Name |
++------------------------+-------------------+----------------+----------------+----------+
+| AWSVMFirewall          | Security Group    | Group ID       | Group Name     | tag:Name |
++------------------------+-------------------+----------------+----------------+----------+
 
 The resources listed above are labeled, they thus have both the `name` and
 `label` properties in CloudBridge. These resources require a mandatory `label`
@@ -92,14 +99,16 @@ web portal.
 
 
 AWS - Unlabeled Resources
--------------------------
-================== ================= ===== ======= ========
-Unlabeled Resource AWS Resource Type CB ID CB Name CB Label
-================== ================= ===== ======= ========
-AWSKeyPair         Key Pair          Name  Name    -
-AWSBucket          Bucket            Name  Name    -
-AWSBucketObject    Bucket Object     Key   Key     -
-================== ================= ===== ======= ========
+---------------------------
++-----------------------+--------------------+-------+---------+----------+
+| Unlabeled Resource    | AWS Resource Type  | CB ID | CB Name | CB Label |
++=======================+====================+=======+=========+==========+
+| AWSKeyPair            | Key Pair           | Name  | Name    | -        |
++-----------------------+--------------------+-------+---------+----------+
+| AWSBucket             | Bucket             | Name  | Name    | -        |
++-----------------------+--------------------+-------+---------+----------+
+| AWSBucketObject       | Bucket Object      | Key   | Key     | -        |
++-----------------------+--------------------+-------+---------+----------+
 
 The resources listed above are unlabeled. They thus only have the `name`
 property in CloudBridge. These resources require a mandatory `name`
@@ -118,14 +127,16 @@ services.
 
 
 AWS - Special Unlabeled Resources
----------------------------------
-================== ====================== ===== ====================================================================== ========
-Unlabeled Resource AWS Resource Type      CB ID CB Name                                                                CB Label
-================== ====================== ===== ====================================================================== ========
-AWSFloatingIP      Elastic IP             ID    [public_ip]                                                            -
-AWSInternetGateway Internet Gateway       ID    tag:Name                                                               -
-AWSVMFirewallRule  Network Security Rules ID    Generated: [direction]-[protocol]-[from_port]-[to_port]-[cidr]-[fw_id] -
-================== ====================== ===== ====================================================================== ========
+-----------------------------------
++--------------------+------------------------+-------+------------------------------------------------------------------------+----------+
+| Unlabeled Resource | AWS Resource Type      | CB ID | CB Name                                                                | CB Label |
++====================+========================+=======+========================================================================+==========+
+| AWSFloatingIP      | Elastic IP             | ID    | [public_ip]                                                            | -        |
++--------------------+------------------------+-------+------------------------------------------------------------------------+----------+
+| AWSInternetGateway | Internet Gateway       | ID    | tag:Name                                                               | -        |
++--------------------+------------------------+-------+------------------------------------------------------------------------+----------+
+| AWSVMFirewallRule  | Network Security Rules | ID    | Generated: [direction]-[protocol]-[from_port]-[to_port]-[cidr]-[fw_id] | -        |
++--------------------+------------------------+-------+------------------------------------------------------------------------+----------+
 
 While these resources are similarly unlabeled, they do not follow the same
 general rules as the ones listed above. Firstly, they differ by the fact

docs/topics/azure_mapping.rst

@@ -1,18 +1,25 @@
 Azure - Labeled Resources
 -------------------------
-===================================== ====================== ===== ====================== ==================================
-Labeled CloudBridge Resource          Azure Resource Type    CB ID CB Name                CB Label                           
-===================================== ====================== ===== ====================== ==================================
-AzureInstance                         Virtual Machine        ID    Name                   tag:Label
-AzureMachineImage (Private)           Image                  ID    Name                   tag:Label                          
-AzureMachineImage (Marketplace Image) VirtualMachineImage    ID    URN                    URN                                
-AzureNetwork                          Virtual Network        ID    Name                   tag:Label                          
-AzureSubnet                           Subnet                 ID    NetworkName/SubnetName Network:tag:SubnetLabel_SubnetName 
-AzureRouter                           Route Table            ID    Name                   tag:Label                          
-AzureVolume                           Disk                   ID    Name                   tag:Label                          
-AzureSnapshot                         Snapshot               ID    Name                   tag:Label                          
-AzureVMFirewall                       Network security group ID    Name                   tag:Label                          
-===================================== ====================== ===== ====================== ==================================
++---------------------------------------+------------------------+-------+------------------------+------------------------------------+
+| Labeled CloudBridge Resource          | Azure Resource Type    | CB ID | CB Name                | CB Label                           |
++=======================================+========================+=======+========================+====================================+
+| AzureInstance                         | Virtual Machine        | ID    | Name                   | tag:Label                          |
++---------------------------------------+------------------------+-------+------------------------+------------------------------------+
+| AzureMachineImage (Private)           | Image                  | ID    | Name                   | tag:Label                          |
+| AzureMachineImage (Marketplace Image) | VirtualMachineImage    | ID    | URN                    | URN                                |
++---------------------------------------+------------------------+-------+------------------------+------------------------------------+
+| AzureNetwork                          | Virtual Network        | ID    | Name                   | tag:Label                          |
++---------------------------------------+------------------------+-------+------------------------+------------------------------------+
+| AzureSubnet                           | Subnet                 | ID    | NetworkName/SubnetName | Network:tag:SubnetLabel_SubnetName |
++---------------------------------------+------------------------+-------+------------------------+------------------------------------+
+| AzureRouter                           | Route Table            | ID    | Name                   | tag:Label                          |
++---------------------------------------+------------------------+-------+------------------------+------------------------------------+
+| AzureVolume                           | Disk                   | ID    | Name                   | tag:Label                          |
++---------------------------------------+------------------------+-------+------------------------+------------------------------------+
+| AzureSnapshot                         | Snapshot               | ID    | Name                   | tag:Label                          |
++---------------------------------------+------------------------+-------+------------------------+------------------------------------+
+| AzureVMFirewall                       | Network security group | ID    | Name                   | tag:Label                          |
++---------------------------------------+------------------------+-------+------------------------+------------------------------------+
 
 The resources listed above are labeled, they thus have both the `name` and
 `label` properties in CloudBridge. These resources require a mandatory `label`
@@ -134,13 +141,15 @@ Azure web portal.
 
 Azure - Unlabeled Resources
 ---------------------------
-================== ====================================== ===== ======= ========
-Unlabeled Resource Azure Resource Type                    CB ID CB Name CB Label
-================== ====================================== ===== ======= ========
-AzureKeyPair       StorageAccount:Table                   Name  Name    -        
-AzureBucket        StorageAccount:BlobContainer           Name  Name    -        
-AzureBucketObject  StorageAccount:BlobContainer:BlockBlob Name  Name    -        
-================== ====================================== ===== ======= ========
++--------------------+----------------------------------------+-------+---------+----------+
+| Unlabeled Resource | Azure Resource Type                    | CB ID | CB Name | CB Label |
++====================+========================================+=======+=========+==========+
+| AzureKeyPair       | StorageAccount:Table                   | Name  | Name    | -        |
++--------------------+----------------------------------------+-------+---------+----------+
+| AzureBucket        | StorageAccount:BlobContainer           | Name  | Name    | -        |
++--------------------+----------------------------------------+-------+---------+----------+
+| AzureBucketObject  | StorageAccount:BlobContainer:BlockBlob | Name  | Name    | -        |
++--------------------+----------------------------------------+-------+---------+----------+
 
 The resources listed above are unlabeled. They thus only have the `name`
 property in CloudBridge. These resources require a mandatory `name`
@@ -165,13 +174,15 @@ corresponding services.
 
 Azure - Special Unlabeled Resources
 -----------------------------------
-==================== ====================== ================== ================== ========
-Unlabeled Resource   Azure Resource Type    CB ID              CB Name            CB Label
-==================== ====================== ================== ================== ========
-AzureFloatingIP      Public IP Address      ID                 [public_ip]        -
-AzureInternetGateway None                   cb-gateway-wrapper cb-gateway-wrapper -
-AzureVMFirewallRule  Network Security Rules ID                 name               -
-==================== ====================== ================== ================== ========
++-------------------------+------------------------+--------------------+--------------------+----------+
+| Unlabeled Resource      | Azure Resource Type    | CB ID              | CB Name            | CB Label |
++=========================+========================+====================+====================+==========+
+| AzureFloatingIP         | Public IP Address      | ID                 | [public_ip]        | -        |
++-------------------------+------------------------+--------------------+--------------------+----------+
+| AzureInternetGateway    | None                   | cb-gateway-wrapper | cb-gateway-wrapper | -        |
++-------------------------+------------------------+--------------------+--------------------+----------+
+| AzureVMFirewallRule     | Network Security Rules | ID                 | name               | -        |
++-------------------------+------------------------+--------------------+--------------------+----------+
 
 While these resources are similarly unlabeled, they do not follow the same
 general rules as the ones listed above. Firstly, they differ by the fact

docs/topics/os_mapping.rst

@@ -1,17 +1,24 @@
 OpenStack - Labeled Resources
------------------------------
-===================== ================ ===== ======= ========
-Labeled Resource      OS Resource Type CB ID CB Name CB Label
-===================== ================ ===== ======= ========
-OpenStackInstance     Instance         ID    ID      Name
-OpenStackMachineImage Image            ID    ID      Name
-OpenStackNetwork      Network          ID    ID      Name
-OpenStackSubnet       Subnet           ID    ID      Name
-OpenStackRouter       Router           ID    ID      Name
-OpenStackVolume       Volume           ID    ID      Name
-OpenStackSnapshot     Snapshot         ID    ID      Name
-OpenStackVMFirewall   Security Group   ID    ID      Name
-===================== ================ ===== ======= ========
+-----------------------
++------------------------+------------------------+-----------+----------------+----------+
+| Labeled Resource       | OS Resource Type       | CB ID     | CB Name        | CB Label |
++========================+========================+===========+================+==========+
+| OpenStackInstance      | Instance               | ID        | ID             | Name     |
++------------------------+------------------------+-----------+----------------+----------+
+| OpenStackMachineImage  | Image                  | ID        | ID             | Name     |
++------------------------+------------------------+-----------+----------------+----------+
+| OpenStackNetwork       | Network                | ID        | ID             | Name     |
++------------------------+------------------------+-----------+----------------+----------+
+| OpenStackSubnet        | Subnet                 | ID        | ID             | Name     |
++------------------------+------------------------+-----------+----------------+----------+
+| OpenStackRouter        | Router                 | ID        | ID             | Name     |
++------------------------+------------------------+-----------+----------------+----------+
+| OpenStackVolume        | Volume                 | ID        | ID             | Name     |
++------------------------+------------------------+-----------+----------------+----------+
+| OpenStackSnapshot      | Snapshot               | ID        | ID             | Name     |
++------------------------+------------------------+-----------+----------------+----------+
+| OpenStackVMFirewall    | Security Group         | ID        | ID             | Name     |
++------------------------+------------------------+-----------+----------------+----------+
 
 The resources listed above are labeled, they thus have both the `name` and
 `label` properties in CloudBridge. These resources require a mandatory `label`
@@ -40,14 +47,16 @@ the description, by appending the following string to the user-provided descript
 
 
 OpenStack - Unlabeled Resources
--------------------------------
-===================== ====================== ===== ======= ========
-Unlabeled Resource    OS Resource Type       CB ID CB Name CB Label
-===================== ====================== ===== ======= ========
-OpenStackKeyPair      Key Pair               Name  Name    -
-OpenStackBucket       Object Store Container Name  Name    -        
-OpenStackBucketObject Object                 Name  Name    -
-===================== ====================== ===== ======= ========
+---------------------------
++-----------------------+------------------------+-------+---------+----------+
+| Unlabeled Resource    | OS Resource Type       | CB ID | CB Name | CB Label |
++=======================+========================+=======+=========+==========+
+| OpenStackKeyPair      | Key Pair               | Name  | Name    | -        |
++-----------------------+------------------------+-------+---------+----------+
+| OpenStackBucket       | Object Store Container | Name  | Name    | -        |
++-----------------------+------------------------+-------+---------+----------+
+| OpenStackBucketObject | Object                 | Name  | Name    | -        |
++-----------------------+------------------------+-------+---------+----------+
 
 The resources listed above are unlabeled. They thus only have the `name`
 property in CloudBridge. These resources require a mandatory `name`
@@ -67,14 +76,16 @@ services.
 
 
 OpenStack - Special Unlabeled Resources
----------------------------------------
-======================== =================== ===== ====================================================================== ========
-Unlabeled Resource       OS Resource Type    CB ID CB Name                                                                CB Label
-======================== =================== ===== ====================================================================== ========
-OpenStackFloatingIP      Floating IP         ID    [public_ip]                                                            -
-OpenStackInternetGateway Network `public`    ID    'public'                                                               -
-OpenStackVMFirewallRule  Security Group Rule ID    Generated: [direction]-[protocol]-[from_port]-[to_port]-[cidr]-[fw_id] -
-======================== =================== ===== ====================================================================== ========
+-----------------------------------
++--------------------------+------------------------+-------+------------------------------------------------------------------------+----------+
+| Unlabeled Resource       | OS Resource Type       | CB ID | CB Name                                                                | CB Label |
++==========================+========================+=======+========================================================================+==========+
+| OpenStackFloatingIP      | Floating IP            | ID    | [public_ip]                                                            | -        |
++--------------------------+------------------------+-------+------------------------------------------------------------------------+----------+
+| OpenStackInternetGateway | Network `public`       | ID    | 'public'                                                               | -        |
++--------------------------+------------------------+-------+------------------------------------------------------------------------+----------+
+| OpenStackVMFirewallRule  | Security Group Rule    | ID    | Generated: [direction]-[protocol]-[from_port]-[to_port]-[cidr]-[fw_id] | -        |
++--------------------------+------------------------+-------+------------------------------------------------------------------------+----------+
 
 While these resources are similarly unlabeled, they do not follow the same
 general rules as the ones listed before. Firstly, they differ by the fact

docs/topics/procuring_credentials.rst

@@ -5,7 +5,7 @@ To initialize a connection to a cloud and get a provider object, you will
 need to provide the cloud's access credentials to CloudBridge. This page
 will walk you through the process of procuring credentials. For more
 information on providing these credentials to CloudBridge, see
-`Providing Access Credentials <setup.html>`.
+`Providing Access Credentials <setup.html>`_.
 
 **Microsoft Azure**
 

docs/topics/resource_types_and_mapping.rst

@@ -34,7 +34,7 @@ whether they support a `label` property.
 
 +-------------------+---------------------+
 | Labeled Resources | Unlabeled Resources | 
-+-------------------+---------------------+
++===================+=====================+
 | Instance          | Key Pair            |
 +-------------------+---------------------+
 | MachineImage      | Bucket              |
@@ -60,6 +60,6 @@ properties to provider objects, as well as some useful dashboard navigation.
 These sections will thus present summary tables delineating the different types of
 CloudBridge resources, as well as present some design decisions made to
 preserve consistency across providers:
--`Detailed Azure Mappings <azure_mapping.html>`
--`Detailed AWS Mappings <aws_mapping.html>`
--`Detailed OpenStack Mappings <os_mapping.html>`
+-`Detailed Azure Mappings <azure_mapping.html>`_
+-`Detailed AWS Mappings <aws_mapping.html>`_
+-`Detailed OpenStack Mappings <os_mapping.html>`_

docs/topics/setup.rst

@@ -3,7 +3,7 @@ Setup
 To initialize a connection to a cloud and get a provider object, you will
 need to provide the cloud's access credentials to CloudBridge. For more
 details on how to create and find these credentials, see `Procuring Access
-Credentials <procuring_credentials.html>`. Once available, these may be
+Credentials <procuring_credentials.html>`_. Once available, these may be
 provided in one of following ways:
 
 1. Environment variables
@@ -18,35 +18,44 @@ The following environment variables must be set, depending on the provider in us
 
 **Amazon**
 
-===================
-Mandatory variables
-===================
-AWS_ACCESS_KEY
-AWS_SECRET_KEY
-===================
++---------------------+
+| Mandatory variables |
++=====================+
+| AWS_ACCESS_KEY      |
++---------------------+
+| AWS_SECRET_KEY      |
++---------------------+
 
 
 **Openstack**
 
-===================
-Mandatory variables
-===================
-OS_AUTH_URL
-OS_USERNAME
-OS_PASSWORD
-OS_PROJECT_NAME
-OS_REGION_NAME
-===================
-
-=======================
-Optional Variables
-=======================
-NOVA_SERVICE_NAME
-OS_COMPUTE_API_VERSION
-OS_VOLUME_API_VERSION
-OS_STORAGE_URL
-OS_AUTH_TOKEN
-=======================
++---------------------+
+| Mandatory variables |
++=====================+
+| OS_AUTH_URL         |
++---------------------+
+| OS_USERNAME         |
++---------------------+
+| OS_PASSWORD         |
++---------------------+
+| OS_PROJECT_NAME     |
++---------------------+
+| OS_REGION_NAME      |
++---------------------+
+
++------------------------+
+| Optional Variables     |
++========================+
+| NOVA_SERVICE_NAME      |
++------------------------+
+| OS_COMPUTE_API_VERSION |
++------------------------+
+| OS_VOLUME_API_VERSION  |
++------------------------+
+| OS_STORAGE_URL         |
++------------------------+
+| OS_AUTH_TOKEN          |
++------------------------+
 
 
 **Microsoft Azure**
@@ -63,44 +72,52 @@ when initializing the relevant services. This operation similarly requires a
 "contributor" or "owner" role.
 For more information on roles, see: https://docs.microsoft.com/en-us/azure/role-based-access-control/overview
 
-======================
-Mandatory variables
-======================
-AZURE_SUBSCRIPTION_ID
-AZURE_CLIENT_ID
-AZURE_SECRET
-AZURE_TENANT
-======================
-
-====================================
-Optional Variables
-====================================
-AZURE_REGION_NAME
-AZURE_RESOURCE_GROUP
-AZURE_STORAGE_ACCOUNT
-AZURE_VM_DEFAULT_USER_NAME
-AZURE_PUBLIC_KEY_STORAGE_TABLE_NAME
-====================================
++-----------------------+
+| Mandatory variables   |
++=======================+
+| AZURE_SUBSCRIPTION_ID |
++-----------------------+
+| AZURE_CLIENT_ID       |
++-----------------------+
+| AZURE_SECRET          |
++-----------------------+
+| AZURE_TENANT          |
++-----------------------+
+
++-------------------------------------+
+| Optional Variables                  |
++=====================================+
+| AZURE_REGION_NAME                   |
++-------------------------------------+
+| AZURE_RESOURCE_GROUP                |
++-------------------------------------+
+| AZURE_STORAGE_ACCOUNT               |
++-------------------------------------+
+| AZURE_VM_DEFAULT_USER_NAME          |
++-------------------------------------+
+| AZURE_PUBLIC_KEY_STORAGE_TABLE_NAME |
++-------------------------------------+
 
 
 **Google**
 
-=======================
-Mandatory variables
-=======================
-GCE_SERVICE_CREDS_FILE
-or
-GCE_SERVICE_CREDS_DICT
-=======================
-
-==================
-Optional Variables
-==================
-GCE_PROJECT_NAME
-GCE_DEFAULT_ZONE
-GCE_REGION_NAME
-==================
-
++------------------------+
+| Mandatory variables    |
++========================+
+| GCE_SERVICE_CREDS_FILE |
+| or                     |
+| GCE_SERVICE_CREDS_DICT |
++------------------------+
+
++--------------------+
+| Optional Variables |
++====================+
+| GCE_PROJECT_NAME   |
++--------------------+
+| GCE_DEFAULT_ZONE   |
++--------------------+
+| GCE_REGION_NAME    |
++--------------------+
 
 Once the environment variables are set, you can create a connection as follows:
 
@@ -140,37 +157,48 @@ dictionary. These are listed below for each provider.
 
 **CloudBridge**
 
-====================  ==================
-Variable		      Description
-====================  ==================
-default_result_limit  Number of results that a ``.list()`` method should return.
-                      Defaults to 50.
-====================  ==================
++----------------------+------------------------------------------------------------+
+| Variable		       | Description                                                |
++======================+============================================================+
+| default_result_limit | Number of results that a ``.list()`` method should return. |
+|                      | Defaults to 50.                                            |
++----------------------+------------------------------------------------------------+
 
 
 **Amazon**
 
-====================  ==================
-Variable		      Description
-====================  ==================
-aws_session_token     Session key for your AWS account (if using temporary
-                      credentials).
-ec2_is_secure         True to use an SSL connection. Default is ``True``.
-ec2_region_name       Default region name. Defaults to ``us-east-1``.
-ec2_region_endpoint   Endpoint to use. Default is ``ec2.us-east-1.amazonaws.com``.
-ec2_port              EC2 connection port. Does not need to be specified unless
-                      EC2 service is running on an alternative port.
-ec2_conn_path	      Connection path. Defaults to ``/``.
-ec2_validate_certs    Whether to use SSL certificate verification. Default is
-                      ``False``.
-s3_is_secure          True to use an SSL connection. Default is ``True``.
-s3_host               Host connection endpoint. Default is ``s3.amazonaws.com``.
-s3_port               Host connection port. Does not need to be specified unless
-                      S3 service is running on an alternative port.
-s3_conn_path          Connection path. Defaults to ``/``.
-s3_validate_certs     Whether to use SSL certificate verification. Default is
-                      ``False``.
-====================  ==================
++---------------------+--------------------------------------------------------------+
+| Variable		      | Description		      	      	      	      	      	     |
++=====================+==============================================================+
+| aws_session_token   | Session key for your AWS account (if using temporary   	     |
+|                     | credentials).   	      	      	      	      	      	 |
++---------------------+--------------------------------------------------------------+
+| ec2_is_secure       | True to use an SSL connection. Default is ``True``.   	     |
++---------------------+--------------------------------------------------------------+
+| ec2_region_name     | Default region name. Defaults to ``us-east-1``.   	       	 |
++---------------------+--------------------------------------------------------------+
+| ec2_region_endpoint | Endpoint to use. Default is ``ec2.us-east-1.amazonaws.com``. |
++---------------------+--------------------------------------------------------------+
+| ec2_port            | EC2 connection port. Does not need to be specified unless    |
+|                     | EC2 service is running on an alternative port.   	       	 |
++---------------------+--------------------------------------------------------------+
+| ec2_conn_path	      | Connection path. Defaults to ``/``.   	       	      	     |
++---------------------+--------------------------------------------------------------+
+| ec2_validate_certs  | Whether to use SSL certificate verification. Default is   	 |
+|                     | ``False``.   	       	      	      	      	      	     |
++---------------------+--------------------------------------------------------------+
+| s3_is_secure        | True to use an SSL connection. Default is ``True``.   	     |
++---------------------+--------------------------------------------------------------+
+| s3_host             | Host connection endpoint. Default is ``s3.amazonaws.com``.   |
++---------------------+--------------------------------------------------------------+
+| s3_port             | Host connection port. Does not need to be specified unless   |
+|                     | S3 service is running on an alternative port.   	         |
++---------------------+--------------------------------------------------------------+
+| s3_conn_path        | Connection path. Defaults to ``/``.   	                     |
++---------------------+--------------------------------------------------------------+
+| s3_validate_certs   | Whether to use SSL certificate verification. Default is   	 |
+|                     | ``False``.   	                                             |
++---------------------+--------------------------------------------------------------+
 
 
 Providing access credentials in a file
@@ -205,29 +233,35 @@ In addition to the provider specific configuration variables above, there are
 some general configuration environment variables that apply to CloudBridge as
 a whole
 
-=========================== ===================================================
-Variable                                    Description
-=========================== ===================================================
-CB_DEBUG                    Setting ``CB_DEBUG=True`` will cause detailed debug
-                            output to be printed for each provider (including
-                            HTTP traces).
-CB_USE_MOCK_PROVIDERS       Setting this to ``True`` will cause the CloudBridge
-                            test suite to use mock drivers when available.
-CB_TEST_PROVIDER            Set this value to a valid :class:`.ProviderList`
-                            value such as ``aws``, to limit tests to that
-                            provider only.
-CB_DEFAULT_SUBNET_LABEL     Name to be used for a subnet that will be
-                            considered the 'default' by the library. This
-                            default will be used only in cases there is no
-                            subnet marked as the default by the provider.
-CB_DEFAULT_NETWORK_LABEL    Name to be used for a network that will be
-                            considered the 'default' by the library. This
-                            default will be used only in cases there is no
-                            network marked as the default by the provider.
-CB_DEFAULT_IPV4RANGE        The default IPv4 range when creating networks if
-                            one is not provided. This value is also used in
-                            tests.
-CB_DEFAULT_SUBNET_IPV4RANGE The default subnet IPv4 range used by CloudBridge
-                            if one is not specified by the user. Tests do not
-                            respect this variable.
-=========================== ===================================================
++-----------------------------+------------------------------------------------------+
+| Variable                    | Description                                          |
++=============================+======================================================+
+| CB_DEBUG                    | Setting ``CB_DEBUG=True`` will cause detailed        |
+|                             | debugoutput to be printed for each provider          |
+|                             | (including HTTP traces).                             |
++-----------------------------+------------------------------------------------------+
+| CB_USE_MOCK_PROVIDERS       | Setting this to ``True`` will cause the CloudBridge  |
+|                             | test suite to use mock drivers when available.       |
++-----------------------------+------------------------------------------------------+
+| CB_TEST_PROVIDER            | Set this value to a valid :class:`.ProviderList`     |
+|                             | value such as ``aws``, to limit tests to that        |
+|                             | provider only.                                       |
++-----------------------------+------------------------------------------------------+
+| CB_DEFAULT_SUBNET_LABEL     | Name to be used for a subnet that will be            |
+|                             | considered the 'default' by the library. This        |
+|                             | default will be used only in cases there is no       |
+|                             | subnet marked as the default by the provider.        |
++-----------------------------+------------------------------------------------------+
+| CB_DEFAULT_NETWORK_LABEL    | Name to be used for a network that will be           |
+|                             | considered the 'default' by the library. This        |
+|                             | default will be used only in cases there is no       |
+|                             | network marked as the default by the provider.       |
++-----------------------------+------------------------------------------------------+
+| CB_DEFAULT_IPV4RANGE        | The default IPv4 range when creating networks if     |
+|                             | one is not provided. This value is also used in      |
+|                             | tests.                                               |
++-----------------------------+------------------------------------------------------+
+| CB_DEFAULT_SUBNET_IPV4RANGE | The default subnet IPv4 range used by CloudBridge    |
+|                             | if one is not specified by the user. Tests do not    |
+|                             | respect this variable.                               |
++-----------------------------+------------------------------------------------------+