aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-11-24 11:46:38 +0100
committerMarcus Arendt <[email protected]>2014-11-24 11:46:38 +0100
commit2b13135cc0e23ec01f5a74c371b60ef0ec02775e (patch)
treee41d23935574e8e97b2fdc8aad29c1c4711209c5 /lib
parenta881aaf73a7c0f102175aa837679c62976575fa1 (diff)
parent09725c52dfbdcce5ebcf4e52f856f732c738b0d8 (diff)
downloadotp-2b13135cc0e23ec01f5a74c371b60ef0ec02775e.tar.gz
otp-2b13135cc0e23ec01f5a74c371b60ef0ec02775e.tar.bz2
otp-2b13135cc0e23ec01f5a74c371b60ef0ec02775e.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/stdlib/doc/src/io_protocol.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/doc/src/io_protocol.xml b/lib/stdlib/doc/src/io_protocol.xml
index d6da205f07..21da404c35 100644
--- a/lib/stdlib/doc/src/io_protocol.xml
+++ b/lib/stdlib/doc/src/io_protocol.xml
@@ -49,7 +49,7 @@ current I/O-protocol.</p>
<p>The original I/O-protocol was simple and flexible. Demands for spacial
and execution time efficiency has triggered extensions to the protocol
over the years, making the protocol larger and somewhat less easy to
-implement than the original. It can certainly be argumented that the
+implement than the original. It can certainly be argued that the
current protocol is too complex, but this text describes how it looks
today, not how it should have looked.</p>