Author: svn-role
Date: Sun Mar 27 18:03:47 2022
New Revision: 1899258
URL: http://svn.apache.org/viewvc?rev=1899258&view=rev
Log:
Merge r1889629 from trunk:
* r1889629
Document how the port number is passed to custom tunnels.
Justification:
Documentation should be complete.
Votes:
+1: danielsh, markphip, hartmannathan
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_subr/config_file.c
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1889629
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899258&r1=1899257&r2=1899258&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sun Mar 27 18:03:47 2022
@@ -116,13 +116,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1889629
- Document how the port number is passed to custom tunnels.
- Justification:
- Documentation should be complete.
- Votes:
- +1: danielsh, markphip, hartmannathan
-
* r1897449
tests: Include additional information in an error message.
Justification:
Modified: subversion/branches/1.14.x/subversion/libsvn_subr/config_file.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_subr/config_file.c?rev=1899258&r1=1899257&r2=1899258&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/libsvn_subr/config_file.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_subr/config_file.c Sun Mar 27
18:03:47 2022
@@ -1442,11 +1442,12 @@ svn_config_ensure(const char *config_dir
"### is defined. The command (or environment variable) may contain" NL
"### arguments, using standard shell quoting for arguments with" NL
"### spaces. The command will be invoked as:" NL
- "### <command> <hostname> svnserve -t" NL
- "### (If the URL includes a username, then the hostname will be" NL
- "### passed to the tunnel agent as <user>@<hostname>.) If the" NL
- "### built-in ssh scheme were not predefined, it could be defined" NL
- "### as:" NL
+ "### <command> <hostinfo> svnserve -t" NL
+ "### where <hostinfo> is the hostname part of the URL. If the URL" NL
+ "### specified a username and/or a port, those are included in the" NL
+ "### <hostinfo> argument in the usual way: <user>@<hostname>:<port>."NL
+ "### If the built-in ssh scheme were not predefined, it could be" NL
+ "### defined as:" NL
"# ssh = $SVN_SSH ssh -q --" NL
"### If you wanted to define a new 'rsh' scheme, to be used with" NL
"### 'svn+rsh:' URLs, you could do so as follows:" NL
