=== modified file 'po4a/po/devscripts.pot'
--- po4a/po/devscripts.pot	2010-10-19 12:35:19 +0000
+++ po4a/po/devscripts.pot	2010-12-06 00:35:54 +0000
@@ -12773,7 +12773,7 @@
 msgid ""
 "# This is the format for an FTP site:\n"
 "# Full-site-with-pattern  [Version  [Action]]\n"
-"ftp://ftp.tex.ac.uk/tex-archive/web/c_cpp/cweb/cweb-(.*)\\e.tar\\e.gz \\e\n"
+"ftp://ftp.tex.ac.uk/tex-archive/web/c_cpp/cweb/cweb-(.+)\\e.tar\\e.gz \\e\n"
 "  debian  uupdate\n"
 msgstr ""
 
@@ -12783,7 +12783,7 @@
 msgid ""
 "# This is the format for an FTP site with regex special characters in\n"
 "# the filename part\n"
-"ftp://ftp.worldforge.org/pub/worldforge/libs/Atlas-C++/transitional/Atlas-C\\e+\\e+-(.*)\\e.tar\\e.gz\n"
+"ftp://ftp.worldforge.org/pub/worldforge/libs/Atlas-C++/transitional/Atlas-C\\e+\\e+-(.+)\\e.tar\\e.gz\n"
 msgstr ""
 
 #. type: Plain text
@@ -12811,7 +12811,7 @@
 "# as the FTP format.  uscan starts by downloading the homepage,\n"
 "# obtained by removing the last component of the URL; in this case,\n"
 "# http://www.cpan.org/modules/by-module/Text/\n"
-"http://www.cpan.org/modules/by-module/Text/Text-CSV_XS-(.*)\\e.tar\\e.gz\n"
+"http://www.cpan.org/modules/by-module/Text/Text-CSV_XS-(.+)\\e.tar\\e.gz\n"
 msgstr ""
 
 #. type: Plain text
@@ -12854,7 +12854,7 @@
 "# githubredir.debian.net is a redirector for GitHub projects\n"
 "# It can be used as following:\n"
 "http://githubredir.debian.net/github/E<lt>userE<gt>/E<lt>projectE<gt> "
-"(.*).tar.gz\n"
+"(.+).tar.gz\n"
 msgstr ""
 
 #. type: Plain text
@@ -12878,7 +12878,7 @@
 "# version numbers.)\n"
 "opts=\"uversionmangle=s/^/0.0./\" \\e\n"
 "  "
-"ftp://ftp.ibiblio.org/pub/Linux/ALPHA/wine/development/Wine-(.*)\\e.tar\\e.gz\n"
+"ftp://ftp.ibiblio.org/pub/Linux/ALPHA/wine/development/Wine-(.+)\\e.tar\\e.gz\n"
 msgstr ""
 
 #. type: Plain text
@@ -12888,7 +12888,7 @@
 "# Similarly, the upstream part of the Debian version number can be\n"
 "# mangled:\n"
 "opts=dversionmangle=s/\\e.dfsg\\e.\\ed+$// \\e\n"
-"  http://some.site.org/some/path/foobar-(.*)\\e.tar\\e.gz\n"
+"  http://some.site.org/some/path/foobar-(.+)\\e.tar\\e.gz\n"
 msgstr ""
 
 #. type: Plain text
@@ -12902,13 +12902,13 @@
 "href=\"http://foo.bar.org/download/?path=&download=foo-0.1.1.tar.gz\"E<gt>\n"
 "# could be handled as:\n"
 "# opts=filenamemangle=s/.*=(.*)/$1/ \\e\n"
-"#     http://foo.bar.org/download/\\e?path=&download=foo-(.*)\\e.tar\\e.gz\n"
+"#     http://foo.bar.org/download/\\e?path=&download=foo-(.+)\\e.tar\\e.gz\n"
 "# \n"
 "# E<lt>A "
 "href=\"http://foo.bar.org/download/?path=&download_version=0.1.1\"E<gt>\n"
 "# could be handled as:\n"
 "# opts=filenamemangle=s/.*=(.*)/foo-$1\\e.tar\\e.gz/ \\e\n"
