From: "Thomas Ackermann via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Martin Ågren" <martin.agren@gmail.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>,
"Thomas Ackermann" <th.acker@arcor.de>,
"Thomas Ackermann" <th.acker@arcor.de>
Subject: [PATCH v2] doc: fix some typos
Date: Sun, 03 Jan 2021 14:25:50 +0000 [thread overview]
Message-ID: <pull.831.v2.git.1609683950823.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.831.git.1609609214040.gitgitgadget@gmail.com>
From: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
---
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 th.acker@arcor.de
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
next prev parent reply other threads:[~2021-01-03 14:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-02 17:40 [PATCH] doc: fix some typos Thomas Ackermann via GitGitGadget
2021-01-02 21:53 ` Martin Ågren
2021-01-02 22:26 ` Felipe Contreras
2021-01-02 22:59 ` Martin Ågren
2021-01-02 23:40 ` Felipe Contreras
2021-01-03 14:50 ` Chris Torek
2021-01-03 14:25 ` Thomas Ackermann via GitGitGadget [this message]
2021-01-03 17:06 ` [PATCH v2] " Martin Ågren
2021-01-06 6:05 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2013-09-16 1:51 Xishi Qiu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.831.v2.git.1609683950823.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=th.acker@arcor.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.