Skip to content

Commit 69d479f

Browse files
russozfelixfontein
andauthored
doc style adjustments: modules [lm]* (#10433)
* doc style adjustments: modules l* * doc style adjustments: modules m* * Apply suggestions from code review Co-authored-by: Felix Fontein <felix@fontein.de> * Update plugins/modules/logstash_plugin.py Co-authored-by: Felix Fontein <felix@fontein.de> --------- Co-authored-by: Felix Fontein <felix@fontein.de>
1 parent bc4d06e commit 69d479f

33 files changed

+214
-168
lines changed

plugins/modules/launchd.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
version_added: 10.1.0
3838
state:
3939
description:
40-
- V(started)/V(stopped) are idempotent actions that will not run commands unless necessary.
41-
- Launchd does not support V(restarted) nor V(reloaded) natively. These will trigger a stop/start (restarted) or an
42-
unload/load (reloaded).
40+
- V(started)/V(stopped) are idempotent actions that do not run commands unless necessary.
41+
- C(launchd) does not support V(restarted) nor V(reloaded) natively. These states trigger a stop/start (restarted) or
42+
an unload/load (reloaded).
4343
- V(restarted) unloads and loads the service before start to ensure that the latest job definition (plist) is used.
4444
- V(reloaded) unloads and loads the service to ensure that the latest job definition (plist) is used. Whether a service
4545
is started or stopped depends on the content of the definition file.
@@ -53,8 +53,8 @@
5353
force_stop:
5454
description:
5555
- Whether the service should not be restarted automatically by launchd.
56-
- Services might have the 'KeepAlive' attribute set to true in a launchd configuration. In case this is set to true,
57-
stopping a service will cause that launchd starts the service again.
56+
- Services might have the C(KeepAlive) attribute set to V(true) in a launchd configuration. In case this is set to V(true),
57+
stopping a service causes that C(launchd) starts the service again.
5858
- Set this option to V(true) to let this module change the C(KeepAlive) attribute to V(false).
5959
type: bool
6060
default: false

plugins/modules/layman.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
type: str
3636
list_url:
3737
description:
38-
- An URL of the alternative overlays list that defines the overlay to install. This list will be fetched and saved under
38+
- An URL of the alternative overlays list that defines the overlay to install. This list is fetched and saved under
3939
C(${overlay_defs}/${name}.xml), where C(overlay_defs) is read from the Layman's configuration.
4040
aliases: [url]
4141
type: str
@@ -47,7 +47,7 @@
4747
type: str
4848
validate_certs:
4949
description:
50-
- If V(false), SSL certificates will not be validated. This should only be set to V(false) when no other option exists.
50+
- If V(false), SSL certificates are not validated. This should only be set to V(false) when no other option exists.
5151
type: bool
5252
default: true
5353
"""

plugins/modules/ldap_attrs.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,9 @@
4343
choices: [present, absent, exact]
4444
default: present
4545
description:
46-
- The state of the attribute values. If V(present), all given attribute values will be added if they are missing. If
47-
V(absent), all given attribute values will be removed if present. If V(exact), the set of attribute values will be
48-
forced to exactly those provided and no others. If O(state=exact) and the attribute value is empty, all values for
49-
this attribute will be removed.
46+
- The state of the attribute values. If V(present), all given attribute values are added if they are missing. If V(absent),
47+
all given attribute values are removed if present. If V(exact), the set of attribute values is forced to exactly those
48+
provided and no others. If O(state=exact) and the attribute value is empty, all values for this attribute are removed.
5049
attributes:
5150
required: true
5251
type: dict

plugins/modules/ldap_inc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
and the control PostRead. This extension and the control are implemented in OpenLdap but not all directory servers implement
2727
them. In this case, the module automatically uses a more classic method based on two phases, first the current value is
2828
read then the modify operation remove the old value and add the new one in a single request. If the value has changed
29-
by a concurrent call then the remove action will fail. Then the sequence is retried 3 times before raising an error to
30-
the playbook. In an heavy modification environment, the module does not guarante to be systematically successful.
29+
by a concurrent call then the remove action fails. Then the sequence is retried 3 times before raising an error to the
30+
playbook. In an heavy modification environment, the module does not guarante to be systematically successful.
3131
- This only deals with integer attribute of an existing entry. To modify attributes of an entry, see M(community.general.ldap_attrs)
3232
or to add or remove whole entries, see M(community.general.ldap_entry).
3333
author:

plugins/modules/ldap_search.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@
6464
version_added: 7.1.0
6565
base64_attributes:
6666
description:
67-
- If provided, all attribute values returned that are listed in this option will be Base64 encoded.
68-
- If the special value V(*) appears in this list, all attributes will be Base64 encoded.
69-
- All other attribute values will be converted to UTF-8 strings. If they contain binary data, please note that invalid
70-
UTF-8 bytes will be omitted.
67+
- If provided, all attribute values returned that are listed in this option are Base64 encoded.
68+
- If the special value V(*) appears in this list, all attributes are Base64 encoded.
69+
- All other attribute values are converted to UTF-8 strings. If they contain binary data, please note that invalid UTF-8
70+
bytes are omitted.
7171
type: list
7272
elements: str
7373
version_added: 7.0.0
@@ -94,12 +94,12 @@
9494
RESULTS = r"""
9595
results:
9696
description:
97-
- For every entry found, one dictionary will be returned.
97+
- For every entry found, one dictionary is returned.
9898
- Every dictionary contains a key C(dn) with the entry's DN as a value.
9999
- Every attribute of the entry found is added to the dictionary. If the key has precisely one value, that value is taken
100100
directly, otherwise the key's value is a list.
101-
- Note that all values (for single-element lists) and list elements (for multi-valued lists) will be UTF-8 strings. Some
102-
might contain Base64-encoded binary data; which ones is determined by the O(base64_attributes) option.
101+
- Note that all values (for single-element lists) and list elements (for multi-valued lists) are UTF-8 strings. Some might
102+
contain Base64-encoded binary data; which ones is determined by the O(base64_attributes) option.
103103
type: list
104104
elements: dict
105105
"""

plugins/modules/librato_annotation.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
module: librato_annotation
1414
short_description: Create an annotation in Librato
1515
description:
16-
- Create an annotation event on the given annotation stream :name. If the annotation stream does not exist, it will be created
17-
automatically.
16+
- Create an annotation event on the given annotation stream O(name). If the annotation stream does not exist, it creates
17+
one automatically.
1818
author: "Seth Edwards (@Sedward)"
1919
requirements: []
2020
extends_documentation_fragment:
@@ -39,7 +39,7 @@
3939
type: str
4040
description:
4141
- The annotation stream name.
42-
- If the annotation stream does not exist, it will be created automatically.
42+
- If the annotation stream does not exist, it creates one automatically.
4343
required: false
4444
title:
4545
type: str

plugins/modules/linode.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
linode_id:
4848
description:
4949
- Unique ID of a Linode server. This value is read-only in the sense that if you specify it on creation of a Linode
50-
it will not be used. The Linode API generates these IDs and we can those generated value here to reference a Linode
51-
more specifically. This is useful for idempotence.
50+
it is not used. The Linode API generates these IDs and we can those generated value here to reference a Linode more
51+
specifically. This is useful for idempotency.
5252
aliases: [lid]
5353
type: int
5454
additional_disks:
@@ -103,7 +103,7 @@
103103
type: int
104104
backupwindow:
105105
description:
106-
- The time window in which backups will be taken.
106+
- The time window in which backups are taken.
107107
type: int
108108
plan:
109109
description:

plugins/modules/linode_v4.py

Lines changed: 45 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
author:
1818
- Luke Murphy (@decentral1se)
1919
notes:
20-
- No Linode resizing is currently implemented. This module will, in time, replace the current Linode module which uses deprecated
20+
- No Linode resizing is currently implemented. This module aims to replace the current Linode module which uses deprecated
2121
API bindings on the Linode side.
2222
extends_documentation_fragment:
2323
- community.general.attributes
@@ -43,7 +43,7 @@
4343
type: str
4444
label:
4545
description:
46-
- The instance label. This label is used as the main determiner for idempotence for the module and is therefore mandatory.
46+
- The instance label. This label is used as the main determiner for idempotency for the module and is therefore mandatory.
4747
type: str
4848
required: true
4949
group:
@@ -53,7 +53,7 @@
5353
type: str
5454
private_ip:
5555
description:
56-
- If V(true), the created Linode will have private networking enabled and assigned a private IPv4 address.
56+
- If V(true), the created Linode instance has private networking enabled and assigned a private IPv4 address.
5757
type: bool
5858
default: false
5959
version_added: 3.0.0
@@ -65,8 +65,8 @@
6565
elements: str
6666
root_pass:
6767
description:
68-
- The password for the root user. If not specified, one will be generated. This generated password will be available
69-
in the task success JSON.
68+
- The password for the root user. If not specified, it generates a new one. This generated password is available in
69+
the task success JSON.
7070
type: str
7171
authorized_keys:
7272
description:
@@ -128,45 +128,46 @@
128128
description: The instance description in JSON serialized form.
129129
returned: Always.
130130
type: dict
131-
sample: {
132-
"root_pass": "foobar", # if auto-generated
133-
"alerts": {
134-
"cpu": 90,
135-
"io": 10000,
136-
"network_in": 10,
137-
"network_out": 10,
138-
"transfer_quota": 80
139-
},
140-
"backups": {
141-
"enabled": false,
142-
"schedule": {
143-
"day": null,
144-
"window": null
145-
}
146-
},
147-
"created": "2018-09-26T08:12:33",
148-
"group": "Foobar Group",
149-
"hypervisor": "kvm",
150-
"id": 10480444,
151-
"image": "linode/centos7",
152-
"ipv4": [
153-
"130.132.285.233"
154-
],
155-
"ipv6": "2a82:7e00::h03c:46ff:fe04:5cd2/64",
156-
"label": "lin-foo",
157-
"region": "eu-west",
158-
"specs": {
159-
"disk": 25600,
160-
"memory": 1024,
161-
"transfer": 1000,
162-
"vcpus": 1
163-
},
164-
"status": "running",
165-
"tags": [],
166-
"type": "g6-nanode-1",
167-
"updated": "2018-09-26T10:10:14",
168-
"watchdog_enabled": true
169-
}
131+
sample:
132+
{
133+
"root_pass": "foobar", # if auto-generated
134+
"alerts": {
135+
"cpu": 90,
136+
"io": 10000,
137+
"network_in": 10,
138+
"network_out": 10,
139+
"transfer_quota": 80
140+
},
141+
"backups": {
142+
"enabled": false,
143+
"schedule": {
144+
"day": null,
145+
"window": null
146+
}
147+
},
148+
"created": "2018-09-26T08:12:33",
149+
"group": "Foobar Group",
150+
"hypervisor": "kvm",
151+
"id": 10480444,
152+
"image": "linode/centos7",
153+
"ipv4": [
154+
"130.132.285.233"
155+
],
156+
"ipv6": "2a82:7e00::h03c:46ff:fe04:5cd2/64",
157+
"label": "lin-foo",
158+
"region": "eu-west",
159+
"specs": {
160+
"disk": 25600,
161+
"memory": 1024,
162+
"transfer": 1000,
163+
"vcpus": 1
164+
},
165+
"status": "running",
166+
"tags": [],
167+
"type": "g6-nanode-1",
168+
"updated": "2018-09-26T10:10:14",
169+
"watchdog_enabled": true
170+
}
170171
"""
171172

172173
import traceback

plugins/modules/listen_ports_facts.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
short_description: Gather facts on processes listening on TCP and UDP ports
2121
notes:
2222
- C(ss) returns all processes for each listen address and port.
23-
- This plugin will return each of them, so multiple entries for the same listen address and port are likely in results.
23+
- This plugin returns each of them, so multiple entries for the same listen address and port are likely in results.
2424
extends_documentation_fragment:
2525
- community.general.attributes
2626
- community.general.attributes.facts
@@ -29,7 +29,7 @@
2929
command:
3030
description:
3131
- Override which command to use for fetching listen ports.
32-
- By default module will use first found supported command on the system (in alphanumerical order).
32+
- By default module uses first found supported command on the system (in alphanumerical order).
3333
type: str
3434
choices:
3535
- netstat

plugins/modules/locale_gen.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
choices: [absent, present]
3838
default: present
3939
notes:
40-
- If C(/etc/locale.gen) exists, the module will assume to be using the B(glibc) mechanism, else if C(/var/lib/locales/supported.d/)
41-
exists it will assume to be using the B(ubuntu_legacy) mechanism, else it will raise an error.
42-
- When using glibc mechanism, it will manage locales by editing C(/etc/locale.gen) and running C(locale-gen).
43-
- When using ubuntu_legacy mechanism, it will manage locales by editing C(/var/lib/locales/supported.d/local) and then running
40+
- If C(/etc/locale.gen) exists, the module assumes to be using the B(glibc) mechanism, else if C(/var/lib/locales/supported.d/)
41+
exists it assumes to be using the B(ubuntu_legacy) mechanism, else it raises an error.
42+
- When using glibc mechanism, it manages locales by editing C(/etc/locale.gen) and running C(locale-gen).
43+
- When using ubuntu_legacy mechanism, it manages locales by editing C(/var/lib/locales/supported.d/local) and then running
4444
C(locale-gen).
4545
- Please note that the code path that uses ubuntu_legacy mechanism has not been tested for a while, because Ubuntu is already
4646
using the glibc mechanism. There is no support for that, given our inability to test it. Therefore, that mechanism is

0 commit comments

Comments
 (0)