From e76bcba56bb07eaedd616d0019dc0c27028e8269 Mon Sep 17 00:00:00 2001 From: Jackson Date: Sat, 14 Jan 2017 05:00:30 +1100 Subject: [PATCH] Fix spelling and grammatical errors in zerver/help docs. --- templates/zerver/help/add-a-bot-or-integration.md | 2 +- templates/zerver/help/add-emoji.md | 2 +- templates/zerver/help/browse-and-join-streams.md | 2 +- templates/zerver/help/change-the-date-and-time-format.md | 2 +- templates/zerver/help/change-who-can-join-a-stream.md | 2 +- templates/zerver/help/change-your-password.md | 2 +- .../zerver/help/check-whether-someone-is-here-or-away.md | 2 +- templates/zerver/help/collapse-a-message.md | 2 +- templates/zerver/help/deactivate-or-reactivate-a-user.md | 2 +- templates/zerver/help/send-a-status-message.md | 2 +- templates/zerver/help/set-default-streams-for-new-users.md | 2 +- templates/zerver/help/star-a-message.md | 4 ++-- .../verify-that-your-message-has-been-successfully-sent.md | 5 +++-- templates/zerver/help/view-information-about-a-message.md | 2 +- templates/zerver/help/view-messages-from-a-user.md | 4 ++-- templates/zerver/help/zulip-on-android.md | 4 ++-- 16 files changed, 21 insertions(+), 20 deletions(-) diff --git a/templates/zerver/help/add-a-bot-or-integration.md b/templates/zerver/help/add-a-bot-or-integration.md index 08abe2db5b..f0edb7de49 100644 --- a/templates/zerver/help/add-a-bot-or-integration.md +++ b/templates/zerver/help/add-a-bot-or-integration.md @@ -1,6 +1,6 @@ # Add a Bot or Integration -Bots and integrations are features that are accesible to all members of an organization. +Bots and integrations are features that are accessible to all members of an organization. ## To Add a Bot diff --git a/templates/zerver/help/add-emoji.md b/templates/zerver/help/add-emoji.md index 118d3635a0..3242a8cb18 100644 --- a/templates/zerver/help/add-emoji.md +++ b/templates/zerver/help/add-emoji.md @@ -8,7 +8,7 @@ menu, pasting Unicode, or manually inputting the emoji code. 1. Start by composing a [new message](/help/reply-to-a-message). 2. Click the smiley face () icon under the left edge of the message box. -3. Click on any emoji to include it in your messsage. +3. Click on any emoji to include it in your message. ## Pasting Unicode Zulip fully supports Unicode emoji. To use Unicode emoji in your message: diff --git a/templates/zerver/help/browse-and-join-streams.md b/templates/zerver/help/browse-and-join-streams.md index 73c0598b50..8616f2ca1f 100644 --- a/templates/zerver/help/browse-and-join-streams.md +++ b/templates/zerver/help/browse-and-join-streams.md @@ -58,7 +58,7 @@ button. ### Subscribing later -However, if the you were not notified about the stream's creation, +However, if you were not notified about the stream's creation, you can subscribe to a stream by navigating to the [Subscriptions](/#subscriptions) page. diff --git a/templates/zerver/help/change-the-date-and-time-format.md b/templates/zerver/help/change-the-date-and-time-format.md index fc6c06f4e7..52e6de6e20 100644 --- a/templates/zerver/help/change-the-date-and-time-format.md +++ b/templates/zerver/help/change-the-date-and-time-format.md @@ -1,7 +1,7 @@ # Change the date and time format By default, messages in Zulip are displayed with a 12-hour timestamp. If you are -used to seeing time displayed in a 24-hour format, you can change the Zulip +used to seeing the time displayed in a 24-hour format, you can change the Zulip timestamp's format from a 12-hour format to a 24-hour format. You may want to do this to avoid confusion between A.M. and P.M. hours. diff --git a/templates/zerver/help/change-who-can-join-a-stream.md b/templates/zerver/help/change-who-can-join-a-stream.md index b5d43536c3..3acaa83b2e 100644 --- a/templates/zerver/help/change-who-can-join-a-stream.md +++ b/templates/zerver/help/change-who-can-join-a-stream.md @@ -4,7 +4,7 @@ If you are a Zulip organization administrator, you can change who can join your stream by changing the stream's accessibility. Please note that any users that were previously subscribed to the stream will -remain subscribed to the stream after you change the stream's accesibility. +remain subscribed to the stream after you change the stream's accessibility. ## Make a public stream private diff --git a/templates/zerver/help/change-your-password.md b/templates/zerver/help/change-your-password.md index 7d29c33032..e9a256a33a 100644 --- a/templates/zerver/help/change-your-password.md +++ b/templates/zerver/help/change-your-password.md @@ -5,7 +5,7 @@ {!go-to-the.md!} [Your account](/#settings/your-account) {!settings.md!} 2. Click the **Change password** button located underneath your name. -3. You will be asked first to enter your old password, and then to +3. You will first be asked to enter your old password, and then to enter a new password and to confirm it. 4. Click **Save changes** to apply your new password. diff --git a/templates/zerver/help/check-whether-someone-is-here-or-away.md b/templates/zerver/help/check-whether-someone-is-here-or-away.md index 09bfa04c1a..7372d3f999 100644 --- a/templates/zerver/help/check-whether-someone-is-here-or-away.md +++ b/templates/zerver/help/check-whether-someone-is-here-or-away.md @@ -11,7 +11,7 @@ user’s name, in the user list located at the right sidebar by default. * A white, circle () means the user is not active and was not recently so. - * A orange half-filled circle + * An orange half-filled circle () means the user is “not active” but was recently so. diff --git a/templates/zerver/help/collapse-a-message.md b/templates/zerver/help/collapse-a-message.md index 24a0de0366..6ab7b22653 100644 --- a/templates/zerver/help/collapse-a-message.md +++ b/templates/zerver/help/collapse-a-message.md @@ -11,4 +11,4 @@ message. !!! tip "" To uncollapse a message, click the **[More...]** hyperlink near the - bottom of a collasped message. + bottom of a collapsed message. diff --git a/templates/zerver/help/deactivate-or-reactivate-a-user.md b/templates/zerver/help/deactivate-or-reactivate-a-user.md index b2410b5afc..e7a5d99563 100644 --- a/templates/zerver/help/deactivate-or-reactivate-a-user.md +++ b/templates/zerver/help/deactivate-or-reactivate-a-user.md @@ -5,7 +5,7 @@ user's account in their organization. ## Deactivate a user -To properly remove a user’s access to a Zulip orgnanization, it does not +To properly remove a user’s access to a Zulip organization, it does not suffice to change their password or deactivate their account in the SSO system, since neither of those actions prevents authentication with the user’s API key or any API keys of the bots the user has created. diff --git a/templates/zerver/help/send-a-status-message.md b/templates/zerver/help/send-a-status-message.md index dbc5b052d0..f006581653 100644 --- a/templates/zerver/help/send-a-status-message.md +++ b/templates/zerver/help/send-a-status-message.md @@ -15,4 +15,4 @@ name, like this: !!! tip "" Status messages are frequently written in third person, in order to make - them look gramatically coherent. + them look grammatically coherent. diff --git a/templates/zerver/help/set-default-streams-for-new-users.md b/templates/zerver/help/set-default-streams-for-new-users.md index 4df40bd29b..9a43bcd493 100644 --- a/templates/zerver/help/set-default-streams-for-new-users.md +++ b/templates/zerver/help/set-default-streams-for-new-users.md @@ -7,7 +7,7 @@ following steps. {!go-to-the.md!} [Default streams](/#administration/default-streams-list) {!admin.md!} -2. To add a new stream to **Default streams**, enter the name of stream in the +2. To add a new stream to **Default streams**, enter the name of the stream in the box next to **Stream Name**. Autocompletion suggestions will appear in a dropdown as you type; select the stream name from the dropdown. diff --git a/templates/zerver/help/star-a-message.md b/templates/zerver/help/star-a-message.md index e584c27899..cc80c034be 100644 --- a/templates/zerver/help/star-a-message.md +++ b/templates/zerver/help/star-a-message.md @@ -5,8 +5,8 @@ tasks you need to go back to or documents you reference often. {!message-actions.md!} the star () icon. 2. After starring a message, a filled star () -icon appears next to the timestamp of the message, confirming the success of -your starring of the message. +icon appears next to the timestamp of the message, confirming that the message has been +starred. You can click on the filled star () icon next to a starred message to unstar the message. diff --git a/templates/zerver/help/verify-that-your-message-has-been-successfully-sent.md b/templates/zerver/help/verify-that-your-message-has-been-successfully-sent.md index e98b9cf971..7673c8b40b 100644 --- a/templates/zerver/help/verify-that-your-message-has-been-successfully-sent.md +++ b/templates/zerver/help/verify-that-your-message-has-been-successfully-sent.md @@ -37,5 +37,6 @@ timestamp on the right side of the message body. ![Message time](/static/images/help/message-exact-time.png) Zulip is designed to store locally echoed message content in local -storage and replay it when your browser reconnects to the Internet, to -avoid issues where messages users thought they sent are lost. +storage and replay it when your browser reconnects to the Internet. +This should ensure that messages that users thought they had sent get +delivered eventually. diff --git a/templates/zerver/help/view-information-about-a-message.md b/templates/zerver/help/view-information-about-a-message.md index 5a6798fed0..08c8c1600b 100644 --- a/templates/zerver/help/view-information-about-a-message.md +++ b/templates/zerver/help/view-information-about-a-message.md @@ -22,7 +22,7 @@ to. 2. The **Sent by** section displays the username and email address of the message sender. - In this example, **King Hamlet** sent the messsage. His email address is + In this example, **King Hamlet** sent the message. His email address is **hamlet@zulip.com**. 3. This **Timestamp** section shows the exact date and time at which the message diff --git a/templates/zerver/help/view-messages-from-a-user.md b/templates/zerver/help/view-messages-from-a-user.md index 83d5e23f5a..7747522c2b 100644 --- a/templates/zerver/help/view-messages-from-a-user.md +++ b/templates/zerver/help/view-messages-from-a-user.md @@ -7,8 +7,8 @@ the following steps. **Note**: Your private message history will not include messages sent in group private messages. -1. Click on the name of the user that you want to see your messages with in the -user's list located at the right sidebar. +1. Click on the name of the user that you want to see your messages with, in the +user's list located in the right sidebar. 2. Upon clicking on the user's name, your view will be narrowed to all of your private messages with the selected user. diff --git a/templates/zerver/help/zulip-on-android.md b/templates/zerver/help/zulip-on-android.md index 0da63e483a..7dc3ceb9c4 100644 --- a/templates/zerver/help/zulip-on-android.md +++ b/templates/zerver/help/zulip-on-android.md @@ -12,10 +12,10 @@ for your server's address appears. You have to write the server's URL in it, and press **Enter**. !!! warn "" - **Note:** There's no need to add `https://` in case your server is running secure + **Note:** There's no need to add `https://` in case your server is running a secure HTTP (HTTPS) protocol. - However, if your server uses a unsecure HTTP connection, you'll have to + However, if your server uses an insecure HTTP connection, you'll have to write `http://` manually. A message will appear, warning you about the risks of using this type of connections. In case you have no other choice, choose the **Use HTTP** option.