]>
Commit | Line | Data |
---|---|---|
c9a2c537 MW |
1 | diff -Naur rsync-2.5.6-orig/rsync.1 rsync-2.5.6/rsync.1 |
2 | --- rsync-2.5.6-orig/rsync.1 Tue Jan 28 04:11:57 2003 | |
3 | +++ rsync-2.5.6/rsync.1 Thu Jan 30 18:11:11 2003 | |
4 | @@ -236,7 +236,7 @@ | |
b38302f0 | 5 | .PP |
c9a2c537 MW |
6 | An rsync server is configured using a config 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 rsync is running over a remote | |
9 | +file is called /etc/rsyncd/rsyncd\&.conf, unless rsync is running over a remote | |
10 | shell program and is not running as root; in that case, the default name | |
11 | is rsyncd\&.conf in the current directory on the remote computer | |
12 | (typically $HOME)\&. | |
13 | @@ -860,7 +860,7 @@ | |
cbdb69ef | 14 | .IP "\fB--config=FILE\fP" |
15 | This specifies an alternate config file than | |
c9a2c537 MW |
16 | the default\&. This is only relevant when --daemon 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)\&. | |
b38302f0 | 21 | .IP |
c9a2c537 | 22 | @@ -1258,7 +1258,7 @@ |
9def7c32 AM |
23 | .PP |
24 | .SH "FILES" | |
25 | .PP | |
c9a2c537 MW |
26 | -/etc/rsyncd\&.conf or rsyncd\&.conf |
27 | +/etc/rsyncd/rsyncd\&.conf or rsyncd\&.conf | |
9def7c32 AM |
28 | .PP |
29 | .SH "SEE ALSO" | |
30 | .PP | |
c9a2c537 MW |
31 | diff -Naur rsync-2.5.6-orig/rsyncd.conf.5 rsync-2.5.6/rsyncd.conf.5 |
32 | --- rsync-2.5.6-orig/rsyncd.conf.5 Thu Jan 30 17:52:53 2003 | |
33 | +++ rsync-2.5.6/rsyncd.conf.5 Thu Jan 30 18:11:58 2003 | |
34 | @@ -161,7 +161,7 @@ | |
cbdb69ef | 35 | support the "max connections" option\&. The rsync server uses record |
36 | locking on this file to ensure that the max connections limit is not | |
c9a2c537 MW |
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\&. | |
cbdb69ef | 40 | .IP |
41 | .IP "\fBread only\fP" | |
42 | The "read only" option determines whether clients |