Merge branch 'master' of ssh://vo20.nl/git/uva

telematica/ass1/doc/implementation.rst

@@ -46,15 +46,15 @@ other less relevant ones):
 Because those function callbacks have self-documenting names, the callbacks are
 not further discussed here (for more information about those callbacks, see the
 implementation in *async.py* and *asyncbase.py*). This event callback mechanism
-allowed us to easily built an interactive user interface on top of the
+allowed us to easily build an interactive user interface on top of the
 connection. Those various callback functions will handle the connection-specific
-logic and triggers a new UI event based on the event occurred.
+logic and triggers a new UI event based on the occurred event.
 
-For example, if an authentication response is sent to the client (when the
-client sent **USER foo\\r\\n** to the server), the function **handle_read()** is
-called. This callback will parse the response and, if the authentication is done
-successfully, trigger an *authenticated* UI event (which will be received by the
-text-based user interface). This event mechanism allows a developer to built
+For example, if an authentication response is sent to the client (after the
+client has sent **USER foo\\r\\n** to the server), the function **handle_read()** is
+called. This callback will parse the response and, if the authentication is
+successful, trigger an *authenticated* UI event (which will be received by the
+text-based user interface). This event mechanism allows a developer to build
 different user interfaces on top to a client connection, instead of developing
 the response handling over and over again.
 
@@ -89,8 +89,8 @@ Text-based interface (using curses)
 The designed text-based user interface consists of four major components:
 
  1. **Main chat window.** This window displays all notifications sent from the
-    server and will show all chat messages sent and received. This window is
-    shown at the top of the interface.
+    server and will show all chat messages that have been sent or received. This
+    window is shown at the top of the interface.
 
  2. **Debug log window.** Information regarding the chat protocol, incoming and
     outgoing protocol messages and raised exceptions are displayed in this