Merge branch 'jc/doc-maintainer' into maint

diff --git a/Documentation/config.txt b/Documentation/config.txt
index bf8f911e1ffe7820a8e903ec669c690d39612150..e452ff89ba1f2935d6b22d030251b04db48a3cef 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1351,6 +1351,12 @@ help.autocorrect::
        value is 0 - the command will be just shown but not executed.
        This is the default.
 
+help.htmlpath::
+       Specify the path where the HTML documentation resides. File system paths
+       and URLs are supported. HTML pages will be prefixed with this path when
+       help is displayed in the 'web' format. This defaults to the documentation
+       path of your Git installation.
+
 http.proxy::
        Override the HTTP proxy, normally configured using the 'http_proxy',
        'https_proxy', and 'all_proxy' environment variables (see