diff --git a/docsite/rst/playbooks_error_handling.rst b/docsite/rst/playbooks_error_handling.rst
index af5c021da50..98ffb2860f3 100644
--- a/docsite/rst/playbooks_error_handling.rst
+++ b/docsite/rst/playbooks_error_handling.rst
@@ -26,6 +26,9 @@ write a task that looks like this::
       command: /bin/false
       ignore_errors: yes
 
+Note that the above system only governs the failure of the particular task, so if you have an undefined
+variable used, it will still raise an error that users will need to address.
+
 .. _controlling_what_defines_failure:
 
 Controlling What Defines Failure
diff --git a/library/files/template b/library/files/template
index 5f64b6d9e60..6fd1b9414c4 100644
--- a/library/files/template
+++ b/library/files/template
@@ -44,7 +44,7 @@ options:
     version_added: "1.2"
   others:
     description:
-      - all arguments accepted by the M(file) module also work here
+      - all arguments accepted by the M(file) module also work here, as well as the M(copy) module (except the the 'content' parameter).
     required: false
 notes:
   - "Since Ansible version 0.9, templates are loaded with C(trim_blocks=True)."