aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorBjörn Gustavsson <bjorn@erlang.org>2010-10-07 11:13:54 +0200
committerBjörn Gustavsson <bjorn@erlang.org>2010-10-07 11:13:54 +0200
commit9cd4afbb49d3a1802b2dcb4e15a8797286045644 (patch)
treee7b91e741702e108bb4b995c87e465bfb4f137bd /lib/stdlib
parentd8f8eeba477fd8872f1136fc507fa299f013cc46 (diff)
parent9815d1aa229716ada5132987104999db0dea12c0 (diff)
downloadotp-9cd4afbb49d3a1802b2dcb4e15a8797286045644.tar.gz
otp-9cd4afbb49d3a1802b2dcb4e15a8797286045644.tar.bz2
otp-9cd4afbb49d3a1802b2dcb4e15a8797286045644.zip
Merge branch 'bjorn/filelib-document-charset/OTP-8879' into dev
* bjorn/filelib-document-charset/OTP-8879: filelib: Document the character set syntax in wildcards
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/doc/src/filelib.xml8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/stdlib/doc/src/filelib.xml b/lib/stdlib/doc/src/filelib.xml
index c1c4ca9350..4ff3b22f32 100644
--- a/lib/stdlib/doc/src/filelib.xml
+++ b/lib/stdlib/doc/src/filelib.xml
@@ -4,7 +4,7 @@
<erlref>
<header>
<copyright>
- <year>2003</year><year>2009</year>
+ <year>2003</year><year>2010</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -160,6 +160,12 @@ DeepList = [char() | atom() | DeepList]</code>
<p>Matches any number of characters up to the end of
the filename, the next dot, or the next slash.</p>
</item>
+ <tag>[Character1,Character2,...]</tag>
+ <item>
+ <p>Matches any of the characters listed. Two characters
+ separated by a hyphen will match a range of characters.
+ Example: <c>[A-Z]</c> will match any uppercase letter.</p>
+ </item>
<tag>{Item,...}</tag>
<item>
<p>Alternation. Matches one of the alternatives.</p>