Skip to content

Commit ec4185f

Browse files
authored
Merge pull request #759 from dundargoc/docs/misc
Fix typos
2 parents 657a08f + b0adbe3 commit ec4185f

11 files changed

Lines changed: 17 additions & 17 deletions

.ci/setup_lua.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ lua -v
8888

8989
LUAROCKS_BASE=luarocks-$LUAROCKS
9090

91-
# retry 5 times, connection to luarocks.org seems to timeout occassionally
91+
# retry 5 times, connection to luarocks.org seems to timeout occasionally
9292
curl --silent --location --retry 5 "https://luarocks.org/releases/$LUAROCKS_BASE.tar.gz" | tar xz
9393

9494
cd "$LUAROCKS_BASE"

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ endif (NOT WITH_LUA_ENGINE)
4444

4545
if (NOT LUA_BUILD_TYPE)
4646
set(LUA_BUILD_TYPE "Static"
47-
CACHE STRING "Build Lua/LuaJIT as static, dynamic libary, or use system one" FORCE)
47+
CACHE STRING "Build Lua/LuaJIT as static, dynamic library, or use system one" FORCE)
4848
set_property(CACHE LUA_BUILD_TYPE
4949
PROPERTY STRINGS "Static;Dynamic;System")
5050
endif (NOT LUA_BUILD_TYPE)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ package is good for this.
115115
On OSX, you probably want XCode which comes with `clang` and `make` and friends.
116116

117117
For windows the free Visual Studio Express works. If you get the 2013 edition,
118-
make sure to get the `Windows Deskop` edition. The `Windows` version doesn't
118+
make sure to get the `Windows Desktop` edition. The `Windows` version doesn't
119119
include a working C compiler. Make sure to run all of setup including getting a
120120
free license.
121121

docs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ lowercase option strings are listed below.
210210

211211
In libuv, errors are represented by negative numbered constants. While these
212212
constants are made available in the `uv.errno` table, they are not returned by
213-
luv funtions and the libuv functions used to handle them are not exposed.
213+
luv functions and the libuv functions used to handle them are not exposed.
214214
Instead, if an internal error is encountered, the failing luv function will
215215
return to the caller an assertable `nil, err, name` tuple:
216216

@@ -3447,7 +3447,7 @@ looked up using the `getprotobyname(3)` function. Examples: `"ip"`, `"icmp"`,
34473447
- `port`: `integer` or `nil`
34483448
- `family`: `string` or `integer` or `nil`
34493449
- `callback`: `callable` (async version) or `nil` (sync version)
3450-
- `err`: `nil` or `sring`
3450+
- `err`: `nil` or `string`
34513451
- `host`: `string` or `nil`
34523452
- `service`: `string` or `nil`
34533453

src/luv.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ typedef int (*luv_CFpcall) (lua_State* L, int nargs, int nresults, int flags);
9090

9191
typedef int (*luv_CFcpcall) (lua_State* L, lua_CFunction func, void* ud, int flags);
9292

93-
/* Default implemention of event callback */
93+
/* Default implementation of event callback */
9494
LUALIB_API int luv_cfpcall(lua_State* L, int nargs, int nresult, int flags);
9595

96-
/* Default implemention of thread entory function */
96+
/* Default implementation of thread entory function */
9797
LUALIB_API int luv_cfcpcall(lua_State* L, lua_CFunction func, void* ud, int flags);
9898

9999
typedef struct {

src/process.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ static int luv_spawn(lua_State* L) {
146146
}
147147
for (i = 0; i < len; ++i) {
148148
lua_rawgeti(L, -1, i + 1);
149-
// integers are assumed to be file descripters
149+
// integers are assumed to be file descriptors
150150
if (lua_type(L, -1) == LUA_TNUMBER) {
151151
options.stdio[i].flags = UV_INHERIT_FD;
152152
options.stdio[i].data.fd = lua_tointeger(L, -1);

tests/manual-test-exit.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
--come from https://github.com/luvit/luv/issues/599
22

33
-- run `lua manual-test-exit.lua || echo $?`
4-
-- it shoud print `5`
4+
-- it should print `5`
55

66
local uv = require('luv')
77

tests/manual-test-external-loop.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ local thread = uv.new_thread(function(delay)
2727
local t2 = uv.thread_self()
2828
assert(t1:equal(t2))
2929
assert(tostring(t1)==tostring(t2))
30-
_G.print('Runing', uv.thread_self())
30+
_G.print('Running', uv.thread_self())
3131

3232
assert(_THREAD)
3333

tests/test-dns.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ return require('lib/tap')(function (test)
3333
assert(res[1].port == 80)
3434
end, "1.3.0")
3535

36-
test("Get only ipv4 tcp adresses for luvit.io", function (print, p, expect, uv)
36+
test("Get only ipv4 tcp addresses for luvit.io", function (print, p, expect, uv)
3737
assert(uv.getaddrinfo("luvit.io", nil, {
3838
socktype = "stream",
3939
family = "inet",
@@ -50,7 +50,7 @@ return require('lib/tap')(function (test)
5050

5151
-- FIXME: this test always fails on Windows/AppVeyor with ENOENT for some reason
5252
if not isWindows then
53-
test("Get only ipv6 tcp adresses for luvit.io", function (print, p, expect, uv)
53+
test("Get only ipv6 tcp addresses for luvit.io", function (print, p, expect, uv)
5454
assert(uv.getaddrinfo("luvit.io", nil, {
5555
socktype = "stream",
5656
family = "inet6",
@@ -66,7 +66,7 @@ return require('lib/tap')(function (test)
6666
end)
6767
end
6868

69-
test("Get ipv4 and ipv6 tcp adresses for luvit.io", function (print, p, expect, uv)
69+
test("Get ipv4 and ipv6 tcp addresses for luvit.io", function (print, p, expect, uv)
7070
assert(uv.getaddrinfo("luvit.io", nil, {
7171
socktype = "stream",
7272
}, expect(function (err, res)
@@ -80,7 +80,7 @@ return require('lib/tap')(function (test)
8080
end)))
8181
end)
8282

83-
test("Get all adresses for luvit.io", function (print, p, expect, uv)
83+
test("Get all addresses for luvit.io", function (print, p, expect, uv)
8484
assert(uv.getaddrinfo("luvit.io", nil, nil, expect(function (err, res)
8585
if errorAllowed(err) then
8686
print(err, "skipping")

tests/test-thread.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ return require('lib/tap')(function (test)
4646
local delay = 100
4747
uv.update_time()
4848
local before = uv.now()
49-
print('Runing', uv.thread_self())
49+
print('Running', uv.thread_self())
5050
uv.sleep(delay)
51-
print('Runing', uv.thread_self())
51+
print('Running', uv.thread_self())
5252
uv.update_time()
5353
local elapsed = uv.now() - before
5454
p({

0 commit comments

Comments
 (0)