diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-06-10 10:02:35 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-06-10 10:02:35 +0200 |
| commit | 9e20ac47b7107dcda818b20f6622e56f52a5ef64 (patch) | |
| tree | 2e90673b80a8fb0484229a38ed4a9847b44ad962 /system/doc | |
| parent | bb399e7ab2d96edcaa0ff482bd51494848c1a248 (diff) | |
| parent | 02d813dd3180cd6bc74c6b4af2252bd7d6959654 (diff) | |
| download | otp-9e20ac47b7107dcda818b20f6622e56f52a5ef64.tar.gz otp-9e20ac47b7107dcda818b20f6622e56f52a5ef64.tar.bz2 otp-9e20ac47b7107dcda818b20f6622e56f52a5ef64.zip | |
Merge branch 'lh/fix-doc-reserved-words/OTP-11158' into maint
* lh/fix-doc-reserved-words/OTP-11158:
Remove 'query' from the list of reserved words in docs
Diffstat (limited to 'system/doc')
| -rw-r--r-- | system/doc/reference_manual/introduction.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/doc/reference_manual/introduction.xml b/system/doc/reference_manual/introduction.xml index 7737c34469..678b1964a6 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> |