Merging from master, resolving conflict in s3/key.py. Considerably more work is required here.requests_refactor

1 files changed, 15 insertions, 10 deletions

diff --git a/boto/dynamodb/layer1.py b/boto/dynamodb/layer1.py
index 4443f7fa..2ff77ce4 100644
--- a/boto/dynamodb/layer1.py
+++ b/boto/dynamodb/layer1.py
@@ -151,14 +151,19 @@ class Layer1(AWSAuthConnection):
 
     def list_tables(self, limit=None, start_table=None):
         """
-        Return a list of table names associated with the current account
-        and endpoint.
+        Returns a dictionary of results.  The dictionary contains
+        a **TableNames** key whose value is a list of the table names.
+        The dictionary could also contain a **LastEvaluatedTableName**
+        key whose value would be the last table name returned if
+        the complete list of table names was not returned.  This
+        value would then be passed as the ``start_table`` parameter on
+        a subsequent call to this method.
 
         :type limit: int
         :param limit: The maximum number of tables to return.
 
         :type start_table: str
-        :param limit: The name of the table that starts the
+        :param start_table: The name of the table that starts the
             list.  If you ran a previous list_tables and not
             all results were returned, the response dict would
             include a LastEvaluatedTableName attribute.  Use
@@ -179,7 +184,7 @@ class Layer1(AWSAuthConnection):
         table was created.
 
         :type table_name: str
-        :param table_name: The name of the table to delete.
+        :param table_name: The name of the table to describe.
         """
         data = {'TableName' : table_name}
         json_input = json.dumps(data)
@@ -194,7 +199,7 @@ class Layer1(AWSAuthConnection):
         table will be ACTIVE.
 
         :type table_name: str
-        :param table_name: The name of the table to delete.
+        :param table_name: The name of the table to create.
         
         :type schema: dict
         :param schema: A Python version of the KeySchema data structure
@@ -218,7 +223,7 @@ class Layer1(AWSAuthConnection):
         Updates the provisioned throughput for a given table.
         
         :type table_name: str
-        :param table_name: The name of the table to delete.
+        :param table_name: The name of the table to update.
         
         :type provisioned_throughput: dict
         :param provisioned_throughput: A Python version of the
@@ -250,7 +255,7 @@ class Layer1(AWSAuthConnection):
         the supplied key.
 
         :type table_name: str
-        :param table_name: The name of the table to delete.
+        :param table_name: The name of the table containing the item.
 
         :type key: dict
         :param key: A Python version of the Key data structure
@@ -307,7 +312,7 @@ class Layer1(AWSAuthConnection):
         expected rule.
 
         :type table_name: str
-        :param table_name: The name of the table to delete.
+        :param table_name: The name of the table in which to put the item.
 
         :type item: dict
         :param item: A Python version of the Item data structure
@@ -385,7 +390,7 @@ class Layer1(AWSAuthConnection):
         expected rule.
 
         :type table_name: str
-        :param table_name: The name of the table to delete.
+        :param table_name: The name of the table containing the item.
 
         :type key: dict
         :param key: A Python version of the Key data structure
@@ -422,7 +427,7 @@ class Layer1(AWSAuthConnection):
         which is passed as is to DynamoDB.
 
         :type table_name: str
-        :param table_name: The name of the table to delete.
+        :param table_name: The name of the table to query.
 
         :type hash_key_value: dict
         :param key: A DynamoDB-style HashKeyValue.