summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-02-14 20:42:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-14 20:42:30 (GMT)
commit80b806f1a8a5a51fe2cab52ecfc399142e677ef4 (patch)
tree9c2c67f8c7da728105db993de0af4353650640e7
parenteceff4ba124e6d18ed690b1f3ec6b0587e5359ed (diff)
parent856249c62a7e0633f119e25926410f4538cfb832 (diff)
downloadgit-80b806f1a8a5a51fe2cab52ecfc399142e677ef4.zip
git-80b806f1a8a5a51fe2cab52ecfc399142e677ef4.tar.gz
git-80b806f1a8a5a51fe2cab52ecfc399142e677ef4.tar.bz2
Merge branch 'bc/actualmente' into maint
Doc grammo fix. * bc/actualmente: docs: use "currently" for the present time
-rw-r--r--Documentation/config/http.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt
index 5a32f5b..8471b39 100644
--- a/Documentation/config/http.txt
+++ b/Documentation/config/http.txt
@@ -71,7 +71,7 @@ http.saveCookies::
http.version::
Use the specified HTTP protocol version when communicating with a server.
If you want to force the default. The available and default version depend
- on libcurl. Actually the possible values of
+ on libcurl. Currently the possible values of
this option are:
- HTTP/2
@@ -84,7 +84,7 @@ http.sslVersion::
particular configuration of the crypto library in use. Internally
this sets the 'CURLOPT_SSL_VERSION' option; see the libcurl
documentation for more details on the format of this option and
- for the ssl version supported. Actually the possible values of
+ for the ssl version supported. Currently the possible values of
this option are:
- sslv2