doc: fix some typos
Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Acked-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Ackermann committed
Jan 3, 2021 at 14:25 UTC
7efc37820508ba00ab426b3f901865f8bd3bdcef
6 files changed
+7
-7
Documentation/config/http.txt
+2
-2
@@ -42,12 +42,12 @@ http.proxySSLKey::
42
http.proxySSLCertPasswordProtected::
43
Enable Git's password prompt for the proxy SSL certificate. Otherwise OpenSSL
44
will prompt the user, possibly many times, if the certificate or private key
45
- is encrypted. Can be overriden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED`
45
+ is encrypted. Can be overridden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED`
46
environment variable.
47
48
http.proxySSLCAInfo::
49
Pathname to the file containing the certificate bundle that should be used to
50
- verify the proxy with when using an HTTPS proxy. Can be overriden by the
50
+ verify the proxy with when using an HTTPS proxy. Can be overridden by the
51
`GIT_PROXY_SSL_CAINFO` environment variable.
52
53
http.emptyAuth::
Documentation/config/trace2.txt
+1
-1
@@ -54,7 +54,7 @@ trace2.envVars::
54
`GIT_HTTP_USER_AGENT,GIT_CONFIG` would cause the trace2 output to
55
contain events listing the overrides for HTTP user agent and the
56
location of the Git configuration file (assuming any are set). May be
57
- overriden by the `GIT_TRACE2_ENV_VARS` environment variable. Unset by
57
+ overridden by the `GIT_TRACE2_ENV_VARS` environment variable. Unset by
58
default.
59
60
trace2.destinationDebug::
Documentation/git-maintenance.txt
+1
-1
@@ -38,7 +38,7 @@ register::
38
for running in the background without disrupting foreground
39
processes.
40
+
41
-The `register` subcomand will also set the `maintenance.strategy` config
41
+The `register` subcommand will also set the `maintenance.strategy` config
42
value to `incremental`, if this value is not previously set. The
43
`incremental` strategy uses the following schedule for each maintenance
44
task:
Documentation/git-p4.txt
+1
-1
@@ -397,7 +397,7 @@ changelist text. Exiting with a non-zero status from the script
397
will abort the process.
398
399
The purpose of the hook is to edit the message file in place,
400
-and it is not supressed by the `--no-verify` option. This hook
400
+and it is not suppressed by the `--no-verify` option. This hook
401
is called even if `--prepare-p4-only` is set.
402
403
p4-changelist
Documentation/githooks.txt
+1
-1
@@ -644,7 +644,7 @@ changelist text. Exiting with a non-zero status from the script
644
will abort the process.
645
646
The purpose of the hook is to edit the message file in place,
647
-and it is not supressed by the `--no-verify` option. This hook
647
+and it is not suppressed by the `--no-verify` option. This hook
648
is called even if `--prepare-p4-only` is set.
649
650
Run `git-p4 submit --help` for details.
Documentation/technical/reftable.txt
+1
-1
@@ -446,7 +446,7 @@ especially if readers will not use the object name to ref mapping.
446
Object blocks use unique, abbreviated 2-32 object name keys, mapping to
447
ref blocks containing references pointing to that object directly, or as
448
the peeled value of an annotated tag. Like ref blocks, object blocks use
449
-the file's standard block size. The abbrevation length is available in
449
+the file's standard block size. The abbreviation length is available in
450
the footer as `obj_id_len`.
451
452
To save space in small files, object blocks may be omitted if the ref