Cleanup documentation by removing "for the default template" sentence

Enrico Usai · enrico-usai · commit 2acb589dde5c · 2018-11-13T15:47:51.000+01:00
Signed-off-by: Enrico Usai &lt;usai@amazon.com&gt;
diff --git a/cli/pcluster/examples/config b/cli/pcluster/examples/config
@@ -58,7 +58,7 @@ key_name = mykey
 # (defaults to sge)
 #scheduler = sge
 # Type of cluster to launch i.e. ondemand or spot
-# (defaults to ondemand for the default template)
+# (defaults to ondemand)
 #cluster_type = ondemand
 # Spot price for the ComputeFleet
 #spot_price = 0.00
@@ -67,55 +67,55 @@ key_name = mykey
 # ID of a Custom AMI, to use instead of published AMI's
 #custom_ami = NONE
 # Specify S3 resource which AWS ParallelCluster nodes will be granted read-only access
-# (defaults to NONE for the default template)
+# (defaults to NONE)
 #s3_read_resource = NONE
 # Specify S3 resource which AWS ParallelCluster nodes will be granted read-write access
-# (defaults to NONE for the default template)
+# (defaults to NONE)
 #s3_read_write_resource = NONE
 # URL to a preinstall script. This is executed before any of the boot_as_* scripts are run
-# (defaults to NONE for the default template)
+# (defaults to NONE)
 #pre_install = NONE
 # Arguments to be passed to preinstall script
-# (defaults to NONE for the default template)
+# (defaults to NONE)
 #pre_install_args = NONE
 # URL to a postinstall script. This is executed after any of the boot_as_* scripts are run
-# (defaults to NONE for the default template)
+# (defaults to NONE)
 #post_install = NONE
 # Arguments to be passed to postinstall script
-# (defaults to NONE for the default template)
+# (defaults to NONE)
 #post_install_args = NONE
 # HTTP(S) proxy server, typically http://x.x.x.x:8080
-# (defaults to NONE for the default template)
+# (defaults to NONE)
 #proxy_server = NONE
 # Cluster placement group. This placement group must already exist.
-# (defaults to NONE for the default template)
+# (defaults to NONE)
 #placement_group = NONE
 # Cluster placement logic. This enables the whole cluster or only compute to use the placement group
-# (defaults to cluster in the default template)
+# (defaults to cluster)
 #placement = cluster
 # Path/mountpoint for ephemeral drives
-# (defaults to /scratch in the default template)
+# (defaults to /scratch)
 #ephemeral_dir = /scratch
 # Path/mountpoint for shared EBS volume
-# (defaults to /shared in the default template)
+# (defaults to /shared)
 #shared_dir = /shared
 # Encrypted ephemeral drives. In-memory keys, non-recoverable.
-# (defaults to false in default template)
+# (defaults to false)
 #encrypted_ephemeral = false
 # MasterServer root volume size in GB. (AMI must support growroot)
-# (defaults to 15 in default template)
+# (defaults to 15)
 #master_root_volume_size = 15
 # ComputeFleet root volume size in GB. (AMI must support growroot)
-# (defaults to 15 in default template)
+# (defaults to 15)
 #compute_root_volume_size = 15
 # OS type used in the cluster
-# (defaults to alinux in the default template)
+# (defaults to alinux)
 #base_os = alinux
 # Existing EC2 IAM role to be associated with the EC2 instances
-# (defaults to NONE in the default template)
+# (defaults to NONE)
 #ec2_iam_role = NONE
 # Extra Json to be merged with the dna.json used by Chef
-# (defaults to {} in the default template)
+# (defaults to {})
 #extra_json = {}
 # Additional CloudFormation template to launch with the cluster
 #additional_cfn_template = NONE
@@ -134,13 +134,13 @@ vpc_id = vpc-
 master_subnet_id = subnet-
 # SSH from CIDR
 # This is only used when AWS ParallelCluster creates the security group
-# (defaults to 0.0.0.0/0 in the default template)
+# (defaults to 0.0.0.0/0)
 #ssh_from = 0.0.0.0/0
 # Additional VPC security group Id for all instances
-# (defaults to NONE in the default template)
+# (defaults to NONE)
 #additional_sg = sg-
 # Existing EC2 security group to be assosiated with the EC2 instances
-# (defaults to NONE in the default template)
+# (defaults to NONE)
 #vpc_security_group_id = sg-
 
 #[vpc private-new]
@@ -178,7 +178,7 @@ master_subnet_id = subnet-
 # (defaults to false)
 #encrypted = false
 # Existing EBS volume to be attached to the MasterServer
-# (defaults to NONE in the default template)
+# (defaults to NONE)
 #ebs_volume_id = NONE
 
 ## Second EBS Settings
@@ -195,5 +195,5 @@ master_subnet_id = subnet-
 ## Scaling settings
 #[scaling custom]
 # Amount of time in minutes without a job after which the compute node will terminate
-# Defaults to 10 for the default template
+# Defaults to 10
 #scaledown_idletime = 10
diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst
@@ -135,7 +135,7 @@ The maximum number of EC2 instances that can be launched in the cluster for trad
 
 If you're using awsbatch, use :ref:`max_vcpus <max_vcpus>`.
 
-This defaults to 10 for the default template. ::
+This defaults to 10. ::
 
     max_queue_size = 10
 
@@ -149,7 +149,7 @@ If set to true, the Auto Scaling group will never have fewer members than the va
 
 Setting to false allows the Auto Scaling group to scale down to 0 members, so resources will not sit idle when they aren't needed.
 
-Defaults to false for the default template. ::
+Defaults to false. ::
 
     maintain_initial_size = false
 
@@ -187,15 +187,15 @@ scheduler
 """""""""
 Scheduler to be used with the cluster.  Valid options are sge, torque, slurm, or awsbatch.
 
-Defaults to sge for the default template. ::
+Defaults to sge. ::
 
     scheduler = sge
 
 cluster_type
 """"""""""""
 Type of cluster to launch i.e. ondemand or spot
 
-Defaults to ondemand for the default template. ::
+Defaults to ondemand. ::
 
     cluster_type = ondemand
 
@@ -233,7 +233,7 @@ For example, 'arn:aws:s3:::my_corporate_bucket/\*' would provide read-only acces
 
 See :doc:`working with S3 <s3_resources>` for details on format.
 
-Defaults to NONE for the default template. ::
+Defaults to NONE. ::
 
     s3_read_resource = NONE
 
@@ -245,7 +245,7 @@ For example, 'arn:aws:s3:::my_corporate_bucket/Development/\*' would provide rea
 
 See :doc:`working with S3 <s3_resources>` for details on format.
 
-Defaults to NONE for the default template. ::
+Defaults to NONE. ::
 
     s3_read_write_resource = NONE
 
@@ -257,15 +257,15 @@ This only gets executed on the master node when using awsbatch as your scheduler
 
 Can be specified in "http://hostname/path/to/script.sh" or "s3://bucketname/path/to/script.sh" format.
 
-Defaults to NONE for the default template. ::
+Defaults to NONE. ::
 
     pre_install = NONE
 
 pre_install_args
 """"""""""""""""
 Quoted list of arguments to be passed to preinstall script
 
-Defaults to NONE for the default template. ::
+Defaults to NONE. ::
 
     pre_install_args = NONE
 
@@ -277,23 +277,23 @@ This only gets executed on the master node when using awsbatch as your scheduler
 
 Can be specified in "http://hostname/path/to/script.sh" or "s3://bucketname/path/to/script.sh" format.
 
-Defaults to NONE for the default template. ::
+Defaults to NONE. ::
 
     post_install = NONE
 
 post_install_args
 """""""""""""""""
 Arguments to be passed to postinstall script
 
-Defaults to NONE for the default template. ::
+Defaults to NONE. ::
 
     post_install_args = NONE
 
 proxy_server
 """"""""""""
 HTTP(S) proxy server, typically http://x.x.x.x:8080
 
-Defaults to NONE for the default template. ::
+Defaults to NONE. ::
 
     proxy_server = NONE
 
@@ -303,7 +303,7 @@ Cluster placement group. The can be one of three values: NONE, DYNAMIC and an ex
 
 This does not apply to awsbatch.
 
-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>`_::
+Defaults to NONE. More information on placement groups can be found `here <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/placement-groups.html>`_::
 
     placement_group = NONE
 
@@ -313,55 +313,55 @@ Cluster placement logic. This enables the whole cluster or only compute to use t
 
 This does not apply to awsbatch.
 
-Defaults to cluster in the default template. ::
+Defaults to cluster. ::
 
     placement = cluster
 
 ephemeral_dir
 """""""""""""
 If instance store volumes exist, this is the path/mountpoint they will be mounted on.
 
-Defaults to /scratch in the default template. ::
+Defaults to /scratch. ::
 
     ephemeral_dir = /scratch
 
 shared_dir
 """"""""""
 Path/mountpoint for shared EBS volume. Do not use this option when using multiple EBS volumes; provide shared_dir under each EBS section instead
 
-Defaults to /shared in the default template. The example below mounts to /myshared. See :ref:`EBS Section <ebs_section>` for details on working with multiple EBS volumes::
+Defaults to /shared. The example below mounts to /myshared. See :ref:`EBS Section <ebs_section>` for details on working with multiple EBS volumes::
 
     shared_dir = myshared
 
 encrypted_ephemeral
 """""""""""""""""""
 Encrypted ephemeral drives. In-memory keys, non-recoverable. If true, AWS ParallelCluster will generate an ephemeral encryption key in memroy and using LUKS encryption, encrypt your instance store volumes.
 
