diff --git a/docsite/rst/developing_inventory.rst b/docsite/rst/developing_inventory.rst index 56eebd90052..a78621d4fed 100644 --- a/docsite/rst/developing_inventory.rst +++ b/docsite/rst/developing_inventory.rst @@ -60,7 +60,7 @@ Tuning the External Inventory Script The stock inventory script system detailed above works for all versions of Ansible, but calling '--host' for every host can be rather expensive, especially if it involves expensive API calls to -a remote subsystemm. In Ansible +a remote subsystem. In Ansible 1.3 or later, if the inventory script returns a top level element called "_meta", it is possible to return all of the host variables in one inventory script call. When this meta element contains a value for "hostvars", the inventory script will not be invoked with "--host" for each host. This diff --git a/docsite/rst/guide_aws.rst b/docsite/rst/guide_aws.rst index 9e48f6cc8ea..50325f787a2 100644 --- a/docsite/rst/guide_aws.rst +++ b/docsite/rst/guide_aws.rst @@ -136,7 +136,7 @@ AWX Autoscaling AnsibleWorks's "AWX" product also contains a very nice feature for auto-scaling use cases. In this mode, a simple curl script can call a defined URL and the server will "dial out" to the requester and configure an instance that is spinning up. This can be a great way -to reconfigure ephmeral nodes. See the AWX documentation for more details. Click on the AWX link in the sidebar for details. +to reconfigure ephemeral nodes. See the AWX documentation for more details. Click on the AWX link in the sidebar for details. A benefit of using the callback in AWX over pull mode is that job results are still centrally recorded and less information has to be shared with remote hosts. diff --git a/docsite/rst/intro_configuration.rst b/docsite/rst/intro_configuration.rst index f1c4f2b9232..be4d63c045b 100644 --- a/docsite/rst/intro_configuration.rst +++ b/docsite/rst/intro_configuration.rst @@ -258,7 +258,7 @@ Ansible prefers to use Jinja2 syntax '{{ like_this }}' to indicate a variable sh older versions of playbooks used a more Perl-style syntax. This syntax was undesirable as it frequently conflicted with bash and was hard to explain to new users when referencing complicated variable hierarchies, so we have standardized on the '{{ jinja2 }}' way. -To ensure a string like '$foo' is not indadvertedly replaced in a Perl or Bash script template, the old form of templating (which is +To ensure a string like '$foo' is not inadvertently replaced in a Perl or Bash script template, the old form of templating (which is still enabled as of Ansible 1.4) can be disabled like so :: legacy_playbook_variables = no diff --git a/docsite/rst/intro_dynamic_inventory.rst b/docsite/rst/intro_dynamic_inventory.rst index 3bf374c7f65..52de7eb9a56 100644 --- a/docsite/rst/intro_dynamic_inventory.rst +++ b/docsite/rst/intro_dynamic_inventory.rst @@ -217,7 +217,7 @@ Using Multiple Inventory Sources ```````````````````````````````` If the location given to -i in Ansible is a directory (or as so configured in ansible.cfg), Ansible can use multiple inventory sources -at thes same time. When doing so, it is possible to mix both dynamic and statically managed inventory sources in the same ansible run. Instant +at the same time. When doing so, it is possible to mix both dynamic and statically managed inventory sources in the same ansible run. Instant hybrid cloud! .. seealso:: diff --git a/docsite/rst/modules.rst b/docsite/rst/modules.rst index 38d0cc04665..800348e982c 100644 --- a/docsite/rst/modules.rst +++ b/docsite/rst/modules.rst @@ -45,7 +45,7 @@ Modules are `idempotent`, meaning they will seek to avoid changes to the system playbooks, these modules can trigger 'change events' in the form of notifying 'handlers' to run additional tasks. -Documention for each module can be accessed from the command line with the +Documentation for each module can be accessed from the command line with the ansible-doc as well as the man command:: ansible-doc command diff --git a/docsite/rst/playbooks.rst b/docsite/rst/playbooks.rst index a4e58b9f2c5..6aa5f0cae61 100644 --- a/docsite/rst/playbooks.rst +++ b/docsite/rst/playbooks.rst @@ -155,7 +155,7 @@ Just `Control-C` to kill it and run it again with `-K`. only occurs when sudoing from a user like 'bob' to 'timmy', not when going from 'bob' to 'root', or logging in directly as 'bob' or 'root'. If this concerns you that this data is briefly readable - (not writeable), avoid transferring uncrypted passwords with + (not writable), avoid transferring uncrypted passwords with `sudo_user` set. In other cases, '/tmp' is not used and this does not come into play. Ansible also takes care to not log password parameters. diff --git a/docsite/rst/playbooks_error_handling.rst b/docsite/rst/playbooks_error_handling.rst index 36c47e9a898..d64917b05d1 100644 --- a/docsite/rst/playbooks_error_handling.rst +++ b/docsite/rst/playbooks_error_handling.rst @@ -6,7 +6,7 @@ Error Handling In Playbooks Ansible normally has defaults that make sure to check the return codes of commands and modules and it fails fast -- forcing an error to be dealt with unless you decide otherwise. -y + Sometimes a command that returns 0 isn't an error. Sometimes a command might not always need to report that it 'changed' the remote system. This section describes how to change the default behavior of Ansible for certain tasks so output and error handling behavior is diff --git a/docsite/rst/playbooks_lookups.rst b/docsite/rst/playbooks_lookups.rst index 6a69ba230ae..f3402f066e1 100644 --- a/docsite/rst/playbooks_lookups.rst +++ b/docsite/rst/playbooks_lookups.rst @@ -77,7 +77,7 @@ Starting in version 1.4, password accepts a "chars" parameter to allow defining (...) -To enter comma use two commas ',,' somewhere - preferably at the end. Quotes and double qoutes are not supported. +To enter comma use two commas ',,' somewhere - preferably at the end. Quotes and double quotes are not supported. .. _more_lookups: