Merge pull request #1849 from petk/patch-urls

ben · web-flow · commit 8fbbf9cc2dfa · 2023-03-25T10:19:19.000-07:00
Update URLs
diff --git a/book/01-introduction/sections/installing.asc b/book/01-introduction/sections/installing.asc
@@ -58,7 +58,7 @@ The most official build is available for download on the Git website.
 Just go to https://git-scm.com/download/win[^] and the download will start automatically.
 Note that this is a project called Git for Windows, which is separate from Git itself; for more information on it, go to https://gitforwindows.org[^].
 
-To get an automated installation you can use the https://chocolatey.org/packages/git[Git Chocolatey package^].
+To get an automated installation you can use the https://community.chocolatey.org/packages/git[Git Chocolatey package^].
 Note that the Chocolatey package is community maintained.
 
 ==== Installing from Source
diff --git a/book/04-git-server/sections/generating-ssh-key.asc b/book/04-git-server/sections/generating-ssh-key.asc
@@ -54,4 +54,4 @@ mZ+AW4OZPnTPI89ZPmVMLuayrD2cE86Z/il8b+gw3r3+1nKatmIkjn2so1d01QraTlMqVSsbx
 NrRFi9wrf+M7Q== schacon@mylaptop.local
 ----
 
-For a more in-depth tutorial on creating an SSH key on multiple operating systems, see the GitHub guide on SSH keys at https://docs.github.com/en/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent[^].
+For a more in-depth tutorial on creating an SSH key on multiple operating systems, see the GitHub guide on SSH keys at https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent[^].
diff --git a/book/04-git-server/sections/hosted.asc b/book/04-git-server/sections/hosted.asc
@@ -5,6 +5,6 @@ Doing so offers a number of advantages: a hosting site is generally quick to set
 Even if you set up and run your own server internally, you may still want to use a public hosting site for your open source code -- it's generally easier for the open source community to find and help you with.
 
 These days, you have a huge number of hosting options to choose from, each with different advantages and disadvantages.
-To see an up-to-date list, check out the GitHosting page on the main Git wiki at https://git.wiki.kernel.org/index.php/GitHosting[^].
+To see an up-to-date list, check out the GitHosting page on the main Git wiki at https://archive.kernel.org/oldwiki/git.wiki.kernel.org/index.php/GitHosting.html[^].
 
 We'll cover using GitHub in detail in <<ch06-github#ch06-github>>, as it is the largest Git host out there and you may need to interact with projects hosted on it in any case, but there are dozens more to choose from should you not want to set up your own Git server.
diff --git a/book/06-github/sections/5-scripting.asc b/book/06-github/sections/5-scripting.asc
@@ -107,7 +107,7 @@ image::images/scripting-04-webhook-debug.png[Web hook debugging information]
 
 The other great feature of this is that you can redeliver any of the payloads to test your service easily.
 
-For more information on how to write webhooks and all the different event types you can listen for, go to the GitHub Developer documentation at https://developer.github.com/webhooks/[^].
+For more information on how to write webhooks and all the different event types you can listen for, go to the GitHub Developer documentation at https://docs.github.com/en/webhooks-and-events/webhooks/about-webhooks[^].
 
 ==== The GitHub API
 
@@ -299,4 +299,4 @@ At the time of this writing, the supported languages include Go, Objective-C, Ru
 Check out https://github.com/octokit[^] for more information on these, as they handle much of the HTTP for you.
 
 Hopefully these tools can help you customize and modify GitHub to work better for your specific workflows.
-For complete documentation on the entire API as well as guides for common tasks, check out https://developer.github.com[^].
+For complete documentation on the entire API as well as guides for common tasks, check out https://docs.github.com/[^].
diff --git a/book/07-git-tools/sections/credentials.asc b/book/07-git-tools/sections/credentials.asc
@@ -19,9 +19,9 @@ Git has a few options provided in the box:
   The downside of this approach is that your passwords are stored in cleartext in a plain file in your home directory.
 * If you're using a Mac, Git comes with an "`osxkeychain`" mode, which caches credentials in the secure keychain that's attached to your system account.
   This method stores the credentials on disk, and they never expire, but they're encrypted with the same system that stores HTTPS certificates and Safari auto-fills.
-* If you're using Windows, you can enable the *Git Credential Manager* feature when installing https://gitforwindows.org/[Git for Windows] or separately install https://github.com/GitCredentialManager/git-credential-manager/releases/latest[the latest GCM] as a standalone service.
+* If you're using Windows, you can enable the *Git Credential Manager* feature when installing https://gitforwindows.org/[Git for Windows] or separately install https://github.com/git-ecosystem/git-credential-manager/releases/latest[the latest GCM] as a standalone service.
   This is similar to the "`osxkeychain`" helper described above, but uses the Windows Credential Store to control sensitive information.
