[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100492: * tramp.texi: Use consistently "Emacs" (instead of "GNU Emacs") and

[Michael Albinus]

------------------------------------------------------------
revno: 100492
committer: Michael Albinus <address@hidden>
branch nick: emacs-23
timestamp: Sat 2011-02-19 20:55:44 +0100
message:
  * tramp.texi: Use consistently "Emacs" (instead of "GNU Emacs") and
  "Debian GNU/Linux".
  
  * trampver.texi [xemacs]: Set emacsothername to "Emacs".
modified:
  doc/misc/ChangeLog
  doc/misc/tramp.texi
  doc/misc/trampver.texi

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2011-02-18 13:57:53 +0000
+++ b/doc/misc/ChangeLog        2011-02-19 19:55:44 +0000
@@ -1,3 +1,10 @@
+2011-02-19  Michael Albinus  <address@hidden>
+
+       * tramp.texi: Use consistently "Emacs" (instead of "GNU Emacs") and
+       "Debian GNU/Linux".
+
+       * trampver.texi [xemacs]: Set emacsothername to "Emacs".
+
 2011-02-18  Eli Zaretskii  <address@hidden>
 
        * ada-mode.texi: Sync @dircategory with ../../info/dir.

=== modified file 'doc/misc/tramp.texi'
--- a/doc/misc/tramp.texi       2011-02-18 13:57:53 +0000
+++ b/doc/misc/tramp.texi       2011-02-19 19:55:44 +0000
@@ -376,13 +376,12 @@
 @cindex obtaining Tramp
 
 @value{tramp} is freely available on the Internet and the latest
-release may be downloaded from
address@hidden://ftp.gnu.org/gnu/tramp/}.  This release includes the full
-documentation and code for @value{tramp}, suitable for installation.
-But GNU Emacs (22 or later) includes @value{tramp} already, and there
-is a @value{tramp} package for XEmacs, as well.  So maybe it is easier
-to just use those.  But if you want the bleeding edge, read
address@hidden
+release may be downloaded from @uref{ftp://ftp.gnu.org/gnu/tramp/}.
+This release includes the full documentation and code for
address@hidden, suitable for installation.  But Emacs (22 or later)
+includes @value{tramp} already, and there is a @value{tramp} package
+for XEmacs, as well.  So maybe it is easier to just use those.  But if
+you want the bleeding edge, read address@hidden
 
 For the especially brave, @value{tramp} is available from CVS.  The CVS
 version is the latest version of the code and may contain incomplete
@@ -455,10 +454,10 @@
 @end ifset
 
 In December 2001, @value{tramp} has been added to the XEmacs package
-repository.  Being part of the GNU Emacs repository happened in June
-2002, the first release including @value{tramp} was GNU Emacs 22.1.
+repository.  Being part of the Emacs repository happened in June 2002,
+the first release including @value{tramp} was Emacs 22.1.
 
address@hidden is also a GNU/Linux Debian package since February 2001.
address@hidden is also a Debian GNU/Linux package since February 2001.
 
 
 @c Installation chapter is necessary only in case of standalone
@@ -1762,9 +1761,10 @@
 machines.  The symbol @code{tramp-default-remote-path} is a place
 holder, it is replaced by the list of directories received via the
 command @command{getconf PATH} on your remote machine.  For example,
-on GNU Debian this is @file{/bin:/usr/bin}, whereas on Solaris this is
address@hidden/usr/xpg4/bin:/usr/ccs/bin:/usr/bin:/opt/SUNWspro/bin}.  It is
-recommended to apply this symbol on top of @code{tramp-remote-path}.
+on Debian GNU/Linux this is @file{/bin:/usr/bin}, whereas on Solaris
+this is @file{/usr/xpg4/bin:/usr/ccs/bin:/usr/bin:/opt/SUNWspro/bin}.
+It is recommended to apply this symbol on top of
address@hidden
 
 It is possible, however, that your local (or remote ;) system
 administrator has put the tools you want in some obscure local
@@ -2757,8 +2757,8 @@
 @item
 Which systems does it work on?
 
-The package has been used successfully on GNU Emacs 22, GNU Emacs 23,
-XEmacs 21 (starting with 21.4), and SXEmacs 22.
+The package has been used successfully on Emacs 22, Emacs 23, XEmacs
+21 (starting with 21.4), and SXEmacs 22.
 
 The package was intended to work on Unix, and it really expects a
 Unix-like system on the remote end (except the @option{smb} and
@@ -3597,9 +3597,9 @@
 But I have decided that this is too fragile to reliably work, so on some
 systems you'll have to do without the uuencode methods.
 
address@hidden The @value{tramp} filename syntax differs between GNU Emacs and 
XEmacs.
address@hidden The @value{tramp} filename syntax differs between Emacs and 
XEmacs.
 
-The GNU Emacs maintainers wish to use a unified filename syntax for
+The Emacs maintainers wish to use a unified filename syntax for
 Ange-FTP and @value{tramp} so that users don't have to learn a new
 syntax.  It is sufficient to learn some extensions to the old syntax.
 

=== modified file 'doc/misc/trampver.texi'
--- a/doc/misc/trampver.texi    2011-02-18 13:57:53 +0000
+++ b/doc/misc/trampver.texi    2011-02-19 19:55:44 +0000
@@ -70,7 +70,7 @@
 @set postfixhop         /
 @set ipv6prefix
 @set ipv6postfix
address@hidden emacsothername     GNU Emacs
address@hidden emacsothername     Emacs
 @set emacsotherdir      emacs
 @set emacsotherfilename tramp-emacs.html
 @set japanesemanual     tramp_ja-xemacs.html