From aae9998d41d1890476951ef5ae51adc1d4a5e1d7 Mon Sep 17 00:00:00 2001 From: Andrew Bonventre Date: Tue, 29 Aug 2017 16:23:49 -0400 Subject: 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 (cherry picked from commit 98603e7af6056734e0f5bee5f05b3623ca5189de) Reviewed-on: https://go-review.googlesource.com/88735 Reviewed-by: Andrew Bonventre --- doc/docs.html | 42 +++++++++++++++++++++++++++++------------- 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 @@

@@ -33,14 +34,20 @@ libraries. -

A Tour of 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 take the tour online or -install it locally with: +learned. You can {{if not $.GoogleCN}}take the tour +online or{{end}} install it locally with: 

@@ -51,10 +58,13 @@ This will place the gotour binary in your workspace's binHow to write Go code
 

-Also available as a
-screencast, this doc
-explains how to use the go command to fetch, build, and
-install packages, commands, and run tests.
+{{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.
 

 
 
Editor plugins and IDEs

@@ -115,9 +125,11 @@ same variable in a different goroutine.
 
 
Articles

 
+{{if not $.GoogleCN}}
 
The Go Blog

 
The official blog of the Go project, featuring news and in-depth articles by
 the Go team and guests.

+{{end}}
 
 
Codewalks

 

@@ -130,6 +142,7 @@ Guided tours of Go programs.
 
  • Writing Web Applications - building a simple web application.
    • 
 
 
+{{if not $.GoogleCN}}
 
    Language
    
 
+{{end}}
 
 
    Tools
    
 
 
 
    More
    
@@ -169,7 +185,7 @@ See the Articles page at the
 Wiki for more Go articles.
 
    
 
-
+{{if not $.GoogleCN}}
 
    Talks
    
 
 
@@ -200,7 +216,7 @@ This talk expands on the Go Concurrency Patterns talk to dive deeper into
 
    
 See the Go Talks site and wiki page for more Go talks.
 
    
-
+{{end}}
 
 
    Non-English Documentation
    
 
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 @@
 
 
 
    
@@ -9,6 +10,7 @@
 
 
 
+{{if not $.GoogleCN}}
 
    Go Nuts Mailing List
    
 
    
 Get help from Go users, and share your work on the official mailing list.
@@ -31,10 +33,12 @@ forum for Go programmers.
 
    Go IRC Channel
    
 
    Get live support at #go-nuts on irc.freenode.net, the official
 Go IRC channel.
    
+{{end}}
 
 
    Frequently Asked Questions (FAQ)
    
 
    Answers to common questions about Go.
    
 
+{{if not $.GoogleCN}}
 
    Stay informed
    
 
 
    Go Announcements Mailing List
    
@@ -64,6 +68,7 @@ for Go news and discussion.
 The Go Time podcast is a panel of Go experts and special guests
 discussing the Go programming language, the community, and everything in between.
 
    
+{{end}}
 
 
    Community resources
    
 
@@ -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.
 
    
 
+{{if not $.GoogleCN}}
 
    Go Playground
    
 
    A place to write, run, and share Go code.
    
 
 
    Go Wiki
    
 
    A wiki maintained by the Go community.
    
+{{end}}
 
 
    Code of Conduct
    
 
    
-- 
cgit v1.2.3-54-g00ecf