summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gerrand <adg@golang.org>2012-03-27 15:09:13 +1100
committerAndrew Gerrand <adg@golang.org>2012-03-27 15:09:13 +1100
commita2681b62ee33e65bf0055499964eac0e969574b4 (patch)
treeeea557207d6aa9795e48cb541364883f4d9ae93e
parent37a3690ef3e3f60ad0955c1bc8962f6dafd72968 (diff)
downloadgo-a2681b62ee33e65bf0055499964eac0e969574b4.tar.gz
doc: update licensing text one more time
R=golang-dev, r CC=golang-dev http://codereview.appspot.com/5916046
-rw-r--r--LICENSE2
-rw-r--r--lib/godoc/godoc.html8
2 files changed, 6 insertions, 4 deletions
diff --git a/LICENSE b/LICENSE
index 6a66aea5e..744875676 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2009 The Go Authors. All rights reserved.
+Copyright (c) 2012 The Go Authors. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
diff --git a/lib/godoc/godoc.html b/lib/godoc/godoc.html
index 5e1819352..fd6032927 100644
--- a/lib/godoc/godoc.html
+++ b/lib/godoc/godoc.html
@@ -53,9 +53,11 @@
<div id="footer">
Build version {{html .Version}}.<br>
Except as <a href="http://code.google.com/policies.html#restrictions">noted</a>,
-the content of this page is licensed under the Creative Commons Attribution 3.0 License,<br>
-and code samples are licensed under a <a href="/LICENSE">BSD-style license</a>.<br>
-<a href="/doc/tos.html">Terms of Service</a>
+the content of this page is licensed under the
+Creative Commons Attribution 3.0 License,
+and code is licensed under a <a href="/LICENSE">BSD license</a>.<br>
+<a href="/doc/tos.html">Terms of Service</a> |
+<a href="http://www.google.com/intl/en/privacy/privacy-policy.html">Privacy Policy</a>
</div>
</body>