Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion system/doc/reference_manual/character_set.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ limitations under the License.

## Character Set

The syntax of Erlang tokens allow the use of the full ISO-8859-1 (Latin-1)
The syntax of Erlang tokens allows the use of the full ISO-8859-1 (Latin-1)
character set. This is noticeable in the following ways:

- All the Latin-1 printable characters can be used and are shown without the
Expand Down
14 changes: 7 additions & 7 deletions system/doc/reference_manual/code_loading.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Erlang/OTP with references to relevant parts of the documentation.

Erlang programs must be _compiled_ to object code. The compiler can generate a
new file that contains the object code. The current abstract machine, which runs
the object code, is called BEAM, therefore the object files get the suffix
the object code, is called BEAM and therefore the object files get the suffix
`.beam`. The compiler can also generate a binary which can be loaded directly.

The compiler is located in the module `m:compile` in Compiler.
Expand All @@ -53,7 +53,7 @@ The compiler can also be accessed from the OS prompt using the
% erl -make
```

The `erlc` program provides way to compile modules from the OS
The `erlc` program provides a way to compile modules from the OS
shell, see the [erlc](`e:erts:erlc_cmd.md`) executable in ERTS. It
understands a number of flags that can be used to define macros, add search
paths for include files, and more.
Expand All @@ -73,7 +73,7 @@ The code server loads code according to a code loading strategy, which is either
_interactive_ (default) or _embedded_. In interactive mode, code is searched for
in a _code path_ and loaded when first referenced. In embedded mode, code is
loaded at start-up according to a _boot script_. This is described in
[System Principles ](`e:system:system_principles.md#code_loading`).
[System Principles](`e:system:system_principles.md#code_loading`).

## Code Replacement

Expand All @@ -85,12 +85,12 @@ When a module is loaded into the system for the first time, the code becomes
'current'. If then a new instance of the module is loaded, the code of the
previous instance becomes 'old' and the new instance becomes 'current'.

Both old and current code is valid, and can be evaluated concurrently. Fully
Both old and current code are valid, and can be evaluated concurrently. Fully
qualified function calls always refer to current code. Old code can still be
evaluated because of processes lingering in the old code.

If a third instance of the module is loaded, the code server removes (purges)
the old code and any processes lingering in it is terminated. Then the third
the old code and any processes lingering in it are terminated. Then the third
instance becomes 'current' and the previously current code becomes 'old'.

To change from old code to current code, a process must make a fully qualified
Expand Down Expand Up @@ -147,7 +147,7 @@ and can be called until the `on_load` function has returned. If the `on_load`
function fails, the current code (if any) will remain current. If there is no
current code for a module, any process that makes an external call to the module
before the `on_load` function has finished will be suspended until the `on_load`
function have finished.
function has finished.

> #### Change {: .info }
>
Expand All @@ -172,4 +172,4 @@ load_my_nifs() ->
```

If the call to `erlang:load_nif/2` fails, the module is unloaded and a warning
report is sent to the error loader.
report is sent to the error logger.
Loading
Loading