Merge branch 'master' into 1.1

[meshlink] / doc / tinc.texi

diff --git a/doc/tinc.texi b/doc/tinc.texi
index 13784335f37ea36d0efd6bde215c91c4fdbb5428..094c54dbc28efc75e73b84ba80ad2c4307216e50 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -1,5 +1,4 @@
 \input texinfo   @c -*-texinfo-*-
 \input texinfo   @c -*-texinfo-*-

-@c $Id$

 @c %**start of header
 @setfilename tinc.info
 @settitle tinc Manual
 @c %**start of header
 @setfilename tinc.info
 @settitle tinc Manual


@@ -20,8 +19,6 @@ Copyright @copyright{} 1998-2009 Ivo Timmermans,
 Guus Sliepen <guus@@tinc-vpn.org> and
 Wessel Dankers <wsl@@tinc-vpn.org>.
 
 Guus Sliepen <guus@@tinc-vpn.org> and
 Wessel Dankers <wsl@@tinc-vpn.org>.
 

-$Id$
-

 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
 preserved on all copies.
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
 preserved on all copies.


@@ -47,8 +44,6 @@ Copyright @copyright{} 1998-2009 Ivo Timmermans,
 Guus Sliepen <guus@@tinc-vpn.org> and
 Wessel Dankers <wsl@@tinc-vpn.org>.
 
 Guus Sliepen <guus@@tinc-vpn.org> and
 Wessel Dankers <wsl@@tinc-vpn.org>.
 

-$Id$
-

 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
 preserved on all copies.
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
 preserved on all copies.


@@ -2459,7 +2454,7 @@ and join channel #tinc.
 @section Authors
 
 @table @asis
 @section Authors
 
 @table @asis

-@item Ivo Timmermans (zarq) (@email{ivo@@tinc-vpn.org})
+@item Ivo Timmermans (zarq)

 @item Guus Sliepen (guus) (@email{guus@@tinc-vpn.org})
 @end table
 
 @item Guus Sliepen (guus) (@email{guus@@tinc-vpn.org})
 @end table