Merge pull request #2476 from owncloud/two-factor-admin

two-factor admin doc

admin_manual/configuration_server/occ_command.rst

@@ -39,6 +39,8 @@ occ Command Directory
 * :ref:`versions_label`
 * :ref:`command_line_installation_label`
 * :ref:`command_line_upgrade_label`
+* :ref:`two_factor_auth_label`
+* :ref:`disable_user_label`
 
 .. _http_user_label:
 
@@ -1269,5 +1271,35 @@ option::
  sudo -u www-data php occ upgrade --skip-migration-test
 
 You can perform this simulation manually with the ``--dry-run`` option::
- 
+
  sudo -u www-data php occ upgrade --dry-run
+
+.. _two_factor_auth_label:
+
+Two-factor Authentication
+-------------------------
+If a two-factor provider app is enabled, it is enabled for all users by default
+(though the provider can decide whether or not the user has to pass the challenge).
+In the case of an user losing access to the second factor (e.g. lost phone with
+two-factor SMS verification), the admin can temporarily disable the two-factor
+check for that user via the occ command::
+
+ sudo -u www-data php occ twofactor:disable <username>
+
+To re-enable two-factor auth again use the following commmand::
+
+ sudo -u www-data php occ twofactor:enable <username>
+
+.. _disable_user_label:
+
+Disable Users
+-------------
+Admins can disable users via the occ command too::
+
+ sudo -u www-data php occ user:disable <username>
+
+Use the following command to enable the user again::
+
+ sudo -u www-data php occ user:enable <username>
+
+Note that once users are disabled, their connected browsers will be disconnected.

admin_manual/whats_new_admin.rst

@@ -10,6 +10,8 @@ ownCloud has many improvements. Some of our new features are:
 
 * New ``occ`` option, ``--unscanned``, to scan only previously unscanned 
   files (`<https://github.com/owncloud/core/pull/24702>`_)
+* New ``occ`` command to disable/enable users
+* New ``occ`` command to disable/enable two-factor auth for specific users
 * New group tags for system file tags 
   (`<https://github.com/owncloud/enterprise/issues/1208>`_)
 * Cleaner internal file URLs