Merge branch 'jk/relative-directory-fix'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index ce9102cea83766be0ae8d2ed2867fd4c587d7a95..2659153cb377554bc5cf6fc4199233b2bab498a2 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1957,6 +1957,7 @@ http.sslVersion::
        - tlsv1.0
        - tlsv1.1
        - tlsv1.2
+       - tlsv1.3
 
 +
 Can be overridden by the `GIT_SSL_VERSION` environment variable.
@@ -3364,7 +3365,7 @@ uploadpack.packObjectsHook::
        stdout.
 
 uploadpack.allowFilter::
-       If this option is set, `upload-pack` will advertise partial
+       If this option is set, `upload-pack` will support partial
        clone and partial fetch object filtering.
 +
 Note that this configuration variable is ignored if it is seen in the