-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
-@@ -264,7 +264,7 @@
- .PP
- An rsync daemon is configured using a configuration file\&. Please see the
- rsyncd\&.conf(5) man page for more information\&. By default the configuration
--file is called /etc/rsyncd\&.conf (unless the daemon is spawned via a remote
-+file is called /etc/rsyncd/rsyncd\&.conf (unless the daemon is spawned via a remote
- shell--see below)\&.
- .PP
- .SH "RUNNING AN RSYNC DAEMON OVER A REMOTE SHELL PROGRAM"
-@@ -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\&.