From 0cc9753f7f873bbcf8a528e05ab0adbd5c8fc79c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Mon, 27 Jan 2014 13:10:54 +0100
Subject: Change the default file name encoding mode to +fnaw

---
 erts/doc/src/erl.xml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'erts/doc/src')

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index e737727941..6428a24209 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.
-- 
cgit v1.2.3