-diff -Nur rsync-2.3.2/rsync.1 rsync-2.3.2.pld/rsync.1
---- rsync-2.3.2/rsync.1 Tue Apr 6 17:04:16 1999
-+++ rsync-2.3.2.pld/rsync.1 Thu Jun 17 09:56:27 1999
-@@ -186,7 +186,7 @@
- .SH "RUNNING AN RSYNC SERVER"
- .PP
- An rsync server is configured using a config file which by default is
--called /etc/rsyncd\&.conf\&. Please see the rsyncd\&.conf(5) man page for more
-+called /etc/rsyncd/rsyncd\&.conf\&. Please see the rsyncd\&.conf(5) man page for more
- information\&.
- .PP
- .SH "EXAMPLES"
-@@ -683,13 +683,13 @@
- daemon\&. 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 (/etc/rsyncd\&.conf) on each connect made by a client and
-+config file (/etc/rsyncd/rsyncd\&.conf) on each connect made by a client and
- respond to requests accordingly\&. See the rsyncd\&.conf(5) man page for more
- details\&.
- .IP
+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 /etc/rsyncd\&.conf\&. This is only relevant when --daemon is
-+the default /etc/rsyncd/rsyncd\&.conf\&. This is only relevant when --daemon is
- specified\&.
+ 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 the super-user; in that case
+ the default is rsyncd\&.conf in the current directory (typically $HOME)\&.
.IP
- .IP "\fB--port=PORT\fP"
-@@ -857,7 +857,7 @@
+@@ -2865,7 +2865,7 @@
.PP
.SH "FILES"
.PP
--/etc/rsyncd\&.conf
-+/etc/rsyncd/rsyncd\&.conf
+-/etc/rsyncd\&.conf or rsyncd\&.conf
++/etc/rsyncd/rsyncd\&.conf or rsyncd\&.conf
.PP
.SH "SEE ALSO"
.PP
-diff -Nur rsync-2.3.2/rsyncd.conf.5 rsync-2.3.2.pld/rsyncd.conf.5
---- rsync-2.3.2/rsyncd.conf.5 Thu Jun 17 10:00:42 1999
-+++ rsync-2.3.2.pld/rsyncd.conf.5 Thu Jun 17 09:57:18 1999
-@@ -149,7 +149,7 @@
- The "lock file" option specifies the file to use to
- support the "max connections" option\&. The rsync server uses record
+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\&. The default is \f(CW/var/run/rsyncd\&.lock\fP\&.
-+exceeded\&. The default is \f(CW/var/lock/rsyncd\&.lock\fP\&.
+ exceeded for the modules sharing the lock file\&.
+-The default is \f(CW/var/run/rsyncd\&.lock\fP\&.
++The default is \f(CW/var/lock/rsyncd\&.lock\fP\&.
.IP
.IP "\fBread only\fP"
The "read only" option determines whether clients