Skip to content

Commit aae9998

Browse files
committed
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 <[email protected]> (cherry picked from commit 98603e7) Reviewed-on: https://go-review.googlesource.com/88735 Reviewed-by: Andrew Bonventre <[email protected]>
1 parent 5476967 commit aae9998

File tree

2 files changed

+37
-14
lines changed

2 files changed

+37
-14
lines changed

doc/docs.html

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!--{
22
"Title": "Documentation",
3-
"Path": "/doc/"
3+
"Path": "/doc/",
4+
"Template": true
45
}-->
56

67
<p>
@@ -33,14 +34,20 @@ <h2 id="learning">Learning Go</h2>
3334

3435
<img class="gopher" src="/doc/gopher/doc.png"/>
3536

36-
<h3 id="go_tour"><a href="//tour.golang.org/">A Tour of Go</a></h3>
37+
<h3 id="go_tour">
38+
{{if $.GoogleCN}}
39+
A Tour of Go
40+
{{else}}
41+
<a href="//tour.golang.org/">A Tour of Go</a>
42+
{{end}}
43+
</h3>
3744
<p>
3845
An interactive introduction to Go in three sections.
3946
The first section covers basic syntax and data structures; the second discusses
4047
methods and interfaces; and the third introduces Go's concurrency primitives.
4148
Each section concludes with a few exercises so you can practice what you've
42-
learned. You can <a href="//tour.golang.org/">take the tour online</a> or
43-
install it locally with:
49+
learned. You can {{if not $.GoogleCN}}<a href="//tour.golang.org/">take the tour
50+
online</a> or{{end}} install it locally with:
4451
</p>
4552
<p>
4653
<pre>
@@ -51,10 +58,13 @@ <h3 id="go_tour"><a href="//tour.golang.org/">A Tour of Go</a></h3>
5158

5259
<h3 id="code"><a href="code.html">How to write Go code</a></h3>
5360
<p>
54-
Also available as a
55-
<a href="//www.youtube.com/watch?v=XCsL89YtqCs">screencast</a>, this doc
56-
explains how to use the <a href="/cmd/go/">go command</a> to fetch, build, and
57-
install packages, commands, and run tests.
61+
{{if not $.GoogleCN}}
62+
Also available as a <a href="//www.youtube.com/watch?v=XCsL89YtqCs">screencast</a>, this
63+
{{else}}
64+
This
65+
{{end}}
66+
doc explains how to use the <a href="/cmd/go/">go command</a>
67+
to fetch, build, and install packages, commands, and run tests.
5868
</p>
5969

6070
<h3 id="editors"><a href="editors.html">Editor plugins and IDEs</a></h3>
@@ -115,9 +125,11 @@ <h3 id="release"><a href="/doc/devel/release.html">Release History</a></h3>
115125

116126
<h2 id="articles">Articles</h2>
117127

128+
{{if not $.GoogleCN}}
118129
<h3 id="blog"><a href="//blog.golang.org/">The Go Blog</a></h3>
119130
<p>The official blog of the Go project, featuring news and in-depth articles by
120131
the Go team and guests.</p>
132+
{{end}}
121133

122134
<h4>Codewalks</h4>
123135
<p>
@@ -130,6 +142,7 @@ <h4>Codewalks</h4>
130142
<li><a href="/doc/articles/wiki/">Writing Web Applications</a> - building a simple web application.</li>
131143
</ul>
132144

145+
{{if not $.GoogleCN}}
133146
<h4>Language</h4>
134147
<ul>
135148
<li><a href="/blog/json-rpc-tale-of-interfaces">JSON-RPC: a tale of interfaces</a></li>
@@ -150,17 +163,20 @@ <h4>Packages</h4>
150163
<li><a href="/blog/go-image-package">The Go image package</a> - the fundamentals of the <a href="/pkg/image/">image</a> package.</li>
151164
<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>
152165
</ul>
166+
{{end}}
153167

