aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2013-02-14 12:04:56 +0100
committerBjörn Gustavsson <[email protected]>2013-02-14 12:04:56 +0100
commit9905024a8b7d9a26f7fdf6640ab391c5cb8f6780 (patch)
tree435f9e18d02c565efa184b56956dfa4db35a173a /lib/kernel/doc
parent3a223f53c7c4fa5d2656c8cdc5dae74f20185b04 (diff)
parent1d6ac47dc148bcfdb61c205b709b61172374eb30 (diff)
downloadotp-9905024a8b7d9a26f7fdf6640ab391c5cb8f6780.tar.gz
otp-9905024a8b7d9a26f7fdf6640ab391c5cb8f6780.tar.bz2
otp-9905024a8b7d9a26f7fdf6640ab391c5cb8f6780.zip
Merge branch 'bjorn/stdlib/types'
* bjorn/stdlib/types: Make the file:filename() type more restrictive c: Remove handling of binaries in return from file:list_dir/1
Diffstat (limited to 'lib/kernel/doc')
-rw-r--r--lib/kernel/doc/src/file.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index a96da0fb4e..069b13eacf 100644
--- a/lib/kernel/doc/src/file.xml
+++ b/lib/kernel/doc/src/file.xml
@@ -110,6 +110,9 @@
<name name="filename"/>
</datatype>
<datatype>
+ <name name="filename_all"/>
+ </datatype>
+ <datatype>
<name name="io_device"/>
<desc>
<p>As returned by