summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2007-02-25 16:41:43 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2007-02-25 16:41:43 +0000
commitd5068f36da97579e535ef99cd3b9df44d29fcebd (patch)
tree0771277cb713085b575b1e68bab8af126d65953f /sbin
parent1b4b71a52369e1d1f4c012d7b4b9c0dbcc2e5fe8 (diff)
one application does not need five synopses;
Diffstat (limited to 'sbin')
-rw-r--r--sbin/restore/main.c10
-rw-r--r--sbin/restore/restore.832
2 files changed, 6 insertions, 36 deletions
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index 28c855d827d..14c66079b06 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.16 2006/03/20 18:55:13 dhill Exp $ */
+/* $OpenBSD: main.c,v 1.17 2007/02/25 16:41:42 jmc Exp $ */
/* $NetBSD: main.c,v 1.13 1997/07/01 05:37:51 lukem Exp $ */
/*
@@ -40,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 9/13/94";
#else
-static const char rcsid[] = "$OpenBSD: main.c,v 1.16 2006/03/20 18:55:13 dhill Exp $";
+static const char rcsid[] = "$OpenBSD: main.c,v 1.17 2007/02/25 16:41:42 jmc Exp $";
#endif
#endif /* not lint */
@@ -286,11 +286,7 @@ static void
usage(void)
{
- (void)fprintf(stderr, "usage: %s -i [-chmvy] [-b blocksize] [-f file] [-s fileno]\n", __progname);
- (void)fprintf(stderr, " %s -R [-cvy] [-b blocksize] [-f file] [-s fileno]\n", __progname);
- (void)fprintf(stderr, " %s -r [-cvy] [-b blocksize] [-f file] [-s fileno]\n", __progname);
- (void)fprintf(stderr, " %s -t [-chvy] [-b blocksize] [-f file] [-s fileno] [file ...]\n", __progname);
- (void)fprintf(stderr, " %s -x [-chmvy] [-b blocksize] [-f file] [-s fileno] [file ...]\n", __progname);
+ (void)fprintf(stderr, "usage: %s [-chimRrtvxy] [-b blocksize] [-f file] [-s fileno] [file ...]\n", __progname);
exit(1);
}
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index f931d6bbb78..9bd0be6a3f0 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: restore.8,v 1.29 2007/02/25 16:29:49 jmc Exp $
+.\" $OpenBSD: restore.8,v 1.30 2007/02/25 16:41:42 jmc Exp $
.\" $NetBSD: restore.8,v 1.15 1997/07/01 05:37:53 lukem Exp $
.\"
.\" Copyright (c) 1985, 1991, 1993
@@ -38,37 +38,11 @@
.Nd "restore files or file systems from backups made with dump"
.Sh SYNOPSIS
.Nm restore
-.Fl i
-.Op Fl chmvy
-.Op Fl b Ar blocksize
-.Op Fl f Ar file
-.Op Fl s Ar fileno
-.Nm restore
-.Fl R
-.Op Fl cvy
-.Op Fl b Ar blocksize
-.Op Fl f Ar file
-.Op Fl s Ar fileno
-.Nm restore
-.Fl r
-.Op Fl cvy
-.Op Fl b Ar blocksize
-.Op Fl f Ar file
-.Op Fl s Ar fileno
-.Nm restore
-.Fl t
-.Op Fl chvy
-.Op Fl b Ar blocksize
-.Op Fl f Ar file
-.Op Fl s Ar fileno
-.Op Ar file Ar ...
-.Nm restore
-.Fl x
-.Op Fl chmvy
+.Op Fl chimRrtvxy
.Op Fl b Ar blocksize
.Op Fl f Ar file
.Op Fl s Ar fileno
-.Op Ar file Ar ...
+.Op Ar
.Sh DESCRIPTION
The
.Nm