Skip to content

Commit 635dadd

Browse files
author
Vladimir I
committed
Revert "Fix #796"
This reverts commit c434396.
1 parent c434396 commit 635dadd

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

doc/1.10/reference/reference_lua/net_box.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,8 +509,7 @@ Below is a list of all ``net.box`` functions.
509509

510510
* ``future:is_ready()`` which will return true
511511
when the result of the request is available,
512-
* ``future:result()`` to get the result of the request (returns the
513-
response or Nil in case it's not ready yet or there has been an error),
512+
* ``future:result()`` to get the result of the request,
514513
* ``future:wait_result(timeout)`` to
515514
wait until the result of the request is available and then get it,
516515
* ``future:discard()`` to abandon the object.

locale/ru/LC_MESSAGES/doc.po

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54138,11 +54138,8 @@ msgid ""
5413854138
msgstr "``future:is_ready()`` вернет true (правда), если доступен результат запроса,"
5413954139

5414054140
#: ../doc/1.10/reference/reference_lua/net_box.rst:513
54141-
msgid "``future:result()`` to get the result of the request (returns the "
54142-
"response or Nil in case it's not ready yet or there has been an error),"
54143-
msgstr "``future:result()`` используется для получения результата запроса "
54144-
"(возвращает ответ на запрос или Nil в случае, если ответ еще не получен "
54145-
"или произошла какая-либо ошибка),"
54141+
msgid "``future:result()`` to get the result of the request,"
54142+
msgstr "``future:result()`` используется для получения результата запроса,"
5414654143

5414754144
#: ../doc/1.10/reference/reference_lua/net_box.rst:514
5414854145
msgid ""

0 commit comments

Comments
 (0)