Merge remote-tracking branch 'origin/master'

docs/features.rst

@@ -99,14 +99,38 @@ Tethys provides mechanisms for plugging into dataset services like CKAN and Hydr
 Computing
 =========
 
-Tethys includes Python modules that will allow you to provision and run computing jobs in distributed computing environments. Make use of the idle computing power that is available in your office by using `HTCondor <http://research.cs.wisc.edu/htcondor/>`_ via CondorPy. Alternatively, you can use TethysCluster to send jobs to be processed in the cloud using commercial services like `Amazon AWS <https://aws.amazon.com/free/cloud-computing-free-tier/?sc_channel=PS&sc_campaign=AWS_Free_Tier_2013_T&sc_country=US&sc_publisher=Google&sc_medium=b_test_cloud_computing_e-amazon_computing&sc_content=50999158962&sc_detail=Amazon%20computing&sc_category=aws_cloud_computing&sc_segment=cloud_computing&sc_matchtype=e&s_kwcid=AL!4422!3!50999158962!e!!g!!amazon%20computing&ef_id=U2k10QAAAbgQyF5m:20141124202406:s>`_ and `Microsoft Azure <https://azure.microsoft.com/en-us/>`_.
+Tethys includes Python modules that will allow you to provision and run computing jobs in distributed computing environments.
 
 .. figure:: images/features/computing.png
     :width: 500px
     :align: center
 
     Run the computing jobs of Tethys web app using distributed computing.
 
+With CondorPy you can define your computing jobs and submit them to distributed computing environments provided by `HTCondor <http://research.cs.wisc.edu/htcondor/>`_.
+
+.. figure:: images/features/computing_condorpy.png
+    :width: 400px
+    :align: center
+
+    CondorPy enables computing jobs to be created and submitted to a HTCondor computing pool.
+
+HTCondor provides a way to make use of the idle computing power that is already available in your office. Alternatively, TethysCluster enables you to provision scalable computing resources in the cloud using commercial services like `Amazon AWS <https://aws.amazon.com/free/cloud-computing-free-tier/?sc_channel=PS&sc_campaign=AWS_Free_Tier_2013_T&sc_country=US&sc_publisher=Google&sc_medium=b_test_cloud_computing_e-amazon_computing&sc_content=50999158962&sc_detail=Amazon%20computing&sc_category=aws_cloud_computing&sc_segment=cloud_computing&sc_matchtype=e&s_kwcid=AL!4422!3!50999158962!e!!g!!amazon%20computing&ef_id=U2k10QAAAbgQyF5m:20141124202406:s>`_ and `Microsoft Azure <https://azure.microsoft.com/en-us/>`_.
+
+.. figure:: images/features/computing_tethyscluster.png
+    :width: 600px
+    :align: center
+
+    TethysCluster makes it easy to scale your computing resources using commercial cloud services.
+
+Computing resources can be managed in Tethys through the Admin Portal. With just a few clicks new computing clusters can be provisioned and scaled to meet the demands of your current workload.
+
+.. figure:: images/features/computing_admin_portal.png
+    :width: 600px
+    :align: center
+
+    The Admin Portal provides an easy-to-use interface for provisioning cloud computing resources.
+
 .. note::
 
     To learn more, read the :doc:`./tethys_sdk/cloud_computing`.