aboutsummaryrefslogtreecommitdiff
path: root/sysklogd/logger.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2012-03-22 15:41:00 +0000
committerRon Yorston <rmy@pobox.com>2012-03-22 15:41:00 +0000
commit1118c95535ea51961437089fc3dece5ab4ea7e1b (patch)
tree1515bd2376a6d6c5123791662307ce2ed90cdf36 /sysklogd/logger.c
parent0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (diff)
parent066f39956641300c1e5c6bfe6c11a115cea3e2cf (diff)
downloadbusybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.gz
busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.bz2
busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.zip
Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge
Conflicts: procps/ps.c
Diffstat (limited to 'sysklogd/logger.c')
-rw-r--r--sysklogd/logger.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sysklogd/logger.c b/sysklogd/logger.c
index 0fabd97ca..5a7027731 100644
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -11,7 +11,6 @@
11//usage: "[OPTIONS] [MESSAGE]" 11//usage: "[OPTIONS] [MESSAGE]"
12//usage:#define logger_full_usage "\n\n" 12//usage:#define logger_full_usage "\n\n"
13//usage: "Write MESSAGE (or stdin) to syslog\n" 13//usage: "Write MESSAGE (or stdin) to syslog\n"
14//usage: "\nOptions:"
15//usage: "\n -s Log to stderr as well as the system log" 14//usage: "\n -s Log to stderr as well as the system log"
16//usage: "\n -t TAG Log using the specified tag (defaults to user name)" 15//usage: "\n -t TAG Log using the specified tag (defaults to user name)"
17//usage: "\n -p PRIO Priority (numeric or facility.level pair)" 16//usage: "\n -p PRIO Priority (numeric or facility.level pair)"