mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
doc: minor fixes to doc and comments
This commit is contained in:
parent
db963b7864
commit
98a8c0f055
4 changed files with 6 additions and 6 deletions
|
@ -163,8 +163,8 @@ all minions which have an ID beginning with the string ``webserver`` will have t
|
|||
webserver state from the requested environment assigned to it.
|
||||
|
||||
In this manner, a proposed change to a state could first be made in a state
|
||||
file in ``/srv/salt/dev`` and the applied to development webservers before moving
|
||||
the state into QA by copying the state file into ``/srv/salt/qa``.
|
||||
file in ``/srv/salt/dev`` and then be applied to development webservers before
|
||||
moving the state into QA by copying the state file into ``/srv/salt/qa``.
|
||||
|
||||
|
||||
Choosing an Environment to Target
|
||||
|
|
|
@ -489,7 +489,7 @@ VALID_OPTS = {
|
|||
|
||||
'pillar_safe_render_error': bool,
|
||||
|
||||
# When creating a pillar, there are several stratigies to choose from when
|
||||
# When creating a pillar, there are several strategies to choose from when
|
||||
# encountering duplicate values
|
||||
'pillar_source_merging_strategy': str,
|
||||
|
||||
|
|
|
@ -1540,7 +1540,7 @@ def remove_image(image):
|
|||
def inspect_image(image):
|
||||
'''
|
||||
Inspect the status of an image and return relative data. This is similar to
|
||||
``docker inspect`` command but only for images
|
||||
``docker inspect`` command but only for images.
|
||||
|
||||
image
|
||||
name of the image
|
||||
|
|
|
@ -589,7 +589,7 @@ def _ensure_exists(wrapped):
|
|||
|
||||
def _refresh_mine_cache(wrapped):
|
||||
'''
|
||||
Decorator to trig a refresh of salt mine data.
|
||||
Decorator to trigger a refresh of salt mine data.
|
||||
'''
|
||||
@functools.wraps(wrapped)
|
||||
def wrapper(*args, **kwargs):
|
||||
|
@ -2467,7 +2467,7 @@ def top(name):
|
|||
|
||||
def version():
|
||||
'''
|
||||
Returns a dictionary of Docker version information. Equivlent to running
|
||||
Returns a dictionary of Docker version information. Equivalent to running
|
||||
the ``docker version`` Docker CLI command.
|
||||
|
||||
CLI Example:
|
||||
|
|
Loading…
Add table
Reference in a new issue