Merge branch 'fix/docs' of https://github.com/ypid/debops into ypid-f…

…ix/docs
debops · Sep 5, 2019 · 1f54f4d · 1f54f4d
2 parents 0d6e322 + e69269f
commit 1f54f4d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -284,7 +284,7 @@ Updates of upstream application versions
   the :envvar:`nodejs__yarn_upstream` variable.
 
   If the NodeJS upstream support is enabled, the NodeJS 8.x version will be
-  installed on older Debian/Ubuntu releases, for exaple Debian Stretch and
+  installed on older Debian/Ubuntu releases, for example Debian Stretch and
   Ubuntu Bionic. Debian Buster and newer releases will use NodeJS 10.x
   version, to keep the Node version from upstream in sync with the one
   available in the OS repositories.
@@ -1009,7 +1009,7 @@ Mail Transport Agents
 
 - If automatic reboots are enabled, VMs will not reboot all at the same time to
   avoid high load on the hypervisor host.  Instead they will reboot at
-  a particular minute in a 15 minute time window.  For each host, a random but
+  a particular minute in a 15 minute time window.  For each host, a
   random-but-idempotent time is chosen.  For hypervisor hosts good presets
   cannot be picked. You should ensure that hosts don’t reboot at the same time
   by defining different reboot times in inventory groups.

diff --git a/ansible/roles/debops.keyring/defaults/main.yml b/ansible/roles/debops.keyring/defaults/main.yml
@@ -24,7 +24,7 @@ keyring__enabled: True
 # .. envvar:: keyring__local_path [[[
 #
 # The path to the directory that contains GPG keys available locally on the
-# Ansible Controller. A relative path is relative to the :file:`files/`
+# Ansible Controller. A non-absolute path is relative to the :file:`files/`
 # directory of the :ref:`debops.keyring` Ansible role; you can also specify an
 # absolute path to a directory on the Ansible Controller.
 #

diff --git a/ansible/roles/debops.nscd/meta/main.yml b/ansible/roles/debops.nscd/meta/main.yml
@@ -8,7 +8,7 @@ galaxy_info:
 
   role_name: 'nscd'
   company: 'DebOps'
-  author: 'Maciej Delmanowski, Robin Schneider'
+  author: 'Maciej Delmanowski'
   description: 'Manage Name Service Cache Daemon'
   license: 'GPL-3.0'
   min_ansible_version: '2.7.0'

diff --git a/docs/ansible/roles/debops.php/getting-started.rst b/docs/ansible/roles/debops.php/getting-started.rst
@@ -64,7 +64,7 @@ to see an example usage.
 PHP Composer installation
 -------------------------
 
-The :ref:`debops.php` role wil install the `PHP Composer`__, a dependency
+The :ref:`debops.php` role will install the `PHP Composer`__, a dependency
 manager for PHP. The version from the OS repositories will be preferred. On
 older OS releases (including Debian Stretch), a known upstream binary will be
 downloaded and installed instead.

diff --git a/docs/news/releases.rst b/docs/news/releases.rst
@@ -56,7 +56,7 @@ latest updates in the codebase, bugfixes and improvements.
 The changes in the ``master`` branch are performed in the form of pull requests
 from forked :command:`git` repositories, usually on separate branches with one
 or more :command:`git` commits. The ``master`` branch is designed to be usable
-at all times in the production environment, but uncatched bugs might occur;
+at all times in the production environment, but uncaught bugs might occur;
 they are usually quickly fixed if found.