Skip to content

Commit 9874ff5

Browse files
committed
Merge branch 'ta/doc-typofix' into maint
Doc fix. * ta/doc-typofix: doc: fix some typos
2 parents 42df89b + 7efc378 commit 9874ff5

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

Documentation/config/http.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ http.proxySSLKey::
4242
http.proxySSLCertPasswordProtected::
4343
Enable Git's password prompt for the proxy SSL certificate. Otherwise OpenSSL
4444
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`
4646
environment variable.
4747

4848
http.proxySSLCAInfo::
4949
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
5151
`GIT_PROXY_SSL_CAINFO` environment variable.
5252

5353
http.emptyAuth::

Documentation/config/trace2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ trace2.envVars::
5454
`GIT_HTTP_USER_AGENT,GIT_CONFIG` would cause the trace2 output to
5555
contain events listing the overrides for HTTP user agent and the
5656
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
5858
default.
5959

6060
trace2.destinationDebug::

Documentation/git-maintenance.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ register::
3838
for running in the background without disrupting foreground
3939
processes.
4040
+
41-
The `register` subcomand will also set the `maintenance.strategy` config
41+
The `register` subcommand will also set the `maintenance.strategy` config
4242
value to `incremental`, if this value is not previously set. The
4343
`incremental` strategy uses the following schedule for each maintenance
4444
task:

Documentation/git-p4.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ changelist text. Exiting with a non-zero status from the script
397397
will abort the process.
398398

399399
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
401401
is called even if `--prepare-p4-only` is set.
402402

403403
p4-changelist

Documentation/githooks.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ changelist text. Exiting with a non-zero status from the script
644644
will abort the process.
645645

646646
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
648648
is called even if `--prepare-p4-only` is set.
649649

650650
Run `git-p4 submit --help` for details.

Documentation/technical/reftable.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ especially if readers will not use the object name to ref mapping.
446446
Object blocks use unique, abbreviated 2-32 object name keys, mapping to
447447
ref blocks containing references pointing to that object directly, or as
448448
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
450450
the footer as `obj_id_len`.
451451

452452
To save space in small files, object blocks may be omitted if the ref

0 commit comments

Comments
 (0)