diff --git a/mod/box/client/ruby/README b/connector/ruby/README
similarity index 100%
rename from mod/box/client/ruby/README
rename to connector/ruby/README
diff --git a/mod/box/client/ruby/box.rb b/connector/ruby/box.rb
similarity index 100%
rename from mod/box/client/ruby/box.rb
rename to connector/ruby/box.rb
diff --git a/mod/box/client/ruby/iproto.rb b/connector/ruby/iproto.rb
similarity index 100%
rename from mod/box/client/ruby/iproto.rb
rename to connector/ruby/iproto.rb
diff --git a/doc/user/connectors.xml b/doc/user/connectors.xml
index ac5298b799ddd5c4ea60dd5265b798531a2e1f68..f3cdfb7002551926bdbb089a2266126ebeed3adc 100644
--- a/doc/user/connectors.xml
+++ b/doc/user/connectors.xml
@@ -17,35 +17,38 @@
   <section>
     <title>C</title>
     <para>
-       Please see (xref here).
+       Please see <link
+       xlink:href="https://github.com/mailru/tarantool/blob/master/connector/c/client.h"><filename>connector/c/client.h</filename></link> in the source tree.
     </para>
   </section>
 
   <section>
     <title>Perl</title>
     <para>
-       Please see (xref here).
+       Please see <link
+       xlink:href="https://github.com/mailru/tarantool/blob/master/mod/box/client/perl/lib/"><filename>mod/box/client/perl/lib/</filename></link> in the source tree.
     </para>
   </section>
 
   <section>
     <title>PHP</title>
     <para>
-       Please see (xref here).
+       @tba
     </para>
   </section>
 
   <section>
     <title>Python</title>
     <para>
-       Please see (xref here).
+       @tba
     </para>
   </section>
 
   <section>
     <title>Ruby</title>
     <para>
-       Please see (xref here).
+       Please see <link
+       xlink:href="https://github.com/mailru/tarantool/blob/master/connector/Ruby/Box.rb"><filename>connector/Ruby/Box.rb</filename></link> in the source tree.
     </para>
   </section>
 
diff --git a/doc/user/user.xml b/doc/user/user.xml
index 114a077ea634f7b8a51a95a5bca0359bff096c57..e063dbf69ad0166de77d0f89df010efb6edc7a60 100644
--- a/doc/user/user.xml
+++ b/doc/user/user.xml
@@ -15,61 +15,9 @@
 <xi:include href="replication.xml"/>
 <xi:include href="configuration-reference.xml"/>
 <xi:include href="connectors.xml"/>
-<!--
-<xi:include href="memcached.xml"/>
-<xi:include href="logging.xml"/>
-<xi:include href="connectors.xml"/>
-<xi:include href="faq.xml"/>
--->
 <xi:include href="errcode.xml"/>
 <!--
-     TOC:
-
-     Introduction
-       What it can basically do; 
-
-     Installation and Running
-       Command line options reference
- 
-     Data console and administrative console
-       Data operations
-       Administrative console operations
-         Format of response
-
-     Setting up replication
-       Master-slave replication
-
-     Support of memcached protocol
-
-     Configuration reference
-
-     Log file messages
-
-     Format of the binary log/snapshot
-
-     Tarantool command line shell
-
-     Connectors
-       C
-       Ruby 
-         Example
-       Perl
-
-     Product release cycle
-
-     Frequently Asked Questions
-       Q. What's on your roadmap?
-       Q. I found a bug. What to do?
-       What can possibly go wrong during compile:
-       as exception - old python
-       - confetti not found - explain what is going on
-       gcc compilation error: type 'VERBOSE=1 make' and
-       check out the exact error.
-
-     Appendixes:
-       Configuration parameters index
-       Server error codes
-       Glossary of terms
+<xi:include href="faq.xml"/>
 -->
 </book>
 <!--