Automated merge.

diff --cc ChangeLog
index 4cb4b2812844f601fcf087529babdaea9b0f3ee1,34cb3f76887779a77f610eea7f292977eccef4e9..0eb978b691512215f00fb4c1166559b0a1877098
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,55 -1,9 +1,61 @@@
+ 2007-10-12  Micah Cowan  <micah@cowan.name>
+ 
+       * PATCHES: Removed.
+       * NEWS: Updated info about source repositories, removal of
+       PATCHES file.
+ 
 +2007-10-09  Micah Cowan  <micah@cowan.name>
 +
 +      * configure.in: Renamed to configure.ac
 +      * configure.ac: Renamed from configure.in. Added invocations of
 +      AM_GNU_GETTEXT, etc. Added en@quot and en@boldquot pseudo-LINGUA
 +      support.
 +      * ABOUT-NLS: Added back in (required by autoreconf :\).
 +      * Makefile.am: Added ABOUT-NLS and msdos/Makefile.WC to EXTRA_DIST.
 +      * m4/wget.m4: Removed no-longer-used NLS stuff.
 +      * Makefile.in.in: Restore previous policy of not updating .po's
 +      unless explicitly asked (via update-po).
 +
 +2007-10-09  gettextize  <bug-gnu-gettext@gnu.org>
 +
 +      * m4/gettext.m4: New file, from gettext-0.16.1.
 +      * m4/iconv.m4: New file, from gettext-0.16.1.
 +      * m4/lib-ld.m4: Upgrade to gettext-0.16.1.
 +      * m4/lib-link.m4: Upgrade to gettext-0.16.1.
 +      * m4/lib-prefix.m4: Upgrade to gettext-0.16.1.
 +      * m4/nls.m4: New file, from gettext-0.16.1.
 +      * m4/po.m4: New file, from gettext-0.16.1.
 +      * m4/progtest.m4: New file, from gettext-0.16.1.
 +      * po/Makefile.in.in: Upgrade to gettext-0.16.1.
 +      * po/Rules-quot: New file, from gettext-0.16.1.
 +      * po/boldquot.sed: New file, from gettext-0.16.1.
 +      * po/en@boldquot.header: New file, from gettext-0.16.1.
 +      * po/en@quot.header: New file, from gettext-0.16.1.
 +      * po/insert-header.sin: New file, from gettext-0.16.1.
 +      * po/quot.sed: New file, from gettext-0.16.1.
 +      * po/remove-potcdate.sin: New file, from gettext-0.16.1.
 +
 +2007-10-08  Micah Cowan  <micah@cowan.name>
 +
 +      * AUTHORS: Credit to Ralf Wildenhues for automakifying patches.
 +
 +2007-10-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      * po/Makefile.in.in: Since `distdir' is used now, adjust
 +      DISTFILES to the missing ChangeLog file.
 +      Add trivial targets ps, pdf, html.
 +      * Makefile.in: Removed, replaced by Makefile.am.
 +      * Makefile.am: Converted from Makefile.in.
 +      * util/Makefile.in: Removed, replaced by Makefile.am.
 +      * util/Makefile.am: Converted from Makefile.in.
 +      * configure.in: Adjust for automake support.
 +
 +2007-10-05  Micah Cowan  <micah@cowan.name>
 +
 +      * config.guess, config.sub, install-sh: Update from versions
 +      found in /usr/share/automake/.
 +      * autogen.sh: Removed, in favor of just running autoreconf.
 +
  2007-10-03  Micah Cowan  <micah@cowan.name>
  
        * NEWS: Note missing functionality from GnuTLS support. Call out

diff --cc NEWS
index e7c854d683ca000506e765a50aa0e67527374d56,518b561dae037388b660f87f673d9a8f33489902..77faebe097aedbaf1cdf8d47d2e43b33ebd95d05
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -6,12 -6,17 +6,21 @@@ See the end for copying conditions
  
  Please send GNU Wget bug reports to <bug-wget@gnu.org>.
  \f
 +* Changes in Wget (MAINLINE).
 +
 +** Wget uses Automake now.
 +\f
  * Changes in Wget 1.11.
  
+ ** The source code has been migrated to Mercurial. The repositories are
+ available at http://hg.addictivecode.org/. Prior to this, the source
+ code was hosted on Subversion (migrated from the original CVS); you can
+ still get access to older tags and branches for Wget in the Subversion
+ repository at http://addictivecode.org/svn/wget/.
+ 
+ ** PATCH file removed; see http://wget.addictivecode.org/PatchGuidelines
+ for current information about producing patches for GNU Wget.
+ 
  ** TODO file removed: we use a bugtracker now; see
  http://wget.addictivecode.org/BugTracker. Also,
  http://wget.addictivecode.org/FeatureSpecifications.

diff --cc doc/ChangeLog
Simple merge

diff --cc doc/wget.texi
Simple merge