aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-06-07 10:46:49 -0700
committerJunio C Hamano <gitster@pobox.com>2025-06-07 10:46:49 -0700
commite2e22932cd9c684ab536f662eecb278ed23fe9fe (patch)
tree26595220ae06696de1c2a2b3fc44c86d1cbfb638 /Documentation
parentMerge branch 'master' of https://github.com/j6t/git-gui (diff)
parentcompletion: make sed command that generates config-list.h portable. (diff)
downloadgit-e2e22932cd9c684ab536f662eecb278ed23fe9fe.tar.gz
git-e2e22932cd9c684ab536f662eecb278ed23fe9fe.zip
Merge branch 'cf/var-completion-obsd-fixes'
Build fix for OpenBSD. * cf/var-completion-obsd-fixes: completion: make sed command that generates config-list.h portable.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config/gitcvs.adoc3
-rw-r--r--Documentation/config/http.adoc3
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/config/gitcvs.adoc b/Documentation/config/gitcvs.adoc
index 02da427fd9..31d7be3992 100644
--- a/Documentation/config/gitcvs.adoc
+++ b/Documentation/config/gitcvs.adoc
@@ -47,7 +47,8 @@ gitcvs.dbDriver::
May not contain double colons (`:`). Default: 'SQLite'.
See linkgit:git-cvsserver[1].
-gitcvs.dbUser, gitcvs.dbPass::
+gitcvs.dbUser::
+gitcvs.dbPass::
Database user and password. Only useful if setting `gitcvs.dbDriver`,
since SQLite has no concept of database users and/or passwords.
'gitcvs.dbUser' supports variable substitution (see
diff --git a/Documentation/config/http.adoc b/Documentation/config/http.adoc
index 67393282fa..9da5c298cc 100644
--- a/Documentation/config/http.adoc
+++ b/Documentation/config/http.adoc
@@ -289,7 +289,8 @@ for most push problems, but can increase memory consumption
significantly since the entire buffer is allocated even for small
pushes.
-http.lowSpeedLimit, http.lowSpeedTime::
+http.lowSpeedLimit::
+http.lowSpeedTime::
If the HTTP transfer speed, in bytes per second, is less than
'http.lowSpeedLimit' for longer than 'http.lowSpeedTime' seconds,
the transfer is aborted.