X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=doc%2Ftinc.texi;h=59aec48112fb90253bcd8e259842e9f2a1b57a9c;hp=afcaa6a334eb5fd6f95c8e27c7a45a885c90ac19;hb=bd0325655867b1dff740d52d0505773bba0606a6;hpb=7c665712d69d5a502d4c2f098ad85df3b17bfb92

diff --git a/doc/tinc.texi b/doc/tinc.texi
index afcaa6a3..59aec481 100644
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -6,6 +6,9 @@
 @c %**end of header
 
 @ifinfo
+@direntry
+* tinc: (tinc).              The tinc Manual.
+@end direntry
 
 This is the info manual for tinc, a Virtual Private Network daemon.
 
@@ -96,7 +99,7 @@ more than just one way.
 @cindex private
 For instance, a VPN can consist of a single stand-alone ethernet LAN. Or
 even two computers hooked up using a null-modem cable@footnote{Though
-discussable, I think it qualifies as a VPN.}. In these cases, it is
+discuss-able, I think it qualifies as a VPN.}. In these cases, it is
 obvious that the network is @emph{private}. But there is another type
 of VPN, the type tinc was made for.
 
@@ -209,7 +212,7 @@ chown 0.0 /dev/tap0
 
 The permissions now will be such that only the super user may read/write
 to this file. You'd want this, because otherwise eavesdropping would
-become a tad too easy. This does, however, imply that you'd have to run
+become a bit too easy. This does, however, imply that you'd have to run
 tincd as root.
 
 If you want to, you may also create more device files, which would be
@@ -219,7 +222,7 @@ owned by root and have permission 600.
 
 @subsubheading @file{/etc/networks}
 
-You may add a line to @file{/etc/networks} so that your vpn will get a
+You may add a line to @file{/etc/networks} so that your VPN will get a
 symbolic name. For example:
 
 @example
@@ -230,7 +233,7 @@ myvpn 10.0.0.0
 @subsubheading @file{/etc/services}
 
 You may add this line to @file{/etc/services}. The effect is that you
-may supply a @samp{vpn} as a valid port number to some programs. The
+may supply a @samp{tinc} as a valid port number to some programs. The
 number 655 is registered with the IANA.
 
 @example
@@ -325,12 +328,12 @@ to this daemon.
 
 The effect of this is that the daemon will set its configuration
 ``root'' to /etc/tinc/nn/, where nn is your argument to the -n
-option. You'll notice that it appears in syslog as ``tincd.nn''.
+option. You'll notice that it appears in syslog as ``tinc.nn''.
 
 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 /etc/tinc/, instead of
-/etc/tinc/nn/; the configuration file should be /etc/tinc/tincd.conf,
+/etc/tinc/nn/; the configuration file should be /etc/tinc/tinc.conf,
 and the passphrases are now expected to be in /etc/tinc/passphrases/.
 
 But it is highly recommended that you use this feature of tinc, because
@@ -354,7 +357,7 @@ will try to connect to it, on the given port. If this fails, tinc exits.
 @section Configuration file
 
 The actual configuration of the daemon is done in the file
-@file{/etc/tinc/nn/tincd.conf}.
+@file{/etc/tinc/nn/tinc.conf}.
 
 This file consists of comments (lines started with a #) or assignments
 in the form of
@@ -478,7 +481,7 @@ ifconfig tap0 10.1.54.1 netmask 255.0.0.0
 ifconfig eth0 10.1.54.1 netmask 255.255.0.0 broadcast 10.1.255.255
 @end example
 
-and in /etc/tinc/tincd.conf:
+and in /etc/tinc/tinc.conf:
 
 @example
 TapDevice = /dev/tap0
@@ -493,7 +496,7 @@ ifconfig tap0 10.2.1.12 netmask 255.0.0.0
 ifconfig eth0 10.2.43.8 netmask 255.255.0.0 broadcast 10.2.255.255
 @end example
 
-and in /etc/tinc/tincd.conf:
+and in /etc/tinc/tinc.conf:
 
 @example
 TapDevice = /dev/tap0
@@ -514,7 +517,7 @@ ifconfig tap0 10.3.69.254 netmask 255.0.0.0
 ifconfig eth0 10.3.69.254 netmask 255.255.0.0 broadcast 10.3.255.255
 @end example
 
-and in /etc/tinc/A/tincd.conf:
+and in /etc/tinc/A/tinc.conf:
 
 @example
 MyVirtualIP = 10.3.69.254/16
@@ -534,7 +537,7 @@ ifconfig tap0 10.4.3.32 netmask 255.0.0.0
 ifconfig tap0 10.4.3.32 netmask 255.255.0.0 broadcast 10.4.255.255
 @end example
 
-and in /etc/tinc/tincd.conf:
+and in /etc/tinc/tinc.conf:
 
 @example
 MyVirtualIP = 10.4.3.32/16
@@ -642,7 +645,7 @@ generated automatically, so may be more up-to-date.
 @table @asis
 @item -c, --config=FILE
 Read configuration options from FILE. The default is
-@file{/etc/tinc/nn/tincd.conf}.
+@file{/etc/tinc/nn/tinc.conf}.
 
 @item -d
 Increase debug level. The higher it gets, the more gets
@@ -657,7 +660,7 @@ packets themselves.
 
 @item -k, --kill
 Attempt to kill a running tincd and exit. A TERM signal (15) gets sent
-to the daemon that his its PID in /var/run/tincd.nn.pid.
+to the daemon that his its PID in /var/run/tinc.nn.pid.
 
 Because it kills only one tincd, you should use -n here if you use it
 normally.
@@ -1154,7 +1157,7 @@ Main coder/hacker and maintainer of the package.
 Originator of it all, co-author.
 
 @item Wessel Dankers (Ubiq)
-General obfuscator of the code.
+General obfuscater of the code.
 
 @end table