-diff -urBb rsync-2.6.5.org/rsyncd.conf.5 rsync-2.6.5/rsyncd.conf.5
---- rsync-2.6.5.org/rsyncd.conf.5 2005-07-23 16:01:33.135106000 +0200
-+++ rsync-2.6.5/rsyncd.conf.5 2005-07-23 16:01:58.800205112 +0200
-@@ -325,7 +325,7 @@
+diff -ur rsync-2.6.7.org/rsyncd.conf.5 rsync-2.6.7/rsyncd.conf.5
+--- rsync-2.6.7.org/rsyncd.conf.5 2006-03-11 19:25:08.000000000 +0100
++++ rsync-2.6.7/rsyncd.conf.5 2006-03-11 21:37:33.616778500 +0100
+@@ -344,7 +344,7 @@
you may find that passwords longer than 8 characters don\&'t work\&.
.IP
There is no default for the "secrets file" option, you must choose a name
by "other"; see "strict modes"\&.
.IP
.IP "\fBstrict modes\fP"
-@@ -623,13 +623,13 @@
+@@ -656,13 +656,13 @@
path = /data/cvs
comment = CVS repository (requires authentication)
auth users = tridge, susan
.PP
.RS
\f(CWtridge:mypass\fP
-@@ -640,7 +640,7 @@
+@@ -673,7 +673,7 @@
.PP
.SH "FILES"
.PP
.PP
.SH "SEE ALSO"
.PP
-diff -urBb rsync-2.6.5.org/rsyncd.conf.yo rsync-2.6.5/rsyncd.conf.yo
---- rsync-2.6.5.org/rsyncd.conf.yo 2005-07-23 16:01:33.136106000 +0200
-+++ rsync-2.6.5/rsyncd.conf.yo 2005-07-23 16:01:58.800205112 +0200
-@@ -69,7 +69,7 @@
+diff -ur rsync-2.6.7.org/rsyncd.conf.yo rsync-2.6.7/rsyncd.conf.yo
+--- rsync-2.6.7.org/rsyncd.conf.yo 2006-03-11 19:25:04.000000000 +0100
++++ rsync-2.6.7/rsyncd.conf.yo 2006-03-11 21:37:33.616778500 +0100
+@@ -66,7 +66,7 @@
reread its config file.
Note that you should bf(not) send the rsync daemon a HUP signal to force
connection.
manpagesection(GLOBAL OPTIONS)
-@@ -139,7 +139,7 @@
+@@ -137,7 +137,7 @@
dit(bf(path)) The "path" option specifies the directory in the daemon's
filesystem to make available in this module. You must specify this option
dit(bf(use chroot)) If "use chroot" is true, the rsync daemon will chroot
to the "path" before starting the file transfer with the client. This has
-@@ -292,7 +292,7 @@
+@@ -309,7 +309,7 @@
you may find that passwords longer than 8 characters don't work.
There is no default for the "secrets file" option, you must choose a name
by "other"; see "strict modes".
dit(bf(strict modes)) The "strict modes" option determines whether or not
-@@ -543,10 +543,10 @@
+@@ -564,10 +564,10 @@
path = /data/cvs
comment = CVS repository (requires authentication)
auth users = tridge, susan
quote(
tt(tridge:mypass)nl()
-diff -urBb rsync-2.6.5.org/rsync.h rsync-2.6.5/rsync.h
---- rsync-2.6.5.org/rsync.h 2005-05-03 19:00:47.000000000 +0200
-+++ rsync-2.6.5/rsync.h 2005-07-23 16:01:58.801204960 +0200
+diff -ur rsync-2.6.7.org/rsync.h rsync-2.6.7/rsync.h
+--- rsync-2.6.7.org/rsync.h 2006-03-11 21:37:15.251630000 +0100
++++ rsync-2.6.7/rsync.h 2006-03-11 21:37:33.616778500 +0100
@@ -30,7 +30,7 @@
/* RSYNCD_SYSCONF is now set in config.h */
#define RSYNCD_USERCONF "rsyncd.conf"
#define URL_PREFIX "rsync://"
#define BACKUP_SUFFIX "~"
-diff -urBb rsync-2.6.5.org/rsync.yo rsync-2.6.5/rsync.yo
---- rsync-2.6.5.org/rsync.yo 2005-07-23 16:01:33.135106000 +0200
-+++ rsync-2.6.5/rsync.yo 2005-07-23 16:02:35.743588864 +0200
-@@ -1334,7 +1334,7 @@
+diff -ur rsync-2.6.7.org/rsync.yo rsync-2.6.7/rsync.yo
+--- rsync-2.6.7.org/rsync.yo 2006-03-11 21:37:15.267631000 +0100
++++ rsync-2.6.7/rsync.yo 2006-03-11 21:37:33.616778500 +0100
+@@ -1749,7 +1749,7 @@
If standard input is a socket then rsync will assume that it is being
run via inetd, otherwise it will detach from the current terminal and
become a background daemon. The daemon will read the config file
requests accordingly. See the rsyncd.conf(5) man page for more
details.
-@@ -1352,7 +1352,7 @@
-
- dit(bf(--config=FILE)) This specifies an alternate config file than
- the default. This is only relevant when bf(--daemon) is specified.
--The default is /etc/rsyncd.conf unless the daemon is running over
-+The default is /etc/rsyncd/rsyncd.conf unless the daemon is running over
- a remote shell program and the remote user is not root; in that case
- the default is rsyncd.conf in the current directory (typically $HOME).
-
-@@ -2045,7 +2045,7 @@
+@@ -2477,7 +2477,7 @@
manpagefiles()
manpageseealso()
-diff -urBb rsync-2.6.5.org/support/rsyncstats rsync-2.6.5/support/rsyncstats
---- rsync-2.6.5.org/support/rsyncstats 2005-02-19 20:36:54.000000000 +0100
-+++ rsync-2.6.5/support/rsyncstats 2005-07-23 16:01:58.801204960 +0200
-@@ -12,7 +12,7 @@
- use Getopt::Long;
-
- # You may wish to edit the next line to customize for your default log file.
--$usage_file = "/var/adm/rsyncd.log";
-+$usage_file = "/var/log/rsyncd.log";
-
- # Edit the following lines for default report settings.
- # Entries defined here will be over-ridden by the command line.
-diff -urBb rsync-2.6.5.org/rsync.1 rsync-2.6.5/rsync.1
---- rsync-2.6.5.org/rsync.1 2005-07-23 16:01:33.133107000 +0200
-+++ rsync-2.6.5/rsync.1 2005-07-23 16:04:22.057426704 +0200
-@@ -1543,7 +1543,7 @@
+diff -ur rsync-2.6.7.org/rsync.1 rsync-2.6.7/rsync.1
+--- rsync-2.6.7.org/rsync.1 2006-03-11 21:37:15.275632000 +0100
++++ rsync-2.6.7/rsync.1 2006-03-11 21:39:30.924109750 +0100
+@@ -2019,7 +2019,7 @@
.IP "\fB--config=FILE\fP"
This specifies an alternate config file than
the default\&. This is only relevant when \fB--daemon\fP is specified\&.
-The default is /etc/rsyncd\&.conf unless the daemon is running over
+The default is /etc/rsyncd/rsyncd\&.conf unless the daemon is running over
- a remote shell program and the remote user is not root; in that case
+ a remote shell program and the remote user is not the super-user; in that case
the default is rsyncd\&.conf in the current directory (typically $HOME)\&.
.IP
-@@ -2366,7 +2366,7 @@
+@@ -2865,7 +2865,7 @@
.PP
.SH "FILES"
.PP
.PP
.SH "SEE ALSO"
.PP
-diff -urBb rsync-2.6.5.org/rsyncd.conf.5 rsync-2.6.5/rsyncd.conf.5
---- rsync-2.6.5.org/rsyncd.conf.5 2005-07-23 16:01:58.800205000 +0200
-+++ rsync-2.6.5/rsyncd.conf.5 2005-07-23 16:03:21.122690192 +0200
-@@ -212,7 +212,7 @@
+diff -ur rsync-2.6.7.org/rsyncd.conf.5 rsync-2.6.7/rsyncd.conf.5
+--- rsync-2.6.7.org/rsyncd.conf.5 2006-03-11 21:38:50.437579500 +0100
++++ rsync-2.6.7/rsyncd.conf.5 2006-03-11 21:39:02.086307500 +0100
+@@ -210,7 +210,7 @@
support the "max connections" option\&. The rsync daemon uses record
locking on this file to ensure that the max connections limit is not
exceeded for the modules sharing the lock file\&.