Unify usage output in all tools and add bugreport URL

18 files changed, 172 insertions, 103 deletions

diff --git a/tools/idevice_id.c b/tools/idevice_id.c
index b746491..7987705 100644
--- a/tools/idevice_id.c
+++ b/tools/idevice_id.c
@@ -40,16 +40,21 @@ static void print_usage(int argc, char **argv, int is_error)
 	name = strrchr(argv[0], '/');
 	fprintf(is_error ? stderr : stdout, "Usage: %s [OPTIONS] [UDID]\n", (name ? name + 1: argv[0]));
 	fprintf(is_error ? stderr : stdout,
-	  "Prints device name or a list of attached devices.\n\n" \
-	  "  If UDID is given, the name of the connected device with that UDID" \
-	  "  will be retrieved.\n\n" \
-	  "  -l, --list      list UDIDs of all devices attached via USB\n" \
-	  "  -n, --network   list UDIDs of all devices available via network\n" \
-	  "  -d, --debug     enable communication debugging\n" \
-	  "  -h, --help      prints usage information\n" \
-	  "\n" \
-	  "Homepage: <" PACKAGE_URL ">\n"
-        );
+		"\n" \
+		"Prints device name or a list of attached devices.\n" \
+		"\n" \
+		"  If UDID is given, the name of the connected device with that UDID" \
+		"  will be retrieved.\n" \
+		"\n" \
+		"OPTIONS:\n" \
+		"  -l, --list      list UDIDs of all devices attached via USB\n" \
+		"  -n, --network   list UDIDs of all devices available via network\n" \
+		"  -d, --debug     enable communication debugging\n" \
+		"  -h, --help      prints usage information\n" \
+		"\n" \
+		"Homepage:    <" PACKAGE_URL ">\n" \
+		"Bug Reports: <" PACKAGE_BUGREPORT ">\n"
+	);
 }
 
 int main(int argc, char **argv)
diff --git a/tools/idevicebackup.c b/tools/idevicebackup.c
index de08295..c55301c 100644
--- a/tools/idevicebackup.c
+++ b/tools/idevicebackup.c
@@ -665,16 +665,20 @@ static void print_usage(int argc, char **argv)
 	char *name = NULL;
 	name = strrchr(argv[0], '/');
 	printf("Usage: %s [OPTIONS] CMD [DIRECTORY]\n", (name ? name + 1: argv[0]));
-	printf("Create or restore backup from the current or specified directory.\n\n");
-	printf("commands:\n");
+	printf("\n");
+	printf("Create or restore backup from the current or specified directory.\n");
+	printf("\n");
+	printf("CMD:\n");
 	printf("  backup\tSaves a device backup into DIRECTORY\n");
-	printf("  restore\tRestores a device backup from DIRECTORY.\n\n");
-	printf("options:\n");
+	printf("  restore\tRestores a device backup from DIRECTORY.\n");
+	printf("\n");
+	printf("OPTIONS:\n");
 	printf("  -d, --debug\t\tenable communication debugging\n");
 	printf("  -u, --udid UDID\ttarget specific device by UDID\n");
 	printf("  -h, --help\t\tprints usage information\n");
 	printf("\n");
-	printf("Homepage: <" PACKAGE_URL ">\n");
+	printf("Homepage:    <" PACKAGE_URL ">\n");
+	printf("Bug Reports: <" PACKAGE_BUGREPORT ">\n");
 }
 
 int main(int argc, char *argv[])
diff --git a/tools/idevicebackup2.c b/tools/idevicebackup2.c
index c2f04c2..382efc6 100644
--- a/tools/idevicebackup2.c
+++ b/tools/idevicebackup2.c
@@ -1403,8 +1403,10 @@ static void print_usage(int argc, char **argv)
 	char *name = NULL;
 	name = strrchr(argv[0], '/');
 	printf("Usage: %s [OPTIONS] CMD [CMDOPTIONS] DIRECTORY\n", (name ? name + 1: argv[0]));
