Skip to content
Snippets Groups Projects
Unverified Commit 9eb66ae7 authored by lenkis's avatar lenkis Committed by Alexander Turenko
Browse files

Fix text in built-in tutorial

parent c739101d
No related branches found
No related tags found
No related merge requests found
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
return { return {
help = [[ help = [[
To get help, see the Tarantool manual at https://tarantool.io/en/doc/ To get help, see the Tarantool manual at https://tarantool.io/en/doc/
To start the interactive Tarantool tutorial, type 'tutorial()' To start the interactive Tarantool tutorial, type 'tutorial()' here.
Available backslash commands: Available backslash commands:
...@@ -265,24 +265,24 @@ Obviously it will work, so just type <tutorial("next")!> now. ...@@ -265,24 +265,24 @@ Obviously it will work, so just type <tutorial("next")!> now.
]]; ]];
[[ [[
Tutorial -- Screen #10 -- Packages Tutorial -- Screen #10 -- Modules
================================== =================================
Many developers have gone to the trouble of making Many developers have gone to the trouble of making modules,
packages of functions (sometimes called "modules") i.e. distributable packages of functions that have a general
that have a general utility. utility. In the Lua world, modules are called "rocks".
More in the Luarocks list: http://luarocks.org/ More in the Luarocks list: http://luarocks.org/
Most packages have to be "required", with the syntax Most modules have to be "required", with the syntax
variable_name = require("package-name") variable_name = require("module-name")
which should look familiar because earlier you said which should look familiar because earlier you said
console = require("console") console = require("console")
At this point, if you just say the variable_name, At this point, if you just say the variable_name,
you’ll see a list of the package’s members and you’ll see a list of the module’s members and
functions. If then you use a "." operator as in functions. If then you use a "." operator as in
package-variable-name.function_name() variable_name.function_name()
you’ll invoke a package’s function. you’ll invoke a module’s function.
(At a different level you’ll have to use a ":" (At a different level you’ll have to use a ":"
operator, as you’ll see in later examples.) operator, as you’ll see in later examples.)
...@@ -299,8 +299,8 @@ More on fibers on the next screen, so type <tutorial("next")!> now. ...@@ -299,8 +299,8 @@ More on fibers on the next screen, so type <tutorial("next")!> now.
]]; ]];
[[ [[
Tutorial -- Screen #11 -- The fiber package Tutorial -- Screen #11 -- The fiber module
=========================================== ==========================================
Make a function that will run like a daemon in the Make a function that will run like a daemon in the
background until you cancel it. For this you need background until you cancel it. For this you need
...@@ -336,8 +336,8 @@ times and notice how the value mysteriously increases. ...@@ -336,8 +336,8 @@ times and notice how the value mysteriously increases.
]]; ]];
[[ [[
Tutorial -- Screen #12 -- The socket package Tutorial -- Screen #12 -- The socket module
============================================ ===========================================
Connect to the Internet and send a message to Tarantool's web-site. Connect to the Internet and send a message to Tarantool's web-site.
...@@ -365,8 +365,8 @@ https://tarantool.io/en/doc/<version>/reference/reference_lua/socket/ ...@@ -365,8 +365,8 @@ https://tarantool.io/en/doc/<version>/reference/reference_lua/socket/
]]; ]];
[[ [[
Tutorial -- Screen #13 -- The box package Tutorial -- Screen #13 -- The box module
========================================= ========================================
So far you’ve seen Tarantool in action as a So far you’ve seen Tarantool in action as a
Lua application server. Henceforth you’ll see Lua application server. Henceforth you’ll see
...@@ -401,11 +401,11 @@ To understand the description, you just have to know that: ...@@ -401,11 +401,11 @@ To understand the description, you just have to know that:
** tuples are collections of fields, as are Lua tables ** tuples are collections of fields, as are Lua tables
(vaguely like rows in an SQL DBMS) (vaguely like rows in an SQL DBMS)
** spaces are where Tarantool stores sets of tuples ** spaces are where Tarantool stores sets of tuples
(vaguely like databases in an SQL DBMS) (vaguely like tables in an SQL DBMS)
** indexes are objects that make lookups of tuples faster ** indexes are objects that make lookups of tuples faster
(vaguely like indexes in an SQL DBMS) (vaguely like indexes in an SQL DBMS)
Much of the description doesn’t matter right now; it’s Much of the description doesn’t matter right now; it’s
enough if you see that package box gets a space which is enough if you see that module box gets a space which is
named tutor, and it has one index on the first field. named tutor, and it has one index on the first field.
]]; ]];
...@@ -574,11 +574,11 @@ Tutorial -- Screen #20 -- The bigger Tutorials ...@@ -574,11 +574,11 @@ Tutorial -- Screen #20 -- The bigger Tutorials
============================================== ==============================================
You can continue to type in whatever Lua instructions, You can continue to type in whatever Lua instructions,
package requires, and database-manipulations you want, module requires, and database-manipulations you want,
here on this screen. But to really get into Tarantool, here on this screen. But to really get into Tarantool,
you should download it so that you can be your own you should download it so that you can be your own
administrator and create your own permanent databases. The administrator and create your own permanent databases. The
Tarantool manual has three significant tutorials: Tarantool manual has three significant Lua tutorials:
Insert one million tuples with a Lua stored procedure, Insert one million tuples with a Lua stored procedure,
Sum a JSON field for all tuples, and Sum a JSON field for all tuples, and
......
...@@ -15,7 +15,7 @@ help() ...@@ -15,7 +15,7 @@ help()
--- ---
- - | - - |
To get help, see the Tarantool manual at https://tarantool.io/en/doc/ To get help, see the Tarantool manual at https://tarantool.io/en/doc/
To start the interactive Tarantool tutorial, type 'tutorial()' To start the interactive Tarantool tutorial, type 'tutorial()' here.
Available backslash commands: Available backslash commands:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment