19468: capitalize URL abbreviation in completion descriptions

16 files changed, 38 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index e7621a1a4..52c3b4566 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-02-26  Doug Kearns  <djkea2@mugca.its.monash.edu.au>
+
+	* 19468: Completion/Unix/Command/_elinks,
+	Completion/Unix/Command/_gpg, Completion/Unix/Command/_imagemagick,
+	Completion/Unix/Command/_java, Completion/Unix/Command/_links,
+	Completion/Unix/Command/_lynx, Completion/Unix/Command/_pine,
+	Completion/Unix/Command/_subversion, Completion/Unix/Command/_w3m,
+	Completion/Unix/Command/_webbrowser, Completion/Unix/Command/_wget,
+	Completion/Unix/Type/_urls, Completion/X/Command/_mozilla,
+	Completion/X/Command/_mplayer: capitalize URL abbreviation in
+	completion descriptions 
+
 2004-02-26  Peter Stephenson  <pws@csr.com>
 
 	* 19460: configure.ac, Src/Modules/terminfo.c,
diff --git a/Completion/Unix/Command/_elinks b/Completion/Unix/Command/_elinks
index c76d3f64e..ceb851db6 100644
--- a/Completion/Unix/Command/_elinks
+++ b/Completion/Unix/Command/_elinks
@@ -29,7 +29,7 @@ _arguments -C -A '-*' \
   '*-no-numbering[do not number links in dump output]::boolean:(0 1)' \
   '*-touch-files[touch files in ~/.elinks when running with -no-connect/-session-ring]::boolean:(0 1)' \
   '(- 1)-version[print version information and exit]' \
-  '1:url:->url' && ret=0
+  '1:URL:->url' && ret=0
 
 if [[ "$state" = url ]]; then
   local elinks_bookmarks
@@ -41,7 +41,7 @@ if [[ "$state" = url ]]; then
   _alternative \
     'files:file:_files' \
     'bookmarks:bookmark:compadd -a elinks_bookmarks' \
-    'urls:url:_urls' && return
+    'urls:URL:_urls' && return
 fi
 
 return ret
diff --git a/Completion/Unix/Command/_gpg b/Completion/Unix/Command/_gpg
index 32a51cb08..cb48c48f3 100644
--- a/Completion/Unix/Command/_gpg
+++ b/Completion/Unix/Command/_gpg
@@ -100,7 +100,7 @@ _arguments -C -s -S -A "-*" \
   '(-N --notation-data)'{-N,--notation-data}'[put parameter in signature]:name=value' \
   '(--no-show-notation)--show-notation[show key signature notations]' \
   "(--show-notation)--no-show-notation[don't show key signature notations]" \
-  '--set-policy-url:policy url' \
+  '--set-policy-url:policy URL' \
   '(--no-show-policy-url)--show-policy-url' \
   "(--show-policy-url)--no-show-policy-url" \
   '--set-filename[specify file which is stored in messages]:file:_files' \
diff --git a/Completion/Unix/Command/_imagemagick b/Completion/Unix/Command/_imagemagick
index 43f3a277a..a47e28cfc 100644
--- a/Completion/Unix/Command/_imagemagick
+++ b/Completion/Unix/Command/_imagemagick
@@ -517,7 +517,7 @@ case "$service" in
       '-retrieve[retrieve matching files]' \
       '-timeout:maximum timeout' \
       '-type:remote system type:(UNIX VMS other)' \
-      ':url: _urls' && return
+      ':URL: _urls' && return
   ;;
 
   identify)
diff --git a/Completion/Unix/Command/_java b/Completion/Unix/Command/_java
index 680238ebc..949477b73 100644
--- a/Completion/Unix/Command/_java
+++ b/Completion/Unix/Command/_java
@@ -98,7 +98,7 @@ appletviewer)
     '-debug[run applet on jdb]' \
     '-encoding[specify character encoding for source files]:encoding:->encoding' \
     '-J-[specify java option]:java option:' \
-    '*:url:_urls' && return 0
+    '*:URL:_urls' && return 0
   ;;
 
 jar)
@@ -331,7 +331,7 @@ keytool)
 
 jarsigner)
   _arguments \
-    '-keystore[specify url for keystore location]:url for keystore location:' \
+    '-keystore[specify URL for keystore location]:URL for keystore location:' \
     '-storetype[specify keystore type]:store type:' \
     '-storepass[specify password for keystore]:password:' \
     '-keypass[specify password for private key]:password:' \
diff --git a/Completion/Unix/Command/_links b/Completion/Unix/Command/_links
index d2bc9be14..c8a4995d5 100644
--- a/Completion/Unix/Command/_links
+++ b/Completion/Unix/Command/_links
@@ -25,11 +25,11 @@ _arguments -C \
   '(-help)-source[dump the source page]' \
   '(-help)-unrestartable-receive-timeout[timeout on non restartable connections]:secs:' \
   '(-help)-version[prints the links version number and exit]' \
-  ':url:->html' && ret=0
+  ':URL:->html' && ret=0
 
 case $state in
   html)
