summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Knapp <kyleknap@amazon.com>2015-08-20 10:40:54 -0700
committerKyle Knapp <kyleknap@amazon.com>2015-08-20 10:40:54 -0700
commit3d167b81a04d2dcade8d65bde9a65351f9c08b17 (patch)
tree27c323b631f792c95ec3e6f2eff6c02dd4ae05ed
parent7789bd00f7428804a8aa07f99c99b0609590520b (diff)
parentb98fcd20897f4dee5c3fddad26ba83a2cc6a2944 (diff)
downloadboto-3d167b81a04d2dcade8d65bde9a65351f9c08b17.tar.gz
Merge pull request #3308 from stevenbrichards/develop
Fix 3264: Add documentation for query_auth
-rw-r--r--boto/s3/key.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/boto/s3/key.py b/boto/s3/key.py
index 194c6b6e..8e00d12e 100644
--- a/boto/s3/key.py
+++ b/boto/s3/key.py
@@ -634,17 +634,17 @@ class Key(object):
Generate a URL to access this key.
:type expires_in: int
- :param expires_in: How long the url is valid for, in seconds
+ :param expires_in: How long the url is valid for, in seconds.
:type method: string
:param method: The method to use for retrieving the file
- (default is GET)
+ (default is GET).
:type headers: dict
- :param headers: Any headers to pass along in the request
+ :param headers: Any headers to pass along in the request.
:type query_auth: bool
- :param query_auth:
+ :param query_auth: If True, signs the request in the URL.
:type force_http: bool
:param force_http: If True, http will be used instead of https.