diff --git a/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py b/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py
index a85bdf00223..7984b67a29f 100644
--- a/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py
+++ b/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py
@@ -29,7 +29,6 @@ description:
   - If there is no AKI or ARI associated with an image, these will be C(null).
   - Only supports images from cloud-images.ubuntu.com
   - 'Example output: C({"ami": "ami-69f5a900", "changed": false, "aki": "aki-88aa75e1", "tag": "release", "ari": null, "serial": "20131024"})'
-version_added: "1.6"
 options:
   distro:
     description: Linux distribution (e.g., C(ubuntu))
diff --git a/lib/ansible/modules/cloud/amazon/route53.py b/lib/ansible/modules/cloud/amazon/route53.py
index 870361d0bdb..581f0c53a39 100644
--- a/lib/ansible/modules/cloud/amazon/route53.py
+++ b/lib/ansible/modules/cloud/amazon/route53.py
@@ -162,8 +162,7 @@ options:
     required: false
     default: 300
     version_added: "2.1"
-author: "Bruce Pennypacker (@bpennypacker)"
-author: 
+author:
   - "Bruce Pennypacker (@bpennypacker)"
   - "Mike Buzzetti <mike.buzzetti@gmail.com>"
 extends_documentation_fragment: aws
diff --git a/lib/ansible/modules/commands/command.py b/lib/ansible/modules/commands/command.py
index 2a670e74979..d45fe7050c2 100644
--- a/lib/ansible/modules/commands/command.py
+++ b/lib/ansible/modules/commands/command.py
@@ -76,7 +76,6 @@ options:
     description:
       - if command warnings are on in ansible.cfg, do not warn about this particular line if set to no/false.
     required: false
-    default: True
 notes:
     -  If you want to run a command through the shell (say you are using C(<),
        C(>), C(|), etc), you actually want the M(shell) module instead. The
diff --git a/lib/ansible/modules/database/postgresql/postgresql_db.py b/lib/ansible/modules/database/postgresql/postgresql_db.py
index 762cb65e922..cca41963293 100644
--- a/lib/ansible/modules/database/postgresql/postgresql_db.py
+++ b/lib/ansible/modules/database/postgresql/postgresql_db.py
@@ -69,11 +69,6 @@ options:
       - Encoding of the database
     required: false
     default: null
-  encoding:
-    description:
-      - Encoding of the database
-    required: false
-    default: null
   lc_collate:
     description:
       - Collation order (LC_COLLATE) to use in the database. Must match collation order of template database unless C(template0) is used as template.
diff --git a/lib/ansible/modules/files/acl.py b/lib/ansible/modules/files/acl.py
index a3997cd495d..32910b7cb89 100644
--- a/lib/ansible/modules/files/acl.py
+++ b/lib/ansible/modules/files/acl.py
@@ -22,8 +22,6 @@ version_added: "1.4"
 short_description: Sets and retrieves file ACL information.
 description:
     - Sets and retrieves file ACL information.
-notes:
-    - As of Ansible 2.0, this module only supports Linux distributions.
 options:
   name:
     required: true
@@ -94,6 +92,7 @@ author:
     - "Jérémie Astori (@astorije)"
 notes:
     - The "acl" module requires that acls are enabled on the target filesystem and that the setfacl and getfacl binaries are installed.
+    - As of Ansible 2.0, this module only supports Linux distributions.
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/system/authorized_key.py b/lib/ansible/modules/system/authorized_key.py
index 3c8fb5791e5..1df21b4c764 100644
--- a/lib/ansible/modules/system/authorized_key.py
+++ b/lib/ansible/modules/system/authorized_key.py
@@ -26,7 +26,7 @@ DOCUMENTATION = '''
 module: authorized_key
 short_description: Adds or removes an SSH authorized key
 description:
-     - Adds or removes an SSH authorized key for a user from a remote host.
+    - "Adds or removes SSH authorized keys for particular user accounts"
 version_added: "0.5"
 options:
   user:
@@ -89,8 +89,6 @@ options:
     default: "yes"
     choices: ["yes", "no"]
     version_added: "2.1" 
-description:
-    - "Adds or removes authorized keys for particular user accounts"
 author: "Ansible Core Team"
 '''
 
diff --git a/lib/ansible/modules/windows/win_get_url.py b/lib/ansible/modules/windows/win_get_url.py
index 26b0dc7b012..f7c5819cb22 100644
--- a/lib/ansible/modules/windows/win_get_url.py
+++ b/lib/ansible/modules/windows/win_get_url.py
@@ -28,7 +28,9 @@ version_added: "1.7"
 short_description: Fetches a file from a given URL
 description:
  - Fetches a file from a URL and saves to locally
-author: "Paul Durivage (@angstwad)"
+author:
+    - "Paul Durivage (@angstwad)"
+    - "Takeshi Kuramochi (tksarah)"
 options:
   url:
     description:
@@ -80,9 +82,6 @@ options:
       - Proxy authentication password
     version_added: "2.0"
     required: false
-author:
-    - "Paul Durivage (@angstwad)"
-    - "Takeshi Kuramochi (tksarah)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/windows/win_lineinfile.py b/lib/ansible/modules/windows/win_lineinfile.py
index 6c54fd2bea8..7377f26d359 100644
--- a/lib/ansible/modules/windows/win_lineinfile.py
+++ b/lib/ansible/modules/windows/win_lineinfile.py
@@ -103,11 +103,8 @@ options:
   validate:
     required: false
     description:
-      - validation to run before copying into place. 
-        Use %s in the command to indicate the current file to validate.
-        The command is passed securely so shell features like
-        expansion and pipes won't work.
-    required: false
+      - Validation to run before copying into place.  Use %s in the command to indicate the current file to validate.
+      - The command is passed securely so shell features like expansion and pipes won't work.
     default: None
   encoding:
     required: false