Merge pull request #20 from hishamhm/master

Release Xavante 2.4.0 with Lua 5.3 support
keplerproject · May 25, 2016 · 081fbda · 081fbda
2 parents 1bd20da + 464d1d1
commit 081fbda
Show file tree

Hide file tree

Showing 9 changed files with 188 additions and 320 deletions.
diff --git a/README b/README
diff --git a/README.md b/README.md
@@ -0,0 +1,51 @@
+Xavante
+=======
+
+Xavante is a Lua HTTP 1.1 Web server that uses a modular architecture based on
+URI mapped handlers. Xavante currently offers a file handler, a redirect
+handler and a WSAPI handler. Those are used for general files, URI remapping
+and WSAPI applications respectively.
+
+Xavante is free software and uses the same license as Lua.
+
+You can install Xavante using LuaRocks:
+
+    luarocks install xavante
+
+The Xavante package provides just the Xavante libraries. To see Xavante in action
+install wsapi-xavante from LuaRocks.
+
+Dependencies
+------------
+
+Xavante dependencies can be separated by the used handlers:
+
+* Lua 5.1, 5.2 or 5.3
+* Copas 1.2.0
+* LuaSocket 2.1
+* LuaFileSystem 1.6 (file handler only)
+
+The portability of Xavante is determined by its binary components
+(LuaSocket and LuaFileSystem) and Lua itself. The other components are written
+in Lua and are as portable as Lua itself.
+
+Credits
+-------
+
+Xavante is maintained by Fábio Mascarenhas and the community of contributors.
+See the GitHub logs for detailed credits.
+
+Xavante circa 1.3 was implemented by Javier Guerra, André Carregal,
+and Fabio Mascarenhas with the help of Ignacio Burgueño, Zachary P. Landau,
+Mauricio Bomfim, Matthew Burke, Thomas Harning and others.
+
+Xavante 1.2 was implemented by Javier Guerra, André Carregal,
+Fabio Mascarenhas and Leonardo Godinho.
+
+Xavante 1.1 was redesigned and implemented by Javier Guerra and André Carregal.
+It merged Javier's work with luahttpd and André's work with Copas and Xavante 1.0.
+luahttpd is now part of Xavante.
+
+Xavante 1.0 was designed and implemented by André Carregal as part of the
+Kepler Project with contributions from Renato Crivano and Danilo Tuler.
+Xavante 1.0 development was sponsored by Fábrica Digital and Hands. 
diff --git a/doc/us/experimental.html b/doc/us/experimental.html
@@ -8,14 +8,15 @@
 </head>
 
 <body>
+
 <div id="container">
 
 <div id="product">
-    <div id="product_logo"><a href="http://www.keplerproject.org">
-    <img alt="Xavante logo" src="xavante.gif" /></a>
+	<div id="product_logo">
+		<img alt="Xavante logo" src="xavante.gif" width="128" height="128"/>
     </div>
-    <div id="product_name"><big><strong>Xavante</strong></big></div>
-    <div id="product_description">A Lua Web Server with CGILua support</div>
+	<div id="product_name"><big><strong>Xavante</strong></big></div>
+	<div id="product_description">A Lua Web Server with WSAPI support</div>
 </div> <!-- id="product" -->
 
 <div id="main">
@@ -43,8 +44,12 @@ <h1>Xavante</h1>
             </ul>
         </li>
         <li><strong>Sajax</strong></li>
+	    <li><a href="http://github.com/keplerproject/xavante/">Project</a>
+	        <ul>
+	            <li><a href="http://http://github.com/keplerproject/xavante/issues">Bug Tracker</a></li>
+	        </ul>
+	    </li>
         <li><a href="license.html">License</a></li>
-		<li><a href="http://luaforge.net/projects/xavante/">LuaForge project</a></li>
 	</ul>
 </div> <!-- id="navigation" -->