aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-03-08 14:51:51 +0100
committerHenrik Nord <[email protected]>2016-03-08 14:51:51 +0100
commit92573ea08320c05f233e978aba2aa7a4463b3617 (patch)
treee3f81cf077ffab693447dbddc108a236b1421dd9 /lib/stdlib
parent7ba125fafa1da21d8780bcdae97f1ef56fb6a39a (diff)
parent043133b500274669fa8b5b894939280185941ce3 (diff)
downloadotp-92573ea08320c05f233e978aba2aa7a4463b3617.tar.gz
otp-92573ea08320c05f233e978aba2aa7a4463b3617.tar.bz2
otp-92573ea08320c05f233e978aba2aa7a4463b3617.zip
Merge branch 'maint'
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/doc/src/filename.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/doc/src/filename.xml b/lib/stdlib/doc/src/filename.xml
index 65009753f3..ce6aba3657 100644
--- a/lib/stdlib/doc/src/filename.xml
+++ b/lib/stdlib/doc/src/filename.xml
@@ -368,7 +368,7 @@ true
<desc>
<p>Converts <c><anno>Path</anno></c> to a form accepted by the command shell
and native applications on the current platform. On Windows,
- forward slashes is converted to backward slashes. On all
+ forward slashes are converted to backward slashes. On all
platforms, the name is normalized as done by <c>join/1</c>.</p>
<pre>
19> <input>filename:nativename("/usr/local/bin/").</input> % Unix