Fixing bugs...

14 files changed, 78 insertions, 55 deletions

diff --git a/doc/dns.html b/doc/dns.html
index 67b24ca..47134d8 100644
--- a/doc/dns.html
+++ b/doc/dns.html
@@ -16,7 +16,7 @@
 <center>
 <table summary="LuaSocket logo">
 <tr><td align=center><a href="http://www.lua.org">
-<img border=0 alt="LuaSocket" src="luasocket.png">
+<img width=128 border=0 alt="LuaSocket" src="luasocket.png">
 </a></td></tr>
 <tr><td align=center valign=top>Network support for the Lua language
 </td></tr>
diff --git a/doc/ftp.html b/doc/ftp.html
index 14a3601..fe514e9 100644
--- a/doc/ftp.html
+++ b/doc/ftp.html
@@ -14,7 +14,7 @@
 <center>
 <table summary="LuaSocket logo">
 <tr><td align=center><a href="http://www.lua.org">
-<img border=0 alt="LuaSocket" src="luasocket.png">
+<img width=128 border=0 alt="LuaSocket" src="luasocket.png">
 </a></td></tr>
 <tr><td align=center valign=top>Network support for the Lua language
 </td></tr>
@@ -227,10 +227,10 @@ message describing the reason for failure.
 -- load the ftp support
 local ftp = require("ftp")
 
--- Log as user "diego" on server "ftp.tecgraf.puc-rio.br",
--- using password "nehab", and store a file "README" with contents 
+-- Log as user "fulano" on server "ftp.example.com",
+-- using password "silva", and store a file "README" with contents 
 -- "wrong password, of course"