-	printf("Create or restore backup from the current or specified directory.\n\n");
-	printf("commands:\n");
+	printf("\n");
+	printf("Create or restore backup from the current or specified directory.\n");
+	printf("\n");
+	printf("CMD:\n");
 	printf("  backup\tcreate backup for the device\n");
 	printf("    --full\t\tforce full backup from device.\n");
 	printf("  restore\trestore last backup to the device\n");
@@ -1424,14 +1426,15 @@ static void print_usage(int argc, char **argv)
 	printf("    NOTE: passwords will be requested in interactive mode if omitted\n");
 	printf("  cloud on|off\tenable or disable cloud use (requires iCloud account)\n");
 	printf("\n");
-	printf("options:\n");
+	printf("OPTIONS:\n");
 	printf("  -d, --debug\t\tenable communication debugging\n");
 	printf("  -u, --udid UDID\ttarget specific device by UDID\n");
 	printf("  -s, --source UDID\tuse backup data from device specified by UDID\n");
 	printf("  -i, --interactive\trequest passwords interactively\n");
 	printf("  -h, --help\t\tprints usage information\n");
 	printf("\n");
-	printf("Homepage: <" PACKAGE_URL ">\n");
+	printf("Homepage:    <" PACKAGE_URL ">\n");
+	printf("Bug Reports: <" PACKAGE_BUGREPORT ">\n");
 }
 
 #define DEVICE_VERSION(maj, min, patch) (((maj & 0xFF) << 16) | ((min & 0xFF) << 8) | (patch & 0xFF))
diff --git a/tools/idevicecrashreport.c b/tools/idevicecrashreport.c
index 5d2e21d..8600ad1 100644
--- a/tools/idevicecrashreport.c
+++ b/tools/idevicecrashreport.c
@@ -302,14 +302,18 @@ static void print_usage(int argc, char **argv)
 
 	name = strrchr(argv[0], '/');
 	printf("Usage: %s [OPTIONS] DIRECTORY\n", (name ? name + 1: argv[0]));
-	printf("Move crash reports from device to a local DIRECTORY.\n\n");
+	printf("\n");
+	printf("Move crash reports from device to a local DIRECTORY.\n");
+	printf("\n");
+	printf("OPTIONS:\n");
 	printf("  -e, --extract\t\textract raw crash report into separate '.crash' file\n");
 	printf("  -k, --keep\t\tcopy but do not remove crash reports from device\n");
 	printf("  -d, --debug\t\tenable communication debugging\n");
 	printf("  -u, --udid UDID\ttarget specific device by UDID\n");
 	printf("  -h, --help\t\tprints usage information\n");
 	printf("\n");
-	printf("Homepage: <" PACKAGE_URL ">\n");
+	printf("Homepage:    <" PACKAGE_URL ">\n");
+	printf("Bug Reports: <" PACKAGE_BUGREPORT ">\n");
 }
 
 int main(int argc, char* argv[])
diff --git a/tools/idevicedate.c b/tools/idevicedate.c
index 6dddc18..9c14fdf 100644
--- a/tools/idevicedate.c
+++ b/tools/idevicedate.c
@@ -49,16 +49,21 @@ static void print_usage(int argc, char **argv)
 
 	name = strrchr(argv[0], '/');
 	printf("Usage: %s [OPTIONS]\n", (name ? name + 1: argv[0]));
-	printf("Display the current date or set it on a device.\n\n");
+	printf("\n");
+	printf("Display the current date or set it on a device.\n");
+	printf("\n");
 	printf("NOTE: Setting the time on iOS 6 and later is only supported\n");
-	printf("      in the setup wizard screens before device activation.\n\n");
+	printf("      in the setup wizard screens before device activation.\n");
+	printf("\n");
+	printf("OPTIONS:\n");
 	printf("  -d, --debug\t\tenable communication debugging\n");
 	printf("  -u, --udid UDID\ttarget specific device by UDID\n");
 	printf("  -s, --set TIMESTAMP\tset UTC time described by TIMESTAMP\n");
 	printf("  -c, --sync\t\tset time of device to current system time\n");
 	printf("  -h, --help\t\tprints usage information\n");
 	printf("\n");
-	printf("Homepage: <" PACKAGE_URL ">\n");
+	printf("Homepage:    <" PACKAGE_URL ">\n");
+	printf("Bug Reports: <" PACKAGE_BUGREPORT ">\n");
 }
 
 int main(int argc, char *argv[])
diff --git a/tools/idevicedebug.c b/tools/idevicedebug.c
index 71da0bf..b946d2c 100644
--- a/tools/idevicedebug.c
+++ b/tools/idevicedebug.c
@@ -186,17 +186,20 @@ static void print_usage(int argc, char **argv)
 	char *name = NULL;
 	name = strrchr(argv[0], '/');
 	printf("Usage: %s [OPTIONS] COMMAND\n", (name ? name + 1: argv[0]));
-	printf("Interact with the debugserver service of a device.\n\n");
-	printf(" Where COMMAND is one of:\n");
+	printf("\n");
+	printf("Interact with the debugserver service of a device.\n");
+	printf("\n");
+	printf("Where COMMAND is one of:\n");
 	printf("  run BUNDLEID [ARGS...]\trun app with BUNDLEID and optional ARGS on device.\n");
 	printf("\n");
-	printf(" The following OPTIONS are accepted:\n");
+	printf("The following OPTIONS are accepted:\n");
 	printf("  -e, --env NAME=VALUE\tset environment variable NAME to VALUE\n");
 	printf("  -u, --udid UDID\ttarget specific device by UDID\n");
 	printf("  -d, --debug\t\tenable communication debugging\n");
 	printf("  -h, --help\t\tprints usage information\n");
 	printf("\n");
-	printf("Homepage: <" PACKAGE_URL ">\n");
+	printf("Homepage:    <" PACKAGE_URL ">\n");
+	printf("Bug Reports: <" PACKAGE_BUGREPORT ">\n");
 }
 
 int main(int argc, char *argv[])
diff --git a/tools/idevicedebugserverproxy.c b/tools/idevicedebugserverproxy.c
index e99d0bf..338a3c0 100644
--- a/tools/idevicedebugserverproxy.c
+++ b/tools/idevicedebugserverproxy.c
@@ -69,12 +69,16 @@ static void print_usage(int argc, char **argv)
 
 	name = strrchr(argv[0], '/');
 	printf("Usage: %s [OPTIONS] <PORT>\n", (name ? name + 1: argv[0]));
-	printf("Proxy debugserver connection from device to a local socket at PORT.\n\n");
+	printf("\n");
+	printf("Proxy debugserver connection from device to a local socket at PORT.\n");
+	printf("\n");
+	printf("OPTIONS:\n");
 	printf("  -d, --debug\t\tenable communication debugging\n");
 	printf("  -u, --udid UDID\ttarget specific device by UDID\n");
 	printf("  -h, --help\t\tprints usage information\n");
 	printf("\n");
-	printf("Homepage: <" PACKAGE_URL ">\n");
+	printf("Homepage:    <" PACKAGE_URL ">\n");
+	printf("Bug Reports: <" PACKAGE_BUGREPORT ">\n");
 }
 
 static void *thread_device_to_client(void *data)
