Skip to content

Commit 76308a1

Browse files
committed
Tweaked documentation of timestamp logopt.
1 parent af59ef1 commit 76308a1

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2003-10-07 Chris Dunlap <cdunlap@llnl.gov>
2+
3+
* etc/conman.conf, man/conman.conf.5.in: Tweaked timestamp logopt docs.
4+
15
2003-10-03 Chris Dunlap <cdunlap@llnl.gov>
26

37
* server-logfile.c, server-obj.c, server.h: Fixed newline timestamping

etc/conman.conf

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
# ConMan daemon configuration file
33
##
4-
# $Id: conman.conf,v 1.13.2.4 2003/10/01 23:22:10 dun Exp $
4+
# $Id: conman.conf,v 1.13.2.5 2003/10/07 23:19:36 dun Exp $
55
##
66
# - Whitespace is ignored.
77
# - Comments are ignored (from the pound char to the newline).
@@ -128,7 +128,9 @@
128128
# - "sanitize" or "nosanitize" - sanitized logs convert non-printable
129129
# characters into 7-bit printable characters.
130130
# - "timestamp" or "notimestamp" - timestamped logs prepend each line
131-
# with the current timestamp in "YYYY-MM-DD HH:MM:SS" format.
131+
# of console output with a timestamp in "YYYY-MM-DD HH:MM:SS" format.
132+
# This timestamp is generated when the first character following the
133+
# line break is output.
132134
# The default is "nosanitize,notimestamp".
133135
##
134136
# GLOBAL logopts="nosanitize,notimestamp"

man/conman.conf.5.in

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" $Id: conman.conf.5.in,v 1.5.2.6 2003/10/01 23:22:10 dun Exp $
1+
.\" $Id: conman.conf.5.in,v 1.5.2.7 2003/10/07 23:19:36 dun Exp $
22

33
.TH CONMAN.CONF 5 "@DATE@" "@PROJECT@-@VERSION@" "LLNL"
44

@@ -100,8 +100,10 @@ logoptions include the following:
100100
characters into 7-bit printable characters.
101101
.br
102102
.sp
103-
\fBtimestamp\fR or \fBnotimestamp\fR - timestamped logs prepend each line with
104-
the current timestamp in "YYYY-MM-DD HH:MM:SS" format.
103+
\fBtimestamp\fR or \fBnotimestamp\fR - timestamped logs prepend each line
104+
of console output with a timestamp in "YYYY-MM-DD HH:MM:SS" format. This
105+
timestamp is generated when the first character following the line break is
106+
output.
105107
.br
106108
.sp
107109
The default is "\fBnosanitize\fR,\fBnotimestamp\fR".

0 commit comments

Comments
 (0)