aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc/src
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2010-07-07 10:49:21 +0200
committerRaimo Niskanen <[email protected]>2010-07-07 10:49:21 +0200
commitc06512bbe8b84ff073813130bfa0908199c941e4 (patch)
tree4776348469acecd746562233aa694d2f839cfd3c /lib/kernel/doc/src
parent3865a7373bba2ede731eca614dddd18bb50ce7d6 (diff)
parent6973f776b46505db9bc30775723b1088a46756c6 (diff)
downloadotp-c06512bbe8b84ff073813130bfa0908199c941e4.tar.gz
otp-c06512bbe8b84ff073813130bfa0908199c941e4.tar.bz2
otp-c06512bbe8b84ff073813130bfa0908199c941e4.zip
Merge branch 'ta/filetypo' into dev
* ta/filetypo: Correct trivial typos in file manual
Diffstat (limited to 'lib/kernel/doc/src')
-rw-r--r--lib/kernel/doc/src/file.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index a9ceac0bcf..2044b074ee 100644
--- a/lib/kernel/doc/src/file.xml
+++ b/lib/kernel/doc/src/file.xml
@@ -1229,7 +1229,7 @@ f.txt: {person, "kalle", 25}.
</item>
<tag><c>{no_translation, unicode, latin1}</c></tag>
<item>
- <p>The file is was opened with another <c>encoding</c> than <c>latin1</c> and the data on the file can not be translated to the byte-oriented data that this function returns.</p>
+ <p>The file was opened with another <c>encoding</c> than <c>latin1</c> and the data in the file can not be translated to the byte-oriented data that this function returns.</p>
</item>
</taglist>
</desc>