Merge tag 'upstream/1.1_hg20130304' into debian-sid

Upstream version 1.1~hg20130304

1 files changed, 4 insertions, 5 deletions

diff --git a/doc/articles/c_go_cgo.html b/doc/articles/c_go_cgo.html
index ac6bb29a2..b37a6ba65 100644
--- a/doc/articles/c_go_cgo.html
+++ b/doc/articles/c_go_cgo.html
@@ -149,9 +149,9 @@ is more complex than a single function call), as in this rewrite of
 </p>
 
 <p>
-To build cgo packages, just use <a href="/cmd/go/#Compile_packages_and_dependencies">"
+To build cgo packages, just use <a href="/cmd/go/#hdr-Compile_packages_and_dependencies">"
 <code>go build</code>"</a> or
-<a href="/cmd/go/#Compile_and_install_packages_and_dependencies">"<code>go install</code>
+<a href="/cmd/go/#hdr-Compile_and_install_packages_and_dependencies">"<code>go install</code>
 "</a> as usual. The go tool recognizes the special <code>"C"</code> import and automatically
 uses cgo for those files.
 </p>
@@ -169,9 +169,8 @@ in the Go tree demonstrate more advanced concepts.
 <p>
 For a simple, idiomatic example of a cgo-based package, see Russ Cox's <a
 href="http://code.google.com/p/gosqlite/source/browse/sqlite/sqlite.go">gosqlite</a>.
-Also, the Go Project Dashboard lists <a
-href="https://godashboard.appspot.com/project?tag=cgo">several other
-cgo packages</a>.
+Also, the <a href="http://code.google.com/p/go-wiki/wiki/Projects">Go Community Wiki</a>
+lists many packages, some of which use cgo.
 </p>
 
 <p>