diff --git a/tools/idevicediagnostics.c b/tools/idevicediagnostics.c
index bff1e1d..f302d68 100644
--- a/tools/idevicediagnostics.c
+++ b/tools/idevicediagnostics.c
@@ -312,20 +312,24 @@ void print_usage(int argc, char **argv)
 {
 	char *name = NULL;
 	name = strrchr(argv[0], '/');
-	printf("Usage: %s COMMAND [OPTIONS]\n", (name ? name + 1: argv[0]));
-	printf("Use diagnostics interface of a device running iOS 4 or later.\n\n");
-	printf(" Where COMMAND is one of:\n");
+	printf("Usage: %s [OPTIONS] COMMAND\n", (name ? name + 1: argv[0]));
+	printf("\n");
+	printf("Use diagnostics interface of a device running iOS 4 or later.\n");
+	printf("\n");
+	printf("Where COMMAND is one of:\n");
 	printf("  diagnostics [TYPE]\t\tprint diagnostics information from device by TYPE (All, WiFi, GasGauge, NAND)\n");
 	printf("  mobilegestalt KEY [...]\tprint mobilegestalt keys passed as arguments separated by a space.\n");
 	printf("  ioreg [PLANE]\t\t\tprint IORegistry of device, optionally by PLANE (IODeviceTree, IOPower, IOService) (iOS 5+ only)\n");
 	printf("  ioregentry [KEY]\t\tprint IORegistry entry of device (AppleARMPMUCharger, ASPStorage, ...) (iOS 5+ only)\n");
 	printf("  shutdown\t\t\tshutdown device\n");
 	printf("  restart\t\t\trestart device\n");
-	printf("  sleep\t\t\t\tput device into sleep mode (disconnects from host)\n\n");
-	printf(" The following OPTIONS are accepted:\n");
+	printf("  sleep\t\t\t\tput device into sleep mode (disconnects from host)\n");
+	printf("\n");
+	printf("The following OPTIONS are accepted:\n");
 	printf("  -d, --debug\t\tenable communication debugging\n");
 	printf("  -u, --udid UDID\ttarget specific device by UDID\n");
 	printf("  -h, --help\t\tprints usage information\n");
 	printf("\n");
-	printf("Homepage: <" PACKAGE_URL ">\n");
+	printf("Homepage:    <" PACKAGE_URL ">\n");
+	printf("Bug Reports: <" PACKAGE_BUGREPORT ">\n");
 }
diff --git a/tools/ideviceenterrecovery.c b/tools/ideviceenterrecovery.c
index ec9093b..868ee7d 100644
--- a/tools/ideviceenterrecovery.c
+++ b/tools/ideviceenterrecovery.c
@@ -40,11 +40,15 @@ static void print_usage(int argc, char **argv)
 
 	name = strrchr(argv[0], '/');
 	printf("Usage: %s [OPTIONS] UDID\n", (name ? name + 1: argv[0]));
-	printf("Makes a device with the supplied UDID enter recovery mode immediately.\n\n");
+	printf("\n");
+	printf("Makes a device with the supplied UDID enter recovery mode immediately.\n");
+	printf("\n");
+	printf("OPTIONS:\n");
 	printf("  -d, --debug\t\tenable communication debugging\n");
 	printf("  -h, --help\t\tprints usage information\n");
 	printf("\n");
-	printf("Homepage: <" PACKAGE_URL ">\n");
+	printf("Homepage:    <" PACKAGE_URL ">\n");
+	printf("Bug Reports: <" PACKAGE_BUGREPORT ">\n");
 }
 
 int main(int argc, char *argv[])
diff --git a/tools/ideviceimagemounter.c b/tools/ideviceimagemounter.c
index 74df5e4..3f6f42e 100644
--- a/tools/ideviceimagemounter.c
+++ b/tools/ideviceimagemounter.c
@@ -64,8 +64,11 @@ static void print_usage(int argc, char **argv)
 	char *name = NULL;
 
 	name = strrchr(argv[0], '/');
-	printf("Usage: %s [OPTIONS] IMAGE_FILE IMAGE_SIGNATURE_FILE\n\n", (name ? name + 1: argv[0]));
-	printf("Mounts the specified disk image on the device.\n\n");
+	printf("Usage: %s [OPTIONS] IMAGE_FILE IMAGE_SIGNATURE_FILE\n", (name ? name + 1: argv[0]));
+	printf("\n");
+	printf("Mounts the specified disk image on the device.\n");
+	printf("\n");
+	printf("OPTIONS:\n");
 	printf("  -u, --udid UDID\ttarget specific device by UDID\n");
 	printf("  -l, --list\t\tList mount information\n");
 	printf("  -t, --imagetype\tImage type to use, default is 'Developer'\n");
@@ -73,7 +76,8 @@ static void print_usage(int argc, char **argv)
 	printf("  -d, --debug\t\tenable communication debugging\n");
 	printf("  -h, --help\t\tprints usage information\n");
 	printf("\n");
