From 65717f952e18dc3cff75115bdd8f64686cba4aa3 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Tue, 30 Oct 2007 17:49:00 +0000
Subject: [PATCH] Apply style(9) to usage(), fix markup of the manpage.

---
 usr.bin/file2c/file2c.1 | 10 ++++------
 usr.bin/file2c/file2c.c |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/usr.bin/file2c/file2c.1 b/usr.bin/file2c/file2c.1
index a4f72e221e69..40482c27e0e8 100644
--- a/usr.bin/file2c/file2c.1
+++ b/usr.bin/file2c/file2c.1
@@ -15,9 +15,8 @@
 .Nd convert file to c-source
 .Sh SYNOPSIS
 .Nm
+.Op Fl sx
 .Op Fl n Ar count
-.Op Fl s
-.Op Fl x
 .Op Ar prefix Op Ar suffix
 .Sh DESCRIPTION
 The
@@ -28,7 +27,8 @@ The byte values are separated by a comma.
 This also means that the last byte value is not followed by a comma.
 By default the byte values are printed in decimal, but when the
 .Fl x
-option is given, the values will be printed in hexadecimal. When
+option is given, the values will be printed in hexadecimal.
+When
 .Fl s
 option is given, each line is printed with a leading tab and each comma is
 followed by a space except for the last one on the line.
@@ -54,9 +54,7 @@ This program is typically used to embed binary files into C source files.
 The prefix is used to define an array type and the suffix is used to end
 the C statement.
 The
-.Fl n
-,
-.Fl s
+.Fl n , s
 and
 .Fl x
 options are useful when the binary data represents a bitmap and the output
diff --git a/usr.bin/file2c/file2c.c b/usr.bin/file2c/file2c.c
index 14f754e97faa..e50bd1f8a46d 100644
--- a/usr.bin/file2c/file2c.c
+++ b/usr.bin/file2c/file2c.c
@@ -19,7 +19,7 @@ static void
 usage(void)
 {
 
-	fprintf(stderr, "usage: %s [-n count] [-s] [-x] [prefix [suffix]]\n",
+	fprintf(stderr, "usage: %s [-sx] [-n count] [prefix [suffix]]\n",
 	    getprogname());
 	exit(1);
 }