saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

lots of copyediting

Browse source
This commit is contained in:
Chris Rebert 2014-04-30 12:06:27 -07:00
parent aa8cee3ce3
commit 45981a56f9
22 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/conf.py
View file

@ -15,7 +15,7 @@ class Mock(object):
'''
Mock out specified imports
This allows autodoc to do it's thing without having oodles of req'd
This allows autodoc to do its thing without having oodles of req'd
installed libs. This doesn't work with ``import *`` imports.
http://read-the-docs.readthedocs.org/en/latest/faq.html#i-get-import-errors-on-libraries-that-depend-on-c-modules

4
doc/topics/targeting/compound.rst
View file

@ -57,7 +57,7 @@ Excluding a minion based on its ID is also possible:
Precedence Matching
-------------------
Matches can be grouped together with parentheses to explicitely declare precedence amongst groups.
Matches can be grouped together with parentheses to explicitly declare precedence amongst groups.
.. code-block:: bash
@ -65,6 +65,6 @@ Matches can be grouped together with parentheses to explicitely declare preceden
.. note::
Be certain to note that spaces are required between the parantheses and targets. Failing to obey this
Be certain to note that spaces are required between the parentheses and targets. Failing to obey this
rule may result in incorrect targeting!

4
salt/cloud/__init__.py
View file

@ -1874,7 +1874,7 @@ class Map(Cloud):
if master_profile['minion'].get('local_master', False) and \
master_profile['minion'].get('master', None) is not None:
# The minion is explicitly defining a master and it's
# explicitely saying it's the local one
# explicitly saying it's the local one
local_master = True
out = self.create(master_profile, local_master=local_master)
@ -1939,7 +1939,7 @@ class Map(Cloud):
if 'minion' in profile and profile['minion'].get('local_master', False) and \
profile['minion'].get('master', None) is not None:
# The minion is explicitly defining a master and it's
# explicitely saying it's the local one
# explicitly saying it's the local one
local_master = True
if master_finger is not None and local_master is False:

2
salt/cloud/clouds/gce.py
View file

@ -1715,7 +1715,7 @@ def destroy(vm_name, call=None):
transport=__opts__['transport']
)
# Use the instance metadata to see if it's salt cloud profile was
# Use the instance metadata to see if its salt cloud profile was
# preserved during instance create. If so, use the profile value
# to see if the 'delete_boot_pd' value is set to delete the disk
# along with the instance.

2
salt/cloud/clouds/libcloud_aws.py
View file

@ -248,7 +248,7 @@ def ssh_username(vm_):
usernames.append(name)
# Add the user provided usernames to the end of the list since enough time
# might need to pass before the remote service is available for logins and
# the proper username might have passed it's iteration.
# the proper username might have passed its iteration.
# This has detected in a CentOS 5.7 EC2 image
usernames.extend(initial)
return usernames

8
salt/config.py
View file

@ -740,7 +740,7 @@ def minion_config(path,
# in `5d60f77` in order not to break backwards compatibility.
#
# Showing a deprecation for 0.17.0 and 2014.1.0 should be enough for any
# api calls to be updated in order to stop it's use.
# api calls to be updated in order to stop its use.
salt.utils.warn_until(
'Helium',
'The functionality behind the \'check_dns\' keyword argument is '
@ -967,7 +967,7 @@ def cloud_config(path, env_var='SALT_CLOUD_CONFIG', defaults=None,
entry = os.path.join(os.path.dirname(path), entry)
if os.path.isdir(entry):
# Path exists, let's update the entry(it's path might have been
# Path exists, let's update the entry (its path might have been
# made absolute)
deploy_scripts_search_path[idx] = entry
continue
@ -975,7 +975,7 @@ def cloud_config(path, env_var='SALT_CLOUD_CONFIG', defaults=None,
# It's not a directory? Remove it from the search path
deploy_scripts_search_path.pop(idx)
# Add the built-in scripts directory to the search path(last resort)
# Add the built-in scripts directory to the search path (last resort)
deploy_scripts_search_path.append(
os.path.abspath(
os.path.join(
@ -1853,7 +1853,7 @@ def apply_minion_config(overrides=None,
# in `5d60f77` in order not to break backwards compatibility.
#
# Showing a deprecation for 0.17.0 and 2014.1.0 should be enough for any
# api calls to be updated in order to stop it's use.
# api calls to be updated in order to stop its use.
salt.utils.warn_until(
'Helium',
'The functionality behind the \'check_dns\' keyword argument is '

2
salt/loader.py
View file

@ -979,7 +979,7 @@ class Loader(object):
def process_virtual(self, mod, module_name):
'''
Given a loaded module and it's default name determine its virtual name
Given a loaded module and its default name determine its virtual name
This function returns a tuple. The first value will be either True or
False and will indicate if the module should be loaded or not (ie. if

2
salt/log/handlers/__init__.py
View file

@ -42,7 +42,7 @@ if sys.version_info < (2, 7):
class TemporaryLoggingHandler(logging.NullHandler):
'''
This logging handler will store all the log records up to it's maximum
This logging handler will store all the log records up to its maximum
queue size at which stage the first messages stored will be dropped.
Should only be used as a temporary logging handler, while the logging

12
salt/modules/softwareupdate.py
View file

@ -219,7 +219,7 @@ def schedule(*status):
def upgrade(rec=False, restart=True):
'''
Install all available upgrades. Returns a dictionary containing the name
of the update and the status of it's installation.
of the update and the status of its installation.
Return values:
- ``True``: The update was installed.
@ -268,12 +268,12 @@ def upgrade(rec=False, restart=True):
def install(*updates):
'''
Install a named upgrade. Returns a dictionary containing the name
of the update and the status of it's installation.
of the update and the status of its installation.
Return values:
- ``True``: The update was installed.
- ``False``: The update was not installed.
- ``None``: There is no update avaliable with that name.
- ``None``: There is no update available with that name.
CLI Example:
@ -288,7 +288,7 @@ def install(*updates):
if len(updates) == 0:
return ''
avaliable_upgrades = _get_upgradable()
available_upgrades = _get_upgradable()
for name in updates:
cmd = ['softwareupdate', '--install', name]
@ -298,7 +298,7 @@ def install(*updates):
upgrades_left = _get_upgradable()
for name in updates:
if name not in avaliable_upgrades:
if name not in available_upgrades:
ret[name] = None
elif name not in upgrades_left:
ret[name] = True
@ -375,7 +375,7 @@ def download(*updates):
def download_all(rec=False, restart=True):
'''
Download all avaliable updates so that they can be installed later
Download all available updates so that they can be installed later
with the install or upgrade function. It returns a list of updates
that are now downloaded.

2
salt/modules/virt.py
View file

@ -105,7 +105,7 @@ def __get_conn():
def __esxi_auth():
'''
We rely on that the credentials is provided to libvirt through
it's built in mechanisms.
its built in mechanisms.
Example libvirt `/etc/libvirt/auth.conf`:

2
salt/modules/win_update.py
View file

@ -372,7 +372,7 @@ def _search(quidditch, retries=5):
comment = ''
while not passed:
log.debug('Searching. tries left: {0}'.format(str(retries)))
#let the updater make it's own search string. MORE POWER this way.
#let the updater make its own search string. MORE POWER this way.
passed = quidditch.AutoSearch()
log.debug('Done searching: {0}'.format(str(passed)))
if isinstance(passed, Exception):

2
salt/payload.py
View file

@ -112,7 +112,7 @@ class Serial(object):
# raise the exception
raise
# msgpack is < 0.2.0, let's make it's life easier
# msgpack is < 0.2.0, let's make its life easier
# Since OrderedDict is identified as a dictionary, we can't
# make use of msgpack custom types, we will need to convert by
# hand.

2
salt/renderers/pyobjects.py
View file

@ -28,7 +28,7 @@ Creating state data
^^^^^^^^^^^^^^^^^^^
Pyobjects takes care of creating an object for each of the available states on
the minion. Each state is represented by an object that is the CamelCase
version of it's name (ie. ``File``, ``Service``, ``User``, etc), and these
version of its name (ie. ``File``, ``Service``, ``User``, etc), and these
objects expose all of their available state functions (ie. ``File.managed``,
``Service.running``, etc).

2
salt/states/pip_state.py
View file

@ -218,7 +218,7 @@ def installed(name,
Salt from an active `virtualenv`_.
The reason for this requirement is because ``pip`` already does a
pretty good job parsing it's own requirements. It makes no sense for
pretty good job parsing its own requirements. It makes no sense for
Salt to do ``pip`` requirements parsing and validation before passing
them to the ``pip`` library. It's functionality duplication and it's
more error prone.

2
salt/states/win_dns_client.py
View file

@ -105,7 +105,7 @@ def primary_suffix(name,
suffix : None
The suffix which is advertised for this client when acquiring a DHCP lease
When none is set, the explicitely configured DNS suffix will be removed.
When none is set, the explicitly configured DNS suffix will be removed.
updates : False
Allow syncing the DNS suffix with the AD domain when the client's AD domain membership changes

2
salt/utils/cloud.py
View file

@ -441,7 +441,7 @@ def ssh_usernames(vm_, opts, default_users=None):
usernames.append(name)
# Add the user provided usernames to the end of the list since enough time
# might need to pass before the remote service is available for logins and
# the proper username might have passed it's iteration.
# the proper username might have passed its iteration.
# This has detected in a CentOS 5.7 EC2 image
usernames.extend(initial)
return usernames

4
salt/utils/openstack/nova.py
View file

@ -205,13 +205,13 @@ class SaltNova(object):
def show_instance(self, name):
'''
Find a server by it's name (libcloud)
Find a server by its name (libcloud)
'''
return self.server_list().get(name, {})
def server_by_name(self, name):
'''
Find a server by it's name
Find a server by its name
'''
return self.server_show_libcloud(
self.server_list().get(name, {}).get('id', '')

12
salt/utils/parsers.py
View file

@ -328,7 +328,7 @@ class SaltfileMixIn(object):
cli_config = saltfile_config[self.get_prog_name()]
# If there are any options, who's names match any key from the loaded
# Saltfile, we need to update it's default value
# Saltfile, we need to update its default value
for option in self.option_list:
if option.dest is None:
# --version does not have dest attribute set for example.
@ -639,8 +639,8 @@ class LogLevelMixIn(object):
)
if not is_writeable(logfile, check_parent=True):
# Since we're not be able to write to the log file or it's parent
# directory(if the log file does not exit), are we the same user
# Since we're not be able to write to the log file or its parent
# directory (if the log file does not exit), are we the same user
# as the one defined in the configuration file?
current_user = salt.utils.get_user()
if self.config['user'] != current_user:
@ -648,7 +648,7 @@ class LogLevelMixIn(object):
# Is the current user in ACL?
if current_user in self.config.get('client_acl', {}).keys():
# Yep, the user is in ACL!
# Let's write the logfile to it's home directory instead.
# Let's write the logfile to its home directory instead.
user_salt_dir = os.path.expanduser('~/.salt')
if not os.path.isdir(user_salt_dir):
os.makedirs(user_salt_dir, 0750)
@ -1932,7 +1932,7 @@ class SaltKeyOptionParser(OptionParser, ConfigDirMixIn, MergeConfigMixIn,
os.makedirs(self.options.gen_keys_dir)
self.options.config_dir = self.options.gen_keys_dir
super(SaltKeyOptionParser, self).process_config_dir()
# Don't change it's mixin priority!
# Don't change its mixin priority!
process_config_dir._mixin_prio_ = ConfigDirMixIn._mixin_prio_
def setup_config(self):
@ -2267,7 +2267,7 @@ class SaltSSHOptionParser(OptionParser, ConfigDirMixIn, MergeConfigMixIn,
dest='ssh_key_deploy',
default=False,
action='store_true',
help='Set this flag to atempt to deploy the authorized ssh key '
help='Set this flag to attempt to deploy the authorized ssh key '
'with all minions. This combined with --passwd can make '
'initial deployment of keys very fast and easy'
)

2
tests/integration/__init__.py
View file

@ -349,7 +349,7 @@ class TestDaemon(object):
Return a local client which will be used for example to ping and sync
the test minions.
This client is defined as a class attribute because it's creation needs
This client is defined as a class attribute because its creation needs
to be deferred to a latter stage. If created it on `__enter__` like it
previously was, it would not receive the master events.
'''

8
tests/unit/modules/virtualenv_test.py
View file

@ -285,7 +285,7 @@ class VirtualenvTestCase(TestCase):
)
# <---- virtualenv binary present but > 0 exit code --------------
# ----- virtualenv binary returns 1.9.1 as it's version --------->
# ----- virtualenv binary returns 1.9.1 as its version --------->
mock = MagicMock(side_effect=[
{'retcode': 0, 'stdout': '1.9.1'},
{'retcode': 0, 'stdout': ''}
@ -298,9 +298,9 @@ class VirtualenvTestCase(TestCase):
'virtualenv --never-download /tmp/foo',
runas=None
)
# <---- virtualenv binary returns 1.9.1 as it's version ----------
# <---- virtualenv binary returns 1.9.1 as its version ----------
# ----- virtualenv binary returns 1.10rc1 as it's version ------->
# ----- virtualenv binary returns 1.10rc1 as its version ------->
mock = MagicMock(side_effect=[
{'retcode': 0, 'stdout': '1.10rc1'},
{'retcode': 0, 'stdout': ''}
@ -313,7 +313,7 @@ class VirtualenvTestCase(TestCase):
'virtualenv /tmp/foo',
runas=None
)
# <---- virtualenv binary returns 1.10rc1 as it's version --------
# <---- virtualenv binary returns 1.10rc1 as its version --------
def test_python_argument(self):
mock = MagicMock(return_value={'retcode': 0, 'stdout': ''})

2
tests/unit/modules/win_status_test.py
View file

@ -24,7 +24,7 @@ if NO_MOCK is False:
pythoncom.CoInitialize = Mock()
pythoncom.CoUninitialize = Mock()
# This is imported late so mock can do it's job
# This is imported late so mock can do its job
import salt.modules.win_status as status

2
tests/unit/states/gem_test.py
View file

@ -6,7 +6,7 @@ from salttesting.helpers import ensure_in_syspath
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
ensure_in_syspath('../../')
# Late import so mock can do it's job
# Late import so mock can do its job
import salt.states.gem as gem
gem.__salt__ = {}
gem.__opts__ = {'test': False}