From 01a7ed952d5943f12be080f1e7da1a5ceacdbcee Mon Sep 17 00:00:00 2001 From: Rishi Gupta Date: Tue, 8 May 2018 17:30:08 -0700 Subject: [PATCH] user docs: Update a few articles in account basics. --- .../zerver/help/change-your-email-address.md | 30 ++++++++-------- templates/zerver/help/change-your-name.md | 22 +++++------- templates/zerver/help/change-your-password.md | 36 +++++++++---------- 3 files changed, 41 insertions(+), 47 deletions(-) diff --git a/templates/zerver/help/change-your-email-address.md b/templates/zerver/help/change-your-email-address.md index bb8af11664..4adcfdf519 100644 --- a/templates/zerver/help/change-your-email-address.md +++ b/templates/zerver/help/change-your-email-address.md @@ -1,23 +1,21 @@ # Change your email address -If enabled by Zulip organization administrator, you can change your email address -using the following steps. +By default, anyone can change their email address at any time. + +Organization adminstrators can +[restrict users to certain email domains](/help/change-a-users-name), or +[prevent users from changing their email](/help/restrict-name-and-email-changes). {settings_tab|your-account} -2. Click on the **[Change]** link beside your email address. +2. Under **User settings**, click on the button with your email address. + +3. Enter your new email, and click **Change**. + +4. You will receive a confirmation email within a few minutes. Open it and click **Confirm email change**. !!! warn "" - **Note:** If you do not see the [Change] link, - it is probably because your organization's administrators - have disabled change of email addresses. - If that's the case, then you need to ask them to - allow users to change their email address. - -3. Change your email in the **Email** field. - -4. Click on the **Change** button to receive a confirmation mail. - -5. Click on the **Confirmation link** send to your new email address. - -Congratulations! You have updated your email address. + **Note:** If you are unable to click on the button with your email address, check + that your organization allows email changes. Follow the steps at + [prevent users from changing their names](/help/restrict-name-and-email-changes) + to view your organization's settings. diff --git a/templates/zerver/help/change-your-name.md b/templates/zerver/help/change-your-name.md index 2c3eb27740..2430ad8f6b 100644 --- a/templates/zerver/help/change-your-name.md +++ b/templates/zerver/help/change-your-name.md @@ -3,22 +3,18 @@ By default, everyone can change their name in Zulip. You can write your name in any language you'd like. -Organization administrators can -[change anyone's name](/help/change-a-users-name), and +Organization administrators can [change anyone's name](/help/change-a-users-name), and [prevent users from changing their names](/help/restrict-name-and-email-changes). This is useful when users' names are managed via LDAP or another data source. -1. From your desktop, click on the **gear** - () in the upper right corner. +{settings_tab|your-account} -1. Select **Settings** from the dropdown. - -1. Click the button with your name in it, under **User settings**. - - !!! warn "" - **Note:** If clicking on the button doesn't work, check that your - organization allows name changes. Follow the steps at - [prevent users from changing their names](/help/restrict-name-and-email-changes) - and see if the relevant box is checked. +1. Under **User settings**, click on the button with your name in it. 1. Change your name, and click **Save**. + + !!! warn "" + **Note:** If you are unable to click on the button with your name, check + that your organization allows name changes. Follow the steps at + [prevent users from changing their names](/help/restrict-name-and-email-changes) + to view your organization's settings. diff --git a/templates/zerver/help/change-your-password.md b/templates/zerver/help/change-your-password.md index a2730309b9..2ae821f1a9 100644 --- a/templates/zerver/help/change-your-password.md +++ b/templates/zerver/help/change-your-password.md @@ -1,25 +1,25 @@ # Change your password -## If you know your current password +You can reset your password at any time, as long as you either know your +current password, or have access to the email address associated with your +account. +### If you've forgotten or never had a password + +1. Log out. + +1. Go to your organization's login page. + +2. Below the **Password** field, click **Forgot password**. + +3. Enter your email address, and click **Reset password**. + +4. You will receive a confirmation email within a few minutes. Open it and click **Reset password**. + +### If you know your current password {settings_tab|your-account} -2. Click the **Change password** button located underneath your name. -3. You will first be asked to enter your old password, and then to - enter a new password and to confirm it. +2. Under **User settings**, click on the password field (it should look like `********`). - !!! warn "" - **Note:** Your password must be six characters or longer. - -{!save-changes.md!} account settings. - -## If you forgot your password -If you've forgotten your password, you can easily reset it using your e-mail. - -1. Go to your organization's Zulip homepage. -2. Click the **Forgot password?** link below the **Password** field. -3. In the new form you see, enter your email address in the **Email** field -and click the **Reset password** button. - -You will receive an email with instructions on how to reset your password. +3. Enter your old password and your new password, and click **Change**.