All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/8] cfdisk: remove the mistaken B from the explanation of size suffixes
@ 2015-02-01 14:00 Benno Schulenberg
  2015-02-01 14:00 ` [PATCH 2/8] cfdisk: improve wording and consistency of the size warnings Benno Schulenberg
                   ` (7 more replies)
  0 siblings, 8 replies; 14+ messages in thread
From: Benno Schulenberg @ 2015-02-01 14:00 UTC (permalink / raw)
  To: util-linux

Also reword the explanation to be clearer.  It is not necessary to
be complete -- that is what the man page is for.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 disk-utils/cfdisk.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index 9455910..f1d4745 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -1507,8 +1507,8 @@ static int ui_get_size(struct cfdisk *cf, const char *prompt, uintmax_t *res,
 
 		snprintf(buf, sizeof(buf), "%s", dflt);
 		rc = ui_get_string(cf, prompt,
-				_("May be followed by {M,B,G,T}iB "
-				  "(the \"iB\" is optional) or S for sectors."),
+				_("May be followed by M for MiB, G for GiB, "
+				  "T for TiB, or S for sectors."),
 				buf, sizeof(buf));
 		if (rc == 0) {
 			ui_warnx(_("Please, specify size."));
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 2/8] cfdisk: improve wording and consistency of the size warnings
  2015-02-01 14:00 [PATCH 1/8] cfdisk: remove the mistaken B from the explanation of size suffixes Benno Schulenberg
@ 2015-02-01 14:00 ` Benno Schulenberg
  2015-02-01 14:00 ` [PATCH 3/8] cfdisk: punctuate the bottombar messages consistently Benno Schulenberg
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 14+ messages in thread
From: Benno Schulenberg @ 2015-02-01 14:00 UTC (permalink / raw)
  To: util-linux

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 disk-utils/cfdisk.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index f1d4745..f414f55 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -1533,7 +1533,7 @@ static int ui_get_size(struct cfdisk *cf, const char *prompt, uintmax_t *res,
 			if (insec)
 				user *= fdisk_get_sector_size(cf->cxt);
 			if (user < low) {
-				ui_warnx(_("Minimal size is %ju"), low);
+				ui_warnx(_("Minimum size is %ju bytes."), low);
 				rc = -ERANGE;
 			}
 			if (user > up && pwr && user < up + (1ULL << pwr * 10))
@@ -1542,7 +1542,7 @@ static int ui_get_size(struct cfdisk *cf, const char *prompt, uintmax_t *res,
 				user = up;
 
 			if (user > up) {
-				ui_warnx(_("Maximal size is %ju bytes."), up);
+				ui_warnx(_("Maximum size is %ju bytes."), up);
 				rc = -ERANGE;
 			}
 			if (rc == 0 && insec && expsize)
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 3/8] cfdisk: punctuate the bottombar messages consistently
  2015-02-01 14:00 [PATCH 1/8] cfdisk: remove the mistaken B from the explanation of size suffixes Benno Schulenberg
  2015-02-01 14:00 ` [PATCH 2/8] cfdisk: improve wording and consistency of the size warnings Benno Schulenberg
@ 2015-02-01 14:00 ` Benno Schulenberg
  2015-02-01 14:00 ` [PATCH 4/8] cfdisk: make '?' an alias of 'h', to also show the help screen Benno Schulenberg
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 14+ messages in thread
From: Benno Schulenberg @ 2015-02-01 14:00 UTC (permalink / raw)
  To: util-linux

Also adjust the style of two comments and add another.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 disk-utils/cfdisk.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index f414f55..eb3141b 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -1923,7 +1923,7 @@ static int main_menu_action(struct cfdisk *cf, int key)
 			info = _("Partition %zu has been deleted.");
 		ref = 1;
 		break;
-	case 'h': /* help */
+	case 'h': /* Help */
 		ui_help();
 		ref = 1;
 		break;
@@ -1989,13 +1989,13 @@ static int main_menu_action(struct cfdisk *cf, int key)
 			info = _("The type of partition %zu is unchanged.");
 		break;
 	}
-	case 's': /* fix order */
+	case 's': /* Sort */
 		if (cf->wrong_order) {
 			fdisk_reorder_partitions(cf->cxt);
 			ref = 1;
 		}
 		break;
-	case 'u':
+	case 'u': /* dUmp */
 		ui_script_write(cf);
 		break;
 	case 'W': /* Write */
@@ -2003,7 +2003,7 @@ static int main_menu_action(struct cfdisk *cf, int key)
 		char buf[64] = { 0 };
 
 		if (fdisk_is_readonly(cf->cxt)) {
-			warn = _("Device open in read-only mode");
+			warn = _("Device is open in read-only mode.");
 			break;
 		}
 
@@ -2016,12 +2016,12 @@ static int main_menu_action(struct cfdisk *cf, int key)
 		ref = 1;
 		if (rc <= 0 || (strcasecmp(buf, "yes") != 0 &&
 				strcasecmp(buf, _("yes")) != 0)) {
-			info = _("Did not write partition table to disk");
+			info = _("Did not write partition table to disk.");
 			break;
 		}
 		rc = fdisk_write_disklabel(cf->cxt);
 		if (rc)
-			warn = _("Failed to write disklabel");
+			warn = _("Failed to write disklabel.");
 		else {
 			fdisk_reread_partition_table(cf->cxt);
 			info = _("The partition table has been altered.");
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 4/8] cfdisk: make '?' an alias of 'h', to also show the help screen
  2015-02-01 14:00 [PATCH 1/8] cfdisk: remove the mistaken B from the explanation of size suffixes Benno Schulenberg
  2015-02-01 14:00 ` [PATCH 2/8] cfdisk: improve wording and consistency of the size warnings Benno Schulenberg
  2015-02-01 14:00 ` [PATCH 3/8] cfdisk: punctuate the bottombar messages consistently Benno Schulenberg
@ 2015-02-01 14:00 ` Benno Schulenberg
  2015-02-01 14:00 ` [PATCH 5/8] lib/strutils: accept not just 'B' but also lowercase 'b' in a size suffix Benno Schulenberg
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 14+ messages in thread
From: Benno Schulenberg @ 2015-02-01 14:00 UTC (permalink / raw)
  To: util-linux

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 disk-utils/cfdisk.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index eb3141b..8658ff2 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -1924,6 +1924,7 @@ static int main_menu_action(struct cfdisk *cf, int key)
 		ref = 1;
 		break;
 	case 'h': /* Help */
+	case '?':
 		ui_help();
 		ref = 1;
 		break;
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 5/8] lib/strutils: accept not just 'B' but also lowercase 'b' in a size suffix
  2015-02-01 14:00 [PATCH 1/8] cfdisk: remove the mistaken B from the explanation of size suffixes Benno Schulenberg
                   ` (2 preceding siblings ...)
  2015-02-01 14:00 ` [PATCH 4/8] cfdisk: make '?' an alias of 'h', to also show the help screen Benno Schulenberg
@ 2015-02-01 14:00 ` Benno Schulenberg
  2015-02-01 14:00 ` [PATCH 6/8] libfdisk: actually translate the human-readable name of the partition type Benno Schulenberg
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 14+ messages in thread
From: Benno Schulenberg @ 2015-02-01 14:00 UTC (permalink / raw)
  To: util-linux

Just line 'M' and 'm' are accepted for mega, 'G' and 'g' for giga,
'S' and 's' for sectors, and so on.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 lib/strutils.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/strutils.c b/lib/strutils.c
index 9fe9481..c4f9600 100644
--- a/lib/strutils.c
+++ b/lib/strutils.c
@@ -101,9 +101,9 @@ int parse_size(const char *str, uintmax_t *res, int *power)
 	 * Check size suffixes
 	 */
 check_suffix:
-	if (*(p + 1) == 'i' && *(p + 2) == 'B' && !*(p + 3))
+	if (*(p + 1) == 'i' && (*(p + 2) == 'B' || *(p + 2) == 'b') && !*(p + 3))
 		base = 1024;			/* XiB, 2^N */
-	else if (*(p + 1) == 'B' && !*(p + 2))
+	else if ((*(p + 1) == 'B' || *(p + 1) == 'b') && !*(p + 2))
 		base = 1000;			/* XB, 10^N */
 	else if (*(p + 1)) {
 		struct lconv const *l = localeconv();
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 6/8] libfdisk: actually translate the human-readable name of the partition type
  2015-02-01 14:00 [PATCH 1/8] cfdisk: remove the mistaken B from the explanation of size suffixes Benno Schulenberg
                   ` (3 preceding siblings ...)
  2015-02-01 14:00 ` [PATCH 5/8] lib/strutils: accept not just 'B' but also lowercase 'b' in a size suffix Benno Schulenberg
@ 2015-02-01 14:00 ` Benno Schulenberg
  2015-02-01 14:00 ` [PATCH 7/8] build-sys: improve wording and punctuation of several messages Benno Schulenberg
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 14+ messages in thread
From: Benno Schulenberg @ 2015-02-01 14:00 UTC (permalink / raw)
  To: util-linux

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 libfdisk/src/partition.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libfdisk/src/partition.c b/libfdisk/src/partition.c
index 9a02993..5b27d3a 100644
--- a/libfdisk/src/partition.c
+++ b/libfdisk/src/partition.c
@@ -735,7 +735,7 @@ int fdisk_partition_to_string(struct fdisk_partition *pa,
 		rc = asprintf(&p, "%ju", pa->cpg);
 		break;
 	case FDISK_FIELD_TYPE:
-		p = pa->type && pa->type->name ? strdup(pa->type->name) : NULL;
+		p = pa->type && pa->type->name ? strdup(_(pa->type->name)) : NULL;
 		break;
 	case FDISK_FIELD_TYPEID:
 		if (pa->type && fdisk_parttype_get_string(pa->type))
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 7/8] build-sys: improve wording and punctuation of several messages
  2015-02-01 14:00 [PATCH 1/8] cfdisk: remove the mistaken B from the explanation of size suffixes Benno Schulenberg
                   ` (4 preceding siblings ...)
  2015-02-01 14:00 ` [PATCH 6/8] libfdisk: actually translate the human-readable name of the partition type Benno Schulenberg
@ 2015-02-01 14:00 ` Benno Schulenberg
  2015-02-01 14:00 ` [PATCH 8/8] docs: add the Sort command to the man page of cfdisk Benno Schulenberg
  2015-02-02  9:59 ` [PATCH 1/8] cfdisk: remove the mistaken B from the explanation of size suffixes Karel Zak
  7 siblings, 0 replies; 14+ messages in thread
From: Benno Schulenberg @ 2015-02-01 14:00 UTC (permalink / raw)
  To: util-linux

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 autogen.sh |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index d0b340f..546d468 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,7 +24,7 @@ autopoint_fun ()
 		sed -n -e 's/.* \(0\.18\|0\.18\.[1-2]\)$/\1/p'`
 
 	if [ -n "$gt_ver" ]; then
-		echo "warning, force autopoint to use old gettext $gt_ver"
+		echo "warning: forcing autopoint to use old gettext $gt_ver"
 		rm -f configure.ac.autogenbak
 		sed -i.autogenbak configure.ac \
 			-e "s/\(AM_GNU_GETTEXT_VERSION\).*/\1([$gt_ver])/"
@@ -41,41 +41,41 @@ autopoint_fun ()
 
 test -f sys-utils/mount.c || {
 	echo
-	echo "You must run this script in the top-level util-linux directory"
+	echo "You must run this script in the top-level util-linux directory."
 	echo
 	DIE=1
 }
 
 (autopoint --version) < /dev/null > /dev/null 2>&1 || {
         echo
-        echo "You must have autopoint installed to generate util-linux build system."
+        echo "You must have autopoint installed to generate the util-linux build system."
         echo "The autopoint command is part of the GNU gettext package."
 	echo
         DIE=1
 }
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
 	echo
-	echo "You must have autoconf installed to generate util-linux build system."
+	echo "You must have autoconf installed to generate the util-linux build system."
 	echo
 	DIE=1
 }
 (autoheader --version) < /dev/null > /dev/null 2>&1 || {
 	echo
-	echo "You must have autoheader installed to generate util-linux build system."
+	echo "You must have autoheader installed to generate the util-linux build system."
 	echo "The autoheader command is part of the GNU autoconf package."
 	echo
 	DIE=1
 }
 (libtoolize --version) < /dev/null > /dev/null 2>&1 || {
 	echo
-	echo "You must have libtool-2 installed to generate util-linux build system."
+	echo "You must have libtool-2 installed to generate the util-linux build system."
 	echo
 	DIE=1
 }
 (automake --version) < /dev/null > /dev/null 2>&1 || {
 	echo
-	echo "You must have automake installed to generate util-linux build system."
-	echo 
+	echo "You must have automake installed to generate the util-linux build system."
+	echo
 	DIE=1
 }
 
@@ -91,7 +91,7 @@ if test "$DIE" -eq 1; then
 fi
 
 echo
-echo "Generate build-system by:"
+echo "Generating build-system with:"
 echo "   autopoint:  $(autopoint --version | head -1)"
 echo "   aclocal:    $(aclocal --version | head -1)"
 echo "   autoconf:   $(autoconf --version | head -1)"
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 8/8] docs: add the Sort command to the man page of cfdisk
  2015-02-01 14:00 [PATCH 1/8] cfdisk: remove the mistaken B from the explanation of size suffixes Benno Schulenberg
                   ` (5 preceding siblings ...)
  2015-02-01 14:00 ` [PATCH 7/8] build-sys: improve wording and punctuation of several messages Benno Schulenberg
@ 2015-02-01 14:00 ` Benno Schulenberg
  2015-02-01 19:38   ` J William Piggott
  2015-02-02  9:59 ` [PATCH 1/8] cfdisk: remove the mistaken B from the explanation of size suffixes Karel Zak
  7 siblings, 1 reply; 14+ messages in thread
From: Benno Schulenberg @ 2015-02-01 14:00 UTC (permalink / raw)
  To: util-linux

Also sort T into its proper position, improve the wording of U,
and add the Left and Right arrow keys.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 disk-utils/cfdisk.8 |   38 +++++++++++++++++++++++---------------
 1 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/disk-utils/cfdisk.8 b/disk-utils/cfdisk.8
index dc30b70..e4577d5 100644
--- a/disk-utils/cfdisk.8
+++ b/disk-utils/cfdisk.8
@@ -66,9 +66,8 @@ Display version information and exit.
 .BR \-z , " \-\-zero"
 Start with an in-memory zeroed partition table.  This option does not zero the
 partition table on the disk; rather, it simply starts the program without
-reading the existing partition table.  This option allows to a create new
-partition table from scratch or create a new partition table according to
-a sfdisk compatible script.
+reading the existing partition table.  This option allows you to create a new
+partition table from scratch or from an sfdisk-compatible script.
 
 .SH COMMANDS
 The commands for
@@ -107,22 +106,27 @@ MiB (=1024*1024), and so on for GiB, TiB, PiB, EiB, ZiB and YiB
 Quit the program.  This will exit the program without writing any data to
 the disk.
 .TP
-.B u
-Dump the current in-memory partition table to the sfdisk compatible file.
-.sp
-The script files are compatible between cfdisk, sfdisk, fdisk and another
-libfdisk applications. For more details see
-.BR sfdisk (8).
-.sp
-It is also possible to load sfdisk script to cfdisk if there is no partition
-table on the device or when you start cfdisk with \fI--zero\fR command line
-option.
+.B s
+Sort the partitions in ascending start-sector order.  When deleting and
+adding partitions, it is likely that the numbering of the partitions will
+no longer match their order on the disk.  This command restores that match.
 .TP
 .B t
 Change the partition type.  By default, new partitions are created as
 .I Linux
 partitions.
 .TP
+.B u
+Dump the current in-memory partition table to an sfdisk-compatible script file.
+.sp
+The script files are compatible between \fBcfdisk\fR, \fBfdisk\fR, \fBsfdisk\fR
+and other libfdisk applications.  For more details see
+.BR sfdisk (8).
+.sp
+It is also possible to load an sfdisk-script into \fBcfdisk\fR if there is
+no partition table on the device or when you start \fBcfdisk\fR with the
+\fB--zero\fR command-line option.
+.TP
 .B W
 Write the partition table to disk (you must enter an uppercase W).  Since
 this might destroy data on the disk, you must either confirm or deny
@@ -143,13 +147,17 @@ Move the cursor to the previous or next partition.  If there are more
 partitions than can be displayed on a screen, you can display the next
 (previous) set of partitions by moving down (up) at the last (first)
 partition displayed on the screen.
+.TP
+.IR "Left Arrow" , " Right Arrow"
+Select the preceding or the next menu item.  Hitting \fIEnter\fR will
+execute the currently selected item.
 
 .PP
 All commands can be entered with either uppercase or lowercase
 letters (except for
 .BR W rite).
-When in a submenu or at a prompt for entering a size, you can hit the
-.I ESC
+When in a submenu or at a prompt, you can hit the
+.I Esc
 key to return to the main menu.
 
 .SH COLORS
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* Re: [PATCH 8/8] docs: add the Sort command to the man page of cfdisk
  2015-02-01 14:00 ` [PATCH 8/8] docs: add the Sort command to the man page of cfdisk Benno Schulenberg
@ 2015-02-01 19:38   ` J William Piggott
  2015-02-01 21:21     ` Peter Cordes
  2015-02-02 10:03     ` Karel Zak
  0 siblings, 2 replies; 14+ messages in thread
From: J William Piggott @ 2015-02-01 19:38 UTC (permalink / raw)
  To: Benno Schulenberg, util-linux



On 02/01/2015 09:00 AM, Benno Schulenberg wrote:
> Also sort T into its proper position, improve the wording of U,
> and add the Left and Right arrow keys.
> 
> Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
> ---
>  disk-utils/cfdisk.8 |   38 +++++++++++++++++++++++---------------
>  1 files changed, 23 insertions(+), 15 deletions(-)
> 
> diff --git a/disk-utils/cfdisk.8 b/disk-utils/cfdisk.8
> index dc30b70..e4577d5 100644
> --- a/disk-utils/cfdisk.8
> +++ b/disk-utils/cfdisk.8
> @@ -66,9 +66,8 @@ Display version information and exit.
>  .BR \-z , " \-\-zero"
>  Start with an in-memory zeroed partition table.  This option does not zero the
>  partition table on the disk; rather, it simply starts the program without
> -reading the existing partition table.  This option allows to a create new
> -partition table from scratch or create a new partition table according to
> -a sfdisk compatible script.
> +reading the existing partition table.  This option allows you to create a new
> +partition table from scratch or from an sfdisk-compatible script.
>  
>  .SH COMMANDS
>  The commands for
> @@ -107,22 +106,27 @@ MiB (=1024*1024), and so on for GiB, TiB, PiB, EiB, ZiB and YiB
>  Quit the program.  This will exit the program without writing any data to
>  the disk.
>  .TP
> -.B u
> -Dump the current in-memory partition table to the sfdisk compatible file.
> -.sp
> -The script files are compatible between cfdisk, sfdisk, fdisk and another
> -libfdisk applications. For more details see
> -.BR sfdisk (8).
> -.sp
> -It is also possible to load sfdisk script to cfdisk if there is no partition
> -table on the device or when you start cfdisk with \fI--zero\fR command line
> -option.
> +.B s
> +Sort the partitions in ascending start-sector order.  When deleting and
> +adding partitions, it is likely that the numbering of the partitions will
> +no longer match their order on the disk.  This command restores that match.
>  .TP
>  .B t
>  Change the partition type.  By default, new partitions are created as
>  .I Linux
>  partitions.
>  .TP
> +.B u
> +Dump the current in-memory partition table to an sfdisk-compatible script file.
> +.sp
> +The script files are compatible between \fBcfdisk\fR, \fBfdisk\fR, \fBsfdisk\fR
> +and other libfdisk applications.  For more details see
> +.BR sfdisk (8).
> +.sp
> +It is also possible to load an sfdisk-script into \fBcfdisk\fR if there is
> +no partition table on the device or when you start \fBcfdisk\fR with the
> +\fB--zero\fR command-line option.


 +It is also possible to load an sfdisk-script into \fBcfdisk\fR, if there is
 +no partition table on the device, or when you start \fBcfdisk\fR with the
 +\fB--zero\fR command-line option.


> +.TP
>  .B W
>  Write the partition table to disk (you must enter an uppercase W).  Since
>  this might destroy data on the disk, you must either confirm or deny
> @@ -143,13 +147,17 @@ Move the cursor to the previous or next partition.  If there are more
>  partitions than can be displayed on a screen, you can display the next
>  (previous) set of partitions by moving down (up) at the last (first)
>  partition displayed on the screen.
> +.TP
> +.IR "Left Arrow" , " Right Arrow"
> +Select the preceding or the next menu item.  Hitting \fIEnter\fR will
> +execute the currently selected item.
>  
>  .PP
>  All commands can be entered with either uppercase or lowercase
>  letters (except for
>  .BR W rite).
> -When in a submenu or at a prompt for entering a size, you can hit the
> -.I ESC
> +When in a submenu or at a prompt, you can hit the
> +.I Esc
>  key to return to the main menu.

s/can hit/may use/

>  
>  .SH COLORS
> 

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 8/8] docs: add the Sort command to the man page of cfdisk
  2015-02-01 19:38   ` J William Piggott
@ 2015-02-01 21:21     ` Peter Cordes
  2015-02-02  0:21       ` J William Piggott
  2015-02-02 10:03     ` Karel Zak
  1 sibling, 1 reply; 14+ messages in thread
From: Peter Cordes @ 2015-02-01 21:21 UTC (permalink / raw)
  To: J William Piggott; +Cc: Benno Schulenberg, util-linux

On Sun, Feb 01, 2015 at 02:38:10PM -0500, J William Piggott wrote:
> 
> 
> On 02/01/2015 09:00 AM, Benno Schulenberg wrote:
> > Also sort T into its proper position, improve the wording of U,
> > and add the Left and Right arrow keys.
> > 
> > Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
> > ---
> >  disk-utils/cfdisk.8 |   38 +++++++++++++++++++++++---------------
> >  1 files changed, 23 insertions(+), 15 deletions(-)
> > 
> > diff --git a/disk-utils/cfdisk.8 b/disk-utils/cfdisk.8
> > index dc30b70..e4577d5 100644
> > --- a/disk-utils/cfdisk.8
> > +++ b/disk-utils/cfdisk.8
...
> >  .PP
> >  All commands can be entered with either uppercase or lowercase
> >  letters (except for
> >  .BR W rite).
> > -When in a submenu or at a prompt for entering a size, you can hit the
> > -.I ESC
> > +When in a submenu or at a prompt, you can hit the
> > +.I Esc
> >  key to return to the main menu.
> 
> s/can hit/may use/

 I think "can" is better.  "can use", though, rather than "can hit".
There's a "can be entered" earlier in the paragraph, which I think is
good usage.

"may" sounds like either the docs / software is giving you permission
to use this feature, or commenting on whether or not you might
actually use the feature.


 Docs should get their meaning across with as simple and
straightforward language as possible, for quick reading and
understanding by as many people as possible.  And hopefully not
distract ADHD people like me into thinking about re-wording them while
I'm in the middle of trying to figure out how to do something else :P.

-- 
#define X(x,y) x##y
Peter Cordes ;  e-mail: X(peter@cor , des.ca)

"The gods confound the man who first found out how to distinguish the hours!
 Confound him, too, who in this place set up a sundial, to cut and hack
 my day so wretchedly into small pieces!" -- Plautus, 200 BC

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 8/8] docs: add the Sort command to the man page of cfdisk
  2015-02-01 21:21     ` Peter Cordes
@ 2015-02-02  0:21       ` J William Piggott
  2015-02-02  1:12         ` Peter Cordes
  0 siblings, 1 reply; 14+ messages in thread
From: J William Piggott @ 2015-02-02  0:21 UTC (permalink / raw)
  To: Peter Cordes; +Cc: Benno Schulenberg, util-linux



On 02/01/2015 04:21 PM, Peter Cordes wrote:
> On Sun, Feb 01, 2015 at 02:38:10PM -0500, J William Piggott wrote:
>>
>>
>> On 02/01/2015 09:00 AM, Benno Schulenberg wrote:
>>> Also sort T into its proper position, improve the wording of U,
>>> and add the Left and Right arrow keys.
>>>
>>> Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
>>> ---
>>>  disk-utils/cfdisk.8 |   38 +++++++++++++++++++++++---------------
>>>  1 files changed, 23 insertions(+), 15 deletions(-)
>>>
>>> diff --git a/disk-utils/cfdisk.8 b/disk-utils/cfdisk.8
>>> index dc30b70..e4577d5 100644
>>> --- a/disk-utils/cfdisk.8
>>> +++ b/disk-utils/cfdisk.8
> ...
>>>  .PP
>>>  All commands can be entered with either uppercase or lowercase
>>>  letters (except for
>>>  .BR W rite).
>>> -When in a submenu or at a prompt for entering a size, you can hit the
>>> -.I ESC
>>> +When in a submenu or at a prompt, you can hit the
>>> +.I Esc
>>>  key to return to the main menu.
>>
>> s/can hit/may use/
> 
>  I think "can" is better.  "can use", though, rather than "can hit".
> There's a "can be entered" earlier in the paragraph, which I think is
> good usage.
> 
> "may" sounds like either the docs / software is giving you permission
> to use this feature,

Yes, that is exactly why 'may' is better. One 'can' use the <ESC>
anytime, I'm hitting it right now. Can means: it is possible.

What is being said, is in this particular circumstance the program
'allows' you to use that key and something will happen.

Having said that, grammatically either one is considered acceptable.
So 'can vs may' is a subjective call, but 'hit' needs to go IMO.


> or commenting on whether or not you might
> actually use the feature.
> 
> 
>  Docs should get their meaning across with as simple and
> straightforward language as possible, for quick reading and
> understanding by as many people as possible.  And hopefully not
> distract ADHD people like me into thinking about re-wording them while
> I'm in the middle of trying to figure out how to do something else :P.
> 

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 8/8] docs: add the Sort command to the man page of cfdisk
  2015-02-02  0:21       ` J William Piggott
