- added acfix patch (for ac 2.58+)

[packages/rsync.git] / rsync-man.patch

diff --git a/rsync-man.patch b/rsync-man.patch
index ae77de2ab856001beeafe90007e66ba21f2da5f6..79766c6942df11a781ae4ebdf07e2b94e76fb116 100644 (file)
--- a/rsync-man.patch
+++ b/rsync-man.patch
@@ -1,49 +1,42 @@
-diff -Nur rsync-2.3.1/rsync.1 rsync-2.3.1.pld/rsync.1
---- rsync-2.3.1/rsync.1        Tue Apr  6 17:04:16 1999
-+++ rsync-2.3.1.pld/rsync.1    Thu Jun 17 09:56:27 1999
-@@ -186,7 +186,7 @@
- .SH "RUNNING AN RSYNC SERVER" 
+diff -Naur rsync-2.5.6-orig/rsync.1 rsync-2.5.6/rsync.1
+--- rsync-2.5.6-orig/rsync.1   Tue Jan 28 04:11:57 2003
++++ rsync-2.5.6/rsync.1        Thu Jan 30 18:11:11 2003
+@@ -236,7 +236,7 @@
  .PP 
- An rsync server is configured using a config file which by default is
--called /etc/rsyncd\&.conf\&. Please see the rsyncd\&.conf(5) man page for more
-+called /etc/rsyncd/rsyncd\&.conf\&. Please see the rsyncd\&.conf(5) man page for more
- information\&. 
- .PP 
- .SH "EXAMPLES" 
-@@ -683,13 +683,13 @@
- daemon\&. If standard input is a socket then rsync will assume that it
- is being run via inetd, otherwise it will detach from the current
- terminal and become a background daemon\&. The daemon will read the
--config file (/etc/rsyncd\&.conf) on each connect made by a client and
-+config file (/etc/rsyncd/rsyncd\&.conf) on each connect made by a client and
- respond to requests accordingly\&. See the rsyncd\&.conf(5) man page for more
- details\&. 
- .IP 
+ An rsync server is configured using a config file\&.  Please see the 
+ rsyncd\&.conf(5) man page for more information\&.  By default the configuration
+-file is called /etc/rsyncd\&.conf, unless rsync is running over a remote
++file is called /etc/rsyncd/rsyncd\&.conf, unless rsync is running over a remote
+ shell program and is not running as root; in that case, the default name
+ is rsyncd\&.conf in the current directory on the remote computer 
+ (typically $HOME)\&.
+@@ -860,7 +860,7 @@
  .IP "\fB--config=FILE\fP" 
  This specifies an alternate config file than
--the default /etc/rsyncd\&.conf\&. This is only relevant when --daemon is
-+the default /etc/rsyncd/rsyncd\&.conf\&. This is only relevant when --daemon is
- specified\&. 
+ the default\&.  This is only relevant when --daemon 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 root; in that case
+ the default is rsyncd\&.conf in the current directory (typically $HOME)\&.
  .IP 
- .IP "\fB--port=PORT\fP" 
-@@ -857,7 +857,7 @@
+@@ -1258,7 +1258,7 @@
  .PP 
  .SH "FILES" 
  .PP 
--/etc/rsyncd\&.conf
-+/etc/rsyncd/rsyncd\&.conf
+-/etc/rsyncd\&.conf or rsyncd\&.conf
++/etc/rsyncd/rsyncd\&.conf or rsyncd\&.conf
  .PP 
  .SH "SEE ALSO" 
  .PP 
-diff -Nur rsync-2.3.1/rsyncd.conf.5 rsync-2.3.1.pld/rsyncd.conf.5
---- rsync-2.3.1/rsyncd.conf.5  Thu Jun 17 10:00:42 1999
-+++ rsync-2.3.1.pld/rsyncd.conf.5      Thu Jun 17 09:57:18 1999
-@@ -149,7 +149,7 @@
- The "lock file" option specifies the file to use to
+diff -Naur rsync-2.5.6-orig/rsyncd.conf.5 rsync-2.5.6/rsyncd.conf.5
+--- rsync-2.5.6-orig/rsyncd.conf.5     Thu Jan 30 17:52:53 2003
++++ rsync-2.5.6/rsyncd.conf.5  Thu Jan 30 18:11:58 2003
+@@ -161,7 +161,7 @@
  support the "max connections" option\&. The rsync server uses record
  locking on this file to ensure that the max connections limit is not
--exceeded\&. The default is \f(CW/var/run/rsyncd\&.lock\fP\&.
-+exceeded\&. The default is \f(CW/var/lock/rsyncd\&.lock\fP\&.
+ 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" 
  The "read only" option determines whether clients