Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 16 Jun 2013 18:59:07 +0000 (UTC)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r251816 - in stable/9/release/doc: en_US.ISO8859-1 en_US.ISO8859-1/errata en_US.ISO8859-1/hardware en_US.ISO8859-1/installation en_US.ISO8859-1/readme en_US.ISO8859-1/relnotes share/mk ...
Message-ID:  <201306161859.r5GIx7ZL038293@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Sun Jun 16 18:59:07 2013
New Revision: 251816
URL: http://svnweb.freebsd.org/changeset/base/251816

Log:
  MFC r250746 and r250805:
  
  - Update the release notes to DocBook 4.5 XML to build with the
    updated documentation tree
  - Fix build after doc/projects/xml-tools integration.

Added:
  stable/9/release/doc/share/xml/catalog.xml
     - copied unchanged from r250746, head/release/doc/share/xml/catalog.xml
Modified:
  stable/9/release/doc/en_US.ISO8859-1/Makefile
  stable/9/release/doc/en_US.ISO8859-1/errata/article.xml
  stable/9/release/doc/en_US.ISO8859-1/hardware/Makefile
  stable/9/release/doc/en_US.ISO8859-1/hardware/article.xml
  stable/9/release/doc/en_US.ISO8859-1/installation/article.xml
  stable/9/release/doc/en_US.ISO8859-1/readme/article.xml
  stable/9/release/doc/en_US.ISO8859-1/relnotes/article.xml
  stable/9/release/doc/share/mk/doc.relnotes.mk
  stable/9/release/doc/share/xml/Makefile
  stable/9/release/doc/share/xml/release.ent
Directory Properties:
  stable/9/release/doc/   (props changed)
  stable/9/release/doc/en_US.ISO8859-1/hardware/   (props changed)

Modified: stable/9/release/doc/en_US.ISO8859-1/Makefile
==============================================================================
--- stable/9/release/doc/en_US.ISO8859-1/Makefile	Sun Jun 16 18:32:59 2013	(r251815)
+++ stable/9/release/doc/en_US.ISO8859-1/Makefile	Sun Jun 16 18:59:07 2013	(r251816)
@@ -10,5 +10,8 @@ SUBDIR+= installation
 
 COMPAT_SYMLINK = en
 
+LANGCODE=en_US.ISO8859-1
+_LANGCODE=en_US.ISO8859-1
+
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"

Modified: stable/9/release/doc/en_US.ISO8859-1/errata/article.xml
==============================================================================
--- stable/9/release/doc/en_US.ISO8859-1/errata/article.xml	Sun Jun 16 18:32:59 2013	(r251815)
+++ stable/9/release/doc/en_US.ISO8859-1/errata/article.xml	Sun Jun 16 18:59:07 2013	(r251816)
@@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+%release;
+]>
+
 <!--
 	FreeBSD errata document.  Unlike some of the other RELNOTESng
 	files, this file should remain as a single SGML file, so that
@@ -9,27 +16,10 @@
 	not be the one that received the last change in the document.)
 
 -->
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN">
-%entities;
 
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-]>
 <article>
   <articleinfo>
-    <title>&os;
-<![ %release.type.current [
-    &release.current;
-]]>
-<![ %release.type.snapshot [
-    &release.prev;
-]]>
-<![ %release.type.release [
-    &release.current;
-]]>
-    Errata</title>
+    <title>&os; &release.current; Errata</title>
 
     <corpauthor>
     The &os; Project
@@ -51,16 +41,7 @@
   </articleinfo>
 
   <abstract>
-    <para>This document lists errata items for &os;
-<![ %release.type.current [
-      &release.current;,
-]]>
-<![ %release.type.snapshot [
-      &release.prev;,
-]]>
-<![ %release.type.release [
-      &release.current;,
-]]>
+    <para>This document lists errata items for &os; &release.current;,
       containing significant information discovered after the release
       or too late in the release cycle to be otherwise included in the
       release documentation.
@@ -70,16 +51,7 @@
       should always be consulted before installing this version of
       &os;.</para>
 
-    <para>This errata document for &os;
-<![ %release.type.current [
-      &release.current;
-]]>
-<![ %release.type.snapshot [
-      &release.prev;
-]]>
-<![ %release.type.release [
-      &release.current;
-]]>
+    <para>This errata document for &os; &release.current;
       will be maintained until the release of &os; &release.next;.</para>
   </abstract>
 
@@ -87,16 +59,7 @@
     <title>Introduction</title>
 
     <para>This errata document contains <quote>late-breaking news</quote>
