From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eric Hanchrow Newsgroups: gmane.emacs.devel Subject: [PATCH] * info/tramp (File): Tweak wording for the `scpc' option. Date: Thu, 19 Jan 2012 12:46:35 -0800 Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: dough.gmane.org 1327006028 3697 80.91.229.12 (19 Jan 2012 20:47:08 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 19 Jan 2012 20:47:08 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 19 21:47:05 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Rnysy-0005Uo-NY for ged-emacs-devel@m.gmane.org; Thu, 19 Jan 2012 21:47:04 +0100 Original-Received: from localhost ([::1]:57722 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rnysy-0003co-1t for ged-emacs-devel@m.gmane.org; Thu, 19 Jan 2012 15:47:04 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:59283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rnysu-0003cU-Ik for emacs-devel@gnu.org; Thu, 19 Jan 2012 15:47:02 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rnyss-000211-Fl for emacs-devel@gnu.org; Thu, 19 Jan 2012 15:47:00 -0500 Original-Received: from mail-bk0-f41.google.com ([209.85.214.41]:35973) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rnyss-00020a-6B for emacs-devel@gnu.org; Thu, 19 Jan 2012 15:46:58 -0500 Original-Received: by bkbzx1 with SMTP id zx1so404108bkb.0 for ; Thu, 19 Jan 2012 12:46:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; bh=dEROObRnALkgw7ppnNzi9r7QRSZECMwNP7uo0jvMK5U=; b=EGcU7uL85x+MoI8Yh/3stVkKkHR6brVquRbTxjmHTL4vYOpxq10oq+IL9wagdHwfxc lWnR9JSa0Rexd//JgKJrRRMOZDE4HKjgDrfXh05zryI8WM5cIu/wm2FKTdC68f+DzpFv qolUqzfiwY+sxE8VML0yn2MD4dkbeZcNW/qKo= Original-Received: by 10.204.156.133 with SMTP id x5mr6579266bkw.86.1327006016217; Thu, 19 Jan 2012 12:46:56 -0800 (PST) Original-Received: by 10.204.49.10 with HTTP; Thu, 19 Jan 2012 12:46:35 -0800 (PST) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.41 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:147747 Archived-At: 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 + + * info/tramp (File): Tweak wording for the `scpc' option. + 2011-12-17 Paul Eggert 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