-    _alternative 'files:file:_files -g "*.x#html(-.)"' 'urls:url:_urls' && ret=0
+    _alternative 'files:file:_files -g "*.x#html(-.)"' 'urls:URL:_urls' && ret=0
   ;;
   graphics_drivers)
     vals=(${=${${${(f)"$(_call_program links-graphics-drivers links -driver help 2>&1)"}[-1]}//','/''}} )
diff --git a/Completion/Unix/Command/_lynx b/Completion/Unix/Command/_lynx
index e53fa8415..04f0d495f 100644
--- a/Completion/Unix/Command/_lynx
+++ b/Completion/Unix/Command/_lynx
@@ -128,7 +128,7 @@ _arguments -C \
   '-vikeys' \
   '-width=:NUMBER:' \
   '-with_backspaces' \
-  ':url:->html' && ret=0
+  ':URL:->html' && ret=0
 
 case "$state" in
 restrictions)
@@ -140,7 +140,7 @@ restrictions)
     outside_telnet print shell suspend telnet_port useragent && return
   ;;
 html)
-  _alternative 'files:file:_files -g "*.x#html(-.)"' 'urls:url:_urls' && return
+  _alternative 'files:file:_files -g "*.x#html(-.)"' 'urls:URL:_urls' && return
   ;;
 esac
 
diff --git a/Completion/Unix/Command/_pine b/Completion/Unix/Command/_pine
index 1902074a8..12bd29157 100644
--- a/Completion/Unix/Command/_pine
+++ b/Completion/Unix/Command/_pine
@@ -31,7 +31,7 @@ _arguments -s \
   "($opts $idx -url)-attach[go directly into composer with given file]:file:_files" \
   "($opts $idx -url)-attachlist[go to composer with given files]:file:_files" \
   "($opts $idx -url)-attach_and_delete[go to composer, attach file, delete when finished]:file:_files" \
-  "($opts $idx $send)-url[open the given URL]:url:_email_addresses -c -P mailto\:" \
+  "($opts $idx $send)-url[open the given URL]:URL:_email_addresses -c -P mailto\:" \
   "($opts $send)-f+[specify mailbox to load]:mailbox: _mailboxes" \
   "($opts $send)-c+[specify context to apply to -f arg]: :_guard '[0-9]#' number" \
   "($opts $send)-sort[specify sort order of folder]:sort order:(${(j: :)sortorder})" \
diff --git a/Completion/Unix/Command/_raggle b/Completion/Unix/Command/_raggle
index 35b7fc3c5..434a2a5a1 100644
--- a/Completion/Unix/Command/_raggle
+++ b/Completion/Unix/Command/_raggle
@@ -22,6 +22,6 @@ _arguments \
   '(-t --title)'{-t,--title}"[title attribute of feed (for '--add' and '--edit')]:feed title:" \
   "--unlock-title[unlock Title attribute of feed (for '--add' and '--edit')]" \
   "--unsave-items[don't save old items of feed (for '--add' and '--edit')]" \
-  '(-u --url)'{-u,--url}"[URL attribute of feed (for '--add' and '--edit')]:url:_urls" \
+  '(-u --url)'{-u,--url}"[URL attribute of feed (for '--add' and '--edit')]:URL:_urls" \
   '--verbose[turn on verbose output]' \
   '(-)'{-v,--version}'[display version information]'
diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion
index 92cedff7d..6ef3e3712 100644
--- a/Completion/Unix/Command/_subversion
+++ b/Completion/Unix/Command/_subversion
@@ -78,7 +78,7 @@ _svn_subcommand () {
     ;;
     log)
       _svn_subcmds+=(
-        '1: : _alternative "files:file:_files -g \*\(e:_svn_controlled:\)" "urls:url:_svn_urls"'
+        '1: : _alternative "files:file:_files -g \*\(e:_svn_controlled:\)" "urls:URL:_svn_urls"'
 	'*:file:_files -g "*(e:_svn_controlled:)"'
       )
     ;;
@@ -86,10 +86,10 @@ _svn_subcommand () {
       case $_svn_subcmd_usage in
         *(TARGET|URL*PATH)*)
           _svn_subcmds+=( 
-	    '*: : _alternative "files:file:_files" "urls:url:_svn_urls"'
+	    '*: : _alternative "files:file:_files" "urls:URL:_svn_urls"'
 	  )
 	;;
-        *URL*) _svn_subcmds+=( ':url:_svn_urls' ) ;;
+        *URL*) _svn_subcmds+=( ':URL:_svn_urls' ) ;;
         *PATH*) _svn_subcmds+=( '*:file:_files' ) ;;
       esac
     ;;
diff --git a/Completion/Unix/Command/_w3m b/Completion/Unix/Command/_w3m
index 4e849ce0c..c8e5ef19d 100644
--- a/Completion/Unix/Command/_w3m
+++ b/Completion/Unix/Command/_w3m
@@ -30,7 +30,7 @@ _arguments -C \
   '-o[option]:option-value' \
   '-config:config file:_files' \
   '-debug' \
-  ':url:->html' \
+  ':URL:->html' \
   '+:goto line' && ret=0
 
 if [[ -n $state ]]; then
