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 @@ .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 the default is rsyncd\&.conf in the current directory (typically $HOME)\&. .IP @@ -2366,7 +2366,7 @@ .PP .SH "FILES" .PP -/etc/rsyncd\&.conf or rsyncd\&.conf +/etc/rsyncd/rsyncd\&.conf or rsyncd\&.conf .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 @@ 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\&. -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