summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/changes.html2
-rw-r--r--doc/install.html8
-rw-r--r--doc/luajit.html2
-rw-r--r--doc/running.html14
-rw-r--r--doc/status.html11
5 files changed, 14 insertions, 23 deletions
diff --git a/doc/changes.html b/doc/changes.html
index 20c2fc59..2bc1171a 100644
--- a/doc/changes.html
+++ b/doc/changes.html
@@ -63,7 +63,7 @@ div.major { max-width: 600px; padding: 1em; margin: 1em 0 1em 0; }
63<div id="main"> 63<div id="main">
64<p> 64<p>
65This is a list of changes between the released versions of LuaJIT.<br> 65This is a list of changes between the released versions of LuaJIT.<br>
66The current <span style="color: #c00000;">development version</span> is <strong>LuaJIT&nbsp;2.0.0-beta10</strong>.<br> 66The current <span style="color: #c00000;">development version</span> is <strong>LuaJIT&nbsp;2.0.0-beta11</strong>.<br>
67The current <span style="color: #0000c0;">stable version</span> is <strong>LuaJIT&nbsp;1.1.8</strong>. 67The current <span style="color: #0000c0;">stable version</span> is <strong>LuaJIT&nbsp;1.1.8</strong>.
68</p> 68</p>
69<p> 69<p>
diff --git a/doc/install.html b/doc/install.html
index ab2cdda5..c74a57c7 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -188,8 +188,8 @@ open a terminal window and change to this directory. Now unpack the archive
188and change to the newly created directory: 188and change to the newly created directory:
189</p> 189</p>
190<pre class="code"> 190<pre class="code">
191tar zxf LuaJIT-2.0.0-beta10.tar.gz 191tar zxf LuaJIT-2.0.0-beta11.tar.gz
192cd LuaJIT-2.0.0-beta10</pre> 192cd LuaJIT-2.0.0-beta11</pre>
193<h3>Building LuaJIT</h3> 193<h3>Building LuaJIT</h3>
194<p> 194<p>
195The supplied Makefiles try to auto-detect the settings needed for your 195The supplied Makefiles try to auto-detect the settings needed for your
@@ -239,11 +239,11 @@ Obviously the prefixes given during build and installation need to be the same.
239<p style="color: #c00000;"> 239<p style="color: #c00000;">
240Note: to avoid overwriting a previous version, the beta test releases 240Note: to avoid overwriting a previous version, the beta test releases
241only install the LuaJIT executable under the versioned name (i.e. 241only install the LuaJIT executable under the versioned name (i.e.
242<tt>luajit-2.0.0-beta10</tt>). You probably want to create a symlink 242<tt>luajit-2.0.0-beta11</tt>). You probably want to create a symlink
243for convenience, with a command like this: 243for convenience, with a command like this:
244</p> 244</p>
245<pre class="code" style="color: #c00000;"> 245<pre class="code" style="color: #c00000;">
246sudo ln -sf luajit-2.0.0-beta10&nbsp;/usr/local/bin/luajit 246sudo ln -sf luajit-2.0.0-beta11&nbsp;/usr/local/bin/luajit
247</pre> 247</pre>
248 248
249<h2 id="windows">Windows Systems</h2> 249<h2 id="windows">Windows Systems</h2>
diff --git a/doc/luajit.html b/doc/luajit.html
index 9ab12899..5d021355 100644
--- a/doc/luajit.html
+++ b/doc/luajit.html
@@ -197,7 +197,7 @@ cross-language benchmarks since its first release &mdash; often by a
197substantial margin. 197substantial margin.
198</p> 198</p>
199<p> 199<p>
200For <b>LuaJIT 2.0</b> the whole VM has been rewritten from the ground up 200For <b>LuaJIT 2.0</b>, the whole VM has been rewritten from the ground up
201and relentlessly optimized for performance. It combines a <b>high-speed 201and relentlessly optimized for performance. It combines a <b>high-speed
202interpreter</b>, written in assembler, with a <b>state-of-the-art JIT 202interpreter</b>, written in assembler, with a <b>state-of-the-art JIT
203compiler</b>. 203compiler</b>.
diff --git a/doc/running.html b/doc/running.html
index eddb7ad7..8dd935aa 100644
--- a/doc/running.html
+++ b/doc/running.html
@@ -89,16 +89,12 @@ interactive mode, too.
89<p class="indent" style="color: #c00000;"> 89<p class="indent" style="color: #c00000;">
90Note: the beta test releases only install under the versioned name on 90Note: the beta test releases only install under the versioned name on
91POSIX systems (to avoid overwriting a previous version). You either need 91POSIX systems (to avoid overwriting a previous version). You either need
92to type <tt>luajit-2.0.0-beta10</tt> to start it or create a symlink 92to type <tt>luajit-2.0.0-beta11</tt> to start it or create a symlink
93with a command like this: 93with a command like this:
94</p> 94</p>
95<pre class="code" style="color: #c00000;"> 95<pre class="code" style="color: #c00000;">
96sudo ln -sf luajit-2.0.0-beta10&nbsp;/usr/local/bin/luajit 96sudo ln -sf luajit-2.0.0-beta11&nbsp;/usr/local/bin/luajit
97</pre> 97</pre>
98<p>
99Unlike previous versions <b>optimization is turned on by default</b> in
100LuaJIT 2.0!<br>It's no longer necessary to use <tt>luajit&nbsp;-O</tt>.
101</p>
102 98
103<h2 id="options">Command Line Options</h2> 99<h2 id="options">Command Line Options</h2>
104<p> 100<p>
@@ -199,7 +195,7 @@ itself. For a description of their options and output format, please
199read the comment block at the start of their source. 195read the comment block at the start of their source.
200They can be found in the <tt>lib</tt> directory of the source 196They can be found in the <tt>lib</tt> directory of the source
201distribution or installed under the <tt>jit</tt> directory. By default 197distribution or installed under the <tt>jit</tt> directory. By default
202this is <tt>/usr/local/share/luajit-2.0.0-beta10/jit</tt> on POSIX 198this is <tt>/usr/local/share/luajit-2.0.0-beta11/jit</tt> on POSIX
203systems. 199systems.
204</p> 200</p>
205 201
@@ -221,6 +217,10 @@ optimizations and higher numbers enable more optimizations. Omitting
221the level (i.e. just <tt>-O</tt>) sets the default optimization level, 217the level (i.e. just <tt>-O</tt>) sets the default optimization level,
222which is <tt>-O3</tt> in the current version. 218which is <tt>-O3</tt> in the current version.
223</p> 219</p>
220<p style="font-size: 8pt;">
221Note: Unlike previous versions, <b>optimization is turned on by default</b> in
222LuaJIT 2.0!<br>It's no longer necessary to use <tt>luajit&nbsp;-O</tt>.
223</p>
224<p> 224<p>
225The second form adds or removes individual optimization flags. 225The second form adds or removes individual optimization flags.
226The third form sets a parameter for the VM or the JIT compiler 226The third form sets a parameter for the VM or the JIT compiler
diff --git a/doc/status.html b/doc/status.html
index 6bb4df89..574cf3ce 100644
--- a/doc/status.html
+++ b/doc/status.html
@@ -62,20 +62,11 @@ ul li { padding-bottom: 0.3em; }
62</div> 62</div>
63<div id="main"> 63<div id="main">
64<p> 64<p>
65The <span style="color: #0000c0;">LuaJIT&nbsp;1.x</span> series represents
66the current <span style="color: #0000c0;">stable branch</span>.
67Only a single bug has been discovered in the last three years. So, if
68you need a rock-solid VM, you are encouraged to fetch the latest
69release of LuaJIT 1.x from the <a href="http://luajit.org/download.html"><span class="ext">&raquo;</span>&nbsp;Download</a>
70page.
71</p>
72<p>
73<span style="color: #c00000;">LuaJIT&nbsp;2.0</span> is the currently active 65<span style="color: #c00000;">LuaJIT&nbsp;2.0</span> is the currently active
74<span style="color: #c00000;">development branch</span> in beta test. 66<span style="color: #c00000;">development branch</span> in beta test.
75It has <a href="http://luajit.org/performance.html"><span class="ext">&raquo;</span>&nbsp;much better performance</a> than 67It has <a href="http://luajit.org/performance.html"><span class="ext">&raquo;</span>&nbsp;much better performance</a> than
76LuaJIT&nbsp;1.x and runs on many more platforms and architectures. 68LuaJIT&nbsp;1.x and runs on many more platforms and architectures.
77It's nearing a stable release, so you should definitely 69The branch has already been frozen as it's nearing a stable release.
78start to evaluate it for new projects right now.
79</p> 70</p>
80 71
81<h2>Current Status</h2> 72<h2>Current Status</h2>