paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed typos with receive

Browse Source
This commit is contained in:
JefftheBest1
2017-01-12 15:27:56 +11:00
committed by showell
parent 9de75f5167
commit f0afa3e8df
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/examples/recent-messages
View File

@@ -29,7 +29,7 @@ import optparse
usage = """recent-messages [options] --count=<no. of previous messages> --user=<sender's email address> --api-key=<sender's api key> usage = """recent-messages [options] --count=<no. of previous messages> --user=<sender's email address> --api-key=<sender's 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 Example: recent-messages --count=101 --user=username@example.com --api-key=a0b1c2d3e4f5a6b7c8d9e0f1a2b3c4d5

2
docs/life-of-a-request.md
View File

@@ -45,7 +45,7 @@ location /static/ {
[tornado-django]: architecture-overview.html?highlight=tornado#tornado-and-django [tornado-django]: architecture-overview.html?highlight=tornado#tornado-and-django
All our connected clients hold open long-polling connections so that 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. real-time. Events are served by Zulip's `tornado` application.
Nearly every other kind of request is served by the `zerver` Django Nearly every other kind of request is served by the `zerver` Django

2
static/js/message_list_view.js
View File

@@ -846,7 +846,7 @@ MessageListView.prototype = {
// If the pointer is high on the page such that there is a // 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 // 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, // the new message, which will appear in the viewable area,
// is rendered. // is rendered.
this.maybe_rerender(); this.maybe_rerender();

4
templates/zerver/integrations.html
View File

@@ -1119,7 +1119,7 @@
<li> <li>
<code>--interval</code>: This flag specifies the interval of time - in minutes - between <code>--interval</code>: This flag specifies the interval of time - in minutes - between
receiving the reminder, and the actual event. For example, an interval of 30 minutes 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. scheduled to occur.
</li> </li>
</ol> </ol>
@@ -2305,7 +2305,7 @@ key = NAGIOS_BOT_API_KEY
</p> </p>
<p> <p>
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: Zulip currently supports the following events:
</p> </p>

2
zerver/lib/debug.py
View File

@@ -21,7 +21,7 @@ def interactive_debug(sig, frame):
d.update(frame.f_globals) # Unless shadowed by global d.update(frame.f_globals) # Unless shadowed by global
d.update(frame.f_locals) 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)) message += ''.join(traceback.format_stack(frame))
i = code.InteractiveConsole(d) i = code.InteractiveConsole(d)
i.interact(message) i.interact(message)