aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorBjörn Gustavsson <bjorn@erlang.org>2014-01-29 10:50:26 +0100
committerBjörn Gustavsson <bjorn@erlang.org>2014-01-29 10:50:26 +0100
commitd960d54f75c51b81a99a1c5cf40c19f2e9d55068 (patch)
tree85946b659b16dc200114645d859d134a9944c2b0 /erts/doc
parent228ef1c22ee2f6f39183091aa70f17417c3d9aa6 (diff)
parent0cc9753f7f873bbcf8a528e05ab0adbd5c8fc79c (diff)
downloadotp-d960d54f75c51b81a99a1c5cf40c19f2e9d55068.tar.gz
otp-d960d54f75c51b81a99a1c5cf40c19f2e9d55068.tar.bz2
otp-d960d54f75c51b81a99a1c5cf40c19f2e9d55068.zip
Merge branch 'bjorn/fna-default/OTP-11612'
* bjorn/fna-default/OTP-11612: Change the default file name encoding mode to +fnaw
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/erl.xml14
1 files changed, 11 insertions, 3 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 27a23174d5..4aa3033f40 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -535,12 +535,15 @@
</item>
<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. This is default on operating systems that have transparent file naming, i.e. all Unixes except MacOSX.</p>
+ <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>
</item>
<tag><c><![CDATA[+fnu[{w|i|e}]]]></c></tag>
<item>
- <p>The VM works with file names as if they are encoded using UTF-8 (or some other system specific Unicode encoding). This is the default on operating systems that enforce Unicode encoding, i.e. Windows and MacOSX.</p>
+ <p>The VM works with file names as if they are encoded using
+ UTF-8 (or some other system specific Unicode encoding). This
+ is the default on operating systems that enforce Unicode
+ encoding, i.e. Windows and MacOS X.</p>
<p>The <c>+fnu</c> switch can be followed by <c>w</c>,
<c>i</c>, or <c>e</c> to control the way wrongly encoded file
names are to be reported. <c>w</c> means that a warning is
@@ -556,7 +559,12 @@
</item>
<tag><c><![CDATA[+fna[{w|i|e}]]]></c></tag>
<item>
- <p>Selection between <c>+fnl</c> and <c>+fnu</c> is done based on the current locale settings in the OS, meaning that if you have set your terminal for UTF-8 encoding, the filesystem is expected to use the same encoding for file names (use with care).</p>
+ <p>Selection between <c>+fnl</c> and <c>+fnu</c> is done based
+ on the current locale settings in the OS, meaning that if you
+ have set your terminal for UTF-8 encoding, the filesystem is
+ expected to use the same encoding for file names. This is
+ default on all operating systems except MacOS X and
+ Windows.</p>
<p>The <c>+fna</c> switch can be followed by <c>w</c>,
<c>i</c>, or <c>e</c>. This will have effect if the locale
settings cause the behavior of <c>+fnu</c> to be selected.