From: Wayne Davison <wayned@samba.org>
Date: Sat, 14 Jun 2014 16:55:37 +0000 (-0700)
Subject: Updated NEWS & tweaked a comment.
X-Git-Tag: v3.1.1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edb0d9c79205a5d8840719462cd69b98642cfbf2;p=thirdparty%2Frsync.git

Updated NEWS & tweaked a comment.
---

diff --git a/NEWS b/NEWS
index 5f2e7387..9ad83068 100644
--- a/NEWS
+++ b/NEWS
@@ -107,3 +107,6 @@ Changes since 3.1.0:
   DEVELOPER RELATED:
 
     - We now include an example systemd file (in packaging/systemd).
+
+    - Tweaked configure to make sure that any intended use of the included popt
+      and/or zlib code is put early in the CFLAGS.
diff --git a/options.c b/options.c
index 5b061ade..62dfe4f0 100644
--- a/options.c
+++ b/options.c
@@ -2500,7 +2500,7 @@ void server_options(char **args, int *argc_p)
 		argstr[x++] = 's'; /* symlink iconv translation support */
 #endif
 		argstr[x++] = 'f'; /* flist I/O-error safety support */
-		argstr[x++] = 'x'; /* xattr hardlink optimization not supported */
+		argstr[x++] = 'x'; /* xattr hardlink optimization not desired */
 	}
 
 	if (x >= (int)sizeof argstr) { /* Not possible... */