From e7302af311839d06f6faf4192d2d0eae6d895b2a Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Wed, 14 Aug 2013 02:09:36 -0500 Subject: [PATCH] wimlib-imagex: Clean up usage information --- doc/imagex-delete.1.in | 2 +- doc/imagex-split.1.in | 6 +++--- programs/imagex.c | 38 +++++++++++++++++++------------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/doc/imagex-delete.1.in b/doc/imagex-delete.1.in index 3e5b4c1e..9304657f 100644 --- a/doc/imagex-delete.1.in +++ b/doc/imagex-delete.1.in @@ -2,7 +2,7 @@ .SH NAME @IMAGEX_PROGNAME@-delete \- Delete an image from a WIM archive .SH SYNOPSIS -\fB@IMAGEX_PROGNAME@ delete\fR \fIWIMFILE\fR \fIIMAGE\fR [--check] +\fB@IMAGEX_PROGNAME@ delete\fR \fIWIMFILE\fR \fIIMAGE\fR [\fIOPTION\fR...] .SH DESCRIPTION \fB@IMAGEX_PROGNAME@ delete\fR deletes the specified image from the Windows Imaging (WIM) file \fIWIMFILE\fR. diff --git a/doc/imagex-split.1.in b/doc/imagex-split.1.in index 27b5cea6..f3127bf8 100644 --- a/doc/imagex-split.1.in +++ b/doc/imagex-split.1.in @@ -2,10 +2,10 @@ .SH NAME @IMAGEX_PROGNAME@-split \- Split a WIM into multiple parts .SH SYNOPSIS -\fB@IMAGEX_PROGNAME@ split\fR \fIWIMFILE\fR \fISPLIT_WIM_PART\fR \fIPART_SIZE\fR [\fIOPTION...\fR] +\fB@IMAGEX_PROGNAME@ split\fR \fIWIMFILE\fR \fISPLIT_WIM_PART_1\fR \fIPART_SIZE\fR [\fIOPTION...\fR] .SH DESCRIPTION Splits \fIWIMFILE\fR into parts with size at most \fIPART_SIZE\fR mebibytes, -with the first part having the name \fISPLIT_WIM_PART\fR and the other parts +with the first part having the name \fISPLIT_WIM_PART_1\fR and the other parts having names numbered in order of the parts. This command is also available as simply \fBwimsplit\fR if the appropriate hard link or batch file has been installed. @@ -15,7 +15,7 @@ hard link or batch file has been installed. .TP 6 \fB--check\fR When reading \fIWIMFILE\fR, verify its integrity if the integrity table is -present; additionally, when writing each \fISPLIT_WIM_PART\fR, write an integrity +present; additionally, when writing each split WIM part, write an integrity table. If this option is not specified, integrity tables will be included in the split WIMs if and only if one was present in \fIWIMFILE\fR. .SH EXAMPLES diff --git a/programs/imagex.c b/programs/imagex.c index 679ece16..b4e3b540 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -3471,17 +3471,17 @@ static const struct imagex_command imagex_commands[] = { static const tchar *usage_strings[] = { [CMD_APPEND] = T( -" %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE [IMAGE_NAME]\n" -" [DESCRIPTION] [--boot] [--check] [--nocheck]\n" -" [--flags EDITION_ID] [--verbose] [--dereference]\n" -" [--config=FILE] [--threads=NUM_THREADS] [--rebuild]\n" -" [--unix-data] [--source-list] [--no-acls]\n" +" %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n" +" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot] [--check]\n" +" [--nocheck] [--flags EDITION_ID] [--verbose]\n" +" [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n" +" [--rebuild] [--unix-data] [--source-list] [--no-acls]\n" " [--strict-acls] [--rpfix] [--norpfix] [--pipable]\n" " [--not-pipable]\n" ), [CMD_APPLY] = T( -" %"TS" WIMFILE [IMAGE_NUM | IMAGE_NAME | all]\n" +" %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME | all)]\n" " (DIRECTORY | NTFS_VOLUME) [--check] [--hardlink]\n" " [--symlink] [--verbose] [--ref=\"GLOB\"] [--unix-data]\n" " [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" @@ -3489,10 +3489,10 @@ T( ), [CMD_CAPTURE] = T( -" %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE [IMAGE_NAME]\n" -" [DESCRIPTION] [--boot] [--check] [--nocheck]\n" -" [--compress=TYPE] [--flags EDITION_ID] [--verbose]\n" -" [--dereference] [--config=FILE]\n" +" %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n" +" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot] [--check]\n" +" [--nocheck] [--compress=TYPE] [--flags EDITION_ID]\n" +" [--verbose] [--dereference] [--config=FILE]\n" " [--threads=NUM_THREADS] [--unix-data] [--source-list]\n" " [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" " [--pipable] [--not-pipable]\n" @@ -3509,7 +3509,7 @@ T( [CMD_EXPORT] = T( " %"TS" SRC_WIMFILE (SRC_IMAGE_NUM | SRC_IMAGE_NAME | all ) \n" -" DEST_WIMFILE [DEST_IMAGE_NAME] [DEST_IMAGE_DESCRIPTION]\n" +" DEST_WIMFILE [DEST_IMAGE_NAME [DEST_IMAGE_DESCRIPTION]]\n" " [--boot] [--check] [--nocheck] [--compress=TYPE]\n" " [--ref=\"GLOB\"] [--threads=NUM_THREADS] [--rebuild]\n" " [--pipable] [--not-pipable]\n" @@ -3518,30 +3518,30 @@ T( T( " %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME) [PATH...]\n" " [--check] [--ref=\"GLOB\"] [--verbose] [--unix-data]\n" -" [--no-acls] [--strict-acls] [--to-stdout] [--dest-dir=CMD_DIR]\n" -" [--include-invalid-names]\n" +" [--no-acls] [--strict-acls] [--to-stdout]\n" +" [--dest-dir=CMD_DIR] [--include-invalid-names]\n" ), [CMD_INFO] = T( -" %"TS" WIMFILE [IMAGE_NUM | IMAGE_NAME] [NEW_NAME]\n" -" [NEW_DESC] [--boot] [--check] [--nocheck] [--header]\n" +" %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME) [NEW_NAME\n" +" [NEW_DESC]]] [--boot] [--check] [--nocheck] [--header]\n" " [--lookup-table] [--xml] [--extract-xml FILE]\n" " [--metadata]\n" ), [CMD_JOIN] = T( -" %"TS" [--check] WIMFILE SPLIT_WIM...\n" +" %"TS" OUT_WIMFILE SPLIT_WIM_PART... [--check]\n" ), #if WIM_MOUNTING_SUPPORTED [CMD_MOUNT] = T( -" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME) DIRECTORY\n" +" %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME)] DIRECTORY\n" " [--check] [--debug] [--streams-interface=INTERFACE]\n" " [--ref=\"GLOB\"] [--unix-data] [--allow-other]\n" ), [CMD_MOUNTRW] = T( -" %"TS" WIMFILE [IMAGE_NUM | IMAGE_NAME] DIRECTORY\n" +" %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME)] DIRECTORY\n" " [--check] [--debug] [--streams-interface=INTERFACE]\n" " [--staging-dir=CMD_DIR] [--unix-data] [--allow-other]\n" ), @@ -3553,7 +3553,7 @@ T( ), [CMD_SPLIT] = T( -" %"TS" WIMFILE SPLIT_WIMFILE PART_SIZE_MB [--check]\n" +" %"TS" WIMFILE SPLIT_WIM_PART_1 PART_SIZE_MB [--check]\n" ), #if WIM_MOUNTING_SUPPORTED [CMD_UNMOUNT] = -- 2.43.0