From: Karel Zak <kzak@redhat.com>
Date: Tue, 16 Aug 2011 11:16:40 +0000 (+0200)
Subject: unshare: cleanup usage()
X-Git-Tag: v2.20-rc2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3cf01b94d4ec50d40db442fc5f0ae3cbbe3dc83a;p=thirdparty%2Futil-linux.git

unshare: cleanup usage()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c
index 7a68e2cbbb..b11919d96e 100644
--- a/sys-utils/unshare.c
+++ b/sys-utils/unshare.c
@@ -54,17 +54,18 @@ static void usage(int status)
 {
 	FILE *out = status == EXIT_SUCCESS ? stdout : stderr;
 
-	fprintf(out, _("Usage: %s [options] <program> [args...]\n"),
-		program_invocation_short_name);
-
-	fputs(_("Run program with some namespaces unshared from parent\n\n"
-		"  -h, --help        usage information (this)\n"
-		"  -m, --mount       unshare mounts namespace\n"
-		"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-		"  -i, --ipc         unshare System V IPC namespace\n"
-		"  -n, --net         unshare network namespace\n"), out);
-
-	fprintf(out, _("\nFor more information see unshare(1).\n"));
+	fputs(_("\nUsage:\n"), out);
+	fprintf(out,
+	      _(" %s [options] <program> [args...]\n"),	program_invocation_short_name);
+
+	fputs(_("\nOptions:\n"), out);
+	fputs(_(" -h, --help        usage information (this)\n"
+		" -m, --mount       unshare mounts namespace\n"
+		" -u, --uts         unshare UTS namespace (hostname etc)\n"
+		" -i, --ipc         unshare System V IPC namespace\n"
+		" -n, --net         unshare network namespace\n"), out);
+
+	fputs(_("\nFor more information see unshare(1).\n"), out);
 	exit(status);
 }