diff options
| author | Mike Pall <mike> | 2013-04-09 16:35:02 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-04-09 16:35:02 +0200 |
| commit | e92e29dd4e23809cdc0fee795c68e8819eff0b54 (patch) | |
| tree | 6687bc02b6dcaf9f05eb9edefd60d7138ad6ee18 /doc | |
| parent | 48912a2dea496e6640db75a261b105182ddbb7a6 (diff) | |
| parent | b1327bcf89ab58fe2824eff73fdec28bc9acc305 (diff) | |
| download | luajit-e92e29dd4e23809cdc0fee795c68e8819eff0b54.tar.gz luajit-e92e29dd4e23809cdc0fee795c68e8819eff0b54.tar.bz2 luajit-e92e29dd4e23809cdc0fee795c68e8819eff0b54.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/extensions.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/extensions.html b/doc/extensions.html index f288fbde..8300753e 100644 --- a/doc/extensions.html +++ b/doc/extensions.html | |||
| @@ -251,8 +251,9 @@ enabled: | |||
| 251 | <ul> | 251 | <ul> |
| 252 | <li><tt>goto</tt> and <tt>::labels::</tt>.</li> | 252 | <li><tt>goto</tt> and <tt>::labels::</tt>.</li> |
| 253 | <li>Hex escapes <tt>'\x3F'</tt> and <tt>'\*'</tt> escape in strings.</li> | 253 | <li>Hex escapes <tt>'\x3F'</tt> and <tt>'\*'</tt> escape in strings.</li> |
| 254 | <li><tt>load(string|reader, chunkname [,mode [,env]])</tt>. | 254 | <li><tt>load(string|reader [, chunkname [,mode [,env]]])</tt>.</li> |
| 255 | <tt>loadstring()</tt> is an alias.</li> | 255 | <li><tt>loadstring()</tt> is an alias for <tt>load()</tt>.</li> |
| 256 | <li><tt>loadfile(filename [,mode [,env]])</tt>.</li> | ||
| 256 | <li><tt>math.log(x [,base])</tt>. | 257 | <li><tt>math.log(x [,base])</tt>. |
| 257 | <li><tt>string.rep(s, n [,sep])</tt>. | 258 | <li><tt>string.rep(s, n [,sep])</tt>. |
| 258 | <li><tt>string.format()</tt>: <tt>%q</tt> reversible. | 259 | <li><tt>string.format()</tt>: <tt>%q</tt> reversible. |