From d45ee5a3d8d858c65f600875c3b98d63bd8bae4a Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Tue, 11 Mar 2014 12:26:35 -0500 Subject: [PATCH] Fixing up some docstrings causing make webdocs to fail --- cloud/ec2_ami_search | 3 ++- cloud/s3 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cloud/ec2_ami_search b/cloud/ec2_ami_search index e3b75257c35..a1f53cd3d67 100644 --- a/cloud/ec2_ami_search +++ b/cloud/ec2_ami_search @@ -26,7 +26,8 @@ description: - Returns C(ami), C(aki), C(ari), C(serial), C(tag) - 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"}) + - '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/s3 b/cloud/s3 index afc3f99d388..fc0824b2354 100644 --- a/cloud/s3 +++ b/cloud/s3 @@ -68,7 +68,7 @@ options: aliases: [] s3_url: description: - - S3 URL endpoint. If not specified then the S3_URL environment variable is used, if that variable is defined. Ansible tries to guess if fakes3 (https://github.com/jubos/fake-s3) or Eucalyptus Walrus (https://github.com/eucalyptus/eucalyptus/wiki/Walrus) is used and configure connection accordingly. Current heuristic is: everything with scheme fakes3:// is fakes3, everything else not ending with amazonaws.com is Walrus. + - "S3 URL endpoint. If not specified then the S3_URL environment variable is used, if that variable is defined. Ansible tries to guess if fakes3 (https://github.com/jubos/fake-s3) or Eucalyptus Walrus (https://github.com/eucalyptus/eucalyptus/wiki/Walrus) is used and configure connection accordingly. Current heuristic is: everything with scheme fakes3:// is fakes3, everything else not ending with amazonaws.com is Walrus." default: null aliases: [ S3_URL ] aws_secret_key: