commit 7de5e6e84d766f73a7cccfb2f862bcca2e87dc7b
author Andrew Gerrand <adg@golang.org> Thu Oct 21 14:59:23 2010 +1100
committer Andrew Gerrand <adg@golang.org> Thu Oct 21 14:59:23 2010 +1100
tree 5b1d9bae213b4ddbb38ebe4d1d36f9f93b04a0c7
parent 64cc5be4adbf3a4ee27c4ad61f12f94af4932b38

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

Fixes #1211.

R=r, r2
CC=golang-dev
https://golang.org/cl/2635041

doc/go_tutorial.html

diff --git a/doc/go_tutorial.html b/doc/go_tutorial.html
index 13ccb82..1b9f752 100644
--- a/doc/go_tutorial.html
+++ b/doc/go_tutorial.html
@@ -531,7 +531,7 @@
     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 @@
 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 @@
 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 @@
 <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 @@
 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])

doc/go_tutorial.txt

diff --git a/doc/go_tutorial.txt b/doc/go_tutorial.txt
index 477199a..9c08bd2 100644
--- a/doc/go_tutorial.txt
+++ b/doc/go_tutorial.txt
@@ -420,7 +420,7 @@
 	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":