diff options
| author | Jay Conrod <jayconrod@google.com> | 2019-09-26 16:21:23 -0400 |
|---|---|---|
| committer | Jay Conrod <jayconrod@google.com> | 2019-09-30 22:43:31 +0000 |
| commit | efeb14978e5857dfbcda2e421f664c1975a7aeb2 (patch) | |
| tree | c873f547ad6164022debfde214ed0ac17259c0e9 /go.mod | |
| parent | 07c3481f1c4d80d1ad34efa3f113292e69511af4 (diff) | |
| download | go-x-website-efeb14978e5857dfbcda2e421f664c1975a7aeb2.tar.xz | |
cmd/golangorg, content: serve /doc from content/static/doc before GOROOT/doc
In the "/doc" directory, files are now served from the
content/static/doc, then from GOROOT/doc (where GOROOT is either a zip
file or the GOROOT directory).
This allows documentation to be moved to golang.org outside of the
normal Go release cycle. For example, this CL moves (but does not
modify) doc/docs.html here. Documentation that is tied to the Go
release cycle (for example, doc/spec.html) will not be moved.
Updates golang/go#33637
Updates golang/go#29206
Change-Id: I5f1c577e0ffddc3418653bdd9b0cc36cf79e3fe1
Reviewed-on: https://go-review.googlesource.com/c/website/+/197638
Run-TryBot: Jay Conrod <jayconrod@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Diffstat (limited to 'go.mod')
| -rw-r--r-- | go.mod | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -6,9 +6,8 @@ require ( cloud.google.com/go v0.38.0 github.com/gomodule/redigo v2.0.0+incompatible go.opencensus.io v0.22.0 // indirect - golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 - golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c - golang.org/x/tools v0.0.0-20190516015132-d1a3278ee749 + golang.org/x/net v0.0.0-20190620200207-3b0461eec859 + golang.org/x/tools v0.0.0-20190930201159-7c411dea38b0 google.golang.org/api v0.9.0 // indirect google.golang.org/appengine v1.5.0 ) |