fix: move admin email change setting to User Config chapter

Also fixed some typos, grammar, etc.


Signed-off-by: Josh <[email protected]>

Author: joshtrichards

admin_manual/configuration_user/user_configuration.rst

@@ -13,19 +13,19 @@ On the User management page of your Nextcloud Web UI you can:
 * View and set quotas
 * Create and edit their email addresses
 * Send an automatic email notification to new users
-* Disable and Enable users
+* Disable and enable users
 * Delete them with a single click
 
 The default view displays basic information about your users.
 
 .. figure:: ../images/user-config.png
 
-The Group filters on the left sidebar lets you quickly filter users by their
-group memberships, and create new groups.
+The group filters on the left sidebar let you quickly filter users by their
+group memberships and create new groups.
 
 .. figure:: ../images/user-config-groups.png
 
-.. note: User counts for certain groups such as "All accounts" may not be
+.. note:: User counts for certain groups, such as "All accounts," may not be
    visible when using certain backends such as LDAP/AD/SAML.
 
 Click the gear icon on the lower left sidebar to set a default storage quota,
@@ -38,37 +38,36 @@ Show user backend, Send email to new users,** and **Show email address**.
 User accounts have the following properties:
 
 *Login Name (Username)*
-  The unique ID of a Nextcloud user, and it cannot be changed.
+  The unique ID of a Nextcloud user, which cannot be changed.
 
 *Full Name*
   The user's display name that appears on file shares, the Nextcloud Web
-  interface, and emails. Admins and users may change the Full Name anytime. If
-  the Full Name is not set it defaults to the login name.
+  interface, and emails. Admins and users may change the Full Name at any time. If
+  the Full Name is not set, it defaults to the login name.
 
 *Password*
-  The admin sets the new user's first password. Both the user and the admin can
-  change the user's password at anytime.
+  The admin sets the new user's initial password. Both the user and the admin can
+  change the user's password at any time.
 
 *Email address*
   You can set an email address for a user.
-  This address can be used when you first set-up an account
-  so the user receive a mail asking them to create a password if none is provided.
-  This address can be used for password reset request.
+  This address can be used when you first set up an account
+  so the user receives an email asking them to create a password if none is provided.
+  This address can also be used for password reset requests.
 
 *Groups*
-  You may create groups, and assign group memberships to users. By default new
+  You may create groups and assign group memberships to users. By default, new
   users are not assigned to any groups.
 
 *Group Admin*
-  Group admins are granted administrative privileges on specific groups, and
+  Group admins are granted administrative privileges for specific groups and
   can create and remove users from their groups. This means they can modify the
-  username, password, email, quota, etc. of members of the group. Group admins
+  username, password, email, quota, etc., of members of the group. Group admins
   are not allowed to add existing users to their groups.
 
-
 *Quota*
-  The maximum disk space assigned to each user. Any user that exceeds the quota
-  cannot upload or sync data. You have the the option to include external
+  The maximum disk space assigned to each user. Any user who exceeds the quota
+  cannot upload or sync data. You have the option to include external
   storage in user quotas.
 
 *Manager*
@@ -89,8 +88,8 @@ To create a user account:
 .. figure:: ../images/user-config-new-user.png
 
 Login names may contain letters (a-z, A-Z), numbers (0-9), dashes (-),
-underscores (_), periods (.), spaces ( ) and at signs (@). After creating the user, you
-may fill in their **Full Name** if it is different than the login name, or
+underscores (_), periods (.), spaces ( ), and at signs (@). After creating the user, you
+may fill in their **Full Name** if it is different from the login name, or
 leave it for the user to complete.
 
 If you have checked **Send email to new user** in the control panel on the
@@ -99,8 +98,8 @@ Nextcloud will automatically send them a notification with their new login
 information. You may edit this email using the email template editor on your
 Admin page (see :doc:`../configuration_server/email_configuration`).
 
-Set the **Send email to new user**-checkbox allows you to leave the **Password**
-field empty. The user will get an activation-email to set their own password.
+Setting the **Send email to new user** checkbox allows you to leave the **Password**
+field empty. The user will get an activation email to set their own password.
 
 Reset a user's password
 -----------------------
@@ -126,47 +125,45 @@ the display name of a user, but you cannot change the login name of any user.
 To set or change a user's display name:
 
 * Hover your cursor over the user's **Full Name** field
-* Click on the **Pencil icon**
+* Click on the **pencil icon**
 * Enter the user's new display name
 
-
 Granting administrator privileges to a user
 -------------------------------------------
 
 Nextcloud has two types of administrators: **Super Administrators** and **Group
-Administrators**. Group administrators have the rights to create, edit and
+Administrators**. Group administrators have the rights to create, edit, and
 delete users in their assigned groups. Group administrators cannot access
-system settings, or add or modify users in the groups that they are not **Group
-Administrators** for. Use the dropdown menus in the **Group Admin** column to
+system settings or add or modify users in groups for which they are not **Group
+Administrators**. Use the dropdown menus in the **Group Admin** column to
 assign group admin privileges.
 
 .. figure:: ../images/user-config-group-admin.png
 
-**Super Administrators** have full rights on your Nextcloud server, and can
+**Super Administrators** have full rights on your Nextcloud server and can
 access and modify all settings. To assign the **Super Administrators** role to
 a user, simply add them to the ``admin`` group.
 
-
 Managing groups
 ---------------
 
