Merge with mainline

[wget] / util / dist-wget

diff --git a/util/dist-wget b/util/dist-wget
index 64d7baf6875f83c6d59fd94773de1104f237630a..fd9840598d92e2cd9da2ed5e6dec8d688608b9ab 100755 (executable)
--- a/util/dist-wget
+++ b/util/dist-wget
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2007 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # In addition, as a special exception, the Free Software Foundation
 # gives permission to link the code of its release of Wget with the
@@ -96,7 +95,7 @@ do
       VERSION=$1
       ;;
     *)
-      echo "Usage: $0 [-d] [-b BRANCH] [-r TAG | -D DATE]" >&2
+      echo "Usage: $0 [-d] [-b BRANCH-PATH] [-r REVISION | -D DATE]" >&2
       exit 1
   esac
   shift