Clean up mutool usage messages.

3 files changed, 13 insertions, 13 deletions

diff --git a/source/tools/pdfcreate.c b/source/tools/pdfcreate.c
index b7b580db..d7d8e4a9 100644
--- a/source/tools/pdfcreate.c
+++ b/source/tools/pdfcreate.c
@@ -10,8 +10,8 @@ static void usage(void)
 {
 	fprintf(stderr,
 		"usage: mutool create [-o output.pdf] [-O options] page.txt [page2.txt ...]\n"
-		"\t-o\tname of PDF file to create\n"
-		"\t-O\tcomma separated list of output options\n"
+		"\t-o -\tname of PDF file to create\n"
+		"\t-O -\tcomma separated list of output options\n"
 		"\tpage.txt\tcontent stream with annotations for creating resources\n\n"
 		"Content stream special commands:\n"
 		"\t%%%%MediaBox LLX LLY URX URY\n"
@@ -19,7 +19,7 @@ static void usage(void)
 		"\t%%%%Font Name Filename (or base 14 font name)\n"
 		"\t%%%%Image Name Filename\n\n"
 		);
-	fprintf(stderr, "%s\n", fz_pdf_write_options_usage);
+	fputs(fz_pdf_write_options_usage, stderr);
 	exit(1);
 }
 
diff --git a/source/tools/pdfmerge.c b/source/tools/pdfmerge.c
index 6874e8b9..153d87ff 100644
--- a/source/tools/pdfmerge.c
+++ b/source/tools/pdfmerge.c
@@ -10,12 +10,12 @@ static void usage(void)
 {
 	fprintf(stderr,
 		"usage: mutool merge [-o output.pdf] [-O options] input.pdf [pages] [input2.pdf] [pages2] ...\n"
-		"\t-o\tname of PDF file to create\n"
-		"\t-O\tcomma separated list of output options\n"
+		"\t-o -\tname of PDF file to create\n"
+		"\t-O -\tcomma separated list of output options\n"
 		"\tinput.pdf\tname of input file from which to copy pages\n"
-		"\tpages\tcomma separated list of page numbers and ranges\n"
+		"\tpages\tcomma separated list of page numbers and ranges\n\n"
 		);
-	fprintf(stderr, "%s\n", fz_pdf_write_options_usage);
+	fputs(fz_pdf_write_options_usage, stderr);
 	exit(1);
 }
 
diff --git a/source/tools/pdfportfolio.c b/source/tools/pdfportfolio.c
index 87662989..b4488cd4 100644
--- a/source/tools/pdfportfolio.c
+++ b/source/tools/pdfportfolio.c
@@ -10,15 +10,15 @@ static fz_context *ctx = NULL;
 static void usage(void)
 {
 	fprintf(stderr, "usage: mutool portfolio [options] portfolio.pdf [actions]\n");
-	fprintf(stderr, "\tOptions are:\n");
+	fprintf(stderr, "\nOptions are:\n");
 	fprintf(stderr, "\t-p -\tpassword\n");
 	fprintf(stderr, "\t-o -\toutput (defaults to input file)\n");
 	fprintf(stderr, "\t-O -\tPDF output options (see mutool create)\n");
-	fprintf(stderr, "Actions are:\n");
-	fprintf(stderr, "\tt\tlist embedded files\n");
-	fprintf(stderr, "\tx N <filename>\n\t\textract Nth embedded file as <filename>\n");
-	fprintf(stderr, "\ta <filename> <entry>\n\t\tembed contents of <filename> named as <entry>\n");
-	fprintf(stderr, "\nFor safety, keep all filenames as 7 bit clean for now.\n");
+	fprintf(stderr, "\nActions are:\n");
+	fprintf(stderr, "\tt\tdisplay a table listing the contents of the portfolio\n");
+	fprintf(stderr, "\tx N <file>\n\t\textract Nth entry to <file>\n");
+	fprintf(stderr, "\ta <file> <name>\n\t\tadd contents of <file> as an entry named <name>\n");
+	fprintf(stderr, "\nFor safety, only use ASCII characters in entry names for now.\n");
 	exit(1);
 }