-  It can also serve credentials to WSL1 or WSL2. See https://github.com/GitCredentialManager/git-credential-manager#readme[GCM Install Instructions] for more information.
+  It can also serve credentials to WSL1 or WSL2. See https://github.com/git-ecosystem/git-credential-manager#readme[GCM Install Instructions] for more information.
 
 You can choose one of these methods by setting a Git configuration value:
 
diff --git a/book/08-customizing-git/sections/config.asc b/book/08-customizing-git/sections/config.asc
@@ -253,7 +253,7 @@ We'll demonstrate setting up the Perforce Visual Merge Tool (P4Merge) to do your
 If you want to try this out, P4Merge works on all major platforms, so you should be able to do so.
 We'll use path names in the examples that work on macOS and Linux systems; for Windows, you'll have to change `/usr/local/bin` to an executable path in your environment.
 
-To begin, https://www.perforce.com/product/components/perforce-visual-merge-and-diff-tools[download P4Merge from Perforce^].
+To begin, https://www.perforce.com/products/helix-core-apps/merge-diff-tool-p4merge[download P4Merge from Perforce^].
 Next, you'll set up external wrapper scripts to run your commands.
 We'll use the macOS path for the executable; in other systems, it will be where your `p4merge` binary is installed.
 Set up a merge wrapper script named `extMerge` that calls your binary with all the arguments provided:
diff --git a/book/09-git-and-other-scms/sections/import-bzr.asc b/book/09-git-and-other-scms/sections/import-bzr.asc
@@ -53,7 +53,7 @@ ImportError: No module named fastimport
 $ pip install fastimport
 ----
 
-If it is not available, you can download it at address https://pypi.python.org/pypi/fastimport/[^].
+If it is not available, you can download it at address https://pypi.org/project/fastimport/[^].
 
 In the second case (on Windows), `bzr-fastimport` is automatically installed with the standalone version and the default installation (let all the checkboxes checked).
 So in this case you have nothing to do.
diff --git a/book/09-git-and-other-scms/sections/import-svn.asc b/book/09-git-and-other-scms/sections/import-svn.asc
@@ -33,7 +33,7 @@ Then, redirect that output into your `users.txt` file so you can add the equival
 [NOTE]
 ====
 If you're trying this on a Windows machine, this is the point where you'll run into trouble.
-Microsoft have provided some good advice and samples at https://docs.microsoft.com/en-us/azure/devops/repos/git/perform-migration-from-svn-to-git[^].
+Microsoft have provided some good advice and samples at https://learn.microsoft.com/en-us/azure/devops/repos/git/perform-migration-from-svn-to-git[^].
 ====
 
 You can provide this file to `git svn` to help it map the author data more accurately.
diff --git a/book/A-git-in-other-environments/sections/guis.asc b/book/A-git-in-other-environments/sections/guis.asc
@@ -96,7 +96,7 @@ While they're designed to highlight GitHub's service and recommended workflow, t
 
 ===== Installation
 
-GitHub for Windows can be downloaded from https://windows.github.com[^], and GitHub for macOS from https://mac.github.com[^].
+GitHub for Windows and macOS can be downloaded from https://desktop.github.com/[^].
 When the applications are first run, they walk you through all the first-time Git setup, such as configuring your name and email address, and both set up sane defaults for many common configuration options, such as credential caches and CRLF behavior.
 
 Both are "`evergreen`" – updates are downloaded and installed in the background while the applications are open.
@@ -149,4 +149,4 @@ However, if your workflow is different, or you want more control over how and wh
 
 There are a number of other graphical Git clients, and they run the gamut from specialized, single-purpose tools all the way to apps that try to expose everything Git can do.
 The official Git website has a curated list of the most popular clients at https://git-scm.com/downloads/guis[^].
-A more comprehensive list is available on the Git wiki site, at https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools#Graphical_Interfaces[^].
+A more comprehensive list is available on the Git wiki site, at https://archive.kernel.org/oldwiki/git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools.html#Graphical_Interfaces[^].
diff --git a/book/A-git-in-other-environments/sections/powershell.asc b/book/A-git-in-other-environments/sections/powershell.asc
@@ -21,9 +21,9 @@ With `RemoteSigned`, only scripts having the `ZoneIdentifier` set to `Internet`
 If you're an administrator and want to set it for all users on that machine, use `-Scope LocalMachine`.
 If you're a normal user, without administrative rights, you can use `-Scope CurrentUser` to set it only for you.
 
