Merge branch 'master' into factory_pattern

Author: thirdtruck

chapters/networking/basic-client.textile

@@ -13,7 +13,7 @@ h2. Solution
 
 Create a basic TCP client.
 
-h3. Node.js
+h3. In Node.js
 
 {% highlight coffeescript %}
 net = require 'net'
@@ -35,10 +35,17 @@ h3. Example Usage
 
 Accessing the <a href="/chapters/networking/basic-server.html">Basic Server</a>:
 
-*$ coffee basic-client.coffee*
+{% highlight console %}
+$ coffee basic-client.coffee
 Opened connection to localhost:9001
 Received: Hello, World!
+{% endhighlight %}
 
 h2. Discussion
 
-See also the <a href="/chapters/networking/basic-server.html">Basic Server</a>, the <a href="/chapters/networking/bi-directional-client.html">Bi-Directional Client</a>, and the <a href="/chapters/networking/bi-directional-server.html">Bi-Directional Server recipes</a>.
+The most important work takes place in the _connection.on 'data'_ handler, where the client receives its response from the server and would most likely arrange for responses to it.
+
+See also the <a href="/chapters/networking/basic-server.html">Basic Server</a>, <a href="/chapters/networking/bi-directional-client.html">Bi-Directional Client</a>, and <a href="/chapters/networking/bi-directional-server.html">Bi-Directional Server recipes</a>.
+
+h3. Exercises
+* Add support for choosing the target domain and port based on command-line arguments or from a configuration file.

chapters/networking/basic-server.textile

@@ -13,7 +13,7 @@ h2. Solution
 
 Create a basic TCP server.
 
-h3. Node.js
+h3. In Node.js
 
 {% highlight coffeescript %}
 net = require 'net'
@@ -34,12 +34,19 @@ h3. Example Usage
 
 Accessed by the <a href="/chapters/networking/basic-client.html">Basic Client</a>:
 
-*$ coffee basic-server.coffee*
+{% highlight console %}
+$ coffee basic-server.coffee
 Listening to localhost:9001
 Received connection from 127.0.0.1
 Received connection from 127.0.0.1
 [...]
+{% endhighlight %}
 
 h2. Discussion
 
-See also the <a href="/chapters/networking/basic-client.html">Basic Client</a>, the <a href="/chapters/networking/bi-directional-server.html">Bi-Directional Server</a>, and the <a href="/chapters/networking/bi-directional-client.html">Bi-Directional Client recipes</a>.
+The function passed to @net.createServer@ receives the new socket provided for each new connection to a client.  This basic server simply socializes with its visitors but a hard-working server would pass this socket along to a dedicated handler and then return to the task of waiting for the next client.
+
+See also the <a href="/chapters/networking/basic-client.html">Basic Client</a>, <a href="/chapters/networking/bi-directional-server.html">Bi-Directional Server</a>, and <a href="/chapters/networking/bi-directional-client.html">Bi-Directional Client</a> recipes.
+
+h3. Exercises
+* Add support for choosing the target domain and port based on command-line arguments or from a configuration file.

chapters/networking/bi-directional-client.textile

@@ -6,14 +6,13 @@ chapter: Networking
 
 h2. Problem
 
-You want to access a service that provides a persistent connection over the network.
-
+You want to a persistent service over a network, one which maintains an on-going connection with its clients.
 
 h2. Solution
 
 Create a bi-directional TCP client.
 
-h3. Node.js
+h3. In Node.js
 
 {% highlight coffeescript %}
 net = require 'net'
@@ -45,22 +44,24 @@ h3. Example Usage
 
 Accessing the <a href="/chapters/networking/bi-directional-server.html">Bi-Directional Server</a>:
 
-*$ coffee bi-directional-client.coffee*
+{% highlight console %}
+$ coffee bi-directional-client.coffee
 Opened connection to localhost:9001
 Pinging server
 Received: You have 0 peers on this server
 Pinging server
 Received: You have 0 peers on this server
 Pinging server
-Received: You have 0 peers on this server
+Received: You have 1 peer on this server
 [...]
 Connection closed
+{% endhighlight %}
 
 h2. Discussion
 
-This particular example initiates contact with the server and starts the conversation in the _on 'connect'_ handler.  The bulk of the work in a real client, however, will lie in the _on 'data'_ handler, which processes output from the server.
+This particular example initiates contact with the server and starts the conversation in the @connection.on 'connect'@ handler.  The bulk of the work in a real client, however, will lie in the @connection.on 'data'@ handler, which processes output from the server.  The @ping@  function only recurses in order to illustrate continuous communication with the server and can be removed from a real client.
 
-See also the <a href="/chapters/networking/bi-directional-server.html">Bi-Directional Server</a>, the <a href="/chapters/networking/basic-client.html">Basic Client</a>, and the <a href="/chapters/networking/basic-server.html">Basic Server</a> recipes.
+See also the <a href="/chapters/networking/bi-directional-server.html">Bi-Directional Server</a>, <a href="/chapters/networking/basic-client.html">Basic Client</a>, and <a href="/chapters/networking/basic-server.html">Basic Server</a> recipes.
 
 h3. Exercises
 * Add support for choosing the target domain and port based on command-line arguments or from a configuration file.

chapters/networking/bi-directional-server.textile

@@ -6,14 +6,13 @@ chapter: Networking
 
 h2. Problem
 
-You want to provide a service over a network while maintaining a connection with clients.
-
+You want to provide a persistent service over a network, one which maintains an on-going connection with a client.
 
 h2. Solution
 
 Create a bi-directional TCP server.
 
-h3. Node.js
+h3. In Node.js
 
 {% highlight coffeescript %}
 net = require 'net'
@@ -37,20 +36,22 @@ h3. Example Usage
 
 Accessed by the <a href="/chapters/networking/bi-directional-client.html">Bi-Directional Client</a>:
 
-*$ coffee bi-directional-server.coffee*
+{% highlight console %}
+$ coffee bi-directional-server.coffee
 Listening to localhost:9001
 New connection from 127.0.0.1
 127.0.0.1 sent: Ping
 127.0.0.1 sent: Ping
 127.0.0.1 sent: Ping
 [...]
+{% endhighlight %}
 
 h2. Discussion
 
-The bulk of the work lies in the _on 'data'_ handler, which processes all of the input from the client.
+The bulk of the work lies in the @socket.on 'data'@ handler, which processes all of the input from the client.  A real server would likely pass the data onto another function to process it and generate any responses so that the original handler.
 
-See also the <a href="/chapters/networking/bi-directional-client.html">Bi-Directional Client</a>, the <a href="/chapters/networking/basic-client.html">Basic Client</a>, and the <a href="/chapters/networking/basic-server.html">Basic Server</a> recipes.
+See also the <a href="/chapters/networking/bi-directional-client.html">Bi-Directional Client</a>, <a href="/chapters/networking/basic-client.html">Basic Client</a>, and <a href="/chapters/networking/basic-server.html">Basic Server</a> recipes.
 
 h3. Exercises
-* Add support for choosing the target domain and port based on command-line arguments or from a configuration file.
+* Add support for choosing the target domain and port based on command-line arguments or on a configuration file.
 

css/default.css

@@ -10,6 +10,14 @@
   margin: 0;
 }
 
+em {
+  font-style: italic;
+}
+
+code {
+  font-family: courier;
+}
+
 article, header, section, footer {
   display: block;
 }