mount-tool,man: reword comments and error messages

We were consistenly using --umount everywhere, but add a comment to make this
clearer. Also, reword a few things for clarity.

diff --git a/man/systemd-mount.xml b/man/systemd-mount.xml
index 890c950cd05a8f821e69f5772829f7b9c217aa39..3463a107dab4c82b2fbcb46087561059dab5194a 100644 (file)
--- a/man/systemd-mount.xml
+++ b/man/systemd-mount.xml
@@ -70,9 +70,9 @@
     whose name is generated from the file system label. In this mode the block device or image file must
     exist at the time of invocation of the command, so that it may be probed. If the device is found to be a
     removable block device (e.g. a USB stick), an automount point is created instead of a regular mount point
-    (i.e. the <option>--automount=</option> option is implied, see below). If the option <option>--tmpfs</option>
-    is specified, then the argument will be interpreted as the path where the new temporary file system will
-    be mounted on.</para>
+    (i.e. the <option>--automount=</option> option is implied, see below). If the option
+    <option>--tmpfs</option> is specified, then the argument is interpreted as the path where the new
+    temporary file system shall be mounted.</para>
 
     <para>If two arguments are specified, the first indicates the mount source (the
     <replaceable>WHAT</replaceable>) and the second indicates the path to mount it on (the

diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index 31abc0685dcd1df904c78f8331bdcd067b4d9d7b..a0f1503f70d84188f175beee6719a986be6293d3 100644 (file)
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -206,7 +206,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "bind-device",        no_argument,       NULL, ARG_BIND_DEVICE        },
                 { "list",               no_argument,       NULL, ARG_LIST               },
                 { "umount",             no_argument,       NULL, 'u'                    },
-                { "unmount",            no_argument,       NULL, 'u'                    },
+                { "unmount",            no_argument,       NULL, 'u'                    }, /* Compat spelling */
                 { "collect",            no_argument,       NULL, 'G'                    },
                 { "tmpfs",              no_argument,       NULL, 'T'                    },
                 {},
@@ -407,7 +407,7 @@ static int parse_argv(int argc, char *argv[]) {
 
                 if (argc > optind+2)
                         return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                               "At most two arguments required.");
+                                               "More than two arguments are not allowed.");
 
                 if (arg_tmpfs) {
                         if (argc <= optind+1) {