-      about &os;
-<![ %release.type.current [
-      &release.current;.
-]]>
-<![ %release.type.snapshot [
-      &release.prev;.
-]]>
-<![ %release.type.release [
-      &release.current;.
-]]>
+      about &os; &release.current;
       Before installing this version, it is important to consult this
       document to learn about any post-release discoveries or problems
       that may already have been found and fixed.</para>
@@ -124,9 +87,9 @@
     <title>Security Advisories</title>
 
     <para>Problems described in the following security advisories have
-      been fixed in &release.current;.  For more information, consult
-      the individual advisories available from <ulink
-	url="http://security.FreeBSD.org/"></ulink>.</para>;
+      been fixed in &release.current;. For more information, consult
+      the individual advisories available from
+      <ulink url="http://security.FreeBSD.org/" />.</para>
 
     <informaltable frame="none" pgwide="1">
       <tgroup cols="3">

Modified: stable/9/release/doc/en_US.ISO8859-1/hardware/Makefile
==============================================================================
--- stable/9/release/doc/en_US.ISO8859-1/hardware/Makefile	Sun Jun 16 18:32:59 2013	(r251815)
+++ stable/9/release/doc/en_US.ISO8859-1/hardware/Makefile	Sun Jun 16 18:59:07 2013	(r251816)
@@ -18,7 +18,7 @@ JADEFLAGS+=	-V %generate-article-toc%
 # SGML content
 SRCS+=	article.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.ent
 
 CATALOGS+=	-c ${DEV-AUTODIR}/catalog-auto
 

Modified: stable/9/release/doc/en_US.ISO8859-1/hardware/article.xml
==============================================================================
--- stable/9/release/doc/en_US.ISO8859-1/hardware/article.xml	Sun Jun 16 18:32:59 2013	(r251815)
+++ stable/9/release/doc/en_US.ISO8859-1/hardware/article.xml	Sun Jun 16 18:59:07 2013	(r251816)
@@ -1,11 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN">
-%entities;
-
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
 %release;
-<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
+<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "nonexistent">
 %devauto;
 ]>
 
@@ -334,7 +332,7 @@
 	  <para>Apple iMac G5</para>
 	</listitem>
 	<listitem>
-	  <para>Apple Power Macintosh G3 (Blue & White)</para>
+	  <para>Apple Power Macintosh G3 (Blue &amp; White)</para>
 	</listitem>
 	<listitem>
 	  <para>Apple Power Macintosh G4</para>
@@ -535,7 +533,7 @@
       <para>The following systems are partially supported by &os;.  In
 	particular the fiber channel controllers in SBus-based systems are not
 	supported.  However, it is possible to use these with a SCSI controller
-	supported by the &man.esp.4 driver (Sun ESP SCSI, Sun FAS Fast-SCSI
+	supported by the &man.esp.4; driver (Sun ESP SCSI, Sun FAS Fast-SCSI
 	and Sun FAS366 Fast-Wide SCSI controllers).</para>
 
       <itemizedlist>

Modified: stable/9/release/doc/en_US.ISO8859-1/installation/article.xml
==============================================================================
--- stable/9/release/doc/en_US.ISO8859-1/installation/article.xml	Sun Jun 16 18:32:59 2013	(r251815)
+++ stable/9/release/doc/en_US.ISO8859-1/installation/article.xml	Sun Jun 16 18:59:07 2013	(r251816)
@@ -1,15 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN">
-%entities;
-
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
 %release;
-
-<!-- Text constants which probably don't need to be changed.-->
-
-<!ENTITY % include.historic "IGNORE">
-<!ENTITY % no.include.historic "IGNORE">
 ]>
 
 <article>

Modified: stable/9/release/doc/en_US.ISO8859-1/readme/article.xml
==============================================================================
--- stable/9/release/doc/en_US.ISO8859-1/readme/article.xml	Sun Jun 16 18:32:59 2013	(r251815)
+++ stable/9/release/doc/en_US.ISO8859-1/readme/article.xml	Sun Jun 16 18:59:07 2013	(r251816)
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN">
-%entities;
-
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 ]>
 
 <article>
@@ -84,59 +82,46 @@
     <sect2>
       <title>Target Audience</title>
 
-<![ %release.type.current; [
-
-      <para>This &release.type; is aimed primarily at early adopters
+      <para releasetype="current">This &release.type; is aimed primarily at early adopters
 	and various other users who want to get involved with the
 	ongoing development of &os;.  While the &os; development team
 	tries its best to ensure that each &release.type; works as
 	advertised, &release.branch; is very much a
 	work-in-progress.</para>
 
-      <para>The basic requirements for using this &release.type; are
+      <para releasetype="current">The basic requirements for using this &release.type; are
 	technical proficiency with &os; and an understanding of the
 	ongoing development process of &os; &release.branch; (as
 	discussed on the &a.current;).</para>
 
-      <para>For those more interested in doing business with &os; than
+      <para releasetype="current">For those more interested in doing business with &os; than
 	in experimenting with new &os; technology, formal releases
-	(such as &release.prev.stable;) are frequently more appropriate.
+	(such as &release.prev;) are frequently more appropriate.
 	Releases undergo a period of testing and quality assurance
 	checking to ensure high reliability and dependability.</para>
 
-]]>
-
-<![ %release.type.snapshot; [
-
-      <para>This &release.type; is aimed primarily at early adopters
+      <para releasetype="snapshot">This &release.type; is aimed primarily at early adopters
 	and various other users who want to get involved with the
 	ongoing development of &os;.  While the &os; development team
 	tries its best to ensure that each &release.type; works as
 	advertised, &release.branch; is very much a
 	work-in-progress.</para>
 
-      <para>The basic requirements for using this &release.type; are
+      <para releasetype="snapshot">The basic requirements for using this &release.type; are
 	technical proficiency with &os; and an understanding of the
 	ongoing development process of &os; &release.branch; (as
 	discussed on the &a.current;).</para>
 
-      <para>For those more interested in doing business with &os; than
+      <para releasetype="snapshot">For those more interested in doing business with &os; than
 	in experimenting with new &os; technology, formal releases
-	(such as &release.prev.stable;) are frequently more appropriate.
+	(such as &release.prev;) are frequently more appropriate.
 	Releases undergo a period of testing and quality assurance
 	checking to ensure high reliability and dependability.</para>
 
-]]>
-
-<![ %release.type.release; [
-
-      <para>This &release.type; of &os; is suitable for all users.  It
+      <para releasetype="release">This &release.type; of &os; is suitable for all users.  It
 	has undergone a period of testing and quality assurance
 	checking to ensure the highest reliability and
 	dependability.</para>
-
-]]>
-
     </sect2>
   </sect1>
 

Modified: stable/9/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/9/release/doc/en_US.ISO8859-1/relnotes/article.xml	Sun Jun 16 18:32:59 2013	(r251815)
+++ stable/9/release/doc/en_US.ISO8859-1/relnotes/article.xml	Sun Jun 16 18:59:07 2013	(r251816)
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN">
-%entities;
-
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 ]>
 
 <article>

Modified: stable/9/release/doc/share/mk/doc.relnotes.mk
==============================================================================
--- stable/9/release/doc/share/mk/doc.relnotes.mk	Sun Jun 16 18:32:59 2013	(r251815)
+++ stable/9/release/doc/share/mk/doc.relnotes.mk	Sun Jun 16 18:59:07 2013	(r251816)
@@ -2,12 +2,21 @@
 
 DOC_PREFIX?= ${RELN_ROOT}/../../../doc
 
+# XXX
+RELEASETYPE!= grep -o 'release.type "[a-z]*"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[a-z.]* "\([a-z]*\)"|\1|'
+.if ${RELEASETYPE} == "current"
+PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'current'"
+.elif ${RELEASETYPE} == "snapshot"
+PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'snapshot'"
+.elif ${RELEASETYPE} == "release"
+PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'release'"
+.endif
+
 # Find the RELNOTESng document catalogs
-EXTRA_CATALOGS+= ${RELN_ROOT}/${LANGCODE}/share/xml/catalog
-EXTRA_CATALOGS+= ${RELN_ROOT}/share/xml/catalog
+EXTRA_CATALOGS+= file://${RELN_ROOT}/${LANGCODE}/share/xml/catalog.xml \
+		file://${RELN_ROOT}/share/xml/catalog.xml
 
 # Use the appropriate architecture-dependent RELNOTESng stylesheet
-DSLHTML?=	${RELN_ROOT}/share/xml/default.dsl
 DSLPRINT?=	${RELN_ROOT}/share/xml/default.dsl
 
 #
@@ -23,7 +32,7 @@ MAN4DIR?=	${RELN_ROOT}/../../share/man/m
 MAN4PAGES?=	${MAN4DIR}/*.4 ${MAN4DIR}/man4.*/*.4
 ARCHLIST?=	${RELN_ROOT}/share/misc/dev.archlist.txt
 DEV-AUTODIR=	${RELN_ROOT:S/${.CURDIR}/${.OBJDIR}/}/share/xml