@@ -39,10 +39,10 @@ if [[ -n $state ]]; then
   _tags files w3mhistory urls
   while _tags; do
     _requested files expl 'file' _files -g "*.x#html(-.)" && ret=0
-    _requested urls expl 'url' _urls && ret=0
+    _requested urls expl 'URL' _urls && ret=0
     if [[ -s ~/.w3m/history ]] && _requested w3mhistory; then
       w3mhistory=( ${(f)"$(<~/.w3m/history)"} )
-      _all_labels w3mhistory expl 'url from history' compadd -a w3mhistory
+      _all_labels w3mhistory expl 'URL from history' compadd -a w3mhistory
     fi
     (( ret )) || break
   done
diff --git a/Completion/Unix/Command/_webbrowser b/Completion/Unix/Command/_webbrowser
index 86f97d117..d97d5457a 100644
--- a/Completion/Unix/Command/_webbrowser
+++ b/Completion/Unix/Command/_webbrowser
@@ -1,3 +1,3 @@
 #compdef amaya arena chimera dillo express galeon grail gzilla hotjava konqueror light mmm Mosaic netrik opera phoenix retawq skipstone www xmosaic zen
 
-_alternative 'files:file:_files' 'urls:url:_urls'
+_alternative 'files:file:_files' 'urls:URL:_urls'
diff --git a/Completion/Unix/Command/_wget b/Completion/Unix/Command/_wget
index e900ba61f..836d996d5 100644
--- a/Completion/Unix/Command/_wget
+++ b/Completion/Unix/Command/_wget
@@ -48,7 +48,7 @@ _arguments -C -s \
   '--header=:string:' \
   '--proxy-user=:user:' \
   '--proxy-passwd=:password:' \
-  '--referer=:url:_urls' \
+  '--referer=:URL:_urls' \
   '(--save-headers -s)'{--save-headers,-s}'[save http headers]' \
   '(--user-agent -U)'{--user-agent=,-U+}'[specify user agent to identify as]:user-agent' \
   '--retr-symlinks' \
@@ -97,7 +97,7 @@ _arguments -C -s \
   '--sslcerttype=[specify client cert type]:certificate type:((0\:PEM 1\:ASN1))' \
   '--sslcheckcert=[check the server cert against given CA]: :(0 1)' \
   '--sslprotocol=[choose SSL protocol]:protocol version:((0\:automatic 1\:SSLv2 2\:SSLv3 3\:TLSv1))' \
-  '*:url:_urls' && return 0
+  '*:URL:_urls' && return 0
 
 case "$state" in
   gauge)
diff --git a/Completion/Unix/Type/_urls b/Completion/Unix/Type/_urls
index 3115b57ca..94483bbf8 100644
--- a/Completion/Unix/Type/_urls
+++ b/Completion/Unix/Type/_urls
@@ -48,7 +48,7 @@ zstyle -a ":completion:${curcontext}:urls" urls urls
 
 if [[ $#urls -gt 1 || ( $#urls -eq 1 && ! -d $urls[1] ) ]]; then
   [[ $#urls -eq 1 && -f $urls[1] ]] && urls=( $(< $urls[1]) )
-  _wanted urls expl 'url' compadd -a urls && return 0
+  _wanted urls expl 'URL' compadd -a urls && return 0
   urls=()
 fi
 
diff --git a/Completion/X/Command/_mozilla b/Completion/X/Command/_mozilla
index 1ad572c1b..f6ade49fc 100644
--- a/Completion/X/Command/_mozilla
+++ b/Completion/X/Command/_mozilla
@@ -28,10 +28,10 @@ else
     '-jsconsole[start with JavaScript Console]' \
     '-venkman[start with JavaScript debugger]' \
     '-terminal[start with command line terminal]' \
-    '-edit[start with editor]:url:_urls' \
-    '-chrome[load the specified chrome]:url:_urls' \
+    '-edit[start with editor]:URL:_urls' \
+    '-chrome[load the specified chrome]:URL:_urls' \
     '-mail[start with mail]' \
-    '-compose[start with messenger compose]:url:_urls' \
+    '-compose[start with messenger compose]:URL:_urls' \
     '*:location:->urls' && ret=0
 fi
 
diff --git a/Completion/X/Command/_mplayer b/Completion/X/Command/_mplayer
index 9aad7a0c1..d4918f5df 100644
--- a/Completion/X/Command/_mplayer
+++ b/Completion/X/Command/_mplayer
@@ -117,7 +117,7 @@ case "$state" in
       _requested files expl 'video file' _files -g \
           "*.(#i)(avi|mp3|mpg|mpe|mpeg|m1v|mov|asf|vob|mjpg|wma|wmv|asx|qt|rm|mkv|mka|ogm|ogg)(-.)" && ret=0
       if _requested urls; then
-        while _next_label urls expl url; do
+        while _next_label urls expl URL; do
           _urls "$expl[@]" && ret=0
 	  compadd -S '' "$expl[@]" {dvd,vcd,cdda,cddb,tv}:// && ret=0
 	done