From f0afa3e8dfb9dd294627de9a9f1dc2353bf36ea1 Mon Sep 17 00:00:00 2001 From: JefftheBest1 Date: Thu, 12 Jan 2017 15:27:56 +1100 Subject: [PATCH] Fixed typos with receive --- api/examples/recent-messages | 2 +- docs/life-of-a-request.md | 2 +- static/js/message_list_view.js | 2 +- templates/zerver/integrations.html | 4 ++-- zerver/lib/debug.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/examples/recent-messages b/api/examples/recent-messages index e1da7a4e00..457fb49c57 100755 --- a/api/examples/recent-messages +++ b/api/examples/recent-messages @@ -29,7 +29,7 @@ import optparse usage = """recent-messages [options] --count= --user= --api-key= -Prints out last count messages recieved by the indicated bot or user +Prints out last count messages received by the indicated bot or user Example: recent-messages --count=101 --user=username@example.com --api-key=a0b1c2d3e4f5a6b7c8d9e0f1a2b3c4d5 diff --git a/docs/life-of-a-request.md b/docs/life-of-a-request.md index 6f56940b2a..5a0d0107ab 100644 --- a/docs/life-of-a-request.md +++ b/docs/life-of-a-request.md @@ -45,7 +45,7 @@ location /static/ { [tornado-django]: architecture-overview.html?highlight=tornado#tornado-and-django All our connected clients hold open long-polling connections so that -they can recieve events (messages, presence notifications, and so on) in +they can receive events (messages, presence notifications, and so on) in real-time. Events are served by Zulip's `tornado` application. Nearly every other kind of request is served by the `zerver` Django diff --git a/static/js/message_list_view.js b/static/js/message_list_view.js index 394b2387a6..52085875dd 100644 --- a/static/js/message_list_view.js +++ b/static/js/message_list_view.js @@ -846,7 +846,7 @@ MessageListView.prototype = { // If the pointer is high on the page such that there is a // lot of empty space below and the render window is full, a - // newly recieved message should trigger a rerender so that + // newly received message should trigger a rerender so that // the new message, which will appear in the viewable area, // is rendered. this.maybe_rerender(); diff --git a/templates/zerver/integrations.html b/templates/zerver/integrations.html index ea28f5fd71..0d518e04c8 100644 --- a/templates/zerver/integrations.html +++ b/templates/zerver/integrations.html @@ -1119,7 +1119,7 @@
  • --interval: This flag specifies the interval of time - in minutes - between receiving the reminder, and the actual event. For example, an interval of 30 minutes - would mean that you would recieve a reminder for an event 30 minutes before it is + would mean that you would receive a reminder for an event 30 minutes before it is scheduled to occur.
    • @@ -2305,7 +2305,7 @@ key = NAGIOS_BOT_API_KEY

    - You will now recieve notifications for the events you have chosen. + You will now receive notifications for the events you have chosen. Zulip currently supports the following events:

    diff --git a/zerver/lib/debug.py b/zerver/lib/debug.py index a88aae5434..ae527ffd47 100644 --- a/zerver/lib/debug.py +++ b/zerver/lib/debug.py @@ -21,7 +21,7 @@ def interactive_debug(sig, frame): d.update(frame.f_globals) # Unless shadowed by global d.update(frame.f_locals) - message = "Signal recieved : entering python shell.\nTraceback:\n" + message = "Signal received : entering python shell.\nTraceback:\n" message += ''.join(traceback.format_stack(frame)) i = code.InteractiveConsole(d) i.interact(message)