From 66795408dbca30a1ceaee2e73dd4ff5c5ccd1e2f Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 2 Feb 2018 08:20:18 +0900 Subject: [PATCH 1/3] intro-quick: replace http:// with ssh:// in fetch example All the other example commands use ssh, so using ssh in this command makes it consistent. Also, the http command was using the `/p/` URL infix which is no longer needed. Change-Id: Ie9ffb50fc5f565f1d7f293dcae106fb285d6553d --- Documentation/intro-quick.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/intro-quick.txt b/Documentation/intro-quick.txt index c6dad5b58c..d72c6969b9 100644 --- a/Documentation/intro-quick.txt +++ b/Documentation/intro-quick.txt @@ -317,8 +317,8 @@ _download_ command. All we need to do to get the change is copy paste this command and run it in our Gerrit checkout. ---- -$ git fetch http://gerrithost:8080/p/RecipeBook refs/changes/68/68/2 -From http://gerrithost:8080/p/RecipeBook +$ git fetch ssh://gerrithost:29418/RecipeBook refs/changes/68/68/2 +From ssh://gerrithost:29418/RecipeBook * branch refs/changes/68/68/2 -> FETCH_HEAD $ git checkout FETCH_HEAD Note: checking out 'FETCH_HEAD'. From 7845019dbf61b57ec81cc39c2f3621a16e6ac370 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 2 Feb 2018 10:13:45 +0900 Subject: [PATCH 2/3] Replace links to code.google.com/p/gerrit Google Code was shut down nearly 2 years ago [1] and the links don't work any more. Replace them with the new locations. [1] https://opensource.googleblog.com/2015/03/farewell-to-google-code.html Change-Id: I53e791d04eb243483d69254a296c30e59a7de479 --- Documentation/config-sso.txt | 2 +- Documentation/dev-design.txt | 2 +- Documentation/dev-readme.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/config-sso.txt b/Documentation/config-sso.txt index 04949bfee1..4048ebae63 100644 --- a/Documentation/config-sso.txt +++ b/Documentation/config-sso.txt @@ -64,7 +64,7 @@ Users wishing to link an alternative identity should *NOT* log in separately with that identity. Doing so will result in a new account being created, and subsequent attempts to link that account with the existing account will fail. In cases where this happens, the administrator will need to manually merge the -accounts. See link:https://code.google.com/p/gerrit/wiki/SqlMergeUserAccounts[ +accounts. See link:https://gerrit.googlesource.com/homepage/+/md-pages/docs/SqlMergeUserAccounts.md[ Merging Gerrit User Accounts] on the Gerrit Wiki for details. Linking another identity is also useful for users whose primary OpenID provider diff --git a/Documentation/dev-design.txt b/Documentation/dev-design.txt index 4e82507901..bdd2a68319 100644 --- a/Documentation/dev-design.txt +++ b/Documentation/dev-design.txt @@ -342,7 +342,7 @@ automate interfaces may make it impossible for non-browser agents to be used with the JSON-RPC interface. * link:http://json-rpc.org/wd/JSON-RPC-1-1-WD-20060807.html[JSON-RPC 1.1] -* link:http://code.google.com/p/gerrit/source/browse/README?repo=gwtjsonrpc&name=master[XSRF JSON-RPC] +* link:https://gerrit.googlesource.com/gwtjsonrpc/+/master/README[XSRF JSON-RPC] == Privacy Considerations diff --git a/Documentation/dev-readme.txt b/Documentation/dev-readme.txt index b7c111f6d7..5c24731d95 100644 --- a/Documentation/dev-readme.txt +++ b/Documentation/dev-readme.txt @@ -266,7 +266,7 @@ the browser and on the server side. Google Web Toolkit: -* http://code.google.com/webtoolkit/download.html[Download] +* http://www.gwtproject.org/download.html[Download] Apache SSHD: From fb6eba1211b49dcea70b93ec9f79d6a6f627b31c Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 2 Feb 2018 10:21:17 +0900 Subject: [PATCH 3/3] config-sso: Reword section about Google OpenID shutdown Google already shut down their OpenID service nearly 2 years ago. Rewrite the documentation related to this in past tense. Change-Id: I6691f42a198b014afb32ee718c3e88e300655c54 --- Documentation/config-sso.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Documentation/config-sso.txt b/Documentation/config-sso.txt index 4048ebae63..78140613ae 100644 --- a/Documentation/config-sso.txt +++ b/Documentation/config-sso.txt @@ -68,14 +68,13 @@ accounts. See link:https://gerrit.googlesource.com/homepage/+/md-pages/docs/Sql Merging Gerrit User Accounts] on the Gerrit Wiki for details. Linking another identity is also useful for users whose primary OpenID provider -shuts down. For example Google will +shuts down. For example Google link:https://developers.google.com/+/api/auth-migration[shut down their OpenID -service on 20th April 2015]. Users must add an alternative identity, using another -OpenID provider, before that shutdown date. User who fail to add an alternative -identity before that date, and end up with their account only having a disabled -Google identity, will need to create a separate account with an alternative -provider and then ask the administrator to merge the accounts using the previously -mentioned method. +service on 20th April 2015]. Users who failed to add an alternative identity with +another OpenID provider before that date will end up with their account only having +a disabled Google identity. After creating a separate account with an alternative +provider, they will need to ask the administrator to merge the accounts using the +previously mentioned method. To link another identity to an existing account: