Some reaarangements in tramp*.texi

* doc/misc/trampver.texi (trampfn): Change check for definition of macro.
(tramp-bug-report-address): New variable.

* doc/misc/tramp.texi (Top, Bug Reports): Use it.

1 files changed, 11 insertions, 8 deletions

diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index db4654ce28e..aac7243446f 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -5,12 +5,12 @@
 @c Copyright (C) 2003-2018 Free Software Foundation, Inc.
 @c See file doclicense.texi for copying conditions.
 
-@c In the Tramp GIT, the version number is auto-frobbed from
-@c configure.ac, so you should edit that file and run
-@c "autoconf && ./configure" to change the version number.
+@c In the Tramp GIT, the version number is auto-frobbed from tramp.el,
+@c and the bug report address is auto-frobbed from configure.ac.
 @set trampver 2.4.1-pre
+@set tramp-bug-report-address tramp-devel@@gnu.org
 
-@c Other flags from configuration
+@c Other flags from configuration.
 @set instprefix /usr/local
 @set lispdir /usr/local/share/emacs/site-lisp
 @set infodir /usr/local/share/info
@@ -46,12 +46,15 @@
 @end ifset
 
 @c Macro for formatting a file name according to the respective
-@c syntax.  Macro arguments should not have any leading or trailing
-@c whitespace.  Not very elegant, but I don't know it better.
-
-@unmacro trampfn
+@c syntax.  trampver.texi is included several times in tramp.texi and
+@c trampinst.texi.  Redefining the macro is reported as warning for
+@c creating the dvi and pdf files, so we declare the macro only the
+@c first time this file is included.
+@ifclear trampfndefined
+@set trampfndefined
 @macro trampfn {method, userhost, localname}
 @value{prefix}@c
 \method\@value{postfixhop}@c
 \userhost\@value{postfix}\localname\
 @end macro
+@end ifclear