Merge branch 'spelling' of git://github.com/cgar/ansible into devel

Conflicts:
	docsite/rst/guide_rax.rst
	plugins/callbacks/mail.py
This commit is contained in:
Michael DeHaan
2014-08-08 13:28:45 -04:00
36 changed files with 54 additions and 54 deletions

View File

@@ -145,7 +145,7 @@ class AristaInterface(object):
""" This method will return a dictionary with the attributes of the
physical ethernet interface resource specified in interface_id.
The physcial ethernet interface resource has the following
stucture:
structure:
{
"interface_id": <interface_id>,

View File

@@ -154,7 +154,7 @@ class AristaL2Interface(object):
def get(self):
""" This method will return a dictionary with the attributes of the
layer 2 interface resource specified in interface_id. The layer
2 interface resource has the following stucture:
2 interface resource has the following structure:
{
"interface_id": <interface_id>,

View File

@@ -143,7 +143,7 @@ class AristaLag(object):
def get(self):
""" This method will return a dictionary with the attributes of the
lag interface resource specified in interface_id. The lag
interface resource has the following stucture:
interface resource has the following structure:
{
"interface_id": <interface_id>,

View File

@@ -234,7 +234,7 @@ class AristaVlan(object):
def get(self):
""" This method will return a dictionary with the attributes of the
VLAN resource identified in vlan_id. The VLAN resource has the
following stucture:
following structure:
{
"vlan_id": <vlan_id>,

View File

@@ -101,7 +101,7 @@ options:
default: none
port:
description:
- port address part op the ipport definition. Tyhe default API
- port address part op the ipport definition. The default API
setting is 0.
required: false
default: none

View File

@@ -101,7 +101,7 @@ options:
default: none
port:
description:
- port address part op the ipport definition. Tyhe default API
- port address part op the ipport definition. The default API
setting is 0.
required: false
default: none

View File

@@ -24,7 +24,7 @@ description:
options:
account_email:
description:
- "Account email. If ommitted, the env variables DNSIMPLE_EMAIL and DNSIMPLE_API_TOKEN will be looked for. If those aren't found, a C(.dnsimple) file will be looked for, see: U(https://github.com/mikemaccana/dnsimple-python#getting-started)"
- "Account email. If omitted, the env variables DNSIMPLE_EMAIL and DNSIMPLE_API_TOKEN will be looked for. If those aren't found, a C(.dnsimple) file will be looked for, see: U(https://github.com/mikemaccana/dnsimple-python#getting-started)"
required: false
default: null
@@ -36,7 +36,7 @@ options:
domain:
description:
- Domain to work with. Can be the domain name (e.g. "mydomain.com") or the numeric ID of the domain in DNSimple. If ommitted, a list of domains will be returned.
- Domain to work with. Can be the domain name (e.g. "mydomain.com") or the numeric ID of the domain in DNSimple. If omitted, a list of domains will be returned.
- If domain is present but the domain doesn't exist, it will be created.
required: false
default: null