Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tarantool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
tarantool
Commits
9eb66ae7
Unverified
Commit
9eb66ae7
authored
5 years ago
by
lenkis
Committed by
Alexander Turenko
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix text in built-in tutorial
parent
c739101d
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/lua/help_en_US.lua
+21
-21
21 additions, 21 deletions
src/lua/help_en_US.lua
test/box/admin.result
+1
-1
1 addition, 1 deletion
test/box/admin.result
with
22 additions
and
22 deletions
src/lua/help_en_US.lua
+
21
−
21
View file @
9eb66ae7
...
...
@@ -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 --
Packag
es
=================================
=
Tutorial -- Screen #10 --
Modul
es
=================================
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
packag
es have to be "required", with the syntax
variable_name = require("
packag
e-name")
Most
modul
es have to be "required", with the syntax
variable_name = require("
modul
e-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
packag
e’s members and
you’ll see a list of the
modul
e’s members and
functions. If then you use a "." operator as in
package-
variable
-
name.function_name()
you’ll invoke a
packag
e’s function.
variable
_
name.function_name()
you’ll invoke a
modul
e’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
packag
e
==========================================
=
Tutorial -- Screen #11 -- The fiber
modul
e
==========================================
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
packag
e
===========================================
=
Tutorial -- Screen #12 -- The socket
modul
e
===========================================
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
packag
e
========================================
=
Tutorial -- Screen #13 -- The box
modul
e
========================================
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
da
tab
as
es in an SQL DBMS)
(vaguely like tab
l
es 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
packag
e box gets a space which is
enough if you see that
modul
e 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,
packag
e requires, and database-manipulations you want,
modul
e 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
...
...
This diff is collapsed.
Click to expand it.
test/box/admin.result
+
1
−
1
View file @
9eb66ae7
...
...
@@ -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:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment