aboutsummaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-06-10 10:02:46 +0200
committerFredrik Gustafsson <[email protected]>2013-06-10 10:02:46 +0200
commit099419dbf6c1180fe09552de700853ef3ad85414 (patch)
tree52954403b33eeafe03bf5c085716bcabc90c1bf6 /system
parent5c956596526b0d996319786c808a0799dd0d61eb (diff)
parent9e20ac47b7107dcda818b20f6622e56f52a5ef64 (diff)
downloadotp-099419dbf6c1180fe09552de700853ef3ad85414.tar.gz
otp-099419dbf6c1180fe09552de700853ef3ad85414.tar.bz2
otp-099419dbf6c1180fe09552de700853ef3ad85414.zip
Merge branch 'maint'
Diffstat (limited to 'system')
-rw-r--r--system/doc/reference_manual/introduction.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/doc/reference_manual/introduction.xml b/system/doc/reference_manual/introduction.xml
index 34b77f3e32..aa42967625 100644
--- a/system/doc/reference_manual/introduction.xml
+++ b/system/doc/reference_manual/introduction.xml
@@ -75,7 +75,7 @@
<title>Reserved Words</title>
<p>The following are reserved words in Erlang:</p>
<p>after and andalso band begin bnot bor bsl bsr bxor case catch
- cond div end fun if let not of or orelse query receive rem try
+ cond div end fun if let not of or orelse receive rem try
when xor</p>
</section>