Mercurial Hosting > luan

changeset 370:7999601586b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor documentation
author Franklin Schmidt <fschmidt@gmail.com>
date Fri, 17 Apr 2015 07:18:39 -0600
parents 85bf9f0379aa
children e01cddba3433
files website/src/diff.html website/src/docs.html website/src/index.html
diffstat 3 files changed, 44 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
diff -r 85bf9f0379aa -r 7999601586b1 website/src/diff.html
--- a/website/src/diff.html	Fri Apr 17 06:25:38 2015 -0600
+++ b/website/src/diff.html	Fri Apr 17 07:18:39 2015 -0600
@@ -4,7 +4,7 @@
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1">
 
-		<title>Luan Documentation</title>
+		<title>How Luan differs from Lua</title>
 		
 		<link href="http://www.simplyhtml.org/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 		<link rel="stylesheet" href="http://www.simplyhtml.org/assets/font-awesome/css/font-awesome.min.css">
@@ -15,9 +15,10 @@
 	</head>
 	<body>
 		<div container>
+			<div><small><a href="/">Luan</a></small></div>
 			<h1>How Luan differs from Lua</h1>
 
-			<p>This document explains how <a href="/">Luan</a> differs from <a href="http://www.lua.org">Lua</a> as described in the <a href="http://www.lua.org/manual/5.3/">Lua 5.3 Reference Manual</a>.</p>
+			<p>This document explains how Luan differs from <a href="http://www.lua.org">Lua</a> as described in the <a href="http://www.lua.org/manual/5.3/">Lua 5.3 Reference Manual</a>.</p>
 
 			<h2 margin-top="1em">Contents</h2>
 
@@ -175,7 +176,7 @@
 
 			<tt><pre>
 	local name = "Bob"
-	Io.stdout.write( %>
+	require("luan:Io").stdout.write( %>
 	Hello <%=name%>!
 	Bye <%=name%>.
 	<% )
@@ -204,7 +205,14 @@
 	write( %>Hello <%=name%>!<% )
 			</pre></tt>
 
-			<p>This template expression returns 3 values: "Hello ", "Bob", and "!".  The strings in template expressions may be multiple lines.</p>
+			<p>This is equivalent to the code:</p>
+
+			<tt><pre>
+	local name = "Bob"
+	write( "Hello ", name, "!" )
+			</pre></tt>
+
+			<p>The strings in template expressions may be multiple lines.</p>
 
 		</div>
 		
diff -r 85bf9f0379aa -r 7999601586b1 website/src/docs.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/website/src/docs.html	Fri Apr 17 07:18:39 2015 -0600
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+
+		<title>Luan Documentation</title>
+		
+		<link href="http://www.simplyhtml.org/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+		<link rel="stylesheet" href="http://www.simplyhtml.org/assets/font-awesome/css/font-awesome.min.css">
+		<script src="http://www.simplyhtml.org/assets/jquery/jquery.min.js"></script>
+
+		<link href="http://www.simplyhtml.org/assets/simplyhtml/simplyhtml.css" rel="stylesheet"/>
+		<script src="http://www.simplyhtml.org/assets/simplyhtml/simplyhtml.js"></script>
+	</head>
+	<body>
+		<div container>
+			<div><small><a href="/">Luan</a></small></div>
+			<h1 margin-bottom="1em">Luan Documentation</h1>
+
+			<big>
+				<p>
+					<a href="diff.html">How Luan differs from Lua</a><br>
+				</p>
+			</big>
+
+		</div>
+		
+		<script src="http://www.simplyhtml.org/assets/bootstrap/js/bootstrap.min.js"></script>
+	</body>
+</html>
diff -r 85bf9f0379aa -r 7999601586b1 website/src/index.html
--- a/website/src/index.html	Fri Apr 17 06:25:38 2015 -0600
+++ b/website/src/index.html	Fri Apr 17 07:18:39 2015 -0600
@@ -20,7 +20,7 @@
 				<p margin-bottom="2em">under construction...</p>
 				<p>Luan is a <a href="http://www.lua.org">Lua</a>-like language implemented in <a href="https://www.oracle.com/java/">Java</a>.</p>
 				<p>
-					<a href="diff.html">Documentation</a><br>
+					<a href="docs.html">Documentation</a><br>
 					<a href="https://www.dropbox.com/sh/i7imf67wzj7z3h2/AABrpM0L1apqHysb_ot5t2dla?dl=0
 	">Download</a><br>
 					<a href="https://bitbucket.org/frschmidt/luan">Source</a><br>