Skip to content

Commit 835ee69

Browse files
committed
docs: Fix grammar errors found by mwic.
Signed-off-by: Anders Kaseorg <[email protected]>
1 parent 7807bff commit 835ee69

30 files changed

+33
-33
lines changed

Dockerfile-postgresql

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# -f ./Dockerfile-postgresql -t zulip/zulip-postgresql:14 --push .
99

1010
# Currently the PostgreSQL images do not support automatic upgrading of
11-
# the on-disk data in volumes. So the base image can not currently be upgraded
11+
# the on-disk data in volumes. So the base image cannot currently be upgraded
1212
# without users needing a manual pgdump and restore.
1313

1414
# https://hub.docker.com/r/groonga/pgroonga/tags

docs/documentation/api.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ We can see in the traceback that a `SchemaError` was raised in
469469
raise SchemaError(message) from None
470470
```
471471

472-
The next line in the output, let's us know how many errors were found
472+
The next line in the output, lets us know how many errors were found
473473
and for what endpoint.
474474

475475
```console

docs/outreach/experience.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ help you along.
3838

3939
Don't forget to have fun! Spending a few months coding on open source is an
4040
amazing opportunity, and we hope you'll have a blast. Your acceptance to the
41-
program means that we we are confident that if you put in the effort, your
41+
program means that we are confident that if you put in the effort, your
4242
contributions to the open source world will be something you can be proud of for
4343
the rest of your life.
4444

docs/subsystems/markdown.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ this file:
6464
rendered content, since the APNS and GCM push notification systems
6565
don't support richer markup. Mostly, this involves stripping HTML,
6666
but there's some syntax we take special care with. Tests for what
67-
this plain-text version of content should be are stored in the
67+
this plain-text version of content should be stored in the
6868
`text_content` field.
6969

7070
If you're going to manually test some changes in the frontend Markdown

help/scim.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ for Zulip.
1212
Zulip's SCIM integration has the following limitations:
1313

1414
* Provisioning Groups is not yet implemented.
15-
* While Zulip's SCIM integration is generic, it has has only been
15+
* While Zulip's SCIM integration is generic, it has only been
1616
fully tested and documented with Okta's SCIM provider, and it is
1717
possible minor adjustments may be required. [Zulip
1818
support](/help/contact-support) is happy to help customers configure
@@ -71,7 +71,7 @@ Zulip's SCIM integration has the following limitations:
7171
* **familyName**
7272

7373
1. **Optional:** If you'd like to also sync [user role](/help/roles-and-permissions),
74-
you can do it by by adding a custom attribute in Okta. Go to the **Profile Editor**,
74+
you can do it by adding a custom attribute in Okta. Go to the **Profile Editor**,
7575
click into the entry of the SCIM app you've just set up and **Add Attribute**.
7676
Configure the following:
7777
* **Data type**: `string`

puppet/zulip_ops/manifests/profile/base.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118

