From fbd359033c1dad844011aecf83cd76853b058998 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Fri, 15 Jul 2022 21:27:55 +0200
Subject: [PATCH] Capitalise "Git" outside of command and package names

Its documentation and web site refer to it as "Git" not "git".
---
 chapter-bugs.dbk         | 8 ++++----
 chapter-common-tasks.dbk | 2 +-
 chapter-scope.dbk        | 2 +-
 debian/changelog         | 7 ++++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/chapter-bugs.dbk b/chapter-bugs.dbk
index 1cf7e3b..5ebec8d 100644
--- a/chapter-bugs.dbk
+++ b/chapter-bugs.dbk
@@ -29,8 +29,8 @@ console</ulink>, or a photograph.
 <para>
 If the report is relaying information about a bug acknowledged upstream, we do
 not need system information but we do need specific references (<ulink
-url="https://bugzilla.kernel.org">bugzilla.kernel.org</ulink> or
-<command>git</command> commit id).
+url="https://bugzilla.kernel.org">bugzilla.kernel.org</ulink> or Git commit
+id).
 </para>
 </listitem>
 <listitem>
@@ -147,7 +147,7 @@ url="https://patchwork.kernel.org">patchwork.kernel.org</ulink>
 </listitem>
 <listitem>
 <para>
-Viewing git commit logs for relevant source files
+Viewing Git commit logs for relevant source files
 </para>
 <itemizedlist>
 <listitem>
@@ -448,7 +448,7 @@ work:
 <prompt>$</prompt> <userinput>git bisect start v<replaceable>new-version</replaceable> v<replaceable>old-version</replaceable></userinput>
 </screen>
 <para>
-Now git checks out a version half-way in between to test.  Build it, reusing
+Now Git checks out a version half-way in between to test.  Build it, reusing
 the prepared configuration.
 </para>
 <screen>
diff --git a/chapter-common-tasks.dbk b/chapter-common-tasks.dbk
index ad62c44..c869156 100644
--- a/chapter-common-tasks.dbk
+++ b/chapter-common-tasks.dbk
@@ -281,7 +281,7 @@ version is a release candidate, change the string <literal>-rc</literal> to
 </para>
 <para>
 The 'orig' tarball is generated by the <command>genorig.py</command>
-script, which requires an upstream git repository.  For Debian 12
+script, which requires an upstream Git repository.  For Debian 12
 "bookworm" onward, this can be a remote repository; for older stable
 branches it must be local.  Run:
 </para>
diff --git a/chapter-scope.dbk b/chapter-scope.dbk
index 5ebe614..f9b5c66 100644
--- a/chapter-scope.dbk
+++ b/chapter-scope.dbk
@@ -29,7 +29,7 @@ This handbook is maintained within the <ulink
 url="https://salsa.debian.org/kernel-team/kernel-handbook">kernel-handbook</ulink>
 project on <ulink url="https://salsa.debian.org">Salsa</ulink>.  The SGML
 source of the book may be checked out from the Debian <ulink
-url="https://salsa.debian.org/kernel-team/kernel-handbook.git">git
+url="https://salsa.debian.org/kernel-team/kernel-handbook.git">Git
 repository</ulink>.  It is intended as a community project, thus all proposals
 for improvements and contributions are welcome.  The preferred way to submit a
 contribution is to send it to the
diff --git a/debian/changelog b/debian/changelog
index 5b351f5..7e1dfce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,17 +5,18 @@ kernel-handbook (1.0.20) UNRELEASED; urgency=medium
   * Correct the filenames where debug-info is enabled in the linux package
   * Link to lore.kernel.org as preferred mail archive
   * Makefile: Update name of public pages directory in clean rule
-  * Makefile: Generate git version in a way that works with GitLab CI variables
+  * Makefile: Generate Git version in a way that works with GitLab CI variables
   * d/salsa-ci.yml: Add CI configuration for salsa.debian.org
   * Makefile, d/salsa-ci.yml: Move pages update to CI
-  * Change URL for kernel git repository to use HTTP-S
+  * Change URL for kernel Git repository to use HTTP-S
   * Fix a plaintext HTTP URL in the Japanese translation
-  * Change bisection instructions to include verifying upstream git tags
+  * Change bisection instructions to include verifying upstream Git tags
     (Closes: #958559)
   * Change custom package building examples to use the bindeb-pkg target
   * Remove documentation of genorig.py's obsolete, insecure tarball support
   * Add new build-dependencies to bisection instructions
   * Refer to libncurses-dev instead of the now-transitional libncurses5-dev
+  * Capitalise "Git" outside of command and package names
 
   [ Debian Janitor ]
   * Trim trailing whitespace.