Automated merge.

This commit is contained in:
Micah Cowan 2008-11-05 09:12:46 -08:00
commit 3d7fceb1ef
9 changed files with 143 additions and 201 deletions

View File

@ -1,3 +1,9 @@
2008-10-31 Micah Cowan <micah@cowan.name>
* MAILING-LIST: Update information.
* NEWS: Add mention of mailing list move.
2008-08-01 Joao Ferreira <joao@joaoff.com> 2008-08-01 Joao Ferreira <joao@joaoff.com>
* NEWS: Added option --default-page to support alternative * NEWS: Added option --default-page to support alternative

View File

@ -1,33 +1,25 @@
Mailing List Mailing List
================ ============
There are several Wget-related mailing lists. The general discussion The primary mailinglist for discussion, bug-reports, or questions about
list is at <wget@sunsite.dk>. It is the preferred place for support GNU Wget is at <bug-wget@gnu.org>. To subscribe, send an email to
requests and suggestions, as well as for discussion of development. <bug-wget-join@gnu.org>, or visit
You are invited to subscribe. `http://lists.gnu.org/mailman/listinfo/bug-wget'.
To subscribe, simply send mail to <wget-subscribe@sunsite.dk> and Additionally, there is the <wget-notify@addictivecode.org> mailing
follow the instructions. Unsubscribe by mailing to list. This is a non-discussion list that receives bug report
<wget-unsubscribe@sunsite.dk>. The mailing list is archived at notifications from the bug-tracker. To subscribe to this list, send an
`http://www.mail-archive.com/wget%40sunsite.dk/' and at email to <wget-notify-join@addictivecode.org>, or visit
`http://news.gmane.org/gmane.comp.web.wget.general'.
Another mailing list is at <wget-patches@sunsite.dk>, and is used to
submit patches for review by Wget developers. A "patch" is a textual
representation of change to source code, readable by both humans and
programs. The file `PATCHES' that comes with Wget covers the creation
and submitting of patches in detail. Please don't send general
suggestions or bug reports to `wget-patches'; use it only for patch
submissions.
Subscription is the same as above for <wget@sunsite.dk>, except that
you send to <wget-patches-subscribe@sunsite.dk>, instead. The mailing
list is archived at `http://news.gmane.org/gmane.comp.web.wget.patches'.
Finally, there is the <wget-notify@addictivecode.org> mailing list.
This is a non-discussion list that receives commit notifications from
the source repository, and also bug report-change notifications. This
is the highest-traffic list for Wget, and is recommended only for
people who are seriously interested in ongoing Wget development.
Subscription is through the `mailman' interface at
`http://addictivecode.org/mailman/listinfo/wget-notify'. `http://addictivecode.org/mailman/listinfo/wget-notify'.
Previously, the mailing list <wget@sunsite.dk> was used as the main
discussion list, and another list, <wget-patches@sunsite.dk> was used
for submitting and discussing patches to GNU Wget.
Messages from <wget@sunsite.dk> are archived at
`http://www.mail-archive.com/wget%40sunsite.dk/' and at
`http://news.gmane.org/gmane.comp.web.wget.general'.
Messages from <wget-patches@sunsite.dk> are archived at
`http://news.gmane.org/gmane.comp.web.wget.patches'.

2
NEWS
View File

@ -8,6 +8,8 @@ Please send GNU Wget bug reports to <bug-wget@gnu.org>.
* Changes in Wget 1.12 (MAINLINE) * Changes in Wget 1.12 (MAINLINE)
** Mailing list MOVED to bug-wget@gnu.org
** --default-page option added to support alternative default names for ** --default-page option added to support alternative default names for
index.html. index.html.

View File

@ -3,6 +3,15 @@
* wget.texi: Move --no-http-keep-alive from FTP Options to HTTP * wget.texi: Move --no-http-keep-alive from FTP Options to HTTP
Options. Options.
2008-11-04 Micah Cowan <micah@cowan.name>
* wget.texi, fdl.texi: Updated to FDL version 1.3.
2008-10-31 Micah Cowan <micah@cowan.name>
* wget.texi (Mailing List): Update info to reflect change to
bug-wget@gnu.org.
2008-09-30 Steven Schubiger <stsc@members.fsf.org> 2008-09-30 Steven Schubiger <stsc@members.fsf.org>
* wget.texi (Wgetrc Commands): Add default_page, save_headers, * wget.texi (Wgetrc Commands): Add default_page, save_headers,

View File

@ -1,130 +0,0 @@
TO RELEASE WGET X.Y.Z:
1) update PO files from the TP
cd po
../util/update_po_files.sh
2) generate tarball
from the trunk:
cd ~/tmp
~/code/svn/wget/trunk/util/dist-wget --force-version X.Y.Z
from a branch:
cd ~/tmp
~/code/svn/wget/branches/X.Y/util/dist-wget --force-version X.Y.Z -b branches/X.Y
3) test the tarball
4) set new version number "X.Y.Z" on the repository
5) tag the sources in subversion
from the trunk:
svn copy -m "Tagging release X.Y.Z" http://svn.dotsrc.org/repo/wget/trunk http://svn.dotsrc.org/repo/wget/tags/WGET_X_Y_Z/
from a branch:
svn copy -m "Tagging release X.Y.Z" http://svn.dotsrc.org/repo/wget/branches/X.Y/ http://svn.dotsrc.org/repo/wget/tags/WGET_X_Y_Z/
6) upload the tarball on gnu.org
RELEASE=X.Y.Z
TARBALL=wget-${RELEASE}.tar.gz
gpg --default-key 7B2FD4B0 --detach-sign -b --output ${TARBALL}.sig $TARBALL
echo -e "version: 1.1\ndirectory: wget\nfilename: $TARBALL\ncomment: Wget release ${RELEASE}" > ${TARBALL}.directive
gpg --default-key 7B2FD4B0 --clearsign ${TARBALL}.directive
lftp ftp://ftp-upload.gnu.org/incoming/ftp
(use ftp://ftp-upload.gnu.org/incoming/alpha for pre-releases)
put wget-X.Y.Z.tar.gz
put wget-X.Y.Z.tar.gz.sig
put wget-X.Y.Z.tar.gz.directive.asc
7) update wget.sunsite.dk and gnu.org/software/wget
8) send announcement on wget@sunsite.dk:
hi to everybody,
i have just uploaded the wget X.Y.Z tarball on ftp.gnu.org:
ftp://ftp.gnu.org/gnu/wget/wget-X.Y.Z.tar.gz
you can find the GPG signature of the tarball at these URLs:
ftp://ftp.gnu.org/gnu/wget/wget-X.Y.Z.tar.gz.sig
and the GPG key i have used for the signature at this URL:
http://www.tortonesi.com/GNU-GPG-Key.txt
the key fingerprint is:
pub 1024D/7B2FD4B0 2005-06-02 Mauro Tortonesi (GNU Wget Maintainer)
<mauro@ferrara.linux.it>
Key fingerprint = 1E90 AEA8 D511 58F0 94E5 B106 7220 24E9 7B2F D4B0
the MD5 checksum of the tarball is:
MD5 of tarball wget-X.Y.Z.tar.gz
{DESCRIPTION OF THE CHANGES}
9) send announcement on info-gnu@gnu.org
I'm very pleased to announce the availability of GNU Wget X.Y.Z.
GNU Wget is a non-interactive command-line tool for retrieving files using
HTTP, HTTPS and FTP, which may easily be called from scripts, cron jobs,
terminals without X-Windows support, etc.
For more information, please see:
http://www.gnu.org/software/wget
http://wget.sunsite.dk
Here are the compressed sources and the GPG detached signature:
ftp://ftp.gnu.org/gnu/wget/wget-X.Y.Z.tar.gz
ftp://ftp.gnu.org/gnu/wget/wget-X.Y.Z.tar.gz.sig
The MD5 checksums of the tarball is:
MD5 of tarball wget-X.Y.Z.tar.gz
The GPG key I have used for the tarball signature is available at this URL:
http://www.tortonesi.com/GNU-GPG-Key.txt
the key fingerprint is:
pub 1024D/7B2FD4B0 2005-06-02 Mauro Tortonesi (GNU Wget Maintainer)
<mauro@ferrara.linux.it>
Key fingerprint = 1E90 AEA8 D511 58F0 94E5 B106 7220 24E9 7B2F D4B0
{DESCRIPTION OF THE CHANGES}
10) post announcement on freshmeat.net
11) set new version number "X.Y.Z+devel" on the repository

View File

@ -1,13 +1,12 @@
@c The GNU Free Documentation License.
@center Version 1.3, 3 November 2008
@node GNU Free Documentation License @c This file is intended to be included within another document,
@appendixsec GNU Free Documentation License @c hence no sectioning command or @node.
@cindex FDL, GNU Free Documentation License
@center Version 1.2, November 2002
@display @display
Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc. Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA @uref{http://fsf.org/}
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.
@ -112,6 +111,9 @@ formats which do not have any title page as such, ``Title Page'' means
the text near the most prominent appearance of the work's title, the text near the most prominent appearance of the work's title,
preceding the beginning of the body of the text. preceding the beginning of the body of the text.
The ``publisher'' means any person or entity that distributes copies
of the Document to the public.
A section ``Entitled XYZ'' means a named subunit of the Document whose A section ``Entitled XYZ'' means a named subunit of the Document whose
title either is precisely XYZ or contains XYZ in parentheses following title either is precisely XYZ or contains XYZ in parentheses following
text that translates XYZ in another language. (Here XYZ stands for a text that translates XYZ in another language. (Here XYZ stands for a
@ -380,13 +382,30 @@ title.
@item @item
TERMINATION TERMINATION
You may not copy, modify, sublicense, or distribute the Document except You may not copy, modify, sublicense, or distribute the Document
as expressly provided for under this License. Any other attempt to except as expressly provided under this License. Any attempt
copy, modify, sublicense or distribute the Document is void, and will otherwise to copy, modify, sublicense, or distribute it is void, and
automatically terminate your rights under this License. However, will automatically terminate your rights under this License.
parties who have received copies, or rights, from you under this
License will not have their licenses terminated so long as such However, if you cease all violation of this License, then your license
parties remain in full compliance. from a particular copyright holder is reinstated (a) provisionally,
unless and until the copyright holder explicitly and finally
terminates your license, and (b) permanently, if the copyright holder
fails to notify you of the violation by some reasonable means prior to
60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, receipt of a copy of some or all of the same material does
not give you any rights to use it.
@item @item
FUTURE REVISIONS OF THIS LICENSE FUTURE REVISIONS OF THIS LICENSE
@ -404,7 +423,42 @@ following the terms and conditions either of that specified version or
of any later version that has been published (not as a draft) by the of any later version that has been published (not as a draft) by the
Free Software Foundation. If the Document does not specify a version Free Software Foundation. If the Document does not specify a version
number of this License, you may choose any version ever published (not number of this License, you may choose any version ever published (not
as a draft) by the Free Software Foundation. as a draft) by the Free Software Foundation. If the Document
specifies that a proxy can decide which future versions of this
License can be used, that proxy's public statement of acceptance of a
version permanently authorizes you to choose that version for the
Document.
@item
RELICENSING
``Massive Multiauthor Collaboration Site'' (or ``MMC Site'') means any
World Wide Web server that publishes copyrightable works and also
provides prominent facilities for anybody to edit those works. A
public wiki that anybody can edit is an example of such a server. A
``Massive Multiauthor Collaboration'' (or ``MMC'') contained in the
site means any set of copyrightable works thus published on the MMC
site.
``CC-BY-SA'' means the Creative Commons Attribution-Share Alike 3.0
license published by Creative Commons Corporation, a not-for-profit
corporation with a principal place of business in San Francisco,
California, as well as future copyleft versions of that license
published by that same organization.
``Incorporate'' means to publish or republish a Document, in whole or
in part, as part of another Document.
An MMC is ``eligible for relicensing'' if it is licensed under this
License, and if all works that were first published under this License
somewhere other than this MMC, and subsequently incorporated in whole
or in part into the MMC, (1) had no cover texts or invariant sections,
and (2) were thus incorporated prior to November 1, 2008.
The operator of an MMC Site may republish an MMC contained in the site
under CC-BY-SA on the same site at any time before August 1, 2009,
provided the MMC is eligible for relicensing.
@end enumerate @end enumerate
@page @page
@ -418,7 +472,7 @@ license notices just after the title page:
@group @group
Copyright (C) @var{year} @var{your name}. Copyright (C) @var{year} @var{your name}.
Permission is granted to copy, distribute and/or modify this document Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2 under the terms of the GNU Free Documentation License, Version 1.3
or any later version published by the Free Software Foundation; or any later version published by the Free Software Foundation;
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
Texts. A copy of the license is included in the section entitled ``GNU Texts. A copy of the license is included in the section entitled ``GNU
@ -427,7 +481,7 @@ license notices just after the title page:
@end smallexample @end smallexample
If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
replace the ``with...Texts.'' line with this: replace the ``with@dots{}Texts.'' line with this:
@smallexample @smallexample
@group @group

View File

@ -3409,36 +3409,35 @@ information resides at ``The Wget Wgiki'',
@cindex mailing list @cindex mailing list
@cindex list @cindex list
There are several Wget-related mailing lists. The general discussion The primary mailinglist for discussion, bug-reports, or questions
list is at @email{wget@@sunsite.dk}. It is the preferred place for about GNU Wget is at @email{bug-wget@@gnu.org}. To subscribe, send an
support requests and suggestions, as well as for discussion of email to @email{bug-wget-join@@gnu.org}, or visit
development. You are invited to subscribe. @url{http://lists.gnu.org/mailman/listinfo/bug-wget}.
To subscribe, simply send mail to @email{wget-subscribe@@sunsite.dk} Additionally, there is the @email{wget-notify@@addictivecode.org} mailing
and follow the instructions. Unsubscribe by mailing to list. This is a non-discussion list that receives bug report
@email{wget-unsubscribe@@sunsite.dk}. The mailing list is archived at notifications from the bug-tracker. To subscribe to this list,
send an email to @email{wget-notify-join@@addictivecode.org},
or visit @url{http://addictivecode.org/mailman/listinfo/wget-notify}.
Previously, the mailing list @email{wget@@sunsite.dk} was used as the
main discussion list, and another list,
@email{wget-patches@@sunsite.dk} was used for submitting and
discussing patches to GNU Wget.
Messages from @email{wget@@sunsite.dk} are archived at
@itemize @tie{}
@item
@url{http://www.mail-archive.com/wget%40sunsite.dk/} and at @url{http://www.mail-archive.com/wget%40sunsite.dk/} and at
@item
@url{http://news.gmane.org/gmane.comp.web.wget.general}. @url{http://news.gmane.org/gmane.comp.web.wget.general}.
@end itemize
Another mailing list is at @email{wget-patches@@sunsite.dk}, and is Messages from @email{wget-patches@@sunsite.dk} are archived at
used to submit patches for review by Wget developers. A ``patch'' is @itemize @tie{}
a textual representation of change to source code, readable by both @item
humans and programs. The
@url{http://wget.addictivecode.org/PatchGuidelines} page
covers the creation and submitting of patches in detail. Please don't
send general suggestions or bug reports to @samp{wget-patches}; use it
only for patch submissions.
Subscription is the same as above for @email{wget@@sunsite.dk}, except
that you send to @email{wget-patches-subscribe@@sunsite.dk}, instead.
The mailing list is archived at
@url{http://news.gmane.org/gmane.comp.web.wget.patches}. @url{http://news.gmane.org/gmane.comp.web.wget.patches}.
@end itemize
Finally, there is the @email{wget-notify@@addictivecode.org} mailing
list. This is a non-discussion list that receives bug report-change
notifications from the bug-tracker. Unlike for the other mailing lists,
subscription is through the @code{mailman} interface at
@url{http://addictivecode.org/mailman/listinfo/wget-notify}.
@node Internet Relay Chat @node Internet Relay Chat
@section Internet Relay Chat @section Internet Relay Chat
@ -4039,6 +4038,10 @@ subscribers of the Wget mailing list.
* GNU Free Documentation License:: Licnse for copying this manual. * GNU Free Documentation License:: Licnse for copying this manual.
@end menu @end menu
@node GNU Free Documentation License
@appendixsec GNU Free Documentation License
@cindex FDL, GNU Free Documentation License
@include fdl.texi @include fdl.texi

View File

@ -1,3 +1,7 @@
2008-10-31 Micah Cowan <micah@cowan.name>
* main.c (print_version): Add information about the mailing list.
2008-10-31 Alexander Drozdov <dzal_mail@mtu-net.ru> 2008-10-31 Alexander Drozdov <dzal_mail@mtu-net.ru>
* retr.c (fd_read_hunk): Make assert deal with maxsize == 0. * retr.c (fd_read_hunk): Make assert deal with maxsize == 0.

View File

@ -835,6 +835,8 @@ There is NO WARRANTY, to the extent permitted by law.\n"), stdout);
stdout); stdout);
fputs (_("Currently maintained by Micah Cowan <micah@cowan.name>.\n"), fputs (_("Currently maintained by Micah Cowan <micah@cowan.name>.\n"),
stdout); stdout);
fputs (_("Please send bug reports and questions to <bug-wget@gnu.org>.\n"),
stdout);
exit (0); exit (0);
} }