diff --git a/cmd/golangorg/appinit.go b/cmd/golangorg/appinit.go
index 5485194c..24a47e79 100644
--- a/cmd/golangorg/appinit.go
+++ b/cmd/golangorg/appinit.go
@@ -75,10 +75,11 @@ func main() {
fs.Bind("/", rootfs, "/", vfs.BindReplace)
}
- // Use a local copy of root.html instead of the one in the main go repository.
- // See golang.org/issue/29206 for more info.
- fs.Bind("/doc/root.html", mapfs.New(static.Files), "/doc/root.html", vfs.BindReplace)
- fs.Bind("/doc/copyright.html", mapfs.New(static.Files), "/doc/copyright.html", vfs.BindReplace)
+ // Try serving files in /doc from a local copy before trying the main
+ // go repository. This lets us update some documentation outside the
+ // Go release cycle. This includes root.html, which redirects to "/".
+ // See golang.org/issue/29206.
+ fs.Bind("/doc", mapfs.New(static.Files), "/doc", vfs.BindBefore)
fs.Bind("/lib/godoc", mapfs.New(static.Files), "/", vfs.BindReplace)
webroot := getFullPath("/src/golang.org/x/website")
diff --git a/cmd/golangorg/main.go b/cmd/golangorg/main.go
index 1044f7ff..3c825a22 100644
--- a/cmd/golangorg/main.go
+++ b/cmd/golangorg/main.go
@@ -7,7 +7,7 @@
// Web server tree:
//
// https://golang.org/ main landing page
-// https://golang.org/doc/ serve from $GOROOT/doc - spec, mem, etc.
+// https://golang.org/doc/ serve from content/static/doc, then $GOROOT/doc. spec, mem, etc.
// https://golang.org/src/ serve files from $GOROOT/src; .go gets pretty-printed
// https://golang.org/cmd/ serve documentation about commands
// https://golang.org/pkg/ serve documentation about packages
@@ -15,8 +15,8 @@
// https://golang.org/pkg/compress/zlib)
//
-// Some pages are being transitioned from $GOROOT to this source tree.
-// See bindings below to see which ones.
+// Some pages are being transitioned from $GOROOT to content/static/doc.
+// See golang.org/issue/29206 and golang.org/issue/33637.
// +build !golangorg
@@ -143,15 +143,15 @@ func main() {
defer rc.Close() // be nice (e.g., -writeIndex mode)
fs.Bind("/", zipfs.New(rc, *zipfile), *goroot, vfs.BindReplace)
}
- // Use a local copy of root.html instead of the one in the main go repository.
- // See golang.org/issue/29206 for more info.
+ // Try serving files in /doc from a local copy before trying the main
+ // go repository. This lets us update some documentation outside the
+ // Go release cycle. This includes root.html, which redirects to "/".
+ // See golang.org/issue/29206.
if *templateDir != "" {
- fs.Bind("/doc/root.html", vfs.OS(*templateDir), "/doc/root.html", vfs.BindReplace)
- fs.Bind("/doc/copyright.html", vfs.OS(*templateDir), "/doc/copyright.html", vfs.BindReplace)
+ fs.Bind("/doc", vfs.OS(*templateDir), "/doc", vfs.BindBefore)
fs.Bind("/lib/godoc", vfs.OS(*templateDir), "/", vfs.BindBefore)
} else {
- fs.Bind("/doc/root.html", mapfs.New(static.Files), "/doc/root.html", vfs.BindReplace)
- fs.Bind("/doc/copyright.html", mapfs.New(static.Files), "/doc/copyright.html", vfs.BindReplace)
+ fs.Bind("/doc", mapfs.New(static.Files), "/doc", vfs.BindBefore)
fs.Bind("/lib/godoc", mapfs.New(static.Files), "/", vfs.BindReplace)
}
diff --git a/content/static/doc/docs.html b/content/static/doc/docs.html
new file mode 100644
index 00000000..8f79d3a7
--- /dev/null
+++ b/content/static/doc/docs.html
@@ -0,0 +1,232 @@
+
+
+
+The Go programming language is an open source project to make programmers more
+productive.
+
+
+
+Go is expressive, concise, clean, and efficient. Its concurrency
+mechanisms make it easy to write programs that get the most out of multicore
+and networked machines, while its novel type system enables flexible and
+modular program construction. Go compiles quickly to machine code yet has the
+convenience of garbage collection and the power of run-time reflection. It's a
+fast, statically typed, compiled language that feels like a dynamically typed,
+interpreted language.
+
+Instructions for downloading and installing the Go compilers, tools, and
+libraries.
+
+
+
+
Learning Go
+
+
+
+
+ {{if $.GoogleCN}}
+ A Tour of Go
+ {{else}}
+ A Tour of Go
+ {{end}}
+
+
+An interactive introduction to Go in three sections.
+The first section covers basic syntax and data structures; the second discusses
+methods and interfaces; and the third introduces Go's concurrency primitives.
+Each section concludes with a few exercises so you can practice what you've
+learned. You can {{if not $.GoogleCN}}take the tour
+online or{{end}} install it locally with:
+
+
+$ go get golang.org/x/tour
+
+
+This will place the tour binary in your workspace's bin directory.
+
+{{if not $.GoogleCN}}
+Also available as a screencast, this
+{{else}}
+This
+{{end}}
+doc explains how to use the go command
+to fetch, build, and install packages, commands, and run tests.
+
+A document that gives tips for writing clear, idiomatic Go code.
+A must read for any new Go programmer. It augments the tour and
+the language specification, both of which should be read first.
+
+A document that specifies the conditions under which reads of a variable in
+one goroutine can be guaranteed to observe values produced by writes to the
+same variable in a different goroutine.
+
+One of Go's key design goals is code adaptability; that it should be easy to take a simple design and build upon it in a clean and natural way. In this talk Andrew Gerrand describes a simple "chat roulette" server that matches pairs of incoming TCP connections, and then use Go's concurrency mechanisms, interfaces, and standard library to extend it with a web interface and other features. While the function of the program changes dramatically, Go's flexibility preserves the original design as it grows.
+
+Concurrency is the key to designing high performance network services. Go's concurrency primitives (goroutines and channels) provide a simple and efficient means of expressing concurrent execution. In this talk we see how tricky concurrency problems can be solved gracefully with simple Go code.
+
+
+
+
+