-"#    http://foo.bar.org/download/\\e?path=&download_version=(.*)\n"
+"#    http://foo.bar.org/download/\\e?path=&download_version=(.+)\n"
 msgstr ""
 
 #. type: Plain text
@@ -12921,7 +12921,7 @@
 "# some way into one which will work automatically, for example:\n"
 "# opts=downloadurlmangle=s/prdownload/download/ \\e\n"
 "#   http://developer.berlios.de/project/showfiles.php?group_id=2051 \\e\n"
-"#   http://prdownload.berlios.de/softdevice/vdr-softdevice-(.*).tgz\n"
+"#   http://prdownload.berlios.de/softdevice/vdr-softdevice-(.+).tgz\n"
 msgstr ""
 
 #. type: Plain text
@@ -13047,8 +13047,8 @@
 "searched for hrefs matching the pattern given in the second field.  (Again, "
 "this pattern will be anchored at the beginning and the end, so it must match "
 "the whole href.  If you want to match just the basename of the href, you can "
-"use a pattern like \".*/name-(.*)\\e.tar\\e.gz\" if you know that there is a "
-"full URL, or better still: \"(?:.*/)?name-(.*)\\e.tar\\e.gz\" if there may "
+"use a pattern like \".*/name-(.+)\\e.tar\\e.gz\" if you know that there is a "
+"full URL, or better still: \"(?:.*/)?name-(.+)\\e.tar\\e.gz\" if there may "
 "or may not be.  Note the use of (?:...) to avoid making a backreference.)  "
 "If any of the hrefs in the homepage which match the (anchored) pattern are "
 "relative URLs, they will be taken as being relative to the base URL of the "

=== modified file 'po4a/po/fr.po'
--- po4a/po/fr.po	2010-10-19 12:35:19 +0000
+++ po4a/po/fr.po	2010-12-06 00:35:54 +0000
@@ -16271,12 +16271,12 @@
 msgid ""
 "# This is the format for an FTP site:\n"
 "# Full-site-with-pattern  [Version  [Action]]\n"
-"ftp://ftp.tex.ac.uk/tex-archive/web/c_cpp/cweb/cweb-(.*)\\e.tar\\e.gz \\e\n"
+"ftp://ftp.tex.ac.uk/tex-archive/web/c_cpp/cweb/cweb-(.+)\\e.tar\\e.gz \\e\n"
 "  debian  uupdate\n"
 msgstr ""
 "# Voici le format pour un site FTP :\n"
 "# Nom-complet-du-site-avec-modèle [Version [Action]]\n"
-"ftp://ftp.tex.ac.uk/tex-archive/web/c_cpp/cweb/cweb-(.*)\\e.tar\\e.gz \\e\n"
+"ftp://ftp.tex.ac.uk/tex-archive/web/c_cpp/cweb/cweb-(.+)\\e.tar\\e.gz \\e\n"
 "  debian  uupdate\n"
 
 #. type: Plain text
@@ -16285,11 +16285,11 @@
 msgid ""
 "# This is the format for an FTP site with regex special characters in\n"
 "# the filename part\n"
-"ftp://ftp.worldforge.org/pub/worldforge/libs/Atlas-C++/transitional/Atlas-C\\e+\\e+-(.*)\\e.tar\\e.gz\n"
+"ftp://ftp.worldforge.org/pub/worldforge/libs/Atlas-C++/transitional/Atlas-C\\e+\\e+-(.+)\\e.tar\\e.gz\n"
 msgstr ""
 "# Voici la syntaxe pour un site FTP, avec une expression rationnelle \n"
 "# dans le nom du fichier\n"
