3 files changed, 12 insertions, 37 deletions
diff --git a/release/doc/share/mk/doc.relnotes.mk b/release/doc/share/mk/doc.relnotes.mk
index 8248441..51f8444 100644
--- a/release/doc/share/mk/doc.relnotes.mk
+++ b/release/doc/share/mk/doc.relnotes.mk
@@ -2,5 +2,12 @@
 
 DOC_PREFIX?= ${RELN_ROOT}/../../../doc
 
+# Find the RELNOTESng document catalog
+EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
+
+# Use the appropriate architecture-dependent RELNOTESng stylesheet
+DSLHTML?=	${RELN_ROOT}/share/sgml/release.dsl
+DSLPRINT?=	${RELN_ROOT}/share/sgml/release.dsl
+
 # XXX using /release/doc as anchor!
 DESTDIR?= ${DOCDIR}/${.CURDIR:C/^.*\/release\/doc//}
diff --git a/release/doc/share/sgml/release-i386.dsl b/release/doc/share/sgml/release-i386.dsl
deleted file mode 100644
index f3e52f7..0000000
--- a/release/doc/share/sgml/release-i386.dsl
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" CDATA DSSSL>
-]>
-
-<style-sheet>
-  <style-specification use="docbook">
-    <style-specification-body>
-
-; The architecture we're building for.  We really need to pull this out of a 
-; entity somewhere, so it can be defined without needing to munge the
-; stylesheet.  Or do we?
-(define for-arch "i386")
-
-(default
-  (let* ((arch (attribute-string (normalize "arch"))))
-    (if (or (equal? arch #f)
-	    (equal? arch ""))
-	(next-match)
-; We can do a lot more flexible things here.  Like it'd be nice to
-; tokenize the arch= attribute and do comparisons of for-arch against
-; different substrings.
-	(cond ((equal? arch for-arch) (next-match))
-	      (else (empty-sosofo))))))
-
-    </style-specification-body>
-  </style-specification>
-
-  <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
-
diff --git a/release/doc/share/sgml/release-alpha.dsl b/release/doc/share/sgml/release.dsl
index 5515c65..a1666f6 100644
--- a/release/doc/share/sgml/release-alpha.dsl
+++ b/release/doc/share/sgml/release.dsl
@@ -8,13 +8,13 @@
   <style-specification use="docbook">
     <style-specification-body>
 
-; The architecture we're building for.  We really need to pull this out of a 
-; entity somewhere, so it can be defined without needing to munge the
-; stylesheet.  Or do we?
-(define for-arch "alpha")
+; The architecture we're building for.  We need to define this as a
+; procedure, because we may not be able to evaluate it until we are
+; at a point in formatting where (current-node) is defined.
 
 (default
-  (let* ((arch (attribute-string (normalize "arch"))))
+  (let* ((arch (attribute-string (normalize "arch")))
+	 (for-arch (entity-text "arch")))
     (if (or (equal? arch #f)
 	    (equal? arch ""))
 	(next-match)