-	printf("Homepage: <" PACKAGE_URL ">\n");
+	printf("Homepage:    <" PACKAGE_URL ">\n");
+	printf("Bug Reports: <" PACKAGE_BUGREPORT ">\n");
 }
 
 static void parse_opts(int argc, char **argv)
diff --git a/tools/ideviceinfo.c b/tools/ideviceinfo.c
index f52cd00..0697990 100644
--- a/tools/ideviceinfo.c
+++ b/tools/ideviceinfo.c
@@ -93,24 +93,28 @@ static void print_usage(int argc, char **argv, int is_error)
 	name = strrchr(argv[0], '/');
 	fprintf(is_error ? stderr : stdout, "Usage: %s [OPTIONS]\n", (name ? name + 1: argv[0]));
 	fprintf(is_error ? stderr : stdout,
-	  "Show information about a connected device.\n\n" \
-	  "  -s, --simple       use a simple connection to avoid auto-pairing with the device\n" \
-	  "  -u, --udid UDID    target specific device by UDID\n" \
-	  "  -n, --network      connect to network device even if available via USB\n" \
-	  "  -q, --domain NAME  set domain of query to NAME. Default: None\n" \
-	  "  -k, --key NAME     only query key specified by NAME. Default: All keys.\n" \
-	  "  -x, --xml          output information as xml plist instead of key/value pairs\n" \
-	  "  -h, --help         prints usage information\n" \
-	  "  -d, --debug        enable communication debugging\n" \
-	  "\n"
+		"\n" \
+		"Show information about a connected device.\n" \
+		"\n" \
+		"OPTIONS:\n" \
+		"  -s, --simple       use a simple connection to avoid auto-pairing with the device\n" \
+		"  -u, --udid UDID    target specific device by UDID\n" \
+		"  -n, --network      connect to network device even if available via USB\n" \
+		"  -q, --domain NAME  set domain of query to NAME. Default: None\n" \
+		"  -k, --key NAME     only query key specified by NAME. Default: All keys.\n" \
+		"  -x, --xml          output information as xml plist instead of key/value pairs\n" \
+		"  -h, --help         prints usage information\n" \
+		"  -d, --debug        enable communication debugging\n" \
+		"\n"
 	);
-	fprintf(is_error ? stderr : stdout, "  Known domains are:\n\n");
+	fprintf(is_error ? stderr : stdout, "Known domains are:\n\n");
 	while (domains[i] != NULL) {
 		fprintf(is_error ? stderr : stdout, "  %s\n", domains[i++]);
 	}
 	fprintf(is_error ? stderr : stdout,
-	  "\n" \
-	  "Homepage: <" PACKAGE_URL ">\n"
+		"\n" \
+		"Homepage:    <" PACKAGE_URL ">\n"
+		"Bug Reports: <" PACKAGE_BUGREPORT ">\n"
 	);
 }
 
diff --git a/tools/idevicename.c b/tools/idevicename.c
index a66f5aa..af80dcc 100644
--- a/tools/idevicename.c
+++ b/tools/idevicename.c
@@ -38,13 +38,16 @@
 static void print_usage(void)
 {
 	printf("Usage: idevicename [OPTIONS] [NAME]\n");
+	printf("\n");
 	printf("Display the device name or set it to NAME if specified.\n");
 	printf("\n");
+	printf("OPTIONS:\n");
 	printf("  -d, --debug\t\tenable communication debugging\n");
 	printf("  -u, --udid UDID\ttarget specific device by UDID\n");
 	printf("  -h, --help\t\tprint usage information\n");
 	printf("\n");
-	printf("Homepage: <" PACKAGE_URL ">\n");
+	printf("Homepage:    <" PACKAGE_URL ">\n");
+	printf("Bug Reports: <" PACKAGE_BUGREPORT ">\n");
 }
 
 int main(int argc, char** argv)
