diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-01-08 21:18:15 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-01-08 21:18:15 +0100 |
| commit | c2002dcd1f769e0a54976ad2d586a29c9316ffce (patch) | |
| tree | 8f813de017886d395dd8741aa1cc794a6409d63a /src/daemon | |
| parent | 9fc726c6d780f63610647014efeffab3a97b8dac (diff) | |
| parent | 7ca0f384c8b122f6acb3547d20ca3a838507a038 (diff) | |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Diffstat (limited to 'src/daemon')
| -rw-r--r-- | src/daemon/cmdline.c | 2 | ||||
| -rw-r--r-- | src/daemon/cpulimit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c index 0bfc8a92..cc3d714b 100644 --- a/src/daemon/cmdline.c +++ b/src/daemon/cmdline.c @@ -130,7 +130,7 @@ void pa_cmdline_help(const char *argv0) { " --cleanup-shm Cleanup stale shared memory segments\n" " --start Start the daemon if it is not running\n" " -k --kill Kill a running daemon\n" - " --check Check for a running daemon\n\n" + " --check Check for a running daemon (only returns exit code)\n\n" "OPTIONS:\n" " --system[=BOOL] Run as system-wide instance\n" diff --git a/src/daemon/cpulimit.c b/src/daemon/cpulimit.c index a909600e..5f24474d 100644 --- a/src/daemon/cpulimit.c +++ b/src/daemon/cpulimit.c @@ -167,7 +167,7 @@ static void callback(pa_mainloop_api*m, pa_io_event*e, int fd, pa_io_event_flags pa_assert(e == io_event); pa_assert(fd == the_pipe[0]); - pa_log("Recevied request to terminate due to CPU overload."); + pa_log("Received request to terminate due to CPU overload."); pa_read(the_pipe[0], &c, sizeof(c), NULL); m->quit(m, 1); /* Quit the main loop */ |