aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xmanual/2html6
-rw-r--r--manual/manual.of12
2 files changed, 9 insertions, 9 deletions
diff --git a/manual/2html b/manual/2html
index ac5ea043..b7afd2a6 100755
--- a/manual/2html
+++ b/manual/2html
@@ -8,11 +8,11 @@
8 8
9--------------------------------------------------------------- 9---------------------------------------------------------------
10header = [[ 10header = [[
11<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> 11<!DOCTYPE html>
12<html> 12<html>
13 13
14<head> 14<head>
15<title>Lua 5.4 Reference Manual</title> 15<title>Lua 5.5 Reference Manual</title>
16<meta http-equiv="Content-Type" content="text/html;charset=utf-8"> 16<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
17<link rel="stylesheet" href="lua.css"> 17<link rel="stylesheet" href="lua.css">
18<link rel="stylesheet" href="manual.css"> 18<link rel="stylesheet" href="manual.css">
@@ -23,7 +23,7 @@ header = [[
23<hr> 23<hr>
24<h1> 24<h1>
25<a href="http://www.lua.org/home.html"><img src="logo.gif" alt="[Lua logo]" border="0"></a> 25<a href="http://www.lua.org/home.html"><img src="logo.gif" alt="[Lua logo]" border="0"></a>
26Lua 5.4 Reference Manual 26Lua 5.5 Reference Manual
27</h1> 27</h1>
28 28
29by Roberto Ierusalimschy, Luiz Henrique de Figueiredo, Waldemar Celes 29by Roberto Ierusalimschy, Luiz Henrique de Figueiredo, Waldemar Celes
diff --git a/manual/manual.of b/manual/manual.of
index 5bab781b..bcc8173b 100644
--- a/manual/manual.of
+++ b/manual/manual.of
@@ -6908,7 +6908,7 @@ and @St{userdata}.
6908 6908
6909A global variable (not a function) that 6909A global variable (not a function) that
6910holds a string containing the running Lua version. 6910holds a string containing the running Lua version.
6911The current value of this variable is @St{Lua 5.4}. 6911The current value of this variable is @St{Lua 5.5}.
6912 6912
6913} 6913}
6914 6914
@@ -7154,7 +7154,7 @@ to search for a @N{C loader}.
7154 7154
7155Lua initializes the @N{C path} @Lid{package.cpath} in the same way 7155Lua initializes the @N{C path} @Lid{package.cpath} in the same way
7156it initializes the Lua path @Lid{package.path}, 7156it initializes the Lua path @Lid{package.path},
7157using the environment variable @defid{LUA_CPATH_5_4}, 7157using the environment variable @defid{LUA_CPATH_5_5},
7158or the environment variable @defid{LUA_CPATH}, 7158or the environment variable @defid{LUA_CPATH},
7159or a default path defined in @id{luaconf.h}. 7159or a default path defined in @id{luaconf.h}.
7160 7160
@@ -7223,7 +7223,7 @@ A string with the path used by @Lid{require}
7223to search for a Lua loader. 7223to search for a Lua loader.
7224 7224
7225At start-up, Lua initializes this variable with 7225At start-up, Lua initializes this variable with
7226the value of the environment variable @defid{LUA_PATH_5_4} or 7226the value of the environment variable @defid{LUA_PATH_5_5} or
7227the environment variable @defid{LUA_PATH} or 7227the environment variable @defid{LUA_PATH} or
7228with a default path defined in @id{luaconf.h}, 7228with a default path defined in @id{luaconf.h},
7229if those environment variables are not defined. 7229if those environment variables are not defined.
@@ -7594,9 +7594,9 @@ x = string.gsub("4+5 = $return 4+5$", "%$(.-)%$", function (s)
7594 end) 7594 end)
7595-- x="4+5 = 9" 7595-- x="4+5 = 9"
7596 7596
7597local t = {name="lua", version="5.4"} 7597local t = {name="lua", version="5.5"}
7598x = string.gsub("$name-$version.tar.gz", "%$(%w+)", t) 7598x = string.gsub("$name-$version.tar.gz", "%$(%w+)", t)
7599-- x="lua-5.4.tar.gz" 7599-- x="lua-5.5.tar.gz"
7600} 7600}
7601 7601
7602} 7602}
@@ -9332,7 +9332,7 @@ when the standard input (@id{stdin}) is a terminal,
9332and as @T{lua -} otherwise. 9332and as @T{lua -} otherwise.
9333 9333
9334When called without the option @T{-E}, 9334When called without the option @T{-E},
9335the interpreter checks for an environment variable @defid{LUA_INIT_5_4} 9335the interpreter checks for an environment variable @defid{LUA_INIT_5_5}
9336(or @defid{LUA_INIT} if the versioned name is not defined) 9336(or @defid{LUA_INIT} if the versioned name is not defined)
9337before running any argument. 9337before running any argument.
9338If the variable content has the format @T{@At@rep{filename}}, 9338If the variable content has the format @T{@At@rep{filename}},