Skip to content

Commit d040139

Browse files
authored
Merge pull request #1835 from progit/dependabot/bundler/html-proofer-5.0.5
Update html-proofer requirement from 4.4.1 to 5.0.5
2 parents d9acee5 + 10f605f commit d040139

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/workflows/pr-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Set up Ruby
1414
uses: ruby/setup-ruby@v1
1515
with:
16-
ruby-version: 2.7
16+
ruby-version: 3.1
1717
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
1818

1919
- name: Build book

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ gem 'coderay', '1.1.3'
1414
gem 'pygments.rb', '2.3.1'
1515
gem 'thread_safe', '0.3.6'
1616
gem 'epubcheck-ruby', '4.2.6.0'
17-
gem 'html-proofer', '4.4.1'
17+
gem 'html-proofer', '5.0.5'
1818
gem 'kindlegen', '3.1.1'

book/07-git-tools/sections/credentials.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ Git has a few options provided in the box:
2020
* 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.
2121
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.
2222
* 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.
23-
This is similar to the "`osxkeychain`" helper described above, but uses the Windows Credential Store to control sensitive information.
24-
It can also serve credentials to WSL1 or WSL2. See https://github.com/GitCredentialManager/git-credential-manager#windows[GCM Install Instructions] for more information.
23+
This is similar to the "`osxkeychain`" helper described above, but uses the Windows Credential Store to control sensitive information.
24+
It can also serve credentials to WSL1 or WSL2. See https://github.com/GitCredentialManager/git-credential-manager#readme[GCM Install Instructions] for more information.
2525

2626
You can choose one of these methods by setting a Git configuration value:
2727

book/09-git-and-other-scms/sections/client-p4.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ The second is git-p4, a client-side bridge that lets you use Git as a Perforce c
1515
===== Git Fusion
1616

1717
(((Perforce, Git Fusion)))
18-
Perforce provides a product called Git Fusion (available at http://www.perforce.com/git-fusion[^]), which synchronizes a Perforce server with Git repositories on the server side.
18+
Perforce provides a product called Git Fusion (available at https://www.perforce.com/git-fusion[^]), which synchronizes a Perforce server with Git repositories on the server side.
1919

2020
====== Setting Up
2121

2222
For our examples, we'll be using the easiest installation method for Git Fusion, which is downloading a virtual machine that runs the Perforce daemon and Git Fusion.
23-
You can get the virtual machine image from http://www.perforce.com/downloads/Perforce/20-User[^], and once it's finished downloading, import it into your favorite virtualization software (we'll use VirtualBox).
23+
You can get the virtual machine image from https://www.perforce.com/downloads/Perforce/20-User[^], and once it's finished downloading, import it into your favorite virtualization software (we'll use VirtualBox).
2424

2525
Upon first starting the machine, it asks you to customize the password for three Linux users (`root`, `perforce`, and `git`), and provide an instance name, which can be used to distinguish this installation from others on the same network.
2626
When that has all completed, you'll see this:

book/A-git-in-other-environments/sections/zsh.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ It looks a bit like this:
4040
.Customized `zsh` prompt
4141
image::images/zsh-prompt.png[Customized `zsh` prompt]
4242

43-
For more information on `vcs_info`, check out its documentation in the `zshcontrib(1)` manual page, or online at http://zsh.sourceforge.net/Doc/Release/User-Contributions.html#Version-Control-Information[^].
43+
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[^].
4444

4545
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.
4646
`git-prompt.sh` is compatible with both Bash and Zsh.

0 commit comments

Comments
 (0)