From: Matt McCutchen Date: Mon, 17 Mar 2008 19:19:13 +0000 (-0400) Subject: More typo fixes. X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/d7b6774d82ae234978542c43c9ad655c8ade101e More typo fixes. --- diff --git a/NEWS b/NEWS index 3d78dbd1..f5e4b0b9 100644 --- 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 files on 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. diff --git a/configure.in b/configure.in index 746b06d7..ba217779 100644 --- a/configure.in +++ b/configure.in @@ -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 " # 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