make --help output more help2man-friendly

Change-Id: Ie1ba56de27536f6ae8a529559cdf4c3de8140b9d

3 files changed, 26 insertions, 11 deletions

diff --git a/src/conv/html/abw2html.cpp b/src/conv/html/abw2html.cpp
index 75eef0e..457e795 100644
--- a/src/conv/html/abw2html.cpp
+++ b/src/conv/html/abw2html.cpp
@@ -26,11 +26,15 @@ namespace
 
 int printUsage()
 {
-  printf("Usage: abw2html [OPTION] <AbiWord Document>\n");
+  printf("`abw2html' converts AbiWord documents to HTML.\n");
+  printf("\n");
+  printf("Usage: abw2html [OPTION] INPUT\n");
   printf("\n");
   printf("Options:\n");
-  printf("--help                Shows this help message\n");
-  printf("--version             Output abw2html version \n");
+  printf("\t--help                show this help message\n");
+  printf("\t--version             show version information\n");
+  printf("\n");
+  printf("Report bugs to <https://bugs.documentfoundation.org/>.\n");
   return -1;
 }
 
diff --git a/src/conv/raw/abw2raw.cpp b/src/conv/raw/abw2raw.cpp
index 0c5ebb2..3d71bd2 100644
--- a/src/conv/raw/abw2raw.cpp
+++ b/src/conv/raw/abw2raw.cpp
@@ -17,6 +17,9 @@
 #include "config.h"
 #endif
 
+#ifndef PACKAGE
+#define PACKAGE "libabw"
+#endif
 #ifndef VERSION
 #define VERSION "UNKNOWN VERSION"
 #endif
@@ -26,12 +29,16 @@ namespace
 
 int printUsage()
 {
-  printf("Usage: abw2raw [OPTION] <AbiWord Document>\n");
+  printf("`abw2raw' is used to test " PACKAGE ".\n");
+  printf("\n");
+  printf("Usage: abw2raw [OPTION] INPUT\n");
   printf("\n");
   printf("Options:\n");
-  printf("--callgraph           Display the call graph nesting level\n");
-  printf("--help                Shows this help message\n");
-  printf("--version             Output abw2raw version \n");
+  printf("\t--callgraph           display the call graph nesting level\n");
+  printf("\t--help                show this help message\n");
+  printf("\t--version             show version information\n");
+  printf("\n");
+  printf("Report bugs to <https://bugs.documentfoundation.org/>.\n");
   return -1;
 }
 
diff --git a/src/conv/text/abw2text.cpp b/src/conv/text/abw2text.cpp
index 590045c..aed75dc 100644
--- a/src/conv/text/abw2text.cpp
+++ b/src/conv/text/abw2text.cpp
@@ -27,12 +27,16 @@ namespace
 
 int printUsage()
 {
-  printf("Usage: abw2text [OPTION] <AbiWord Document>\n");
+  printf("`abw2text' converts AbiWord documents to plain text.\n");
+  printf("\n");
+  printf("Usage: abw2text [OPTION] INPUT\n");
   printf("\n");
   printf("Options:\n");
-  printf("--info                Display document metadata instead of the text\n");
-  printf("--help                Shows this help message\n");
-  printf("--version             Output abw2text version\n");
+  printf("\t--info                display document metadata instead of the text\n");
+  printf("\t--help                show this help message\n");
+  printf("\t--version             show version information\n");
+  printf("\n");
+  printf("Report bugs to <https://bugs.documentfoundation.org/>.\n");
   return -1;
 }