diff options
Diffstat (limited to 'sbin')
46 files changed, 135 insertions, 150 deletions
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8 index 6b4a331e0d8c..ae33276f3372 100644 --- a/sbin/ccdconfig/ccdconfig.8 +++ b/sbin/ccdconfig/ccdconfig.8 @@ -40,8 +40,7 @@ .Ar ccd .Ar ileave .Op Ar flags -.Ar dev -.Op Ar +.Ar dev ... .Nm .Fl C .Op Fl v @@ -49,15 +48,14 @@ .Nm .Fl u .Op Fl v -.Ar ccd -.Op Ar +.Ar ccd ... .Nm .Fl U .Op Fl v .Op Fl f Ar config_file .Nm .Fl g -.Op Ar ccd Op Ar ... +.Op Ar ccd ... .Sh DESCRIPTION The .Nm diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c index c7baa9826c82..5159bfa1ed48 100644 --- a/sbin/ccdconfig/ccdconfig.c +++ b/sbin/ccdconfig/ccdconfig.c @@ -432,10 +432,10 @@ static void usage(void) { fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n", - "usage: ccdconfig [-cv] ccd ileave [flags] dev [...]", + "usage: ccdconfig [-cv] ccd ileave [flags] dev ...", " ccdconfig -C [-v] [-f config_file]", - " ccdconfig -u [-v] ccd [...]", + " ccdconfig -u [-v] ccd ...", " ccdconfig -U [-v] [-f config_file]", - " ccdconfig -g [ccd [...]]"); + " ccdconfig -g [ccd ...]"); exit(1); } diff --git a/sbin/conscontrol/conscontrol.8 b/sbin/conscontrol/conscontrol.8 index d746caff63d7..726041e4087b 100644 --- a/sbin/conscontrol/conscontrol.8 +++ b/sbin/conscontrol/conscontrol.8 @@ -39,6 +39,8 @@ .Nm .Cm add | delete .Ar console +.Nm +.Cm set Ar console | Cm unset .Sh DESCRIPTION The .Nm diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc index 75b22c3f2329..aad0695eb0f6 100644 --- a/sbin/devd/devd.cc +++ b/sbin/devd/devd.cc @@ -795,7 +795,7 @@ gensighand(int) static void usage() { - fprintf(stderr, "usage: %s [-d]\n", getprogname()); + fprintf(stderr, "usage: %s [-Ddn]\n", getprogname()); exit(1); } diff --git a/sbin/dump/main.c b/sbin/dump/main.c index 96f92300c60a..e4118025e52b 100644 --- a/sbin/dump/main.c +++ b/sbin/dump/main.c @@ -587,8 +587,8 @@ usage(void) { fprintf(stderr, "usage: dump [-0123456789acLnSu] [-B records] [-b blocksize] [-C cachesize]\n" - " [-D dumpdates] [-d density] [-h level] [-s feet] [-T date]\n" - " [-f file | -P pipecommand] filesystem\n" + " [-D dumpdates] [-d density] [-f file | -P pipecommand] [-h level]\n" + " [-s feet] [-T date] filesystem\n" " dump -W | -w\n"); exit(X_STARTUP); } diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8 index 8e701d5ba0f6..c673b083a051 100644 --- a/sbin/dumpfs/dumpfs.8 +++ b/sbin/dumpfs/dumpfs.8 @@ -37,7 +37,7 @@ .Sh SYNOPSIS .Nm .Op Fl m -.Op Ar filesys No \&| Ar device +.Ar filesys | device .Sh DESCRIPTION The .Nm diff --git a/sbin/ffsinfo/ffsinfo.c b/sbin/ffsinfo/ffsinfo.c index e556be82c7e2..6ee4c8df4bdf 100644 --- a/sbin/ffsinfo/ffsinfo.c +++ b/sbin/ffsinfo/ffsinfo.c @@ -667,7 +667,7 @@ usage(void) DBG_ENTER; fprintf(stderr, - "usage: ffsinfo [-L] [-g cylgrp] [-i inode] [-l level] " + "usage: ffsinfo [-g cylinder_group] [-i inode] [-l level] " "[-o outfile]\n" " special | file\n"); diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8 index 8caf83e4024d..b7360d9bd8c0 100644 --- a/sbin/fsck/fsck.8 +++ b/sbin/fsck/fsck.8 @@ -37,11 +37,11 @@ .Nd file system consistency check and interactive repair .Sh SYNOPSIS .Nm -.Op Fl dvpfyn +.Op Fl dfnpvy .Op Fl B | F -.Op Fl t Ar fstype .Op Fl T Ar fstype : Ns Ar fsoptions -.Op Ar special | node ... +.Op Fl t Ar fstype +.Oo Ar special | node Oc ... .Sh DESCRIPTION The .Nm diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c index 291cd3780224..490a29af919a 100644 --- a/sbin/fsck/fsck.c +++ b/sbin/fsck/fsck.c @@ -566,9 +566,9 @@ static void usage(void) { static const char common[] = - "[-BFdfnpvy] [-T fstype:fsoptions] [-t fstype]"; + "[-dfnpvy] [-B | -F] [-T fstype:fsoptions] [-t fstype]"; - (void)fprintf(stderr, "usage: %s %s [special|node]...\n", + (void)fprintf(stderr, "usage: %s %s [special | node] ...\n", getprogname(), common); exit(1); } diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8 index 26c47bfde0e0..c85b94a789e6 100644 --- a/sbin/fsck_ffs/fsck_ffs.8 +++ b/sbin/fsck_ffs/fsck_ffs.8 @@ -39,7 +39,7 @@ .Sh SYNOPSIS .Nm .Op Fl BFpfny -.Op Fl b Ar block# +.Op Fl b Ar block .Op Fl c Ar level .Op Fl m Ar mode .Ar filesystem diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index c1ca226f69ae..a7179691542a 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -532,7 +532,7 @@ usage(void) { (void) fprintf(stderr, "usage: %s [-BFpfny] [-b block] [-c level] [-m mode] " - "file system ...\n", + "filesystem ...\n", getprogname()); exit(1); } diff --git a/sbin/kldconfig/kldconfig.8 b/sbin/kldconfig/kldconfig.8 index 191f4add9e52..18fbaf609ac4 100644 --- a/sbin/kldconfig/kldconfig.8 +++ b/sbin/kldconfig/kldconfig.8 @@ -34,7 +34,7 @@ .Sh SYNOPSIS .Nm .Op Fl dfimnUv -.Op Fl S Ar name +.Op Fl S Ar sysctlname .Op Ar path ... .Nm .Fl r @@ -73,7 +73,7 @@ Do not actually change the module search path. .It Fl r Display the current search path. This option cannot be used if any paths are also specified. -.It Fl S Ar name +.It Fl S Ar sysctlname Specify the sysctl name to use instead of the default .Va kern.module_path . .It Fl U diff --git a/sbin/kldconfig/kldconfig.c b/sbin/kldconfig/kldconfig.c index 1f53d7cd0b2b..6da8d530c192 100644 --- a/sbin/kldconfig/kldconfig.c +++ b/sbin/kldconfig/kldconfig.c @@ -307,7 +307,7 @@ usage(void) { fprintf(stderr, "%s\n%s\n", - "usage:\tkldconfig [-dfimnUv] [-S sysctlname] [path..]", + "usage:\tkldconfig [-dfimnUv] [-S sysctlname] [path ...]", "\tkldconfig -r"); exit(1); } diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c index b328bde36ce7..b49cf20a1a8a 100644 --- a/sbin/ldconfig/ldconfig.c +++ b/sbin/ldconfig/ldconfig.c @@ -226,7 +226,7 @@ static void usage() { fprintf(stderr, - "usage: ldconfig [-aout | -elf] [-Rimrsv] [-f hints_file] [dir | file ...]\n"); + "usage: ldconfig [-aout | -elf] [-Rimrsv] [-f hints_file] [directory | file ...]\n"); exit(1); } diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c index b2d92667427e..f8b584bfbaff 100644 --- a/sbin/mdconfig/mdconfig.c +++ b/sbin/mdconfig/mdconfig.c @@ -41,7 +41,7 @@ void usage() { fprintf(stderr, -"usage: mdconfig -a -t type [-n] [-o [no]option] ... [ -f file]\n" +"usage: mdconfig -a -t type [-n] [-o [no]option] ... [-f file]\n" " [-s size] [-S sectorsize] [-u unit]\n" " [-x sectors/track] [-y heads/cyl]\n" " mdconfig -d -u unit\n" diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c index e2a14a097c5e..b855d332bdcd 100644 --- a/sbin/mdmfs/mdmfs.c +++ b/sbin/mdmfs/mdmfs.c @@ -670,15 +670,15 @@ usage(void) name = "mdmfs"; if (!compat) fprintf(stderr, -"usage: %s [-DLlMNSUX] [-a maxcontig [-b block-size] [-c cylinders]\n" +"usage: %s [-DLlMNSUX] [-a maxcontig] [-b block-size] [-c cylinders]\n" "\t[-d rotdelay] [-e maxbpg] [-F file] [-f frag-size] [-i bytes]\n" "\t[-m percent-free] [-n rotational-positions] [-O optimization]\n" -"\t[-o mount-options] [-p permissions] [-s size] [-w user:group]\n" -"\tmd-device mount-point\n", name); +"\t[-o mount-options] [-p permissions] [-s size] [-v version]\n" +"\t[-w user:group] md-device mount-point\n", name); fprintf(stderr, "usage: %s -C [-lNU] [-a maxcontig] [-b block-size] [-c cylinders]\n" "\t[-d rotdelay] [-e maxbpg] [-F file] [-f frag-size] [-i bytes]\n" "\t[-m percent-free] [-n rotational-positions] [-O optimization]\n" -"\t[-o mount-options] [-s size] md-device mount-point\n", name); +"\t[-o mount-options] [-s size] [-v version] md-device mount-point\n", name); exit(1); } diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8 index cc73ec01c623..54b544153c97 100644 --- a/sbin/mknod/mknod.8 +++ b/sbin/mknod/mknod.8 @@ -37,7 +37,7 @@ .Sh SYNOPSIS .Nm .Ar name -.Op Cm c | Cm b +.Op Cm b | c .Ar major minor .Op Ar owner : Ns Ar group .Sh DESCRIPTION @@ -61,7 +61,7 @@ Device name, for example for a SCSI disk on an HP300 or a .Dq pty for pseudo-terminals. -.It Cm b | Cm c +.It Cm b | c Type of device. If the device is a block type device such as a tape or disk drive which needs diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index cecf347b2c9a..4ce8b81d6661 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -704,9 +704,9 @@ usage() { (void)fprintf(stderr, "%s\n%s\n%s\n", -"usage: mount [-dfpruvw] [-o options] [-t ufs | external_type] special node", -" mount [-adfpruvw] [ -F fstab] [-o options] [-t ufs | external_type]", -" mount [-dfpruvw] special | node"); +"usage: mount [-adfpruvw] [-F fstab] [-o options] [-t ufs | external_type]", +" mount [-dfpruvw] special | node", +" mount [-dfpruvw] [-o options] [-t ufs | external_type] special node"); exit(1); } diff --git a/sbin/mount_msdosfs/mount_msdosfs.8 b/sbin/mount_msdosfs/mount_msdosfs.8 index 1fd704f7e177..40334f4f04f9 100644 --- a/sbin/mount_msdosfs/mount_msdosfs.8 +++ b/sbin/mount_msdosfs/mount_msdosfs.8 @@ -38,20 +38,16 @@ .Nd mount an MS-DOS file system .Sh SYNOPSIS .Nm -.Op Fl o Ar options -.Op Fl u Ar uid +.Op Fl 9ls +.Op Fl D Ar DOS_codepage .Op Fl g Ar gid -.Op Fl m Ar mask -.Op Fl M Ar mask -.Op Fl s -.Op Fl l -.Op Fl 9 -.\".Op Fl G .Op Fl L Ar locale -.Op Fl D Ar dos-codepage +.Op Fl M Ar mask +.Op Fl m Ar mask +.Op Fl o Ar options +.Op Fl u Ar uid .Op Fl W Ar table -.Pa special -.Pa node +.Ar special node .Sh DESCRIPTION The .Nm @@ -166,7 +162,7 @@ This forces Specify locale name used for file name conversions for DOS and Win'95 names. By default ISO 8859-1 assumed as local character set. -.It Fl D Ar dos-codepage +.It Fl D Ar DOS_codepage Specify the MS-DOS code page (aka IBM/OEM code page) name used for file name conversions for DOS names. .It Fl W Ar table diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8 index 48c55efc4c72..9aef0352435f 100644 --- a/sbin/mount_nfs/mount_nfs.8 +++ b/sbin/mount_nfs/mount_nfs.8 @@ -36,13 +36,13 @@ .Nd mount NFS file systems .Sh SYNOPSIS .Nm -.Op Fl 23NPTUbcdiLls -.Op Fl D Ar deadthresh -.Op Fl I Ar readdirsize -.Op Fl R Ar retrycnt +.Op Fl 23bcdiLlNPsTU .Op Fl a Ar maxreadahead +.Op Fl D Ar deadthresh .Op Fl g Ar maxgroups +.Op Fl I Ar readdirsize .Op Fl o Ar options +.Op Fl R Ar retrycnt .Op Fl r Ar readsize .Op Fl t Ar timeout .Op Fl w Ar writesize diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c index 5a76d0d4c1c7..0e9957722a08 100644 --- a/sbin/mount_nfs/mount_nfs.c +++ b/sbin/mount_nfs/mount_nfs.c @@ -260,7 +260,7 @@ main(argc, argv) nfsargs = nfsdefargs; nfsargsp = &nfsargs; while ((c = getopt(argc, argv, - "23a:bcdD:g:I:iLl:No:PR:r:sTt:w:x:U")) != -1) + "23a:bcdD:g:I:iLlNo:PR:r:sTt:w:x:U")) != -1) switch (c) { case '2': mountmode = V2; @@ -918,9 +918,9 @@ void usage() { (void)fprintf(stderr, "%s\n%s\n%s\n%s\n", -"usage: mount_nfs [-23KNPTUbcdilqs] [-D deadthresh] [-I readdirsize]", -" [-R retrycnt] [-a maxreadahead]", -" [-g maxgroups] [-m realm] [-o options] [-r readsize]", -" [-t timeout] [-w writesize] [-x retrans] rhost:path node"); +"usage: mount_nfs [-23bcdiLlNPsTU] [-a maxreadahead] [-D deadthresh]", +" [-g maxgroups] [-I readdirsize] [-o options] [-R retrycnt]", +" [-r readsize] [-t timeout] [-w writesize] [-x retrans]", +" rhost:path node"); exit(1); } diff --git a/sbin/mount_nfs4/mount_nfs4.8 b/sbin/mount_nfs4/mount_nfs4.8 index 7400270ec8f1..8ef824581fce 100644 --- a/sbin/mount_nfs4/mount_nfs4.8 +++ b/sbin/mount_nfs4/mount_nfs4.8 @@ -36,16 +36,13 @@ .Nd mount NFSv4 file systems .Sh SYNOPSIS .Nm -.Op Fl NPTUbcdiLls +.Op Fl biNPsTU +.Op Fl a Ar maxreadahead .Op Fl D Ar deadthresh .Op Fl I Ar readdirsize -.Op Fl R Ar retrycnt -.Op Fl a Ar maxreadahead -.Op Fl g Ar maxgroups .Op Fl o Ar options -.Op Fl r Ar readsize +.Op Fl R Ar retrycnt .Op Fl t Ar timeout -.Op Fl w Ar writesize .Op Fl x Ar retrans .Ar rhost : Ns Ar path node .Sh DESCRIPTION diff --git a/sbin/mount_nfs4/mount_nfs4.c b/sbin/mount_nfs4/mount_nfs4.c index 73e4d7818312..b1ad123a446a 100644 --- a/sbin/mount_nfs4/mount_nfs4.c +++ b/sbin/mount_nfs4/mount_nfs4.c @@ -289,7 +289,7 @@ main(argc, argv) nfsargs = nfsdefargs; nfsargsp = &nfsargs; while ((c = getopt(argc, argv, - "a:bcdD:I:iNo:PR:sTt:x:U")) != -1) + "a:bD:I:iNo:PR:sTt:x:U")) != -1) switch (c) { case 'a': num = strtol(optarg, &p, 10); @@ -727,10 +727,9 @@ getnetconf_cached(const char *netid) { void usage() { - (void)fprintf(stderr, "%s\n%s\n%s\n%s\n", -"usage: mount_nfs [-KNPTUbiqs] [-D deadthresh] [-I readdirsize]", -" [-R retrycnt] [-a maxreadahead]", -" [-m realm] [-o options]", -" [-t timeout] [-x retrans] rhost:path node"); + (void)fprintf(stderr, "%s\n%s\n%s\n", +"usage: mount_nfs4 [-biNPsTU] [-a maxreadahead] [-D deadthresh] [-I readdirsize]", +" [-o options] [-R retrycnt] [-t timeout] [-x retrans]", +" rhost:path node"); exit(1); } diff --git a/sbin/mount_ntfs/mount_ntfs.8 b/sbin/mount_ntfs/mount_ntfs.8 index 17902b2d3110..15f49dffc2a0 100644 --- a/sbin/mount_ntfs/mount_ntfs.8 +++ b/sbin/mount_ntfs/mount_ntfs.8 @@ -40,8 +40,8 @@ .Nm .Op Fl a .Op Fl i -.Op Fl u Ar uid -.Op Fl g Ar gid +.Op Fl u Ar user +.Op Fl g Ar group .Op Fl m Ar mask .Op Fl C Ar charset .Op Fl W Ar u2wtable @@ -69,14 +69,14 @@ Force behaviour to return MS-DOS 8.3 names also on .Fn readdir . .It Fl i Make name lookup case insensitive for all names except POSIX names. -.It Fl u Ar uid +.It Fl u Ar user Set the owner of the files in the file system to -.Ar uid . +.Ar user . The default owner is the owner of the directory on which the file system is being mounted. -.It Fl g Ar gid +.It Fl g Ar group Set the group of the files in the file system to -.Ar gid . +.Ar group . The default group is the group of the directory on which the file system is being mounted. .It Fl m Ar mask diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c index 3bd6528e7224..54bb38e0d424 100644 --- a/sbin/mount_ntfs/mount_ntfs.c +++ b/sbin/mount_ntfs/mount_ntfs.c @@ -255,9 +255,9 @@ usage() #ifdef TRANSITION_PERIOD_HACK fprintf(stderr, "%s\n%s\n", "usage: mount_ntfs [-a] [-i] [-u user] [-g group] [-m mask]", - " [-C charset] [-W u2wtable] bdev dir"); + " [-C charset] [-W u2wtable] special node"); #else - fprintf(stderr, "usage: mount_ntfs [-a] [-i] [-u user] [-g group] [-m mask] [-C charset] bdev dir\n"); + fprintf(stderr, "usage: mount_ntfs [-a] [-i] [-u user] [-g group] [-m mask] [-C charset] special node\n"); #endif exit(EX_USAGE); } diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c index 175200bddbd2..0c947a923ecb 100644 --- a/sbin/mount_nullfs/mount_nullfs.c +++ b/sbin/mount_nullfs/mount_nullfs.c @@ -138,6 +138,6 @@ static void usage() { (void)fprintf(stderr, - "usage: mount_nullfs [-o options] target_fs mount_point\n"); + "usage: mount_nullfs [-o options] target mount-point\n"); exit(1); } diff --git a/sbin/mount_udf/mount_udf.8 b/sbin/mount_udf/mount_udf.8 index f91a866542c2..fb39419aea48 100644 --- a/sbin/mount_udf/mount_udf.8 +++ b/sbin/mount_udf/mount_udf.8 @@ -37,7 +37,7 @@ .Op Fl v .Op Fl o Ar options .Op Fl C Ar charset -.Ar special | node +.Ar special node .Sh DESCRIPTION The .Nm diff --git a/sbin/mount_umapfs/mount_umapfs.c b/sbin/mount_umapfs/mount_umapfs.c index b375db609980..c7315be9a3c9 100644 --- a/sbin/mount_umapfs/mount_umapfs.c +++ b/sbin/mount_umapfs/mount_umapfs.c @@ -230,6 +230,6 @@ void usage() { (void)fprintf(stderr, -"usage: mount_umapfs [-o options] -u usermap -g groupmap target_fs mount_point\n"); +"usage: mount_umapfs [-o options] -u uid-mapfile -g gid-mapfile target mount-point\n"); exit(EX_USAGE); } diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c index 49986bc286b2..6d67bef9b499 100644 --- a/sbin/mount_unionfs/mount_unionfs.c +++ b/sbin/mount_unionfs/mount_unionfs.c @@ -155,6 +155,6 @@ void usage() { (void)fprintf(stderr, - "usage: mount_unionfs [-br] [-o options] target_fs mount_point\n"); + "usage: mount_unionfs [-br] [-o options] directory uniondir\n"); exit(EX_USAGE); } diff --git a/sbin/nos-tun/nos-tun.8 b/sbin/nos-tun/nos-tun.8 index f37c42829639..c5f1989c7011 100644 --- a/sbin/nos-tun/nos-tun.8 +++ b/sbin/nos-tun/nos-tun.8 @@ -24,6 +24,7 @@ .Ar destination .Fl p .Ar protocol_number +.Op Ar source .Ar target .Sh DESCRIPTION The diff --git a/sbin/nos-tun/nos-tun.c b/sbin/nos-tun/nos-tun.c index b54ef7258f4e..9966840038f7 100644 --- a/sbin/nos-tun/nos-tun.c +++ b/sbin/nos-tun/nos-tun.c @@ -389,7 +389,7 @@ static void usage() { fprintf(stderr, -"usage: nos-tun -t <tun_name> -s <source_addr> -d <dest_addr> -p <protocol_number> [<source_addr>] <target_addr>\n"); +"usage: nos-tun -t tunnel -s source -d destination -p protocol_number [source] target\n"); exit(1); } diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8 index 686bd2747829..89a81684cf55 100644 --- a/sbin/ping6/ping6.8 +++ b/sbin/ping6/ping6.8 @@ -68,13 +68,13 @@ packets to network hosts .Op Fl l Ar preload .Ek .Bk -words -.Op Fl p Ar pattern -.Ek -.Bk -words .\" new ipsec .Op Fl P Ar policy .Ek .Bk -words +.Op Fl p Ar pattern +.Ek +.Bk -words .Op Fl S Ar sourceaddr .Ek .Bk -words diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c index 9310088d05dd..d9c2f82fd2d5 100644 --- a/sbin/ping6/ping6.c +++ b/sbin/ping6/ping6.c @@ -2702,21 +2702,26 @@ void usage() { (void)fprintf(stderr, - "usage: ping6 [-dfH" +#if defined(IPSEC) && !defined(IPSEC_POLICY_IPSEC) + "A" +#endif + "usage: ping6 [-" + "d" +#if defined(IPSEC) && !defined(IPSEC_POLICY_IPSEC) + "E" +#endif + "fH" #ifdef IPV6_USE_MIN_MTU "m" #endif - "nNqtvwW" -#ifdef IPSEC -#ifdef IPSEC_POLICY_IPSEC - "] [-P policy" -#else - "AE" -#endif + "nNqtvwW] " + "[-a addrtype] [-b bufsiz] [-c count] [-g gateway]\n" + " [-h hoplimit] [-I interface] [-i wait] [-l preload]" +#if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC) + " [-P policy]" #endif - "] [-a [aAclsg]] [-b sockbufsiz] [-c count] \n" - "\t[-I interface] [-i wait] [-l preload] [-p pattern] " - "[-S sourceaddr]\n" - "\t[-s packetsize] [-h hoplimit] [hops...] [-g gateway] host\n"); + "\n" + " [-p pattern] [-S sourceaddr] [-s packetsize] " + "[hops ...] host\n"); exit(1); } diff --git a/sbin/quotacheck/quotacheck.8 b/sbin/quotacheck/quotacheck.8 index eb687e22f64c..0eb3eb8cb3a9 100644 --- a/sbin/quotacheck/quotacheck.8 +++ b/sbin/quotacheck/quotacheck.8 @@ -39,16 +39,11 @@ .Nd file system quota consistency checker .Sh SYNOPSIS .Nm -.Op Fl g -.Op Fl u -.Op Fl v -.Ar filesystem -.Ar -.Nm -.Op Fl g -.Op Fl u -.Op Fl v +.Op Fl guv .Fl a +.Nm +.Op Fl guv +.Ar filesystem ... .Sh DESCRIPTION The .Nm diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c index 28190670a3b6..634124e11043 100644 --- a/sbin/quotacheck/quotacheck.c +++ b/sbin/quotacheck/quotacheck.c @@ -217,7 +217,7 @@ void usage() { (void)fprintf(stderr, "%s\n%s\n", - "usage: quotacheck -a [-guv]", + "usage: quotacheck [-guv] -a", " quotacheck [-guv] filesystem ..."); exit(1); } diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8 index 2b9cd401aa4d..39022ab90ae9 100644 --- a/sbin/reboot/reboot.8 +++ b/sbin/reboot/reboot.8 @@ -39,16 +39,16 @@ .Nd stopping and restarting the system .Sh SYNOPSIS .Nm halt -.Op Fl lnqp +.Op Fl lnpq .Op Fl k Ar kernel .Nm -.Op Fl dlnqp +.Op Fl dlnpq .Op Fl k Ar kernel .Nm fasthalt -.Op Fl lnqp +.Op Fl lnpq .Op Fl k Ar kernel .Nm fastboot -.Op Fl dlnqp +.Op Fl dlnpq .Op Fl k Ar kernel .Sh DESCRIPTION The @@ -98,12 +98,6 @@ and log this themselves. .It Fl n The file system cache is not flushed. This option should probably not be used. -.It Fl q -The system is halted or restarted quickly and ungracefully, and only -the flushing of the file system cache is performed (if the -.Fl n -option is not specified). -This option should probably not be used. .It Fl p The system will turn off the power if it can. If the power down action fails, the system @@ -112,6 +106,12 @@ will halt or reboot normally, depending on whether or .Nm was called. +.It Fl q +The system is halted or restarted quickly and ungracefully, and only +the flushing of the file system cache is performed (if the +.Fl n +option is not specified). +This option should probably not be used. .El .Pp The diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 195c094abb98..692364057cea 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -205,8 +205,8 @@ restart: static void usage() { - (void)fprintf(stderr, "usage: %s [-dnpq] [-k kernel]\n", - dohalt ? "halt" : "reboot"); + (void)fprintf(stderr, "usage: %s [-%slnpq] [-k kernel]\n", + getprogname(), dohalt ? "" : "d"); exit(1); } diff --git a/sbin/restore/main.c b/sbin/restore/main.c index b2ace5db112f..22555ad0733a 100644 --- a/sbin/restore/main.c +++ b/sbin/restore/main.c @@ -290,16 +290,16 @@ static void usage() { const char *const common = - "[-b blocksize] [-P pipecmd | -f file] [-s fileno]"; + "[-b blocksize] [-f file | -P pipecommand] [-s fileno]"; const char *const fileell = "[file ...]"; (void)fprintf(stderr, "usage:\t%s %s\n\t%s %s\n\t%s %s\n" "\t%s %s %s\n\t%s %s %s\n", "restore -i [-cdhmNuvy]", common, - "restore -r [-cdNuvy]", common, "restore -R [-cdNuvy]", common, - "restore -x [-cdhmNuvy]", common, fileell, - "restore -t [-cdhNuvy]", common, fileell); + "restore -r [-cdNuvy]", common, + "restore -t [-cdhNuvy]", common, fileell, + "restore -x [-cdhmNuvy]", common, fileell); done(1); } diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c index 5bb76e9cb7a0..f4e26d2cecb2 100644 --- a/sbin/savecore/savecore.c +++ b/sbin/savecore/savecore.c @@ -478,8 +478,10 @@ closefd: static void usage(void) { - fprintf(stderr, - "usage: savecore [-Cv|-cfkvz] [directory [device...]]\n"); + fprintf(stderr, "%s\n%s\n%s\n", + "usage: savecore -c", + " savecore -C [-v] [directory device]", + " savecore [-fkvz] [directory [device ...]]"); exit (1); } diff --git a/sbin/slattach/slattach.8 b/sbin/slattach/slattach.8 index fbccd7193267..a359dd25605d 100644 --- a/sbin/slattach/slattach.8 +++ b/sbin/slattach/slattach.8 @@ -37,21 +37,14 @@ .Nd attach serial lines as network interfaces .Sh SYNOPSIS .Nm -.Op Fl a -.Op Fl c +.Op Fl acfhLlnz .Op Fl e Ar exit-command -.Op Fl f -.Op Fl h -.Op Fl l -.Op Fl n -.Op Fl z -.Op Fl L -.Op Fl r Ar redial-command -.Op Fl s Ar baudrate -.Op Fl u Ar unit-command .Op Fl K Ar keepalive .Op Fl O Ar outfill +.Op Fl r Ar redial-command .Op Fl S Ar unit +.Op Fl s Ar baudrate +.Op Fl u Ar unit-command .Ar ttyname .Sh DESCRIPTION The diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c index 613332cfff9b..afdfce8a2e71 100644 --- a/sbin/slattach/slattach.c +++ b/sbin/slattach/slattach.c @@ -105,9 +105,10 @@ char *exit_cmd = 0; /* command to exec before exiting. */ static void usage() { - fprintf(stderr, "%s\n%s\n", -"usage: slattach [-acfhlnz] [-e command] [-r command] [-s speed] [-u command]", -" [-L] [-K timeout] [-O timeout] [-S unit] device"); + fprintf(stderr, "%s\n%s\n%s\n", +"usage: slattach [-acfhLlnz] [-e exit-command] [-K keepalive] [-O outfill]", +" [-r redial-command] [-S unit] [-s baudrate] [-u unit-command]", +" ttyname"); /* do not exit here */ } diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c index f7238701f772..2d4d3bfb124a 100644 --- a/sbin/startslip/startslip.c +++ b/sbin/startslip/startslip.c @@ -590,6 +590,6 @@ usage(void) "usage: startslip [-d] [-b speed] [-s string1 [-s string2 [...]]] [-h] [-l]", " [-L] [-A annexname] [-U upscript] [-D downscript]", " [-t script_timeout] [-W maxtries] [-w retry_pause]", -" [-K keepalive] [-O outfill] [-S unit] device user passwd"); +" [-K keepalive] [-O outfill] [-S unit] device user password"); exit(1); } diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8 index 73e17e160989..f4ecd14145f7 100644 --- a/sbin/swapon/swapon.8 +++ b/sbin/swapon/swapon.8 @@ -35,10 +35,8 @@ .Nm swapon , swapoff , swapctl .Nd "specify devices for paging and swapping" .Sh SYNOPSIS -.Nm swapon Ar -.Nm swapon Fl a -.Nm swapoff Ar -.Nm swapoff Fl a +.Nm swapon Fl a | Ar +.Nm swapoff Fl a | Ar .Nm swapctl .Op Fl AhklsU .Oo diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c index 2d330a63bb0a..13297f9178dc 100644 --- a/sbin/swapon/swapon.c +++ b/sbin/swapon/swapon.c @@ -194,14 +194,12 @@ usage(void) { fprintf(stderr, "usage: %s ", getprogname()); switch(orig_prog) { - case SWAPOFF: - fprintf(stderr, "[-a] [special_file ...]\n"); - break; case SWAPON: - fprintf(stderr, "[-a] [special_file ...]\n"); + case SWAPOFF: + fprintf(stderr, "-a | file ...\n"); break; case SWAPCTL: - fprintf(stderr, "[-lshAU] [-a/-d special_file ...]\n"); + fprintf(stderr, "[-AhklsU] [-a file ... | -d file ...]\n"); break; } exit(1); diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index 3fcd24eeab91..1ce20edc1e68 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -75,7 +75,7 @@ usage(void) { (void)fprintf(stderr, "%s\n%s\n", - "usage: sysctl [-bdehNnox] variable[=value] ...", + "usage: sysctl [-bdehNnox] name[=value] ...", " sysctl [-bdehNnox] -a"); exit(1); } diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c index e1bd26790e48..c00a09d8da22 100644 --- a/sbin/umount/umount.c +++ b/sbin/umount/umount.c @@ -591,7 +591,7 @@ usage() { (void)fprintf(stderr, "%s\n%s\n", - "usage: umount [-fv] special | node", - " umount -a | -A [ -F fstab] [-fv] [-h host] [-t type]"); + "usage: umount [-fv] special | node | fsid", + " umount -a | -A [-F fstab] [-fv] [-h host] [-t type]"); exit(1); } |