Merge branch 'main' into patch-1

Author: mavaddat

.github/workflows/pr-build.yml

@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

.github/workflows/release-on-merge.yml

@@ -8,7 +8,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
 

Gemfile

@@ -1,17 +1,17 @@
 source 'https://rubygems.org'
 
 gem 'rake', '13.0.6'
-gem 'asciidoctor', '2.0.16'
+gem 'asciidoctor', '2.0.17'
 
-gem 'json', '2.6.1'
+gem 'json', '2.6.2'
 gem 'awesome_print', '1.9.2'
 
 gem 'asciidoctor-epub3', '1.5.1'
-gem 'asciidoctor-pdf', '1.6.1'
+gem 'asciidoctor-pdf', '2.3.0'
 
 gem 'coderay', '1.1.3'
-gem 'pygments.rb', '2.2.0'
+gem 'pygments.rb', '2.3.0'
 gem 'thread_safe', '0.3.6'
 gem 'epubcheck-ruby', '4.2.6.0'
-gem 'html-proofer', '3.19.3'
+gem 'html-proofer', '4.4.0'
 gem 'kindlegen', '3.1.1'

Rakefile

@@ -98,7 +98,7 @@ namespace :book do
   task :check => [:build_html, :build_epub] do
       puts 'Checking generated books'
 
-      sh "htmlproofer --check-html progit.html"
+      sh "htmlproofer progit.html"
       sh "epubcheck progit.epub"
   end
 

book/01-introduction/sections/about-version-control.asc

@@ -23,7 +23,7 @@ To deal with this issue, programmers long ago developed local VCSs that had a si
 image::images/local.png[Local version control diagram]
 
 One of the most popular VCS tools was a system called RCS, which is still distributed with many computers today.
-https://www.gnu.org/software/rcs/[RCS] works by keeping patch sets (that is, the differences between files) in a special format on disk; it can then re-create what any file looked like at any point in time by adding up all the patches.
+https://www.gnu.org/software/rcs/[RCS^] works by keeping patch sets (that is, the differences between files) in a special format on disk; it can then re-create what any file looked like at any point in time by adding up all the patches.
 
 ==== Centralized Version Control Systems
 

book/01-introduction/sections/first-time-setup.asc

@@ -84,6 +84,7 @@ You may find, if you don't setup your editor like this, you get into a really co
 An example on a Windows system may include a prematurely terminated Git operation during a Git initiated edit.
 ====
 
+[[_default_branch]]
 ==== Your default branch name
 
 By default Git will create a branch called _master_ when you create a new repository with `git init`.

book/01-introduction/sections/help.asc

@@ -18,7 +18,7 @@ $ git help config
 ----
 
 These commands are nice because you can access them anywhere, even offline.
-If the manpages and this book aren't enough and you need in-person help, you can try the `#git`, `#github`, or `#gitlab` channels on the Libera Chat IRC server, which can be found at https://libera.chat/[].
+If the manpages and this book aren't enough and you need in-person help, you can try the `#git`, `#github`, or `#gitlab` channels on the Libera Chat IRC server, which can be found at https://libera.chat/[^].
 These channels are regularly filled with hundreds of people who are all very knowledgeable about Git and are often willing to help.(((IRC)))
 
 In addition, if you don't need the full-blown manpage help, but just need a quick refresher on the available options for a Git command, you can ask for the more concise "`help`" output with the `-h` option, as in:

book/01-introduction/sections/installing.asc

@@ -6,9 +6,9 @@ You can either install it as a package or via another installer, or download the
 
 [NOTE]
 ====
-This book was written using Git version *2.8.0*.
-Though most of the commands we use should work even in ancient versions of Git, some of them might not or might act slightly differently if you're using an older version.
-Since Git is quite excellent at preserving backwards compatibility, any version after 2.8 should work just fine.
+This book was written using Git version 2.
+Since Git is quite excellent at preserving backwards compatibility, any recent version should work just fine.
+Though most of the commands we use should work even in ancient versions of Git, some of them might not or might act slightly differently.
 ====
 
 ==== Installing on Linux
@@ -29,7 +29,7 @@ If you're on a Debian-based distribution, such as Ubuntu, try `apt`:
 $ sudo apt install git-all
 ----
 
