From: Giuseppe Scrivano <gscri...@redhat.com> --- ChangeLog | 5 +++++ build-aux/build_info.pl | 2 +- configure.ac | 6 +++--- doc/ChangeLog | 2 ++ doc/wget.texi | 10 +++++----- src/ChangeLog | 2 ++ src/wget.h | 2 +- 7 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog index cb3114d..4cfd923 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-06-10 Giuseppe Scrivano <gscri...@redhat.com> + + * build-aux/build_info.pl: Remove trailing whitespaces. + * configure.ac: Likewise. + 2014-05-30 Darshit Shah <dar...@gmail.com> * configure.ac: Allow compilation without libpsl. diff --git a/build-aux/build_info.pl b/build-aux/build_info.pl index eddfd52..67aeab1 100755 --- a/build-aux/build_info.pl +++ b/build-aux/build_info.pl @@ -100,7 +100,7 @@ EOC EOC } print $fh <<EOC; -#else +#else "-$name", #endif diff --git a/configure.ac b/configure.ac index d2c2e70..fe35c2e 100644 --- a/configure.ac +++ b/configure.ac @@ -264,7 +264,7 @@ AS_IF([test x"$with_ssl" = xopenssl], [ case $host_os in *mingw32* ) dnl prefer link to openssl dlls if possible. if not then fallback on static libs. if not then error - + AC_CHECK_LIB(eay32, EVP_MD_CTX_init) if test x"$ac_cv_lib_eay32_EVP_MD_CTX_init" != xno then @@ -276,7 +276,7 @@ AS_IF([test x"$with_ssl" = xopenssl], [ AC_DEFINE([HAVE_LIBSSL32], [1], [Define to 1 if you have the `ssl32' library (-lssl32).]) ], AC_MSG_ERROR([openssl not found: shared lib eay32 found but ssl32 not found])) - + else LIBS+=' -lgdi32' dnl fallback and test static libs @@ -565,7 +565,7 @@ AC_CHECK_HEADER(pcre.h, ]) ) - + dnl Needed by src/Makefile.am AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"]) diff --git a/doc/ChangeLog b/doc/ChangeLog index 446ed5a..fd01b76 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,7 @@ 2014-06-10 Giuseppe Scrivano <gscri...@redhat.com> + * wget.texi: Remove trailing whitespaces. + * fdl.texi: Copy from gnulib. 2014-05-24 Darshit Shah <dar...@gmail.com> diff --git a/doc/wget.texi b/doc/wget.texi index b154f4b..fab0ab8 100644 --- a/doc/wget.texi +++ b/doc/wget.texi @@ -935,7 +935,7 @@ Don't use proxies, even if the appropriate @code{*_proxy} environment variable is defined. @c man end -For more information about the use of proxies with Wget, @xref{Proxies}. +@xref{Proxies} for more information about the use of proxies with Wget. @c man begin OPTIONS @cindex quota @@ -1277,8 +1277,8 @@ really important, do not leave them lying in those files either---edit the files and delete them after Wget has started the download. @iftex -For more information about security issues with Wget, @xref{Security -Considerations}. +@xref{Security Considerations} for more information about security issues +with Wget. @end iftex @cindex Keep-Alive, turning off @@ -1814,8 +1814,8 @@ really important, do not leave them lying in those files either---edit the files and delete them after Wget has started the download. @iftex -For more information about security issues with Wget, @xref{Security -Considerations}. +@xref{Security Considerations} for more information about security issues +with Wget. @end iftex @cindex .listing files, removing diff --git a/src/ChangeLog b/src/ChangeLog index 3a883aa..dbe1028 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2014-06-10 Giuseppe Scrivano <gscri...@redhat.com> + * wget.h: Remove trailing whitespaces. + * retr.c (getproxy): Return a dinamically allocated string and... (retrieve_from_file, retrieve_url, url_uses_proxy): ...fix the caller to handle it. diff --git a/src/wget.h b/src/wget.h index ba4ea21..6bdbe7a 100644 --- a/src/wget.h +++ b/src/wget.h @@ -366,7 +366,7 @@ typedef enum Select an appropriate "orig" suffix and a separator character for adding a unique suffix to a file name. - A VMS ODS2 file system can not tolerate multiple dots. An ODS5 file + A VMS ODS2 file system can't tolerate multiple dots. An ODS5 file system can, but even there not all dots are equal, and heroic effort would be needed to get ".html^.orig" rather than (the less desirable) "^.html.orig". It's more satisfactory always to use "_orig" on VMS -- 1.9.3