doc: update codelab wiki to fix template.Execute argument order

Fixes #1595.

R=r
CC=golang-dev
https://golang.org/cl/4243067

diff --git a/doc/codelab/wiki/final-noclosure.go b/doc/codelab/wiki/final-noclosure.go
index 99121f298b8bd2b2c366f36dc037989a4bdc90e0..d09a0d7ab9725bb6ab495544655af910c5e48bac 100644 (file)
--- a/doc/codelab/wiki/final-noclosure.go
+++ b/doc/codelab/wiki/final-noclosure.go
@@ -73,7 +73,7 @@ func renderTemplate(w http.ResponseWriter, tmpl string, p *Page) {
                http.Error(w, err.String(), http.StatusInternalServerError)
                return
        }
-       err = t.Execute(p, w)
+       err = t.Execute(w, p)
        if err != nil {
                http.Error(w, err.String(), http.StatusInternalServerError)
        }

diff --git a/doc/codelab/wiki/final-noerror.go b/doc/codelab/wiki/final-noerror.go
index 0f18912d2e6cac00634ca3146500d7f23533cf45..5fcf1de76d39e4e6828d19e1ebe3c4c9b5e2825e 100644 (file)
--- a/doc/codelab/wiki/final-noerror.go
+++ b/doc/codelab/wiki/final-noerror.go
@@ -35,14 +35,14 @@ func editHandler(w http.ResponseWriter, r *http.Request) {
                p = &Page{Title: title}
        }
        t, _ := template.ParseFile("edit.html", nil)
-       t.Execute(p, w)
+       t.Execute(w, p)
 }
 
 func viewHandler(w http.ResponseWriter, r *http.Request) {
        title := r.URL.Path[lenPath:]
        p, _ := loadPage(title)
        t, _ := template.ParseFile("view.html", nil)
-       t.Execute(p, w)
+       t.Execute(w, p)
 }
 
 func main() {

diff --git a/doc/codelab/wiki/final-parsetemplate.go b/doc/codelab/wiki/final-parsetemplate.go
index ea897760159a56f1f753dc72bb127ae8982c6095..f25012eed12257d7c9ea66a731c5f1a945737631 100644 (file)
--- a/doc/codelab/wiki/final-parsetemplate.go
+++ b/doc/codelab/wiki/final-parsetemplate.go
@@ -61,7 +61,7 @@ func renderTemplate(w http.ResponseWriter, tmpl string, p *Page) {
                http.Error(w, err.String(), http.StatusInternalServerError)
                return
        }
-       err = t.Execute(p, w)
+       err = t.Execute(w, p)
        if err != nil {
                http.Error(w, err.String(), http.StatusInternalServerError)
        }

diff --git a/doc/codelab/wiki/final-template.go b/doc/codelab/wiki/final-template.go
index 4d6a2cfaba3e7f130db03b183d6de8d9d71cd8c2..aab536ee1a5a9c571e9694d3b6805011e97fc84c 100644 (file)
--- a/doc/codelab/wiki/final-template.go
+++ b/doc/codelab/wiki/final-template.go
@@ -53,7 +53,7 @@ func saveHandler(w http.ResponseWriter, r *http.Request) {
 
 func renderTemplate(w http.ResponseWriter, tmpl string, p *Page) {
        t, _ := template.ParseFile(tmpl+".html", nil)
-       t.Execute(p, w)
+       t.Execute(w, p)
 }
 
 func main() {

diff --git a/doc/codelab/wiki/index.html b/doc/codelab/wiki/index.html
index fc8c27bfa0b57f51dbb83fe7a4cb947dae670a79..d059fa027d0e0c857e05800282e77662f526e18d 100644 (file)
--- a/doc/codelab/wiki/index.html
+++ b/doc/codelab/wiki/index.html
@@ -475,7 +475,7 @@ func editHandler(w http.ResponseWriter, r *http.Request) {
                p = &Page{Title: title}
        }
        t, _ := template.ParseFile("edit.html", nil)
-       t.Execute(p, w)
+       t.Execute(w, p)
 }
 </pre>
 
@@ -527,7 +527,7 @@ func viewHandler(w http.ResponseWriter, r *http.Request) {
        title := r.URL.Path[lenPath:]
        p, _ := loadPage(title)
        t, _ := template.ParseFile(&#34;view.html&#34;, nil)
-       t.Execute(p, w)
+       t.Execute(w, p)
 }
 </pre>
 
@@ -555,7 +555,7 @@ func editHandler(w http.ResponseWriter, r *http.Request) {
 
 func renderTemplate(w http.ResponseWriter, tmpl string, p *Page) {
        t, _ := template.ParseFile(tmpl+&#34;.html&#34;, nil)
-       t.Execute(p, w)
+       t.Execute(w, p)
 }
 </pre>
 
@@ -644,7 +644,7 @@ func renderTemplate(w http.ResponseWriter, tmpl string, p *Page) {
                http.Error(w, err.String(), http.StatusInternalServerError)
                return
        }
-       err = t.Execute(p, w)
+       err = t.Execute(w, p)
        if err != nil {
                http.Error(w, err.String(), http.StatusInternalServerError)
        }