From: Benno Schulenberg <bensberg@telfort.nl>
Date: Mon, 6 Oct 2025 00:20:01 +0000 (-0400)
Subject: swapon: (usage) make the help text fit within 80 columns again
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=368c7bda2effe3946f5143a325d150efd8dd04fc;p=thirdparty%2Futil-linux.git

swapon: (usage) make the help text fit within 80 columns again

Recent commit 72829b08fe added four extra spaces to each description
in the usage text, causing some lines to be wider than 80 characters.
Undo that addition, to make the help text fit again in 80 columns.

Also, put the equals sign for the new --annotation option inside the
square brackets instead of mistakenly before them.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
---

diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c
index 1cf8fda2c..896728880 100644
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -830,21 +830,21 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Enable devices and files for paging and swapping.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	fputs(_(" -a, --all                	enable all swaps from /etc/fstab\n"), out);
-	fputs(_(" -d, --discard[=<policy>] 	enable swap discards, if supported by device\n"), out);
-	fputs(_(" -e, --ifexists           	silently skip devices that do not exist\n"), out);
-	fputs(_(" -f, --fixpgsz            	reinitialize the swap space if necessary\n"), out);
-	fputs(_(" -o, --options <list>     	comma-separated list of swap options\n"), out);
-	fputs(_(" -p, --priority <prio>    	specify the priority of the swap device\n"), out);
-	fputs(_(" -s, --summary            	display summary about used swap devices (DEPRECATED)\n"), out);
-	fputs(_(" -T, --fstab <path>       	alternative file to /etc/fstab\n"), out);
-	fputs(_("     --show[=<columns>]   	display summary in definable table\n"), out);
-	fputs(_("     --output-all         	output all available columns\n"), out);
-	fputs(_("     --annotation=[<when>]     annotate columns with a tooltip (always|never|auto)\n"), out);
-	fputs(_("     --noheadings         	don't print table heading (with --show)\n"), out);
-	fputs(_("     --raw                	use the raw output format (with --show)\n"), out);
-	fputs(_("     --bytes              	display swap size in bytes in --show output\n"), out);
-	fputs(_(" -v, --verbose            	verbose mode\n"), out);
+	fputs(_(" -a, --all                enable all swaps from /etc/fstab\n"), out);
+	fputs(_(" -d, --discard[=<policy>] enable swap discards, if supported by device\n"), out);
+	fputs(_(" -e, --ifexists           silently skip devices that do not exist\n"), out);
+	fputs(_(" -f, --fixpgsz            reinitialize the swap space if necessary\n"), out);
+	fputs(_(" -o, --options <list>     comma-separated list of swap options\n"), out);
+	fputs(_(" -p, --priority <prio>    specify the priority of the swap device\n"), out);
+	fputs(_(" -s, --summary            display summary about used swap devices (DEPRECATED)\n"), out);
+	fputs(_(" -T, --fstab <path>       alternative file to /etc/fstab\n"), out);
+	fputs(_("     --show[=<columns>]   display summary in definable table\n"), out);
+	fputs(_("     --output-all         output all available columns\n"), out);
+	fputs(_("     --annotation[=<when>]  annotate columns with a tooltip (always|never|auto)\n"), out);
+	fputs(_("     --noheadings         don't print table heading (with --show)\n"), out);
+	fputs(_("     --raw                use the raw output format (with --show)\n"), out);
+	fputs(_("     --bytes              display swap size in bytes in --show output\n"), out);
+	fputs(_(" -v, --verbose            verbose mode\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
 	fprintf(out, USAGE_HELP_OPTIONS(26));