Permalink
Browse files

Merge pull request #232 from dturnbull/master

return self
  • Loading branch information...
2 parents a30944a + ddd743f commit 2ba896c38129cb2bd0bb0a0aa2b037f305f32161 @tmm1 tmm1 committed Sep 9, 2011
Showing with 6 additions and 5 deletions.
  1. +4 −3 lib/em/completion.rb
  2. +2 −2 lib/em/connection.rb
View
@@ -16,16 +16,16 @@
#
# == Basic Usage
#
-# As already mentioned, the basic usage of a Completion is simply for it's two
+# As already mentioned, the basic usage of a Completion is simply for its two
# final states, :succeeded and :failed.
#
# An asynchronous operation will complete at some future point in time, and
# users often want to react to this event. API authors will want to expose
# some common interface to react to these events.
#
# In the following example, the user wants to know when a short lived
-# connection has completed it's exchange with the remote server. The simple
-# protocol just waits for an ack to it's message.
+# connection has completed its exchange with the remote server. The simple
+# protocol just waits for an ack to its message.
#
# class Protocol < EM::Connection
# include EM::P::LineText2
@@ -199,6 +199,7 @@ def stateback(state, *a, &b)
@callbacks[state] << EM::Callback(*a, &b)
end
execute_callbacks
+ self
end
# Callbacks are called when you enter (or are in) a :succeeded state.
View
@@ -121,7 +121,7 @@ def receive_data data
# been completed, as a result of calling #start_tls to initiate SSL/TLS on the connection.
#
# This callback exists because {#post_init} and {#connection_completed} are **not** reliable
- # for indicating when an SSL/TLS connection is ready to have it's certificate queried for.
+ # for indicating when an SSL/TLS connection is ready to have its certificate queried for.
#
# @see #get_peer_cert
def ssl_handshake_completed
@@ -471,7 +471,7 @@ def start_tls args={}
# # -----END CERTIFICATE-----
#
# You can do whatever you want with the certificate String, such as load it
- # as a certificate object using the OpenSSL library, and check it's fields.
+ # as a certificate object using the OpenSSL library, and check its fields.
#
# @return [String] the remote [X509 certificate](http://en.wikipedia.org/wiki/X.509), in the popular [PEM format](http://en.wikipedia.org/wiki/Privacy_Enhanced_Mail),
# if TLS is active on the connection

0 comments on commit 2ba896c

Please sign in to comment.