diff options
author | Kyle Knapp <kyleknap@amazon.com> | 2015-12-09 17:09:29 -0800 |
---|---|---|
committer | Kyle Knapp <kyleknap@amazon.com> | 2015-12-09 17:09:29 -0800 |
commit | 4f66311f2918aacd4bd7fefff9e0c8ed7bc2813e (patch) | |
tree | dc5ec04fbd0abef4857020c54b0184462b996a86 /docs | |
parent | cee6159511fed248c54a18eff73737e4ac53fd5c (diff) | |
parent | d6b6bd4de9c82df6350914f0efb1cb14301011d4 (diff) | |
download | boto-4f66311f2918aacd4bd7fefff9e0c8ed7bc2813e.tar.gz |
Merge pull request #3401 from macrotim/develop
Fixed docs
Diffstat (limited to 'docs')
-rw-r--r-- | docs/source/boto_config_tut.rst | 2 | ||||
-rw-r--r-- | docs/source/cloudfront_tut.rst | 4 | ||||
-rw-r--r-- | docs/source/cloudsearch_tut.rst | 11 | ||||
-rw-r--r-- | docs/source/dynamodb2_tut.rst | 2 | ||||
-rw-r--r-- | docs/source/ec2_tut.rst | 2 | ||||
-rw-r--r-- | docs/source/ses_tut.rst | 4 |
6 files changed, 12 insertions, 13 deletions
diff --git a/docs/source/boto_config_tut.rst b/docs/source/boto_config_tut.rst index 7e3ea083..302d2093 100644 --- a/docs/source/boto_config_tut.rst +++ b/docs/source/boto_config_tut.rst @@ -173,7 +173,7 @@ For example:: :connection_stale_duration: Amount of time to wait in seconds before a connection will stop getting reused. AWS will disconnect connections which have been idle for 180 seconds. -:is_secure: Is the connection over SSL. This setting will overide passed in +:is_secure: Is the connection over SSL. This setting will override passed in values. :https_validate_certificates: Validate HTTPS certificates. This is on by default :ca_certificates_file: Location of CA certificates or the keyword "system". diff --git a/docs/source/cloudfront_tut.rst b/docs/source/cloudfront_tut.rst index cd33056e..fde6b1b2 100644 --- a/docs/source/cloudfront_tut.rst +++ b/docs/source/cloudfront_tut.rst @@ -116,7 +116,7 @@ Invalidate a list of paths in a CloudFront distribution:: This will return a :class:`boto.cloudfront.invalidation.InvalidationBatch` object representing the invalidation request. You can also fetch a single -invalidaton request for a given distribution using +invalidation request for a given distribution using ``invalidation_request_status``:: >>> inval_req = c.invalidation_request_status(u'ECH69MOIW7613', u'IFCT7K03VUETK') @@ -187,7 +187,7 @@ representing the invalidation request pointed to by a >>> print inval_req <InvalidationBatch: IFCT7K03VUETK> -Simiarly you can get the parent +Similarly you can get the parent :class:`boto.cloudfront.distribution.Distribution` object for the invalidation request from a :class:`boto.cloudfront.invalidation.InvalidationSummary` object using:: diff --git a/docs/source/cloudsearch_tut.rst b/docs/source/cloudsearch_tut.rst index 3e2de7ad..33518979 100644 --- a/docs/source/cloudsearch_tut.rst +++ b/docs/source/cloudsearch_tut.rst @@ -76,7 +76,7 @@ Creating index fields Each domain can have up to twenty index fields which are indexed by the CloudSearch service. For each index field, you will need to specify whether -it's a text or integer field, as well as optionaly a default value:: +it's a text or integer field, as well as optionally a default value:: >>> # Create an 'text' index field called 'username' >>> uname_field = domain.create_index_field('username', 'text') @@ -178,11 +178,10 @@ The result is an instance of :py:class:`CommitResponse dictionary response a nice object (ie result.adds, result.deletes) and raise an exception for us if all of our documents weren't actually committed. -After you have successfully committed some documents to cloudsearch, you must -use :py:meth:`clear_sdf -<boto.cloudsearch.document.DocumentServiceConnection.clear_sdf>`, if you wish -to use the same document service connection again so that its internal cache is -cleared. +If you wish to use the same document service connection after a commit, +you must use :py:meth:`clear_sdf +<boto.cloudsearch.document.DocumentServiceConnection.clear_sdf>` to clear its +internal cache. Searching Documents ------------------- diff --git a/docs/source/dynamodb2_tut.rst b/docs/source/dynamodb2_tut.rst index 0e4b5b87..f367cf97 100644 --- a/docs/source/dynamodb2_tut.rst +++ b/docs/source/dynamodb2_tut.rst @@ -635,7 +635,7 @@ API requests necessary to access a large number of items. The & fetches all of them, presented as an iterator interface. This is done lazily, so if you never iterate over the results, no requests are -executed. Additionally, if you only iterate over part of the set, the minumum +executed. Additionally, if you only iterate over part of the set, the minimum number of calls are made to fetch those results (typically max 100 per response). diff --git a/docs/source/ec2_tut.rst b/docs/source/ec2_tut.rst index 140930be..ba576b30 100644 --- a/docs/source/ec2_tut.rst +++ b/docs/source/ec2_tut.rst @@ -237,7 +237,7 @@ If you no longer need a launch configuration, you can delete it: If ``use_block_device_types=True`` is passed to the connection it will deserialize Launch Configurations with Block Device Mappings into a re-usable format with BlockDeviceType objects, similar to how AMIs are deserialized currently. Legacy - behavior is to put them into a format that is incompatabile with creating new Launch + behavior is to put them into a format that is incompatible with creating new Launch Configurations. This switch is in place to preserve backwards compatability, but its usage is the preferred format going forward. diff --git a/docs/source/ses_tut.rst b/docs/source/ses_tut.rst index d19a4e36..10d6a278 100644 --- a/docs/source/ses_tut.rst +++ b/docs/source/ses_tut.rst @@ -25,10 +25,10 @@ To do so, the most straight forward way is the following:: Bear in mind that if you have your credentials in boto config in your home
directory, the two keyword arguments in the call above are not needed. More
-details on configuration can be fond in :doc:`boto_config_tut`.
+details on configuration can be found in :doc:`boto_config_tut`.
The :py:func:`boto.ses.connect_to_region` functions returns a
-:py:class:`boto.ses.connection.SESConnection` instance, which is a the boto API
+:py:class:`boto.ses.connection.SESConnection` instance, which is the boto API
for working with SES.
Notes on Sending
|