-"ftp://ftp.worldforge.org/pub/worldforge/libs/Atlas-C++/transitional/Atlas-C\\e+\\e+-(.*)\\e.tar\\e.gz\n"
+"ftp://ftp.worldforge.org/pub/worldforge/libs/Atlas-C++/transitional/Atlas-C\\e+\\e+-(.+)\\e.tar\\e.gz\n"
 
 #. type: Plain text
 #: ../scripts/uscan.1:47
@@ -16320,13 +16320,13 @@
 "# as the FTP format.  uscan starts by downloading the homepage,\n"
 "# obtained by removing the last component of the URL; in this case,\n"
 "# http://www.cpan.org/modules/by-module/Text/\n"
-"http://www.cpan.org/modules/by-module/Text/Text-CSV_XS-(.*)\\e.tar\\e.gz\n"
+"http://www.cpan.org/modules/by-module/Text/Text-CSV_XS-(.+)\\e.tar\\e.gz\n"
 msgstr ""
 "# Il s'agit d'un format pour un site HTTP, identique à celui d'un\n"
 "# site FTP. uscan commence par télécharger la page principale,\n"
 "# obtenue en supprimant le dernier élément de l'URL ; dans ce cas,\n"
 "# http://www.cpan.org/modules/by-module/Text/\n"
-"http://www.cpan.org/modules/by-module/Text/Text-CSV_XS-(.*)\\e.tar\\e.gz\n"
+"http://www.cpan.org/modules/by-module/Text/Text-CSV_XS-(.+)\\e.tar\\e.gz\n"
 
 #. type: Plain text
 #: ../scripts/uscan.1:63
@@ -16382,11 +16382,11 @@
 msgid ""
 "# githubredir.debian.net is a redirector for GitHub projects\n"
 "# It can be used as following:\n"
-"http://githubredir.debian.net/github/E<lt>userE<gt>/E<lt>projectE<gt> (.*).tar.gz\n"
+"http://githubredir.debian.net/github/E<lt>userE<gt>/E<lt>projectE<gt> (.+).tar.gz\n"
 msgstr ""
 "# githubredir.debian.net est un redirecteur pour les projets GitHub\n"
 "# Il peut être utilisé de la façon suivante :\n"
-"http://githubredir.debian.net/github/E<lt>utilisateurE<gt>/E<lt>projetE<gt> (.*).tar.gz\n"
+"http://githubredir.debian.net/github/E<lt>utilisateurE<gt>/E<lt>projetE<gt> (.+).tar.gz\n"
 
 #. type: Plain text
 #: ../scripts/uscan.1:84
@@ -16413,7 +16413,7 @@
 "# only be performed on the basename version number, not any path\n"
 "# version numbers.)\n"
 "opts=\"uversionmangle=s/^/0.0./\" \\e\n"
-"  ftp://ftp.ibiblio.org/pub/Linux/ALPHA/wine/development/Wine-(.*)\\e.tar\\e.gz\n"
+"  ftp://ftp.ibiblio.org/pub/Linux/ALPHA/wine/development/Wine-(.+)\\e.tar\\e.gz\n"
 msgstr ""
 "# Voici une autre manière pour des sites ayant des numéros de version\n"
 "# bizarres, en effectuant une modification cette fois. (Notez que\n"
@@ -16421,7 +16421,7 @@
 "# et que les modifications ne seront effectuées que sur le numéro de\n"
 "# version de base, et pas dans les versions contenues dans les chemins.)\n"
 "opts=\"uversionmangle=s/^/0.0/\" \\e\n"
-"  ftp://ftp.ibiblio.org/pub/Linux/ALPHA/wine/development/Wine-(.*)\\e.tar\\e.gz\n"
+"  ftp://ftp.ibiblio.org/pub/Linux/ALPHA/wine/development/Wine-(.+)\\e.tar\\e.gz\n"
 
 #. type: Plain text
 #: ../scripts/uscan.1:97
