Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix various typos in the comments #55422

Merged
merged 2 commits into from
Nov 26, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions salt/modules/zpool.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
:platform: illumos,freebsd,linux

.. versionchanged:: 2018.3.1
Big refactor to remove duplicate code, better type converions and improved
consistancy in output.
Big refactor to remove duplicate code, better type conversions and improved
consistency in output.

'''
from __future__ import absolute_import, print_function, unicode_literals
Expand Down Expand Up @@ -143,7 +143,7 @@ def status(zpool=None):

## parse status output
# NOTE: output is 'key: value' except for the 'config' key.
# mulitple pools will repeat the output, so if switch pools if
# multiple pools will repeat the output, so if switch pools if
# we see 'pool:'
current_pool = None
current_prop = None
Expand Down Expand Up @@ -195,7 +195,7 @@ def status(zpool=None):
# NOTE: data is indented by 1 tab, then multiples of 2 spaces
# to differential root vdev, vdev, and dev
#
# we just strip the intial tab (can't use .strip() here)
# we just strip the initial tab (can't use .strip() here)
if line[0] == "\t":
line = line[1:]

Expand Down Expand Up @@ -372,7 +372,7 @@ def list_(properties='size,alloc,free,cap,frag,health', zpool=None, parsable=Tru

.. note::

Multiple storage pool can be provded as a space separated list
Multiple storage pool can be provided as a space separated list

CLI Example:

Expand Down
6 changes: 3 additions & 3 deletions salt/states/zpool.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

.. versionadded:: 2016.3.0
.. versionchanged:: 2018.3.1
Big refactor to remove duplicate code, better type converions and improved
consistancy in output.
Big refactor to remove duplicate code, better type conversions and improved
consistency in output.

.. code-block:: yaml

Expand Down Expand Up @@ -387,7 +387,7 @@ def absent(name, export=False, force=False):
name : string
name of storage pool
export : boolean
export instread of destroy the zpool if present
export instead of destroy the zpool if present
force : boolean
force destroy or export

Expand Down
20 changes: 10 additions & 10 deletions salt/utils/zfs.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def _property_parse_cmd(cmd, alias=None):
# NOTE: parse output
prop_hdr = []
for prop_data in _exec(cmd=cmd)['stderr'].split('\n'):
# NOTE: make the line data more managable
# NOTE: make the line data more manageable
prop_data = prop_data.lower().split()

# NOTE: skip empty lines
Expand Down Expand Up @@ -217,7 +217,7 @@ def _command(source, command, flags=None, opts=None,
cmd.append(flag)

# NOTE: append options
# we pass through 'sorted' to garentee the same order
# we pass through 'sorted' to guarantee the same order
if opts is None:
opts = {}
for opt in sorted(opts):
Expand All @@ -228,7 +228,7 @@ def _command(source, command, flags=None, opts=None,
cmd.append(to_str(val))

# NOTE: append filesystem properties (really just options with a key/value)
# we pass through 'sorted' to garentee the same order
# we pass through 'sorted' to guarantee the same order
if filesystem_properties is None:
filesystem_properties = {}
for fsopt in sorted(filesystem_properties):
Expand All @@ -239,7 +239,7 @@ def _command(source, command, flags=None, opts=None,
))

# NOTE: append pool properties (really just options with a key/value)
# we pass through 'sorted' to garentee the same order
# we pass through 'sorted' to guarantee the same order
if pool_properties is None:
pool_properties = {}
for fsopt in sorted(pool_properties):
Expand Down Expand Up @@ -330,8 +330,8 @@ def property_data_zpool():

.. warning::

This data is probed from the output of 'zpool get' with some suplimental
data that is hardcoded. There is no better way to get this informatio aside
This data is probed from the output of 'zpool get' with some supplemental
data that is hardcoded. There is no better way to get this information aside
from reading the code.

'''
Expand Down Expand Up @@ -387,8 +387,8 @@ def property_data_zfs():

.. warning::

This data is probed from the output of 'zfs get' with some suplimental
data that is hardcoded. There is no better way to get this informatio aside
This data is probed from the output of 'zfs get' with some supplemental
data that is hardcoded. There is no better way to get this information aside
from reading the code.

'''
Expand Down Expand Up @@ -476,7 +476,7 @@ def to_bool_alt(value):

def from_size(value):
'''
Convert zfs size (human readble) to python int (bytes)
Convert zfs size (human readable) to python int (bytes)
'''
match_size = re_zfs_size.match(str(value))
if match_size:
Expand Down Expand Up @@ -676,7 +676,7 @@ def parse_command_result(res, label=None):

.. note::

Output on failure is rather predicatable.
Output on failure is rather predictable.
- retcode > 0
- each 'error' is a line on stderr
- optional 'Usage:' block under those with hits
Expand Down