Skip to content

Commit

Permalink
minor spelling changes
Browse files Browse the repository at this point in the history
  • Loading branch information
cgar authored and bcoca committed Dec 13, 2016
1 parent 054a3fc commit 0b80114
Show file tree
Hide file tree
Showing 114 changed files with 152 additions and 152 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -1782,7 +1782,7 @@ New modules and plugins.
* rax_clb *-- manages Rackspace cloud load balancers*
- files
* acl *-- set or get acls on a file*
* synchronize *-- a useful wraper around rsyncing trees of files*
* synchronize *-- a useful wrapper around rsyncing trees of files*
* unarchive *-- pushes and extracts tarballs*
- system
* blacklist *-- add or remove modules from the kernel blacklist*
Expand Down
2 changes: 1 addition & 1 deletion contrib/inventory/ec2.ini
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ all_instances = False

# By default, only EC2 instances in the 'running' state are returned. Specify
# EC2 instance states to return as a comma-separated list. This
# option is overriden when 'all_instances' is True.
# option is overridden when 'all_instances' is True.
# instance_states = pending, running, shutting-down, terminated, stopping, stopped

# By default, only RDS instances in the 'available' state are returned. Set
Expand Down
4 changes: 2 additions & 2 deletions contrib/inventory/ec2.py
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ def get_elasticache_clusters_by_region(self, region):

try:
# Boto also doesn't provide wrapper classes to CacheClusters or
# CacheNodes. Because of that wo can't make use of the get_list
# CacheNodes. Because of that we can't make use of the get_list
# method in the AWSQueryConnection. Let's do the work manually
clusters = response['DescribeCacheClustersResponse']['DescribeCacheClustersResult']['CacheClusters']

Expand Down Expand Up @@ -710,7 +710,7 @@ def get_elasticache_replication_groups_by_region(self, region):

try:
# Boto also doesn't provide wrapper classes to ReplicationGroups
# Because of that wo can't make use of the get_list method in the
# Because of that we can't make use of the get_list method in the
# AWSQueryConnection. Let's do the work manually
replication_groups = response['DescribeReplicationGroupsResponse']['DescribeReplicationGroupsResult']['ReplicationGroups']

Expand Down
2 changes: 1 addition & 1 deletion contrib/inventory/gce.py
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ def get_gce_driver(self):
return gce

