- Fixed some spelling mistakes and terminology here and there.

diff --git a/doc/tinc.conf.5 b/doc/tinc.conf.5
index 930bb06..d647bbb 100644 (file)
--- a/doc/tinc.conf.5
+++ b/doc/tinc.conf.5
@@ -1,6 +1,6 @@
 .TH TINC 5 "May 2000" "tinc version 1.0" "FSF"
 .SH NAME
 .TH TINC 5 "May 2000" "tinc version 1.0" "FSF"
 .SH NAME

-tincd.conf \- tinc daemon configuration
+tinc.conf \- tinc daemon configuration

 .SH "DESCRIPTION"
 The files in the \fI/etc/tinc\fR directory contain runtime and
 security information for the \fBtinc\fR(8) daemon.
 .SH "DESCRIPTION"
 The files in the \fI/etc/tinc\fR directory contain runtime and
 security information for the \fBtinc\fR(8) daemon.


@@ -23,7 +23,7 @@ However, it is not strictly necessary that you call tinc with the -n
 option. In this case, the network name would just be empty, and it
 will be used as such. tinc now looks for files in \fI/etc/tinc/\fR,
 instead of \fI/etc/tinc/\fBnn\fI/\fR; the configuration file should be
 option. In this case, the network name would just be empty, and it
 will be used as such. tinc now looks for files in \fI/etc/tinc/\fR,
 instead of \fI/etc/tinc/\fBnn\fI/\fR; the configuration file should be

-\fI/etc/tinc/tincd.conf\fR, and the passphrases are now expected to be
+\fI/etc/tinc/tinc.conf\fR, and the passphrases are now expected to be

 in \fI/etc/tinc/passphrases/\fR.
 
 But it is highly recommended that you use this feature of tinc,
 in \fI/etc/tinc/passphrases/\fR.
 
 But it is highly recommended that you use this feature of tinc,


@@ -36,8 +36,9 @@ it will be part of. The name will be used by other tinc daemons for
 identification. The name has to be declared in the
 \fI/etc/tinc/\fBnn\fI/tinc.conf\fR file.
 
 identification. The name has to be declared in the
 \fI/etc/tinc/\fBnn\fI/tinc.conf\fR file.
 

-To make things easy, choose something that will give unique names to
-your tinc daemon(s): hostnames, owner surnames, location.
+To make things easy, choose something that will give unique and easy
+to rememebr names to your tinc daemon(s).
+You could try things like hostnames, owner surnames or location names.

 .PP
 .SH "PUBLIC/PRIVATE KEYS"
 You should use \fBtincd --generate-keys\fR to generate public/private
 .PP
 .SH "PUBLIC/PRIVATE KEYS"
 You should use \fBtincd --generate-keys\fR to generate public/private


@@ -50,7 +51,7 @@ for the name of the tinc daemon (See \fBNAMES\fR).
 .PP
 .SH "SERVER CONFIGURATION"
 The server configuration of the daemon is done in the file
 .PP
 .SH "SERVER CONFIGURATION"
 The server configuration of the daemon is done in the file