@@ -16430,12 +16430,12 @@
 "# Similarly, the upstream part of the Debian version number can be\n"
 "# mangled:\n"
 "opts=dversionmangle=s/\\e.dfsg\\e.\\ed+$// \\e\n"
-"  http://some.site.org/some/path/foobar-(.*)\\e.tar\\e.gz\n"
+"  http://some.site.org/some/path/foobar-(.+)\\e.tar\\e.gz\n"
 msgstr ""
 "# De manière similaire, la partie de la version amont du numéro de\n"
 "# version Debian peut être modifiée :\n"
 "opts=dversionmangle=s/\\e.dfsg\\e.\\ed+$// \\e\n"
-"  http://un.site.org/un/chemin/toto-(.*)\\e.tar\\e.gz\n"
+"  http://un.site.org/un/chemin/toto-(.+)\\e.tar\\e.gz\n"
 
 #. type: Plain text
 #: ../scripts/uscan.1:110
@@ -16447,12 +16447,12 @@
 "# E<lt>A href=\"http://foo.bar.org/download/?path=&download=foo-0.1.1.tar.gz\"E<gt>\n"
 "# could be handled as:\n"
 "# opts=filenamemangle=s/.*=(.*)/$1/ \\e\n"
-"#     http://foo.bar.org/download/\\e?path=&download=foo-(.*)\\e.tar\\e.gz\n"
+"#     http://foo.bar.org/download/\\e?path=&download=foo-(.+)\\e.tar\\e.gz\n"
 "# \n"
 "# E<lt>A href=\"http://foo.bar.org/download/?path=&download_version=0.1.1\"E<gt>\n"
 "# could be handled as:\n"
 "# opts=filenamemangle=s/.*=(.*)/foo-$1\\e.tar\\e.gz/ \\e\n"
-"#    http://foo.bar.org/download/\\e?path=&download_version=(.*)\n"
+"#    http://foo.bar.org/download/\\e?path=&download_version=(.+)\n"
 msgstr ""
 "# Le nom de fichier est déterminé en prenant le dernier composant de\n"
 "# l'URL et en retirant tout ce qui se trouve après un éventuel « ? ».\n"
@@ -16461,12 +16461,12 @@
 "# E<lt>A href=\"http://toto.titi.org/download/?path=&amp;download=toto-0.1.1.tar.gz\"E<gt>\n"
 "# peut être géré ainsi :\n"
 "# opts=filenamemangle=s/.*=(.*)/$1/ \\e\n"
-"#     http://toto.titi.org/download/\\e?path=&amp;download=toto-(.*)\\e.tar\\e.gz\n"
+"#     http://toto.titi.org/download/\\e?path=&amp;download=toto-(.+)\\e.tar\\e.gz\n"
 "# \n"
 "# E<lt>A href=\"http://toto.titi.org/download/?path=&amp;download_version=0.1.1\"E<gt>\n"
 "# peut être géré ainsi :\n"
 "# opts=filenamemangle=s/.*=(.*)/toto-$1\\e.tar\\e.gz/ \\e\n"
-"#    http://toto.titi.org/download/\\e?path=&amp;download_version=(.*)\n"
+"#    http://toto.titi.org/download/\\e?path=&amp;download_version=(.+)\n"
 
 #. type: Plain text
 #: ../scripts/uscan.1:118
@@ -16478,7 +16478,7 @@
 "# some way into one which will work automatically, for example:\n"
 "# opts=downloadurlmangle=s/prdownload/download/ \\e\n"
 "#   http://developer.berlios.de/project/showfiles.php?group_id=2051 \\e\n"
-"#   http://prdownload.berlios.de/softdevice/vdr-softdevice-(.*).tgz\n"
+"#   http://prdownload.berlios.de/softdevice/vdr-softdevice-(.+).tgz\n"
 msgstr ""
 "# L'option downloadurlmangle peut être utilisée pour modifier l'URL\n"
 "# du fichier à télécharger. Ceci ne peut être utilisé qu'avec des liens\n"
