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

Misc typo fixes #59620

Merged
merged 1 commit into from
Jul 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/ansible/modules/cloud/amazon/aws_config_aggregator.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,20 @@
- A list of source regions being aggregated.
all_aws_regions:
description:
- If true, aggreagate existing AWS Config regions and future regions.
- If true, aggregate existing AWS Config regions and future regions.
organization_source:
description:
- The region authorized to collect aggregated data.
suboptions:
role_arn:
description:
- ARN of the IAM role used to retreive AWS Organization details associated with the aggregator account.
- ARN of the IAM role used to retrieve AWS Organization details associated with the aggregator account.
aws_regions:
description:
- The source regions being aggregated.
all_aws_regions:
description:
- If true, aggreagate existing AWS Config regions and future regions.
- If true, aggregate existing AWS Config regions and future regions.
extends_documentation_fragment:
- aws
- ec2
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/modules/monitoring/grafana_dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
uid:
version_added: 2.7
description:
- uid of the dasboard to export when C(state) is C(export) or C(absent).
- uid of the dashboard to export when C(state) is C(export) or C(absent).
path:
description:
- The path to the json file containing the Grafana dashboard to import or export.
Expand Down Expand Up @@ -423,7 +423,7 @@ def main():
except GrafanaMalformedJson as e:
module.fail_json(
failed=True,
msg="error : json file does not contain a meta section with a slug parameter, or you did'nt specify the slug parameter"
msg="error : json file does not contain a meta section with a slug parameter, or you did not specify the slug parameter"
)
return
except GrafanaDeleteException as e:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
- Add a port if it is specified in expected state but not in current state.
- Delete a port if it is specified in current state but not in expected state.
- For split action, it represents the ports to be split from current broadcast domain and added to the new broadcast domain.
- if all ports are removed or splited from a broadcast domain, the broadcast domain will be deleted automatically.
- if all ports are removed or split from a broadcast domain, the broadcast domain will be deleted automatically.
'''

EXAMPLES = """
Expand Down Expand Up @@ -145,7 +145,7 @@ def get_broadcast_domain(self, broadcast_domain=None):
"""
Return details about the broadcast domain
:param broadcast_domain: specific broadcast domain to get.
:return: Details about the broadcas domain. None if not found.
:return: Details about the broadcast domain. None if not found.
:rtype: dict
"""
if broadcast_domain is None:
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/plugins/lookup/grafana_dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
- api key of grafana.
- when C(grafana_api_key) is set, the options C(grafan_user), C(grafana_password) and C(grafana_org_id) are ignored.
- Attention, please remove the two == at the end of the grafana_api_key
- because ansible lookup plugins options are splited on = (see example).
- because ansible lookup plugins options are split on = (see example).
env:
- name: GRAFANA_API_KEY
grafana_user:
Expand Down