-\fI/etc/tinc/\fBnn\fI/tincd.conf\fR.
+\fI/etc/tinc/\fBnn\fI/tinc.conf\fR.

 
 This file consists of comments (lines started with a \fB#\fR) or
 assignments in the form of
 
 This file consists of comments (lines started with a \fB#\fR) or
 assignments in the form of


@@ -87,18 +88,6 @@ a lookup if your DNS server is not responding.
 This does not affect resolving hostnames to IP addresses from the
 host configuration files.
 .TP
 This does not affect resolving hostnames to IP addresses from the
 host configuration files.
 .TP

-\fBInterface\fR = <\fIdevice\fR> (optional)
-If you have more than one network interface in your computer, tinc will by
-default listen on all of them for incoming connections. It is possible to
-bind tinc to a single interface like eth0 or ppp0 with this variable.
-.TP
-\fBInterfaceIP\fR = <\fIlocal address\fR> (optional)
-If your computer has more than one IP address on a single interface (for example
-if you are running virtual hosts), tinc will by default listen on all of them for
-incoming connections. It is possible to bind tinc to a single IP address with
-this variable. It is still possible to listen on several interfaces at the same
-time though, if they share the same IP address.
-.TP

 \fBKeyExpire\fR = <\fIseconds\fR> (3600)
 This option controls the time the encryption keys used to encrypt the data
 are valid. It is common practice to change keys at regular intervals to
 \fBKeyExpire\fR = <\fIseconds\fR> (3600)
 This option controls the time the encryption keys used to encrypt the data
 are valid. It is common practice to change keys at regular intervals to

diff --git a/doc/tincd.8 b/doc/tincd.8
index 648c5de..b96164a 100644 (file)
--- a/doc/tincd.8
+++ b/doc/tincd.8
@@ -1,6 +1,6 @@
 .TH TINCD 8 "June 2000" "tinc version 1.0pre3" "FSF"
 .SH NAME
 .TH TINCD 8 "June 2000" "tinc version 1.0pre3" "FSF"
 .SH NAME

-tinc \- tinc VPN daemon
+tincd \- tinc VPN daemon

 .SH SYNOPSIS
 .B tincd
 [\fIoption\fR]...
 .SH SYNOPSIS
 .B tincd
 [\fIoption\fR]...


@@ -12,7 +12,7 @@ network (VPN) project. When started, tincd will read
 it's configuration file to determine what virtual subnets
 it has to serve and to what other tinc daemons it should connect.
 It will connect to the ethertap or tun/tap device and set up a socket
 it's configuration file to determine what virtual subnets
 it has to serve and to what other tinc daemons it should connect.
 It will connect to the ethertap or tun/tap device and set up a socket

-for incomming connections.
+for incoming connections.

 If that succeeds, it will detach from the controlling terminal and
 continue in the background, accepting and setting up connections to other
 tinc daemons that are part of the virtual private network.
 If that succeeds, it will detach from the controlling terminal and
 continue in the background, accepting and setting up connections to other
 tinc daemons that are part of the virtual private network.


@@ -35,7 +35,7 @@ Attempt to kill a running tincd and exit.
 \fB\-n\fR, \fB\-\-net\fR=\fINETNAME\fR
 Connect to net NETNAME.
 .TP
 \fB\-n\fR, \fB\-\-net\fR=\fINETNAME\fR
 Connect to net NETNAME.
 .TP

-\fB\-K\fR, \fB\-\-generate-key\fR[=\fIBITS]\fR
+\fB\-K\fR, \fB\-\-generate-keys\fR[=\fIBITS]\fR

 Generate public/private RSA keypair and exit. If BITS is omitted,
 the default length will be 1024 bits.
 .TP
 Generate public/private RSA keypair and exit. If BITS is omitted,
 the default length will be 1024 bits.
 .TP

diff --git a/src/tincd.c b/src/tincd.c
index dac3dbc..a99b81b 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: tincd.c,v 1.10.4.22 2000/10/30 00:22:54 guus Exp $
+    $Id: tincd.c,v 1.10.4.23 2000/10/30 10:19:06 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -90,7 +90,7 @@ static struct option const long_options[] =
   { "help", no_argument, &show_help, 1 },
   { "version", no_argument, &show_version, 1 },
   { "no-detach", no_argument, &do_detach, 0 },
   { "help", no_argument, &show_help, 1 },
   { "version", no_argument, &show_version, 1 },
   { "no-detach", no_argument, &do_detach, 0 },

-  { "keygen", optional_argument, NULL, 'K'},
+  { "generate-keys", optional_argument, NULL, 'K'},

   { NULL, 0, NULL, 0 }
 };
 
   { NULL, 0, NULL, 0 }
 };