diff --git a/doc/reference/reference_sql/data_type.spec b/doc/reference/reference_sql/data_type.spec
index 92020137fb..e831db1dba 100644
--- a/doc/reference/reference_sql/data_type.spec
+++ b/doc/reference/reference_sql/data_type.spec
@@ -3,6 +3,7 @@ stack (
     choice(
       line(' BOOL '),
       line(' BOOLEAN '),
+      line(' DECIMAL '),
       line(' DOUBLE '),
       line(' INT '),
       line(' INTEGER '),
diff --git a/doc/reference/reference_sql/data_type.svg b/doc/reference/reference_sql/data_type.svg
index 381920add0..074c41e082 100644
--- a/doc/reference/reference_sql/data_type.svg
+++ b/doc/reference/reference_sql/data_type.svg
@@ -3,7 +3,7 @@
 <svg xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 xml:space="preserve"
-width="691" height="461" version="1.1">
+width="691" height="490" version="1.1">
 <style type="text/css">
 <![CDATA[
 .title_font {fill:#000000; text-anchor:middle;
@@ -31,116 +31,119 @@ width="691" height="461" version="1.1">
 </defs>
 <rect width="100%" height="100%" fill="white"/><path d="M69.0,31.5 A12.0,12.0 0 0,1 69.0,7.5 H129.0 A12.0,12.0 0 0,1 129.0,31.5 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
 <path d="M69.0,61.0 A12.0,12.0 0 0,1 69.0,37.0 H162.0 A12.0,12.0 0 0,1 162.0,61.0 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
-<path d="M69.0,90.5 A12.0,12.0 0 0,1 69.0,66.5 H151.0 A12.0,12.0 0 0,1 151.0,90.5 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
-<path d="M69.0,120.0 A12.0,12.0 0 0,1 69.0,96.0 H118.0 A12.0,12.0 0 0,1 118.0,120.0 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
-<path d="M69.0,149.5 A12.0,12.0 0 0,1 69.0,125.5 H162.0 A12.0,12.0 0 0,1 162.0,149.5 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
-<path d="M69.0,179.0 A12.0,12.0 0 0,1 69.0,155.0 H151.0 A12.0,12.0 0 0,1 151.0,179.0 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
+<path d="M69.0,90.5 A12.0,12.0 0 0,1 69.0,66.5 H162.0 A12.0,12.0 0 0,1 162.0,90.5 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
+<path d="M69.0,120.0 A12.0,12.0 0 0,1 69.0,96.0 H151.0 A12.0,12.0 0 0,1 151.0,120.0 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
+<path d="M69.0,149.5 A12.0,12.0 0 0,1 69.0,125.5 H118.0 A12.0,12.0 0 0,1 118.0,149.5 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
+<path d="M69.0,179.0 A12.0,12.0 0 0,1 69.0,155.0 H162.0 A12.0,12.0 0 0,1 162.0,179.0 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
 <path d="M69.0,208.5 A12.0,12.0 0 0,1 69.0,184.5 H151.0 A12.0,12.0 0 0,1 151.0,208.5 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
-<rect x="209.0" y="202.5" width="188.0" height="24.0" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
-<path d="M69.0,256.0 A12.0,12.0 0 0,1 69.0,232.0 H151.0 A12.0,12.0 0 0,1 151.0,256.0 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
-<rect x="209.0" y="250.0" width="188.0" height="24.0" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
-<path d="M69.0,303.5 A12.0,12.0 0 0,1 69.0,279.5 H129.0 A12.0,12.0 0 0,1 129.0,303.5 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
-<rect x="187.0" y="297.5" width="188.0" height="24.0" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
-<path d="M69.0,351.0 A12.0,12.0 0 0,1 69.0,327.0 H173.0 A12.0,12.0 0 0,1 173.0,351.0 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
-<path d="M69.0,380.5 A12.0,12.0 0 0,1 69.0,356.5 H129.0 A12.0,12.0 0 0,1 129.0,380.5 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
-<path d="M69.0,410.0 A12.0,12.0 0 0,1 69.0,386.0 H184.0 A12.0,12.0 0 0,1 184.0,410.0 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
-<path d="M69.0,439.5 A12.0,12.0 0 0,1 69.0,415.5 H162.0 A12.0,12.0 0 0,1 162.0,439.5 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
-<path d="M204.0,439.5 A12.0,12.0 0 0,1 204.0,415.5 H209.0 A12.0,12.0 0 0,1 209.0,439.5 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
-<rect x="239.0" y="415.5" width="89.0" height="24.0" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
-<path d="M358.0,439.5 A12.0,12.0 0 0,1 358.0,415.5 H363.0 A12.0,12.0 0 0,1 363.0,439.5 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
-<rect x="421.0" y="433.5" width="188.0" height="24.0" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
+<path d="M69.0,238.0 A12.0,12.0 0 0,1 69.0,214.0 H151.0 A12.0,12.0 0 0,1 151.0,238.0 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
+<rect x="209.0" y="232.0" width="188.0" height="24.0" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
+<path d="M69.0,285.5 A12.0,12.0 0 0,1 69.0,261.5 H151.0 A12.0,12.0 0 0,1 151.0,285.5 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
+<rect x="209.0" y="279.5" width="188.0" height="24.0" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
+<path d="M69.0,333.0 A12.0,12.0 0 0,1 69.0,309.0 H129.0 A12.0,12.0 0 0,1 129.0,333.0 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
+<rect x="187.0" y="327.0" width="188.0" height="24.0" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
+<path d="M69.0,380.5 A12.0,12.0 0 0,1 69.0,356.5 H173.0 A12.0,12.0 0 0,1 173.0,380.5 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
+<path d="M69.0,410.0 A12.0,12.0 0 0,1 69.0,386.0 H129.0 A12.0,12.0 0 0,1 129.0,410.0 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
+<path d="M69.0,439.5 A12.0,12.0 0 0,1 69.0,415.5 H184.0 A12.0,12.0 0 0,1 184.0,439.5 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
+<path d="M69.0,469.0 A12.0,12.0 0 0,1 69.0,445.0 H162.0 A12.0,12.0 0 0,1 162.0,469.0 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
+<path d="M204.0,469.0 A12.0,12.0 0 0,1 204.0,445.0 H209.0 A12.0,12.0 0 0,1 209.0,469.0 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
+<rect x="239.0" y="445.0" width="89.0" height="24.0" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
+<path d="M358.0,469.0 A12.0,12.0 0 0,1 358.0,445.0 H363.0 A12.0,12.0 0 0,1 363.0,469.0 z" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
+<rect x="421.0" y="463.0" width="188.0" height="24.0" stroke="none" fill="#000000" fill-opacity="0.4980392156862745"/>
 <circle cx="7.5" cy="16.5" r="2.0" stroke="#FF0000" fill="#FFFFFF" stroke-width="1"/>
 <path d="M67.0,29.5 A12.0,12.0 0 0,1 67.0,5.5 H127.0 A12.0,12.0 0 0,1 127.0,29.5 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
 <text class="token_font" x="97.0" y="23.0"> BOOL </text>
 <path d="M67.0,59.0 A12.0,12.0 0 0,1 67.0,35.0 H160.0 A12.0,12.0 0 0,1 160.0,59.0 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
 <text class="token_font" x="113.5" y="52.5"> BOOLEAN </text>
-<path d="M67.0,88.5 A12.0,12.0 0 0,1 67.0,64.5 H149.0 A12.0,12.0 0 0,1 149.0,88.5 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
-<text class="token_font" x="108.0" y="82.0"> DOUBLE </text>
-<path d="M67.0,118.0 A12.0,12.0 0 0,1 67.0,94.0 H116.0 A12.0,12.0 0 0,1 116.0,118.0 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
-<text class="token_font" x="91.5" y="111.5"> INT </text>
-<path d="M67.0,147.5 A12.0,12.0 0 0,1 67.0,123.5 H160.0 A12.0,12.0 0 0,1 160.0,147.5 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
-<text class="token_font" x="113.5" y="141.0"> INTEGER </text>
-<path d="M67.0,177.0 A12.0,12.0 0 0,1 67.0,153.0 H149.0 A12.0,12.0 0 0,1 149.0,177.0 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
-<text class="token_font" x="108.0" y="170.5"> NUMBER </text>
+<path d="M67.0,88.5 A12.0,12.0 0 0,1 67.0,64.5 H160.0 A12.0,12.0 0 0,1 160.0,88.5 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
+<text class="token_font" x="113.5" y="82.0"> DECIMAL </text>
+<path d="M67.0,118.0 A12.0,12.0 0 0,1 67.0,94.0 H149.0 A12.0,12.0 0 0,1 149.0,118.0 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
+<text class="token_font" x="108.0" y="111.5"> DOUBLE </text>
+<path d="M67.0,147.5 A12.0,12.0 0 0,1 67.0,123.5 H116.0 A12.0,12.0 0 0,1 116.0,147.5 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
+<text class="token_font" x="91.5" y="141.0"> INT </text>
+<path d="M67.0,177.0 A12.0,12.0 0 0,1 67.0,153.0 H160.0 A12.0,12.0 0 0,1 160.0,177.0 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
+<text class="token_font" x="113.5" y="170.5"> INTEGER </text>
 <path d="M67.0,206.5 A12.0,12.0 0 0,1 67.0,182.5 H149.0 A12.0,12.0 0 0,1 149.0,206.5 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
-<text class="token_font" x="108.0" y="200.0"> SCALAR </text>
-<line x1="300.0" y1="193.5" x2="301.0" y2="193.5" stroke="#FF0000" stroke-width="1" />
-<rect x="207.0" y="200.5" width="188.0" height="24.0" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
-<text class="box_font" x="301.0" y="218.0">collation-clause</text>
-<line x1="178.5" y1="193.5" x2="296.0" y2="193.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="301.0" y1="193.5" x2="424.5" y2="193.5" stroke="#FF0000" stroke-width="1" />
-<path d="M187.5,202.5 A9.0,9.0 0 0,0 178.5,193.5" stroke="#FF0000" fill="none" stroke-width="1"/>
-<line x1="196.5" y1="211.5" x2="202.5" y2="211.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="395.5" y1="211.5" x2="401.5" y2="211.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<path d="M187.5,202.5 A9.0,9.0 0 0,0 196.5,211.5" stroke="#FF0000" fill="none" stroke-width="1"/>
-<path d="M405.5,211.5 A9.0,9.0 0 0,0 414.5,202.5" stroke="#FF0000" fill="none" stroke-width="1"/>
-<path d="M423.5,193.5 A9.0,9.0 0 0,0 414.5,202.5" stroke="#FF0000" fill="none" stroke-width="1"/>
-<line x1="187.5" y1="202.5" x2="187.5" y2="202.5" stroke="#FF0000" stroke-width="1" />
-<line x1="414.5" y1="202.5" x2="414.5" y2="202.5" stroke="#FF0000" stroke-width="1" />
-<line x1="160.5" y1="193.5" x2="174.5" y2="193.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<path d="M67.0,254.0 A12.0,12.0 0 0,1 67.0,230.0 H149.0 A12.0,12.0 0 0,1 149.0,254.0 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
-<text class="token_font" x="108.0" y="247.5"> STRING </text>
-<line x1="300.0" y1="241.0" x2="301.0" y2="241.0" stroke="#FF0000" stroke-width="1" />
-<rect x="207.0" y="248.0" width="188.0" height="24.0" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
-<text class="box_font" x="301.0" y="265.5">collation-clause</text>
-<line x1="178.5" y1="241.0" x2="296.0" y2="241.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="301.0" y1="241.0" x2="424.5" y2="241.0" stroke="#FF0000" stroke-width="1" />
-<path d="M187.5,250.0 A9.0,9.0 0 0,0 178.5,241.0" stroke="#FF0000" fill="none" stroke-width="1"/>
-<line x1="196.5" y1="259.0" x2="202.5" y2="259.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="395.5" y1="259.0" x2="401.5" y2="259.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<path d="M187.5,250.0 A9.0,9.0 0 0,0 196.5,259.0" stroke="#FF0000" fill="none" stroke-width="1"/>
-<path d="M405.5,259.0 A9.0,9.0 0 0,0 414.5,250.0" stroke="#FF0000" fill="none" stroke-width="1"/>
-<path d="M423.5,241.0 A9.0,9.0 0 0,0 414.5,250.0" stroke="#FF0000" fill="none" stroke-width="1"/>
-<line x1="187.5" y1="250.0" x2="187.5" y2="250.0" stroke="#FF0000" stroke-width="1" />
-<line x1="414.5" y1="250.0" x2="414.5" y2="250.0" stroke="#FF0000" stroke-width="1" />
-<line x1="160.5" y1="241.0" x2="174.5" y2="241.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<path d="M67.0,301.5 A12.0,12.0 0 0,1 67.0,277.5 H127.0 A12.0,12.0 0 0,1 127.0,301.5 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
-<text class="token_font" x="97.0" y="295.0"> TEXT </text>
-<line x1="278.0" y1="288.5" x2="279.0" y2="288.5" stroke="#FF0000" stroke-width="1" />
-<rect x="185.0" y="295.5" width="188.0" height="24.0" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
-<text class="box_font" x="279.0" y="313.0">collation-clause</text>
-<line x1="156.5" y1="288.5" x2="274.0" y2="288.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="279.0" y1="288.5" x2="402.5" y2="288.5" stroke="#FF0000" stroke-width="1" />
-<path d="M165.5,297.5 A9.0,9.0 0 0,0 156.5,288.5" stroke="#FF0000" fill="none" stroke-width="1"/>
-<line x1="174.5" y1="306.5" x2="180.5" y2="306.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="373.5" y1="306.5" x2="379.5" y2="306.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<path d="M165.5,297.5 A9.0,9.0 0 0,0 174.5,306.5" stroke="#FF0000" fill="none" stroke-width="1"/>
-<path d="M383.5,306.5 A9.0,9.0 0 0,0 392.5,297.5" stroke="#FF0000" fill="none" stroke-width="1"/>
-<path d="M401.5,288.5 A9.0,9.0 0 0,0 392.5,297.5" stroke="#FF0000" fill="none" stroke-width="1"/>
-<line x1="165.5" y1="297.5" x2="165.5" y2="297.5" stroke="#FF0000" stroke-width="1" />
-<line x1="392.5" y1="297.5" x2="392.5" y2="297.5" stroke="#FF0000" stroke-width="1" />
-<line x1="138.5" y1="288.5" x2="152.5" y2="288.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<path d="M67.0,349.0 A12.0,12.0 0 0,1 67.0,325.0 H171.0 A12.0,12.0 0 0,1 171.0,349.0 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
-<text class="token_font" x="119.0" y="342.5"> UNSIGNED </text>
-<path d="M67.0,378.5 A12.0,12.0 0 0,1 67.0,354.5 H127.0 A12.0,12.0 0 0,1 127.0,378.5 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
-<text class="token_font" x="97.0" y="372.0"> UUID </text>
-<path d="M67.0,408.0 A12.0,12.0 0 0,1 67.0,384.0 H182.0 A12.0,12.0 0 0,1 182.0,408.0 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
-<text class="token_font" x="124.5" y="401.5"> VARBINARY </text>
-<path d="M67.0,437.5 A12.0,12.0 0 0,1 67.0,413.5 H160.0 A12.0,12.0 0 0,1 160.0,437.5 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
-<text class="token_font" x="113.5" y="431.0"> VARCHAR </text>
-<path d="M202.0,437.5 A12.0,12.0 0 0,1 202.0,413.5 H207.0 A12.0,12.0 0 0,1 207.0,437.5 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
-<text class="name_font" x="204.5" y="431.0">(</text>
-<line x1="171.5" y1="424.5" x2="185.5" y2="424.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<rect x="237.0" y="413.5" width="89.0" height="24.0" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
-<text class="box_font" x="281.5" y="431.0">integer</text>
-<line x1="218.5" y1="424.5" x2="232.5" y2="424.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<path d="M356.0,437.5 A12.0,12.0 0 0,1 356.0,413.5 H361.0 A12.0,12.0 0 0,1 361.0,437.5 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
-<text class="name_font" x="358.5" y="431.0">)</text>
-<line x1="325.5" y1="424.5" x2="339.5" y2="424.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="512.0" y1="424.5" x2="513.0" y2="424.5" stroke="#FF0000" stroke-width="1" />
-<rect x="419.0" y="431.5" width="188.0" height="24.0" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
-<text class="box_font" x="513.0" y="449.0">collation-clause</text>
-<line x1="390.5" y1="424.5" x2="508.0" y2="424.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="513.0" y1="424.5" x2="636.5" y2="424.5" stroke="#FF0000" stroke-width="1" />
-<path d="M399.5,433.5 A9.0,9.0 0 0,0 390.5,424.5" stroke="#FF0000" fill="none" stroke-width="1"/>
-<line x1="408.5" y1="442.5" x2="414.5" y2="442.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="607.5" y1="442.5" x2="613.5" y2="442.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<path d="M399.5,433.5 A9.0,9.0 0 0,0 408.5,442.5" stroke="#FF0000" fill="none" stroke-width="1"/>
-<path d="M617.5,442.5 A9.0,9.0 0 0,0 626.5,433.5" stroke="#FF0000" fill="none" stroke-width="1"/>
-<path d="M635.5,424.5 A9.0,9.0 0 0,0 626.5,433.5" stroke="#FF0000" fill="none" stroke-width="1"/>
-<line x1="399.5" y1="433.5" x2="399.5" y2="433.5" stroke="#FF0000" stroke-width="1" />
-<line x1="626.5" y1="433.5" x2="626.5" y2="433.5" stroke="#FF0000" stroke-width="1" />
-<line x1="372.5" y1="424.5" x2="386.5" y2="424.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<text class="token_font" x="108.0" y="200.0"> NUMBER </text>
+<path d="M67.0,236.0 A12.0,12.0 0 0,1 67.0,212.0 H149.0 A12.0,12.0 0 0,1 149.0,236.0 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
+<text class="token_font" x="108.0" y="229.5"> SCALAR </text>
+<line x1="300.0" y1="223.0" x2="301.0" y2="223.0" stroke="#FF0000" stroke-width="1" />
+<rect x="207.0" y="230.0" width="188.0" height="24.0" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
+<text class="box_font" x="301.0" y="247.5">collation-clause</text>
+<line x1="178.5" y1="223.0" x2="296.0" y2="223.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="301.0" y1="223.0" x2="424.5" y2="223.0" stroke="#FF0000" stroke-width="1" />
+<path d="M187.5,232.0 A9.0,9.0 0 0,0 178.5,223.0" stroke="#FF0000" fill="none" stroke-width="1"/>
+<line x1="196.5" y1="241.0" x2="202.5" y2="241.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="395.5" y1="241.0" x2="401.5" y2="241.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<path d="M187.5,232.0 A9.0,9.0 0 0,0 196.5,241.0" stroke="#FF0000" fill="none" stroke-width="1"/>
+<path d="M405.5,241.0 A9.0,9.0 0 0,0 414.5,232.0" stroke="#FF0000" fill="none" stroke-width="1"/>
+<path d="M423.5,223.0 A9.0,9.0 0 0,0 414.5,232.0" stroke="#FF0000" fill="none" stroke-width="1"/>
+<line x1="187.5" y1="232.0" x2="187.5" y2="232.0" stroke="#FF0000" stroke-width="1" />
+<line x1="414.5" y1="232.0" x2="414.5" y2="232.0" stroke="#FF0000" stroke-width="1" />
+<line x1="160.5" y1="223.0" x2="174.5" y2="223.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<path d="M67.0,283.5 A12.0,12.0 0 0,1 67.0,259.5 H149.0 A12.0,12.0 0 0,1 149.0,283.5 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
+<text class="token_font" x="108.0" y="277.0"> STRING </text>
+<line x1="300.0" y1="270.5" x2="301.0" y2="270.5" stroke="#FF0000" stroke-width="1" />
+<rect x="207.0" y="277.5" width="188.0" height="24.0" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
+<text class="box_font" x="301.0" y="295.0">collation-clause</text>
+<line x1="178.5" y1="270.5" x2="296.0" y2="270.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="301.0" y1="270.5" x2="424.5" y2="270.5" stroke="#FF0000" stroke-width="1" />
+<path d="M187.5,279.5 A9.0,9.0 0 0,0 178.5,270.5" stroke="#FF0000" fill="none" stroke-width="1"/>
+<line x1="196.5" y1="288.5" x2="202.5" y2="288.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="395.5" y1="288.5" x2="401.5" y2="288.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<path d="M187.5,279.5 A9.0,9.0 0 0,0 196.5,288.5" stroke="#FF0000" fill="none" stroke-width="1"/>
+<path d="M405.5,288.5 A9.0,9.0 0 0,0 414.5,279.5" stroke="#FF0000" fill="none" stroke-width="1"/>
+<path d="M423.5,270.5 A9.0,9.0 0 0,0 414.5,279.5" stroke="#FF0000" fill="none" stroke-width="1"/>
+<line x1="187.5" y1="279.5" x2="187.5" y2="279.5" stroke="#FF0000" stroke-width="1" />
+<line x1="414.5" y1="279.5" x2="414.5" y2="279.5" stroke="#FF0000" stroke-width="1" />
+<line x1="160.5" y1="270.5" x2="174.5" y2="270.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<path d="M67.0,331.0 A12.0,12.0 0 0,1 67.0,307.0 H127.0 A12.0,12.0 0 0,1 127.0,331.0 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
+<text class="token_font" x="97.0" y="324.5"> TEXT </text>
+<line x1="278.0" y1="318.0" x2="279.0" y2="318.0" stroke="#FF0000" stroke-width="1" />
+<rect x="185.0" y="325.0" width="188.0" height="24.0" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
+<text class="box_font" x="279.0" y="342.5">collation-clause</text>
+<line x1="156.5" y1="318.0" x2="274.0" y2="318.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="279.0" y1="318.0" x2="402.5" y2="318.0" stroke="#FF0000" stroke-width="1" />
+<path d="M165.5,327.0 A9.0,9.0 0 0,0 156.5,318.0" stroke="#FF0000" fill="none" stroke-width="1"/>
+<line x1="174.5" y1="336.0" x2="180.5" y2="336.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="373.5" y1="336.0" x2="379.5" y2="336.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<path d="M165.5,327.0 A9.0,9.0 0 0,0 174.5,336.0" stroke="#FF0000" fill="none" stroke-width="1"/>
+<path d="M383.5,336.0 A9.0,9.0 0 0,0 392.5,327.0" stroke="#FF0000" fill="none" stroke-width="1"/>
+<path d="M401.5,318.0 A9.0,9.0 0 0,0 392.5,327.0" stroke="#FF0000" fill="none" stroke-width="1"/>
+<line x1="165.5" y1="327.0" x2="165.5" y2="327.0" stroke="#FF0000" stroke-width="1" />
+<line x1="392.5" y1="327.0" x2="392.5" y2="327.0" stroke="#FF0000" stroke-width="1" />
+<line x1="138.5" y1="318.0" x2="152.5" y2="318.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<path d="M67.0,378.5 A12.0,12.0 0 0,1 67.0,354.5 H171.0 A12.0,12.0 0 0,1 171.0,378.5 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
+<text class="token_font" x="119.0" y="372.0"> UNSIGNED </text>
+<path d="M67.0,408.0 A12.0,12.0 0 0,1 67.0,384.0 H127.0 A12.0,12.0 0 0,1 127.0,408.0 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
+<text class="token_font" x="97.0" y="401.5"> UUID </text>
+<path d="M67.0,437.5 A12.0,12.0 0 0,1 67.0,413.5 H182.0 A12.0,12.0 0 0,1 182.0,437.5 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
+<text class="token_font" x="124.5" y="431.0"> VARBINARY </text>
+<path d="M67.0,467.0 A12.0,12.0 0 0,1 67.0,443.0 H160.0 A12.0,12.0 0 0,1 160.0,467.0 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
+<text class="token_font" x="113.5" y="460.5"> VARCHAR </text>
+<path d="M202.0,467.0 A12.0,12.0 0 0,1 202.0,443.0 H207.0 A12.0,12.0 0 0,1 207.0,467.0 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
+<text class="name_font" x="204.5" y="460.5">(</text>
+<line x1="171.5" y1="454.0" x2="185.5" y2="454.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<rect x="237.0" y="443.0" width="89.0" height="24.0" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
+<text class="box_font" x="281.5" y="460.5">integer</text>
+<line x1="218.5" y1="454.0" x2="232.5" y2="454.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<path d="M356.0,467.0 A12.0,12.0 0 0,1 356.0,443.0 H361.0 A12.0,12.0 0 0,1 361.0,467.0 z" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
+<text class="name_font" x="358.5" y="460.5">)</text>
+<line x1="325.5" y1="454.0" x2="339.5" y2="454.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="512.0" y1="454.0" x2="513.0" y2="454.0" stroke="#FF0000" stroke-width="1" />
+<rect x="419.0" y="461.0" width="188.0" height="24.0" stroke="#FF0000" fill="#D3D3D3" stroke-width="1"/>
+<text class="box_font" x="513.0" y="478.5">collation-clause</text>
+<line x1="390.5" y1="454.0" x2="508.0" y2="454.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="513.0" y1="454.0" x2="636.5" y2="454.0" stroke="#FF0000" stroke-width="1" />
+<path d="M399.5,463.0 A9.0,9.0 0 0,0 390.5,454.0" stroke="#FF0000" fill="none" stroke-width="1"/>
+<line x1="408.5" y1="472.0" x2="414.5" y2="472.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="607.5" y1="472.0" x2="613.5" y2="472.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<path d="M399.5,463.0 A9.0,9.0 0 0,0 408.5,472.0" stroke="#FF0000" fill="none" stroke-width="1"/>
+<path d="M617.5,472.0 A9.0,9.0 0 0,0 626.5,463.0" stroke="#FF0000" fill="none" stroke-width="1"/>
+<path d="M635.5,454.0 A9.0,9.0 0 0,0 626.5,463.0" stroke="#FF0000" fill="none" stroke-width="1"/>
+<line x1="399.5" y1="463.0" x2="399.5" y2="463.0" stroke="#FF0000" stroke-width="1" />
+<line x1="626.5" y1="463.0" x2="626.5" y2="463.0" stroke="#FF0000" stroke-width="1" />
+<line x1="372.5" y1="454.0" x2="386.5" y2="454.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
 <line x1="26.5" y1="16.5" x2="50.5" y2="16.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
 <line x1="139.5" y1="16.5" x2="666.0" y2="16.5" stroke="#FF0000" stroke-width="1" />
 <path d="M35.5,25.5 A9.0,9.0 0 0,0 26.5,16.5" stroke="#FF0000" fill="none" stroke-width="1"/>
@@ -149,52 +152,56 @@ width="691" height="461" version="1.1">
 <path d="M35.5,37.0 A9.0,9.0 0 0,0 44.5,46.0" stroke="#FF0000" fill="none" stroke-width="1"/>
 <path d="M647.0,46.0 A9.0,9.0 0 0,0 656.0,37.0" stroke="#FF0000" fill="none" stroke-width="1"/>
 <line x1="44.5" y1="75.5" x2="50.5" y2="75.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="161.5" y1="75.5" x2="643.0" y2="75.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="172.5" y1="75.5" x2="643.0" y2="75.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
 <path d="M35.5,66.5 A9.0,9.0 0 0,0 44.5,75.5" stroke="#FF0000" fill="none" stroke-width="1"/>
 <path d="M647.0,75.5 A9.0,9.0 0 0,0 656.0,66.5" stroke="#FF0000" fill="none" stroke-width="1"/>
 <line x1="44.5" y1="105.0" x2="50.5" y2="105.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="128.5" y1="105.0" x2="643.0" y2="105.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="161.5" y1="105.0" x2="643.0" y2="105.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
 <path d="M35.5,96.0 A9.0,9.0 0 0,0 44.5,105.0" stroke="#FF0000" fill="none" stroke-width="1"/>
 <path d="M647.0,105.0 A9.0,9.0 0 0,0 656.0,96.0" stroke="#FF0000" fill="none" stroke-width="1"/>
 <line x1="44.5" y1="134.5" x2="50.5" y2="134.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="172.5" y1="134.5" x2="643.0" y2="134.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="128.5" y1="134.5" x2="643.0" y2="134.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
 <path d="M35.5,125.5 A9.0,9.0 0 0,0 44.5,134.5" stroke="#FF0000" fill="none" stroke-width="1"/>
 <path d="M647.0,134.5 A9.0,9.0 0 0,0 656.0,125.5" stroke="#FF0000" fill="none" stroke-width="1"/>
 <line x1="44.5" y1="164.0" x2="50.5" y2="164.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="161.5" y1="164.0" x2="643.0" y2="164.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="172.5" y1="164.0" x2="643.0" y2="164.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
 <path d="M35.5,155.0 A9.0,9.0 0 0,0 44.5,164.0" stroke="#FF0000" fill="none" stroke-width="1"/>
 <path d="M647.0,164.0 A9.0,9.0 0 0,0 656.0,155.0" stroke="#FF0000" fill="none" stroke-width="1"/>
 <line x1="44.5" y1="193.5" x2="50.5" y2="193.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="423.5" y1="193.5" x2="643.0" y2="193.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="161.5" y1="193.5" x2="643.0" y2="193.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
 <path d="M35.5,184.5 A9.0,9.0 0 0,0 44.5,193.5" stroke="#FF0000" fill="none" stroke-width="1"/>
 <path d="M647.0,193.5 A9.0,9.0 0 0,0 656.0,184.5" stroke="#FF0000" fill="none" stroke-width="1"/>
-<line x1="44.5" y1="241.0" x2="50.5" y2="241.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="423.5" y1="241.0" x2="643.0" y2="241.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<path d="M35.5,232.0 A9.0,9.0 0 0,0 44.5,241.0" stroke="#FF0000" fill="none" stroke-width="1"/>
-<path d="M647.0,241.0 A9.0,9.0 0 0,0 656.0,232.0" stroke="#FF0000" fill="none" stroke-width="1"/>
-<line x1="44.5" y1="288.5" x2="50.5" y2="288.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="401.5" y1="288.5" x2="643.0" y2="288.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<path d="M35.5,279.5 A9.0,9.0 0 0,0 44.5,288.5" stroke="#FF0000" fill="none" stroke-width="1"/>
-<path d="M647.0,288.5 A9.0,9.0 0 0,0 656.0,279.5" stroke="#FF0000" fill="none" stroke-width="1"/>
-<line x1="44.5" y1="336.0" x2="50.5" y2="336.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="183.5" y1="336.0" x2="643.0" y2="336.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<path d="M35.5,327.0 A9.0,9.0 0 0,0 44.5,336.0" stroke="#FF0000" fill="none" stroke-width="1"/>
-<path d="M647.0,336.0 A9.0,9.0 0 0,0 656.0,327.0" stroke="#FF0000" fill="none" stroke-width="1"/>
+<line x1="44.5" y1="223.0" x2="50.5" y2="223.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="423.5" y1="223.0" x2="643.0" y2="223.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<path d="M35.5,214.0 A9.0,9.0 0 0,0 44.5,223.0" stroke="#FF0000" fill="none" stroke-width="1"/>
+<path d="M647.0,223.0 A9.0,9.0 0 0,0 656.0,214.0" stroke="#FF0000" fill="none" stroke-width="1"/>
+<line x1="44.5" y1="270.5" x2="50.5" y2="270.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="423.5" y1="270.5" x2="643.0" y2="270.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<path d="M35.5,261.5 A9.0,9.0 0 0,0 44.5,270.5" stroke="#FF0000" fill="none" stroke-width="1"/>
+<path d="M647.0,270.5 A9.0,9.0 0 0,0 656.0,261.5" stroke="#FF0000" fill="none" stroke-width="1"/>
+<line x1="44.5" y1="318.0" x2="50.5" y2="318.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="401.5" y1="318.0" x2="643.0" y2="318.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<path d="M35.5,309.0 A9.0,9.0 0 0,0 44.5,318.0" stroke="#FF0000" fill="none" stroke-width="1"/>
+<path d="M647.0,318.0 A9.0,9.0 0 0,0 656.0,309.0" stroke="#FF0000" fill="none" stroke-width="1"/>
 <line x1="44.5" y1="365.5" x2="50.5" y2="365.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="139.5" y1="365.5" x2="643.0" y2="365.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="183.5" y1="365.5" x2="643.0" y2="365.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
 <path d="M35.5,356.5 A9.0,9.0 0 0,0 44.5,365.5" stroke="#FF0000" fill="none" stroke-width="1"/>
 <path d="M647.0,365.5 A9.0,9.0 0 0,0 656.0,356.5" stroke="#FF0000" fill="none" stroke-width="1"/>
 <line x1="44.5" y1="395.0" x2="50.5" y2="395.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="194.5" y1="395.0" x2="643.0" y2="395.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="139.5" y1="395.0" x2="643.0" y2="395.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
 <path d="M35.5,386.0 A9.0,9.0 0 0,0 44.5,395.0" stroke="#FF0000" fill="none" stroke-width="1"/>
 <path d="M647.0,395.0 A9.0,9.0 0 0,0 656.0,386.0" stroke="#FF0000" fill="none" stroke-width="1"/>
 <line x1="44.5" y1="424.5" x2="50.5" y2="424.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
-<line x1="635.5" y1="424.5" x2="643.0" y2="424.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="194.5" y1="424.5" x2="643.0" y2="424.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
 <path d="M35.5,415.5 A9.0,9.0 0 0,0 44.5,424.5" stroke="#FF0000" fill="none" stroke-width="1"/>
 <path d="M647.0,424.5 A9.0,9.0 0 0,0 656.0,415.5" stroke="#FF0000" fill="none" stroke-width="1"/>
+<line x1="44.5" y1="454.0" x2="50.5" y2="454.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<line x1="635.5" y1="454.0" x2="643.0" y2="454.0" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
+<path d="M35.5,445.0 A9.0,9.0 0 0,0 44.5,454.0" stroke="#FF0000" fill="none" stroke-width="1"/>
+<path d="M647.0,454.0 A9.0,9.0 0 0,0 656.0,445.0" stroke="#FF0000" fill="none" stroke-width="1"/>
 <path d="M665.0,16.5 A9.0,9.0 0 0,0 656.0,25.5" stroke="#FF0000" fill="none" stroke-width="1"/>
-<line x1="35.5" y1="415.5" x2="35.5" y2="25.5" stroke="#FF0000" stroke-width="1" />
-<line x1="656.0" y1="415.5" x2="656.0" y2="25.5" stroke="#FF0000" stroke-width="1" />
+<line x1="35.5" y1="445.0" x2="35.5" y2="25.5" stroke="#FF0000" stroke-width="1" />
+<line x1="656.0" y1="445.0" x2="656.0" y2="25.5" stroke="#FF0000" stroke-width="1" />
 <line x1="8.5" y1="16.5" x2="22.5" y2="16.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
 <circle cx="684.0" cy="16.5" r="2.0" stroke="#FF0000" fill="#FFFFFF" stroke-width="1"/>
 <line x1="664.0" y1="16.5" x2="678.0" y2="16.5" stroke="#FF0000" stroke-width="1" marker-end="url(#arrow)" />
diff --git a/doc/reference/reference_sql/sql-features.rst b/doc/reference/reference_sql/sql-features.rst
index 0c95963d1c..61faed07ae 100644
--- a/doc/reference/reference_sql/sql-features.rst
+++ b/doc/reference/reference_sql/sql-features.rst
@@ -38,7 +38,7 @@ marked "Okay" will probably be balanced by tests which are unfairly marked "Fail
     |            |                                               |                                                          | columns (created from Lua) from FLOAT/DOUBLE/REAL ones  |
     |            |                                               |                                                          | (created from SQL).                                     |
     +------------+-----------------------------------------------+----------------------------------------------------------+---------------------------------------------------------+
-    | E011-03    | DECIMAL and NUMERIC data types                | ``CREATE TABLE td (s1 NUMERIC PRIMARY KEY);``            | Fail, DECIMAL and NUMERIC data types are not supported  |
+    | E011-03    | DECIMAL and NUMERIC data types                | ``CREATE TABLE td (s1 NUMERIC PRIMARY KEY);``            | Fail, NUMERIC data types are not supported              |
     |            |                                               |                                                          | and a number containing post-decimal digits will be     |
     |            |                                               |                                                          | treated as approximate numeric.                         |
     +------------+-----------------------------------------------+----------------------------------------------------------+---------------------------------------------------------+
@@ -308,9 +308,9 @@ marked "Okay" will probably be balanced by tests which are unfairly marked "Fail
     | F031-03    | GRANT statement                               |                                                          | Fail. Tarantool doesn't support privileges except       |
     |            |                                               |                                                          | via NoSQL.                                              |
     +------------+-----------------------------------------------+----------------------------------------------------------+---------------------------------------------------------+
-    | F031-04    | ALTER TABLE statement: add column             | ``ALTER TABLE t7 ADD COLUMN t7_2 VARCHAR DEFAULT 'q';``  | Fail. Tarantool supports                                |
-    |            |                                               |                                                          | :ref:`ALTER TABLE <sql_alter_table>` but not            |
-    |            |                                               |                                                          | this clause.                                            |
+    | F031-04    | ALTER TABLE statement: add column             | ``ALTER TABLE t7 ADD COLUMN t7_2 VARCHAR(1)              | Okay. Tarantool supports                                |
+    |            |                                               | DEFAULT 'q';``                                           | :ref:`ALTER TABLE <sql_alter_table>` and support for    |
+    |            |                                               |                                                          | ADD COLUMN was added in Tarantool version 2.7.          |
     +------------+-----------------------------------------------+----------------------------------------------------------+---------------------------------------------------------+
     | F031-13    | DROP TABLE statement: RESTRICT clause         | ``DROP TABLE t20 RESTRICT;``                             | Fail. Tarantool supports                                |
     |            |                                               |                                                          | :ref:`DROP TABLE <sql_drop_table>` but not this         |
@@ -448,9 +448,9 @@ marked "Okay" will probably be balanced by tests which are unfairly marked "Fail
     |            |                                               |                                                          | name (not counted in the final score).                  |
     +------------+-----------------------------------------------+----------------------------------------------------------+---------------------------------------------------------+
 
-Total number of items marked "Fail": 68
+Total number of items marked "Fail": 67
 
-Total number of items marked "Okay": 78
+Total number of items marked "Okay": 79
 
 
 
diff --git a/doc/reference/reference_sql/sql_beginners_guide.rst b/doc/reference/reference_sql/sql_beginners_guide.rst
index 158cf45d85..c8f45d2504 100644
--- a/doc/reference/reference_sql/sql_beginners_guide.rst
+++ b/doc/reference/reference_sql/sql_beginners_guide.rst
@@ -32,11 +32,11 @@ we prefer to pick out specific items by their contents. In that spirit, this is
 
 .. code-block:: none
 
-    modules
+    MODULES
 
     +-----------------+------+---------------------+
-    | name            | size | purpose             |
-    +-----------------|------|---------------------|
+    | NAME            | SIZE | PURPOSE             |
+    +-----------------+------+---------------------+
     | box             | 1432 | Database Management |
     | clock           |  188 | Seconds             |
     | crypto          |    4 | Cryptography        |
@@ -165,8 +165,8 @@ A primary-key column automatically has a UNIQUE index.
 
 data domain -- if a column is defined as having data type INTEGER, it is illegal to put a non-number into it.
 More generally, if a value doesn't correspond to the data type of the definition, it is illegal.
-However, some database management systems (DBMSs) are very forgiving and will try to
-make allowances for bad values rather than reject them; Tarantool is one of those DBMSs.
+Some database management systems (DBMSs) are very forgiving and will try to
+make allowances for bad values rather than reject them; Tarantool is a bit more strict than those DBMSs.
 
 Now, here are other types of constraints ...
 
@@ -216,7 +216,7 @@ By default searches in Tarantool's SQL use a binary collation. This will work:
 ``INSERT INTO submodules`` |br|
 |nbsp| |nbsp| ``VALUES ('space', 'box', 10000, 'insert etc.');``
 
-Now try to delete the new row from the modules table:
+Now try to delete the corresponding row from the modules table:
 
 ``DELETE FROM modules WHERE name = 'box';``
 
@@ -352,9 +352,9 @@ but displayed as a table the result will look like
 .. code-block:: none
 
       +----------------+------------------------+
-      | double_size    | concatenated_literals  |
+      | DOUBLE_SIZE    | CONCATENATED_LITERALS  |
       +----------------+------------------------+
-      |               8| XY                     |
+      |              8 | XY                     |
       +----------------+------------------------+
 
 **Selecting with a select list with asterisk**
@@ -411,7 +411,7 @@ The result will look like this:
 .. code-block:: none
 
       +-------------------+------------------------+--------------------+
-      | submodules_name   | modules_purpose        | submodules_purpose |
+      | SUBMODULES_NAME   | MODULES_PURPOSE        | SUBMODULES_PURPOSE |
       +-------------------+------------------------+--------------------+
       | space             | Database Management    | insert etc.        |
       +-------------------+------------------------+--------------------+
@@ -437,11 +437,11 @@ That is legal. Usually it is not what you want, but it is a learning aid. The re
 
     { columns from modules table }         { columns from submodules table }
     +--------+------+---------------------+-------+-------------+-------+-------------+
-    | name   | size | purpose             | name  | module_name | size  | purpose     |
+    | NAME   | SIZE | PURPOSE             | NAME  | MODULE_NAME | SIZE  | PURPOSE     |
     +--------+------+---------------------+-------+-------------+-------+-------------+
     | box    | 1432 | Database Management | space | box         | 10000 | insert etc. |
-    | clock  | 188  | Seconds             | space | box         | 10000 | insert etc. |
-    | crypto |   4  | Cryptography        | space | box         | 10000 | insert etc. |
+    | clock  |  188 | Seconds             | space | box         | 10000 | insert etc. |
+    | crypto |    4 | Cryptography        | space | box         | 10000 | insert etc. |
     +--------+------+---------------------+-------+-------------+-------+-------------+
 
 It is not an error. The meaning of this type of join is "combine every row in table-1 with every row in table-2".
@@ -469,12 +469,12 @@ The result will be:
 .. code-block:: none
 
     +----------+-----------+------------+--------+---------+-------+-------------+
-    | modules_ |  modules_ | modules_   | name   | module_ | size  | purpose     |
-    | name     |  size     | purpose    |        | name    |       |             |
-    +----------+-----------+--------- --+--------+---------+-------+-------------|
-    | box      | 1432      | Database   | space  | box     | 10000 | insert etc. |
+    | MODULES_ |  MODULES_ | MODULES_   | NAME   | MODULE_ | SIZE  | PURPOSE     |
+    | NAME     |  SIZE     | PURPOSE    |        | NAME    |       |             |
+    +----------+-----------+--------- --+--------+---------+-------+-------------+
+    | box      |      1432 | Database   | space  | box     | 10000 | insert etc. |
     |          |           | Management |        |         |       |             |
-    +----------+-----------+------------+--------+---------+-------+-------------|
+    +----------+-----------+------------+--------+---------+-------+-------------+
 
 In other words, you can specify a Cartesian join in the FROM clause,
 then you can filter out the irrelevant rows in the WHERE clause,
@@ -556,11 +556,11 @@ which returns:
 
     { columns from modules table }         { columns from submodules table }
     +--------+------+---------------------+-------+-------------+-------+-------------+
-    | name   | size | purpose             | name  | module_name | size  | purpose     |
+    | NAME   | SIZE | PURPOSE             | NAME  | MODULE_NAME | SIZE  | PURPOSE     |
     +--------+------+---------------------+-------+-------------+-------+-------------+
     | box    | 1432 | Database Management | space | box         | 10000 | insert etc. |
-    | clock  | 188  | Seconds             | NULL  | NULL        | NULL  | NULL        |
-    | crypto |   4  | Cryptography        | NULL  | NULL        | NULL  | NULL        |
+    | clock  |  188 | Seconds             | NULL  | NULL        | NULL  | NULL        |
+    | crypto |    4 | Cryptography        | NULL  | NULL        | NULL  | NULL        |
     +--------+------+---------------------+-------+-------------+-------+-------------+
 
 Thus, for the submodules of the clock module and the submodules of the crypto
@@ -585,11 +585,11 @@ Remember that our modules table looks like this:
 
 .. code-block:: none
 
-    modules
+    MODULES
 
     +-----------------+------+---------------------+
-    | name            | size | purpose             |
-    +-----------------|------|---------------------|
+    | NAME            | SIZE | PURPOSE             |
+    +-----------------+------+---------------------+
     | box             | 1432 | Database Management |
     | clock           |  188 | Seconds             |
     | crypto          |    4 | Cryptography        |
@@ -598,7 +598,7 @@ Remember that our modules table looks like this:
 
 Suppose that we do not want to know all the individual size values,
 we just want to know about their aggregation, that is, take the attributes of the collection.
-SQL allows five aggregation functions: AVG (average), SUM, MIN (minimum), MAX (maximum), and COUNT.
+SQL allows aggregation functions including: AVG (average), SUM, MIN (minimum), MAX (maximum), and COUNT.
 For example
 
 ``SELECT AVG(size), SUM(size), MIN(size), MAX(size), COUNT(size) FROM modules;``
@@ -607,11 +607,11 @@ The result will look like this:
 
 .. code-block:: none
 
-     +--------------+-----------+-----------+-----------+-----------+
-     | COLUMN_1     | COLUMN_2  | COLUMN_3  | COLUMN_4  | COLUMN_5  |
-     +--------------+-----------+-----------+-----------+-----------|
-     | 5.413333E+02 | 1624      |         4 |      1432 |         3 |
-     +--------------+-----------+-----------+-----------+-----------+
+     +-----------+-----------+-----------+-----------+-----------+
+     | COLUMN_1  | COLUMN_2  | COLUMN_3  | COLUMN_4  | COLUMN_5  |
+     +-----------+-----------+-----------+-----------+-----------|
+     |       541 |      1624 |         4 |      1432 |         3 |
+     +-----------+-----------+-----------+-----------+-----------+
 
 Suppose that we want aggregations, but aggregations of rows that have some common characteristic.
 Supposing further, we want to divide the rows into two groups, the ones whose names
@@ -630,10 +630,10 @@ The result will look like this:
 
      +------------+--------------+-----------+-----------+-----------+-------------+
      | COLUMN_1   | COLUMN_2     | COLUMN_3  | COLUMN_4  | COLUMN_5  | COLUMN_6    |
-     +------------+--------------+-----------+-----------+-----------|-------------|
+     +------------+--------------+-----------+-----------+-----------+-------------+
      | b          |         1432 |      1432 |      1432 |      1432 |           1 |
      | c          |           96 |       192 |         4 |       188 |           2 |
-     +------------+--------------+-----------+-----------+-----------|-------------+
+     +------------+--------------+-----------+-----------+-----------+-------------+
 
 
 **Select with common table expression**
diff --git a/doc/reference/reference_sql/sql_plus_lua.rst b/doc/reference/reference_sql/sql_plus_lua.rst
index 3ee05171bf..2bc3358b39 100644
--- a/doc/reference/reference_sql/sql_plus_lua.rst
+++ b/doc/reference/reference_sql/sql_plus_lua.rst
@@ -347,6 +347,7 @@ If there were no Lua functions, we would have to treat it as a VARBINARY
 and look for ``POSITION(X'A476696577C3',"flags")  > 0`` (A4 is a MsgPack signal
 that a 4-byte string follows, 76696577 is UTF8 encoding for 'view',
 C3 is a MsgPack code meaning true).
+In any case, starting with Tarantool version 2.10, POSITION() does not work on VARBINARY operands.
 But we have a more sophisticated way, we can create a function that
 returns true if ``"flags".view`` is true.
 So our way of making the function looks like this:
@@ -634,7 +635,7 @@ _COLUMNS view
 ********************************************************************************
 
 This is also an example of how one can use :ref:`recursive views <sql_with>` to make temporary tables
-with multiple rows for each tuple in the original ``"_vtable"`` space.
+with multiple rows for each tuple in the original ``"_vspace"`` space.
 It requires a global variable, _G.box.FORMATS, as a temporary static variable.
 
 Warning: Use this code only with Tarantool version 2.3.2 or later.
diff --git a/doc/reference/reference_sql/sql_statements_and_clauses.rst b/doc/reference/reference_sql/sql_statements_and_clauses.rst
index c015f3972b..16fe7f49c9 100644
--- a/doc/reference/reference_sql/sql_statements_and_clauses.rst
+++ b/doc/reference/reference_sql/sql_statements_and_clauses.rst
@@ -289,6 +289,8 @@ The detailed description of data types is in the section
 Column definition -- the rules for the SCALAR data type
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+The rules for the SCALAR data type were significantly changed in Tarantool version :tarantool-release:`2.10.0-beta1`.
+
 SCALAR is a "complex" data type, unlike all the other data types which are "primitive".
 Two column values in a SCALAR column can have two different primitive data types.
 
@@ -304,7 +306,7 @@ Two column values in a SCALAR column can have two different primitive data types
    in the second row is STRING (the data type of a literal is always clear from
    its format).
 
-   An item's primitive type is far more important than its defined type.
+   An item's primitive type is far less important than its defined type.
    Incidentally Tarantool might find the primitive type by looking at the way
    MsgPack stores it, but that is an implementation detail.
 
@@ -316,24 +318,21 @@ Two column values in a SCALAR column can have two different primitive data types
    target is a SCALAR item. For example ``UPDATE ... SET column1 = 'a'``
    is illegal if ``column1`` is defined as INTEGER, but is legal if ``column1``
    is defined as SCALAR -- values which happen to be INTEGER will be changed
-   so their data type is STRING.
+   so their data type is SCALAR.
 #. There is no literal syntax which implies data type SCALAR.
-#. TYPEOF(x) is never SCALAR, it is always the underlying data type.
-   This is true even if ``x`` is NULL (in that case the data type is BOOLEAN).
-   In fact there is no function that is guaranteed to return the defined data type.
-   For example, ``TYPEOF(CAST(1 AS SCALAR));`` returns INTEGER, not SCALAR.
+#. TYPEOF(x) is always 'scalar' or 'NULL', it is never the underlying data type.
+   In fact there is no function that is guaranteed to return the underlying data type.
+   For example, ``TYPEOF(CAST(1 AS SCALAR));`` returns 'scalar', not 'integer'.
 #. For any operation that requires implicit casting from an item defined as SCALAR,
-   the syntax is legal but the operation may fail at runtime.
-   At runtime, Tarantool detects the underlying primitive data type and applies
-   the rules for that. For example, if a definition is:
+   the operation will fail at runtime.
+   For example, if a definition is:
 
    .. code-block:: sql
 
       CREATE TABLE t (s1 SCALAR PRIMARY KEY, s2 INTEGER);
 
-   and within any row ``s1 = 'a'``, that is, its underlying primitive type is
-   STRING to indicate character strings, then ``UPDATE t SET s2 = s1;`` is illegal.
-   Tarantool usually does not know that in advance.
+   and the only row in table T has s1 = 1, that is, its underlying primitive type is
+   INTEGER, then ``UPDATE t SET s2 = s1;`` is illegal.
 #. For any dyadic operation that requires implicit casting for comparison, the
    syntax is legal and the operation will not fail at runtime.
    Take this situation: comparison with a primitive type VARBINARY and
@@ -346,33 +345,37 @@ Two column values in a SCALAR column can have two different primitive data types
       SELECT * FROM t WHERE s1 > 'a';
 
    The comparison is valid, because Tarantool knows the ordering of X'41' and 'a'
-   in Tarantool/NoSQL 'scalar'.
+   in Tarantool/NoSQL 'scalar' -- this is a case where the primitive type matters.
 #. The result data type of :ref:`min/max <sql_aggregate>` operation on a column defined as SCALAR
-   is the data type of the minimum/maximum operand, unless the result value
-   is NULL. For example:
+   is SCALAR.
+   Users will need to know the underlying primitive type of the result in advance. For example:
 
    .. code-block:: sql
 
       CREATE TABLE t (s1 INTEGER, s2 SCALAR PRIMARY KEY);
       INSERT INTO t VALUES (1, X'44'), (2, 11), (3, 1E4), (4, 'a');
-      SELECT min(s2), hex(max(s2)) FROM t;
+      SELECT cast(min(s2) AS INTEGER), hex(cast(max(s2) as VARBINARY)) FROM t;
 
    The result is: ``- - [11, '44',]``
 
    That is only possible with Tarantool/NoSQL scalar rules, but ``SELECT SUM(s2)``
    would not be legal because addition would in this case require implicit casting
-   from VARBINARY to a number, which is not sensible.
-#. The result data type of a primitive combination is never SCALAR because we
-   in effect use TYPEOF(item) not the defined data type.
+   from VARBINARY to a numeric, which is not sensible.
+#. The result data type of a primitive combination is sometimes SCALAR although we
+   in effect use the primitive data type not the defined data type.
    (Here we use the word "combination" in the way that the standard document
    uses it for section "Result of data type combinations".) Therefore for
-   ``greatest(1E308, 'a', 0, X'00')`` the result is X'00'.
+   ``greatest(1E308, 'a', 0, X'00')`` the result is X'00' but
+   ``typeof(greatest(1E308, 'a', 0, X'00')`` is 'scalar'.
+#. The union of two SCALARs is sometimes the primitive type.
+   For example, ``SELECT TYPEOF((SELECT CAST('a' AS SCALAR) UNION SELECT CAST('a' AS SCALAR)));``
+   returns 'string'.
 
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Column definition -- relation to NoSQL
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-All the SQL data types correspond to
+All of the SQL data types except SCALAR correspond to
 :ref:`Tarantool/NoSQL types with the same name <box_space-index_field_types>`.
 For example an SQL STRING is stored in a NoSQL space as type = 'string'.
 
@@ -388,11 +391,12 @@ If two items have SQL data types that have different underlying types, then the
 rules for explicit casts, or implicit (assignment) casts, or implicit (comparison)
 casts, apply.
 
-There is one floating-point value which is not handled by SQL: -nan is seen as NULL.
+There is one floating-point value which is not handled by SQL: -nan is seen as NULL
+although its data type is 'double'.
 
 There are also some Tarantool/NoSQL data types which have no corresponding
-SQL data types. For example, ``SELECT "flags" FROM "_space";`` will return
-a column whose data type is 'map'. Such columns can only be manipulated in SQL
+SQL data types. For example, ``SELECT "flags" FROM "_vspace";`` will return
+a column whose SQL data type is 'varbinary' rather than 'map'. Such columns can only be manipulated in SQL
 by :ref:`invoking Lua functions <sql_calling_lua>`.
 
 .. _sql_column_def_constraint:
@@ -487,7 +491,8 @@ Data types may also appear in :ref:`CAST <sql_function_cast>` functions.
     columnb VARCHAR(0), columnc VARCHAR(100000) COLLATE "binary",
     columnd UUID,
     columne VARBINARY,
-    columnf SCALAR, columng SCALAR COLLATE "unicode_uk_s2");
+    columnf SCALAR, columng SCALAR COLLATE "unicode_uk_s2",
+    columnh DECIMAL);
 
 .. code-block:: sql
 
@@ -2099,12 +2104,12 @@ NULLs are ignored for all aggregate functions except COUNT(*).
 .. _sql_aggregate_sum:
 
 ``SUM([DISTINCT] expression)``
-             Return the sum of values of expression.
+             Return the sum of values of expression, or NULL if there are no rows.
 
              Example: :samp:`SUM({column1})`
 
 ``TOTAL([DISTINCT] expression)``
-             Return the sum of values of expression.
+             Return the sum of values of expression, or zero if there are no rows.
 
              Example: :samp:`TOTAL({column1})`
 
@@ -2207,7 +2212,7 @@ The expression may also contain operators and function names and literals.
 For example, in the statement |br|
 ``SELECT x, y FROM t ORDER BY UPPER(z);`` |br|
 ``ORDER BY UPPER(z)`` means "order by the uppercase form of column ``t.z``",
-which may be similar to doing ordering in a case-insensitive manner.
+which may be similar to doing ordering with one of Tarantool's case-insensitive collations.
 
 Type 3 is illegal if the SELECT statement contains
 :ref:`UNION or EXCEPT or INTERSECT <sql_union>`.
@@ -2227,7 +2232,7 @@ and returns a table with rows in order.
 Sorting order:
 
 * The default order is ASC (ascending), the optional order is DESC (descending).
-* NULLs come first, then BOOLEANs, then numbers, then STRINGs, then VARBINARYs, then UUIDs.
+* NULLs come first, then BOOLEANs, then numerics, then STRINGs, then VARBINARYs, then UUIDs.
 * Within STRINGs, ordering is according to collation.
 * Collation may be specified with a :ref:`COLLATE clause <sql_collate_clause>` within the ORDER BY column-list, or may be default.
 
@@ -3146,6 +3151,10 @@ The required privileges for built-in functions will likely change in a future ve
 List of functions
 ********************************************************************************
 
+These are Tarantool/SQL's built-in functions.
+Starting with Tarantool 2.10, for functions that require numeric arguments,
+function arguments with NUMBER data type are illegal.
+
 .. _sql_function_abs:
 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -3254,10 +3263,14 @@ Syntax:
 
 :samp:`HEX(expression)`
 
-Return the hexadecimal code for each byte in **expression**,
-which may be either a string or a byte sequence.
+Return the hexadecimal code for each byte in **expression**.
+
+Starting with Tarantool version 2.10.0, the expression must be a byte sequence
+(data type VARBINARY).
+
+In earlier versions of Tarantool, the expression could be either a string or a byte sequence.
 For ASCII characters, this
-is straightforward because the encoding is
+was straightforward because the encoding is
 the same as the code point value. For
 non-ASCII characters, since character strings
 are usually encoded in UTF-8, each character
@@ -3265,8 +3278,8 @@ will require two or more bytes.
 
 Examples:
 
-* ``HEX('A')`` will return ``41``.
-* ``HEX('Д')`` will return ``D094``.
+* ``HEX(X'41')`` will return ``41``.
+* ``HEX(CAST('Д' AS VARBINARY))`` will return ``D094``.
 
 .. _sql_function_ifnull:
 
@@ -3339,9 +3352,9 @@ LIKELIHOOD
 
 Syntax:
 
-:samp:`LIKELIHOOD({expression}, {number literal})`
+:samp:`LIKELIHOOD({expression}, {DOUBLE literal})`
 
-Return the result of the expression, provided that the number literal is between 0.0 and 1.0.
+Return the expression without change, provided that the numeric literal is between 0.0 and 1.0.
 
 Example: ``LIKELIHOOD('a' = 'b', .0)`` is FALSE
 
@@ -3438,12 +3451,12 @@ Syntax:
 
 Return a string formatted according to the rules of the C
 ``sprintf()`` function, where ``%d%s`` means the next two arguments
-are a number and a string, and so on.
+are a numeric and a string, and so on.
 
 If an argument is missing or is NULL, it becomes:
 
 * '0' if the format requires an integer,
-* '0.0' if the format requires a number with a decimal point,
+* '0.0' if the format requires a numeric with a decimal point,
 * '' if the format requires a string.
 
 Example: ``PRINTF('%da', 5)`` is '5a'.
@@ -3456,7 +3469,7 @@ QUOTE
 
 Syntax:
 
-:samp:`QUOTE(string-literal)`
+:samp:`QUOTE(string-argument)`
 
 Return a string with enclosing quotes if necessary,
 and with quotes inside the enclosing quotes if necessary.
@@ -3465,7 +3478,10 @@ which are part of SQL statements, because of SQL's rules that
 string literals are enclosed by single quotes, and single quotes
 inside such strings are shown as two single quotes in a row.
 
-Example: ``QUOTE('a')`` is ``'a'``.
+Starting with Tarantool version 2.10, arguments with numeric
+data types are returned without change.
+
+Example: ``QUOTE('a')`` is ``'a'``. ``QUOTE(5)`` is ``5``.
 
 .. _sql_function_raise:
 
@@ -3536,7 +3552,7 @@ Syntax:
 :samp:`ROUND({numeric-expression-1} [, {numeric-expression-2}])`
 
 Return the rounded value of numeric-expression-1, always rounding
-.5 upward for floating-point positive numbers or downward for negative numbers.
+.5 upward for positive numerics or downward for negative numerics.
 If numeric-expression-2 is supplied then rounding is to the nearest
 numeric-expression-2 digits after the decimal point;
 if numeric-expression-2 is not supplied then rounding is to the nearest integer.
@@ -3672,7 +3688,9 @@ Syntax:
 
 :samp:`TYPEOF({expression})`
 
-Return the :ref:`data type <sql_column_def_data_type>` of the expression.
+Return 'NULL' if the expression is NULL,
+or return 'scalar' if the expression is the name of a column defined as SCALAR,
+or return the :ref:`data type <sql_column_def_data_type>` of the expression.
 
 Examples:
 
@@ -3680,7 +3698,10 @@ Examples:
 ``TYPEOF(RANDOMBLOB(1))`` returns 'varbinary';
 ``TYPEOF(1e44)`` returns 'double' or 'number';
 ``TYPEOF(-44)`` returns 'integer';
-``TYPEOF(NULL)`` returns 'boolean'
+``TYPEOF(NULL)`` returns 'NULL'
+
+Prior to Tarantool version 2.10, ``TYPEOF(expression)`` simply returned
+the data type of the expression for all cases.
 
 .. _sql_function_unicode:
 
@@ -3860,3 +3881,25 @@ the three SELECT statements here will return results in three different orders:
 ``SELECT remark FROM things ORDER BY remark COLLATE "unicode";`` |br|
 ``SELECT remark FROM things ORDER BY remark COLLATE "unicode_uk_s1";`` |br|
 ``SELECT remark FROM things ORDER BY remark COLLATE "unicode_ky_s1";``
+
+********************************************************************************
+Default function parameters
+********************************************************************************
+
+Starting in Tarantool 2.10, if a parameter for an :ref:`aggregate function <sql_aggregate>` 
+or a :ref:`built-in scalar SQL function <sql_functions>` is one of the ``extra-parameters``
+that can appear in :ref:`box.execute(...[,extra-parameters]) <box-sql_box_execute>`
+requests,
+default data type is calculated thus: |br|
+* When there is only one possible data type, it is default. |br|
+Example: ``box.execute([[SELECT TYPEOF(LOWER(?));]],{x})`` is 'string'. |br|
+* When possible data types are INTEGER or DOUBLE or DECIMAL, DECIMAL is default. |br|
+Example: ``box.execute([[SELECT TYPEOF(AVG(?));]],{x})`` is 'decimal'. |br|
+* When possible data types are STRING or VARBINARY, STRING is default. |br|
+Example: ``box.execute([[SELECT TYPEOF(LENGTH(?));]],{x})`` is 'string'. |br|
+* When possible data types are any other scalar data type, SCALAR is default. |br|
+Example: ``box.execute([[SELECT TYPEOF(GREATEST(?,5));]],{x})`` is 'scalar'. |br|
+* Otherwise, there is no default. |br|
+Example: ``box.execute([[SELECT TYPEOF(LIKELY(?));]],{x})`` is the name of one of the primitive data types.
+
+
diff --git a/doc/reference/reference_sql/sql_user_guide.rst b/doc/reference/reference_sql/sql_user_guide.rst
index 641f4dad97..a8b90ac1af 100644
--- a/doc/reference/reference_sql/sql_user_guide.rst
+++ b/doc/reference/reference_sql/sql_user_guide.rst
@@ -35,7 +35,7 @@ The User Guide describes how users can start up with SQL with Tarantool, and nec
 Getting Started
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The explanations for installing and starting the Tarantool server are in earlier chapters of the Tarantool manual..
+The explanations for installing and starting the Tarantool server are in earlier chapters of the Tarantool manual.
 
 To get started specifically with the SQL features, using Tarantool as a client, execute these requests:
 
@@ -105,7 +105,7 @@ or between ``--`` and the end of a line (simple).
     INSERT /* This is a bracketed comment */ INTO t VALUES (5);
     INSERT INTO t VALUES (5); -- this is a simple comment
 
-Expressions, for example ``a + b`` OR ``a > b AND NOT a <= b``, may have arithmetic operators
+Expressions, for example ``a + b`` or ``a > b AND NOT a <= b``, may have arithmetic operators
 ``+ - / *``, may have comparison operators ``= > < <= >= LIKE``, and may be combined with
 ``AND OR NOT``, with optional parentheses.
 
@@ -148,7 +148,7 @@ The token is the minimum SQL-syntax unit that Tarantool understands.
 These are the types of tokens:
 
 Keywords -- official words in the language, for example ``SELECT`` |br|
-Literals -- constants for numbers or strings, for example ``15.7`` or ``'Taranto'`` |br|
+Literals -- constants for numerics or strings, for example ``15.7`` or ``'Taranto'`` |br|
 Identifiers -- for example column55 or table_of_accounts |br|
 Operators (strictly speaking "non-alphabetic operators") -- for example ``* / + - ( ) , ; < = >=``
 
@@ -157,7 +157,7 @@ Tokens can be separated from each other by one or more separators: |br|
 * Bracketed comments (beginning with ``/*`` and ending with ``*/``) |br|
 * Simple comments (beginning with ``--`` and ending with line feed) |br|
 Separators are not necessary before or after operators. |br|
-Separators are necessary after keywords or numbers or ordinary identifiers, unless the following token is an operator. |br|
+Separators are necessary after keywords or numerics or ordinary identifiers, unless the following token is an operator. |br|
 Thus Tarantool can understand this series of six tokens: |br|
 ``SELECT'a'FROM/**/t;`` |br|
 but for readability one would usually use spaces to separate tokens: |br|
@@ -192,8 +192,8 @@ DOUBLE literals: |br|
 Examples: .0, 1.0, 1E5, 1.1E5. |br|
 A literal has :ref:`data type = DOUBLE <sql_data_type_double>` if it contains a period, or contains "E".
 DOUBLE literals are also known as floating-point literals or approximate-numeric literals.
-To represent "Inf" (infinity), write a real number outside the double-precision number range, for example 1E309.
-To represent "nan" (not a number), write an expression that does not result in a real number,
+To represent "Inf" (infinity), write a real numeric outside the double-precision numeric range, for example 1E309.
+To represent "nan" (not a number), write an expression that does not result in a real numeric,
 for example 0/0, using Tarantool/NoSQL. This will appear as NULL in Tarantool/SQL.
 In an earlier version literals containing periods were considered to be :ref:`NUMBER <sql_data_type_number>` literals.
 In a future version "nan" may not appear as NULL.
@@ -212,9 +212,9 @@ Example: ``X'414243'``, which will be displayed as ``'ABC'``. |br|
 A literal has :ref:`data type = VARBINARY <sql_data_type_varbinary>`
 ("variable-length binary") if it is the letter X followed by quotes containing pairs of hexadecimal digits, representing byte values.
 
-Here are four ways to put non-ASCII characters,such as the Greek letter α alpha,  in string literals: |br|
+Here are four ways to put non-ASCII characters,such as the Greek letter α alpha, in string literals: |br|
 First make sure that your shell program is set to accept characters as UTF-8. A simple way to check is |br|
-``SELECT hex('α');``
+``SELECT hex(cast('α' as VARBINARY));``
 If the result is CEB1 -- which is the hexadecimal value for the UTF-8 representation of α -- it is good. |br|
 (1) Simply enclose the character inside ``'...'``, |br|
 ``'α'`` |br|
@@ -230,16 +230,14 @@ or |br|
 One can use the concatenation operator ``||`` to combine characters made with any of these methods.
 
 Limitations: (`Issue#2344 <https://github.com/tarantool/tarantool/issues/2344>`_) |br|
-* Numeric literals may be quoted, one cannot depend on the presence or
-absence of quote marks to determine whether a literal is numeric. |br|
-* ``LENGTH('A''B') = 3`` which is correct, but the display from
+* ``LENGTH('A''B') = 3`` which is correct, but on the Tarantool console the display from
 ``SELECT A''B;`` is ``A''B``, which is misleading. |br|
 * It is unfortunate that ``X'41'`` is a byte sequence which looks the same as ``'A'``,
 but it is not the same. ``box.execute("select 'A' < X'41';")`` is not legal at the moment.
 This happens because ``TYPEOF(X'41')`` yields ``'varbinary'``.
 Also it is illegal to say ``UPDATE ... SET string_column = X'41'``,
 one must say ``UPDATE ... SET string_column = CAST(X'41' AS STRING);``. |br|
-* It is non-standard to say that any number which contains a period has data type = DOUBLE.
+* It is non-standard to say that any numeric which contains a period has data type = DOUBLE.
 
 .. _sql_identifiers:
 
@@ -273,7 +271,7 @@ BEGIN BETWEEN BINARY BLOB BOOL BOOLEAN BOTH BY CALL CASE
 CAST CHAR CHARACTER CHECK COLLATE COLUMN COMMIT CONDITION
 CONNECT CONSTRAINT CREATE CROSS CURRENT CURRENT_DATE
 CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER CURSOR DATE
-DATETIME dec DECIMAL DECLARE DEFAULT DEFERRABLE DELETE DENSE_RANK
+DATETIME DEC DECIMAL DECLARE DEFAULT DEFERRABLE DELETE DENSE_RANK
 DESC DESCRIBE DETERMINISTIC DISTINCT DOUBLE DROP EACH ELSE
 ELSEIF END ESCAPE EXCEPT EXISTS EXPLAIN FALSE FETCH FLOAT
 FOR FOREIGN FROM FULL FUNCTION GET GRANT GROUP HAVING IF
@@ -355,9 +353,9 @@ Inside certain statements, identifiers may have "qualifiers" to prevent ambiguit
 A qualifier is an identifier of a higher-level object, followed by a period.
 For example column1 within table1 may be referred to as table1.column1.
 The "name" of an object is the same as its identifier, or its qualified identifier.
-For example, inside ``SELECT t1.column1, t2.column1 FROM t1, t2;`` the qualifiers
+For example, inside ``SELECT table1.column1, table2.column1 FROM table1, table2;`` the qualifiers
 make it clear that the first column is column1 from table1 and the second column
-is column2 from table2.
+is column1 from table2.
 
 The rules are sometimes relaxed for compatibility reasons, for example
 some non-letter characters such as $ and « are legal in regular identifiers.
@@ -426,7 +424,7 @@ in upper case and all similar words which refer to NoSQL types or to other kinds
 of object are in lower case, for example:
 
 * STRING is a data type name, but string is a general term;
-* NUMBER is a data type name, but number is a general term.
+* NUMBER is a data type name, but numeric is a general term.
 
 Although it is common to say that a VARBINARY value is a "binary string",
 this manual will not use that term and will instead say "byte sequence".
@@ -454,6 +452,9 @@ and minimum / maximum literal examples.
     +-----------+------------+------------+----------------------+-------------------------+
     | NUMBER    | number     | (none)     | -1.79769e308         | 1.79769e308             |
     +-----------+------------+------------+----------------------+-------------------------+
+    | DECIMAL   | decimal    | DEC        | -9999999999999999999 | 9999999999999999999     |
+    |           |            |            |  9999999999999999999 | 9999999999999999999     |
+    +-----------+------------+------------+----------------------+-------------------------+
     | STRING    | string     | TEXT,      | ``''``               | ``'many-characters'``   |
     |           |            | VARCHAR(n) |                      |                         |
     +-----------+------------+------------+----------------------+-------------------------+
@@ -462,7 +463,7 @@ and minimum / maximum literal examples.
     | UUID      | uuid       | (none)     | 00000000-0000-0000-  | ffffffff-ffff-ffff-     |
     |           |            |            | 0000-000000000000    | dfff-ffffffffffff       |
     +-----------+------------+------------+----------------------+-------------------------+
-    | SCALAR    | scalar     | (none)     | FALSE                |  ``X'many-hex-digits'`` |
+    | SCALAR    | (varies)   | (none)     | FALSE                | maximum UUID value      |
     +-----------+------------+------------+----------------------+-------------------------+
 
 
@@ -473,34 +474,45 @@ FALSE is less than TRUE.
 
 .. _sql_data_type_integer:
 
-INTEGER values are numbers that do not contain decimal points and are
+INTEGER values are numerics that do not contain decimal points and are
 not expressed with exponential notation. The range of possible values is
 between -2^63 and +2^64, or NULL.
 
 .. _sql_data_type_unsigned:
 
-UNSIGNED values are numbers that do not contain decimal points and are not
+UNSIGNED values are numerics that do not contain decimal points and are not
 expressed with exponential notation. The range of possible values is
 between 0 and +2^64, or NULL.
 
 .. _sql_data_type_double:
 
-DOUBLE values are numbers that do contain decimal points (for example 0.5) or
+DOUBLE values are numerics that do contain decimal points (for example 0.5) or
 are expressed with exponential notation (for example 5E-1).
 The range of possible values is the same as for the IEEE 754 floating-point
-standard, or NULL. Numbers outside the range of DOUBLE literals may be displayed
+standard, or NULL. Numerics outside the range of DOUBLE literals may be displayed
 as -inf or inf.
 
 .. _sql_data_type_number:
 
 NUMBER values have the same range as DOUBLE values.
-But NUMBER values may also also be integers, and, if so,
-arithmetic operation results will be exact rather than approximate.
-For example, if a NUMBER column ``X`` contains 5, then ``X / 2`` is 2, an integer.
+But NUMBER values may also be integers.
 There is no literal format for NUMBER (literals like ``1.5`` or ``1E555``
 are considered to be DOUBLEs), so use :ref:`CAST <sql_function_cast>`
-to insist that a number has data type NUMBER, but that is rarely necessary.
+to insist that a numeric has data type NUMBER, but that is rarely necessary.
 See the description of NoSQL type :ref:`'number' <index-box_number>`.
+Support for arithmetic and built-in arithmetic functions with NUMBERs was removed in Tarantool version 2.10.1.
+
+.. _sql_data_type_decimal:
+
+DECIMAL values can contain up to 38 digits on either side of a decimal point.
+and any arithmetic with DECIMAL values has exact results
+(arithmetic with DOUBLE values could have approximate results instead of exact results).
+There is no literal format for DECIMAL,
+so use :ref:`CAST <sql_function_cast>` to insist that a numeric
+has data type DECIMAL, for example ``CAST(1.1 AS DECIMAL)`` or
+``CAST('99999999999999999999999999999999999999' AS DECIMAL)``.
+See the description of NoSQL type :ref:`'decimal' <decimal>`.
+DECIMAL support in SQL was added in Tarantool version 2.10.1.
 
 .. _sql_data_type_string:
 
@@ -535,24 +547,25 @@ UUID support in SQL was added in Tarantool version 2.9.1.
 .. _sql_data_type_scalar:
 
 SCALAR can be used for
-:ref:`column definitions <sql_column_def_data_type>` but the individual column values have
-one of the preceding types -- BOOLEAN, INTEGER, DOUBLE, STRING, VARBINARY, or UUID.
-See more about SCALAR in the section
+:ref:`column definitions <sql_column_def_data_type>` and the individual column values have
+type SCALAR. See
 :ref:`Column definition -- the rules for the SCALAR data type <sql_column_def_scalar>`.
 The data-type may be followed by :ref:`[COLLATE collation-name] <sql_collate_clause>`.
-
+Prior to Tarantool version 2.10.1, individual column values had
+one of the preceding types -- BOOLEAN, INTEGER, DOUBLE, DECIMAL, STRING, VARBINARY, or UUID.
+Starting in Tarantool version 2.10.1, all values have type SCALAR.
 
 Any value of any data type may be NULL. Ordinarily NULL will be cast to the
 data type of any operand it is being compared to or to the data type of the
 column it is in. If the data type of NULL cannot be determined from context,
 it is BOOLEAN.
 
-All the SQL data types correspond to
+Most of the SQL data types correspond to
 :ref:`Tarantool/NoSQL types <details_about_index_field_types>` with the same name.
 There are also some Tarantool/NoSQL data types which have no corresponding SQL data types.
 If Tarantool/SQL reads a Tarantool/NoSQL value which has a type which has no SQL equivalent,
 Tarantool/SQL may treat it as NULL or INTEGER or VARBINARY.
-For example, ``SELECT "flags" FROM "_space";`` will return a column whose data type is ``'map'``.
+For example, ``SELECT "flags" FROM "_vspace";`` will return a column whose type is ``'map'``.
 Such columns can only be manipulated in SQL by
 :ref:`invoking Lua functions <sql_calling_lua>`.
 
@@ -575,7 +588,7 @@ promotion to a broader type may occur to avoid overflow.
 Arithmetic with NULL operands will result in a NULL operand.
 
 In the following list of operators, the tag "(arithmetic)" indicates
-that all operands are expected to be numbers and should result in a number;
+that all operands are expected to be numerics (other than NUMBER) and should result in a numeric;
 the tag "(comparison)" indicates that operands are expected to have similar
 data types and should result in a BOOLEAN; the tag "(logic)"
 indicates that operands are expected to be BOOLEAN and should result in a BOOLEAN.
@@ -583,75 +596,84 @@ Exceptions may occur where operations are not possible, but see the "special sit
 which are described after this list.
 Although all examples show literals, they could just as easily show column identifiers.
 
+Starting with Tarantool version 2.10.1, arithmetic operands cannot be NUMBERs.
+
 .. _sql_operator_arithmetic:
 
 .. _sql_operator_addition:
 
 ``+`` addition (arithmetic)
-Add two numbers according to standard arithmetic rules.
+Add two numerics according to standard arithmetic rules.
 Example: ``1 + 5``, result = 6.
 
 .. _sql_operator_subtraction:
 
 ``-`` subtraction (arithmetic)
-Subtract second number from first number according to standard arithmetic rules.
+Subtract second numeric from first numeric according to standard arithmetic rules.
 Example: ``1 - 5``, result = -4.
 
 ``*`` multiplication (arithmetic)
-Multiply two numbers according to standard arithmetic rules.
+Multiply two numerics according to standard arithmetic rules.
 Example: ``2 * 5``, result = 10.
 
 ``/`` division (arithmetic)
-Divide second number into first number according to standard arithmetic rules.
+Divide second numeric into first numeric according to standard arithmetic rules.
 Division by zero is not legal.
-Division of integers always results in rounding down, use :ref:`CAST <sql_function_cast>` to DOUBLE to get
+Division of integers always results in rounding toward zero, use :ref:`CAST <sql_function_cast>` to DOUBLE to get
 non-integer results.
 Example: ``5 / 2``, result = 2.
 
 ``%`` modulus (arithmetic)
-Divide second number into first number according to standard arithmetic rules.
+Divide second numeric into first numeric according to standard arithmetic rules.
 The result is the remainder.
+Starting with Tarantool version 2.10.1, operands must be INTEGER or UNSIGNED.
 Example: ``17 % 5``, result = 2.
+Example: ``-123 % 4``, result = -3.
 
 ``<<`` shift left (arithmetic)
-Shift the first number to the left N times, where N = the second number.
-For positive numbers, each 1-bit shift to the left is equivalent to multiplying times 2.
+Shift the first numeric to the left N times, where N = the second numeric.
+For positive numerics, each 1-bit shift to the left is equivalent to multiplying times 2.
 Example: ``5 << 1``, result = 10.
+Starting with Tarantool version 2.10.1, operands must be non-negative INTEGER or UNSIGNED.
 
 ``>>`` shift right (arithmetic)
-Shift the first number to the right N times, where N = the second number.
-For positive numbers, each 1-bit shift to the right is equivalent to dividing by 2.
+Shift the first numeric to the right N times, where N = the second numeric.
+For positive numerics, each 1-bit shift to the right is equivalent to dividing by 2.
 Example: ``5 >> 1``, result = 2.
+Starting with Tarantool version 2.10.1, operands must be non-negative INTEGER or UNSIGNED.
 
 ``&`` and (arithmetic)
-Combine the two numbers, with 1 bits in the result if and only if both original numbers have 1 bits.
+Combine the two numerics, with 1 bits in the result if and only if both original numerics have 1 bits.
 Example: ``5 & 4``, result = 4.
+Starting with Tarantool version 2.10.1, operands must be non-negative INTEGER or UNSIGNED.
 
 ``|`` or (arithmetic)
-Combine the two numbers, with 1 bits in the result if either original number has a 1 bit.
+Combine the two numerics, with 1 bits in the result if either original numeric has a 1 bit.
 Example: ``5 | 2``, result = 7.
+Starting with Tarantool version 2.10.1, operands must be non-negative INTEGER or UNSIGNED.
 
 ``~`` negate (arithmetic), sometimes called bit inversion
 Change 0 bits to 1 bits, change 1 bits to 0 bits.
 Example: ``~5``, result = -6.
+Starting with Tarantool version 2.10.1, the operand must be non-negative INTEGER or UNSIGNED.
 
 .. _sql_operator_comparison:
 
 ``<`` less than (comparison)
 Return TRUE if the first operand is less than the second by arithmetic or collation rules.
-Example for numbers: ``5 < 2``, result = FALSE. Example for strings: ``'C' < ' '``, result = FALSE.
+Example for numerics: ``5 < 2``, result = FALSE. Example for strings: ``'C' < ' '``, result = FALSE.
 
 ``<=`` less than or equal (comparison)
 Return TRUE if the first operand is less than or equal to the second by arithmetic or collation rules.
-Example for numbers: ``5 <= 5``, result = TRUE. Example for strings: ``'C' <= 'B'``, result = FALSE.
+Example for numerics: ``5 <= 5``, result = TRUE. Example for strings: ``'C' <= 'B'``, result = FALSE.
 
 ``>`` greater than (comparison)
 Return TRUE if the first operand is greater than the second by arithmetic or collation rules.
-Example for numbers: ``5 > -5``, result = TRUE. Example for strings: ``'C' > '!'``, result = TRUE.
+Example for numerics: ``5 > -5``, result = TRUE. Example for strings: ``'C' > '!'``, result = TRUE.
 
 ``>=`` greater than or equal (comparison)
 Return TRUE if the first operand is greater than or equal to the second by arithmetic or collation rules.
-Example for numbers: ``0 >= 0``, result = TRUE. Example for strings: ``'Z' >= 'Γ'``, result = FALSE.
+Example for numerics: ``0 >= 0``, result = TRUE. Example for strings: ``'Z' >= 'Γ'``, result = FALSE.
 
 .. _sql_equal:
 
@@ -659,7 +681,7 @@ Example for numbers: ``0 >= 0``, result = TRUE. Example for strings: ``'Z' >= '
 After the word SET, "=" means the first operand gets the value from the second operand.
 In other contexts, "=" returns TRUE if operands are equal.
 Example for assignment: ``... SET column1 = 'a';``
-Example for numbers: ``0 = 0``, result = TRUE. Example for strings:  ``'1' = '2 '``, result = FALSE.
+Example for numerics: ``0 = 0``, result = TRUE. Example for strings: ``'1' = '2 '``, result = FALSE.
 
 ``==`` equal (assignment), or equal (comparison)
 This is a non-standard equivalent of
@@ -755,14 +777,16 @@ for example ``SELECT 1e318 - 1e318;`` is NULL and ``SELECT 1e318 * 0;`` is NULL.
 SQL operations never return the floating-point value -nan,
 although it may exist in data created by Tarantool's NoSQL. In SQL, -nan is treated as NULL.
 
-A string will be converted to a number if it is used with an arithmetic operator and conversion is possible,
+In older Tarantool versions,
+a string would be converted to a numeric if it was used with an arithmetic operator and conversion was possible,
 for example ``'7' + '7'`` = 14.
 And for comparison, ``'7'`` = 7.
-This is called implicit casting. It is applicable for STRINGs and all numeric data types.
+This is called implicit casting. It was applicable for STRINGs and all numeric data types.
+Starting with Tarantool version 2.10, it is no longer supported.
 
 Limitations: (`Issue#2346 <https://github.com/tarantool/tarantool/issues/2346>`_) |br|
 * Some words, for example MATCH and REGEXP, are reserved but are not necessary for current or planned Tarantool versions |br|
-* 999999999999999 << 210 yields 0. (1 << 63) >> 63 yields -1.
+* 999999999999999 << 210 yields 0.
 
 .. _sql_expressions:
 
@@ -786,8 +810,6 @@ CASE ... WHEN ... THEN ... ELSE ... END |br|
 
 See also: :ref:`subquery <sql_subquery>`.
 
-Limitations: IS TRUE and IS FALSE return an error.
-
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Comparing and Ordering
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -796,14 +818,13 @@ There are rules for determining whether value-1 is "less than", "equal to", or "
 These rules are applied for searches, for sorting results in order by column values,
 and for determining whether a column is unique.
 The result of a comparison of two values can be TRUE, FALSE, or UNKNOWN (the three BOOLEAN values).
-Sometimes for retrieval TRUE is converted to 1, FALSE is converted to 0, UNKNOWN is converted to NULL.
 For any comparisons where neither operand is NULL, the operands are "distinct" if the comparison
 result is FALSE.
 For any set of operands where all operands are distinct from each other, the set is considered to be "unique".
 
-When comparing a number to a number: |br|
+When comparing a numeric to a numeric: |br|
 * infinity = infinity is true |br|
-* regular numbers are compared according to usual arithmetic rules
+* regular numerics are compared according to usual arithmetic rules
 
 When comparing any value to NULL: |br|
 (for examples in this paragraph assume that column1 in table T contains {NULL, NULL, 1, 2}) |br|
@@ -813,10 +834,13 @@ When comparing any value to NULL: |br|
 * for ordering, NULL values sort together and are less than non-NULL values. Therefore SELECT column1 FROM T ORDER BY column1; returns {NULL, NULL, 1,2}. |br|
 * for evaluating a UNIQUE constraint or UNIQUE index, any number of NULLs is okay. Therefore CREATE UNIQUE INDEX i ON T (column1); will succeed.
 
-When comparing a number to a STRING: |br|
-* If implicit casting is possible, the STRING operand is converted to a number before comparison.
-If implicit casting is not possible, and one of the operands is the name of a column which was
-defined as SCALAR, and the column is being compared with a number, then number is less than STRING. Otherwise, the comparison is not legal.
+When comparing any value to a SCALAR: |br|
+* This is always legal, and the result depends on the underlying type of the value.
+For example, if COLUMN1 is defined as SCALAR, and a value in the column is 'a', then
+COLUMN1 < 5 is a legal comparison and the result is FALSE because numeric is less than STRING.
+
+When comparing a numeric to a STRING: |br|
+* Comparison is legal if the STRING value can be converted to a numeric with an explicit cast.
 
 When comparing a BOOLEAN to a BOOLEAN: |br|
 TRUE is greater than FALSE.
@@ -836,7 +860,6 @@ When comparing a STRING to a STRING: |br|
 * Ordinarily trailing spaces matter. So ``'a' = 'a  '`` is not TRUE. This can be cancelled by using the :ref:`TRIM(TRAILING ...) <sql_function_trim>` function. |br|
 
 Limitations: |br|
-* LIKE comparisons return integer results according to meta-information. |br|
 * LIKE is not expected to work with VARBINARY.
 
 ********************************************************************************
@@ -921,20 +944,20 @@ Assignments and operations involving NULL cause NULL or UNKNOWN results. |br|
 For arithmetic, convert to the data type which can contain both operands and the result. |br|
 For explicit casts, if a meaningful result is possible, the operation is allowed. |br|
 For implicit casts, if a meaningful result is possible and the data types on both sides
-are either STRINGs or numbers (that is, are STRING or INTEGER or UNSIGNED or DOUBLE or NUMBER),
+are either STRINGs or most numeric types (that is, are STRING or INTEGER or UNSIGNED or DOUBLE but not NUMBER),
 the operation is sometimes allowed.
 
 The specific situations in this chart follow the general rules:
 
 .. code-block:: none
 
-    ~                To BOOLEAN | To number  | To STRING | To VARBINARY | To UUID
+    ~                To BOOLEAN | To numeric | To STRING | To VARBINARY | To UUID
     ---------------  ----------   ----------   ---------   ------------   -------
-    From BOOLEAN   | AAA        | S--        | A--       | ---          | ---
-    From number    | A--        | SSA        | A-A       | ---          | ---
-    From STRING    | S--        | S-S        | AAA       | A--          | SS-
-    From VARBINARY | ---        | ---        | A--       | AAA          | SS-
-    From UUID      | ---        | ---        | AA-       | AA-          | AAA
+    From BOOLEAN   | AAA        | ---        | A--       | ---          | ---
+    From numeric   | ---        | SSA        | A--       | ---          | ---
+    From STRING    | S--        | S--        | AAA       | A--          | S--
+    From VARBINARY | ---        | ---        | A--       | AAA          | S--
+    From UUID      | ---        | ---        | A--       | A--          | AAA
 
 Where each entry in the chart has 3 characters: |br|
 Where A = Always allowed, S = Sometimes allowed, - = Never allowed. |br|
@@ -945,13 +968,12 @@ So AAA = Always for explicit, Always for Implicit (assignment), Always for Impli
 
 The S "Sometimes allowed" character applies for these special situations: |br|
 From STRING To BOOLEAN is allowed if UPPER(string-value) = ``'TRUE'`` or ``'FALSE'``. |br|
-From number to INTEGER or UNSIGNED is allowed for cast and assignment only if the result is not out of range,
-and the number has no post-decimal digits. |br|
-From STRING to INTEGER or UNSIGNED is allowed only if the string has a representation of a number,
+From numeric to INTEGER or UNSIGNED is allowed for cast and assignment only if the result is not out of range,
+and the numeric has no post-decimal digits. |br|
+From STRING to INTEGER or UNSIGNED or DECIMAL is allowed only if the string has a representation of a numeric,
 and the result is not out of range,
-and the number has no post-decimal digits. |br|
-From STRING to DOUBLE or NUMBER is allowed only if the string has a representation of a number. |br|
-From BOOLEAN to number is allowed only if the number is not DOUBLE. |br|
+and the numeric has no post-decimal digits. |br|
+From STRING to DOUBLE or NUMBER is allowed only if the string has a representation of a numeric. |br|
 From STRING to UUID is allowed only if the value is
 (8 hexadecimal digits) hyphen (4 hexadecimal digits) hyphen (4 hexadecimal digits) hyphen (4 hexadecimal digits) hyphen (12 hexadecimal digits),
 such as ``'8e3b281b-78ad-4410-bfe9-54806a586a90'``. |br|
@@ -959,9 +981,7 @@ From VARBINARY to UUID is allowed only if the value is
 16 bytes long,
 as in ``X'8e3b281b78ad4410bfe954806a586a90'``. |br|
 The chart does not show To|From SCALAR because the conversions depend on the type of the value,
-not the type of the column definition.
-Explicit cast to SCALAR is allowed but has no effect, the result data type is always the same as the original data type.
-But comparisons of values of different types are allowed if the definition is SCALAR.
+not the type of the column definition. Explicit cast to SCALAR is always allowed.
 
 ..  note::
 
@@ -969,26 +989,33 @@ But comparisons of values of different types are allowed if the definition is SC
     in the same way as the :ref:`number <index-box_number>` type in
     NoSQL Tarantool.
 
+    Starting with Tarantool 2.10.1, these conversions which used to be legal are now illegal: |br|
+    Explicit cast from numeric to BOOLEAN, |br|
+    Explicit cast from BOOLEAN to numeric, |br|
+    Implicit cast from NUMBER to other numeric types for arithmetic or built-in functions. |br|
+    Implicit cast from numeric to STRING. |br|
+    Implicit cast from STRING to numeric.
+
 Examples of casts, illustrating the situations in the chart:
 
-``CAST(TRUE AS INTEGER)`` is legal because the intersection of the  "From BOOLEAN" row with the "To number"
+``CAST(TRUE AS STRING)`` is legal. The intersection of the "From BOOLEAN" row with the "To STRING"
 column is ``A--`` and the first letter of ``A--`` is for explicit cast and A means Always Allowed.
-The result is 1.
+The result is 'TRUE'.
 
-``UPDATE ... SET varbinary_column = 'A'`` is illegal because the intersection of the "From STRING" row with the "To VARBINARY"
+``UPDATE ... SET varbinary_column = 'A'`` is illegal. The intersection of the "From STRING" row with the "To VARBINARY"
 column is ``A--`` and the second letter of ``A--`` is for implicit cast (assignment) and - means not allowed.
 The result is an error message.
 
-``1.7E-1 > 0`` is legal because the intersection of the "From number" row with the "To number"
+``1.7E-1 > 0`` is legal. The intersection of the "From numeric" row with the "To numeric"
 column is SSA, and the third letter of SSA is for implicit cast (comparison) and A means Always Allowed.
 The result is TRUE.
 
-``11 > '2'`` is legal because the intersection of the "From number" row with the "To STRING"
-column is AAA and the third letter of AAA is for implicit cast (comparison) and A means Always Allowed.
-The result is TRUE.  For detailed explanation see the following section.
+``11 > '2'`` is illegal. The intersection of the "From numeric" row with the "To STRING"
+column is A-- and the third letter of A-- is for implicit cast (comparison) and - means not allowed.
+The result is an error message. For detailed explanation see the following section.
 
-``CAST('5' AS INTEGER)`` is legal because the intersection of the "From STRING" row with the "To number"
-column is S-S and the first letter of S-S is for explicit cast and S means Sometimes Allowed.
+``CAST('5' AS INTEGER)`` is legal. The intersection of the "From STRING" row with the "To numeric"
+column is S-- and the first letter of S-- is for explicit cast and S means Sometimes Allowed.
 However, ``CAST('5.5' AS INTEGER)`` is illegal because 5.5 is not an integer --
 if the string contains post-decimal digits and the target is INTEGER or UNSIGNED,
 the assignment will fail.
@@ -999,29 +1026,32 @@ the assignment will fail.
 Implicit string/numeric cast
 ********************************************************************************
 
+The examples in this section are true only for Tarantool versions before Tarantool 2.10.
+Starting with Tarantool 2.10, implicit string/numeric cast is no longer allowed.
+
 Special considerations may apply for casting STRINGs
-to/from INTEGERs/DOUBLEs/NUMBERs/UNSIGNEDs (numbers) for comparison or assignment.
+to/from INTEGERs/DOUBLEs/NUMBERs/UNSIGNEDs (numerics) for comparison or assignment.
 
-``1 = '1' /* compare a STRING with a number */`` |br|
-``UPDATE ... SET string_column = 1 /* assign a number to a STRING */``
+``1 = '1' /* compare a STRING with a numeric */`` |br|
+``UPDATE ... SET string_column = 1 /* assign a numeric to a STRING */``
 
-For comparisons, the cast is always from STRING to number. |br|
+For comparisons, the cast is always from STRING to numeric. |br|
 Therefore ``1e2 = '100'`` is TRUE, and ``11 > '2'`` is TRUE. |br|
-If the cast fails, then the number is less than the STRING. |br|
+If the cast fails, then the numeric is less than the STRING. |br|
 Therefore ``1e400 < ''`` is TRUE. |br|
 Exception: for BETWEEN the cast is to the data type of the first and last operands. |br|
 Therefore ``'66' BETWEEN 5 AND '7'`` is TRUE.
 
 For assignments, due to a change in behavior starting with Tarantool
 :doc:`2.5.1 </release/2.5.1>`,
-implicit casts from strings to numbers are not legal. Therefore
+implicit casts from strings to numerics are not legal. Therefore
 ``INSERT INTO t (integer_column) VALUES ('5');`` is an error.
 
 Implicit cast does happen if STRINGS are used in arithmetic. |br|
 Therefore ``'5' / '5' = 1``. If the cast fails, then the result is an error. |br|
 Therefore ``'5' / ''`` is an error.
 
-Implicit cast does NOT happen if numbers are used in concatenation, or in LIKE. |br|
+Implicit cast does NOT happen if numerics are used in concatenation, or in LIKE. |br|
 Therefore ``5 || '5'`` is illegal.
 
 In the following examples, implicit cast does not happen for values in SCALAR columns: |br|
@@ -1057,6 +1087,4 @@ with other DBMSs. However, other DBMSs have different rules about what can be co
 And, of course, it is not possible to be compatible with other DBMSs and at the same
 time support SCALAR, which other DBMSs do not have.
 
-Limitations (`Issue#3809 <https://github.com/tarantool/tarantool/issues/3809>`_): |br|
-Result of concatenation, or out-of-bound result, may have wrong type. |br|
-Parameter conversion behavior will change (`Issue#4159 <https://github.com/tarantool/tarantool/issues/4159>`_). After issue#4159 is done, LENGTH(15) will be illegal.
+
diff --git a/locale/ru/LC_MESSAGES/book/app_server/luajit_memprof.po b/locale/ru/LC_MESSAGES/book/app_server/luajit_memprof.po
index 168236c96c..16fcf77f02 100644
--- a/locale/ru/LC_MESSAGES/book/app_server/luajit_memprof.po
+++ b/locale/ru/LC_MESSAGES/book/app_server/luajit_memprof.po
@@ -1,34 +1,46 @@
 
 msgid "LuaJIT memory profiler"
-msgstr ""
+msgstr "Профилировщик памяти LuaJIT"
 
 msgid ""
-"Starting from version :doc:`2.7.1 </release/2.7.1>`, Tarantool has the "
-"built‑in module called ``misc.memprof`` that implements the LuaJIT memory "
-"profiler (further, *profiler*). The profiler provides a memory allocation "
-"report that helps analyse Lua code and find out the places that put the most"
-" pressure on the Lua garbage collector (GC)."
+"Starting from version :doc:`2.7.1 </release/2.7.1>`, Tarantool has a "
+"built‑in module called ``misc.memprof`` that implements a LuaJIT memory "
+"profiler (which we will just call *the profiler* in this section). The "
+"profiler provides a memory allocation report that helps analyze Lua code and"
+" find the places that put the most pressure on the Lua garbage collector "
+"(GC)."
 msgstr ""
+"В Tarantool, начиная с версии :doc:`2.7.1 </release/2.7.1>`, есть встроенный"
+" модуль ``misc.memprof``, реализующий профилировщик памяти LuaJIT (далее в "
+"разделе — *профилировщик*). Профилировщик предоставляет отчет об аллокации "
+"памяти, который помогает проанализовать Lua-код и выявить области наибольшей"
+" нагрузки на сборщик мусора на Lua."
 
-msgid "Working with profiler"
-msgstr ""
+msgid "Working with the profiler"
+msgstr "Использование профилировщика"
 
-msgid "Usage of the profiler is two-fold:"
-msgstr ""
+msgid "Usage of the profiler involves two steps:"
+msgstr "Работа с профилировщиком состоит из двух этапов:"
 
 msgid ""
-":ref:`Collect <profiler_usage_get>` a binary profile of allocations, "
+":ref:`Collecting <profiler_usage_get>` a binary profile of allocations, "
 "reallocations, and deallocations in memory related to Lua (further, *binary "
 "memory profile* or *binary profile* for short)."
 msgstr ""
+"События аллокации, реаллокации и деаллокации в Lua :ref:`собираются "
+"<profiler_usage_get>` в бинарный профиль (далее по тексту — *бинарный "
+"профиль памяти* или просто *бинарный профиль*)."
 
 msgid ""
-":ref:`Parse <profiler_usage_parse>` the binary profile collected and get a "
+":ref:`Parsing <profiler_usage_parse>` the collected binary profile to get a "
 "human-readable profiling report."
 msgstr ""
+"Выполняется :ref:`парсинг <profiler_usage_parse>` собранного бинарного "
+"профиля. В результате формируется отчет о профилировании в удобном для "
+"чтения формате."
 
 msgid "Collecting binary profile"
-msgstr ""
+msgstr "Сбор бинарного профиля"
 
 msgid ""
 "To collect a binary profile for a particular part of the Lua code, you need "
@@ -36,10 +48,15 @@ msgid ""
 "``misc.memprof.start()`` and ``misc.memprof.stop()``, and then execute the "
 "code under Tarantool."
 msgstr ""
+"Чтобы сформировать бинарный профиль для определенного участка кода на Lua, "
+"вставьте этот участок кода между функциями ``misc.memprof.start()`` и "
+"``misc.memprof.stop()``, а затем выполните его в Tarantool."
 
 msgid ""
 "Below is a chunk of simple Lua code named ``test.lua`` to illustrate this."
 msgstr ""
+"Для наглядности ниже приведен фрагмент кода на Lua под названием "
+"``test.lua``."
 
 msgid ""
 "-- Prevent allocations on traces.\n"
@@ -52,7 +69,7 @@ msgid ""
 "end\n"
 "\n"
 "local t = {}\n"
-"for i = 1, 1e5 do\n"
+"for i = 1, 1e4 do\n"
 "    -- table.insert is the built-in function and all corresponding\n"
 "    -- allocations are reported in the scope of the main chunk.\n"
 "    table.insert(t,\n"
@@ -61,188 +78,328 @@ msgid ""
 "end\n"
 "local stp, err = misc.memprof.stop()"
 msgstr ""
+"-- Отключение аллокации на трассах\n"
+"jit.off()\n"
+"local str, err = misc.memprof.start(\"memprof_new.bin\")\n"
+"-- Lua не создает стековый фрейм для вызова string.rep,\n"
+"-- поэтому все события аллокации\n"
+"-- приписываются не функции append(), а родительской области\n"
+"local function append(str, rep)\n"
+"    return string.rep(str, rep)\n"
+"end\n"
+"\n"
+"local t = {}\n"
+"for i = 1, 1e4 do\n"
+"    -- table.insert — встроенная функция,\n"
+"    -- так что профилировщик включает все соответствующие ей\n"
+"    -- события аллокации в отчет по основной части кода\n"
+"    table.insert(t,\n"
+"        append('q', i)\n"
+"    )\n"
+"end\n"
+"local stp, err = misc.memprof.stop()"
 
-msgid "Starting profiler in Lua code:"
+msgid ""
+"The Lua code for starting the profiler -- as in line 3 in the test.lua "
+"example above -- is:"
 msgstr ""
+"В примере test.lua код для запуска профилировщика находится на строке 3:"
 
 msgid "local str, err = misc.memprof.start(FILENAME)"
-msgstr ""
+msgstr "local str, err = misc.memprof.start(ИМЯ_ФАЙЛА)"
 
 msgid ""
-"where ``FILENAME`` is a name of the binary file where profiling events are "
-"written."
+"where ``FILENAME`` is the name of the binary file where profiling events are"
+" written."
 msgstr ""
+"``ИМЯ_ФАЙЛА`` — имя бинарного файла, куда записываются профилируемые "
+"события."
 
 msgid ""
-"If it is not possible to open a file for writing or the profiler fails to "
-"start, ``misc.memprof.start()`` returns ``nil`` on failure. Also, in this "
-"case the function returns an error message as the second result and a "
-"system-dependent error code as the third result. Otherwise, it returns "
-"``true``."
-msgstr ""
+"If the operation fails, for example if it is not possible to open a file for"
+" writing or if the profiler is already running, ``misc.memprof.start()`` "
+"returns ``nil`` as the first result, an error-message string as the second "
+"result, and a system-dependent error code number as the third result. If the"
+" operation succeeds, ``misc.memprof.start()`` returns ``true``."
+msgstr ""
+"Если операция завершается ошибкой, функция ``misc.memprof.start()`` "
+"возвращает результат, состоящий из трех частей: ``nil``; строка с сообщением"
+" об ошибке; код ошибки в зависимости от системы. Ошибка может возникнуть, "
+"например, когда не открывается файл для записи или профилировщик уже "
+"запущен. Если операция выполняется успешно, ``misc.memprof.start()`` "
+"возвращает ``true``."
 
-msgid "Stopping profiler in Lua code:"
+msgid ""
+"The Lua code for stopping the profiler -- as in line 18 in the test.lua "
+"example above -- is:"
 msgstr ""
+"В примере test.lua код для остановки профилировщика находится на строке 18:"
 
 msgid "local stp, err = misc.memprof.stop()"
-msgstr ""
+msgstr "local stp, err = misc.memprof.stop()"
 
 msgid ""
-"If any error occurs at stopping the profiling (an error when the file "
-"descriptor is being closed) or during reporting, ``misc.memprof.stop()`` "
-"returns ``nil``. Also, in this case the function returns an error message as"
-" the second result and a system-dependent error code as the third result. "
-"Otherwise, it returns ``true``."
-msgstr ""
+"If the operation fails, for example if  there is an error when the file "
+"descriptor is being closed or if there is a failure during reporting, "
+"``misc.memprof.stop()`` returns ``nil`` as the first result, an error-"
+"message string as the second result, and a system-dependent error code "
+"number as the third result. If the operation succeeds, "
+"``misc.memprof.stop()`` returns ``true``."
+msgstr ""
+"Если операция завершается ошибкой, функция ``misc.memprof.stop()`` "
+"возвращает результат, состоящий из трех частей: ``nil``; строка с сообщением"
+" об ошибке; код ошибки в зависимости от системы. Ошибка может возникнуть, "
+"например, когда закрыт файловый дескриптор или во время составления отчета "
+"происходит сбой. Если операция выполняется успешно, ``misc.memprof.stop()`` "
+"возвращает ``true``."
 
 msgid ""
 "To generate the file with memory profile in binary format (in the "
-":ref:`example above <profiler_usage_example01>`, it's ``memprof_new.bin``), "
-"execute the code under Tarantool:"
+":ref:`test.lua code example above <profiler_usage_example01>` the file name "
+"is ``memprof_new.bin``), execute the code under Tarantool:"
 msgstr ""
+"Теперь нужно сгенерировать файл с профилем памяти в бинарном формате. В "
+":ref:`примере test.lua <profiler_usage_example01>` имя файла — "
+"``memprof_new.bin``. Выполните код в Tarantool:"
 
 msgid "$ tarantool test.lua"
-msgstr ""
+msgstr "$ tarantool test.lua"
 
 msgid ""
 "Tarantool collects the allocation events in ``memprof_new.bin``, puts the "
 "file in its :ref:`working directory <cfg_basic-work_dir>`, and closes the "
 "session."
 msgstr ""
+"Tarantool собирает события аллокации в файл ``memprof_new.bin``, помещает "
+"его в :ref:`рабочую директорию <cfg_basic-work_dir>` и завершает сеанс."
 
 msgid ""
-"The :ref:`code example <profiler_usage_example01>` above also illustrates "
-"the memory allocation logic in some of the cases that are important to "
-"understand for further :ref:`reading <profiler_usage_parse>` and "
-":ref:`analysing <profiler_analysis>` a profiling report:"
+"The :ref:`test.lua code example <profiler_usage_example01>` above also "
+"illustrates the memory allocation logic in some cases that are important to "
+"understand for :ref:`reading <profiler_usage_parse>` and :ref:`analyzing "
+"<profiler_analysis>` a profiling report:"
 msgstr ""
+":ref:`Пример test.lua <profiler_usage_example01>` также иллюстрирует логику,"
+" по которой в некоторых случаях происходит аллокация памяти. Важно понимать "
+"эту логику, чтобы :ref:`читать <profiler_usage_parse>` и :ref:`анализировать"
+" <profiler_analysis>` отчеты о профилировании."
 
 msgid ""
 "Line 2: It is recommended to switch the JIT compilation off by calling "
-"``jit.off()`` before the profiler start. Refer to the following "
-":ref:`explanation <profiler_usage_internal_jitoff>` for more details."
+"``jit.off()`` before the profiler start. Refer to the following :ref:`note "
+"about jitoff <profiler_usage_internal_jitoff>` for more details."
 msgstr ""
+"Строка 2: Рекомендуется отключать JIT-компиляцию, вызывая ``jit.off()`` "
+"перед запуском профилировщика. За дополнительными сведениями обратитесь к "
+":ref:`примечанию о jitoff <profiler_usage_internal_jitoff>`."
 
 msgid ""
 "Lines 6-8: Tail call optimization doesn't create a new call frame, so all "
 "allocations inside the function called via the ``CALLT/CALLMT`` `bytecodes "
 "<http://wiki.luajit.org/Bytecode-2.0#calls-and-vararg-handling>`_ are "
-"attributed to its caller. See also comments to these lines."
+"attributed to the function's caller. See also the comments preceding these "
+"lines."
 msgstr ""
+"Строки 6–8: Оптимизация хвостового вызова не создает новый фрейм стека "
+"вызовов, поэтому все события аллокации в `байт-коде "
+"<http://wiki.luajit.org/Bytecode-2.0#calls-and-vararg-handling>`_ "
+"``CALLT/CALLMT`` относятся на счет кода, вызывающего эту функцию. Обратите "
+"внимание на комментарии перед этими строками."
 
 msgid ""
-"Lines 14-16: Usually, the information about allocations inside Lua built‑ins"
-" are not really useful for developers. That's why if a Lua built‑in function"
-" is called from a Lua function, the profiler attributes all allocations to "
+"Lines 14-16: Usually the information about allocations inside Lua built‑ins "
+"is not really useful for developers. That's why if a Lua built‑in function "
+"is called from a Lua function, the profiler attributes all allocations to "
 "the Lua function. Otherwise, this event is attributed to a C function. See "
-"also comments to these lines."
+"also the comments preceding these lines."
 msgstr ""
+"Строки 14–16: Как правило, разработчиков несильно интересует информация об "
+"аллокации во встроенных функциях LuaJIT. Поэтому если встроенная функция "
+"вызывается из функции на Lua, профилировщик собирает все события аллокации "
+"для функции на Lua. В противном случае событие относится к функции на C. "
+"Обратите внимание на комментарии перед этими строками."
 
 msgid "Parsing binary profile and generating profiling report"
-msgstr ""
+msgstr "Парсинг бинарного профиля и формирование отчета о профилировании"
 
 msgid ""
-"After having the memory profile in binary format, the next step is to parse "
-"it to get a human-readable profiling report. You can do this via Tarantool "
+"After getting the memory profile in binary format, the next step is to parse"
+" it to get a human-readable profiling report. You can do this via Tarantool "
 "by using the following command (mind the hyphen ``-`` prior to the file "
 "name):"
 msgstr ""
+"Получив профиль памяти в двоичном формате, нужно выполнить парсинг, чтобы "
+"отчет было удобно читать. Парсинг можно выполнить в Tarantool, "
+"воспользовавшись следующей командой (обратите внимание на дефис ``-`` перед "
+"именем файла):"
 
-msgid "$ tarantool -e 'require(\"memprof\")(arg[1])' - <memprof_new.bin>"
-msgstr ""
+msgid "$ tarantool -e 'require(\"memprof\")(arg)' - memprof_new.bin"
+msgstr "$ tarantool -e 'require(\"memprof\")(arg)' - memprof_new.bin"
 
 msgid ""
 "where ``memprof_new.bin`` is the binary profile :ref:`generated earlier "
-"<profiler_usage_generate>`."
+"<profiler_usage_generate>` by ``tarantool test.lua``. (Warning: there is a "
+"slight behavior change here, the ``tarantool -e ...`` command was slightly "
+"different in Tarantool versions prior to Tarantool 2.8.1.)"
 msgstr ""
+"Здесь ``memprof_new.bin`` — бинарный профиль, :ref:`ранее сгенерированный "
+"<profiler_usage_generate>` командой ``tarantool test.lua``. (Внимание: в "
+"версии Tarantool 2.8.1 поведение команды ``tarantool -e`` немного "
+"изменилось.)"
 
 msgid ""
-"Tarantool generates a profiling report that is displayed in console and "
-"closes the session:"
+"Tarantool generates a profiling report and displays it on the console before"
+" closing the session:"
 msgstr ""
+"Tarantool генерирует отчет о профилировании и выводит его в консоль перед "
+"закрытием сеанса:"
 
 msgid ""
 "ALLOCATIONS\n"
-"@test.lua:0, line 15: 1002      531818  0\n"
-"@test.lua:0, line 14: 1 24      0\n"
-"@test.lua:0, line 10: 1  32      0\n"
-"@test.lua:0, line 8: 1  20      0\n"
+"@test.lua:14: 10000 events  +50240518 bytes -0 bytes\n"
+"@test.lua:9: 1 events       +32 bytes       -0 bytes\n"
+"@test.lua:8: 1 events       +20 bytes       -0 bytes\n"
+"@test.lua:13: 1 events      +24 bytes       -0 bytes\n"
 "\n"
 "REALLOCATIONS\n"
-"@test.lua:0, line 14: 9 16424   8248\n"
-"        Overrides:\n"
-"                @test.lua:0, line 14\n"
-"@test.lua:0, line 15: 5 1984    992\n"
-"        Overrides:\n"
-"                @test.lua:0, line 15\n"
+"@test.lua:13: 13 events     +262216 bytes   -131160 bytes\n"
+"    Overrides:\n"
+"        @test.lua:13\n"
+"\n"
+"@test.lua:14: 11 events     +49536 bytes    -24768 bytes\n"
+"            Overrides:\n"
+"        @test.lua:14\n"
+"        INTERNAL\n"
+"\n"
+"INTERNAL: 3 events          +8448 bytes     -16896 bytes\n"
+"    Overrides:\n"
+"        @test.lua:14\n"
 "\n"
 "DEALLOCATIONS\n"
-"INTERNAL: 20    0       1481\n"
-"@test.lua:0, line 15: 3 0       7168\n"
-"        Overrides:\n"
-"                @test.lua:0, line 15"
+"INTERNAL: 1723 events       +0 bytes        -483515 bytes\n"
+"@test.lua:14: 1 events      +0 bytes        -32768 bytes\n"
+"\n"
+"HEAP SUMMARY:\n"
+"@test.lua:14 holds 50248326 bytes: 10010 allocs, 10 frees\n"
+"@test.lua:13 holds 131080 bytes: 14 allocs, 13 frees\n"
+"INTERNAL holds 8448 bytes: 3 allocs, 3 frees\n"
+"@test.lua:9 holds 32 bytes: 1 allocs, 0 frees\n"
+"@test.lua:8 holds 20 bytes: 1 allocs, 0 frees"
 msgstr ""
+"ALLOCATIONS\n"
+"@test.lua:14: 10000 events  +50240518 bytes -0 bytes\n"
+"@test.lua:9: 1 events       +32 bytes       -0 bytes\n"
+"@test.lua:8: 1 events       +20 bytes       -0 bytes\n"
+"@test.lua:13: 1 events      +24 bytes       -0 bytes\n"
+"\n"
+"REALLOCATIONS\n"
+"@test.lua:13: 13 events     +262216 bytes   -131160 bytes\n"
+"    Overrides:\n"
+"        @test.lua:13\n"
+"\n"
+"@test.lua:14: 11 events     +49536 bytes    -24768 bytes\n"
+"            Overrides:\n"
+"        @test.lua:14\n"
+"        INTERNAL\n"
+"\n"
+"INTERNAL: 3 events          +8448 bytes     -16896 bytes\n"
+"    Overrides:\n"
+"        @test.lua:14\n"
+"\n"
+"DEALLOCATIONS\n"
+"INTERNAL: 1723 events       +0 bytes        -483515 bytes\n"
+"@test.lua:14: 1 events      +0 bytes        -32768 bytes\n"
+"\n"
+"HEAP SUMMARY:\n"
+"@test.lua:14 holds 50248326 bytes: 10010 allocs, 10 frees\n"
+"@test.lua:13 holds 131080 bytes: 14 allocs, 13 frees\n"
+"INTERNAL holds 8448 bytes: 3 allocs, 3 frees\n"
+"@test.lua:9 holds 32 bytes: 1 allocs, 0 frees\n"
+"@test.lua:8 holds 20 bytes: 1 allocs, 0 frees"
 
 msgid ""
 "On MacOS, a report will be different for the same chunk of code because "
 "Tarantool and LuaJIT are built with the GC64 mode enabled for MacOS."
 msgstr ""
+"В macOS отчет по той же части кода выглядит по-другому, поскольку Tarantool "
+"и LuaJIT собраны с поддержкой режима GC64 для macOS."
 
-msgid "Let's examine the report structure. A report has three sections:"
-msgstr ""
+msgid "Let's examine the report structure. A report has four sections:"
+msgstr "Рассмотрим структуру отчета. Он состоит из четырех разделов:"
 
 msgid "ALLOCATIONS"
-msgstr ""
+msgstr "ALLOCATIONS (аллокация)"
 
-msgid "RELOCATIONS"
-msgstr ""
+msgid "REALLOCATIONS"
+msgstr "REALLOCATIONS (реаллокация)"
 
-msgid "DEALLOCATIONS."
+msgid "DEALLOCATIONS"
+msgstr "DEALLOCATIONS (деаллокация)"
+
+msgid ""
+"HEAP SUMMARY (described later in :ref:`The heap summary and the --leak-only "
+"option<luajit_memprof_leak_only>`)"
 msgstr ""
+"HEAP SUMMARY (cводка изменений в динамической памяти, раздел описан "
+":ref:`ниже <luajit_memprof_leak_only>`)"
 
 msgid ""
-"Each section contains event records that are sorted from the most often to "
-"the least ones."
+"Each section contains event records that are sorted from the most frequent "
+"to the least frequent."
 msgstr ""
+"Записи в каждом разделе отсортированы в порядке от наиболее до наименее "
+"частых событий."
 
 msgid "An event record has the following format:"
-msgstr ""
+msgstr "Запись о событии регистрируется в следующем формате:"
 
 msgid ""
-"@<filename>:<function_line>, line <line_number>: <number_of_events> "
-"<allocated> <freed>"
+"@<filename>:<line_number>: <number_of_events> events +<allocated> bytes "
+"-<freed> bytes"
 msgstr ""
+"@<имя_файла>:<номер_строки>: <количество_событий> events +<выделенные_байты>"
+" bytes -<освобожденные_байты> bytes"
 
 msgid "<filename>—a name of the file containing Lua code."
-msgstr ""
-
-msgid ""
-"<function_line>—the line number where the function generating the event is "
-"declared. In some of the cases, allocations are attributed not to the "
-"declared function but to the main chunk. In this case, the <function_line> "
-"is set to ``0``. See the :ref:`code chunk above<profiler_usage_example01>` "
-"with the explanation in the comments for some examples."
-msgstr ""
+msgstr "<имя_файла> — имя файла, содержащего код на Lua."
 
 msgid "<line_number>—the line number where the event is detected."
-msgstr ""
+msgstr "<номер_строки> — номер строки, в которой обнаружено событие."
 
 msgid "<number_of_events>—a number of events for this code line."
-msgstr ""
+msgstr "<количество_событий> — количество событий для этой строки кода."
 
-msgid "<allocated>—amount of memory allocated during all the events, bytes."
+msgid ""
+"+<allocated> bytes—amount of memory allocated during all the events on this "
+"line."
 msgstr ""
+"+<выделенная_память_в_байтах> bytes — объем выделенной памяти для всех "
+"событий в этой строке."
 
-msgid "<freed>—amount of memory freed during all the events, bytes."
+msgid ""
+"-<freed> bytes—amount of memory freed during all the events on this line."
 msgstr ""
+"+<освобожденная_память_в_байтах> bytes — объем освобожденной памяти для всех"
+" событий в этой строке."
 
 msgid "The ``Overrides`` label shows what allocation has been overridden."
 msgstr ""
+"Метка ``Overrides`` на событии показывает, какое событие аллокации оно "
+"замещает."
+
+msgid ""
+"See the :ref:`test.lua chunk above <profiler_usage_example01>` with the "
+"explanation in the comments for some examples."
+msgstr ""
+"См. :ref:`код примера test.lua выше <profiler_usage_example01>` и пояснения "
+"в комментариях к нему."
 
 msgid ""
 "The ``INTERNAL`` label indicates that this event is caused by internal "
 "LuaJIT structures."
 msgstr ""
+"Метка ``INTERNAL`` показывает, что событие произошло во внутренних "
+"структурах LuaJIT."
 
 msgid ""
 "Important note regarding the ``INTERNAL`` label and the recommendation of "
@@ -254,6 +411,14 @@ msgid ""
 "code that generated the trace. In this case, the profiler labels such "
 "allocations as ``INTERNAL``."
 msgstr ""
+"Важное примечание о метке ``INTERNAL`` и рекомендации отключать компиляцию "
+"JIT (``jit.off()``). В текущей версии профилировщика не поддерживается "
+"подробное (verbose) описание событий аллокации при `трассировке "
+"<https://en.wikipedia.org/wiki/Tracing_just-in-"
+"time_compilation#Technical_details>`_. Если память выделяется во время "
+"трассировки, профилировщик не может соотнести события аллокации с "
+"соответствующей частью кода. В этом случае профилировщик помечает такие "
+"события как ``INTERNAL``."
 
 msgid ""
 "So, if the JIT compilation is on, new traces will be generated and there "
@@ -261,47 +426,69 @@ msgid ""
 "some of them are really caused by internal LuaJIT structures, but some of "
 "them are caused by allocations on traces."
 msgstr ""
+"Когда компиляция JIT включена, выполняется несколько процессов трассировки. "
+"В результате пометку ``INTERNAL`` в отчете о профилировании получают самые "
+"разные события: некоторые из них действительно возникают во внутренних "
+"структурах LuaJIT, а другие вызваны аллокацией при трассировке."
 
 msgid ""
-"If you want to have more definite report without JIT compiler allocations, "
-":ref:`call jit.off() <profiler_usage_example01>` before starting the "
+"If you want to have a more definite report without JIT compiler allocations,"
+" :ref:`call jit.off() <profiler_usage_example01>` before starting the "
 "profiling. And if you want to completely exclude the trace allocations from "
 "the report, remove also the old traces by additionally calling "
 "``jit.flush()`` after ``jit.off()``."
 msgstr ""
+"Вы можете получить более конкретный отчет, в который не входят события "
+"аллокации, вызванные JIT-компилятором. Для этого до запуска профилировщика "
+":ref:`вызовите jit.off() <profiler_usage_example01>`. Чтобы полностью "
+"исключить из отчета аллокацию на трассах, удалите предыдущие трассы, вызвав "
+"после ``jit.off()`` функцию ``jit.flush()``."
 
 msgid ""
 "Nevertheless, switching the JIT compilation off before the profiling is not "
-"\"a must\". It is rather a recommendation, and in some of the cases, for "
-"example, on production environment, you may need to keep JIT compilation on "
-"to see the full picture of all the memory allocations. In this case, the "
-"majority the ``INTERNAL`` events are most probably caused by traces."
+"\"a must\". It is rather a recommendation, and in some cases, for example in"
+" a production environment, you may need to keep JIT compilation on to see "
+"the full picture of all the memory allocations. In this case, the majority "
+"of the ``INTERNAL`` events are most probably caused by traces."
 msgstr ""
+"Отключать компиляцию JIT перед запуском профилировщика рекомендуется, но это"
+" не обязательно. Например, в производственной среде без компиляции JIT "
+"полное представление об аллокациях памяти получить невозможно. В подобных "
+"случаях большая часть событий ``INTERNAL``, вероятнее всего, происходит при "
+"трассировках."
 
 msgid ""
 "As for investigating the Lua code with the help of profiling reports, it is "
-"always code-dependent and there can't be cent per cent definite "
-"recommendations in this regard. Nevertheless, some of the things you can see"
-" in the analysis of :ref:`another code example <profiler_analysis>`."
+"always code-dependent and there can't be hundred per cent definite "
+"recommendations in this regard. Nevertheless, you can see some of the things"
+" in the :ref:`Profiling report analysis example <profiler_analysis>` later."
 msgstr ""
+"Иногда отчет о профилировании помогает исследовать код на Lua. Однако этот "
+"метод подходит не для любого кода, так что рекомендаций на этот счет нет. "
+"Посмотрите :ref:`пример анализа отчета о профилировании "
+"<profiler_analysis>`, чтобы узнать, как можно использовать отчет для "
+"исследования кода."
 
 msgid ""
 "Also, below is the :ref:`FAQ <profiler_faq>` section with the questions that"
-" most probably can arise while using the profiler."
+" most probably can arise while using profiler."
 msgstr ""
+"Больше информации о том, как использовать профилировщик, вы найдете ниже в "
+"разделе :ref:`Вопросы и ответы <profiler_faq>`."
 
 msgid "FAQ"
 msgstr "Вопросы и ответы"
 
 msgid ""
-"In this section, some of the profiler-related points are discussed in a Q&A "
-"format."
+"In this section, some profiler-related points are discussed in a Q&A format."
 msgstr ""
+"В этом разделе даются ответы на часто задаваемые вопросы о работе "
+"профилировщика."
 
 msgid ""
 "**Question (Q)**: Is the profiler suitable for C allocations or allocations "
 "inside C code?"
-msgstr ""
+msgstr "**Вопрос (В)**: Проверяет ли профилировщик аллокацию в C и коде на C?"
 
 msgid ""
 "**Answer (A)**: The profiler reports only allocation events caused by the "
@@ -310,52 +497,83 @@ msgid ""
 "``malloc()`` or other non-Lua allocators. You can use ``valgrind`` to debug "
 "them."
 msgstr ""
+"**Ответ (A)**: Профилировщик включает в отчет только события выделения "
+"памяти Lua-аллокатором. Отчет содержит все события аллокации в Lua, например"
+" создание таблиц и строк. Однако профилировщик не отслеживает выделение "
+"памяти с помощью ``malloc()`` или действия аллокаторов, не связанных с Lua. "
+"Чтобы фиксировать такие события, для отладки можно использовать "
+"``valgrind``."
 
 msgid ""
 "**Q**: Why are there so many ``INTERNAL`` allocations in my profiling "
 "report? What does it mean?"
 msgstr ""
+"**В**: Почему у меня в отчете о профилировании столько событий аллокации "
+"``INTERNAL``? Что это значит?"
 
 msgid ""
 "**A**: ``INTERNAL`` means that these allocations/reallocations/deallocations"
 " are related to the internal LuaJIT structures or are made on traces. "
-"Currently, the memory profiler doesn't report verbosely allocations of "
-"objects that are made during trace execution. Try to :ref:`add jit.off() "
-"<profiler_usage_internal_jitoff>` before profiler start."
+"Currently, the profiler doesn't verbosely report allocations of objects that"
+" are made during trace execution. Try :ref:`adding jit.off() "
+"<profiler_usage_internal_jitoff>` before the profiler start."
 msgstr ""
+"**О**: Пометка ``INTERNAL`` означает, что событие "
+"аллокации/реаллокации/деаллокации связано с внутренними структурами LuaJIT "
+"или трассами. Сейчас профилировщик не включает в отчет подробное описание "
+"событий аллокации для объектов, создаваемых на трассах. Попробуйте перед "
+"запуском профилировщика :ref:`добавить jit.off() "
+"<profiler_usage_internal_jitoff>`."
 
 msgid ""
-"**Q**: Why is there some reallocations/deallocations without the "
+"**Q**: Why are there some reallocations/deallocations without an "
 "``Overrides`` section?"
 msgstr ""
+"**В**: Почему на некоторых событиях аллокации/деаллокации нет метки "
+"``Overrides``?"
 
 msgid ""
 "**A**: These objects can be created before the profiler starts. Adding "
-"``collectgarbage()`` before the profiler's start enables to collect all "
+"``collectgarbage()`` before the profiler's start enables collecting all "
 "previously allocated objects that are dead when the profiler starts."
 msgstr ""
+"**О**: Вероятно, события связаны с объектами, созданными до запуска "
+"профилировщика. Если перед запуском профилировщика добавить вызов "
+"``collectgarbage()``, то будут учитываться и события, связанные с "
+"\"мертвыми\" объектами: под такие объекты ранее была выделена память, но на "
+"момент запуска профилировщика они уже недоступны."
 
 msgid ""
-"**Q**: Why some objects are not collected during profiling? Is it a memory "
+"**Q**: Why are some objects not collected during profiling? Is it a memory "
 "leak?"
 msgstr ""
+"**В**: Почему некоторые объекты не учитываются при профилировании? Это "
+"связано с утечкой памяти?"
 
 msgid ""
 "**A**: LuaJIT uses incremental Garbage Collector (GC). A GC cycle may not be"
-" finished at the moment of the profiler's stop. Add ``collectgarbage()`` "
-"before stopping the profiler to collect all the dead objects for sure."
+" finished at the moment the profiler stops. Add ``collectgarbage()`` before "
+"stopping the profiler to collect all the dead objects for sure."
 msgstr ""
+"**О**: LuaJIT использует инкрементальный сборщик мусора. Когда профилировщик"
+" завершает работу, цикл сборки мусора может все еще выполняться. Чтобы "
+"обеспечить профилирование \"мертвых\" объектов, добавьте "
+"``collectgarbage()`` перед командой остановки профилировщика."
 
 msgid ""
 "**Q**: Can I profile not just a current chunk but the entire running "
 "application? Can I start the profiler when the application is already "
 "running?"
 msgstr ""
+"**В**: Можно ли профилировать не только часть кода, а все приложение? Можно "
+"ли запустить профилировщик во время работы приложения?"
 
 msgid ""
-"**A**: Yes. Here is the example of code that can be inserted in the "
-"Tarantool console for a running instance."
+"**A**: Yes. Here is an example of code that can be inserted in the Tarantool"
+" console for a running instance."
 msgstr ""
+"**О**: Да. Вот пример кода, который можно вставить в консоль Tarantool, "
+"когда приложение уже запущено:"
 
 msgid ""
 "local fiber = require \"fiber\"\n"
@@ -384,28 +602,60 @@ msgid ""
 "  log.warn(\"end of profile\")\n"
 "end)"
 msgstr ""
+"local fiber = require \"fiber\"\n"
+"local log = require \"log\"\n"
+"\n"
+"fiber.create(function()\n"
+"  fiber.name(\"memprof\")\n"
+"\n"
+"  collectgarbage() -- Сбор мертвых объектов\n"
+"  log.warn(\"start of profile\")\n"
+"\n"
+"  local st, err = misc.memprof.start(ИМЯ_ФАЙЛА)\n"
+"  if not st then\n"
+"    log.error(\"failed to start profiler: %s\", err)\n"
+"  end\n"
+"\n"
+"  fiber.sleep(ВРЕМЯ)\n"
+"\n"
+"  collectgarbage()\n"
+"  st, err = misc.memprof.stop()\n"
+"\n"
+"  if not st then\n"
+"    log.error(\"profiler on stop error: %s\", err)\n"
+"  end\n"
+"\n"
+"  log.warn(\"end of profile\")\n"
+"end)"
 
 msgid "where"
-msgstr ""
+msgstr "Пояснения:"
 
-msgid "``FILENAME``—a name of the report file in binary format"
+msgid ""
+"``FILENAME``—the name of the binary file where profiling events are written"
 msgstr ""
+"``ИМЯ_ФАЙЛА`` — имя бинарного файла, куда записываются профилируемые "
+"события."
 
-msgid "``TIME``—duration of profiling, seconds."
-msgstr ""
+msgid "``TIME``—duration of profiling, in seconds."
+msgstr "``ВРЕМЯ`` — продолжительность профилирования в секундах."
 
 msgid ""
 "Also, you can directly call ``misc.memprof.start()`` and "
 "``misc.memprof.stop()`` from a console."
 msgstr ""
+"Кроме того, вызывать ``misc.memprof.start()`` и ``misc.memprof.stop()`` "
+"можно напрямую из консоли."
 
 msgid "Profiling report analysis example"
-msgstr ""
+msgstr "Пример анализа отчета о профилировании"
 
 msgid ""
 "In the example below, the following Lua code named ``format_concat.lua`` is "
 "investigated with the help of the memory profiler reports."
 msgstr ""
+"Ниже приведен код на Lua --- файл ``format_concat.lua``. Этот код будет "
+"исследован с применением отчетов о профилировании памяти."
 
 msgid ""
 "-- Prevent allocations on new traces.\n"
@@ -440,56 +690,123 @@ msgid ""
 "\n"
 "os.exit()"
 msgstr ""
+"-- Отключение аллокации на новых трассах\n"
+"jit.off()\n"
+"\n"
+"local function concat(a)\n"
+"  local nstr = a..\"a\"\n"
+"  return nstr\n"
+"end\n"
+"\n"
+"local function format(a)\n"
+"  local nstr = string.format(\"%sa\", a)\n"
+"  return nstr\n"
+"end\n"
+"\n"
+"collectgarbage()\n"
+"\n"
+"local binfile = \"/tmp/memprof_\"..(arg[0]):match(\"([^/]*).lua\")..\".bin\"\n"
+"\n"
+"local st, err = misc.memprof.start(binfile)\n"
+"assert(st, err)\n"
+"\n"
+"-- Нагрузка\n"
+"for i = 1, 10000 do\n"
+"  local f = format(i)\n"
+"  local c = concat(i)\n"
+"end\n"
+"collectgarbage()\n"
+"\n"
+"local st, err = misc.memprof.stop()\n"
+"assert(st, err)\n"
+"\n"
+"os.exit()"
 
 msgid ""
 "When you run this code :ref:`under Tarantool <profiler_usage_generate>` and "
-"then :ref:`parse <profiler_usage_parse_command>` the binary memory profile, "
-"you will get the following profiling report:"
+"then :ref:`parse <profiler_usage_parse_command>` the binary memory profile "
+"in /tmp/memprof_format_concat.bin, you will get the following profiling "
+"report:"
 msgstr ""
+"Запустив этот код :ref:`в Tarantool <profiler_usage_generate>` и выполнив "
+"последующий :ref:`парсинг <profiler_usage_parse_command>` бинарного профиля "
+"в /tmp/memprof_format_concat.bin, вы получите такой отчет о профилировании:"
 
 msgid ""
 "ALLOCATIONS\n"
-"@format_concat.lua:9, line 10: 19998     624322  0\n"
-"INTERNAL: 1     65536   0\n"
+"@format_concat.lua:10: 19996 events +624284 bytes   -0 bytes\n"
+"INTERNAL: 1 events                  +65536 bytes    -0 bytes\n"
 "\n"
 "REALLOCATIONS\n"
 "\n"
 "DEALLOCATIONS\n"
-"INTERNAL: 19998 0       558816\n"
-"        Overrides:\n"
-"                @format_concat.lua:9, line 10\n"
-"@format_concat.lua:9, line 10: 2 0       98304\n"
-"        Overrides:\n"
-"                @format_concat.lua:9, line 10"
+"INTERNAL: 19996 events              +0 bytes        -558778 bytes\n"
+"    Overrides:\n"
+"        @format_concat.lua:10\n"
+"\n"
+"@format_concat.lua:10: 2 events     +0 bytes        -98304 bytes\n"
+"    Overrides:\n"
+"        @format_concat.lua:10\n"
+"\n"
+"HEAP SUMMARY:\n"
+"INTERNAL holds 65536 bytes: 1 allocs, 0 frees"
 msgstr ""
+"ALLOCATIONS\n"
+"@format_concat.lua:10: 19996 events +624284 bytes   -0 bytes\n"
+"INTERNAL: 1 events                  +65536 bytes    -0 bytes\n"
+"\n"
+"REALLOCATIONS\n"
+"\n"
+"DEALLOCATIONS\n"
+"INTERNAL: 19996 events              +0 bytes        -558778 bytes\n"
+"    Overrides:\n"
+"        @format_concat.lua:10\n"
+"\n"
+"@format_concat.lua:10: 2 events     +0 bytes        -98304 bytes\n"
+"    Overrides:\n"
+"        @format_concat.lua:10\n"
+"\n"
+"HEAP SUMMARY:\n"
+"INTERNAL holds 65536 bytes: 1 allocs, 0 frees"
 
-msgid "The reasonable questions regarding the report can be:"
-msgstr ""
+msgid "Reasonable questions regarding the report can be:"
+msgstr "Отчет может вызвать такие вопросы:"
 
 msgid "Why are there no allocations related to the ``concat()`` function?"
-msgstr ""
+msgstr "Почему нет событий по функции ``concat()``?"
 
-msgid "Why the amount of allocations is not a round number?"
-msgstr ""
+msgid "Why is the number of allocations not a round number?"
+msgstr "Почему количество событий — это не целое число?"
 
 msgid "Why are there approximately 20K allocations instead of 10K?"
-msgstr ""
+msgstr "Почему в отчете не 10 тысяч событий, а около 20 тысяч?"
 
 msgid ""
 "First of all, LuaJIT doesn't create a new string if the string with the same"
 " payload exists (see details on `lua-users.org/wiki <http://lua-"
-"users.org/wiki/ImmutableObjects>`_). This is called the `string interning "
-"<https://en.wikipedia.org/wiki/String_interning>`_. So, when the string is "
+"users.org/wiki/ImmutableObjects>`_). This is called `string interning "
+"<https://en.wikipedia.org/wiki/String_interning>`_. So, when a string is "
 "created via the ``format()`` function, there is no need to create the same "
 "string via the ``concat()`` function, and LuaJIT just uses the previous one."
 msgstr ""
+"Во-первых, LuaJIT не создает новую строку, если уже есть строка с такой же "
+"нагрузкой (подробнее на сайте `lua-users.org/wiki <http://lua-"
+"users.org/wiki/ImmutableObjects>`_). Это называется `интернированием строк "
+"<https://en.wikipedia.org/wiki/String_interning>`_. Иными словами, если "
+"строка создана с помощью функции ``format()``, нет необходимости создавать "
+"такую же строку с помощью функции ``concat()`` — LuaJIT будет использовать "
+"предыдущую."
 
 msgid ""
-"That is also the reason why the amount of allocations is not the round "
-"number as can be expected from the cycle operator ``for i = 1, 10000...``: "
+"That is also the reason why the number of allocations is not a round number "
+"as could be expected from the cycle operator ``for i = 1, 10000...``: "
 "Tarantool creates some strings for internal needs and built‑in modules, so "
 "some strings already exist."
 msgstr ""
+"По этой же причине количество событий аллокации — это не целое число, как "
+"можно было бы ожидать при использовании оператора цикла ``for i = 1, "
+"10000...``. Некоторые строки Tarantool создает для внутренних нужд и "
+"встроенных модулей, поэтому часть строк уже существует."
 
 msgid ""
 "But why are there so many allocations? It's almost twice as big as the "
@@ -497,104 +814,198 @@ msgid ""
 "creates another string necessary for the ``%s`` identifier, so there are two"
 " allocations for each iteration: for ``tostring(i)`` and for "
 "``string.format(\"%sa\", string_i_value)``. You can see the difference in "
-"behaviour by adding the ``local _ = tostring(i)`` line between lines 22 and "
+"behavior by adding the line ``local _ = tostring(i)`` between lines 22 and "
 "23."
 msgstr ""
+"Но откуда столько событий аллокации? Их почти в 2 раза больше, чем можно "
+"было бы ожидать. Это происходит потому, что встроенная функция "
+"``string.format()`` каждый раз создает дополнительную строку для "
+"идентификатора ``%s``. То есть в каждой итерации регистрируются два события "
+"аллокации: для ``tostring(i)`` и для ``string.format(\"%sa\", "
+"string_i_value)``. Добавив строку ``local _ = tostring(i)`` между строками "
+"22 и 23, вы увидите разницу в поведении."
 
 msgid ""
-"To profile only the ``concat()`` function, comment line 23, namely, ``local "
-"f = format(i)`` and run the profiler."
-msgstr ""
-
-msgid "The profiler's output is the following:"
+"To profile only the ``concat()`` function, comment out line 23 (which is "
+"``local f = format(i)``) and run the profiler. Now the output will look like"
+" this:"
 msgstr ""
+"Чтобы профилировать только функцию ``concat()``, закомментируйте строку 23 "
+"(``local f = format(i)``) и запустите профилировщик. Теперь результат будет "
+"такой:"
 
 msgid ""
 "ALLOCATIONS\n"
-"@format_concat.lua:4, line 5: 10000     284411  0\n"
+"@format_concat.lua:5: 10000 events  +284411 bytes    -0 bytes\n"
 "\n"
 "REALLOCATIONS\n"
 "\n"
 "DEALLOCATIONS\n"
-"INTERNAL: 10000 0       218905\n"
-"        Overrides:\n"
-"                @format_concat.lua:4, line 5\n"
-"@format_concat.lua:4, line 5: 1 0       32768"
+"INTERNAL: 10000 events              +0 bytes         -218905 bytes\n"
+"    Overrides:\n"
+"        @format_concat.lua:5\n"
+"\n"
+"@format_concat.lua:5: 1 events      +0 bytes         -32768 bytes\n"
+"\n"
+"HEAP SUMMARY:\n"
+"@format_concat.lua:5 holds 65536 bytes: 10000 allocs, 9999 frees"
 msgstr ""
+"ALLOCATIONS\n"
+"@format_concat.lua:5: 10000 events  +284411 bytes    -0 bytes\n"
+"\n"
+"REALLOCATIONS\n"
+"\n"
+"DEALLOCATIONS\n"
+"INTERNAL: 10000 events              +0 bytes         -218905 bytes\n"
+"    Overrides:\n"
+"        @format_concat.lua:5\n"
+"\n"
+"@format_concat.lua:5: 1 events      +0 bytes         -32768 bytes\n"
+"\n"
+"HEAP SUMMARY:\n"
+"@format_concat.lua:5 holds 65536 bytes: 10000 allocs, 9999 frees"
 
-msgid "**Q**: But what will change if the JIT compilation is enabled?"
-msgstr ""
+msgid "**Q**: But what will change if JIT compilation is enabled?"
+msgstr "**В**: Что изменится, если включить компиляцию JIT?"
 
 msgid ""
-"**A**: In the :ref:`code <profiler_usage_example03>`, comment line 2, "
-"namely, ``jit.off()`` and run the profiler . Now, there are only 56 "
+"**A**: In the :ref:`code <profiler_usage_example03>`, comment out line 2 "
+"(which is ``jit.off()``) and run the profiler . Now there are only 56 "
 "allocations in the report, and all other allocations are JIT-related (see "
 "also the related `dev issue "
 "<https://github.com/tarantool/tarantool/issues/5679>`_):"
 msgstr ""
+"**О**: Закомментируйте вторую строку (``jit.off()``) в :ref:`коде "
+"<profiler_usage_example03>` и запустите профилировщик. Теперь в отчете "
+"только 56 событий. Остальные события связаны с JIT (см. также "
+"соответствующую `задачу на GitHub "
+"<https://github.com/tarantool/tarantool/issues/5679>`_):"
 
 msgid ""
 "ALLOCATIONS\n"
-"@format_concat.lua:4, line 5: 56        1112    0\n"
-"@format_concat.lua:0, line 0: 4 640     0\n"
-"INTERNAL: 2     382     0\n"
+"@format_concat.lua:5: 56 events +1112 bytes -0 bytes\n"
+"@format_concat.lua:0: 4 events  +640 bytes  -0 bytes\n"
+"INTERNAL: 2 events              +382 bytes  -0 bytes\n"
 "\n"
 "REALLOCATIONS\n"
 "\n"
 "DEALLOCATIONS\n"
-"INTERNAL: 58    0       1164\n"
-"        Overrides:\n"
-"                @format_concat.lua:4, line 5\n"
-"                INTERNAL"
+"INTERNAL: 58 events             +0 bytes    -1164 bytes\n"
+"    Overrides:\n"
+"        @format_concat.lua:5\n"
+"        INTERNAL\n"
+"\n"
+"\n"
+"HEAP SUMMARY:\n"
+"@format_concat.lua:0 holds 640 bytes: 4 allocs, 0 frees\n"
+"INTERNAL holds 360 bytes: 2 allocs, 1 frees"
 msgstr ""
+"ALLOCATIONS\n"
+"@format_concat.lua:5: 56 events +1112 bytes -0 bytes\n"
+"@format_concat.lua:0: 4 events  +640 bytes  -0 bytes\n"
+"INTERNAL: 2 events              +382 bytes  -0 bytes\n"
+"\n"
+"REALLOCATIONS\n"
+"\n"
+"DEALLOCATIONS\n"
+"INTERNAL: 58 events             +0 bytes    -1164 bytes\n"
+"    Overrides:\n"
+"        @format_concat.lua:5\n"
+"        INTERNAL\n"
+"\n"
+"\n"
+"HEAP SUMMARY:\n"
+"@format_concat.lua:0 holds 640 bytes: 4 allocs, 0 frees\n"
+"INTERNAL holds 360 bytes: 2 allocs, 1 frees"
 
 msgid ""
 "This happens because a trace has been compiled after 56 iterations (the "
 "default value of the ``hotloop`` compiler parameter). Then, the JIT-compiler"
-" removed the unused ``c`` variable  from the trace, and, therefore, the dead"
-" code of the ``concat()`` function is eliminated."
+" removed the unused variable ``c`` from the trace, and, therefore, the dead "
+"code of the ``concat()`` function is eliminated."
 msgstr ""
+"Так произошло потому, что трассировка была скомпилирована после 56 итераций "
+"(это значение параметра компилятора ``hotloop`` по умолчанию). Затем JIT-"
+"компилятор удалил из трассировки неиспользуемую переменную ``c``, а вместе с"
+" ней и неиспользуемый код функции ``concat()``."
 
 msgid ""
 "Next, let's profile only the ``format()`` function with JIT enabled. For "
-"that, keep lines 2 and 24 commented (``jit.off()`` and ``local c = "
-"concat(i)`` respectively), uncomment line 23 (``local f = format(i)``), and "
-"run the profiler."
+"that, comment out lines 2 and 24 (``jit.off()`` and ``local c = "
+"concat(i)``), do not comment out line 23 (``local f = format(i)``), and run "
+"the profiler. Now the output will look like this:"
 msgstr ""
+"Теперь включите компиляцию JIT и запустите профилирование только для функции"
+" ``format()``. Для этого закомментируйте строки 2 и 24 (``jit.off()`` и "
+"``local c = concat(i)``), раскомментируйте строку 23 (``local f = "
+"format(i)``) и вызовите профилировщик. Результат будет такой:"
 
 msgid ""
 "ALLOCATIONS\n"
-"@format_concat.lua:9, line 10: 19998     624322  0\n"
-"INTERNAL: 4     66824   0\n"
-"@format_concat.lua:0, line 0: 4 640     0\n"
+"@format_concat.lua:10: 19996 events +624284 bytes  -0 bytes\n"
+"INTERNAL: 4 events                  +66928 bytes   -0 bytes\n"
+"@format_concat.lua:0: 4 events      +640 bytes     -0 bytes\n"
 "\n"
 "REALLOCATIONS\n"
 "\n"
 "DEALLOCATIONS\n"
-"INTERNAL: 19999 0       559072\n"
-"        Overrides:\n"
-"                @format_concat.lua:0, line 0\n"
-"                @format_concat.lua:9, line 10\n"
-"@format_concat.lua:9, line 10: 2 0       98304\n"
-"        Overrides:\n"
-"                @format_concat.lua:9, line 10"
+"INTERNAL: 19997 events              +0 bytes       -559034 bytes\n"
+"    Overrides:\n"
+"        @format_concat.lua:0\n"
+"        @format_concat.lua:10\n"
+"\n"
+"@format_concat.lua:10: 2 events     +0 bytes       -98304 bytes\n"
+"    Overrides:\n"
+"        @format_concat.lua:10\n"
+"\n"
+"\n"
+"HEAP SUMMARY:\n"
+"INTERNAL holds 66928 bytes: 4 allocs, 0 frees\n"
+"@format_concat.lua:0 holds 384 bytes: 4 allocs, 1 frees"
 msgstr ""
+"ALLOCATIONS\n"
+"@format_concat.lua:10: 19996 events +624284 bytes  -0 bytes\n"
+"INTERNAL: 4 events                  +66928 bytes   -0 bytes\n"
+"@format_concat.lua:0: 4 events      +640 bytes     -0 bytes\n"
+"\n"
+"REALLOCATIONS\n"
+"\n"
+"DEALLOCATIONS\n"
+"INTERNAL: 19997 events              +0 bytes       -559034 bytes\n"
+"    Overrides:\n"
+"        @format_concat.lua:0\n"
+"        @format_concat.lua:10\n"
+"\n"
+"@format_concat.lua:10: 2 events     +0 bytes       -98304 bytes\n"
+"    Overrides:\n"
+"        @format_concat.lua:10\n"
+"\n"
+"\n"
+"HEAP SUMMARY:\n"
+"INTERNAL holds 66928 bytes: 4 allocs, 0 frees\n"
+"@format_concat.lua:0 holds 384 bytes: 4 allocs, 1 frees"
 
 msgid ""
-"**Q**: Why is there so many allocations in comparison to the ``concat()`` "
+"**Q**: Why are there so many allocations in comparison to the ``concat()`` "
 "function?"
 msgstr ""
+"**В**: Откуда так много событий аллокации по сравнению с ``concat()``?"
 
 msgid ""
 "**A**: The answer is simple: the ``string.format()`` function with the "
 "``%s`` identifier is not yet compiled via LuaJIT. So, a trace can't be "
 "recorded and the compiler doesn't perform the corresponding optimizations."
 msgstr ""
+"**О**: Ответ прост: LuaJIT еще не скомпилировал функцию ``string.format()`` "
+"с идентификатором ``%s``. Поэтому трассировка не регистрируется, а "
+"компилятор не выполняет соответствующую оптимизацию."
 
 msgid ""
-"If we change the ``format()`` function in the :ref:`code chunk "
-"<profiler_usage_example03>` in the following way"
+"If we change the ``format()`` function in lines 9-12 of the :ref:`Profiling "
+"report analysis example <profiler_usage_example03>` in the following way"
 msgstr ""
+"Изменим функцию ``format`` в строках 9--12 :ref:`примера для анализа отчета "
+"о профилировании <profiler_usage_example03>` следующим образом:"
 
 msgid ""
 "local function format(a)\n"
@@ -602,22 +1013,90 @@ msgid ""
 "  return nstr\n"
 "end"
 msgstr ""
+"local function format(a)\n"
+"  local nstr = string.format(\"%sa\", tostring(a))\n"
+"  return nstr\n"
+"end"
 
 msgid "the profiling report becomes much prettier:"
-msgstr ""
+msgstr "Теперь отчет о профилировании будет выглядеть намного лучше:"
 
 msgid ""
 "ALLOCATIONS\n"
-"@format_concat.lua:9, line 10: 110       2131    0\n"
-"@format_concat.lua:0, line 0: 4 640     0\n"
-"INTERNAL: 3     1148    0\n"
+"@format_concat.lua:10: 109 events   +2112 bytes -0 bytes\n"
+"@format_concat.lua:0: 4 events      +640 bytes  -0 bytes\n"
+"INTERNAL: 3 events                  +1206 bytes -0 bytes\n"
+"\n"
+"REALLOCATIONS\n"
+"\n"
+"DEALLOCATIONS\n"
+"INTERNAL: 112 events                +0 bytes    -2460 bytes\n"
+"    Overrides:\n"
+"        @format_concat.lua:0\n"
+"        @format_concat.lua:10\n"
+"        INTERNAL\n"
+"\n"
+"\n"
+"HEAP SUMMARY:\n"
+"INTERNAL holds 1144 bytes: 3 allocs, 1 frees\n"
+"@format_concat.lua:0 holds 384 bytes: 4 allocs, 1 frees"
+msgstr ""
+"ALLOCATIONS\n"
+"@format_concat.lua:10: 109 events   +2112 bytes -0 bytes\n"
+"@format_concat.lua:0: 4 events      +640 bytes  -0 bytes\n"
+"INTERNAL: 3 events                  +1206 bytes -0 bytes\n"
 "\n"
 "REALLOCATIONS\n"
 "\n"
 "DEALLOCATIONS\n"
-"INTERNAL: 113   0       2469\n"
-"        Overrides:\n"
-"                @format_concat.lua:0, line 0\n"
-"                @format_concat.lua:9, line 10\n"
-"                INTERNAL"
+"INTERNAL: 112 events                +0 bytes    -2460 bytes\n"
+"    Overrides:\n"
+"        @format_concat.lua:0\n"
+"        @format_concat.lua:10\n"
+"        INTERNAL\n"
+"\n"
+"\n"
+"HEAP SUMMARY:\n"
+"INTERNAL holds 1144 bytes: 3 allocs, 1 frees\n"
+"@format_concat.lua:0 holds 384 bytes: 4 allocs, 1 frees"
+
+msgid "The heap summary and the --leak-only option"
+msgstr "Сводка изменений в динамической памяти и параметр --leak-only"
+
+msgid "This feature was added in version :doc:`2.8.1 </release/2.8.1>`."
+msgstr ""
+"Эта функциональная возможность появилась в версии :doc:`2.8.1 "
+"</release/2.8.1>`."
+
+msgid ""
+"The end of each display is a HEAP SUMMARY section which looks like this:"
+msgstr ""
+"В конце каждого отчета приводится раздел HEAP SUMMARY (сводка изменений в "
+"динамической памяти). Этот раздел выглядит так:"
+
+msgid ""
+"@<filename>:<line number> holds <number of still reachable bytes> bytes:\n"
+"<number of allocation events> allocs, <number of deallocation events> frees"
+msgstr ""
+"@<имя_файла>:<номер_строки> holds <количество_доступных_байтов> bytes: "
+"<количество_событий_аллокации> allocs, <количество_событий_деаллокации> "
+"frees"
+
+msgid ""
+"Sometimes a program can cause many deallocations, so the DEALLOCATION "
+"section can become large, so the display is not easy to read. To minimize "
+"output, start the parsing with an extra flag: ``--leak-only``, for example"
+msgstr ""
+"Иногда программа может вызывать множество событий деаллокации. В этом случае"
+" раздел DEALLOCATION сильно увеличится и отчет будет сложно читать. Чтобы "
+"уменьшить количество выводимых данных, запустите парсинг с дополнительным "
+"параметром ``--leak-only``. Например, так:"
+
+msgid "$ tarantool -e 'require(\"memprof\")(arg)' - --leak-only memprof_new.bin"
+msgstr "$ tarantool -e 'require(\"memprof\")(arg)' - --leak-only memprof_new.bin"
+
+msgid ""
+"When `--leak-only`` is used, only the HEAP SUMMARY section is displayed."
 msgstr ""
+"При использовании параметра ``--leak-only`` выводится только раздел HEAP "
+"SUMMARY."
diff --git a/locale/ru/LC_MESSAGES/book/box/atomic.po b/locale/ru/LC_MESSAGES/book/box/atomic.po
index 38d1d19374..3cb1f6bba5 100644
--- a/locale/ru/LC_MESSAGES/book/box/atomic.po
+++ b/locale/ru/LC_MESSAGES/book/box/atomic.po
@@ -11,6 +11,14 @@ msgstr ""
 "почему Tarantool дает гарантию атомарности выполнения. На это следует "
 "обратить внимание."
 
+msgid ""
+"Since :tarantool-release:`2.10.0-beta1`, Tarantool supports streams and "
+"interactive transactions over them. See :ref:`Streams <box_stream>`."
+msgstr ""
+"Начиная с версии :tarantool-release:`2.10.0-beta1`, Tarantool поддерживает "
+"стримы и интерактивные транзакции. Больше информации можно найти здесь: "
+":ref:`Стримы <box_stream>`."
+
 msgid "Threads, fibers and yields"
 msgstr "Потоки, файберы и передача управления"
 
diff --git a/locale/ru/LC_MESSAGES/book/connectors/index.po b/locale/ru/LC_MESSAGES/book/connectors/index.po
index 7f0d1fa644..adb1f6f792 100644
--- a/locale/ru/LC_MESSAGES/book/connectors/index.po
+++ b/locale/ru/LC_MESSAGES/book/connectors/index.po
@@ -243,8 +243,67 @@ msgstr ""
 msgid "Java"
 msgstr "Java"
 
-msgid "See http://github.com/tarantool/tarantool-java/."
-msgstr "См. http://github.com/tarantool/tarantool-java/."
+msgid "There are two Java connectors available:"
+msgstr "Доступны два Java-коннектора:"
+
+msgid ""
+"`cartridge-java <http://github.com/tarantool/cartridge-java/>`__ supports "
+"both single Tarantool nodes and clusters, as well as applications built "
+"using the :doc:`Cartridge framework </book/cartridge>` and its modules. The "
+"Tarantool team actively updates this module with the newest Tarantool "
+"features."
+msgstr ""
+"`cartridge-java <http://github.com/tarantool/cartridge-java/>`__ "
+"поддерживает как отдельные узлы и кластеры Tarantool, так и приложения, "
+"созданные с использованием :doc:`фреймворка Cartridge </book/cartridge>` и "
+"его модулей. Команда Tarantool активно добавляет в этот модуль новейшие "
+"функциональные возможности платформы."
+
+msgid ""
+"`tarantool-java <http://github.com/tarantool/tarantool-java/>`__ works with "
+"early Tarantool versions (1.6 and later) and offers JDBC interface support "
+"for single Tarantool nodes. This module *isn't currently maintained* and "
+"does not support the newest 2.x Tarantool features or Tarantool clusters."
+msgstr ""
+"`tarantool-java <http://github.com/tarantool/tarantool-java/>`__ "
+"предназначен для ранних версий Tarantool (1.6 и выше) и предоставляет "
+"интерфейс JDBC для одиночных узлов Tarantool. Этот модуль *в настоящее время"
+" не поддерживается* и не работает ни с новейшими функциональными "
+"возможностями Tarantool 2.x, ни с кластерами Tarantool."
+
+msgid "The following modules support Java libraries and frameworks:"
+msgstr ""
+"Для работы с библиотеками и фреймворками Java в Tarantool существуют "
+"следующие модули:"
+
+msgid ""
+"`TestContainers Tarantool module <http://github.com/tarantool/cartridge-"
+"java-testcontainers/>`__ adds support for the popular `TestСontainers "
+"framework <https://www.testcontainers.org/>`__ used for integration testing "
+"of Java applications."
+msgstr ""
+"Модуль Tarantool `TestContainers <http://github.com/tarantool/cartridge-"
+"java-testcontainers/>`__ добавляет поддержку популярного `фреймворка "
+"TestСontainers <https://www.testcontainers.org/>`__, используемого для "
+"интеграционного тестирования приложений Java."
+
+msgid ""
+"`Spring Data Tarantool module <http://github.com/tarantool/cartridge-"
+"springdata/>`__ adds support for the `Spring framework "
+"<https://projects.spring.io/spring-data/>`__."
+msgstr ""
+"`Модуль Spring Data в Tarantool <http://github.com/tarantool/cartridge-"
+"springdata/>`__ добавляет поддержку `фреймворка Spring "
+"<https://projects.spring.io/spring-data/>`__."
+
+msgid ""
+"Check out the `Spring Pet Clinic project "
+"<http://github.com/tarantool/spring-petclinic-tarantool/>`__ to get familiar"
+" with using this module in real applications."
+msgstr ""
+"Чтобы узнать, как использовать этот модуль в реальных приложениях, "
+"ознакомьтесь с `проектом Spring Pet Clinic "
+"<http://github.com/tarantool/spring-petclinic-tarantool/>`__."
 
 msgid "Go"
 msgstr "Go"
diff --git a/locale/ru/LC_MESSAGES/contributing/contributing.po b/locale/ru/LC_MESSAGES/contributing/contributing.po
index 0d89738a9d..56f5963ed3 100644
--- a/locale/ru/LC_MESSAGES/contributing/contributing.po
+++ b/locale/ru/LC_MESSAGES/contributing/contributing.po
@@ -1,5 +1,5 @@
 
-msgid "How to be involved in Tarantool"
+msgid "How to get involved in Tarantool"
 msgstr ""
 
 msgid "What is Tarantool?"
@@ -8,8 +8,8 @@ msgstr ""
 msgid ""
 "Tarantool is an open source database that can store everything in RAM. Use "
 "Tarantool as a cache with the ability to save data to disk. Tarantool serves"
-" up to a million requests per second, secondary index searches, and SQL "
-"support."
+" up to a million requests per second, allows for secondary index searches, "
+"and has SQL support."
 msgstr ""
 
 msgid ""
@@ -31,39 +31,39 @@ msgstr ""
 
 msgid ""
 "This is the easiest way to get your questions answered. Many people are "
-"afraid to ask questions because they think they are \"wasting the experts' "
-"time,\" but no one really thinks so. Contributors are important to us."
+"afraid to ask questions because they believe they are \"wasting the experts'"
+" time,\" but we don't really think so. Contributors are important to us."
 msgstr ""
 
 msgid ""
-"Also we have a `Stack Overflow tag "
+"We also have a `Stack Overflow tag "
 "<https://stackoverflow.com/questions/tagged/tarantool>`_."
 msgstr ""
 
 msgid "Join the chat and ask questions."
 msgstr ""
 
-msgid "How to leave feedback, ideas or suggestions?"
+msgid "How to leave feedback, ideas, or suggestions?"
 msgstr ""
 
 msgid "You can leave your feedback or share ideas in different ways:"
 msgstr ""
 
 msgid ""
-"**The simplest way** is to write `here "
+"**The simplest way** is to fill `the feedback form "
 "<https://docs.google.com/forms/d/1iwBj_2in-"
 "rBIYEcPeeVPQa4JfUIU_m14IUbAK4NojIE/edit?usp=sharing>`__. All you need to do "
-"is fill in one product comment field and send it to us. If you don't mind --"
-" leave your email address. If you wish, we can involve you in the product "
+"is fill in one product comment field and click \"Send.\" You can optionally "
+"provide your email address. If you wish, we can involve you in the product "
 "development process."
 msgstr ""
 
 msgid ""
 "**A more technical way** is to create a ticket on GitHub. If you have a "
-"suggestion for a new feature or information about a bug, `follow the link "
-"<https://github.com/tarantool/tarantool/issues/new>`_ and leave a ticket. "
-"The link leads to the ``tarantool/tarantool`` repository. For any other "
-"projects on GitHub select \"Issues\" - \"New issue\"."
+"suggestion for a new feature or information about a bug, `create a new "
+"GitHub issue <https://github.com/tarantool/tarantool/issues/new>`_. The link"
+" leads to the ``tarantool/tarantool`` repository. To leave feedback for our "
+"other projects on GitHub, select \"Issues\" > \"New issue.\""
 msgstr ""
 
 msgid ""
@@ -71,9 +71,7 @@ msgid ""
 "<https://github.com/tarantool/tarantool/issues/5046>`_."
 msgstr ""
 
-msgid ""
-"You can chat with the team in the general product chat. They are divided by "
-"language:"
+msgid "To talk to our team about a product, go to one of our chats:"
 msgstr ""
 
 msgid "`Russian-speaking <https://t.me/tarantoolru>`_"
@@ -83,46 +81,44 @@ msgid "`English-speaking <https://t.me/tarantool>`_"
 msgstr ""
 
 msgid ""
-"If this communication channel is inconvenient for you or there is simply no "
-"Telegram, you can leave your comment on `tarantool.io "
-"<http://www.tarantool.io>`_. Fill out the form at the bottom of the site and"
-" leave your email. We read each request and respond to them usually within 2"
-" days."
+"If Telegram is inconvenient for you or simply isn't working, you can leave "
+"your comment on `tarantool.io <http://www.tarantool.io>`_. Fill out the form"
+" at the bottom of the site and leave your email. We read every request and "
+"respond to them usually within 2 days."
 msgstr ""
 
-msgid "How to contribute?"
+msgid "How to contribute"
 msgstr ""
 
 msgid "There are many ways to contribute to Tarantool:"
 msgstr ""
 
 msgid ""
-"Code -- Contribute to the code. We have components written in C, Lua, "
-"Python, Go, and other languages."
+"Code: Contribute to the code. We have components written in C, Lua, Python, "
+"Go, and other languages."
 msgstr ""
 
 msgid ""
-"Write -- Improve documentation, write blog posts, create tutorials or "
-"solution pages."
+"Write: Improve documentation, write blog posts, create tutorials or solution"
+" pages."
 msgstr ""
 
 msgid ""
-"Q&A -- Share your acknowledgments at Stack Overflow with tag `#tarantool "
-"<https://stackoverflow.com/questions/tagged/tarantool>`_."
+"Q&A: Share your experience on Stack Overflow with the `#tarantool "
+"<https://stackoverflow.com/questions/tagged/tarantool>`_ tag."
 msgstr ""
 
 msgid ""
-"Spread the word -- Share your accomplishments in social media using the "
-"``#tarantool`` hashtags (or CC ``@tarantooldb`` in Twitter)."
-msgstr ""
-
-msgid "Tarantool Ecosystem"
+"Spread the word: Share your accomplishments on social media using the "
+"``#tarantool`` hashtag (or CC ``@tarantooldb`` on Twitter)."
 msgstr ""
 
-msgid "Tarantool has a large ecosystem of tools around the product itself."
+msgid "Tarantool ecosystem"
 msgstr ""
 
-msgid "We divide the Tarantool ecosystem into 4 types:"
+msgid ""
+"Tarantool has a large ecosystem of tools. We divide the ecosystem into four "
+"large blocks:"
 msgstr ""
 
 msgid "Tarantool itself."
@@ -135,14 +131,15 @@ msgid "Connectors for programming languages."
 msgstr ""
 
 msgid ""
-"Applied tools. See a selection including external tools in the `\"awesome "
-"Tarantool\" list <https://github.com/tarantool/awesome-tarantool>`_."
+"Applied tools. See the curated `Awesome Tarantool list "
+"<https://github.com/tarantool/awesome-tarantool>`_, which also includes "
+"external tools."
 msgstr ""
 
 msgid ""
-"First-time tasks can be easily found in the issues section of any repository"
-" by the \"good first issue\" tag. These are beginner to intermediate tasks "
-"that will help you get comfortable with the tool."
+"To start contributing, check the \"good first issue\" tag in the issues "
+"section of any of our repositories. These are beginner to intermediate tasks"
+" that will help you get comfortable with the tool."
 msgstr ""
 
 msgid ""
@@ -152,8 +149,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"For each repository we have a queue for reviewing, and reviewing your "
-"changes can be delayed. We try to give the first answer within two days. "
+"There is a review queue in each of our repositories, so your changes may not"
+" be reviewed immediately. We usually give the first answer within two days. "
 "Depending on the ticket and its complexity, the review time may take a week "
 "or more."
 msgstr ""
@@ -161,11 +158,10 @@ msgstr ""
 msgid "Please do not hesitate to tag the maintainer in your GitHub ticket."
 msgstr ""
 
-msgid "Read further about the contribution to each of the blocks."
+msgid "Read on to learn about contributing to different ecosystem blocks."
 msgstr ""
 
-msgid ""
-"You have a problem in documentation. How to tell about it and how to fix it?"
+msgid "Documentation: How to report and fix problems"
 msgstr ""
 
 msgid "There are several ways to improve the documentation:"
@@ -173,196 +169,201 @@ msgstr ""
 
 msgid ""
 "**The easiest one** is to leave your comment on the web documentation page. "
-"All you need to do is click on the red button in the bottom right corner of "
-"the page and fill in the comment field. You can point out an error, provide "
-"feedback on the current article, or suggest changes. We review each comment "
-"and take it to work. This form is built into the documentation on the "
-"Tarantool website."
+"To use the built-in feedback form, select the text that you want to comment "
+"on, press :kbd:`Ctrl+Enter`, type your comment in the pop-up window, and "
+"click :guilabel:`Submit`. On mobile screens, an :guilabel:`Error?` button "
+"appears at the bottom of the screen, which opens the same pop-up window. You"
+" can point out an error, provide feedback on the current article, or suggest"
+" changes. We review each comment and work with it."
 msgstr ""
 
 msgid ""
-"**Advanced** -- All Tarantool documentation tasks are `in the repository "
-"<https://github.com/tarantool/doc/issues>`_. Here you can take any tasks and"
-" suggest your changes. Our documentation is written in the `reStructuredText"
-" markup "
+"**Advanced**: All Tarantool documentation tasks can be found in the "
+"`repository <https://github.com/tarantool/doc/issues>`_. Go to any task and "
+"suggest your changes. We write our documentation using `reStructuredText "
+"markup "
 "<https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html>`_, and "
-"we have a :doc:`writing style guide <docs>`. After making the change, you "
-"need to build the documentation locally and see how it was laid out. This is"
-" done automatically in Docker. `Read more in the README of the tarantool/doc"
-" repository <https://github.com/tarantool/doc>`_."
+"we have a :doc:`writing style guide <docs>`. After you make the change, "
+"build the documentation locally and see how it works. This can be done "
+"automatically in Docker. To learn more, check the `README of the "
+"tarantool/doc repository <https://github.com/tarantool/doc>`_."
 msgstr ""
 
 msgid ""
-"Some projects have their documentation in the code repository. For example, "
-"`Tarantool Cartridge <https://github.com/tarantool/cartridge/>`_. This is "
-"done on purpose, so the developers themselves can update it faster. "
-"Instructions for building such documentation sets are in the code "
-"repository."
+"Some projects, like `Tarantool Cartridge "
+"<https://github.com/tarantool/cartridge/>`_, have their documentation in the"
+" code repository. This is done on purpose, so the developers themselves can "
+"update it faster. You can find instructions for building such documentation "
+"in the code repository."
 msgstr ""
 
 msgid ""
-"If you find that the documentation in the README of a module or, for "
-"example, a connector is incomplete or wrong, the best way to influence this "
-"is to fix it yourself. Clone the repository, fix the bug, and suggest "
-"changes as a PR (pull request). It will take you 5 minutes and will help the"
-" whole community."
+"If you find that the documentation provided in the README of a module or a "
+"connector is incomplete or wrong, the best way to influence this is to fix "
+"it yourself. Clone the repository, fix the bug, and suggest changes in a "
+"pull request. It will take you five minutes but it will help the whole "
+"community."
 msgstr ""
 
 msgid ""
-"If for some reason you cannot fix it, create a ticket in this repository and"
-" report the error. Such errors are fixed quickly."
+"If you cannot fix it for any reason, create a ticket in the repository and "
+"report the error. It will be fixed promptly."
 msgstr ""
 
 msgid "How to contribute to modules"
 msgstr ""
 
 msgid ""
-"Tarantool is a database with an embedded application server. You can write "
-"any code in C and Lua and pack it in distributable modules."
+"Tarantool is a database with an embedded application server. This means you "
+"can write any code in C or Lua and pack it in distributable modules."
 msgstr ""
 
-msgid "Here are examples of official modules:"
+msgid ""
+"We have official and unofficial modules. Here are some of our official "
+"modules:"
 msgstr ""
 
 msgid ""
-"`HTTP server <https://github.com/tarantool/http>`_ -- HTTP server "
+"`HTTP server <https://github.com/tarantool/http>`_: HTTP server "
 "implementation with middleware support."
 msgstr ""
 
 msgid ""
-"`queue <https://github.com/tarantool/queue>`_ - Tarantool implementation of "
-"a persistent message queue."
+"`queue <https://github.com/tarantool/queue>`_: Tarantool implementation of "
+"the persistent message queue."
 msgstr ""
 
 msgid ""
-"`metrics <https://github.com/tarantool/metrics>`_ - ready-to-use solution "
-"for collecting metrics."
+"`metrics <https://github.com/tarantool/metrics>`_: Ready-to-use solution for"
+" collecting metrics."
 msgstr ""
 
 msgid ""
-"`cartridge <https://github.com/tarantool/cartridge>`_ - framework for "
-"writing distributed applications."
+"`cartridge <https://github.com/tarantool/cartridge>`_: Framework for writing"
+" distributed applications."
+msgstr ""
+
+msgid "Official modules are provided in our organization on GitHub."
 msgstr ""
 
 msgid ""
-"Modules are distributed through our package manager, which is already "
-"preinstalled with Tarantool."
+"All modules are distributed through our package manager, which is pre-"
+"installed with Tarantool. That also applies to unofficial modules, which "
+"means that other users can get your module easily."
 msgstr ""
 
 msgid ""
-"We have official modules and unofficial ones. The official ones are those "
-"that are in our organization on GitHub. But we distribute unofficial ones "
-"via our package manager too so that other users can get your module easily. "
-"If you want to add your module to our GitHub organization -- `text us here "
-"<https://t.me/arturbrsg>`_."
+"If you want to add your module to our GitHub organization, `send us a "
+"message on Telegram <https://t.me/arturbrsg>`_."
 msgstr ""
 
-msgid "Want to contribute to an existing module"
+msgid "Contributing to an existing module"
 msgstr ""
 
 msgid ""
-"Tasks for contributors can be easily found in the issues section of any "
-"repository by the \"good first issue\" tag. These are tasks of an initial or"
-" intermediate level of difficulty that will help you get comfortable in the "
-"module of interest."
+"Tasks for contributors can be found in the issues section of any repository "
+"under the \"good first issue\" tag. These tasks are beginner or intermediate"
+" in terms of difficulty level, so you can comfortably get used to the module"
+" of your interest."
 msgstr ""
 
 msgid ""
-"Look at the `currently open tasks "
+"Check the `currently open tasks "
 "<https://github.com/tarantool/http/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22>`_"
 " for the HTTP Server module."
 msgstr ""
 
-msgid ""
-"The style guide for the Lua code we are following is :ref:`here "
-"<lua_style_guide>`."
+msgid "Please see our :doc:`Lua style guide </dev_guide/lua_style_guide>`."
 msgstr ""
 
 msgid ""
-"You can contact the current maintainer through MAINTAINERS, which is located"
-" in the root of the repository. If there is not such a file -- `let us know "
-"<https://t.me/arturbrsg>`_. We will respond within one to two days."
+"You can find the contact of the current maintainer in the MAINTAINERS file, "
+"located in the root of the repository. If there is no such file, please `let"
+" us know <https://t.me/arturbrsg>`_. We will respond within two days."
 msgstr ""
 
 msgid ""
 "If you see that the project does not have a maintainer or is inactive, you "
-"can become one yourself. See the section :ref:`How to become a maintainer "
-"<how_to_become_a_maintainer>`."
+"can become its maintainer yourself. See the :ref:`How to become a maintainer"
+" <contributing-how_to_become_a_maintainer>` section."
 msgstr ""
 
-msgid "Want to create a new module"
+msgid "Creating a new module"
 msgstr ""
 
 msgid ""
-"You can also create any custom modules and share them with the community. "
-"`Look at the module template <https://github.com/tarantool/modulekit>`_ and "
-"write your own."
+"You can also create custom modules and share them with the community. `Look "
+"at the module template <https://github.com/tarantool/modulekit>`_ and write "
+"your own."
 msgstr ""
 
 msgid "How to contribute to Tarantool Core"
 msgstr ""
 
 msgid ""
-"Tarantool is written mostly in C. Some parts are written in C++ and Lua. "
-"Review can take longer because we want it to be reliable."
+"Tarantool is written mostly in C. Some parts are in C++ and Lua. Your "
+"contributions to Tarantool Core may take longer to review because we want "
+"the code to be reliable."
 msgstr ""
 
 msgid "To start:"
 msgstr ""
 
-msgid ":ref:`learn how to build Tarantool <building_from_source>`"
+msgid ":doc:`Learn how to build Tarantool </dev_guide/building_from_source>`."
 msgstr ""
 
 msgid ""
-"read about Tarantool architecture and main modules (`here "
-"<https://docs.tarantool.dev/en/latest/>`__ and `here "
-"<https://github.com/tarantool/tarantool/wiki/Developer-information>`__)"
+"Read about Tarantool architecture and main modules on the `developer site "
+"<https://docs.tarantool.dev/en/latest/>`__ and on `GitHub "
+"<https://github.com/tarantool/tarantool/wiki/Developer-information>`__."
 msgstr ""
 
 msgid ""
-"We have standards that we try to adhere to when developing in Tarantool. "
-"These are the Style Guide and Contribution Guide :ref:`links "
-"<developer_guidelines>`. They tell you how to format your code, how to "
-"format your commits, and how to write your test and make sure you don't "
-"break anything."
+"In Tarantool development, we strive to follow the standards laid out in our "
+":doc:`style and contribution guides </dev_guide/developer_guidelines>`. "
+"These documents explain how to format your code and commits as well as how "
+"to write tests without breaking anything accidentally."
 msgstr ""
 
 msgid ""
-"They will also help you make a patch that is easier to check, which will "
-"allow you to quickly push changes to master."
+"The guidelines also help you create patches that are easy to check, which "
+"allows quickly pushing changes to master."
 msgstr ""
 
 msgid ""
-"Before your first commit, read `this article "
+"Please read about `our code review procedure "
 "<https://github.com/tarantool/tarantool/wiki/Code-review-procedure#general-"
-"coding-points-to-check>`_!"
+"coding-points-to-check>`_ before making your first commit."
 msgstr ""
 
-msgid "A patch can be offered in two ways:"
+msgid "Here are two ways to suggest a patch:"
 msgstr ""
 
 msgid ""
-"(preferred) Using a fork and pull mechanism on GitHub: make changes to your "
-"copy of the repository and submit to us for review. See details `here "
-"<https://docs.github.com/en/github/collaborating-with-issues-and-pull-"
-"requests/creating-a-pull-request-from-a-fork>`__."
+"(preferred) Using the fork and pull mechanism on GitHub: Make changes to "
+"your copy of the repository and submit it to us for review. Check the "
+"`GitHub documentation <https://docs.github.com/en/github/collaborating-with-"
+"issues-and-pull-requests/creating-a-pull-request-from-a-fork>`__ to learn "
+"how to do it."
 msgstr ""
 
 msgid ""
-"Suggest a patch via the mailing list. Our developers are discussing most of "
-"the features there. See details :ref:`here <dev_guidelines-patch-review>`."
+"Suggest a patch via the mailing list. This is where our developers discuss "
+"most features. Learn more in :ref:`the article on submitting patches "
+"</dev_guide/developer_guidelines/#how-to-submit-a-patch-for-review>`."
 msgstr ""
 
-msgid "How to write a test"
+msgid "How to write tests"
 msgstr ""
 
 msgid ""
-"The database is a product that is expected to be as reliable as possible. We"
-" at Tarantool have developed a dedicated test framework for developing test "
-"scripts that test Tarantool itself. The framework is called ``test-run``."
+"A database is a product that is expected to be as reliable as possible. We "
+"at Tarantool created ``test-run``, a dedicated test framework for developing"
+" scripts that test Tarantool itself."
 msgstr ""
 
-msgid "Writing your own test is not difficult. See test examples here:"
+msgid ""
+"Writing your own test is not difficult. Check out the following examples:"
 msgstr ""
 
 msgid ""
@@ -376,45 +377,40 @@ msgid ""
 msgstr ""
 
 msgid ""
-"We also have a CI that automatically checks build and test coverage for new "
-"changes on all supported operating systems. This happens after any commit to"
-" the repository."
+"We also have a CI workflow that automatically checks build and test coverage"
+" for new changes on all supported operating systems. The workflow is "
+"launched after every commit to the repository."
 msgstr ""
 
 msgid ""
-"The QA team has many tasks for specialists who are involved in checking the "
-"quality of the product and tools. They provide test coverage for products, "
-"help develop the test framework, and introduce and maintain new tools to "
-"test the stability of releases."
+"We have many tasks for QA specialists. Our QA team provides test coverage "
+"for our products, helps develop the test framework, and introduces and "
+"maintains new tools to test the stability of our releases."
 msgstr ""
 
 msgid ""
-"We test modules differently: for modules, we use the `luatest "
-"<https://github.com/tarantool/luatest>`_ framework. This is a fork of the "
-"popular framework in the Lua community, which we have enhanced and optimized"
-" for our tasks. See `examples "
+"For modules, we use `luatest <https://github.com/tarantool/luatest>`_--- our"
+" fork of a framework popular in the Lua community, enhanced and optimized "
+"for our tasks. See `examples "
 "<https://github.com/tarantool/metrics/tree/master/test>`_. of writing tests "
 "for a module."
 msgstr ""
 
-msgid "Read: writing tests in Tarantool, writing unit tests. ???"
-msgstr ""
-
 msgid "How to contribute to language connectors"
 msgstr ""
 
 msgid ""
-"A connector is a library that provides an API for accessing Tarantool from a"
-" programming language. Tarantool uses its own binary protocol for access, "
-"and the connector's task is to transfer user requests to the database and "
+"A connector is a library that provides an API to access Tarantool from a "
+"programming language. Tarantool uses its own binary protocol for access, and"
+" the connector's task is to transfer user requests to the database and "
 "application server in the required format."
 msgstr ""
 
 msgid ""
 "Data access connectors have already been implemented for all major "
 "languages. If you want to write your own connector, you first need to "
-"familiarize yourself with the Tarantool binary protocol. Its current "
-"description can be found :ref:`here <box_protocol-iproto_protocol>`."
+"familiarize yourself with the Tarantool binary protocol. Read :doc:`the "
+"protocol description </dev_guide/internals/box_protocol>` to learn more."
 msgstr ""
 
 msgid "We consider the following connectors as references:"
@@ -426,70 +422,69 @@ msgstr ""
 msgid ""
 "`net.box "
 "<https://github.com/tarantool/tarantool/blob/master/src/box/lua/net_box.lua>`_"
-" — binary protocol client in Tarantool"
+"---Tarantool binary protocol client"
 msgstr ""
 
 msgid "You can look at them to understand how to do it right."
 msgstr ""
 
 msgid ""
-"The Tarantool ecosystem has connectors that are supported by the Tarantool "
-"team itself, and there are connectors that are developed and supported "
-"exclusively by the community. All of them have their pros and cons. See a "
-"`complete list of connectors and their recommended versions "
+"Some connectors in the Tarantool ecosystem are supported by the Tarantool "
+"team. Others are developed and supported exclusively by the community. All "
+"of them have their pros and cons. See the `complete list of connectors and "
+"their recommended versions "
 "<https://www.tarantool.io/en/download/connectors>`_."
 msgstr ""
 
 msgid ""
-"If you are using an existing connector from the community and want to "
-"implement new features or fix a bug, then send your PRs via GitHub to the "
-"desired repository."
+"If you are using a community connector and want to implement new features "
+"for it or fix a bug, send your PRs via GitHub to the connector repository."
 msgstr ""
 
 msgid ""
-"To contact the author of the connector in case of questions, look in the "
-"MAINTAINERS file: there will be contacts of the repository maintainer. If "
-"there is no such file -- `text us here <https://t.me/arturbrsg>`_. We will "
-"help you figure it out. We usually answer within one day."
+"If you have questions for the author of the connector, check the MAINTAINERS"
+" file for the repository maintainer's contact. If there is no such file, "
+"`send us a message on Telegram <https://t.me/arturbrsg>`_. We will help you "
+"figure it out. We usually answer within one day."
 msgstr ""
 
 msgid "How to contribute to tools"
 msgstr ""
 
 msgid ""
-"The Tarantool ecosystem has tools that help in operation, deploy "
-"applications, or allow working with Kubernetes."
+"The Tarantool ecosystem has tools that facilitate the workflow, help with "
+"application deployment, or allow working with Kubernetes."
 msgstr ""
 
-msgid "Examples of tools from the Tarantool team:"
+msgid "Here are some of the tools created by the Tarantool team:"
 msgstr ""
 
 msgid ""
-"`ansible-cartridge <https://github.com/tarantool/ansible-cartridge>`_: "
-"Ansible role for deploying an application on Cartridge"
+"`ansible-cartridge <https://github.com/tarantool/ansible-cartridge>`_: an "
+"Ansible role to deploy Cartridge applications."
 msgstr ""
 
 msgid ""
-"`cartridge-cli <https://github.com/tarantool/cartridge-cli>`_: CLI utility "
-"for creating applications, launching clusters locally on Cartridge and "
-"solving operational problems"
+"`cartridge-cli <https://github.com/tarantool/cartridge-cli>`_: a CLI utility"
+" for creating applications, launching clusters locally on Cartridge, and "
+"solving operation problems."
 msgstr ""
 
 msgid ""
-"`tarantool-operator <https://github.com/tarantool/tarantool-operator>`_: "
-"Kubernetes operator for cluster orchestration"
+"`tarantool-operator <https://github.com/tarantool/tarantool-operator>`_: a "
+"Kubernetes operator for cluster orchestration."
 msgstr ""
 
 msgid ""
 "These tools can be installed via standard package managers: ``ansible "
-"galaxy``, ``yum``, ``apt-get``, respectively."
+"galaxy``, ``yum``, or ``apt-get``."
 msgstr ""
 
 msgid ""
-"If you have a tool that might go well in our curated `\"awesome Tarantool\" "
-"list <https://github.com/tarantool/awesome-tarantool>`_ you can read the "
-"`guide for contributors <https://github.com/tarantool/awesome-"
-"tarantool/blob/master/CONTRIBUTING.md>`_ there and submit a pull request."
+"If you have a tool that might go well in our curated `Awesome Tarantool list"
+" <https://github.com/tarantool/awesome-tarantool>`_, read the `guide for "
+"contributors <https://github.com/tarantool/awesome-"
+"tarantool/blob/master/CONTRIBUTING.md>`_ and submit a pull request."
 msgstr ""
 
 msgid "How to become a maintainer"
@@ -497,29 +492,30 @@ msgstr ""
 
 msgid ""
 "Maintainers are people who can merge PRs or commit to master. We expect "
-"maintainers to answer questions and tickets in time, and do code reviews."
+"maintainers to answer questions and tickets on time as well as do code "
+"reviews."
 msgstr ""
 
 msgid ""
-"If you need to get a review but no one responds for a week, take a look at "
-"the Maintainers section of the ``README.md`` in the repository. Write to the"
-" person listed there. If you have not received an answer in 3-4 days, you "
-"can escalate the question `here <https://t.me/arturbrsg>`__."
+"If you need to get a review but no one responds within a week, take a look "
+"at the Maintainers section of the repository's ``README.md``. Write to the "
+"person listed there. If you have not received an answer within 3--4 days, "
+"you can escalate the question `on Telegram <https://t.me/arturbrsg>`__."
 msgstr ""
 
 msgid ""
-"A repository may have no maintainers (the Maintainers list in ``README.md`` "
-"is empty), or existing maintainers may be inactive. Then you can become a "
-"maintainer yourself. We think it's better if the repository is maintained by"
-" a newbie than if the repository is dead. So don't be shy: we love "
-"maintainers and help them figure it out."
+"A repository may have no maintainers (empty Maintainers list in "
+"``README.md``), or the existing maintainers may be inactive. In this case, "
+"you can become a maintainer yourself. We think it's better if the repository"
+" is maintained by a newbie than if the repository is dead. So don't be shy: "
+"we love maintainers and help them figure it all out."
 msgstr ""
 
 msgid ""
 "All you need to do is fill out `this form "
 "<https://docs.google.com/forms/d/1RihU9hQkbY5n7hU-3ZOr6t1L6cJKOlJcETowD_cNeOk/edit?usp=sharing>`_."
-" Indicate which repository you want to access, the reason (inactivity, the "
-"maintainer is not responding), and how to contact you. We will consider the "
-"application in 1 day and either give you the rights or tell you what else "
+" Tell us what repository you want to access, the reason (inactivity, the "
+"maintainer is not responding), and how to contact you. We will consider your"
+" application in 1 day and either give you the rights or tell you what else "
 "needs to be done."
 msgstr ""
diff --git a/locale/ru/LC_MESSAGES/contributing/docs.po b/locale/ru/LC_MESSAGES/contributing/docs.po
index 5c3a6f95e3..97105b5c56 100644
--- a/locale/ru/LC_MESSAGES/contributing/docs.po
+++ b/locale/ru/LC_MESSAGES/contributing/docs.po
@@ -1,4 +1,7 @@
 
+msgid "Contents:"
+msgstr "Оглавление:"
+
 msgid "Documentation & Localization guidelines"
 msgstr ""
 
@@ -10,6 +13,3 @@ msgstr ""
 msgid ""
 "The guidelines are a work in progress, and we welcome all contributions."
 msgstr ""
-
-msgid "Contents:"
-msgstr "Оглавление:"
diff --git a/locale/ru/LC_MESSAGES/contributing/docs/examples.po b/locale/ru/LC_MESSAGES/contributing/docs/examples.po
index 7fb4583580..538a00f42c 100644
--- a/locale/ru/LC_MESSAGES/contributing/docs/examples.po
+++ b/locale/ru/LC_MESSAGES/contributing/docs/examples.po
@@ -3,8 +3,8 @@ msgid "Examples and templates"
 msgstr "Примеры и шаблоны"
 
 msgid ""
-"In this document, we explain general guidelines for describing Tarantool API"
-" and give some examples and templates."
+"This document contains general guidelines for describing the Tarantool API, "
+"as well as examples and templates."
 msgstr ""
 
 msgid "Use this checklist for documenting a function or a method:"
@@ -28,7 +28,7 @@ msgstr ""
 msgid "Complexity factors (if exist)"
 msgstr ""
 
-msgid "Note re storage engine (if exists)"
+msgid "Usage with memtx and vinyl (if differs)"
 msgstr ""
 
 msgid "Example(s)"
@@ -37,12 +37,12 @@ msgstr ""
 msgid "Extra information (if needed)"
 msgstr ""
 
-msgid "Documenting a function"
+msgid "Documenting functions"
 msgstr ""
 
 msgid ""
-"We describe functions of Tarantool modules via Sphinx directives ``.. "
-"module::`` and ``.. function::``:"
+"We use the Sphinx directives ``.. module::`` and ``.. function::`` to "
+"describe functions of Tarantool modules:"
 msgstr ""
 
 msgid ""
@@ -77,7 +77,7 @@ msgid ""
 "        ...\n"
 msgstr ""
 
-msgid "And the resulting output looks like this:"
+msgid "The resulting output looks like this:"
 msgstr ""
 
 msgid ""
@@ -137,22 +137,22 @@ msgstr ""
 "---\n"
 "..."
 
-msgid "Documenting class method and data"
+msgid "Documenting class methods and data"
 msgstr ""
 
 msgid ""
-"Description of a method is similar to a function, but the ``.. class::`` "
+"Methods are described similarly to functions, but the ``.. class::`` "
 "directive, unlike ``.. module::``, requires nesting."
 msgstr ""
 
 msgid ""
-"As for documenting data, it will be enough to write a description, a return "
-"type, and an example."
+"As for data, it's enough to write the description, the return type, and an "
+"example."
 msgstr ""
 
 msgid ""
-"Here is an example of documenting a method and data of a class "
-"``index_object``:"
+"Here is the example documentation describing the method and data of the "
+"``index_object`` class:"
 msgstr ""
 
 msgid ""
@@ -201,6 +201,9 @@ msgid ""
 "            ...\n"
 msgstr ""
 
+msgid "And the resulting output looks like this:"
+msgstr ""
+
 msgid "Search for a tuple :ref:`via the given index <box_index-note>`."
 msgstr ""
 
diff --git a/locale/ru/LC_MESSAGES/contributing/docs/infra.po b/locale/ru/LC_MESSAGES/contributing/docs/infra.po
index 35bfb59f4d..323a0cfa18 100644
--- a/locale/ru/LC_MESSAGES/contributing/docs/infra.po
+++ b/locale/ru/LC_MESSAGES/contributing/docs/infra.po
@@ -3,40 +3,40 @@ msgid "Documentation infrastructure"
 msgstr ""
 
 msgid ""
-"In this section of the :doc:`documentation guidelines </contributing/docs>`,"
-" we deal with some support activities to ensure the correct building of "
-"documentation."
+"This section of the :doc:`documentation guidelines </contributing/docs>` "
+"discusses some of the support activities that ensure the correct building of"
+" documentation."
 msgstr ""
 
 msgid "Adding submodules"
 msgstr ""
 
 msgid ""
-"The source files with the documentation content are mainly stored in the "
-"`documentation repository <https://github.com/tarantool/doc>`_. However, in "
-"some of the cases the content source files are stored in repositories of "
-"other Tarantool-related products and modules, for example, `Cartridge "
-"<https://github.com/tarantool/cartridge>`_, `Monitoring "
-"<https://github.com/tarantool/metrics/tree/master/doc/monitoring>`__, and "
-"some others."
+"The documentation source files are mainly stored in the `documentation "
+"repository <https://github.com/tarantool/doc>`_. However, in some cases, "
+"they are stored in the repositories of other Tarantool-related products or "
+"modules---`Cartridge <https://github.com/tarantool/cartridge>`_, `Monitoring"
+" <https://github.com/tarantool/metrics/tree/master/doc/monitoring>`__, and "
+"others."
 msgstr ""
 
 msgid ""
-"In this case, we need to add such a repository containing the source files "
-"as a submodule to the `documentation repository "
-"<https://github.com/tarantool/doc>`_ and set up other necessary settings to "
-"ensure the proper building of the entire body of Tarantool documentation "
-"presented at the `official web-site <http://www.tarantool.io/en/doc>`_."
+"If you are working with source files from a product or module repository, "
+"add that repository as a submodule to the `documentation repository "
+"<https://github.com/tarantool/doc>`_ and configure other necessary settings."
+" This will ensure that the entire body of Tarantool documentation, presented"
+" on the `official website <http://www.tarantool.io/en/doc>`_, is built "
+"properly."
 msgstr ""
 
-msgid "The steps to do that are the following:"
+msgid "Here is how to do that:"
 msgstr ""
 
 msgid "1. Add a submodule"
 msgstr ""
 
 msgid ""
-"First, we need to add a repository containing the content source files as a "
+"First, we need to add the repository with content source files as a "
 "submodule."
 msgstr ""
 
@@ -54,8 +54,7 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Check that the new submodule appears in the ``.gitmodules`` file, for "
-"example:"
+"Check that the new submodule is in the ``.gitmodules`` file, for example:"
 msgstr ""
 
 msgid ""
@@ -68,42 +67,39 @@ msgid "2. Update build_submodules.sh"
 msgstr ""
 
 msgid ""
-"Next, we should define what directories and files are to be copied from the "
-"submodule repository into the documentation one before building "
-"documentation. These settings are defined in the ``build_submodules.sh`` "
-"file which is in the root directory of the documentation repository."
+"Now define what directories and files are to be copied from the submodule "
+"repository to the documentation repository before building documentation. "
+"These settings are defined in the ``build_submodules.sh`` file in the root "
+"directory of the documentation repository."
 msgstr ""
 
 msgid ""
-"We can take examples of the already existing submodules to show the logic of"
-" the settings."
+"Here are some real submodule examples that show the logic of the settings."
 msgstr ""
 
 msgid "metrics"
 msgstr ""
 
 msgid ""
-"In case of the ``metrics`` submodule, the content source files are in the "
+"The content source files for the ``metrics`` submodule are in the "
 "``./doc/monitoring`` directory of the submodule repository. In the final "
 "documentation view, the content should appear in the `Monitoring "
 "<https://www.tarantool.io/en/doc/latest/book/monitoring/>`__ chapter "
 "(``https://www.tarantool.io/en/doc/latest/book/monitoring/``)."
 msgstr ""
 
-msgid "So, we need to:"
+msgid "To make this work:"
 msgstr ""
 
-msgid "create a directory at ``./doc/book/monitoring/``."
+msgid "Create a directory at ``./doc/book/monitoring/``."
 msgstr ""
 
 msgid ""
-"copy the entire content of the  ``./modules/metrics/doc/monitoring/`` "
+"Copy the entire content of the  ``./modules/metrics/doc/monitoring/`` "
 "directory to ``./doc/book/monitoring/``."
 msgstr ""
 
-msgid ""
-"The corresponding lines in the ``build_submodules.sh`` file are the "
-"following:"
+msgid "Here are the corresponding lines in ``build_submodules.sh``:"
 msgstr ""
 
 msgid ""
@@ -115,33 +111,30 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The ``${project_root}`` variable is defined earlier as "
-"``project_root=$(pwd)``. We should start the documentation build from the "
-"documentation repository root directory so that will be the value of the "
-"variable."
+"The ``${project_root}`` variable is defined earlier in the file as "
+"``project_root=$(pwd)``. This is because the documentation build has to "
+"start from the documentation repository root directory."
 msgstr ""
 
 msgid "cartridge_cli"
 msgstr ""
 
 msgid ""
-"In case of the ``cartridge_cli`` submodule, the content source is in the "
-"``README.rst`` file located in the directory of the submodule repository. In"
-" the final documentation view, the content should appear here: "
+"The content source file for the ``cartridge_cli`` submodule is "
+"``README.rst``, located in the directory of the submodule repository. In the"
+" final documentation view, the content should appear here: "
 "``https://www.tarantool.io/en/doc/latest/book/cartridge/cartridge_cli/``."
 msgstr ""
 
-msgid "create a directory at ``./doc/book/cartridge/cartridge_cli``"
+msgid "Create a directory at ``./doc/book/cartridge/cartridge_cli``."
 msgstr ""
 
 msgid ""
-"copy ``./modules/cartridge_cli/README.rst`` to "
+"Copy ``./modules/cartridge_cli/README.rst`` to "
 "``./doc/book/cartridge/cartridge_cli/index.rst``."
 msgstr ""
 
-msgid ""
-"The corresponding settings in the ``build_submodules.st`` file are the "
-"following:"
+msgid "Here ar the corresponding settings in ``build_submodules.sh``:"
 msgstr ""
 
 msgid ""
@@ -158,6 +151,5 @@ msgid "3. Update .gitignore"
 msgstr ""
 
 msgid ""
-"Finaly, we should add paths to the copied directories and files to the "
-"``.gitignore`` file."
+"Finally, add paths to the copied directories and files to ``.gitignore``."
 msgstr ""
diff --git a/locale/ru/LC_MESSAGES/contributing/docs/localization.po b/locale/ru/LC_MESSAGES/contributing/docs/localization.po
index 22d83b84a6..4d74aa004b 100644
--- a/locale/ru/LC_MESSAGES/contributing/docs/localization.po
+++ b/locale/ru/LC_MESSAGES/contributing/docs/localization.po
@@ -1,4 +1,7 @@
 
+msgid "Contents:"
+msgstr ""
+
 msgid "Localization"
 msgstr ""
 
@@ -7,6 +10,3 @@ msgid ""
 "you are translating Tarantool docs into Russian, be sure to check out our "
 "translation guidelines."
 msgstr ""
-
-msgid "Contents:"
-msgstr ""
diff --git a/locale/ru/LC_MESSAGES/contributing/docs/localization/locstate.po b/locale/ru/LC_MESSAGES/contributing/docs/localization/locstate.po
index cb5c41ca59..1ff317a988 100644
--- a/locale/ru/LC_MESSAGES/contributing/docs/localization/locstate.po
+++ b/locale/ru/LC_MESSAGES/contributing/docs/localization/locstate.po
@@ -17,6 +17,9 @@ msgstr ""
 msgid "|doc|"
 msgstr ""
 
+msgid "doc"
+msgstr ""
+
 msgid "352 000"
 msgstr ""
 
@@ -26,6 +29,9 @@ msgstr ""
 msgid "|cartridge|"
 msgstr ""
 
+msgid "cartridge"
+msgstr ""
+
 msgid "14 000"
 msgstr ""
 
@@ -35,6 +41,9 @@ msgstr ""
 msgid "|tarantool-ansible-role|"
 msgstr ""
 
+msgid "tarantool-ansible-role"
+msgstr ""
+
 msgid "11 000"
 msgstr ""
 
@@ -44,6 +53,9 @@ msgstr ""
 msgid "|cartridge-cli|"
 msgstr ""
 
+msgid "cartridge-cli"
+msgstr ""
+
 msgid "6 500"
 msgstr ""
 
@@ -53,6 +65,9 @@ msgstr ""
 msgid "|tarantool-enterprise|"
 msgstr ""
 
+msgid "tarantool-enterprise"
+msgstr ""
+
 msgid "6 000"
 msgstr ""
 
@@ -62,6 +77,9 @@ msgstr ""
 msgid "|tarantool-data-grid|"
 msgstr ""
 
+msgid "tarantool-data-grid"
+msgstr ""
+
 msgid "4 000"
 msgstr ""
 
@@ -71,18 +89,27 @@ msgstr ""
 msgid "|tarantool-metrics|"
 msgstr ""
 
+msgid "tarantool-metrics"
+msgstr ""
+
 msgid "Tarantool C++ Driver"
 msgstr ""
 
 msgid "|tarantool-cpp|"
 msgstr ""
 
+msgid "tarantool-cpp"
+msgstr ""
+
 msgid "Tarantool Kubernetes Operator"
 msgstr ""
 
 msgid "|tarantool-kubernetes-operator|"
 msgstr ""
 
+msgid "tarantool-kubernetes-operator"
+msgstr ""
+
 msgid "2 750"
 msgstr ""
 
@@ -92,6 +119,9 @@ msgstr ""
 msgid "|tarantool-luatest|"
 msgstr ""
 
+msgid "tarantool-luatest"
+msgstr ""
+
 msgid "750"
 msgstr ""
 
@@ -101,5 +131,8 @@ msgstr ""
 msgid "|tarantool-graphana-dashboard|"
 msgstr ""
 
+msgid "tarantool-graphana-dashboard"
+msgstr ""
+
 msgid "500"
 msgstr ""
diff --git a/locale/ru/LC_MESSAGES/contributing/docs/markup.po b/locale/ru/LC_MESSAGES/contributing/docs/markup.po
index 2eaecb7c28..8f02a11c63 100644
--- a/locale/ru/LC_MESSAGES/contributing/docs/markup.po
+++ b/locale/ru/LC_MESSAGES/contributing/docs/markup.po
@@ -1,14 +1,13 @@
 
+msgid "Contents:"
+msgstr "Оглавление:"
+
 msgid "Markup reference"
 msgstr ""
 
 msgid ""
-"Tarantool documentation is built via `Sphinx <https://www.sphinx-"
+"Tarantool documentation is built via the `Sphinx <https://www.sphinx-"
 "doc.org/en/master/index.html>`_ engine and is written in `reStructuredText "
-"<https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html>`_ "
-"markup. This section will guide you through our typical cases while writing "
-"the docs."
+"<https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html>`_. This"
+" section will guide you through our typical documentation formatting cases."
 msgstr ""
-
-msgid "Contents:"
-msgstr "Оглавление:"
diff --git a/locale/ru/LC_MESSAGES/contributing/docs/markup/admonitions.po b/locale/ru/LC_MESSAGES/contributing/docs/markup/admonitions.po
index bea97522ec..6133b9e789 100644
--- a/locale/ru/LC_MESSAGES/contributing/docs/markup/admonitions.po
+++ b/locale/ru/LC_MESSAGES/contributing/docs/markup/admonitions.po
@@ -43,6 +43,23 @@ msgid ""
 "user about some consequences of his actions."
 msgstr ""
 
+msgid "Important:"
+msgstr ""
+
+msgid "..  important::"
+msgstr ""
+
+msgid ""
+"This block contains essential information that the user should know while "
+"doing something."
+msgstr ""
+
+msgid ""
+"For example, the block :doc:`in Getting Started with Docker "
+"</getting_started/getting_started_go>` is used to warn the user against "
+"closing the terminal window."
+msgstr ""
+
 msgid "Custom admonition:"
 msgstr ""
 
diff --git a/locale/ru/LC_MESSAGES/contributing/docs/markup/intro.po b/locale/ru/LC_MESSAGES/contributing/docs/markup/intro.po
index cfc0fc8043..fb9a2e5414 100644
--- a/locale/ru/LC_MESSAGES/contributing/docs/markup/intro.po
+++ b/locale/ru/LC_MESSAGES/contributing/docs/markup/intro.po
@@ -162,6 +162,9 @@ msgid ""
 "it out!"
 msgstr ""
 
+msgid "clickable links in the console"
+msgstr ""
+
 msgid ""
 "These comments don't work properly in nested documentation, though. For "
 "example, if you leave a comment in module -> object -> method, Sphinx "
diff --git a/locale/ru/LC_MESSAGES/contributing/docs/markup/links.po b/locale/ru/LC_MESSAGES/contributing/docs/markup/links.po
index 706a73876c..58ca7876e7 100644
--- a/locale/ru/LC_MESSAGES/contributing/docs/markup/links.po
+++ b/locale/ru/LC_MESSAGES/contributing/docs/markup/links.po
@@ -43,11 +43,11 @@ msgstr ""
 msgid "Our naming convention is as follows:"
 msgstr "Соглашение об именовании заключается в следующем:"
 
-msgid "Character set: a through z, 0 through 9, dash, underscore."
-msgstr "Набор символов: от a до z, от 0 до 9, дефис, подчеркивание."
+msgid "Character set: a through z, 0 through 9, hyphen, underscore."
+msgstr ""
 
-msgid "Format: ``path dash filename dash tag``"
-msgstr "Формат: ``путь дефис имя файла дефис тег``"
+msgid "Format: ``path hyphen filename hyphen tag``"
+msgstr ""
 
 msgid "**Example:**"
 msgstr "**Пример:**"
@@ -68,24 +68,17 @@ msgid "``iterator_type`` is the tag."
 msgstr ""
 
 msgid ""
-"Use a dash \"-\" to delimit the path and the file name. In the documentation"
-" source, we use only underscores \"_\" in paths and file names, reserving "
-"dash \"-\" as the delimiter for local links."
+"Use a hyphen \"-\" to delimit the path and the file name. In the "
+"documentation source, we use only underscores \"_\" in paths and file names,"
+" reserving the hyphen \"-\" as the delimiter for local links."
 msgstr ""
-"Используйте дефис \"-\", чтобы разграничить путь и имя файла. В исходном "
-"коде документации мы пользуемся только символами подчеркивания \"_\" при "
-"указании пути и имени файла, оставляя дефисы \"-\" для разграничения в "
-"локальных ссылках."
 
 msgid ""
 "The tag can be anything meaningful. The only guideline is for Tarantool "
 "syntax items (such as members), where the preferred tag syntax is "
-"``module_or_object_name dash member_name``. For example, ``box_space-drop``."
+"``module_or_object_name hyphen member_name``. For example, ``box_space-"
+"drop``."
 msgstr ""
-"Тег может содержать любую значимую информацию. Единственная рекомендация "
-"дается для элементов синтаксиса Tarantool'а, где предпочтительно "
-"использовать следующий синтаксис в тегах: ``имя_объекта_или_модуля дефис "
-"имя_элемента``. Например, ``box_space-drop``."
 
 msgid "To add a link to an anchor, use the following syntax:"
 msgstr ""
diff --git a/locale/ru/LC_MESSAGES/contributing/docs/sphinx-warnings.po b/locale/ru/LC_MESSAGES/contributing/docs/sphinx-warnings.po
index 571a81b042..e4616dc997 100644
--- a/locale/ru/LC_MESSAGES/contributing/docs/sphinx-warnings.po
+++ b/locale/ru/LC_MESSAGES/contributing/docs/sphinx-warnings.po
@@ -3,13 +3,11 @@ msgid "Sphinx-build warnings reference"
 msgstr ""
 
 msgid ""
-"This document will guide you through the possible warnings raised by Sphinx "
-"engine while building the docs."
+"This document will guide you through the warnings that can be raised by "
+"Sphinx while building the docs."
 msgstr ""
 
-msgid ""
-"Below we cite a list with the most frequent warnings and the ways of "
-"solutions."
+msgid "Below are the most frequent warnings and the ways to solve them."
 msgstr ""
 
 msgid "Bullet list ends without a blank line; unexpected unindent"
@@ -59,8 +57,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Sometimes, however, there's no appropriate lexer, or the code snippet can't "
-"be lexed properly. In such case, use ``code-block:: text``."
+"However, sometimes there's no appropriate lexer or the code snippet can't be"
+" lexed properly. In that case, use ``code-block:: text``."
 msgstr ""
 
 msgid "Duplicate explicit target name: \"...\""
@@ -68,22 +66,22 @@ msgstr ""
 
 msgid ""
 "*   `Install <https://git-scm.com/book/en/v2/Getting-Started-Installing-Git>`_\n"
-"    ``git``, a version control system.\n"
+"    ``git``, the version control system.\n"
 "\n"
 "*   `Install <https://linuxize.com/post/how-to-unzip-files-in-linux/>`_\n"
 "    the ``unzip`` utility."
 msgstr ""
 
 msgid ""
-"Sphinx-builder raises warnings when we call different targets the same "
-"names. Sphinx developers `recommend <https://github.com/sphinx-"
+"Sphinx-builder raises warnings when we call different targets the same name."
+" Sphinx developers `recommend <https://github.com/sphinx-"
 "doc/sphinx/issues/3921>`_ using double underlines ``__`` in such cases to "
 "avoid this."
 msgstr ""
 
 msgid ""
 "*   `Install <https://git-scm.com/book/en/v2/Getting-Started-Installing-Git>`__\n"
-"    ``git``, a version control system.\n"
+"    ``git``, the version control system.\n"
 "\n"
 "*   `Install <https://linuxize.com/post/how-to-unzip-files-in-linux/>`__\n"
 "    the ``unzip`` utility."
@@ -97,23 +95,25 @@ msgid ""
 msgstr ""
 
 msgid ""
-"If you don't need it there, place ``:orphan:`` directive at the top of the "
-"file. Or, if this file is included somewhere or reused, add it to the "
-"_includes directory. These directories are ignored by Sphinx because we put "
-"them in ``exclude_patterns`` in ``conf.py`` file."
+"If you don't want to include the document in a toctree, place the "
+"``:orphan:`` directive at the top of the file. If this file is already "
+"included somewhere or reused, add it to the _includes directory. Sphinx "
+"ignores everything in this directory because we list it among "
+"``exclude_patterns`` in ``conf.py``."
 msgstr ""
 
 msgid "Duplicate label \"...\", other instance in \".../.../...\""
 msgstr ""
 
 msgid ""
-"This happens if you include the contents of one file with tags in another. "
-"Then Sphinx thinks the tags are repeated."
+"This happens if you include the contents of a file into another file, when "
+"the included file has tags in it. In this, Sphinx thinks the tags are "
+"repeated."
 msgstr ""
 
 msgid ""
-"As in previous case, don't forget to add such file in _includes or avoid "
-"using tags within it."
+"As in the previous case, add the file to _includes or avoid using tags in "
+"it."
 msgstr ""
 
 msgid "Malformed hyperlink target"
@@ -122,7 +122,7 @@ msgstr ""
 msgid "**Similar warning:** Unknown target name: \"...\""
 msgstr ""
 
-msgid "Check the spelling of the target or the accuracy of the tag."
+msgid "Check the target spelling and the tag syntax."
 msgstr ""
 
 msgid "..  _box_space-index_func"
@@ -132,7 +132,7 @@ msgid ""
 "See the :ref:`Creating a functional index <box_space-index_func>` section."
 msgstr ""
 
-msgid "Semicolon is missing in tag definition:"
+msgid "A semicolon is missing in the tag definition:"
 msgstr ""
 
 msgid "..  _box_space-index_func:"
@@ -141,16 +141,14 @@ msgstr ""
 msgid "Toctree contains reference to nonexisting document '...'"
 msgstr ""
 
-msgid ""
-"This may happen when you, for example, refer to the wrong path to a "
-"document."
+msgid "This may happen when you refer to a wrong path to a document."
 msgstr ""
 
 msgid "Check the path."
 msgstr ""
 
 msgid ""
-"If the path is in ``cartridge`` or another submodule, check that you've "
+"If the path points to ``cartridge`` or another submodule, check that you've "
 ":doc:`built the submodules content </contributing/docs/build>` before "
 "building docs."
 msgstr ""
@@ -172,37 +170,37 @@ msgstr ""
 msgid "**See also:**"
 msgstr "**См. также:**"
 
-msgid ":doc:`/contributing/docs/markup/links`"
+msgid ":doc:`Links and references </contributing/docs/markup/links>`"
 msgstr ""
 
 msgid "Unexpected indentation"
 msgstr ""
 
 msgid ""
-"The reStructuredText syntax is based on indentation, much like in Python. In"
-" a block of content, all lines should be equally indented. An increase or "
-"decrease in indentation means the end of the current block and the beginning"
-" of a new one."
+"The reStructuredText syntax is based on indentation, much like in Python. "
+"All lines in a block of content must be equally indented. An increase or "
+"decrease in indentation denotes the end of the current block and the "
+"beginning of a new one."
 msgstr ""
 
 msgid ""
-"Note: dots show indentation spaces in these examples. For example, ``|..|`` "
-"means a two-space indentation."
+"Note: In the following examples, dots stand for indentation spaces. For "
+"example, ``|..|`` denotes a two-space indentation."
 msgstr ""
 
 msgid ""
 "|..|* (Engines) Improve dump start/stop logging. When initiating memory dump, print\n"
-"how much memory is going to be dumped, expected dump rate, ETA, and the recent\n"
+"how much memory is going to be dumped, the expected dump rate, ETA, and the recent\n"
 "write rate."
 msgstr ""
 
 msgid ""
 "*|...|(Engines) Improve dump start/stop logging. When initiating memory dump, print\n"
-"|....|how much memory is going to be dumped, expected dump rate, ETA, and the recent\n"
+"|....|how much memory is going to be dumped, the expected dump rate, ETA, and the recent\n"
 "|....|write rate."
 msgstr ""
 
-msgid ":doc:`/contributing/docs/markup/intro`"
+msgid ":doc:`General syntax guidelines </contributing/docs/markup/intro>`"
 msgstr ""
 
 msgid "Unknown document"
@@ -212,7 +210,7 @@ msgid ":doc:`reference/reference_lua/box_space/update`"
 msgstr ""
 
 msgid ""
-"Sphinx did not recognise the file path correctly due to a missing slash at "
+"Sphinx did not recognize the file path correctly due to a missing slash at "
 "the beginning, so let's just put it there:"
 msgstr ""
 
diff --git a/locale/ru/LC_MESSAGES/contributing/docs/style.po b/locale/ru/LC_MESSAGES/contributing/docs/style.po
index 4c560dac5f..9e94666943 100644
--- a/locale/ru/LC_MESSAGES/contributing/docs/style.po
+++ b/locale/ru/LC_MESSAGES/contributing/docs/style.po
@@ -5,37 +5,27 @@ msgstr ""
 msgid "US vs British spelling"
 msgstr "Британский или американский вариант английского"
 
-msgid "We use English US spelling."
+msgid "We use the US English spelling."
 msgstr ""
-"В английской версии документации мы придерживаемся американского варианта "
-"английского языка."
 
 msgid "Instance vs server"
 msgstr "Экземпляр или сервер"
 
 msgid ""
-"We say \"instance\" rather than \"server\" to refer to an instance of "
-"Tarantool server. This keeps the manual terminology consistent with names "
-"like ``/etc/tarantool/instances.enabled`` in the Tarantool environment."
+"We say \"instance\" rather than \"server\" to refer to a Tarantool server "
+"instance. This keeps the manual terminology consistent with names like "
+"``/etc/tarantool/instances.enabled`` in the Tarantool environment."
 msgstr ""
-"Ссылаясь на экземпляр Tarantool-сервера, мы говорим \"экземпляр\", а не "
-"\"сервер\". Это обеспечивает однородность терминологии в руководстве и "
-"именами в окружении Tarantool'а (например, "
-"``/etc/tarantool/instances.enabled`` -- активные экземпляры)."
 
 msgid ""
-"Wrong usage: \"Replication allows multiple Tarantool *servers* to work on "
-"copies of the same databases.\""
+"Wrong usage: \"Replication allows multiple Tarantool *servers* to work with "
+"copies of the same database.\""
 msgstr ""
-"Неправильно: \"С помощью репликации несколько *серверов* Tarantool’а могут "
-"работать на копиях одинаковых баз данных.\""
 
 msgid ""
 "Correct usage: \"Replication allows multiple Tarantool *instances* to work "
-"on copies of the same databases.\""
+"with copies of the same database.\""
 msgstr ""
-"Правильно: \"С помощью репликации несколько *экземпляров* Tarantool’а могут "
-"работать на копиях одинаковых баз данных.\""
 
 msgid "Express one idea in a sentence"
 msgstr ""
@@ -75,15 +65,15 @@ msgid ""
 msgstr ""
 
 msgid ""
-"A replica set from which the bucket is being migrated is called a source; a "
-"target replica set to which the bucket is being migrated is called a "
-"destination."
+"The replica set from where the bucket is being migrated is called the "
+"source; the target replica set where the bucket is being migrated to is "
+"called the destination."
 msgstr ""
 
 msgid ""
-"A replica set from which the bucket is being migrated is called a source. A "
-"target replica set to which the bucket is being migrated is called a "
-"destination."
+"The replica set from where the bucket is being migrated is called the "
+"source. The target replica set where the bucket is being migrated to is "
+"called the destination."
 msgstr ""
 
 msgid "Don't use i.e. and e.g."
@@ -93,28 +83,29 @@ msgid "Don't use the following contractions:"
 msgstr ""
 
 msgid ""
-"`\"i.e.\" <https://www.merriam-webster.com/dictionary/i.e.>`_ —from Latin "
-"\"id est\". Use \"that is\" or \"which means\" instead."
+"`\"i.e.\" <https://www.merriam-webster.com/dictionary/i.e.>`_---from the "
+"Latin \"id est\". Use \"that is\" or \"which means\" instead."
 msgstr ""
 
 msgid ""
-"`\"e.g.\" <https://www.merriam-webster.com/dictionary/e.g.>`_ —from Latin "
-"\"exempli gratia\". Use \"for example\" or \"such as\" instead."
+"`\"e.g.\" <https://www.merriam-webster.com/dictionary/e.g.>`_---from the "
+"Latin \"exempli gratia\". Use \"for example\" or \"such as\" instead."
 msgstr ""
 
 msgid ""
-"Many people, especially non-native English speakers, aren't familiar or "
-"don't know the difference between `\"i.e.\" and \"e.g.\" contractions "
-"<https://www.merriam-webster.com/words-at-play/ie-vs-eg-abbreviation-"
-"meaning-usage-difference>`_. So it's best to avoid using them."
+"Many people, especially non-native English speakers, aren't familiar with "
+"the `\"i.e.\" and \"e.g.\" contractions <https://www.merriam-"
+"webster.com/words-at-play/ie-vs-eg-abbreviation-meaning-usage-difference>`_ "
+"or don't know the difference between them. For this reason, it's best to "
+"avoid using them."
 msgstr ""
 
-msgid "Specify a link text"
+msgid "Specify link text"
 msgstr ""
 
 msgid ""
-"While giving a :doc:`link </contributing/docs/markup/links>`, specify "
-"clearly where this link leads. Thus, you will not mislead a reader."
+"When you provide a :doc:`link </contributing/docs/markup/links>`, clearly "
+"specify where it leads. In this way, you will not mislead the reader."
 msgstr ""
 
 msgid "Bad example:"
diff --git a/locale/ru/LC_MESSAGES/contributing/docs/terms.po b/locale/ru/LC_MESSAGES/contributing/docs/terms.po
index 484d0753ce..1b1b99db2d 100644
--- a/locale/ru/LC_MESSAGES/contributing/docs/terms.po
+++ b/locale/ru/LC_MESSAGES/contributing/docs/terms.po
@@ -6,83 +6,82 @@ msgid "What are concepts and terms"
 msgstr ""
 
 msgid ""
-"To write well about some subject matter, one needs to know the objects of "
-"this subject matter and use the right, carefully selected words for them. "
-"Such objects are called concepts, and the words for them are called terms."
+"To write well about a certain subject matter, one needs to know its details "
+"and use the right, carefully selected words for them. These details are "
+"called concepts, and the words for them are called terms."
 msgstr ""
 
 msgid "concept"
 msgstr ""
 
 msgid ""
-"The concept is the idea of some object, attribute, or action. It is "
-"independent of languages, audience, and products. It just exists."
+"A concept is the idea of an object, attribute, or action. It is independent "
+"of languages, audience, and products. It just exists."
 msgstr ""
 
 msgid ""
-"For example, a large database can be partitioned into smaller instances, "
-"which are easier to operate and can exceed the throughput of a single large "
-"database instance. Such instances can exchange data for keeping it "
-"consistent between them."
+"For example, a large database can be partitioned into smaller instances. "
+"Those instances are easier to operate, and their throughput often exceeds "
+"the throughput of a single large database instance. The instances can "
+"exchange data to keep it consistent between them."
 msgstr ""
 
 msgid "term"
 msgstr ""
 
 msgid ""
-"The term is a word, which authors or a particular book, article, or "
-"documentation set have explicitly selected to denote a :term:`concept` in a "
-"particular language and for a particular audience."
+"A term is a word explicitly selected by the authors of a particular text to "
+"denote a :term:`concept` in a particular language for a particular audience."
 msgstr ""
 
 msgid ""
 "For example, in Tarantool, we use the term \"[database] sharding\" to denote"
-" the concept mentioned in the previous example."
+" the concept described in the previous example."
 msgstr ""
 
 msgid "Use preferred terms"
 msgstr ""
 
 msgid ""
-"The purpose of using terms is to write concisely and unambiguously, which is"
-" good for readers. But selecting terms is hard. Often there are two or more "
-"terms for one concept popular with the community, so there's no obvious "
-"choice. Indeed, selecting and consistently using any of them is much better "
-"than not selecting and just using random terms each time. This is why it's "
-"also helpful to restrict the usage of some terms explicitly."
+"The purpose of using terms is writing concisely and unambiguously, which is "
+"good for the readers. But selecting terms is hard. Often, the community "
+"favors two or more terms for one concept, so there's no obvious choice. "
+"Selecting and consistently using any of them is much better than not making "
+"a choice and using a random term every time. This is why it's also helpful "
+"to restrict the usage of some terms explicitly."
 msgstr ""
 
 msgid "restricted term"
 msgstr ""
 
 msgid ""
-"A restricted term is a word that authors have explicitly forbidden to use "
+"A restricted term is a word that the authors explicitly prohibited to use "
 "for denoting a :term:`concept`. Such a word is sometimes used as a "
-":term:`term` for the same :term:`concept` elsewhere: in the community, in "
-"other books, or other products' documentation. Sometimes, this word is used "
-"to denote a similar but different concept. In this case, the right choice of"
-" terms helps us differentiate between concepts."
+":term:`term` for the same :term:`concept` elsewhere---in the community, in "
+"books, or in other product documentation. Sometimes this word is used to "
+"denote a similar but different concept. In this case, the right choice of "
+"terms helps us differentiate between concepts."
 msgstr ""
 
 msgid ""
 "For example, in Tarantool, we don't use the term \"[database] segmentation\""
-" to denote what we call \"database sharding.\" Although, other authors could"
-" do so. Also, there is the term \"[database] partitioning\" that we use to "
-"denote a wider concept, which includes sharding and other things."
+" to denote what we call \"database sharding.\" Nevertheless, other authors "
+"might do so. We also use the term \"[database] partitioning\" to denote a "
+"wider concept, which includes sharding among other things."
 msgstr ""
 
 msgid "Define terms by explaining concepts"
 msgstr ""
 
 msgid ""
-"Define the term by explaining the concept. For the most important concepts "
-"and the ones unique to Tarantool, the definition should always be in our "
-"documentation."
+"We always want to document definitions for the most important concepts, as "
+"well as for concepts unique to Tarantool."
 msgstr ""
 
 msgid ""
-"Define each term in the document which is most relevant to it. There's no "
-"need to gather all definitions on a particular \"Glossary\" page."
+"Define every term in the document that you find most appropriate for it. You"
+" don't have to create a dedicated glossary page containing all the "
+"definitions."
 msgstr ""
 
 msgid "To define a term, use the ``glossary`` directive in the following way:"
@@ -106,17 +105,17 @@ msgstr ""
 
 msgid ""
 "The `Sphinx documentation <https://github.com/sphinx-"
-"doc/sphinx/blob/master/doc/glossary.rst>`_ has an extensive glossary, which "
-"we can use as a reference."
+"doc/sphinx/blob/master/doc/glossary.rst>`_ has an extensive glossary that "
+"can be used as a reference."
 msgstr ""
 
 msgid "Introduce terms on first entry"
 msgstr ""
 
 msgid ""
-"When you use a term for the first time in a document, introduce it by giving"
-" a definition, synonyms, translation, examples, and links. It will help "
-"readers learn the term and understand the concept behind it."
+"When you use a term in a document for the first time, define it and provide "
+"synonyms, a translation, examples, and/or links. It will help readers learn "
+"the term and understand the concept behind it."
 msgstr ""
 
 msgid "Define the term or give a link to the definition."
@@ -130,15 +129,15 @@ msgstr ""
 
 msgid ""
 "For example, this is a link to the definition of :term:`concept`.\n"
-"As with any rST role, it can have :term:`custom text <concept>`."
+"Like any rST role, it can have :term:`custom text <concept>`."
 msgstr ""
 
 msgid "The resulting output will look like this:"
 msgstr ""
 
 msgid ""
-"For example, this is a link to the definition of :term:`concept`. As with "
-"any rST role, it can have :term:`custom text <concept>`."
+"For example, this is a link to the definition of :term:`concept`. Like any "
+"rST role, it can have :term:`custom text <concept>`."
 msgstr ""
 
 msgid "With acronyms, you can also use the `abbr` role:"
@@ -160,10 +159,10 @@ msgstr ""
 
 msgid ""
 "When writing in Russian, it's good to add the corresponding English term. "
-"Readers may be more familiar with it or can use it in search."
+"Readers may be more familiar with it or can search it online."
 msgstr ""
 
-msgid "Шардирование (сегментирование, sharding) — это..."
+msgid "Шардирование (сегментирование, sharding) --- это..."
 msgstr ""
 
 msgid "Give examples or links to extra reading where you can."
diff --git a/locale/ru/LC_MESSAGES/dev_guide/building_from_source.po b/locale/ru/LC_MESSAGES/dev_guide/building_from_source.po
index 553d824fc7..95880fcc3a 100644
--- a/locale/ru/LC_MESSAGES/dev_guide/building_from_source.po
+++ b/locale/ru/LC_MESSAGES/dev_guide/building_from_source.po
@@ -146,8 +146,8 @@ msgid "RHEL/CentOS 7"
 msgstr ""
 
 msgid ""
-"$ yum install python-pip\n"
-"$ yum install epel-release\n"
+"$ yum install -y python-pip\n"
+"$ yum install -y epel-release\n"
 "\n"
 "$ curl -s https://packagecloud.io/install/repositories/packpack/backports/script.rpm.sh | bash\n"
 "\n"
@@ -178,10 +178,10 @@ msgid "CentOS 8"
 msgstr ""
 
 msgid ""
-"$ dnf install epel-release\n"
+"$ dnf install -y epel-release\n"
 "\n"
-"$ dnf install -y git gcc cmake3 make gcc-c++ zlib-devel readline-devel \\\n"
-"  ncurses-devel openssl-devel libunwind-devel libicu-devel \\\n"
+"$ dnf install -y git gcc cmake3 libarchive make gcc-c++ zlib-devel \\\n"
+"  readline-devel ncurses-devel openssl-devel libunwind-devel libicu-devel \\\n"
 "  python3-pyyaml python3-six python3-gevent\n"
 "\n"
 "$ git clone https://github.com/tarantool/tarantool.git --recursive\n"
diff --git a/locale/ru/LC_MESSAGES/dev_guide/internals/box_protocol.po b/locale/ru/LC_MESSAGES/dev_guide/internals/box_protocol.po
index 6ff5f08430..a9e3d8720b 100644
--- a/locale/ru/LC_MESSAGES/dev_guide/internals/box_protocol.po
+++ b/locale/ru/LC_MESSAGES/dev_guide/internals/box_protocol.po
@@ -72,7 +72,9 @@ msgid ""
 "<box_protocol-join>` |br|:ref:`IPROTO_SUBSCRIBE <box_protocol-join>` "
 "|br|:ref:`IPROTO_VOTE_DEPRECATED <box_protocol-join>` |br|:ref:`IPROTO_VOTE "
 "<box_protocol-join>` |br|:ref:`IPROTO_FETCH_SNAPSHOT <box_protocol-join>` "
-"|br|:ref:`IPROTO_REGISTER <box_protocol-join>`"
+"|br|:ref:`IPROTO_REGISTER <box_protocol-join>` |br|:ref:`IPROTO_BEGIN "
+"<box_protocol-begin>` |br|:ref:`IPROTO_COMMIT <box_protocol-commit>` "
+"|br|:ref:`IPROTO_ROLLBACK <box_protocol-rollback>`"
 msgstr ""
 "Запросы: |br|:ref:`IPROTO_SELECT <box_protocol-select>` "
 "|br|:ref:`IPROTO_INSERT <box_protocol-insert>` |br|:ref:`IPROTO_REPLACE "
@@ -87,7 +89,9 @@ msgstr ""
 "<box_protocol-join>` |br|:ref:`IPROTO_SUBSCRIBE <box_protocol-join>` "
 "|br|:ref:`IPROTO_VOTE_DEPRECATED <box_protocol-join>` |br|:ref:`IPROTO_VOTE "
 "<box_protocol-join>` |br|:ref:`IPROTO_FETCH_SNAPSHOT <box_protocol-join>` "
-"|br|:ref:`IPROTO_REGISTER <box_protocol-join>`"
+"|br|:ref:`IPROTO_REGISTER <box_protocol-join>` |br|:ref:`IPROTO_BEGIN "
+"<box_protocol-begin>` |br|:ref:`IPROTO_COMMIT <box_protocol-commit>` "
+"|br|:ref:`IPROTO_ROLLBACK <box_protocol-rollback>`"
 
 msgid "Body of a request"
 msgstr "Тело запроса"
@@ -224,8 +228,11 @@ msgid ""
 "IPROTO_EXECUTE=0x0b\n"
 "IPROTO_NOP=0x0c\n"
 "IPROTO_PREPARE=0x0d\n"
-"IPROTO_CONFIRM=0x28\n"
-"IPROTO_ROLLBACK=0x29\n"
+"IPROTO_BEGIN=0x0e\n"
+"IPROTO_COMMIT=0x0f\n"
+"IPROTO_ROLLBACK=0x10\n"
+"IPROTO_RAFT_CONFIRM=0x28\n"
+"IPROTO_RAFT_ROLLBACK=0x29\n"
 "IPROTO_PING=0x40\n"
 "IPROTO_JOIN=0x41\n"
 "IPROTO_SUBSCRIBE=0x42\n"
@@ -247,8 +254,11 @@ msgstr ""
 "IPROTO_EXECUTE=0x0b\n"
 "IPROTO_NOP=0x0c\n"
 "IPROTO_PREPARE=0x0d\n"
-"IPROTO_CONFIRM=0x28\n"
-"IPROTO_ROLLBACK=0x29\n"
+"IPROTO_BEGIN=0x0e\n"
+"IPROTO_COMMIT=0x0f\n"
+"IPROTO_ROLLBACK=0x10\n"
+"IPROTO_RAFT_CONFIRM=0x28\n"
+"IPROTO_RAFT_ROLLBACK=0x29\n"
 "IPROTO_PING=0x40\n"
 "IPROTO_JOIN=0x41\n"
 "IPROTO_SUBSCRIBE=0x42\n"
@@ -273,6 +283,7 @@ msgid ""
 "IPROTO_TIMESTAMP=0x04\n"
 "IPROTO_SCHEMA_VERSION=0x05\n"
 "IPROTO_FLAGS=0x09\n"
+"IPROTO_STREAM_ID=0x0a\n"
 "IPROTO_SPACE_ID=0x10\n"
 "IPROTO_INDEX_ID=0x11\n"
 "IPROTO_LIMIT=0x12\n"
@@ -322,6 +333,7 @@ msgstr ""
 "IPROTO_TIMESTAMP=0x04\n"
 "IPROTO_SCHEMA_VERSION=0x05\n"
 "IPROTO_FLAGS=0x09\n"
+"IPROTO_STREAM_ID=0x0a\n"
 "IPROTO_SPACE_ID=0x10\n"
 "IPROTO_INDEX_ID=0x11\n"
 "IPROTO_LIMIT=0x12\n"
@@ -451,12 +463,14 @@ msgid ""
 "    IPROTO_REQUEST_TYPE: :samp:`{{MP_UINT unsigned integer}}`,\n"
 "    IPROTO_SYNC: :samp:`{{MP_UINT unsigned integer}}`,\n"
 "    IPROTO_SCHEMA_VERSION: :samp:`{{MP_UINT unsigned integer}}`\n"
+"    IPROTO_STREAM_ID: :samp:`{{MP_UINT unsigned integer}}`\n"
 "})"
 msgstr ""
 "msgpack({\n"
 "    IPROTO_REQUEST_TYPE: :samp:`{{MP_UINT unsigned integer}}`,\n"
 "    IPROTO_SYNC: :samp:`{{MP_UINT unsigned integer}}`,\n"
 "    IPROTO_SCHEMA_VERSION: :samp:`{{MP_UINT unsigned integer}}`\n"
+"    IPROTO_STREAM_ID: :samp:`{{MP_UINT unsigned integer}}`\n"
 "})"
 
 msgid ""
@@ -497,6 +511,22 @@ msgstr ""
 "IPROTO_SCHEMA_VERSION присутствует всегда, и клиент должен сам проверить, не"
 " изменилась ли версия."
 
+msgid ""
+"**IPROTO_STREAM_ID** = 0x0a. An unsigned number that should be unique in "
+"every stream. In requests IPROTO_STREAM_ID is optional and is useful for two"
+" things: ensuring that requests within transactions are done in separate "
+"groups, and ensuring strictly consistent execution of requests (whether or "
+"not they are within transactions). In responses IPROTO_STREAM_ID does not "
+"appear. See :ref:`Binary protocol -- streams <box_protocol-streams>`."
+msgstr ""
+"**IPROTO_STREAM_ID** = 0x0a. Беззнаковое число, которое должно быть "
+"уникально для каждого стрима. В запросах указывать значение IPROTO_STREAM_ID"
+" необязательно. Однако оно может понадобиться, если необходимо обрабатывать "
+"запросы внутри транзакций отдельными группами или выполнять запросы строго "
+"последовательно независимо от того, входят ли они в ту или иную транзакцию. "
+"В ответах IPROTO_STREAM_ID отсутствует. См. :ref:`Бинарный протокол -- "
+"стримы<box_protocol-streams>`."
+
 msgid ""
 "Have a look at file `xrow.c "
 "<https://github.com/tarantool/tarantool/blob/master/src/box/xrow.c>`_ "
@@ -996,11 +1026,11 @@ msgstr ""
 "})"
 
 msgid ""
-"Example: if this is the fifth message, |br| "
-":samp:`{conn}.:code:`eval('return 5;')` will cause:"
+"Example: if this is the fifth message, :samp:`conn:eval('return 5;')` will "
+"cause:"
 msgstr ""
-"Пример: если это пятое сообщение, |br| :samp:`{conn}.:code:`eval('return "
-"5;')` вызовет:"
+"Пример. Если это пятое сообщение, :samp:`conn:eval('return 5;')` приведет к "
+"следующему:"
 
 msgid ""
 "# <size>\n"
@@ -1155,17 +1185,17 @@ msgstr ""
 "})"
 
 msgid ""
-"Use IPROTO_STMT_ID (0x43) + statement-id (MP_INT) if executing a prepared "
-"statement, or use IPROTO_SQL_TEXT (0x40) + statement-text (MP_STR) if "
-"executing an SQL string, then IPROTO_SQL_BIND (0x41) + array of parameter "
+"Use IPROTO_STMT_ID (0x43) and statement-id (MP_INT) if executing a prepared "
+"statement, or use IPROTO_SQL_TEXT (0x40) and statement-text (MP_STR) if "
+"executing an SQL string, then IPROTO_SQL_BIND (0x41) and array of parameter "
 "values to match ? placeholders or :name placeholders, IPROTO_OPTIONS (0x2b) "
-"+ array of options (usually empty)."
+"and array of options (usually empty)."
 msgstr ""
-"При выполнении подготовленного оператора используйте IPROTO_STMT_ID (0x43) +"
+"При выполнении подготовленного оператора используйте IPROTO_STMT_ID (0x43) и"
 " ID оператора (MP_INT), при работе со строками SQL — IPROTO_SQL_TEXT (0x40) "
-"+ текст оператора (MP_STR), а затем IPROTO_SQL_BIND (0x41) + массив значений"
-" параметров для подстановочных знаков ? или :name, IPROTO_OPTIONS (0x2b) + "
-"массив параметров (обычно пустой)."
+"и текст оператора (MP_STR), а затем IPROTO_SQL_BIND (0x41) и массив значений"
+" параметров для подстановочных знаков ``?`` или ``:name``, IPROTO_OPTIONS "
+"(0x2b) и массив параметров (обычно пустой)."
 
 msgid ""
 "For example, suppose we prepare a statement with two ? placeholders, and "
@@ -1276,16 +1306,43 @@ msgstr ""
 "})"
 
 msgid ""
-"IPROTO_STMT_ID (0x43) + statement-id (MP_INT) if executing a prepared "
-"statement or IPROTO_SQL_TEXT (0x40) + statement-text (string) if executing "
-"an SQL string. Thus the IPROTO_PREPARE map item is the same as the first "
+"IPROTO_STMT_ID (0x43) and statement-id (MP_INT) if executing a prepared "
+"statement or IPROTO_SQL_TEXT (0x40) and statement-text (string) if executing"
+" an SQL string. Thus the IPROTO_PREPARE map item is the same as the first "
 "item of the :ref:`IPROTO_EXECUTE <box_protocol-execute>` body."
 msgstr ""
-"При выполнении подготовленного оператора используйте IPROTO_STMT_ID (0x43) +"
-" ID оператора (MP_INT), при работе со строками SQL — IPROTO_SQL_TEXT (0x40) "
-"+ текст оператора (string). Таким образом, элемент ассоциативного массива "
-"IPROTO_PREPARE — это то же самое, что и первый элемент тела сообщения "
-":ref:`IPROTO_EXECUTE <box_protocol-execute>`."
+"При выполнении подготовленного оператора используйте IPROTO_STMT_ID (0x43) и"
+" ID оператора (MP_INT), при работе со строками SQL --- IPROTO_SQL_TEXT "
+"(0x40) и текст оператора (string). Таким образом, элемент ассоциативного "
+"массива IPROTO_PREPARE — это то же самое, что и первый элемент тела "
+"сообщения :ref:`IPROTO_EXECUTE <box_protocol-execute>`."
+
+msgid "**IPROTO_BEGIN** = 0x0e."
+msgstr "**IPROTO_BEGIN** = 0x0e."
+
+msgid ""
+"This is for starting a transaction. Typically the header will include "
+"IPROTO_STREAM_ID. The body is: nothing. See the later section :ref:`Binary "
+"protocol -- streams <box_protocol-streams>`."
+msgstr ""
+"Этот запрос начинает транзакцию. Как правило, заголовок запроса включает "
+"IPROTO_STREAM_ID. Тело запроса пустое. См. раздел ниже :ref:`Бинарный "
+"протокол -- стримы<box_protocol-streams>`."
+
+msgid "**IPROTO_COMMIT** = 0x0f."
+msgstr "**IPROTO_COMMIT** = 0x0f."
+
+msgid ""
+"This is for ending a transaction. Typically the header will include "
+"IPROTO_STREAM_ID. The body is: nothing. See the later section :ref:`Binary "
+"protocol -- streams <box_protocol-streams>`."
+msgstr ""
+"Этот запрос завершает транзакцию. Как правило, заголовок запроса включает "
+"IPROTO_STREAM_ID. Тело запроса пустое. См. раздел ниже :ref:`Бинарный "
+"протокол -- стримы<box_protocol-streams>`."
+
+msgid "**IPROTO_ROLLBACK** = 0x10."
+msgstr "**IPROTO_ROLLBACK** = 0x10."
 
 msgid "**IPROTO_PING** = 0x40."
 msgstr "**IPROTO_PING** = 0x40."
@@ -1351,17 +1408,19 @@ msgstr ""
 "узлами Tarantool при :ref:`синхронной репликации <repl_sync>`. Эти сообщения"
 " не должны использоваться клиентскими приложениями при обычном соединении."
 
-msgid "**IPROTO_CONFIRM** = 0x28"
-msgstr "**IPROTO_CONFIRM** = 0x28"
+msgid "**IPROTO_RAFT_CONFIRM** = 0x28"
+msgstr "**IPROTO_RAFT_CONFIRM** = 0x28"
 
 msgid ""
 "This message confirms that the transactions originated from the instance "
 "with id = IPROTO_REPLICA_ID have achieved quorum and can be committed, up to"
-" and including LSN = IPROTO_LSN."
+" and including LSN = IPROTO_LSN. Prior to Tarantool version 2.10-beta1, "
+"IPROTO_RAFT_CONFIRM was called IPROTO_CONFIRM."
 msgstr ""
-"Это сообщение подтверждает, что транзакции до LSN = IPROTO_LSN включительно "
-"от экземпляра с ID = IPROTO_REPLICA_ID достигли кворума и могут быть "
-"зафиксированы."
+"Это сообщение подтверждает, что транзакции до ``LSN = IPROTO_LSN`` "
+"включительно из экземпляра с ``id = IPROTO_REPLICA_ID`` набрали кворум и "
+"могут пройти коммит. До версии Tarantool 2.10-beta1 запрос "
+"IPROTO_RAFT_CONFIRM назывался IPROTO_CONFIRM."
 
 msgid "The body is a 2-item map:"
 msgstr ""
@@ -1372,7 +1431,7 @@ msgid ""
 "msgpack(:samp:`{{MP_UINT unsigned integer = size(<header>) + size(<body>)}}`)\n"
 "# <header>\n"
 "msgpack({\n"
-"    IPROTO_REQUEST_TYPE: IPROTO_CONFIRM,\n"
+"    IPROTO_REQUEST_TYPE: IPROTO_RAFT_CONFIRM,\n"
 "    IPROTO_SYNC: :samp:`{{MP_UINT unsigned integer}}`\n"
 "})\n"
 "# <body>\n"
@@ -1385,7 +1444,7 @@ msgstr ""
 "msgpack(:samp:`{{MP_UINT unsigned integer = size(<header>) + size(<body>)}}`)\n"
 "# <header>\n"
 "msgpack({\n"
-"    IPROTO_REQUEST_TYPE: IPROTO_CONFIRM,\n"
+"    IPROTO_REQUEST_TYPE: IPROTO_RAFT_CONFIRM,\n"
 "    IPROTO_SYNC: :samp:`{{MP_UINT unsigned integer}}`\n"
 "})\n"
 "# <body>\n"
@@ -1394,24 +1453,26 @@ msgstr ""
 "    IPROTO_LSN: :samp:`{{MP_INT integer}}`\n"
 "})"
 
-msgid "**IPROTO_ROLLBACK** = 0x29"
-msgstr "**IPROTO_ROLLBACK** = 0x29"
+msgid "**IPROTO_RAFT_ROLLBACK** = 0x29"
+msgstr "**IPROTO_RAFT_ROLLBACK** = 0x29"
 
 msgid ""
 "This message says that the transactions originated from the instance with id"
 " = IPROTO_REPLICA_ID couldn't achieve quorum for some reason and should be "
-"rolled back, down to LSN = IPROTO_LSN and including it."
+"rolled back, down to LSN = IPROTO_LSN and including it. Prior to Tarantool "
+"version 2.10, IPROTO_RAFT_ROLLBACK was called IPROTO_ROLLBACK."
 msgstr ""
-"В этом сообщении говорится, что транзакции до LSN = IPROTO_LSN включительно "
-"от экземпляра с id = IPROTO_REPLICA_ID, по какой-то причине не смогли "
-"достичь кворума — их нужно откатить."
+"В этом сообщении говорится, что транзакции до ``LSN = IPROTO_LSN`` "
+"включительно из экземпляра с ``id = IPROTO_REPLICA_ID`` не смогли набрать "
+"кворум и будут отменены. До версии Tarantool 2.10 запрос "
+"IPROTO_RAFT_ROLLBACK назывался IPROTO_ROLLBACK."
 
 msgid ""
 "# <size>\n"
 "msgpack(:samp:`{{MP_UINT unsigned integer = size(<header>) + size(<body>)}}`)\n"
 "# <header>\n"
 "msgpack({\n"
-"    IPROTO_REQUEST_TYPE: IPROTO_ROLLBACK,\n"
+"    IPROTO_REQUEST_TYPE: IPROTO_RAFT_ROLLBACK,\n"
 "    IPROTO_SYNC: :samp:`{{MP_UINT unsigned integer}}`\n"
 "})\n"
 "# <body>\n"
@@ -1424,7 +1485,7 @@ msgstr ""
 "msgpack(:samp:`{{MP_UINT unsigned integer = size(<header>) + size(<body>)}}`)\n"
 "# <header>\n"
 "msgpack({\n"
-"    IPROTO_REQUEST_TYPE: IPROTO_ROLLBACK,\n"
+"    IPROTO_REQUEST_TYPE: IPROTO_RAFT_ROLLBACK,\n"
 "    IPROTO_SYNC: :samp:`{{MP_UINT unsigned integer}}`\n"
 "})\n"
 "# <body>\n"
@@ -1801,35 +1862,36 @@ msgstr ""
 
 msgid ""
 ":samp:`IPROTO_METADATA: {array of column maps}` = array of column maps, with"
-" each column map containing at least IPROTO_FIELD_NAME (0x00) + MP_STR, and "
-"IPROTO_FIELD_TYPE (0x01) + MP_STR. Additionally, if ``sql_full_metadata`` in"
-" the :ref:`_session_settings <box_space-session_settings>` system space is "
-"TRUE, then the array will have these additional column maps which correspond"
-" to components described in the :ref:`box.execute() <box-"
-"sql_if_full_metadata>` section:"
-msgstr ""
-":samp:`IPROTO_METADATA: {array of column maps}` = массив ассоциативных "
+" each column map containing at least IPROTO_FIELD_NAME (0x00) and MP_STR, "
+"and IPROTO_FIELD_TYPE (0x01) and MP_STR. Additionally, if "
+"``sql_full_metadata`` in the :ref:`_session_settings <box_space-"
+"session_settings>` system space is TRUE, then the array will have these "
+"additional column maps which correspond to components described in the "
+":ref:`box.execute() <box-sql_if_full_metadata>` section:"
+msgstr ""
+":samp:`IPROTO_METADATA: {array of column maps}` --- массив ассоциативных "
 "массивов, причем каждый ассоциативный массив содержит по крайней мере "
 "IPROTO_FIELD_NAME (0x00) + MP_STR и IPROTO_FIELD_TYPE (0x01) + MP_STR. Кроме"
-" того, если задано значение TRUE для ``sql_full_metadata`` в системном "
-"спейсе :ref:`_session_settings <box_space-session_settings>`, то массив "
-"будет содержать такие дополнительные ассоциативные массивы, которые "
+" того, если в системном спейсе :ref:`_session_settings <box_space-"
+"session_settings>` задано значение TRUE для ``sql_full_metadata``, то массив"
+" будет содержать такие дополнительные ассоциативные массивы, которые "
 "соответствуют компонентам, описанным в разделе :ref:`box.execute() <box-"
 "sql_if_full_metadata>`:"
 
 msgid ""
-"IPROTO_FIELD_COLL (0x02) + MP_STR\n"
-"IPROTO_FIELD_IS_NULLABLE (0x03) + MP_BOOL\n"
-"IPROTO_FIELD_IS_AUTOINCREMENT (0x04) + MP_BOOL\n"
-"IPROTO_FIELD_SPAN (0x05) + MP_STR or MP_NIL"
+"IPROTO_FIELD_COLL (0x02) and MP_STR\n"
+"IPROTO_FIELD_IS_NULLABLE (0x03) and MP_BOOL\n"
+"IPROTO_FIELD_IS_AUTOINCREMENT (0x04) and MP_BOOL\n"
+"IPROTO_FIELD_SPAN (0x05) and MP_STR or MP_NIL"
 msgstr ""
 "IPROTO_FIELD_COLL (0x02) + MP_STR\n"
 "IPROTO_FIELD_IS_NULLABLE (0x03) + MP_BOOL\n"
 "IPROTO_FIELD_IS_AUTOINCREMENT (0x04) + MP_BOOL\n"
-"IPROTO_FIELD_SPAN (0x05) + MP_STR or MP_NIL"
+"IPROTO_FIELD_SPAN (0x05) + MP_STR или MP_NIL"
 
 msgid ":samp:`IPROTO_DATA:{array of tuples}` = the result set \"rows\"."
 msgstr ""
+":samp:`IPROTO_DATA:{array of tuples}` = строки результирующего набора."
 
 msgid ""
 "Example: If we ask for full metadata by saying |br| "
@@ -1853,7 +1915,6 @@ msgid ""
 "        IPROTO_FIELD_IS_NULLABLE: false,\n"
 "        IPROTO_FIELD_IS_AUTOINCREMENT: true,\n"
 "        IPROTO_FIELD_SPAN: nil,\n"
-"         ,\n"
 "        IPROTO_FIELD_NAME: 'Д',\n"
 "        IPROTO_FIELD_TYPE: 'string',\n"
 "        IPROTO_FIELD_COLL: 'unicode',\n"
@@ -1874,7 +1935,6 @@ msgstr ""
 "        IPROTO_FIELD_IS_NULLABLE: false,\n"
 "        IPROTO_FIELD_IS_AUTOINCREMENT: true,\n"
 "        IPROTO_FIELD_SPAN: nil,\n"
-"         ,\n"
 "        IPROTO_FIELD_NAME: 'Д',\n"
 "        IPROTO_FIELD_TYPE: 'string',\n"
 "        IPROTO_FIELD_COLL: 'unicode',\n"
@@ -1891,16 +1951,15 @@ msgid ""
 "If instead we said |br| :code:`conn:prepare([[SELECT dd, дд AS д FROM "
 "t1;]])` |br| then we could get almost the same response, but there would be "
 "no IPROTO_DATA and there would be two additional items: |br| ``34 00 = "
-"IPROTO_BIND_COUNT + MP_UINT = 0`` (there are no parameters to bind), |br| "
-"``33 90 = IPROTO_BIND_METADATA + MP_ARRAY, size 0`` (there are no parameters"
-" to bind)."
+"IPROTO_BIND_COUNT and MP_UINT = 0`` (there are no parameters to bind), |br| "
+"``33 90 = IPROTO_BIND_METADATA and MP_ARRAY, size 0`` (there are no "
+"parameters to bind)."
 msgstr ""
-"Если бы вместо этого мы вызвали |br| :code:`conn:prepare([[SELECT dd, дд AS "
-"д FROM t1;]])` |br| то могли бы получить почти такой же ответ, но без "
-"IPROTO_DATA и с двумя дополнительными элементами: |br| ``34 00 = "
-"IPROTO_BIND_COUNT + MP_UINT = 0`` (привязка параметров не нужна), |br| ``33 "
-"90 = IPROTO_BIND_METADATA + MP_ARRAY, size 0`` (привязка параметров не "
-"нужна)."
+"Если бы вместо этого мы вызвали :code:`conn:prepare([[SELECT dd, дд AS д "
+"FROM t1;]])`, мы получили бы почти такой же ответ, но без IPROTO_DATA и с "
+"двумя дополнительными элементами: |br| ``34`` (IPROTO_BIND_COUNT) и ``00`` "
+"(MP_UINT = 0, нет параметров), ``33`` (IPROTO_BIND_METADATA) и ``90`` "
+"(MP_ARRAY размера 0, нет параметров)."
 
 msgid ""
 "# <body>\n"
@@ -1914,7 +1973,6 @@ msgid ""
 "            IPROTO_FIELD_IS_NULLABLE: false\n"
 "            IPROTO_FIELD_IS_AUTOINCREMENT: true\n"
 "            IPROTO_FIELD_SPAN: nil,\n"
-"            ,\n"
 "            IPROTO_FIELD_NAME: 'Д',\n"
 "            IPROTO_FIELD_TYPE: 'string',\n"
 "            IPROTO_FIELD_COLL: 'unicode',\n"
@@ -1934,7 +1992,6 @@ msgstr ""
 "            IPROTO_FIELD_IS_NULLABLE: false\n"
 "            IPROTO_FIELD_IS_AUTOINCREMENT: true\n"
 "            IPROTO_FIELD_SPAN: nil,\n"
-"            ,\n"
 "            IPROTO_FIELD_NAME: 'Д',\n"
 "            IPROTO_FIELD_TYPE: 'string',\n"
 "            IPROTO_FIELD_COLL: 'unicode',\n"
@@ -2115,6 +2172,138 @@ msgstr ""
 "`netbox_encode_auth`` в файле `net_box.c "
 "<https://github.com/tarantool/tarantool/blob/master/src/box/lua/net_box.c>`_."
 
+msgid "Binary protocol -- streams"
+msgstr "Бинарный протокол — стримы"
+
+msgid ""
+"The :ref:`Streams and interactive transactions <box_stream>` feature, which "
+"was added in Tarantool version :tarantool-release:`2.10.0-beta1`, allows two"
+" things: sequential processing and interleaving."
+msgstr ""
+":ref:`Стримы и интерактивные транзакции <box_stream>`, добавленные в "
+"Tarantool :tarantool-release:`2.10.0-beta1`, делают возможными две "
+"процедуры: последовательную обработку и чередование."
+
+msgid ""
+"Sequential processing: With streams there is a guarantee that the server "
+"instance will not handle the next request in a stream until it has completed"
+" the previous one."
+msgstr ""
+"Последовательная обработка гарантирует, что экземпляр не будет обрабатывать "
+"следующий запрос в стриме, пока не завершит работу с предыдущим."
+
+msgid ""
+"Interleaving: For example, a series of requests can include \"begin for "
+"stream #1\", \"begin for stream #2\", \"insert for stream #1\", \"insert for"
+" stream #2\", \"delete for stream #1\", \"commit for stream #1\", \"rollback"
+" for stream #2\"."
+msgstr ""
+"Чередование допускает, например, такую последовательность запросов: \"begin "
+"для стрима 1\", \"begin для стрима 2\", \"insert для стрима 1\", \"insert "
+"для стрима 2\", \"delete для стрима 1\", \"commit для стрима 1\", \"rollback"
+" для стрима 2\"."
+
+msgid ""
+"To make these things possible, the engine should be :ref:`vinyl <engines-"
+"vinyl>` or :ref:`memtx with mvcc <cfg_basic-memtx_use_mvcc_engine>`, and the"
+" client is responsible for ensuring that the stream identifier, unsigned "
+"integer :ref:`IPROTO_STREAM_ID <box_protocol-iproto_stream_id>`, is in the "
+"request header. IPROTO_STREAM_ID can be any positive 64-bit number, and "
+"should be unique for the connection. If IPROTO_STREAM_ID equals zero the "
+"server instance will ignore it."
+msgstr ""
+"Эти процедуры возможны, если используется движок :ref:`vinyl <engines-"
+"vinyl>` или :ref:`memtx с mvcc <cfg_basic-memtx_use_mvcc_engine>`. При этом "
+"клиент отвечает за наличие идентификатора стрима, беззнакового целого числа "
+":ref:`IPROTO_STREAM_ID <box_protocol-iproto_stream_id>`, в заголовке "
+"запроса. Идентификатор IPROTO_STREAM_ID должен быть положительным 64-битовым"
+" числом, уникальным для соединения. Если IPROTO_STREAM_ID стрима равен нулю,"
+" экземпляр его проигнорирует."
+
+msgid ""
+"For example, suppose that the client has started a stream with the "
+":ref:`net.box module <net_box-module>`"
+msgstr ""
+"Предположим, что клиент запустил стрим с помощью :ref:`модуля "
+"net.box<net_box-module>`."
+
+msgid ""
+"net_box = require('net.box')\n"
+"conn = net_box.connect('localhost:3302')\n"
+"stream = conn:new_stream()"
+msgstr ""
+"net_box = require('net.box')\n"
+"conn = net_box.connect('localhost:3302')\n"
+"stream = conn:new_stream()"
+
+msgid ""
+"At this point the stream object will look like a duplicate of the conn "
+"object, with just one additional member: ``stream_id``. Now, using stream "
+"instead of conn, the client sends two requests:"
+msgstr ""
+"В этот момент объект ``stream`` будет выглядеть так же, как объект ``conn``,"
+" но включать один дополнительный элемент: ``stream_id``. Пусть теперь "
+"клиент, используя ``stream`` вместо ``conn``, отправит два запроса:"
+
+msgid ""
+"stream.space.T:insert{1}\n"
+"stream.space.T:insert{2}"
+msgstr ""
+"stream.space.T:insert{1}\n"
+"stream.space.T:insert{2}"
+
+msgid ""
+"The header and body of these requests will be the same as in non-stream "
+":ref:`IPROTO_INSERT <box_protocol-insert>` requests, except that the header "
+"will contain an additional item: IPROTO_STREAM_ID=0x0a with MP_UINT=0x01. It"
+" happens to equal 1 for this example because each call to conn:new_stream() "
+"assigns a new number, starting with 1."
+msgstr ""
+"Заголовок и тело этих запросов будут такими же, как в обычных запросах "
+":ref:`IPROTO_INSERT <box_protocol-insert>`, но заголовок будет содержать "
+"дополнительный элемент ``IPROTO_STREAM_ID=0x0a``, где ``MP_UINT=0x01``. В "
+"этом примере значение IPROTO_STREAM_ID равно 1, так как при вызове "
+"``conn:new_stream()`` идентификатору каждого нового стрима присваивается "
+"уникальное значение, начиная с 1."
+
+msgid ""
+"The client makes stream transactions by sending, in order: IPROTO_BEGIN, the"
+" transaction data-change and query requests, IPROTO_COMMIT or "
+"IPROTO_ROLLBACK. Each request must contain the same IPROTO_STREAM_ID value. "
+"With streaming there is no need to add :ref:`IPROTO_FLAGS <box_protocol-"
+"flags>` and IPROTO_FLAG_COMMIT in the header of the last request of a "
+"transaction. Rollback will be automatic if disconnect occurs before commit "
+"is possible."
+msgstr ""
+"Клиент запускает транзакцию внутри стрима, отправляя запросы в следующем "
+"порядке: IPROTO_BEGIN, запросы на изменение и получение данных транзакции, "
+"затем IPROTO_COMMIT или IPROTO_ROLLBACK. Каждый запрос должен содержать "
+"переменную IPROTO_STREAM_ID с одним и тем же значением. Используя стримы, не"
+" нужно добавлять в заголовок последнего запроса транзакции "
+":ref:`IPROTO_FLAGS <box_protocol-flags>` и IPROTO_FLAG_COMMIT. Если "
+"транзакция прервется до того, как можно будет выполнить коммит, она будет "
+"автоматически отменена."
+
+msgid ""
+"Thus there are now multiple ways to do transactions: with net_box and "
+"stream:begin() and stream:commit() or stream:rollback() which cause "
+"IPROTO_BEGIN and IPROTO_COMMIT or IPROTO_ROLLBACK with the current value of "
+"stream.stream_id; with :ref:`box.begin() <box-begin>` and :ref:`box.commit()"
+" <box-commit>` or :ref:`box.rollback() <box-rollback>`; with SQL and "
+":ref:`START TRANSACTION <sql_start_transaction>` and :ref:`COMMIT "
+"<sql_commit>` or :ref:`ROLLBACK <sql_rollback>`. An application can use any "
+"or all of these ways."
+msgstr ""
+"Таким образом, у приложения есть несколько способов выполнять транзакции. "
+"Во-первых, можно использовать модуль ``net_box`` с методами "
+"``stream:begin()`` и ``stream:commit()``/``stream:rollback()``, которые "
+"отправляют запросы IPROTO_BEGIN и IPROTO_COMMIT/IPROTO_ROLLBACK с текущим "
+"значением ``stream.stream_id``. Другой способ --- применять методы "
+":ref:`box.begin() <box-begin>` и :ref:`box.commit() <box-"
+"commit>`/:ref:`box.rollback() <box-rollback>`. Наконец, можно пользоваться "
+"инструкциями SQL :ref:`START TRANSACTION <sql_start_transaction>` и "
+":ref:`COMMIT <sql_commit>`/:ref:`ROLLBACK <sql_rollback>`."
+
 msgid "Binary protocol -- replication"
 msgstr "Бинарный протокол — репликация"
 
@@ -2293,19 +2482,19 @@ msgstr ""
 "в IPROTO_BALLOT — это элементы ассоциативного массива:"
 
 msgid ""
-"IPROTO_BALLOT_IS_RO_CFG (0x01) + MP_BOOL\n"
-"IPROTO_BALLOT_VCLOCK (0x02) + vclock\n"
-"IPROTO_BALLOT_GC_VCLOCK (0x03) + vclock\n"
-"IPROTO_BALLOT_IS_RO (0x04) + MP_BOOL\n"
-"IPROTO_BALLOT_IS_ANON = 0x05 + MP_BOOL\n"
-"IPROTO_BALLOT_IS_BOOTED = 0x06 + MP_BOOL"
+"IPROTO_BALLOT_IS_RO_CFG (0x01) and MP_BOOL\n"
+"IPROTO_BALLOT_VCLOCK (0x02) and vclock\n"
+"IPROTO_BALLOT_GC_VCLOCK (0x03) and vclock\n"
+"IPROTO_BALLOT_IS_RO (0x04) and MP_BOOL\n"
+"IPROTO_BALLOT_IS_ANON = 0x05 and MP_BOOL\n"
+"IPROTO_BALLOT_IS_BOOTED = 0x06 and MP_BOOL"
 msgstr ""
-"IPROTO_BALLOT_IS_RO_CFG (0x01) + MP_BOOL\n"
-"IPROTO_BALLOT_VCLOCK (0x02) + vclock\n"
-"IPROTO_BALLOT_GC_VCLOCK (0x03) + vclock\n"
-"IPROTO_BALLOT_IS_RO (0x04) + MP_BOOL\n"
-"IPROTO_BALLOT_IS_ANON = 0x05 + MP_BOOL\n"
-"IPROTO_BALLOT_IS_BOOTED = 0x06 + MP_BOOL"
+"IPROTO_BALLOT_IS_RO_CFG (0x01) и MP_BOOL\n"
+"IPROTO_BALLOT_VCLOCK (0x02) и vclock\n"
+"IPROTO_BALLOT_GC_VCLOCK (0x03) и vclock\n"
+"IPROTO_BALLOT_IS_RO (0x04) и MP_BOOL\n"
+"IPROTO_BALLOT_IS_ANON = 0x05 и MP_BOOL\n"
+"IPROTO_BALLOT_IS_BOOTED = 0x06 и MP_BOOL"
 
 msgid ""
 "IPROTO_BALLOT_IS_RO_CFG and IPRO_BALLOT_VCLOCK and IPROTO_BALLOT_GC_VCLOCK "
@@ -2502,6 +2691,27 @@ msgid ""
 "cd 01 18               MP_UINT = 280 (Select-Map Item#6, Key-Array Item#1)\n"
 "                       -- 280 is the key value that we are searching for"
 msgstr ""
+"ce 00 00 00 1b   MP_UINT = 27, десятичное число = число байт после этого\n"
+"82               MP_MAP, размер 2 (назовем это Main-Map)\n"
+"01                 IPROTO_SYNC (1-й элемент Main-Map)\n"
+"04                 MP_INT = 4 = число, которое увеличивается на 1 с каждым запросом\n"
+"00                 IPROTO_REQUEST_TYPE (2-й элемент Main-Map)\n"
+"01                 IPROTO_SELECT\n"
+"86                 MP_MAP, размер 6 (назовем это Select-Map)\n"
+"10                   IPROTO_SPACE_ID (1-й элемент Select-Map)\n"
+"cd 02 00             MP_UINT = 512, десятичное число = id tspace (может быть больше)\n"
+"11                   IPROTO_INDEX_ID (2-й элемент Select-Map)\n"
+"00                   MP_INT = 0 = id индекса в tspace\n"
+"14                   IPROTO_ITERATOR (3-й элемент Select-Map)\n"
+"00                   MP_INT = 0 = константа Tarantool iterator_type.h ITER_EQ\n"
+"13                   IPROTO_OFFSET (4-й элемент Select-Map)\n"
+"00                   MP_INT = 0 = смещение\n"
+"12                   IPROTO_LIMIT (5-й элемент Select-Map)\n"
+"ce ff ff ff ff       MP_UINT = 4294967295 = наибольший возможный предел\n"
+"20                   IPROTO_KEY (6-й элемент Select-Map)\n"
+"91                   MP_ARRAY, размер 1 (назовем это Key-Array)\n"
+"cd 01 18               MP_UINT = 280 (6-й элемент Select-Map, 1-й элемент Key-Array)\n"
+"                       -- 280, ключевое значение, которое мы ищем"
 
 msgid ""
 "Now read the source code file `net_box.c "
@@ -2569,10 +2779,27 @@ msgid ""
 "91                 MP_ARRAY, size 1, for array of key values\n"
 "02                   MP_UINT = primary-key value = 2"
 msgstr ""
+"04               IPROTO_UPDATE\n"
+"85               IPROTO_MAP, размер 5\n"
+"10                 IPROTO_SPACE_ID, 1-й элемент ассоциативного массива\n"
+"cd 02 00           MP_UINT 256\n"
+"11                 IPROTO_INDEX_ID, 2-й элемент ассоциативного массива\n"
+"00                 MP_INT 0 = номер индекса первичного ключа\n"
+"15                 IPROTO_INDEX_BASE, 3-й элемент ассоциативного массива\n"
+"01                 MP_INT = 1, т.е. нумерация полей начинается с 1\n"
+"21                 IPROTO_TUPLE, 4-й элемент ассоциативного массива\n"
+"91                 MP_ARRAY, размер 1, для массива операций\n"
+"93                   MP_ARRAY, размер 3\n"
+"a1 3d                   MP_STR = OPERATOR = '='\n"
+"02                      MP_INT = FIELD_NO = 2\n"
+"a5 42 42 42 42 42       MP_STR = VALUE = 'BBBB'\n"
+"20                 IPROTO_KEY, 5--й элемент ассоциативного массива\n"
+"91                 MP_ARRAY, размер 1, для массива ключей\n"
+"02                   MP_UINT = значение первичного ключа = 2"
 
 msgid ""
 "Byte codes for the :ref:`IPROTO_EXECUTE <box_protocol-execute>` example:"
-msgstr ""
+msgstr "Пример байт-кода :ref:`IPROTO_EXECUTE <box_protocol-execute>`:"
 
 msgid ""
 "0b               IPROTO_EXECUTE\n"
@@ -2586,15 +2813,27 @@ msgid ""
 "2b                 IPROTO_OPTIONS Map Item#3\n"
 "90                 MP_ARRAY, size 0 (there are no options)"
 msgstr ""
+"0b               IPROTO_EXECUTE\n"
+"83               MP_MAP, размер 3\n"
+"43                 IPROTO_STMT_ID 1-й элемент ассоциативного массива\n"
+"ce d7 aa 74 1b     MP_UINT значение n.stmt_id\n"
+"41                 IPROTO_SQL_BIND 2-й элемент ассоциативного массива\n"
+"92                 MP_ARRAY, размер 2\n"
+"01                   MP_INT = 1 = значение первого параметра\n"
+"a1 61                MP_STR = 'a' = значение второго параметра\n"
+"2b                 IPROTO_OPTIONS 3-й элемент ассоциативного массива\n"
+"90                 MP_ARRAY, размер 0 (никакие опции не выбраны)"
 
 msgid ""
 "Byte codes for the response to the "
 ":codenormal:`box.space.`:codeitalic:`space-name`:codenormal:`:insert{6}` "
 "example:"
 msgstr ""
+"Пример байт-кода ответа на запрос "
+":codenormal:`box.space.`:codeitalic:`space-name`:codenormal:`:insert{6}`:"
 
 msgid ""
-"ce 00 00 00 20                MP_UINT = HEADER + BODY SIZE\n"
+"ce 00 00 00 20                MP_UINT = HEADER AND BODY SIZE\n"
 "83                            MP_MAP, size 3\n"
 "00                              Response-Code-Indicator\n"
 "ce 00 00 00 00                  MP_UINT = IPROTO_OK\n"
@@ -2608,14 +2847,29 @@ msgid ""
 "91                              MP_ARRAY, size 1 (field count)\n"
 "06                              MP_INT = 6 = the value that was inserted"
 msgstr ""
+"ce 00 00 00 20                MP_UINT = размер заголовка и тела\n"
+"83                            MP_MAP, размер 3\n"
+"00                              индикатор кода ответа\n"
+"ce 00 00 00 00                  MP_UINT = IPROTO_OK\n"
+"01                              IPROTO_SYNC\n"
+"cf 00 00 00 00 00 00 00 53      MP_UINT = значение синхронизации\n"
+"05                              IPROTO_SCHEMA_VERSION\n"
+"ce 00 00 00 68                  MP_UINT = версия схемы\n"
+"81                            MP_MAP, размер 1\n"
+"30                              IPROTO_DATA\n"
+"dd 00 00 00 01                  MP_ARRAY, размер 1 (число строк)\n"
+"91                              MP_ARRAY, размер 1 (число полей)\n"
+"06                              MP_INT = 6 = добавленное значение"
 
 msgid ""
 "Byte codes for the response to the "
 "``conn:eval([[box.schema.space.create('_space');]])`` example:"
 msgstr ""
+"Пример байт-кода ответа на запрос "
+"``conn:eval([[box.schema.space.create('_space');]])``:"
 
 msgid ""
-"ce 00 00 00 3b                  MP_UINT = HEADER + BODY SIZE\n"
+"ce 00 00 00 3b                  MP_UINT = HEADER AND BODY SIZE\n"
 "83                              MP_MAP, size 3 (i.e. 3 items in header)\n"
 "   00                              Response-Code-Indicator\n"
 "   ce 00 00 80 0a                  MP_UINT = hexadecimal 800a\n"
@@ -2627,6 +2881,17 @@ msgid ""
 "     31                              IPROTO_ERROR_24\n"
 "     db 00 00 00 1d 53 70 61 63 etc. MP_STR = \"Space '_space' already exists\""
 msgstr ""
+"ce 00 00 00 3b                  MP_UINT = размер заголовка и тела\n"
+"83                              MP_MAP, размер 3 (3 элемента в заголовке)\n"
+"   00                              индикатор кода ответа\n"
+"   ce 00 00 80 0a                  MP_UINT = шестнадцатеричное значение 800a\n"
+"   01                              IPROTO_SYNC\n"
+"   cf 00 00 00 00 00 00 00 26      MP_UINT = значение синхронизации\n"
+"   05                              IPROTO_SCHEMA_VERSION\n"
+"   ce 00 00 00 78                  MP_UINT = версия схемы \n"
+"   81                              MP_MAP, размер 1\n"
+"     31                              IPROTO_ERROR_24\n"
+"     db 00 00 00 1d 53 70 61 63 ... MP_STR = \"Space '_space' already exists\""
 
 msgid ""
 "Byte codes, if we use the same net.box connection that we used for "
@@ -2640,6 +2905,16 @@ msgid ""
 " from net.box which users will not see); (2) the final bytes of the response"
 " to the INSERT will be:"
 msgstr ""
+"Подключимся через то же соединение net.box, что приводилось в разделе "
+":ref:`Бинарный протокол --- примеры <box_protocol-illustration>`, и выполним"
+" следующее: |br| ``conn:execute([[CREATE TABLE t1 (dd INT PRIMARY KEY "
+"AUTOINCREMENT, дд STRING COLLATE \"unicode\");]])`` |br| "
+"``conn:execute([[INSERT INTO t1 VALUES (NULL, 'a'), (NULL, 'b');]])`` |br| "
+"Результат вывода tcpdump покажет два интересных момента: (1) инструкция "
+"CREATE привела к изменению схемы, так что в ответе указано новое значение "
+"IPROTO_SCHEMA_VERSION. При этом тело включает новое содержимое некоторых "
+"системных таблиц, полученное в результате невидимых для пользователя "
+"запросов от net.box; (2) последние байты ответа на INSERT будут следующими:"
 
 msgid ""
 "81   MP_MAP, size 1\n"
@@ -2652,6 +2927,15 @@ msgid ""
 "01         first autoincrement number\n"
 "02         second autoincrement number"
 msgstr ""
+"81   MP_MAP, размер 1\n"
+"42     IPROTO_SQL_INFO\n"
+"82     MP_MAP, размер 2\n"
+"00       константа Tarantool (не из iproto_constants.h) = SQL_INFO_ROW_COUNT\n"
+"02       1 = число строк\n"
+"01       константа Tarantool (не из iproto_constants.h) = SQL_INFO_AUTOINCREMENT_ID\n"
+"92       MP_ARRAY, размер 2\n"
+"01         первое число с автоинкрементом\n"
+"02         второе число с автоинкрементом"
 
 msgid ""
 "Byte codes for the SQL SELECT example, if we ask for full metadata by saying"
@@ -2660,23 +2944,28 @@ msgid ""
 "just created |br| :code:`conn:execute([[SELECT dd, дд AS д FROM t1;]])` |br|"
 " then tcpdump will show this response, after the header:"
 msgstr ""
+"Пример байт-кода SQL SELECT. Запросим полные метаданные, вызвав "
+":code:`conn.space._session_settings:update('sql_full_metadata', {{'=', "
+"'value', true}})`, и выберем две строки из только что созданной таблицы: "
+":code:`conn:execute([[SELECT dd, дд AS д FROM t1;]])`. tcpdump выдаст "
+"следующий ответ (после заголовка):"
 
 msgid ""
 "82                       MP_MAP, size 2 (i.e. metadata and rows)\n"
 "32                         IPROTO_METADATA\n"
 "92                         MP_ARRAY, size 2 (i.e. 2 columns)\n"
 "85                           MP_MAP, size 5 (i.e. 5 items for column#1)\n"
-"00 a2 44 44                    IPROTO_FIELD_NAME + 'DD'\n"
-"01 a7 69 6e 74 65 67 65 72     IPROTO_FIELD_TYPE + 'integer'\n"
-"03 c2                          IPROTO_FIELD_IS_NULLABLE + false\n"
-"04 c3                          IPROTO_FIELD_IS_AUTOINCREMENT + true\n"
-"05 c0                          PROTO_FIELD_SPAN + nil\n"
+"00 a2 44 44                    IPROTO_FIELD_NAME and 'DD'\n"
+"01 a7 69 6e 74 65 67 65 72     IPROTO_FIELD_TYPE and 'integer'\n"
+"03 c2                          IPROTO_FIELD_IS_NULLABLE and false\n"
+"04 c3                          IPROTO_FIELD_IS_AUTOINCREMENT and true\n"
+"05 c0                          PROTO_FIELD_SPAN and nil\n"
 "85                           MP_MAP, size 5 (i.e. 5 items for column#2)\n"
-"00 a2 d0 94                    IPROTO_FIELD_NAME + 'Д' upper case\n"
-"01 a6 73 74 72 69 6e 67        IPROTO_FIELD_TYPE + 'string'\n"
-"02 a7 75 6e 69 63 6f 64 65     IPROTO_FIELD_COLL + 'unicode'\n"
-"03 c3                          IPROTO_FIELD_IS_NULLABLE + true\n"
-"05 a4 d0 b4 d0 b4              IPROTO_FIELD_SPAN + 'дд' lower case\n"
+"00 a2 d0 94                    IPROTO_FIELD_NAME and 'Д' upper case\n"
+"01 a6 73 74 72 69 6e 67        IPROTO_FIELD_TYPE and 'string'\n"
+"02 a7 75 6e 69 63 6f 64 65     IPROTO_FIELD_COLL and 'unicode'\n"
+"03 c3                          IPROTO_FIELD_IS_NULLABLE and true\n"
+"05 a4 d0 b4 d0 b4              IPROTO_FIELD_SPAN and 'дд' lower case\n"
 "30                         IPROTO_DATA\n"
 "92                         MP_ARRAY, size 2\n"
 "92                           MP_ARRAY, size 2\n"
@@ -2686,16 +2975,59 @@ msgid ""
 "02                             MP_INT = 2 i.e. contents of row#2 column#1\n"
 "a1 62                          MP_STR = 'b' i.e. contents of row#2 column#2"
 msgstr ""
+"82                       MP_MAP, размер 2 (метаданные и строки)\n"
+"32                         IPROTO_METADATA\n"
+"92                         MP_ARRAY, размер 2 (2 столбца)\n"
+"85                           MP_MAP, размер 5 (5 элементов для столбца 1)\n"
+"00 a2 44 44                    IPROTO_FIELD_NAME и 'DD'\n"
+"01 a7 69 6e 74 65 67 65 72     IPROTO_FIELD_TYPE и 'integer'\n"
+"03 c2                          IPROTO_FIELD_IS_NULLABLE и false\n"
+"04 c3                          IPROTO_FIELD_IS_AUTOINCREMENT и true\n"
+"05 c0                          PROTO_FIELD_SPAN и nil\n"
+"85                           MP_MAP, размер 5 (5 элементов для столбца 2)\n"
+"00 a2 d0 94                    IPROTO_FIELD_NAME и 'Д' в верхнем регистре\n"
+"01 a6 73 74 72 69 6e 67        IPROTO_FIELD_TYPE и 'string'\n"
+"02 a7 75 6e 69 63 6f 64 65     IPROTO_FIELD_COLL и 'unicode'\n"
+"03 c3                          IPROTO_FIELD_IS_NULLABLE и true\n"
+"05 a4 d0 b4 d0 b4              IPROTO_FIELD_SPAN и 'дд' в нижнем регистре\n"
+"30                         IPROTO_DATA\n"
+"92                         MP_ARRAY, размер 2\n"
+"92                           MP_ARRAY, размер 2\n"
+"01                             MP_INT = 1: содержимое строки 1, столбца 1\n"
+"a1 61                          MP_STR = 'a': содержимое строки 1, столбца 2\n"
+"92                           MP_ARRAY, размер 2\n"
+"02                             MP_INT = 2: содержимое строки 2, столбца 1\n"
+"a1 62                          MP_STR = 'b': содержимое строки 2, столбца 2"
 
 msgid ""
 "Byte code for the SQL PREPARE example. If we said |br| "
 ":code:`conn:prepare([[SELECT dd, дд AS д FROM t1;]])` |br| then tcpdump "
-"would should show almost the same response, but there would be no "
-"IPROTO_DATA and there would be two additional items: |br| :code:`34 00 = "
-"IPROTO_BIND_COUNT + MP_UINT = 0` (there are no parameters to bind), |br| "
-":code:`33 90 = IPROTO_BIND_METADATA + MP_ARRAY`, size 0 (there are no "
-"parameters to bind)."
+"would show almost the same response, but there would be no IPROTO_DATA. "
+"Instead, additional items will appear:"
+msgstr ""
+"Пример байт-кода SQL PREPARE. Если вызвать :code:`conn:prepare([[SELECT dd, "
+"дд AS д FROM t1;]])`, вывод tcpdump будет почти таким же, но исчезнет "
+"IPROTO_DATA. Вместо этого появятся дополнительные байты:"
+
+msgid ""
+"34                       IPROTO_BIND_COUNT\n"
+"00                       MP_UINT = 0\n"
+"\n"
+"33                       IPROTO_BIND_METADATA\n"
+"90                       MP_ARRAY, size 0"
+msgstr ""
+"34                       IPROTO_BIND_COUNT\n"
+"00                       MP_UINT = 0\n"
+"\n"
+"33                       IPROTO_BIND_METADATA\n"
+"90                       MP_ARRAY, размер 0"
+
+msgid ""
+"``MP_UINT = 0`` and ``MP_ARRAY`` has size 0 because there are no parameters "
+"to bind. Full output:"
 msgstr ""
+"``MP_UINT = 0``. Массив ``MP_ARRAY`` имеет размер 0, поскольку параметров "
+"нет. Вывод целиком:"
 
 msgid ""
 "84                       MP_MAP, size 4\n"
@@ -2708,21 +3040,44 @@ msgid ""
 "32                         IPROTO_METADATA\n"
 "92                         MP_ARRAY, size 2 (i.e. 2 columns)\n"
 "85                           MP_MAP, size 5 (i.e. 5 items for column#1)\n"
-"00 a2 44 44                    IPROTO_FIELD_NAME + 'DD'\n"
-"01 a7 69 6e 74 65 67 65 72     IPROTO_FIELD_TYPE + 'integer'\n"
-"03 c2                          IPROTO_FIELD_IS_NULLABLE + false\n"
-"04 c3                          IPROTO_FIELD_IS_AUTOINCREMENT + true\n"
-"05 c0                          PROTO_FIELD_SPAN + nil\n"
+"00 a2 44 44                    IPROTO_FIELD_NAME and 'DD'\n"
+"01 a7 69 6e 74 65 67 65 72     IPROTO_FIELD_TYPE and 'integer'\n"
+"03 c2                          IPROTO_FIELD_IS_NULLABLE and false\n"
+"04 c3                          IPROTO_FIELD_IS_AUTOINCREMENT and true\n"
+"05 c0                          PROTO_FIELD_SPAN and nil\n"
 "85                           MP_MAP, size 5 (i.e. 5 items for column#2)\n"
-"00 a2 d0 94                    IPROTO_FIELD_NAME + 'Д' upper case\n"
-"01 a6 73 74 72 69 6e 67        IPROTO_FIELD_TYPE + 'string'\n"
-"02 a7 75 6e 69 63 6f 64 65     IPROTO_FIELD_COLL + 'unicode'\n"
-"03 c3                          IPROTO_FIELD_IS_NULLABLE + true\n"
-"05 a4 d0 b4 d0 b4              IPROTO_FIELD_SPAN + 'дд' lower case"
+"00 a2 d0 94                    IPROTO_FIELD_NAME and 'Д' upper case\n"
+"01 a6 73 74 72 69 6e 67        IPROTO_FIELD_TYPE and 'string'\n"
+"02 a7 75 6e 69 63 6f 64 65     IPROTO_FIELD_COLL and 'unicode'\n"
+"03 c3                          IPROTO_FIELD_IS_NULLABLE and true\n"
+"05 a4 d0 b4 d0 b4              IPROTO_FIELD_SPAN and 'дд' lower case"
 msgstr ""
+"84                       MP_MAP, размер 4\n"
+"43                         IPROTO_STMT_ID\n"
+"ce c2 3c 2c 1e             MP_UINT = ID инструкции\n"
+"34                         IPROTO_BIND_COUNT\n"
+"00                         MP_INT = 0 = число привязываемых параметров\n"
+"33                         IPROTO_BIND_METADATA\n"
+"90                         MP_ARRAY, размер 0 = нет привязываемых параметров\n"
+"32                         IPROTO_METADATA\n"
+"92                         MP_ARRAY, размер 2 (2 столбца)\n"
+"85                           MP_MAP, размер 5 (5 элементов для столбца 1)\n"
+"00 a2 44 44                    IPROTO_FIELD_NAME и 'DD'\n"
+"01 a7 69 6e 74 65 67 65 72     IPROTO_FIELD_TYPE и 'integer'\n"
+"03 c2                          IPROTO_FIELD_IS_NULLABLE и false\n"
+"04 c3                          IPROTO_FIELD_IS_AUTOINCREMENT и true\n"
+"05 c0                          PROTO_FIELD_SPAN и nil\n"
+"85                           MP_MAP, размер 5 (5 элементов для столбца 2)\n"
+"00 a2 d0 94                    IPROTO_FIELD_NAME + 'Д' в верхнем регистре\n"
+"01 a6 73 74 72 69 6e 67        IPROTO_FIELD_TYPE и 'string'\n"
+"02 a7 75 6e 69 63 6f 64 65     IPROTO_FIELD_COLL и 'unicode'\n"
+"03 c3                          IPROTO_FIELD_IS_NULLABLE и true\n"
+"05 a4 d0 b4 d0 b4              IPROTO_FIELD_SPAN и 'дд' в нижнем регистре"
 
 msgid "Byte code for the heartbeat example. The master might send this body:"
 msgstr ""
+"Пример байт-кода контрольного сигнала. Мастер может отправить следующее "
+"тело:"
 
 msgid ""
 "83                      MP_MAP, size 3\n"
@@ -2734,10 +3089,20 @@ msgid ""
 "cb                          MP_DOUBLE (MessagePack \"Float 64\")\n"
 "41 d7 ba 06 7b 3a 03 21     8-byte timestamp"
 msgstr ""
+"83                      MP_MAP, размер 3\n"
+"00                        1-й элемент Main-Map IPROTO_REQUEST_TYPE\n"
+"00                          MP_UINT = 0\n"
+"02                        2-й элемент Main-Map IPROTO_REPLICA_ID\n"
+"02                          MP_UINT = 2 = id\n"
+"04                        3-й элемент Main-Map IPROTO_TIMESTAMP\n"
+"cb                          MP_DOUBLE (MessagePack \"Float 64\")\n"
+"41 d7 ba 06 7b 3a 03 21     8-байтовая временная отметка"
 
 msgid ""
 "Byte code for the heartbeat example. The replica might send back this body"
 msgstr ""
+"Пример байт-кода ответа на контрольный сигнал. Реплика может вернуть "
+"следующее тело:"
 
 msgid ""
 "81                       MP_MAP, size 1\n"
@@ -2749,6 +3114,14 @@ msgid ""
 "01                             MP_UINT = 1 = id (part 1 of vclock)\n"
 "06                             MP_UINT = 6 = lsn (part 2 of vclock)"
 msgstr ""
+"81                       MP_MAP, размер 1\n"
+"00                         1-й элемент Main-Map: индикатор кода ответа\n"
+"00                         MP_UINT = 0 = IPROTO_OK\n"
+"81                         2-й элемент Main-Map: MP_MAP, размер 1 (Sub-Map)\n"
+"26                           1-й элемент Sub-Map: IPROTO_VCLOCK\n"
+"81                           2-й элемент Sub-Map: MP_MAP, размер 1\n"
+"01                             MP_UINT = 1 = id (1-я часть vclock)\n"
+"06                             MP_UINT = 6 = lsn (2-я часть vclock)"
 
 msgid "XLOG / SNAP"
 msgstr "XLOG / SNAP"
@@ -2799,6 +3172,20 @@ msgid ""
 "+============+ +===================================+\n"
 "     MP_MAP                     MP_MAP"
 msgstr ""
+"0            3 4                                         17\n"
+"+-------------+========+============+===========+=========+\n"
+"|             |        |            |           |         |\n"
+"| 0xd5ba0bab  | LENGTH | CRC32 PREV | CRC32 CUR | PADDING |\n"
+"|             |        |            |           |         |\n"
+"+-------------+========+============+===========+=========+\n"
+"   MP_FIXEXT2    MP_INT     MP_INT       MP_INT      ---\n"
+"\n"
+"+============+ +===================================+\n"
+"|            | |                                   |\n"
+"|   HEADER   | |                BODY               |\n"
+"|            | |                                   |\n"
+"+============+ +===================================+\n"
+"     MP_MAP                     MP_MAP"
 
 msgid ""
 "See the example in the :ref:`File formats <internals-data_persistence>` "
diff --git a/locale/ru/LC_MESSAGES/dev_guide/reference_capi/index.po b/locale/ru/LC_MESSAGES/dev_guide/reference_capi/index.po
index 011d1b1f1a..b5f2c818ff 100644
--- a/locale/ru/LC_MESSAGES/dev_guide/reference_capi/index.po
+++ b/locale/ru/LC_MESSAGES/dev_guide/reference_capi/index.po
@@ -1,6 +1,6 @@
 
-msgid "C API reference"
-msgstr "Справочник по C API"
-
 msgid "List of C API headers"
 msgstr "Список API для языка C"
+
+msgid "C API reference"
+msgstr "Справочник по C API"
diff --git a/locale/ru/LC_MESSAGES/getting_started/getting_started_cartridge.po b/locale/ru/LC_MESSAGES/getting_started/getting_started_cartridge.po
index c2e7e43d7f..fa4a0e4264 100644
--- a/locale/ru/LC_MESSAGES/getting_started/getting_started_cartridge.po
+++ b/locale/ru/LC_MESSAGES/getting_started/getting_started_cartridge.po
@@ -20,12 +20,12 @@ msgstr "$ cartridge create --name myapp"
 
 msgid ""
 "This will create a Tarantool Cartridge application in the ``./myapp`` "
-"directory, with a handful of :ref:`template files and directories "
-"<cartridge-cli-creating_an_application_from_template>` inside."
+"directory, with a handful of :doc:`template files and directories "
+"</book/cartridge/cartridge_cli/commands/create>` inside."
 msgstr ""
 "Эта команда создает новое Tarantool Cartridge-приложение в директории "
-"``./myapp``. Там теперь содержатся созданные по шаблону :ref:`файлы и "
-"директории <cartridge-cli-creating_an_application_from_template>`."
+"``./myapp``. Там теперь содержатся созданные по шаблону :doc:`файлы и "
+"директории </book/cartridge/cartridge_cli/commands/create>`."
 
 msgid "Go inside and make a dry run:"
 msgstr "Войдите внутрь этой директории и запустите ваше приложение:"
@@ -392,10 +392,10 @@ msgstr ""
 " для вашей роли."
 
 msgid ""
-":ref:`Pack <cartridge-cli-packing-an-application>` your application for easy"
-" distribution. Choose what you like: a DEB or RPM package, a TGZ archive, or"
-" a Docker image."
+":doc:`Pack </book/cartridge/cartridge_cli/commands/pack>` your application "
+"for easy distribution. Choose what you like: a DEB or RPM package, a TGZ "
+"archive, or a Docker image."
 msgstr ""
-":ref:`Упакуйте <cartridge-cli-packing-an-application>` ваше приложение для "
-"дальнейшего распространения. Вы можете выбрать любой из поддерживаемых видов"
-" пакетов: DEB, RPM, архив TGZ или Docker-образ."
+":doc:`Упакуйте </book/cartridge/cartridge_cli/commands/pack>` ваше "
+"приложение для дальнейшего распространения. Вы можете выбрать любой из "
+"поддерживаемых видов пакетов: DEB, RPM, архив TGZ или Docker-образ."
diff --git a/locale/ru/LC_MESSAGES/getting_started/getting_started_db.po b/locale/ru/LC_MESSAGES/getting_started/getting_started_db.po
index c278a3db63..af6415b8b1 100644
--- a/locale/ru/LC_MESSAGES/getting_started/getting_started_db.po
+++ b/locale/ru/LC_MESSAGES/getting_started/getting_started_db.po
@@ -3,11 +3,8 @@ msgid "Creating your first Tarantool database"
 msgstr "Создаем свою первую базу данных на Tarantool"
 
 msgid ""
-"First thing, let's install Tarantool, start it, and create a simple "
-"database."
+"First, let's install Tarantool, start it, and create a simple database."
 msgstr ""
-"Первым делом давайте установим Tarantool, запустим его и создадим простую "
-"базу данных."
 
 msgid "You can install Tarantool and work with it locally or in Docker."
 msgstr ""
@@ -18,18 +15,12 @@ msgid "Using a Docker image"
 msgstr "Использование Docker-образа"
 
 msgid ""
-"For trial and test purposes, we recommend using `official Tarantool images "
-"for Docker <https://github.com/tarantool/docker>`_. An official image "
-"contains a particular Tarantool version and all popular external modules for"
-" Tarantool. Everything is already installed and configured in Linux. These "
-"images are the easiest way to install and use Tarantool."
+"For trial and test purposes, we recommend using `the official Tarantool "
+"images for Docker <https://github.com/tarantool/docker>`_. An official image"
+" contains a particular Tarantool version and all popular external modules "
+"for Tarantool. Everything is already installed and configured in Linux. "
+"These images are the easiest way to install and use Tarantool."
 msgstr ""
-"Для практики и тестирования мы рекомендуем использовать `официальные образы "
-"Tarantool для Docker <https://github.com/tarantool/docker>`_. Официальный "
-"образ содержит определенную версию Tarantool и все популярные внешние модули"
-" для Tarantool. Все необходимое уже установлено и настроено на платформе "
-"Linux. Данные образы - это самый простой способ установить и запустить "
-"Tarantool."
 
 msgid ""
 "If you're new to Docker, we recommend going over `this tutorial "
@@ -52,11 +43,9 @@ msgstr ""
 "docker>`_ для вашей ОС."
 
 msgid ""
-"To start a fully functional Tarantool instance, run a container with minimal"
-" options:"
+"To start a fully functional Tarantool instance, run a container with some "
+"minimal options:"
 msgstr ""
-"Чтобы использовать полнофункциональный экземпляр Tarantool, запустите "
-"контейнер с минимальными настройками:"
 
 msgid ""
 "$ docker run \\\n"
@@ -81,11 +70,9 @@ msgstr ""
 "предустановленным Tarantool ``2.6.0`` и всеми внешними модулями."
 
 msgid ""
-"Tarantool will be accepting incoming connections on ``localhost:3301``. You "
-"may start using it as a key-value storage right away."
+"Tarantool will accept incoming connections on ``localhost:3301``. You can "
+"start using it as a key-value storage right away."
 msgstr ""
-"Tarantool будет принимать входящие подключения по адресу ``localhost:3301``."
-" Можно сразу начать его использовать как key-value хранилище."
 
 msgid ""
 "Tarantool :ref:`persists data <index-box_persistence>` inside the container."
@@ -93,46 +80,28 @@ msgid ""
 " also mounts the host's directory ``/data/dir/on/host`` (you need to specify"
 " here an absolute path to an existing local directory) in the container's "
 "directory ``/var/lib/tarantool`` (by convention, Tarantool in a container "
-"uses this directory to persist data). So, all changes made in the mounted "
-"directory on the container's side are applied to the host's disk."
+"uses this directory to persist data). Through this, all changes made in the "
+"mounted directory on the container's side are applied to the host's disk."
 msgstr ""
-"Tarantool :ref:`сохраняет данные <index-box_persistence>` внутри контейнера."
-" Чтобы ваше тестовые данные остались доступны после остановки контейнера, "
-"эта команда также монтирует директорию ``/data/dir/on/host`` (здесь "
-"необходимо указать абсолютный путь до существующей локальной директории), "
-"расположенную на машине, в директорию ``/var/lib/tarantool``  (Tarantool "
-"традиционно использует эту директорию в контейнере для сохранения данных), "
-"расположенную в контейнере. Таким образом все изменения в смонтированной "
-"директории, внесенные на стороне контейнера, также отражаются в "
-"расположенной на пользовательском диске директории."
 
 msgid ""
 "Tarantool's database module in the container is already :doc:`configured "
-"</reference/reference_lua/box_cfg>` and started. You needn't do it manually,"
-" unless you use Tarantool as an :ref:`application server <app_server>` and "
-"run it with an application."
+"</reference/reference_lua/box_cfg>` and started. You don't need to do it "
+"manually, unless you use Tarantool as an :ref:`application server "
+"<app_server>` and run it with an application."
 msgstr ""
-"Модуль Tarantool для работы с базой данных уже :doc:`настроен "
-"</reference/reference_lua/box_cfg>` и запущен в контейнере. Ручная настройка"
-" не требуется, если только вы не используете Tarantool как :ref:`сервер "
-"приложений <app_server>` и не запускаете его вместе с приложением."
 
 msgid ""
-"If your container terminates soon after start, follow `this page "
+"If your container terminates immediately after starting, follow `this page "
 "<https://stackoverflow.com/questions/64178499/tarantool-does-not-start-due-"
 "to-disk-write-error>`_ for a possible solution."
 msgstr ""
-"Если ваш контейнер рушится вскоре после запуска, `перейдите на эту страницу "
-"<https://stackoverflow.com/questions/64178499/tarantool-does-not-start-due-"
-"to-disk-write-error>`_, чтобы найти возможное решение."
 
 msgid "Attaching to Tarantool"
 msgstr "Подключение к экземпляру Tarantool"
 
-msgid "To attach to Tarantool that runs inside the container, say:"
+msgid "To attach to Tarantool that runs inside the container, run:"
 msgstr ""
-"Чтобы подключиться к запущенному в контейнере экземпляру Tarantool, "
-"выполните эту команду:"
 
 msgid "$ docker exec -i -t mytarantool console"
 msgstr "$ docker exec -i -t mytarantool console"
@@ -148,11 +117,9 @@ msgstr ""
 "подключений."
 
 msgid ""
-"Attaches to the Tarantool server inside the container under ``admin`` user "
-"via a standard Unix socket."
+"Attaches to the Tarantool server inside the container under the ``admin`` "
+"user via a standard Unix socket."
 msgstr ""
-"Подключается через стандартный Unix-сокет к Tarantool-серверу, запущенному "
-"внутри контейнера, из-под пользователя ``admin``."
 
 msgid "Tarantool displays a prompt:"
 msgstr "Tarantool показывает приглашение командной строки:"
@@ -164,21 +131,17 @@ msgid "Now you can enter requests on the command line."
 msgstr "Теперь вы можете вводить запросы в командной строке."
 
 msgid ""
-"On production machines, Tarantool's interactive mode is for system "
-"administration only. But we use it for most examples in this manual, because"
-" the interactive mode is convenient for learning."
+"On production machines, Tarantool's interactive mode is designed for system "
+"administration only. We use it for most examples in this manual, because it "
+"is convenient for learning."
 msgstr ""
-"На боевых серверах интерактивный режим Tarantool предназначен только для "
-"системных администраторов. Мы же используем его в большинстве примеров в "
-"данном руководстве, потому что интерактивный режим хорошо подходит для "
-"обучения."
 
 msgid "Creating a database"
 msgstr "Создание базы данных"
 
 msgid ""
-"While you're attached to the console, let's create a simple test database."
-msgstr "Подключившись к консоли, создадим простую тестовую базу данных."
+"While we're attached to the console, let's create a simple test database."
+msgstr ""
 
 msgid "First, create the first :term:`space` (named ``tester``):"
 msgstr "Сначала создайте первый :term:`спейс` (с именем ``tester``):"
@@ -239,9 +202,8 @@ msgstr ""
 "tarantool.sock> s:insert{2, 'Scorpions', 2015}\n"
 "tarantool.sock> s:insert{3, 'Ace of Base', 1993}"
 
-msgid "To select a tuple using the ``primary`` index, say:"
+msgid "To select a tuple using the ``primary`` index, run:"
 msgstr ""
-"Для выборки кортежей по первичному индексу ``primary`` выполните команду:"
 
 msgid "tarantool.sock> s:select{3}"
 msgstr "tarantool.sock> s:select{3}"
@@ -334,10 +296,8 @@ msgstr ""
 "- - [3, 'Ace of Base', 1993]\n"
 "..."
 
-msgid "To add a secondary index based on the ``band_name`` field, say:"
+msgid "To add a secondary index based on the ``band_name`` field, run:"
 msgstr ""
-"Для добавления вторичного индекса по полю ``band_name`` используйте эту "
-"команду:"
 
 msgid ""
 "tarantool.sock> s:create_index('secondary', {\n"
@@ -350,9 +310,8 @@ msgstr ""
 "              > parts = {'band_name'}\n"
 "              > })"
 
-msgid "To select tuples using the ``secondary`` index, say:"
+msgid "To select tuples using the ``secondary`` index, run:"
 msgstr ""
-"Для выборки кортежей по вторичному индексу ``secondary`` выполните команду:"
 
 msgid ""
 "tarantool.sock> s.index.secondary:select{'Scorpions'}\n"
@@ -365,8 +324,8 @@ msgstr ""
 "- - [2, 'Scorpions', 2015]\n"
 "..."
 
-msgid "To drop an index, say:"
-msgstr "Чтобы удалить индекс, выполните: "
+msgid "To drop an index, run:"
+msgstr ""
 
 msgid ""
 "tarantool> s.index.secondary:drop()\n"
@@ -392,32 +351,22 @@ msgid ""
 "This was a temporary container, and its disk/memory data were flushed when "
 "you stopped it. But since you mounted a data directory from the host in the "
 "container, Tarantool's data files were persisted to the host's disk. Now if "
-"you start a new container and mount that data directory in it, Tarantool "
-"will recover all data from disk and continue working with the persisted "
+"you start a new container and mount that data directory, Tarantool will "
+"recover all of the data from disk and continue working with the persisted "
 "data."
 msgstr ""
-"Это был временный контейнер, поэтому после остановки содержимое его "
-"диска/памяти обнулилось. Но так как вы монтировали локальную директорию в "
-"контейнер, все данные Tarantool сохранились на диске вашей машины. Если вы "
-"запустите новый контейнер и смонтируете в него ту же директорию с данными, "
-"Tarantool восстановит все данные с диска и продолжит с ними работать."
 
 msgid "Using a package manager"
 msgstr "Использование менеджера пакетов"
 
 msgid ""
-"For production purposes, we recommend to install Tarantool via `official "
-"package manager <http://tarantool.org/download.html>`_. You can choose one "
-"of three versions: LTS, stable, or beta. An automatic build system creates, "
-"tests and publishes packages for every push into a corresponding branch at "
-"`Tarantool's GitHub repository <https://github.com/tarantool/tarantool>`_."
+"For production purposes, we recommend that you install Tarantool via the "
+"`official package manager <http://tarantool.org/download.html>`_. You can "
+"choose one of three versions: LTS, stable, or beta. An automatic build "
+"system creates, tests and publishes packages for every push into a "
+"corresponding branch at `Tarantool's GitHub repository "
+"<https://github.com/tarantool/tarantool>`_."
 msgstr ""
-"Для реальных условий эксплуатации мы рекомендуем устанавливать Tarantool с "
-"помощью `официального менеджера пакетов "
-"<http://tarantool.org/download.html>`_. Можно выбрать одну из трех версий: "
-"LTS, stable или beta. Автоматическая система сборки создает, тестирует и "
-"публикует пакеты после каждого коммита в соответствующую ветку `репозитория "
-"Tarantool на GitHub <https://github.com/tarantool/tarantool>`_."
 
 msgid ""
 "To download and install the package that's appropriate for your OS, start a "
@@ -431,8 +380,8 @@ msgstr ""
 msgid "Starting Tarantool"
 msgstr "Запуск экземпляра Tarantool’а"
 
-msgid "To start working with Tarantool, run a terminal and say this:"
-msgstr "Чтобы начать работу с Tarantool, выполните эту команду:"
+msgid "To start working with Tarantool, start a terminal and run this:"
+msgstr ""
 
 msgid ""
 "$ tarantool\n"
@@ -441,14 +390,18 @@ msgstr ""
 "$ tarantool\n"
 "$ # при этом создается новый экземпляр Tarantool"
 
-msgid "Tarantool starts in the interactive mode and displays a prompt:"
+msgid "Tarantool starts in interactive mode and displays a prompt:"
 msgstr ""
-"Tarantool запускается в интерактивном режиме и показывает приглашение "
-"командной строки:"
 
 msgid "tarantool>"
 msgstr "tarantool>"
 
+msgid ""
+"On production machines, Tarantool's interactive mode is designed for system "
+"administration only. We use it for most examples in this manual because it "
+"is convenient for learning."
+msgstr ""
+
 msgid "Here is how to create a simple test database after installation."
 msgstr ""
 "Далее объясняется, как создать простую тестовую базу данных после установки "
@@ -468,14 +421,13 @@ msgstr ""
 "$ mkdir ~/tarantool_sandbox\n"
 "$ cd ~/tarantool_sandbox"
 
-msgid "You can delete the directory when the tests are over."
-msgstr "Ее можно удалить после окончания тестирования."
+msgid "You can delete the directory when the tests are completed."
+msgstr ""
 
 msgid ""
-"Check if the default port the database instance will listen to is vacant."
+"Check if the default port that the database instance will listen to is "
+"vacant."
 msgstr ""
-"Проверьте доступность порта, используемого по умолчанию для прослушивания на"
-" экземпляре базы данных."
 
 msgid ""
 "In versions before :doc:`2.4.2 </release/2.4.2>`, during installation the "
@@ -502,10 +454,8 @@ msgstr ""
 msgid "Make sure the default port is vacant:"
 msgstr "Убедитесь, что свободен порт, используемый по умолчанию:"
 
-msgid "To check if the demonstrative instance is running, say:"
+msgid "To check if the demonstrative instance is running, run:"
 msgstr ""
-"Чтобы проверить статус работы демонстрационного экземпляра, выполните "
-"команду:"
 
 msgid ""
 "$ lsof -i :3301\n"
@@ -524,11 +474,8 @@ msgstr "$ kill 6851"
 
 msgid ""
 "To start Tarantool's database module and make the instance accept TCP "
-"requests on port ``3301``, say:"
+"requests on port ``3301``, run:"
 msgstr ""
-"Чтобы запустить модуль Tarantool для работы с базой данных и сделать так, "
-"чтобы запущенный экземпляр принимал TCP-запросы на порт ``3301``, выполните "
-"эту команду:"
 
 msgid "tarantool> box.cfg{listen = 3301}"
 msgstr "tarantool> box.cfg{listen = 3301}"
diff --git a/locale/ru/LC_MESSAGES/getting_started/index.po b/locale/ru/LC_MESSAGES/getting_started/index.po
index 4fc9b0db41..60b46bfef5 100644
--- a/locale/ru/LC_MESSAGES/getting_started/index.po
+++ b/locale/ru/LC_MESSAGES/getting_started/index.po
@@ -3,9 +3,32 @@ msgid "Getting started"
 msgstr "Руководство для начинающих"
 
 msgid ""
-"In this chapter, we show how to work with Tarantool as a DBMS -- and how to "
-"connect to a Tarantool database from other programming languages."
+"The :ref:`First steps <getting_started-imcp>` section will get you "
+"acquainted with Tarantool in 15 minutes. We will be creating a basic "
+"microservice for TikTok. We will start Tarantool, create a data schema, and "
+"write our first data. You'll get an understanding of the technology and "
+"learn about the basic terms and features."
+msgstr ""
+
+msgid ""
+"In the :ref:`Connecting to cluster <connecting_to_cluster>` section, we'll "
+"show you how to read or write data to Tarantool from your Python/Go/PHP "
+"application or another programming language."
+msgstr ""
+
+msgid ""
+"After connecting to the database for the first time, you might want to "
+"change the data schema. In the section :ref:`Updating the data schema "
+"<getting_started-schema_changing>`, we'll discuss the approaches to changing"
+" the data schema and the associated limitations."
+msgstr ""
+
+msgid ""
+"To make our code work with Tarantool, we may want to transfer some of our "
+"data logic to Tarantool. In the section :ref:`Writing cluster application "
+"code <getting_started-wrirting_cluster-code>`, we'll write a \"Hello, "
+"World!\" program in the Lua language, which will work in our Tarantool "
+"cluster. This will give you a basic understanding of how the role mechanism "
+"works. In this way, you'll understand what part of your business logic you "
+"would like to write in/migrate to Tarantool."
 msgstr ""
-"В этой главе объясняются основы работы с Tarantool как с СУБД, а также "
-"приводятся способы подключения к базе на Tarantool из других языков "
-"программирования."
diff --git a/locale/ru/LC_MESSAGES/index.po b/locale/ru/LC_MESSAGES/index.po
index 5656f9cb7c..3e27ab4b15 100644
--- a/locale/ru/LC_MESSAGES/index.po
+++ b/locale/ru/LC_MESSAGES/index.po
@@ -1,4 +1,10 @@
 
+msgid "CRUD operations"
+msgstr ""
+
+msgid "Streams"
+msgstr ""
+
 msgid "Tarantool - Documentation"
 msgstr "Документация по Tarantool"
 
@@ -17,30 +23,3 @@ msgstr ""
 "вводной информации и упражнений для начинающих -- до продвинутых инструкций "
 "и подробных справочников для опытных пользователей и сторонних "
 "разработчиков."
-
-msgid "**Other formats:**"
-msgstr "**Другие форматы:**"
-
-msgid "`Single-page HTML <singlehtml.html>`__"
-msgstr "`HTML одной страницей <singlehtml.html>`__"
-
-msgid "`PDF <Tarantool.pdf>`__"
-msgstr "`PDF <Tarantool.pdf>`__"
-
-msgid "**See also:**"
-msgstr "**См. также:**"
-
-msgid "`Documentation archive <https://tarantool.io/dist/pdf/>`__"
-msgstr "`Архив документации <https://tarantool.io/dist/pdf/>`__"
-
-msgid "`Articles <https://tarantool.io/learn/>`__"
-msgstr "`Статьи <https://tarantool.io/learn/>`__"
-
-msgid "**Support:**"
-msgstr "**Поддержка:**"
-
-msgid "`Google forum <https://groups.google.com/forum/#!forum/tarantool>`__"
-msgstr "`Форум в Google <https://googlegroups.com/group/tarantool-ru>`__"
-
-msgid "`Telegram chat <https://t.me/tarantool>`__"
-msgstr "`Чат в Telegram <https://t.me/tarantoolru>`__"
diff --git a/locale/ru/LC_MESSAGES/reference/reference_lua/index.po b/locale/ru/LC_MESSAGES/reference/reference_lua/index.po
index 81e7c31dba..682af5df1c 100644
--- a/locale/ru/LC_MESSAGES/reference/reference_lua/index.po
+++ b/locale/ru/LC_MESSAGES/reference/reference_lua/index.po
@@ -1,4 +1,7 @@
 
+msgid "List of Lua modules"
+msgstr "Перечень Lua-модулей"
+
 msgid "Built-in modules reference"
 msgstr "Справочник по встроенным модулям"
 
@@ -15,6 +18,3 @@ msgstr ""
 "`стандартных Lua-библиотек <http://www.lua.org/manual/>`_. Для достижения "
 "наилучшего результата мы рекомендуем использовать функции из встроенных "
 "модулей Tarantool'а."
-
-msgid "List of Lua modules"
-msgstr "Перечень Lua-модулей"
diff --git a/locale/ru/LC_MESSAGES/reference/reference_lua/key_def.po b/locale/ru/LC_MESSAGES/reference/reference_lua/key_def.po
index c3e6e81313..1105dcabaa 100644
--- a/locale/ru/LC_MESSAGES/reference/reference_lua/key_def.po
+++ b/locale/ru/LC_MESSAGES/reference/reference_lua/key_def.po
@@ -1,54 +1,69 @@
 
 msgid "Module `key_def`"
-msgstr ""
+msgstr "Модуль `key_def`"
 
 msgid ""
 "The `key_def` module has a function for making a definition of the field "
 "numbers and types of a tuple. The definition is usually used in conjunction "
 "with an index definition to extract or compare the index key values."
 msgstr ""
+"В модуле `key_def` есть функция, позволяющая создавать определение номеров и"
+" типов полей кортежа. Это определение обычно используется вместе с "
+"определением индекса, чтобы извлекать или сравнивать значения ключей "
+"индекса."
 
 msgid "Create a new key_def instance."
-msgstr ""
+msgstr "Создание нового экземпляра key_def."
 
 msgid "Parameters"
 msgstr "Параметры"
 
 msgid ""
-"field numbers and types. There must be at least one part and it must have at"
-" least fieldno and type."
+"field numbers and types. There must be at least one part. Every part must "
+"have the attributes ``type`` and ``fieldno``/``field``. Other attributes are"
+" optional."
 msgstr ""
+"типы и номера полей. В таблице ``parts`` должен быть хотя бы один элемент. "
+"Для каждого элемента обязательны только атрибуты ``type`` и "
+"``fieldno``/``field``."
 
 msgid "returns"
 msgstr "возвращает"
 
 msgid "key_def-object :ref:`a key_def object <key_def-object>`"
-msgstr ""
+msgstr ":ref:`объект key_def <key_def-object>`"
 
 msgid ""
 "The parts table has components which are the same as the ``parts`` option in"
 " :ref:`Options for space_object:create_index() <box_space-create_index-"
 "options>`."
 msgstr ""
+"Таблица parts содержит компоненты, аналогичные тем, что указываются в "
+"параметре ``parts`` :ref:`при создании объекта space_object:create_index() "
+"<box_space-create_index-options>`:"
 
 msgid ""
-"fieldno (integer) for example fieldno = 1. It is legal to say field instead "
-"of fieldno."
+"``fieldno`` (integer) for example ``fieldno = 1``. It is legal to use "
+"``field`` instead of ``fieldno``."
 msgstr ""
+"``fieldno`` (целое число), например ``fieldno = 1``. Вместо ``fieldno`` "
+"можно использовать ``field``."
 
-msgid "type (string) for example type = 'string'."
-msgstr ""
+msgid "``type`` (string) for example ``type = 'string'``."
+msgstr "``type`` (строка), например ``type = 'string'``."
 
 msgid "Other components are optional."
-msgstr ""
+msgstr "Остальные компоненты необязательны."
 
 msgid "Example: ``key_def.new({{type = 'unsigned', fieldno = 1}})``"
-msgstr ""
+msgstr "Пример №1: ``key_def.new({{type = 'unsigned', fieldno = 1}})``"
 
 msgid ""
 "Example: ``key_def.new({{type = 'string', collation = 'unicode', field = "
 "2}})``"
 msgstr ""
+"Пример №2: ``key_def.new({{type = 'string', collation = 'unicode', field = "
+"2}})``"
 
 msgid ""
 "A key_def object is an object returned by :ref:`key_def.new() <key_def-"
@@ -57,18 +72,23 @@ msgid ""
 "compare_with_key>`, :ref:`merge() <key_def-merge>`, :ref:`totable() "
 "<key_def-totable>`."
 msgstr ""
+"Объект key_def возвращается функцией :ref:`key_def.new() <key_def-new>`. У "
+"него есть следующие методы: :ref:`extract_key() <key_def-extract_key>`, "
+":ref:`compare() <key_def-compare>`, :ref:`compare_with_key() <key_def-"
+"compare_with_key>`, :ref:`merge() <key_def-merge>`, :ref:`totable() "
+"<key_def-totable>`."
 
-msgid "Return a tuple containing only the fields of the key_def object."
-msgstr ""
+msgid "Return a tuple containing only the fields of the ``key_def`` object."
+msgstr "Получение кортежа, содержащего только поля объекта ``key_def``."
 
 msgid "tuple or Lua table with field contents"
-msgstr ""
+msgstr "кортеж или Lua-таблица с содержимым поля"
 
 msgid "return"
 msgstr "возвращает"
 
-msgid "the fields that were defined for the key_def object"
-msgstr ""
+msgid "the fields that were defined for the ``key_def`` object"
+msgstr "поля, определенные для объекта ``key_def``,"
 
 msgid "**Example #1:**"
 msgstr "**Пример №1:**"
@@ -86,7 +106,7 @@ msgid ""
 "...\n"
 "\n"
 "tarantool> k = key_def.new({{type = 'string', fieldno = 3},\n"
-">                           {type = 'unsigned', fieldno =1 }})\n"
+">                           {type = 'unsigned', fieldno = 1}})\n"
 "---\n"
 "...\n"
 "\n"
@@ -95,6 +115,26 @@ msgid ""
 "- ['X', 1]\n"
 "..."
 msgstr ""
+"-- Предположим, что у некоторого элемента пять полей:\n"
+"-- 1, 99.5, 'X', nil, 99.5\n"
+"-- и нас интересуют только два из них:\n"
+"-- третье (строка) и первое (целое число).\n"
+"-- Мы можем определить эти поля инструкцией k = key_def.new\n"
+"-- и извлечь значения командой k:extract_key.\n"
+"\n"
+"tarantool> key_def = require('key_def')\n"
+"---\n"
+"...\n"
+"\n"
+"tarantool> k = key_def.new({{type = 'string', fieldno = 3},\n"
+">                           {type = 'unsigned', fieldno = 1}})\n"
+"---\n"
+"...\n"
+"\n"
+"tarantool> k:extract_key({1, 99.5, 'X', nil, 99.5})\n"
+"---\n"
+"- ['X', 1]\n"
+"..."
 
 msgid "**Example #2**"
 msgstr "**Пример №2**"
@@ -107,11 +147,22 @@ msgid ""
 "-- The result will be the same.\n"
 "key_def = require('key_def')\n"
 "box.schema.space.create('T')\n"
-"i = box.space.T:create_index('I',{parts={3,'string',1,'unsigned'}})\n"
+"i = box.space.T:create_index('I', {parts={3, 'string', 1, 'unsigned'}})\n"
 "box.space.T:insert{1, 99.5, 'X', nil, 99.5}\n"
 "k = key_def.new(i.parts)\n"
 "k:extract_key(box.space.T:get({'X', 1}))"
 msgstr ""
+"-- Теперь предположим, что элемент является кортежем в спейсе.\n"
+"-- У спейса есть составной индекс, построенный по полям 3 и 1.\n"
+"-- Мы можем передать определение индекса в качестве аргумента функции key_def.new,\n"
+"-- а не заполнять определение, как в примере №1.\n"
+"-- Результат будет тот же.\n"
+"key_def = require('key_def')\n"
+"box.schema.space.create('T')\n"
+"i = box.space.T:create_index('I', {parts={3, 'string', 1, 'unsigned'}})\n"
+"box.space.T:insert{1, 99.5, 'X', nil, 99.5}\n"
+"k = key_def.new(i.parts)\n"
+"k:extract_key(box.space.T:get({'X', 1}))"
 
 msgid "**Example #3**"
 msgstr "**Пример №3**"
@@ -133,19 +184,42 @@ msgid ""
 "    pk:delete(key)\n"
 "end"
 msgstr ""
+"-- Проходим по всем кортежам во вторичном неуникальном индексе\n"
+"-- и извлекаем из них значения по первичному ключу.\n"
+"-- Затем удаляем значения, используя уникальный индекс.\n"
+"-- Этот код должен входить в Lua-функцию.\n"
+"local key_def_lib = require('key_def')\n"
+"local s = box.schema.space.create('test')\n"
+"local pk = s:create_index('pk')\n"
+"local sk = s:create_index('test', {unique = false, parts = {\n"
+"    {2, 'number', path = 'a'}, {2, 'number', path = 'b'}}})\n"
+"s:insert{1, {a = 1, b = 1}}\n"
+"s:insert{2, {a = 1, b = 2}}\n"
+"local key_def = key_def_lib.new(pk.parts)\n"
+"for _, tuple in sk:pairs({1})) do\n"
+"    local key = key_def:extract_key(tuple)\n"
+"    pk:delete(key)\n"
+"end"
 
 msgid ""
-"Compare the key fields of tuple_1 to the key fields of tuple_2. This is a "
-"tuple-by-tuple comparison so users do not have to write code which compares "
-"a field at a time. Each field's type and collation will be taken into "
-"account. In effect it is a comparison of extract_key(tuple_1) with "
-"extract_key(tuple_2)."
+"Compare the key fields of ``tuple_1`` to the key fields of ``tuple_2``. This"
+" is a tuple-by-tuple comparison so users do not have to write code which "
+"compares a field at a time. Each field's type and collation will be taken "
+"into account. In effect it is a comparison of ``extract_key(tuple_1)`` with "
+"``extract_key(tuple_2)``."
 msgstr ""
+"Сравнение полей кортежей ``tuple_1`` и ``tuple_2`` по определённому ключу. "
+"Пользователю не нужно писать код для сравнения отдельных полей. Учитываются "
+"типы полей и параметры сортировки. Фактически сравниваются значения "
+"``extract_key(tuple_1)`` и ``extract_key(tuple_2)``."
 
 msgid ""
 "> 0 if tuple_1 key fields > tuple_2 key fields, = 0 if tuple_1 key fields = "
 "tuple_2 key fields, < 0 if tuple_1 key fields < tuple_2 key fields"
 msgstr ""
+"положительное число, если значения полей tuple_1 больше значений полей "
+"tuple_2 по ключу; 0, если они равны; отрицательное число, если значения "
+"полей tuple_1 меньше значений полей tuple_2 по ключу"
 
 msgid "**Example:**"
 msgstr "**Пример:**"
@@ -153,74 +227,113 @@ msgstr "**Пример:**"
 msgid ""
 "-- This will return 0\n"
 "key_def = require('key_def')\n"
-"k = key_def.new({{type='string',fieldno=3,collation='unicode_ci'},\n"
-"                 {type='unsigned',fieldno=1}})\n"
+"k = key_def.new({{type = 'string', fieldno = 3, collation = 'unicode_ci'},\n"
+"                 {type = 'unsigned', fieldno = 1}})\n"
 "k:compare({1, 99.5, 'X', nil, 99.5}, {1, 99.5, 'x', nil, 99.5})"
 msgstr ""
+"-- Результат этого кода будет 0\n"
+"key_def = require('key_def')\n"
+"k = key_def.new({{type = 'string', fieldno = 3, collation = 'unicode_ci'},\n"
+"                 {type = 'unsigned', fieldno = 1}})\n"
+"k:compare({1, 99.5, 'X', nil, 99.5}, {1, 99.5, 'x', nil, 99.5})"
 
 msgid ""
-"Compare the key fields of tuple_1 to all the fields of tuple_2. This is the "
-"same as :ref:`key_def_object:compare() <key_def-compare>` except that "
-"tuple_2 contains only the key fields. In effect it is a comparison of "
-"extract_key(tuple_1) with tuple_2."
+"Compare the key fields of ``tuple_1`` to all the fields of ``tuple_2``. This"
+" is the same as :ref:`key_def_object:compare() <key_def-compare>` except "
+"that ``tuple_2`` contains only the key fields. In effect it is a comparison "
+"of ``extract_key(tuple_1)`` with ``tuple_2``."
 msgstr ""
+"Сравнение полей кортежей ``tuple_1`` с полями кортежа ``tuple_2`` по "
+"заданному ключу. Аналогично :ref:`key_def_object:compare() <key_def-"
+"compare>`, за исключением того, что ``tuple_2`` содержит только поля ключа. "
+"Фактически это сравнение ``extract_key(tuple_1)`` с ``tuple_2``."
 
 msgid ""
 "> 0 if tuple_1 key fields > tuple_2 fields, = 0 if tuple_1 key fields = "
 "tuple_2 fields, < 0 if tuple_1 key fields < tuple_2 fields"
 msgstr ""
+"положительное число, если значения полей tuple_1 больше значений полей "
+"tuple_2 по ключу; 0, если они равны; отрицательное число, если значения "
+"полей tuple_1 меньше значений полей tuple_2 по ключу"
 
 msgid ""
 "-- This will return 0\n"
 "key_def = require('key_def')\n"
-"k = key_def.new({{type='string',fieldno=3,collation='unicode_ci'},\n"
-"                 {type='unsigned',fieldno=1}})\n"
+"k = key_def.new({{type = 'string', fieldno = 3, collation = 'unicode_ci'},\n"
+"                 {type = 'unsigned', fieldno = 1}})\n"
 "k:compare_with_key({1, 99.5, 'X', nil, 99.5}, {'x', 1})"
 msgstr ""
+"-- Результат этого кода будет 0\n"
+"key_def = require('key_def')\n"
+"k = key_def.new({{type = 'string', fieldno = 3, collation = 'unicode_ci'},\n"
+"                 {type = 'unsigned', fieldno = 1}})\n"
+"k:compare_with_key({1, 99.5, 'X', nil, 99.5}, {'x', 1})"
 
 msgid ""
-"Combine the main key_def_object with other_key_def_object. The return value "
-"is a new key_def_object containing all the fields of the main "
-"key_def_object, then all the fields of other_key_def_object which are not in"
-" the main key_def_object."
+"Combine the main ``key_def_object`` with ``other_key_def_object``. The "
+"return value is a new ``key_def_object`` containing all the fields of the "
+"main ``key_def_object``, then all the fields of ``other_key_def_object`` "
+"which are not in the main ``key_def_object``."
 msgstr ""
+"Объединение основного объекта ``key_def_object`` с другим объектом "
+"``other_key_def_object``. Возвращает новый объект ``key_def_object``, "
+"содержащий сначала все поля основного объекта ``key_def_object``, а потом те"
+" поля объекта ``other_key_def_object``, которых не было в основном объекте "
+"``key_def_object``."
 
 msgid "definition of fields to add"
-msgstr ""
+msgstr "определение полей, которые нужно добавить"
 
 msgid "key_def_object"
-msgstr ""
+msgstr "key_def_object"
 
 msgid ""
-"-- This will return a key definition with fieldno=3 and fieldno=1.\n"
+"-- This will return a key definition with fieldno = 3 and fieldno = 1.\n"
 "key_def = require('key_def')\n"
 "k = key_def.new({{type = 'string', fieldno = 3}})\n"
 "k2= key_def.new({{type = 'unsigned', fieldno = 1},\n"
 "                 {type = 'string', fieldno = 3}})\n"
 "k:merge(k2)"
 msgstr ""
+"-- Результатом этого кода будет определение ключа\n"
+"-- по полям с fieldno = 3 и fieldno = 1\n"
+"key_def = require('key_def')\n"
+"k = key_def.new({{type = 'string', fieldno = 3}})\n"
+"k2= key_def.new({{type = 'unsigned', fieldno = 1},\n"
+"                 {type = 'string', fieldno = 3}})\n"
+"k:merge(k2)"
 
 msgid ""
-"Return a table containing what is in the key_def_object. This is the reverse"
-" of ``key_def.new()``:"
+"Return a table containing what is in the ``key_def_object``. This is the "
+"reverse of ``key_def.new()``:"
 msgstr ""
+"Возвращает таблицу с содержимым ``key_def_object``. Функция противоположна "
+"функции ``key_def.new()``:"
 
-msgid "``key_def.new()`` takes a table and returns a key_def object,"
-msgstr ""
+msgid "``key_def.new()`` takes a table and returns a ``key_def`` object,"
+msgstr "``key_def.new()`` принимает таблицу, а возвращает объект ``key_def``."
 
 msgid ""
-"``key_def_object:totable()`` takes a key_def object and returns a table."
+"``key_def_object:totable()`` takes a ``key_def`` object and returns a table."
 msgstr ""
+"``key_def_object:totable()`` принимает объект ``key_def``, а возвращает "
+"таблицу."
 
 msgid "This is useful for input to ``_serialize`` methods."
 msgstr ""
+"Это удобно при подготовке входных данных для методов сериализации "
+"(``_serialize``)."
 
 msgid "table"
 msgstr "таблица"
 
 msgid ""
-"-- This will return a table with type='string', fieldno=3\n"
+"-- This will return a table with type = 'string', fieldno = 3\n"
 "key_def = require('key_def')\n"
 "k = key_def.new({{type = 'string', fieldno = 3}})\n"
 "k:totable()"
 msgstr ""
+"-- Результатом этого кода будет таблица с type = 'string', fieldno = 3\n"
+"key_def = require('key_def')\n"
+"k = key_def.new({{type = 'string', fieldno = 3}})\n"
+"k:totable()"
diff --git a/locale/ru/LC_MESSAGES/reference/reference_lua/net_box.po b/locale/ru/LC_MESSAGES/reference/reference_lua/net_box.po
index cced28a485..7690c1460c 100644
--- a/locale/ru/LC_MESSAGES/reference/reference_lua/net_box.po
+++ b/locale/ru/LC_MESSAGES/reference/reference_lua/net_box.po
@@ -108,6 +108,9 @@ msgstr ""
 "На диаграмме ниже представлены возможные состояния и варианты перехода из "
 "одного состояния в другое:"
 
+msgid "net_states.svg"
+msgstr ""
+
 msgid "On this diagram:"
 msgstr "На этой диаграмме:"
 
diff --git a/locale/ru/LC_MESSAGES/reference/reference_sql/sql-features.po b/locale/ru/LC_MESSAGES/reference/reference_sql/sql-features.po
index 7f5588c428..47e727d354 100644
--- a/locale/ru/LC_MESSAGES/reference/reference_sql/sql-features.po
+++ b/locale/ru/LC_MESSAGES/reference/reference_sql/sql-features.po
@@ -75,9 +75,11 @@ msgid "``CREATE TABLE td (s1 NUMERIC PRIMARY KEY);``"
 msgstr ""
 
 msgid ""
-"Fail, DECIMAL and NUMERIC data types are not supported and a number "
-"containing post-decimal digits will be treated as approximate numeric."
+"Fail, NUMERIC data types are not supported and a number containing post-"
+"decimal digits will be treated as approximate numeric."
 msgstr ""
+"Неуспешно, так как типы данных NUMERIC не поддерживаются и число с цифрами "
+"после десятичной точки будет обрабатываться как примерное."
 
 msgid "E011-04"
 msgstr ""
@@ -1157,13 +1159,16 @@ msgstr ""
 msgid "ALTER TABLE statement: add column"
 msgstr ""
 
-msgid "``ALTER TABLE t7 ADD COLUMN t7_2 VARCHAR DEFAULT 'q';``"
-msgstr ""
+msgid "``ALTER TABLE t7 ADD COLUMN t7_2 VARCHAR(1) DEFAULT 'q';``"
+msgstr "``ALTER TABLE t7 ADD COLUMN t7_2 VARCHAR(1) DEFAULT 'q';``"
 
 msgid ""
-"Fail. Tarantool supports :ref:`ALTER TABLE <sql_alter_table>` but not this "
-"clause."
+"Okay. Tarantool supports :ref:`ALTER TABLE <sql_alter_table>` and support "
+"for ADD COLUMN was added in Tarantool version 2.7."
 msgstr ""
+"Успешно. Tarantool поддерживает инструкцию :ref:`ALTER TABLE "
+"<sql_alter_table>`, а в версии Tarantool 2.7 была добавлена поддержка ADD "
+"COLUMN."
 
 msgid "F031-13"
 msgstr ""
@@ -1671,8 +1676,8 @@ msgid ""
 " the final score)."
 msgstr ""
 
-msgid "Total number of items marked \"Fail\": 68"
-msgstr ""
+msgid "Total number of items marked \"Fail\": 67"
+msgstr "Количество элементов с отметкой \"Неуспешно\": 67."
 
-msgid "Total number of items marked \"Okay\": 78"
-msgstr ""
+msgid "Total number of items marked \"Okay\": 79"
+msgstr "Количество элементов с отметкой \"Успешно\": 79."
diff --git a/locale/ru/LC_MESSAGES/reference/reference_sql/sql_beginners_guide.po b/locale/ru/LC_MESSAGES/reference/reference_sql/sql_beginners_guide.po
index 39cca0f70b..56a16ccaee 100644
--- a/locale/ru/LC_MESSAGES/reference/reference_sql/sql_beginners_guide.po
+++ b/locale/ru/LC_MESSAGES/reference/reference_sql/sql_beginners_guide.po
@@ -1,11 +1,13 @@
 
 msgid "SQL beginners' guide"
-msgstr ""
+msgstr "Руководство для начинающих по SQL"
 
 msgid ""
 "The Beginners' Guide describes how users can start up with SQL with "
 "Tarantool, and necessary concepts."
 msgstr ""
+"В этом руководстве описано, как пользователю начать работу с SQL в "
+"Tarantool, а также объясняются все необходимые понятия."
 
 msgid ""
 "The SQL Beginners' Guide is about databases in general, and about the "
@@ -13,15 +15,21 @@ msgid ""
 " in the Beginners' Guide will already be familiar to people who have used "
 "relational databases before."
 msgstr ""
+"Ниже рассказывается о базах данных в целом и взаимосвязи между решениями "
+"NoSQL и SQL в Tarantool. Большинство тем, изложенных в этом руководстве, "
+"будут знакомы тем, кто уже использовал реляционные базы данных."
 
 msgid "**Sample Simple Table**"
-msgstr ""
+msgstr "**Пример простой таблицы**"
 
 msgid ""
 "In football training camp it is traditional for the trainer to begin by "
 "showing a football and saying \"this is a football\". In that spirit, this "
 "is a table:"
 msgstr ""
+"В футбольном тренировочном лагере тренер традиционно начинает с того, что "
+"показывает игрокам футбольный мяч и говорит: \"Это --- футбольный мяч\". В "
+"случае SQL подобный базовый объект --- это таблица:"
 
 msgid ""
 "TABLE\n"
@@ -34,24 +42,45 @@ msgid ""
 " Row#3 | Row#3,Column#1  | Row#3,Column#2 | Row#3,Column#3 |\n"
 "       +-----------------+----------------+----------------+"
 msgstr ""
+"TABLE\n"
+"          [1]              [2]              [3]\n"
+"       +-----------------+----------------+----------------+\n"
+" Стрк1 |  Стрк1, Стлб1   |  Стрк1, Стлб2  |  Стрк1, Стлб3  |\n"
+"       +-----------------+----------------+----------------+\n"
+" Стрк2 |  Стрк2, Стлб1   | Стрк2, Стлб2   |  Стрк2, Стлб3  |\n"
+"       +-----------------+----------------+----------------+\n"
+" Стрк3 |  Стрк3, Стлб1   |  Стрк3, Стлб2  |  Стрк3, Стлб3  |\n"
+"       +-----------------+----------------+----------------+"
 
 msgid ""
 "but the labels are misleading -- we usually don't identify rows and columns "
 "by their ordinal positions, we prefer to pick out specific items by their "
 "contents. In that spirit, this is a table:"
 msgstr ""
+"Но эти обозначения вводят в заблуждение. Обычно мы не обозначаем строки и "
+"столбцы порядковыми позициями, мы скорее будем искать элементы таблицы по их"
+" содержимому:"
 
 msgid ""
-"modules\n"
+"MODULES\n"
 "\n"
 "+-----------------+------+---------------------+\n"
-"| name            | size | purpose             |\n"
-"+-----------------|------|---------------------|\n"
+"| NAME            | SIZE | PURPOSE             |\n"
+"+-----------------+------+---------------------+\n"
 "| box             | 1432 | Database Management |\n"
 "| clock           |  188 | Seconds             |\n"
 "| crypto          |    4 | Cryptography        |\n"
 "+-----------------+------+---------------------+"
 msgstr ""
+"MODULES\n"
+"\n"
+"+-----------------+------+---------------------+\n"
+"| NAME            | SIZE | PURPOSE             |\n"
+"+-----------------+------+---------------------+\n"
+"| box             | 1432 | Управление БД       |\n"
+"| clock           |  188 | Секунды             |\n"
+"| crypto          |    4 | Криптография        |\n"
+"+-----------------+------+---------------------+"
 
 msgid ""
 "so we do not use longitude/latitude navigation by talking about \"Row#2 "
@@ -59,9 +88,13 @@ msgid ""
 " column by talking about \"the size, where the name is 'clock'\". To be more"
 " exact, this is what we say:"
 msgstr ""
+"Так что мы не используем навигацию по позиции, обращаясь к элементу \"Строка"
+" #2, столбец #2\"; мы используем содержимое колонок \"name\" (имя) и "
+"\"size\" (размер), и ищем значение \"size\" для элемента, для которого "
+"значение \"name\" совпадает с 'clock'. Если быть точнее, вот что мы говорим:"
 
 msgid "``SELECT size FROM modules WHERE name = 'clock';``"
-msgstr ""
+msgstr "``SELECT size FROM modules WHERE name = 'clock';``"
 
 msgid ""
 "If you're familiar with Tarantool's architecture -- and we hope that you "
@@ -93,7 +126,7 @@ msgid ""
 msgstr ""
 
 msgid "**Creating a table**"
-msgstr ""
+msgstr "**Создание таблицы**"
 
 msgid "This is how to create the modules table:"
 msgstr ""
@@ -153,7 +186,7 @@ msgid ""
 msgstr ""
 
 msgid "**Creating an index**"
-msgstr ""
+msgstr "**Создание индекса**"
 
 msgid "This is how to create indexes for the modules table:"
 msgstr ""
@@ -181,7 +214,7 @@ msgid ""
 msgstr ""
 
 msgid "**Data change**"
-msgstr ""
+msgstr "**Изменение данных**"
 
 msgid ""
 "Putting data into a table is called \"inserting\". Changing data is called "
@@ -241,11 +274,17 @@ msgstr ""
 msgid ""
 "data domain -- if a column is defined as having data type INTEGER, it is "
 "illegal to put a non-number into it. More generally, if a value doesn't "
-"correspond to the data type of the definition, it is illegal. However, some "
-"database management systems (DBMSs) are very forgiving and will try to make "
-"allowances for bad values rather than reject them; Tarantool is one of those"
-" DBMSs."
-msgstr ""
+"correspond to the data type of the definition, it is illegal. Some database "
+"management systems (DBMSs) are very forgiving and will try to make "
+"allowances for bad values rather than reject them; Tarantool is a bit more "
+"strict than those DBMSs."
+msgstr ""
+"Допустимые значения --- если столбец по определению содержит тип данных "
+"INTEGER, в него запрещено помещать нечисловые значения. В целом, недопустимо"
+" любое значение, которое не соответствует типу данных, указанному в "
+"определении. Некоторые системы управления базами данных относительно гибки и"
+" скорее примут некорректные значения, чем отклонят их. Tarantool в этом "
+"плане более строгий."
 
 msgid "Now, here are other types of constraints ..."
 msgstr ""
@@ -309,8 +348,8 @@ msgid ""
 "10000, 'insert etc.');``"
 msgstr ""
 
-msgid "Now try to delete the new row from the modules table:"
-msgstr ""
+msgid "Now try to delete the corresponding row from the modules table:"
+msgstr "Теперь попробуем удалить соответствующую строку из таблицы modules:"
 
 msgid "``DELETE FROM modules WHERE name = 'box';``"
 msgstr ""
@@ -482,11 +521,16 @@ msgstr ""
 
 msgid ""
 "+----------------+------------------------+\n"
-"| double_size    | concatenated_literals  |\n"
+"| DOUBLE_SIZE    | CONCATENATED_LITERALS  |\n"
 "+----------------+------------------------+\n"
-"|               8| XY                     |\n"
+"|              8 | XY                     |\n"
 "+----------------+------------------------+"
 msgstr ""
+"+----------------+------------------------+\n"
+"| DOUBLE_SIZE    | CONCATENATED_LITERALS  |\n"
+"+----------------+------------------------+\n"
+"|              8 | XY                     |\n"
+"+----------------+------------------------+"
 
 msgid "**Selecting with a select list with asterisk**"
 msgstr ""
@@ -561,11 +605,16 @@ msgstr "Результат будет выглядеть следующим об
 
 msgid ""
 "+-------------------+------------------------+--------------------+\n"
-"| submodules_name   | modules_purpose        | submodules_purpose |\n"
+"| SUBMODULES_NAME   | MODULES_PURPOSE        | SUBMODULES_PURPOSE |\n"
 "+-------------------+------------------------+--------------------+\n"
 "| space             | Database Management    | insert etc.        |\n"
 "+-------------------+------------------------+--------------------+"
 msgstr ""
+"+-------------------+------------------------+--------------------+\n"
+"| SUBMODULES_NAME   | MODULES_PURPOSE        | SUBMODULES_PURPOSE |\n"
+"+-------------------+------------------------+--------------------+\n"
+"| space             | Управление БД          | Вставка ...        |\n"
+"+-------------------+------------------------+--------------------+"
 
 msgid ""
 "Perhaps you have read somewhere that SQL stands for \"Structured Query "
@@ -597,13 +646,21 @@ msgstr ""
 msgid ""
 "{ columns from modules table }         { columns from submodules table }\n"
 "+--------+------+---------------------+-------+-------------+-------+-------------+\n"
-"| name   | size | purpose             | name  | module_name | size  | purpose     |\n"
+"| NAME   | SIZE | PURPOSE             | NAME  | MODULE_NAME | SIZE  | PURPOSE     |\n"
 "+--------+------+---------------------+-------+-------------+-------+-------------+\n"
 "| box    | 1432 | Database Management | space | box         | 10000 | insert etc. |\n"
-"| clock  | 188  | Seconds             | space | box         | 10000 | insert etc. |\n"
-"| crypto |   4  | Cryptography        | space | box         | 10000 | insert etc. |\n"
+"| clock  |  188 | Seconds             | space | box         | 10000 | insert etc. |\n"
+"| crypto |    4 | Cryptography        | space | box         | 10000 | insert etc. |\n"
 "+--------+------+---------------------+-------+-------------+-------+-------------+"
 msgstr ""
+"{ столбцы таблицы modules }         { столбцы таблицы submodules }\n"
+"+--------+------+---------------------+-------+-------------+-------+-------------+\n"
+"| NAME   | SIZE | PURPOSE             | NAME  | MODULE_NAME | SIZE  | PURPOSE     |\n"
+"+--------+------+---------------------+-------+-------------+-------+-------------+\n"
+"| box    | 1432 | Управление БД       | space | box         | 10000 | Вставка ... |\n"
+"| clock  |  188 | Секунды             | space | box         | 10000 | Вставка ... |\n"
+"| crypto |    4 | Криптография        | space | box         | 10000 | Вставка ... |\n"
+"+--------+------+---------------------+-------+-------------+-------+-------------+"
 
 msgid ""
 "It is not an error. The meaning of this type of join is \"combine every row "
@@ -637,13 +694,20 @@ msgstr "Мы получим следующий результат:"
 
 msgid ""
 "+----------+-----------+------------+--------+---------+-------+-------------+\n"
-"| modules_ |  modules_ | modules_   | name   | module_ | size  | purpose     |\n"
-"| name     |  size     | purpose    |        | name    |       |             |\n"
-"+----------+-----------+--------- --+--------+---------+-------+-------------|\n"
-"| box      | 1432      | Database   | space  | box     | 10000 | insert etc. |\n"
+"| MODULES_ |  MODULES_ | MODULES_   | NAME   | MODULE_ | SIZE  | PURPOSE     |\n"
+"| NAME     |  SIZE     | PURPOSE    |        | NAME    |       |             |\n"
+"+----------+-----------+--------- --+--------+---------+-------+-------------+\n"
+"| box      |      1432 | Database   | space  | box     | 10000 | insert etc. |\n"
 "|          |           | Management |        |         |       |             |\n"
-"+----------+-----------+------------+--------+---------+-------+-------------|"
+"+----------+-----------+------------+--------+---------+-------+-------------+"
 msgstr ""
+"+----------+-----------+------------+--------+---------+-------+-------------+\n"
+"| MODULES_ |  MODULES_ | MODULES_   | NAME   | MODULE_ | SIZE  | PURPOSE     |\n"
+"| NAME     |  SIZE     | PURPOSE    |        | NAME    |       |             |\n"
+"+----------+-----------+--------- --+--------+---------+-------+-------------+\n"
+"| box      |      1432 | Управление | space  | box     | 10000 | Вставка ... |\n"
+"|          |           | БД         |        |         |       |             |\n"
+"+----------+-----------+------------+--------+---------+-------+-------------+"
 
 msgid ""
 "In other words, you can specify a Cartesian join in the FROM clause, then "
@@ -764,13 +828,21 @@ msgstr ""
 msgid ""
 "{ columns from modules table }         { columns from submodules table }\n"
 "+--------+------+---------------------+-------+-------------+-------+-------------+\n"
-"| name   | size | purpose             | name  | module_name | size  | purpose     |\n"
+"| NAME   | SIZE | PURPOSE             | NAME  | MODULE_NAME | SIZE  | PURPOSE     |\n"
 "+--------+------+---------------------+-------+-------------+-------+-------------+\n"
 "| box    | 1432 | Database Management | space | box         | 10000 | insert etc. |\n"
-"| clock  | 188  | Seconds             | NULL  | NULL        | NULL  | NULL        |\n"
-"| crypto |   4  | Cryptography        | NULL  | NULL        | NULL  | NULL        |\n"
+"| clock  |  188 | Seconds             | NULL  | NULL        | NULL  | NULL        |\n"
+"| crypto |    4 | Cryptography        | NULL  | NULL        | NULL  | NULL        |\n"
 "+--------+------+---------------------+-------+-------------+-------+-------------+"
 msgstr ""
+"{ столбцы таблицы modules    }         { столбцы таблицы submodules    }\n"
+"+--------+------+---------------------+-------+-------------+-------+-------------+\n"
+"| NAME   | SIZE | PURPOSE             | NAME  | MODULE_NAME | SIZE  | PURPOSE     |\n"
+"+--------+------+---------------------+-------+-------------+-------+-------------+\n"
+"| box    | 1432 | Управление БД       | space | box         | 10000 | Вставка ... |\n"
+"| clock  |  188 | Секунды             | NULL  | NULL        | NULL  | NULL        |\n"
+"| crypto |    4 | Криптография        | NULL  | NULL        | NULL  | NULL        |\n"
+"+--------+------+---------------------+-------+-------------+-------+-------------+"
 
 msgid ""
 "Thus, for the submodules of the clock module and the submodules of the "
@@ -807,9 +879,14 @@ msgstr ""
 msgid ""
 "Suppose that we do not want to know all the individual size values, we just "
 "want to know about their aggregation, that is, take the attributes of the "
-"collection. SQL allows five aggregation functions: AVG (average), SUM, MIN "
-"(minimum), MAX (maximum), and COUNT. For example"
+"collection. SQL allows aggregation functions including: AVG (average), SUM, "
+"MIN (minimum), MAX (maximum), and COUNT. For example"
 msgstr ""
+"Предположим, что требуется не получить все отдельные значения из столбца "
+"``size``, а узнать что-либо об их совокупности, то есть получить атрибуты "
+"коллекции. SQL позволяет использовать агрегатные функции, в том числе: AVG "
+"(среднее значение), SUM (сумма), MIN (минимум), MAX (максимум) и COUNT "
+"(число элементов). Пример:"
 
 msgid ""
 "``SELECT AVG(size), SUM(size), MIN(size), MAX(size), COUNT(size) FROM "
@@ -817,12 +894,17 @@ msgid ""
 msgstr ""
 
 msgid ""
-"+--------------+-----------+-----------+-----------+-----------+\n"
-"| COLUMN_1     | COLUMN_2  | COLUMN_3  | COLUMN_4  | COLUMN_5  |\n"
-"+--------------+-----------+-----------+-----------+-----------|\n"
-"| 5.413333E+02 | 1624      |         4 |      1432 |         3 |\n"
-"+--------------+-----------+-----------+-----------+-----------+"
+"+-----------+-----------+-----------+-----------+-----------+\n"
+"| COLUMN_1  | COLUMN_2  | COLUMN_3  | COLUMN_4  | COLUMN_5  |\n"
+"+-----------+-----------+-----------+-----------+-----------|\n"
+"|       541 |      1624 |         4 |      1432 |         3 |\n"
+"+-----------+-----------+-----------+-----------+-----------+"
 msgstr ""
+"+-----------+-----------+-----------+-----------+-----------+\n"
+"| СТОЛБЕЦ1  | СТОЛБЕЦ2  | СТОЛБЕЦ3  | СТОЛБЕЦ4  | СТОЛБЕЦ5  |\n"
+"+-----------+-----------+-----------+-----------+-----------|\n"
+"|       541 |      1624 |         4 |      1432 |         3 |\n"
+"+-----------+-----------+-----------+-----------+-----------+"
 
 msgid ""
 "Suppose that we want aggregations, but aggregations of rows that have some "
@@ -841,11 +923,17 @@ msgstr ""
 msgid ""
 "+------------+--------------+-----------+-----------+-----------+-------------+\n"
 "| COLUMN_1   | COLUMN_2     | COLUMN_3  | COLUMN_4  | COLUMN_5  | COLUMN_6    |\n"
-"+------------+--------------+-----------+-----------+-----------|-------------|\n"
+"+------------+--------------+-----------+-----------+-----------+-------------+\n"
 "| b          |         1432 |      1432 |      1432 |      1432 |           1 |\n"
 "| c          |           96 |       192 |         4 |       188 |           2 |\n"
-"+------------+--------------+-----------+-----------+-----------|-------------+"
+"+------------+--------------+-----------+-----------+-----------+-------------+"
 msgstr ""
+"+------------+--------------+-----------+-----------+-----------+-------------+\n"
+"| СТОЛБЕЦ1   | СТОЛБЕЦ2     | СТОЛБЕЦ3  | СТОЛБЕЦ4  | СТОЛБЕЦ5  | СТОЛБЕЦ6    |\n"
+"+------------+--------------+-----------+-----------+-----------+-------------+\n"
+"| b          |         1432 |      1432 |      1432 |      1432 |           1 |\n"
+"| c          |           96 |       192 |         4 |       188 |           2 |\n"
+"+------------+--------------+-----------+-----------+-----------+-------------+"
 
 msgid "**Select with common table expression**"
 msgstr ""
@@ -917,7 +1005,7 @@ msgid ""
 msgstr ""
 
 msgid "**Transactions**"
-msgstr ""
+msgstr "**Транзакции**"
 
 msgid ""
 "Tarantool has a \"Write Ahead Log\" (WAL). Effects of data-change statements"
@@ -1030,7 +1118,7 @@ msgid ""
 msgstr ""
 
 msgid "**Relational Databases**"
-msgstr ""
+msgstr "**Реляционные базы данных**"
 
 msgid ""
 "Edgar F. Codd, the person most responsible for researching and explaining "
diff --git a/locale/ru/LC_MESSAGES/reference/reference_sql/sql_plus_lua.po b/locale/ru/LC_MESSAGES/reference/reference_sql/sql_plus_lua.po
index 63f33207e6..492dc2f20f 100644
--- a/locale/ru/LC_MESSAGES/reference/reference_sql/sql_plus_lua.po
+++ b/locale/ru/LC_MESSAGES/reference/reference_sql/sql_plus_lua.po
@@ -321,10 +321,28 @@ msgid ""
 "functions, we would have to treat it as a VARBINARY and look for "
 "``POSITION(X'A476696577C3',\"flags\")  > 0`` (A4 is a MsgPack signal that a "
 "4-byte string follows, 76696577 is UTF8 encoding for 'view', C3 is a MsgPack"
-" code meaning true). But we have a more sophisticated way, we can create a "
-"function that returns true if ``\"flags\".view`` is true. So our way of "
-"making the function looks like this:"
-msgstr ""
+" code meaning true). In any case, starting with Tarantool version 2.10, "
+"POSITION() does not work on VARBINARY operands. But we have a more "
+"sophisticated way, we can create a function that returns true if "
+"``\"flags\".view`` is true. So our way of making the function looks like "
+"this:"
+msgstr ""
+"Рассмотрим пример ниже, где Tarantool создает представление со столбцами "
+"``table_name`` и ``table_type``. Они включены в представление в том же виде,"
+" как если бы они входили в стандартное представление SQL "
+"``information_schema.tables``. Однако, чтобы определить, должен ли "
+"``table_type`` быть ``'BASE TABLE'`` или ``'VIEW'``, нам необходимо знать "
+"значение поля ``\"flags\"`` в спейсе Tarantool/NoSQL :ref:`\"_space\" "
+"<box_space-space>` или ``\"_vspace\"``. Тип поля ``\"flags\"`` --- "
+"``\"map\"``, а SQL не очень хорошо понимает этот тип. Без функций Lua нам "
+"пришлось бы рассматривать его как VARBINARY и искать "
+"``POSITION(X'A476696577C3',\"flags\")  > 0`` (где ``A4`` --- сигнал MsgPack "
+"о том, что далее следует 4-байтовая строка, ``76696577`` --- кодировка UTF8 "
+"для ``'view'``, а ``C3`` --- код MsgPack, означающий ``TRUE``).  В любом "
+"случае, начиная с версии Tarantool 2.10, ``POSITION()`` не работает на "
+"операндах типа VARBINARY. Но у нас есть более изысканный способ: мы можем "
+"создать функцию, возвращающую ``TRUE``, если ``\"flags\".view`` --- "
+"``TRUE``. Это можно сделать следующим образом:"
 
 msgid ""
 "box.schema.func.create('TABLES_IS_VIEW',\n"
@@ -652,9 +670,13 @@ msgstr ""
 msgid ""
 "This is also an example of how one can use :ref:`recursive views <sql_with>`"
 " to make temporary tables with multiple rows for each tuple in the original "
-"``\"_vtable\"`` space. It requires a global variable, _G.box.FORMATS, as a "
+"``\"_vspace\"`` space. It requires a global variable, _G.box.FORMATS, as a "
 "temporary static variable."
 msgstr ""
+"Этот пример также показывает, как с помощью :ref:`рекурсивных представлений "
+"<sql_with>` создавать временные таблицы с несколькими строками для каждого "
+"кортежа в исходном спейсе ``\"_vspace\"``. Для этого потребуется глобальная "
+"переменная ``_G.box.FORMATS`` в качестве временной статической переменной."
 
 msgid ""
 "Warning: Use this code only with Tarantool version 2.3.2 or later. Use with "
diff --git a/locale/ru/LC_MESSAGES/reference/reference_sql/sql_statements_and_clauses.po b/locale/ru/LC_MESSAGES/reference/reference_sql/sql_statements_and_clauses.po
index cccc648209..65221257c9 100644
--- a/locale/ru/LC_MESSAGES/reference/reference_sql/sql_statements_and_clauses.po
+++ b/locale/ru/LC_MESSAGES/reference/reference_sql/sql_statements_and_clauses.po
@@ -341,6 +341,13 @@ msgstr ""
 msgid "Column definition -- the rules for the SCALAR data type"
 msgstr ""
 
+msgid ""
+"The rules for the SCALAR data type were significantly changed in Tarantool "
+"version :tarantool-release:`2.10.0-beta1`."
+msgstr ""
+"Правила для типа данных SCALAR были значительно изменены в версии Tarantool "
+":tarantool-release:`2.10.0-beta1`."
+
 msgid ""
 "SCALAR is a \"complex\" data type, unlike all the other data types which are"
 " \"primitive\". Two column values in a SCALAR column can have two different "
@@ -365,10 +372,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"An item's primitive type is far more important than its defined type. "
+"An item's primitive type is far less important than its defined type. "
 "Incidentally Tarantool might find the primitive type by looking at the way "
 "MsgPack stores it, but that is an implementation detail."
 msgstr ""
+"Примитивный тип элемента гораздо менее важен, чем его установленный тип. "
+"Tarantool может определить примитивный тип по тому, как MsgPack хранит его, "
+"но это уже детали реализации."
 
 msgid ""
 "A SCALAR definition may not include a maximum length, as there is no "
@@ -386,34 +396,47 @@ msgid ""
 "target is a SCALAR item. For example ``UPDATE ... SET column1 = 'a'`` is "
 "illegal if ``column1`` is defined as INTEGER, but is legal if ``column1`` is"
 " defined as SCALAR -- values which happen to be INTEGER will be changed so "
-"their data type is STRING."
+"their data type is SCALAR."
 msgstr ""
+"Некоторые присваивания недопустимы, когда типы данных различаются, но "
+"разрешены, если речь об элементе типа SCALAR. Например, инструкция ``UPDATE "
+"... SET column1 = 'a'`` выдаст ошибку, если столбец ``column1`` определен "
+"как INTEGER. Однако она может быть выполнена, если ``column1`` определен как"
+" SCALAR, при этом все значения типа INTEGER будут приведены к типу данных "
+"SCALAR."
 
 msgid "There is no literal syntax which implies data type SCALAR."
 msgstr ""
 
 msgid ""
-"TYPEOF(x) is never SCALAR, it is always the underlying data type. This is "
-"true even if ``x`` is NULL (in that case the data type is BOOLEAN). In fact "
-"there is no function that is guaranteed to return the defined data type. For"
-" example, ``TYPEOF(CAST(1 AS SCALAR));`` returns INTEGER, not SCALAR."
+"TYPEOF(x) is always 'scalar' or 'NULL', it is never the underlying data "
+"type. In fact there is no function that is guaranteed to return the "
+"underlying data type. For example, ``TYPEOF(CAST(1 AS SCALAR));`` returns "
+"'scalar', not 'integer'."
 msgstr ""
+"Результат ``TYPEOF(x)`` --- всегда ``'scalar'`` или ``'NULL'``, а не базовый"
+" тип данных. Не существует функции, которая гарантированно возвращает "
+"базовый тип данных. Например, ``TYPEOF(CAST(1 AS SCALAR));`` возвращает "
+"``'scalar'``, а не ``'integer'``."
 
 msgid ""
 "For any operation that requires implicit casting from an item defined as "
-"SCALAR, the syntax is legal but the operation may fail at runtime. At "
-"runtime, Tarantool detects the underlying primitive data type and applies "
-"the rules for that. For example, if a definition is:"
+"SCALAR, the operation will fail at runtime. For example, if a definition is:"
 msgstr ""
+"Любая операция, которая требует неявного приведения элемента, определенного "
+"как SCALAR, завершится ошибкой во время выполнения. Например, если "
+"определение имеет вид:"
 
 msgid "CREATE TABLE t (s1 SCALAR PRIMARY KEY, s2 INTEGER);"
-msgstr ""
+msgstr "CREATE TABLE t (s1 SCALAR PRIMARY KEY, s2 INTEGER);"
 
 msgid ""
-"and within any row ``s1 = 'a'``, that is, its underlying primitive type is "
-"STRING to indicate character strings, then ``UPDATE t SET s2 = s1;`` is "
-"illegal. Tarantool usually does not know that in advance."
+"and the only row in table T has s1 = 1, that is, its underlying primitive "
+"type is INTEGER, then ``UPDATE t SET s2 = s1;`` is illegal."
 msgstr ""
+"и единственная строка в таблице T содержит значение ``s1 = 1``, то есть "
+"примитивный тип этого значения --- INTEGER, то операция ``UPDATE t SET s2 = "
+"s1;`` все равно не разрешена."
 
 msgid ""
 "For any dyadic operation that requires implicit casting for comparison, the "
@@ -430,20 +453,30 @@ msgstr ""
 
 msgid ""
 "The comparison is valid, because Tarantool knows the ordering of X'41' and "
-"'a' in Tarantool/NoSQL 'scalar'."
+"'a' in Tarantool/NoSQL 'scalar' -- this is a case where the primitive type "
+"matters."
 msgstr ""
+"Такое сравнение корректно, поскольку Tarantool знает, в каком порядке стоят "
+"значения ``X'41'`` и ``'a'`` типа ``'scalar'`` в Tarantool/NoSQL. В этом "
+"случае примитивный тип имеет значение."
 
 msgid ""
 "The result data type of :ref:`min/max <sql_aggregate>` operation on a column"
-" defined as SCALAR is the data type of the minimum/maximum operand, unless "
-"the result value is NULL. For example:"
+" defined as SCALAR is SCALAR. Users will need to know the underlying "
+"primitive type of the result in advance. For example:"
 msgstr ""
+"Результат операции :ref:`min/max <sql_aggregate>` над столбцом, определенным"
+" как SCALAR, тоже будет иметь тип SCALAR. Пользователям необходимо заранее "
+"знать примитивный тип результата. Пример:"
 
 msgid ""
 "CREATE TABLE t (s1 INTEGER, s2 SCALAR PRIMARY KEY);\n"
 "INSERT INTO t VALUES (1, X'44'), (2, 11), (3, 1E4), (4, 'a');\n"
-"SELECT min(s2), hex(max(s2)) FROM t;"
+"SELECT cast(min(s2) AS INTEGER), hex(cast(max(s2) as VARBINARY)) FROM t;"
 msgstr ""
+"CREATE TABLE t (s1 INTEGER, s2 SCALAR PRIMARY KEY);\n"
+"INSERT INTO t VALUES (1, X'44'), (2, 11), (3, 1E4), (4, 'a');\n"
+"SELECT cast(min(s2) AS INTEGER), hex(cast(max(s2) as VARBINARY)) FROM t;"
 
 msgid "The result is: ``- - [11, '44',]``"
 msgstr ""
@@ -451,25 +484,47 @@ msgstr ""
 msgid ""
 "That is only possible with Tarantool/NoSQL scalar rules, but ``SELECT "
 "SUM(s2)`` would not be legal because addition would in this case require "
-"implicit casting from VARBINARY to a number, which is not sensible."
+"implicit casting from VARBINARY to a numeric, which is not sensible."
+msgstr ""
+"Это возможно только с правилами Tarantool/NoSQL для типа ``scalar``. Однако "
+"вызов ``SELECT SUM(s2)`` не будет допустим: суммирование в этом случае "
+"потребует неявного приведения VARBINARY к числовому значению, что неразумно."
+
+msgid ""
+"The result data type of a primitive combination is sometimes SCALAR although"
+" we in effect use the primitive data type not the defined data type. (Here "
+"we use the word \"combination\" in the way that the standard document uses "
+"it for section \"Result of data type combinations\".) Therefore for "
+"``greatest(1E308, 'a', 0, X'00')`` the result is X'00' but "
+"``typeof(greatest(1E308, 'a', 0, X'00')`` is 'scalar'."
 msgstr ""
+"В случае комбинации примитивных типов результат иногда имеет тип данных "
+"SCALAR, хотя на самом деле используется примитивный тип данных, а не "
+"установленный тип данных. Здесь под комбинацией подразумевается то же, что и"
+" в стандарте SQL в разделе \"Результат комбинации типов данных\". Поэтому "
+"для ``greatest(1E308, 'a', 0, X'00')`` результатом будет ``X'00'``, но "
+"результат ``typeof(greatest(1E308, 'a', 0, X'00')`` будет ``'scalar'``."
 
 msgid ""
-"The result data type of a primitive combination is never SCALAR because we "
-"in effect use TYPEOF(item) not the defined data type. (Here we use the word "
-"\"combination\" in the way that the standard document uses it for section "
-"\"Result of data type combinations\".) Therefore for ``greatest(1E308, 'a', "
-"0, X'00')`` the result is X'00'."
+"The union of two SCALARs is sometimes the primitive type. For example, "
+"``SELECT TYPEOF((SELECT CAST('a' AS SCALAR) UNION SELECT CAST('a' AS "
+"SCALAR)));`` returns 'string'."
 msgstr ""
+"Объединение двух значений типа SCALAR иногда представляется примитивным "
+"типом. Например, ``SELECT TYPEOF((SELECT CAST('a' AS SCALAR) UNION SELECT "
+"CAST('a' AS SCALAR)));`` вернет ``'string'``."
 
 msgid "Column definition -- relation to NoSQL"
 msgstr ""
 
 msgid ""
-"All the SQL data types correspond to :ref:`Tarantool/NoSQL types with the "
-"same name <box_space-index_field_types>`. For example an SQL STRING is "
-"stored in a NoSQL space as type = 'string'."
+"All of the SQL data types except SCALAR correspond to :ref:`Tarantool/NoSQL "
+"types with the same name <box_space-index_field_types>`. For example an SQL "
+"STRING is stored in a NoSQL space as type = 'string'."
 msgstr ""
+"Все типы данных SQL, кроме SCALAR, соответствуют :ref:`типам в "
+"Tarantool/NoSQL с тем же именем <box_space-index_field_types>`. Например, "
+"тип SQL STRING хранится в пространстве NoSQL как тип ``'string'``."
 
 msgid ""
 "Therefore specifying an SQL data type X determines that the storage will be "
@@ -492,15 +547,23 @@ msgstr ""
 
 msgid ""
 "There is one floating-point value which is not handled by SQL: -nan is seen "
-"as NULL."
+"as NULL although its data type is 'double'."
 msgstr ""
+"Существует одно значение с плавающей точкой, которое не обрабатывается SQL: "
+"``-NaN`` воспринимается как ``NULL``, хотя его тип данных --- ``'double'``."
 
 msgid ""
 "There are also some Tarantool/NoSQL data types which have no corresponding "
-"SQL data types. For example, ``SELECT \"flags\" FROM \"_space\";`` will "
-"return a column whose data type is 'map'. Such columns can only be "
-"manipulated in SQL by :ref:`invoking Lua functions <sql_calling_lua>`."
+"SQL data types. For example, ``SELECT \"flags\" FROM \"_vspace\";`` will "
+"return a column whose SQL data type is 'varbinary' rather than 'map'. Such "
+"columns can only be manipulated in SQL by :ref:`invoking Lua functions "
+"<sql_calling_lua>`."
 msgstr ""
+"В Tarantool/NoSQL также есть типы, которым не соответствует ни один тип "
+"данных в SQL. Например, ``SELECT \"flags\" FROM \"_vspace\";`` вернет "
+"столбец, тип которого ``'varbinary'``, а не ``'map'``. Такими столбцами "
+"можно оперировать в SQL, только :ref:`вызывая Lua-функции "
+"<sql_calling_lua>`."
 
 msgid "Column definition -- column-constraint or default clause"
 msgstr ""
@@ -617,7 +680,8 @@ msgid ""
 " columnb VARCHAR(0), columnc VARCHAR(100000) COLLATE \"binary\",\n"
 " columnd UUID,\n"
 " columne VARBINARY,\n"
-" columnf SCALAR, columng SCALAR COLLATE \"unicode_uk_s2\");"
+" columnf SCALAR, columng SCALAR COLLATE \"unicode_uk_s2\",\n"
+" columnh DECIMAL);"
 msgstr ""
 "-- со всеми возможными типами данных и алиасами\n"
 "CREATE TABLE t\n"
@@ -630,7 +694,8 @@ msgstr ""
 " columnb VARCHAR(0), columnc VARCHAR(100000) COLLATE \"binary\",\n"
 " columnd UUID,\n"
 " columne VARBINARY,\n"
-" columnf SCALAR, columng SCALAR COLLATE \"unicode_uk_s2\");"
+" columnf SCALAR, columng SCALAR COLLATE \"unicode_uk_s2\",\n"
+" columnh DECIMAL);"
 
 msgid ""
 "-- with all possible column constraints and a default clause\n"
@@ -2298,8 +2363,8 @@ msgstr ""
 msgid "``SUM([DISTINCT] expression)``"
 msgstr ""
 
-msgid "Return the sum of values of expression."
-msgstr ""
+msgid "Return the sum of values of expression, or NULL if there are no rows."
+msgstr "Возвращает сумму значений выражения или ``NULL``, если строк не было."
 
 msgid "Example: :samp:`SUM({column1})`"
 msgstr ""
@@ -2307,6 +2372,9 @@ msgstr ""
 msgid "``TOTAL([DISTINCT] expression)``"
 msgstr ""
 
+msgid "Return the sum of values of expression, or zero if there are no rows."
+msgstr "Возвращает сумму значений выражения или ноль, если строк не было."
+
 msgid "Example: :samp:`TOTAL({column1})`"
 msgstr ""
 
@@ -2397,9 +2465,15 @@ msgid ""
 "The expression may also contain operators and function names and literals. "
 "For example, in the statement |br| ``SELECT x, y FROM t ORDER BY UPPER(z);``"
 " |br| ``ORDER BY UPPER(z)`` means \"order by the uppercase form of column "
-"``t.z``\", which may be similar to doing ordering in a case-insensitive "
-"manner."
+"``t.z``\", which may be similar to doing ordering with one of Tarantool's "
+"case-insensitive collations."
 msgstr ""
+"Выражение может содержать операторы и имена функций, а также конкретные "
+"значения. Например, в инструкции ``SELECT x, y FROM t ORDER BY UPPER(z);`` "
+"часть ``ORDER BY UPPER(z)`` означает \"упорядочить по значениям столбца "
+"``t.z``, представленным в заглавном регистре\". Вероятно, эта операция "
+"аналогична упорядочиванию с помощью одной из нечувствительных к регистру "
+"сортировок Tarantool."
 
 msgid ""
 "Type 3 is illegal if the SELECT statement contains :ref:`UNION or EXCEPT or "
@@ -2429,11 +2503,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"NULLs come first, then BOOLEANs, then numbers, then STRINGs, then "
+"NULLs come first, then BOOLEANs, then numerics, then STRINGs, then "
 "VARBINARYs, then UUIDs."
 msgstr ""
-"Первыми идут значения типа NULL, затем BOOLEAN, числовые значения, STRING, "
-"VARBINARY и, наконец, UUID."
+"Первыми идут значения NULL, затем значения типа BOOLEAN, числовые значения, "
+"STRING, VARBINARY и, наконец, UUID."
 
 msgid "Within STRINGs, ordering is according to collation."
 msgstr ""
@@ -3316,6 +3390,15 @@ msgstr ""
 msgid "List of functions"
 msgstr ""
 
+msgid ""
+"These are Tarantool/SQL's built-in functions. Starting with Tarantool 2.10, "
+"for functions that require numeric arguments, function arguments with NUMBER"
+" data type are illegal."
+msgstr ""
+"Ниже приведены встроенные функции Tarantool/SQL. Начиная с Tarantool 2.10 "
+"для функций, требующих числовые аргументы, аргументы с типом данных NUMBER "
+"недопустимы."
+
 msgid "ABS"
 msgstr ""
 
@@ -3426,19 +3509,36 @@ msgstr ""
 msgid ":samp:`HEX(expression)`"
 msgstr ""
 
-msgid ""
-"Return the hexadecimal code for each byte in **expression**, which may be "
-"either a string or a byte sequence. For ASCII characters, this is "
-"straightforward because the encoding is the same as the code point value. "
-"For non-ASCII characters, since character strings are usually encoded in "
-"UTF-8, each character will require two or more bytes."
+msgid "Return the hexadecimal code for each byte in **expression**."
 msgstr ""
+"Возвращает шестнадцатеричный код для каждого байта выражения **expression**."
 
-msgid "``HEX('A')`` will return ``41``."
+msgid ""
+"Starting with Tarantool version 2.10.0, the expression must be a byte "
+"sequence (data type VARBINARY)."
 msgstr ""
+"Начиная с версии Tarantool 2.10.0 выражение должно быть последовательностью "
+"байтов (тип данных VARBINARY)."
 
-msgid "``HEX('Д')`` will return ``D094``."
+msgid ""
+"In earlier versions of Tarantool, the expression could be either a string or"
+" a byte sequence. For ASCII characters, this was straightforward because the"
+" encoding is the same as the code point value. For non-ASCII characters, "
+"since character strings are usually encoded in UTF-8, each character will "
+"require two or more bytes."
 msgstr ""
+"В предыдущих версиях Tarantool выражение могло быть либо строкой, либо "
+"последовательностью байтов. Для символов ASCII оно выполнялось довольно "
+"прямолинейно, поскольку значение каждого символа в кодировке ASCII совпадает"
+" с его значением в шестнадцатеричной схеме. В случае с символами, не "
+"входящими в таблицу ASCII, для каждого символа потребуется два байта или "
+"более, поскольку строки символов обычно кодируются в UTF-8."
+
+msgid "``HEX(X'41')`` will return ``41``."
+msgstr "``HEX(X'41')`` вернет ``41``."
+
+msgid "``HEX(CAST('Д' AS VARBINARY))`` will return ``D094``."
+msgstr "``HEX(CAST('Д' AS VARBINARY))`` вернет ``D094``."
 
 msgid "IFNULL"
 msgstr ""
@@ -3502,13 +3602,15 @@ msgstr ""
 msgid "LIKELIHOOD"
 msgstr ""
 
-msgid ":samp:`LIKELIHOOD({expression}, {number literal})`"
-msgstr ""
+msgid ":samp:`LIKELIHOOD({expression}, {DOUBLE literal})`"
+msgstr ":samp:`LIKELIHOOD({expression}, {DOUBLE literal})`"
 
 msgid ""
-"Return the result of the expression, provided that the number literal is "
+"Return the expression without change, provided that the numeric literal is "
 "between 0.0 and 1.0."
 msgstr ""
+"Возвращает выражение без изменений, при условии, что числовое значение "
+"находится в диапазоне от 0.0 до 1.0."
 
 msgid "Example: ``LIKELIHOOD('a' = 'b', .0)`` is FALSE"
 msgstr ""
@@ -3591,9 +3693,12 @@ msgstr ""
 
 msgid ""
 "Return a string formatted according to the rules of the C ``sprintf()`` "
-"function, where ``%d%s`` means the next two arguments are a number and a "
+"function, where ``%d%s`` means the next two arguments are a numeric and a "
 "string, and so on."
 msgstr ""
+"Возвращает строку, отформатированную по правилам функции C ``sprintf()``, "
+"где ``%d%s`` означает, что следующие два аргумента --- числовой и строка, и "
+"так далее."
 
 msgid "If an argument is missing or is NULL, it becomes:"
 msgstr ""
@@ -3601,8 +3706,9 @@ msgstr ""
 msgid "'0' if the format requires an integer,"
 msgstr ""
 
-msgid "'0.0' if the format requires a number with a decimal point,"
+msgid "'0.0' if the format requires a numeric with a decimal point,"
 msgstr ""
+"``'0.0'``, если формат требует числового значения с десятичной точкой,"
 
 msgid "'' if the format requires a string."
 msgstr ""
@@ -3613,8 +3719,8 @@ msgstr ""
 msgid "QUOTE"
 msgstr ""
 
-msgid ":samp:`QUOTE(string-literal)`"
-msgstr ""
+msgid ":samp:`QUOTE(string-argument)`"
+msgstr ":samp:`QUOTE(string)`"
 
 msgid ""
 "Return a string with enclosing quotes if necessary, and with quotes inside "
@@ -3624,8 +3730,15 @@ msgid ""
 "strings are shown as two single quotes in a row."
 msgstr ""
 
-msgid "Example: ``QUOTE('a')`` is ``'a'``."
+msgid ""
+"Starting with Tarantool version 2.10, arguments with numeric data types are "
+"returned without change."
 msgstr ""
+"Начиная с версии Tarantool 2.10 аргументы с числовыми типами данных "
+"возвращаются без изменений."
+
+msgid "Example: ``QUOTE('a')`` is ``'a'``. ``QUOTE(5)`` is ``5``."
+msgstr "Примеры: ``QUOTE('a')`` вернет ``'a'``, ``QUOTE(5)`` вернет ``5``."
 
 msgid "RAISE"
 msgstr ""
@@ -3691,11 +3804,16 @@ msgstr ""
 
 msgid ""
 "Return the rounded value of numeric-expression-1, always rounding .5 upward "
-"for floating-point positive numbers or downward for negative numbers. If "
-"numeric-expression-2 is supplied then rounding is to the nearest numeric-"
+"for positive numerics or downward for negative numerics. If numeric-"
+"expression-2 is supplied then rounding is to the nearest numeric-"
 "expression-2 digits after the decimal point; if numeric-expression-2 is not "
 "supplied then rounding is to the nearest integer."
 msgstr ""
+"Возвращает округленное значение первого числового выражения. Положительные "
+"числа округляются до 0,5 в большую сторону, отрицательные --- до 0,5 в "
+"меньшую. Если задано второе числовое выражение, то первое округляется до "
+"ближайших цифр после десятичной точки второго выражения. Если второе "
+"выражение не задано, первое округляется до ближайшего целого числа."
 
 msgid "Example: ``ROUND(-1.5)`` is -2, ``ROUND(1.7766E1,2)`` is 17.77."
 msgstr ""
@@ -3831,14 +3949,30 @@ msgid ":samp:`TYPEOF({expression})`"
 msgstr ""
 
 msgid ""
-"Return the :ref:`data type <sql_column_def_data_type>` of the expression."
+"Return 'NULL' if the expression is NULL, or return 'scalar' if the "
+"expression is the name of a column defined as SCALAR, or return the "
+":ref:`data type <sql_column_def_data_type>` of the expression."
 msgstr ""
+"Возвращает ``'NULL'``, если выражение равно ``NULL``. Возвращает "
+"``'scalar'``, если выражение --- это имя колонки, определенной как SCALAR. В"
+" остальных случаях возвращает :ref:`тип данных <sql_column_def_data_type>` "
+"выражения."
 
 msgid ""
 "``TYPEOF('A')`` returns 'string'; ``TYPEOF(RANDOMBLOB(1))`` returns "
 "'varbinary'; ``TYPEOF(1e44)`` returns 'double' or 'number'; ``TYPEOF(-44)`` "
-"returns 'integer'; ``TYPEOF(NULL)`` returns 'boolean'"
+"returns 'integer'; ``TYPEOF(NULL)`` returns 'NULL'"
+msgstr ""
+"``TYPEOF('A')`` вернет ``'string'``; ``TYPEOF(RANDOMBLOB(1))`` вернет "
+"``'varbinary'``; ``TYPEOF(1e44)`` вернет ``'double'`` или ``'number'``; "
+"``TYPEOF(-44)`` вернет ``'integer'``; ``TYPEOF(NULL)`` вернет ``'NULL'``."
+
+msgid ""
+"Prior to Tarantool version 2.10, ``TYPEOF(expression)`` simply returned the "
+"data type of the expression for all cases."
 msgstr ""
+"До версии Tarantool 2.10 ``TYPEOF(выражение)`` возвращало тип данных "
+"результата выражения во всех случаях."
 
 msgid "UNICODE"
 msgstr ""
@@ -4037,3 +4171,44 @@ msgid ""
 "things ORDER BY remark COLLATE \"unicode_uk_s1\";`` |br| ``SELECT remark "
 "FROM things ORDER BY remark COLLATE \"unicode_ky_s1\";``"
 msgstr ""
+
+msgid "Default function parameters"
+msgstr "Параметры функций по умолчанию"
+
+msgid ""
+"Starting in Tarantool 2.10, if a parameter for an :ref:`aggregate function "
+"<sql_aggregate>` or a :ref:`built-in scalar SQL function <sql_functions>` is"
+" one of the ``extra-parameters`` that can appear in "
+":ref:`box.execute(...[,extra-parameters]) <box-sql_box_execute>` requests, "
+"default data type is calculated thus: |br| * When there is only one possible"
+" data type, it is default. |br| Example: ``box.execute([[SELECT "
+"TYPEOF(LOWER(?));]],{x})`` is 'string'. |br| * When possible data types are "
+"INTEGER or DOUBLE or DECIMAL, DECIMAL is default. |br| Example: "
+"``box.execute([[SELECT TYPEOF(AVG(?));]],{x})`` is 'decimal'. |br| * When "
+"possible data types are STRING or VARBINARY, STRING is default. |br| "
+"Example: ``box.execute([[SELECT TYPEOF(LENGTH(?));]],{x})`` is 'string'. "
+"|br| * When possible data types are any other scalar data type, SCALAR is "
+"default. |br| Example: ``box.execute([[SELECT "
+"TYPEOF(GREATEST(?,5));]],{x})`` is 'scalar'. |br| * Otherwise, there is no "
+"default. |br| Example: ``box.execute([[SELECT TYPEOF(LIKELY(?));]],{x})`` is"
+" the name of one of the primitive data types."
+msgstr ""
+"Начиная с Tarantool 2.10 действует следующее поведение. Если параметр "
+":ref:`агрегатной функции <sql_aggregate>` или :ref:`встроенных функций SQL "
+"для scalar <sql_functions>` --- один из дополнительных параметров ``extra-"
+"parameters``, которые могут появляться в запросах "
+":ref:`box.execute(...[,extra-parameters]) <box-sql_box_execute>`, тип данных"
+" по умолчанию определяется следующим образом: |br| * Если возможен только "
+"один тип данных, он используется по умолчанию. |br| Пример: "
+"``box.execute([[SELECT TYPEOF(LOWER(?));]],{x})``, тип --- ``'string'``. "
+"|br| * Если возможные типы данных --- INTEGER, DOUBLE или DECIMAL, по "
+"умолчанию используется DECIMAL. |br| Пример: ``box.execute([[SELECT "
+"TYPEOF(AVG(?));]],{x})``, тип --- ``'decimal'``. |br| * Если возможные типы "
+"данных --- STRING или VARBINARY, по умолчанию используется STRING. |br| "
+"Пример: ``box.execute([[SELECT TYPEOF(LENGTH(?));]],{x})``, тип --- "
+"``'string'``. |br| * Если возможны любые другие скалярные типы данных, по "
+"умолчанию используется SCALAR. |br| Пример: ``box.execute([[SELECT "
+"TYPEOF(GREATEST(?,5));]],{x})``, тип --- ``'scalar'``. |br| * Для всех "
+"остальных случаев значения по умолчанию нет. |br| Пример: "
+"``box.execute([[SELECT TYPEOF(LIKELY(?));]],{x})`` --- имя одного из "
+"примитивных типов данных."
diff --git a/locale/ru/LC_MESSAGES/reference/reference_sql/sql_user_guide.po b/locale/ru/LC_MESSAGES/reference/reference_sql/sql_user_guide.po
index 235313c91e..2ef0a39e07 100644
--- a/locale/ru/LC_MESSAGES/reference/reference_sql/sql_user_guide.po
+++ b/locale/ru/LC_MESSAGES/reference/reference_sql/sql_user_guide.po
@@ -43,8 +43,10 @@ msgstr ""
 
 msgid ""
 "The explanations for installing and starting the Tarantool server are in "
-"earlier chapters of the Tarantool manual.."
+"earlier chapters of the Tarantool manual."
 msgstr ""
+"Пояснения по установке и запуску сервера Tarantool приведены в других главах"
+" руководства по Tarantool."
 
 msgid ""
 "To get started specifically with the SQL features, using Tarantool as a "
@@ -135,11 +137,15 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Expressions, for example ``a + b`` OR ``a > b AND NOT a <= b``, may have "
+"Expressions, for example ``a + b`` or ``a > b AND NOT a <= b``, may have "
 "arithmetic operators ``+ - / *``, may have comparison operators ``= > < <= "
 ">= LIKE``, and may be combined with ``AND OR NOT``, with optional "
 "parentheses."
 msgstr ""
+"Выражения, например ``a + b`` или ``a > b AND NOT a <= b``, могут содержать "
+"арифметические операторы ``+ - / *`` и операторы сравнения ``= > < <= >= "
+"LIKE``, а также могут использоваться вместе с ``AND OR NOT``, при этом "
+"круглые скобки необязательны."
 
 msgid "Concepts"
 msgstr ""
@@ -186,11 +192,17 @@ msgstr ""
 
 msgid ""
 "Keywords -- official words in the language, for example ``SELECT`` |br| "
-"Literals -- constants for numbers or strings, for example ``15.7`` or "
+"Literals -- constants for numerics or strings, for example ``15.7`` or "
 "``'Taranto'`` |br| Identifiers -- for example column55 or table_of_accounts "
 "|br| Operators (strictly speaking \"non-alphabetic operators\") -- for "
 "example ``* / + - ( ) , ; < = >=``"
 msgstr ""
+"Ключевые слова --- официальные слова языка, например ``SELECT``. |br| "
+"Литералы --- числовые или строковые константы, например ``15.7`` или "
+"``'Taranto'``. |br| Идентификаторы --- имена объектов, например ``column55``"
+" или ``table_of_accounts``. |br| Операторы (строго говоря, неалфавитные "
+"операторы) --- математические операторы, например ``* / + - ( ) , ; < = "
+">=``."
 
 msgid ""
 "Tokens can be separated from each other by one or more separators: |br| * "
@@ -201,12 +213,26 @@ msgid ""
 " |br| * Bracketed comments (beginning with ``/*`` and ending with ``*/``) "
 "|br| * Simple comments (beginning with ``--`` and ending with line feed) "
 "|br| Separators are not necessary before or after operators. |br| Separators"
-" are necessary after keywords or numbers or ordinary identifiers, unless the"
-" following token is an operator. |br| Thus Tarantool can understand this "
+" are necessary after keywords or numerics or ordinary identifiers, unless "
+"the following token is an operator. |br| Thus Tarantool can understand this "
 "series of six tokens: |br| ``SELECT'a'FROM/**/t;`` |br| but for readability "
 "one would usually use spaces to separate tokens: |br| ``SELECT 'a' FROM /**/"
 " t;``"
 msgstr ""
+"Токены могут быть отделены друг от друга одним или несколькими "
+"разделителями. |br| * Символы-разделители: табуляция (U+0009), перевод "
+"строки (U+000A), вертикальная табуляция (U+000B), смена страницы (U+000C), "
+"возврат каретки (U+000D), пробел (U+0020), следующая строка (U+0085), а "
+"также все редкие символы классов Zl, Zp и Zs Юникода. Полный список символов"
+" вы найдете на странице https://github.com/tarantool/tarantool/issues/2371. "
+"|br| * Комментарии (начинаются с ``/*`` и заканчиваются ``*/``). |br| * "
+"Однострочные комментарии (начинаются с ``--`` и заканчиваются переводом "
+"строки). |br| Разделители не нужны ни перед операторами, ни после них. |br| "
+"Разделители необходимы после ключевых слов, числовых значений или обычных "
+"идентификаторов, если только следующий токен не является оператором. |br| "
+"Таким образом, Tarantool может понять следующую серию из шести токенов: |br|"
+" ``SELECT'a'FROM/**/t;`` |br| Но для удобства чтения токены обычно разделяют"
+" пробелами: |br| ``SELECT 'a' FROM /**/ t;``"
 
 msgid "Literals"
 msgstr ""
@@ -238,14 +264,27 @@ msgid ""
 "Examples: .0, 1.0, 1E5, 1.1E5. |br| A literal has :ref:`data type = DOUBLE "
 "<sql_data_type_double>` if it contains a period, or contains \"E\". DOUBLE "
 "literals are also known as floating-point literals or approximate-numeric "
-"literals. To represent \"Inf\" (infinity), write a real number outside the "
-"double-precision number range, for example 1E309. To represent \"nan\" (not "
-"a number), write an expression that does not result in a real number, for "
+"literals. To represent \"Inf\" (infinity), write a real numeric outside the "
+"double-precision numeric range, for example 1E309. To represent \"nan\" (not"
+" a number), write an expression that does not result in a real numeric, for "
 "example 0/0, using Tarantool/NoSQL. This will appear as NULL in "
 "Tarantool/SQL. In an earlier version literals containing periods were "
 "considered to be :ref:`NUMBER <sql_data_type_number>` literals. In a future "
 "version \"nan\" may not appear as NULL."
 msgstr ""
+"DOUBLE: |br| [+ | -] [цифра [цифра ...]] точка [цифра [цифра ...]] |br| [E|e"
+" [+ | -] цифра ...] |br| Примеры: ``.0``, ``1.0``, ``1E5``, ``1.1E5``. "
+"Значение имеет :ref:`тип данных DOUBLE <sql_data_type_double>`, если оно "
+"содержит десятичную точку или \"E\". Значения типа DOUBLE также известны как"
+" значения с плавающей точкой или приблизительные числа. Чтобы представить "
+"значение \"Inf\" (бесконечность), запишите вещественное число вне диапазона "
+"double, например, ``1E309``. Чтобы представить \"NaN\" (Not a Number, "
+"нечисловое значение), напишите с помощью Tarantool/NoSQL выражение, "
+"результат которого не является вещественным числом, например ``0/0``. В "
+"Tarantool/SQL результат будет отображаться как ``NULL``. В предыдущих "
+"версиях значения, содержащие десятичную точку, считались значениями типа "
+":ref:`NUMBER <sql_data_type_number>`. В будущем \"NaN\" может не "
+"отображаться как ``NULL``."
 
 msgid ""
 "STRING literals: |br| [quote] [character ...] [quote] |br| Examples: "
@@ -266,37 +305,65 @@ msgstr ""
 
 msgid ""
 "Here are four ways to put non-ASCII characters,such as the Greek letter α "
-"alpha,  in string literals: |br| First make sure that your shell program is "
+"alpha, in string literals: |br| First make sure that your shell program is "
 "set to accept characters as UTF-8. A simple way to check is |br| ``SELECT "
-"hex('α');`` If the result is CEB1 -- which is the hexadecimal value for the "
-"UTF-8 representation of α -- it is good. |br| (1) Simply enclose the "
-"character inside ``'...'``, |br| ``'α'`` |br| or |br| (2) Find out what is "
-"the hexadecimal code for the UTF-8 representation of α, and enclose that "
-"inside ``X'...'``, then cast to STRING because ``X'...'`` literals are data "
-"type VARBINARY not STRING, |br| ``CAST(X'CEB1' AS STRING)`` |br| or |br| (3)"
-" Find out what is the Unicode code point for α, and pass that to the "
-":ref:`CHAR function <sql_function_char>`. |br| ``CHAR(945)  /* remember that"
-" this is α as data type STRING not VARBINARY */`` |br| (4) Enclose "
-"statements inside double quotes and include Lua escapes, for example "
-"``box.execute(\"SELECT '\\206\\177';\")`` |br| One can use the concatenation"
-" operator ``||`` to combine characters made with any of these methods."
-msgstr ""
+"hex(cast('α' as VARBINARY));`` If the result is CEB1 -- which is the "
+"hexadecimal value for the UTF-8 representation of α -- it is good. |br| (1) "
+"Simply enclose the character inside ``'...'``, |br| ``'α'`` |br| or |br| (2)"
+" Find out what is the hexadecimal code for the UTF-8 representation of α, "
+"and enclose that inside ``X'...'``, then cast to STRING because ``X'...'`` "
+"literals are data type VARBINARY not STRING, |br| ``CAST(X'CEB1' AS "
+"STRING)`` |br| or |br| (3) Find out what is the Unicode code point for α, "
+"and pass that to the :ref:`CHAR function <sql_function_char>`. |br| "
+"``CHAR(945)  /* remember that this is α as data type STRING not VARBINARY "
+"*/`` |br| (4) Enclose statements inside double quotes and include Lua "
+"escapes, for example ``box.execute(\"SELECT '\\206\\177';\")`` |br| One can "
+"use the concatenation operator ``||`` to combine characters made with any of"
+" these methods."
+msgstr ""
+"Вот четыре способа поместить в строки символы, не относящиеся к стандарту "
+"ASCII, например, греческую букву альфа (α): |br| Сначала убедитесь, что ваша"
+" shell-программа настроена для приема символов в UTF-8. Простой способ "
+"проверки --- выполнить ``SELECT hex(cast('α' as VARBINARY));``. Если "
+"результатом будет ``CEB1`` --- шестнадцатеричное значение "
+"UTF-8-представления α --- значит, все настроено верно. |br| 1. Заключите "
+"символ в одинарные кавычки ``'...'``, |br| ``'α'``. |br| 2. Узнайте "
+"шестнадцатеричный код UTF-8-представления α и запишите его как ``X'...'``. "
+"Затем нужно привести этот литерал к STRING, поскольку значения вида "
+"``X'...'`` имеют тип данных VARBINARY, а не STRING: ``CAST(X'CEB1' AS "
+"STRING)``. |br| 3. Выясните кодовую позицию (code point) Unicode для α и "
+"передайте ее в функцию :ref:`CHAR <sql_function_char>`. |br| ``CHAR(945)  /*"
+" помните, что это α как STRING, а не VARBINARY */`` |br| 4. Заключите "
+"инструкции в двойные кавычки и добавьте управляющие последовательности Lua, "
+"например ``box.execute(\"SELECT '\\206\\177';\")``. |br| Объединить символы,"
+" полученные любым из этих методов, можно с помощью оператора конкатенации "
+"``||``."
 
 msgid ""
 "Limitations: (`Issue#2344 "
-"<https://github.com/tarantool/tarantool/issues/2344>`_) |br| * Numeric "
-"literals may be quoted, one cannot depend on the presence or absence of "
-"quote marks to determine whether a literal is numeric. |br| * "
-"``LENGTH('A''B') = 3`` which is correct, but the display from ``SELECT "
-"A''B;`` is ``A''B``, which is misleading. |br| * It is unfortunate that "
-"``X'41'`` is a byte sequence which looks the same as ``'A'``, but it is not "
-"the same. ``box.execute(\"select 'A' < X'41';\")`` is not legal at the "
-"moment. This happens because ``TYPEOF(X'41')`` yields ``'varbinary'``. Also "
-"it is illegal to say ``UPDATE ... SET string_column = X'41'``, one must say "
-"``UPDATE ... SET string_column = CAST(X'41' AS STRING);``. |br| * It is non-"
-"standard to say that any number which contains a period has data type = "
-"DOUBLE."
-msgstr ""
+"<https://github.com/tarantool/tarantool/issues/2344>`_) |br| * "
+"``LENGTH('A''B') = 3`` which is correct, but on the Tarantool console the "
+"display from ``SELECT A''B;`` is ``A''B``, which is misleading. |br| * It is"
+" unfortunate that ``X'41'`` is a byte sequence which looks the same as "
+"``'A'``, but it is not the same. ``box.execute(\"select 'A' < X'41';\")`` is"
+" not legal at the moment. This happens because ``TYPEOF(X'41')`` yields "
+"``'varbinary'``. Also it is illegal to say ``UPDATE ... SET string_column = "
+"X'41'``, one must say ``UPDATE ... SET string_column = CAST(X'41' AS "
+"STRING);``. |br| * It is non-standard to say that any numeric which contains"
+" a period has data type = DOUBLE."
+msgstr ""
+"Ограничения (подробнее в `Issue#2344 на GitHub "
+"<https://github.com/tarantool/tarantool/issues/2344>`_): |br| * Инструкции, "
+"подобные ``LENGTH('A''B') = 3``, корректны, но в консоли Tarantool при "
+"выполнении ``SELECT A''B;`` будет выведено ``A''B``, что вводит в "
+"заблуждение. |br| * Хотя последовательность байтов ``X'41'`` выглядит так "
+"же, как ``'A'``, но это не одно и то же. Инструкции, подобные "
+"``box.execute(\"select 'A' < X'41';\")``, в настоящее время недопустимы, "
+"поскольку ``TYPEOF(X'41')`` возвращает ``'varbinary'``. Также нельзя "
+"выполнить ``UPDATE ... SET string_column = X'41'``; правильным вариантом "
+"будет ``UPDATE ... SET string_column = CAST(X'41' AS STRING);``. |br| * Не "
+"принято говорить, что типом данных DOUBLE обладает любое числовое значение, "
+"содержащее десятичную точку."
 
 msgid "Identifiers"
 msgstr ""
@@ -331,7 +398,7 @@ msgid ""
 "BINARY BLOB BOOL BOOLEAN BOTH BY CALL CASE CAST CHAR CHARACTER CHECK COLLATE"
 " COLUMN COMMIT CONDITION CONNECT CONSTRAINT CREATE CROSS CURRENT "
 "CURRENT_DATE CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER CURSOR DATE "
-"DATETIME dec DECIMAL DECLARE DEFAULT DEFERRABLE DELETE DENSE_RANK DESC "
+"DATETIME DEC DECIMAL DECLARE DEFAULT DEFERRABLE DELETE DENSE_RANK DESC "
 "DESCRIBE DETERMINISTIC DISTINCT DOUBLE DROP EACH ELSE ELSEIF END ESCAPE "
 "EXCEPT EXISTS EXPLAIN FALSE FETCH FLOAT FOR FOREIGN FROM FULL FUNCTION GET "
 "GRANT GROUP HAVING IF IMMEDIATE IN INDEX INNER INOUT INSENSITIVE INSERT INT "
@@ -349,7 +416,7 @@ msgstr ""
 "BINARY BLOB BOOL BOOLEAN BOTH BY CALL CASE CAST CHAR CHARACTER CHECK COLLATE"
 " COLUMN COMMIT CONDITION CONNECT CONSTRAINT CREATE CROSS CURRENT "
 "CURRENT_DATE CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER CURSOR DATE "
-"DATETIME dec DECIMAL DECLARE DEFAULT DEFERRABLE DELETE DENSE_RANK DESC "
+"DATETIME DEC DECIMAL DECLARE DEFAULT DEFERRABLE DELETE DENSE_RANK DESC "
 "DESCRIBE DETERMINISTIC DISTINCT DOUBLE DROP EACH ELSE ELSEIF END ESCAPE "
 "EXCEPT EXISTS EXPLAIN FALSE FETCH FLOAT FOR FOREIGN FROM FULL FUNCTION GET "
 "GRANT GROUP HAVING IF IMMEDIATE IN INDEX INNER INOUT INSENSITIVE INSERT INT "
@@ -386,10 +453,20 @@ msgid ""
 "ambiguity. A qualifier is an identifier of a higher-level object, followed "
 "by a period. For example column1 within table1 may be referred to as "
 "table1.column1. The \"name\" of an object is the same as its identifier, or "
-"its qualified identifier. For example, inside ``SELECT t1.column1, "
-"t2.column1 FROM t1, t2;`` the qualifiers make it clear that the first column"
-" is column1 from table1 and the second column is column2 from table2."
-msgstr ""
+"its qualified identifier. For example, inside ``SELECT table1.column1, "
+"table2.column1 FROM table1, table2;`` the qualifiers make it clear that the "
+"first column is column1 from table1 and the second column is column1 from "
+"table2."
+msgstr ""
+"Внутри некоторых инструкций к идентификаторам можно добавлять квалификаторы "
+"для исключения двусмысленности. Квалификатор --- это идентификатор объекта "
+"более высокого уровня, за которым следует точка. Например, к столбцу "
+"``column1`` в таблице ``table1`` можно обратиться как ``table1.column1``. "
+"Идентификатор, в том числе с добавленным квалификатором, --- своего рода имя"
+" объекта. Например, в ``SELECT table1.column1, table2.column1 FROM table1, "
+"table2;`` соответствующие квалификаторы дают понять, что первый используемый"
+" столбец --- это ``column1`` из ``table1``, а второй --- ``column1`` из "
+"``table2``."
 
 msgid ""
 "The rules are sometimes relaxed for compatibility reasons, for example some "
@@ -484,8 +561,10 @@ msgstr ""
 msgid "STRING is a data type name, but string is a general term;"
 msgstr ""
 
-msgid "NUMBER is a data type name, but number is a general term."
+msgid "NUMBER is a data type name, but numeric is a general term."
 msgstr ""
+"NUMBER --- имя типа данных, а \"numeric\" и \"числовое значение\" --- общие "
+"термины."
 
 msgid ""
 "Although it is common to say that a VARBINARY value is a \"binary string\", "
@@ -567,10 +646,28 @@ msgid "1.79769e308"
 msgstr ""
 
 msgid "NUMBER"
-msgstr ""
+msgstr "NUMBER"
 
 msgid "number"
-msgstr "число"
+msgstr "number"
+
+msgid "DECIMAL"
+msgstr "DECIMAL"
+
+msgid "decimal"
+msgstr "decimal"
+
+msgid "DEC"
+msgstr "DEC"
+
+msgid "-9999999999999999999"
+msgstr "-9999999999999999999"
+
+msgid "9999999999999999999"
+msgstr "9999999999999999999"
+
+msgid "9999999999999999999 9999999999999999999"
+msgstr "9999999999999999999 9999999999999999999"
 
 msgid "STRING"
 msgstr ""
@@ -614,8 +711,11 @@ msgstr "ffffffff-ffff-ffff- dfff-ffffffffffff"
 msgid "SCALAR"
 msgstr ""
 
-msgid "scalar"
-msgstr "скалярный"
+msgid "(varies)"
+msgstr "(различные)"
+
+msgid "maximum UUID value"
+msgstr "максимальное значение UUID"
 
 msgid ""
 "BOOLEAN values are FALSE, TRUE, and UNKNOWN (which is the same as NULL). "
@@ -623,35 +723,74 @@ msgid ""
 msgstr ""
 
 msgid ""
-"INTEGER values are numbers that do not contain decimal points and are not "
+"INTEGER values are numerics that do not contain decimal points and are not "
 "expressed with exponential notation. The range of possible values is between"
 " -2^63 and +2^64, or NULL."
 msgstr ""
+"Значения INTEGER --- это числовые значения, которые не содержат десятичной "
+"точки и не представлены в экспоненциальной форме записи. Возможные значения:"
+" от ``-2^63`` до ``+2^64``, а также ``NULL``."
 
 msgid ""
-"UNSIGNED values are numbers that do not contain decimal points and are not "
+"UNSIGNED values are numerics that do not contain decimal points and are not "
 "expressed with exponential notation. The range of possible values is between"
 " 0 and +2^64, or NULL."
 msgstr ""
+"Значения UNSIGNED --- это числовые значения, которые не содержат десятичной "
+"точки и не представлены в экспоненциальной форме записи. Возможные значения:"
+" от ``0`` до ``+2^64``, а также ``NULL``."
 
 msgid ""
-"DOUBLE values are numbers that do contain decimal points (for example 0.5) "
+"DOUBLE values are numerics that do contain decimal points (for example 0.5) "
 "or are expressed with exponential notation (for example 5E-1). The range of "
 "possible values is the same as for the IEEE 754 floating-point standard, or "
-"NULL. Numbers outside the range of DOUBLE literals may be displayed as -inf "
-"or inf."
+"NULL. Numerics outside the range of DOUBLE literals may be displayed as -inf"
+" or inf."
 msgstr ""
+"Значения DOUBLE --- это числовые значения, которые содержат десятичную точку"
+" (например, ``0.5``) или представлены в экспоненциальной форме записи "
+"(например, ``5E-1``). Диапазон возможных значений соответствует стандарту "
+"IEEE 754 чисел с плавающей точкой, а также включает в себя ``NULL``. Числа, "
+"выходящие за пределы диапазона DOUBLE, могут быть представлены как ``-inf`` "
+"или ``inf``."
 
 msgid ""
 "NUMBER values have the same range as DOUBLE values. But NUMBER values may "
-"also also be integers, and, if so, arithmetic operation results will be "
-"exact rather than approximate. For example, if a NUMBER column ``X`` "
-"contains 5, then ``X / 2`` is 2, an integer. There is no literal format for "
-"NUMBER (literals like ``1.5`` or ``1E555`` are considered to be DOUBLEs), so"
-" use :ref:`CAST <sql_function_cast>` to insist that a number has data type "
-"NUMBER, but that is rarely necessary. See the description of NoSQL type "
-":ref:`'number' <index-box_number>`."
-msgstr ""
+"also be integers. There is no literal format for NUMBER (literals like "
+"``1.5`` or ``1E555`` are considered to be DOUBLEs), so use :ref:`CAST "
+"<sql_function_cast>` to insist that a numeric has data type NUMBER, but that"
+" is rarely necessary. See the description of NoSQL type :ref:`'number' "
+"<index-box_number>`. Support for arithmetic and built-in arithmetic "
+"functions with NUMBERs was removed in Tarantool version 2.10.1."
+msgstr ""
+"Значения NUMBER имеют тот же диапазон, что и значения DOUBLE, но могут быть "
+"и целыми числами. Для NUMBER не существует отдельного формата записи "
+"(значения типа ``1.5`` или ``1E555`` считаются DOUBLE), поэтому при "
+"необходимости используйте :ref:`CAST <sql_function_cast>`, чтобы привести "
+"значение к типу NUMBER. См. также описание типа :ref:`'number' <index-"
+"box_number>` в NoSQL. Арифметические операции и встроенные арифметические "
+"функции с типами NUMBER не поддерживаются начиная с версии Tarantool 2.10.1."
+
+msgid ""
+"DECIMAL values can contain up to 38 digits on either side of a decimal "
+"point. and any arithmetic with DECIMAL values has exact results (arithmetic "
+"with DOUBLE values could have approximate results instead of exact results)."
+" There is no literal format for DECIMAL, so use :ref:`CAST "
+"<sql_function_cast>` to insist that a numeric has data type DECIMAL, for "
+"example ``CAST(1.1 AS DECIMAL)`` or "
+"``CAST('99999999999999999999999999999999999999' AS DECIMAL)``. See the "
+"description of NoSQL type :ref:`'decimal' <decimal>`. DECIMAL support in SQL"
+" was added in Tarantool version 2.10.1."
+msgstr ""
+"Значения DECIMAL могут содержать до 38 цифр по обе стороны от десятичной "
+"точки. Любая арифметическая операция со значениями DECIMAL имеет точные "
+"результаты (тогда как арифметическая операция со значениями DOUBLE может "
+"иметь приблизительные результаты вместо точных). Для DECIMAL не существует "
+"отдельного формата записи, поэтому используйте :ref:`CAST "
+"<sql_function_cast>`, чтобы привести значение к типу DECIMAL: например, "
+"``CAST(1.1 AS DECIMAL)`` или ``CAST('99999999999999999999999999999999999999'"
+" AS DECIMAL)``. См. также описание типа :ref:`'decimal' <decimal>` в NoSQL. "
+"Поддержка типа DECIMAL в SQL добавлена в версии Tarantool 2.10.1."
 
 msgid ""
 "STRING values are any sequence of zero or more characters encoded with "
@@ -694,19 +833,23 @@ msgstr ""
 
 msgid ""
 "SCALAR can be used for :ref:`column definitions <sql_column_def_data_type>` "
-"but the individual column values have one of the preceding types -- BOOLEAN,"
-" INTEGER, DOUBLE, STRING, VARBINARY, or UUID. See more about SCALAR in the "
-"section :ref:`Column definition -- the rules for the SCALAR data type "
-"<sql_column_def_scalar>`. The data-type may be followed by :ref:`[COLLATE "
-"collation-name] <sql_collate_clause>`."
-msgstr ""
-"SCALAR может использоваться для :ref:`определения столбцов "
-"<sql_column_def_data_type>`, но отдельные значения столбца должны иметь один"
-" из предыдущих типов: BOOLEAN, INTEGER, DOUBLE, STRING, VARBINARY или UUID. "
-"Узнайте больше о типе данных SCALAR в разделе :ref:`Определение столбцов — "
-"правила для типа данных SCALAR <sql_column_def_scalar>`. С этим типом данных"
-" часто используется :ref:`[COLLATE название-сортировки] "
-"<sql_collate_clause>`."
+"and the individual column values have type SCALAR. See :ref:`Column "
+"definition -- the rules for the SCALAR data type <sql_column_def_scalar>`. "
+"The data-type may be followed by :ref:`[COLLATE collation-name] "
+"<sql_collate_clause>`. Prior to Tarantool version 2.10.1, individual column "
+"values had one of the preceding types -- BOOLEAN, INTEGER, DOUBLE, DECIMAL, "
+"STRING, VARBINARY, or UUID. Starting in Tarantool version 2.10.1, all values"
+" have type SCALAR."
+msgstr ""
+"SCALAR может использоваться в :ref:`определениях столбцов "
+"<sql_column_def_data_type>`. Отдельные значения столбца также могут иметь "
+"тип SCALAR. Подробную информацию вы найдете в разделе :ref:`Определение "
+"столбцов --- правила для типа данных SCALAR <sql_column_def_scalar>`. Вместе"
+" с этим типом данных может использоваться :ref:`[COLLATE название-"
+"сортировки] <sql_collate_clause>`. До версии Tarantool 2.10.1 отдельные "
+"значения столбцов могли иметь один из перечисленных выше типов: BOOLEAN, "
+"INTEGER, DOUBLE, DECIMAL, STRING, VARBINARY или UUID. Начиная с версии "
+"Tarantool 2.10.1 все значения в столбце SCALAR имеют тип SCALAR."
 
 msgid ""
 "Any value of any data type may be NULL. Ordinarily NULL will be cast to the "
@@ -716,15 +859,23 @@ msgid ""
 msgstr ""
 
 msgid ""
-"All the SQL data types correspond to :ref:`Tarantool/NoSQL types "
+"Most of the SQL data types correspond to :ref:`Tarantool/NoSQL types "
 "<details_about_index_field_types>` with the same name. There are also some "
 "Tarantool/NoSQL data types which have no corresponding SQL data types. If "
 "Tarantool/SQL reads a Tarantool/NoSQL value which has a type which has no "
 "SQL equivalent, Tarantool/SQL may treat it as NULL or INTEGER or VARBINARY. "
-"For example, ``SELECT \"flags\" FROM \"_space\";`` will return a column "
-"whose data type is ``'map'``. Such columns can only be manipulated in SQL by"
-" :ref:`invoking Lua functions <sql_calling_lua>`."
-msgstr ""
+"For example, ``SELECT \"flags\" FROM \"_vspace\";`` will return a column "
+"whose type is ``'map'``. Such columns can only be manipulated in SQL by "
+":ref:`invoking Lua functions <sql_calling_lua>`."
+msgstr ""
+"Большинство типов данных в SQL аналогичны :ref:`типам в Tarantool/NoSQL "
+"<details_about_index_field_types>` с тем же именем. В Tarantool/NoSQL также "
+"есть типы, не имеющие аналогов в SQL. Если Tarantool/SQL считывает значение "
+"Tarantool/NoSQL с типом, не имеющим эквивалента в SQL, Tarantool/SQL может "
+"рассматривать его как NULL, INTEGER или VARBINARY. Например, ``SELECT "
+"\"flags\" FROM \"_vspace\";`` вернет столбец, тип которого --- ``'map'``. "
+"Такими столбцами можно оперировать в SQL только вызывая :ref:`Lua-функции "
+"<sql_calling_lua>`."
 
 msgid "Operators"
 msgstr ""
@@ -754,105 +905,199 @@ msgstr ""
 
 msgid ""
 "In the following list of operators, the tag \"(arithmetic)\" indicates that "
-"all operands are expected to be numbers and should result in a number; the "
-"tag \"(comparison)\" indicates that operands are expected to have similar "
-"data types and should result in a BOOLEAN; the tag \"(logic)\" indicates "
-"that operands are expected to be BOOLEAN and should result in a BOOLEAN. "
-"Exceptions may occur where operations are not possible, but see the "
-"\"special situations\" which are described after this list. Although all "
-"examples show literals, they could just as easily show column identifiers."
+"all operands are expected to be numerics (other than NUMBER) and should "
+"result in a numeric; the tag \"(comparison)\" indicates that operands are "
+"expected to have similar data types and should result in a BOOLEAN; the tag "
+"\"(logic)\" indicates that operands are expected to be BOOLEAN and should "
+"result in a BOOLEAN. Exceptions may occur where operations are not possible,"
+" but see the \"special situations\" which are described after this list. "
+"Although all examples show literals, they could just as easily show column "
+"identifiers."
 msgstr ""
+"В списке операторов ниже пометка \"(арифметическая операция)\" указывает на "
+"то, что все операнды должны быть числовыми значениями (кроме NUMBER) и в "
+"результате тоже должно получиться число. Пометка \"(сравнение)\" указывает, "
+"что операнды должны иметь схожие типы данных и результат будет типа BOOLEAN."
+" Пометка \"(логическая операция)\" указывает, что операнды должны быть типа "
+"BOOLEAN и результат также будет типа BOOLEAN. Если операция невозможна, "
+"выбрасывается исключение. Кроме того, существуют особые ситуации: их "
+"описание приводится после списка операторов. На месте указанных в примерах "
+"конкретных значений (литералов) могут с тем же успехом стоять идентификаторы"
+" столбцов."
 
 msgid ""
-"``+`` addition (arithmetic) Add two numbers according to standard arithmetic"
-" rules. Example: ``1 + 5``, result = 6."
+"Starting with Tarantool version 2.10.1, arithmetic operands cannot be "
+"NUMBERs."
 msgstr ""
+"Начиная с версии Tarantool 2.10.1 арифметические операнды не могут быть типа"
+" NUMBER."
 
 msgid ""
-"``-`` subtraction (arithmetic) Subtract second number from first number "
+"``+`` addition (arithmetic) Add two numerics according to standard "
+"arithmetic rules. Example: ``1 + 5``, result = 6."
+msgstr ""
+"``+`` --- сложение (арифметическая операция). Сложение двух чисел в "
+"соответствии со стандартными правилами арифметики. Пример: ``1 + 5``, "
+"результат --- ``6``."
+
+msgid ""
+"``-`` subtraction (arithmetic) Subtract second numeric from first numeric "
 "according to standard arithmetic rules. Example: ``1 - 5``, result = -4."
 msgstr ""
+"``-`` --- вычитание (арифметическая операция). Вычитание второго числа из "
+"первого в соответствии со стандартными правилами арифметики. Пример: ``1 - "
+"5``, результат --- ``-4``."
 
 msgid ""
-"``*`` multiplication (arithmetic) Multiply two numbers according to standard"
-" arithmetic rules. Example: ``2 * 5``, result = 10."
+"``*`` multiplication (arithmetic) Multiply two numerics according to "
+"standard arithmetic rules. Example: ``2 * 5``, result = 10."
 msgstr ""
+"``*`` --- умножение (арифметическая операция). Умножение двух чисел в "
+"соответствии со стандартными правилами арифметики. Пример: ``2 * 5``, "
+"результат --- ``10``."
 
 msgid ""
-"``/`` division (arithmetic) Divide second number into first number according"
-" to standard arithmetic rules. Division by zero is not legal. Division of "
-"integers always results in rounding down, use :ref:`CAST "
+"``/`` division (arithmetic) Divide second numeric into first numeric "
+"according to standard arithmetic rules. Division by zero is not legal. "
+"Division of integers always results in rounding toward zero, use :ref:`CAST "
 "<sql_function_cast>` to DOUBLE to get non-integer results. Example: ``5 / "
 "2``, result = 2."
 msgstr ""
+"``/`` --- деление (арифметическая операция). Деление второго числа на первое"
+" число в соответствии со стандартными правилами арифметики. Деление на ноль "
+"недопустимо. Деление целых чисел всегда приводит к округлению в сторону "
+"нуля; чтобы получить дробный результат, приведите тип к DOUBLE с помощью "
+":ref:`CAST <sql_function_cast>`. Пример: ``5 / 2``, результат --- ``2``."
 
 msgid ""
-"``%`` modulus (arithmetic) Divide second number into first number according "
-"to standard arithmetic rules. The result is the remainder. Example: ``17 % "
-"5``, result = 2."
+"``%`` modulus (arithmetic) Divide second numeric into first numeric "
+"according to standard arithmetic rules. The result is the remainder. "
+"Starting with Tarantool version 2.10.1, operands must be INTEGER or "
+"UNSIGNED. Example: ``17 % 5``, result = 2. Example: ``-123 % 4``, result = "
+"-3."
 msgstr ""
+"``%`` взятие остатка (арифметическая операция). Деление второго числа на "
+"первое в соответствии со стандартными правилами арифметики. Результатом "
+"будет остаток от деления. Начиная с версии Tarantool 2.10.1 операнды должны "
+"быть типов INTEGER или UNSIGNED. Примеры: ``17 % 5``, результатом будет "
+"``2``; ``-123 % 4``, результат --- ``-3``."
 
 msgid ""
-"``<<`` shift left (arithmetic) Shift the first number to the left N times, "
-"where N = the second number. For positive numbers, each 1-bit shift to the "
-"left is equivalent to multiplying times 2. Example: ``5 << 1``, result = 10."
+"``<<`` shift left (arithmetic) Shift the first numeric to the left N times, "
+"where N = the second numeric. For positive numerics, each 1-bit shift to the"
+" left is equivalent to multiplying times 2. Example: ``5 << 1``, result = "
+"10. Starting with Tarantool version 2.10.1, operands must be non-negative "
+"INTEGER or UNSIGNED."
 msgstr ""
+"``<<`` сдвиг влево (арифметическая операция). Сдвигает первое числовое "
+"значение влево N раз, где N --- второе числовое значение. Для положительных "
+"чисел каждый сдвиг на 1 бит влево эквивалентен умножению числа на 2. Пример:"
+" ``5 << 1``, результат --- ``10``. Начиная с версии Tarantool 2.10.1 "
+"операнды должны быть неотрицательными числами INTEGER или UNSIGNED."
 
 msgid ""
-"``>>`` shift right (arithmetic) Shift the first number to the right N times,"
-" where N = the second number. For positive numbers, each 1-bit shift to the "
-"right is equivalent to dividing by 2. Example: ``5 >> 1``, result = 2."
+"``>>`` shift right (arithmetic) Shift the first numeric to the right N "
+"times, where N = the second numeric. For positive numerics, each 1-bit shift"
+" to the right is equivalent to dividing by 2. Example: ``5 >> 1``, result = "
+"2. Starting with Tarantool version 2.10.1, operands must be non-negative "
+"INTEGER or UNSIGNED."
 msgstr ""
+"``>>`` сдвиг вправо (арифметическая операция). Сдвигает первое числовое "
+"значение вправо N раз, где N --- второе числовое значение. Для положительных"
+" чисел каждый сдвиг на 1 бит вправо эквивалентен делению числа на 2. Пример:"
+" ``5 >> 1``, результат --- ``2``. Начиная с версии Tarantool 2.10.1 операнды"
+" должны быть неотрицательными числами INTEGER или UNSIGNED."
 
 msgid ""
-"``&`` and (arithmetic) Combine the two numbers, with 1 bits in the result if"
-" and only if both original numbers have 1 bits. Example: ``5 & 4``, result ="
-" 4."
+"``&`` and (arithmetic) Combine the two numerics, with 1 bits in the result "
+"if and only if both original numerics have 1 bits. Example: ``5 & 4``, "
+"result = 4. Starting with Tarantool version 2.10.1, operands must be non-"
+"negative INTEGER or UNSIGNED."
 msgstr ""
+"``&`` побитовое \"и\" (арифметическая операция). Побитовое объединение двух "
+"чисел, где в результат записывается ``1``, только если у обоих операндов на "
+"этой позиции был бит ``1``. Пример: ``5 & 4``, результат --- ``4``. Начиная "
+"с версии Tarantool 2.10.1 операнды должны быть неотрицательными числами "
+"INTEGER или UNSIGNED."
 
 msgid ""
-"``|`` or (arithmetic) Combine the two numbers, with 1 bits in the result if "
-"either original number has a 1 bit. Example: ``5 | 2``, result = 7."
+"``|`` or (arithmetic) Combine the two numerics, with 1 bits in the result if"
+" either original numeric has a 1 bit. Example: ``5 | 2``, result = 7. "
+"Starting with Tarantool version 2.10.1, operands must be non-negative "
+"INTEGER or UNSIGNED."
 msgstr ""
+"``|`` побитовое \"или\" (арифметическая операция). Побитовое объединение "
+"двух чисел, где в результат записывается ``1``, если хотя бы у одного "
+"операнда на этой позиции был бит ``1``. Пример: ``5 | 2``, результат --- "
+"``7``. Начиная с версии Tarantool 2.10.1 операнды должны быть "
+"неотрицательными числами INTEGER или UNSIGNED."
 
 msgid ""
 "``~`` negate (arithmetic), sometimes called bit inversion Change 0 bits to 1"
-" bits, change 1 bits to 0 bits. Example: ``~5``, result = -6."
+" bits, change 1 bits to 0 bits. Example: ``~5``, result = -6. Starting with "
+"Tarantool version 2.10.1, the operand must be non-negative INTEGER or "
+"UNSIGNED."
 msgstr ""
+"``~`` negate, инверсия битов (арифметическая операция). Замена всех битов "
+"``0`` на ``1``, а ``1`` --- на ``0``. Пример: ``~5``, результат --- ``-6``. "
+"Начиная с версии Tarantool 2.10.1 операнд должен быть неотрицательным числом"
+" INTEGER или UNSIGNED."
 
 msgid ""
 "``<`` less than (comparison) Return TRUE if the first operand is less than "
-"the second by arithmetic or collation rules. Example for numbers: ``5 < 2``,"
-" result = FALSE. Example for strings: ``'C' < ' '``, result = FALSE."
+"the second by arithmetic or collation rules. Example for numerics: ``5 < "
+"2``, result = FALSE. Example for strings: ``'C' < ' '``, result = FALSE."
 msgstr ""
+"``<`` меньше чем (сравнение). Возвращает ``TRUE``, если первый операнд "
+"меньше второго по арифметическим правилам или правилам сопоставления. Пример"
+" с числами: ``5 < 2``, результат --- ``FALSE``. Пример со строками: ``'C' < "
+"' '``, результат --- ``FALSE``."
 
 msgid ""
 "``<=`` less than or equal (comparison) Return TRUE if the first operand is "
 "less than or equal to the second by arithmetic or collation rules. Example "
-"for numbers: ``5 <= 5``, result = TRUE. Example for strings: ``'C' <= 'B'``,"
-" result = FALSE."
+"for numerics: ``5 <= 5``, result = TRUE. Example for strings: ``'C' <= "
+"'B'``, result = FALSE."
 msgstr ""
+"``<=`` меньше или равно (сравнение). Возвращает ``TRUE``, если первый "
+"операнд по арифметическим правилам или правилам сопоставления меньше второго"
+" или равен ему. Пример с числами: ``5 <= 5``, результат --- ``TRUE``. Пример"
+" со строками: ``'C' <= 'B'``, результат --- ``FALSE``."
 
 msgid ""
 "``>`` greater than (comparison) Return TRUE if the first operand is greater "
-"than the second by arithmetic or collation rules. Example for numbers: ``5 >"
-" -5``, result = TRUE. Example for strings: ``'C' > '!'``, result = TRUE."
+"than the second by arithmetic or collation rules. Example for numerics: ``5 "
+"> -5``, result = TRUE. Example for strings: ``'C' > '!'``, result = TRUE."
 msgstr ""
+"``>`` больше чем (сравнение). Возвращает ``TRUE``, если первый операнд "
+"больше второго по арифметическим правилам или правилам сопоставления. Пример"
+" с числами: ``5 > -5``, результат --- ``TRUE``. Пример со строками: ``'C' > "
+"'!'``, результат --- ``TRUE``."
 
 msgid ""
 "``>=`` greater than or equal (comparison) Return TRUE if the first operand "
 "is greater than or equal to the second by arithmetic or collation rules. "
-"Example for numbers: ``0 >= 0``, result = TRUE. Example for strings: ``'Z' "
+"Example for numerics: ``0 >= 0``, result = TRUE. Example for strings: ``'Z' "
 ">= 'Γ'``, result = FALSE."
 msgstr ""
+"``>=`` больше или равно (сравнение). Возвращает ``TRUE``, если первый "
+"операнд по арифметическим правилам или правилам сопоставления больше второго"
+" или равен ему. Пример с числами: ``0 >= 0``, результат --- ``TRUE``. Пример"
+" со строками: ``'Z' >= 'Γ'``, результат --- ``FALSE``."
 
 msgid ""
 "``=`` equal (assignment or comparison) After the word SET, \"=\" means the "
 "first operand gets the value from the second operand. In other contexts, "
 "\"=\" returns TRUE if operands are equal. Example for assignment: ``... SET "
-"column1 = 'a';`` Example for numbers: ``0 = 0``, result = TRUE. Example for "
-"strings:  ``'1' = '2 '``, result = FALSE."
+"column1 = 'a';`` Example for numerics: ``0 = 0``, result = TRUE. Example for"
+" strings: ``'1' = '2 '``, result = FALSE."
 msgstr ""
+"``=`` equal (присваивание или сравнение). После ключевого слова SET знак "
+"``=`` означает, что первый операнд получит значение второго. В других "
+"контекстах ``=`` возвращает ``TRUE``, если операнды равны. Пример "
+"присваивания: ``... SET column1 = 'a';``. Пример сравнения числовых "
+"значений: ``0 = 0``, результат --- ``TRUE``. Пример сравнения строк: ``'1' ="
+" '2 '``, результат --- ``FALSE``."
 
 msgid ""
 "``==`` equal (assignment), or equal (comparison) This is a non-standard "
@@ -966,19 +1211,31 @@ msgid ""
 msgstr ""
 
 msgid ""
-"A string will be converted to a number if it is used with an arithmetic "
-"operator and conversion is possible, for example ``'7' + '7'`` = 14. And for"
-" comparison, ``'7'`` = 7. This is called implicit casting. It is applicable "
-"for STRINGs and all numeric data types."
+"In older Tarantool versions, a string would be converted to a numeric if it "
+"was used with an arithmetic operator and conversion was possible, for "
+"example ``'7' + '7'`` = 14. And for comparison, ``'7'`` = 7. This is called "
+"implicit casting. It was applicable for STRINGs and all numeric data types. "
+"Starting with Tarantool version 2.10, it is no longer supported."
 msgstr ""
+"В предыдущих версиях Tarantool строка преобразовывалась в числовое значение,"
+" если она использовалась с арифметическим оператором и преобразование было "
+"возможно. Например, результатом выражения ``'7' + '7'`` было ``14``. Для "
+"операций сравнения строка ``'7'`` преобразовывалась в значение ``7``. Это "
+"называется неявным приведением. Оно было применимо для значений типа STRING "
+"и всех числовых типов данных. Начиная с версии Tarantool 2.10 неявное "
+"приведение в числа больше не поддерживается."
 
 msgid ""
 "Limitations: (`Issue#2346 "
 "<https://github.com/tarantool/tarantool/issues/2346>`_) |br| * Some words, "
 "for example MATCH and REGEXP, are reserved but are not necessary for current"
-" or planned Tarantool versions |br| * 999999999999999 << 210 yields 0. (1 <<"
-" 63) >> 63 yields -1."
+" or planned Tarantool versions |br| * 999999999999999 << 210 yields 0."
 msgstr ""
+"Ограничения (подробнее в `Issue#2346 на GitHub "
+"<https://github.com/tarantool/tarantool/issues/2346>`_): |br| * Некоторые "
+"ключевые слова, например MATCH и REGEXP, зарезервированы, но в текущих или "
+"будущих версиях Tarantool их пока не планируется использовать. |br| * "
+"``99999999999999999 << 210`` возвращает ``0``."
 
 msgid "Expressions"
 msgstr ""
@@ -1011,9 +1268,6 @@ msgstr ""
 msgid "See also: :ref:`subquery <sql_subquery>`."
 msgstr ""
 
-msgid "Limitations: IS TRUE and IS FALSE return an error."
-msgstr ""
-
 msgid "Comparing and Ordering"
 msgstr ""
 
@@ -1022,18 +1276,27 @@ msgid ""
 "to\", or \"greater than\" value-2. These rules are applied for searches, for"
 " sorting results in order by column values, and for determining whether a "
 "column is unique. The result of a comparison of two values can be TRUE, "
-"FALSE, or UNKNOWN (the three BOOLEAN values). Sometimes for retrieval TRUE "
-"is converted to 1, FALSE is converted to 0, UNKNOWN is converted to NULL. "
-"For any comparisons where neither operand is NULL, the operands are "
-"\"distinct\" if the comparison result is FALSE. For any set of operands "
-"where all operands are distinct from each other, the set is considered to be"
-" \"unique\"."
+"FALSE, or UNKNOWN (the three BOOLEAN values). For any comparisons where "
+"neither operand is NULL, the operands are \"distinct\" if the comparison "
+"result is FALSE. For any set of operands where all operands are distinct "
+"from each other, the set is considered to be \"unique\"."
 msgstr ""
+"Определить, равны ли два значения или первое больше/меньше второго, помогают"
+" специальные правила. Они применяются при поиске, сортировке результатов в "
+"порядке возрастания значений в столбце, а также определении уникальности "
+"содержимого столбца. Результатом сравнения могут быть три значения типа "
+"BOOLEAN: ``TRUE``, ``FALSE`` или ``UNKNOWN``. В любом сравнении, где ни один"
+" из операндов не является ``NULL``, операнды считаются различными, если "
+"результат сравнения равен ``FALSE``. Любой набор операндов, где все операнды"
+" отличаются друг от друга, считается уникальным."
 
 msgid ""
-"When comparing a number to a number: |br| * infinity = infinity is true |br|"
-" * regular numbers are compared according to usual arithmetic rules"
+"When comparing a numeric to a numeric: |br| * infinity = infinity is true "
+"|br| * regular numerics are compared according to usual arithmetic rules"
 msgstr ""
+"Сравнение двух числовых значений: |br| * infinity = infinity вернет "
+"``TRUE``; |br| * обычные числовые значения сравниваются по обычным "
+"арифметическим правилам."
 
 msgid ""
 "When comparing any value to NULL: |br| (for examples in this paragraph "
@@ -1055,12 +1318,24 @@ msgid ""
 msgstr ""
 
 msgid ""
-"When comparing a number to a STRING: |br| * If implicit casting is possible,"
-" the STRING operand is converted to a number before comparison. If implicit "
-"casting is not possible, and one of the operands is the name of a column "
-"which was defined as SCALAR, and the column is being compared with a number,"
-" then number is less than STRING. Otherwise, the comparison is not legal."
+"When comparing any value to a SCALAR: |br| * This is always legal, and the "
+"result depends on the underlying type of the value. For example, if COLUMN1 "
+"is defined as SCALAR, and a value in the column is 'a', then COLUMN1 < 5 is "
+"a legal comparison and the result is FALSE because numeric is less than "
+"STRING."
 msgstr ""
+"Сравнение любого значения со SCALAR: |br| * Всегда разрешено, результат "
+"зависит от базового типа значения. Например, если столбец ``COLUMN1`` "
+"определен как SCALAR и значение в столбце --- ``'a'``, то ``COLUMN1 < 5`` "
+"--- допустимое сравнение. Его результатом будет ``FALSE``, потому что "
+"числовое значение всегда меньше STRING."
+
+msgid ""
+"When comparing a numeric to a STRING: |br| * Comparison is legal if the "
+"STRING value can be converted to a numeric with an explicit cast."
+msgstr ""
+"Сравнение числового значения со значением типа STRING: |br| * Сравнение "
+"разрешено, если значение STRING можно явно привести к числовому."
 
 msgid ""
 "When comparing a BOOLEAN to a BOOLEAN: |br| TRUE is greater than FALSE."
@@ -1096,10 +1371,10 @@ msgid ""
 "using the :ref:`TRIM(TRAILING ...) <sql_function_trim>` function. |br|"
 msgstr ""
 
-msgid ""
-"Limitations: |br| * LIKE comparisons return integer results according to "
-"meta-information. |br| * LIKE is not expected to work with VARBINARY."
+msgid "Limitations: |br| * LIKE is not expected to work with VARBINARY."
 msgstr ""
+"Ограничения: |br| * Ожидается, что при работе с VARBINARY не будет "
+"применяться LIKE."
 
 msgid "Statements"
 msgstr ""
@@ -1201,30 +1476,38 @@ msgid ""
 "to the data type which can contain both operands and the result. |br| For "
 "explicit casts, if a meaningful result is possible, the operation is "
 "allowed. |br| For implicit casts, if a meaningful result is possible and the"
-" data types on both sides are either STRINGs or numbers (that is, are STRING"
-" or INTEGER or UNSIGNED or DOUBLE or NUMBER), the operation is sometimes "
-"allowed."
-msgstr ""
+" data types on both sides are either STRINGs or most numeric types (that is,"
+" are STRING or INTEGER or UNSIGNED or DOUBLE but not NUMBER), the operation "
+"is sometimes allowed."
+msgstr ""
+"Общие правила довольно просты: |br| Присвоения и операции с ``NULL`` "
+"приводят к результатам ``NULL`` или ``UNKNOWN``. |br| Чтобы провести "
+"арифметическую операцию, преобразуйте значение в тот тип данных, который "
+"подойдет как для операндов, так и для результата. |br| Явное приведение "
+"разрешено, если оно приводит к осмысленному результату. |br| Неявное "
+"приведение разрешено, если оно приводит к осмысленному результату, а типы "
+"данных с обеих сторон --- либо STRING, либо почти любые числовые типы (то "
+"есть STRING, INTEGER, UNSIGNED или DOUBLE, но не NUMBER)."
 
 msgid "The specific situations in this chart follow the general rules:"
 msgstr ""
 
 msgid ""
-"~                To BOOLEAN | To number  | To STRING | To VARBINARY | To UUID\n"
+"~                To BOOLEAN | To numeric | To STRING | To VARBINARY | To UUID\n"
 "---------------  ----------   ----------   ---------   ------------   -------\n"
-"From BOOLEAN   | AAA        | S--        | A--       | ---          | ---\n"
-"From number    | A--        | SSA        | A-A       | ---          | ---\n"
-"From STRING    | S--        | S-S        | AAA       | A--          | SS-\n"
-"From VARBINARY | ---        | ---        | A--       | AAA          | SS-\n"
-"From UUID      | ---        | ---        | AA-       | AA-          | AAA"
+"From BOOLEAN   | AAA        | ---        | A--       | ---          | ---\n"
+"From numeric   | ---        | SSA        | A--       | ---          | ---\n"
+"From STRING    | S--        | S--        | AAA       | A--          | S--\n"
+"From VARBINARY | ---        | ---        | A--       | AAA          | S--\n"
+"From UUID      | ---        | ---        | A--       | A--          | AAA"
 msgstr ""
-"~                В BOOLEAN | В число  | В STRING | В VARBINARY | В UUID\n"
+"~                В BOOLEAN  | В число    | В STRING  | В VARBINARY  | В UUID\n"
 "---------------  ----------   ----------   ---------   ------------   -------\n"
-"Из BOOLEAN   | AAA        | S--        | A--       | ---          | ---\n"
-"Из числа    | A--        | SSA        | A-A       | ---          | ---\n"
-"Из STRING    | S--        | S-S        | AAA       | A--          | SS-\n"
-"Из VARBINARY | ---        | ---        | A--       | AAA          | SS-\n"
-"Из UUID      | ---        | ---        | AA-       | AA-          | AAA"
+"Из BOOLEAN     | AAA        | ---        | A--       | ---          | ---\n"
+"Из числа       | ---        | SSA        | A--       | ---          | ---\n"
+"Из STRING      | S--        | S--        | AAA       | A--          | S--\n"
+"Из VARBINARY   | ---        | ---        | A--       | AAA          | S--\n"
+"Из UUID        | ---        | ---        | A--       | A--          | AAA"
 
 msgid ""
 "Where each entry in the chart has 3 characters: |br| Where A = Always "
@@ -1238,47 +1521,40 @@ msgstr ""
 msgid ""
 "The S \"Sometimes allowed\" character applies for these special situations: "
 "|br| From STRING To BOOLEAN is allowed if UPPER(string-value) = ``'TRUE'`` "
-"or ``'FALSE'``. |br| From number to INTEGER or UNSIGNED is allowed for cast "
-"and assignment only if the result is not out of range, and the number has no"
-" post-decimal digits. |br| From STRING to INTEGER or UNSIGNED is allowed "
-"only if the string has a representation of a number, and the result is not "
-"out of range, and the number has no post-decimal digits. |br| From STRING to"
-" DOUBLE or NUMBER is allowed only if the string has a representation of a "
-"number. |br| From BOOLEAN to number is allowed only if the number is not "
-"DOUBLE. |br| From STRING to UUID is allowed only if the value is (8 "
-"hexadecimal digits) hyphen (4 hexadecimal digits) hyphen (4 hexadecimal "
-"digits) hyphen (4 hexadecimal digits) hyphen (12 hexadecimal digits), such "
-"as ``'8e3b281b-78ad-4410-bfe9-54806a586a90'``. |br| From VARBINARY to UUID "
-"is allowed only if the value is 16 bytes long, as in "
+"or ``'FALSE'``. |br| From numeric to INTEGER or UNSIGNED is allowed for cast"
+" and assignment only if the result is not out of range, and the numeric has "
+"no post-decimal digits. |br| From STRING to INTEGER or UNSIGNED or DECIMAL "
+"is allowed only if the string has a representation of a numeric, and the "
+"result is not out of range, and the numeric has no post-decimal digits. |br|"
+" From STRING to DOUBLE or NUMBER is allowed only if the string has a "
+"representation of a numeric. |br| From STRING to UUID is allowed only if the"
+" value is (8 hexadecimal digits) hyphen (4 hexadecimal digits) hyphen (4 "
+"hexadecimal digits) hyphen (4 hexadecimal digits) hyphen (12 hexadecimal "
+"digits), such as ``'8e3b281b-78ad-4410-bfe9-54806a586a90'``. |br| From "
+"VARBINARY to UUID is allowed only if the value is 16 bytes long, as in "
 "``X'8e3b281b78ad4410bfe954806a586a90'``. |br| The chart does not show "
 "To|From SCALAR because the conversions depend on the type of the value, not "
-"the type of the column definition. Explicit cast to SCALAR is allowed but "
-"has no effect, the result data type is always the same as the original data "
-"type. But comparisons of values of different types are allowed if the "
-"definition is SCALAR."
-msgstr ""
-"Символ S, \"Иногда разрешено\" (\"Sometimes allowed\"), применим к следующим"
-" особым ситуациям: |br| Из STRING в BOOLEAN приведение разрешено, если "
-"UPPER(string-value) = ``'TRUE'`` или ``'FALSE'``. |br| Из числа в INTEGER "
-"или UNSIGNED разрешено приведение и присваивание значения только в том "
-"случае, когда результат не выходит за пределы диапазона и число не имеет "
-"цифр после запятой. |br| Из STRING в INTEGER или UNSIGNED разрешено "
-"приведение только в том случае, когда строка представлена числом, результат "
-"не выходит за пределы диапазона и число не имеет цифр после запятой. |br| Из"
-" STRING в DOUBLE или NUMBER приведение разрешено только в том случае, когда "
-"строка представлена числом. |br| Из BOOLEAN в число разрешено приведение "
-"только если число не DOUBLE. |br| Из STRING в UUID разрешено приведение "
-"только если значение имеет вид (8 шестнадцатеричных цифр)-(4 "
-"шестнадцатеричные цифры)-(4 шестнадцатеричные цифры)-(4 шестнадцатеричные "
-"цифры)-(12 шестнадцатеричных цифр), например, "
-"``'8e3b281b-78ad-4410-bfe9-54806a586a90'``. |br| Из VARBINARY в UUID "
-"приведение разрешено только если значение занимает 16 байт, например, "
-"``X'8e3b281b78ad4410bfe954806a586a90'``. |br| В таблице не указаны "
-"приведения В|Из SCALAR поскольку преобразования зависят от типа значения, а "
-"не от определения столбца. Явное приведение к SCALAR допускается, но не "
-"будет иметь никакого эффекта, тип данных результата будет совпадать с "
-"исходным типом данных. Однако для SCALAR разрешено сравнение значений с "
-"разными типами данных."
+"the type of the column definition. Explicit cast to SCALAR is always "
+"allowed."
+msgstr ""
+"Символ ``S`` в таблице означает \"Иногда разрешено\" (\"Sometimes "
+"allowed\"). Он относится ко следующим особым ситуациям: |br| Приведение "
+"STRING к BOOLEAN разрешено, если UPPER(строка) = ``'TRUE'`` или ``'FALSE'``."
+" |br| Приведение числового значения к INTEGER или UNSIGNED и соответствующее"
+" присваивание разрешено, только если число не имеет цифр после десятичной "
+"точки и результат не выходит за пределы диапазона. |br| Приведение STRING к "
+"INTEGER, UNSIGNED или DECIMAL разрешено, только если строка представлена "
+"числом, это число не имеет цифр после десятичной точки и результат не "
+"выходит за пределы диапазона. |br| Приведение STRING к DOUBLE или NUMBER "
+"разрешено, только если строка представляет собой число. |br| Приведение "
+"STRING к UUID разрешено, только если значение имеет вид (8 шестнадцатеричных"
+" цифр)-(4 шестнадцатеричные цифры)-(4 шестнадцатеричные цифры)-(4 "
+"шестнадцатеричные цифры)-(12 шестнадцатеричных цифр), например: "
+"``'8e3b281b-78ad-4410-bfe9-54806a586a90'``. |br| Приведение VARBINARY к UUID"
+" разрешено, только если значение занимает 16 байт, например: "
+"``X'8e3b281b78ad4410bfe954806a586a90'``. |br| В таблице не упомянут тип "
+"SCALAR, поскольку преобразования зависят от типа значения, а не от "
+"определения столбца. Явное приведение к SCALAR всегда разрешено."
 
 msgid ""
 "Since version :doc:`2.4.1 </release/2.4.1>`, the NUMBER type is processed in"
@@ -1286,71 +1562,136 @@ msgid ""
 "Tarantool."
 msgstr ""
 
+msgid ""
+"Starting with Tarantool 2.10.1, these conversions which used to be legal are"
+" now illegal: |br| Explicit cast from numeric to BOOLEAN, |br| Explicit cast"
+" from BOOLEAN to numeric, |br| Implicit cast from NUMBER to other numeric "
+"types for arithmetic or built-in functions. |br| Implicit cast from numeric "
+"to STRING. |br| Implicit cast from STRING to numeric."
+msgstr ""
+"Начиная с версии Tarantool 2.10.1 недопустимы некоторые преобразования, "
+"которые раньше были разрешены: |br| Явное приведение числового типа к "
+"BOOLEAN. |br| Явное приведение BOOLEAN к числовому типу. |br| Неявное "
+"приведение NUMBER к другим числовым типам при выполнении арифметических или "
+"встроенных функций. |br| Неявное приведение числового типа к STRING. |br| "
+"Неявное приведение STRING к числовому типу."
+
 msgid "Examples of casts, illustrating the situations in the chart:"
 msgstr ""
 
 msgid ""
-"``CAST(TRUE AS INTEGER)`` is legal because the intersection of the  \"From "
-"BOOLEAN\" row with the \"To number\" column is ``A--`` and the first letter "
-"of ``A--`` is for explicit cast and A means Always Allowed. The result is 1."
+"``CAST(TRUE AS STRING)`` is legal. The intersection of the \"From BOOLEAN\" "
+"row with the \"To STRING\" column is ``A--`` and the first letter of ``A--``"
+" is for explicit cast and A means Always Allowed. The result is 'TRUE'."
 msgstr ""
+"Выполнение ``CAST(TRUE AS STRING)`` допустимо. В строке \"Из BOOLEAN\", "
+"столбце \"В STRING\" приведенной выше таблицы стоит значение ``A--``, где "
+"буква ``A`` относится к явному приведению и означает \"Always Allowed\" --- "
+"всегда разрешено. Таким образом, результатом операции будет ``'TRUE'``."
 
 msgid ""
-"``UPDATE ... SET varbinary_column = 'A'`` is illegal because the "
-"intersection of the \"From STRING\" row with the \"To VARBINARY\" column is "
-"``A--`` and the second letter of ``A--`` is for implicit cast (assignment) "
-"and - means not allowed. The result is an error message."
+"``UPDATE ... SET varbinary_column = 'A'`` is illegal. The intersection of "
+"the \"From STRING\" row with the \"To VARBINARY\" column is ``A--`` and the "
+"second letter of ``A--`` is for implicit cast (assignment) and - means not "
+"allowed. The result is an error message."
 msgstr ""
+"Выполнение ``UPDATE ... SET varbinary_column = 'A'`` завершится ошибкой. В "
+"строке \"Из STRING\", столбце \"В VARBINARY\" приведенной выше таблицы стоит"
+" значение ``A--``, где второй символ ``-`` относится к неявному приведению "
+"при присваивании и` означает \"не разрешено\". Результатом будет сообщение "
+"об ошибке."
 
 msgid ""
-"``1.7E-1 > 0`` is legal because the intersection of the \"From number\" row "
-"with the \"To number\" column is SSA, and the third letter of SSA is for "
+"``1.7E-1 > 0`` is legal. The intersection of the \"From numeric\" row with "
+"the \"To numeric\" column is SSA, and the third letter of SSA is for "
 "implicit cast (comparison) and A means Always Allowed. The result is TRUE."
 msgstr ""
+"Выражение ``1.7E-1 > 0`` допустимо. В строке \"Из числа\", столбце \"В "
+"число\" приведенной выше таблицы стоит значение ``SSA``, где третья буква А "
+"относится к неявному приведению при сравнении и означает \"Always Allowed\" "
+"--- всегда разрешено. Таким образом, результатом операции будет ``'TRUE'``."
 
 msgid ""
-"``11 > '2'`` is legal because the intersection of the \"From number\" row "
-"with the \"To STRING\" column is AAA and the third letter of AAA is for "
-"implicit cast (comparison) and A means Always Allowed. The result is TRUE.  "
+"``11 > '2'`` is illegal. The intersection of the \"From numeric\" row with "
+"the \"To STRING\" column is A-- and the third letter of A-- is for implicit "
+"cast (comparison) and - means not allowed. The result is an error message. "
 "For detailed explanation see the following section."
 msgstr ""
+"Выполнение ``11 > '2'`` завершится ошибкой. В строке \"Из числа\", столбце "
+"\"В STRING\" приведенной выше таблицы стоит значение ``A--``, где третий "
+"символ ``-`` относится к неявному приведению при сравнении и` означает \"не "
+"разрешено\". Результатом операции будет сообщение об ошибке. Подробное "
+"объяснение приводится ниже."
 
 msgid ""
-"``CAST('5' AS INTEGER)`` is legal because the intersection of the \"From "
-"STRING\" row with the \"To number\" column is S-S and the first letter of "
-"S-S is for explicit cast and S means Sometimes Allowed. However, "
-"``CAST('5.5' AS INTEGER)`` is illegal because 5.5 is not an integer -- if "
-"the string contains post-decimal digits and the target is INTEGER or "
-"UNSIGNED, the assignment will fail."
+"``CAST('5' AS INTEGER)`` is legal. The intersection of the \"From STRING\" "
+"row with the \"To numeric\" column is S-- and the first letter of S-- is for"
+" explicit cast and S means Sometimes Allowed. However, ``CAST('5.5' AS "
+"INTEGER)`` is illegal because 5.5 is not an integer -- if the string "
+"contains post-decimal digits and the target is INTEGER or UNSIGNED, the "
+"assignment will fail."
 msgstr ""
+"Выполнение ``CAST('5' AS INTEGER)`` допустимо. В строке \"Из STRING\", "
+"столбце \"В число\" приведенной выше таблицы стоит значение ``S--``, где "
+"первая буква ``S`` относится к явному приведению и означает \"Sometimes "
+"allowed\" --- иногда разрешено. При этом приведение ``CAST('5.5' AS "
+"INTEGER)`` завершится ошибкой, поскольку это не целое число. Если число "
+"содержит цифры после десятичной точки, а целевой тип приведения --- INTEGER "
+"или UNSIGNED, присвоение не будет выполнено."
 
 msgid "Implicit string/numeric cast"
 msgstr ""
 
+msgid ""
+"The examples in this section are true only for Tarantool versions before "
+"Tarantool 2.10. Starting with Tarantool 2.10, implicit string/numeric cast "
+"is no longer allowed."
+msgstr ""
+"Примеры в этом разделе справедливы только для версий Tarantool до 2.10. "
+"Начиная с Tarantool 2.10 неявное приведение строк и числовых значений больше"
+" не допускается."
+
 msgid ""
 "Special considerations may apply for casting STRINGs to/from "
-"INTEGERs/DOUBLEs/NUMBERs/UNSIGNEDs (numbers) for comparison or assignment."
+"INTEGERs/DOUBLEs/NUMBERs/UNSIGNEDs (numerics) for comparison or assignment."
 msgstr ""
+"Приведение STRING к INTEGER/DOUBLE/NUMBER/UNSIGNED (любому числовому типу) и"
+" наоборот, выполняемое в ходе операции присвоения или сравнения, может "
+"требовать особых условий."
 
 msgid ""
-"``1 = '1' /* compare a STRING with a number */`` |br| ``UPDATE ... SET "
-"string_column = 1 /* assign a number to a STRING */``"
+"``1 = '1' /* compare a STRING with a numeric */`` |br| ``UPDATE ... SET "
+"string_column = 1 /* assign a numeric to a STRING */``"
 msgstr ""
+"``1 = '1' /* сравнение значения STRING с числовым значением */`` |br| "
+"``UPDATE ... SET string_column = 1 /* запись в STRING числового значения "
+"*/``"
 
 msgid ""
-"For comparisons, the cast is always from STRING to number. |br| Therefore "
+"For comparisons, the cast is always from STRING to numeric. |br| Therefore "
 "``1e2 = '100'`` is TRUE, and ``11 > '2'`` is TRUE. |br| If the cast fails, "
-"then the number is less than the STRING. |br| Therefore ``1e400 < ''`` is "
+"then the numeric is less than the STRING. |br| Therefore ``1e400 < ''`` is "
 "TRUE. |br| Exception: for BETWEEN the cast is to the data type of the first "
 "and last operands. |br| Therefore ``'66' BETWEEN 5 AND '7'`` is TRUE."
 msgstr ""
+"Для операций сравнения всегда выполняется приведение STRING к числовому "
+"значению. |br| Поэтому ``1e2 = '100'`` вернет ``TRUE``, как и ``11 > '2'``. "
+"|br| Если приведение не удалось, числовое значение считается меньше, чем "
+"значение типа STRING. |br| Так что ``1e400 < ''`` тоже вернет ``TRUE``. |br|"
+" Исключение: для оператора BETWEEN приведение производится к типу данных "
+"первого и последнего операндов. |br| Поэтому выражение ``'66' BETWEEN 5 AND "
+"'7'`` вернет ``TRUE``."
 
 msgid ""
 "For assignments, due to a change in behavior starting with Tarantool "
-":doc:`2.5.1 </release/2.5.1>`, implicit casts from strings to numbers are "
+":doc:`2.5.1 </release/2.5.1>`, implicit casts from strings to numerics are "
 "not legal. Therefore ``INSERT INTO t (integer_column) VALUES ('5');`` is an "
 "error."
 msgstr ""
+"Начиная с Tarantool :doc:`2.5.1 </release/2.5.1>` действует измененный "
+"алгоритм присваивания. В связи с этим неявные приведения строк к числам "
+"недопустимы. Например, ``INSERT INTO t (integer_column) VALUES ('5');`` "
+"выдаст ошибку."
 
 msgid ""
 "Implicit cast does happen if STRINGS are used in arithmetic. |br| Therefore "
@@ -1359,9 +1700,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Implicit cast does NOT happen if numbers are used in concatenation, or in "
+"Implicit cast does NOT happen if numerics are used in concatenation, or in "
 "LIKE. |br| Therefore ``5 || '5'`` is illegal."
 msgstr ""
+"Неявное приведение не производится, если числовые значения используются в "
+"конкатенации или в LIKE. |br| Поэтому выражение ``5 || '5'`` недопустимо."
 
 msgid ""
 "In the following examples, implicit cast does not happen for values in "
@@ -1402,12 +1745,3 @@ msgid ""
 "course, it is not possible to be compatible with other DBMSs and at the same"
 " time support SCALAR, which other DBMSs do not have."
 msgstr ""
-
-msgid ""
-"Limitations (`Issue#3809 "
-"<https://github.com/tarantool/tarantool/issues/3809>`_): |br| Result of "
-"concatenation, or out-of-bound result, may have wrong type. |br| Parameter "
-"conversion behavior will change (`Issue#4159 "
-"<https://github.com/tarantool/tarantool/issues/4159>`_). After issue#4159 is"
-" done, LENGTH(15) will be illegal."
-msgstr ""
diff --git a/locale/ru/LC_MESSAGES/release/major-features.po b/locale/ru/LC_MESSAGES/release/major-features.po
index 179a1d9272..29acb75ee5 100644
--- a/locale/ru/LC_MESSAGES/release/major-features.po
+++ b/locale/ru/LC_MESSAGES/release/major-features.po
@@ -153,11 +153,9 @@ msgid "2.4.1"
 msgstr "2.4.1"
 
 msgid ""
-":ref:`UUID type for field and index <_index-box_uuid>` (:tarantool-"
+":ref:`UUID type for field and index <index-box_uuid>` (:tarantool-"
 "issue:`4268`, :tarantool-issue:`2916`)"
 msgstr ""
-":ref:`Поддержка UUID для полей и индексов<_index-box_uuid>` (:tarantool-"
-"issue:`4268`, :tarantool-issue:`2916`)"
 
 msgid ""
 ":doc:`popen </reference/reference_lua/popen>` built-in module (:tarantool-"