summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAndrew Klychkov <aaklychkov@mail.ru>2020-02-25 01:49:40 +0300
committerGitHub <noreply@github.com>2020-02-24 16:49:40 -0600
commit4cc4d77c4b16ff6a6df432028cd5fea64ddff4fd (patch)
tree19eec64fb5f75590862816596898789a4d2c9371 /docs
parentc6a29ed7d292d0e2901d512f0fb29b2947c298fd (diff)
downloadansible-4cc4d77c4b16ff6a6df432028cd5fea64ddff4fd.tar.gz
[2.9] Backport /docs/docsite/rst: fix typos (#67650)
* user_guide/intro_adhoc.rst: fix typo (#67644) (cherry picked from commit 05a3192eb77efe7ae9f6a5de5445de7f5057d9c1) * dev_guide/developing_modules_best_practices.rst: fix typo (#67639) (cherry picked from commit 244277adddfadc1fe5ef1cc34cab6b6857d95267) * /docs/docsite/rst/dev_guide: fix typos (#67643) (cherry picked from commit 907c98ebcd7a08fab4090c5ba188f6ed884aa56d)
Diffstat (limited to 'docs')
-rw-r--r--docs/docsite/rst/dev_guide/developing_modules_best_practices.rst2
-rw-r--r--docs/docsite/rst/dev_guide/testing/sanity/integration-aliases.rst2
-rw-r--r--docs/docsite/rst/dev_guide/testing_units.rst2
-rw-r--r--docs/docsite/rst/user_guide/intro_adhoc.rst2
4 files changed, 4 insertions, 4 deletions
diff --git a/docs/docsite/rst/dev_guide/developing_modules_best_practices.rst b/docs/docsite/rst/dev_guide/developing_modules_best_practices.rst
index ad56d6338e..de138eb6d1 100644
--- a/docs/docsite/rst/dev_guide/developing_modules_best_practices.rst
+++ b/docs/docsite/rst/dev_guide/developing_modules_best_practices.rst
@@ -31,7 +31,7 @@ Designing module interfaces
General guidelines & tips
=========================
-* Each module should be self-contained in one file, so it can be be auto-transferred by Ansible.
+* Each module should be self-contained in one file, so it can be auto-transferred by Ansible.
* Module name MUST use underscores instead of hyphens or spaces as a word separator. Using hyphens and spaces will prevent Ansible from importing your module.
* Always use the ``hacking/test-module.py`` script when developing modules - it will warn you about common pitfalls.
* If you have a local module that returns facts specific to your installations, a good name for this module is ``site_facts``.
diff --git a/docs/docsite/rst/dev_guide/testing/sanity/integration-aliases.rst b/docs/docsite/rst/dev_guide/testing/sanity/integration-aliases.rst
index 498a68bb25..e6cc1e91ea 100644
--- a/docs/docsite/rst/dev_guide/testing/sanity/integration-aliases.rst
+++ b/docs/docsite/rst/dev_guide/testing/sanity/integration-aliases.rst
@@ -72,7 +72,7 @@ Platform versions, as specified using the ``--remote`` option with ``/`` removed
- ``skip/freebsd11.1`` - Skip tests on FreeBSD 11.1.
- ``skip/rhel7.6`` - Skip tests on RHEL 7.6.
-Windows verssions, as specified using the ``--windows`` option can also be skipped:
+Windows versions, as specified using the ``--windows`` option can also be skipped:
- ``skip/windows/2008`` - Skip tests on Windows Server 2008.
- ``skip/windows/2012-R2`` - Skip tests on Windows Server 2012 R2.
diff --git a/docs/docsite/rst/dev_guide/testing_units.rst b/docs/docsite/rst/dev_guide/testing_units.rst
index be243b7598..265aab5cbc 100644
--- a/docs/docsite/rst/dev_guide/testing_units.rst
+++ b/docs/docsite/rst/dev_guide/testing_units.rst
@@ -161,7 +161,7 @@ files that aren't themselves tests.
Fixtures files
``````````````
-To mock out fetching results from devices, or provide other complex datastructures that
+To mock out fetching results from devices, or provide other complex data structures that
come from external libraries, you can use ``fixtures`` to read in pre-generated data.
Text files live in ``test/units/modules/network/PLATFORM/fixtures/``
diff --git a/docs/docsite/rst/user_guide/intro_adhoc.rst b/docs/docsite/rst/user_guide/intro_adhoc.rst
index c455d6b2b9..979126c403 100644
--- a/docs/docsite/rst/user_guide/intro_adhoc.rst
+++ b/docs/docsite/rst/user_guide/intro_adhoc.rst
@@ -4,7 +4,7 @@
Introduction to ad-hoc commands
*******************************
-An Ansible ad-hoc command uses the `/usr/bin/ansible` command-line tool to automate a single task on one or more managed nodes. Ad-hoc commands are quick and easy, but they are not re-usable. So why learn about ad-hoc commands first? Ad-hoc commands demonstrate the simplicity and power of Ansible. The concepts you learn here will port over directly to the playbook language. Before reading and executing these examples, please read :ref:`intro_inventory`.
+An Ansible ad-hoc command uses the `/usr/bin/ansible` command-line tool to automate a single task on one or more managed nodes. Ad-hoc commands are quick and easy, but they are not reusable. So why learn about ad-hoc commands first? Ad-hoc commands demonstrate the simplicity and power of Ansible. The concepts you learn here will port over directly to the playbook language. Before reading and executing these examples, please read :ref:`intro_inventory`.
.. contents::
:local: