after some thought, i think it unlikely that we will need to specify

a revision number for ISO 8601; in addition, the revision number makes
the text unwieldy when discussing the standard in a casual manner.

therefore change the macro from -8601-4 to simply -8601, which will output
"ISO 8601". i'll get kristaps or ingo to make the change upstream to mandoc.

discussed with/ok millert

7 files changed, 23 insertions, 23 deletions

diff --git a/lib/libc/time/strftime.3 b/lib/libc/time/strftime.3
index 83c06907404..e6e22823af8 100644
--- a/lib/libc/time/strftime.3
+++ b/lib/libc/time/strftime.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)strftime.3    5.12 (Berkeley) 6/29/91
-.\"	$OpenBSD: strftime.3,v 1.26 2011/09/16 15:01:58 jmc Exp $
+.\"	$OpenBSD: strftime.3,v 1.27 2011/09/16 19:36:07 jmc Exp $
 .\"
 .Dd $Mdocdate: September 16 2011 $
 .Dt STRFTIME 3
@@ -101,11 +101,11 @@ is replaced by the date in the format
 .Dq Li %Y-%m-%d .
 .It Cm \&%G
 is replaced by the
-.St -iso8601-4
+.St -iso8601
 year with century as a decimal number.
 .It Cm \&%g
 is replaced by the
-.St -iso8601-4
+.St -iso8601
 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).
@@ -225,7 +225,7 @@ and
 conversion specifications are extensions.
 .Pp
 Use of the
-.St -iso8601-4
+.St -iso8601
 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
diff --git a/lib/libc/time/strptime.3 b/lib/libc/time/strptime.3
index 9c0a590b041..dedf7b502fb 100644
--- a/lib/libc/time/strptime.3
+++ b/lib/libc/time/strptime.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strptime.3,v 1.19 2011/09/16 15:01:58 jmc Exp $
+.\"	$OpenBSD: strptime.3,v 1.20 2011/09/16 19:36:07 jmc Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -98,7 +98,7 @@ the same as
 .It Cm \&%F
 the date as %Y-%m-%d
 (the
-.St -iso8601-4
+.St -iso8601
 date format).
 .It Cm \&%g
 the year corresponding to the ISO week number, without the century.
@@ -155,7 +155,7 @@ 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
-.St -iso8601-4
+.St -iso8601
 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
@@ -186,7 +186,7 @@ Leading zeros are permitted but not required.
 the year, including the century (i.e., 1998).
 .It Cm \&%z
 an
-.St -iso8601-4
+.St -iso8601
 or RFC 2822 timezone specification.
 This is one of the following:
 the offset from
diff --git a/share/man/man7/mdoc.7 b/share/man/man7/mdoc.7
index 3fc4e13341c..0ed54cd08e4 100644
--- a/share/man/man7/mdoc.7
+++ b/share/man/man7/mdoc.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mdoc.7,v 1.82 2011/09/09 15:29:21 jmc Exp $
+.\"	$OpenBSD: mdoc.7,v 1.83 2011/09/16 19:36:07 jmc Exp $
 .\"
 .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 9 2011 $
+.Dd $Mdocdate: September 16 2011 $
 .Dt MDOC 7
 .Os
 .Sh NAME
@@ -2830,8 +2830,8 @@ The following standards are recognised:
 .St -ieee754
 .It \-iso8802-3
 .St -iso8802-3
-.It \-iso8601-4
-.St -iso8601-4
+.It \-iso8601
+.St -iso8601
 .It \-ieee1275-94
 .St -ieee1275-94
 .It \-xpg3
diff --git a/usr.bin/cal/cal.1 b/usr.bin/cal/cal.1
index e744e8cd9bb..5e0ff4cde32 100644
--- a/usr.bin/cal/cal.1
+++ b/usr.bin/cal/cal.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cal.1,v 1.25 2011/09/16 15:01:58 jmc Exp $
+.\"	$OpenBSD: cal.1,v 1.26 2011/09/16 19:36:07 jmc Exp $
 .\"	$NetBSD: cal.1,v 1.6 1995/09/02 05:34:20 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -121,7 +121,7 @@ are extensions to that specification.
 The week number computed by
 .Fl mw
 is compliant with the
-.St -iso8601-4
+.St -iso8601
 specification.
 .Sh HISTORY
 A
diff --git a/usr.bin/mandoc/st.in b/usr.bin/mandoc/st.in
index b6aed61546d..03971c9f8b1 100644
--- a/usr.bin/mandoc/st.in
+++ b/usr.bin/mandoc/st.in
@@ -1,4 +1,4 @@
-/*	$Id: st.in,v 1.10 2011/09/09 15:29:21 jmc Exp $ */
+/*	$Id: st.in,v 1.11 2011/09/16 19:36:07 jmc Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -59,7 +59,7 @@ LINE("-ansiC-89",	"ANSI X3.159-1989 (\\(lqANSI\\~C89\\(rq)")
 LINE("-ansiC-99",	"ANSI/ISO/IEC 9899-1999 (\\(lqANSI\\~C99\\(rq)")
 LINE("-ieee754",	"IEEE Std 754-1985")
 LINE("-iso8802-3",	"ISO 8802-3: 1989")
-LINE("-iso8601-4",	"ISO 8601:2004")
+LINE("-iso8601",	"ISO 8601")
 LINE("-ieee1275-94",	"IEEE Std 1275-1994 (\\(lqOpen Firmware\\(rq)")
 LINE("-xpg3",		"X/Open Portability Guide Issue\\~3 (\\(lqXPG3\\(rq)")
 LINE("-xpg4",		"X/Open Portability Guide Issue\\~4 (\\(lqXPG4\\(rq)")
diff --git a/usr.bin/newsyslog/newsyslog.8 b/usr.bin/newsyslog/newsyslog.8
index 9f9ea009d04..edbfc739a7b 100644
--- a/usr.bin/newsyslog/newsyslog.8
+++ b/usr.bin/newsyslog/newsyslog.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: newsyslog.8,v 1.47 2011/09/16 15:01:58 jmc Exp $
+.\"	$OpenBSD: newsyslog.8,v 1.48 2011/09/16 19:36:07 jmc Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -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
-.St -iso8601-4
+.St -iso8601
 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
-.St -iso8601-4
+.St -iso8601
 time is an
 .So Li \&@ Sc Ns -sign .
 The particular format of the time in restricted
-.St -iso8601-4
+.St -iso8601
 is:
 .Sm off
 .Oo Oo Oo Oo Oo
diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1
index b1979de0590..55e80740bec 100644
--- a/usr.bin/touch/touch.1
+++ b/usr.bin/touch/touch.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: touch.1,v 1.27 2011/09/09 15:33:14 jmc Exp $
+.\"	$OpenBSD: touch.1,v 1.28 2011/09/16 19:36:07 jmc Exp $
 .\"	$NetBSD: touch.1,v 1.8 1995/08/31 22:10:05 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)touch.1	8.3 (Berkeley) 4/28/95
 .\"
-.Dd $Mdocdate: September 9 2011 $
+.Dd $Mdocdate: September 16 2011 $
 .Dt TOUCH 1
 .Os
 .Sh NAME
@@ -73,7 +73,7 @@ No error messages are displayed and the exit value is not affected.
 .Sm on
 Change the access and modification times to the specified time,
 in a format compliant with the
-.St -iso8601-4
+.St -iso8601
 standard.
 The parts of the argument represent the following:
 .Pp