diff --git a/tools/idevicenotificationproxy.c b/tools/idevicenotificationproxy.c
index 72b406c..45744bc 100644
--- a/tools/idevicenotificationproxy.c
+++ b/tools/idevicenotificationproxy.c
@@ -63,17 +63,20 @@ static void print_usage(int argc, char **argv)
 
 	name = strrchr(argv[0], '/');
 	printf("Usage: %s [OPTIONS] COMMAND\n", (name ? name + 1: argv[0]));
-	printf("Post or observe notifications on a device.\n\n");
-	printf(" Where COMMAND is one of:\n");
+	printf("\n");
+	printf("Post or observe notifications on a device.\n");
+	printf("\n");
+	printf("Where COMMAND is one of:\n");
 	printf("  post ID [...]\t\tpost notification IDs to device and exit\n");
 	printf("  observe ID [...]\tobserve notification IDs in the foreground until CTRL+C or signal is received\n");
 	printf("\n");
-	printf(" The following OPTIONS are accepted:\n");
+	printf("The following OPTIONS are accepted:\n");
 	printf("  -d, --debug\t\tenable communication debugging\n");
 	printf("  -u, --udid UDID\ttarget specific device by UDID\n");
 	printf("  -h, --help\t\tprints usage information\n");
 	printf("\n");
-	printf("Homepage: <" PACKAGE_URL ">\n");
+	printf("Homepage:    <" PACKAGE_URL ">\n");
+	printf("Bug Reports: <" PACKAGE_BUGREPORT ">\n");
 }
 
 static void notify_cb(const char *notification, void *user_data)
diff --git a/tools/idevicepair.c b/tools/idevicepair.c
index bc0f5d8..99c7b7c 100644
--- a/tools/idevicepair.c
+++ b/tools/idevicepair.c
@@ -65,21 +65,25 @@ static void print_usage(int argc, char **argv)
 	char *name = NULL;
 
 	name = strrchr(argv[0], '/');
-	printf("\n%s - Manage host pairings with devices and usbmuxd.\n\n", (name ? name + 1: argv[0]));
-	printf("Usage: %s [OPTIONS] COMMAND\n\n", (name ? name + 1: argv[0]));
-	printf(" Where COMMAND is one of:\n");
+	printf("Usage: %s [OPTIONS] COMMAND\n", (name ? name + 1: argv[0]));
+	printf("\n");
+	printf("Manage host pairings with devices and usbmuxd.\n");
+	printf("\n");
+	printf("Where COMMAND is one of:\n");
 	printf("  systembuid   print the system buid of the usbmuxd host\n");
 	printf("  hostid       print the host id for target device\n");
 	printf("  pair         pair device with this host\n");
 	printf("  validate     validate if device is paired with this host\n");
 	printf("  unpair       unpair device with this host\n");
-	printf("  list         list devices paired with this host\n\n");
-	printf(" The following OPTIONS are accepted:\n");
+	printf("  list         list devices paired with this host\n");
+	printf("\n");
+	printf("The following OPTIONS are accepted:\n");
 	printf("  -d, --debug      enable communication debugging\n");
 	printf("  -u, --udid UDID  target specific device by UDID\n");
 	printf("  -h, --help       prints usage information\n");
 	printf("\n");
-	printf("Homepage: <" PACKAGE_URL ">\n");
+	printf("Homepage:    <" PACKAGE_URL ">\n");
+	printf("Bug Reports: <" PACKAGE_BUGREPORT ">\n");
 }
 
 static void parse_opts(int argc, char **argv)
diff --git a/tools/ideviceprovision.c b/tools/ideviceprovision.c
index 7e8367a..4b96821 100644
--- a/tools/ideviceprovision.c
+++ b/tools/ideviceprovision.c
@@ -50,8 +50,10 @@ static void print_usage(int argc, char **argv)
 
 	name = strrchr(argv[0], '/');
 	printf("Usage: %s [OPTIONS] COMMAND\n", (name ? name + 1: argv[0]));
