diff --git a/static/images/help/login-with-github.png b/static/images/help/login-with-github.png new file mode 100644 index 0000000000..8aa9e7774a Binary files /dev/null and b/static/images/help/login-with-github.png differ diff --git a/static/images/help/login-with-google.png b/static/images/help/login-with-google.png new file mode 100644 index 0000000000..6a74093437 Binary files /dev/null and b/static/images/help/login-with-google.png differ diff --git a/static/images/help/signin-github.png b/static/images/help/signin-github.png deleted file mode 100644 index 08fc3dd8aa..0000000000 Binary files a/static/images/help/signin-github.png and /dev/null differ diff --git a/static/images/help/signin-google.png b/static/images/help/signin-google.png deleted file mode 100644 index 2cf676273c..0000000000 Binary files a/static/images/help/signin-google.png and /dev/null differ diff --git a/templates/zerver/help/signing-in.md b/templates/zerver/help/signing-in.md index 6f50486efd..a494651709 100644 --- a/templates/zerver/help/signing-in.md +++ b/templates/zerver/help/signing-in.md @@ -1,13 +1,13 @@ -# Signing in +# Logging in -Zulip offers three ways to sign in: e-mail and password, Google +Zulip offers three ways to log in: e-mail and password, Google credentials, and GitHub credentials. Your organization's administrator may choose to enable or disable any of these options. So don't worry if your login page doesn't have some of the options described here! -## Signing in with your email address +## Logging in with your email address -You can sign into your Zulip organization using your email address by +You can log into your Zulip organization using your email address by following a few simple steps. 1. In the field labeled **Email**, enter the email address that you @@ -28,26 +28,26 @@ following a few simple steps. [Change your password](/help/change-your-password) page for instructions on how to reset it. -## Signing in with your Google account +## Logging in with your Google account -If your organization has enabled Google authentication, you can sign +If your organization has enabled Google authentication, you can log into Zulip using your Google account by following a few simple steps. -1. Click the **Sign in with Google** button located under the +1. Click the **Log in with Google** button located under the **Login** button and **Forgot your password?** link. - ![Zulip sign in Google](/static/images/help/signin-google.png) + ![Zulip log in Google](/static/images/help/login-with-google.png) 2. If you are not signed into a Google account, Google will ask you to enter the credentials to your Google account. - ![Zulip sign in Google login](/static/images/help/google-login.png) + ![Zulip log in Google login](/static/images/help/google-login.png) -3. If you're signing into Zulip with a Google account for the first +3. If you're logging into Zulip with a Google account for the first time, you will be taken to a page titled **Request for permission**. - ![Zulip sign in Google Request Permission](/static/images/help/google-request.png) + ![Zulip log in Google Request Permission](/static/images/help/google-request.png) Zulip requires knowledge of your email address and basic profile info, such as your name, for login purposes. @@ -57,24 +57,24 @@ into Zulip using your Google account by following a few simple steps. If you click the **Deny** button, Zulip cannot finish logging you in, and you will be redirected to the Zulip login page. -## Signing in with your GitHub account +## Logging in with your GitHub account -If your organization has enabled GitHub authentication, you can sign into +If your organization has enabled GitHub authentication, you can log into Zulip using your GitHub account by following a few simple steps. -1. Click the **Sign in with GitHub** button located under the **Sign in with Google** button. +1. Click the **Log in with GitHub** button located under the **Log in with Google** button. - ![Zulip sign in GitHub](/static/images/help/signin-github.png) + ![Zulip log in GitHub](/static/images/help/login-with-github.png) -2. If you are not signed into a GitHub account, GitHub will ask you to +2. If you are not logged into a GitHub account, GitHub will ask you to enter the credentials for your GitHub account. - ![Zulip sign in GitHub login](/static/images/help/github-login.png) + ![Zulip log in GitHub login](/static/images/help/github-login.png) -3. If you're signing into Zulip with a GitHub account for the first +3. If you're logging into Zulip with a GitHub account for the first time, you will be taken to a page titled **Authorize application**. - ![Zulip sign in GitHub Request Permission](/static/images/help/github-request.png) + ![Zulip log in GitHub Request Permission](/static/images/help/github-request.png) Zulip requires user data such as your email address and name for login purposes.