renaming_4: gofix -r everything/but/src/pkg
R=rsc
CC=golang-dev
https://golang.org/cl/5338043
diff --git a/doc/codelab/wiki/final-noclosure.go b/doc/codelab/wiki/final-noclosure.go
index 47f84a7..2d42106 100644
--- a/doc/codelab/wiki/final-noclosure.go
+++ b/doc/codelab/wiki/final-noclosure.go
@@ -2,10 +2,10 @@
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 69e1912..53433e9 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 d3675a0..e3d8a97 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 4b5c44e..0230ae5 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 11620af..66f19c1 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 723484d..3839353 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 9e7605b..1f9023f 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 33379a1..ac8cc4f 100644
--- a/doc/codelab/wiki/http-sample.go
+++ b/doc/codelab/wiki/http-sample.go
@@ -2,7 +2,7 @@
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 3dafc5c..08e181e 100644
--- a/doc/codelab/wiki/index.html
+++ b/doc/codelab/wiki/index.html
@@ -237,7 +237,7 @@
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 d2deec11..2b2aa68 100644
--- a/doc/codelab/wiki/notemplate.go
+++ b/doc/codelab/wiki/notemplate.go
@@ -2,8 +2,8 @@
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 a192089..96359a1 100644
--- a/doc/codelab/wiki/part2.go
+++ b/doc/codelab/wiki/part2.go
@@ -2,8 +2,8 @@
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 6b5fbcb..74c33a2 100644
--- a/doc/codelab/wiki/srcextract.go
+++ b/doc/codelab/wiki/srcextract.go
@@ -3,13 +3,13 @@
import (
"bytes"
"flag"
+ "go/ast"
"go/parser"
"go/printer"
- "go/ast"
"go/token"
"log"
- "template"
"os"
+ "text/template"
)
var (
