Merge pull request #616 from gregdek/devel

Changes to author formatting, remove emails
10 years ago · 8186ccd659
parent 45e869dc6d 004dedba8a
commit 8186ccd659
111 changed files with 123 additions and 123 deletions
--- a/REVIEWERS.md
+++ b/REVIEWERS.md
@ -120,7 +120,7 @@ Active
 "Raul Melo (@melodous)" 
 "Ravi Bhure (@ravibhure)"
 "René Moser (@resmo)"
-"Richard Hoop (@rhoop) <wrhoop@gmail.com>"
+"Richard Hoop (@rhoop)"
 "Richard Isaacson (@risaacson)" 
 "Rick Mendes (@rickmendes)"
 "Romeo Theriault (@romeotheriault)"
@ -129,7 +129,7 @@ Active
 "Serge van Ginderachter (@srvg)"
 "Sergei Antipov (@UnderGreen)"
 "Seth Edwards (@sedward)" 
-"Silviu Dicu (@silviud) <silviudicu@gmail.com>"
+"Silviu Dicu (@silviud)"
 "Simon JAILLET (@jails)"
 "Stephen Fromm (@sfromm)"
 "Steve (@groks)"
--- a/cloud/amazon/ec2_eni_facts.py
+++ b/cloud/amazon/ec2_eni_facts.py
@ -20,7 +20,7 @@ short_description: Gather facts about ec2 ENI interfaces in AWS
 description:
    - Gather facts about ec2 ENI interfaces in AWS
 version_added: "2.0"
-author: Rob White, wimnat [at] gmail.com, @wimnat
+author: "Rob White (@wimnat)"
 options:
  eni_id:
    description:
--- a/cloud/cloudstack/cs_account.py
+++ b/cloud/cloudstack/cs_account.py
@ -25,7 +25,7 @@ short_description: Manages account on Apache CloudStack based clouds.
 description:
    - Create, disable, lock, enable and remove accounts.
 version_added: '2.0'
-author: '"René Moser (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 options:
  name:
    description:
--- a/cloud/cloudstack/cs_affinitygroup.py
+++ b/cloud/cloudstack/cs_affinitygroup.py
@ -25,7 +25,7 @@ short_description: Manages affinity groups on Apache CloudStack based clouds.
 description:
    - Create and remove affinity groups.
 version_added: '2.0'
-author: '"René Moser (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 options:
  name:
    description:
--- a/cloud/cloudstack/cs_firewall.py
+++ b/cloud/cloudstack/cs_firewall.py
@ -25,7 +25,7 @@ short_description: Manages firewall rules on Apache CloudStack based clouds.
 description:
    - Creates and removes firewall rules.
 version_added: '2.0'
-author: '"René Moser (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 options:
  ip_address:
    description:
--- a/cloud/cloudstack/cs_instance.py
+++ b/cloud/cloudstack/cs_instance.py
@ -25,7 +25,7 @@ short_description: Manages instances and virtual machines on Apache CloudStack b
 description:
    - Deploy, start, restart, stop and destroy instances.
 version_added: '2.0'
-author: '"René Moser (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 options:
  name:
    description:
--- a/cloud/cloudstack/cs_instancegroup.py
+++ b/cloud/cloudstack/cs_instancegroup.py
@ -25,7 +25,7 @@ short_description: Manages instance groups on Apache CloudStack based clouds.
 description:
    - Create and remove instance groups.
 version_added: '2.0'
-author: '"René Moser (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 options:
  name:
    description:
--- a/cloud/cloudstack/cs_iso.py
+++ b/cloud/cloudstack/cs_iso.py
@ -25,7 +25,7 @@ short_description: Manages ISOs images on Apache CloudStack based clouds.
 description:
    - Register and remove ISO images.
 version_added: '2.0'
-author: '"René Moser (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 options:
  name:
    description:
--- a/cloud/cloudstack/cs_network.py
+++ b/cloud/cloudstack/cs_network.py
@ -25,7 +25,7 @@ short_description: Manages networks on Apache CloudStack based clouds.
 description:
    - Create, update, restart and delete networks.
 version_added: '2.0'
-author: '"René Moser (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 options:
  name:
    description:
--- a/cloud/cloudstack/cs_portforward.py
+++ b/cloud/cloudstack/cs_portforward.py
@ -25,7 +25,7 @@ short_description: Manages port forwarding rules on Apache CloudStack based clou
 description:
    - Create, update and remove port forwarding rules.
 version_added: '2.0'
-author: '"René Moser (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 options:
  ip_address:
    description:
--- a/cloud/cloudstack/cs_project.py
+++ b/cloud/cloudstack/cs_project.py
@ -25,7 +25,7 @@ short_description: Manages projects on Apache CloudStack based clouds.
 description:
    - Create, update, suspend, activate and remove projects.
 version_added: '2.0'
-author: '"René Moser (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 options:
  name:
    description:
--- a/cloud/cloudstack/cs_securitygroup.py
+++ b/cloud/cloudstack/cs_securitygroup.py
@ -25,7 +25,7 @@ short_description: Manages security groups on Apache CloudStack based clouds.
 description:
    - Create and remove security groups.
 version_added: '2.0'
-author: '"René Moser (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 options:
  name:
    description:
--- a/cloud/cloudstack/cs_securitygroup_rule.py
+++ b/cloud/cloudstack/cs_securitygroup_rule.py
@ -25,7 +25,7 @@ short_description: Manages security group rules on Apache CloudStack based cloud
 description:
    - Add and remove security group rules.
 version_added: '2.0'
-author: '"René Moser (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 options:
  security_group:
    description:
--- a/cloud/cloudstack/cs_sshkeypair.py
+++ b/cloud/cloudstack/cs_sshkeypair.py
@ -27,7 +27,7 @@ description:
    - If no key was found and no public key was provided and a new SSH
      private/public key pair will be created and the private key will be returned.
 version_added: '2.0'
-author: '"René Moser (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 options:
  name:
    description:
--- a/cloud/cloudstack/cs_template.py
+++ b/cloud/cloudstack/cs_template.py
@ -25,7 +25,7 @@ short_description: Manages templates on Apache CloudStack based clouds.
 description:
  - Register a template from URL, create a template from a ROOT volume of a stopped VM or its snapshot and delete templates.
 version_added: '2.0'
-author: '"René Moser (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 options:
  name:
    description:
--- a/cloud/cloudstack/cs_vmsnapshot.py
+++ b/cloud/cloudstack/cs_vmsnapshot.py
@ -25,7 +25,7 @@ short_description: Manages VM snapshots on Apache CloudStack based clouds.
 description:
    - Create, remove and revert VM from snapshots.
 version_added: '2.0'
-author: '"René Moser (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 options:
  name:
    description:
--- a/cloud/google/gce_img.py
+++ b/cloud/google/gce_img.py
@ -81,7 +81,7 @@ options:
 requirements:
    - "python >= 2.6"
    - "apache-libcloud"
-author: '"Peter Tan (@tanpeter)" <ptan@google.com>'
+author: "Peter Tan (@tanpeter)"
 '''

 EXAMPLES = '''
--- a/cloud/lxc/lxc_container.py
+++ b/cloud/lxc/lxc_container.py
@ -26,7 +26,7 @@ short_description: Manage LXC Containers
 version_added: 1.8.0
 description:
  - Management of LXC containers
-author: '"Kevin Carter (@cloudnull)" <kevin.carter@rackspace.com>'
+author: "Kevin Carter (@cloudnull)"
 options:
    name:
        description:
--- a/cloud/misc/ovirt.py
+++ b/cloud/misc/ovirt.py
@ -20,7 +20,7 @@
 DOCUMENTATION = '''
 ---
 module: ovirt
-author: '"Vincent Van der Kussen (@vincentvdk)" <vincent at vanderkussen.org>'
+author: "Vincent Van der Kussen (@vincentvdk)"
 short_description: oVirt/RHEV platform management
 description:
    - allows you to create new instances, either from scratch or an image, in addition to deleting or stopping instances on the oVirt/RHEV platform
--- a/cloud/misc/virt.py
+++ b/cloud/misc/virt.py
@ -60,8 +60,8 @@ requirements:
    - "libvirt-python"
 author:
    - "Ansible Core Team"
-    - '"Michael DeHaan (@mpdehaan)" <michael.dehaan@gmail.com>'
-    - '"Seth Vidal (@skvidal)" <skvidal@fedoraproject.org>'
+    - "Michael DeHaan"
+    - "Seth Vidal"
 '''

 EXAMPLES = '''
--- a/cloud/vmware/vmware_datacenter.py
+++ b/cloud/vmware/vmware_datacenter.py
@ -25,7 +25,7 @@ short_description: Manage VMware vSphere Datacenters
 description:
    - Manage VMware vSphere Datacenters
 version_added: 2.0
-author: '"Joseph Callen (@jcpowermac)" <jcallen () csc.com>'
+author: "Joseph Callen (@jcpowermac)"
 notes:
    - Tested on vSphere 5.5
 requirements:
--- a/clustering/consul.py
+++ b/clustering/consul.py
@ -42,7 +42,7 @@ requirements:
  - python-consul
  - requests
 version_added: "2.0"
-author: '"Steve Gargan (@sgargan)" <steve.gargan@gmail.com>'
+author: "Steve Gargan (@sgargan)" 
 options:
    state:
        description:
--- a/clustering/consul_acl.py
+++ b/clustering/consul_acl.py
@ -30,7 +30,7 @@ requirements:
  - pyhcl
  - requests
 version_added: "2.0"
-author: '"Steve Gargan (@sgargan)" <steve.gargan@gmail.com>'
+author: "Steve Gargan (@sgargan)"
 options:
    mgmt_token:
        description:
--- a/clustering/consul_kv.py
+++ b/clustering/consul_kv.py
@ -32,7 +32,7 @@ requirements:
  - python-consul
  - requests
 version_added: "2.0"
-author: '"Steve Gargan (@sgargan)" <steve.gargan@gmail.com>'
+author: "Steve Gargan (@sgargan)"
 options:
    state:
        description:
--- a/clustering/consul_session.py
+++ b/clustering/consul_session.py
@ -30,7 +30,7 @@ requirements:
  - python-consul
  - requests
 version_added: "2.0"
-author: '"Steve Gargan (@sgargan)" <steve.gargan@gmail.com>'
+author: "Steve Gargan (@sgargan)"
 options:
    state:
        description:
--- a/commands/expect.py
+++ b/commands/expect.py
@ -73,7 +73,7 @@ notes:
  - If you want to run a command through the shell (say you are using C(<),
    C(>), C(|), etc), you must specify a shell in the command such as
    C(/bin/bash -c "/path/to/something | grep else")
-author: '"Matt Martz (@sivel)" <matt@sivel.net>'
+author: "Matt Martz (@sivel)"
 '''

 EXAMPLES = '''
--- a/database/misc/mongodb_user.py
+++ b/database/misc/mongodb_user.py
@ -99,7 +99,7 @@ notes:
    - Requires the pymongo Python package on the remote host, version 2.4.2+. This
      can be installed using pip or the OS package manager. @see http://api.mongodb.org/python/current/installation.html
 requirements: [ "pymongo" ]
-author: '"Elliott Foster (@elliotttf)" <elliott@fourkitchens.com>'
+author: "Elliott Foster (@elliotttf)"
 '''

 EXAMPLES = '''
--- a/database/misc/riak.py
+++ b/database/misc/riak.py
@ -27,8 +27,8 @@ description:
       the status of the cluster.
 version_added: "1.2"
 author:
-    - '"James Martin (@jsmartin)" <jmartin@ansible.com>'
-    - '"Drew Kerrigan (@drewkerrigan)" <dkerrigan@basho.com>'
+    - "James Martin (@jsmartin)"
+    - "Drew Kerrigan (@drewkerrigan)"
 options:
  command:
    description:
--- a/database/mysql/mysql_replication.py
+++ b/database/mysql/mysql_replication.py
@ -30,7 +30,7 @@ short_description: Manage MySQL replication
 description:
    - Manages MySQL server replication, slave, master status get and change master host.
 version_added: "1.3"
-author: '"Balazs Pocze (@banyek)" <banyek@gawker.com>'
+author: "Balazs Pocze (@banyek)" 
 options:
    mode:
        description:
--- a/files/patch.py
+++ b/files/patch.py
@ -23,8 +23,8 @@ DOCUMENTATION = '''
 ---
 module: patch
 author:
-    - '"Jakub Jirutka (@jirutka)" <jakub@jirutka.cz>'
-    - '"Luis Alberto Perez Lazaro (@luisperlaz)" <luisperlazaro@gmail.com>'
+    - "Jakub Jirutka (@jirutka)"
+    - "Luis Alberto Perez Lazaro (@luisperlaz)"
 version_added: 1.9
 description:
    - Apply patch files using the GNU patch tool.
--- a/messaging/rabbitmq_binding.py
+++ b/messaging/rabbitmq_binding.py
@ -22,7 +22,7 @@
 DOCUMENTATION = '''
 ---
 module: rabbitmq_binding
-author: '"Manuel Sousa (@manuel-sousa)" <manuel.sousa@gmail.com>'
+author: "Manuel Sousa (@manuel-sousa)"
 version_added: "2.0"

 short_description: This module manages rabbitMQ bindings
--- a/messaging/rabbitmq_exchange.py
+++ b/messaging/rabbitmq_exchange.py
@ -22,7 +22,7 @@
 DOCUMENTATION = '''
 ---
 module: rabbitmq_exchange
-author: '"Manuel Sousa (@manuel-sousa)" <manuel.sousa@gmail.com>'
+author: "Manuel Sousa (@manuel-sousa)"
 version_added: "2.0"

 short_description: This module manages rabbitMQ exchanges
--- a/messaging/rabbitmq_policy.py
+++ b/messaging/rabbitmq_policy.py
@ -26,7 +26,7 @@ short_description: Manage the state of policies in RabbitMQ.
 description:
  - Manage the state of a virtual host in RabbitMQ.
 version_added: "1.5"
-author: '"John Dewey (@retr0h)" <john@dewey.ws>'
+author: "John Dewey (@retr0h)"
 options:
  name:
    description:
--- a/messaging/rabbitmq_queue.py
+++ b/messaging/rabbitmq_queue.py
@ -22,7 +22,7 @@
 DOCUMENTATION = '''
 ---
 module: rabbitmq_queue
-author: '"Manuel Sousa (@manuel-sousa)" <manuel.sousa@gmail.com>'
+author: "Manuel Sousa (@manuel-sousa)" 
 version_added: "2.0"

 short_description: This module manages rabbitMQ queues
--- a/monitoring/airbrake_deployment.py
+++ b/monitoring/airbrake_deployment.py
@ -22,7 +22,7 @@ DOCUMENTATION = '''
 ---
 module: airbrake_deployment
 version_added: "1.2"
