]>
Commit | Line | Data |
---|---|---|
06295e94 AM |
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 | |
4 | @@ -2019,7 +2019,7 @@ | |
cbdb69ef | 5 | .IP "\fB--config=FILE\fP" |
6 | This specifies an alternate config file than | |
d2da20aa | 7 | the default\&. This is only relevant when \fB\-\-daemon\fP is specified\&. |
c9a2c537 MW |
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 | |
06295e94 | 10 | a remote shell program and the remote user is not the super-user; in that case |
c9a2c537 | 11 | the default is rsyncd\&.conf in the current directory (typically $HOME)\&. |
b38302f0 | 12 | .IP |
06295e94 | 13 | @@ -2865,7 +2865,7 @@ |
9def7c32 AM |
14 | .PP |
15 | .SH "FILES" | |
16 | .PP | |
c9a2c537 MW |
17 | -/etc/rsyncd\&.conf or rsyncd\&.conf |
18 | +/etc/rsyncd/rsyncd\&.conf or rsyncd\&.conf | |
9def7c32 AM |
19 | .PP |
20 | .SH "SEE ALSO" | |
21 | .PP | |
06295e94 AM |
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 | |
d2da20aa | 25 | @@ -228,7 +228,7 @@ |
65bac86c | 26 | support the "max connections" option\&. The rsync daemon uses record |
cbdb69ef | 27 | locking on this file to ensure that the max connections limit is not |
d2da20aa | 28 | exceeded for the modules sharing the lock file\&. |
c9a2c537 MW |
29 | -The default is \f(CW/var/run/rsyncd\&.lock\fP\&. |
30 | +The default is \f(CW/var/lock/rsyncd\&.lock\fP\&. | |
cbdb69ef | 31 | .IP |
d2da20aa | 32 | .IP "\fBread only\fP" |
cbdb69ef | 33 | The "read only" option determines whether clients |
d2da20aa | 34 |