summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2011-09-16 15:01:58 +0000
committerjmc <jmc@openbsd.org>2011-09-16 15:01:58 +0000
commitf38588dfd0376b9bfd4972aee3684811356d627d (patch)
tree6140426866ba0db439fd399383068705e42b0e89
parentIf a user configures logging explicitly in relayd.conf, do it (diff)
downloadwireguard-openbsd-f38588dfd0376b9bfd4972aee3684811356d627d.tar.xz
wireguard-openbsd-f38588dfd0376b9bfd4972aee3684811356d627d.zip
use .St here for ISO 8601 references; ok millert
-rw-r--r--lib/libc/time/strftime.316
-rw-r--r--lib/libc/time/strptime.314
-rw-r--r--usr.bin/cal/cal.18
-rw-r--r--usr.bin/newsyslog/newsyslog.810
4 files changed, 31 insertions, 17 deletions
diff --git a/lib/libc/time/strftime.3 b/lib/libc/time/strftime.3
index f23c2ed97c3..83c06907404 100644
--- a/lib/libc/time/strftime.3
+++ b/lib/libc/time/strftime.3
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)strftime.3 5.12 (Berkeley) 6/29/91
-.\" $OpenBSD: strftime.3,v 1.25 2011/08/31 08:49:42 jmc Exp $
+.\" $OpenBSD: strftime.3,v 1.26 2011/09/16 15:01:58 jmc Exp $
.\"
-.Dd $Mdocdate: August 31 2011 $
+.Dd $Mdocdate: September 16 2011 $
.Dt STRFTIME 3
.Os
.Sh NAME
@@ -100,9 +100,13 @@ single digits are preceded by a blank.
is replaced by the date in the format
.Dq Li %Y-%m-%d .
.It Cm \&%G
-is replaced by the ISO 8601 year with century as a decimal number.
+is replaced by the
+.St -iso8601-4
+year with century as a decimal number.
.It Cm \&%g
-is replaced by the ISO 8601 year without century as a decimal number (00\-99).
+is replaced by the
+.St -iso8601-4
+year without century as a decimal number (00\-99).
.It Cm \&%H
is replaced by the hour (24-hour clock) as a decimal number (00\-23).
.It Cm \&%I
@@ -220,7 +224,9 @@ and
.Ql \&%+
conversion specifications are extensions.
.Pp
-Use of the ISO 8601 conversions may produce non-intuitive results.
+Use of the
+.St -iso8601-4
+conversions may produce non-intuitive results.
Week 01 of a year is per definition the first week which has the Thursday
in this year, which is equivalent to the week which contains the fourth
day of January.
diff --git a/lib/libc/time/strptime.3 b/lib/libc/time/strptime.3
index 115f3130ea1..9c0a590b041 100644
--- a/lib/libc/time/strptime.3
+++ b/lib/libc/time/strptime.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: strptime.3,v 1.18 2011/09/16 09:44:50 jmc Exp $
+.\" $OpenBSD: strptime.3,v 1.19 2011/09/16 15:01:58 jmc Exp $
.\"
.\" Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -97,7 +97,9 @@ the same as
.Cm \&%d .
.It Cm \&%F
the date as %Y-%m-%d
-(the ISO 8601 date format).
+(the
+.St -iso8601-4
+date format).
.It Cm \&%g
the year corresponding to the ISO week number, without the century.
.It Cm \&%G
@@ -152,7 +154,9 @@ as a decimal number [0,53];
leading zeros are permitted but not required.
All days in a year preceding the first Sunday are considered to be in week 0.
.It Cm \&%V
-the ISO 8601:1988 week number as a decimal number.
+the
+.St -iso8601-4
+week number as a decimal number.
If the week (starting on Monday) that contains January 1 has more than
three days in the new year, then it is considered the first week of the
year.
@@ -181,7 +185,9 @@ Leading zeros are permitted but not required.
.It Cm \&%Y
the year, including the century (i.e., 1998).
.It Cm \&%z
-an ISO 8601 or RFC 2822 timezone specification.
+an
+.St -iso8601-4
+or RFC 2822 timezone specification.
This is one of the following:
the offset from
Coordinated Universal Time
diff --git a/usr.bin/cal/cal.1 b/usr.bin/cal/cal.1
index b3a09343620..e744e8cd9bb 100644
--- a/usr.bin/cal/cal.1
+++ b/usr.bin/cal/cal.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cal.1,v 1.24 2010/09/03 11:09:28 jmc Exp $
+.\" $OpenBSD: cal.1,v 1.25 2011/09/16 15:01:58 jmc Exp $
.\" $NetBSD: cal.1,v 1.6 1995/09/02 05:34:20 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -33,7 +33,7 @@
.\"
.\" @(#)cal.1 8.2 (Berkeley) 4/28/95
.\"
-.Dd $Mdocdate: September 3 2010 $
+.Dd $Mdocdate: September 16 2011 $
.Dt CAL 1
.Os
.Sh NAME
@@ -120,7 +120,9 @@ are extensions to that specification.
.Pp
The week number computed by
.Fl mw
-is compliant with the ISO 8601 specification.
+is compliant with the
+.St -iso8601-4
+specification.
.Sh HISTORY
A
.Nm
diff --git a/usr.bin/newsyslog/newsyslog.8 b/usr.bin/newsyslog/newsyslog.8
index 0a532de83ee..9f9ea009d04 100644
--- a/usr.bin/newsyslog/newsyslog.8
+++ b/usr.bin/newsyslog/newsyslog.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: newsyslog.8,v 1.46 2011/05/19 05:11:39 lum Exp $
+.\" $OpenBSD: newsyslog.8,v 1.47 2011/09/16 15:01:58 jmc Exp $
.\"
.\" Copyright (c) 1997, Jason Downs. All rights reserved.
.\"
@@ -41,7 +41,7 @@
.\" the suitability of this software for any purpose. It is
.\" provided "as is" without express or implied warranty.
.\"
-.Dd $Mdocdate: May 19 2011 $
+.Dd $Mdocdate: September 16 2011 $
.Dt NEWSYSLOG 8
.Os
.Sh NAME
@@ -239,7 +239,7 @@ field consists of an optional interval in hours, possibly followed
by an
.So Li \&@ Sc Ns -sign
and a time in a restricted
-.Tn ISO 8601
+.St -iso8601-4
format or by a
.So Li \&$ Sc Ns -sign
and a time specification for logfile rotation at a fixed time once
@@ -260,11 +260,11 @@ component in the current implementation, since the only comparison is
.Pp
.Sy ISO 8601 restricted time format:
The lead-in character for a restricted
-.Tn ISO 8601
+.St -iso8601-4
time is an
.So Li \&@ Sc Ns -sign .
The particular format of the time in restricted
-.Tn ISO 8601
+.St -iso8601-4
is:
.Sm off
.Oo Oo Oo Oo Oo