simplify synopsis/usage() and sort options. also fixes documentation/5411

from han

2 files changed, 16 insertions, 18 deletions

diff --git a/usr.bin/locate/locate/locate.updatedb.8 b/usr.bin/locate/locate/locate.updatedb.8
index df715ac0da3..44b155e4bc4 100644
--- a/usr.bin/locate/locate/locate.updatedb.8
+++ b/usr.bin/locate/locate/locate.updatedb.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: locate.updatedb.8,v 1.15 2003/09/25 18:06:23 jmc Exp $
+.\"	$OpenBSD: locate.updatedb.8,v 1.16 2007/03/15 22:24:18 jmc Exp $
 .\"
 .\" Copyright (c) 1996
 .\"	Mike Pritchard <mpp@FreeBSD.org>.  All rights reserved.
@@ -38,13 +38,11 @@
 .Nd update locate database
 .Sh SYNOPSIS
 .Nm locate.updatedb
-.Bk -words
-.Op Fl -tmpdir=dir
-.Op Fl -fcodes=dbfile
-.Op Fl -searchpaths='dir1 dir2...'
-.Op Fl -prunepaths='dir1 dir2...'
-.Op Fl -filesystems='type1 type2...'
-.Ek
+.Op Cm --fcodes=dbfile
+.Op Cm --filesystems='type ...'
+.Op Cm --prunepaths='dir ...'
+.Op Cm --searchpaths='dir ...'
+.Op Cm --tmpdir=dir
 .Sh DESCRIPTION
 .Nm
 updates the database used by
@@ -59,21 +57,21 @@ file as well as the command line arguments.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
-.It Fl -tmpdir
-Sets the directory temporary files are stored in.
 .It Fl -fcodes
 Use the named file as the find codes database.
 If the file name
 .Ql \-
 is given, the database will be sent to standard output.
-.It Fl -searchpaths
-Sets the list of directories to be put in the database.
-.It Fl -prunepaths
-Sets the list of parent directories that should not go in
-the database.
 .It Fl -filesystems
 A list of filesystem types to be traversed by
 .Xr find 1 .
+.It Fl -prunepaths
+Sets the list of parent directories that should not go in
+the database.
+.It Fl -searchpaths
+Sets the list of directories to be put in the database.
+.It Fl -tmpdir
+Sets the directory temporary files are stored in.
 .El
 .Sh FILES
 .Bl -tag -width /var/db/locate.database -compact
diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh
index 55291dccc02..e55c7aa0e71 100644
--- a/usr.bin/locate/locate/updatedb.sh
+++ b/usr.bin/locate/locate/updatedb.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$OpenBSD: updatedb.sh,v 1.11 2003/09/29 16:03:16 deraadt Exp $
+#	$OpenBSD: updatedb.sh,v 1.12 2007/03/15 22:24:18 jmc Exp $
 #
 # Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 # All rights reserved.
@@ -28,7 +28,7 @@
 #
 # updatedb - update locate database for local mounted filesystems
 #
-# $Id: updatedb.sh,v 1.11 2003/09/29 16:03:16 deraadt Exp $
+# $Id: updatedb.sh,v 1.12 2007/03/15 22:24:18 jmc Exp $
 
 LOCATE_CONFIG="/etc/locate.rc"
 if [ -f "$LOCATE_CONFIG" -a -r "$LOCATE_CONFIG" ]; then
@@ -41,7 +41,7 @@ TMPDIR=${TMPDIR:-/tmp}; export TMPDIR;
 
 PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH; export PATH
 
-USAGE="Usage: $0 [--tmpdir=dir] [--fcodes=dbfile] [--searchpaths='dir1 dir2...'] [--prunepaths='dir1 dir2...'] [--filesystems='type1 type2...']"
+USAGE="usage: $0 [--fcodes=dbfile] [--filesystems='type ...'] [--prunepaths='dir ...'] [--searchpaths='dir ...'] [--tmpdir=dir]"
 
 : ${mklocatedb=locate.mklocatedb}	 # make locate database program
 : ${FCODES=/var/db/locate.database}	 # the database