diff options
author | Daniel G. Taylor <dan@programmer-art.org> | 2014-07-28 14:33:18 -0700 |
---|---|---|
committer | Daniel G. Taylor <dan@programmer-art.org> | 2014-07-28 14:33:18 -0700 |
commit | de284a44634e4582fd3feb88cf22c020f2e4b974 (patch) | |
tree | 12a2fa5a29532d21a115ada7522fbb8503a51cc1 /docs | |
parent | 49af8b61d511256e86c300c92fd6eeed512c2f10 (diff) | |
parent | f50870074993933234245222b12e01c0368c2b5c (diff) | |
download | boto-de284a44634e4582fd3feb88cf22c020f2e4b974.tar.gz |
Merge pull request #2455 from victortrac/develop
Updating documentation on cloudsearch regions. Fixes #2455.
Diffstat (limited to 'docs')
-rw-r--r-- | docs/source/cloudsearch_tut.rst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/source/cloudsearch_tut.rst b/docs/source/cloudsearch_tut.rst index 08d07855..13ffd5ef 100644 --- a/docs/source/cloudsearch_tut.rst +++ b/docs/source/cloudsearch_tut.rst @@ -21,8 +21,9 @@ The recommended method of doing this is as follows:: ... aws_secret_access_key='<aws secret key>') At this point, the variable conn will point to a CloudSearch connection object -in the us-west-2 region. Currently, this is the only region which has the -CloudSearch service. In this example, the AWS access key and AWS secret key are +in the us-west-2 region. Available regions for cloudsearch can be found +`here <http://docs.aws.amazon.com/general/latest/gr/rande.html#cloudsearch_region>`_. +In this example, the AWS access key and AWS secret key are passed in to the method explicitly. Alternatively, you can set the environment variables: |