diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Completion/BSD/Command/_sockstat | 18 | ||||
| -rw-r--r-- | Completion/Debian/Command/_git-buildpackage | 2 | ||||
| -rw-r--r-- | Completion/Unix/Command/_at | 22 | ||||
| -rw-r--r-- | Completion/Unix/Command/_lp | 42 | ||||
| -rw-r--r-- | Completion/Unix/Command/_unison | 4 | ||||
| -rw-r--r-- | Completion/X/Command/_matlab | 28 | ||||
| -rw-r--r-- | Completion/X/Command/_okular | 6 | ||||
| -rw-r--r-- | Completion/Zsh/Function/_zargs | 26 |
9 files changed, 84 insertions, 75 deletions
diff --git a/ChangeLog b/ChangeLog index 6f3533590..09d623ef7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-06-20 Doug Kearns <dougkearns@gmail.com> + + * unposted: Completion/BSD/Command/_sockstat, + Completion/Debian/Command/_git-buildpackage, + Completion/Unix/Command/_at, Completion/Unix/Command/_lp, + Completion/Unix/Command/_unison, Completion/X/Command/_matlab, + Completion/X/Command/_okular, Completion/Zsh/Function/_zargs: clean up + completion descriptions as per Etc/completion-style-guide. + 2011-06-19 Peter Stephenson <p.w.stephenson@ntlworld.com> * Luka Perkov: 29493: Completion/Unix/Type/_pdf: handle apvlv. @@ -15024,5 +15033,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5377 $ +* $Revision: 1.5378 $ ***************************************************** diff --git a/Completion/BSD/Command/_sockstat b/Completion/BSD/Command/_sockstat index 2acbe6bec..e61854622 100644 --- a/Completion/BSD/Command/_sockstat +++ b/Completion/BSD/Command/_sockstat @@ -3,10 +3,10 @@ local tmp_proto protocols proto tmp_proto=(${${(M)${(f)"$(</etc/protocols)"}##[a-z0-9]*}}) -for proto ($tmp_proto) { +for proto ($tmp_proto) { case $proto in *\#*) - protocols=($protocols ${${(j: :)${=proto}}// *\# /:}) + protocols=($protocols ${${(j: :)${=proto}}// *\# /:}) ;; *) protocols=($protocols ${${(j: :)${=proto}}// */}) @@ -14,10 +14,10 @@ for proto ($tmp_proto) { } _arguments -s \ - '-4[Show AF_INET (IPv4) sockets]' \ - '-6[Show AF_INET6 (IPv6) sockets]' \ - '-c[Show connected sockets]' \ - '-l[Show listening sockets]' \ - '-u[Show AF_LOCAL (UNIX) sockets]' \ - '-p[Only show Internet sockets if the port number is on the specified list]' \ - '-P[Only show sockets of the specified protocols]:protocols:(($protocols))' + '-4[show AF_INET (IPv4) sockets]' \ + '-6[show AF_INET6 (IPv6) sockets]' \ + '-c[show connected sockets]' \ + '-l[show listening sockets]' \ + '-u[show AF_LOCAL (UNIX) sockets]' \ + '-p[only show Internet sockets if the port number is on the specified list]' \ + '-P[only show sockets of the specified protocols]:protocols:(($protocols))' diff --git a/Completion/Debian/Command/_git-buildpackage b/Completion/Debian/Command/_git-buildpackage index 784d53028..936539fcc 100644 --- a/Completion/Debian/Command/_git-buildpackage +++ b/Completion/Debian/Command/_git-buildpackage @@ -30,7 +30,7 @@ _arguments \ '--git-prebuild=-[command to run before a build]:command:' \ '--git-postbuild=-[hook run after a successful build]:command:' \ '--git-posttag=-[hook run after a successful tag operation]:command:' \ - '--git-pbuilder[Invoke git-pbuilder for building]' \ + '--git-pbuilder[invoke git-pbuilder for building]' \ '--git-no-pbuilder[negates --git-pbuilder]' \ '--git-dist=-[build for this distribution when using git-pbuilder]:distribution:' \ '--git-arch=-[build for this architecture when using git-pbuilder]:architecture:' \ diff --git a/Completion/Unix/Command/_at b/Completion/Unix/Command/_at index 4e2d28e27..8734e6b55 100644 --- a/Completion/Unix/Command/_at +++ b/Completion/Unix/Command/_at @@ -7,29 +7,29 @@ typeset -A opt_args case $service in atrm) _arguments \ - '-V[Print version number]' \ + '-V[print version number]' \ '*:job number:->jobs' ;; atq) _arguments \ - '-V[Print version number]' \ - '-q[Uses specified queue]:a-z+A-Z' + '-V[print version number]' \ + '-q[uses specified queue]:a-z+A-Z' ;; at|batch) _arguments \ - new-job \ - '-V[Print version number]' \ - '-q[Uses specified queue, uppercase acts as batch]:a-z+A-Z' \ - '-f[Read job from file rather than from stdin]:file:_files' \ - '-v[Show the time the job will be executed]' \ - '-m[Send mail even if there was no output]' \ + '-V[print version number]' \ + '-q[uses specified queue, uppercase acts as batch]:a-z+A-Z' \ + '-f[read job from file rather than from stdin]:file:_files' \ + '-v[show the time the job will be executed]' \ + '-m[send mail even if there was no output]' \ ':time:' \ - atq \ - '-l[Alias for atq]' \ + '-l[alias for atq]' \ - atrm \ - '-d[Alias for atrm]' \ + '-d[alias for atrm]' \ - show-job \ - '-c[Cat specified jobs to stdout]:*:job number:->jobs' + '-c[cat specified jobs to stdout]:*:job number:->jobs' esac case $state in diff --git a/Completion/Unix/Command/_lp b/Completion/Unix/Command/_lp index 5d46a75bb..def9aed87 100644 --- a/Completion/Unix/Command/_lp +++ b/Completion/Unix/Command/_lp @@ -133,7 +133,7 @@ _lp() case $service in (lpq) _arguments \ - '-E[Force encryption]' \ + '-E[force encryption]' \ '-U:username (for connection to server):_users' \ '-h:alternate server:_hosts' \ '(-a)-P+[destination printer]:printers:_printers' \ @@ -144,7 +144,7 @@ _lp() (lprm) _arguments \ - '-E[Force encryption]' \ + '-E[force encryption]' \ '-U:username (for connection to server):_users' \ '-h:alternate server:_hosts' \ '-P+[destination printer]:printers:_printers' \ @@ -153,7 +153,7 @@ _lp() (lpoptions) _arguments \ - '-E[Force encryption]' \ + '-E[force encryption]' \ '-U:username (for connection to server):_users' \ '-h:alternate server:_hosts' \ '(-p -l -r -x)-d[set default printer]:printers:_printers' \ @@ -166,58 +166,58 @@ _lp() (lpstat) _arguments \ - '-E[Force encryption]' \ - '-R[Shows print job ranking]' \ + '-E[force encryption]' \ + '-R[shows print job ranking]' \ '-U:username (for connection to server):_users' \ '-W:which jobs:(completed not-completed)' \ - '-a[Show accepting state]:printers:_printers' \ + '-a[show accepting state]:printers:_printers' \ '-c:printer classes:' \ - '-d[Show current default destination]' \ + '-d[show current default destination]' \ '-h:hostname (alternate server):_hosts' \ '-l[long listing]' \ '-o[destinations]:printers:_printers' \ '-p:printers:_printers' \ '-r[CUPS server running status]' \ - '-s[Status summary]' \ - '-t[All status info]' \ + '-s[status summary]' \ + '-t[all status info]' \ '-u[list jobs by users]:users:_users' \ '-v[show devices]:printers:_printers' ;; (lpr) _arguments \ - '-E[Force encryption]' \ + '-E[force encryption]' \ '-H:hostname (alternate server):_hosts' \ '(-C -J -T)'-{C,J,T}':job name:' \ '-P+[destination printer]:printers:_printers' \ '-U:username (for connection to server):_users' \ - '-#[Copies]:copies (1--100):' \ - '-h[Disables banner printing]' \ + '-#[copies]:copies (1--100):' \ + '-h[disables banner printing]' \ '-l[raw file]' \ - '-m[Send an email on job completion]' \ + '-m[send an email on job completion]' \ '*-o:print job options:_lp_job_options' \ '-p[format with shaded header incl. date, time etc.]' \ - '-q[Hold job for printing.]' \ + '-q[hold job for printing]' \ '-r[delete files after printing]' \ '*:PS/PDF files:_pspdf' ;; (lp) _arguments \ - '-E[Force encryption]' \ + '-E[force encryption]' \ '-U[username (for connection to server)]:username:_users' \ '-c[(OBSOLETE) copy to spool dir before printing]' \ '-d[destination printer]:printers:_printers' \ '-h:hostname (alternate server):_hosts' \ '-i[job id to modify]:job id:' \ - '-m[Send an email on job completion]' \ - '-n[Copies]:copies (1--100):' \ + '-m[send an email on job completion]' \ + '-n[copies]:copies (1--100):' \ '*-o:print job options:_lp_job_options' \ - '-q[Job priority -- 1 (lowest) to 100 (highest)]:priority:' \ - '-s[Dont report resulting job IDs]' \ - '-t[Sets the job name]:job name:' \ + '-q[job priority -- 1 (lowest) to 100 (highest)]:priority:' \ + '-s[dont report resulting job IDs]' \ + '-t[sets the job name]:job name:' \ '-u[job submission username]:username:_users' \ - '-H[Time to print]:print time (or enter hh\:mm):(hold immediate restart resume)' \ + '-H[time to print]:print time (or enter hh\:mm):(hold immediate restart resume)' \ '-P:page range list:' \ '*:PS/PDF files:_pspdf' ;; diff --git a/Completion/Unix/Command/_unison b/Completion/Unix/Command/_unison index bb8edd489..5725575c5 100644 --- a/Completion/Unix/Command/_unison +++ b/Completion/Unix/Command/_unison @@ -42,7 +42,7 @@ _arguments \ '-copythreshold[use copyprog on files bigger than this]:size (kb):' \ '-debug:debug module:(all verbose)' \ '-diff[command for showing differences between files]:program:_files -g "*(-x)"' \ - '-dontchmod[When set, never use the chmod system call]' \ + '-dontchmod[when set, never use the chmod system call]' \ '-dumbtty[do not change terminal settings in text UI]' \ '-fastcheck:fast update detection:(true false default)' \ '-forcepartial[add a pattern to the forcepartial list]:pattern:' \ @@ -63,7 +63,7 @@ _arguments \ '-mountpoint[abort if this path does not exist]:mountpoint:_files -/' \ '-numericids[dont map uid/gid values by user/group names]' \ '-preferpartial[add a pattern to the preferpartial list]:pattern:' \ - '-pretendwin[Use creation times for detecting updates]' \ + '-pretendwin[use creation times for detecting updates]' \ '-repeat[synchronize repeatedly (text interface only)]:repeat:' \ '-retry[re-try failed synchronizations N times (text ui only)]:retry times:' \ '-rootalias[register alias for canonical root names]:root alias:' \ diff --git a/Completion/X/Command/_matlab b/Completion/X/Command/_matlab index 64d076f43..e912b68c1 100644 --- a/Completion/X/Command/_matlab +++ b/Completion/X/Command/_matlab @@ -1,19 +1,19 @@ #compdef matlab _arguments : \ - {-h,-help}'[Display arguments.]' \ - '(-e)-n[Display final environment variables, and exit]' \ - '(-n)-e[Display ALL the environment variables and values, and exit]' \ - '-arch[Start MATLAB assuming architecture arch]:architecture:' \ - '-c[Set location of the license file]:licensefile:_files' \ + {-h,-help}'[display arguments]' \ + '(-e)-n[display final environment variables, and exit]' \ + '(-n)-e[display ALL the environment variables and values, and exit]' \ + '-arch[start MATLAB assuming architecture arch]:architecture:' \ + '-c[set location of the license file]:licensefile:_files' \ '(-nodisplay)-display:display:_x_display' \ - '(-display)-nodisplay[Do not display any X commands.]' \ - '-nosplash[Do not display the splash screen during startup.]' \ - '-mwvisual[The default X visual to use for figure windows.]:visualid:' \ - '-debug[Provide debugging information especially for X based problems.]' \ - '(-nodesktop -nojvm)-desktop[Allow the MATLAB desktop to be started by a process without a controlling terminal.]' \ - '(-desktop -nojvm)-nodesktop[Do not start the MATLAB desktop.]' \ - '(-nodesktop -desktop)-nojvm[Shut off all Java support by not starting the Java virtual machine.]' \ - '-r[Start MATLAB and execute the MATLAB_command.]:MATLAB_command:' \ - '-logfile[Make a copy of any output to the command window in file log.]:log file:' \ + '(-display)-nodisplay[do not display any X commands]' \ + '-nosplash[do not display the splash screen during startup]' \ + '-mwvisual[the default X visual to use for figure windows]:visualid:' \ + '-debug[provide debugging information especially for X based problems]' \ + '(-nodesktop -nojvm)-desktop[allow the MATLAB desktop to be started by a process without a controlling terminal]' \ + '(-desktop -nojvm)-nodesktop[do not start the MATLAB desktop]' \ + '(-nodesktop -desktop)-nojvm[shut off all Java support by not starting the Java virtual machine]' \ + '-r[start MATLAB and execute the MATLAB_command]:MATLAB_command:' \ + '-logfile[make a copy of any output to the command window in file log]:log file:' \ '-D-:debugger:_path_commands' diff --git a/Completion/X/Command/_okular b/Completion/X/Command/_okular index 0b81e2f9d..bfdb4de4b 100644 --- a/Completion/X/Command/_okular +++ b/Completion/X/Command/_okular @@ -4,7 +4,7 @@ local extns extns="{pdf,ps,eps,dvi}(.gz|.bz2)(#c,1)|djvu|tiff|chm|cbr|cbz" _arguments \ - '(-p --page)'{-p,--page}'[Page of the document to be shown]:page: ' \ - '--presentation[Start the document in presentation mode]' \ - '--unique[Unique instance control]' \ + '(-p --page)'{-p,--page}'[page of the document to be shown]:page: ' \ + '--presentation[start the document in presentation mode]' \ + '--unique[unique instance control]' \ "*:Okular documents:_files -g '*.(#i)($extns)(-.)'" diff --git a/Completion/Zsh/Function/_zargs b/Completion/Zsh/Function/_zargs index a4cf0a89e..f1f87b447 100644 --- a/Completion/Zsh/Function/_zargs +++ b/Completion/Zsh/Function/_zargs @@ -4,19 +4,19 @@ local arguments arguments=( $arguments[@] - '(--eof -e)'{--eof=,-e+}'[Change the end-of-input-args string from "--" to eof-str]' - '(--exit, -x)'{--exit,-x}'[Exit if the size (see --max-chars) is exceeded]' - '--help[Print summary and exit]' - '(--interactive, -p)'{--interactive,-p}'[Prompt before executing each command line]' - '(--max-args, -n)'{--max-args=,-n+}'[Use at most max-args arguments per command line]' - '(--max-chars, -s)'{--max-chars=,-s+}'[Use at most max-chars characters per command line]' - '(--max-lines, -l)'{--max-lines=,-l+}'[Use at most max-lines of the input-args per command line]' - '(--max-procs, -P)'{--max-procs=,-P+}'[Run up to max-procs command lines in the background at once]' - '(--no-run-if-empty, -r)'{--no-run-if-empty,-r}'[Do nothing if there are no input arguments before the eof-str]' - '(--null, -0)'{--null,-0}'[Split each input-arg at null bytes, for xargs compatibility]' - '(--replace, -i)'{--replace=,-i}'[Substitute replace-str in the initial-args by each initial-arg]' - '(--verbose, -t)'{--verbose,-t}'[Print each command line to stderr before executing it]' - '--version[Print the version number of zargs and exit]' + '(--eof -e)'{--eof=,-e+}'[change the end-of-input-args string from "--" to eof-str]' + '(--exit, -x)'{--exit,-x}'[exit if the size (see --max-chars) is exceeded]' + '--help[print summary and exit]' + '(--interactive, -p)'{--interactive,-p}'[prompt before executing each command line]' + '(--max-args, -n)'{--max-args=,-n+}'[use at most max-args arguments per command line]' + '(--max-chars, -s)'{--max-chars=,-s+}'[use at most max-chars characters per command line]' + '(--max-lines, -l)'{--max-lines=,-l+}'[use at most max-lines of the input-args per command line]' + '(--max-procs, -P)'{--max-procs=,-P+}'[run up to max-procs command lines in the background at once]' + '(--no-run-if-empty, -r)'{--no-run-if-empty,-r}'[do nothing if there are no input arguments before the eof-str]' + '(--null, -0)'{--null,-0}'[split each input-arg at null bytes, for xargs compatibility]' + '(--replace, -i)'{--replace=,-i}'[substitute replace-str in the initial-args by each initial-arg]' + '(--verbose, -t)'{--verbose,-t}'[print each command line to stderr before executing it]' + '--version[print the version number of zargs and exit]' ) _arguments -S -s $arguments[@] |