Merge branch 'master' into v2.1

1 files changed, 0 insertions, 3 deletions

diff --git a/doc/faq.html b/doc/faq.html
index 9effeb16..469175dd 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -53,8 +53,6 @@ dd { margin-left: 1.5em; }
 </li><li>
 <a class="current" href="faq.html">FAQ</a>
 </li><li>
-<a href="http://wiki.luajit.org/">Wiki <span class="ext">&raquo;</span></a>
-</li><li>
 <a href="https://luajit.org/list.html">Mailing List <span class="ext">&raquo;</span></a>
 </li></ul>
 </div>
@@ -65,7 +63,6 @@ dd { margin-left: 1.5em; }
 <ul style="padding: 0;">
 <li>The <a href="https://luajit.org/list.html"><span class="ext">&raquo;</span>&nbsp;LuaJIT mailing list</a> focuses on topics
 related to LuaJIT.</li>
-<li>The <a href="http://wiki.luajit.org/"><span class="ext">&raquo;</span>&nbsp;LuaJIT wiki</a> gathers community
 resources about LuaJIT.</li>
 <li>News about Lua itself can be found at the
 <a href="https://www.lua.org/lua-l.html"><span class="ext">&raquo;</span>&nbsp;Lua mailing list</a>.