Merge pull request #2201 from owncloud/passwordpolicy

password policy app, enterprise only

admin_manual/configuration_files/file_sharing_configuration.rst

@@ -16,6 +16,9 @@ ownCloud users. You have control of a number of user permissions on file shares:
 * Allow email notifications of new public shares
 * Exclude groups from creating shares
 
+.. note:: ownCloud Enterprise includes a Share Link Password Policy app; see 
+   :ref:`password_policy_label`.
+
 Configure your sharing policy on your Admin page in the Sharing section.
 
 .. figure:: images/sharing-files-1.png
@@ -58,6 +61,17 @@ Configure your sharing policy on your Admin page in the Sharing section.
    directories, though it does update the mtimes on files. See  
    `Wrong folder date when syncing 
    <https://github.com/owncloud/core/issues/7009>`_ for discussion of this.
+   
+.. _password_policy_label:
+
+Share Link Password Policy
+--------------------------
+
+ownCloud Enterprise users have the option of enabling the Share Link Password 
+Policy app. This allows you to enforce password length, required characters, 
+define special characters, and expiration dates on share links.
+
+.. figure:: images/sharing-files-2.png
   
 Creating Persistent File Shares
 -------------------------------

admin_manual/whats_new_admin.rst

@@ -10,4 +10,9 @@ What's New for Admins in ownCloud |version|
 Some of the improvements of interest to ownCloud admins are:
 
 * Separate encryption for home storage and remote storage; you may encrypt 
-  remote storage without encrypting local storage.
+  remote storage without encrypting local storage. See 
+  :doc:`configuration_files/encryption_configuration`.
+* Password policy app for share links, for setting password requirements such 
+  as minimum length and required characters (Enterprise only). See 
+  :ref:`password_policy_label`.
+