-author: '"Bruce Pennypacker (@bpennypacker)" <bruce@pennypacker.org>'
+author: "Bruce Pennypacker (@bpennypacker)"
 short_description: Notify airbrake about app deployments
 description:
   - Notify airbrake about app deployments (see http://help.airbrake.io/kb/api-2/deploy-tracking)
--- a/monitoring/boundary_meter.py
+++ b/monitoring/boundary_meter.py
@ -34,7 +34,7 @@ short_description: Manage boundary meters
 description:
    - This module manages boundary meters
 version_added: "1.3"
-author: '"curtis (@ccollicutt)" <curtis@serverascode.com>'
+author: "curtis (@ccollicutt)"
 requirements:
    - Boundary API access
    - bprobe is required to send data, but not to register a meter
--- a/monitoring/datadog_event.py
+++ b/monitoring/datadog_event.py
@ -14,7 +14,7 @@ description:
 - "Allows to post events to DataDog (www.datadoghq.com) service."
 - "Uses http://docs.datadoghq.com/api/#events API."
 version_added: "1.3"
-author: '"Artūras `arturaz` Šlajus (@arturaz)" <x11@arturaz.net>'
+author: "Artūras `arturaz` Šlajus (@arturaz)"
 notes: []
 requirements: [urllib2]
 options:
--- a/monitoring/datadog_monitor.py
+++ b/monitoring/datadog_monitor.py
@ -34,7 +34,7 @@ description:
 - "Manages monitors within Datadog"
 - "Options like described on http://docs.datadoghq.com/api/"
 version_added: "2.0"
-author: '"Sebastian Kornehl (@skornehl)" <sebastian.kornehl@asideas.de>'
+author: "Sebastian Kornehl (@skornehl)" 
 notes: []
 requirements: [datadog]
 options:
--- a/monitoring/logentries.py
+++ b/monitoring/logentries.py
@ -19,7 +19,7 @@
 DOCUMENTATION = '''
 ---
 module: logentries
-author: '"Ivan Vanderbyl (@ivanvanderbyl)" <ivan@app.io>'
+author: "Ivan Vanderbyl (@ivanvanderbyl)"
 short_description: Module for tracking logs via logentries.com
 description:
    - Sends logs to LogEntries in realtime
--- a/monitoring/monit.py
+++ b/monitoring/monit.py
@ -39,7 +39,7 @@ options:
    default: null
    choices: [ "present", "started", "stopped", "restarted", "monitored", "unmonitored", "reloaded" ]
 requirements: [ ]
-author: '"Darryl Stoflet (@dstoflet)" <stoflet@gmail.com>'
+author: "Darryl Stoflet (@dstoflet)" 
 '''

 EXAMPLES = '''
--- a/monitoring/nagios.py
+++ b/monitoring/nagios.py
@ -86,7 +86,7 @@ options:
    required: true
    default: null

-author: '"Tim Bielawa (@tbielawa)" <tbielawa@redhat.com>'
+author: "Tim Bielawa (@tbielawa)" 
 requirements: [ "Nagios" ]
 '''

--- a/monitoring/newrelic_deployment.py
+++ b/monitoring/newrelic_deployment.py
@ -22,7 +22,7 @@ DOCUMENTATION = '''
 ---
 module: newrelic_deployment
 version_added: "1.2"
-author: '"Matt Coddington (@mcodd)" <coddington@gmail.com>'
+author: "Matt Coddington (@mcodd)"
 short_description: Notify newrelic about app deployments
 description:
   - Notify newrelic about app deployments (see https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/deployment-notifications#api)
--- a/monitoring/rollbar_deployment.py
+++ b/monitoring/rollbar_deployment.py
@ -22,7 +22,7 @@ DOCUMENTATION = '''
 ---
 module: rollbar_deployment
 version_added: 1.6
-author: '"Max Riveiro (@kavu)" <kavu13@gmail.com>'
+author: "Max Riveiro (@kavu)"
 short_description: Notify Rollbar about app deployments
 description:
  - Notify Rollbar about app deployments
--- a/monitoring/zabbix_maintenance.py
+++ b/monitoring/zabbix_maintenance.py
@ -26,7 +26,7 @@ short_description: Create Zabbix maintenance windows
 description:
    - This module will let you create Zabbix maintenance windows.
 version_added: "1.8"
-author: '"Alexander Bulimov (@abulimov)" <lazywolf0@gmail.com>'
+author: "Alexander Bulimov (@abulimov)"
 requirements:
    - "python >= 2.6"
    - zabbix-api
--- a/network/a10/a10_server.py
+++ b/network/a10/a10_server.py
@ -28,7 +28,7 @@ version_added: 1.8
 short_description: Manage A10 Networks AX/SoftAX/Thunder/vThunder devices
 description:
    - Manage slb server objects on A10 Networks devices via aXAPI
-author: '"Mischa Peters (@mischapeters)" <mpeters@a10networks.com>'
+author: "Mischa Peters (@mischapeters)"
 notes:
    - Requires A10 Networks aXAPI 2.1
 options:
--- a/network/a10/a10_service_group.py
+++ b/network/a10/a10_service_group.py
@ -28,7 +28,7 @@ version_added: 1.8
 short_description: Manage A10 Networks AX/SoftAX/Thunder/vThunder devices
 description:
    - Manage slb service-group objects on A10 Networks devices via aXAPI
-author: '"Mischa Peters (@mischapeters)" <mpeters@a10networks.com>'
+author: "Mischa Peters (@mischapeters)"
 notes:
    - Requires A10 Networks aXAPI 2.1
    - When a server doesn't exist and is added to the service-group the server will be created
--- a/network/a10/a10_virtual_server.py
+++ b/network/a10/a10_virtual_server.py
@ -28,7 +28,7 @@ version_added: 1.8
 short_description: Manage A10 Networks AX/SoftAX/Thunder/vThunder devices
 description:
    - Manage slb virtual server objects on A10 Networks devices via aXAPI
-author: '"Mischa Peters (@mischapeters)" <mpeters@a10networks.com>'
+author: "Mischa Peters (@mischapeters)"
 notes:
    - Requires A10 Networks aXAPI 2.1
 requirements:
--- a/network/citrix/netscaler.py
+++ b/network/citrix/netscaler.py
@ -82,7 +82,7 @@ options:
    choices: ['yes', 'no']

 requirements: [ "urllib", "urllib2" ]
-author: '"Nandor Sivok (@dominis)" <nandor@gawker.com>'
+author: "Nandor Sivok (@dominis)"
 '''

 EXAMPLES = '''
--- a/network/f5/bigip_facts.py
+++ b/network/f5/bigip_facts.py
@ -25,7 +25,7 @@ short_description: "Collect facts from F5 BIG-IP devices"
 description:
    - "Collect facts from F5 BIG-IP devices via iControl SOAP API"
 version_added: "1.6"
-author: '"Matt Hite (@mhite)" <mhite@hotmail.com>'
+author: "Matt Hite (@mhite)" 
 notes:
    - "Requires BIG-IP software version >= 11.4"
    - "F5 developed module 'bigsuds' required (see http://devcentral.f5.com)"
--- a/network/f5/bigip_monitor_http.py
+++ b/network/f5/bigip_monitor_http.py
@ -27,7 +27,7 @@ short_description: "Manages F5 BIG-IP LTM http monitors"
 description:
    - "Manages F5 BIG-IP LTM monitors via iControl SOAP API"
 version_added: "1.4"
-author: '"Serge van Ginderachter (@srvg)" <serge@vanginderachter.be>'
+author: "Serge van Ginderachter (@srvg)"
 notes:
    - "Requires BIG-IP software version >= 11"
    - "F5 developed module 'bigsuds' required (see http://devcentral.f5.com)"
--- a/network/f5/bigip_monitor_tcp.py
+++ b/network/f5/bigip_monitor_tcp.py
@ -25,7 +25,7 @@ short_description: "Manages F5 BIG-IP LTM tcp monitors"
 description:
    - "Manages F5 BIG-IP LTM tcp monitors via iControl SOAP API"
 version_added: "1.4"
-author: '"Serge van Ginderachter (@srvg)" <serge@vanginderachter.be>'
+author: "Serge van Ginderachter (@srvg)"
 notes:
    - "Requires BIG-IP software version >= 11"
    - "F5 developed module 'bigsuds' required (see http://devcentral.f5.com)"
--- a/network/f5/bigip_node.py
+++ b/network/f5/bigip_node.py
@ -25,7 +25,7 @@ short_description: "Manages F5 BIG-IP LTM nodes"
 description:
    - "Manages F5 BIG-IP LTM nodes via iControl SOAP API"
 version_added: "1.4"
-author: '"Matt Hite (@mhite)" <mhite@hotmail.com>'
+author: "Matt Hite (@mhite)"
 notes:
    - "Requires BIG-IP software version >= 11"
    - "F5 developed module 'bigsuds' required (see http://devcentral.f5.com)"
--- a/network/f5/bigip_pool.py
+++ b/network/f5/bigip_pool.py
@ -25,7 +25,7 @@ short_description: "Manages F5 BIG-IP LTM pools"
 description:
    - "Manages F5 BIG-IP LTM pools via iControl SOAP API"
 version_added: "1.2"
-author: '"Matt Hite (@mhite)" <mhite@hotmail.com>'
+author: "Matt Hite (@mhite)"
 notes:
    - "Requires BIG-IP software version >= 11"
    - "F5 developed module 'bigsuds' required (see http://devcentral.f5.com)"
--- a/network/f5/bigip_pool_member.py
+++ b/network/f5/bigip_pool_member.py
@ -25,7 +25,7 @@ short_description: "Manages F5 BIG-IP LTM pool members"
 description:
    - "Manages F5 BIG-IP LTM pool members via iControl SOAP API"
 version_added: "1.4"
-author: '"Matt Hite (@mhite)" <mhite@hotmail.com>'
+author: "Matt Hite (@mhite)"
 notes:
    - "Requires BIG-IP software version >= 11"
    - "F5 developed module 'bigsuds' required (see http://devcentral.f5.com)"
--- a/network/haproxy.py
+++ b/network/haproxy.py
@ -91,7 +91,7 @@ examples:
 # enable server in 'www' backend pool with change server(s) weight
 - haproxy: state=enabled host={{ inventory_hostname }} socket=/var/run/haproxy.sock weight=10 backend=www

-author: "Ravi Bhure (@ravibhure)" <ravibhure@gmail.com>
+author: "Ravi Bhure (@ravibhure)"
 '''

 import socket
--- a/network/openvswitch_bridge.py
+++ b/network/openvswitch_bridge.py
@ -22,7 +22,7 @@ DOCUMENTATION = '''
 ---
 module: openvswitch_bridge
 version_added: 1.4
-author: '"David Stygstra (@stygstra)" <david.stygstra@gmail.com>'
+author: "David Stygstra (@stygstra)"
 short_description: Manage Open vSwitch bridges
 requirements: [ ovs-vsctl ]
 description:
--- a/network/openvswitch_port.py
+++ b/network/openvswitch_port.py
@ -22,7 +22,7 @@ DOCUMENTATION = '''
 ---
 module: openvswitch_port
 version_added: 1.4
-author: '"David Stygstra (@stygstra)" <david.stygstra@gmail.com>'
+author: "David Stygstra (@stygstra)"
 short_description: Manage Open vSwitch ports
 requirements: [ ovs-vsctl ]
 description:
--- a/notification/campfire.py
+++ b/notification/campfire.py
@ -43,7 +43,7 @@ options:

 # informational: requirements for nodes
 requirements: [ urllib2, cgi ]
-author: '"Adam Garside (@fabulops)" <adam.garside@gmail.com>'
+author: "Adam Garside (@fabulops)"
 '''

 EXAMPLES = '''
--- a/notification/flowdock.py
+++ b/notification/flowdock.py
@ -22,7 +22,7 @@ DOCUMENTATION = '''
 ---
 module: flowdock
 version_added: "1.2"
-author: '"Matt Coddington (@mcodd)" <coddington@gmail.com>'
+author: "Matt Coddington (@mcodd)" 
 short_description: Send a message to a flowdock
 description:
   - Send a message to a flowdock team inbox or chat using the push API (see https://www.flowdock.com/api/team-inbox and https://www.flowdock.com/api/chat)
--- a/notification/grove.py
+++ b/notification/grove.py
@ -39,7 +39,7 @@ options:
    default: 'yes'
    choices: ['yes', 'no']
    version_added: 1.5.1
-author: '"Jonas Pfenniger (@zimbatm)" <zimbatm@zimbatm.com>'
+author: "Jonas Pfenniger (@zimbatm)"
 '''

 EXAMPLES = '''
--- a/notification/mail.py
+++ b/notification/mail.py
@ -20,7 +20,7 @@

 DOCUMENTATION = """
 ---
-author: '"Dag Wieers (@dagwieers)" <dag@wieers.com>'
+author: "Dag Wieers (@dagwieers)" 
 module: mail
 short_description: Send an email
 description:
--- a/notification/nexmo.py
+++ b/notification/nexmo.py
@ -24,7 +24,7 @@ short_description: Send a SMS via nexmo
 description:
    - Send a SMS message via nexmo
 version_added: 1.6
-author: '"Matt Martz (@sivel)" <matt@sivel.net>'
+author: "Matt Martz (@sivel)"
 options:
  api_key:
    description:
--- a/notification/pushover.py
+++ b/notification/pushover.py
@ -48,7 +48,7 @@ options:
    description: Message priority (see u(https://pushover.net) for details.)
    required: false

-author: '"Jim Richardson (@weaselkeeper)" <weaselkeeper@gmail.com>'
+author: "Jim Richardson (@weaselkeeper)"
 '''

 EXAMPLES = '''
--- a/notification/sendgrid.py
+++ b/notification/sendgrid.py
@ -53,7 +53,7 @@ options:
      the desired subject for the email
    required: true

-author: '"Matt Makai (@makaimc)" <matthew.makai@gmail.com>'
+author: "Matt Makai (@makaimc)"
 '''

 EXAMPLES = '''
--- a/notification/slack.py
+++ b/notification/slack.py
@ -24,7 +24,7 @@ short_description: Send Slack notifications
 description:
    - The M(slack) module sends notifications to U(http://slack.com) via the Incoming WebHook integration
 version_added: 1.6
-author: '"Ramon de la Fuente (@ramondelafuente)" <ramon@delafuente.nl>'
+author: "Ramon de la Fuente (@ramondelafuente)"
 options:
  domain:
    description:
--- a/notification/sns.py
+++ b/notification/sns.py
@ -24,7 +24,7 @@ short_description: Send Amazon Simple Notification Service (SNS) messages
 description:
    - The M(sns) module sends notifications to a topic on your Amazon SNS account
 version_added: 1.6
-author: '"Michael J. Schultz (@mjschultz)" <mjschultz@gmail.com>'
+author: "Michael J. Schultz (@mjschultz)" 
 options:
  msg:
    description:
--- a/notification/twilio.py
+++ b/notification/twilio.py
@ -58,7 +58,7 @@ options:
      (multimedia message) instead of a plain SMS
    required: false

-author: '"Matt Makai (@makaimc)" <matthew.makai@gmail.com>'
+author: "Matt Makai (@makaimc)"
 '''

 EXAMPLES = '''
--- a/notification/typetalk.py
+++ b/notification/typetalk.py
@ -26,7 +26,7 @@ options:
      - message body
    required: true
 requirements: [ urllib, urllib2, json ]
-author: '"Takashi Someda (@tksmd)" <someda@isenshi.com>'
+author: "Takashi Someda (@tksmd)"
 '''

 EXAMPLES = '''
--- a/packaging/language/bower.py
+++ b/packaging/language/bower.py
@ -25,7 +25,7 @@ short_description: Manage bower packages with bower
 description:
  - Manage bower packages with bower
 version_added: 1.9
-author: '"Michael Warkentin (@mwarkentin)" <mwarkentin@gmail.com>'
+author: "Michael Warkentin (@mwarkentin)"
 options:
  name:
    description:
--- a/packaging/language/composer.py
+++ b/packaging/language/composer.py
@ -22,7 +22,7 @@
 DOCUMENTATION = '''
 ---
 module: composer
-author: '"Dimitrios Tydeas Mengidis (@dmtrs)" <tydeas.dr@gmail.com>'
+author: "Dimitrios Tydeas Mengidis (@dmtrs)"
 short_description: Dependency Manager for PHP
 version_added: "1.6"
 description:
--- a/packaging/language/cpanm.py
+++ b/packaging/language/cpanm.py
@ -73,7 +73,7 @@ examples:
     description: Install I(Dancer) perl package from a specific mirror
 notes:
   - Please note that U(http://search.cpan.org/dist/App-cpanminus/bin/cpanm, cpanm) must be installed on the remote host.
-author: '"Franck Cuny (@franckcuny)" <franck@lumberjaph.net>'
+author: "Franck Cuny (@franckcuny)"
 '''

 def _is_package_installed(module, name, locallib, cpanm):
--- a/packaging/language/maven_artifact.py
+++ b/packaging/language/maven_artifact.py
@ -37,7 +37,7 @@ description:
    - Downloads an artifact from a maven repository given the maven coordinates provided to the module. Can retrieve
    - snapshots or release versions of the artifact and will resolve the latest available version if one is not
    - available.
-author: '"Chris Schmidt (@chrisisbeef)" <chris.schmidt () contrastsecurity.com>'
+author: "Chris Schmidt (@chrisisbeef)"
 requirements:
    - "python >= 2.6"
    - lxml
--- a/packaging/language/npm.py
+++ b/packaging/language/npm.py
@ -25,7 +25,7 @@ short_description: Manage node.js packages with npm
 description:
  - Manage node.js packages with Node Package Manager (npm)
 version_added: 1.2
-author: '"Chris Hoffman (@chrishoffman)" <christopher.hoffman@gmail.com>'
+author: "Chris Hoffman (@chrishoffman)"
 options:
  name:
    description:
--- a/packaging/os/dnf.py
+++ b/packaging/os/dnf.py
@ -95,7 +95,7 @@ notes: []
 requirements:
  - dnf
  - yum-utils (for repoquery)
-author: '"Cristian van Ee (@DJMuggs)" <cristian at cvee.org>'
+author: "Cristian van Ee (@DJMuggs)"
 '''

 EXAMPLES = '''
--- a/packaging/os/homebrew.py
+++ b/packaging/os/homebrew.py
@ -23,8 +23,8 @@ DOCUMENTATION = '''
 ---
 module: homebrew
 author:
-    - '"Daniel Jaouen (@danieljaouen)" <dcj24@cornell.edu>'
-    - '"Andrew Dunham (@andrew-d)" <andrew@du.nham.ca>'
+    - "Daniel Jaouen (@danieljaouen)"
+    - "Andrew Dunham (@andrew-d)"
 short_description: Package manager for Homebrew
 description:
    - Manages Homebrew packages
--- a/packaging/os/homebrew_cask.py
+++ b/packaging/os/homebrew_cask.py
@ -19,7 +19,7 @@
 DOCUMENTATION = '''
 ---
 module: homebrew_cask
-author: '"Daniel Jaouen (@danieljaouen)" <dcj24@cornell.edu>'
+author: "Daniel Jaouen (@danieljaouen)"
 short_description: Install/uninstall homebrew casks.
 description:
    - Manages Homebrew casks.
--- a/packaging/os/homebrew_tap.py
+++ b/packaging/os/homebrew_tap.py
@ -24,7 +24,7 @@ import re
 DOCUMENTATION = '''
 ---
 module: homebrew_tap
-author: '"Daniel Jaouen (@danieljaouen)" <dcj24@cornell.edu>'
+author: "Daniel Jaouen (@danieljaouen)"
 short_description: Tap a Homebrew repository.
 description:
    - Tap external Homebrew repositories.
--- a/packaging/os/layman.py
+++ b/packaging/os/layman.py
@ -25,7 +25,7 @@ from urllib2 import Request, urlopen, URLError
 DOCUMENTATION = '''
 ---
 module: layman
-author: '"Jakub Jirutka (@jirutka)" <jakub@jirutka.cz>'
+author: "Jakub Jirutka (@jirutka)"
 version_added: "1.6"
 short_description: Manage Gentoo overlays
 description:
--- a/packaging/os/openbsd_pkg.py
+++ b/packaging/os/openbsd_pkg.py
@ -25,7 +25,7 @@ import syslog
 DOCUMENTATION = '''
 ---
 module: openbsd_pkg
-author: '"Patrik Lundin (@eest)" <patrik.lundin.swe@gmail.com>'
+author: "Patrik Lundin (@eest)"
 version_added: "1.1"
 short_description: Manage packages on OpenBSD.
 description:
--- a/packaging/os/opkg.py
+++ b/packaging/os/opkg.py
@ -20,7 +20,7 @@
 DOCUMENTATION = '''
 ---
 module: opkg
-author: '"Patrick Pelletier (@skinp)" <pp.pelletier@gmail.com>'
+author: "Patrick Pelletier (@skinp)"
 short_description: Package manager for OpenWrt
 description:
    - Manages OpenWrt packages
--- a/packaging/os/pkg5.py
+++ b/packaging/os/pkg5.py
@ -19,7 +19,7 @@
 DOCUMENTATION = '''
 ---
 module: pkg5
-author: '"Peter Oliver (@mavit)" <ansible@mavit.org.uk>'
+author: "Peter Oliver (@mavit)"
 short_description: Manages packages with the Solaris 11 Image Packaging System
 version_added: 1.9
 description:
--- a/packaging/os/pkg5_publisher.py
+++ b/packaging/os/pkg5_publisher.py
@ -19,7 +19,7 @@
 DOCUMENTATION = '''
 ---
 module: pkg5_publisher
-author: '"Peter Oliver (@mavit)" <ansible@mavit.org.uk>'
+author: "Peter Oliver (@mavit)"
 short_description: Manages Solaris 11 Image Packaging System publishers
 version_added: 1.9
 description:
--- a/packaging/os/pkgin.py
+++ b/packaging/os/pkgin.py
@ -31,8 +31,8 @@ description:
      or any OS that uses C(pkgsrc).  (Home: U(http://pkgin.net/))"
 version_added: "1.0"
 author:
-    - '"Larry Gilbert (L2G)" <larry@L2G.to>'
-    - '"Shaun Zinck (@szinck)" <shaun.zinck at gmail.com>'
+    - "Larry Gilbert (L2G)"
+    - "Shaun Zinck (@szinck)"
 notes:
    - "Known bug with pkgin < 0.8.0: if a package is removed and another
      package depends on it, the other package will be silently removed as
--- a/packaging/os/pkgng.py
+++ b/packaging/os/pkgng.py
@ -63,7 +63,7 @@ options:
              for newer pkgng versions, specify a the name of a repository
              configured in /usr/local/etc/pkg/repos
        required: false
-author: '"bleader (@bleader)" <bleader@ratonland.org>'
+author: "bleader (@bleader)" 
 notes:
    - When using pkgsite, be careful that already in cache packages won't be downloaded again.
 '''
--- a/packaging/os/pkgutil.py
+++ b/packaging/os/pkgutil.py
@ -32,7 +32,7 @@ description:
    - Pkgutil is an advanced packaging system, which resolves dependency on installation.
      It is designed for CSW packages.
 version_added: "1.3"
-author: '"Alexander Winkler (@dermute)" <mail () winkler-alexander.de>'
+author: "Alexander Winkler (@dermute)"
 options:
  name:
    description:
--- a/packaging/os/portinstall.py
+++ b/packaging/os/portinstall.py
@ -43,7 +43,7 @@ options:
        choices: [ 'yes', 'no' ]
        required: false
        default: yes
-author: '"berenddeboer (@berenddeboer)" <berend@pobox.com>'
+author: "berenddeboer (@berenddeboer)"
 '''

 EXAMPLES = '''
--- a/packaging/os/swdepot.py
+++ b/packaging/os/swdepot.py
@ -29,7 +29,7 @@ description:
    - Will install, upgrade and remove packages with swdepot package manager (HP-UX)
 version_added: "1.4"
 notes: []
-author: '"Raul Melo (@melodous)" <raulmelo@gmail.com>'
+author: "Raul Melo (@melodous)"
 options:
    name:
        description:
--- a/packaging/os/urpmi.py
+++ b/packaging/os/urpmi.py
@ -57,7 +57,7 @@ options:
    required: false
    default: yes
    choices: [ "yes", "no" ]
-author: '"Philippe Makowski (@pmakowski)" <philippem@mageia.org>'
+author: "Philippe Makowski (@pmakowski)"
 notes:  []
 '''

--- a/packaging/os/zypper.py
+++ b/packaging/os/zypper.py
@ -31,7 +31,7 @@ import re
 DOCUMENTATION = '''
 ---
 module: zypper
-author: '"Patrick Callahan (@dirtyharrycallahan)" <pmc@patrickcallahan.com>'
+author: "Patrick Callahan (@dirtyharrycallahan)"
 version_added: "1.2"
 short_description: Manage packages on SUSE and openSUSE
 description:
--- a/packaging/os/zypper_repository.py
+++ b/packaging/os/zypper_repository.py
@ -23,7 +23,7 @@
 DOCUMENTATION = '''
 ---
 module: zypper_repository
-author: '"Matthias Vogelgesang (@matze)" <matthias.vogelgesang@gmail.com>'
+author: "Matthias Vogelgesang (@matze)"
 version_added: "1.4"
 short_description: Add and remove Zypper repositories
 description:
--- a/source_control/bzr.py
+++ b/source_control/bzr.py
@ -22,7 +22,7 @@
 DOCUMENTATION = u'''
 ---
 module: bzr
-author: '"André Paramés (@andreparames)" <git@andreparames.com>'
+author: "André Paramés (@andreparames)"
 version_added: "1.1"
 short_description: Deploy software (or files) from bzr branches
 description:
--- a/source_control/github_hooks.py
+++ b/source_control/github_hooks.py
@ -64,7 +64,7 @@ options:
    default: 'json'
    choices: ['json', 'form']

-author: '"Phillip Gentry, CX Inc (@pcgentry)" <phillip@cx.com>'
+author: "Phillip Gentry, CX Inc (@pcgentry)"
 '''

 EXAMPLES = '''
--- a/system/alternatives.py
+++ b/system/alternatives.py
@ -31,8 +31,8 @@ description:
    - Useful when multiple programs are installed but provide similar functionality (e.g. different editors).
 version_added: "1.6"
 author:
-    - '"David Wittman (@DavidWittman)" <dwittman@gmail.com>'
-    - '"Gabe Mulley (@mulby)" <gabe.mulley@gmail.com>'
+    - "David Wittman (@DavidWittman)"
+    - "Gabe Mulley (@mulby)"
 options:
  name:
    description:
--- a/system/at.py
+++ b/system/at.py
@ -59,7 +59,7 @@ options:
    default: false
 requirements:
 - at
-author: '"Richard Isaacson (@risaacson)" <richard.c.isaacson@gmail.com>'
+author: "Richard Isaacson (@risaacson)"
 '''

 EXAMPLES = '''
--- a/system/capabilities.py
+++ b/system/capabilities.py
@ -50,7 +50,7 @@ notes:
      and flags to compare, so you will want to ensure that your capabilities
      argument matches the final capabilities.
 requirements: []
-author: '"Nate Coraor (@natefoo)" <nate@bx.psu.edu>'
+author: "Nate Coraor (@natefoo)"
 '''

 EXAMPLES = '''
--- a/system/crypttab.py
+++ b/system/crypttab.py
@ -69,7 +69,7 @@ options:

 notes: []
 requirements: []
-author: '"Steve (@groks)" <yo@groks.org>'
+author: "Steve (@groks)"
 '''

 EXAMPLES = '''
--- a/system/filesystem.py
+++ b/system/filesystem.py
@ -20,7 +20,7 @@

 DOCUMENTATION = '''
 ---
-author: '"Alexander Bulimov (@abulimov)" <lazywolf0@gmail.com>'
+author: "Alexander Bulimov (@abulimov)"
 module: filesystem
 short_description: Makes file system on block device
 description:
--- a/system/firewalld.py
+++ b/system/firewalld.py
@ -69,7 +69,7 @@ options:
 notes:
  - Not tested on any Debian based system.
 requirements: [ 'firewalld >= 0.2.11' ]
-author: '"Adam Miller (@maxamillion)" <maxamillion@fedoraproject.org>'
+author: "Adam Miller (@maxamillion)" 
 '''

 EXAMPLES = '''
--- a/system/gluster_volume.py
+++ b/system/gluster_volume.py
@ -103,7 +103,7 @@ options:
 notes:
  - "Requires cli tools for GlusterFS on servers"
  - "Will add new bricks, but not remove them"
-author: '"Taneli Leppä (@rosmo)" <taneli@crasman.fi>'
+author: "Taneli Leppä (@rosmo)"
 """

 EXAMPLES = """
--- a/system/kernel_blacklist.py
+++ b/system/kernel_blacklist.py
@ -25,7 +25,7 @@ import re
 DOCUMENTATION = '''
 ---
 module: kernel_blacklist
-author: '"Matthias Vogelgesang (@matze)" <matthias.vogelgesang@gmail.com>'
+author: "Matthias Vogelgesang (@matze)"
 version_added: 1.4
 short_description: Blacklist kernel modules
 description:
--- a/Show More
+++ b/Show More