aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc/getting_started/seq_prog.xml
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2018-01-10 10:02:42 +0100
committerHans Bolinder <[email protected]>2018-01-10 10:02:42 +0100
commitfa906be49717c6686bf3b19ab3bcb8d45513590c (patch)
tree90c65f7b2359b5cee6c15e198f049ff28d6df6da /system/doc/getting_started/seq_prog.xml
parentcfeea60dc32e545882047d0ab1d77566a83dcbd3 (diff)
parent9ab233d389bfc40ddaa56af80ace5cc78470a92b (diff)
downloadotp-fa906be49717c6686bf3b19ab3bcb8d45513590c.tar.gz
otp-fa906be49717c6686bf3b19ab3bcb8d45513590c.tar.bz2
otp-fa906be49717c6686bf3b19ab3bcb8d45513590c.zip
Merge branch 'hasse/stdlib/erl_eval_stacktrace/OTP-14826/PR-1540'
* hasse/stdlib/erl_eval_stacktrace/OTP-14826/PR-1540: syntax_tools: Correct handling of stacktrace variable stdlib: Add check of stacktrace variable to erl_eval stdlib: Improve erl_eval's stacktraces
Diffstat (limited to 'system/doc/getting_started/seq_prog.xml')
-rw-r--r--system/doc/getting_started/seq_prog.xml13
1 files changed, 7 insertions, 6 deletions
diff --git a/system/doc/getting_started/seq_prog.xml b/system/doc/getting_started/seq_prog.xml
index 6b7e1cd24f..2b0750ff80 100644
--- a/system/doc/getting_started/seq_prog.xml
+++ b/system/doc/getting_started/seq_prog.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>2003</year><year>2016</year>
+ <year>2003</year><year>2017</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -271,11 +271,12 @@ convert(N, centimeter) ->
{'EXIT',{function_clause,[{tut2,convert,
[3,miles],
[{file,"tut2.erl"},{line,4}]},
- {erl_eval,do_apply,5,[{file,"erl_eval.erl"},{line,482}]},
- {shell,exprs,7,[{file,"shell.erl"},{line,666}]},
- {shell,eval_exprs,7,[{file,"shell.erl"},{line,621}]},
- {shell,eval_loop,3,[{file,"shell.erl"},{line,606}]}]}}</pre>
-
+ {erl_eval,do_apply,6,
+ [{file,"erl_eval.erl"},{line,677}]},
+ {shell,exprs,7,[{file,"shell.erl"},{line,687}]},
+ {shell,eval_exprs,7,[{file,"shell.erl"},{line,642}]},
+ {shell,eval_loop,3,
+ [{file,"shell.erl"},{line,627}]}]}}</pre>
</section>
<section>