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 99121f2..d09a0d7 100644
--- a/doc/codelab/wiki/final-noclosure.go
+++ b/doc/codelab/wiki/final-noclosure.go
@@ -73,7 +73,7 @@
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 0f18912..5fcf1de 100644
--- a/doc/codelab/wiki/final-noerror.go
+++ b/doc/codelab/wiki/final-noerror.go
@@ -35,14 +35,14 @@
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 ea89776..f25012e 100644
--- a/doc/codelab/wiki/final-parsetemplate.go
+++ b/doc/codelab/wiki/final-parsetemplate.go
@@ -61,7 +61,7 @@
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 4d6a2cf..aab536e 100644
--- a/doc/codelab/wiki/final-template.go
+++ b/doc/codelab/wiki/final-template.go
@@ -53,7 +53,7 @@
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 fc8c27b..d059fa0 100644
--- a/doc/codelab/wiki/index.html
+++ b/doc/codelab/wiki/index.html
@@ -475,7 +475,7 @@
p = &Page{Title: title}
}
t, _ := template.ParseFile("edit.html", nil)
- t.Execute(p, w)
+ t.Execute(w, p)
}
</pre>
@@ -527,7 +527,7 @@
title := r.URL.Path[lenPath:]
p, _ := loadPage(title)
t, _ := template.ParseFile("view.html", nil)
- t.Execute(p, w)
+ t.Execute(w, p)
}
</pre>
@@ -555,7 +555,7 @@
func renderTemplate(w http.ResponseWriter, tmpl string, p *Page) {
t, _ := template.ParseFile(tmpl+".html", nil)
- t.Execute(p, w)
+ t.Execute(w, p)
}
</pre>
@@ -644,7 +644,7 @@
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)
}