@@ -16487,7 +16487,7 @@
 "# automatiquement, par exemple :\n"
 "# opts=downloadurlmangle=s/prdownload/download/ \\e\n"
 "#   http://developer.berlios.de/project/showfiles.php?group_id=2051 \\e\n"
-"#   http://prdownload.berlios.de/softdevice/vdr-softdevice-(.*).tgz\n"
+"#   http://prdownload.berlios.de/softdevice/vdr-softdevice-(.+).tgz\n"
 
 #. type: Plain text
 #: ../scripts/uscan.1:124
@@ -16682,8 +16682,8 @@
 "searched for hrefs matching the pattern given in the second field.  (Again, "
 "this pattern will be anchored at the beginning and the end, so it must match "
 "the whole href.  If you want to match just the basename of the href, you can "
-"use a pattern like \".*/name-(.*)\\e.tar\\e.gz\" if you know that there is a "
-"full URL, or better still: \"(?:.*/)?name-(.*)\\e.tar\\e.gz\" if there may "
+"use a pattern like \".*/name-(.+)\\e.tar\\e.gz\" if you know that there is a "
+"full URL, or better still: \"(?:.*/)?name-(.+)\\e.tar\\e.gz\" if there may "
 "or may not be.  Note the use of (?:...) to avoid making a backreference.)  "
 "If any of the hrefs in the homepage which match the (anchored) pattern are "
 "relative URLs, they will be taken as being relative to the base URL of the "
@@ -16698,8 +16698,8 @@
 "dans le second champ. (Encore une fois, ce modèle sera ancré à son début et "
 "à sa fin, de façon à ce qu'il corresponde au lien complet. Si vous chercher "
 "à faire correspondre uniquement le nom de base du lien, vous pouvez utiliser "
-"un modèle comme « .*/nom-(.*)\\e.tar\\e.gz » si vous savez qu'il y a une URL "
-"complète, ou encore mieux : « (?:.*/)?nom-(.*)\\e.tar\\e.gz » si l'URL peut "
+"un modèle comme « .*/nom-(.+)\\e.tar\\e.gz » si vous savez qu'il y a une URL "
+"complète, ou encore mieux : « (?:.*/)?nom-(.+)\\e.tar\\e.gz » si l'URL peut "
 "être ou ne pas être complète. Notez l'utilisation de « (?:...) » qui évite "
 "de créer une référence.) Si un des liens de cette page est une URL relative, "
 "elle sera considérée comme relative à l'URL de base de la page d'accueil "

=== modified file 'scripts/uscan.1'
--- scripts/uscan.1	2010-04-04 04:10:26 +0000
+++ scripts/uscan.1	2010-12-06 00:36:12 +0000
@@ -35,12 +35,12 @@
 
 # This is the format for an FTP site:
 # Full-site-with-pattern  [Version  [Action]]
-ftp://ftp.tex.ac.uk/tex-archive/web/c_cpp/cweb/cweb-(.*)\\.tar\\.gz \\
+ftp://ftp.tex.ac.uk/tex-archive/web/c_cpp/cweb/cweb-(.+)\\.tar\\.gz \\
   debian  uupdate
 
 # This is the format for an FTP site with regex special characters in
 # the filename part
-ftp://ftp.worldforge.org/pub/worldforge/libs/Atlas-C++/transitional/Atlas-C\\+\\+-(.*)\\.tar\\.gz
+ftp://ftp.worldforge.org/pub/worldforge/libs/Atlas-C++/transitional/Atlas-C\\+\\+-(.+)\\.tar\\.gz
 
 # This is the format for an FTP site with directory pattern matching
 ftp://ftp.nessus.org/pub/nessus/nessus-([\\d\\.]+)/src/nessus-core-([\\d\\.]+)\\.tar\\.gz
