From b4c040d30e2677313a892ffe4cde0d53e446da7d Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Sat, 4 Apr 2009 01:49:36 +0100 Subject: [PATCH] More tidy up of messages. --- fish/cmds.c | 14 +++++++------- fish/fish.c | 11 ++++++----- src/generator.ml | 8 ++++---- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/fish/cmds.c b/fish/cmds.c index a3a1d0f..a181b87 100644 --- a/fish/cmds.c +++ b/fish/cmds.c @@ -29,22 +29,22 @@ void list_commands (void) { printf (" %-16s %s\n", "Command", "Description"); list_builtin_commands (); - printf ("%-20s %s\n", "mount", "Mount a guest disk at a position in the filesystem"); - printf ("%-20s %s\n", "sync", "Sync disks, writes are flushed through to the disk image"); - printf ("%-20s %s\n", "touch", "Update file timestamps or create a new file"); - printf ("Use -h to show detailed help for a command.\n"); + printf ("%-20s %s\n", "mount", "mount a guest disk at a position in the filesystem"); + printf ("%-20s %s\n", "sync", "sync disks, writes are flushed through to the disk image"); + printf ("%-20s %s\n", "touch", "update file timestamps or create a new file"); + printf (" Use -h / help to show detailed help for a command.\n"); } void display_command (const char *cmd) { if (strcasecmp (cmd, "mount") == 0) - pod2text ("mount - Mount a guest disk at a position in the filesystem", " mount \n\nMount a guest disk at a position in the filesystem. Block devices\nare named C, C and so on, as they were added to\nthe guest. If those block devices contain partitions, they will have\nthe usual names (eg. C). Also LVM C-style\nnames can be used.\n\nThe rules are the same as for L: A filesystem must\nfirst be mounted on C before others can be mounted. Other\nfilesystems can only be mounted on directories which already\nexist.\n\nThe mounted filesystem is writable, if we have sufficient permissions\non the underlying device.\n\nThe filesystem options C and C are set with this\ncall, in order to improve reliability."); + pod2text ("mount - mount a guest disk at a position in the filesystem", " mount \n\nMount a guest disk at a position in the filesystem. Block devices\nare named C, C and so on, as they were added to\nthe guest. If those block devices contain partitions, they will have\nthe usual names (eg. C). Also LVM C-style\nnames can be used.\n\nThe rules are the same as for L: A filesystem must\nfirst be mounted on C before others can be mounted. Other\nfilesystems can only be mounted on directories which already\nexist.\n\nThe mounted filesystem is writable, if we have sufficient permissions\non the underlying device.\n\nThe filesystem options C and C are set with this\ncall, in order to improve reliability."); else if (strcasecmp (cmd, "sync") == 0) - pod2text ("sync - Sync disks, writes are flushed through to the disk image", " sync\n\nThis syncs the disk, so that any writes are flushed through to the\nunderlying disk image.\n\nYou should always call this if you have modified a disk image, before\ncalling C."); + pod2text ("sync - sync disks, writes are flushed through to the disk image", " sync\n\nThis syncs the disk, so that any writes are flushed through to the\nunderlying disk image.\n\nYou should always call this if you have modified a disk image, before\ncalling C."); else if (strcasecmp (cmd, "touch") == 0) - pod2text ("touch - Update file timestamps or create a new file", " touch \n\nTouch acts like the L command. It can be used to\nupdate the timestamps on a file, or, if the file does not exist,\nto create a new zero-length file."); + pod2text ("touch - update file timestamps or create a new file", " touch \n\nTouch acts like the L command. It can be used to\nupdate the timestamps on a file, or, if the file does not exist,\nto create a new zero-length file."); else display_builtin_command (cmd); } diff --git a/fish/fish.c b/fish/fish.c index d256c2b..fbb26de 100644 --- a/fish/fish.c +++ b/fish/fish.c @@ -239,7 +239,8 @@ script (int prompt) int len, i; if (prompt) - printf ("Welcome to guestfish, the libguestfs filesystem interactive shell for\n" + printf ("\n" + "Welcome to guestfish, the libguestfs filesystem interactive shell for\n" "editing virtual machine filesystems.\n" "\n" "Type: 'help' for help with commands\n" @@ -334,7 +335,7 @@ issue_command (const char *cmd, char *argv[]) } else if (strcasecmp (cmd, "cdrom") == 0) { if (argc != 1) { - fprintf (stderr, "use 'cdrom image' to add a guest cdrom\n"); + fprintf (stderr, "use 'cdrom image' to add a CD-ROM image\n"); return -1; } else @@ -360,9 +361,9 @@ list_builtin_commands (void) printf ("%-20s %s\n", "quit", "quit guestfish"); printf ("%-20s %s\n", - "add", "add a guest image to be examined or modified"); + "add", "add a guest image to be examined or modified"); printf ("%-20s %s\n", - "cdrom", "add a guest CD-ROM image to be examined"); + "cdrom", "add a CD-ROM image to be examined"); printf ("%-20s %s\n", "launch", "launch the subprocess"); } @@ -374,7 +375,7 @@ display_builtin_command (const char *cmd) printf ("add - add a guest image to be examined or modified\n" " add \n"); else if (strcasecmp (cmd, "cdrom") == 0) - printf ("cdrom - add a guest CD-ROM image to be examined\n" + printf ("cdrom - add a CD-ROM image to be examined\n" " cdrom \n"); else if (strcasecmp (cmd, "help") == 0) printf ("help - display a list of commands or help on a command\n" diff --git a/src/generator.ml b/src/generator.ml index 75dcc79..fbb4a40 100755 --- a/src/generator.ml +++ b/src/generator.ml @@ -42,7 +42,7 @@ and argt = let functions = [ ("mount", (Err, P2 (String "device", String "mountpoint")), 1, - "Mount a guest disk at a position in the filesystem", + "mount a guest disk at a position in the filesystem", "\ Mount a guest disk at a position in the filesystem. Block devices are named C, C and so on, as they were added to @@ -62,7 +62,7 @@ The filesystem options C and C are set with this call, in order to improve reliability."); ("sync", (Err, P0), 2, - "Sync disks, writes are flushed through to the disk image", + "sync disks, writes are flushed through to the disk image", "\ This syncs the disk, so that any writes are flushed through to the underlying disk image. @@ -71,7 +71,7 @@ You should always call this if you have modified a disk image, before calling C."); ("touch", (Err, P1 (String "path")), 3, - "Update file timestamps or create a new file", + "update file timestamps or create a new file", "\ Touch acts like the L command. It can be used to update the timestamps on a file, or, if the file does not exist, @@ -473,7 +473,7 @@ and generate_fish_cmds () = pr " printf (\"%%-20s %%s\\n\", \"%s\", \"%s\");\n" name shortdesc ) functions; - pr " printf (\"Use -h to show detailed help for a command.\\n\");\n"; + pr " printf (\" Use -h / help to show detailed help for a command.\\n\");\n"; pr "}\n"; pr "\n"; -- 1.8.3.1