diff --git a/src/lua/help_en_US.lua b/src/lua/help_en_US.lua index 34b06343f09a6ab4c77bac2177a9c4fbeeac5c44..d37b49bf7379b0bd38ec6ec4941b1aa362edfb7b 100644 --- a/src/lua/help_en_US.lua +++ b/src/lua/help_en_US.lua @@ -3,7 +3,7 @@ return { help = [[ 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: @@ -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 -packages of functions (sometimes called "modules") -that have a general utility. +Many developers have gone to the trouble of making modules, +i.e. distributable packages of functions that have a general +utility. In the Lua world, modules are called "rocks". More in the Luarocks list: http://luarocks.org/ -Most packages have to be "required", with the syntax -variable_name = require("package-name") +Most modules have to be "required", with the syntax +variable_name = require("module-name") which should look familiar because earlier you said console = require("console") 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 -package-variable-name.function_name() -you’ll invoke a package’s function. +variable_name.function_name() +you’ll invoke a module’s function. (At a different level you’ll have to use a ":" operator, as you’ll see in later examples.) @@ -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 background until you cancel it. For this you need @@ -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. @@ -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 Lua application server. Henceforth you’ll see @@ -401,11 +401,11 @@ To understand the description, you just have to know that: ** tuples are collections of fields, as are Lua tables (vaguely like rows in an SQL DBMS) ** 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 (vaguely like indexes in an SQL DBMS) 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. ]]; @@ -574,11 +574,11 @@ Tutorial -- Screen #20 -- The bigger Tutorials ============================================== 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, you should download it so that you can be your own 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, Sum a JSON field for all tuples, and diff --git a/test/box/admin.result b/test/box/admin.result index 24bc583fd1d66eb4750ebe4de1bb38b3708d9490..53ced2fccb33b62b34457a3bcc4d65656b1a938d 100644 --- a/test/box/admin.result +++ b/test/box/admin.result @@ -15,7 +15,7 @@ help() --- - - | 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: