From 657495d13fd01b67cee9490f0f687653abad33f2 Mon Sep 17 00:00:00 2001 From: "Carlos E. Garcia" Date: Fri, 10 Jul 2015 12:42:59 -0400 Subject: [PATCH] minor spelling changes --- contrib/inventory/ec2.ini | 2 +- contrib/inventory/ec2.py | 4 ++-- docsite/rst/guide_gce.rst | 2 +- examples/ansible.cfg | 4 ++-- lib/ansible/constants.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/inventory/ec2.ini b/contrib/inventory/ec2.ini index 4cd78305c72..a1d9b1d805d 100644 --- a/contrib/inventory/ec2.ini +++ b/contrib/inventory/ec2.ini @@ -36,7 +36,7 @@ destination_variable = public_dns_name # be run from within EC2. The key of an EC2 tag may optionally be used; however # the boto instance variables hold precedence in the event of a collision. # WARNING: - instances that are in the private vpc, _without_ public ip address -# will not be listed in the inventory untill You set: +# will not be listed in the inventory until You set: # vpc_destination_variable = 'private_ip_address' vpc_destination_variable = ip_address diff --git a/contrib/inventory/ec2.py b/contrib/inventory/ec2.py index 5d8b558aa07..f2d9b51c903 100755 --- a/contrib/inventory/ec2.py +++ b/contrib/inventory/ec2.py @@ -795,7 +795,7 @@ class Ec2Inventory(object): # Inventory: Group by security group if self.group_by_security_group and not is_redis: - # Check for the existance of the 'SecurityGroups' key and also if + # Check for the existence of the 'SecurityGroups' key and also if # this key has some value. When the cluster is not placed in a SG # the query can return None here and cause an error. if 'SecurityGroups' in cluster and cluster['SecurityGroups'] is not None: @@ -887,7 +887,7 @@ class Ec2Inventory(object): # Inventory: Group by security group if self.group_by_security_group: - # Check for the existance of the 'SecurityGroups' key and also if + # Check for the existence of the 'SecurityGroups' key and also if # this key has some value. When the cluster is not placed in a SG # the query can return None here and cause an error. if 'SecurityGroups' in cluster and cluster['SecurityGroups'] is not None: diff --git a/docsite/rst/guide_gce.rst b/docsite/rst/guide_gce.rst index fbcab9ba2a4..fb317265d45 100644 --- a/docsite/rst/guide_gce.rst +++ b/docsite/rst/guide_gce.rst @@ -79,7 +79,7 @@ Create a file ``secrets.py`` looking like following, and put it in some folder w GCE_PARAMS = ('i...@project.googleusercontent.com', '/path/to/project.pem') GCE_KEYWORD_PARAMS = {'project': 'project_id'} -Ensure to enter the email adress from the created services account and not the one from your main account. +Ensure to enter the email address from the created services account and not the one from your main account. Now the modules can be used as above, but the account information can be omitted. diff --git a/examples/ansible.cfg b/examples/ansible.cfg index f6b7208b2bc..2481f01f0dd 100644 --- a/examples/ansible.cfg +++ b/examples/ansible.cfg @@ -87,7 +87,7 @@ timeout = 10 # templates indicates to users editing templates files will be replaced. # replacing {file}, {host} and {uid} and strftime codes with proper values. #ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid} on {host} -# This short version is better used in tempaltes as it won't flag the file as changed every run. +# This short version is better used in templates as it won't flag the file as changed every run. ansible_managed = Ansible managed: {file} on {host} # by default, ansible-playbook will display "Skipping [host]" if it determines a task @@ -236,5 +236,5 @@ accelerate_daemon_timeout = 30 [selinux] # file systems that require special treatment when dealing with security context # the default behaviour that copies the existing context or uses the user default -# needs to be changed to use the file system dependant context. +# needs to be changed to use the file system dependent context. #special_context_filesystems=nfs,vboxsf,fuse,ramfs diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index 2c2930d6824..43ae782e195 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -109,7 +109,7 @@ YAML_FILENAME_EXTENSIONS = [ "", ".yml", ".yaml", ".json" ] # sections in config file DEFAULTS='defaults' -# generaly configurable things +# generally configurable things DEFAULT_DEBUG = get_config(p, DEFAULTS, 'debug', 'ANSIBLE_DEBUG', False, boolean=True) DEFAULT_HOST_LIST = shell_expand_path(get_config(p, DEFAULTS, 'hostfile', 'ANSIBLE_HOSTS', get_config(p, DEFAULTS,'inventory','ANSIBLE_INVENTORY', '/etc/ansible/hosts'))) DEFAULT_MODULE_PATH = get_config(p, DEFAULTS, 'library', 'ANSIBLE_LIBRARY', None)