- up for 2.6.9

Changed files:
    rsync-config.patch -> 1.15
    rsync-man.patch -> 1.12

diff --git a/rsync-config.patch b/rsync-config.patch
index 0efd659bb2a5b464d9fcff34083dcf0dd4468449..f0263655a8ca2900572b118d961c47ba90f7357f 100644 (file)
--- a/rsync-config.patch
+++ b/rsync-config.patch
@@ -11,6 +11,7 @@ diff -urN rsync-2.6.8.org/rsyncd.conf.5 rsync-2.6.8/rsyncd.conf.5
  .IP 
  .IP "\fBstrict modes\fP" 
 @@ -656,13 +656,13 @@
+ [cvs]
          path = /data/cvs
          comment = CVS repository (requires authentication)
          auth users = tridge, susan
@@ -18,7 +19,6 @@ diff -urN rsync-2.6.8.org/rsyncd.conf.5 rsync-2.6.8/rsyncd.conf.5
 +        secrets file = /etc/rsyncd/rsyncd\&.secrets
  
  .fi 
-  
  
  .PP 
 -The /etc/rsyncd\&.secrets file would look something like this:
@@ -44,7 +44,7 @@ diff -urN rsync-2.6.8.org/rsyncd.conf.yo rsync-2.6.8/rsyncd.conf.yo
  Note that you should bf(not) send the rsync daemon a HUP signal to force
 -it to reread the tt(rsyncd.conf) file. The file is re-read on each client
 +it to reread the tt(/etc/rsyncd/rsyncd.conf) file. The file is re-read on each client
- connection. 
+ connection.
  
  manpagesection(GLOBAL OPTIONS)
 @@ -137,7 +137,7 @@

diff --git a/rsync-man.patch b/rsync-man.patch
index 3844d1f9bc13d83207b8e305acc125dbb666a30b..a13f5801f7a9fe0048789d026287d3263804b959 100644 (file)
--- a/rsync-man.patch
+++ b/rsync-man.patch
@@ -4,7 +4,7 @@ diff -ur rsync-2.6.7.org/rsync.1 rsync-2.6.7/rsync.1
 @@ -2019,7 +2019,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\&.  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 the super-user; in that case
@@ -22,12 +22,13 @@ diff -ur rsync-2.6.7.org/rsync.1 rsync-2.6.7/rsync.1
 diff -ur rsync-2.6.7.org/rsyncd.conf.5 rsync-2.6.7/rsyncd.conf.5
 --- rsync-2.6.7.org/rsyncd.conf.5      2006-03-11 21:38:50.437579500 +0100
 +++ rsync-2.6.7/rsyncd.conf.5  2006-03-11 21:39:02.086307500 +0100
-@@ -210,7 +210,7 @@
+@@ -228,7 +228,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\&. 
+ 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" 
+ .IP "\fBread only\fP"
  The "read only" option determines whether clients
+