-You can assign new users to groups when you create them, and create new groups
+You can assign new users to groups when you create them and create new groups
 when you create new users. You may also use the **Add Group** button at the top
 of the left pane to create new groups. New group members will immediately
 have access to file shares that belong to their new groups.
 
-Setting Storage quotas
+Setting storage quotas
 ----------------------
 
-Click the gear on the lower left pane to set a default storage quota. This is
+Click the gear icon on the lower left pane to set a default storage quota. This is
 automatically applied to new users. You may assign a different quota to any user
 by selecting from the **Quota** dropdown, selecting either a preset value or
-entering a custom value. When you create custom quotas, use the normal
-abbreviations for your storage values such as 500 MB, 5 GB, 5 TB, and so on.
+entering a custom value. When you create custom quotas, use the standard
+abbreviations for your storage values, such as 500 MB, 5 GB, 5 TB, and so on.
 
 You now have a configurable option in ``config.php`` that controls whether
-external storage is counted against user's quotas. This is still
-experimental, and may not work as expected. The default is to not count
+external storage is counted against users' quotas. This is still
+experimental and may not work as expected. The default is to not count
 external storage as part of user storage quotas. If you prefer to include it,
 then change the default ``false`` to ``true``.
 
@@ -178,7 +175,7 @@ then change the default ``false`` to ``true``.
    be calculable and will be **ignored**.
 
 Metadata (such as thumbnails, temporary files, and encryption keys) takes up
-about 10% of disk space, but is not counted against user quotas. Users can check
+about 10% of disk space but is not counted against user quotas. Users can check
 their used and available space on their Personal pages. Only files that
 originate with users count against their quotas, and not files shared with them
 that originate from other users. For example, if you upload files to a
@@ -191,13 +188,13 @@ is calculated against the user's quota.
 
 Deleted files that are still in the trash bin do not count against quotas. The
 trash bin is set at 50% of quota. Deleted file aging is set at 30 days. When
-deleted files exceed 50% of quota then the oldest files are removed until the
+deleted files exceed 50% of quota, the oldest files are removed until the
 total is below 50%.
 
-When version control is enabled, the older file versions are not counted
+When version control is enabled, older file versions are not counted
 against quotas.
 
-When a user creates a public share via URL, and allows uploads, any uploaded
+When a user creates a public share via URL and allows uploads, any uploaded
 files count against that user's quota.
 
 Disable and enable users
@@ -206,22 +203,22 @@ Disable and enable users
 .. figure:: ../images/user-config-actions.png
 
 Sometimes you may want to disable a user without permanently deleting their
-settings and files. The user can be activated any time again, without data-loss.
+settings and files. The user can be activated again at any time, without data loss.
 
-Hover your cursor over their name on the **Users** page until the "..."-menu icon
+Hover your cursor over their name on the **Users** page until the "..." menu icon
 appears at the far right. After clicking on it, you will see the **Disable** option.
 
-The user will not longer be able to access their Nextcloud until you enable them again.
-Also all external shares, via public link or email, will not be accessible.
-Internal shares will still be working, so that other users on Nextcloud can continue working.
+The user will no longer be able to access their Nextcloud until you enable them again.
+Also, all external shares, via public link or email, will not be accessible.
+Internal shares will still be working, so other users on Nextcloud can continue working.
 
 If you wish for internal shares to be disabled as well when a user is disabled,
 activate the configuration option files_sharing:hide_disabled_user_shares::
 
  occ config:app:set files_sharing hide_disabled_user_shares --value yes
 
-You will find all disabled users in the **disabled**-section on the left pane.
-Enabling users is as easy as disabling them. Just click on the "..."-menu, and
+You will find all disabled users in the **disabled** section on the left pane.
+Enabling users is as easy as disabling them. Just click on the "..." menu, and
 select **Enable**.
 
 Deleting users
@@ -230,15 +227,31 @@ Deleting users
 .. figure:: ../images/user-config-actions.png
 
 Deleting a user is easy: hover your cursor over their name on the **Users** page
-until the "..."-menu icon appears at the far right. After clicking on it, you will
-see the **Delete** option. Clicking on it, deletes a user with all their data immediately.
+until the "..." menu icon appears at the far right. After clicking on it, you will
+see the **Delete** option. Clicking on it deletes a user with all their data immediately.
 
-You'll see an undo button at the top of the page, which remains for some seconds.
-When the undo button is gone you cannot recover the deleted user.
+You'll see an undo button at the top of the page, which remains for a few seconds.
+When the undo button is gone, you cannot recover the deleted user.
 
 All of the files owned by the user are deleted as well, including all files they
 have shared. If you need to preserve the user's files and shares, you must first
 download them from your Nextcloud Files page, which compresses them into a zip
 file, or use a sync client to copy them to your local computer. See
 :doc:`../configuration_files/file_sharing_configuration` to learn how to create
 persistent file shares that survive user deletions.
+
+Disabling the "Your email address [...] was changed" email 
+----------------------------------------------------------
+
+If an email address of a user is changed by an admin, then it triggers an email
+to the user that states "Your email address on [URL] was changed by an
+administrator.". In some cases this should not be triggered, because it was a
+normal maintenance change. To disable this specific email the appconfig option
+``disable_email.email_address_changed_by_admin`` can be set to ``yes``::
+
+	occ config:app:set settings disable_activity.email_address_changed_by_admin --value yes
+
+To disable this behaviour change it to any other value or delete the app config::
+
+	occ config:app:delete settings disable_activity.email_address_changed_by_admin
+