Capitalization of 'url' completion descriptions

zsh-workers
 help / color / mirror / code / Atom feed

* Capitalization of 'url' completion descriptions
@ 2004-02-25 10:41 Doug Kearns
  2004-02-25 11:30 ` Oliver Kiddle
  0 siblings, 1 reply; 4+ messages in thread
From: Doug Kearns @ 2004-02-25 10:41 UTC (permalink / raw)
  To: zsh-workers

I was just about to capitalize all the 'url' completion descriptions
when I noticed that the the lowercase version appears to be in the clear
majority...

Is this intentional?

Regards,
Doug

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: Capitalization of 'url' completion descriptions
  2004-02-25 10:41 Capitalization of 'url' completion descriptions Doug Kearns
@ 2004-02-25 11:30 ` Oliver Kiddle
  2004-02-25 11:44   ` Doug Kearns
  0 siblings, 1 reply; 4+ messages in thread
From: Oliver Kiddle @ 2004-02-25 11:30 UTC (permalink / raw)
  To: zsh-workers

Doug Kearns wrote:
> I was just about to capitalize all the 'url' completion descriptions
> when I noticed that the the lowercase version appears to be in the clear
> majority...
> 
> Is this intentional?

Probably mostly my fault. It was intentional that descriptions don't
use initial capitals and full stops. In part as a result, I tend to be
in the habit of using all lowercase. And because I don't like too much
use of capitals. You're probably right that it should be PDF and URLs
etc, though. And we ought to be consistent. So I'm happy for you to go
ahead and change it. Other things like tag names should, in my opinion,
stay lowercase.

While you're there "display this usage screen" for --help in _raggle
isn't ideal because the completion list of options is not "this usage
screen". We ought to be consistent in how we describe common options
like --help too.

Oliver

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: Capitalization of 'url' completion descriptions
  2004-02-25 11:30 ` Oliver Kiddle
@ 2004-02-25 11:44   ` Doug Kearns
  2004-02-26  6:50     ` PATCH: capitalization " Doug Kearns
  0 siblings, 1 reply; 4+ messages in thread
From: Doug Kearns @ 2004-02-25 11:44 UTC (permalink / raw)
  To: zsh-workers

On Wed, Feb 25, 2004 at 12:30:20PM +0100, Oliver Kiddle wrote:
> Doug Kearns wrote:
> > I was just about to capitalize all the 'url' completion descriptions
> > when I noticed that the the lowercase version appears to be in the clear
> > majority...
> > 
> > Is this intentional?
> 
> Probably mostly my fault. It was intentional that descriptions don't
> use initial capitals and full stops. In part as a result, I tend to be
> in the habit of using all lowercase. And because I don't like too much
> use of capitals. You're probably right that it should be PDF and URLs
> etc, though. And we ought to be consistent. So I'm happy for you to go
> ahead and change it.

OK, will do.

> Other things like tag names should, in my opinion, stay lowercase.

Yes.
 
> While you're there "display this usage screen" for --help in _raggle
> isn't ideal because the completion list of options is not "this usage
> screen".

Yes, I missed that one, sorry. I think I'll have to pull out that
standards document I asked you to write, when I haven't added any
completion functions for a while... ;-)

> We ought to be consistent in how we describe common options
> like --help too.

Probably a good idea.

Thanks,
Doug


^ permalink raw reply	[flat|nested] 4+ messages in thread

* PATCH: capitalization of 'url' completion descriptions
  2004-02-25 11:44   ` Doug Kearns
@ 2004-02-26  6:50     ` Doug Kearns
  0 siblings, 0 replies; 4+ messages in thread
From: Doug Kearns @ 2004-02-26  6:50 UTC (permalink / raw)
  To: zsh-workers

On Wed, Feb 25, 2004 at 10:44:23PM +1100, Doug Kearns wrote:
> On Wed, Feb 25, 2004 at 12:30:20PM +0100, Oliver Kiddle wrote:
> > Doug Kearns wrote:
> > > I was just about to capitalize all the 'url' completion descriptions
> > > when I noticed that the the lowercase version appears to be in the clear
> > > majority...
> > > 
> > > Is this intentional?
> > 
> > Probably mostly my fault. It was intentional that descriptions don't
> > use initial capitals and full stops. In part as a result, I tend to be
> > in the habit of using all lowercase. And because I don't like too much
> > use of capitals. You're probably right that it should be PDF and URLs
> > etc, though. And we ought to be consistent. So I'm happy for you to go
> > ahead and change it.

Index: Completion/Unix/Command/_elinks
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_elinks,v
retrieving revision 1.6
diff -u -r1.6 _elinks
--- Completion/Unix/Command/_elinks	13 Jan 2004 05:10:09 -0000	1.6
+++ Completion/Unix/Command/_elinks	26 Feb 2004 06:45:41 -0000
@@ -29,7 +29,7 @@
   '*-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 @@
   _alternative \
     'files:file:_files' \
     'bookmarks:bookmark:compadd -a elinks_bookmarks' \
-    'urls:url:_urls' && return
+    'urls:URL:_urls' && return
 fi
 
 return ret
Index: Completion/Unix/Command/_gpg
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_gpg,v
retrieving revision 1.2
diff -u -r1.2 _gpg
--- Completion/Unix/Command/_gpg	25 Jun 2003 09:03:06 -0000	1.2
+++ Completion/Unix/Command/_gpg	26 Feb 2004 06:45:41 -0000
@@ -100,7 +100,7 @@
   '(-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' \
