From 3c54d8a3ad9101fdbde95b7c44e78d4bc6afbbbb Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Sat, 19 Feb 2005 17:38:51 +0000
Subject: [PATCH] Decided to leave the "log format" default the same as in
 earlier versions.

---
 loadparm.c     | 2 +-
 rsyncd.conf.yo | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/loadparm.c b/loadparm.c
index 4c018ed6..ae8a677f 100644
--- a/loadparm.c
+++ b/loadparm.c
@@ -181,7 +181,7 @@ static service sDefault =
 	NULL,    /* exclude from */
 	NULL,    /* include */
 	NULL,    /* include from */
-	"%o %h [%a] %m (%u) %l %f%L",    /* log format */
+	"%o %h [%a] %m (%u) %f %l",    /* log format */
 	NULL,    /* refuse options */
 	"*.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz",    /* dont compress */
 	0,        /* timeout */
diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index fe78f3b3..11740c95 100644
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -378,7 +378,7 @@ quote(itemize(
   it() %l for the length of the file in bytes
   it() %p for the process ID of this rsync session
   it() %o for the operation, which is "send", "recv", or "del."
-  it() %f for the filename (long form on server; no trailing "/")
+  it() %f for the filename (long form on sender; no trailing "/")
   it() %n for the filename (short form; trailing "/" on dir)
   it() %L either the string " -> SYMLINK" or "" if not a symlink
   it() %P for the module path
@@ -391,7 +391,7 @@ quote(itemize(
   it() %i an itemized list of what is being updated
 ))
 
-The default log format is "%o %h [%a] %m (%u) %l %f%L", and a "%t [%p] "
+The default log format is "%o %h [%a] %m (%u) %f %l", and a "%t [%p] "
 is always prefixed when using the "log file" option.
 
 A perl script called rsyncstats to summarize this format is included
-- 
2.34.1