Set default OS version tag and import various NetBSD version tags as well.

2 files changed, 37 insertions, 13 deletions

diff --git a/share/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common
index fcfba4f3816..bbd0e328301 100644
--- a/share/tmac/mdoc/doc-common
+++ b/share/tmac/mdoc/doc-common
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: doc-common,v 1.5 1997/04/22 21:11:29 etheisen Exp $
+.\"	$OpenBSD: doc-common,v 1.6 1997/10/20 02:04:44 etheisen Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -192,7 +192,7 @@
 .de Os
 .ds oS Null
 .if "\\$1"" \{\
-.	ds oS OpenBSD 2.1
+.	ds oS OpenBSD 2.2
 .\}
 .if "\\$2"" \{\
 .	ds aa Non-Null
@@ -224,18 +224,26 @@
 .if "\\$1"NetBSD" \{\
 .	ds oS NetBSD
 .	if "\\$2"0.8"  .as oS \00.8
-.	if "\\$2"0.8a" .as oS \00.8a
+.	if "\\$2"0.8a" .as oS \00.8A
 .	if "\\$2"0.9"  .as oS \00.9
-.	if "\\$2"0.9a" .as oS \00.9a
+.	if "\\$2"0.9a" .as oS \00.9A
 .	if "\\$2"1.0"  .as oS \01.0
-.	if "\\$2"1.0"  .as oS \01.0a
+.	if "\\$2"1.0a" .as oS \01.0A
 .	if "\\$2"1.1"  .as oS \01.1
-.	if "\\$2"1.1"  .as oS \01.2
+.	if "\\$2"1.2"  .as oS \01.2
+.	if "\\$2"1.2a" .as oS \01.2A
+.	if "\\$2"1.2b" .as oS \01.2B
+.	if "\\$2"1.2c" .as oS \01.2C
+.	if "\\$2"1.2d" .as oS \01.2D
+.	if "\\$2"1.2e" .as oS \01.2E
+.	if "\\$2"1.3"  .as oS \01.3
 .\}
 .if "\\$1"OpenBSD" \{\
 .	ds oS OpenBSD
 .	if "\\$2"1.2"  .as oS \01.2
 .	if "\\$2"2.0"  .as oS \02.0
+.	if "\\$2"2.1"  .as oS \02.1
+.	if "\\$2"2.2"  .as oS \02.2
 .\}
 .if "\\*(oS"Null" .ds oS \0\\$1
 .if "\\*(aa"Non-Null" .as oS \0\\$2
diff --git a/share/tmac/mdoc/doc-syms b/share/tmac/mdoc/doc-syms
index 3eac5056146..df3dfacfb0a 100644
--- a/share/tmac/mdoc/doc-syms
+++ b/share/tmac/mdoc/doc-syms
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: doc-syms,v 1.10 1997/09/19 23:48:46 deraadt Exp $
+.\"	$OpenBSD: doc-syms,v 1.11 1997/10/20 02:04:45 etheisen Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -129,23 +129,37 @@
 .ds aa \&\f\\n(cF\s\\n(cZ
 .if \\n(.$==2 \{\
 .	if "\\$1"0.8"  \&\\*(tNNetBSD\\*(aa 0.8\\*(aa\\$2
-.	if "\\$1"0.8a"  \&\\*(tNNetBSD\\*(aa 0.8a\\*(aa\\$2
+.	if "\\$1"0.8a" \&\\*(tNNetBSD\\*(aa 0.8A\\*(aa\\$2
 .	if "\\$1"0.9"  \&\\*(tNNetBSD\\*(aa 0.9\\*(aa\\$2
-.	if "\\$1"0.9a"  \&\\*(tNNetBSD\\*(aa 0.9a\\*(aa\\$2
+.	if "\\$1"0.9a" \&\\*(tNNetBSD\\*(aa 0.9A\\*(aa\\$2
 .	if "\\$1"1.0"  \&\\*(tNNetBSD\\*(aa 1.0\\*(aa\\$2
-.	if "\\$1"1.0a"  \&\\*(tNNetBSD\\*(aa 1.0a\\*(aa\\$2
+.	if "\\$1"1.0a" \&\\*(tNNetBSD\\*(aa 1.0A\\*(aa\\$2
 .	if "\\$1"1.1"  \&\\*(tNNetBSD\\*(aa 1.1\\*(aa\\$2
 .	if "\\$1"1.2"  \&\\*(tNNetBSD\\*(aa 1.2\\*(aa\\$2
+.	if "\\$1"1.2a" \&\\*(tNNetBSD\\*(aa 1.2A\\*(aa\\$2
+.	if "\\$1"1.2b" \&\\*(tNNetBSD\\*(aa 1.2B\\*(aa\\$2
+.	if "\\$1"1.2c" \&\\*(tNNetBSD\\*(aa 1.2C\\*(aa\\$2
+.	if "\\$1"1.2d" \&\\*(tNNetBSD\\*(aa 1.2D\\*(aa\\$2
+.	if "\\$1"1.2e" \&\\*(tNNetBSD\\*(aa 1.2E\\*(aa\\$2
+.	if "\\$1"1.3"  \&\\*(tNNetBSD\\*(aa 1.3\\*(aa\\$2
 .\}
 .if \\n(.$==1 \{\
 .	if "\\$1"0.8"  \&\\*(tNNetBSD\\*(aa 0.8\\*(aa
-.	if "\\$1"0.8a"  \&\\*(tNNetBSD\\*(aa 0.8a\\*(aa
+.	if "\\$1"0.8a" \&\\*(tNNetBSD\\*(aa 0.8A\\*(aa
 .	if "\\$1"0.9"  \&\\*(tNNetBSD\\*(aa 0.9\\*(aa
-.	if "\\$1"0.9a"  \&\\*(tNNetBSD\\*(aa 0.9a\\*(aa
+.	if "\\$1"0.9a" \&\\*(tNNetBSD\\*(aa 0.9A\\*(aa
 .	if "\\$1"1.0"  \&\\*(tNNetBSD\\*(aa 1.0\\*(aa
-.	if "\\$1"1.0a"  \&\\*(tNNetBSD\\*(aa 1.0a\\*(aa
+.	if "\\$1"1.0a" \&\\*(tNNetBSD\\*(aa 1.0A\\*(aa
 .	if "\\$1"1.1"  \&\\*(tNNetBSD\\*(aa 1.1\\*(aa
 .	if "\\$1"1.2"  \&\\*(tNNetBSD\\*(aa 1.2\\*(aa
+.	if "\\$1"1.2a" \&\\*(tNNetBSD\\*(aa 1.2A\\*(aa
+.	if "\\$1"1.2b" \&\\*(tNNetBSD\\*(aa 1.2B\\*(aa
+.	if "\\$1"1.2c" \&\\*(tNNetBSD\\*(aa 1.2C\\*(aa
+.	if "\\$1"1.2d" \&\\*(tNNetBSD\\*(aa 1.2D\\*(aa
+.	if "\\$1"1.2e" \&\\*(tNNetBSD\\*(aa 1.2E\\*(aa
+.	if "\\$1"1.3"  \&\\*(tNNetBSD\\*(aa 1.3\\*(aa
+.	if "\\$1"."    \&\\*(tNNetBSD\\$1\\*(aa
+.	if "\\$1","    \&\\*(tNNetBSD\\$1\\*(aa
 .\}
 ..
 .\" Ns Ox macro - OpenBSD
@@ -164,6 +178,8 @@
 .	if "\\$1"2.0"  \&\\*(tNOpenBSD\\*(aa 2.0\\*(aa
 .	if "\\$1"2.1"  \&\\*(tNOpenBSD\\*(aa 2.1\\*(aa
 .	if "\\$1"2.2"  \&\\*(tNOpenBSD\\*(aa 2.2\\*(aa
+.	if "\\$1"."    \&\\*(tNOpenBSD\\$1\\*(aa
+.	if "\\$1","    \&\\*(tNOpenBSD\\$1\\*(aa
 .\}
 ..
 .\" Ns At macro - AT&T UNIX (this macro does not handle punctuation)