mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
fix various typos
This commit is contained in:
parent
ac08c08695
commit
44963fae0e
14 changed files with 17 additions and 17 deletions
|
@ -218,7 +218,7 @@ html_title = None
|
|||
html_short_title = 'Salt'
|
||||
|
||||
html_static_path = ['_static']
|
||||
html_logo = None # specfied in the theme layout.html
|
||||
html_logo = None # specified in the theme layout.html
|
||||
html_favicon = 'favicon.ico'
|
||||
html_use_smartypants = False
|
||||
|
||||
|
|
|
@ -57,7 +57,7 @@ def need_deployment():
|
|||
st = os.stat(OPTIONS.saltdir)
|
||||
os.chmod(OPTIONS.saltdir, st.st_mode | stat.S_IWGRP | stat.S_IRGRP | stat.S_IXGRP)
|
||||
|
||||
# Delimeter emitted on stdout *only* to indicate shim message to master.
|
||||
# Delimiter emitted on stdout *only* to indicate shim message to master.
|
||||
sys.stdout.write("{0}\ndeploy\n".format(OPTIONS.delimiter))
|
||||
sys.exit(EX_THIN_DEPLOY)
|
||||
|
||||
|
|
|
@ -2187,7 +2187,7 @@ class MultiSyndic(MinionBase):
|
|||
'''
|
||||
Attempt to connect to master, including back-off for each one
|
||||
|
||||
return boolean of wether you connected or not
|
||||
return boolean of whether you connected or not
|
||||
'''
|
||||
if master not in self.master_syndics:
|
||||
log.error('Unable to connect to {0}, not in the list of masters'.format(master))
|
||||
|
|
|
@ -44,7 +44,7 @@ def _cron_matched(cron, cmd, identifier=None):
|
|||
- but also be smart enough to remove states changed crons where we do
|
||||
not removed priorly by a cron.absent by matching on the provided
|
||||
identifier.
|
||||
We assure retrocompatiblity by only checking on identifier if
|
||||
We assure retrocompatibility by only checking on identifier if
|
||||
and only if an identifier was set on the serialized crontab
|
||||
'''
|
||||
ret, id_matched = False, None
|
||||
|
|
|
@ -340,7 +340,7 @@ def serial(zone='', update=False):
|
|||
for greater than the current date is already stored, the function will
|
||||
increment it.
|
||||
|
||||
This module stores the serial in a grain, you can explicitely set the
|
||||
This module stores the serial in a grain, you can explicitly set the
|
||||
stored value as a grain named ``dnsserial_<zone_name>``.
|
||||
|
||||
CLI Example:
|
||||
|
|
|
@ -61,7 +61,7 @@ def _cx_oracle_req():
|
|||
'''
|
||||
Fallback function stub
|
||||
'''
|
||||
return 'Need "cx_Oracle" and Oracle Client installed for this functin exist'
|
||||
return 'Need "cx_Oracle" and Oracle Client installed for this function exist'
|
||||
|
||||
|
||||
def _unicode_output(cursor, name, default_type, size, precision, scale):
|
||||
|
|
|
@ -32,7 +32,7 @@ def set_(uri, value):
|
|||
'''
|
||||
Set a value in a db, using a uri in the form of ``sdb://<profile>/<key>``.
|
||||
If the uri provided does not start with ``sdb://`` or the value is not
|
||||
succesfully set, return ``False``.
|
||||
successfully set, return ``False``.
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
|
@ -70,7 +70,7 @@ def _result_to_dict(data, result, conf):
|
|||
|
||||
Rules:
|
||||
Attributes tagged in the pillar config as 'attrs' or 'lists' are
|
||||
scanned for a 'key=value' format (non matching entires are ignored.
|
||||
scanned for a 'key=value' format (non matching entries are ignored.
|
||||
|
||||
Entries matching the 'attrs' tag overwrite previous values where
|
||||
the key matches a previous result.
|
||||
|
|
|
@ -252,7 +252,7 @@ def init(names, host=None, saltcloud_mode=False, quiet=False, **kwargs):
|
|||
host, 'lxc.cloud_init_interface', args + [kw],
|
||||
expr_form='list', timeout=600).get(host, {})
|
||||
name = kw.pop('name', name)
|
||||
# be sure not to seed an alrady seeded host
|
||||
# be sure not to seed an already seeded host
|
||||
kw['seed'] = seeds[name]
|
||||
if not kw['seed']:
|
||||
kw.pop('seed_cmd', '')
|
||||
|
|
|
@ -162,7 +162,7 @@ def receive(share):
|
|||
|
||||
def wait(share, timeout=0.0, delay=0.01):
|
||||
'''
|
||||
Blocks until recieves a msg addressed to share or timeout
|
||||
Blocks until receives a msg addressed to share or timeout
|
||||
Return msg or None if timed out
|
||||
Delay is sleep time between services
|
||||
'''
|
||||
|
|
|
@ -746,7 +746,7 @@ class Schedule(object):
|
|||
continue
|
||||
|
||||
# Check if the seconds variable is lower than current lowest
|
||||
# loop interval needed. If it is lower then overwrite variable
|
||||
# loop interval needed. If it is lower than overwrite variable
|
||||
# external loops using can then check this variable for how often
|
||||
# they need to reschedule themselves
|
||||
# Not used with 'when' parameter, causes run away jobs and CPU
|
||||
|
|
|
@ -41,7 +41,7 @@ def sdb_set(uri, value, opts):
|
|||
'''
|
||||
Set a value in a db, using a uri in the form of ``sdb://<profile>/<key>``.
|
||||
If the uri provided does not start with ``sdb://`` or the value is not
|
||||
succesfully set, return ``False``.
|
||||
successfully set, return ``False``.
|
||||
'''
|
||||
if not isinstance(uri, string_types):
|
||||
return uri
|
||||
|
|
|
@ -763,7 +763,7 @@ class BotoVpcDHCPOptionsTestCase(BotoVpcTestCaseBase):
|
|||
def test_that_when_associating_an_existing_dhcp_options_set_to_a_non_existent_vpc_the_associate_dhcp_options_method_returns_false(
|
||||
self):
|
||||
'''
|
||||
Tests associating existing dhcp options to non-existance vpc
|
||||
Tests associating existing dhcp options to non-existence vpc
|
||||
'''
|
||||
dhcp_options = self._create_dhcp_options()
|
||||
|
||||
|
@ -819,7 +819,7 @@ class BotoVpcDHCPOptionsTestCase(BotoVpcTestCaseBase):
|
|||
def test_that_when_creating_and_associating_dhcp_options_set_to_a_non_existent_vpc_the_dhcp_options_the_associate_new_dhcp_options_method_returns_false(
|
||||
self):
|
||||
'''
|
||||
Tests creation/association of dhcp options to non-existant vpc
|
||||
Tests creation/association of dhcp options to non-existent vpc
|
||||
'''
|
||||
dhcp_creation_and_association_result = boto_vpc.associate_new_dhcp_options_to_vpc('fake',
|
||||
**dhcp_options_parameters)
|
||||
|
@ -904,7 +904,7 @@ class BotoVpcNetworkACLTestCase(BotoVpcTestCaseBase):
|
|||
@skipIf(True, 'Moto has not implemented this feature. Skipping for now.')
|
||||
def test_that_when_creating_network_acl_for_a_non_existent_vpc_the_create_network_acl_method_returns_false(self):
|
||||
'''
|
||||
Tests creation of network acl with a non-existant vpc
|
||||
Tests creation of network acl with a non-existent vpc
|
||||
'''
|
||||
network_acl_creation_result = boto_vpc.create_network_acl('fake', **conn_parameters)
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@ class TestWhich(integration.TestCase):
|
|||
|
||||
# The mock patch bellow, since we're not providing the return value, we
|
||||
# will be able to tweak it within the test case. The testcase MUST accept
|
||||
# an arguemnt which is the MagicMock'ed object
|
||||
# an argument which is the MagicMock'ed object
|
||||
@patch('os.access')
|
||||
def test_existing_binary_in_windows(self, osaccess):
|
||||
# We define the side_effect attribute on the mocked object in order to
|
||||
|
@ -86,7 +86,7 @@ class TestWhich(integration.TestCase):
|
|||
|
||||
# The mock patch bellow, since we're not providing the return value, we
|
||||
# will be able to tweak it within the test case. The testcase MUST accept
|
||||
# an arguemnt which is the MagicMock'ed object
|
||||
# an argument which is the MagicMock'ed object
|
||||
@patch('os.access')
|
||||
def test_existing_binary_in_windows_pathext(self, osaccess):
|
||||
# We define the side_effect attribute on the mocked object in order to
|
||||
|
|
Loading…
Add table
Reference in a new issue