mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-07 13:52:54 +00:00
Merge branch 'spelling' of git://github.com/cgar/ansible into devel
Conflicts: docsite/rst/guide_rax.rst plugins/callbacks/mail.py
This commit is contained in:
@@ -145,7 +145,7 @@ class Group(object):
|
||||
|
||||
class SunOS(Group):
|
||||
"""
|
||||
This is a SunOS Group manipulation class. Solaris doesnt have
|
||||
This is a SunOS Group manipulation class. Solaris doesn't have
|
||||
the 'system' group concept.
|
||||
|
||||
This overrides the following methods from the generic class:-
|
||||
|
||||
@@ -57,7 +57,7 @@ def apply_change(targetState, name, encoding):
|
||||
"""Create or remove locale.
|
||||
|
||||
Keyword arguments:
|
||||
targetState -- Desired state, eiter present or absent.
|
||||
targetState -- Desired state, either present or absent.
|
||||
name -- Name including encoding such as de_CH.UTF-8.
|
||||
encoding -- Encoding such as UTF-8.
|
||||
"""
|
||||
@@ -76,7 +76,7 @@ def apply_change_ubuntu(targetState, name, encoding):
|
||||
"""Create or remove locale.
|
||||
|
||||
Keyword arguments:
|
||||
targetState -- Desired state, eiter present or absent.
|
||||
targetState -- Desired state, either present or absent.
|
||||
name -- Name including encoding such as de_CH.UTF-8.
|
||||
encoding -- Encoding such as UTF-8.
|
||||
"""
|
||||
|
||||
@@ -531,7 +531,7 @@ class LinuxService(Service):
|
||||
|
||||
# if the job status is still not known check it by status output keywords
|
||||
if self.running is None:
|
||||
# first tranform the status output that could irritate keyword matching
|
||||
# first transform the status output that could irritate keyword matching
|
||||
cleanout = status_stdout.lower().replace(self.name.lower(), '')
|
||||
if "stop" in cleanout:
|
||||
self.running = False
|
||||
|
||||
Reference in New Issue
Block a user