commit 6ab6c49fce6968f200ad5381cb9348e159e51099
author Rob Pike <r@golang.org> Tue Nov 08 15:38:47 2011 -0800
committer Rob Pike <r@golang.org> Tue Nov 08 15:38:47 2011 -0800
tree d4c964014058dec6d0bc1cd9fa6855ec34a817a0
parent e50479ca889a319ffbb669236e949035a59fd82d

renaming_1: hand-edited files for go 1 renaming
This contains the files that required handiwork, mostly
Makefiles with updated TARGs, plus the two packages
with modified package names.
html/template/doc.go needs a separate edit pass.
test/fixedbugs/bug358.go is not legal go so gofix fails on it.

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

doc/effective_go.html

diff --git a/doc/effective_go.html b/doc/effective_go.html
index a58989a..41c7206 100644
--- a/doc/effective_go.html
+++ b/doc/effective_go.html
@@ -1996,7 +1996,7 @@
 <code>http.ResponseWriter</code>.)
 For reference, here's how to attach such a server to a node on the URL tree.
 <pre>
-import "http"
+import "net/http"
 ...
 ctr := new(Counter)
 http.Handle("/counter", ctr)
@@ -2925,12 +2925,13 @@
 
 import (
     &#34;flag&#34;
-    &#34;http&#34;
     &#34;log&#34;
-    &#34;template&#34;
+    &#34;net/http&#34;
+    &#34;text/template&#34;
 )
 
-var addr = flag.String(&#34;addr&#34;, &#34;:1718&#34;, &#34;http service address&#34;) // Q=17, R=18
+var // Q=17, R=18
+addr = flag.String(&#34;addr&#34;, &#34;:1718&#34;, &#34;http service address&#34;)
 
 var templ = template.Must(template.New(&#34;qr&#34;).Parse(templateStr))