misc: fix a couple of template uses preparatory to the big switch.

R=golang-dev, dsymonds
CC=golang-dev
https://golang.org/cl/4876057

diff --git a/doc/tmpltohtml.go b/doc/tmpltohtml.go
index 0a509d90b8264d895c8aef2eb15d9853d5808709..f4d2e2c2c443dc4e3f1d50865fc0bbf0d45b843a 100644 (file)
--- a/doc/tmpltohtml.go
+++ b/doc/tmpltohtml.go
@@ -46,7 +46,7 @@ func main() {
        // Read and parse the input.
        name := flag.Args()[0]
        tmpl := template.New(name).Funcs(template.FuncMap{"code": code})
-       if err := tmpl.ParseFile(name); err != nil {
+       if _, err := tmpl.ParseFile(name); err != nil {
                log.Fatal(err)
        }
 

diff --git a/src/pkg/go/doc/comment.go b/src/pkg/go/doc/comment.go
index 2a24b14556f3c19b40b021636f1c61d7e5483677..af307459ece03127132db329c971a4fa939a84cb 100644 (file)
--- a/src/pkg/go/doc/comment.go
+++ b/src/pkg/go/doc/comment.go
@@ -11,7 +11,7 @@ import (
        "io"
        "regexp"
        "strings"
-       "template" // for htmlEscape
+       "exp/template" // for HTMLEscape
 )
 
 func isWhitespace(ch byte) bool { return ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r' }