diff --git a/doc/user/configuration-reference.xml b/doc/user/configuration-reference.xml
index c1e5d7cd6e0f439757344ea81aa386b501b00408..cea7e2b68772b56dcf8e176fc073d1a486e2ff26 100644
--- a/doc/user/configuration-reference.xml
+++ b/doc/user/configuration-reference.xml
@@ -206,7 +206,7 @@ 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>
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 ae4d40dbbbd473e1bf841059b7b8ae4ca31b9ebf..1537a32feedaaf0ea3ecddc1ab33805532664900 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