Index: Completion/Unix/Command/_imagemagick
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_imagemagick,v
retrieving revision 1.6
diff -u -r1.6 _imagemagick
--- Completion/Unix/Command/_imagemagick	21 Jan 2004 13:53:29 -0000	1.6
+++ Completion/Unix/Command/_imagemagick	26 Feb 2004 06:45:46 -0000
@@ -517,7 +517,7 @@
       '-retrieve[retrieve matching files]' \
       '-timeout:maximum timeout' \
       '-type:remote system type:(UNIX VMS other)' \
-      ':url: _urls' && return
+      ':URL: _urls' && return
   ;;
 
   identify)
Index: Completion/Unix/Command/_java
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_java,v
retrieving revision 1.13
diff -u -r1.13 _java
--- Completion/Unix/Command/_java	21 Jan 2004 13:53:29 -0000	1.13
+++ Completion/Unix/Command/_java	26 Feb 2004 06:45:56 -0000
@@ -98,7 +98,7 @@
     '-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 @@
 
 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:' \
Index: Completion/Unix/Command/_links
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_links,v
retrieving revision 1.7
diff -u -r1.7 _links
--- Completion/Unix/Command/_links	21 Jan 2004 13:53:29 -0000	1.7
+++ Completion/Unix/Command/_links	26 Feb 2004 06:45:56 -0000
@@ -25,11 +25,11 @@
   '(-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]}//','/''}} )
Index: Completion/Unix/Command/_lynx
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_lynx,v
retrieving revision 1.8
diff -u -r1.8 _lynx
--- Completion/Unix/Command/_lynx	21 Jan 2004 13:53:29 -0000	1.8
+++ Completion/Unix/Command/_lynx	26 Feb 2004 06:45:56 -0000
@@ -128,7 +128,7 @@
   '-vikeys' \
   '-width=:NUMBER:' \
   '-with_backspaces' \
-  ':url:->html' && ret=0
+  ':URL:->html' && ret=0
 
 case "$state" in
 restrictions)
@@ -140,7 +140,7 @@
     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
 
Index: Completion/Unix/Command/_pine
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_pine,v
retrieving revision 1.7
diff -u -r1.7 _pine
--- Completion/Unix/Command/_pine	17 Jan 2003 09:23:35 -0000	1.7
+++ Completion/Unix/Command/_pine	26 Feb 2004 06:45:56 -0000
@@ -31,7 +31,7 @@
   "($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})" \
Index: Completion/Unix/Command/_raggle
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_raggle,v
retrieving revision 1.1
diff -u -r1.1 _raggle
--- Completion/Unix/Command/_raggle	25 Feb 2004 05:00:18 -0000	1.1
+++ Completion/Unix/Command/_raggle	26 Feb 2004 06:46:06 -0000
@@ -22,6 +22,6 @@
   '(-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]'
Index: Completion/Unix/Command/_subversion
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_subversion,v
retrieving revision 1.4
diff -u -r1.4 _subversion
--- Completion/Unix/Command/_subversion	4 Dec 2003 13:58:30 -0000	1.4
+++ Completion/Unix/Command/_subversion	26 Feb 2004 06:46:06 -0000
@@ -78,7 +78,7 @@
     ;;
     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 @@
       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
     ;;
Index: Completion/Unix/Command/_w3m
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_w3m,v
retrieving revision 1.10
diff -u -r1.10 _w3m
--- Completion/Unix/Command/_w3m	21 Jan 2004 13:53:29 -0000	1.10
+++ Completion/Unix/Command/_w3m	26 Feb 2004 06:46:06 -0000
@@ -30,7 +30,7 @@
   '-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 @@
   _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
Index: Completion/Unix/Command/_webbrowser
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_webbrowser,v
retrieving revision 1.5
diff -u -r1.5 _webbrowser
--- Completion/Unix/Command/_webbrowser	18 Feb 2003 16:02:29 -0000	1.5
+++ Completion/Unix/Command/_webbrowser	26 Feb 2004 06:46:06 -0000
@@ -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'
Index: Completion/Unix/Command/_wget
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_wget,v
retrieving revision 1.8
diff -u -r1.8 _wget
--- Completion/Unix/Command/_wget	17 Nov 2003 05:01:08 -0000	1.8
+++ Completion/Unix/Command/_wget	26 Feb 2004 06:46:06 -0000
@@ -48,7 +48,7 @@
   '--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 @@
   '--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)
Index: Completion/Unix/Type/_urls
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Type/_urls,v
retrieving revision 1.8
diff -u -r1.8 _urls
--- Completion/Unix/Type/_urls	18 Feb 2003 16:02:30 -0000	1.8
+++ Completion/Unix/Type/_urls	26 Feb 2004 06:46:06 -0000
@@ -48,7 +48,7 @@
 
 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
 
Index: Completion/X/Command/_mozilla
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/X/Command/_mozilla,v
retrieving revision 1.4
diff -u -r1.4 _mozilla
--- Completion/X/Command/_mozilla	13 Feb 2004 18:42:26 -0000	1.4
+++ Completion/X/Command/_mozilla	26 Feb 2004 06:46:06 -0000
@@ -28,10 +28,10 @@
     '-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
 
Index: Completion/X/Command/_mplayer
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/X/Command/_mplayer,v
retrieving revision 1.4
diff -u -r1.4 _mplayer
--- Completion/X/Command/_mplayer	16 Feb 2004 10:41:01 -0000	1.4
+++ Completion/X/Command/_mplayer	26 Feb 2004 06:46:12 -0000
@@ -117,7 +117,7 @@
       _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


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2004-02-26  6:56 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-02-25 10:41 Capitalization of 'url' completion descriptions Doug Kearns
2004-02-25 11:30 ` Oliver Kiddle
2004-02-25 11:44   ` Doug Kearns
2004-02-26  6:50     ` PATCH: capitalization " Doug Kearns

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).