@@ -53,7 +53,7 @@
 # as the FTP format.  uscan starts by downloading the homepage,
 # obtained by removing the last component of the URL; in this case,
 # http://www.cpan.org/modules/by-module/Text/
-http://www.cpan.org/modules/by-module/Text/Text-CSV_XS-(.*)\\.tar\\.gz
+http://www.cpan.org/modules/by-module/Text/Text-CSV_XS-(.+)\\.tar\\.gz
 
 # This is a variant HTTP format which allows direct specification of
 # the homepage:
@@ -75,7 +75,7 @@
 
 # githubredir.debian.net is a redirector for GitHub projects
 # It can be used as following:
-http://githubredir.debian.net/github/<user>/<project> (.*).tar.gz
+http://githubredir.debian.net/github/<user>/<project> (.+).tar.gz
 
 # This is the format for a site which has funny version numbers;
 # the parenthesised groups will be joined with dots to make a
@@ -88,12 +88,12 @@
 # only be performed on the basename version number, not any path
 # version numbers.)
 opts="uversionmangle=s/^/0.0./" \\
-  ftp://ftp.ibiblio.org/pub/Linux/ALPHA/wine/development/Wine-(.*)\\.tar\\.gz
+  ftp://ftp.ibiblio.org/pub/Linux/ALPHA/wine/development/Wine-(.+)\\.tar\\.gz
 
 # Similarly, the upstream part of the Debian version number can be
 # mangled:
 opts=dversionmangle=s/\\.dfsg\\.\\d+$// \\
-  http://some.site.org/some/path/foobar-(.*)\\.tar\\.gz
+  http://some.site.org/some/path/foobar-(.+)\\.tar\\.gz
 
 # The filename is found by taking the last component of the URL and
 # removing everything after any '?'.  If this would not make a usable
@@ -101,12 +101,12 @@
 # <A href="http://foo.bar.org/download/?path=&download=foo-0.1.1.tar.gz">
 # could be handled as:
 # opts=filenamemangle=s/.*=(.*)/$1/ \\
-#     http://foo.bar.org/download/\\?path=&download=foo-(.*)\\.tar\\.gz
+#     http://foo.bar.org/download/\\?path=&download=foo-(.+)\\.tar\\.gz
 # 
 # <A href="http://foo.bar.org/download/?path=&download_version=0.1.1">
 # could be handled as:
 # opts=filenamemangle=s/.*=(.*)/foo-$1\\.tar\\.gz/ \\
-#    http://foo.bar.org/download/\\?path=&download_version=(.*)
+#    http://foo.bar.org/download/\\?path=&download_version=(.+)
 
 # The option downloadurlmangle can be used to mangle the URL of the file
 # to download.  This can only be used with http:// URLs.  This may be
@@ -114,7 +114,7 @@
 # some way into one which will work automatically, for example:
 # opts=downloadurlmangle=s/prdownload/download/ \\
 #   http://developer.berlios.de/project/showfiles.php?group_id=2051 \\
-#   http://prdownload.berlios.de/softdevice/vdr-softdevice-(.*).tgz
+#   http://prdownload.berlios.de/softdevice/vdr-softdevice-(.+).tgz
 
 .fi
 .PP
@@ -207,8 +207,8 @@
 field.  (Again, this pattern will be anchored at the beginning and the
 end, so it must match the whole href.  If you want to match just the
 basename of the href, you can use a pattern like
-".*/name-(.*)\\.tar\\.gz" if you know that there is a full URL, or
-better still: "(?:.*/)?name-(.*)\\.tar\\.gz" if there may or may not
+".*/name-(.+)\\.tar\\.gz" if you know that there is a full URL, or
+better still: "(?:.*/)?name-(.+)\\.tar\\.gz" if there may or may not
 be.  Note the use of (?:...) to avoid making a backreference.)  If any
 of the hrefs in the homepage which match the (anchored) pattern are
 relative URLs, they will be taken as being relative to the base URL of

