18 files changed, 26 insertions, 26 deletions

diff --git a/doc/codelab/wiki/final-noclosure.go b/doc/codelab/wiki/final-noclosure.go
index 47f84a7d45..2d42106398 100644
--- a/doc/codelab/wiki/final-noclosure.go
+++ b/doc/codelab/wiki/final-noclosure.go
@@ -2,10 +2,10 @@ package main
 
 import (
 	"errors"
-	"http"
 	"io/ioutil"
+	"net/http"
 	"regexp"
-	"template"
+	"text/template"
 )
 
 type Page struct {
diff --git a/doc/codelab/wiki/final-noerror.go b/doc/codelab/wiki/final-noerror.go
index 69e191292f..53433e958c 100644
--- a/doc/codelab/wiki/final-noerror.go
+++ b/doc/codelab/wiki/final-noerror.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"http"
 	"io/ioutil"
-	"template"
+	"net/http"
+	"text/template"
 )
 
 type Page struct {
diff --git a/doc/codelab/wiki/final-parsetemplate.go b/doc/codelab/wiki/final-parsetemplate.go
index d3675a0e19..e3d8a97a1d 100644
--- a/doc/codelab/wiki/final-parsetemplate.go
+++ b/doc/codelab/wiki/final-parsetemplate.go
@@ -1,10 +1,10 @@
 package main
 
 import (
-	"http"
 	"io/ioutil"
+	"net/http"
 	"regexp"
-	"template"
+	"text/template"
 )
 
 type Page struct {
diff --git a/doc/codelab/wiki/final-template.go b/doc/codelab/wiki/final-template.go
index 4b5c44e090..0230ae5780 100644
--- a/doc/codelab/wiki/final-template.go
+++ b/doc/codelab/wiki/final-template.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"http"
 	"io/ioutil"
-	"template"
+	"net/http"
+	"text/template"
 )
 
 type Page struct {
diff --git a/doc/codelab/wiki/final.go b/doc/codelab/wiki/final.go
index 11620af3ed..66f19c1e9f 100644
--- a/doc/codelab/wiki/final.go
+++ b/doc/codelab/wiki/final.go
@@ -1,10 +1,10 @@
 package main
 
 import (
-	"http"
 	"io/ioutil"
+	"net/http"
 	"regexp"
-	"template"
+	"text/template"
 )
 
 type Page struct {
diff --git a/doc/codelab/wiki/get.go b/doc/codelab/wiki/get.go
index 723484dec9..383935378d 100644
--- a/doc/codelab/wiki/get.go
+++ b/doc/codelab/wiki/get.go
@@ -1,12 +1,12 @@
 package main
 
 import (
-	"http"
 	"flag"
 	"fmt"
 	"io"
 	"log"
 	"net"
+	"net/http"
 	"os"
 	"strings"
 )
diff --git a/doc/codelab/wiki/htmlify.go b/doc/codelab/wiki/htmlify.go
index 9e7605b921..1f9023f437 100644
--- a/doc/codelab/wiki/htmlify.go
+++ b/doc/codelab/wiki/htmlify.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"template"
-	"os"
 	"io/ioutil"
+	"os"
+	"text/template"
 )
 
 func main() {
diff --git a/doc/codelab/wiki/http-sample.go b/doc/codelab/wiki/http-sample.go
index 33379a1b65..ac8cc4f2d6 100644
--- a/doc/codelab/wiki/http-sample.go
+++ b/doc/codelab/wiki/http-sample.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"http"
+	"net/http"
 )
 
 func handler(w http.ResponseWriter, r *http.Request) {
diff --git a/doc/codelab/wiki/index.html b/doc/codelab/wiki/index.html
index 3dafc5cbef..08e181e3b0 100644
--- a/doc/codelab/wiki/index.html
+++ b/doc/codelab/wiki/index.html
@@ -237,7 +237,7 @@ package main
 
 import (
 	"fmt"
-	"http"
+	"net/http"
 )
 
 func handler(w http.ResponseWriter, r *http.Request) {
diff --git a/doc/codelab/wiki/notemplate.go b/doc/codelab/wiki/notemplate.go
index d2deec11e5..2b2aa685f6 100644
--- a/doc/codelab/wiki/notemplate.go
+++ b/doc/codelab/wiki/notemplate.go
@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
-	"http"
 	"io/ioutil"
+	"net/http"
 )
 
 type Page struct {
diff --git a/doc/codelab/wiki/part2.go b/doc/codelab/wiki/part2.go
index a192089deb..96359a17e2 100644
--- a/doc/codelab/wiki/part2.go
+++ b/doc/codelab/wiki/part2.go
@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
-	"http"
 	"io/ioutil"
+	"net/http"
 )
 
 type Page struct {
diff --git a/doc/codelab/wiki/srcextract.go b/doc/codelab/wiki/srcextract.go
index 6b5fbcb432..74c33a2d64 100644
--- a/doc/codelab/wiki/srcextract.go
+++ b/doc/codelab/wiki/srcextract.go
@@ -3,13 +3,13 @@ package main
 import (
 	"bytes"
 	"flag"
+	"go/ast"
 	"go/parser"
 	"go/printer"
-	"go/ast"
 	"go/token"
 	"log"
-	"template"
 	"os"
+	"text/template"
 )
 
 var (
diff --git a/doc/codewalk/markov.go b/doc/codewalk/markov.go
index 959c2b158d..cb28eb0bcc 100644
--- a/doc/codewalk/markov.go
+++ b/doc/codewalk/markov.go
@@ -50,8 +50,8 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"math/rand"
 	"os"
-	"rand"
 	"strings"
 	"time"
 )
diff --git a/doc/codewalk/pig.go b/doc/codewalk/pig.go
index 9e415f5899..b3f02aff1e 100644
--- a/doc/codewalk/pig.go
+++ b/doc/codewalk/pig.go
@@ -6,7 +6,7 @@ package main
 
 import (
 	"fmt"
-	"rand"
+	"math/rand"
 )
 
 const (
diff --git a/doc/codewalk/urlpoll.go b/doc/codewalk/urlpoll.go
index b320eb1837..1439e34218 100644
--- a/doc/codewalk/urlpoll.go
+++ b/doc/codewalk/urlpoll.go
@@ -5,8 +5,8 @@
 package main
 
 import (
-	"http"
 	"log"
+	"net/http"
 	"time"
 )
 
diff --git a/doc/progs/eff_qr.go b/doc/progs/eff_qr.go
index 5d1fd38e06..de96a0208f 100644
--- a/doc/progs/eff_qr.go
+++ b/doc/progs/eff_qr.go
@@ -2,9 +2,9 @@ package main
 
 import (
 	"flag"
-	"http"
 	"log"
-	"template"
+	"net/http"
+	"text/template"
 )
 
 var addr = flag.String("addr", ":1718", "http service address") // Q=17, R=18
diff --git a/doc/talks/io2010/balance.go b/doc/talks/io2010/balance.go
index b01f7468c5..a3825cbc55 100644
--- a/doc/talks/io2010/balance.go
+++ b/doc/talks/io2010/balance.go
@@ -8,7 +8,7 @@ import (
 	"container/heap"
 	"flag"
 	"fmt"
-	"rand"
+	"math/rand"
 	"time"
 )
 
diff --git a/doc/tmpltohtml.go b/doc/tmpltohtml.go
index 25bc3a4dbe..d9b002e1e7 100644
--- a/doc/tmpltohtml.go
+++ b/doc/tmpltohtml.go
@@ -27,7 +27,7 @@ import (
 	"os"
 	"regexp"
 	"strings"
-	"template"
+	"text/template"
 )
 
 func Usage() {