-CLEANFILES+=	${DEV-AUTODIR}/dev-auto.xml ${DEV-AUTODIR}/catalog-auto
+CLEANFILES+=	${DEV-AUTODIR}/dev-auto.ent
 
 MAN2HWNOTES_CMD=${RELN_ROOT}/share/misc/man2hwnotes.pl
 .if defined(HWNOTES_MI)
@@ -33,7 +42,7 @@ MAN2HWNOTES_FLAGS=	-c
 .endif
 
 # Dependency that the article makefiles can use to pull in
-# dev-auto.xml.
-${DEV-AUTODIR}/catalog-auto ${DEV-AUTODIR}/dev-auto.xml: ${MAN4PAGES} \
+# dev-auto.ent.
+${DEV-AUTODIR}/catalog-auto ${DEV-AUTODIR}/dev-auto.ent: ${MAN4PAGES} \
 	${ARCHLIST} ${MAN2HWNOTES_CMD}
-	cd ${RELN_ROOT}/share/xml && make MAN2HWNOTES_FLAGS=${MAN2HWNOTES_FLAGS} dev-auto.xml
+	cd ${RELN_ROOT}/share/xml && make MAN2HWNOTES_FLAGS=${MAN2HWNOTES_FLAGS} dev-auto.ent

Modified: stable/9/release/doc/share/xml/Makefile
==============================================================================
--- stable/9/release/doc/share/xml/Makefile	Sun Jun 16 18:32:59 2013	(r251815)
+++ stable/9/release/doc/share/xml/Makefile	Sun Jun 16 18:59:07 2013	(r251816)
@@ -5,11 +5,7 @@ RELN_ROOT?= ${.CURDIR}/../..
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
 
-dev-auto.xml: ${MAN4PAGES} ${ARCHLIST} ${MAN2HWNOTES_CMD} catalog-auto
+dev-auto.ent: ${MAN4PAGES} ${ARCHLIST} ${MAN2HWNOTES_CMD}
 	${PERL} ${MAN2HWNOTES_CMD} ${MAN2HWNOTES_FLAGS} -a ${ARCHLIST} -o ${.TARGET} ${MAN4PAGES}
 
-catalog-auto:
-	${ECHO_CMD} 'PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN"' \
-		'"dev-auto.xml"' > ${.TARGET}
-
-all: dev-auto.xml
+all: dev-auto.ent

Copied: stable/9/release/doc/share/xml/catalog.xml (from r250746, head/release/doc/share/xml/catalog.xml)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/9/release/doc/share/xml/catalog.xml	Sun Jun 16 18:59:07 2013	(r251816, copy of r250746, head/release/doc/share/xml/catalog.xml)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">;
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <public
+        publicId="-//FreeBSD//ENTITIES Release Specification//EN"
+        uri="release.ent"/>
+  <public
+	publicId="-//FreeBSD//ENTITIES Auto Generated Device Lists//EN"
+	uri="dev-auto.ent"/>
+</catalog>

Modified: stable/9/release/doc/share/xml/release.ent
==============================================================================
--- stable/9/release/doc/share/xml/release.ent	Sun Jun 16 18:32:59 2013	(r251815)
+++ stable/9/release/doc/share/xml/release.ent	Sun Jun 16 18:59:07 2013	(r251816)
@@ -24,10 +24,24 @@
 
 <!-- The type of release (usually this will be either "snapshot"
      or "release" -->
-<!ENTITY release.type "release">
+
+<!-- WARNING: Do not forget to also change the release type in
+     doc.relnotes.mk when updating this -->
+<!ENTITY release.type "snapshot">
 <!ENTITY % release.type.current  "IGNORE">
-<!ENTITY % release.type.snapshot "IGNORE">
-<!ENTITY % release.type.release "INCLUDE">
+<!ENTITY % release.type.snapshot "INCLUDE">
+<!ENTITY % release.type.release "IGNORE">
+
+<![%release.type.current;[
+<!ENTITY release '&release.current;'>
+]]>
+<![%release.type.snapshot;[
+<!ENTITY release '&release.prev;'>
+]]>
+<![%release.type.release;[
+<!ENTITY release '&release.current;'>
+]]>
+<!ENTITY release ''>
 
 <!-- The manpaths for man page references -->
 <!ENTITY release.man.url "http://www.FreeBSD.org/cgi/man.cgi">;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306161859.r5GIx7ZL038293>