6205 onbld manuals should be declared as 1onbld

Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Josef Sipek <jeffpc@josefsipek.net>
Approved by: Gordon Ross <gwr@nexenta.com>

44 files changed, 204 insertions, 216 deletions

diff --git a/usr/src/cmd/mandoc/msec.in b/usr/src/cmd/mandoc/msec.in
index e1cc5efb90..73ec6195f9 100644
--- a/usr/src/cmd/mandoc/msec.in
+++ b/usr/src/cmd/mandoc/msec.in
@@ -18,6 +18,7 @@ LINE("1B",		"BSD Compatibility Package Commands")
 LINE("1C",		"Communication Commands")
 LINE("1HAS",		"User Commands")
 LINE("1M",		"Maintenance Commands")
+LINE("1ONBLD",		"illumos Build Tools")
 LINE("1S",		"illumos Specific Commands")
 LINE("2",		"System Calls")
 LINE("3",		"Introduction to Library Functions")
diff --git a/usr/src/pkg/manifests/developer-build-onbld.mf b/usr/src/pkg/manifests/developer-build-onbld.mf
index 1305a93740..a02522c4ed 100644
--- a/usr/src/pkg/manifests/developer-build-onbld.mf
+++ b/usr/src/pkg/manifests/developer-build-onbld.mf
@@ -57,7 +57,7 @@ dir path=opt/onbld/lib/python2.6/onbld/Checks
 dir path=opt/onbld/lib/python2.6/onbld/Scm
 dir path=opt/onbld/lib/python2.6/onbld/hgext
 dir path=opt/onbld/man
-dir path=opt/onbld/man/man1
+dir path=opt/onbld/man/man1onbld
 dir path=opt/onbld/share
 $(i386_ONLY)file path=opt/onbld/bin/$(ARCH)/aw mode=0555
 $(sparc_ONLY)file path=opt/onbld/bin/$(ARCH)/chk4ubin mode=0555
@@ -185,39 +185,39 @@ file path=opt/onbld/lib/python2.6/onbld/__init__.pyc mode=0444
 file path=opt/onbld/lib/python2.6/onbld/hgext/__init__.py mode=0444
 file path=opt/onbld/lib/python2.6/onbld/hgext/__init__.pyc mode=0444
 file path=opt/onbld/lib/python2.6/onbld/hgext/cdm.py mode=0444
-file path=opt/onbld/man/man1/Install.1
-file path=opt/onbld/man/man1/bldenv.1
-file path=opt/onbld/man/man1/bringovercheck.1
-file path=opt/onbld/man/man1/cddlchk.1
-file path=opt/onbld/man/man1/check_rtime.1
-file path=opt/onbld/man/man1/checkpaths.1
-file path=opt/onbld/man/man1/codereview.1
-file path=opt/onbld/man/man1/cstyle.1
-file path=opt/onbld/man/man1/cw.1
-file path=opt/onbld/man/man1/find_elf.1
-file path=opt/onbld/man/man1/findunref.1
-file path=opt/onbld/man/man1/flg.flp.1
-file path=opt/onbld/man/man1/get_depend_info.1
-file path=opt/onbld/man/man1/git-pbchk.1
-file path=opt/onbld/man/man1/hdrchk.1
-file path=opt/onbld/man/man1/hgsetup.1
-file path=opt/onbld/man/man1/interface_check.1
-file path=opt/onbld/man/man1/interface_cmp.1
-file path=opt/onbld/man/man1/jstyle.1
-file path=opt/onbld/man/man1/lintdump.1
-file path=opt/onbld/man/man1/make_pkg_db.1
-file path=opt/onbld/man/man1/mapfilechk.1
-file path=opt/onbld/man/man1/ndrgen.1
-file path=opt/onbld/man/man1/nightly.1
-file path=opt/onbld/man/man1/onu.1
-file path=opt/onbld/man/man1/sccscheck.1
-file path=opt/onbld/man/man1/signit.1
-file path=opt/onbld/man/man1/signproto.1
-file path=opt/onbld/man/man1/webrev.1
-file path=opt/onbld/man/man1/which_scm.1
-file path=opt/onbld/man/man1/ws.1
-file path=opt/onbld/man/man1/wsdiff.1
-file path=opt/onbld/man/man1/xref.1
+file path=opt/onbld/man/man1onbld/Install.1onbld
+file path=opt/onbld/man/man1onbld/bldenv.1onbld
+file path=opt/onbld/man/man1onbld/bringovercheck.1onbld
+file path=opt/onbld/man/man1onbld/cddlchk.1onbld
+file path=opt/onbld/man/man1onbld/check_rtime.1onbld
+file path=opt/onbld/man/man1onbld/checkpaths.1onbld
+file path=opt/onbld/man/man1onbld/codereview.1onbld
+file path=opt/onbld/man/man1onbld/cstyle.1onbld
+file path=opt/onbld/man/man1onbld/cw.1onbld
+file path=opt/onbld/man/man1onbld/find_elf.1onbld
+file path=opt/onbld/man/man1onbld/findunref.1onbld
+file path=opt/onbld/man/man1onbld/flg.flp.1onbld
+file path=opt/onbld/man/man1onbld/get_depend_info.1onbld
+file path=opt/onbld/man/man1onbld/git-pbchk.1onbld
+file path=opt/onbld/man/man1onbld/hdrchk.1onbld
+file path=opt/onbld/man/man1onbld/hgsetup.1onbld
+file path=opt/onbld/man/man1onbld/interface_check.1onbld
+file path=opt/onbld/man/man1onbld/interface_cmp.1onbld
+file path=opt/onbld/man/man1onbld/jstyle.1onbld
+file path=opt/onbld/man/man1onbld/lintdump.1onbld
+file path=opt/onbld/man/man1onbld/make_pkg_db.1onbld
+file path=opt/onbld/man/man1onbld/mapfilechk.1onbld
+file path=opt/onbld/man/man1onbld/ndrgen.1onbld
+file path=opt/onbld/man/man1onbld/nightly.1onbld
+file path=opt/onbld/man/man1onbld/onu.1onbld
+file path=opt/onbld/man/man1onbld/sccscheck.1onbld
+file path=opt/onbld/man/man1onbld/signit.1onbld
+file path=opt/onbld/man/man1onbld/signproto.1onbld
+file path=opt/onbld/man/man1onbld/webrev.1onbld
+file path=opt/onbld/man/man1onbld/which_scm.1onbld
+file path=opt/onbld/man/man1onbld/ws.1onbld
+file path=opt/onbld/man/man1onbld/wsdiff.1onbld
+file path=opt/onbld/man/man1onbld/xref.1onbld
 file path=opt/onbld/share/make.rules mode=0444
 hardlink path=opt/onbld/bin/$(ARCH)/install.bin target=./install
 legacy pkg=SUNWonbld desc="tools used to build the OS-Net consolidation" \
@@ -231,7 +231,7 @@ license usr/src/tools/onbld/THIRDPARTYLICENSE \
 link path=opt/onbld/bin/$(ARCH)/dmake target=make
 link path=opt/onbld/bin/git-nits target=git-pbchk
 link path=opt/onbld/lib/python target=python2.6
-link path=opt/onbld/man/man1/git-nits.1 target=git-pbchk.1
+link path=opt/onbld/man/man1onbld/git-nits.1onbld target=git-pbchk.1onbld
 # webrev(1) requires ps2pdf
 depend fmri=print/filter/ghostscript type=require
 # nightly(1) uses wget
diff --git a/usr/src/tools/Makefile b/usr/src/tools/Makefile
index 644c967844..bd541b758c 100644
--- a/usr/src/tools/Makefile
+++ b/usr/src/tools/Makefile
@@ -105,7 +105,7 @@ ROOTDIRS= \
 	$(ROOTONBLD)/share \
 	$(ROOTONBLD)/gk \
 	$(ROOTONBLD)/man \
-	$(ROOTONBLD)/man/man1
+	$(ROOTONBLD)/man/man1onbld
 
 all :=		TARGET= install
 install :=	TARGET= install
diff --git a/usr/src/tools/Makefile.tools b/usr/src/tools/Makefile.tools
index 972a40836f..78fe5f1d14 100644
--- a/usr/src/tools/Makefile.tools
+++ b/usr/src/tools/Makefile.tools
@@ -43,7 +43,7 @@ ROOTONBLDLIBPY_26=	$(ROOTONBLD)/lib/python2.6
 ROOTONBLDENV=		$(ROOTONBLD)/env
 ROOTONBLDGK=		$(ROOTONBLD)/gk
 ROOTONBLDMAN=		$(ROOTONBLD)/man
-ROOTONBLDMAN1=		$(ROOTONBLD)/man/man1
+ROOTONBLDMAN1ONBLD=	$(ROOTONBLD)/man/man1onbld
 ROOTONBLDETCABI=	$(ROOTONBLD)/etc/abi
 ROOTONBLDETCEXCEPT=	$(ROOTONBLD)/etc/exception_lists
 ROOTONBLDSHARE=		$(ROOTONBLD)/share
@@ -67,7 +67,7 @@ ROOTONBLDGKSHFILES=	$(SHFILES:%=$(ROOTONBLDGK)/%)
 ROOTONBLDPERLFILES=	$(PERLFILES:%=$(ROOTONBLDBIN)/%)
 ROOTONBLDPERLMODULES=	$(PERLMODULES:%=$(ROOTONBLDLIBPERL)/%)
 ROOTONBLDPYFILES=	$(PYFILES:%=$(ROOTONBLDBIN)/%)
-ROOTONBLDMAN1FILES=	$(MAN1FILES:%=$(ROOTONBLDMAN1)/%)
+ROOTONBLDMAN1ONBLDFILES=$(MAN1ONBLDFILES:%=$(ROOTONBLDMAN1ONBLD)/%)
 ROOTONBLDABIAUDITFILES=	$(ABI_AUDITFILES:%=$(ROOTONBLDETCABI)/%)
 ROOTONBLDEXCEPTFILES=	$(EXCEPTFILES:%=$(ROOTONBLDETCEXCEPT)/%)
 
@@ -92,7 +92,7 @@ $(ROOTONBLDETC)/%: %
 $(ROOTONBLDLIBPERL)/%: %
 	$(INS.file)
 
-$(ROOTONBLDMAN1)/%: %
+$(ROOTONBLDMAN1ONBLD)/%: %
 	$(INS.file)
 
 $(ROOTONBLDENV)/%: %
diff --git a/usr/src/tools/codereview/Makefile b/usr/src/tools/codereview/Makefile
index ba126eb340..516ce4e1e1 100644
--- a/usr/src/tools/codereview/Makefile
+++ b/usr/src/tools/codereview/Makefile
@@ -34,9 +34,9 @@ include ../Makefile.tools
 
 CERRWARN += -_gcc=-Wno-parentheses
 
-MAN1FILES= codereview.1
+MAN1ONBLDFILES= codereview.1onbld
 
-$(ROOTONBLDMAN1FILES) := FILEMODE=      644
+$(ROOTONBLDMAN1ONBLDFILES) := FILEMODE=      644
 
 COPTS=	-O
 
@@ -50,7 +50,7 @@ $(PROG): $(OBJS)
 	$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 	$(POST_PROCESS)
 
-install: all .WAIT  $(ROOTONBLDMACHPROG) $(ROOTONBLDMAN1FILES)
+install: all .WAIT  $(ROOTONBLDMACHPROG) $(ROOTONBLDMAN1ONBLDFILES)
 
 clean:
 	$(RM) $(CLEANFILES)
diff --git a/usr/src/tools/codereview/codereview.1 b/usr/src/tools/codereview/codereview.1onbld
index fcdb2631ab..061d1bca86 100644
--- a/usr/src/tools/codereview/codereview.1
+++ b/usr/src/tools/codereview/codereview.1onbld
@@ -19,7 +19,7 @@
 .\"
 .\" Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 .\" Use is subject to license terms.
-.TH codereview 1 "August 5, 2008"
+.TH codereview 1ONBLD "August 5, 2008"
 .UC
 .SH NAME
 codereview \- Diff list generator
diff --git a/usr/src/tools/codesign/Makefile b/usr/src/tools/codesign/Makefile
index 71a2bf55c4..aa0e6bcbf8 100644
--- a/usr/src/tools/codesign/Makefile
+++ b/usr/src/tools/codesign/Makefile
@@ -30,22 +30,22 @@ SHFILES= \
 PERLFILES= \
 	signit
 
-MAN1FILES= \
-	signit.1 \
-	signproto.1
+MAN1ONBLDFILES= \
+	signit.1onbld \
+	signproto.1onbld
 
 CLEANFILES = $(SHFILES) $(PERLFILES)
 
 include ../Makefile.tools
 
-$(ROOTONBLDMAN1FILES) := FILEMODE=	644
+$(ROOTONBLDMAN1ONBLDFILES) := FILEMODE=	644
 
 .KEEP_STATE:
 
-all:	$(SHFILES) $(PERLFILES) $(MAN1FILES)
+all:	$(SHFILES) $(PERLFILES) $(MAN1ONBLDFILES)
 
 install: all .WAIT $(ROOTONBLDSHFILES) $(ROOTONBLDPERLFILES) \
-		$(ROOTONBLDMAN1FILES)
+		$(ROOTONBLDMAN1ONBLDFILES)
 
 clean:
 	$(RM) $(CLEANFILES)
diff --git a/usr/src/tools/codesign/signit.1 b/usr/src/tools/codesign/signit.1onbld
index fb9e6f8817..7feafdf5a2 100644
--- a/usr/src/tools/codesign/signit.1
+++ b/usr/src/tools/codesign/signit.1onbld
@@ -21,8 +21,7 @@
 .\" Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 .\" Use is subject to license terms.
 .\"
-.\" ident	"%Z%%M%	%I%	%E% SMI"
-.TH signit 1 "13 June 2007"
+.TH signit 1ONBLD "13 June 2007"
 .SH NAME
 .I signit
 \- sign files using code signing server
@@ -85,4 +84,4 @@ One or more files were not signed successfully.
 .LP
 .SH SEE ALSO
 .LP
-signproto(1)
+signproto(1ONBLD)
diff --git a/usr/src/tools/codesign/signproto.1 b/usr/src/tools/codesign/signproto.1onbld
index 61ecad35a5..58310ce2f3 100644
--- a/usr/src/tools/codesign/signproto.1
+++ b/usr/src/tools/codesign/signproto.1onbld
@@ -21,8 +21,7 @@
 .\" Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 .\" Use is subject to license terms.
 .\"
-.\" ident	"%Z%%M%	%I%	%E% SMI"
-.TH signproto 1 "13 June 2007"
+.TH signproto 1ONBLD "13 June 2007"
 .SH NAME
 .I signproto
 \- sign ELF objects in proto area
@@ -35,7 +34,7 @@
 .I signproto
 finds ELF objects in the ON proto area and re-signs them
 using 
-.IR signit (1).
+.IR signit (1ONBLD).
 This operation is normally invoked only for
 release builds, as it replaces the internal development
 signatures with official Sun signatures. The actual signing using
@@ -72,4 +71,4 @@ Location of ON proto area containing files to be signed.
 .LP
 .SH SEE ALSO
 .LP
-signit(1), elfsign(1)
+signit(1ONBLD), elfsign(1)
diff --git a/usr/src/tools/cw/Makefile b/usr/src/tools/cw/Makefile
index 73a3c3ca57..5350851c1a 100644
--- a/usr/src/tools/cw/Makefile
+++ b/usr/src/tools/cw/Makefile
@@ -25,7 +25,7 @@
 
 PROG	= cw
 
-MAN1FILES=	cw.1
+MAN1ONBLDFILES=	cw.1onbld
 
 include ../Makefile.tools
 
@@ -52,13 +52,13 @@ CPPFLAGS += -DDEFAULT_GCC_DIR='"$(GCC_ROOT)/bin"'
 CPPFLAGS += -DDEFAULT_CPLUSPLUS_DIR='"$(SPRO_VROOT)/bin"'
 CPPFLAGS += -DDEFAULT_GPLUSPLUS_DIR='"$(GCC_ROOT)/bin"'
 
-$(ROOTONBLDMAN1FILES) := FILEMODE=      644
+$(ROOTONBLDMAN1ONBLDFILES) := FILEMODE=      644
 
 .KEEP_STATE:
 
-all: $(PROG) $(MAN1FILES)
+all: $(PROG) $(MAN1ONBLDFILES)
 
-install: all .WAIT $(ROOTONBLDMACHPROG) $(ROOTONBLDMAN1FILES)
+install: all .WAIT $(ROOTONBLDMACHPROG) $(ROOTONBLDMAN1ONBLDFILES)
 
 lint: lint_PROG
 
diff --git a/usr/src/tools/cw/cw.1 b/usr/src/tools/cw/cw.1onbld
index 606cf17d49..c5210d4227 100644
--- a/usr/src/tools/cw/cw.1
+++ b/usr/src/tools/cw/cw.1onbld
@@ -21,7 +21,7 @@
 .\" Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 .\" Use is subject to license terms.
 .\"
-.TH cw 1 "22 March 2010"
+.TH cw 1ONBLD "22 March 2010"
 .SH NAME
 .I cw
 \- invoke one or more compilers with argument translation
diff --git a/usr/src/tools/depcheck/Makefile b/usr/src/tools/depcheck/Makefile
index e7755b8e70..9413e3b6d5 100644
--- a/usr/src/tools/depcheck/Makefile
+++ b/usr/src/tools/depcheck/Makefile
@@ -31,21 +31,21 @@ ETCFILES= \
 	SampleLinks \
 	SamplePkgLinks
 
-MAN1FILES= \
-	get_depend_info.1 \
-	make_pkg_db.1
+MAN1ONBLDFILES= \
+	get_depend_info.1onbld \
+	make_pkg_db.1onbld
 
 include ../Makefile.tools
 
 $(ROOTONBLDETCFILES) := FILEMODE=	644
-$(ROOTONBLDMAN1FILES) := FILEMODE=	644
+$(ROOTONBLDMAN1ONBLDFILES) := FILEMODE=	644
 
 .KEEP_STATE:
 
-all:	$(SHFILES) $(MAN1FILES)
+all:	$(SHFILES) $(MAN1ONBLDFILES)
 
 install: all .WAIT $(ROOTONBLDSHFILES) $(ROOTONBLDETCFILES) \
-	$(ROOTONBLDMAN1FILES)
+	$(ROOTONBLDMAN1ONBLDFILES)
 
 clean:
 	$(RM) $(CLEANFILES)
diff --git a/usr/src/tools/depcheck/get_depend_info.1 b/usr/src/tools/depcheck/get_depend_info.1onbld
index 4f90f9ff19..1983732e2f 100644
--- a/usr/src/tools/depcheck/get_depend_info.1
+++ b/usr/src/tools/depcheck/get_depend_info.1onbld
@@ -24,7 +24,7 @@
 .\" Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
 .\" Use is subject to license terms.
 .\" 
-.TH GET_DEPEND_INFO 1 "Nov 2, 2000"
+.TH GET_DEPEND_INFO 1ONBLD "Nov 2, 2000"
 .SH "NAME"
 get_depend_info \- get dependency information about a package or a file
 .SH "SYNOPSIS"
@@ -55,7 +55,7 @@ Turns on conservative mode, that is, refrains from using
 \fB-\fBdbdir\fR\fR
 .in +16n
 Specifies the directory in which the Perl DBM databases generated by
-\fBmake_pkg_db\fR(1) are located\&.
+\fBmake_pkg_db\fR(1ONBLD) are located\&.
 .sp
 .sp 1
 .in -16n
@@ -197,4 +197,4 @@ MT-Level	Unsafe
 .sp
 .SH "SEE ALSO"
 .PP
-\fBmake_pkg_db\fR(1), \fBattributes\fR(5)
+\fBmake_pkg_db\fR(1ONBLD), \fBattributes\fR(5)
diff --git a/usr/src/tools/depcheck/make_pkg_db.1 b/usr/src/tools/depcheck/make_pkg_db.1onbld
index 4b88bf0f3a..89d42f881c 100644
--- a/usr/src/tools/depcheck/make_pkg_db.1
+++ b/usr/src/tools/depcheck/make_pkg_db.1onbld
@@ -24,7 +24,7 @@
 .\" Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
 .\" Use is subject to license terms.
 .\"
-.TH MAKE_PKG_DB 1 "Nov 2, 2000"
+.TH MAKE_PKG_DB 1ONBLD "Nov 2, 2000"
 .SH "NAME"
 make_pkg_db \- create a Perl DBM database of installed software
 .SH "SYNOPSIS"
@@ -39,7 +39,7 @@ make_pkg_db \- create a Perl DBM database of installed software
 The \fBmake_pkg_db\fR command (a Perl script) generates a Perl DBM database of
 software installed on a system based on \fB/var/sadm/install/contents\fR or the
 contents of a package pool directory\&. The Perl DBM database files are used by
-\fBget_depend_info\fR(1)\&.
+\fBget_depend_info\fR(1ONBLD)\&.
 .PP
 The Perl DBM database files contain information keyed on a file name\&. Some
 files, for example, list the package in which a file is included and the
@@ -187,7 +187,7 @@ MT-Level	Unsafe
 .sp
 .SH "SEE ALSO"
 .PP
-\fBget_depend_info\fR(1), \fBattributes\fR(5)
+\fBget_depend_info\fR(1ONBLD), \fBattributes\fR(5)
 .SH "NOTES"
 .PP
 DBM database files are platform dependent\&. DBM database files you generate on
diff --git a/usr/src/tools/findunref/Makefile b/usr/src/tools/findunref/Makefile
index cda855d604..38baef23fc 100644
--- a/usr/src/tools/findunref/Makefile
+++ b/usr/src/tools/findunref/Makefile
@@ -25,13 +25,13 @@
 #
 
 PROG	  = findunref
-MAN1FILES = findunref.1
+MAN1ONBLDFILES = findunref.1onbld
 CFLAGS += $(CCVERBOSE)
 LINTFLAGS += -ux
 
 include ../Makefile.tools
 
-$(ROOTONBLDMAN1FILES) := FILEMODE=      644
+$(ROOTONBLDMAN1ONBLDFILES) := FILEMODE=      644
 
 EXCEPTION_SRC= common open
 EXCEPTION_LISTS=	$(EXCEPTION_SRC:%=exception_list.%)
@@ -42,7 +42,7 @@ CLOBBERFILES += exception_list
 
 all:    $(PROG) exception_list
 
-install: all .WAIT $(ROOTONBLDMACHPROG) $(ROOTONBLDMAN1FILES)
+install: all .WAIT $(ROOTONBLDMACHPROG) $(ROOTONBLDMAN1ONBLDFILES)
 
 lint:	lint_PROG
 
diff --git a/usr/src/tools/findunref/findunref.1 b/usr/src/tools/findunref/findunref.1onbld
index a9f4af87b7..6e3c11fd48 100644
--- a/usr/src/tools/findunref/findunref.1
+++ b/usr/src/tools/findunref/findunref.1onbld
@@ -19,7 +19,7 @@
 .\"
 .\" Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 .\" Use is subject to license terms.
-.TH findunref 1 "Oct 30, 2012"
+.TH findunref 1ONBLD "Oct 30, 2012"
 .I findunref
 \- find unused files in a source tree
 .SH SYNOPSIS
@@ -32,8 +32,8 @@ findunref [\fB-s\fP \fIsubtree\fP] [\fB-t\fP \fItstampfile\fP]
 The findunref utility lists the files in a source tree which have not been
 accessed more recently than a particular timestamp file.  Although
 findunref may be used on its own, it is usually invoked by
-\fBnightly\fP(1) to find files that are never referenced during a given
-build (see \fB-f\fP in \fBnightly\fP(1)).
+\fBnightly\fP(1ONBLD) to find files that are never referenced during a given
+build (see \fB-f\fP in \fBnightly\fP(1ONBLD)).
 .LP
 The root of the source tree to examine is specified by \fIsrcroot\fP.  To
 simplify comparing findunref output from different source trees, findunref
@@ -71,15 +71,15 @@ By default, \fIsrcroot\fB/.build.tstamp\fR is used.
 .TP 10
 .B -S \fBhg\fP|\fBtw\fP|\fBgit\fP
 Only check files that are managed by the specified SCM.  To simplify
-interaction with \fBwhich_scm\fP(1), the SCM names "mercurial" and
+interaction with \fBwhich_scm\fP(1ONBLD), the SCM names "mercurial" and
 "teamware" may also be specified for "hg" and "tw", respectively.
 By default, all files are checked.
 .SH SEE ALSO
 .LP
 \fBgit\fP(1),
 \fBhg\fP(1),
-\fBnightly\fP(1),
-\fBwhich_scm\fP(1)
+\fBnightly\fP(1ONBLD),
+\fBwhich_scm\fP(1ONBLD)
 .SH NOTES
 Since many files are only used when building for a particular ISA (e.g.,
 Makefiles that are specific to x86 or SPARC), builds must be done on all
diff --git a/usr/src/tools/lintdump/Makefile b/usr/src/tools/lintdump/Makefile
index c5f7b9867d..d397d74668 100644
--- a/usr/src/tools/lintdump/Makefile
+++ b/usr/src/tools/lintdump/Makefile
@@ -25,18 +25,18 @@
 #
 
 PROG      = lintdump
-MAN1FILES = lintdump.1
+MAN1ONBLDFILES = lintdump.1onbld
 CFLAGS   += $(CCVERBOSE)
 
 include ../Makefile.tools
 
-$(ROOTONBLDMAN1FILES) := FILEMODE=	644
+$(ROOTONBLDMAN1ONBLDFILES) := FILEMODE=	644
 
 .KEEP_STATE:
 
 all:    $(PROG)
 
-install: all .WAIT $(ROOTONBLDMACHPROG) $(ROOTONBLDMAN1FILES)
+install: all .WAIT $(ROOTONBLDMACHPROG) $(ROOTONBLDMAN1ONBLDFILES)
 
 lint:	lint_PROG
 
diff --git a/usr/src/tools/lintdump/lintdump.1 b/usr/src/tools/lintdump/lintdump.1onbld
index e65810ea18..4cf36d4e6b 100644
--- a/usr/src/tools/lintdump/lintdump.1
+++ b/usr/src/tools/lintdump/lintdump.1onbld
@@ -1,4 +1,3 @@
-.\" ident	"%Z%%M%	%I%	%E% SMI"
 .\" " CDDL HEADER START
 .\" "
 .\" " The contents of this file are subject to the terms of the
@@ -20,7 +19,7 @@
 .\" "
 .\" "Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 .\" "Use is subject to license terms.
-.TH lintdump 1 "28 Mar 2008"
+.TH lintdump 1ONBLD "28 Mar 2008"
 .I lintdump
 \- dump the contents of one or more lint objects
 .SH SYNOPSIS
diff --git a/usr/src/tools/ndrgen/Makefile b/usr/src/tools/ndrgen/Makefile
index a60e584989..49d57e237a 100644
--- a/usr/src/tools/ndrgen/Makefile
+++ b/usr/src/tools/ndrgen/Makefile
@@ -25,7 +25,7 @@
 
 PROG=	ndrgen ndrgen1
 
-MAN1FILES=	ndrgen.1
+MAN1ONBLDFILES=	ndrgen.1onbld
 
 OBJS=	ndr_main.o ndr_lex.o ndr_anal.o \
 	ndr_gen.o ndr_parse.o ndr_print.o
@@ -39,15 +39,15 @@ CERRWARN += -_gcc=-Wno-unused
 
 CLEANFILES += $(OBJS) y.tab.c y.tab.h
 
-$(ROOTONBLDMAN1FILES) := FILEMODE=      644
+$(ROOTONBLDMAN1ONBLDFILES) := FILEMODE=      644
 
 .KEEP_STATE:
 
 .PARALLEL: $(OBJS)
 
-all:	$(PROG) $(MAN1FILES)
+all:	$(PROG) $(MAN1ONBLDFILES)
 
-install: all .WAIT $(ROOTONBLDMACHPROG) $(ROOTONBLDMAN1FILES)
+install: all .WAIT $(ROOTONBLDMACHPROG) $(ROOTONBLDMAN1ONBLDFILES)
 
 lint:	lint_SRCS
 
diff --git a/usr/src/tools/ndrgen/ndrgen.1 b/usr/src/tools/ndrgen/ndrgen.1onbld
index 64ff1a8b39..2db7b8ee3a 100644
--- a/usr/src/tools/ndrgen/ndrgen.1
+++ b/usr/src/tools/ndrgen/ndrgen.1onbld
@@ -21,9 +21,8 @@
 .\" Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 .\" Use is subject to license terms.
 .\"
-.\" ident	"%Z%%M%	%I%	%E% SMI"
 '\" te
-.TH ndrgen 1 "22 October 2007" "SunOS 5.11" "User Commands"
+.TH ndrgen 1ONBLD "22 October 2007" "SunOS 5.11" "User Commands"
 .SH NAME
 ndrgen \- NDL RPC protocol compiler
 .SH SYNOPSIS
diff --git a/usr/src/tools/scripts/Install.1 b/usr/src/tools/scripts/Install.1onbld
index b1dcb793c8..9670173c15 100644
--- a/usr/src/tools/scripts/Install.1
+++ b/usr/src/tools/scripts/Install.1onbld
@@ -21,7 +21,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.TH Install 1 "14 Jan 2010"
+.TH Install 1ONBLD "14 Jan 2010"
 .SH NAME
 Install \- install a kernel from an ON workspace
 .SH SYNOPSIS
diff --git a/usr/src/tools/scripts/Makefile b/usr/src/tools/scripts/Makefile
index 22c62d1e7f..717147d8ad 100644
--- a/usr/src/tools/scripts/Makefile
+++ b/usr/src/tools/scripts/Makefile
@@ -74,34 +74,34 @@ PYFILES= \
 SCRIPTLINKS= \
 	git-nits
 
-MAN1FILES= \
-	Install.1 \
-	bldenv.1 \
-	bringovercheck.1 \
-	cddlchk.1 \
-	checkpaths.1 \
-	check_rtime.1 \
-	cstyle.1 \
-	find_elf.1 \
-	flg.flp.1 \
-	git-pbchk.1 \
-	hdrchk.1 \
-	interface_check.1 \
-	interface_cmp.1 \
-	hgsetup.1 \
-	jstyle.1 \
-	mapfilechk.1 \
-	nightly.1 \
-	onu.1 \
-	sccscheck.1 \
-	webrev.1 \
-	which_scm.1 \
-	ws.1 \
-	wsdiff.1 \
-	xref.1
-
-MAN1LINKS= \
-	git-nits.1
+MAN1ONBLDFILES= \
+	Install.1onbld \
+	bldenv.1onbld \
+	bringovercheck.1onbld \
+	cddlchk.1onbld \
+	checkpaths.1onbld \
+	check_rtime.1onbld \
+	cstyle.1onbld \
+	find_elf.1onbld \
+	flg.flp.1onbld \
+	git-pbchk.1onbld \
+	hdrchk.1onbld \
+	interface_check.1onbld \
+	interface_cmp.1onbld \
+	hgsetup.1onbld \
+	jstyle.1onbld \
+	mapfilechk.1onbld \
+	nightly.1onbld \
+	onu.1onbld \
+	sccscheck.1onbld \
+	webrev.1onbld \
+	which_scm.1onbld \
+	ws.1onbld \
+	wsdiff.1onbld \
+	xref.1onbld
+
+MAN1ONBLDLINKS= \
+	git-nits.1onbld
 
 MAKEFILES= \
 	xref.mk
