Merge commit 'remotes/meins/master'

diff --git a/afs.cmd b/afs.cmd
index 8f36dd859ac7309398ee58901cc3ff1d31166d36..3f44873e444d7036f7b12b42fe4127420786cd71 100644 (file)
--- a/afs.cmd
+++ b/afs.cmd
@@ -235,11 +235,11 @@ H: -v     Verbose mode.
 N: select
 P: AFS_READ | AFS_WRITE
 D: Activate a mood or a playlist.
-U: select specifier:name
+U: select specifier/name
 H: The specifier is either 'm' or 'p' to indicate whether a playlist or
 H: a mood should be activated. Example:
 H:
-H:     select m:foo
+H:     select m/foo
 H:
 H: loads the mood named 'foo'.
 ---

diff --git a/fsck.c b/fsck.c
index 9688a729ef473ec1a83555479aa79d978c71caef..60bd27026cd3c962327d6074ec51b202fb7daea0 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -970,7 +970,7 @@ out:
                        para_strerror(-ret)
                );
                if (conf.loglevel_arg > 1)
-                       PARA_EMERG_LOG("re-run with \"--logelvel %d\" to increase verbosity\n",
+                       PARA_EMERG_LOG("re-run with \"--loglevel %d\" to increase verbosity\n",
                                conf.loglevel_arg - 1);
        } else
                PARA_NOTICE_LOG("success\n");