aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src
diff options
context:
space:
mode:
authorErland Schönbeck <[email protected]>2014-07-11 11:09:09 +0200
committerErland Schönbeck <[email protected]>2014-07-11 11:09:09 +0200
commit9a1419a7d4325085dc2235a8531d77e1d96ea689 (patch)
treeebb7ed16ce92c1c99b44091bee9e4d2a7220ef75 /erts/doc/src
parenta56f6e3e716c4a2c8f16933e1e30759381c4fdb8 (diff)
parent934b6de4d2ab6c31c5217e1ba4779ade9e37cc83 (diff)
downloadotp-9a1419a7d4325085dc2235a8531d77e1d96ea689.tar.gz
otp-9a1419a7d4325085dc2235a8531d77e1d96ea689.tar.bz2
otp-9a1419a7d4325085dc2235a8531d77e1d96ea689.zip
Merge branch 'maint-17' into maint
Diffstat (limited to 'erts/doc/src')
-rw-r--r--erts/doc/src/erl_prim_loader.xml16
-rw-r--r--erts/doc/src/notes.xml19
2 files changed, 35 insertions, 0 deletions
diff --git a/erts/doc/src/erl_prim_loader.xml b/erts/doc/src/erl_prim_loader.xml
index 6751deda4d..171f84decc 100644
--- a/erts/doc/src/erl_prim_loader.xml
+++ b/erts/doc/src/erl_prim_loader.xml
@@ -148,6 +148,22 @@
</desc>
</func>
<func>
+ <name name="read_link_info" arity="1"/>
+ <fsummary>Get information about a link or file</fsummary>
+ <desc>
+ <p>This function works like
+ <seealso marker="#read_file_info/1">read_file_info/1</seealso>
+ except that if <c><anno>Filename</anno></c> is a symbolic link,
+ information about the link will be returned in the <c>file_info</c>
+ record and the <c>type</c> field of the record will be set to
+ <c>symlink</c>.</p>
+ <p>If <c><anno>Filename</anno></c> is not a symbolic link, this function
+ returns exactly the same result as <c>read_file_info/1</c>.
+ On platforms that do not support symbolic links, this function
+ is always equivalent to <c>read_file_info/1</c>.</p>
+ </desc>
+ </func>
+ <func>
<name name="set_path" arity="1"/>
<fsummary>Set the path of the loader</fsummary>
<desc>
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 5f39822712..086d29c668 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,25 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 6.1.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ OTP-11850 fixed filelib:wildcard/1 to work with broken
+ symlinks. This correction, however, introduced problems
+ since symlinks were no longer followed for functions like
+ filelib:ensure_dir/1, filelib:is_dir/1,
+ filelib:file_size/1, etc. This is now corrected.</p>
+ <p>
+ Own Id: OTP-12054 Aux Id: seq12660 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 6.1.1</title>
<section><title>Fixed Bugs and Malfunctions</title>