mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #34722 from rallytime/fix-34630
Various spelling fixes
This commit is contained in:
Mike Place
GitHub
commit
abf5b976ed
30 changed files with 54 additions and 54 deletions
|
|
@ -18,7 +18,7 @@ Installation from the SUSE Repository
|
|||
Since openSUSE 13.2, Salt 2014.1.11 is available in the primary repositories.
|
||||
With the release of SUSE manager 3 a new repository setup has been created.
|
||||
The new repo will by systemsmanagement:saltstack, which is the source
|
||||
for newer stable packages. For backward compatibilty a linkpackage will be
|
||||
for newer stable packages. For backward compatibility a linkpackage will be
|
||||
created to the old devel:language:python repo.
|
||||
All development of suse packages will be done in systemsmanagement:saltstack:testing.
|
||||
This will ensure that salt will be in mainline suse repo's, a stable release
|
||||
|
|
|
|||
|
|
@ -515,7 +515,7 @@ authentication every ten seconds by default.
|
|||
|
||||
.. code-block:: yaml
|
||||
|
||||
{# Ink server faild to authenticate -- remove accepted key #}
|
||||
{# Ink server failed to authenticate -- remove accepted key #}
|
||||
{% if not data['result'] and data['id'].startswith('ink') %}
|
||||
minion_remove:
|
||||
wheel.key.delete:
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ Changes:
|
|||
* a983942 Merge pull request `#25095`_ from jfindlay/win_groupadd_test
|
||||
* 564dffd depend on win libs rather than mocking them
|
||||
|
||||
* 9b9aeb8 resolved all erors.
|
||||
* 9b9aeb8 resolved all errors.
|
||||
|
||||
* aaf8935 adding win_groupadd unit test case.
|
||||
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ Changes:
|
|||
|
||||
- **PR** `#32588`_: (*anlutro*) Fix salt-ssh module function call argument type juggling by JSON encoding them
|
||||
|
||||
* 5e7edfc yumpkg: Ignore epoch in version comparison for explict versions without an epoch (`#32563`_)
|
||||
* 5e7edfc yumpkg: Ignore epoch in version comparison for explicit versions without an epoch (`#32563`_)
|
||||
|
||||
* fea6056 Fixing critical bug to remove only the specified Host instead of the entire Host cluster (`#32640`_)
|
||||
|
||||
|
|
@ -296,7 +296,7 @@ Changes:
|
|||
|
||||
- **PR** `#32423`_: (*jtand*) Update glusterfs_test to be inline with `#32312`_
|
||||
|
||||
- **PR** `#32425`_: (*cachedout*) Fix salt-cloud paralell provisioning
|
||||
- **PR** `#32425`_: (*cachedout*) Fix salt-cloud parallel provisioning
|
||||
|
||||
* 51fb2ac FreeBSD supports packages in format java/openjdk7 so the prior commit broke that functionality. Check freebsd/pkg`#1409`_ for more info.
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ Changes:
|
|||
|
||||
- **PR** `#33851`_: (*ticosax*) [dockerng] Add support for edge case when `Cmd` and `Entrypoint` can't be blanked
|
||||
|
||||
- **PR** `#33821`_: (*cachedout*) Restore deafault log level to warning
|
||||
- **PR** `#33821`_: (*cachedout*) Restore default log level to warning
|
||||
|
||||
- **PR** `#33767`_: (*amontalban*) Fix `#33604`_ implementation when 'geom disk list' does not output rotat…
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ primarily used for fetching files and returning job returns. The req channels
|
|||
have two basic interfaces when talking to the master. ``send`` is the basic
|
||||
method that guarantees the message is encrypted at least so that only minions
|
||||
attached to the same master can read it-- but no guarantee of minion-master
|
||||
confidentiality, wheras the ``crypted_transfer_decode_dictentry`` method does
|
||||
confidentiality, whereas the ``crypted_transfer_decode_dictentry`` method does
|
||||
guarantee minion-master confidentiality.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@ Salt Master Auth Flooding
|
|||
|
||||
In large installations, care must be taken not to overwhealm the master with
|
||||
authentication requests. Several options can be set on the master which
|
||||
mitigate the chances of an authentication flood from causing an interuption in
|
||||
mitigate the chances of an authentication flood from causing an interruption in
|
||||
service.
|
||||
|
||||
.. note::
|
||||
|
|
|
|||
|
|
@ -813,10 +813,10 @@ def add_source(name, source_location, username=None, password=None):
|
|||
Location of the source you want to work with.
|
||||
|
||||
username
|
||||
Provide username for chocolatey sources that need authentification credentials.
|
||||
Provide username for chocolatey sources that need authentication credentials.
|
||||
|
||||
password
|
||||
Provide password for chocolatey sources that need authentification credentials.
|
||||
Provide password for chocolatey sources that need authentication credentials.
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
|
|||
|
|
@ -2596,7 +2596,7 @@ def powershell(cmd,
|
|||
|
||||
This passes the cmd argument directly to PowerShell
|
||||
without any further processing! Be absolutely sure that you
|
||||
have properly santized the command passed to this function
|
||||
have properly sanitized the command passed to this function
|
||||
and do not use untrusted inputs.
|
||||
|
||||
Note that ``env`` represents the environment variables for the command, and
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ Module to import docker-compose via saltstack
|
|||
|
||||
Introduction
|
||||
------------
|
||||
This module allows to deal with docker-compose file in a directory.
|
||||
This module allows one to deal with docker-compose file in a directory.
|
||||
|
||||
This is a first version only, the following commands are missing at the moment
|
||||
but will be built later on if the community is interested in this module:
|
||||
|
|
@ -93,7 +93,7 @@ Functions
|
|||
- Manage containers image:
|
||||
- :py:func:`dockercompose.pull <salt.modules.dockercompose.pull>`
|
||||
- :py:func:`dockercompose.build <salt.modules.dockercompose.build>`
|
||||
- Gather informations about containers:
|
||||
- Gather information about containers:
|
||||
- :py:func:`dockercompose.ps <salt.modules.dockercompose.ps>`
|
||||
|
||||
Detailed Function Documentation
|
||||
|
|
@ -357,7 +357,7 @@ def build(path, service_names=None):
|
|||
python list, if omitted build images for all containers. Please note
|
||||
that at the moment the module does not allow you to upload your Dockerfile,
|
||||
nor any other file you could need with your docker-compose.yml, you will
|
||||
have to make sure the files you need are actually in the directory sepcified
|
||||
have to make sure the files you need are actually in the directory specified
|
||||
in the `build` keyword
|
||||
|
||||
path
|
||||
|
|
|
|||
|
|
@ -1674,7 +1674,7 @@ def replace(path,
|
|||
|
||||
Replace occurrences of a pattern in a file. If ``show_changes`` is
|
||||
``True``, then a diff of what changed will be returned, otherwise a
|
||||
``True`` will be returnd when changes are made, and ``False`` when
|
||||
``True`` will be returned when changes are made, and ``False`` when
|
||||
no changes are made.
|
||||
|
||||
This is a pure Python implementation that wraps Python's :py:func:`~re.sub`.
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ def delete_record(name,
|
|||
the infoblox user's password (can also use the infolblox:password pillar)
|
||||
|
||||
infoblox_api_version
|
||||
the infoblox api verison to use
|
||||
the infoblox api version to use
|
||||
|
||||
sslVerify
|
||||
should ssl verification be done on the connection to the Infoblox REST API
|
||||
|
|
@ -174,7 +174,7 @@ def update_record(name,
|
|||
the infoblox user's password (can also use the infolblox:password pillar)
|
||||
|
||||
infoblox_api_version
|
||||
the infoblox api verison to use
|
||||
the infoblox api version to use
|
||||
|
||||
sslVerify
|
||||
should ssl verification be done on the connection to the Infoblox REST API
|
||||
|
|
@ -268,7 +268,7 @@ def add_record(name,
|
|||
the infoblox user's password (can also use the infolblox:password pillar)
|
||||
|
||||
infoblox_api_version
|
||||
the infoblox api verison to use
|
||||
the infoblox api version to use
|
||||
|
||||
sslVerify
|
||||
should ssl verification be done on the connection to the Infoblox REST API
|
||||
|
|
@ -351,7 +351,7 @@ def get_network(network_name,
|
|||
the infoblox user's password (can also use the infolblox:password pillar)
|
||||
|
||||
infoblox_api_version
|
||||
the infoblox api verison to use
|
||||
the infoblox api version to use
|
||||
|
||||
sslVerify
|
||||
should ssl verification be done on the connection to the Infoblox REST API
|
||||
|
|
@ -424,7 +424,7 @@ def get_record(record_name,
|
|||
the infoblox DNS view to search, if not specified all views are searched
|
||||
|
||||
infoblox_api_version
|
||||
the infoblox api verison to use
|
||||
the infoblox api version to use
|
||||
|
||||
sslVerify
|
||||
should ssl verification be done on the connection to the Infoblox REST API
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ Support for Opkg
|
|||
|
||||
.. note::
|
||||
|
||||
For version comparision support, the ``opkg-utils`` package must be
|
||||
For version comparison support, the ``opkg-utils`` package must be
|
||||
installed.
|
||||
|
||||
'''
|
||||
|
|
|
|||
|
|
@ -406,10 +406,10 @@ def lookup(search=None, order=None, one=False):
|
|||
|
||||
def sysrq(vm, action='nmi', key='uuid'):
|
||||
'''
|
||||
Send non-maskable interupt to vm or capture a screenshot
|
||||
Send non-maskable interrupt to vm or capture a screenshot
|
||||
|
||||
vm : string
|
||||
vm to be targetted
|
||||
vm to be targeted
|
||||
action : string
|
||||
nmi or screenshot -- Default: nmi
|
||||
key : string [uuid|alias|hostname]
|
||||
|
|
@ -490,7 +490,7 @@ def get(vm, key='uuid'):
|
|||
Output the JSON object describing a VM
|
||||
|
||||
vm : string
|
||||
vm to be targetted
|
||||
vm to be targeted
|
||||
key : string [uuid|alias|hostname]
|
||||
value type of 'vm' parameter
|
||||
|
||||
|
|
@ -527,7 +527,7 @@ def info(vm, info_type='all', key='uuid'):
|
|||
Lookup info on running kvm
|
||||
|
||||
vm : string
|
||||
vm to be targetted
|
||||
vm to be targeted
|
||||
info_type : string [all|block|blockstats|chardev|cpus|kvm|pci|spice|version|vnc]
|
||||
info type to return
|
||||
key : string [uuid|alias|hostname]
|
||||
|
|
@ -572,7 +572,7 @@ def create_snapshot(vm, name, key='uuid'):
|
|||
Create snapshot of a vm
|
||||
|
||||
vm : string
|
||||
vm to be targetted
|
||||
vm to be targeted
|
||||
name : string
|
||||
snapshot name
|
||||
The snapname must be 64 characters or less
|
||||
|
|
@ -625,7 +625,7 @@ def delete_snapshot(vm, name, key='uuid'):
|
|||
Delete snapshot of a vm
|
||||
|
||||
vm : string
|
||||
vm to be targetted
|
||||
vm to be targeted
|
||||
name : string
|
||||
snapshot name
|
||||
The snapname must be 64 characters or less
|
||||
|
|
@ -675,7 +675,7 @@ def rollback_snapshot(vm, name, key='uuid'):
|
|||
Rollback snapshot of a vm
|
||||
|
||||
vm : string
|
||||
vm to be targetted
|
||||
vm to be targeted
|
||||
name : string
|
||||
snapshot name
|
||||
The snapname must be 64 characters or less
|
||||
|
|
|
|||
|
|
@ -518,7 +518,7 @@ def faulty():
|
|||
|
||||
def healthy():
|
||||
'''
|
||||
Return wether fmadm is reporting faults
|
||||
Return whether fmadm is reporting faults
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
|
|||
|
|
@ -1083,7 +1083,7 @@ def time_(format='%A, %d. %B %Y %I:%M%p'):
|
|||
.. versionadded:: 2016.3.0
|
||||
|
||||
Return the current time on the minion,
|
||||
formated based on the format parameter.
|
||||
formatted based on the format parameter.
|
||||
|
||||
Default date format: Monday, 27. July 2015 07:55AM
|
||||
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ def get_alert_config(deployment_id, metric_name=None, api_key=None, profile="tel
|
|||
def get_notification_channel_id(notify_channel, profile="telemetry"):
|
||||
'''
|
||||
Given an email address, creates a notification-channels
|
||||
if one is not found and also returns the corresponsing
|
||||
if one is not found and also returns the corresponding
|
||||
notification channel id.
|
||||
|
||||
notify_channel
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ def add_store(source, store, saltenv='base'):
|
|||
Add the given cert into the given Certificate Store
|
||||
|
||||
source
|
||||
The source certficate file this can be in the form
|
||||
The source certificate file this can be in the form
|
||||
salt://path/to/file
|
||||
|
||||
store
|
||||
|
|
@ -91,7 +91,7 @@ def del_store(source, store, saltenv='base'):
|
|||
Delete the given cert into the given Certificate Store
|
||||
|
||||
source
|
||||
The source certficate file this can be in the form
|
||||
The source certificate file this can be in the form
|
||||
salt://path/to/file
|
||||
|
||||
store
|
||||
|
|
|
|||
|
|
@ -520,7 +520,7 @@ def create_task_from_xml(name,
|
|||
(C:\Windows\System32\tasks).
|
||||
|
||||
:param str xml_text: A string of xml representing the task to be created.
|
||||
This will be overriden by `xml_path` if passed.
|
||||
This will be overridden by `xml_path` if passed.
|
||||
|
||||
:param str xml_path: The path to an XML file on the local system containing
|
||||
the xml that defines the task. This will override `xml_text`
|
||||
|
|
|
|||
|
|
@ -320,7 +320,7 @@ def list_(name=None, **kwargs):
|
|||
depth : int
|
||||
limit recursion to depth
|
||||
properties : string
|
||||
comma-seperated list of properties to list, the name property will always be added
|
||||
comma-separated list of properties to list, the name property will always be added
|
||||
type : string
|
||||
comma-separated list of types to display, where type is one of
|
||||
filesystem, snapshot, volume, bookmark, or all.
|
||||
|
|
@ -885,7 +885,7 @@ def hold(tag, *snapshot, **kwargs):
|
|||
|
||||
.. note::
|
||||
|
||||
A comma-seperated list can be provided for the tag parameter to hold multiple tags.
|
||||
A comma-separated list can be provided for the tag parameter to hold multiple tags.
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -963,7 +963,7 @@ def release(tag, *snapshot, **kwargs):
|
|||
|
||||
.. note::
|
||||
|
||||
A comma-seperated list can be provided for the tag parameter to release multiple tags.
|
||||
A comma-separated list can be provided for the tag parameter to release multiple tags.
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -1192,7 +1192,7 @@ def get(*dataset, **kwargs):
|
|||
depth : int
|
||||
recursively list children to depth
|
||||
fields : string
|
||||
comma-seperated list of fields to include, the name and property field will always be added
|
||||
comma-separated list of fields to include, the name and property field will always be added
|
||||
type : string
|
||||
comma-separated list of types to display, where type is one of
|
||||
filesystem, snapshot, volume, bookmark, or all.
|
||||
|
|
|
|||
|
|
@ -345,7 +345,7 @@ def list_(properties='size,alloc,free,cap,frag,health', zpool=None):
|
|||
optional zpool
|
||||
|
||||
.. note::
|
||||
multiple storage pool can be provded as a space seperated list
|
||||
multiple storage pool can be provded as a space separated list
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -1085,7 +1085,7 @@ def import_(zpool=None, new_name=None, **kwargs):
|
|||
altroot : string
|
||||
equivalent to "-o cachefile=none,altroot=root"
|
||||
dir : string
|
||||
searches for devices or files in dir, mutiple dirs can be specified as follows:: dir="dir1,dir2"
|
||||
searches for devices or files in dir, multiple dirs can be specified as follows:: dir="dir1,dir2"
|
||||
no_mount : boolean
|
||||
import the pool without mounting any file systems.
|
||||
only_destroyed : boolean
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ Configuring git_pillar for Salt releases 2015.8.0 and later
|
|||
will also be logged.
|
||||
|
||||
Beginning with Salt version 2015.8.0, pygit2_ is now supported in addition to
|
||||
GitPython_ (Dulwich_ will not be supported for the forseeable future). The
|
||||
GitPython_ (Dulwich_ will not be supported for the foreseeable future). The
|
||||
requirements for GitPython_ and pygit2_ are the same as for gitfs, as described
|
||||
:ref:`here <gitfs-dependencies>`.
|
||||
|
||||
|
|
|
|||
|
|
@ -77,8 +77,8 @@ You can also provide a list of config files:
|
|||
Select config files through grains|pillar|opts matching
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
You can also opt for a much more flexible configuration: PillarStack allows to
|
||||
select the config files for the current minion based on matching values from
|
||||
You can also opt for a much more flexible configuration: PillarStack allows one
|
||||
to select the config files for the current minion based on matching values from
|
||||
either grains, or pillar, or opts objects.
|
||||
|
||||
Here is an example of such a configuration, which should speak by itself:
|
||||
|
|
|
|||
|
|
@ -374,7 +374,7 @@ def list_jobs(ext_source=None,
|
|||
else:
|
||||
log.error(
|
||||
'\'dateutil\' library not available, skipping start_time '
|
||||
'comparision.'
|
||||
'comparison.'
|
||||
)
|
||||
|
||||
if end_time and _match:
|
||||
|
|
@ -387,7 +387,7 @@ def list_jobs(ext_source=None,
|
|||
else:
|
||||
log.error(
|
||||
'\'dateutil\' library not available, skipping end_time '
|
||||
'comparision.'
|
||||
'comparison.'
|
||||
)
|
||||
|
||||
if _match:
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ module:
|
|||
kmod.absent:
|
||||
- name: pcspkr
|
||||
|
||||
Mutiple modules can be specified for both kmod.present and kmod.absent.
|
||||
Multiple modules can be specified for both kmod.present and kmod.absent.
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ log = logging.getLogger(__name__)
|
|||
|
||||
|
||||
def managed(name, entries, connect_spec=None):
|
||||
'''Ensure the existance (or not) of LDAP entries and their attributes
|
||||
'''Ensure the existence (or not) of LDAP entries and their attributes
|
||||
|
||||
Example:
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ def exists(name, attributes):
|
|||
attributes
|
||||
The attributes that should exist on the file/directory, this is accepted as
|
||||
an array, with key and value split with an equals sign, if you want to specify
|
||||
a hex value then add 0x to the begining of the value.
|
||||
a hex value then add 0x to the beginning of the value.
|
||||
|
||||
'''
|
||||
ret = {'name': name,
|
||||
|
|
|
|||
|
|
@ -69,14 +69,14 @@ class ContextDict(collections.MutableMapping):
|
|||
def __init__(self, **data):
|
||||
# state should be thread local, so this object can be threadsafe
|
||||
self._state = threading.local()
|
||||
# variable for the overriden data
|
||||
# variable for the overridden data
|
||||
self._state.data = None
|
||||
self.global_data = {}
|
||||
|
||||
@property
|
||||
def active(self):
|
||||
'''Determine if this ContextDict is currently overriden
|
||||
Since the ContextDict can be overriden in each thread, we check whether
|
||||
'''Determine if this ContextDict is currently overridden
|
||||
Since the ContextDict can be overridden in each thread, we check whether
|
||||
the _state.data is set or not.
|
||||
'''
|
||||
try:
|
||||
|
|
|
|||
|
|
@ -2783,7 +2783,7 @@ class GitPillar(GitBase):
|
|||
def __init__(self, opts):
|
||||
self.role = 'git_pillar'
|
||||
# Dulwich has no function to check out a branch/tag, so this will be
|
||||
# limited to GitPython and Pygit2 for the forseeable future.
|
||||
# limited to GitPython and Pygit2 for the foreseeable future.
|
||||
GitBase.__init__(self,
|
||||
opts,
|
||||
valid_providers=('gitpython', 'pygit2'))
|
||||
|
|
@ -2824,7 +2824,7 @@ class WinRepo(GitBase):
|
|||
def __init__(self, opts, winrepo_dir):
|
||||
self.role = 'winrepo'
|
||||
# Dulwich has no function to check out a branch/tag, so this will be
|
||||
# limited to GitPython and Pygit2 for the forseeable future.
|
||||
# limited to GitPython and Pygit2 for the foreseeable future.
|
||||
GitBase.__init__(self,
|
||||
opts,
|
||||
valid_providers=('gitpython', 'pygit2'),
|
||||
|
|
|
|||
|
|
@ -913,7 +913,7 @@ class PostgresTestCase(TestCase):
|
|||
@patch('salt.modules.postgres.language_exists', Mock(return_value=True))
|
||||
def test_language_exists(self):
|
||||
'''
|
||||
Test language existance check
|
||||
Test language existence check
|
||||
'''
|
||||
ret = postgres.language_exists(
|
||||
'sql',
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue