Module Name: src
Committed By: dholland
Date: Sat Jul 5 19:22:43 UTC 2014
Modified Files:
src/bin/csh/USD.doc: Makefile
src/bin/sh/USD.doc: Makefile
src/external/bsd/atf/share/doc/atf: Makefile
src/external/bsd/bind: Makefile.inc
src/external/bsd/kyua-atf-compat/share/doc/kyua-atf-compat: Makefile
src/external/bsd/kyua-cli: Makefile.inc
src/external/bsd/kyua-testers/share/doc/kyua-testers: Makefile
src/external/bsd/ntp: Makefile.inc
src/external/bsd/ntp/html: Makefile
src/external/bsd/nvi/docs/USD.doc/exref: Makefile
src/external/bsd/nvi/docs/USD.doc/vi.ref: Makefile
src/external/bsd/nvi/docs/USD.doc/vitut: Makefile
src/external/ibm-public/postfix: Makefile.inc
src/games/rogue/USD.doc: Makefile
src/games/trek/USD.doc: Makefile
src/gnu/usr.bin/groff/contrib/mom/examples: Makefile
src/gnu/usr.bin/groff/contrib/mom/momdoc: Makefile
src/lib/libbz2: Makefile
src/lib/libcurses/PSD.doc: Makefile
src/share/doc/psd/05.sysman: Makefile
src/share/doc/psd/20.ipctut: Makefile
src/share/doc/psd/21.ipc: Makefile
src/share/doc/smm/04.quotas: Makefile
src/share/doc/smm/06.nfs: Makefile
src/share/doc/smm/18.net: Makefile
src/share/doc/smm/config: Makefile
src/share/doc/usd/17.msmacros: Makefile
src/share/doc/usd/18.msdiffs: Makefile
src/share/doc/usd/19.memacros: Makefile
src/share/doc/usd/20.meref: Makefile
src/usr.bin/gprof: Makefile
src/usr.bin/gprof/PSD.doc: Makefile
src/usr.bin/mail/USD.doc: Makefile
src/usr.bin/make/PSD.doc: Makefile
src/usr.sbin/lpr/SMM.doc: Makefile
src/usr.sbin/timed/SMM.doc/timed: Makefile
src/usr.sbin/timed/SMM.doc/timedop: Makefile
Log Message:
Reorg docs, part 1:
Move all the reference manuals to subdirs of /usr/share/doc/reference.
We have subdirs ref1-ref9, corresponding to man page sections 1-9.
Everything that's the reference manual for a program (sections 1, 6,
8), C interface (sections 2, 3), driver or file system (section 4),
format or configuration (section 5), or kernel internal interface
(section 9) belongs in here.
Section 7 is a little less clear: some things that might go in section
7 if they were a man page aren't really reference manuals. So I'm only
putting things in reference section 7 that are (to me) clearly
reference material, rather than e.g. tutorials, guides, FAQs, etc.
This obviously leaves some room for debate, especially without first
editing the docs with this distinction in mind, but if people hate
what I've done things can always be moved again.
Note also that while roff macro man pages traditionally go in section
7, I have put all the roff documentation (macros, tools, etc.) in one
place in reference/ref1/roff. This will make it easier to find and
also easier to edit it into some kind of coherent form.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/bin/csh/USD.doc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/bin/sh/USD.doc/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/share/doc/atf/Makefile
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/kyua-atf-compat/share/doc/kyua-atf-compat/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/kyua-cli/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/kyua-testers/share/doc/kyua-testers/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/html/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nvi/docs/USD.doc/exref/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nvi/docs/USD.doc/vitut/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/ibm-public/postfix/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/games/rogue/USD.doc/Makefile
cvs rdiff -u -r1.5 -r1.6 src/games/trek/USD.doc/Makefile
cvs rdiff -u -r1.8 -r1.9 src/gnu/usr.bin/groff/contrib/mom/examples/Makefile
cvs rdiff -u -r1.3 -r1.4 src/gnu/usr.bin/groff/contrib/mom/momdoc/Makefile
cvs rdiff -u -r1.17 -r1.18 src/lib/libbz2/Makefile
cvs rdiff -u -r1.11 -r1.12 src/lib/libcurses/PSD.doc/Makefile
cvs rdiff -u -r1.9 -r1.10 src/share/doc/psd/05.sysman/Makefile
cvs rdiff -u -r1.6 -r1.7 src/share/doc/psd/20.ipctut/Makefile
cvs rdiff -u -r1.6 -r1.7 src/share/doc/psd/21.ipc/Makefile
cvs rdiff -u -r1.8 -r1.9 src/share/doc/smm/04.quotas/Makefile
cvs rdiff -u -r1.3 -r1.4 src/share/doc/smm/06.nfs/Makefile
cvs rdiff -u -r1.6 -r1.7 src/share/doc/smm/18.net/Makefile
cvs rdiff -u -r1.2 -r1.3 src/share/doc/smm/config/Makefile
cvs rdiff -u -r1.2 -r1.3 src/share/doc/usd/17.msmacros/Makefile
cvs rdiff -u -r1.4 -r1.5 src/share/doc/usd/18.msdiffs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/share/doc/usd/19.memacros/Makefile
cvs rdiff -u -r1.3 -r1.4 src/share/doc/usd/20.meref/Makefile
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/gprof/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/gprof/PSD.doc/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/mail/USD.doc/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/PSD.doc/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/lpr/SMM.doc/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/timed/SMM.doc/timed/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/timed/SMM.doc/timedop/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/csh/USD.doc/Makefile
diff -u src/bin/csh/USD.doc/Makefile:1.8 src/bin/csh/USD.doc/Makefile:1.9
--- src/bin/csh/USD.doc/Makefile:1.8 Sat Jul 5 19:22:02 2014
+++ src/bin/csh/USD.doc/Makefile Sat Jul 5 19:22:41 2014
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2014/07/05 19:22:02 dholland Exp $
+# $NetBSD: Makefile,v 1.9 2014/07/05 19:22:41 dholland Exp $
# @(#)Makefile 8.1 (Berkeley) 8/14/93
-SECTION=usd
+SECTION=reference/ref1
ARTICLE=csh
SRCS= tabs csh.1 csh.2 csh.3 csh.4 csh.ap csh.g
MACROS= -ms
Index: src/bin/sh/USD.doc/Makefile
diff -u src/bin/sh/USD.doc/Makefile:1.2 src/bin/sh/USD.doc/Makefile:1.3
--- src/bin/sh/USD.doc/Makefile:1.2 Sat Jul 5 19:22:02 2014
+++ src/bin/sh/USD.doc/Makefile Sat Jul 5 19:22:41 2014
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2014/07/05 19:22:02 dholland Exp $
+# $NetBSD: Makefile,v 1.3 2014/07/05 19:22:41 dholland Exp $
# @(#)Makefile 8.1 (Berkeley) 8/14/93
-SECTION=usd
+SECTION=reference/ref1
ARTICLE=shell
SRCS= referargs t.mac t1 t2 t3 t4
MACROS=-ms
Index: src/external/bsd/atf/share/doc/atf/Makefile
diff -u src/external/bsd/atf/share/doc/atf/Makefile:1.6 src/external/bsd/atf/share/doc/atf/Makefile:1.7
--- src/external/bsd/atf/share/doc/atf/Makefile:1.6 Wed Feb 12 04:08:31 2014
+++ src/external/bsd/atf/share/doc/atf/Makefile Sat Jul 5 19:22:41 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/02/12 04:08:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2014/07/05 19:22:41 dholland Exp $
.include <bsd.init.mk>
@@ -10,7 +10,7 @@
.PATH: ${SRCDIR}/tools
.if ${MKDOC} != "no"
-FILESDIR= /usr/share/doc/atf
+FILESDIR= /usr/share/doc/reference/ref1/atf
FILES= AUTHORS COPYING NEWS README
.endif
Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.20 src/external/bsd/bind/Makefile.inc:1.21
--- src/external/bsd/bind/Makefile.inc:1.20 Fri Mar 7 23:22:26 2014
+++ src/external/bsd/bind/Makefile.inc Sat Jul 5 19:22:41 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.20 2014/03/07 23:22:26 christos Exp $
+# $NetBSD: Makefile.inc,v 1.21 2014/07/05 19:22:41 dholland Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -27,7 +27,7 @@ NAMED_USE_PTHREADS?=no
IDIST= ${NETBSDSRCDIR}/external/bsd/bind/dist
BIND_SRCDIR= ${NETBSDSRCDIR}/external/bsd/bind
-BIND_HTMLDIR= /usr/share/doc/html/bind9
+BIND_HTMLDIR= /usr/share/doc/reference/ref8/bind9
.include "${IDIST}/version"
Index: src/external/bsd/kyua-atf-compat/share/doc/kyua-atf-compat/Makefile
diff -u src/external/bsd/kyua-atf-compat/share/doc/kyua-atf-compat/Makefile:1.1 src/external/bsd/kyua-atf-compat/share/doc/kyua-atf-compat/Makefile:1.2
--- src/external/bsd/kyua-atf-compat/share/doc/kyua-atf-compat/Makefile:1.1 Mon Feb 25 00:20:09 2013
+++ src/external/bsd/kyua-atf-compat/share/doc/kyua-atf-compat/Makefile Sat Jul 5 19:22:41 2014
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2013/02/25 00:20:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2014/07/05 19:22:41 dholland Exp $
.include <bsd.init.mk>
.if ${MKSHARE} != "no"
-FILESDIR= /usr/share/doc/kyua-atf-compat
+FILESDIR= /usr/share/doc/reference/ref1/kyua/kyua-atf-compat
FILESMODE= 444
FILES= AUTHORS COPYING NEWS README
.endif
Index: src/external/bsd/kyua-cli/Makefile.inc
diff -u src/external/bsd/kyua-cli/Makefile.inc:1.3 src/external/bsd/kyua-cli/Makefile.inc:1.4
--- src/external/bsd/kyua-cli/Makefile.inc:1.3 Sat Feb 15 19:42:10 2014
+++ src/external/bsd/kyua-cli/Makefile.inc Sat Jul 5 19:22:41 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2014/02/15 19:42:10 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.4 2014/07/05 19:22:41 dholland Exp $
.include <bsd.own.mk>
@@ -11,7 +11,7 @@ KYUA_LIBS?=
# Layout of installed files.
KYUA_BINDIR= /usr/bin
KYUA_CONFDIR= /etc/kyua
-KYUA_DOCDIR= /usr/share/doc/kyua-cli
+KYUA_DOCDIR= /usr/share/doc/reference/ref1/kyua/kyua-cli
KYUA_EXAMPLESDIR= /usr/share/examples/kyua-cli
KYUA_MISCDIR= /usr/share/kyua-cli/misc
KYUA_STOREDIR= /usr/share/kyua-cli/store
Index: src/external/bsd/kyua-testers/share/doc/kyua-testers/Makefile
diff -u src/external/bsd/kyua-testers/share/doc/kyua-testers/Makefile:1.1 src/external/bsd/kyua-testers/share/doc/kyua-testers/Makefile:1.2
--- src/external/bsd/kyua-testers/share/doc/kyua-testers/Makefile:1.1 Sun Feb 24 03:12:59 2013
+++ src/external/bsd/kyua-testers/share/doc/kyua-testers/Makefile Sat Jul 5 19:22:41 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/24 03:12:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2014/07/05 19:22:41 dholland Exp $
.include <bsd.init.mk>
@@ -8,7 +8,7 @@ SRCDIR= ${NETBSDSRCDIR}/external/bsd/ky
.if ${MKSHARE} != "no"
.PATH: ${SRCDIR}
-FILESDIR= /usr/share/doc/kyua-testers
+FILESDIR= /usr/share/doc/reference/ref1/kyua/kyua-testers
FILESMODE= 444
FILES= AUTHORS COPYING NEWS README
.endif
Index: src/external/bsd/ntp/Makefile.inc
diff -u src/external/bsd/ntp/Makefile.inc:1.13 src/external/bsd/ntp/Makefile.inc:1.14
--- src/external/bsd/ntp/Makefile.inc:1.13 Thu Jan 2 21:38:38 2014
+++ src/external/bsd/ntp/Makefile.inc Sat Jul 5 19:22:41 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.13 2014/01/02 21:38:38 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.14 2014/07/05 19:22:41 dholland Exp $
.if !defined(NTP_MAKEFILE_INC)
NTP_MAKEFILE_INC=yes
@@ -17,7 +17,7 @@ WARNS?= 4
IDIST= ${NETBSDSRCDIR}/external/bsd/ntp/dist
NTP_SRCDIR= ${NETBSDSRCDIR}/external/bsd/ntp
-NTP_HTMLDIR= /usr/share/doc/html/ntp
+NTP_HTMLDIR= /usr/share/doc/reference/ref8
SYSCONFDIR=/etc
LOCALSTATEDIR=/var
Index: src/external/bsd/ntp/html/Makefile
diff -u src/external/bsd/ntp/html/Makefile:1.2 src/external/bsd/ntp/html/Makefile:1.3
--- src/external/bsd/ntp/html/Makefile:1.2 Sat Dec 28 18:06:41 2013
+++ src/external/bsd/ntp/html/Makefile Sat Jul 5 19:22:42 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/12/28 18:06:41 christos Exp $
+# $NetBSD: Makefile,v 1.3 2014/07/05 19:22:42 dholland Exp $
.include <bsd.own.mk>
.include "${.CURDIR}/../Makefile.inc"
@@ -112,7 +112,7 @@ NTP_DOCFILES= \
_FDIR:= ntp/${F:H} # subdir
_FDIR:= ${_FDIR:S,/.$,,} # remove trivial directory
_FNAME:= ${F:T} # name override
-_F:= ${DESTDIR}${HTMLDOCDIR}/${_FDIR}/${_FNAME} # installed path
+_F:= ${DESTDIR}${NTP_HTMLDIR}/${_FDIR}/${_FNAME} # installed path
_FILE:= ${F}
.if ${MKUPDATE} == "no"
Index: src/external/bsd/nvi/docs/USD.doc/exref/Makefile
diff -u src/external/bsd/nvi/docs/USD.doc/exref/Makefile:1.2 src/external/bsd/nvi/docs/USD.doc/exref/Makefile:1.3
--- src/external/bsd/nvi/docs/USD.doc/exref/Makefile:1.2 Sat Jul 5 19:22:02 2014
+++ src/external/bsd/nvi/docs/USD.doc/exref/Makefile Sat Jul 5 19:22:42 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2014/07/05 19:22:02 dholland Exp $
+# $NetBSD: Makefile,v 1.3 2014/07/05 19:22:42 dholland Exp $
#
# @(#)Makefile 8.8 (Berkeley) 10/10/96
.include "../../../Makefile.inc"
.PATH: ${DIST}/docs/exref
-SECTION= usd
+SECTION= reference/ref1
ARTICLE= ex
SUBARTICLES= reference summary
SRCS.reference= ex.rm
@@ -13,11 +13,15 @@ SRCS.summary= ex.summary
MACROS= -ms
ROFF_TBL= yes
EXTRAHTMLFILES= \
- ex1.png ex2.png ex3.png ex4.png ex5.png \
- ex6.png ex7.png ex8.png ex9.png ex10.png \
- ex11.png ex12.png ex13.png ex14.png ex15.png \
- ex16.png ex17.png ex18.png ex19.png ex20.png \
- ex21.png ex22.png ex23.png ex24.png ex25.png \
- ex26.png ex27.png
+ reference1.png reference2.png reference3.png reference4.png \
+ reference5.png reference6.png reference7.png reference8.png \
+ reference9.png reference10.png reference11.png reference12.png \
+ reference13.png reference14.png reference15.png reference16.png \
+ reference17.png reference18.png reference19.png reference20.png \
+ reference21.png reference22.png reference23.png reference24.png \
+ reference25.png reference26.png reference27.png \
+ summary1.png summary2.png summary3.png summary4.png \
+ summary5.png summary6.png summary7.png summary8.png \
+ summary9.png
.include <bsd.doc.mk>
Index: src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile
diff -u src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile:1.2 src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile:1.3
--- src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile:1.2 Sat Jul 5 19:22:02 2014
+++ src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile Sat Jul 5 19:22:42 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2014/07/05 19:22:02 dholland Exp $
+# $NetBSD: Makefile,v 1.3 2014/07/05 19:22:42 dholland Exp $
#
# @(#)Makefile 8.20 (Berkeley) 8/18/96
-SECTION= usd
+SECTION= reference/ref1
ARTICLE= viref
SRCS= vi.ref
DEPSRCS= ex.cmd.roff set.opt.roff vi.cmd.roff ref.so index.so
Index: src/external/bsd/nvi/docs/USD.doc/vitut/Makefile
diff -u src/external/bsd/nvi/docs/USD.doc/vitut/Makefile:1.2 src/external/bsd/nvi/docs/USD.doc/vitut/Makefile:1.3
--- src/external/bsd/nvi/docs/USD.doc/vitut/Makefile:1.2 Sat Jul 5 19:22:03 2014
+++ src/external/bsd/nvi/docs/USD.doc/vitut/Makefile Sat Jul 5 19:22:42 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/07/05 19:22:03 dholland Exp $
+# $NetBSD: Makefile,v 1.3 2014/07/05 19:22:42 dholland Exp $
#
# @(#)Makefile 8.7 (Berkeley) 8/18/96
@@ -14,12 +14,20 @@ SRCS.viapwh= vi.apwh.ms
MACROS= -ms
ROFF_TBL= yes
EXTRAHTMLFILES= \
- vi1.png vi2.png vi3.png vi4.png vi5.png \
- vi6.png vi7.png vi8.png vi9.png vi10.png \
- vi11.png vi12.png vi13.png vi14.png vi15.png \
- vi16.png vi17.png vi18.png vi19.png vi20.png \
- vi21.png vi22.png vi23.png vi24.png vi25.png \
- vi26.png vi27.png vi28.png vi29.png vi30.png \
- vi31.png vi32.png vi33.png
+ vitut1.png vitut2.png vitut3.png vitut4.png vitut5.png \
+ vitut6.png vitut7.png vitut8.png vitut9.png vitut10.png \
+ vitut11.png vitut12.png vitut13.png vitut14.png vitut15.png \
+ vitut16.png vitut17.png vitut18.png vitut19.png vitut20.png \
+ vitut21.png vitut22.png vitut23.png vitut24.png vitut25.png \
+ vitut26.png vitut27.png vitut28.png vitut29.png vitut30.png \
+ vitut31.png vitut32.png vitut33.png \
+ summary1.png summary2.png summary3.png summary4.png \
+ summary5.png summary6.png summary7.png summary8.png \
+ summary9.png summary10.png summary11.png summary12.png \
+ summary13.png summary14.png summary15.png summary16.png \
+ summary17.png summary18.png summary19.png summary20.png \
+ summary21.png summary22.png summary23.png summary24.png \
+ summary25.png summary26.png summary27.png summary28.png \
+ summary29.png
.include <bsd.doc.mk>
Index: src/external/ibm-public/postfix/Makefile.inc
diff -u src/external/ibm-public/postfix/Makefile.inc:1.16 src/external/ibm-public/postfix/Makefile.inc:1.17
--- src/external/ibm-public/postfix/Makefile.inc:1.16 Wed Sep 11 09:59:13 2013
+++ src/external/ibm-public/postfix/Makefile.inc Sat Jul 5 19:22:42 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16 2013/09/11 09:59:13 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.17 2014/07/05 19:22:42 dholland Exp $
.include <bsd.own.mk>
@@ -90,7 +90,7 @@ LIBP${_LL:tu}= ${POBJDIR.${_LL}}/lib${_L
PFIX_LIBEXECDIR=/usr/libexec/postfix
PFIX_ETCDIR= /etc/postfix
PFIX_EXAMPLEDIR=/usr/share/examples/postfix
-PFIX_HTMLDIR= /usr/share/doc/html/postfix
+PFIX_HTMLDIR= /usr/share/doc/reference/ref8/postfix
PFIX_SBINDIR= /usr/sbin
# override defaults which are otherwise empty and/or so postconf is correct
Index: src/games/rogue/USD.doc/Makefile
diff -u src/games/rogue/USD.doc/Makefile:1.6 src/games/rogue/USD.doc/Makefile:1.7
--- src/games/rogue/USD.doc/Makefile:1.6 Sat Jul 5 19:22:03 2014
+++ src/games/rogue/USD.doc/Makefile Sat Jul 5 19:22:42 2014
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2014/07/05 19:22:03 dholland Exp $
+# $NetBSD: Makefile,v 1.7 2014/07/05 19:22:42 dholland Exp $
# @(#)Makefile 8.1 (Berkeley) 6/8/93
-SECTION=usd
+SECTION=reference/ref6
ARTICLE=rogue
SRCS= rogue.me
MACROS= -me
Index: src/games/trek/USD.doc/Makefile
diff -u src/games/trek/USD.doc/Makefile:1.5 src/games/trek/USD.doc/Makefile:1.6
--- src/games/trek/USD.doc/Makefile:1.5 Sat Jul 5 19:22:03 2014
+++ src/games/trek/USD.doc/Makefile Sat Jul 5 19:22:42 2014
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2014/07/05 19:22:03 dholland Exp $
+# $NetBSD: Makefile,v 1.6 2014/07/05 19:22:42 dholland Exp $
# @(#)Makefile 8.1 (Berkeley) 6/8/93
-SECTION=usd
+SECTION=reference/ref6
ARTICLE=trek
SRCS= trek.me
MACROS= -me
Index: src/gnu/usr.bin/groff/contrib/mom/examples/Makefile
diff -u src/gnu/usr.bin/groff/contrib/mom/examples/Makefile:1.8 src/gnu/usr.bin/groff/contrib/mom/examples/Makefile:1.9
--- src/gnu/usr.bin/groff/contrib/mom/examples/Makefile:1.8 Tue Jan 26 15:11:56 2010
+++ src/gnu/usr.bin/groff/contrib/mom/examples/Makefile Sat Jul 5 19:22:42 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2010/01/26 15:11:56 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2014/07/05 19:22:42 dholland Exp $
DIST_SUBDIR= contrib/mom/examples
.include <bsd.own.mk>
.if ${MKSHARE} != "no"
-FILESDIR= ${DOCDIR}/groff/mom
+FILESDIR= /usr/share/doc/reference/ref1/roff/mom_examples
MOM_FILES= typesetting.mom letter.mom sample_docs.mom
FILES= README.txt elvis_syntax elvis_syntax.new penguin.ps ${MOM_FILES}
.endif # MKSHARE
Index: src/gnu/usr.bin/groff/contrib/mom/momdoc/Makefile
diff -u src/gnu/usr.bin/groff/contrib/mom/momdoc/Makefile:1.3 src/gnu/usr.bin/groff/contrib/mom/momdoc/Makefile:1.4
--- src/gnu/usr.bin/groff/contrib/mom/momdoc/Makefile:1.3 Tue Jan 26 15:11:56 2010
+++ src/gnu/usr.bin/groff/contrib/mom/momdoc/Makefile Sat Jul 5 19:22:42 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2010/01/26 15:11:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2014/07/05 19:22:42 dholland Exp $
DIST_SUBDIR= contrib/mom/momdoc
.include <bsd.own.mk>
.if ${MKSHARE} != "no"
-FILESDIR= ${HTMLDOCDIR}/groff/mom
+FILESDIR= /usr/share/doc/reference/ref1/roff/mom
FILES= appendices.html \
color.html \
cover.html \
Index: src/lib/libbz2/Makefile
diff -u src/lib/libbz2/Makefile:1.17 src/lib/libbz2/Makefile:1.18
--- src/lib/libbz2/Makefile:1.17 Mon May 7 08:51:47 2012
+++ src/lib/libbz2/Makefile Sat Jul 5 19:22:42 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/05/07 08:51:47 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2014/07/05 19:22:42 dholland Exp $
USE_FORT?= yes # data driven bugs?
@@ -27,7 +27,7 @@ COPTS.blocksort.c+= -fno-loop-optimize
.endif
.if ${MKSHARE} != "no"
-FILESDIR= ${HTMLDOCDIR}/bzip2
+FILESDIR= /usr/share/doc/reference/ref1/bzip2
FILES= manual.html
.endif
Index: src/lib/libcurses/PSD.doc/Makefile
diff -u src/lib/libcurses/PSD.doc/Makefile:1.11 src/lib/libcurses/PSD.doc/Makefile:1.12
--- src/lib/libcurses/PSD.doc/Makefile:1.11 Sat Jul 5 19:22:03 2014
+++ src/lib/libcurses/PSD.doc/Makefile Sat Jul 5 19:22:42 2014
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2014/07/05 19:22:03 dholland Exp $
+# $NetBSD: Makefile,v 1.12 2014/07/05 19:22:42 dholland Exp $
# from: @(#)Makefile 8.2 (Berkeley) 5/23/94
-SECTION=psd
+SECTION=reference/ref3
ARTICLE=curses
SRCS= Master
CEXAMPLES= ex1.gr ex2.gr life.gr twinkle1.gr twinkle2.gr win_st.gr
Index: src/share/doc/psd/05.sysman/Makefile
diff -u src/share/doc/psd/05.sysman/Makefile:1.9 src/share/doc/psd/05.sysman/Makefile:1.10
--- src/share/doc/psd/05.sysman/Makefile:1.9 Sat Jul 5 19:22:03 2014
+++ src/share/doc/psd/05.sysman/Makefile Sat Jul 5 19:22:42 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2014/07/05 19:22:03 dholland Exp $
+# $NetBSD: Makefile,v 1.10 2014/07/05 19:22:42 dholland Exp $
#
# @(#)Makefile 8.2 (Berkeley) 6/1/94
-SECTION=psd
+SECTION=reference/ref3
ARTICLE=sysman
SRCS= 0.t 1.0.t 1.1.t 1.2.t 1.3.t 1.4.t 1.5.t 1.6.t 1.7.t \
2.0.t 2.1.t 2.2.t 2.3.t 2.4.t 2.5.t a.t
Index: src/share/doc/psd/20.ipctut/Makefile
diff -u src/share/doc/psd/20.ipctut/Makefile:1.6 src/share/doc/psd/20.ipctut/Makefile:1.7
--- src/share/doc/psd/20.ipctut/Makefile:1.6 Sat Jul 5 19:22:03 2014
+++ src/share/doc/psd/20.ipctut/Makefile Sat Jul 5 19:22:42 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2014/07/05 19:22:03 dholland Exp $
+# $NetBSD: Makefile,v 1.7 2014/07/05 19:22:42 dholland Exp $
#
# @(#)Makefile 8.1 (Berkeley) 8/14/93
-SECTION=psd
+SECTION=reference/ref3
ARTICLE=ipctut
SRCS= tutor.me
DEPSRCS=dgramread.c dgramsend.c fig2.pic fig3.pic fig8.pic pipe.c \
Index: src/share/doc/psd/21.ipc/Makefile
diff -u src/share/doc/psd/21.ipc/Makefile:1.6 src/share/doc/psd/21.ipc/Makefile:1.7
--- src/share/doc/psd/21.ipc/Makefile:1.6 Sat Jul 5 19:22:03 2014
+++ src/share/doc/psd/21.ipc/Makefile Sat Jul 5 19:22:42 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2014/07/05 19:22:03 dholland Exp $
+# $NetBSD: Makefile,v 1.7 2014/07/05 19:22:42 dholland Exp $
#
# @(#)Makefile 8.1 (Berkeley) 6/8/93
-SECTION=psd
+SECTION=reference/ref3
ARTICLE=ipc
SRCS= 0.t 1.t 2.t 3.t 4.t 5.t
MACROS= -ms
Index: src/share/doc/smm/04.quotas/Makefile
diff -u src/share/doc/smm/04.quotas/Makefile:1.8 src/share/doc/smm/04.quotas/Makefile:1.9
--- src/share/doc/smm/04.quotas/Makefile:1.8 Sat Jul 5 19:22:03 2014
+++ src/share/doc/smm/04.quotas/Makefile Sat Jul 5 19:22:42 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2014/07/05 19:22:03 dholland Exp $
+# $NetBSD: Makefile,v 1.9 2014/07/05 19:22:42 dholland Exp $
#
# @(#)Makefile 8.1 (Berkeley) 6/8/93
-SECTION=smm
+SECTION=reference/ref7
ARTICLE=quotas
SRCS= quotas.ms
MACROS= -ms
Index: src/share/doc/smm/06.nfs/Makefile
diff -u src/share/doc/smm/06.nfs/Makefile:1.3 src/share/doc/smm/06.nfs/Makefile:1.4
--- src/share/doc/smm/06.nfs/Makefile:1.3 Sat Jul 5 19:22:03 2014
+++ src/share/doc/smm/06.nfs/Makefile Sat Jul 5 19:22:42 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2014/07/05 19:22:03 dholland Exp $
+# $NetBSD: Makefile,v 1.4 2014/07/05 19:22:42 dholland Exp $
#
# @(#)Makefile 8.1 (Berkeley) 6/8/93
-SECTION=smm
+SECTION=reference/ref9
ARTICLE=nfs
SRCS= 0.t 1.t 2.t ref.t
MACROS= -me
Index: src/share/doc/smm/18.net/Makefile
diff -u src/share/doc/smm/18.net/Makefile:1.6 src/share/doc/smm/18.net/Makefile:1.7
--- src/share/doc/smm/18.net/Makefile:1.6 Sat Jul 5 19:22:04 2014
+++ src/share/doc/smm/18.net/Makefile Sat Jul 5 19:22:43 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2014/07/05 19:22:04 dholland Exp $
+# $NetBSD: Makefile,v 1.7 2014/07/05 19:22:43 dholland Exp $
#
# @(#)Makefile 8.1 (Berkeley) 6/10/93
-SECTION=smm
+SECTION=reference/ref9
ARTICLE=net
SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t 8.t 9.t a.t b.t c.t d.t e.t f.t
MACROS= -ms
Index: src/share/doc/smm/config/Makefile
diff -u src/share/doc/smm/config/Makefile:1.2 src/share/doc/smm/config/Makefile:1.3
--- src/share/doc/smm/config/Makefile:1.2 Sat Jul 5 19:22:04 2014
+++ src/share/doc/smm/config/Makefile Sat Jul 5 19:22:43 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2014/07/05 19:22:04 dholland Exp $
+# $NetBSD: Makefile,v 1.3 2014/07/05 19:22:43 dholland Exp $
#
# @(#)Makefile 8.1 (Berkeley) 7/27/93
-SECTION=smm
+SECTION=reference/ref1
ARTICLE=config
SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t a.t b.t c.t d.t e.t
MACROS= -ms
Index: src/share/doc/usd/17.msmacros/Makefile
diff -u src/share/doc/usd/17.msmacros/Makefile:1.2 src/share/doc/usd/17.msmacros/Makefile:1.3
--- src/share/doc/usd/17.msmacros/Makefile:1.2 Sat Jul 5 19:22:04 2014
+++ src/share/doc/usd/17.msmacros/Makefile Sat Jul 5 19:22:43 2014
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2014/07/05 19:22:04 dholland Exp $
+# $NetBSD: Makefile,v 1.3 2014/07/05 19:22:43 dholland Exp $
-SECTION=usd
+SECTION=reference/ref1/roff
ARTICLE=msmacros
SRCS= ms fig1.pic
MACROS= -ms
Index: src/share/doc/usd/18.msdiffs/Makefile
diff -u src/share/doc/usd/18.msdiffs/Makefile:1.4 src/share/doc/usd/18.msdiffs/Makefile:1.5
--- src/share/doc/usd/18.msdiffs/Makefile:1.4 Sat Jul 5 19:22:04 2014
+++ src/share/doc/usd/18.msdiffs/Makefile Sat Jul 5 19:22:43 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2014/07/05 19:22:04 dholland Exp $
+# $NetBSD: Makefile,v 1.5 2014/07/05 19:22:43 dholland Exp $
#
# @(#)Makefile 8.1 (Berkeley) 6/8/93
-SECTION=usd
+SECTION=reference/ref1/roff
ARTICLE=msdiffs
SRCS= ms.diffs
MACROS= -ms
Index: src/share/doc/usd/19.memacros/Makefile
diff -u src/share/doc/usd/19.memacros/Makefile:1.3 src/share/doc/usd/19.memacros/Makefile:1.4
--- src/share/doc/usd/19.memacros/Makefile:1.3 Sat Jul 5 19:22:04 2014
+++ src/share/doc/usd/19.memacros/Makefile Sat Jul 5 19:22:43 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2014/07/05 19:22:04 dholland Exp $
+# $NetBSD: Makefile,v 1.4 2014/07/05 19:22:43 dholland Exp $
#
# @(#)Makefile 8.1 (Berkeley) 6/8/93
-SECTION=usd
+SECTION=reference/ref1/roff
ARTICLE=memacros
SRCS= intro.me
MACROS= -me
Index: src/share/doc/usd/20.meref/Makefile
diff -u src/share/doc/usd/20.meref/Makefile:1.3 src/share/doc/usd/20.meref/Makefile:1.4
--- src/share/doc/usd/20.meref/Makefile:1.3 Sat Jul 5 19:22:04 2014
+++ src/share/doc/usd/20.meref/Makefile Sat Jul 5 19:22:43 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2014/07/05 19:22:04 dholland Exp $
+# $NetBSD: Makefile,v 1.4 2014/07/05 19:22:43 dholland Exp $
#
# @(#)Makefile 8.1 (Berkeley) 6/8/93
-SECTION=usd
+SECTION=reference/ref1/roff
ARTICLE=meref
SRCS= ref.me
MACROS= -me
Index: src/usr.bin/gprof/Makefile
diff -u src/usr.bin/gprof/Makefile:1.28 src/usr.bin/gprof/Makefile:1.29
--- src/usr.bin/gprof/Makefile:1.28 Sat Jul 5 19:22:04 2014
+++ src/usr.bin/gprof/Makefile Sat Jul 5 19:22:43 2014
@@ -1,3 +1,5 @@
-# $NetBSD: Makefile,v 1.28 2014/07/05 19:22:04 dholland Exp $
+# $NetBSD: Makefile,v 1.29 2014/07/05 19:22:43 dholland Exp $
+
+SUBDIR=PSD.doc
.include <bsd.subdir.mk>
Index: src/usr.bin/gprof/PSD.doc/Makefile
diff -u src/usr.bin/gprof/PSD.doc/Makefile:1.7 src/usr.bin/gprof/PSD.doc/Makefile:1.8
--- src/usr.bin/gprof/PSD.doc/Makefile:1.7 Sat Jul 5 19:22:04 2014
+++ src/usr.bin/gprof/PSD.doc/Makefile Sat Jul 5 19:22:43 2014
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2014/07/05 19:22:04 dholland Exp $
+# $NetBSD: Makefile,v 1.8 2014/07/05 19:22:43 dholland Exp $
# @(#)Makefile 8.1 (Berkeley) 8/14/93
-SECTION=psd
+SECTION=reference/ref1
ARTICLE=gprof
SRCS= header.me abstract.me intro.me profiling.me gathering.me \
postp.me present.me refs.me
Index: src/usr.bin/mail/USD.doc/Makefile
diff -u src/usr.bin/mail/USD.doc/Makefile:1.6 src/usr.bin/mail/USD.doc/Makefile:1.7
--- src/usr.bin/mail/USD.doc/Makefile:1.6 Sat Jul 5 19:22:04 2014
+++ src/usr.bin/mail/USD.doc/Makefile Sat Jul 5 19:22:43 2014
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2014/07/05 19:22:04 dholland Exp $
+# $NetBSD: Makefile,v 1.7 2014/07/05 19:22:43 dholland Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/8/93
-SECTION=usd
+SECTION=reference/ref1
ARTICLE=mail
SRCS= mail0.nr mail1.nr mail2.nr mail3.nr mail4.nr mail5.nr mail6.nr \
mail7.nr mail8.nr mail9.nr maila.nr
Index: src/usr.bin/make/PSD.doc/Makefile
diff -u src/usr.bin/make/PSD.doc/Makefile:1.3 src/usr.bin/make/PSD.doc/Makefile:1.4
--- src/usr.bin/make/PSD.doc/Makefile:1.3 Sat Jul 5 19:22:05 2014
+++ src/usr.bin/make/PSD.doc/Makefile Sat Jul 5 19:22:43 2014
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2014/07/05 19:22:05 dholland Exp $
+# $NetBSD: Makefile,v 1.4 2014/07/05 19:22:43 dholland Exp $
# @(#)Makefile 8.1 (Berkeley) 8/14/93
-SECTION=psd
+SECTION=reference/ref1
ARTICLE=make
SRCS= tutorial.ms
MACROS= -ms
Index: src/usr.sbin/lpr/SMM.doc/Makefile
diff -u src/usr.sbin/lpr/SMM.doc/Makefile:1.6 src/usr.sbin/lpr/SMM.doc/Makefile:1.7
--- src/usr.sbin/lpr/SMM.doc/Makefile:1.6 Sat Jul 5 19:22:05 2014
+++ src/usr.sbin/lpr/SMM.doc/Makefile Sat Jul 5 19:22:43 2014
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2014/07/05 19:22:05 dholland Exp $
+# $NetBSD: Makefile,v 1.7 2014/07/05 19:22:43 dholland Exp $
# @(#)Makefile 8.1 (Berkeley) 6/8/93
-SECTION=smm
+SECTION=reference/ref8
ARTICLE=lpd
SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t
MACROS= -ms
Index: src/usr.sbin/timed/SMM.doc/timed/Makefile
diff -u src/usr.sbin/timed/SMM.doc/timed/Makefile:1.6 src/usr.sbin/timed/SMM.doc/timed/Makefile:1.7
--- src/usr.sbin/timed/SMM.doc/timed/Makefile:1.6 Sat Jul 5 19:22:05 2014
+++ src/usr.sbin/timed/SMM.doc/timed/Makefile Sat Jul 5 19:22:43 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2014/07/05 19:22:05 dholland Exp $
+# $NetBSD: Makefile,v 1.7 2014/07/05 19:22:43 dholland Exp $
#
# @(#)Makefile 8.2 (Berkeley) 5/11/94
-SECTION=smm
+SECTION=reference/ref5
ARTICLE=timed
SRCS= timed.ms
DEPSRCS=time date unused loop # spell.ok?
Index: src/usr.sbin/timed/SMM.doc/timedop/Makefile
diff -u src/usr.sbin/timed/SMM.doc/timedop/Makefile:1.3 src/usr.sbin/timed/SMM.doc/timedop/Makefile:1.4
--- src/usr.sbin/timed/SMM.doc/timedop/Makefile:1.3 Sat Jul 5 19:22:05 2014
+++ src/usr.sbin/timed/SMM.doc/timedop/Makefile Sat Jul 5 19:22:43 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2014/07/05 19:22:05 dholland Exp $
+# $NetBSD: Makefile,v 1.4 2014/07/05 19:22:43 dholland Exp $
#
# @(#)Makefile 8.1 (Berkeley) 6/8/93
-SECTION=smm
-ARTICLE=timedop
+SECTION=reference/ref8
+ARTICLE=timed
SRCS= timed.ms
MACROS= -ms
-EXTRAHTMLFILES=timedop1.png timedop2.png
+EXTRAHTMLFILES=timed1.png timed2.png
.include <bsd.doc.mk>
