Merge "TBR: ref: Open-source prep: update links and such to point to GitHub locations"
diff --git a/README.md b/README.md
index 4c8c809..21f18d6 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,8 @@
 # Vanadium
 
-This repository contains a reference implementation of the [Vanadium] APIs.
+This repository contains a reference implementation of the Vanadium APIs.
 
 Unlike the APIs in https://github.com/vanadium/go.v23, which promises to
 provide [backward compatibility] this repository makes no such promises.
 
-[Vanadium]: https://v.io
-[backward compatibility]: https://godoc.v.io/pkg/v.io/v23
+[backward compatibility]: https://godoc.org/v.io/v23
diff --git a/envvar.go b/envvar.go
index 0c153db..332d3e0 100644
--- a/envvar.go
+++ b/envvar.go
@@ -4,8 +4,6 @@
 
 // Package ref defines constants used through the Vanadium reference
 // implementation, which is implemented in its subdirectories.
-//
-// For more details about the Vanadium project, please visit https://v.io.
 package ref
 
 import (
diff --git a/services/identity/README.md b/services/identity/README.md
index 37f5e2c..6815464 100644
--- a/services/identity/README.md
+++ b/services/identity/README.md
@@ -3,4 +3,4 @@
 This package and its sub-packages implement the identity service
 at https://dev.v.io/auth.
 
-The design is described in https://v.io/designdocs/identity-service.html
+The design is described in https://github.com/vanadium/docs/blob/master/designdocs/identity-service.md
diff --git a/services/identity/identityd/doc.go b/services/identity/identityd/doc.go
index 2ecc2a2..e2bfac9 100644
--- a/services/identity/identityd/doc.go
+++ b/services/identity/identityd/doc.go
@@ -22,7 +22,7 @@
   https://developers.google.com/accounts/docs/OAuth2Login
 
 More details on the design of identityd at:
-  https://v.io/designdocs/identity-service.html
+  https://github.com/vanadium/docs/blob/master/designdocs/identity-service.md
 
 Usage:
    identityd [flags]
diff --git a/services/identity/identityd/main.go b/services/identity/identityd/main.go
index 3e05bef..415b382 100644
--- a/services/identity/identityd/main.go
+++ b/services/identity/identityd/main.go
@@ -76,7 +76,7 @@
   https://developers.google.com/accounts/docs/OAuth2Login
 
 More details on the design of identityd at:
-  https://v.io/designdocs/identity-service.html
+  https://github.com/vanadium/docs/blob/master/designdocs/identity-service.md
 `,
 }
 
diff --git a/services/identity/internal/templates/caveats.go b/services/identity/internal/templates/caveats.go
index 79baa0c..51ff8c4 100644
--- a/services/identity/internal/templates/caveats.go
+++ b/services/identity/internal/templates/caveats.go
@@ -50,7 +50,7 @@
             Using Vanadium in production applications is discouraged at this
           time.</strong><br>
           During this preview, the
-          <a href="https://v.io/glossary.html#blessing-root" target="_">
+          <a href="https://github.com/vanadium/docs/blob/master/glossary.md#blessing-root" target="_">
             blessing root
           </a>
           may change without notice.
diff --git a/services/identity/internal/templates/home.go b/services/identity/internal/templates/home.go
index 03d8d67..96abd5e 100644
--- a/services/identity/internal/templates/home.go
+++ b/services/identity/internal/templates/home.go
@@ -23,7 +23,7 @@
     <h1 class="page-head">Authorize Vanadium apps with Google</h1>
     <p>
       The Vanadium Identity Provider authorizes Vanadium blessings based on your Google Account.<br>
-      <a href="http://v.io/glossary.html#identity-provider">Learn more</a>
+      <a href="https://github.com/vanadium/docs/blob/master/glossary.md#identity-provider">Learn more</a>
     </p>
     <p>
       <a href="/auth/google/{{.ListBlessingsRoute}}" class="button-passive">
diff --git a/services/identity/internal/templates/list_blessings.go b/services/identity/internal/templates/list_blessings.go
index 481f0a6..c653c8f 100644
--- a/services/identity/internal/templates/list_blessings.go
+++ b/services/identity/internal/templates/list_blessings.go
@@ -24,7 +24,7 @@
     <h1 class="page-head">Authorize Vanadium apps with Google</h1>
     <p>
       The Vanadium Identity Provider authorizes Vanadium blessings based on your Google Account.<br>
-      <a href="http://v.io/glossary.html#identity-provider">Learn more</a>
+      <a href="https://github.com/vanadium/docs/blob/master/glossary.md#identity-provider">Learn more</a>
     </p>
 
     <div class="blessings-list">
@@ -69,7 +69,7 @@
       {{end}} {{/* if .Error */}}
     {{else}} {{/* range .Log */}}
       <p>
-        <a href="http://v.io/installation">Install Vanadium</a> to set up your first blessing.
+        <a href="https://github.com/vanadium/docs/blob/master/installation.md">Install Vanadium</a> to set up your first blessing.
       </p>
     {{end}} {{/* range .Log */}}
     </div>
diff --git a/services/identity/internal/templates/partials.go b/services/identity/internal/templates/partials.go
index d2a8d11..dfde489 100644
--- a/services/identity/internal/templates/partials.go
+++ b/services/identity/internal/templates/partials.go
@@ -107,9 +107,8 @@
   <div class="provider-info-section">
     <h5>Learn more</h5>
     <p>
-    Vanadium Concepts: <a href="https://v.io/concepts/security.html">Security</a><br>
-    <a href="https://v.io/tutorials/security">Tutorials</a><br>
-    <a href="https://v.io/tools/identity-service-faq.html">FAQ</a><br>
+    Vanadium Concepts: <a href="https://github.com/vanadium/docs/blob/master/concepts/security.md">Security</a><br>
+    <a href="https://github.com/vanadium/docs/blob/master/tools/identity-service-faq.md">FAQ</a><br>
     </p>
   </div>
 </section>
diff --git a/test/v23tests/v23tests_test.go b/test/v23tests/v23tests_test.go
index c8d655f..c6ece5a 100644
--- a/test/v23tests/v23tests_test.go
+++ b/test/v23tests/v23tests_test.go
@@ -119,7 +119,7 @@
 }
 
 func TestDeferHandling(t *testing.T) {
-	t.Skip("http://v.io/i/686 -- test is flaky in Go1.5")
+	t.Skip("https://v.io/i/686 -- test is flaky in Go1.5")
 	sh, _ := modules.NewShell(nil, nil, testing.Verbose(), t)
 	child, err := sh.Start(nil, RunIntegrationTestInChild, "--test.run=TestHelperProcess", "--v23.tests")
 	if err != nil {