diff --git a/doc/user/configuration-reference.xml b/doc/user/configuration-reference.xml
index c1e5d7cd6e0f439757344ea81aa386b501b00408..7c73535e907cc0223e604a1be4a2982450376ccb 100644
--- a/doc/user/configuration-reference.xml
+++ b/doc/user/configuration-reference.xml
@@ -206,14 +206,14 @@ Tarantool 1.4.0-69-g45551dd
parameters in two template files, which are easy to maintain
and extend:
<filename xlink:href="https://github.com/tarantool/tarantool/blob/master/cfg/core_cfg.cfg_tmpl">cfg/core_cfg.cfg_tmpl</filename>,
- <filename xlink:href="https://github.com/tarantool/tarantool/blob/master/mod/box/box_cfg.cfg_tmpl">src/box/box_cfg.cfg_tmpl</filename>.
+ <filename xlink:href="https://github.com/tarantool/tarantool/blob/master/src/box/box_cfg.cfg_tmpl">src/box/box_cfg.cfg_tmpl</filename>.
These files can always be used as a reference for any
parameter in this manual.
</para>
<para>In addition, two working examples can be found in the source tree:
<filename xlink:href="https://github.com/tarantool/tarantool/blob/master/test/box/tarantool.cfg">test/box/tarantool.cfg</filename>,
- <filename xlink:href="https://github.com/tarantool/tarantool/blob/master/test/box_big/tarantool.cfg">test/box_big/tarantool.cfg</filename>.
+ <filename xlink:href="https://github.com/tarantool/tarantool/blob/master/test/big/tarantool.cfg">test/big/tarantool.cfg</filename>.
</para>
<table frame='all' pgwide='1'>
diff --git a/doc/user/replication.xml b/doc/user/replication.xml
index d320529be6ce1bdd64970a37f2a87308c00d1a13..66ee093f08752f3fc691b68989b12b6b7852a36f 100644
--- a/doc/user/replication.xml
+++ b/doc/user/replication.xml
@@ -65,7 +65,7 @@
necessary to enable <olink targetptr="replication_port"/> in
the configuration file. An example configuration file can be
found in <link
- xlink:href="https://github.com/tarantool/tarantool/blob/master/test/box_replication/cfg/master.cfg"><filename>test/box_replication/cfg/master.cfg</filename></link>. A master with enabled replication_port can accept connections
+ xlink:href="http://github.com/tarantool/tarantool/blob/master/test/replication/cfg/master.cfg"><filename>test/replication/cfg/master.cfg</filename></link>. A master with enabled replication_port can accept connections
from as many replicas as necessary on that port. Each replica
has its own replication state.
</para>
@@ -91,7 +91,7 @@
necessary to keep WAL files on the master host as long as
there are replicas that haven't applied them yet. An example
configuration can be found in <link
- xlink:href="https://github.com/tarantool/tarantool/blob/master/test/box_replication/cfg/replica.cfg"><filename>test/box_replication/cfg/replica.cfg</filename></link>.
+ xlink:href="https://github.com/tarantool/tarantool/blob/master/test/replication/cfg/replica.cfg"><filename>test/replication/cfg/replica.cfg</filename></link>.
</para>
<para>
In absence of required WALs, a replica can be "re-seeded" at
diff --git a/doc/user/stored-procedures.xml b/doc/user/stored-procedures.xml
index cbb100b7ffd1cfe665bb4483c3890aa68c07fadb..cf9e24585eabf8c92aba9be85981ca6462ee25f9 100644
--- a/doc/user/stored-procedures.xml
+++ b/doc/user/stored-procedures.xml
@@ -1235,7 +1235,7 @@ lua box.cjson.decode('{"hello": "world"}').hello
functions. For example, instead of <code>box.insert(0, ...)</code>
one can write <code>box.space[0]:insert(...)</code>.
Package source code is available in file <filename
- xlink:href="https://github.com/tarantool/tarantool/blob/master/src/box/box.lua">src/box/box.lua</filename></para>
+ xlink:href="https://github.com/tarantool/tarantool/blob/master/src/box/lua/box.lua">src/box/lua/box.lua</filename></para>
<para>A list of all <code>space</code> members follows.</para>
<varlistentry>
<term><emphasis role="lua">space.n</emphasis></term>
@@ -1472,7 +1472,7 @@ localhost> lua for k,v in box.space[0]:pairs() do print(v) end
access to all tuples and spaces until it
encounters a "context switch": caused a write to
disk, network, or by an explicit call to <emphasis
- role="lua" xlink:href="box.fiber.yield">box.fiber.yield()</emphasis>.
+ role="lua" xlink:href="#box.fiber.yield">box.fiber.yield()</emphasis>.
When the execution flow returns to the yielded
procedure, the data set could have changed significantly.
Iteration, resumed after a yield point, does not
diff --git a/doc/www-data.in/_layout/base b/doc/www-data.in/_layout/base
index 959681f11f0eb817cfd1848c83c29f5325ee2dbf..528101eaabe77498a2e230730ec50f6184a50fdf 100644
--- a/doc/www-data.in/_layout/base
+++ b/doc/www-data.in/_layout/base
@@ -13,7 +13,7 @@
<div id="header">
{% block header %}
<p class='lwrap'><a id="home_link" href="index{{ languages[pagelang].suffix | e }}">{{ home_tag | langselect | e }}</a></p>
- <p class='rwrap'><a id="lang_link" href="{{ pagename + lang_ext | langselect | e }}">{{ lang_tag | langselect | e }}</a></p>
+<!-- <p class='rwrap'><a id="lang_link" href="{{ pagename + lang_ext | langselect | e }}">{{ lang_tag | langselect | e }}</a></p> -->
{% endblock header %}
</div>
diff --git a/doc/www-data.in/_layout/index b/doc/www-data.in/_layout/index
index e7dab47413077a93e6cad99f39f3c438d995d09b..deea5012d3da3ecf8becf08c929cb801b6ad0306 100644
--- a/doc/www-data.in/_layout/index
+++ b/doc/www-data.in/_layout/index
@@ -2,7 +2,7 @@
{% set title = "Tarantool -- a transactional NoSQL database" %}
{% block header %}
- <p class='rwrap'><a id="lang_link" href="{{ pagename + lang_ext | langselect | e }}">{{ lang_tag | langselect | e }}</a></p>
+<!-- <p class='rwrap'><a id="lang_link" href="{{ pagename + lang_ext | langselect | e }}">{{ lang_tag | langselect | e }}</a></p> -->
{% endblock header %}
{% block content %}
diff --git a/doc/www-data.in/download.cmake b/doc/www-data.in/download.cmake
index e946a1a86bafa54d7b4e35a52aa06de2815649df..9d2c75b3ee47fd7f2e0eff302030e747583495f6 100644
--- a/doc/www-data.in/download.cmake
+++ b/doc/www-data.in/download.cmake
@@ -173,83 +173,6 @@ Tarantool иÑпользует Ñтандартную Ñхему нумеров
Ð”Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð² выÑоконагруженных проектах
рекомендуютÑÑ Ð¿Ð°ÐºÐµÑ‚Ñ‹, опубликованные на Ñтом Ñайте.
-#### RedHat, FreeBSD, Mac OS X
-
-<table border=1 title="Download the latest build, @PACKAGE_VERSION@" width=100%>
-
-<!-- RPM -->
-
- <th colspan=3>RedHat</th>
-
- <tr>
- <td>
- RedHat <b>.rpm</b>
- </td>
-
- <td align=center>
- <a href="http://tarantool.org/dist/tarantool-@PACKAGE_VERSION@-linux-i686.rpm">32-bit</a>
- </td>
-
- <td align=center>
- <a
- href="http://tarantool.org/dist/tarantool-@PACKAGE_VERSION@-linux-x86_64.rpm">64-bit</a>
- </td>
- </tr>
-
- <tr>
- <td>
- RedHat <b>.rpm</b>, with debug info
- </td>
- <td align=center>
- <a
- href="http://tarantool.org/dist/tarantool-@PACKAGE_VERSION@-linux-i686-debug.rpm">32-bit</a>
- </td>
-
- <td align=center>
- <a
- href="http://tarantool.org/dist/tarantool-@PACKAGE_VERSION@-linux-x86_64-debug.rpm">64-bit</a>
- </td>
- </tr>
-
-<!-- .tar.gz -->
- <th colspan=3>Other Linux distributions</th>
-
- <tr>
- <td>
- Binary tarball (<b>.tar.gz</b>)
- </td>
- <td align=center>
- <a href="http://tarantool.org/dist/tarantool-@PACKAGE_VERSION@-linux-i686.tar.gz">32-bit</a>
- </td>
-
- <td align=center>
- <a href="http://tarantool.org/dist/tarantool-@PACKAGE_VERSION@-linux-x86_64.tar.gz">64-bit</a>
- </td>
- </tr>
-
- <th colspan=3>FreeBSD</th>
-
-<!-- .tar.gz -->
-
- <tr>
- <td>
- Binary tarball (<b>.tar.gz</b>)
- </td>
- <td align=center>
- <a
- href="http://tarantool.org/dist/tarantool-@PACKAGE_VERSION@-freebsd-i386.tar.gz">32-bit</a>
- </td>
-
- <td align=center>
- </td>
- </tr>
- <th colspan=4>Mac OS X</th>
- <tr>
- <td align=center colspan=4>brew install http://tarantool.org/dist/tarantool.rb</td>
- <tr>
-
-</table>
-
#### Debian GNU/Linux and Ubuntu
Мы поддерживаем ÑобÑтвенные репозитории .deb пакетов, который
diff --git a/doc/www-data.in/index b/doc/www-data.in/index
index ad2ceca029f02e7d568a9fc0af17f1f67b4bab0e..af2e336cb01157291ad3b05ee86b816f5befa9b6 100644
--- a/doc/www-data.in/index
+++ b/doc/www-data.in/index
@@ -10,7 +10,7 @@
# Tarantool
## NoSQL СУБД Ð´Ð»Ñ Ð²Ñ‹Ñокой нагрузки
-###[Введение](intro.ru.html) [ДокументациÑ](tarantool_user_guide.html) [Скачать](download.ru.html) [Поддержка](support.ru.html)
+###[Введение](intro.html) [ДокументациÑ](tarantool_user_guide.html) [Скачать](download.html) [Поддержка](support.html)
{% text tagline en %}