aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-09-22 11:06:51 +0200
committerSiri Hansen <[email protected]>2014-09-22 11:06:51 +0200
commit6c3ad4ae161de5029cf666f620b7254ea6bb5987 (patch)
treeb6dc57583c824d2a0c1d8acbafbfe5d1cfcbb938
parent3c5b487d925ced4314d5df0172bf33d93920c4d9 (diff)
parentca4f18a59f37f80f7dfa6e1d6d6ba7bb453d1131 (diff)
downloadotp-6c3ad4ae161de5029cf666f620b7254ea6bb5987.tar.gz
otp-6c3ad4ae161de5029cf666f620b7254ea6bb5987.tar.bz2
otp-6c3ad4ae161de5029cf666f620b7254ea6bb5987.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
-rw-r--r--lib/stdlib/doc/src/string.xml6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/stdlib/doc/src/string.xml b/lib/stdlib/doc/src/string.xml
index c96cc95a44..b05d5cbc08 100644
--- a/lib/stdlib/doc/src/string.xml
+++ b/lib/stdlib/doc/src/string.xml
@@ -4,7 +4,7 @@
<erlref>
<header>
<copyright>
- <year>1996</year><year>2013</year>
+ <year>1996</year><year>2014</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -124,6 +124,10 @@
<code type="none">
> tokens("abc defxxghix jkl", "x ").
["abc", "def", "ghi", "jkl"] </code>
+ <p>Note that, as shown in the example above, two or more
+ adjacent separator characters in <c><anno>String</anno></c>
+ will be treated as one. That is, there will not be any empty
+ strings in the resulting list of tokens.</p>
</desc>
</func>
<func>