[svnbook] r5392 committed - branches/1.7/en

[cmpilato at users.sourceforge.net]

Revision: 5392
          http://sourceforge.net/p/svnbook/source/5392
Author:   cmpilato
Date:     2017-08-11 20:06:12 +0000 (Fri, 11 Aug 2017)
Log Message:
-----------
Merge from ^/trunk/en r5391.

Modified Paths:
--------------
    branches/1.7/en/book/ch06-server-configuration.xml

Property Changed:
----------------
    branches/1.7/en/

Index: branches/1.7/en
===================================================================
--- branches/1.7/en	2017-08-11 20:05:18 UTC (rev 5391)
+++ branches/1.7/en	2017-08-11 20:06:12 UTC (rev 5392)

Property changes on: branches/1.7/en
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk/en:4202,4211,4216,4226,4231,4251,4261,4267-4270,4273,4296,4299,4305,4316,4320,4328,4335,4352,4364,4368,4370-4372,4374-4375,4378,4380,4382,4384,4386-4387,4390,4392-4393,4463,4516,4742,4958,5041,5043,5082,5089,5094,5165,5285,5288,5290,5365-5366
\ No newline at end of property
+/trunk/en:4202,4211,4216,4226,4231,4251,4261,4267-4270,4273,4296,4299,4305,4316,4320,4328,4335,4352,4364,4368,4370-4372,4374-4375,4378,4380,4382,4384,4386-4387,4390,4392-4393,4463,4516,4742,4958,5041,5043,5082,5089,5094,5165,5285,5288,5290,5365-5366,5391
\ No newline at end of property
Modified: branches/1.7/en/book/ch06-server-configuration.xml
===================================================================
--- branches/1.7/en/book/ch06-server-configuration.xml	2017-08-11 20:05:18 UTC (rev 5391)
+++ branches/1.7/en/book/ch06-server-configuration.xml	2017-08-11 20:06:12 UTC (rev 5392)
@@ -1383,7 +1383,7 @@
       <informalexample>
         <programlisting>
 [tunnels]
-rsh = rsh
+rsh = rsh --
 </programlisting>
       </informalexample>
 
@@ -1391,17 +1391,28 @@
         URL scheme that matches the name of your new variable:
         <literal>svn+rsh://host/path</literal>.  When using the new
         URL scheme, the Subversion client will actually be running the
-        command <userinput>rsh host svnserve -t</userinput> behind the
+        command <userinput>rsh -- host svnserve -t</userinput> behind the
         scenes.  If you include a username in the URL (e.g.,
         <literal>svn+rsh://username@host/path</literal>), the client
-        will also include that in its command (<userinput>rsh
-        username at host svnserve -t</userinput>).  But you can define new
-        tunneling schemes to be much more clever than that:</para>
+        will also include that in its command (<userinput>rsh --
+        username at host svnserve -t</userinput>).</para>
 
+      <warning>
+        <para>Notice that when defining an RSH-based tunnel, we've
+          added the <literal>--</literal> end-of-options argument to
+          the tunnel command line.  This is to prevent a malformed
+          hostname from being treated as another option to the tunnel
+          command.  You should do the same for other tunnel programs
+          (for example, SSH).</para>
+      </warning>
+
+      <para>But you can define new tunneling schemes to be much more
+        clever than that:</para>
+
       <informalexample>
         <programlisting>
 [tunnels]
-joessh = $JOESSH /opt/alternate/ssh -p 29934
+joessh = $JOESSH /opt/alternate/ssh -p 29934 --
 </programlisting>
       </informalexample>