119119
$hosting_provider = zulipconf('machine', 'hosting_provider', 'ec2')
120120
if $hosting_provider == 'ec2' {
121-
# This conditional block is for for whether it's not
121+
# This conditional block is for whether it's not
122122
# chat.zulip.org, which uses a different hosting provider.
123123
file { '/root/.ssh/authorized_keys':
124124
ensure => file,

scripts/lib/email-mirror-postfix

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Also you can use optional keys to configure the script and change default values
3030
the HTTP requests made by this tool.
3131
3232
-d HOST Destination Zulip host for email uploading. Address must contain type of
33-
HTTP protocol, i.e "https://example.com". Default value: "https://127.0.0.1".
33+
HTTP protocol, e.g. "https://example.com". Default value: "https://127.0.0.1".
3434
3535
-u URL Destination relative for email uploading. Default value: "/email_mirror_message".
3636

scripts/lib/setup_venv.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def try_to_copy_venv(venv_path: str, new_packages: Set[str]) -> bool:
179179
continue
180180

181181
old_packages = get_venv_packages(curr_venv_path)
182-
# We only consider using using old virtualenvs that only
182+
# We only consider using old virtualenvs that only
183183
# contain packages that we want in our new virtualenv.
184184
if not (old_packages - new_packages):
185185
overlap = new_packages & old_packages

tools/total-contributions

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Its main downside is that contributions to projects other than
9898
zulip/zulip in the last few weeks before a zulip/zulip release will be
9999
delayed (i.e. counted in the total for the next zulip/zulip release).
100100
101-
Expects that all Zulip repositories repositories are in the current working
101+
Expects that all Zulip repositories are in the current working
102102
directory, which does not need to be the directory this is run from.
103103
104104
# Changes between two major releases.

web/src/alert_words.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export function process_message(message: Message): void {
6868
// case when there is an alert word just before `<` or `>`.
6969
const check_string = pre_match + match.slice(0, -1);
7070
const in_tag = check_string.lastIndexOf("<") > check_string.lastIndexOf(">");
71-
// Matched word is inside a HTML tag so don't perform any highlighting.
71+
// Matched word is inside an HTML tag so don't perform any highlighting.
7272
if (in_tag) {
7373
return before + word + after;
7474
}

web/src/copy_and_paste.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ function get_end_tr_from_endc($endc) {
273273
// We can tell this is the case because the selection isn't inside a
274274
// `messagebox-content` div, which is where the message text itself is.
275275
// TODO: Ideally make it so that the selection cannot end there.
276-
// For now, we find find the message row directly above wherever the
276+
// For now, we find the message row directly above wherever the
277277
// selection ended.
278278
if ($endc.closest(".messagebox-content").length === 0) {
279279
// If the selection ends within the message following the selected

web/src/message_viewport.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function make_dimen_wrapper(dimen_name, dimen_func) {
3131
export const height = make_dimen_wrapper("height", $.fn.height);
3232
export const width = make_dimen_wrapper("width", $.fn.width);
3333

34-
// TODO: This function let's us use the DOM API instead of jquery
34+
// TODO: This function lets us use the DOM API instead of jquery
3535
// (<10x faster) for condense.js, but we want to eventually do a
3636
// bigger of refactor `height` and `width` above to do the same.
3737
export function max_message_height() {

web/src/people.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ export function slug_to_emails(slug: string): string | undefined {
707707
/*
708708
It's not super important to be flexible about
709709
direct message related slugs, since you would
710-
rarely post them to the web, but we we do want
710+
rarely post them to the web, but we do want
711711
to support reasonable variations:
712712
713713

web/src/reactions.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ function update_ui_and_send_reaction_ajax(message_id, reaction_info) {
109109

110110
export function toggle_emoji_reaction(message_id, emoji_name) {
111111
// This codepath doesn't support toggling a deactivated realm emoji.
112-
// Since an user can interact with a deactivated realm emoji only by
112+
// Since a user can interact with a deactivated realm emoji only by
113113
// clicking on a reaction and that is handled by `process_reaction_click()`
114114
// method. This codepath is to be used only where there is no chance of an
115115
// user interacting with a deactivated realm emoji like emoji picker.

web/src/spoilers.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export function initialize(): void {
5656
const $target = $(e.target);
5757

5858
// Spoiler headers can contain Markdown, including links. We
59-
// return so that clicking such links will be be processed by
59+
// return so that clicking such links will be processed by
6060
// the browser rather than opening the header.
6161
if ($target.closest("a").length > 0) {
6262
return;

web/src/stream_data.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ export function is_default_stream_id(stream_id: number): boolean {
668668

669669
export function get_name(stream_name: string): string {
670670
// This returns the actual name of a stream if we are subscribed to
671-
// it (i.e "Denmark" vs. "denmark"), while falling thru to
671+
// it (e.g. "Denmark" vs. "denmark"), while falling thru to
672672
// stream_name if we don't have a subscription. (Stream names
673673
// are case-insensitive, but we try to display the actual name
674674
// when we know it.)

web/src/stream_edit.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ export function initialize() {
405405
});
406406

407407
$("#streams_overlay_container").on("keypress", "#change_stream_description", (e) => {
408-
// Stream descriptions can not be multiline, so disable enter key
408+
// Stream descriptions cannot be multiline, so disable enter key
409409
// to prevent new line
410410
if (keydown_util.is_enter_event(e)) {
411411
return false;

web/src/user_card_popover.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export const user_card = new PopoverMenu();
100100

101101
function popover_items_handle_keyboard_with_overrides(key, $items) {
102102
/* Variant of popover_items_handle_keyboard with somewhat hacky
103-
* logic for for opening the manage menu. */
103+
* logic for opening the manage menu. */
104104
if (!$items) {
105105
return;
106106
}

web/tests/lib/namespace.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ function template_stub({filename, actual_render}) {
109109

110110
if (exercise_template) {
111111
// If our dev wants to exercise the actual template, then do so.
112-
// We set the in_mid_render bool so that included (i.e partial)
112+
// We set the in_mid_render bool so that included (i.e. partial)
113113
// templates get rendered.
114114
in_mid_render = true;
115115
const html = actual_render(...args);

web/tests/stream_data.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ test("get_streams_for_user", () => {
253253
// #social: current user is can get this as neither this is invite only nor current
254254
// user is a guest.
255255
// #test: current user is no longer subscribed to a private stream, so
256-
// he can not see whether test_user is subscribed to it.
256+
// he cannot see whether test_user is subscribed to it.
257257
assert.deepEqual(stream_data.get_streams_for_user(test_user.user_id).subscribed, [
258258
denmark,
259259
social,

web/tests/typeahead_helper.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ test("sort_languages", () => {
316316
assert.deepEqual(test_langs, ["j", "javascript", "java"]);
317317

318318
// (Only one alias should be shown per language
319-
// (i.e searching for "js" shouldn't show "javascript")
319+
// (e.g. searching for "js" shouldn't show "javascript")
320320
test_langs = ["js", "javascript", "java"];
321321
test_langs = th.sort_languages(test_langs, "js");
322322
assert.deepEqual(test_langs, ["js", "java"]);

web/third/bootstrap/js/bootstrap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113

114114
if (!isActive) {
115115
if ('ontouchstart' in document.documentElement) {
116-
// if mobile we we use a backdrop because click events don't delegate
116+
// if mobile we use a backdrop because click events don't delegate
117117
$('<div class="dropdown-backdrop"/>').insertBefore($(this)).on('click', clearMenus)
118118
}
119119
$parent.toggleClass('open')

zerver/actions/realm_emoji.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def check_add_realm_emoji(
4141
emoji_file_name = get_emoji_file_name(image_file.name, realm_emoji.id)
4242

4343
# The only user-controlled portion of 'emoji_file_name' is an extension,
44-
# which can not contain '..' or '/' or '\', making it difficult to exploit
44+
# which cannot contain '..' or '/' or '\', making it difficult to exploit
4545
emoji_file_name = mark_sanitized(emoji_file_name)
4646

4747
emoji_uploaded_successfully = False

zerver/lib/markdown/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ def is_image(self, url: str) -> bool:
732732
if not self.zmd.image_preview_enabled:
733733
return False
734734
parsed_url = urllib.parse.urlparse(url)
735-
# remove HTML URLs which end with image extensions that can not be shorted
735+
# remove HTML URLs which end with image extensions that cannot be shorted
736736
if parsed_url.netloc == "pasteboard.co":
737737
return False
738738

zerver/lib/upload/base.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ def resize_emoji(
137137
) -> Tuple[bytes, bool, Optional[bytes]]:
138138
# This function returns three values:
139139
# 1) Emoji image data.
140-
# 2) If emoji is gif i.e animated.
141-
# 3) If is animated then return still image data i.e first frame of gif.
140+
# 2) If emoji is gif i.e. animated.
141+
# 3) If is animated then return still image data i.e. first frame of gif.
142142

143143
try:
144144
im = Image.open(io.BytesIO(image_data))

zerver/openapi/zulip.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3961,7 +3961,7 @@ paths:
39613961
type: object
39623962
additionalProperties:
39633963
description: |
3964-
Boolean describing whether the authentication method (i.e its key)
3964+
Boolean describing whether the authentication method (i.e. its key)
39653965
is enabled in this organization.
39663966
type: boolean
39673967
description: |
@@ -13759,7 +13759,7 @@ paths:
1375913759
type: object
1376013760
additionalProperties:
1376113761
description: |
13762-
Boolean describing whether the authentication method (i.e its key)
13762+
Boolean describing whether the authentication method (i.e. its key)
1376313763
is enabled in this organization.
1376413764
type: boolean
1376513765
description: |

zerver/tests/test_realm_emoji.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ def test_failed_file_upload(self) -> None:
346346
self.assert_json_error(result, "Broken")
347347

348348
def test_check_admin_realm_emoji(self) -> None:
349-
# Test that an user A is able to remove a realm emoji uploaded by him
349+
# Test that a user A is able to remove a realm emoji uploaded by him
350350
# and having same name as a deactivated realm emoji uploaded by some
351351
# other user B.
352352
emoji_author_1 = self.example_user("cordelia")

zerver/tests/test_subs.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4734,7 +4734,7 @@ def test_subscribe_to_stream_post_policy_admins_stream(self) -> None:
47344734

47354735
def test_subscribe_to_stream_post_policy_restrict_new_members_stream(self) -> None:
47364736
"""
4737-
New members can subscribe to streams where they can not post
4737+
New members can subscribe to streams where they cannot post
47384738
"""
47394739
new_member_email = self.nonreg_email("test")
47404740
self.register(new_member_email, "test")

zerver/views/message_edit.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def validate_can_delete_message(user_profile: UserProfile, message: Message) ->
158158
# None means no time limit to delete message
159159
return
160160
if (timezone_now() - message.date_sent) > datetime.timedelta(seconds=deadline_seconds):
161-
# User can not delete message after deadline time of realm
161+
# User cannot delete message after deadline time of realm
162162
raise JsonableError(_("The time limit for deleting this message has passed"))
163163
return
164164

zerver/views/video_calls.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def get_bigbluebutton_url(
195195
id = "zulip-" + str(random.randint(100000000000, 999999999999))
196196
password = b32encode(secrets.token_bytes(20)).decode() # 20 bytes means 32 characters
197197

198-
# We sign our data here to ensure a Zulip user can not tamper with
198+
# We sign our data here to ensure a Zulip user cannot tamper with
199199
# the join link to gain access to other meetings that are on the
200200
# same bigbluebutton server.
201201
signed = Signer().sign_object(

0 commit comments

Comments
 (0)