Merge branch 'develop' with doc updates.

Author: dougalb

docs/source/aws_services.rst

@@ -47,35 +47,35 @@ For more details about Amazon SQS, see http://aws.amazon.com/sqs/
 Amazon EC2
 ----------
 
-Amazon EC2 provides the compute for CfnCluster. The MasterServer and ComputeFleet are EC2 instances. Any instance type that support HVM can be selected. The MasterServer and ComputeFleet can be different instance types and the ComputeFleet can also be laucnhed as Spot instances. Ephmeral storage found on the instances is mounted as a RAID0 volume.
+Amazon EC2 provides the compute for CfnCluster. The MasterServer and ComputeFleet are EC2 instances. Any instance type that support HVM can be selected. The MasterServer and ComputeFleet can be different instance types and the ComputeFleet can also be laucnhed as Spot instances. Instance store volumes found on the instances are mounted as a RAID0 volume.
 
 For more details about Amazon EC2, see http://aws.amazon.com/ec2/
 
 Auto Scaling
 ------------
 
-Auto Scaling is used to manage the ComputeFleet instances. These are managed as an AutoScaling Group and can either be elastic driven by workload or static driven by the config. 
+Auto Scaling is used to manage the ComputeFleet instances. These instances are managed as an AutoScaling Group and can either be elastically driven by workload or static and driven by the config. 
 
 For more details about Auto Scaling, see http://aws.amazon.com/autoscaling/
 
 Amazon EBS
 ----------
 
-Amazon EBS provides the storage for the shared volume. Any EBS settings can be passed through the config. EBS volumes can either be initialized empty or from an exisiting EBS snapshot.
+Amazon EBS provides the persistent storage for the shared volume. Any EBS settings can be passed through the config. EBS volumes can either be initialized empty or from an exisiting EBS snapshot.
 
 For more details about Amazon EBS, see http://aws.amazon.com/ebs/
 
-Amazon Cloud Watch
+Amazon CloudWatch
 ------------------
 
-Amazon Cloud Watch provides metric collection and alarms for CfnCluster. The MasterServer publishs pending tasks(jobs) for each cluster. Two alarms are defined that based on parameters defined in the config will automatically increase the size of the ComputeFleet Auto Scaling group.
+Amazon CloudWatch provides metric collection and alarms for CfnCluster. The MasterServer publishes pending tasks (jobs) for each cluster. Two alarms are defined that based on parameters defined in the config will automatically increase the size of the ComputeFleet Auto Scaling group.
 
 For more details, see http://aws.amazon.com/cloudwatch/
 
 Amazon S3
 ---------
 
-Amazon S3 is used to store the CfnCluster templates. Each region has a bucket with all templates. Within CfnCluster, access to S3 can be controlled to allow CLI/SDK tools to use S3.
+Amazon S3 is used to store the CfnCluster templates. Each region has a bucket with all templates. CfnCluster can be configured to allow allow CLI/SDK tools to use S3.
 
 For more details, see http://aws.amazon.com/s3/
 

docs/source/configuration.rst

@@ -133,7 +133,7 @@ Defaults to false for the default template. ::
 
 scheduler
 """""""""
-Scheduler to be used with the cluster.  Valid options are sge, openlava, or torque.
+Scheduler to be used with the cluster.  Valid options are sge, openlava, torque, or slurm.
 
 Defaults to sge for the default template. ::
 
@@ -149,21 +149,21 @@ Defaults to ondemand for the default template. ::
 
 spot_price
 """""""""""
-If cluster_type is set to spot, the maximum spot price for the ComputeFleet. ::
+If cluster_type is set to spot, the maximum spot price for the ComputeFleet. See the `Spot Bid Advisor <https://aws.amazon.com/ec2/spot/bid-advisor/>`_ for assistance finding a bid price that meets your needs::
 
     spot_price = 0.00
 
 .. _custom_ami_section:
 
 custom_ami
 """"""""""
-ID of a Custom AMI, to use instead of default published AMI's. ::
+ID of a Custom AMI, to use instead of default `published AMI's <https://github.com/awslabs/cfncluster/blob/master/amis.txt>`_. ::
 
     custom_ami = NONE
 
 s3_read_resource
 """"""""""""""""
-Specify S3 resource which cfncluster nodes will be granted read-only access
+Specify S3 resource for which cfncluster nodes will be granted read-only access
 
 See :doc:`working with S3 <s3_resources>` for details on format.
 
@@ -173,7 +173,7 @@ Defaults to NONE for the default template. ::
 
 s3_read_write_resource
 """"""""""""""""""""""
-Specify S3 resource which cfncluster nodes will be granted read-write access
+Specify S3 resource for which cfncluster nodes will be granted read-write access
 
 See :doc:`working with S3 <s3_resources>` for details on format.
 
@@ -229,7 +229,7 @@ placement_group
 """""""""""""""
 Cluster placement group. The can be one of three values: NONE, DYNAMIC and an existing placement group name. When DYNAMIC is set, a unique placement group will be created as part of the cluster and deleted when the cluster is deleted. 
 
-Defaults to NONE for the default template. ::
+Defaults to NONE for the default template. More information on placement groups can be found `here <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/placement-groups.html>`_::
 
     placement_group = NONE
 
@@ -253,13 +253,13 @@ shared_dir
 """"""""""
 Path/mountpoint for shared EBS volume
 
-Defaults to /shared in the default template. ::
+Defaults to /shared in the default template. See :ref:`EBS Section <ebs_section>` for details on working with EBS volumes::
 
     shared_dir = /shared
 
 encrypted_ephemeral
 """""""""""""""""""
-Encrypted ephemeral drives. In-memory keys, non-recoverable.
+Encrypted ephemeral drives. In-memory keys, non-recoverable. If true, CfnCluster will generate an ephemeral encryption key in memroy and using LUKS encryption, encrypt your instance store volumes. 
 
 Defaults to false in default template. ::
 

docs/source/index.rst

@@ -37,11 +37,11 @@ Additional Resources
 
 * `CfnCluster Source Repository`_
 * `CfnCluster Issue Tracker`_
-* `CfnCluster Webcast - HPC Scalability in the Cloud`_
+* `CfnCluster Webcast - ResearchCloud - CfnCluster and Internet2 for Enterprise HPC`_
 
 .. _cfncluster Issue Tracker: https://github.com/awslabs/cfncluster/issues
 .. _cfncluster Source Repository: https://github.com/awslabs/cfncluster
-.. _cfncluster Webcast - HPC Scalability in the Cloud: https://www.youtube.com/watch?v=iHtzy6_WytE
+.. _cfncluster Webcast - ResearchCloud - CfnCluster and Internet2 for Enterprise HPC: https://www.youtube.com/watch?v=2WJcKwAChHE&feature=youtu.be&t=22m17s
 
 Indices and tables
 ==================

docs/source/s3_resources.rst

@@ -14,5 +14,5 @@ Accessing S3 within CfnCluster can be controlled through two parameters in the C
   # (defaults to NONE for the default template)
   s3_read_write_resource = NONE
 
-Both parameters except either ``*`` or a valid S3 ARN. For details of how to specify S3 ARNs, please see http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-s3
+Both parameters accept either ``*`` or a valid S3 ARN. For details of how to specify S3 ARNs, please see http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-s3