diff options
author | Mitch Garnaat <mitch@garnaat.com> | 2012-05-15 18:59:46 -0700 |
---|---|---|
committer | Mitch Garnaat <mitch@garnaat.com> | 2012-05-15 18:59:46 -0700 |
commit | 1aa1133e8502ea6c95e49ac34681569df5ace46b (patch) | |
tree | a25397b20d7d409131ccfbfce5d4dca23d7e52a4 /docs/source/ref | |
parent | 911f42b97fdccbc55e160ec323df0cad6fe64c6b (diff) | |
parent | 6588ea270bfc9e0bb4d17263b72ee8b5255545c5 (diff) | |
download | boto-2.4.0.tar.gz |
Merge branch 'release-2.4.0'2.4.0
Diffstat (limited to 'docs/source/ref')
-rw-r--r-- | docs/source/ref/cloudformation.rst | 7 | ||||
-rw-r--r-- | docs/source/ref/cloudsearch.rst | 59 | ||||
-rw-r--r-- | docs/source/ref/index.rst | 1 | ||||
-rw-r--r-- | docs/source/ref/s3.rst | 7 |
4 files changed, 74 insertions, 0 deletions
diff --git a/docs/source/ref/cloudformation.rst b/docs/source/ref/cloudformation.rst index 3ec10c77..3e0ab41f 100644 --- a/docs/source/ref/cloudformation.rst +++ b/docs/source/ref/cloudformation.rst @@ -11,6 +11,13 @@ boto.cloudformation :members: :undoc-members: +boto.cloudformation.connection +------------------------------ + +.. automodule:: boto.cloudformation.connection + :members: + :undoc-members: + boto.cloudformation.stack ------------------------- diff --git a/docs/source/ref/cloudsearch.rst b/docs/source/ref/cloudsearch.rst new file mode 100644 index 00000000..4cd2baaa --- /dev/null +++ b/docs/source/ref/cloudsearch.rst @@ -0,0 +1,59 @@ +.. ref-cloudsearch + +=========== +Cloudsearch +=========== + +boto.cloudsearch +-------- + +.. automodule:: boto.swf + :members: + :undoc-members: + +boto.cloudsearch.domain +-------------------- + +.. automodule:: boto.cloudsearch.domain + :members: + :undoc-members: + +boto.cloudsearch.layer1 +-------------------- + +.. automodule:: boto.cloudsearch.layer1 + :members: + :undoc-members: + +boto.cloudsearch.layer2 +-------------------- + +.. automodule:: boto.cloudsearch.layer2 + :members: + :undoc-members: + +boto.cloudsearch.optionstatus +-------------------- + +.. automodule:: boto.cloudsearch.optionstatus + :members: + :undoc-members: + +boto.cloudsearch.search +-------------------- + +.. automodule:: boto.cloudsearch.search + :members: + :undoc-members: + +boto.cloudsearch.document +-------------------- + +.. automodule:: boto.cloudsearch.document + :members: + :undoc-members: + + + + + diff --git a/docs/source/ref/index.rst b/docs/source/ref/index.rst index 70aa0a6d..4f36adf6 100644 --- a/docs/source/ref/index.rst +++ b/docs/source/ref/index.rst @@ -10,6 +10,7 @@ API Reference boto cloudformation cloudfront + cloudsearch contrib dynamodb ec2 diff --git a/docs/source/ref/s3.rst b/docs/source/ref/s3.rst index 86b411a4..8520aa96 100644 --- a/docs/source/ref/s3.rst +++ b/docs/source/ref/s3.rst @@ -74,3 +74,10 @@ boto.s3.deletemarker :members: :undoc-members: +boto.s3.lifecycle +-------------------- + +.. automodule:: boto.s3.lifecycle + :members: + :undoc-members: + |