[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111296: Port documentation to Texinfo 5.0.

[Michael Albinus]

------------------------------------------------------------
revno: 111296
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Sun 2013-02-24 18:58:29 +0100
message:
  Port documentation to Texinfo 5.0.
  
  * tramp.texi (top) [xxx, yyy, trampfn]: Remove superfluous @c.
  (Filename Syntax): Do not use @trampfn{} in @item.
  (Filename completion): Use @columnfractions in @multitable.
modified:
  doc/misc/tramp.texi

=== modified file 'doc/misc/tramp.texi'
--- a/doc/misc/tramp.texi       2013-02-21 21:33:04 +0000
+++ b/doc/misc/tramp.texi       2013-02-24 17:58:29 +0000
@@ -20,20 +20,23 @@
 @c xxx and yyy are auxiliary macros in order to omit leading and
 @c trailing whitespace.  Not very elegant, but I don't know it better.
 
address@hidden xxx address@hidden
address@hidden address@hidden
address@hidden xxx {one}
address@hidden \one\
 @end macro
 
address@hidden yyy {one, address@hidden
address@hidden yyy {one, two}
 @address@hidden
address@hidden address@hidden
address@hidden x
 address@hidden@c
 @end ifclear
address@hidden address@hidden
address@hidden x\one\
 @end macro
 
address@hidden trampfn {method, user, host, address@hidden
address@hidden@yyy{\method\,@address@hidden,@@address@hidden@c
address@hidden trampfn {method, user, host, localname}
address@hidden@c
address@hidden,@address@hidden
address@hidden,@@address@hidden
address@hidden
 @end macro
 
 @copying
@@ -2268,25 +2271,25 @@
 Some examples of @value{tramp} filenames are shown below.
 
 @table @file
address@hidden @trampfn{, , melancholia, .emacs}
address@hidden @address@hidden
 Edit the file @file{.emacs} in your home directory on the machine
 @code{melancholia}.
 
address@hidden @trampfn{, , melancholia.danann.net, .emacs}
address@hidden @address@hidden
 This edits the same file, using the fully qualified domain name of
 the machine.
 
address@hidden @trampfn{, , melancholia, ~/.emacs}
address@hidden @address@hidden/.emacs
 This also edits the same file; the @file{~} is expanded to your
 home directory on the remote machine, just like it is locally.
 
address@hidden @trampfn{, , melancholia, ~daniel/.emacs}
address@hidden @address@hidden/.emacs
 This edits the file @file{.emacs} in the home directory of the user
 @code{daniel} on the machine @code{melancholia}.  The @file{~<user>}
 construct is expanded to the home directory of that user on the remote
 machine.
 
address@hidden @trampfn{, , melancholia, /etc/squid.conf}
address@hidden @address@hidden/etc/squid.conf
 This edits the file @file{/etc/squid.conf} on the machine
 @code{melancholia}.
 
@@ -2396,7 +2399,8 @@
 @key{TAB}}, @value{tramp} might give you as result the choice for
 
 @example
address@hidden address@hidden, , melancholia.danann.net,}} address@hidden, , 
192.168.0.1,}}
address@hidden @multitable address@hidden, , melancholia.danann.net,}} 
address@hidden, , 192.168.0.1,}}
address@hidden @columnfractions .5 .5
 @ifset emacs
 @item @address@hidden @tab tmp/
 @item @address@hidden @tab
@@ -2423,7 +2427,8 @@
 your @file{/etc/hosts} file, let's say
 
 @example
address@hidden address@hidden, , melancholia.danann.net,}} address@hidden, , 
192.168.0.1,}}
address@hidden @columnfractions .5 .5
address@hidden @multitable address@hidden, , melancholia.danann.net,}} 
address@hidden, , 192.168.0.1,}}
 @item @trampfn{telnet, , 127.0.0.1,} @tab @trampfn{telnet, , 192.168.0.1,}
 @item @trampfn{telnet, , @value{ipv6prefix}::address@hidden,} @tab 
@trampfn{telnet, , localhost,}
 @item @trampfn{telnet, , melancholia.danann.net,} @tab @trampfn{telnet, , 
melancholia,}