Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 May 2011 14:30:13 +0000 (UTC)
From:      "Andrey V. Elsukov" <ae@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r222357 - head/sbin/geom/class/part
Message-ID:  <201105271430.p4REUD5l039395@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ae
Date: Fri May 27 14:30:13 2011
New Revision: 222357
URL: http://svn.freebsd.org/changeset/base/222357

Log:
  Synchronize manpage's synopsis with program's usage. Since -l and -r
  keys are mutually exclusive for the `gpart show` command, then mark
  them so.
  
  Requested by:	ru

Modified:
  head/sbin/geom/class/part/geom_part.c
  head/sbin/geom/class/part/gpart.8

Modified: head/sbin/geom/class/part/geom_part.c
==============================================================================
--- head/sbin/geom/class/part/geom_part.c	Fri May 27 14:27:28 2011	(r222356)
+++ head/sbin/geom/class/part/geom_part.c	Fri May 27 14:30:13 2011	(r222357)
@@ -101,7 +101,7 @@ struct g_command PUBSYM(class_commands)[
 		{ 'l', "label", G_VAL_OPTIONAL, G_TYPE_STRING },
 		{ 'f', "flags", GPART_FLAGS, G_TYPE_STRING },
 		G_OPT_SENTINEL },
-	    "[-a alignment] [-b start] [-s size] -t type [-i index] "
+	    "-t type [-a alignment] [-b start] [-s size] [-i index] "
 		"[-l label] [-f flags] geom"
 	},
 	{ "backup", 0, gpart_backup, G_NULL_OPTS,
@@ -113,7 +113,7 @@ struct g_command PUBSYM(class_commands)[
 		{ 'i', GPART_PARAM_INDEX, G_VAL_OPTIONAL, G_TYPE_NUMBER },
 		{ 'f', "flags", GPART_FLAGS, G_TYPE_STRING },
 		G_OPT_SENTINEL },
-	    "[-b bootcode] [-p partcode] [-i index] [-f flags] geom"
+	    "[-b bootcode] [-p partcode -i index] [-f flags] geom"
 	},
 	{ "commit", 0, gpart_issue, G_NULL_OPTS,
 	    "geom"
@@ -157,7 +157,7 @@ struct g_command PUBSYM(class_commands)[
 		{ 'r', "show_rawtype", NULL, G_TYPE_BOOL },
 		{ 'p', "show_providers", NULL, G_TYPE_BOOL },
 		G_OPT_SENTINEL },
-	    "[-lrp] [geom ...]"
+	    "[-l | -r] [-p] [geom ...]"
 	},
 	{ "undo", 0, gpart_issue, G_NULL_OPTS,
 	    "geom"
@@ -175,7 +175,7 @@ struct g_command PUBSYM(class_commands)[
 		{ 'i', GPART_PARAM_INDEX, NULL, G_TYPE_NUMBER },
 		{ 'f', "flags", GPART_FLAGS, G_TYPE_STRING },
 		G_OPT_SENTINEL },
-	    "[-a alignment] [-s size] -i index [-f flags] geom"
+	    "-i index [-a alignment] [-s size] [-f flags] geom"
 	},
 	{ "restore", 0, gpart_restore, {
 		{ 'F', "force", NULL, G_TYPE_BOOL },

Modified: head/sbin/geom/class/part/gpart.8
==============================================================================
--- head/sbin/geom/class/part/gpart.8	Fri May 27 14:27:28 2011	(r222356)
+++ head/sbin/geom/class/part/gpart.8	Fri May 27 14:30:13 2011	(r222357)
@@ -170,7 +170,8 @@ utility:
 .\" ==== SHOW ====
 .Nm
 .Cm show
-.Op Fl lrp
+.Op Fl l | Fl r
+.Op Fl p
 .Op Ar geom ...
 .\" ==== UNDO ====
 .Nm



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105271430.p4REUD5l039395>