Merge remote-tracking branch 'upstream/feature/storage-preview4' into…

… doc_storage_b4

sdk/storage/azure-storage-blob/azure/storage/blob/blob_client.py

@@ -254,7 +254,7 @@ def generate_shared_access_signature(
             Required unless an id is given referencing a stored access policy
             which contains this field. This field must be omitted if it has been
             specified in an associated stored access policy.
-        :type permission: str or ~azure.storage.blob.BlobPermissions
+        :type permission: str or ~azure.storage.blob.BlobSasPermissions
         :param expiry:
             The time at which the shared access signature becomes invalid.
             Required unless an id is given referencing a stored access policy

sdk/storage/azure-storage-blob/azure/storage/blob/blob_service_client.py

@@ -179,7 +179,7 @@ def generate_shared_access_signature(
             Required unless an id is given referencing a stored access policy
             which contains this field. This field must be omitted if it has been
             specified in an associated stored access policy.
-        :type permission: str or ~azure.storage.blob.AccountPermissions
+        :type permission: str or ~azure.storage.blob.AccountSasPermissions
         :param expiry:
             The time at which the shared access signature becomes invalid.
             Required unless an id is given referencing a stored access policy

sdk/storage/azure-storage-blob/azure/storage/blob/container_client.py

@@ -213,7 +213,7 @@ def generate_shared_access_signature(
             Required unless an id is given referencing a stored access policy
             which contains this field. This field must be omitted if it has been
             specified in an associated stored access policy.
-        :type permission: str or ~azure.storage.blob.ContainerPermissions
+        :type permission: str or ~azure.storage.blob.ContainerSasPermissions
         :param expiry:
             The time at which the shared access signature becomes invalid.
             Required unless an id is given referencing a stored access policy

sdk/storage/azure-storage-blob/azure/storage/blob/models.py

@@ -244,6 +244,10 @@ def __init__(self, allowed_origins, allowed_methods, **kwargs):
 class ContainerProperties(DictMixin):
     """Blob container's properties class.
 
+    Returned ``ContainerProperties`` instances expose these values through a
+    dictionary interface, for example: ``container_props["last_modified"]``.
+    Additionally, the container name is available as ``container_props["name"]``.
+
     :param ~datetime.datetime last_modified:
         A datetime object representing the last time the container was modified.
     :param str etag:
@@ -259,10 +263,6 @@ class ContainerProperties(DictMixin):
         Represents whether the container has a legal hold.
     :param dict metadata: A dict with name-value pairs to associate with the
         container as metadata.
-
-    Returned ``ContainerProperties`` instances expose these values through a
-    dictionary interface, for example: ``container_props["last_modified"]``.
-    Additionally, the container name is available as ``container_props["name"]``.
     """
 
     def __init__(self, **kwargs):
@@ -847,8 +847,8 @@ def __init__(self, permission=None, expiry=None, start=None):
         self.permission = permission
 
 
-class ContainerPermissions(object):
-    """ContainerPermissions class to be used with
+class ContainerSasPermissions(object):
+    """ContainerSasPermissions class to be used with
     :func:`~azure.storage.blob.ContainerClient.generate_shared_access_signature` API and
     for the AccessPolicies used with
     :func:`~azure.storage.blob.ContainerClient.set_container_access_policy`.

sdk/storage/azure-storage-file/azure/storage/file/file_client.py

@@ -257,7 +257,7 @@ def generate_shared_access_signature(
         Use the returned signature with the credential parameter of any FileServiceClient,
         ShareClient, DirectoryClient, or FileClient.
 
-        :param ~azure.storage.file.FilePermissions permission:
+        :param ~azure.storage.file.FileSasPermissions permission:
             The permissions associated with the shared access signature. The
             user is restricted to operations allowed by the permissions.
             Permissions must be ordered read, write, delete, list.

sdk/storage/azure-storage-file/azure/storage/file/share_client.py

@@ -185,7 +185,7 @@ def generate_shared_access_signature(
         Use the returned signature with the credential parameter of any FileServiceClient,
         ShareClient, DirectoryClient, or FileClient.
 
-        :param ~azure.storage.file.SharePermissions permission:
+        :param ~azure.storage.file.ShareSasPermissions permission:
             The permissions associated with the shared access signature. The
             user is restricted to operations allowed by the permissions.
             Permissions must be ordered read, create, write, delete, list.

sdk/storage/azure-storage-queue/azure/storage/queue/queue_client.py

@@ -175,7 +175,7 @@ def generate_shared_access_signature(
 
         Use the returned signature with the credential parameter of any Queue Service.
 
-        :param ~azure.storage.queue.QueuePermissions permission:
+        :param ~azure.storage.queue.QueueSasPermissions permission:
             The permissions associated with the shared access signature. The
             user is restricted to operations allowed by the permissions.
             Required unless a policy_id is given referencing a stored access policy