1 diff -ur rsync-2.6.7.org/rsync.1 rsync-2.6.7/rsync.1
2 --- rsync-2.6.7.org/rsync.1 2006-03-11 21:37:15.275632000 +0100
3 +++ rsync-2.6.7/rsync.1 2006-03-11 21:39:30.924109750 +0100
5 .IP "\fB--config=FILE\fP"
6 This specifies an alternate config file than
7 the default\&. This is only relevant when \fB--daemon\fP is specified\&.
8 -The default is /etc/rsyncd\&.conf unless the daemon is running over
9 +The default is /etc/rsyncd/rsyncd\&.conf unless the daemon is running over
10 a remote shell program and the remote user is not the super-user; in that case
11 the default is rsyncd\&.conf in the current directory (typically $HOME)\&.
17 -/etc/rsyncd\&.conf or rsyncd\&.conf
18 +/etc/rsyncd/rsyncd\&.conf or rsyncd\&.conf
22 diff -ur rsync-2.6.7.org/rsyncd.conf.5 rsync-2.6.7/rsyncd.conf.5
23 --- rsync-2.6.7.org/rsyncd.conf.5 2006-03-11 21:38:50.437579500 +0100
24 +++ rsync-2.6.7/rsyncd.conf.5 2006-03-11 21:39:02.086307500 +0100
26 support the "max connections" option\&. The rsync daemon uses record
27 locking on this file to ensure that the max connections limit is not
28 exceeded for the modules sharing the lock file\&.
29 -The default is \f(CW/var/run/rsyncd\&.lock\fP\&.
30 +The default is \f(CW/var/lock/rsyncd\&.lock\fP\&.
33 The "read only" option determines whether clients