diff --git a/admin_manual/configuration_files/file_sharing_configuration.rst b/admin_manual/configuration_files/file_sharing_configuration.rst
index 82a1656eb..1aac45f07 100644
--- a/admin_manual/configuration_files/file_sharing_configuration.rst
+++ b/admin_manual/configuration_files/file_sharing_configuration.rst
@@ -4,17 +4,7 @@ File Sharing
 
 Nextcloud users can share files with their Nextcloud groups and other users on 
 the same Nextcloud server, with Nextcloud users on :doc:`other Nextcloud servers <federated_cloud_sharing_configuration>`, and create public shares for people who are not 
-Nextcloud users. You have control of a number of user permissions on file shares:
-
-* Allow users to share files
-* Allow users to create public shares
-* Require a password on public shares
-* Allow public uploads to public shares
-* Require an expiration date on public share links
-* Allow resharing
-* Restrict sharing to group members only
-* Allow email notifications of new public shares
-* Exclude groups from creating shares
+Nextcloud users. You have control of a number of user permissions on file shares.
 
 Configure your sharing policy on your Admin page in the Sharing section.
 
@@ -24,34 +14,37 @@ Configure your sharing policy on your Admin page in the Sharing section.
   this is not checked, no users can create file shares.
 * Check ``Allow users to share via link`` to enable creating public shares for  
   people who are not Nextcloud users via hyperlink.
-* Check ``Enforce password protection`` to force users to set a password on all 
-  public share links. This does not apply to local user and group shares.
 * Check ``Allow public uploads`` to allow anyone to upload files to 
   public shares.
-* Check ``Allow users to send mail notification for shared files`` to enable 
-  sending notifications from Nextcloud. (Your Nextcloud server must be configured 
-  to send mail)
+* Check ``Always ask for a password`` to proactively ask a user to set a password
+  for a share link.
+* Check ``Enforce password protection`` to force users to set a password on all 
+  public share links. This does not apply to local user and group shares.
 * Check ``Set default expiration date`` to set a default expiration date on 
   public shares.
 * Check ``Allow resharing`` to enable users to re-share files shared with them.
+* Check ``Allow sharing with groups`` to enable users to share with groups.
 * Check ``Restrict users to only share with users in their groups`` to confine 
   sharing within group memberships.
-
+  
     .. note:: This setting does not apply to the Federated Cloud sharing 
        feature. If :doc:`Federated Cloud Sharing 
        <federated_cloud_sharing_configuration>` is
        enabled, users can still share items with any users on any instances
        (including the one they are on) via a remote share.
-
-* Check ``Allow users to send mail notification for shared files`` enables 
-  users to send an email notification to every Nextcloud user that the file is 
-  shared with.
+  
 * Check ``Exclude groups from sharing`` to prevent members of specific groups 
   from creating any file shares in those groups. When you check this, you'll 
   get a dropdown list of all your groups to choose from. Members of excluded 
-  groups can still receive shares, but not create any
+  groups can still receive shares, but not create any.
 * Check ``Allow username autocompletion in share dialog`` to enable 
   auto-completion of Nextcloud usernames.
+* Check ``Show disclaimer text on the public link upload page`` to set and show
+  a disclaimer text on public links with hidden file lists.
+
+With ``Default share permissions`` you are able to set the default permissions 
+for user-shares (``Create``, ``Change``, ``Delete`` and ``Share``) without
+forcing them.
 
 .. note:: Nextcloud does not preserve the mtime (modification time) of 
    directories, though it does update the mtimes on files. See