Merge branch 'josh-sanders-patch-1'

Author: drybjed

docs/ansible/roles/ferm/rules.rst

@@ -51,7 +51,7 @@ the following keys:
 
 ``domain``
   Optional. :command:`iptables` domain used for the firewall rule. Possible values:
-  :command:`ip`, ``ip6``. Defaults to :envvar:`ferm__domains`.
+  ``ip``, ``ip6``. Defaults to :envvar:`ferm__domains`.
 
 ``table``
   Optional. :command:`iptables` table to which the rule is added or from which it
@@ -637,5 +637,5 @@ on it, disable support completely by setting :envvar:`ferm__include_legacy`
 to ``False`` which will avoid the additional chain from being created.
 
 If you're not sure if you still have legacy rules defined, look for
-variable names with only on '_' after the :program:`ferm` prefix (e. g.
+variable names with only one '_' after the :program:`ferm` prefix (e. g.
 :envvar:`ferm_input_list` and :envvar:`ferm_input_dependent_list`).

docs/introduction/getting-started.rst

@@ -154,8 +154,8 @@ It's customary to specify this variable directly in the
 .. code-block:: none
 
    [debops_all_hosts]
-   server    ansible_host=server.example.com ansible_user=ansible-admin
-   server    system_users__self_name=ansible-admin
+   server    ansible_host=server.example.com ansible_user=ansible
+   server    system_users__self_name=ansible
 
 On specific platforms you can set this variable to an automatically created
 username to make the remote host administration easier:

docs/user-guide/project-directories.rst

@@ -569,7 +569,7 @@ in :file:`ansible/playbooks/your_role.yml`:
 .. code-block:: yaml
 
   ---
-  - name: Manage the your specific setup
+  - name: Manage your specific setup
     hosts: [ 'debops_all_hosts' ]
     roles:
       - role: ansible.your_role