-	printf("Manage provisioning profiles on a device.\n\n");
-	printf(" Where COMMAND is one of:\n");
+	printf("\n");
+	printf("Manage provisioning profiles on a device.\n");
+	printf("\n");
+	printf("Where COMMAND is one of:\n");
 	printf("  install FILE\tInstalls the provisioning profile specified by FILE.\n");
 	printf("              \tA valid .mobileprovision file is expected.\n");
 	printf("  list\t\tGet a list of all provisioning profiles on the device.\n");
@@ -64,14 +66,16 @@ static void print_usage(int argc, char **argv)
 	printf("  remove UUID\tRemoves the provisioning profile identified by UUID.\n");
 	printf("  remove-all\tRemoves all installed provisioning profiles.\n");
 	printf("  dump FILE\tPrints detailed information about the provisioning profile\n");
-	printf("           \tspecified by FILE.\n\n");
-	printf(" The following OPTIONS are accepted:\n");
+	printf("           \tspecified by FILE.\n");
+	printf("\n");
+	printf("The following OPTIONS are accepted:\n");
 	printf("  -d, --debug      enable communication debugging\n");
 	printf("  -u, --udid UDID  target specific device by UDID\n");
 	printf("  -x, --xml        print XML output when using the 'dump' command\n");
 	printf("  -h, --help       prints usage information\n");
 	printf("\n");
-	printf("Homepage: <" PACKAGE_URL ">\n");
+	printf("Homepage:    <" PACKAGE_URL ">\n");
+	printf("Bug Reports: <" PACKAGE_BUGREPORT ">\n");
 }
 
 enum {
diff --git a/tools/idevicescreenshot.c b/tools/idevicescreenshot.c
index 38d323c..d91e8f4 100644
--- a/tools/idevicescreenshot.c
+++ b/tools/idevicescreenshot.c
@@ -157,15 +157,20 @@ void print_usage(int argc, char **argv)
 
 	name = strrchr(argv[0], '/');
 	printf("Usage: %s [OPTIONS] [FILE]\n", (name ? name + 1: argv[0]));
+	printf("\n");
 	printf("Gets a screenshot from a device.\n");
+	printf("\n");
 	printf("The screenshot is saved as a TIFF image with the given FILE name,\n");
 	printf("where the default name is \"screenshot-DATE.tiff\", e.g.:\n");
-	printf("   ./screenshot-2013-12-31-23-59-59.tiff\n\n");
+	printf("   ./screenshot-2013-12-31-23-59-59.tiff\n");
+	printf("\n");
 	printf("NOTE: A mounted developer disk image is required on the device, otherwise\n");
-	printf("the screenshotr service is not available.\n\n");
+	printf("the screenshotr service is not available.\n");
+	printf("\n");
 	printf("  -d, --debug\t\tenable communication debugging\n");
 	printf("  -u, --udid UDID\ttarget specific device by UDID\n");
 	printf("  -h, --help\t\tprints usage information\n");
 	printf("\n");
-	printf("Homepage: <" PACKAGE_URL ">\n");
+	printf("Homepage:    <" PACKAGE_URL ">\n");
+	printf("Bug Reports: <" PACKAGE_BUGREPORT ">\n");
 }
diff --git a/tools/idevicesetlocation.c b/tools/idevicesetlocation.c
index d2b8864..47fc7da 100644
--- a/tools/idevicesetlocation.c
+++ b/tools/idevicesetlocation.c
@@ -49,13 +49,14 @@ static void print_usage(int argc, char **argv, int is_error)
 	fprintf(is_error ? stderr : stdout, "Usage: %s [OPTIONS] -- <LAT> <LONG>\n", bname);
 	fprintf(is_error ? stderr : stdout, "       %s [OPTIONS] reset\n", bname);
 	fprintf(is_error ? stderr : stdout, "\n" \
-	  "OPTIONS:\n" \
-	  "  -u, --udid UDID    target specific device by UDID\n" \
-	  "  -n, --network      connect to network device even if available via USB\n" \
-	  "  -h, --help         prints usage information\n" \
-	  "  -d, --debug        enable communication debugging\n" \
-	  "\n"
-	  "Homepage: <" PACKAGE_URL ">\n"
+		"OPTIONS:\n" \
+		"  -u, --udid UDID    target specific device by UDID\n" \
+		"  -n, --network      connect to network device even if available via USB\n" \
+		"  -h, --help         prints usage information\n" \
+		"  -d, --debug        enable communication debugging\n" \
+		"\n" \
+		"Homepage:    <" PACKAGE_URL ">\n" \
+		"Bug Reports: <" PACKAGE_BUGREPORT ">\n"
 	);
 }
 
