diff options
author | Toshio Kuratomi <toshio@fedoraproject.org> | 2016-01-28 09:24:02 -0800 |
---|---|---|
committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2016-01-28 09:28:01 -0800 |
commit | 263932393a8fc246d58bf75e6a995bb598e39240 (patch) | |
tree | 39cb77320b78c8da8dad11612ba7806133f341f3 | |
parent | 0a76cd3bc309d05604f3a3a2fb45aa75ff0d284f (diff) | |
download | ansible-modules-core-263932393a8fc246d58bf75e6a995bb598e39240.tar.gz |
Remove duplicate documentation fields
-rw-r--r-- | cloud/amazon/_ec2_ami_search.py | 1 | ||||
-rw-r--r-- | cloud/amazon/route53.py | 4 | ||||
-rw-r--r-- | commands/command.py | 1 | ||||
-rw-r--r-- | database/postgresql/postgresql_db.py | 5 | ||||
-rw-r--r-- | files/acl.py | 3 | ||||
-rw-r--r-- | system/authorized_key.py | 4 | ||||
-rw-r--r-- | windows/win_get_url.py | 7 | ||||
-rw-r--r-- | windows/win_lineinfile.py | 1 |
8 files changed, 8 insertions, 18 deletions
diff --git a/cloud/amazon/_ec2_ami_search.py b/cloud/amazon/_ec2_ami_search.py index a85bdf00..7984b67a 100644 --- a/cloud/amazon/_ec2_ami_search.py +++ b/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/cloud/amazon/route53.py b/cloud/amazon/route53.py index 72eac85b..e3cc8785 100644 --- a/cloud/amazon/route53.py +++ b/cloud/amazon/route53.py @@ -131,7 +131,9 @@ options: required: false default: null version_added: "2.0" -author: "Bruce Pennypacker (@bpennypacker)" +author: + - "Bruce Pennypacker (@bpennypacker)" + - "Mike Buzzetti <mike.buzzetti@gmail.com>" extends_documentation_fragment: aws ''' diff --git a/commands/command.py b/commands/command.py index 2bd8f704..e9d34531 100644 --- a/commands/command.py +++ b/commands/command.py @@ -74,7 +74,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/database/postgresql/postgresql_db.py b/database/postgresql/postgresql_db.py index 762cb65e..cca41963 100644 --- a/database/postgresql/postgresql_db.py +++ b/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/files/acl.py b/files/acl.py index a3997cd4..32910b7c 100644 --- a/files/acl.py +++ b/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/system/authorized_key.py b/system/authorized_key.py index 8a97722b..6fb59bc4 100644 --- a/system/authorized_key.py +++ b/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: @@ -80,8 +80,6 @@ options: choices: [ "yes", "no" ] default: "no" version_added: "1.9" -description: - - "Adds or removes authorized keys for particular user accounts" author: "Ansible Core Team" ''' diff --git a/windows/win_get_url.py b/windows/win_get_url.py index 26b0dc7b..f7c5819c 100644 --- a/windows/win_get_url.py +++ b/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/windows/win_lineinfile.py b/windows/win_lineinfile.py index 24d0afde..6bb41479 100644 --- a/windows/win_lineinfile.py +++ b/windows/win_lineinfile.py @@ -82,7 +82,6 @@ options: 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 default: None encoding: required: false |