-For more options, there are instructions for installing on several different Unix distributions on the Git website, at https://git-scm.com/download/linux[].
+For more options, there are instructions for installing on several different Unix distributions on the Git website, at https://git-scm.com/download/linux[^].
 
 ==== Installing on macOS
 
@@ -46,7 +46,7 @@ $ git --version
 If you don't have it installed already, it will prompt you to install it.
 
 If you want a more up to date version, you can also install it via a binary installer.
-A macOS Git installer is maintained and available for download at the Git website, at https://git-scm.com/download/mac[].
+A macOS Git installer is maintained and available for download at the Git website, at https://git-scm.com/download/mac[^].
 
 .Git macOS Installer
 image::images/git-osx-installer.png[Git macOS installer]
@@ -55,10 +55,10 @@ image::images/git-osx-installer.png[Git macOS installer]
 
 There are also a few ways to install Git on Windows.(((Windows, installing)))
 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[].
+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://chocolatey.org/packages/git[Git Chocolatey package^].
 Note that the Chocolatey package is community maintained.
 
 ==== Installing from Source
@@ -87,7 +87,7 @@ $ sudo apt-get install asciidoc xmlto docbook2x
 
 [NOTE]
 ====
-Users of RHEL and RHEL-derivatives like CentOS and Scientific Linux will have to https://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F[enable the EPEL repository] to download the `docbook2X` package.
+Users of RHEL and RHEL-derivatives like CentOS and Scientific Linux will have to https://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F[enable the EPEL repository^] to download the `docbook2X` package.
 ====
 
 If you're using a Debian-based distribution (Debian/Ubuntu/Ubuntu-derivatives), you also need the `install-info` package:
@@ -114,7 +114,7 @@ $ sudo ln -s /usr/bin/db2x_docbook2texi /usr/bin/docbook2x-texi
 due to binary name differences.
 
 When you have all the necessary dependencies, you can go ahead and grab the latest tagged release tarball from several places.
-You can get it via the kernel.org site, at https://www.kernel.org/pub/software/scm/git[], or the mirror on the GitHub website, at https://github.com/git/git/releases[].
+You can get it via the kernel.org site, at https://www.kernel.org/pub/software/scm/git[], or the mirror on the GitHub website, at https://github.com/git/git/releases[^].
 It's generally a little clearer what the latest version is on the GitHub page, but the kernel.org page also has release signatures if you want to verify your download.
 
 Then, compile and install:

book/02-git-basics/sections/recording-changes.asc

@@ -36,6 +36,15 @@ Finally, the command tells you which branch you're on and informs you that it ha
 For now, that branch is always `master`, which is the default; you won't worry about it here.
 <<ch03-git-branching#ch03-git-branching>> will go over branches and references in detail.
 
+[NOTE]
+====
+GitHub changed the default branch name from `master` to `main` in mid-2020, and other Git hosts followed suit.
+So you may find that the default branch name in some newly created repositories is `main` and not `master`.
+In addition, the default branch name can be changed (as you have seen in <<ch01-getting-started#_default_branch>>), so you may see a different name for the default branch.
+
+However, Git itself still uses `master` as the default, so we will use it throughout the book.
+====
+
 Let's say you add a new file to your project, a simple `README` file.
 If the file didn't exist before, and you run `git status`, you see your untracked file like so:
 
@@ -254,7 +263,7 @@ doc/**/*.pdf
 
 [TIP]
 ====
-GitHub maintains a fairly comprehensive list of good `.gitignore` file examples for dozens of projects and languages at https://github.com/github/gitignore[] if you want a starting point for your project.
+GitHub maintains a fairly comprehensive list of good `.gitignore` file examples for dozens of projects and languages at https://github.com/github/gitignore[^] if you want a starting point for your project.
 ====
 
 [NOTE]
@@ -617,4 +626,4 @@ $ git add README
 
 Git figures out that it's a rename implicitly, so it doesn't matter if you rename a file that way or with the `mv` command.
 The only real difference is that `git mv` is one command instead of three -- it's a convenience function.
-More importantly, you can use any tool you like to rename a file, and address the add/rm later, before you commit.
+More importantly, you can use any tool you like to rename a file, and address the `add`/`rm` later, before you commit.

book/03-git-branching/sections/branch-management.asc

@@ -153,7 +153,7 @@ Now we end up with the following state:
 
 [source,console]
 ----
-git branch --all
+$ git branch --all
 * main
   remotes/origin/HEAD -> origin/master
   remotes/origin/main