html/template, net/http, websocket: fix import paths in comments

R=golang-dev
CC=golang-dev, rsc
https://golang.org/cl/5411048

diff --git a/src/pkg/html/template/doc.go b/src/pkg/html/template/doc.go
index 0324c9c0ee325115a08f85087de2b2d74d1e18eb..570567e8760f41c299591ade090b19fc15a0a970 100644 (file)
--- a/src/pkg/html/template/doc.go
+++ b/src/pkg/html/template/doc.go
@@ -29,7 +29,7 @@ trusted, while Execute's data parameter is not. More details are provided below.
 
 Example
 
-    import "template"
+    import "text/template"
     ...
     t, err := (&template.Set{}).Parse(`{{define "T"}}Hello, {{.}}!{{end}}`)
     err = t.Execute(out, "T", "<script>alert('you have been pwned')</script>")

diff --git a/src/pkg/net/http/server.go b/src/pkg/net/http/server.go
index 7221d2508bb4e4856e8f61080160190fbf295f5e..27040c7be55210cd02d1dfe78e148d37b065e408 100644 (file)
--- a/src/pkg/net/http/server.go
+++ b/src/pkg/net/http/server.go
@@ -1013,8 +1013,8 @@ func (srv *Server) Serve(l net.Listener) error {
 //     package main
 //
 //     import (
-//             "http"
 //             "io"
+//             "net/http"
 //             "log"
 //     )
 //
@@ -1044,8 +1044,8 @@ func ListenAndServe(addr string, handler Handler) error {
 // A trivial example server is:
 //
 //     import (
-//             "http"
 //             "log"
+//             "net/http"
 //     )
 //
 //     func handler(w http.ResponseWriter, req *http.Request) {

diff --git a/src/pkg/websocket/client.go b/src/pkg/websocket/client.go
index 5dfd824e6e5b9a110f0ae5fd20872b7f2ee81672..89cdcda71aeda5bd27947c32cac0a3d15e35a3fc 100644 (file)
--- a/src/pkg/websocket/client.go
+++ b/src/pkg/websocket/client.go
@@ -72,8 +72,8 @@ A trivial example client:
        package main
 
        import (
-               "http"
                "log"
+               "net/http"
                "strings"
                "websocket"
        )

diff --git a/src/pkg/websocket/server.go b/src/pkg/websocket/server.go
index 57dc4fd1dfff4d6e1ec6fb0441441e02ef6149ed..8320b032ead3abae7f65aad00fddfc725a770bfd 100644 (file)
--- a/src/pkg/websocket/server.go
+++ b/src/pkg/websocket/server.go
@@ -60,8 +60,8 @@ A trivial example server:
        package main
 
        import (
-               "http"
                "io"
+               "net/http"
                "websocket"
        )