Merge branch 'tb/ci-run-cocci-with-18.04' into maint

[thirdparty/git.git] / Documentation / config / http.txt

diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt
index 3968fbb697aea209affaf7f22594c598bb698ae1..7003661c0dba393778c0df03d2f26e121392c545 100644 (file)
--- 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::