=== modified file 'scripts/uscan.pl'
--- scripts/uscan.pl	2010-10-07 11:49:39 +0000
+++ scripts/uscan.pl	2010-12-06 00:36:12 +0000
@@ -611,12 +611,12 @@
 # watch_version=2:
 #
 # For ftp sites:
-#   ftp://site.name/dir/path/pattern-(.*)\.tar\.gz [version [action]]
+#   ftp://site.name/dir/path/pattern-(.+)\.tar\.gz [version [action]]
 #
 # For http sites:
-#   http://site.name/dir/path/pattern-(.*)\.tar\.gz [version [action]]
+#   http://site.name/dir/path/pattern-(.+)\.tar\.gz [version [action]]
 # or
-#   http://site.name/dir/path/base pattern-(.*)\.tar\.gz [version [action]]
+#   http://site.name/dir/path/base pattern-(.+)\.tar\.gz [version [action]]
 #
 # Lines can be prefixed with opts=<opts>.
 #
@@ -627,7 +627,7 @@
 # watch_version=3:
 #
 # Correct handling of regex special characters in the path part:
-# ftp://ftp.worldforge.org/pub/worldforge/libs/Atlas-C++/transitional/Atlas-C\+\+-(.*)\.tar\.gz
+# ftp://ftp.worldforge.org/pub/worldforge/libs/Atlas-C++/transitional/Atlas-C\+\+-(.+)\.tar\.gz
 # 
 # Directory pattern matching:
 # ftp://ftp.nessus.org/pub/nessus/nessus-([\d\.]+)/src/nessus-core-([\d\.]+)\.tar\.gz
@@ -643,12 +643,12 @@
 # only be performed on the basename version number, not any path version
 # numbers.)
 # opts=uversionmangle=s/^/0.0./ \
-#   ftp://ftp.ibiblio.org/pub/Linux/ALPHA/wine/development/Wine-(.*)\.tar\.gz
+#   ftp://ftp.ibiblio.org/pub/Linux/ALPHA/wine/development/Wine-(.+)\.tar\.gz
 # 
 # Similarly, the upstream part of the Debian version number can be
 # mangled:
 # opts=dversionmangle=s/\.dfsg\.\d+$// \
-#   http://some.site.org/some/path/foobar-(.*)\.tar\.gz
+#   http://some.site.org/some/path/foobar-(.+)\.tar\.gz
 # 
 # The versionmangle=... option is a shorthand for saying uversionmangle=...
 # and dversionmangle=... and applies to both upstream and Debian versions.
@@ -658,12 +658,12 @@
 #   href="http://foo.bar.org/download/?path=&amp;download=foo-0.1.1.tar.gz"
 # could be handled as:
 # opts=filenamemangle=s/.*=(.*)/$1/ \
-#     http://foo.bar.org/download/\?path=&amp;download=foo-(.*)\.tar\.gz
+#     http://foo.bar.org/download/\?path=&amp;download=foo-(.+)\.tar\.gz
 # and
 #   href="http://foo.bar.org/download/?path=&amp;download_version=0.1.1"
 # as:
 # opts=filenamemangle=s/.*=(.*)/foo-$1\.tar\.gz/ \
-#    http://foo.bar.org/download/\?path=&amp;download_version=(.*)
+#    http://foo.bar.org/download/\?path=&amp;download_version=(.+)
 # 
 # The option downloadurlmangle can be used to mangle the URL of the file
 # to download.  This can only be used with http:// URLs.  This may be
@@ -671,7 +671,7 @@
 # some way into one which will work automatically, for example:
 # opts=downloadurlmangle=s/prdownload/download/ \
 #   http://developer.berlios.de/project/showfiles.php?group_id=2051 \
-#   http://prdownload.berlios.de/softdevice/vdr-softdevice-(.*).tgz
+#   http://prdownload.berlios.de/softdevice/vdr-softdevice-(.+).tgz
 
 
 sub process_watchline ($$$$$$)

