diff options
| author | Francisco Souza <franciscossouza@gmail.com> | 2012-03-04 14:40:14 +1100 |
|---|---|---|
| committer | Andrew Gerrand <adg@golang.org> | 2012-03-04 14:40:14 +1100 |
| commit | 54875a7a7f64ed3ae2f4d3b66f9de4b3c30c3a22 (patch) | |
| tree | ad981ab410845e34b123d20bf523a67acc78813c | |
| parent | dd29609244b72e57ebda3551eb84d4bed716f4bf (diff) | |
| download | go-54875a7a7f64ed3ae2f4d3b66f9de4b3c30c3a22.tar.gz go-54875a7a7f64ed3ae2f4d3b66f9de4b3c30c3a22.zip | |
doc: fix another typo in article on defer, panic and recover
Fixes #3177
R=adg
CC=golang-dev
https://golang.org/cl/5728057
| -rw-r--r-- | doc/articles/defer_panic_recover.html | 2 | ||||
| -rw-r--r-- | doc/articles/defer_panic_recover.tmpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/articles/defer_panic_recover.html b/doc/articles/defer_panic_recover.html index 9798bedef2..be97045dd9 100644 --- a/doc/articles/defer_panic_recover.html +++ b/doc/articles/defer_panic_recover.html @@ -236,7 +236,7 @@ panic PC=0x2a9cd8 For a real-world example of <b>panic</b> and <b>recover</b>, see the <a href="/pkg/encoding/json/">json package</a> from the Go standard library. It decodes JSON-encoded data with a set of recursive functions. -When malformed JSON is encountered, the parser calls panic is to unwind the +When malformed JSON is encountered, the parser calls panic to unwind the stack to the top-level function call, which recovers from the panic and returns an appropriate error value (see the 'error' and 'unmarshal' functions in <a href="/src/pkg/encoding/json/decode.go">decode.go</a>). diff --git a/doc/articles/defer_panic_recover.tmpl b/doc/articles/defer_panic_recover.tmpl index d2ca7ae2cf..5f48c6ef48 100644 --- a/doc/articles/defer_panic_recover.tmpl +++ b/doc/articles/defer_panic_recover.tmpl @@ -157,7 +157,7 @@ panic PC=0x2a9cd8 For a real-world example of <b>panic</b> and <b>recover</b>, see the <a href="/pkg/encoding/json/">json package</a> from the Go standard library. It decodes JSON-encoded data with a set of recursive functions. -When malformed JSON is encountered, the parser calls panic is to unwind the +When malformed JSON is encountered, the parser calls panic to unwind the stack to the top-level function call, which recovers from the panic and returns an appropriate error value (see the 'error' and 'unmarshal' functions in <a href="/src/pkg/encoding/json/decode.go">decode.go</a>). |