Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

user docs: Merge user restrictions on email address and name.

This commit is contained in:
Lyla Fischer 2018-02-17 13:50:16 -05:00 committed by Rishi Gupta
parent e396897a06
commit 502264f208
3 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
templates/zerver/help/include/sidebar.md
View File

@ -127,8 +127,7 @@
* [Restrict stream creation](/help/only-allow-admins-to-create-new-streams-feature)
* [Change who can add custom emoji](/help/only-allow-admins-to-add-emoji)
* [Block image and link previews](/help/allow-image-link-previews)
* [Prevent users from changing their name](/help/prevent-users-from-changing-their-name)
* [Prevent users from changing their email](/help/prevent-users-from-changing-their-email-address)
* [Restrict name and email changes](/help/restrict-name-and-email-changes)
* [Disable message edit history](/help/disable-message-edit-history)
* [Manage editing of old messages](/help/restrict-editing-of-old-messages-and-topics)
* [Require topics in stream messages](/help/require-users-to-include-topics-in-stream-messages)

15
templates/zerver/help/prevent-users-from-changing-their-name.md
View File

@ -1,15 +0,0 @@
# Prevent users from changing their name
{!admin-only.md!}
By default, any user can change their name by going through the
steps given [here](/help/change-your-name), but administrators can enable a
setting that prevents them from changing their own names via the Zulip UI.
{!go-to-the.md!} [Organization permissions](/#organization/organization-permissions)
{!admin.md!}
2. Select the **Prevent users from changing their name** checkbox under the
**User identity** section.
{!save-changes.md!} organization settings.

22
templates/zerver/help/prevent-users-from-changing-their-email-address.md → templates/zerver/help/restrict-name-and-email-changes.md
View File

@ -1,7 +1,13 @@
# Prevent users from changing their email address
# Restrict name and email changes
{!admin-only.md!}
{!go-to-the.md!} [Organization permissions](/#organization/organization-permissions)
{!admin.md!}
# Prevent users from changing their email address
By default, any user can change their own email address by going
through an email confirmation process that confirms they own both the
account and new email address.
@ -11,10 +17,18 @@ solution where a user's account is managed elsewhere, you can enable a
setting that prevents them from changing their own email address via
the Zulip UI.
{!go-to-the.md!} [Organization permissions](/#organization/organization-permissions)
{!admin.md!}
2. Select the **Prevent users from changing their email address** checkbox
under the **User identity** section.
{!save-changes.md!} organization settings.
# Prevent users from changing their name
By default, any user can change their name by going through the
steps given [here](/help/change-your-name), but administrators can enable a
setting that prevents them from changing their own names via the Zulip UI.
2. Select the **Prevent users from changing their name** checkbox under the
**User identity** section.
{!save-changes.md!} organization settings.