Merging the documentation from HEAD

doc/us/manual.html

@@ -94,7 +94,9 @@ LuaFileSystem offers the following functions:
     <code>lfs.attributes(filepath).aname</code>, but the table is not created
     and only one attribute is retrieved from the O.S.).
     The attributes are described as follows;
-    attribute <code>mode</code> is a string, all the others are numbers: 
+    attribute <code>mode</code> is a string, all the others are numbers,
+    and the time related attributes use the same time reference of
+    <a href="http://www.lua.org/manual/5.0/manual.html#5.7"><code>os.time</code></a>: 
         <dl>
         <dt><strong><code>dev</code></strong></dt>
         <dd>on Unix systems, this represents the device that the inode resides on. On Windows systems,
@@ -215,7 +217,7 @@ LuaFileSystem offers the following functions:
 <div id="about">
 	<p><a href="http://validator.w3.org/check?uri=referer">
     <img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p>
-	<p><small>$Id: manual.html,v 1.30 2006/03/15 16:44:04 carregal Exp $</small></p>
+	<p><small>$Id: manual.html,v 1.30.2.1 2006/03/15 20:30:53 carregal Exp $</small></p>
 </div> <!-- id="about" -->
 
 </div> <!-- id="container" -->