_content: move content/static/* to _content/*

The extra level of hierarchy here is unnecessary and confusing.
The directory is now _content so that any Go source files in our
docs are not considered by commands like "go mod tidy" and
"go test all".

Change-Id: Ib6d7cb12920193798ee825155a8f8b33f16e60d8
Reviewed-on: https://go-review.googlesource.com/c/website/+/291691
Trust: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>

README.md

@@ -2,30 +2,19 @@
 
 [![Go Reference](https://pkg.go.dev/badge/golang.org/x/website.svg)](https://pkg.go.dev/golang.org/x/website)
 
-This repository holds the Go website server code and content.
+This repo holds content and serving programs for the golang.org web site.
 
-## Checkout and Run
+Content is in content/. Server code is in cmd/ and internal/.
 
-To download and run the golang.org web server locally:
+To run the server to preview local content changes, use:
 
- - `git clone https://go.googlesource.com/website`
- - `cd website`
- - `go run ./cmd/golangorg`
- - Open http://localhost:6060/ in your browser.
+	go run ./cmd/golangorg -a
 
-See [cmd/golangorg/README.md](cmd/golangorg/README.md) for more details.
+The supporting programs cmd/admingolangorg and cmd/googlegolangorg
+are the servers for admin.golang.org and google.golang.org.
+(They do not use the content/ directory.)
 
-## Changing Content
-
-To make basic changes to the golang.org website content:
-
- - Make the changes you want in the `content/static` directory.
- - Stop any running `go run ./cmd/golangorg`.
- - `go generate ./content/static`
- - `go run ./cmd/golangorg`
- - Open http://localhost:6060/ in your browser.
-
-See [content/README.md](content/README.md) for more sophisticated instructions.
+Each command directory has its own README.md explaining deployment.
 
 ## JS/CSS Formatting
 
@@ -44,3 +33,4 @@ this repository, see https://golang.org/doc/contribute.html.
 The main issue tracker for the website repository is located at
 https://github.com/golang/go/issues. Prefix your issue with "x/website:" in the
 subject line, so it is easy to find.
+

cmd/golangorg/appinit.go

@@ -27,7 +27,7 @@ import (
 	"golang.org/x/tools/godoc/vfs"
 	"golang.org/x/tools/godoc/vfs/gatefs"
 	"golang.org/x/tools/godoc/vfs/zipfs"
-	"golang.org/x/website/content/static"
+	"golang.org/x/website"
 	"golang.org/x/website/internal/dl"
 	"golang.org/x/website/internal/proxy"
 	"golang.org/x/website/internal/redirect"
@@ -79,8 +79,8 @@ func 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", vfs.FromFS(static.FS), "/doc", vfs.BindBefore)
-	fs.Bind("/lib/godoc", vfs.FromFS(static.FS), "/", vfs.BindReplace)
+	fs.Bind("/doc", vfs.FromFS(website.Content), "/doc", vfs.BindBefore)
+	fs.Bind("/lib/godoc", vfs.FromFS(website.Content), "/", vfs.BindReplace)
 
 	webroot := getFullPath("/src/golang.org/x/website")
 	fs.Bind("/favicon.ico", gatefs.New(vfs.OS(webroot), fsGate), "/favicon.ico", vfs.BindBefore)

cmd/golangorg/main.go

@@ -7,7 +7,7 @@
 // Web server tree:
 //
 //	https://golang.org/			main landing page
-//	https://golang.org/doc/	serve from content/static/doc, then $GOROOT/doc. spec, mem, etc.
+//	https://golang.org/doc/	serve from content/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,7 +15,7 @@
 //				https://golang.org/pkg/compress/zlib)
 //
 
-// Some pages are being transitioned from $GOROOT to content/static/doc.
+// Some pages are being transitioned from $GOROOT to content/doc.
 // See golang.org/issue/29206 and golang.org/issue/33637.
 
 // +build go1.16
@@ -41,7 +41,7 @@ import (
 	"golang.org/x/tools/godoc/vfs"
 	"golang.org/x/tools/godoc/vfs/gatefs"
 	"golang.org/x/tools/godoc/vfs/zipfs"
-	"golang.org/x/website/content/static"
+	"golang.org/x/website"
 )
 
 const defaultAddr = "localhost:6060" // default webserver address
@@ -66,7 +66,7 @@ var (
 	// layout control
 	autoFlag       = flag.Bool("a", false, "update templates automatically")
 	showTimestamps = flag.Bool("timestamps", false, "show timestamps with directory listings")
-	templateDir    = flag.String("templates", "", "load templates/JS/CSS from disk in this directory (usually /path-to-website/content/static)")
+	templateDir    = flag.String("templates", "", "load templates/JS/CSS from disk in this directory (usually /path-to-website/content)")
 	showPlayground = flag.Bool("play", false, "enable playground")
 	declLinks      = flag.Bool("links", true, "link identifiers to their declarations")
 
@@ -124,7 +124,7 @@ func main() {
 			fmt.Fprintln(os.Stderr, "runtime.Caller failed: cannot find templates for -a mode.")
 			os.Exit(2)
 		}
-		dir := filepath.Join(file, "../../../content/static")
+		dir := filepath.Join(file, "../../../content")
 		if _, err := os.Stat(filepath.Join(dir, "godoc.html")); err != nil {
 			fmt.Fprintln(os.Stderr, err)
 			fmt.Fprintln(os.Stderr, "Cannot find templates for -a mode.")
@@ -172,8 +172,8 @@ func main() {
 		fs.Bind("/doc", vfs.OS(*templateDir), "/doc", vfs.BindBefore)
 		fs.Bind("/lib/godoc", vfs.OS(*templateDir), "/", vfs.BindBefore)
 	} else {
-		fs.Bind("/doc", vfs.FromFS(static.FS), "/doc", vfs.BindBefore)
-		fs.Bind("/lib/godoc", vfs.FromFS(static.FS), "/", vfs.BindReplace)
+		fs.Bind("/doc", vfs.FromFS(website.Content), "/doc", vfs.BindBefore)
+		fs.Bind("/lib/godoc", vfs.FromFS(website.Content), "/", vfs.BindReplace)
 	}
 
 	// Bind $GOPATH trees into Go root.

cmd/golangorg/release_test.go

@@ -14,7 +14,7 @@ import (
 
 	"golang.org/x/tools/godoc"
 	"golang.org/x/tools/godoc/vfs"
-	"golang.org/x/website/content/static"
+	"golang.org/x/website"
 )
 
 // Test that the release history page includes expected entries.
@@ -27,8 +27,8 @@ func TestReleaseHistory(t *testing.T) {
 	origFS, origPres := fs, pres
 	defer func() { fs, pres = origFS, origPres }()
 	fs = vfs.NameSpace{}
-	fs.Bind("/doc", vfs.FromFS(static.FS), "/doc", vfs.BindBefore)
-	fs.Bind("/lib/godoc", vfs.FromFS(static.FS), "/", vfs.BindReplace)
+	fs.Bind("/doc", vfs.FromFS(website.Content), "/doc", vfs.BindBefore)
+	fs.Bind("/lib/godoc", vfs.FromFS(website.Content), "/", vfs.BindReplace)
 	pres = godoc.NewPresentation(godoc.NewCorpus(fs))
 	readTemplates(pres)
 	mux := registerHandlers(pres)