@@ -116,37 +116,37 @@ EXCEPTFILES= \
 	interface_check \
 	interface_cmp
 
-CLEANFILES = $(SHFILES) $(PERLFILES) $(PYFILES) bldenv.1
+CLEANFILES = $(SHFILES) $(PERLFILES) $(PYFILES) bldenv.1onbld
 
 include ../Makefile.tools
 
 ROOTONBLDSCRIPTLINKS = $(SCRIPTLINKS:%=$(ROOTONBLDBIN)/%)
-ROOTONBLDMAN1LINKS = $(MAN1LINKS:%=$(ROOTONBLDMAN1)/%)
+ROOTONBLDMAN1ONBLDLINKS = $(MAN1ONBLDLINKS:%=$(ROOTONBLDMAN1ONBLD)/%)
 
-$(ROOTONBLDETCFILES)	:= FILEMODE=	644
-$(ROOTONBLDEXCEPTFILES)	:= FILEMODE=	644
-$(ROOTONBLDPERLMODULES)	:= FILEMODE=	644
-$(ROOTONBLDMAKEFILES)	:= FILEMODE=	644
-$(ROOTONBLDMAN1FILES)	:= FILEMODE=	644
+$(ROOTONBLDETCFILES)		:= FILEMODE=	644
+$(ROOTONBLDEXCEPTFILES)		:= FILEMODE=	644
+$(ROOTONBLDPERLMODULES)		:= FILEMODE=	644
+$(ROOTONBLDMAKEFILES)		:= FILEMODE=	644
+$(ROOTONBLDMAN1ONBLDFILES)	:= FILEMODE=	644
 
 .KEEP_STATE:
 
 all:	$(SHFILES) $(PERLFILES) $(PERLMODULES) $(PYFILES) \
-	$(MAN1FILES) $(MAKEFILES)
+	$(MAN1ONBLDFILES) $(MAKEFILES)
 
 $(ROOTONBLDBIN)/git-nits:
 	$(RM) $(ROOTONBLDBIN)/git-nits
 	$(SYMLINK) git-pbchk $(ROOTONBLDBIN)/git-nits
 
-$(ROOTONBLDMAN1)/git-nits.1:
-	$(RM) $(ROOTONBLDMAN1)/git-nits.1
-	$(SYMLINK) git-pbchk.1 $(ROOTONBLDMAN1)/git-nits.1
+$(ROOTONBLDMAN1ONBLD)/git-nits.1onbld:
+	$(RM) $(ROOTONBLDMAN1ONBLD)/git-nits.1onbld
+	$(SYMLINK) git-pbchk.1onbld $(ROOTONBLDMAN1ONBLD)/git-nits.1onbld
 
-install: all .WAIT $(ROOTONBLDSHFILES) $(ROOTONBLDPERLFILES)	\
-		$(ROOTONBLDPERLMODULES) $(ROOTONBLDPYFILES)	\
-		$(ROOTONBLDSCRIPTLINKS) $(ROOTONBLDMAN1FILES)	\
-		$(ROOTONBLDMAKEFILES) $(ROOTONBLDETCFILES)	\
-		$(ROOTONBLDEXCEPTFILES) $(ROOTONBLDMAN1LINKS)
+install: all .WAIT $(ROOTONBLDSHFILES) $(ROOTONBLDPERLFILES)		\
+		$(ROOTONBLDPERLMODULES) $(ROOTONBLDPYFILES)		\
+		$(ROOTONBLDSCRIPTLINKS) $(ROOTONBLDMAN1ONBLDFILES)	\
+		$(ROOTONBLDMAKEFILES) $(ROOTONBLDETCFILES)		\
+		$(ROOTONBLDEXCEPTFILES) $(ROOTONBLDMAN1ONBLDLINKS)
 
 clean:
 	$(RM) $(CLEANFILES)
@@ -160,10 +160,12 @@ bldenv: bldenv.sh stdenv.sh
 		{ print -r -- "$${shlintout}" ;	false ; } || true
 	$(CHMOD) +x "$@" 
 
-bldenv.1: bldenv
+bldenv.1onbld: bldenv
 	$(RM) "$@"
 	(set +o errexit ; ksh93 $? --nroff ; true) 2>&1 | \
-	sed 's/\.DS/.nf/g;s/\.DE/.fi/' > "$@"
+	sed -e 's/\.DS/.nf/g;s/\.DE/.fi/' \
+	-e 's/\.TH BLDENV 1/.TH BLDENV 1ONBLD/' \
+	-e 's/(1)/(1ONBLD)/' > "$@"
 
 nightly: nightly.sh stdenv.sh
 	$(RM) "$@"
diff --git a/usr/src/tools/scripts/bringovercheck.1 b/usr/src/tools/scripts/bringovercheck.1onbld
index 7edc0d402b..54a16eab9d 100644
--- a/usr/src/tools/scripts/bringovercheck.1
+++ b/usr/src/tools/scripts/bringovercheck.1onbld
@@ -20,9 +20,7 @@
 .\" Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 .\" Use is subject to license terms.
 .\"
-.\" ident	"%Z%%M%	%I%	%E% SMI"
-.\"
-.TH bringovercheck 1 "7 April 2006"
+.TH bringovercheck 1ONBLD "7 April 2006"
 .SH NAME
 .I bringovercheck
 \- Repair misordered workspace timestamps
@@ -30,15 +28,15 @@
 .B bringovercheck
 workspace
 .SH DESCRIPTION
-Some versions of 
-.I bringover(1) 
-fail to 
+Some versions of
+.I bringover(1ONBLD)
+fail to
 .I msync(2)
 writeable mappings; this results in indeterminate modification times
 when the workspace exists on certain filesystems.  When this results
 in SCCS s. files being newer than their respective checked-out source
 files, build carnage may result (see
-.I sccscheck(1)
+.I sccscheck(1ONBLD)
 for one mitigating step being taken).
 
 If a workspace has been damaged by this bug, you can run
diff --git a/usr/src/tools/scripts/cddlchk.1 b/usr/src/tools/scripts/cddlchk.1onbld
index 67e393160b..5c8345f681 100644
--- a/usr/src/tools/scripts/cddlchk.1
+++ b/usr/src/tools/scripts/cddlchk.1onbld
@@ -20,7 +20,7 @@
 .\" Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 .\" Use is subject to license terms.
 .\"
-.TH cddlchk 1 "1 June 2008"
+.TH cddlchk 1ONBLD "1 June 2008"
 .SH NAME
 cddlchk \- Check for valid CDDL header blocks
 .SH SYNOPSIS
diff --git a/usr/src/tools/scripts/check_rtime.1 b/usr/src/tools/scripts/check_rtime.1onbld
index 07364e87a6..31ed36aced 100644
--- a/usr/src/tools/scripts/check_rtime.1
+++ b/usr/src/tools/scripts/check_rtime.1onbld
@@ -19,7 +19,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.TH check_rtime 1 "09 March 2010"
+.TH check_rtime 1ONBLD "09 March 2010"
 .SH NAME
 .I check_rtime
 \- check ELF runtime attributes
@@ -38,7 +38,7 @@ A dynamic object can be defined explicitly as a \fIfile\fP
 or multiple dynamic objects can be located under the directory \fIdir\fP.
 .LP
 .I check_rtime
-is typically called from \fBnightly(1)\fP when the \fB-r\fP
+is typically called from \fBnightly(1ONBLD)\fP when the \fB-r\fP
 option is in effect. In this case the dynamic objects under
 the associated \fIproto\fP area (\fB$ROOT\fP) are checked.
 .I check_rtime
@@ -376,7 +376,7 @@ The \fB-D\fP and \fB-d\fP options are mutually exclusive.
 .TP
 .B \-d depdir
 Use \fIdepdir\fP to generate an alternative dependency mapping.
-\fBfind_elf(1)\fP is used to locate the ELF sharable objects for
+\fBfind_elf(1ONBLD)\fP is used to locate the ELF sharable objects for
 which alternative mappings are required. The \fB-D\fP and \fB-d\fP options
 are mutually exclusive.
 .TP 4
@@ -728,7 +728,7 @@ $CODEMGR_WS/exception_list/check_rtime
 .SH SEE ALSO
 .B crle(1),
 .B elfdump(1),
-.B find_elf(1),
+.B find_elf(1ONBLD),
 .B ldd(1),
 .B ld.so.1(1),
 .B mcs(1).
diff --git a/usr/src/tools/scripts/checkpaths.1 b/usr/src/tools/scripts/checkpaths.1onbld
index 235dda710c..38b7e635ae 100644
--- a/usr/src/tools/scripts/checkpaths.1
+++ b/usr/src/tools/scripts/checkpaths.1onbld
@@ -1,4 +1,3 @@
-.\" ident	"%Z%%M%	%I%	%E% SMI"
 .\" Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 .\" Use is subject to license terms.
 .\"
@@ -22,7 +21,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.TH checkpaths 1 "25 September 2003"
+.TH checkpaths 1ONBLD "25 September 2003"
 .SH NAME
 .I checkpaths
 \- check file path containing files
@@ -40,7 +39,7 @@ file was removed or renamed without updating the corresponding
 \fIinc.flg\fP, \fIcry_files\fP, or \fIexception_list\fP entry.
 .LP
 .I checkpaths
-is typically called from \fBnightly(1)\fP.  It may be invoked
+is typically called from \fBnightly(1ONBLD)\fP.  It may be invoked
 interactively within a workspace, and requires that at least
 \fI$CODEMGR_WS\fP is set to a valid workspace.  It is not necessary
 that a full build has been performed in the workspace to be tested,
@@ -55,7 +54,7 @@ The following options are supported:
 .B \-b
 Disable processing of files that list derived (built) objects.  This
 should be set if the \fI$CODEMGR_WS/proto/\fP directory exists, but
-the contents are known to be bad.  \fBnightly(1)\fP will typically set
+the contents are known to be bad.  \fBnightly(1ONBLD)\fP will typically set
 this flag if the build fails.
 .LP
 .TP 4
@@ -81,4 +80,4 @@ The location of your ON source tree.  Defaults to
 .RE
 .LP
 .SH SEE ALSO
-.B nightly(1).
+.B nightly(1ONBLD).
diff --git a/usr/src/tools/scripts/cstyle.1 b/usr/src/tools/scripts/cstyle.1onbld
index 5b0190a402..72157bb954 100644
--- a/usr/src/tools/scripts/cstyle.1
+++ b/usr/src/tools/scripts/cstyle.1onbld
@@ -20,7 +20,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.TH cstyle 1 "28 March 2005"
+.TH cstyle 1ONBLD "28 March 2005"
 .SH NAME
 .I cstyle
 \- check for some common stylistic errors in C source files
@@ -36,7 +36,7 @@ attempts to check for the cstyle documented in
 \fI/shared/ON/general_docs/cstyle.ms.pdf\fP.  Note that there is much
 in that document that
 .I cannot
-be checked for; just because your code is \fBcstyle(1)\fP clean does not
+be checked for; just because your code is \fBcstyle(1ONBLD)\fP clean does not
 mean that you've followed Sun's C style.  \fICaveat emptor\fP.
 .LP
 .SH OPTIONS
diff --git a/usr/src/tools/scripts/find_elf.1 b/usr/src/tools/scripts/find_elf.1onbld
index 8cf25447dc..e513b4b7b0 100644
--- a/usr/src/tools/scripts/find_elf.1
+++ b/usr/src/tools/scripts/find_elf.1onbld
@@ -19,7 +19,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.TH find_elf 1 "25 March 2010"
+.TH find_elf 1ONBLD "25 March 2010"
 .SH NAME
 find_elf \- Locate ELF shared objects and executables
 .SH SYNOPSIS
@@ -214,9 +214,9 @@ OBJECT 32 DYN  VERDEF   /lib/libc.so
 .RS
 .nf
 .SH SEE ALSO
-.BR check_rtime (1),
-.BR interface_check (1),
-.BR interface_cmp (1),
+.BR check_rtime (1ONBLD),
+.BR interface_check (1ONBLD),
+.BR interface_cmp (1ONBLD),
 .BR ld (1),
 .BR ldd (1),
 .BR elfdump (1),
diff --git a/usr/src/tools/scripts/flg.flp.1 b/usr/src/tools/scripts/flg.flp.1onbld
index 58d6ecb7f2..3fd5e8cc4b 100644
--- a/usr/src/tools/scripts/flg.flp.1
+++ b/usr/src/tools/scripts/flg.flp.1onbld
@@ -1,4 +1,3 @@
-.\" ident	"%Z%%M%	%I%	%E% SMI"
 .\" " CDDL HEADER START
 .\" "
 .\" " The contents of this file are subject to the terms of the
@@ -21,7 +20,7 @@
 .\" "
 .\" "Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
 .\" "Use is subject to license terms."
-.TH flg.flp 1 "18 Oct 2002"
+.TH flg.flp 1ONBLD "18 Oct 2002"
 .I flg.flp
 \- list the files that bringover would bring over due to inc.flg and
 req.flg files
@@ -34,7 +33,7 @@ req.flg files
 .I flg.flp
 uses the inc.flg and req.flg files contained within a workspace to
 determine what additional files would be brought over if one were to
-perform a bringover(1) of the specified directory. The resulting list of
+perform a bringover(1ONBLD) of the specified directory. The resulting list of
 files, specified relative to \fICODEMGR_WS\fP, is sent to standard output.
 .LP
 At most one directory may be specified; if none is specified, the current
@@ -48,7 +47,7 @@ Output the list of files relative to the current working directory, rather
 than \fICODEMGR_WS\fP.
 .SH SEE ALSO
 .LP
-.IR bringover(1)
+.IR bringover(1ONBLD)
 .LP
 The inc.flg and req.flg files are poorly documented, but outlined in
 /shared/ON/tools/teamware/OSNet/doc/osnet-sde.
diff --git a/usr/src/tools/scripts/git-pbchk.1 b/usr/src/tools/scripts/git-pbchk.1onbld
index cb18da4c07..1a05b5b84f 100644
--- a/usr/src/tools/scripts/git-pbchk.1
+++ b/usr/src/tools/scripts/git-pbchk.1onbld
@@ -14,7 +14,7 @@
 .\" Copyright 2015 Elysium Digital, L.L.C.
 .\"
 
-.TH "GIT\-PBCHK" "1" "April 23, 2015" "" ""
+.TH "GIT\-PBCHK" "1ONBLD" "April 23, 2015" "" ""
 
 .SH "NAME"
 \fBgit\-pbchk\fR \- nits and pre\-putback checks for git
diff --git a/usr/src/tools/scripts/hdrchk.1 b/usr/src/tools/scripts/hdrchk.1onbld
index 0297d3e5b3..a93f59b53f 100644
--- a/usr/src/tools/scripts/hdrchk.1
+++ b/usr/src/tools/scripts/hdrchk.1onbld
@@ -20,9 +20,7 @@
 .\" Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 .\" Use is subject to license terms.
 .\"
-.\" ident	"%Z%%M%	%I%	%E% SMI"
-.\"
-.TH hdrchk 1 "02 July 2008"
+.TH hdrchk 1ONBLD "02 July 2008"
 .SH NAME
 hdrchk \- check that header files conform to ON standards
 .SH SYNOPSIS
diff --git a/usr/src/tools/scripts/hgsetup.1 b/usr/src/tools/scripts/hgsetup.1onbld
index f36955155a..4c3b7da217 100644
--- a/usr/src/tools/scripts/hgsetup.1
+++ b/usr/src/tools/scripts/hgsetup.1onbld
@@ -20,7 +20,7 @@
 .\" Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 .\" Use is subject to license terms."
 .\"
-.TH hgsetup 1 "2 October 2008"
+.TH hgsetup 1ONBLD "2 October 2008"
 .SH NAME
 .I hgsetup
 \- sets up a user's ~/.hgrc for development of ON with Mercurial
diff --git a/usr/src/tools/scripts/interface_check.1 b/usr/src/tools/scripts/interface_check.1onbld
index a380fba567..0a91705124 100644
--- a/usr/src/tools/scripts/interface_check.1
+++ b/usr/src/tools/scripts/interface_check.1onbld
@@ -19,7 +19,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.TH interface_check 1 "25 March 2010"
+.TH interface_check 1ONBLD "25 March 2010"
 .SH NAME
 interface_check \- check shared object interfaces
 .SH SYNOPSIS
@@ -42,7 +42,7 @@ These interface description files reflect the association of the shared
 object's global symbols with recorded version definitions.
 .LP
 .I interface_check
-is typically called from \fBnightly(1)\fP when the \fB-A\fP
+is typically called from \fBnightly(1ONBLD)\fP when the \fB-A\fP
 option is in effect. In this case the shared objects under
 the associated \fIproto\fP area (\fB$ROOT\fP) are examined.
 .I interface_check
@@ -383,8 +383,8 @@ interface.err
 $CODEMGR_WS/exception_list/interface_check
 /opt/onbld/etc/exception_list/interface_check
 .SH SEE ALSO
-.BR find_elf(1),
-.BR interface_cmp(1),
+.BR find_elf(1ONBLD),
+.BR interface_cmp(1ONBLD),
 .BR ld(1),
 .BR ldd(1),
 .BR elfdump(1),
diff --git a/usr/src/tools/scripts/interface_cmp.1 b/usr/src/tools/scripts/interface_cmp.1onbld
index f9c30a9810..dd882baad8 100644
--- a/usr/src/tools/scripts/interface_cmp.1
+++ b/usr/src/tools/scripts/interface_cmp.1onbld
@@ -19,7 +19,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.TH interface_cmp 1 "25 March 2010"
+.TH interface_cmp 1ONBLD "25 March 2010"
 .SH NAME
 interface_cmp \- compare shared object interface descriptions
 .SH SYNOPSIS
@@ -35,7 +35,7 @@ files are created by
 .IR interface_check.
 .PP
 .I interface_cmp
-is typically called from \fBnightly(1)\fP when the \fB-A\fP
+is typically called from \fBnightly(1ONBLD)\fP when the \fB-A\fP
 option is in effect following the creation of a new database by
 .IR interface_check .
 To insure symbolic
@@ -235,8 +235,8 @@ the example, they do not indicate any real changes that have
 occurred in the associated system libraries.
 .br
 .SH SEE ALSO
-.BR find_elf(1),
-.BR interface_check(1),
+.BR find_elf(1ONBLD),
+.BR interface_check(1ONBLD),
 .BR ld(1),
 .BR ldd(1),
 .BR elfdump(1),
diff --git a/usr/src/tools/scripts/jstyle.1 b/usr/src/tools/scripts/jstyle.1onbld
index fea00a0752..e0e408a783 100644
--- a/usr/src/tools/scripts/jstyle.1
+++ b/usr/src/tools/scripts/jstyle.1onbld
@@ -1,4 +1,3 @@
-.\" ident	"%Z%%M%	%I%	%E% SMI"
 .\" Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 .\" Use is subject to license terms.
 .\"
@@ -21,7 +20,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.TH jstyle 1 "22 November 2005"
+.TH jstyle 1ONBLD "22 November 2005"
 .SH NAME
 .I jstyle
 \- check for some common stylistic errors in Java source files
@@ -34,14 +33,14 @@
 .B jstyle
 inspects Java source files (*.java) for common stylistic errors.  It
 is similar to
-.BR cstyle (1)
+.BR cstyle (1ONBLD)
 in that it attempts to check for the style
 documented in \fI/shared/ON/general_docs/cstyle.ms.pdf\fP, although by
 necessity is modified to work with Java-specific constructs.  Note that
 there is much in that document that
 .I cannot
 be checked for; just because your code is
-.BR jstyle (1)
+.BR jstyle (1ONBLD)
 clean does not
 mean that you've followed Sun's Java style.  \fICaveat emptor\fP.
 .LP
@@ -105,7 +104,7 @@ must also give no errors.  This way, files cannot become unclean.
 .LP
 .SH BUGS
 .LP
-.BR jstyle (1)
+.BR jstyle (1ONBLD)
 cannot disambiguate Java generic type parameters or
 arguments that span multiple lines from relational operators.  For example:
 .RS 4
diff --git a/usr/src/tools/scripts/mapfilechk.1 b/usr/src/tools/scripts/mapfilechk.1onbld
index ca34f5e050..eb582cd0e6 100644
--- a/usr/src/tools/scripts/mapfilechk.1
+++ b/usr/src/tools/scripts/mapfilechk.1onbld
@@ -19,7 +19,7 @@
 .\"
 .\" Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 .\" Use is subject to license terms.
-.TH mapfilechk 1 "27 January 2009"
+.TH mapfilechk 1ONBLD "27 January 2009"
 .SH NAME
 mapfilechk \- Check for valid link-editor mapfile header blocks
 .SH SYNOPSIS
diff --git a/usr/src/tools/scripts/nightly.1 b/usr/src/tools/scripts/nightly.1onbld
index a0d319f15a..aa719a93cd 100644
--- a/usr/src/tools/scripts/nightly.1
+++ b/usr/src/tools/scripts/nightly.1onbld
@@ -19,7 +19,7 @@
 .\" "Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 .\" "Copyright 2012 Joshua M. Clulow <josh@sysmgr.org>
 .\" "
-.TH nightly 1 "Jan 28, 2014"
+.TH nightly 1ONBLD "Jan 28, 2014"
 .SH NAME
 .I nightly
 \- build an OS-Net consolidation overnight
@@ -207,7 +207,7 @@ recommended, especially in conjunction with the \-p option)
 .TP
 .B \-w
 Report which proto area objects differ between this and the last build.
-See wsdiff(1) for details. Note that the proto areas used for comparison
+See wsdiff(1ONBLD) for details. Note that the proto areas used for comparison
 are the last ones constructed as part of the build. As an example, if both
 a non-debug and debug build are performed (in that order), then the debug
 proto area will be used for comparison (which might not be what you want).
@@ -560,4 +560,4 @@ export NIGHTLY_OPTIONS
 .PD
 .LP
 .SH SEE ALSO
-.BR bldenv (1)
+.BR bldenv (1ONBLD)
diff --git a/usr/src/tools/scripts/onu.1 b/usr/src/tools/scripts/onu.1onbld
index d5b3fe249a..7950d18835 100644
--- a/usr/src/tools/scripts/onu.1
+++ b/usr/src/tools/scripts/onu.1onbld
@@ -20,7 +20,7 @@
 .\" "Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 .\" "Copyright 2010, Richard Lowe
 .\" "
-.TH onu 1 "28 August 2010"
+.TH onu 1ONBLD "28 August 2010"
 .SH NAME
 .I onu
 \- OS/Net Update
diff --git a/usr/src/tools/scripts/sccscheck.1 b/usr/src/tools/scripts/sccscheck.1onbld
index c73025b338..c7299bc89f 100644
--- a/usr/src/tools/scripts/sccscheck.1
+++ b/usr/src/tools/scripts/sccscheck.1onbld
@@ -20,9 +20,7 @@
 .\" Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 .\" Use is subject to license terms.
 .\"
-.\" ident	"%Z%%M%	%I%	%E% SMI"
-.\"
-.TH sccscheck 1 "7 April 2006"
+.TH sccscheck 1ONBLD "7 April 2006"
 .SH NAME
 .I sccscheck
 \- 
diff --git a/usr/src/tools/scripts/webrev.1 b/usr/src/tools/scripts/webrev.1onbld
index d970157275..7def2c35c5 100644
--- a/usr/src/tools/scripts/webrev.1
+++ b/usr/src/tools/scripts/webrev.1onbld
@@ -22,7 +22,7 @@
 .\" Use is subject to license terms.
 .\"
 .\"
-.TH webrev 1 "7 Feb 2014"
+.TH webrev 1ONBLD "7 Feb 2014"
 .SH NAME
 webrev \- Generate HTML codereview materials
 .SH SYNOPSIS
@@ -124,9 +124,9 @@ format.
 See FILE LIST for more details.
 .PP
 In all cases, if the user has activated the workspace with the
-.BR ws (1)
+.BR ws (1ONBLD)
 or
-.BR bldenv (1)
+.BR bldenv (1ONBLD)
 commands, \fBwebrev\fR will use the \fBCODEMGR_PARENT\fR and
 \fBCODEMGR_WS\fR environment variables to identify parent and child
 workspaces respectively.
@@ -137,7 +137,7 @@ the environment.
 .SS Discovering the SCM in use.
 .B webrev
 makes use of
-.BR which_scm (1)
+.BR which_scm (1ONBLD)
 to determine the SCM in use for a given workspace.
 
 .SS Mercurial
@@ -434,7 +434,7 @@ This will remove just the \fIbugfix.onnv\fR directory.
 .BR git "(1),"
 .BR ssh_config "(4),"
 .BR svn "(1),"
-.BR which_scm "(1)"
+.BR which_scm "(1ONBLD)"
 
 .SH ACKNOWLEDGEMENTS
 Acknowledgements to Rob Thurlow, Mike Eisler, Lin Ling,
diff --git a/usr/src/tools/scripts/which_scm.1 b/usr/src/tools/scripts/which_scm.1onbld
index c7e4c671be..b9f21f22a5 100644
--- a/usr/src/tools/scripts/which_scm.1
+++ b/usr/src/tools/scripts/which_scm.1onbld
@@ -21,7 +21,7 @@
 .\" Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 .\" Use is subject to license terms.
 .\"
-.TH which_scm 1 "18 September 2009"
+.TH which_scm 1ONBLD "18 September 2009"
 .SH NAME
 which_scm \- Report Source Code Management system
 .SH SYNOPSIS
diff --git a/usr/src/tools/scripts/ws.1 b/usr/src/tools/scripts/ws.1onbld
index 7bb2985abe..9e58b7c09b 100644
--- a/usr/src/tools/scripts/ws.1
+++ b/usr/src/tools/scripts/ws.1onbld
@@ -1,4 +1,3 @@
-.\" ident	"%Z%%M%	%I%	%E% SMI"
 .\" " CDDL HEADER START
 .\" "
 .\" " The contents of this file are subject to the terms of the
@@ -22,7 +21,7 @@
 .\" "Copyright 2004 Sun Microsystems, Inc."
 .\" "All rights reserved"
 .\" "Use is subject to license terms."
-.TH WS 1 "28 January 1992"
+.TH WS 1ONBLD "28 January 1992"
 .SH NAME
 .I ws 
 \- enable SunOS avocet environments
@@ -424,7 +423,7 @@ $CODEMGR_WS/avocet/sunos/protodefs
 .SH "SEE ALSO"
 .LP
 .IR workspace (1),
-.IR bringover (1),
+.IR bringover (1ONBLD),
 .IR putback (1),
 .IR protodefs(5)
 .LP
diff --git a/usr/src/tools/scripts/wsdiff.1 b/usr/src/tools/scripts/wsdiff.1onbld
index 6c0cb31bf1..8a57fcd81a 100644
--- a/usr/src/tools/scripts/wsdiff.1
+++ b/usr/src/tools/scripts/wsdiff.1onbld
@@ -19,7 +19,7 @@
 .\" "
 .\" " Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 .\" "
-.TH wsdiff 1 "15 Jul 2010"
+.TH wsdiff 1ONBLD "15 Jul 2010"
 .I wsdiff
 \- report differences between proto area objects
 .SH SYNOPSIS
@@ -168,11 +168,11 @@ user@example$ cat results
 <... verbose differences only for genunix.so ...>
 .fi
 .PP
-\fBExample 4: Invoking wsdiff through nightly(1)\fR
+\fBExample 4: Invoking wsdiff through nightly(1ONBLD)\fR
 .PP
-By specifying -w in NIGHTLY_OPTIONS, nightly(1) will use wsdiff(1) to determine
+By specifying -w in NIGHTLY_OPTIONS, nightly(1ONBLD) will use wsdiff(1ONBLD) to determine
 which objects look different, compared to the previous build. A pre-existing proto area
-must exist for wsdiff(1) to compare against. nightly(1) will move aside the
+must exist for wsdiff(1ONBLD) to compare against. nightly(1ONBLD) will move aside the
 pre-existing proto area (renaming it to $ROOT.prev under proto), and will
 invoke wsdiff at the end of the build. The list of changed objects will be reported
 in the nightly mail message, and a results file "wsdiff_results" will appear in the
@@ -189,11 +189,10 @@ to some other value the DMAKE_MAX_JOBS environment variable can be used:
 $ DMAKE_MAX_JOBS=24 wsdiff proto_base proto_patch
 .fi
 .PP
-Note that this variable is also used for nightly(1) so when run from
-nightly(1), wsdiff will honor the setting.
+Note that this variable is also used for nightly(1ONBLD) so when run from
+nightly(1ONBLD), wsdiff will honor the setting.
 .LP
 .SH SEE ALSO
 .LP
-.IR lintdump(1),
-.IR nightly(1),
+.IR nightly(1ONBLD),
 .IR elfdump(1),
diff --git a/usr/src/tools/scripts/xref.1 b/usr/src/tools/scripts/xref.1onbld
index 9ee4c892cf..5663512e07 100644
--- a/usr/src/tools/scripts/xref.1
+++ b/usr/src/tools/scripts/xref.1onbld
@@ -19,7 +19,7 @@
 .\" "
 .\" "Copyright 2009 Sun Microsystems, Inc.  All rights reserved."
 .\" "Use is subject to license terms."
-.TH xref 1 "10 Aug 2009"
+.TH xref 1ONBLD "10 Aug 2009"
 .SH NAME
 .I xref
 \- build and maintain source cross-references
@@ -34,7 +34,7 @@ is a simple tool for building and maintaining source cross-references for
 subtrees of a workspace.  By default, xref builds cscope-fast, ctags, and
 etags (if available; see NOTES) source cross-references for all of the
 eligible files underneath each named subtree, plus any additional eligible
-files reported by flg.flp(1).  File eligibility is determined by pattern
+files reported by flg.flp(1ONBLD).  File eligibility is determined by pattern
 matching -- by default, files matching the following patterns are
 eligible:
 
@@ -54,7 +54,7 @@ assumed to be relative to the current working directory.
 Clobber (rather than build) cross-references.
 .TP 10
 .B -f
-Do not use flg.flp(1) to locate additional related files.  This option is
+Do not use flg.flp(1ONBLD) to locate additional related files.  This option is
 ignored if \fB-c\fP is specified.
 .TP
 .B -m \fImakefile\fP
@@ -127,7 +127,7 @@ Build cscope-fast, ctags, and etags cross-references for $SRC/cmd/agents:
 $ xref $SRC/cmd/agents
 .LP
 Build just the cscope-fast cross-reference for $SRC, and do not use
-flg.flp(1) (since there are no additional source files to find):
+flg.flp(1ONBLD) (since there are no additional source files to find):
 .LP
 $ xref -f -x cscope $SRC
 .LP
@@ -154,8 +154,8 @@ references; see \fIEXAMPLES\fP.
 .SH SEE ALSO
 .LP
 .IR make(1),
-.IR bringover(1),
-.IR flg.flp(1)
+.IR bringover(1ONBLD)
+.IR flg.flp(1ONBLD)
 .SH NOTES
 The etags utility is no longer bundled with the Sun Studio, which
 means it may not be available on all developer systems.  If xref cannot