diff options
author | Andrew Bonventre <andybons@golang.org> | 2017-08-29 16:23:49 -0400 |
---|---|---|
committer | Andrew Bonventre <andybons@golang.org> | 2018-01-20 05:07:43 +0000 |
commit | aae9998d41d1890476951ef5ae51adc1d4a5e1d7 (patch) | |
tree | 14b1acfa2da7b9d1b5466b6a83149253a315e2a7 | |
parent | 5476967b1a3d29fef4061999c00cadbec19ac0e3 (diff) | |
download | go-aae9998d41d1890476951ef5ae51adc1d4a5e1d7.tar.gz go-aae9998d41d1890476951ef5ae51adc1d4a5e1d7.zip |
doc: hide content blocked by GFW when served in CN
Change-Id: Ia3d0fa0517d96f0672d3c5ce7e7b7bb8bd0ce093
Reviewed-on: https://go-review.googlesource.com/60070
Reviewed-by: Chris Broadfoot <cbro@golang.org>
(cherry picked from commit 98603e7af6056734e0f5bee5f05b3623ca5189de)
Reviewed-on: https://go-review.googlesource.com/88735
Reviewed-by: Andrew Bonventre <andybons@golang.org>
-rw-r--r-- | doc/docs.html | 42 | ||||
-rw-r--r-- | doc/help.html | 9 |
2 files changed, 37 insertions, 14 deletions
diff --git a/doc/docs.html b/doc/docs.html index 92392e2596..d75c500159 100644 --- a/doc/docs.html +++ b/doc/docs.html @@ -1,6 +1,7 @@ <!--{ "Title": "Documentation", - "Path": "/doc/" + "Path": "/doc/", + "Template": true }--> <p> @@ -33,14 +34,20 @@ libraries. <img class="gopher" src="/doc/gopher/doc.png"/> -<h3 id="go_tour"><a href="//tour.golang.org/">A Tour of Go</a></h3> +<h3 id="go_tour"> + {{if $.GoogleCN}} + A Tour of Go + {{else}} + <a href="//tour.golang.org/">A Tour of Go</a> + {{end}} +</h3> <p> 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 <a href="//tour.golang.org/">take the tour online</a> or -install it locally with: +learned. You can {{if not $.GoogleCN}}<a href="//tour.golang.org/">take the tour +online</a> or{{end}} install it locally with: </p> <p> <pre> @@ -51,10 +58,13 @@ This will place the <code>gotour</code> binary in your workspace's <code>bin</co <h3 id="code"><a href="code.html">How to write Go code</a></h3> <p> -Also available as a -<a href="//www.youtube.com/watch?v=XCsL89YtqCs">screencast</a>, this doc -explains how to use the <a href="/cmd/go/">go command</a> to fetch, build, and -install packages, commands, and run tests. +{{if not $.GoogleCN}} +Also available as a <a href="//www.youtube.com/watch?v=XCsL89YtqCs">screencast</a>, this +{{else}} +This +{{end}} +doc explains how to use the <a href="/cmd/go/">go command</a> +to fetch, build, and install packages, commands, and run tests. </p> <h3 id="editors"><a href="editors.html">Editor plugins and IDEs</a></h3> @@ -115,9 +125,11 @@ same variable in a different goroutine. <h2 id="articles">Articles</h2> +{{if not $.GoogleCN}} <h3 id="blog"><a href="//blog.golang.org/">The Go Blog</a></h3> <p>The official blog of the Go project, featuring news and in-depth articles by the Go team and guests.</p> +{{end}} <h4>Codewalks</h4> <p> @@ -130,6 +142,7 @@ Guided tours of Go programs. <li><a href="/doc/articles/wiki/">Writing Web Applications</a> - building a simple web application.</li> </ul> +{{if not $.GoogleCN}} <h4>Language</h4> <ul> <li><a href="/blog/json-rpc-tale-of-interfaces">JSON-RPC: a tale of interfaces</a></li> @@ -150,17 +163,20 @@ Guided tours of Go programs. <li><a href="/blog/go-image-package">The Go image package</a> - the fundamentals of the <a href="/pkg/image/">image</a> package.</li> <li><a href="/blog/go-imagedraw-package">The Go image/draw package</a> - the fundamentals of the <a href="/pkg/image/draw/">image/draw</a> package.</li> </ul> +{{end}} <h4>Tools</h4> <ul> <li><a href="/doc/articles/go_command.html">About the Go command</a> - why we wrote it, what it is, what it's not, and how to use it.</li> -<li><a href="/blog/c-go-cgo">C? Go? Cgo!</a> - linking against C code with <a href="/cmd/cgo/">cgo</a>.</li> <li><a href="/doc/gdb">Debugging Go Code with GDB</a></li> +<li><a href="/doc/articles/race_detector.html">Data Race Detector</a> - a manual for the data race detector.</li> +<li><a href="/doc/asm">A Quick Guide to Go's Assembler</a> - an introduction to the assembler used by Go.</li> +{{if not $.GoogleCN}} +<li><a href="/blog/c-go-cgo">C? Go? Cgo!</a> - linking against C code with <a href="/cmd/cgo/">cgo</a>.</li> <li><a href="/blog/godoc-documenting-go-code">Godoc: documenting Go code</a> - writing good documentation for <a href="/cmd/godoc/">godoc</a>.</li> <li><a href="/blog/profiling-go-programs">Profiling Go Programs</a></li> -<li><a href="/doc/articles/race_detector.html">Data Race Detector</a> - a manual for the data race detector.</li> <li><a href="/blog/race-detector">Introducing the Go Race Detector</a> - an introduction to the race detector.</li> -<li><a href="/doc/asm">A Quick Guide to Go's Assembler</a> - an introduction to the assembler used by Go.</li> +{{end}} </ul> <h4 id="articles_more">More</h4> @@ -169,7 +185,7 @@ See the <a href="/wiki/Articles">Articles page</a> at the <a href="/wiki">Wiki</a> for more Go articles. </p> - +{{if not $.GoogleCN}} <h2 id="talks">Talks</h2> <img class="gopher" src="/doc/gopher/talks.png"/> @@ -200,7 +216,7 @@ This talk expands on the <i>Go Concurrency Patterns</i> talk to dive deeper into <p> See the <a href="/talks">Go Talks site</a> and <a href="/wiki/GoTalks">wiki page</a> for more Go talks. </p> - +{{end}} <h2 id="nonenglish">Non-English Documentation</h2> diff --git a/doc/help.html b/doc/help.html index 057d75290e..f668196871 100644 --- a/doc/help.html +++ b/doc/help.html @@ -1,6 +1,7 @@ <!--{ "Title": "Help", - "Path": "/help/" + "Path": "/help/", + "Template": true }--> <div id="manual-nav"></div> @@ -9,6 +10,7 @@ <img class="gopher" src="/doc/gopher/help.png"/> +{{if not $.GoogleCN}} <h3 id="mailinglist"><a href="https://groups.google.com/group/golang-nuts">Go Nuts Mailing List</a></h3> <p> Get help from Go users, and share your work on the official mailing list. @@ -31,10 +33,12 @@ forum for Go programmers. <h3 id="irc"><a href="irc:irc.freenode.net/go-nuts">Go IRC Channel</a></h3> <p>Get live support at <b>#go-nuts</b> on <b>irc.freenode.net</b>, the official Go IRC channel.</p> +{{end}} <h3 id="faq"><a href="/doc/faq">Frequently Asked Questions (FAQ)</a></h3> <p>Answers to common questions about Go.</p> +{{if not $.GoogleCN}} <h2 id="inform">Stay informed</h2> <h3 id="announce"><a href="https://groups.google.com/group/golang-announce">Go Announcements Mailing List</a></h3> @@ -64,6 +68,7 @@ for Go news and discussion. The <a href="https://changelog.com/gotime">Go Time podcast</a> is a panel of Go experts and special guests discussing the Go programming language, the community, and everything in between. </p> +{{end}} <h2 id="community">Community resources</h2> @@ -73,11 +78,13 @@ Each month in places around the world, groups of Go programmers ("gophers") meet to talk about Go. Find a chapter near you. </p> +{{if not $.GoogleCN}} <h3 id="playground"><a href="/play">Go Playground</a></h3> <p>A place to write, run, and share Go code.</p> <h3 id="wiki"><a href="/wiki">Go Wiki</a></h3> <p>A wiki maintained by the Go community.</p> +{{end}} <h3 id="conduct"><a href="/conduct">Code of Conduct</a></h3> <p> |