diff options
| author | Mike Pall <mike> | 2017-01-17 10:55:41 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2017-01-17 10:55:41 +0100 |
| commit | ed4ce98ac1471a1d8a4f50486adb29771dcab9f2 (patch) | |
| tree | 9733793160f34f6e7102a33fc016e309d3d07503 /doc | |
| parent | 12c0df4189c3bd3daf9034afbb2773b92c883d44 (diff) | |
| parent | a1e13fa6e4382bcae44f97bf5954f0e57cfad90c (diff) | |
| download | luajit-ed4ce98ac1471a1d8a4f50486adb29771dcab9f2.tar.gz luajit-ed4ce98ac1471a1d8a4f50486adb29771dcab9f2.tar.bz2 luajit-ed4ce98ac1471a1d8a4f50486adb29771dcab9f2.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/extensions.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/extensions.html b/doc/extensions.html index 9d666293..70dc6995 100644 --- a/doc/extensions.html +++ b/doc/extensions.html | |||
| @@ -291,8 +291,8 @@ enabled: | |||
| 291 | <li><tt>load(string|reader [, chunkname [,mode [,env]]])</tt>.</li> | 291 | <li><tt>load(string|reader [, chunkname [,mode [,env]]])</tt>.</li> |
| 292 | <li><tt>loadstring()</tt> is an alias for <tt>load()</tt>.</li> | 292 | <li><tt>loadstring()</tt> is an alias for <tt>load()</tt>.</li> |
| 293 | <li><tt>loadfile(filename [,mode [,env]])</tt>.</li> | 293 | <li><tt>loadfile(filename [,mode [,env]])</tt>.</li> |
| 294 | <li><tt>math.log(x [,base])</tt>. | 294 | <li><tt>math.log(x [,base])</tt>.</li> |
| 295 | <li><tt>string.rep(s, n [,sep])</tt>. | 295 | <li><tt>string.rep(s, n [,sep])</tt>.</li> |
| 296 | <li><tt>string.format()</tt>: <tt>%q</tt> reversible. | 296 | <li><tt>string.format()</tt>: <tt>%q</tt> reversible. |
| 297 | <tt>%s</tt> checks <tt>__tostring</tt>. | 297 | <tt>%s</tt> checks <tt>__tostring</tt>. |
| 298 | <tt>%a</tt> and <tt>"%A</tt> added.</li> | 298 | <tt>%a</tt> and <tt>"%A</tt> added.</li> |
| @@ -335,7 +335,7 @@ instead of <tt>true</tt>.</li> | |||
| 335 | exit status.</li> | 335 | exit status.</li> |
| 336 | <li><tt>debug.setmetatable()</tt> returns object.</li> | 336 | <li><tt>debug.setmetatable()</tt> returns object.</li> |
| 337 | <li><tt>debug.getuservalue()</tt> and <tt>debug.setuservalue()</tt>.</li> | 337 | <li><tt>debug.getuservalue()</tt> and <tt>debug.setuservalue()</tt>.</li> |
| 338 | <li>Remove <tt>math.mod()</tt>, <tt>string.gfind()</tt>. | 338 | <li>Remove <tt>math.mod()</tt>, <tt>string.gfind()</tt>.</li> |
| 339 | </ul> | 339 | </ul> |
| 340 | <p> | 340 | <p> |
| 341 | Note: this provides only partial compatibility with Lua 5.2 at the | 341 | Note: this provides only partial compatibility with Lua 5.2 at the |