@ 2015-02-02  1:12         ` Peter Cordes
  0 siblings, 0 replies; 14+ messages in thread
From: Peter Cordes @ 2015-02-02  1:12 UTC (permalink / raw)
  To: J William Piggott; +Cc: Benno Schulenberg, util-linux

On Sun, Feb 01, 2015 at 07:21:07PM -0500, J William Piggott wrote:
> 
> 
> On 02/01/2015 04:21 PM, Peter Cordes wrote:
> > On Sun, Feb 01, 2015 at 02:38:10PM -0500, J William Piggott wrote:
> >>
> >>
> >> On 02/01/2015 09:00 AM, Benno Schulenberg wrote:
> >>> Also sort T into its proper position, improve the wording of U,
> >>> and add the Left and Right arrow keys.
> >>>
> >>> Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
> >>> ---
> >>>  disk-utils/cfdisk.8 |   38 +++++++++++++++++++++++---------------
> >>>  1 files changed, 23 insertions(+), 15 deletions(-)
> >>>
> >>> diff --git a/disk-utils/cfdisk.8 b/disk-utils/cfdisk.8
> >>> index dc30b70..e4577d5 100644
> >>> --- a/disk-utils/cfdisk.8
> >>> +++ b/disk-utils/cfdisk.8
> > ...
> >>>  .PP
> >>>  All commands can be entered with either uppercase or lowercase
> >>>  letters (except for
> >>>  .BR W rite).
> >>> -When in a submenu or at a prompt for entering a size, you can hit the
> >>> -.I ESC
> >>> +When in a submenu or at a prompt, you can hit the
> >>> +.I Esc
> >>>  key to return to the main menu.
> >>
> >> s/can hit/may use/
> > 
> >  I think "can" is better.  "can use", though, rather than "can hit".
> > There's a "can be entered" earlier in the paragraph, which I think is
> > good usage.
> > 
> > "may" sounds like either the docs / software is giving you permission
> > to use this feature,
> 
> Yes, that is exactly why 'may' is better. One 'can' use the <ESC>
> anytime, I'm hitting it right now. Can means: it is possible.
>
> What is being said, is in this particular circumstance the program
> 'allows' you to use that key and something will happen.

 That sentence is telling you that returning to the main menu (by
pressing <ESC>) is one of your options.  Not just that you can press a
key.  You can always give any input you want (if you don't care about
the resulting behaviour).

 This kind of leads to the question of whether the program is in
charge, with a user directing its action; or whether the user is in
charge, carrying out their desired actions by directing software to do
it.  I feel like I want to say something snarky about Microsoft now.
:P

> Having said that, grammatically either one is considered acceptable.
> So 'can vs may' is a subjective call,

 Yeah, both ways convey the correct meaning.  I still think "may" has
unintended connotations, but your explanation does make sense for why
you think "may" is appropriate.

  Perhaps someone who learned English only as a second, or Nth,
language, could shed some light on whether there's any confusion, or
if one way sounds more clear to them.  I prefer "can use" or "can
press", partly because I think it's more direct and straightforward.


> but 'hit' needs to go IMO.

 It's not terrible, but I think it would be an improvement to change it.

-- 
#define X(x,y) x##y
Peter Cordes ;  e-mail: X(peter@cor , des.ca)

"The gods confound the man who first found out how to distinguish the hours!
 Confound him, too, who in this place set up a sundial, to cut and hack
 my day so wretchedly into small pieces!" -- Plautus, 200 BC

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 1/8] cfdisk: remove the mistaken B from the explanation of size suffixes
  2015-02-01 14:00 [PATCH 1/8] cfdisk: remove the mistaken B from the explanation of size suffixes Benno Schulenberg
                   ` (6 preceding siblings ...)
  2015-02-01 14:00 ` [PATCH 8/8] docs: add the Sort command to the man page of cfdisk Benno Schulenberg
@ 2015-02-02  9:59 ` Karel Zak
  7 siblings, 0 replies; 14+ messages in thread
