aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2013-09-06 10:25:15 +0200
committerMichael Albinus2013-09-06 10:25:15 +0200
commit97e99cc328b3b98b060bc57ac865c535790cffdd (patch)
tree567097d7e4ccf0ed89320a9f5800c0ec6ac707a2
parent352d3beabbb6aada64c9fd1b946954164640b7f7 (diff)
downloademacs-97e99cc328b3b98b060bc57ac865c535790cffdd.tar.gz
emacs-97e99cc328b3b98b060bc57ac865c535790cffdd.zip
* tramp.texi (Alternative Syntax): Remove chapter.
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/tramp.texi42
2 files changed, 4 insertions, 42 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 22148deace0..85143fc2692 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
12013-09-06 Michael Albinus <michael.albinus@gmx.de>
2
3 * tramp.texi (Alternative Syntax): Remove chapter.
4
12013-08-28 Paul Eggert <eggert@cs.ucla.edu> 52013-08-28 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 * Makefile.in (SHELL): Now @SHELL@, not /bin/sh, 7 * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 03c6da3b73f..aa4cea58f04 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -225,7 +225,6 @@ Configuring @value{tramp} for use
225Using @value{tramp} 225Using @value{tramp}
226 226
227* Filename Syntax:: @value{tramp} filename conventions. 227* Filename Syntax:: @value{tramp} filename conventions.
228* Alternative Syntax:: URL-like filename syntax.
229* Filename completion:: Filename completion. 228* Filename completion:: Filename completion.
230* Ad-hoc multi-hops:: Declaring multiple hops in the file name. 229* Ad-hoc multi-hops:: Declaring multiple hops in the file name.
231* Remote processes:: Integration with other @value{emacsname} packages. 230* Remote processes:: Integration with other @value{emacsname} packages.
@@ -2356,7 +2355,6 @@ minute you have already forgotten that you hit that key!
2356 2355
2357@menu 2356@menu
2358* Filename Syntax:: @value{tramp} filename conventions. 2357* Filename Syntax:: @value{tramp} filename conventions.
2359* Alternative Syntax:: URL-like filename syntax.
2360* Filename completion:: Filename completion. 2358* Filename completion:: Filename completion.
2361* Ad-hoc multi-hops:: Declaring multiple hops in the file name. 2359* Ad-hoc multi-hops:: Declaring multiple hops in the file name.
2362* Remote processes:: Integration with other @value{emacsname} packages. 2360* Remote processes:: Integration with other @value{emacsname} packages.
@@ -2453,46 +2451,6 @@ by adding @file{#<port>} to the host name, like in @file{@trampfn{ssh,
2453daniel, melancholia#42, .emacs}}. 2451daniel, melancholia#42, .emacs}}.
2454 2452
2455 2453
2456@node Alternative Syntax
2457@section URL-like filename syntax
2458@cindex filename syntax
2459@cindex filename examples
2460
2461Additionally to the syntax described in the previous chapter, it is
2462possible to use a URL-like syntax for @value{tramp}. This can be
2463switched on by customizing the variable @code{tramp-syntax}. Please
2464note that this feature is experimental for the time being.
2465
2466The variable @code{tramp-syntax} must be set before requiring @value{tramp}:
2467
2468@lisp
2469(setq tramp-syntax 'url)
2470(require 'tramp)
2471@end lisp
2472
2473Then, a @value{tramp} filename would look like this:
2474@file{/@var{method}://@var{user}@@@var{machine}:@var{port}/@var{path/to.file}}.
2475@file{/@var{method}://} is mandatory, all other parts are optional.
2476@file{:@var{port}} is useful for methods only who support this.
2477
2478The last example from the previous section would look like this:
2479@file{/ssh://daniel@@melancholia/.emacs}.
2480
2481For the time being, @code{tramp-syntax} can have the following values:
2482
2483@itemize @w{}
2484@ifset emacs
2485@item @code{ftp}---That is the default syntax
2486@item @code{url}---URL-like syntax
2487@end ifset
2488@ifset xemacs
2489@item @code{sep}---That is the default syntax
2490@item @code{url}---URL-like syntax
2491@item @code{ftp}---EFS-like syntax
2492@end ifset
2493@end itemize
2494
2495
2496@node Filename completion 2454@node Filename completion
2497@section Filename completion 2455@section Filename completion
2498@cindex filename completion 2456@cindex filename completion