diff --git a/files/lineinfile.py b/files/lineinfile.py
index 777f0a498a9..45dd12ec135 100644
--- a/files/lineinfile.py
+++ b/files/lineinfile.py
@@ -27,11 +27,12 @@ import tempfile
 DOCUMENTATION = """
 ---
 module: lineinfile
-author: 
+author:
     - "Daniel Hokka Zakrissoni (@dhozac)"
     - "Ahti Kitsik (@ahtik)"
-extends_documentation_fragment: files
-extends_documentation_fragment: validate
+extends_documentation_fragment:
+    - files
+    - validate
 short_description: Ensure a particular line is in a file, or replace an
                    existing line using a back-referenced regular expression.
 description:
diff --git a/files/replace.py b/files/replace.py
index dea2c32a54f..765f60f5c8f 100644
--- a/files/replace.py
+++ b/files/replace.py
@@ -26,8 +26,9 @@ DOCUMENTATION = """
 ---
 module: replace
 author: "Evan Kaufman (@EvanK)"
-extends_documentation_fragment: files
-extends_documentation_fragment: validate
+extends_documentation_fragment:
+    - files
+    - validate
 short_description: Replace all instances of a particular string in a
                    file using a back-referenced regular expression.
 description:
diff --git a/files/template.py b/files/template.py
index 120917f49c2..637cab5ca7b 100644
--- a/files/template.py
+++ b/files/template.py
@@ -24,13 +24,10 @@ options:
     description:
       - Path of a Jinja2 formatted template on the local server. This can be a relative or absolute path.
     required: true
-    default: null
-    aliases: []
   dest:
     description:
       - Location to render the template to on the remote machine.
     required: true
-    default: null
   backup:
     description:
       - Create a backup file including the timestamp information so you can get
@@ -48,12 +45,12 @@ options:
     default: "yes"
 notes:
   - "Since Ansible version 0.9, templates are loaded with C(trim_blocks=True)."
-requirements: []
 author:
-    - Ansible Core Team 
+    - Ansible Core Team
     - Michael DeHaan
-extends_documentation_fragment: files
-extends_documentation_fragment: validate
+extends_documentation_fragment:
+    - files
+    - validate
 '''
 
 EXAMPLES = '''