From 8af5bd5e01cef3f0ebb760e9c7e4cea0452a270f Mon Sep 17 00:00:00 2001 From: Tuncer Ayaz Date: Tue, 10 Apr 2012 12:47:23 +0200 Subject: Fix various code typos for R15B02 --- erts/emulator/beam/erl_time_sup.c | 2 +- erts/preloaded/src/prim_file.erl | 2 +- lib/inets/src/http_client/httpc_handler.erl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c index 1d0735aa99..7fd8501b08 100644 --- a/erts/emulator/beam/erl_time_sup.c +++ b/erts/emulator/beam/erl_time_sup.c @@ -351,7 +351,7 @@ static int clock_resolution; /* ** The clock resolution should really be the resolution of the ** time function in use, which on most platforms -** is 1. On VxWorks the resolution shold be +** is 1. On VxWorks the resolution should be ** the number of ticks per second (or 1, which would work nicely to). ** ** Setting lower resolutions is mostly interesting when timers are used diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl index 0fc56c8c8e..ec158ba970 100644 --- a/erts/preloaded/src/prim_file.erl +++ b/erts/preloaded/src/prim_file.erl @@ -453,7 +453,7 @@ position(#file_descriptor{module = ?MODULE, data = {Port, _}}, At) -> {error, Reason} end. -%% Returns {error, Reaseon} | ok. +%% Returns {error, Reason} | ok. truncate(#file_descriptor{module = ?MODULE, data = {Port, _}}) -> drv_command(Port, <>). diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl index b8c34bd99b..fb6879bf4d 100644 --- a/lib/inets/src/http_client/httpc_handler.erl +++ b/lib/inets/src/http_client/httpc_handler.erl @@ -55,7 +55,7 @@ status_line, % {Version, StatusCode, ReasonPharse} headers, % #http_response_h{} body, % binary() - mfa, % {Moduel, Function, Args} + mfa, % {Module, Function, Args} pipeline = queue:new(), % queue() keep_alive = queue:new(), % queue() status, % undefined | new | pipeline | keep_alive | close | ssl_tunnel -- cgit v1.2.3 From 541e986798f525add633b55349168eb1c75aa5cf Mon Sep 17 00:00:00 2001 From: Tuncer Ayaz Date: Tue, 10 Apr 2012 12:47:44 +0200 Subject: Fix various doc typos for R15B02 --- erts/doc/src/erlc.xml | 2 +- lib/common_test/doc/src/write_test_chapter.xml | 2 +- lib/compiler/doc/src/compile.xml | 2 +- lib/kernel/doc/src/code.xml | 2 +- lib/reltool/doc/src/reltool.xml | 2 +- lib/ssl/test/ssl_test_lib.erl | 2 +- lib/tools/doc/src/xref_chapter.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/erts/doc/src/erlc.xml b/erts/doc/src/erlc.xml index 3358b8f115..09ed4bd372 100644 --- a/erts/doc/src/erlc.xml +++ b/erts/doc/src/erlc.xml @@ -67,7 +67,7 @@

Instructs the compiler to search for include files in the specified directory. When encountering an - or directive, the + or directive, the compiler searches for header files in the following directories:

diff --git a/lib/common_test/doc/src/write_test_chapter.xml b/lib/common_test/doc/src/write_test_chapter.xml index 7b7e7af8ea..d98bd3a19e 100644 --- a/lib/common_test/doc/src/write_test_chapter.xml +++ b/lib/common_test/doc/src/write_test_chapter.xml @@ -883,7 +883,7 @@ of its sub-groups. If a timetrap value is defined by group/1 for a sub-group, it overrides that of its higher level groups. Timetrap values set by individual test cases (by means of the test case info - function) overrides both group- and suite- level timetraps.

+ function) override both group- and suite- level timetraps.

It is also possible to dynamically set/reset a timetrap during the excution of a test case, or configuration function. This is done by calling diff --git a/lib/compiler/doc/src/compile.xml b/lib/compiler/doc/src/compile.xml index b577e5ca4f..e2e2633637 100644 --- a/lib/compiler/doc/src/compile.xml +++ b/lib/compiler/doc/src/compile.xml @@ -310,7 +310,7 @@ module.beam: module.erl \

Add Dir to the list of directories to be searched when including a file. When encountering an - -include or -include_dir directive, + -include or -include_lib directive, the compiler searches for header files in the following directories:

diff --git a/lib/kernel/doc/src/code.xml b/lib/kernel/doc/src/code.xml index ee687511a3..214e61cc00 100644 --- a/lib/kernel/doc/src/code.xml +++ b/lib/kernel/doc/src/code.xml @@ -91,7 +91,7 @@ of the additional library directories will override modules with the same name in OTP, except for modules in Kernel and STDLIB.

-

The environment variable ERL_LIBS (if defined) shold contain +

The environment variable ERL_LIBS (if defined) should contain a colon-separated (for Unix-like systems) or semicolon-separated (for Windows) list of additional libraries.

Example: On an Unix-like system, ERL_LIBS could be set to diff --git a/lib/reltool/doc/src/reltool.xml b/lib/reltool/doc/src/reltool.xml index 9a4e2d130e..27e46bf086 100644 --- a/lib/reltool/doc/src/reltool.xml +++ b/lib/reltool/doc/src/reltool.xml @@ -144,7 +144,7 @@ value include implies that all applications and escripts that do not have any explicit incl_cond setting will be included. exclude implies that all - applications and escripts) that do not have any explicit + applications and escripts that do not have any explicit incl_cond setting will be excluded.

 diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index fa8a1826f2..a587f90e43 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -150,7 +150,7 @@ run_client(Opts) -> {ok, Socket} -> Pid ! { connected, Socket }, test_server:format("Client: connected~n", []), - %% In specail cases we want to know the client port, it will + %% In special cases we want to know the client port, it will %% be indicated by sending {port, 0} in options list! send_selected_port(Pid, proplists:get_value(port, Options), Socket), {Module, Function, Args} = proplists:get_value(mfa, Opts), diff --git a/lib/tools/doc/src/xref_chapter.xml b/lib/tools/doc/src/xref_chapter.xml index 39c5545af9..169313cb9c 100644 --- a/lib/tools/doc/src/xref_chapter.xml +++ b/lib/tools/doc/src/xref_chapter.xml @@ -301,7 +301,7 @@ and |||) are the only operators that accept both representations. This means that in order to analyze indirect calls using restriction, the closure operator (which creates the - digraph representation of graphs) has to been + digraph representation of graphs) has to be applied explicitly.

As an example of analyzing indirect calls, the following Erlang -- cgit v1.2.3