go.blog: use new golang.org/x/... import paths

TBR=rsc
R=rsc, r
CC=golang-codereviews
https://golang.org/cl/170250043

10 files changed, 16 insertions, 16 deletions

diff --git a/blog/appengine.go b/blog/appengine.go
index 207a298..12bcdf2 100644
--- a/blog/appengine.go
+++ b/blog/appengine.go
@@ -11,7 +11,7 @@ package main
 import (
 	"net/http"
 
-	"code.google.com/p/go.tools/blog"
+	"golang.org/x/tools/blog"
 )
 
 func init() {
diff --git a/blog/blog.go b/blog/blog.go
index 2fbf620..08125df 100644
--- a/blog/blog.go
+++ b/blog/blog.go
@@ -11,10 +11,10 @@ import (
 	"strings"
 	"time"
 
-	"code.google.com/p/go.tools/blog"
-	"code.google.com/p/go.tools/godoc/static"
+	"golang.org/x/tools/blog"
+	"golang.org/x/tools/godoc/static"
 
-	_ "code.google.com/p/go.tools/playground"
+	_ "golang.org/x/tools/playground"
 )
 
 const hostname = "blog.golang.org" // default hostname for blog server
diff --git a/blog/local.go b/blog/local.go
index fd77d97..2e7ab54 100644
--- a/blog/local.go
+++ b/blog/local.go
@@ -13,7 +13,7 @@ import (
 	"log"
 	"net/http"
 
-	"code.google.com/p/go.tools/blog"
+	"golang.org/x/tools/blog"
 )
 
 var (
diff --git a/content/context/google/google.go b/content/context/google/google.go
index 7f8a984..73778a3 100644
--- a/content/context/google/google.go
+++ b/content/context/google/google.go
@@ -6,8 +6,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"code.google.com/p/go.blog/content/context/userip"
-	"code.google.com/p/go.net/context"
+	"golang.org/x/blog/content/context/userip"
+	"golang.org/x/net/context"
 )
 
 // Results is an ordered list of search results.
diff --git a/content/context/gorilla/gorilla.go b/content/context/gorilla/gorilla.go
index afcf516..4698dce 100644
--- a/content/context/gorilla/gorilla.go
+++ b/content/context/gorilla/gorilla.go
@@ -8,8 +8,8 @@ package gorilla
 import (
 	"net/http"
 
-	"code.google.com/p/go.net/context"
 	gcontext "github.com/gorilla/context"
+	"golang.org/x/net/context"
 )
 
 // NewContext returns a Context whose Value method returns values associated
diff --git a/content/context/server/server.go b/content/context/server/server.go
index bbab5b0..2504370 100644
--- a/content/context/server/server.go
+++ b/content/context/server/server.go
@@ -16,9 +16,9 @@ import (
 	"net/http"
 	"time"
 
-	"code.google.com/p/go.blog/content/context/google"
-	"code.google.com/p/go.blog/content/context/userip"
-	"code.google.com/p/go.net/context"
+	"golang.org/x/blog/content/context/google"
+	"golang.org/x/blog/content/context/userip"
+	"golang.org/x/net/context"
 )
 
 func main() {
diff --git a/content/context/tomb/tomb.go b/content/context/tomb/tomb.go
index 0cfa5d4..da94dc9 100644
--- a/content/context/tomb/tomb.go
+++ b/content/context/tomb/tomb.go
@@ -5,7 +5,7 @@
 package tomb
 
 import (
-	"code.google.com/p/go.net/context"
+	"golang.org/x/net/context"
 	tomb "gopkg.in/tomb.v2"
 )
 
diff --git a/content/context/userip/userip.go b/content/context/userip/userip.go
index 616dd04..4f316b5 100644
--- a/content/context/userip/userip.go
+++ b/content/context/userip/userip.go
@@ -7,7 +7,7 @@ import (
 	"net"
 	"net/http"
 
-	"code.google.com/p/go.net/context"
+	"golang.org/x/net/context"
 )
 
 // FromRequest extracts the user IP address from req, if present.
diff --git a/content/normalization.article b/content/normalization.article
index f53b09f..1763fcb 100644
--- a/content/normalization.article
+++ b/content/normalization.article
@@ -222,8 +222,8 @@ recomposes the text into NFC:
 	import (
 		"unicode"
 
-		"code.google.com/p/go.text/transform"
-		"code.google.com/p/go.text/unicode/norm"
+		"golang.org/x/text/transform"
+		"golang.org/x/text/unicode/norm"
 	)
 
 	isMn := func(r rune) bool {
diff --git a/content/organizing-go-code.article b/content/organizing-go-code.article
index 9eed04d..185034f 100644
--- a/content/organizing-go-code.article
+++ b/content/organizing-go-code.article
@@ -22,7 +22,7 @@ A good name is the most important part of a software interface: the name is the
 
 An import path is the string with which users import a package. It specifies the directory (relative to `$GOROOT/src/pkg` or `$GOPATH/src`) in which the package's source code resides.
 
-Import paths should be globally unique, so use the path of your source repository as its base. For instance, the `websocket` package from the `go.net` sub-repository has an import path of `"code.google.com/p/go.net/websocket"`. The Go project owns the path `"code.google.com/p/go"`, so that path cannot be used by another author for a different package. Because the repository URL and import path are one and the same, the `go`get` command can fetch and install the package automatically.
+Import paths should be globally unique, so use the path of your source repository as its base. For instance, the `websocket` package from the `go.net` sub-repository has an import path of `"golang.org/x/net/websocket"`. The Go project owns the path `"code.google.com/p/go"`, so that path cannot be used by another author for a different package. Because the repository URL and import path are one and the same, the `go`get` command can fetch and install the package automatically.
 
 If you don't use a hosted source repository, choose some unique prefix such as a domain, company, or project name. As an example, the import path of all Google's internal Go code starts with the string `"google"`.