diff --git a/docs/overview/changelog.md b/docs/overview/changelog.md index 2bddc29a54..679be49a9f 100644 --- a/docs/overview/changelog.md +++ b/docs/overview/changelog.md @@ -221,7 +221,7 @@ _Released 2023-08-25_ _Released 2023-07-05_ - Started logging a more accurate, detailed, and actionable error messages when - [common reverse proxy mis-configurations][proxies] are detected. + [common reverse proxy misconfigurations][proxies] are detected. - Improved [reverse proxy documentation][proxies] to clarify that trust of `X-Forwarded-Proto` is also necessary. diff --git a/docs/production/authentication-methods.md b/docs/production/authentication-methods.md index 74a1cd4858..21e6edf4b0 100644 --- a/docs/production/authentication-methods.md +++ b/docs/production/authentication-methods.md @@ -780,7 +780,7 @@ these instructions are for that provider; please [contact us](https://zulip.com/help/contact-support) if you need help using this with another IdP. -#### IdP-initated Single Logout +#### IdP-initiated Single Logout 1. In the KeyCloak configuration for Zulip, enable `Force Name ID Format` and set `Name ID Format` to `email`. Zulip needs to receive diff --git a/puppet/zulip/templates/nginx/trusted-proto.template.erb b/puppet/zulip/templates/nginx/trusted-proto.template.erb index 4fbc122483..d26efe748c 100644 --- a/puppet/zulip/templates/nginx/trusted-proto.template.erb +++ b/puppet/zulip/templates/nginx/trusted-proto.template.erb @@ -19,7 +19,7 @@ geo $realip_remote_addr $is_x_forwarded_proto_trusted { } # Check if the IP address that we resolved the request as coming -# (after looking at X-Fowarded-For, if any) from is actually the proxy +# (after looking at X-Forwarded-For, if any) from is actually the proxy # itself. geo $remote_addr $is_from_proxy { default 0; diff --git a/web/images/app-screenshots/android.svg b/web/images/app-screenshots/android.svg index 2c57411eab..68a86556a2 100644 Binary files a/web/images/app-screenshots/android.svg and b/web/images/app-screenshots/android.svg differ diff --git a/web/images/app-screenshots/iphoneX.svg b/web/images/app-screenshots/iphoneX.svg index 16a223c7b6..dd9aaf74bf 100644 Binary files a/web/images/app-screenshots/iphoneX.svg and b/web/images/app-screenshots/iphoneX.svg differ diff --git a/web/src/markdown.js b/web/src/markdown.js index 04a6250e47..9ebaea2ae7 100644 --- a/web/src/markdown.js +++ b/web/src/markdown.js @@ -574,7 +574,7 @@ export function parse({raw_content, helper_config}) { // Disable _emphasis_ (keeping *emphasis*) // Text inside ** must start and end with a word character - // to prevent mis-parsing things like "char **x = (char **)y" + // to prevent misparsing things like "char **x = (char **)y" marked.InlineLexer.rules.zulip.em = /^\*(?!\s+)((?:\*\*|[\S\s])+?)(\S)\*(?!\*)/; // Disable autolink as (a) it is not used in our backend and (b) it interferes with @mentions diff --git a/zerver/data_import/slack.py b/zerver/data_import/slack.py index 44c7505c30..4f3fd32934 100644 --- a/zerver/data_import/slack.py +++ b/zerver/data_import/slack.py @@ -1368,7 +1368,7 @@ def do_convert_data( # Slack's export doesn't set the UTF-8 flag on each # filename entry, despite encoding them as such, so # zipfile mojibake's the output. Explicitly re-interpret - # it as UTF-8 mis-decoded as cp437, the default. + # it as UTF-8 misdecoded as cp437, the default. for fileinfo in zipObj.infolist(): fileinfo.flag_bits |= 0x800 fileinfo.filename = fileinfo.filename.encode("cp437").decode("utf-8") diff --git a/zerver/lib/import_realm.py b/zerver/lib/import_realm.py index fbba5a628c..ca39bcd25d 100644 --- a/zerver/lib/import_realm.py +++ b/zerver/lib/import_realm.py @@ -1473,7 +1473,7 @@ def get_incoming_message_ids(import_dir: Path, sort_by_date: bool) -> List[int]: # save memory and speed up the sort. For # Zulip-to-Zulip imports, the # message_id will generally be a good tiebreaker. - # If we occasionally mis-order the ids for two + # If we occasionally misorder the ids for two # messages from the same second, it's not the # end of the world, as it's likely those messages # arrived to the original server in somewhat diff --git a/zerver/lib/user_topics.py b/zerver/lib/user_topics.py index 44b2b5f04c..208cfd7aa3 100644 --- a/zerver/lib/user_topics.py +++ b/zerver/lib/user_topics.py @@ -264,15 +264,15 @@ def build_get_topic_visibility_policy( "visibility_policy", ) - topic_to_visiblity_policy: Dict[Tuple[int, str], int] = defaultdict(int) + topic_to_visibility_policy: Dict[Tuple[int, str], int] = defaultdict(int) for row in rows: recipient_id = row["recipient_id"] topic_name = row["topic_name"] visibility_policy = row["visibility_policy"] - topic_to_visiblity_policy[(recipient_id, topic_name)] = visibility_policy + topic_to_visibility_policy[(recipient_id, topic_name)] = visibility_policy def get_topic_visibility_policy(recipient_id: int, topic: str) -> int: - return topic_to_visiblity_policy[(recipient_id, topic.lower())] + return topic_to_visibility_policy[(recipient_id, topic.lower())] return get_topic_visibility_policy diff --git a/zerver/tests/test_home.py b/zerver/tests/test_home.py index 4f90ba55f3..a732d79b58 100644 --- a/zerver/tests/test_home.py +++ b/zerver/tests/test_home.py @@ -737,7 +737,7 @@ class HomeTest(ZulipTestCase): self.assertIn(bots[2].id, bot_ids) self.assertIn(bots[2].id, active_ids) - # Make sure nobody got mis-bucketed. + # Make sure nobody got misbucketed. self.assertNotIn(hamlet.id, non_active_ids) self.assertNotIn(defunct_user.id, active_ids) diff --git a/zerver/tests/test_import_export.py b/zerver/tests/test_import_export.py index 5636c1c70a..cfc5682778 100644 --- a/zerver/tests/test_import_export.py +++ b/zerver/tests/test_import_export.py @@ -1048,8 +1048,8 @@ class RealmImportExportTest(ExportFile): @getter def get_group_names_for_group_settings(r: Realm) -> Set[str]: return { - getattr(r, permmission_name).name - for permmission_name in Realm.REALM_PERMISSION_GROUP_SETTINGS + getattr(r, permission_name).name + for permission_name in Realm.REALM_PERMISSION_GROUP_SETTINGS } # test recipients diff --git a/zerver/tests/test_push_notifications.py b/zerver/tests/test_push_notifications.py index f5cca48e74..262ddaa860 100644 --- a/zerver/tests/test_push_notifications.py +++ b/zerver/tests/test_push_notifications.py @@ -472,8 +472,8 @@ class PushBouncerNotificationTest(BouncerTestCase): "apns_payload": apns_payload, "gcm_options": gcm_options, } - time_recieved = time_sent + datetime.timedelta(seconds=1, milliseconds=234) - with time_machine.travel(time_recieved, tick=False), mock.patch( + time_received = time_sent + datetime.timedelta(seconds=1, milliseconds=234) + with time_machine.travel(time_received, tick=False), mock.patch( "zilencer.views.send_android_push_notification" ), mock.patch("zilencer.views.send_apple_push_notification"), self.assertLogs( "zilencer.views", level="INFO" @@ -1165,12 +1165,12 @@ class HandlePushNotificationTest(PushNotificationTest): message=message, ) - time_recieved = time_sent + datetime.timedelta(seconds=1, milliseconds=234) + time_received = time_sent + datetime.timedelta(seconds=1, milliseconds=234) missed_message = { "message_id": message.id, "trigger": NotificationTriggers.DIRECT_MESSAGE, } - with time_machine.travel(time_recieved, tick=False), mock.patch( + with time_machine.travel(time_received, tick=False), mock.patch( "zerver.lib.push_notifications.gcm_client" ) as mock_gcm, self.mock_apns() as (apns_context, send_notification), self.assertLogs( "zerver.lib.push_notifications", level="INFO" @@ -1232,12 +1232,12 @@ class HandlePushNotificationTest(PushNotificationTest): message=message, ) - time_recieved = time_sent + datetime.timedelta(seconds=1, milliseconds=234) + time_received = time_sent + datetime.timedelta(seconds=1, milliseconds=234) missed_message = { "message_id": message.id, "trigger": NotificationTriggers.DIRECT_MESSAGE, } - with time_machine.travel(time_recieved, tick=False), mock.patch( + with time_machine.travel(time_received, tick=False), mock.patch( "zerver.lib.push_notifications.gcm_client" ) as mock_gcm, self.mock_apns() as (apns_context, send_notification), self.assertLogs( "zerver.lib.push_notifications", level="INFO" diff --git a/zerver/views/sentry.py b/zerver/views/sentry.py index 63c4970fb2..ba7f98f459 100644 --- a/zerver/views/sentry.py +++ b/zerver/views/sentry.py @@ -41,7 +41,7 @@ def sentry_tunnel( # debugging more complicated. updated_body = request.body # If we fail to update the body for any reason, leave it as-is; it - # is better to mis-report the IP than to drop the report entirely. + # is better to misreport the IP than to drop the report entirely. with suppress(Exception): # This parses the Sentry ingestion format, known as an # Envelope. See https://develop.sentry.dev/sdk/envelopes/ for