Updates, updates

diff --git a/doc/tinc.texi b/doc/tinc.texi
index b51bf01a0712baec1186b2cafea4901a14b2929d..d9105862a044e207e1e921a8045ac845aeec46bf 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -1,5 +1,5 @@
 \input texinfo   @c -*-texinfo-*-
 \input texinfo   @c -*-texinfo-*-

-@c $Id: tinc.texi,v 1.8.4.6 2000/11/02 21:34:45 zarq Exp $
+@c $Id: tinc.texi,v 1.8.4.7 2000/11/09 21:29:58 zarq Exp $

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


@@ -17,7 +17,7 @@ Copyright @copyright{} 1998,199,2000 Ivo Timmermans
 <itimmermans@@bigfoot.com>, Guus Sliepen <guus@@sliepen.warande.net> and
 Wessel Dankers <wsl@@nl.linux.org>.
 
 <itimmermans@@bigfoot.com>, Guus Sliepen <guus@@sliepen.warande.net> and
 Wessel Dankers <wsl@@nl.linux.org>.
 

-$Id: tinc.texi,v 1.8.4.6 2000/11/02 21:34:45 zarq Exp $
+$Id: tinc.texi,v 1.8.4.7 2000/11/09 21:29:58 zarq Exp $

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


@@ -42,7 +42,7 @@ Copyright @copyright{} 1998,1999,2000 Ivo Timmermans
 <itimmermans@@bigfoot.com>, Guus Sliepen <guus@@sliepen.warande.net> and
 Wessel Dankers <wsl@@nl.linux.org>.
 
 <itimmermans@@bigfoot.com>, Guus Sliepen <guus@@sliepen.warande.net> and
 Wessel Dankers <wsl@@nl.linux.org>.
 

-$Id: tinc.texi,v 1.8.4.6 2000/11/02 21:34:45 zarq Exp $
+$Id: tinc.texi,v 1.8.4.7 2000/11/09 21:29:58 zarq Exp $

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


@@ -532,35 +532,14 @@ The actual setup of the ethertap device is quite simple, just repeat
 after me:
 
 @example
 after me:
 
 @example

-ifconfig tap@emph{n} hw ether fe:fd:@emph{xx}:@emph{xx}:@emph{xx}:@emph{xx}
+ifconfig tap@emph{n} hw ether fe:fd:00:00:00:00

 @end example
 
 @end example
 

-The @emph{n} here is the number of the ethertap device you want to use.
-It should be the same @emph{n} as the one you use for
-@file{/dev/tap@emph{n}}.  The @emph{xx}s are four hexadecimal numbers
-(0--ff). With previous versions of tincd, it didn't matter what they
-were.  But newer kernels require properly set up ethernet addresses.  In
-fact, the old behavior was wrong.  It is required that the @emph{xx}s
-match the numbers of the IP address you will give to the tap device and
-to the MyOwnVPNIP configuration (which will be discussed later).
-

 @cindex MAC address
 @cindex hardware address
 @cindex MAC address
 @cindex hardware address

-@strong{Tip}: for finding out what the MAC address of the tap interface
-should be, you can use the following command:
-
-@example
-$ printf 'fe:fd:%02x:%02x:%02x:%02x' 10 1 54 1
-fe:fd:0a:01:36:01
-@end example
-
-or with perl:
-
-@example
-$ perl -e 'print "fe:fd:", join(":", map @{sprintf "%02x", $_@} split(/\./, $ARGV[0])), "\n";' 10.1.54.1
-fe:fd:0a:01:36:01
-@end example
-
+@strong{Note:} Since version 1.0pre3, all interface addresses are set to
+this address, whereas previous versions required the MAC to match the
+actual IP address.

 
 @cindex ifconfig
 To activate the device, you have to assign an IP address to it.  To set
 
 @cindex ifconfig
 To activate the device, you have to assign an IP address to it.  To set


@@ -741,17 +720,20 @@ maskbits is the number of bits set to 1 in the netmask part.
 @item MyVirtualIP = <local address[/maskbits]>
 This is an alias for MyOwnVPNIP.
 
 @item MyVirtualIP = <local address[/maskbits]>
 This is an alias for MyOwnVPNIP.
 

-@item Passphrases = <directory> (/etc/tinc/NETNAME/passphrases)
-The directory where tinc will look for passphrases when someone tries to
-connect. Please see the manpage for genauth(8) for more information
-about passphrases as used by tinc.
-

 @item PingTimeout = <seconds> (5)
 The number of seconds of inactivity that tinc will wait before sending a
 probe to the other end. If that other end doesn't answer within that
 same amount of seconds, the connection is terminated, and the others
 will be notified of this.
 
 @item PingTimeout = <seconds> (5)
 The number of seconds of inactivity that tinc will wait before sending a
 probe to the other end. If that other end doesn't answer within that
 same amount of seconds, the connection is terminated, and the others
 will be notified of this.
 

+@item PrivateKey = <key>
+This is a sequence of hexadecimal numbers, as generated by ``tincd
+--generate-keys''.
+
+@item PublicKey = <key>
+This is a sequence of hexadecimal numbers, as generated by ``tincd
+--generate-keys''.
+

 @item TapDevice = <device> (/dev/tap0)
 The ethertap device to use. Note that you can only use one device per
 daemon. The info pages of the tinc package contain more information
 @item TapDevice = <device> (/dev/tap0)
 The ethertap device to use. Note that you can only use one device per
 daemon. The info pages of the tinc package contain more information