diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:31:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:31:21 -0800 |
| commit | 9874ff59267e6d29af09b02f5f4facc2825f044f (patch) | |
| tree | e21021405889fa47829432c3363d07c7a7f3883a /Documentation/config | |
| parent | Merge branch 'pk/subsub-fetch-fix-take-2' into maint (diff) | |
| parent | doc: fix some typos (diff) | |
| download | tgif-9874ff59267e6d29af09b02f5f4facc2825f044f.tar.xz | |
Merge branch 'ta/doc-typofix' into maint
Doc fix.
* ta/doc-typofix:
doc: fix some typos
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/http.txt | 4 | ||||
| -rw-r--r-- | Documentation/config/trace2.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt index 3968fbb697..7003661c0d 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 01d3afd8a8..fe1642f0d4 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:: |