diff options
author | Siri Hansen <[email protected]> | 2014-03-25 10:18:30 +0100 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2014-03-25 10:18:39 +0100 |
commit | b12e68f2e49807aee175de4474c2b79b24e24b61 (patch) | |
tree | 74922e8697f113bce2676003cba61f98116f0c41 /erts | |
parent | aa2dfd7c30d3ca3318498bcbf4155dad175b6d7e (diff) | |
parent | a9fd7c1ffbb2b3509821b6655f460e27f70c2892 (diff) | |
download | otp-b12e68f2e49807aee175de4474c2b79b24e24b61.tar.gz otp-b12e68f2e49807aee175de4474c2b79b24e24b61.tar.bz2 otp-b12e68f2e49807aee175de4474c2b79b24e24b61.zip |
Merge branch 'vladdu/unicode_parameters_doc'
* vladdu/unicode_parameters_doc:
Specify that +fn* flags affect even command-line parameters and environment variables
OTP-11818
Diffstat (limited to 'erts')
-rw-r--r-- | erts/doc/src/erl.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml index 4aa3033f40..9724a1345a 100644 --- a/erts/doc/src/erl.xml +++ b/erts/doc/src/erl.xml @@ -536,7 +536,7 @@ <tag><marker id="file_name_encoding"></marker><c><![CDATA[+fnl]]></c></tag> <item> <p>The VM works with file names as if they are encoded using the ISO-latin-1 encoding, disallowing Unicode characters with codepoints beyond 255.</p> - <p>See <seealso marker="stdlib:unicode_usage#unicode_file_names">STDLIB User's Guide</seealso> for more infomation about unicode file names.</p> + <p>See <seealso marker="stdlib:unicode_usage#unicode_file_names">STDLIB User's Guide</seealso> for more infomation about unicode file names. Note that this value also applies to command-line parameters and environment variables (see <seealso marker="stdlib:unicode_usage#unicode_in_environment_and_parameters">STDLIB User's Guide</seealso>).</p> </item> <tag><c><![CDATA[+fnu[{w|i|e}]]]></c></tag> <item> @@ -555,7 +555,7 @@ encountered. <c>w</c> is the default. Note that <c>file:read_link/1</c> will always return an error if the link points to an invalid file name.</p> - <p>See <seealso marker="stdlib:unicode_usage#unicode_file_names">STDLIB User's Guide</seealso> for more infomation about unicode file names.</p> + <p>See <seealso marker="stdlib:unicode_usage#unicode_file_names">STDLIB User's Guide</seealso> for more infomation about unicode file names. Note that this value also applies to command-line parameters and environment variables (see <seealso marker="stdlib:unicode_usage#unicode_in_environment_and_parameters">STDLIB User's Guide</seealso>).</p> </item> <tag><c><![CDATA[+fna[{w|i|e}]]]></c></tag> <item> @@ -572,7 +572,7 @@ settings cause the behavior of <c>+fnl</c> to be selected, then <c>w</c>, <c>i</c>, or <c>e</c> will not have any effect.</p> - <p>See <seealso marker="stdlib:unicode_usage#unicode_file_names">STDLIB User's Guide</seealso> for more infomation about unicode file names.</p> + <p>See <seealso marker="stdlib:unicode_usage#unicode_file_names">STDLIB User's Guide</seealso> for more infomation about unicode file names. Note that this value also applies to command-line parameters and environment variables (see <seealso marker="stdlib:unicode_usage#unicode_in_environment_and_parameters">STDLIB User's Guide</seealso>).</p> </item> <tag><c><![CDATA[+hms Size]]></c></tag> <item> |