diff options
| author | Hans Bolinder <[email protected]> | 2015-11-04 13:14:33 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2015-11-04 13:14:33 +0100 |
| commit | c4fd58a394f427edf54fae75288c3b9159f9cc1a (patch) | |
| tree | 1c7c1d89b8d292546f45a342022ae659069f1ba1 /erts/doc/src/escript.xml | |
| parent | ce2c23ed1d6b6dc3d1a1c7109ceae255d1203f9f (diff) | |
| parent | 4ddb88db95442d18abe654ba1ff788e98eebe375 (diff) | |
| download | otp-c4fd58a394f427edf54fae75288c3b9159f9cc1a.tar.gz otp-c4fd58a394f427edf54fae75288c3b9159f9cc1a.tar.bz2 otp-c4fd58a394f427edf54fae75288c3b9159f9cc1a.zip | |
Merge branch 'maint'
* maint:
[erl_docgen] Correct documentation
[dialyzer] Correct documentation
[hipe] Correct documentation
[test_server] Correct documentation
[tools] Correct documentation
[erts] Correct documentation
[stdlib] Correct documentation
[kernel] Correct documentation
Conflicts:
lib/stdlib/doc/src/erl_scan.xml
Diffstat (limited to 'erts/doc/src/escript.xml')
| -rw-r--r-- | erts/doc/src/escript.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/doc/src/escript.xml b/erts/doc/src/escript.xml index 46110333f9..f12f76890c 100644 --- a/erts/doc/src/escript.xml +++ b/erts/doc/src/escript.xml @@ -4,7 +4,7 @@ <comref> <header> <copyright> - <year>2007</year><year>2014</year> + <year>2007</year><year>2015</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -96,8 +96,8 @@ $ <input>escript factorial 5</input> </pre> <note><p> The encoding specified by the above mentioned comment applies to the script itself. The encoding of the - I/O-server, however, has to be set explicitly like this: -<code>io:setopts([{encoding, unicode}])</code></p> + I/O-server, however, has to be set explicitly like this:</p> +<code>io:setopts([{encoding, unicode}])</code> <p>The default encoding of the I/O-server for <c>standard_io</c> is <c>latin1</c> since the script runs in a non-interactive terminal |