Automated merge.

diff --git a/AUTHORS b/AUTHORS
index 219877e9a4fb65bad0661875c0f5d7ef8376215b..ab44acb2aa366c9897d27562d8fb91ed4590d136 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -45,3 +45,8 @@ Micah Cowan.  Current Wget maintainer, from mid-2007.
 
 Ralf Wildenhues.  Contributed patches to convert Wget to use Automake as
 part of its build process, and various bugfixes.
+
+Steven Schubiger.  Many helpful patches, bugfixes and improvements.
+Notably, conversion of Wget to use the Gnulib quotes and quoteargs
+modules, and the addition of password prompts at the console, via the
+Gnulib getpasswd-gnu module.

diff --git a/ChangeLog b/ChangeLog
index 407ce64cf8222706348e5aa55d7ee3345595f81a..00a1bfe78f48d4f5024361062f011ad670b37a57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-30  Micah Cowan  <micah@cowan.name>
+
+       * NEWS: Entries for 1.11.4.
+
+       * AUTHORS: Added Steven Schubiger.
+
 2008-05-29  Micah Cowan  <micah@cowan.name>
 
        * po/*.po: Updated from TP (the 1.11.3 set).

diff --git a/NEWS b/NEWS
index e74ce2a0ae1a9c74ecc539ec283386eff270aea9..02428f8f505b480e3f2d8624cbed4e1076614fdb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,20 @@ Please send GNU Wget bug reports to <bug-wget@gnu.org>.
 
 ** --ask-password option (and associated wgetrc command) added to
 support password prompts at the console.
+\f
+* Changes in Wget 1.11.4
+
+** Fixed an issue (apparently a regression) where -O would refuse to
+download when -nc was given, even though the file didn't exist.
+
+** Fixed a situation where Wget could abort with --continue if the
+remote server gives a content-length of zero when the file exists
+locally with content.
+
+** Fixed a crash on some systems, due to Wget casting a pointer-to-long
+to a pointer-to-time_t.
 
+** Translation updates for Catalan.
 \f
 * Changes in Wget 1.11.3
 

diff --git a/doc/ChangeLog b/doc/ChangeLog
index e028ad40380246dfeb1531cd8366cc6f2136cd8e..d9a87ab3381e7e515bc347f36ff4643ccdf878fb 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-29  Micah Cowan  <micah@cowan.name>
+
+       * wget.texi <Contributors>: Added Joao Ferreira, Mike Frysinger,
+       Alain, Guibert, Madhusudan Hosaagrahara, Jim Paris, Kenny
+       Parnell, Benno Schulenberg, and Pranab Shenoy. Added Steven
+       Schubiger to the "Special Thanks" section.
+
 2008-06-13  Micah Cowan  <micah@cowan.name>
 
        * wget.texi (Mailing List): The wget-notify mailing list no longer

diff --git a/doc/wget.texi b/doc/wget.texi
index 83f97a3768673feb1dc51072f3a75cc044f5be85..fb8e1004f31ea18ee37dc55504c595d2e902959a 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -3,7 +3,7 @@
 @c %**start of header
 @setfilename wget.info
 @include version.texi
-@set UPDATED Mar 2008
+@set UPDATED Jun 2008
 @settitle GNU Wget @value{VERSION} Manual
 @c Disable the monstrous rectangles beside overfull hbox-es.
 @finalout
@@ -3764,6 +3764,12 @@ Windows and MS-DOS support.
 Ralf Wildenhues---Contributed patches to convert Wget to use Automake as
 part of its build process, and various bugfixes.
 
+@item
+Steven Schubiger---Many helpful patches, bugfixes and improvements.
+Notably, conversion of Wget to use the Gnulib quotes and quoteargs
+modules, and the addition of password prompts at the console, via the
+Gnulib getpasswd-gnu module.
+
 @item
 People who provided donations for development---including Brian Gough.
 @end itemize
@@ -3819,8 +3825,15 @@ Aleksandar Erkalovi@'{c},
 Aleksandar Erkalovic,
 @end ifnottex
 Andy Eskilsson,
+@iftex
+Jo@~{a}o Ferreira,
+@end iftex
+@ifnottex
+Joao Ferreira,
+@end ifnottex
 Christian Fraenkel,
 David Fritz,
+Mike Frysinger,
 Charles C.@: Fu,
 FUJISHIMA Satsuki,
 Masashi Fujita,
@@ -3828,10 +3841,12 @@ Howard Gayle,
 Marcel Gerrits,
 Lemble Gregory,
 Hans Grobler,
+Alain Guibert,
 Mathieu Guillaume,
 Aaron Hawley,
 Jochen Hein,
 Karl Heuer,
+Madhusudan Hosaagrahara,
 HIROSE Masaaki,
 Ulf Harnhammar,
 Gregor Hoffleit,
@@ -3903,6 +3918,8 @@ Adam D.@: Moss,
 Simon Munton,
 Charlie Negyesi,
 R.@: K.@: Owen,
+Jim Paris,
+Kenny Parnell,
 Leonid Petrov,
 Simone Piunno,
 Andrew Pollock,
@@ -3937,9 +3954,11 @@ Edward J.@: Sabol,
 Heinz Salzmann,
 Robert Schmidt,
 Nicolas Schodet,
+Benno Schulenberg,
 Andreas Schwab,
 Steven M.@: Schweda,
 Chris Seawood,
+Pranab Shenoy,
 Dennis Smit,
 Toomas Soome,
 Tage Stabell-Kulo,