diff options
| author | Ron Yorston <rmy@pobox.com> | 2014-12-14 14:20:56 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2014-12-14 14:20:56 +0000 |
| commit | 6d6d18d45c145899fce3a39553771cf0af671f30 (patch) | |
| tree | 1936d18cbf61b9e0989464aad0a11c52cbeff7b7 /docs | |
| parent | 0c204dc07b718244c360e0b84df66ce0a012e14f (diff) | |
| parent | acb8be721768b54075a51d1859d390904a0f1f6c (diff) | |
| download | busybox-w32-6d6d18d45c145899fce3a39553771cf0af671f30.tar.gz busybox-w32-6d6d18d45c145899fce3a39553771cf0af671f30.tar.bz2 busybox-w32-6d6d18d45c145899fce3a39553771cf0af671f30.zip | |
Merge branch 'busybox' into merge
Conflicts:
archival/libarchive/open_transformer.c
libbb/lineedit.c
miscutils/man.c
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/logging_and_backgrounding.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/logging_and_backgrounding.txt b/docs/logging_and_backgrounding.txt index 7e6885560..c76cd3653 100644 --- a/docs/logging_and_backgrounding.txt +++ b/docs/logging_and_backgrounding.txt | |||
| @@ -45,6 +45,8 @@ udhcpc - auto-backgrounds unless -f after lease is obtained, | |||
| 45 | udhcpd - auto-backgrounds and do not log to stderr unless -f, | 45 | udhcpd - auto-backgrounds and do not log to stderr unless -f, |
| 46 | otherwise logs to stderr, but option -S makes it log *also* to syslog | 46 | otherwise logs to stderr, but option -S makes it log *also* to syslog |
| 47 | zcip - auto-backgrounds and logs *also* to syslog unless -f | 47 | zcip - auto-backgrounds and logs *also* to syslog unless -f |
| 48 | behaviour can be overridden with experimental LOGGING env.var | ||
| 49 | (can be set to either "none" or "syslog") | ||
| 48 | 50 | ||
| 49 | Total: 13 applets (+1 obsolete), | 51 | Total: 13 applets (+1 obsolete), |
| 50 | 4 log to syslog by default (crond fakeidentd inetd zcip), | 52 | 4 log to syslog by default (crond fakeidentd inetd zcip), |