aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Niemeyer <gustavo@niemeyer.net>2012-01-19 21:49:28 -0200
committerGustavo Niemeyer <gustavo@niemeyer.net>2012-01-19 21:49:28 -0200
commit369454d7b2f3b03ee5bdfde1eae6092bace14951 (patch)
treedcaa9a5cdbba1ccdb5bc921e494b6abe10f628e2
parent6454a3eb150218e13e71cecd48638e673dc6c304 (diff)
downloadgo-369454d7b2f3b03ee5bdfde1eae6092bace14951.tar.gz
go-369454d7b2f3b03ee5bdfde1eae6092bace14951.zip
html/template: fix docs after API changes
R=golang-dev, r CC=golang-dev https://golang.org/cl/5528109
-rw-r--r--src/pkg/html/template/doc.go14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/pkg/html/template/doc.go b/src/pkg/html/template/doc.go
index fc0e382644..77a9bf2e22 100644
--- a/src/pkg/html/template/doc.go
+++ b/src/pkg/html/template/doc.go
@@ -31,8 +31,8 @@ Example
import "text/template"
...
- t, err := (&template.Set{}).Parse(`{{define "T"}}Hello, {{.}}!{{end}}`)
- err = t.Execute(out, "T", "<script>alert('you have been pwned')</script>")
+ t, err := template.New("foo").Parse(`{{define "T"}}Hello, {{.}}!{{end}}`)
+ err = t.ExecuteTemplate(out, "T", "<script>alert('you have been pwned')</script>")
produces
@@ -42,12 +42,12 @@ but with contextual autoescaping,
import "html/template"
...
- t, err := (&template.Set{}).Parse(`{{define "T"}}Hello, {{.}}!{{end}}`)
- err = t.Execute(out, "T", "<script>alert('you have been pwned')</script>")
+ t, err := template.New("foo").Parse(`{{define "T"}}Hello, {{.}}!{{end}}`)
+ err = t.ExecuteTemplate(out, "T", "<script>alert('you have been pwned')</script>")
produces safe, escaped HTML output
- Hello, &lt;script&gt;alert('you have been pwned')&lt;/script&gt;!
+ Hello, &lt;script&gt;alert(&#39;you have been pwned&#39;)&lt;/script&gt;!
Contexts
@@ -57,8 +57,8 @@ functions to each simple action pipeline, so given the excerpt
<a href="/search?q={{.}}">{{.}}</a>
-At parse time each {{.}} is overwritten to add escaping functions as necessary,
-in this case,
+At parse time each {{.}} is overwritten to add escaping functions as necessary.
+In this case it becomes
<a href="/search?q={{. | urlquery}}">{{. | html}}</a>