user docs: Update a few articles in account basics.

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
+By default, anyone can change their email address at any time.
-using the following steps.
+
+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,
+        **Note:** If you are unable to click on the button with your email address, check
-        it is probably because your organization's administrators
+        that your organization allows email changes. Follow the steps at
-        have disabled change of email addresses.
+        [prevent users from changing their names](/help/restrict-name-and-email-changes)
-        If that's the case, then you need to ask them to
+        to view your organization's settings.
-        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.

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
+Organization administrators can [change anyone's name](/help/change-a-users-name), and
-[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**
+{settings_tab|your-account}
-   (<i class="icon-vector-cog"></i>) in the upper right corner.
 
-1. Select **Settings** from the dropdown.
+1. Under **User settings**, click on the button with your name in it.
-
-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. 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.

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.
+2. Under **User settings**, click on the password field (it should look like `********`).
-3. You will first be asked to enter your old password, and then to
-   enter a new password and to confirm it.
 
-    !!! warn ""
+3. Enter your old password and your new password, and click **Change**.
-        **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.