More tincd->tinc updates.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3caf69d..09707ed 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,14 +5,14 @@ info_TEXINFOS = tinc.texi
 dyn_MANS = tincd.8
 man_aux = $(dyn_MANS:.8=.x)
 
-man_MANS = tincd.conf.5 genauth.8 $(dyn_MANS)
+man_MANS = tinc.conf.5 genauth.8 $(dyn_MANS)
 
 PERL = @PERL@
 HELP2MAN = help2man
 MAINTAINERCLEANFILES = $(dyn_MANS)
 
 EXTRA_DIST = $(man_MANS) $(HELP2MAN) $(man_aux) \
-  Makefile.maint GNUmakefile Makefile.summ tincd.conf.sample
+  Makefile.maint GNUmakefile Makefile.summ tinc.conf.sample
 
 # Use `ginstall' in the definition of man_MANS to avoid
 # confusion with the `install' target.  The install rule transforms `ginstall'

diff --git a/doc/tincd.conf.5 b/doc/tinc.conf.5
similarity index 100%
rename from doc/tincd.conf.5
rename to doc/tinc.conf.5

diff --git a/doc/tincd.conf.sample b/doc/tinc.conf.sample
similarity index 100%
rename from doc/tincd.conf.sample
rename to doc/tinc.conf.sample

diff --git a/redhat/tinc.spec b/redhat/tinc.spec
index 376599d..24bdde4 100644 (file)
--- a/redhat/tinc.spec
+++ b/redhat/tinc.spec
@@ -83,7 +83,7 @@ grep -q '^tinc[[:space:]]' /etc/services || patch -s /etc/services << END
   hmmp-ind     612/tcp         dqs313_intercell# HMMP Indication / DQS
   hmmp-ind     612/udp         dqs313_intercell# HMMP Indication / DQS
 + tinc         655/tcp         TINC            # tinc vpn
-+ tinc         655/udp         TINC            # tinc.nl.linux.org
++ tinc         655/udp         TINC            # http://tinc.nl.linux.org/
   #
   # UNIX specific services
 END
@@ -101,13 +101,13 @@ END
 %postun
 
 %files
-%doc AUTHORS ChangeLog NEWS README THANKS *.html doc/tincd.conf.sample
+%doc AUTHORS ChangeLog NEWS README THANKS *.html doc/tinc.conf.sample
 %config /etc/tinc/
 /etc/rc.d/init.d/tinc
 /usr/sbin/genauth
 /usr/sbin/tincd
 /usr/lib/tinc/
-/usr/man/man5/tincd.conf.5
+/usr/man/man5/tinc.conf.5
 /usr/man/man8/genauth.8
 /usr/man/man8/tincd.8
 /usr/info/tinc.info.gz