1 diff -urBb rsync-2.6.5.org/rsync.1 rsync-2.6.5/rsync.1
2 --- rsync-2.6.5.org/rsync.1 2005-07-23 16:01:33.133107000 +0200
3 +++ rsync-2.6.5/rsync.1 2005-07-23 16:04:22.057426704 +0200
6 An rsync daemon is configured using a configuration file\&. Please see the
7 rsyncd\&.conf(5) man page for more information\&. By default the configuration
8 -file is called /etc/rsyncd\&.conf (unless the daemon is spawned via a remote
9 +file is called /etc/rsyncd/rsyncd\&.conf (unless the daemon is spawned via a remote
12 .SH "RUNNING AN RSYNC DAEMON OVER A REMOTE SHELL PROGRAM"
14 .IP "\fB--config=FILE\fP"
15 This specifies an alternate config file than
16 the default\&. This is only relevant when \fB--daemon\fP is specified\&.
17 -The default is /etc/rsyncd\&.conf unless the daemon is running over
18 +The default is /etc/rsyncd/rsyncd\&.conf unless the daemon is running over
19 a remote shell program and the remote user is not root; in that case
20 the default is rsyncd\&.conf in the current directory (typically $HOME)\&.
26 -/etc/rsyncd\&.conf or rsyncd\&.conf
27 +/etc/rsyncd/rsyncd\&.conf or rsyncd\&.conf
31 diff -urBb rsync-2.6.5.org/rsyncd.conf.5 rsync-2.6.5/rsyncd.conf.5
32 --- rsync-2.6.5.org/rsyncd.conf.5 2005-07-23 16:01:58.800205000 +0200
33 +++ rsync-2.6.5/rsyncd.conf.5 2005-07-23 16:03:21.122690192 +0200
35 support the "max connections" option\&. The rsync daemon uses record
36 locking on this file to ensure that the max connections limit is not
37 exceeded for the modules sharing the lock file\&.
38 -The default is \f(CW/var/run/rsyncd\&.lock\fP\&.
39 +The default is \f(CW/var/lock/rsyncd\&.lock\fP\&.
42 The "read only" option determines whether clients