-Defaults to false in default template. ::
+Defaults to false. ::
 
     encrypted_ephemeral = false
 
 master_root_volume_size
 """""""""""""""""""""""
 MasterServer root volume size in GB. (AMI must support growroot)
 
-Defaults to 15 in default template. ::
+Defaults to 15. ::
 
     master_root_volume_size = 15
 
 compute_root_volume_size
 """"""""""""""""""""""""
 ComputeFleet root volume size in GB. (AMI must support growroot)
 
-Defaults to 15 in default template. ::
+Defaults to 15. ::
 
     compute_root_volume_size = 15
 
 base_os
 """""""
 OS type used in the cluster
 
-Defaults to alinux in the default template. Available options are: alinux, centos6, centos7, ubuntu1404 and ubuntu1604
+Defaults to alinux. Available options are: alinux, centos6, centos7, ubuntu1404 and ubuntu1604
 
 Note: The base_os determines the username used to log into the cluster.
 
@@ -378,15 +378,15 @@ instances in the cluster. Note that the given name of a role and its Amazon
 Resource Name (ARN) are different, and the latter can not be used as an argument
 to ec2_iam_role.
 
-Defaults to NONE in the default template. ::
+Defaults to NONE. ::
 
     ec2_iam_role = NONE
 
 extra_json
 """"""""""
 Extra JSON that will be merged into the dna.json used by Chef.
 
-Defaults to {} in the default template. ::
+Defaults to {}. ::
 
     extra_json = {}
 
@@ -396,7 +396,7 @@ An additional CloudFormation template to launch along with the cluster. This all
 
 Must be a HTTP URL to a public template with all parameters provided.
 
-Defaults to NONE in the default template. ::
+Defaults to NONE. ::
 
     additional_cfn_template = NONE
 
@@ -467,15 +467,15 @@ CIDR formatted IP range in which to allow SSH access from.
 
 This is only used when AWS ParallelCluster creates the security group.
 
-Defaults to 0.0.0.0/0 in the default template. ::
+Defaults to 0.0.0.0/0. ::
 
     ssh_from = 0.0.0.0/0
 
 additional_sg
 """""""""""""
 Additional VPC security group Id for all instances.
 
-Defaults to NONE in the default template. ::
+Defaults to NONE. ::
 
     additional_sg = sg-xxxxxx
 
@@ -511,7 +511,7 @@ vpc_security_group_id
 """""""""""""""""""""
 Use an existing security group for all instances.
 
-Defaults to NONE in the default template. ::
+Defaults to NONE. ::
 
     vpc_security_group_id = sg-xxxxxx
 
@@ -602,7 +602,7 @@ Amount of time in minutes without a job after which the compute node will termin
 
 This does not apply to awsbatch.
 
-Defaults to 10 for the default template. ::
+Defaults to 10. ::
 
     scaledown_idletime = 10
 
diff --git a/docs/source/pre_post_install.rst b/docs/source/pre_post_install.rst
@@ -21,16 +21,16 @@ The following config settings are used to define pre/post-install actions and ar
 ::
 
 	# URL to a preinstall script. This is executed before any of the boot_as_* scripts are run
-	# (defaults to NONE for the default template)
+	# (defaults to NONE)
 	pre_install = NONE
 	# Arguments to be passed to preinstall script
-	# (defaults to NONE for the default template)
+	# (defaults to NONE)
 	pre_install_args = NONE
 	# URL to a postinstall script. This is executed after any of the boot_as_* scripts are run
-	# (defaults to NONE for the default template)
+	# (defaults to NONE)
 	post_install = NONE
 	# Arguments to be passed to postinstall script
-	# (defaults to NONE for the default template)
+	# (defaults to NONE)
 	post_install_args = NONE
 
 Arguments
diff --git a/docs/source/s3_resources.rst b/docs/source/s3_resources.rst
@@ -8,10 +8,10 @@ Accessing S3 within AWS ParallelCluster can be controlled through two parameters
 ::
 
   # Specify S3 resource which AWS ParallelCluster nodes will be granted read-only access
-  # (defaults to NONE for the default template)
+  # (defaults to NONE)
   s3_read_resource = NONE
   # Specify S3 resource which AWS ParallelCluster nodes will be granted read-write access
-  # (defaults to NONE for the default template)
+  # (defaults to NONE)
   s3_read_write_resource = NONE
 
 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
diff --git a/docs/staging/pre_post-install-actions.txt b/docs/staging/pre_post-install-actions.txt
