diff --git a/lib/ansible/plugins/inventory/auto.py b/lib/ansible/plugins/inventory/auto.py
index e30083ea8eb..82d96650ed6 100644
--- a/lib/ansible/plugins/inventory/auto.py
+++ b/lib/ansible/plugins/inventory/auto.py
@@ -7,7 +7,7 @@ __metaclass__ = type
 DOCUMENTATION = '''
     name: auto
     author:
-      - Matt Davis <@nitzmahone>
+      - Matt Davis (@nitzmahone)
     version_added: "2.5"
     short_description: Loads and executes an inventory plugin specified in a YAML config
     description:
diff --git a/lib/ansible/plugins/lookup/config.py b/lib/ansible/plugins/lookup/config.py
index cd0c8cbf2d7..245ea67c733 100644
--- a/lib/ansible/plugins/lookup/config.py
+++ b/lib/ansible/plugins/lookup/config.py
@@ -5,7 +5,7 @@ __metaclass__ = type
 
 DOCUMENTATION = """
     name: config
-    author: Ansible Core
+    author: Ansible Core Team
     version_added: "2.5"
     short_description: Lookup current Ansible configuration values
     description:
diff --git a/lib/ansible/plugins/lookup/file.py b/lib/ansible/plugins/lookup/file.py
index 03ccad9a276..04ddc4b1ea9 100644
--- a/lib/ansible/plugins/lookup/file.py
+++ b/lib/ansible/plugins/lookup/file.py
@@ -6,7 +6,7 @@ __metaclass__ = type
 
 DOCUMENTATION = """
     name: file
-    author: Daniel Hokka Zakrisson <daniel@hozac.com>
+    author: Daniel Hokka Zakrisson (!UNKNOWN) <daniel@hozac.com>
     version_added: "0.9"
     short_description: read file contents
     description:
diff --git a/lib/ansible/plugins/lookup/fileglob.py b/lib/ansible/plugins/lookup/fileglob.py
index 8b51e768fca..84ae6312ff5 100644
--- a/lib/ansible/plugins/lookup/fileglob.py
+++ b/lib/ansible/plugins/lookup/fileglob.py
@@ -6,7 +6,7 @@ __metaclass__ = type
 
 DOCUMENTATION = """
     name: fileglob
-    author: Michael DeHaan <michael.dehaan@gmail.com>
+    author: Michael DeHaan
     version_added: "1.4"
     short_description: list files matching a pattern
     description:
diff --git a/lib/ansible/plugins/lookup/first_found.py b/lib/ansible/plugins/lookup/first_found.py
index b25f2177345..ffe9fd30f65 100644
--- a/lib/ansible/plugins/lookup/first_found.py
+++ b/lib/ansible/plugins/lookup/first_found.py
@@ -6,7 +6,7 @@ __metaclass__ = type
 
 DOCUMENTATION = """
     name: first_found
-    author: Seth Vidal <skvidal@fedoraproject.org>
+    author: Seth Vidal (!UNKNOWN) <skvidal@fedoraproject.org>
     version_added: historical
     short_description: return first file found from list
     description:
diff --git a/lib/ansible/plugins/lookup/indexed_items.py b/lib/ansible/plugins/lookup/indexed_items.py
index 8ec6c41380e..7f77b6f84bd 100644
--- a/lib/ansible/plugins/lookup/indexed_items.py
+++ b/lib/ansible/plugins/lookup/indexed_items.py
@@ -6,7 +6,7 @@ __metaclass__ = type
 
 DOCUMENTATION = """
     name: indexed_items
-    author: Michael DeHaan <michael.dehaan@gmail.com>
+    author: Michael DeHaan
     version_added: "1.3"
     short_description: rewrites lists to return 'indexed items'
     description:
diff --git a/lib/ansible/plugins/lookup/ini.py b/lib/ansible/plugins/lookup/ini.py
index 6686d5adf17..a2e16070326 100644
--- a/lib/ansible/plugins/lookup/ini.py
+++ b/lib/ansible/plugins/lookup/ini.py
@@ -6,7 +6,7 @@ __metaclass__ = type
 
 DOCUMENTATION = """
     name: ini
-    author: Yannig Perre <yannig.perre(at)gmail.com>
+    author: Yannig Perre (!UNKNOWN) <yannig.perre(at)gmail.com>
     version_added: "2.0"
     short_description: read data from a ini file
     description:
diff --git a/lib/ansible/plugins/lookup/inventory_hostnames.py b/lib/ansible/plugins/lookup/inventory_hostnames.py
index b5e2e31c7ff..a3cff92ea96 100644
--- a/lib/ansible/plugins/lookup/inventory_hostnames.py
+++ b/lib/ansible/plugins/lookup/inventory_hostnames.py
@@ -9,8 +9,8 @@ __metaclass__ = type
 DOCUMENTATION = """
     name: inventory_hostnames
     author:
-      - Michael DeHaan <michael.dehaan@gmail.com>
-      - Steven Dossett <sdossett@panath.com>
+      - Michael DeHaan
+      - Steven Dossett (!UNKNOWN) <sdossett@panath.com>
     version_added: "1.3"
     short_description: list of inventory hosts matching a host pattern
     description:
diff --git a/lib/ansible/plugins/lookup/items.py b/lib/ansible/plugins/lookup/items.py
index db6d48a51d1..9cb270300f6 100644
--- a/lib/ansible/plugins/lookup/items.py
+++ b/lib/ansible/plugins/lookup/items.py
@@ -6,7 +6,7 @@ __metaclass__ = type
 
 DOCUMENTATION = """
     name: items
-    author: Michael DeHaan <michael.dehaan@gmail.com>
+    author: Michael DeHaan
     version_added: historical
     short_description: list of items
     description:
diff --git a/lib/ansible/plugins/lookup/lines.py b/lib/ansible/plugins/lookup/lines.py
index 56638c00b0c..fa578e62c1b 100644
--- a/lib/ansible/plugins/lookup/lines.py
+++ b/lib/ansible/plugins/lookup/lines.py
@@ -7,7 +7,7 @@ __metaclass__ = type
 
 DOCUMENTATION = """
     name: lines
-    author: Daniel Hokka Zakrisson <daniel@hozac.com>
+    author: Daniel Hokka Zakrisson (!UNKNOWN) <daniel@hozac.com>
     version_added: "0.9"
     short_description: read lines from command
     description:
diff --git a/lib/ansible/plugins/lookup/list.py b/lib/ansible/plugins/lookup/list.py
index f4576e0da1b..8d6d900a422 100644
--- a/lib/ansible/plugins/lookup/list.py
+++ b/lib/ansible/plugins/lookup/list.py
@@ -8,7 +8,7 @@ __metaclass__ = type
 
 DOCUMENTATION = """
     name: list
-    author: Ansible core team
+    author: Ansible Core Team
     version_added: "2.0"
     short_description: simply returns what it is given.
     description:
diff --git a/lib/ansible/plugins/lookup/password.py b/lib/ansible/plugins/lookup/password.py
index 1102de19562..f9ed15ec917 100644
--- a/lib/ansible/plugins/lookup/password.py
+++ b/lib/ansible/plugins/lookup/password.py
@@ -10,9 +10,9 @@ DOCUMENTATION = """
     name: password
     version_added: "1.1"
     author:
-      - Daniel Hokka Zakrisson <daniel@hozac.com>
-      - Javier Candeira <javier@candeira.com>
-      - Maykel Moya <mmoya@speedyrails.com>
+      - Daniel Hokka Zakrisson (!UNKNOWN) <daniel@hozac.com>
+      - Javier Candeira (!UNKNOWN) <javier@candeira.com>
+      - Maykel Moya (!UNKNOWN) <mmoya@speedyrails.com>
     short_description: retrieve or generate a random password, stored in a file
     description:
       - Generates a random plaintext password and stores it in a file at a given filepath.
diff --git a/lib/ansible/plugins/lookup/pipe.py b/lib/ansible/plugins/lookup/pipe.py
index 1713b425896..d6bce2cd5af 100644
--- a/lib/ansible/plugins/lookup/pipe.py
+++ b/lib/ansible/plugins/lookup/pipe.py
@@ -6,7 +6,7 @@ __metaclass__ = type
 
 DOCUMENTATION = r"""
     name: pipe
-    author: Daniel Hokka Zakrisson <daniel@hozac.com>
+    author: Daniel Hokka Zakrisson (!UNKNOWN) <daniel@hozac.com>
     version_added: "0.9"
     short_description: read output from a command
     description:
diff --git a/lib/ansible/plugins/lookup/random_choice.py b/lib/ansible/plugins/lookup/random_choice.py
index fc482d3a8e7..24aea9ac256 100644
--- a/lib/ansible/plugins/lookup/random_choice.py
+++ b/lib/ansible/plugins/lookup/random_choice.py
@@ -6,7 +6,7 @@ __metaclass__ = type
 
 DOCUMENTATION = """
     name: random_choice
-    author: Michael DeHaan <michael.dehaan@gmail.com>
+    author: Michael DeHaan
     version_added: "1.1"
     short_description: return random element from list
     description:
diff --git a/lib/ansible/plugins/lookup/sequence.py b/lib/ansible/plugins/lookup/sequence.py
index e5e085525be..b531168afc6 100644
--- a/lib/ansible/plugins/lookup/sequence.py
+++ b/lib/ansible/plugins/lookup/sequence.py
@@ -6,7 +6,7 @@ __metaclass__ = type
 
 DOCUMENTATION = """
     name: sequence
-    author: Jayson Vantuyl <jayson@aggressive.ly>
+    author: Jayson Vantuyl (!UNKNOWN) <jayson@aggressive.ly>
     version_added: "1.0"
     short_description: generate a list based on a number sequence
     description:
diff --git a/lib/ansible/plugins/lookup/subelements.py b/lib/ansible/plugins/lookup/subelements.py
index f1670a1ff39..27350b08e94 100644
--- a/lib/ansible/plugins/lookup/subelements.py
+++ b/lib/ansible/plugins/lookup/subelements.py
@@ -6,7 +6,7 @@ __metaclass__ = type
 
 DOCUMENTATION = """
     name: subelements
-    author: Serge van Ginderachter <serge@vanginderachter.be>
+    author: Serge van Ginderachter (!UNKNOWN) <serge@vanginderachter.be>
     version_added: "1.4"
     short_description: traverse nested key from a list of dictionaries
     description:
diff --git a/lib/ansible/plugins/lookup/template.py b/lib/ansible/plugins/lookup/template.py
index 160aea99f3f..8239f8398a2 100644
--- a/lib/ansible/plugins/lookup/template.py
+++ b/lib/ansible/plugins/lookup/template.py
@@ -7,7 +7,7 @@ __metaclass__ = type
 
 DOCUMENTATION = """
     name: template
-    author: Michael DeHaan <michael.dehaan@gmail.com>
+    author: Michael DeHaan
     version_added: "0.9"
     short_description: retrieve contents of file after templating with Jinja2
     description:
diff --git a/lib/ansible/plugins/lookup/together.py b/lib/ansible/plugins/lookup/together.py
index b2deb911b1f..8ba62f148cd 100644
--- a/lib/ansible/plugins/lookup/together.py
+++ b/lib/ansible/plugins/lookup/together.py
@@ -6,7 +6,7 @@ __metaclass__ = type
 
 DOCUMENTATION = """
     name: together
-    author:  Bradley Young <young.bradley@gmail.com>
+    author:  Bradley Young (!UNKNOWN) <young.bradley@gmail.com>
     version_added: '1.3'
     short_description: merges lists into synchronized list
     description:
diff --git a/lib/ansible/plugins/lookup/unvault.py b/lib/ansible/plugins/lookup/unvault.py
index 2c43c784edc..152dc95ee3f 100644
--- a/lib/ansible/plugins/lookup/unvault.py
+++ b/lib/ansible/plugins/lookup/unvault.py
@@ -5,7 +5,7 @@ __metaclass__ = type
 
 DOCUMENTATION = """
     name: unvault
-    author: ansible core team
+    author: Ansible Core Team
     version_added: "2.10"
     short_description: read vaulted file(s) contents
     description:
diff --git a/lib/ansible/plugins/lookup/varnames.py b/lib/ansible/plugins/lookup/varnames.py
index abe5ce861da..6a3def37b57 100644
--- a/lib/ansible/plugins/lookup/varnames.py
+++ b/lib/ansible/plugins/lookup/varnames.py
@@ -5,7 +5,7 @@ __metaclass__ = type
 
 DOCUMENTATION = """
     name: varnames
-    author: Ansible Core
+    author: Ansible Core Team
     version_added: "2.8"
     short_description: Lookup matching variable names
     description:
diff --git a/lib/ansible/plugins/lookup/vars.py b/lib/ansible/plugins/lookup/vars.py
index 478fcb7bafa..9e14735219e 100644
--- a/lib/ansible/plugins/lookup/vars.py
+++ b/lib/ansible/plugins/lookup/vars.py
@@ -5,7 +5,7 @@ __metaclass__ = type
 
 DOCUMENTATION = """
     name: vars
-    author: Ansible Core
+    author: Ansible Core Team
     version_added: "2.5"
     short_description: Lookup templated value of variables
     description:
diff --git a/lib/ansible/plugins/strategy/debug.py b/lib/ansible/plugins/strategy/debug.py
index bf15ff6911a..f808bcfa0d2 100644
--- a/lib/ansible/plugins/strategy/debug.py
+++ b/lib/ansible/plugins/strategy/debug.py
@@ -21,7 +21,7 @@ DOCUMENTATION = '''
     description:
         - Task execution is 'linear' but controlled by an interactive debug session.
     version_added: "2.1"
-    author: Kishin Yagami
+    author: Kishin Yagami (!UNKNOWN)
 '''
 
 import cmd