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

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

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)
 	}
 

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' }