-More about PowerShell Scopes: https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_scopes[^].
+More about PowerShell Scopes: https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_scopes[^].
 
-More about PowerShell ExecutionPolicy: https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.security/set-executionpolicy[^].
+More about PowerShell ExecutionPolicy: https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.security/set-executionpolicy[^].
 
 To set the value of `ExecutionPolicy` to `RemoteSigned` for all users use the next command:
 
@@ -36,7 +36,7 @@ To set the value of `ExecutionPolicy` to `RemoteSigned` for all users use the ne
 
 If you have at least PowerShell 5 or PowerShell 4 with PackageManagement installed, you can use the package manager to install posh-git for you.
 
-More information about PowerShell Gallery: https://docs.microsoft.com/en-us/powershell/scripting/gallery/overview[^].
+More information about PowerShell Gallery: https://learn.microsoft.com/en-us/powershell/scripting/gallery/overview[^].
 
 [source,powershell]
 ----
diff --git a/book/A-git-in-other-environments/sections/sublimetext.asc b/book/A-git-in-other-environments/sections/sublimetext.asc
@@ -11,4 +11,4 @@ The features are:
 * You can use part of the Sublime Merge git client functionality from within Sublime Text.
   This requires that Sublime Merge is installed. See: https://www.sublimemerge.com/[^].
 
-The official documentation for Sublime Text can be found here: https://www.sublimetext.com/docs/3/git_integration.html[^].
+The official documentation for Sublime Text can be found here: https://www.sublimetext.com/docs/git_integration.html[^].
diff --git a/book/A-git-in-other-environments/sections/visualstudio.asc b/book/A-git-in-other-environments/sections/visualstudio.asc
@@ -15,4 +15,4 @@ The tooling supports the following Git functionality:
 * View diffs.
 * ... and more!
 
-Read the https://docs.microsoft.com/visualstudio/version-control[official documentation^] to learn more.
+Read the https://learn.microsoft.com/en-us/visualstudio/version-control/[official documentation^] to learn more.
diff --git a/book/A-git-in-other-environments/sections/visualstudiocode.asc b/book/A-git-in-other-environments/sections/visualstudiocode.asc
@@ -18,4 +18,4 @@ The main features are:
 * With an extension, you can also handle GitHub Pull Requests:
   https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github[^].
 
-The official documentation can be found here: https://code.visualstudio.com/Docs/editor/versioncontrol[^].
+The official documentation can be found here: https://code.visualstudio.com/docs/sourcecontrol/overview[^].
diff --git a/book/A-git-in-other-environments/sections/zsh.asc b/book/A-git-in-other-environments/sections/zsh.asc
@@ -40,13 +40,13 @@ It looks a bit like this:
 .Customized `zsh` prompt
 image::images/zsh-prompt.png[Customized `zsh` prompt]
 
-For more information on `vcs_info`, check out its documentation in the `zshcontrib(1)` manual page, or online at https://zsh.sourceforge.net/Doc/Release/User-Contributions.html#Version-Control-Information[^].
+For more information on `vcs_info`, check out its documentation in the `zshcontrib(1)` manual page, or online at https://zsh.sourceforge.io/Doc/Release/User-Contributions.html#Version-Control-Information[^].
 
 Instead of `vcs_info`, you might prefer the prompt customization script that ships with Git, called `git-prompt.sh`; see https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh[^] for details.
 `git-prompt.sh` is compatible with both Bash and Zsh.
 
 Zsh is powerful enough that there are entire frameworks dedicated to making it better.
-One of them is called "oh-my-zsh", and it can be found at https://github.com/robbyrussell/oh-my-zsh[^].
+One of them is called "oh-my-zsh", and it can be found at https://github.com/ohmyzsh/ohmyzsh[^].
 oh-my-zsh's plugin system comes with powerful git tab-completion, and it has a variety of prompt "themes", many of which display version-control data.
 <<oh_my_zsh_git>> is just one example of what can be done with this system.
 

-Original file line number
+Diff line change
 NrRFi9wrf+M7Q== [email protected]
 ----
 -For a more in-depth tutorial on creating an SSH key on multiple operating systems, see the GitHub guide on SSH keys at https://docs.github.com/en/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent[^].
 +For a more in-depth tutorial on creating an SSH key on multiple operating systems, see the GitHub guide on SSH keys at https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent[^].