-f, e = ftp.put("ftp://diego:nehab@ftp.tecgraf.puc-rio.br/README", 
+f, e = ftp.put("ftp://fulano:silva@ftp.example.com/README", 
     "wrong password, of course")
 </pre>
 
@@ -239,13 +239,13 @@ f, e = ftp.put("ftp://diego:nehab@ftp.tecgraf.puc-rio.br/README",
 local ftp = require("ftp")
 local ltn12 = require("ltn12")
 
--- Log as user "diego" on server "ftp.tecgraf.puc-rio.br",
--- using password "nehab", and append to the remote file "LOG", sending the
+-- Log as user "fulano" on server "ftp.example.com",
+-- using password "silva", and append to the remote file "LOG", sending the
 -- contents of the local file "LOCAL-LOG"
 f, e = ftp.put{
-  host = "ftp.tecgraf.puc-rio.br", 
-  user = "diego",
-  password = "nehab",
+  host = "ftp.example.com", 
+  user = "fulano",
+  password = "silva",
   command = "appe",
   argument = "LOG",
   source = ltn12.source.file(io.open("LOCAL-LOG", "r"))
diff --git a/doc/http.html b/doc/http.html
index a98915c..4780436 100644
--- a/doc/http.html
+++ b/doc/http.html
@@ -16,7 +16,7 @@
 <center>
 <table summary="LuaSocket logo">
 <tr><td align=center><a href="http://www.lua.org">
-<img border=0 alt="LuaSocket" src="luasocket.png">
+<img width=128 border=0 alt="LuaSocket" src="luasocket.png">
 </a></td></tr>
 <tr><td align=center valign=top>Network support for the Lua language
 </td></tr>
@@ -209,9 +209,9 @@ http = require("http")
 -- file from "/luasocket/http.html"
 b = http.request("http://www.tecgraf.puc-rio.br/luasocket/http.html")
 
--- connect to server "www.tecgraf.puc-rio.br" and tries to retrieve
--- "~diego/auth/index.html". Fails because authentication is needed.
-b, c, h = http.request("http://www.tecgraf.puc-rio.br/~diego/auth/index.html")
+-- connect to server "www.example.com" and tries to retrieve
+-- "/private/index.html". Fails because authentication is needed.
+b, c, h = http.request("http://www.example.com/private/index.html")
 -- b returns some useless page telling about the denied access, 
 -- h returns authentication information
 -- and c returns with value 401 (Authentication Required)
@@ -276,16 +276,16 @@ authentication is required.
 http = require("http")
 mime = require("mime")
 
--- Connect to server "www.tecgraf.puc-rio.br" and tries to retrieve
--- "~diego/auth/index.html", using the provided name and password to
+-- Connect to server "www.example.com" and tries to retrieve
+-- "/private/index.html", using the provided name and password to
 -- authenticate the request
-b, c, h = http.request("http://diego:password@www.tecgraf.puc-rio.br/~diego/auth/index.html")
+b, c, h = http.request("http://fulano:silva@www.example.com/private/index.html")
 
 -- Alternatively, one could fill the appropriate header and authenticate
 -- the request directly.
 r, c = http.request {
-  url = "http://www.tecgraf.puc-rio.br/~diego/auth/index.html",
-  headers = { authentication = "Basic " .. (mime.b64("diego:password")) }
+  url = "http://www.example.com/private/index.html",
+  headers = { authentication = "Basic " .. (mime.b64("fulano:silva")) }
 }
 </pre>
 
diff --git a/doc/index.html b/doc/index.html
index 7394386..0e9eb1d 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -16,7 +16,7 @@
 <center>
 <table summary="LuaSocket logo">
 <tr><td align=center><a href="http://www.lua.org">
-<img border=0 alt="LuaSocket" src="luasocket.png">
+<img width=128 border=0 alt="LuaSocket" src="luasocket.png">
 </a></td></tr>
 <tr><td align=center valign=top>Network support for the Lua language
 </td></tr>
@@ -216,7 +216,7 @@ the changes that made it into version 2.0:
 
 <li> Select checks if sockets have buffered data and returns immediately; 
 
-<li> <tt>socket.sleep</tt> and <tt>socket.time</tt> are now part of the
+<li> <tt>socket.sleep</tt> and <tt>socket.gettime</tt> are now part of the
      library and are supported. They used to be available only when
      LUASOCKET_DEBUG was defined, but it turns out they might be useful for
      applications;
@@ -276,6 +276,8 @@ return convention WILL break old code;
     does not call <tt>listen</tt> anymore. It is the new <tt>listen</tt>
 method that turns a TCP object into a server object; 
 
+<li> <tt>socket.time</tt> became <tt>socket.gettime</tt> for uniformity;
+
 <li> Interface to options has changed.
 
 </ul>
diff --git a/doc/introduction.html b/doc/introduction.html
index 8706c83..2c738d6 100644
--- a/doc/introduction.html
+++ b/doc/introduction.html
@@ -16,7 +16,7 @@
 <center>
 <table summary="LuaSocket logo">
 <tr><td align=center><a href="http://www.lua.org">
-<img border=0 alt="LuaSocket" src="luasocket.png">
+<img width=128 border=0 alt="LuaSocket" src="luasocket.png">
 </a></td></tr>
 <tr><td align=center valign=top>Network support for the Lua language
 </td></tr>
diff --git a/doc/ltn12.html b/doc/ltn12.html
index 23b9ff8..bfb9b51 100644
--- a/doc/ltn12.html
+++ b/doc/ltn12.html
@@ -16,7 +16,7 @@
 <center>
 <table summary="LuaSocket logo">
 <tr><td align=center><a href="http://www.lua.org">
-<img border=0 alt="LuaSocket" src="luasocket.png">
+<img width=128 border=0 alt="LuaSocket" src="luasocket.png">
 </a></td></tr>
 <tr><td align=center valign=top>Network support for the Lua language
 </td></tr>
diff --git a/doc/mime.html b/doc/mime.html
index 520c8ff..0f4ffa8 100644
--- a/doc/mime.html
+++ b/doc/mime.html
@@ -16,7 +16,7 @@
 <center>
 <table summary="LuaSocket logo">
 <tr><td align=center><a href="http://www.lua.org">
-<img border=0 alt="LuaSocket" src="luasocket.png">
+<img width=128 border=0 alt="LuaSocket" src="luasocket.png">
 </a></td></tr>
 <tr><td align=center valign=top>Network support for the Lua language
 </td></tr>
diff --git a/doc/reference.css b/doc/reference.css
index 7c8148d..b1dd25d 100644
--- a/doc/reference.css
+++ b/doc/reference.css
@@ -1,7 +1,7 @@
 body { 
     margin-left: 1em; 
     margin-right: 1em; 
-    font-family: "Verdana"; 
+    font-family: "Verdana", sans-serif; 
 }
 
 tt {
diff --git a/doc/reference.html b/doc/reference.html
index ec81d72..5c07c4d 100644
--- a/doc/reference.html
+++ b/doc/reference.html
@@ -16,7 +16,7 @@
 <center>
 <table summary="LuaSocket logo">
 <tr><td align=center><a href="http://www.lua.org">
-<img border=0 alt="LuaSocket" src="luasocket.png">
+<img width=128 border=0 alt="LuaSocket" src="luasocket.png">
 </a></td></tr>
 <tr><td align=center valign=top>Network support for the Lua language
 </td></tr>
@@ -140,6 +140,7 @@
 <blockquote>
 <a href="socket.html#debug">DEBUG</a>,
 <a href="dns.html#dns">dns</a>,
+<a href="socket.html#gettime">gettime</a>,
 <a href="socket.html#newtry">newtry</a>,
 <a href="socket.html#protect">protect</a>,
 <a href="socket.html#select">select</a>,
@@ -147,7 +148,6 @@
 <a href="socket.html#skip">skip</a>,
 <a href="socket.html#sleep">sleep</a>,
 <a href="socket.html#source">source</a>,
-<a href="socket.html#time">time</a>,
 <a href="tcp.html#tcp">tcp</a>,
 <a href="socket.html#try">try</a>,
 <a href="udp.html#udp">udp</a>,
diff --git a/doc/smtp.html b/doc/smtp.html
index 89f4757..224dde3 100644
--- a/doc/smtp.html
+++ b/doc/smtp.html
@@ -16,7 +16,7 @@
 <center>
 <table summary="LuaSocket logo">
 <tr><td align=center><a href="http://www.lua.org">
-<img border=0 alt="LuaSocket" src="luasocket.png">
+<img width=128 border=0 alt="LuaSocket" src="luasocket.png">
 </a></td></tr>
 <tr><td align=center valign=top>Network support for the Lua language
 </td></tr>
@@ -165,7 +165,7 @@ If  successful, the function returns 1. Otherwise, the function returns
 <p class=note>
 Note: SMTP servers are can be very picky with the format of e-mail
 addresses. To be safe, use only addresses of the form
-"<tt>&lt;fulano@tecgraf.puc-rio.br&gt;</tt>" in the <tt>from</tt> and
+"<tt>&lt;fulano@example.com&gt;</tt>" in the <tt>from</tt> and
 <tt>rcpt</tt> arguments to the <tt>send</tt> function. In headers, e-mail
 addresses can take whatever form you like.  </p>
 
@@ -238,23 +238,23 @@ and
 local smtp = require("smtp")
 
 -- Connects to server "localhost" and sends a message to users
--- "fulano@tecgraf.puc-rio.br",  "beltrano@tecgraf.puc-rio.br", 
--- and "sicrano@tecgraf.puc-rio.br".
+-- "fulano@example.com",  "beltrano@example.com", 
+-- and "sicrano@example.com".
 -- Note that "fulano" is the primary recipient, "beltrano" receives a
 -- carbon copy and neither of them knows that "sicrano" received a blind
 -- carbon copy of the message.
-from = "&lt;luasocket@tecgraf.puc-rio.br&gt;"
+from = "&lt;luasocket@example.com&gt;"
 
 rcpt = {
-  "&lt;fulano@tecgraf.puc-rio.br&gt;",
-  "&lt;beltrano@tecgraf.puc-rio.br&gt;",
-  "&lt;sicrano@tecgraf.puc-rio.br&gt;"
+  "&lt;fulano@example.com&gt;",
+  "&lt;beltrano@example.com&gt;",
+  "&lt;sicrano@example.com&gt;"
 }
 
 mesgt = {
   headers = {
-    to = "Fulano da Silva &lt;fulano@tecgraf.puc-rio.br&gt;",
-    cc = '"Beltrano F. Nunes" &lt;beltrano@tecgraf.puc-rio.br&gt;',
+    to = "Fulano da Silva &lt;fulano@example.com&gt;",
+    cc = '"Beltrano F. Nunes" &lt;beltrano@example.com&gt;',
     subject = "My first message"
   }
   body = "I hope this works. If it does, I can send you another 1000 copies."
@@ -334,8 +334,8 @@ local ltn12 = require("ltn12")
 source = smtp.message{
   headers = {
      -- Remember that headers are *ignored* by smtp.send. 
-     from = "Sicrano de Oliveira &lt;sicrano@tecgraf.puc-rio.br&gt;",
-     to = "Fulano da Silva &lt;fulano@tecgraf.puc-rio.br&gt;",
+     from = "Sicrano de Oliveira &lt;sicrano@example.com&gt;",
+     to = "Fulano da Silva &lt;fulano@example.com&gt;",
      subject = "Here is a message with attachments"
   },
   body = {
@@ -378,8 +378,8 @@ source = smtp.message{
 
 -- finally send it
 r, e = smtp.send{
-    from = "&lt;sicrano@tecgraf.puc-rio.br&gt;",
-    rcpt = "&lt;fulano@tecgraf.puc-rio.br&gt;",
+    from = "&lt;sicrano@example.com&gt;",
+    rcpt = "&lt;fulano@example.com&gt;",
     source = source,
 }
 </pre>
diff --git a/doc/socket.html b/doc/socket.html
index 4d77478..1bbeb7f 100644
--- a/doc/socket.html
+++ b/doc/socket.html
@@ -16,7 +16,7 @@
 <center>
 <table summary="LuaSocket logo">
 <tr><td align=center><a href="http://www.lua.org">
-<img border=0 alt="LuaSocket" src="luasocket.png">
+<img width=128 border=0 alt="LuaSocket" src="luasocket.png">
 </a></td></tr>
 <tr><td align=center valign=top>Network support for the Lua language
 </td></tr>
@@ -48,6 +48,27 @@ To obtain the <tt>socket</tt> namespace, run:
 local socket = require("socket")
 </pre>
 
+<!-- bind ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+<p class=name id=bind> 
+socket.<b>bind(</b>address, port [, backlog]<b>)</b>
+</p>
+
+<p class=description>
+</p>
+
+<!-- connect ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+<p class=name id=connect> 
+socket.<b>connect(</b>address, port [, locaddr, locport]<b>)</b>
+</p>
+
+<p class=description>
+This function is a shortcut that creates and returns a TCP socket object
+connected to a remote <tt>host</tt> at a given <tt>port</tt>. Optionally,
+the use can also specify the local address and port to bind
+(<tt>locaddr</tt> and </tt>locport</tt>).
+</p>
 
 <!-- debug ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
 
@@ -289,8 +310,8 @@ The function returns a source with the appropriate behavior.
 
 <!-- time ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
 
-<p class=name id=time> 
-socket.<b>time()</b>
+<p class=name id=gettime> 
+socket.<b>gettime()</b>
 </p>
 
 <p class=description>
@@ -304,9 +325,9 @@ The function returns the time as a number.
 </p>
 
 <pre class=example>
-t = socket.time()
+t = socket.gettime()
 -- do stuff
-print(socket.time() - t .. " seconds elapsed")
+print(socket.gettime() - t .. " seconds elapsed")
 </pre>
 
 <!-- try ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
diff --git a/doc/tcp.html b/doc/tcp.html
index cd417a5..37b0b56 100644
--- a/doc/tcp.html
+++ b/doc/tcp.html
@@ -16,7 +16,7 @@
 <center>
 <table summary="LuaSocket logo">
 <tr><td align=center><a href="http://www.lua.org">
-<img border=0 alt="LuaSocket" src="luasocket.png">
+<img width=128 border=0 alt="LuaSocket" src="luasocket.png">
 </a></td></tr>
 <tr><td align=center valign=top>Network support for the Lua language
 </td></tr>
@@ -74,7 +74,7 @@ reported by <b><tt>nil</tt></b> followed by a message describing the error.
 </p>
 
 <p class=note>
-Note: calling <a href=misc.html#socket.select><tt>socket.select</tt></a>
+Note: calling <a href=sockett.html#select><tt>socket.select</tt></a>
 with   a  server   object   in
 the <tt>receive</tt>  parameter  before  a   call  to  <tt>accept</tt> does
 <em>not</em> guarantee  <tt>accept</tt> will  return immediately.  Use the <a
@@ -94,7 +94,7 @@ local host.
 
 <p class=parameters>
 <tt>Address</tt> can be an IP address or a host name. 
-<tt>Port</tt> must be an integer number in the range [0..64K]. 
+<tt>Port</tt> must be an integer number in the range [0..64K). 
 If <tt>address</tt>
 is '<tt>*</tt>', the system binds to all local interfaces
 using the <tt>INADDR_ANY</tt> constant. If <tt>port</tt> is 0, the system automatically
@@ -154,7 +154,7 @@ and <a href=#close><tt>close</tt></a>.
 
 <p class=parameters>
 <tt>Address</tt> can be an IP address or a host name. 
-<tt>Port</tt> must be an integer number in the range [1..64K]. 
+<tt>Port</tt> must be an integer number in the range [1..64K). 
 </p>
 
 <p class=return>
diff --git a/doc/udp.html b/doc/udp.html
index 6f2e607..69895ce 100644
--- a/doc/udp.html
+++ b/doc/udp.html
@@ -14,7 +14,7 @@
 <center>
 <table summary="LuaSocket logo">
 <tr><td align=center><a href="http://www.lua.org">
-<img border=0 alt="LuaSocket" src="luasocket.png">
+<img width=128 border=0 alt="LuaSocket" src="luasocket.png">
 </a></td></tr>
 <tr><td align=center valign=top>Network support for the Lua language
 </td></tr>
diff --git a/doc/url.html b/doc/url.html
index 46e6e09..207995c 100644
--- a/doc/url.html
+++ b/doc/url.html
@@ -16,7 +16,7 @@
 <center>
 <table summary="LuaSocket logo">
 <tr><td align=center><a href="http://www.lua.org">
-<img border=0 alt="LuaSocket" src="luasocket.png">
+<img width=128 border=0 alt="LuaSocket" src="luasocket.png">
 </a></td></tr>
 <tr><td align=center valign=top>Network support for the Lua language
 </td></tr>
@@ -238,11 +238,11 @@ parsed_url = {<br>
 -- load url module
 url = require("url")
 
-parsed_url = url.parse("http://www.puc-rio.br/~diego/index.lua?a=2#there")
+parsed_url = url.parse("http://www.example.com/cgilua/index.lua?a=2#there")
 -- parsed_url = {
 --   scheme = "http",
---   authority = "www.puc-rio.br",
---   path = "/~diego/index.lua"
+--   authority = "www.example.com",
+--   path = "/cgilua/index.lua"
 --   query = "a=2",
 --   fragment = "there",
 --   host = "www.puc-rio.br",