clones/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2024-09-21 18:38:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

go_tutorial: change wording slightly and sync .txt and .html post-gofmt

Browse Source 
Fixes #1211.

R=r, r2
CC=golang-dev
https://golang.org/cl/2635041
This commit is contained in:
Andrew Gerrand 2010-10-21 14:59:23 +11:00
parent 64cc5be4ad
commit 7de5e6e84d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/go_tutorial.html
View File

@ -531,7 +531,7 @@ object. We could write
return n
</pre>
<p>
but for simple structures like <code>File</code> it's easier to return the address of a nonce
but for simple structures like <code>File</code> it's easier to return the address of a
composite literal, as is done here on line 21.
<p>
We can use the factory to construct some familiar, exported variables of type <code>*File</code>:
@ -698,7 +698,7 @@ Building on the <code>file</code> package, here's a simple version of the Unix u
19 case nr &lt; 0:
20 fmt.Fprintf(os.Stderr, &quot;cat: error reading from %s: %s\n&quot;, f.String(), er.String())
21 os.Exit(1)
22 case nr == 0: // EOF
22 case nr == 0: // EOF
23 return
24 case nr &gt; 0:
25 if nw, ew := file.Stdout.Write(buf[0:nr]); nw != nr {
@ -709,7 +709,7 @@ Building on the <code>file</code> package, here's a simple version of the Unix u
30 }
<p>
32 func main() {
33 flag.Parse() // Scans the arg list and sets up flags
33 flag.Parse() // Scans the arg list and sets up flags
34 if flag.NArg() == 0 {
35 cat(file.Stdin)
36 }
@ -770,7 +770,7 @@ we have a second implementation of the <code>reader</code> interface.
<p>
<pre> <!-- progs/cat_rot13.go /type.rotate13/ /end.of.rotate13/ -->
31 type rotate13 struct {
32 source reader
32 source reader
33 }
<p>
35 func newRotate13(source reader) *rotate13 {
@ -814,7 +814,7 @@ and use it from within a mostly unchanged <code>cat()</code> function:
61 case nr &lt; 0:
62 fmt.Fprintf(os.Stderr, &quot;cat: error reading from %s: %s\n&quot;, r.String(), er.String())
63 os.Exit(1)
64 case nr == 0: // EOF
64 case nr == 0: // EOF
65 return
66 case nr &gt; 0:
67 nw, ew := file.Stdout.Write(buf[0:nr])

2
doc/go_tutorial.txt
View File

@ -420,7 +420,7 @@ object. We could write
n.name = name
return n
but for simple structures like "File" it's easier to return the address of a nonce
but for simple structures like "File" it's easier to return the address of a
composite literal, as is done here on line 21.
We can use the factory to construct some familiar, exported variables of type "*File":