From 1da9d23f90fc5ab054b10c338ed77cb30f315b1f Mon Sep 17 00:00:00 2001 From: Nigel Metheringham Date: Mon, 10 Sep 2012 11:51:16 +0100 Subject: [PATCH 1/4] Typo fix for assemble module --- rst/modules/assemble.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rst/modules/assemble.rst b/rst/modules/assemble.rst index 160d2cd415..5caeb37a0a 100644 --- a/rst/modules/assemble.rst +++ b/rst/modules/assemble.rst @@ -8,7 +8,7 @@ assemble Assembles a configuration file from fragments. Often a particular program will take a single configuration file and does not support a conf.d style structure where it is easy to build up the configuration -from multiple sources. Assmeble will take a directory of files that +from multiple sources. Assemble will take a directory of files that have already been transferred to the system, and concatenate them together to produce a destination file. Files are assembled in string sorting order. Puppet calls this idea "fragments". From c0495c3b9b501561d99421de3f1085cf0ed9bca2 Mon Sep 17 00:00:00 2001 From: Nigel Metheringham Date: Mon, 10 Sep 2012 12:31:52 +0100 Subject: [PATCH 2/4] Typo fix - playbook ignoring shell status return --- rst/playbooks.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rst/playbooks.rst b/rst/playbooks.rst index db12af810b..3b71e744db 100644 --- a/rst/playbooks.rst +++ b/rst/playbooks.rst @@ -208,7 +208,7 @@ them work just like you would expect. Simple:: action: command /sbin/setenforce 0 The command and shell module care about return codes, so if you have a command -who's successful exit code is not zero, you may wish to do this: +who's successful exit code is not zero, you may wish to do this:: tasks: - name: run this command and ignore the result From 84f2968023c2a9a61f8a0453c5fab497f53f9dea Mon Sep 17 00:00:00 2001 From: Nigel Metheringham Date: Mon, 10 Sep 2012 16:09:30 +0100 Subject: [PATCH 3/4] Added a paragraph linking to the Jinja2 template docs --- rst/modules/template.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rst/modules/template.rst b/rst/modules/template.rst index a121c585e8..f795d12a93 100644 --- a/rst/modules/template.rst +++ b/rst/modules/template.rst @@ -5,6 +5,11 @@ template Templates a file out to a remote server. +Templates are processed by the +`Jinja2 templating language `_ - +documentation on the template formatting can be found in the +`Template Designer Documentation `_ + +--------------------+----------+---------+----------------------------------------------------------------------------+ | parameter | required | default | comments | +====================+==========+=========+============================================================================+ From 046e43ec111c39aab31518ae14e9089b577a16d6 Mon Sep 17 00:00:00 2001 From: Nigel Metheringham Date: Tue, 11 Sep 2012 11:50:31 +0100 Subject: [PATCH 4/4] Module user - typo corrected for state --- rst/modules/user.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rst/modules/user.rst b/rst/modules/user.rst index 8f4be3566d..d866372ca1 100644 --- a/rst/modules/user.rst +++ b/rst/modules/user.rst @@ -37,7 +37,7 @@ Creates user accounts, manipulates existing user accounts, and removes user acco +--------------------+----------+---------+----------------------------------------------------------------------------+ | force | | no | when used with state=absent, behavior is as with userdel --force | +--------------------+----------+---------+----------------------------------------------------------------------------+ -| remove | | no | when used with state=remove, behavior is as with userdel --remove | +| remove | | no | when used with state=absent, behavior is as with userdel --remove | +--------------------+----------+---------+----------------------------------------------------------------------------+ Example action from Ansible :doc:`playbooks`::