Merge pull request #223 from nigelm/master

Pair of trivial documentation fixes

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".

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 <http://jinja.pocoo.org/docs/>`_ - 
+documentation on the template formatting can be found in the 
+`Template Designer Documentation <http://jinja.pocoo.org/docs/templates/>`_
+
 +--------------------+----------+---------+----------------------------------------------------------------------------+
 | parameter          | required | default | comments                                                                   |
 +====================+==========+=========+============================================================================+

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`::

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