Merge branch 'upstream' into debian

1 files changed, 6 insertions, 2 deletions

diff --git a/Completion/Unix/Command/_vmstat b/Completion/Unix/Command/_vmstat
index e05bc88bc..1d0ac855d 100644
--- a/Completion/Unix/Command/_vmstat
+++ b/Completion/Unix/Command/_vmstat
@@ -8,7 +8,7 @@ case $OSTYPE in
       '(-t --timestamp)'{-t,--timestamp}'[show timestamp]'
       '(-n --one-header)'{-n,--one-header}'[do not redisplay header]'
       '(-S --unit)'{-S+,--unit=}'[specify unit for displayed sizes]:unit prefix [K]:((k\:1000 K\:1024 m\:1000000 M\:1048576))'
-      '(-C --full-cache)'{-C,--full-cache}'[add further cache lines to main cache]'
+      '(-y --no-first)'{-y,--no-first}'[skip first line of output]'
       '1: :_guard "[0-9]#" "interval (seconds)"' '2:count'
       + '(action)' \
       '(- :)'{-h,--help}'[display help information]'
@@ -37,10 +37,14 @@ case $OSTYPE in
       '-f[report on the number fork syscalls since boot and pages of virtual memory for each]'
     )
   ;|
+  freebsd*|dragonfly*|netbsd*)
+    specs+=(
+      '-n+[change the maximum number of disks to display]:number of disks to display [2]'
+    )
+  ;|
   freebsd*|dragonfly*)
     specs+=(
       '-m[report on the usage of kernel dynamic memory allocated using malloc(9) by type]'
-      '-n+[change the maximum number of disks to display]:number of disks to display [2]'
       '*-p+[specify which types of devices to display]: :->devices'
       '-s[display the contents of the SUM structure]'
       '-z[report on memory used by the kernel zone allocator, uma(9), by zone]'