Merge branch 'master' of github.com:tarantool/tarantool

doc/sphinx/_static/headers.js

@@ -11,6 +11,17 @@ $(document).ready(function () {
       }
     }
   );
+  $("[id^='lua-object'], [id^='lua-function'], [id^='lua-data']").each(
+    function(i, el) {
+      var icon = '<i class="fa fa-link"></i>';
+      var hlink = $(el).find(".headerlink");
+      var hlink_id = hlink.attr("href");
+      if (typeof(hlink_id) != 'undefined') {
+        $(hlink).remove();
+        $(el).prepend($("<a />").addClass("headerlink").attr("href", hlink_id).html(icon));
+      }
+    }
+  );
   $(".admonition.note p.first.admonition-title").each(
     function(i, el) {
       var icon = '<i class="fa fa-comments-o"></i>';

doc/sphinx/_static/sphinx_design.css

@@ -13,6 +13,7 @@
 }
 li.toctree-l1>a {
     color:#168de2;
+
     font-size:20px;
     margin:0;
     text-decoration:none;
@@ -187,7 +188,8 @@ a.headerlink {
 .b-article h2,
 .b-article h3,
 .b-article h4,
-.b-article h5 {
+.b-article h5,
+.b-article h6 {
     margin: 16px 0 16px -25px;
     font-weight: bold;
 }
@@ -211,12 +213,24 @@ a.headerlink {
   -ms-transition: opacity 0.2s ease-in-out 0.1s;
 }
 
+[id^="lua-object"  ],
+[id^="lua-function"],
+[id^="lua-data"    ] {
+    margin-left: -25px;
+}
+
+[id^="lua-object"  ]:hover .headerlink,
+[id^="lua-function"]:hover .headerlink,
+[id^="lua-data"    ]:hover .headerlink {
+    opacity: 1;
+}
+
 h2:hover .headerlink,
 h3:hover .headerlink,
 h4:hover .headerlink,
 h5:hover .headerlink,
 h6:hover .headerlink {
-  opacity: 1;
+    opacity: 1;
 }
 
 table.docutils.footnote {
@@ -378,8 +392,8 @@ div.b-cols_content_left .b-search-text {
 }
 .b-tab_switcher {
     display:inline-block;
-    border:1px solid #168de2;
-    background:#FFF;
+    border:2px solid #797979;
+    background:#fff;
     -webkit-border-radius: 6px 6px 0 0;
     -moz-border-radius: 6px 6px 0 0;
     border-radius: 6px 6px 0 0;
@@ -391,7 +405,7 @@ div.b-cols_content_left .b-search-text {
     display:inline-block;
     font-size:16px;
     color:#262626;
-    border-right:1px solid #168de2;
+    border-right:2px solid #797979;
     padding: 0px !important;
 }
 .b-tab_switcher-item:last-child {
@@ -399,17 +413,18 @@ div.b-cols_content_left .b-search-text {
 }
 .b-tab_switcher-item-url {
     display:inline-block;
-    color:inherit;
+    color:#797979;
     text-decoration:none;
     padding:8px 19px;
     text-transform:uppercase;
 }
 .b-tab_switcher-item-url:hover {
-    background:#e7f3fc;
+    background:#c9c9c9;
+    color:#fff
 }
 .b-tab_switcher-item-url.p-active {
-    background:#168de2;
-    color:#FFF;
+    background:#797979;
+    color:#fff;
 }
 .b-tab_switcher-item:first-child .b-tab_switcher-item-url {
     -webkit-border-radius: 4px 0 0 0px;
@@ -423,9 +438,12 @@ div.b-cols_content_left .b-search-text {
 }
 
 .b-documentation-tab-content {
-    border: 1px solid #168de2;
-    margin-top: -1px;
+    border: 2px solid #797979;
+    margin-top: -2px;
     padding: 5px;
+    -webkit-border-radius: 0 6px 6px 6px;
+    -moz-border-radius: 0 6px 6px 6px;
+    border-radius: 0 6px 6px 6px;
 }
 
 .b-documentation-tab div {

doc/sphinx/book/replication/index.rst

@@ -95,7 +95,7 @@ the old master went down, they would have to be re-applied manually.
 
 
 =====================================================================
-  Instructions for quick startup of a new two-server simple cluster
+        Quick startup of a new two-server simple cluster
 =====================================================================
 
 Step 1. Start the first server thus:
@@ -342,7 +342,7 @@ Now the screen looks like this: (except that UUID values are always different):
                 }, '#catalog-2 .b-tab_switcher-item');
                 dOn.ready(function(event) {
                     maxHeight = Math.max($('#terminal-2-1').height(), $('#terminal-2-2').height());
-                    $('#catalog-2-content').height(maxHeight);
+                    $('#catalog-2-content').height(maxHeight + 10);
                     $('#terminal-2-1').height(maxHeight);
                     $('#terminal-2-2').height(maxHeight);
                     $('#terminal-2-1').show();