Merge of NetBSD changes + $OpenBSD$ tags

8 files changed, 11 insertions, 7 deletions

diff --git a/gnu/usr.bin/gas/doc/Makefile.in b/gnu/usr.bin/gas/doc/Makefile.in
index fdae0b28f40..bea1ea50067 100644
--- a/gnu/usr.bin/gas/doc/Makefile.in
+++ b/gnu/usr.bin/gas/doc/Makefile.in
@@ -1,3 +1,5 @@
+#	$OpenBSD: Makefile.in,v 1.2 1998/02/15 18:49:54 niklas Exp $
+
 # Makefile for GNU Assembler documentation
 #  - see pretex.m4 for discussion of preprocessor definitions
 #   Copyright (C) 1987-1992 Free Software Foundation, Inc.
diff --git a/gnu/usr.bin/gas/doc/all.m4 b/gnu/usr.bin/gas/doc/all.m4
index 9205895c185..66bb7f3a75d 100644
--- a/gnu/usr.bin/gas/doc/all.m4
+++ b/gnu/usr.bin/gas/doc/all.m4
@@ -1,5 +1,5 @@
 _divert__(-1)
-<$Id: all.m4,v 1.1 1995/10/18 08:39:08 deraadt Exp $>
+<$OpenBSD: all.m4,v 1.2 1998/02/15 18:49:55 niklas Exp $>
 _define__(<_ALL_ARCH__>,<1>)
 _define__(<_GENERIC__>,<1>)	In case none.m4 changes its mind abt default
 
diff --git a/gnu/usr.bin/gas/doc/as.texinfo b/gnu/usr.bin/gas/doc/as.texinfo
index ce666058cfb..97fa400680f 100644
--- a/gnu/usr.bin/gas/doc/as.texinfo
+++ b/gnu/usr.bin/gas/doc/as.texinfo
@@ -1,6 +1,6 @@
 _dnl__                                          -*-Texinfo-*-
+_dnl__ $OpenBSD: as.texinfo,v 1.2 1998/02/15 18:49:56 niklas Exp $
 _dnl__ Copyright (c) 1991 1992 Free Software Foundation, Inc.
-_dnl__ $Id: as.texinfo,v 1.1 1995/10/18 08:39:08 deraadt Exp $
 \input texinfo @c                               -*-Texinfo-*-
 @c  Copyright (c) 1991 1992 Free Software Foundation, Inc.
 @c %**start of header 
@@ -86,7 +86,7 @@ done.
 @page
 @tex
 \def\$#1${{#1}}  % Kluge: collect RCS revision info without $...$
-\xdef\manvers{\$Revision: 1.1 $}  % For use in headers, footers too
+\xdef\manvers{\$Revision: 1.2 $}  % For use in headers, footers too
 {\parskip=0pt
 \hfill \manvers\par
 \hfill \TeX{}info \texinfoversion\par
diff --git a/gnu/usr.bin/gas/doc/configure.in b/gnu/usr.bin/gas/doc/configure.in
index f9820ea1903..e2fd68c8125 100644
--- a/gnu/usr.bin/gas/doc/configure.in
+++ b/gnu/usr.bin/gas/doc/configure.in
@@ -1,3 +1,5 @@
+#	$OpenBSD: configure.in,v 1.2 1998/02/15 18:49:57 niklas Exp $
+
 # This file is configure.in
 #
 #   Copyright (C) 1987-1992 Free Software Foundation, Inc.
diff --git a/gnu/usr.bin/gas/doc/gen.m4 b/gnu/usr.bin/gas/doc/gen.m4
index 85bf151ea66..f55c0f5d0a6 100644
--- a/gnu/usr.bin/gas/doc/gen.m4
+++ b/gnu/usr.bin/gas/doc/gen.m4
@@ -1,5 +1,5 @@
 _divert__(-1)
-<$Id: gen.m4,v 1.1 1995/10/18 08:39:09 deraadt Exp $>
+<$OpenBSD: gen.m4,v 1.2 1998/02/15 18:49:58 niklas Exp $>
 _define__(<_GENERIC__>,<1>)	In case none.m4 changes its mind abt default
 
 _define__(<_AOUT__>,<1>)
diff --git a/gnu/usr.bin/gas/doc/none.m4 b/gnu/usr.bin/gas/doc/none.m4
index 80bb5172cea..5d7f0a06a61 100644
--- a/gnu/usr.bin/gas/doc/none.m4
+++ b/gnu/usr.bin/gas/doc/none.m4
@@ -1,5 +1,5 @@
 _divert__(-1)
-<$Id: none.m4,v 1.1 1995/10/18 08:39:09 deraadt Exp $>
+<$OpenBSD: none.m4,v 1.2 1998/02/15 18:49:59 niklas Exp $>
 
 Switches:
 
diff --git a/gnu/usr.bin/gas/doc/pretex.m4 b/gnu/usr.bin/gas/doc/pretex.m4
index dcfd3b0966a..26d0d64f03c 100644
--- a/gnu/usr.bin/gas/doc/pretex.m4
+++ b/gnu/usr.bin/gas/doc/pretex.m4
@@ -1,8 +1,8 @@
+` $OpenBSD: pretex.m4,v 1.2 1998/02/15 18:49:59 niklas Exp $'
 divert(-1)				-*-Text-*-
 ` Copyright (c) 1991 Free Software Foundation, Inc.'
 ` This file defines and documents the M4 macros used '
 `      to preprocess some GNU manuals'
-` $Id: pretex.m4,v 1.1 1995/10/18 08:39:09 deraadt Exp $'
 
 I. INTRODUCTION
 
diff --git a/gnu/usr.bin/gas/doc/vintage.m4 b/gnu/usr.bin/gas/doc/vintage.m4
index e6ab49bdeac..aaba64d34e3 100644
--- a/gnu/usr.bin/gas/doc/vintage.m4
+++ b/gnu/usr.bin/gas/doc/vintage.m4
@@ -1,5 +1,5 @@
 _divert__(-1)
-<$Id: vintage.m4,v 1.1 1995/10/18 08:39:09 deraadt Exp $>
+<$OpenBSD: vintage.m4,v 1.2 1998/02/15 18:50:00 niklas Exp $>
 _define__(<_ALL_ARCH__>,<1>)
 _define__(<_GENERIC__>,<1>)	In case none.m4 changes its mind abt default