Subject: [PATCH v2] doc: fix some typos

From: "Thomas Ackermann via GitGitGadget" <[email-masked]>
Date: Sun, 03 Jan 2021 14:25:50 +0000

From: Thomas Ackermann <[email-masked]>

Signed-off-by: Thomas Ackermann <[email-masked]>
---
    doc: fix some typos
    
    Changed since v1:
    
     * Removed changes in non-doc file contrib/buildsystems/CMakeLists.txt
       from the patch. Thanks to Martin and Felipe for pointing this out.
    
    Signed-off-by: Thomas Ackermann [email-masked]

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-831%2Ftacker66%2Ffix_some_typos-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-831/tacker66/fix_some_typos-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/831

Range-diff vs v1:

 1:  7016f417044 ! 1:  67e26552cb6 doc: fix some typos
     @@ Documentation/technical/reftable.txt: especially if readers will not use the obj
       the footer as `obj_id_len`.
       
       To save space in small files, object blocks may be omitted if the ref
     -
     - ## contrib/buildsystems/CMakeLists.txt ##
     -@@ contrib/buildsystems/CMakeLists.txt: endif()
     - check_c_source_compiles("
     - #include <regex.h>
     - #ifndef REG_STARTEND
     --#error oops we dont have it
     -+#error oops we don't have it
     - #endif
     - 
     - int main(void)

 Documentation/config/http.txt        | 4 ++--
 Documentation/config/trace2.txt      | 2 +-
 Documentation/git-maintenance.txt    | 2 +-
 Documentation/git-p4.txt             | 2 +-
 Documentation/githooks.txt           | 2 +-
 Documentation/technical/reftable.txt | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt
index 3968fbb697a..7003661c0db 100644
--- a/Documentation/config/http.txt
+++ b/Documentation/config/http.txt
@@ -42,12 +42,12 @@ http.proxySSLKey::
 http.proxySSLCertPasswordProtected::
 	Enable Git's password prompt for the proxy SSL certificate.  Otherwise OpenSSL
 	will prompt the user, possibly many times, if the certificate or private key
-	is encrypted. Can be overriden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED`
+	is encrypted. Can be overridden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED`
 	environment variable.
 
 http.proxySSLCAInfo::
 	Pathname to the file containing the certificate bundle that should be used to
-	verify the proxy with when using an HTTPS proxy. Can be overriden by the
+	verify the proxy with when using an HTTPS proxy. Can be overridden by the
 	`GIT_PROXY_SSL_CAINFO` environment variable.
 
 http.emptyAuth::
diff --git a/Documentation/config/trace2.txt b/Documentation/config/trace2.txt
index 01d3afd8a8b..fe1642f0d40 100644
--- a/Documentation/config/trace2.txt
+++ b/Documentation/config/trace2.txt
@@ -54,7 +54,7 @@ trace2.envVars::
 	`GIT_HTTP_USER_AGENT,GIT_CONFIG` would cause the trace2 output to
 	contain events listing the overrides for HTTP user agent and the
 	location of the Git configuration file (assuming any are set).  May be
-	overriden by the `GIT_TRACE2_ENV_VARS` environment variable.  Unset by
+	overridden by the `GIT_TRACE2_ENV_VARS` environment variable.  Unset by
 	default.
 
 trace2.destinationDebug::
diff --git a/Documentation/git-maintenance.txt b/Documentation/git-maintenance.txt
index d1f9b5172df..6fe1e5e1055 100644
--- a/Documentation/git-maintenance.txt
+++ b/Documentation/git-maintenance.txt
@@ -38,7 +38,7 @@ register::
 	for running in the background without disrupting foreground
 	processes.
 +
-The `register` subcomand will also set the `maintenance.strategy` config
+The `register` subcommand will also set the `maintenance.strategy` config
 value to `incremental`, if this value is not previously set. The
 `incremental` strategy uses the following schedule for each maintenance
 task:
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index ec233ac0c1c..f89e68b424c 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -397,7 +397,7 @@ changelist text. Exiting with a non-zero status from the script
 will abort the process.
 
 The purpose of the hook is to edit the message file in place,
-and it is not supressed by the `--no-verify` option. This hook
+and it is not suppressed by the `--no-verify` option. This hook
 is called even if `--prepare-p4-only` is set.
 
 p4-changelist
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index ffccfc77608..1f3b57d04db 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -644,7 +644,7 @@ changelist text. Exiting with a non-zero status from the script
 will abort the process.
 
 The purpose of the hook is to edit the message file in place,
-and it is not supressed by the `--no-verify` option. This hook
+and it is not suppressed by the `--no-verify` option. This hook
 is called even if `--prepare-p4-only` is set.
 
 Run `git-p4 submit --help` for details.
diff --git a/Documentation/technical/reftable.txt b/Documentation/technical/reftable.txt
index 2951840e9c9..8095ab2590c 100644
--- a/Documentation/technical/reftable.txt
+++ b/Documentation/technical/reftable.txt
@@ -446,7 +446,7 @@ especially if readers will not use the object name to ref mapping.
 Object blocks use unique, abbreviated 2-32 object name keys, mapping to
 ref blocks containing references pointing to that object directly, or as
 the peeled value of an annotated tag. Like ref blocks, object blocks use
-the file's standard block size. The abbrevation length is available in
+the file's standard block size. The abbreviation length is available in
 the footer as `obj_id_len`.
 
 To save space in small files, object blocks may be omitted if the ref

base-commit: 71ca53e8125e36efbda17293c50027d31681a41f
-- 
gitgitgadget