[PATCH] * info/tramp (File): Tweak wording for the `scpc' option.

[PATCH] * info/tramp (File): Tweak wording for the `scpc' option.

[Eric Hanchrow]

 ChangeLog           |    4 ++++
 doc/misc/tramp.texi |   15 ++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 605ef32..0a3565e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Eric Hanchrow  <eric.hanchrow@gmail.com>
+
+	* info/tramp (File): Tweak wording for the `scpc' option.
+
 2011-12-17  Paul Eggert  <eggert@cs.ucla.edu>

 	Port HAVE_PTHREAD configuration to MirBSD 10 (Bug#10201).
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 1cea074..f0de574 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -866,13 +866,22 @@ Newer versions of @option{ssh} (for example
OpenSSH 4) offer an option
 @option{ControlMaster}.  This allows @option{scp} to reuse an existing
 @option{ssh} channel, which increases performance.

-Before you use this method, you shall check whether your @option{ssh}
-implementation does support this option.  Try from the command line
+Before you use this method, you should check whether your @option{ssh}
+implementation supports this option.  Try from the command line

 @example
-ssh localhost -o ControlMaster=yes
+ssh localhost -o ControlMaster=yes /bin/true
 @end example

+If that command succeeds silently, then you can use @option{scpc}; but
+if it fails like
+
+@example
+command-line: line 0: Bad configuration option: ControlMaster
+@end example
+
+then you cannot use it.
+
 This method supports the @samp{-p} argument.


-- 
1.7.8.rc3.17.gf56ef1

Re: [PATCH] * info/tramp (File): Tweak wording for the `scpc' option.

[Eli Zaretskii]

> From: Eric Hanchrow <eric.hanchrow@gmail.com>
> Date: Thu, 19 Jan 2012 12:46:35 -0800
> 
> +If that command succeeds silently, then you can use @option{scpc}; but
> +if it fails like
> +
> +@example
> +command-line: line 0: Bad configuration option: ControlMaster
> +@end example
> +
> +then you cannot use it.

You want a @noindent before the last line, otherwise it will be
indented as if it were a new paragraph.

Re: [PATCH] * info/tramp (File): Tweak wording for the `scpc' option.

[Michael Albinus]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Eric Hanchrow <eric.hanchrow@gmail.com>
>> Date: Thu, 19 Jan 2012 12:46:35 -0800
>> 
>> +If that command succeeds silently, then you can use @option{scpc}; but
>> +if it fails like
>> +
>> +@example
>> +command-line: line 0: Bad configuration option: ControlMaster
>> +@end example
>> +
>> +then you cannot use it.
>
> You want a @noindent before the last line, otherwise it will be
> indented as if it were a new paragraph.

That's not needed, because it is an @item of a @table.

Best regards, Michael.

Re: [PATCH] * info/tramp (File): Tweak wording for the `scpc' option.

[Michael Albinus]

Eric Hanchrow <eric.hanchrow@gmail.com> writes:

>  ChangeLog           |    4 ++++
>  doc/misc/tramp.texi |   15 ++++++++++++---
>  2 files changed, 16 insertions(+), 3 deletions(-)

Thanks, I've committed your patch to both Emacs and Tramp repositories.

Best regards, Michael.