diff --git a/tools/idevicesyslog.c b/tools/idevicesyslog.c
index f7a5b74..54699a0 100644
--- a/tools/idevicesyslog.c
+++ b/tools/idevicesyslog.c
@@ -519,29 +519,34 @@ static void print_usage(int argc, char **argv, int is_error)
 	name = strrchr(argv[0], '/');
 	fprintf(is_error ? stderr : stdout, "Usage: %s [OPTIONS]\n", (name ? name + 1: argv[0]));
 	fprintf(is_error ? stderr : stdout,
-	  "Relay syslog of a connected device.\n\n" \
-	  "OPTIONS:\n" \
-	  "  -u, --udid UDID  target specific device by UDID\n" \
-	  "  -n, --network    connect to network device even if available via USB\n" \
-	  "  -x, --exit       exit when device disconnects\n" \
-	  "  -h, --help       prints usage information\n" \
-	  "  -d, --debug      enable communication debugging\n" \
-	  " --no-colors       disable colored output\n" \
-	  "\n" \
-	  "FILTER OPTIONS:\n" \
-	  "  -m, --match STRING     only print messages that contain STRING\n" \
-	  "  -t, --trigger STRING   start logging when matching STRING\n" \
-	  "  -T, --untrigger STRING  stop logging when matching STRING\n" \
-	  "  -p, --process PROCESS  only print messages from matching process(es)\n" \
-	  "  -e, --exclude PROCESS  print all messages except matching process(es)\n" \
-	  "        PROCESS is a process name or multiple process names separated by \"|\".\n" \
-	  "  -q, --quiet      set a filter to exclude common noisy processes\n" \
-	  "  --quiet-list     prints the list of processes for --quiet and exits\n" \
-	  "  -k, --kernel     only print kernel messages\n" \
-	  "  -K, --no-kernel  suppress kernel messages\n" \
-	  "For filter example usage consult idevicesyslog(1) man page.\n" \
-	  "\n" \
-	  "Homepage: <" PACKAGE_URL ">\n"
+		"\n" \
+		"Relay syslog of a connected device.\n" \
+		"\n" \
+		"OPTIONS:\n" \
+		"  -u, --udid UDID  target specific device by UDID\n" \
+		"  -n, --network    connect to network device even if available via USB\n" \
+		"  -x, --exit       exit when device disconnects\n" \
+		"  -h, --help       prints usage information\n" \
+		"  -d, --debug      enable communication debugging\n" \
+		" --no-colors       disable colored output\n" \
+		"\n" \
+		"FILTER OPTIONS:\n" \
+		"  -m, --match STRING      only print messages that contain STRING\n" \
+		"  -t, --trigger STRING    start logging when matching STRING\n" \
+		"  -T, --untrigger STRING  stop logging when matching STRING\n" \
+		"  -p, --process PROCESS   only print messages from matching process(es)\n" \
+		"  -e, --exclude PROCESS   print all messages except matching process(es)\n" \
+		"                          PROCESS is a process name or multiple process names\n" \
+		"                          separated by \"|\".\n" \
+		"  -q, --quiet             set a filter to exclude common noisy processes\n" \
+		"  --quiet-list            prints the list of processes for --quiet and exits\n" \
+		"  -k, --kernel            only print kernel messages\n" \
+		"  -K, --no-kernel         suppress kernel messages\n" \
+		"\n" \
+		"For filter examples consult idevicesyslog(1) man page.\n" \
+		"\n" \
+		"Homepage:    <" PACKAGE_URL ">\n"
+		"Bug Reports: <" PACKAGE_BUGREPORT ">\n"
 	);
 }