# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1269974813 -3600
# Node ID 3cafa20e22e94a5018170b5d3f790e4eda87a6fb
# Parent  294c359a05f52e3c64c7837ea18a35089235d37b# Parent  5069534f7f36ec2674fef38f2a0fba5bd49c1db7
Merge 0.7/waqas->0.7/MattJ

diff -r 294c359a05f5 -r 3cafa20e22e9 net/server_event.lua
--- a/net/server_event.lua	Tue Mar 30 19:45:56 2010 +0100
+++ b/net/server_event.lua	Tue Mar 30 19:46:53 2010 +0100
@@ -20,14 +20,14 @@
 
 local cfg = {
 	MAX_CONNECTIONS       = 100000,  -- max per server connections (use "ulimit -n" on *nix)
-	MAX_HANDSHAKE_ATTEMPS = 1000,  -- attemps to finish ssl handshake
-	HANDSHAKE_TIMEOUT     = 60,  -- timout in seconds per handshake attemp
+	MAX_HANDSHAKE_ATTEMPS = 1000,  -- attempts to finish ssl handshake
+	HANDSHAKE_TIMEOUT     = 60,  -- timout in seconds per handshake attempt
 	MAX_READ_LENGTH       = 1024 * 1024 * 1024 * 1024,  -- max bytes allowed to read from sockets
 	MAX_SEND_LENGTH       = 1024 * 1024 * 1024 * 1024,  -- max bytes size of write buffer (for writing on sockets)
-	ACCEPT_DELAY          = 10,  -- seconds to wait until the next attemp of a full server to accept
+	ACCEPT_DELAY          = 10,  -- seconds to wait until the next attempt of a full server to accept
 	READ_TIMEOUT          = 60 * 60 * 6,  -- timeout in seconds for read data from socket
 	WRITE_TIMEOUT         = 180,  -- timeout in seconds for write data on socket
-	CONNECT_TIMEOUT       = 20,  -- timeout in seconds for connection attemps
+	CONNECT_TIMEOUT       = 20,  -- timeout in seconds for connection attempts
 	CLEAR_DELAY           = 5,  -- seconds to wait for clearing interface list (and calling ondisconnect listeners)
 	DEBUG                 = true,  -- show debug messages
 }