154168
<h4>Tools</h4>
155169
<ul>
156170
<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>
157-
<li><a href="/blog/c-go-cgo">C? Go? Cgo!</a> - linking against C code with <a href="/cmd/cgo/">cgo</a>.</li>
158171
<li><a href="/doc/gdb">Debugging Go Code with GDB</a></li>
172+
<li><a href="/doc/articles/race_detector.html">Data Race Detector</a> - a manual for the data race detector.</li>
173+
<li><a href="/doc/asm">A Quick Guide to Go's Assembler</a> - an introduction to the assembler used by Go.</li>
174+
{{if not $.GoogleCN}}
175+
<li><a href="/blog/c-go-cgo">C? Go? Cgo!</a> - linking against C code with <a href="/cmd/cgo/">cgo</a>.</li>
159176
<li><a href="/blog/godoc-documenting-go-code">Godoc: documenting Go code</a> - writing good documentation for <a href="/cmd/godoc/">godoc</a>.</li>
160177
<li><a href="/blog/profiling-go-programs">Profiling Go Programs</a></li>
161-
<li><a href="/doc/articles/race_detector.html">Data Race Detector</a> - a manual for the data race detector.</li>
162178
<li><a href="/blog/race-detector">Introducing the Go Race Detector</a> - an introduction to the race detector.</li>
163-
<li><a href="/doc/asm">A Quick Guide to Go's Assembler</a> - an introduction to the assembler used by Go.</li>
179+
{{end}}
164180
</ul>
165181

166182
<h4 id="articles_more">More</h4>
@@ -169,7 +185,7 @@ <h4 id="articles_more">More</h4>
169185
<a href="/wiki">Wiki</a> for more Go articles.
170186
</p>
171187

172-
188+
{{if not $.GoogleCN}}
173189
<h2 id="talks">Talks</h2>
174190

175191
<img class="gopher" src="/doc/gopher/talks.png"/>
@@ -200,7 +216,7 @@ <h4 id="talks_more">More</h4>
200216
<p>
201217
See the <a href="/talks">Go Talks site</a> and <a href="/wiki/GoTalks">wiki page</a> for more Go talks.
202218
</p>
203-
219+
{{end}}
204220

205221
<h2 id="nonenglish">Non-English Documentation</h2>
206222

doc/help.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!--{
22
"Title": "Help",
3-
"Path": "/help/"
3+
"Path": "/help/",
4+
"Template": true
45
}-->
56

67
<div id="manual-nav"></div>
@@ -9,6 +10,7 @@ <h2 id="help">Get help</h2>
910

1011
<img class="gopher" src="/doc/gopher/help.png"/>
1112

13+
{{if not $.GoogleCN}}
1214
<h3 id="mailinglist"><a href="https://groups.google.com/group/golang-nuts">Go Nuts Mailing List</a></h3>
1315
<p>
1416
Get help from Go users, and share your work on the official mailing list.
@@ -31,10 +33,12 @@ <h3 id="slack"><a href="https://blog.gopheracademy.com/gophers-slack-community/"
3133
<h3 id="irc"><a href="irc:irc.freenode.net/go-nuts">Go IRC Channel</a></h3>
3234
<p>Get live support at <b>#go-nuts</b> on <b>irc.freenode.net</b>, the official
3335
Go IRC channel.</p>
36+
{{end}}
3437

3538
<h3 id="faq"><a href="/doc/faq">Frequently Asked Questions (FAQ)</a></h3>
3639
<p>Answers to common questions about Go.</p>
3740

41+
{{if not $.GoogleCN}}
3842
<h2 id="inform">Stay informed</h2>
3943

4044
<h3 id="announce"><a href="https://groups.google.com/group/golang-announce">Go Announcements Mailing List</a></h3>
@@ -64,6 +68,7 @@ <h3 id="gotime"><a href="https://changelog.com/gotime">Go Time Podcast</a></h3>
6468
The <a href="https://changelog.com/gotime">Go Time podcast</a> is a panel of Go experts and special guests
6569
discussing the Go programming language, the community, and everything in between.
6670
</p>
71+
{{end}}
6772

6873
<h2 id="community">Community resources</h2>
6974

@@ -73,11 +78,13 @@ <h3 id="go_user_groups"><a href="/wiki/GoUserGroups">Go User Groups</a></h3>
7378
meet to talk about Go. Find a chapter near you.
7479
</p>
7580

81+
{{if not $.GoogleCN}}
7682
<h3 id="playground"><a href="/play">Go Playground</a></h3>
7783
<p>A place to write, run, and share Go code.</p>
7884

7985
<h3 id="wiki"><a href="/wiki">Go Wiki</a></h3>
8086
<p>A wiki maintained by the Go community.</p>
87+
{{end}}
8188

8289
<h3 id="conduct"><a href="/conduct">Code of Conduct</a></h3>
8390
<p>

0 commit comments

Comments
 (0)