]> git.ipfire.org Git - thirdparty/rsync.git/commitdiff
More typo fixes.
authorMatt McCutchen <matt@mattmccutchen.net>
Mon, 17 Mar 2008 19:19:13 +0000 (15:19 -0400)
committerMatt McCutchen <matt@mattmccutchen.net>
Mon, 17 Mar 2008 19:32:07 +0000 (15:32 -0400)
NEWS
configure.in

diff --git a/NEWS b/NEWS
index 3d78dbd1a0e443f14fa35c6e1480efa66a361308..f5e4b0b9abfdc321e98acfb4af01e7ddf7aa8c2b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -20,10 +20,10 @@ Changes since 3.0.0:
       CPPFLAGS to be used.  Also improved the error reporting if the building
       of rounding.h fails.
 
-    - Fixed the use of th --protect-args (-s) option when talking to a daemon.
+    - Fixed the use of the --protect-args (-s) option when talking to a daemon.
 
     - Fixed the --ignore-existing option's protection of files on the receiver
-      that are non-regular file son the sender (e.g. if a symlink or a dir on
+      that are non-regular fileon the sender (e.g. if a symlink or a dir on
       the sender is trying to replace a file on the receiver).  The reverse
       protection (protecting a dir/symlink/device from being replaced by a
       file) was already working.
index 746b06d78d7461bf8961e59595a4bc20bd47e86a..ba2177790c775c113b9782da96af44962b813d1f 100644 (file)
@@ -660,7 +660,7 @@ if test x"$ac_cv_header_popt_popt_h" = x"yes"; then
     # If the system has /usr/include/popt/popt.h, we enable the
     # included popt because an attempt to "#include <popt/popt.h>"
     # would use our included header file anyway (due to -I.), and
-    # might conflit with the system popt.
+    # might conflict with the system popt.
     with_included_popt=yes
 elif test x"$ac_cv_header_popt_h" != x"yes"; then
     with_included_popt=yes