Merge branch 'main' into dependabot/pip/pytest-runner-5.3.0

dropbox · Apr 14, 2021 · 4002419 · 4002419
2 parents 8cc898a + a812d56
commit 4002419
Show file tree

Hide file tree

Showing 6 changed files with 545 additions and 5 deletions.
diff --git a/dropbox/sharing.py b/dropbox/sharing.py
@@ -1303,8 +1303,10 @@ class CreateSharedLinkWithSettingsError(bb.Union):
     :ivar SharedLinkSettingsError
         CreateSharedLinkWithSettingsError.settings_error: There is an error with
         the given settings.
-    :ivar sharing.CreateSharedLinkWithSettingsError.access_denied: Access to the
-        requested path is forbidden.
+    :ivar sharing.CreateSharedLinkWithSettingsError.access_denied: The user is
+        not allowed to create a shared link to the specified file. For  example,
+        this can occur if the file is restricted or if the user's links are
+        `banned <https://help.dropbox.com/files-folders/share/banned-links>`_.
     """
 
     _catch_all = None

diff --git a/dropbox/team.py b/dropbox/team.py
@@ -591,7 +591,8 @@ class AdminTier(bb.Union):
     :ivar team.AdminTier.user_management_admin: User can do most user
         provisioning, de-provisioning and management.
     :ivar team.AdminTier.support_admin: User can do a limited set of common
-        support tasks for existing users.
+        support tasks for existing users. Note: Dropbox is adding new types of
+        admin roles; these may display as support_admin.
     :ivar team.AdminTier.member_only: User is not an admin of the team.
     """