def parse_env_zones(self):
'''returns a list of comma seperated zones parsed from the GCE_ZONE environment variable.
'''returns a list of comma separated zones parsed from the GCE_ZONE environment variable.
If provided, this will be used to filter the results of the grouped_instances call'''
import csv
reader = csv.reader([os.environ.get('GCE_ZONE',"")], skipinitialspace=True)
Expand Down
4 changes: 2 additions & 2 deletions contrib/inventory/rudder.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ disable_ssl_certificate_validation = True
# Your Rudder API token, created in the Web interface.
token = aaabbbccc

# Rudder API version to use, use "latest" for lastest available
# Rudder API version to use, use "latest" for latest available
# version.
version = latest

Expand All @@ -23,7 +23,7 @@ version = latest
group_name = displayName

# Fail if there are two groups with the same name or two hosts with the
# same hostname in the output.
# same hostname in the output.
fail_if_name_collision = True

# We cache the results of Rudder API in a local file
Expand Down
2 changes: 1 addition & 1 deletion contrib/inventory/vmware_inventory.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# TODO:
# * more jq examples
# * optional folder heirarchy
# * optional folder heriarchy

"""
$ jq '._meta.hostvars[].config' data.json | head
Expand Down
2 changes: 1 addition & 1 deletion docs/man/man1/ansible-pull.1.asciidoc.in
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Purge the checkout after the playbook is run.

*-s* 'SLEEP', *--sleep=*'SLEEP'::

Sleep for random interval (between 0 and SLEEP number of seconds) before starting. This is a useful way ot disperse git requests.
Sleep for random interval (between 0 and SLEEP number of seconds) before starting. This is a useful way to disperse git requests.

*--ssh-common-args=*''-o ProxyCommand="ssh -W %h:%p ..." ...''::

Expand Down
2 changes: 1 addition & 1 deletion docsite/_static/searchtools.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* searchtools.js_t
* ~~~~~~~~~~~~~~~~
*
* Sphinx JavaScript utilties for the full-text search.
* Sphinx JavaScript utilities for the full-text search.
*
* :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
Expand Down
2 changes: 1 addition & 1 deletion docsite/rst/become.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ privilege escalation tools, which you probably already use or have configured, l

Directives
-----------
These can be set from play to task level, but are overriden by connection variables as they can be host specific.
These can be set from play to task level, but are overridden by connection variables as they can be host specific.

become
set to 'true'/'yes' to activate privilege escalation.
Expand Down
2 changes: 1 addition & 1 deletion docsite/rst/committer_guidelines.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Individuals with direct commit access to ansible/ansible (+core, + extras) are e
- Be active. Committers who have no activity on the project (through merges, triage, commits, etc.) will have their permissions suspended.
- Consider backwards compatibility (goes back to "don’t break existing playbooks").
- Write tests. PRs with tests are looked at with more priority than PRs without tests that should have them included. While not all changes require tests, be sure to add them for bug fixes or functionality changes.
- Discuss with other commiters, specially when you are unsure of something.
- Discuss with other committers, specially when you are unsure of something.
- Document! If your PR is a new feature or a change to behavior, make sure you've updated all associated documentation or have notified the right people to do so. It also helps to add the version of Core against which this documentation is compatible (to avoid confusion with stable versus devel docs, for backwards compatibility, etc.).
- Consider scope, sometimes a fix can be generalized
- Keep it simple, then things are maintainable, debuggable and intelligible.
Expand Down
10 changes: 5 additions & 5 deletions docsite/rst/dev_guide/developing_module_utilities.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ The following is a list of module_utils files and a general description. The mod
- api.py - Adds shared support for generic API modules.
- asa.py - Module support utilities for managing Cisco ASA network devices.
- azure_rm_common.py - Definitions and utilities for Microsoft Azure Resource Manager template deployments.
- basic.py - General definitions and helper utilites for Ansible modules.
- basic.py - General definitions and helper utilities for Ansible modules.
- cloudstack.py - Utilities for CloudStack modules.
- database.py - Miscellaneous helper functions for PostGRES and MySQL
- docker_common.py - Definitions and helper utilites for modules working with Docker.
- ec2.py - Definitions and utilites for modules working with Amazon EC2
- docker_common.py - Definitions and helper utilities for modules working with Docker.
- ec2.py - Definitions and utilities for modules working with Amazon EC2
- eos.py - Helper functions for modules working with EOS networking devices.
- f5.py - Helper functions for modules working with F5 networking devices.
- facts.py - Helper functions for modules that return facts.
Expand All @@ -25,7 +25,7 @@ The following is a list of module_utils files and a general description. The mod
- iosxr.py - Definitions and helper functions for modules that manage Cisco IOS-XR networking devices
- ismount.py - Contains single helper function that fixes os.path.ismount
- junos.py - Definitions and helper functions for modules that manage Junos networking devices
- known_hosts.py - Utilites for working with known_hosts file
- known_hosts.py - utilities for working with known_hosts file
- mysql.py - Allows modules to connect to a MySQL instance
- netcfg.py - Configuration utility functions for use by networking modules
- netcmd.py - Defines commands and comparison operators for use in networking modules
Expand All @@ -40,7 +40,7 @@ The following is a list of module_utils files and a general description. The mod
- service.py - Contains utilities to enable modules to work with Linux services (placeholder, not in use).
- shell.py - Functions to allow modules to create shells and work with shell commands
- six.py - Module utils for working with the Six python 2 and 3 compatibility library
- splitter.py - String splitting and manipulation utilites for working with Jinja2 templates
- splitter.py - String splitting and manipulation utilities for working with Jinja2 templates
- urls.py - Utilities for working with http and https requests
- vca.py - Contains utilities for modules that work with VMware vCloud Air
- vmware.py - Contains utilities for modules that work with VMware vSphere VMs
Expand Down
2 changes: 1 addition & 1 deletion docsite/rst/dev_guide/developing_modules.rst
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ Windows modules checklist
* Look at existing modules for more examples of argument checking.

* Results
* The result object should allways contain an attribute called changed set to either $true or $false
* The result object should always contain an attribute called changed set to either $true or $false
* Create your result object like this::

$result = New-Object psobject @{
Expand Down
2 changes: 1 addition & 1 deletion docsite/rst/dev_guide/developing_modules_python3.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ numbers, other printable symbols, and a small number of unprintable "symbols"
(control codes).

In Python-2, the two types for these (:class:`str` for bytes and
:class:`unicode` for text) are often used interchangably. When dealing only
:class:`unicode` for text) are often used interchangeably. When dealing only
with ASCII characters, the strings can be combined, compared, and converted
from one type to another automatically. When non-ASCII characters are
introduced, Python starts throwing exceptions due to not knowing what encoding
Expand Down
4 changes: 2 additions & 2 deletions docsite/rst/dev_guide/developing_plugins.rst
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ The following example shows how Ansible's timer plugin is implemented::
runtime = end_time - self.start_time
self._display.display("Playbook run took %s days, %s hours, %s minutes, %s seconds" % (self.days_hours_minutes_seconds(runtime)))

Note that the CALLBACK_VERSION and CALLBACK_NAME definitons are required for properly functioning plugins for Ansible >=2.0.
Note that the CALLBACK_VERSION and CALLBACK_NAME definitions are required for properly functioning plugins for Ansible >=2.0.

.. _developing_connection_plugins:

Expand Down Expand Up @@ -193,7 +193,7 @@ An example of how this lookup is called::

- debug: msg="the value of foo.txt is {{ contents }} as seen today {{ lookup('pipe', 'date +"%Y-%m-%d"') }}"

Errors encountered during execution should be returned by raising AnsibleError() with a message describing the error. Any strings returned by your lookup plugin implementation that could ever contain non-ASCII characters must be converted into Python's unicode type becasue the strings will be run through jinja2. To do this, you can use::
Errors encountered during execution should be returned by raising AnsibleError() with a message describing the error. Any strings returned by your lookup plugin implementation that could ever contain non-ASCII characters must be converted into Python's unicode type because the strings will be run through jinja2. To do this, you can use::

from ansible.module_utils._text import to_text
result_string = to_text(result_string)
Expand Down
2 changes: 1 addition & 1 deletion docsite/rst/developing_modules.rst
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ Windows modules checklist
* Look at existing modules for more examples of argument checking.

* Results
* The result object should allways contain an attribute called changed set to either $true or $false
* The result object should always contain an attribute called changed set to either $true or $false
* Create your result object like this::

$result = New-Object psobject @{
Expand Down
4 changes: 2 additions & 2 deletions docsite/rst/guide_cloudstack.rst
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ This is how our inventory looks like:
As you can see, the public IPs for our web servers and jumphost has been assigned as variable ``public_ip`` directly in the inventory.

The configure the jumphost, web servers and database servers, we use ``group_vars``. The ``group_vars`` directory contains 4 files for configuration of the groups: cloud-vm, jumphost, webserver and db-server. The cloud-vm is there for specifing the defaults of our cloud infrastructure.
The configure the jumphost, web servers and database servers, we use ``group_vars``. The ``group_vars`` directory contains 4 files for configuration of the groups: cloud-vm, jumphost, webserver and db-server. The cloud-vm is there for specifying the defaults of our cloud infrastructure.

.. code-block:: yaml
Expand Down Expand Up @@ -231,7 +231,7 @@ Now to the fun part. We create a playbook to create our infrastructure we call i
In the above play we defined 3 tasks and use the group ``cloud-vm`` as target to handle all VMs in the cloud but instead SSH to these VMs, we use ``connetion=local`` to execute the API calls locally from our workstation.

In the first task, we ensure we have a running VM created with the Debian template. If the VM is already created but stopped, it would just start it. If you like to change the offering on an exisiting VM, you must add ``force: yes`` to the task, which would stop the VM, change the offering and start the VM again.
In the first task, we ensure we have a running VM created with the Debian template. If the VM is already created but stopped, it would just start it. If you like to change the offering on an existing VM, you must add ``force: yes`` to the task, which would stop the VM, change the offering and start the VM again.

In the second task we ensure the ports are opened if we give a public IP to the VM.

Expand Down
2 changes: 1 addition & 1 deletion docsite/rst/intro_installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ You also need Python 2.4 or later. If you are running less than Python 2.5 on th

Ansible 2.2 introduces a tech preview of support for Python 3. For more information, see `Python 3 Support <http://docs.ansible.com/ansible/python_3_support.html>`_.

By default, Ansible uses Python 2 in order to maintain compability with older distributions
By default, Ansible uses Python 2 in order to maintain compatibility with older distributions
such as RHEL 5 and RHEL 6. However, some Linux distributions (Gentoo, Arch) may not have a
Python 2.X interpreter installed by default. On those systems, you should install one, and set
the 'ansible_python_interpreter' variable in inventory (see :doc:`intro_inventory`) to point at your 2.X Python. Distributions
Expand Down
2 changes: 1 addition & 1 deletion docsite/rst/intro_patterns.rst
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ And if you want to read the list of hosts from a file, prefix the file name with

Easy enough. See :doc:`intro_adhoc` and then :doc:`playbooks` for how to apply this knowledge.

.. note:: With the exception of version 1.9, you can use ',' instead of ':' as a host list separator. The ',' is prefered specially when dealing with ranges and ipv6.
.. note:: With the exception of version 1.9, you can use ',' instead of ':' as a host list separator. The ',' is preferred specially when dealing with ranges and ipv6.
.. note:: As of 2.0 the ';' is deprecated as a host list separator.

.. seealso::
Expand Down
2 changes: 1 addition & 1 deletion docsite/rst/intro_windows.rst
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ You may wind up with a more readable playbook by using the PowerShell equivalent
- name: Move file on remote Windows Server from one location to another
raw: Move-Item C:\teststuff\myfile.conf C:\builds\smtp.conf

Bear in mind that using C(raw) will allways report "changed", and it is your responsiblity to ensure PowerShell will need to handle idempotency as appropriate (the move examples above are inherently not idempotent), so where possible use (or write) a module.
Bear in mind that using C(raw) will always report "changed", and it is your responsiblity to ensure PowerShell will need to handle idempotency as appropriate (the move examples above are inherently not idempotent), so where possible use (or write) a module.

Here's an example of how to use the win_stat module to test for file existence. Note that the data returned by the win_stat module is slightly different than what is provided by the Linux equivalent::

Expand Down
2 changes: 1 addition & 1 deletion examples/ansible.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@
#
#pipelining = False

# Control the mechanism for transfering files
# Control the mechanism for transferring files
# * smart = try sftp and then try scp [default]
# * True = use scp only
# * False = use sftp only
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/cli/galaxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ def execute_search(self):

def execute_login(self):
"""
Verify user's identify via Github and retreive an auth token from Galaxy.
Verify user's identify via Github and retrieve an auth token from Galaxy.
"""
# Authenticate with github and retrieve a token
if self.options.token is None:
Expand All @@ -540,7 +540,7 @@ def execute_login(self):
token = GalaxyToken()
token.set(galaxy_response['token'])

display.display("Succesfully logged into Galaxy as %s" % galaxy_response['username'])
display.display("Successfully logged into Galaxy as %s" % galaxy_response['username'])
return 0

def execute_import(self):
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def get_config(p, section, key, env_var, default, value_type=None, expand_relati
and return it as a python list.
:none: Sets the value to None
:path: Expands any environment variables and tilde's in the value.
:tmp_path: Create a unique temporary directory inside of the dirctory
:tmp_path: Create a unique temporary directory inside of the directory
specified by value and return its path.
:pathlist: Treat the value as a typical PATH string. (On POSIX, this
means colon separated strings.) Split the value and then expand
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/executor/task_executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ def _execute(self, variables=None):
# loop error takes precedence
if self._loop_eval_error is not None:
raise self._loop_eval_error
# skip conditional exception in the case of includes as the vars needed might not be avaiable except in the included tasks or due to tags
# skip conditional exception in the case of includes as the vars needed might not be available except in the included tasks or due to tags
if self._task.action not in ['include', 'include_role']:
raise

Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/executor/task_result.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

class TaskResult:
'''
This class is responsible for interpretting the resulting data
This class is responsible for interpreting the resulting data
from an executed task, and provides helper methods for determining
the result of a given task.
'''
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/inventory/script.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def get_host_variables(self, host):
try:
got = self.host_vars_from_top.get(host.name, {})
except AttributeError as e:
raise AnsibleError("Improperly formated host information for %s: %s" % (host.name,to_native(e)))
raise AnsibleError("Improperly formatted host information for %s: %s" % (host.name,to_native(e)))
return got

cmd = [self.filename, "--host", host.name]
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/module_utils/facts.py
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ class Distribution(object):
"""
This subclass of Facts fills the distribution, distribution_version and distribution_release variables
To do so it checks the existance and content of typical files in /etc containing distribution information
To do so it checks the existence and content of typical files in /etc containing distribution information
This is unit tested. Please extend the tests to cover all distributions if you have them available.
"""
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/modules/cloud/amazon/ec2_eip.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
pause to delay further playbook execution until the instance is reachable,
if necessary.
- This module returns multiple changed statuses on disassociation or release.
It returns an overall status based on any changes occuring. It also returns
It returns an overall status based on any changes occurring. It also returns
individual changed statuses for disassociation and release.
'''

Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/modules/cloud/amazon/ec2_scaling_policy.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def create_scaling_policy(connection, module):
if getattr(policy, 'min_adjustment_step') != module.params.get('min_adjustment_step'):
changed = True

# set the min adjustment step incase the user decided to change their
# set the min adjustment step in case the user decided to change their
# adjustment type to percentage
setattr(policy, 'min_adjustment_step', module.params.get('min_adjustment_step'))

Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/modules/cloud/amazon/ec2_vol.py
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ def main():
elif inst is not None:
volume, changed = attach_volume(module, ec2, volume, inst)

# Add device, volume_id and volume_type parameters separately to maintain backward compatability
# Add device, volume_id and volume_type parameters separately to maintain backward compatibility
volume_info = get_volume_info(volume, state)
module.exit_json(changed=changed, volume=volume_info, device=volume_info['attachment_set']['device'], volume_id=volume_info['id'], volume_type=volume_info['type'])
elif state == 'absent':
Expand Down
Loading

0 comments on commit 0b80114

Please sign in to comment.