diff --git a/doc/sphinx/book/user_guide_getting_started.rst b/doc/sphinx/book/user_guide_getting_started.rst index 3e5dadcf3ff20832fdd3d56ccf3543fe5bf2499b..cc9e12261728fccd22be3f08e4048408a6e25134 100644 --- a/doc/sphinx/book/user_guide_getting_started.rst +++ b/doc/sphinx/book/user_guide_getting_started.rst @@ -51,8 +51,8 @@ initializes, something like this: | :codenormal:`2014-08-07 09:41:41.128 ... ready to accept requests` Now that the server is up, you could start up a different shell -and connect to its primary port with - :codebold:`telnet 0 3301` +and connect to its primary port with |br| +:codebold:`telnet 0 3301` |br| but for example purposes it is simpler to just leave the server running in "interactive mode". On production machines the interactive mode is just for administrators, but because it's @@ -96,7 +96,7 @@ Your terminal screen should now look like this: | :codenormal:`---` | :codenormal:`- - [3, 'Length', 93]` | :codenormal:`...` - | + | | :codenormal:`tarantool>` Now, to prepare for the example in the next section, try this: @@ -145,21 +145,21 @@ one of the tuples that was inserted earlier. Your terminal screen should now look like this: | :codenormal:`...` - | + | | :codenormal:`tarantool> console = require('console')` | :codenormal:`---` | :codenormal:`...` - | + | | :codenormal:`tarantool> console.connect('localhost:3301')` | :codenormal:`2014-08-31 12:46:54.650 [32628] main/101/interactive I> connected to localhost:3301` | :codenormal:`---` | :codenormal:`...` - | + | | :codenormal:`localhost:3301> box.space.tester:select{2}` | :codenormal:`---` | :codenormal:`- - [2, 'Music']` | :codenormal:`...` - | + | | :codenormal:`localhost:3301>` You can repeat box.space...:insert{} and box.space...:select{} diff --git a/doc/sphinx/getting_started.rst b/doc/sphinx/getting_started.rst index 736e7696cc0cf99f6ff863bf8bf2a85687848591..e36f84a6353fd66dfc16c137de8c35e77ee48850 100644 --- a/doc/sphinx/getting_started.rst +++ b/doc/sphinx/getting_started.rst @@ -197,7 +197,7 @@ and make install. .. _tarantool.org/dist/master/tarantool.rb: http://tarantool.org/dist/master/tarantool.rb -.. _first database: +.. _dup first database: ===================================================================== Starting Tarantool and making your first database diff --git a/doc/sphinx/reference/fiber.rst b/doc/sphinx/reference/fiber.rst index c35668e36346627e3f0b729ad771b3ba85aa61ec..6f0c2723ef9fe9901b1e8d4faba05fa8c0e829f8 100644 --- a/doc/sphinx/reference/fiber.rst +++ b/doc/sphinx/reference/fiber.rst @@ -83,7 +83,7 @@ can be reused when another fiber is created. Return information about all fibers. - :return: the name, id, and backtrace of all fibers. + :return: the name, id, available memory, used memory, and backtrace of all fibers. :rtype: table .. function:: kill(id)