aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc/reference_manual/expressions.xml
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2012-05-15 10:46:46 +0200
committerHans Bolinder <[email protected]>2012-05-15 10:46:46 +0200
commita1a8c859540dae42ac287a495301f7e6317ff3c3 (patch)
tree830aa78fc2d81af3e919c23598e36991a9040b3f /system/doc/reference_manual/expressions.xml
parent6cad5325cccd5be59d9bcd5d71df7be4a5ad7ae2 (diff)
parent55ba6810c48497149eeff21c543afe72602903d4 (diff)
downloadotp-a1a8c859540dae42ac287a495301f7e6317ff3c3.tar.gz
otp-a1a8c859540dae42ac287a495301f7e6317ff3c3.tar.bz2
otp-a1a8c859540dae42ac287a495301f7e6317ff3c3.zip
Merge branch 'hb/stdlib/correct_pretty_error/OTP-10054' into maint
* hb/stdlib/correct_pretty_error/OTP-10054: Improve the nice 'badarith' message displayed by the shell
Diffstat (limited to 'system/doc/reference_manual/expressions.xml')
-rw-r--r--system/doc/reference_manual/expressions.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/doc/reference_manual/expressions.xml b/system/doc/reference_manual/expressions.xml
index 5fca7225bb..d564b20ca6 100644
--- a/system/doc/reference_manual/expressions.xml
+++ b/system/doc/reference_manual/expressions.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>2003</year><year>2011</year>
+ <year>2003</year><year>2012</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -685,7 +685,7 @@ Expr1 <input>op</input> Expr2</pre>
8> <input>2#10 bor 2#01.</input>
3
9> <input>a + 10.</input>
-** exception error: bad argument in an arithmetic expression
+** exception error: an error occurred when evaluating an arithmetic expression
in operator +/2
called as a + 10
10> <input>1 bsl (1 bsl 64).</input>