From: Karel Zak @ 2015-02-02  9:59 UTC (permalink / raw)
  To: Benno Schulenberg; +Cc: util-linux

On Sun, Feb 01, 2015 at 03:00:06PM +0100, Benno Schulenberg wrote:
>  disk-utils/cfdisk.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

All 8 patches applied. Thanks!


-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 8/8] docs: add the Sort command to the man page of cfdisk
  2015-02-01 19:38   ` J William Piggott
  2015-02-01 21:21     ` Peter Cordes
@ 2015-02-02 10:03     ` Karel Zak
  1 sibling, 0 replies; 14+ messages in thread
From: Karel Zak @ 2015-02-02 10:03 UTC (permalink / raw)
  To: J William Piggott; +Cc: Benno Schulenberg, util-linux

On Sun, Feb 01, 2015 at 02:38:10PM -0500, J William Piggott wrote:
> > +It is also possible to load an sfdisk-script into \fBcfdisk\fR if there is
> > +no partition table on the device or when you start \fBcfdisk\fR with the
> > +\fB--zero\fR command-line option.
> 
> 
>  +It is also possible to load an sfdisk-script into \fBcfdisk\fR, if there is
>  +no partition table on the device, or when you start \fBcfdisk\fR with the
>  +\fB--zero\fR command-line option.

I have applied Benno initial version. It would be nice to have patch for additional
changes -- I don't want to do it manually.

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2015-02-02 10:03 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-01 14:00 [PATCH 1/8] cfdisk: remove the mistaken B from the explanation of size suffixes Benno Schulenberg
2015-02-01 14:00 ` [PATCH 2/8] cfdisk: improve wording and consistency of the size warnings Benno Schulenberg
2015-02-01 14:00 ` [PATCH 3/8] cfdisk: punctuate the bottombar messages consistently Benno Schulenberg
2015-02-01 14:00 ` [PATCH 4/8] cfdisk: make '?' an alias of 'h', to also show the help screen Benno Schulenberg
2015-02-01 14:00 ` [PATCH 5/8] lib/strutils: accept not just 'B' but also lowercase 'b' in a size suffix Benno Schulenberg
2015-02-01 14:00 ` [PATCH 6/8] libfdisk: actually translate the human-readable name of the partition type Benno Schulenberg
2015-02-01 14:00 ` [PATCH 7/8] build-sys: improve wording and punctuation of several messages Benno Schulenberg
2015-02-01 14:00 ` [PATCH 8/8] docs: add the Sort command to the man page of cfdisk Benno Schulenberg
2015-02-01 19:38   ` J William Piggott
2015-02-01 21:21     ` Peter Cordes
2015-02-02  0:21       ` J William Piggott
2015-02-02  1:12         ` Peter Cordes
2015-02-02 10:03     ` Karel Zak
2015-02-02  9:59 ` [PATCH 1/8] cfdisk: remove the mistaken B from the explanation of size suffixes Karel Zak

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.