diff --git a/docsite/rst/intro_configuration.rst b/docsite/rst/intro_configuration.rst index 0a37590f9a..933ed1dc5d 100644 --- a/docsite/rst/intro_configuration.rst +++ b/docsite/rst/intro_configuration.rst @@ -838,5 +838,5 @@ These are settings that control SELinux interactions. .. versionadded:: 1.9 This is a list of file systems that require special treatment when dealing with security context. -The normal behaviour is for operations to copyc the existing context or use the user default, this changes it to use a file system dependent context. +The normal behaviour is for operations to copy the existing context or use the user default, this changes it to use a file system dependent context. The default list is: nfs,vboxsf,fuse,ramfs diff --git a/docsite/rst/modules_core.rst b/docsite/rst/modules_core.rst index 808f9839a9..6364a1556f 100644 --- a/docsite/rst/modules_core.rst +++ b/docsite/rst/modules_core.rst @@ -6,8 +6,8 @@ They will also receive slightly higher priority for all requests than those in t The source of these modules is hosted on GitHub in the `ansible-modules-core `_ repo. -If you believe you have found a bug in this module, and are already running the latest stable or development version of Ansible, first look in the `issue tracker at github.com/ansible/ansible-modules-core `_ to see if a bug has already been filed. If not, we would be grateful if you would file one. +If you believe you have found a bug in a core module and are already running the latest stable or development version of Ansible, first look in the `issue tracker at github.com/ansible/ansible-modules-core `_ to see if a bug has already been filed. If not, we would be grateful if you would file one. Should you have a question rather than a bug report, inquries are welcome on the `ansible-project google group `_ or on Ansible's "#ansible" channel, located on irc.freenode.net. Development oriented topics should instead use the similar `ansible-devel google group `_. -Documentation updates for these modules can also be edited directly by submitting a pull request to the module source code, just look for the "DOCUMENTATION" block in the source tree. +Documentation updates for these modules can also be edited directly in the module itself and by submitting a pull request to the module source code, just look for the "DOCUMENTATION" block in the source tree. diff --git a/docsite/rst/modules_extra.rst b/docsite/rst/modules_extra.rst index 0e0718cb69..479013bb66 100644 --- a/docsite/rst/modules_extra.rst +++ b/docsite/rst/modules_extra.rst @@ -6,9 +6,9 @@ Non-core modules are still fully usable, but may receive slightly lower response Popular "extras" modules may be promoted to core modules over time. -This source of this module is hosted on GitHub in the `ansible-modules-extras `_ repo. +This source for these modules is hosted on GitHub in the `ansible-modules-extras `_ repo. -If you believe you have found a bug in this module, and are already running the latest stable or development version of Ansible, +If you believe you have found a bug in an extras module and are already running the latest stable or development version of Ansible, first look in the `issue tracker at github.com/ansible/ansible-modules-extras `_ o see if a bug has already been filed. If not, we would be grateful if you would file one. @@ -16,8 +16,7 @@ Should you have a question rather than a bug report, inquries are welcome on the or on Ansible's "#ansible" channel, located on irc.freenode.net. Development oriented topics should instead use the similar `ansible-devel google group `_. -Documentation updates for this module can also be edited directly by submitting a pull request to the module source code, -just look for the "DOCUMENTATION" block in the source tree. +Documentation updates for this module can also be edited directly in the module and by submitting a pull request to the module source code, just look for the "DOCUMENTATION" block in the source tree. For help in developing on modules, should you be so inclined, please read :doc:`community`, :doc:`developing_test_pr` and :doc:`developing_modules`. diff --git a/docsite/rst/playbooks_blocks.rst b/docsite/rst/playbooks_blocks.rst index 26da3b5d3c..563d3300e6 100644 --- a/docsite/rst/playbooks_blocks.rst +++ b/docsite/rst/playbooks_blocks.rst @@ -51,7 +51,7 @@ Blocks also introduce the ability to handle errors in a way similar to exception The tasks in the ``block`` would execute normally, if there is any error the ``rescue`` section would get executed -with whatver you need to do to recover from the previous error. The ``always`` section runs no matter what previous +with whatever you need to do to recover from the previous error. The ``always`` section runs no matter what previous error did or did not occur in the ``block`` and ``rescue`` sections. diff --git a/docsite/rst/playbooks_strategies.rst b/docsite/rst/playbooks_strategies.rst index 43f522df62..ae9553a5dc 100644 --- a/docsite/rst/playbooks_strategies.rst +++ b/docsite/rst/playbooks_strategies.rst @@ -1,9 +1,9 @@ -Strategies +Setrategies =========== In 2.0 we added a new way to control play execution, ``strategy``, by default plays will still run as they used to, with what we call the ``linear`` strategy. All hosts will run each -task befor any host starts the next task, using the number of forks (default 5) to paralelize. +task befor any host starts the next task, using the number of forks (default 5) to parallelize. The ``serial`` directive can 'batch' this behaviour to a subset of the hosts, which then run to completion of the play before the next 'batch' starts. @@ -19,7 +19,7 @@ the play as fast as it can.:: .. _strategy_plugins: -Stratergy Plugins +Strategy Plugins ````````````````` The strategies are implelented via a new type of plugin, this means that in the future new