svn commit: r41738 - in translations/share: images/articles/releng images/books/corp-net-guide misc mk pgpkeys security/advisories security/patches/SA-13:01 security/patches/SA-13:02 security/patch...

Thu May 23 20:30:44 UTC 2013

Author: gjb
Date: Thu May 23 20:30:42 2013
New Revision: 41738
URL: http://svnweb.freebsd.org/changeset/doc/41738

Log:
  MFH:
     Merged /head/share:r40366-41735
     Merged /projects/xml-tools/share:r39637-41644
  
  Approved by:	doceng (implicit)

Added:
  translations/share/misc/svn_props.txt
     - copied unchanged from r41735, head/share/misc/svn_props.txt
  translations/share/mk/doc.commands.mk
     - copied unchanged from r41735, head/share/mk/doc.commands.mk
  translations/share/pgpkeys/achim.key
     - copied unchanged from r41735, head/share/pgpkeys/achim.key
  translations/share/pgpkeys/asomers.key
     - copied unchanged from r41735, head/share/pgpkeys/asomers.key
  translations/share/pgpkeys/bhaga.key
     - copied unchanged from r41735, head/share/pgpkeys/bhaga.key
  translations/share/pgpkeys/bk.key
     - copied unchanged from r41735, head/share/pgpkeys/bk.key
  translations/share/pgpkeys/carl.key
     - copied unchanged from r41735, head/share/pgpkeys/carl.key
  translations/share/pgpkeys/dbn.key
     - copied unchanged from r41735, head/share/pgpkeys/dbn.key
  translations/share/pgpkeys/deb.key
     - copied unchanged from r41735, head/share/pgpkeys/deb.key
  translations/share/pgpkeys/dhw.key
     - copied unchanged from r41735, head/share/pgpkeys/dhw.key
  translations/share/pgpkeys/dru.key
     - copied unchanged from r41735, head/share/pgpkeys/dru.key
  translations/share/pgpkeys/dutchdaemon.key
     - copied unchanged from r41735, head/share/pgpkeys/dutchdaemon.key
  translations/share/pgpkeys/emaste.key
     - copied unchanged from r41735, head/share/pgpkeys/emaste.key
  translations/share/pgpkeys/girgen.key
     - copied unchanged from r41735, head/share/pgpkeys/girgen.key
  translations/share/pgpkeys/hiren.key
     - copied unchanged from r41735, head/share/pgpkeys/hiren.key
  translations/share/pgpkeys/markj.key
     - copied unchanged from r41735, head/share/pgpkeys/markj.key
  translations/share/pgpkeys/pclin.key
     - copied unchanged from r41735, head/share/pgpkeys/pclin.key
  translations/share/pgpkeys/pgpkeys-other.xml
     - copied unchanged from r41735, head/share/pgpkeys/pgpkeys-other.xml
  translations/share/pgpkeys/tmseck.key
     - copied unchanged from r41735, head/share/pgpkeys/tmseck.key
  translations/share/pgpkeys/wg.key
     - copied unchanged from r41735, head/share/pgpkeys/wg.key
  translations/share/security/advisories/FreeBSD-SA-13:01.bind.asc
     - copied unchanged from r41735, head/share/security/advisories/FreeBSD-SA-13:01.bind.asc
  translations/share/security/advisories/FreeBSD-SA-13:02.libc.asc
     - copied unchanged from r41735, head/share/security/advisories/FreeBSD-SA-13:02.libc.asc
  translations/share/security/advisories/FreeBSD-SA-13:03.openssl.asc
     - copied unchanged from r41735, head/share/security/advisories/FreeBSD-SA-13:03.openssl.asc
  translations/share/security/advisories/FreeBSD-SA-13:04.bind.asc
     - copied unchanged from r41735, head/share/security/advisories/FreeBSD-SA-13:04.bind.asc
  translations/share/security/advisories/FreeBSD-SA-13:05.nfsserver.asc
     - copied unchanged from r41735, head/share/security/advisories/FreeBSD-SA-13:05.nfsserver.asc
  translations/share/security/patches/SA-13:01/
     - copied from r41735, head/share/security/patches/SA-13:01/
  translations/share/security/patches/SA-13:02/
     - copied from r41735, head/share/security/patches/SA-13:02/
  translations/share/security/patches/SA-13:03/
     - copied from r41735, head/share/security/patches/SA-13:03/
  translations/share/security/patches/SA-13:04/
     - copied from r41735, head/share/security/patches/SA-13:04/
  translations/share/security/patches/SA-13:05/
     - copied from r41735, head/share/security/patches/SA-13:05/
  translations/share/xml/freebsd.sch
     - copied unchanged from r41735, head/share/xml/freebsd.sch
  translations/share/xml/freebsd45.dtd
     - copied unchanged from r41735, head/share/xml/freebsd45.dtd
  translations/share/xml/mirrors.dtd
     - copied unchanged from r41735, head/share/xml/mirrors.dtd
  translations/share/xsl/freebsd-epub.xsl
     - copied unchanged from r41735, head/share/xsl/freebsd-epub.xsl
  translations/share/xsl/freebsd-pgpkeyring.xsl
     - copied unchanged from r41735, head/share/xsl/freebsd-pgpkeyring.xsl
  translations/share/xsl/freebsd-xhtml-chunk.xsl
     - copied unchanged from r41735, head/share/xsl/freebsd-xhtml-chunk.xsl
  translations/share/xsl/freebsd-xhtml-common.xsl
     - copied unchanged from r41735, head/share/xsl/freebsd-xhtml-common.xsl
  translations/share/xsl/freebsd-xhtml-titlepage.xsl
     - copied unchanged from r41735, head/share/xsl/freebsd-xhtml-titlepage.xsl
  translations/share/xsl/freebsd-xhtml.xsl
     - copied unchanged from r41735, head/share/xsl/freebsd-xhtml.xsl
  translations/share/xsl/titlepage.templates.xml
     - copied unchanged from r41735, head/share/xsl/titlepage.templates.xml
Deleted:
  translations/share/images/books/corp-net-guide/
  translations/share/mk/doc.html.mk
  translations/share/pgpkeys/yar.key
  translations/share/xml/entities.ent
  translations/share/xml/freebsd-html.dsl
  translations/share/xml/freebsd42.dtd
  translations/share/xml/pgp.dsl
  translations/share/xsl/default.xsl
  translations/share/xsl/freebsd-html-chunk.xsl
  translations/share/xsl/freebsd-html.xsl
  translations/share/xsl/freebsd.xsl
Modified:
  translations/share/images/articles/releng/branches-releng7.pic
  translations/share/images/articles/releng/branches-releng9.pic
  translations/share/misc/docbook.css
  translations/share/mk/doc.common.mk
  translations/share/mk/doc.docbook.mk
  translations/share/mk/doc.images.mk
  translations/share/mk/doc.project.mk
  translations/share/mk/doc.xml.mk
  translations/share/mk/web.site.mk
  translations/share/pgpkeys/beech.key   (contents, props changed)
  translations/share/pgpkeys/benno.key
  translations/share/pgpkeys/decke.key
  translations/share/pgpkeys/des.key
  translations/share/pgpkeys/glebius.key
  translations/share/pgpkeys/itetcu.key
  translations/share/pgpkeys/pgj.key
  translations/share/pgpkeys/pgpkeys-developers.xml
  translations/share/pgpkeys/pgpkeys.ent
  translations/share/pgpkeys/philip.key
  translations/share/pgpkeys/rene.key
  translations/share/pgpkeys/scop.key
  translations/share/pgpkeys/thomas.key
  translations/share/xml/advisories.xml
  translations/share/xml/authors.ent
  translations/share/xml/bibliography.xml
  translations/share/xml/catalog
  translations/share/xml/catalog.xml
  translations/share/xml/commercial.consult.xml
  translations/share/xml/commercial.isp.xml
  translations/share/xml/commercial.software.xml
  translations/share/xml/developers.ent
  translations/share/xml/events2013.xml
  translations/share/xml/freebsd-common.dsl
  translations/share/xml/freebsd-print.dsl
  translations/share/xml/freebsd.dsl
  translations/share/xml/freebsd.dtd
  translations/share/xml/freebsd.ent
  translations/share/xml/header.ent
  translations/share/xml/man-refs.ent
  translations/share/xml/mirrors-local.xsl
  translations/share/xml/mirrors-master.xsl
  translations/share/xml/mirrors.xml
  translations/share/xml/navibar.ent
  translations/share/xml/news.dtd
  translations/share/xml/news.xml
  translations/share/xml/press.xml
  translations/share/xml/release.ent
  translations/share/xml/templates.events.xsl
  translations/share/xml/templates.pastevents.xsl
  translations/share/xml/trademarks.ent
  translations/share/xml/urls.ent
  translations/share/xml/xhtml.xsl
  translations/share/xsl/freebsd-common.xsl
  translations/share/xsl/freebsd-fo.xsl
Directory Properties:
  translations/share/   (props changed)
  translations/share/pgpkeys/kan.key   (props changed)

Modified: translations/share/images/articles/releng/branches-releng7.pic
==============================================================================

--- translations/share/images/articles/releng/branches-releng7.pic	Thu May 23 20:30:18 2013	(r41737)
+++ translations/share/images/articles/releng/branches-releng7.pic	Thu May 23 20:30:42 2013	(r41738)
@@ -38,6 +38,14 @@ RELENG_7_3:
 	box width .9 "\s-3RELENG_7_3\s+3" dashed
 
 	line -> right from RELENG_7_3_0_RELEASE.e
+RELENG_7_4_0_RELEASE:
+	ellipse width .9 "\s-27.4-RELEASE\s+2"
+
+	line -> down from RELENG_7_4_0_RELEASE.s
+RELENG_7_4:
+	box width .9 "\s-3RELENG_7_4\s+3" dashed
+
+	line -> right from RELENG_7_4_0_RELEASE.e
 RELENG_7:box "\s-27-STABLE\s+2"
 
 .PE

Modified: translations/share/images/articles/releng/branches-releng9.pic
==============================================================================
--- translations/share/images/articles/releng/branches-releng9.pic	Thu May 23 20:30:18 2013	(r41737)
+++ translations/share/images/articles/releng/branches-releng9.pic	Thu May 23 20:30:42 2013	(r41738)
@@ -14,6 +14,14 @@ RELENG_9_0:
 	box width .9 "\s-3RELENG_9_0\s+3" dashed
 
 	line -> right from RELENG_9_0_0_RELEASE.e
+RELENG_9_1_0_RELEASE:
+	ellipse width .9 "\s-29.1-RELEASE\s+2"
+
+	line -> down from RELENG_9_1_0_RELEASE.s
+RELENG_9_1:
+	box width .9 "\s-3RELENG_9_1\s+3" dashed
+
+	line -> right from RELENG_9_1_0_RELEASE.e
 RELENG_9:box "\s-29-STABLE\s+2"
 
 .PE

Modified: translations/share/misc/docbook.css
==============================================================================
--- translations/share/misc/docbook.css	Thu May 23 20:30:18 2013	(r41737)
+++ translations/share/misc/docbook.css	Thu May 23 20:30:42 2013	(r41738)
@@ -26,15 +26,82 @@
  * $FreeBSD$
  */
 
-body address {
-	line-height: 1.3;
-	margin: .6em 0;
+/*
+ * General DocBook styles from the DocBook XSL distribution
+ */
+
+.formalpara-title {
+  font-weight: bold;
+}
+
+div.blockquote-title {
+  font-weight: bold;
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+span.msgmain-title {
+  font-weight: bold;
+}
+
+span.msgsub-title {
+  font-weight: bold;
+}
+
+span.msgrel-title {
+  font-weight: bold;
+}
+
+div.msglevel, div.msgorig, div.msgaud {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+span.msglevel-title, span.msgorig-title, span.msgaud-title {
+  font-weight: bold;
+}
+
+div.msgexplan {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+span.msgexplan-title {
+  font-weight: bold;
+}
+
+div.figure-title {
+  font-weight: bold;
+}
+
+div.example-title {
+  font-weight: bold;
+}
+
+div.equation-title {
+  font-weight: bold;
+}
+
+div.table-title {
+  font-weight: bold;
+}
+
+div.sidebar-title {
+  font-weight: bold;
 }
 
-body blockquote {
-	margin-top: .75em;
+div.synopsis {
+  white-space: pre;
+  font-family: monospace;
+}
+
+/*
+ * FreeBSD-specific formatting
+ */
+
+body address {
 	line-height: 1.3;
-	margin-bottom: .75em;
+	margin: .6em 0;
 }
 
 html body {
@@ -70,7 +137,6 @@ body form {
 	margin: .6em 0;
 }
 
-h1, h2, h3, h4, h5, h6,
 div.example p b,
 .question,
 div.table p b,
@@ -78,24 +144,33 @@ div.procedure p b {
 	color: #990000;
 }
 
-body h1, body h2, body h3, body h4, body h5, body h6 {
+h1.title, h2.title, h3.title, h4.title, h5.title, h6.title,
+h3.author, .corpauthor,
+div.abstract div.abstract-title,
+div.toc div.toc-title,
+div.list-of-figures div.toc-title,
+div.list-of-tables div.toc-title,
+div.list-of-examples div.toc-title {
+	font-weight: bold;
 	line-height: 1.3;
+	margin-top: 1em;
 	margin-left: 0;
+	color: #990000;
 }
 
-body h1, body h2 {
+h1.title, h2.title {
 	margin: .8em 0 0 -4%;
 }
 
-body h3, body h4 {
+h3.title, h4.title {
 	margin: .8em 0 0 -3%;
 }
 
-body h5 {
+h5.title {
 	margin: .8em 0 0 -2%;
 }
 
-body h6 {
+h6.title {
 	margin: .8em 0 0 -1%;
 }
 
@@ -135,15 +210,11 @@ html {
 	padding: 0;
 }
 
-body p b.application {
-	color: #000000;
-}
-
 .filename {
 	color: #007a00;
 }
 
-svnref {
+.svnref {
 	color: #007a00;
 }
 
@@ -163,14 +234,19 @@ svnref {
 	text-decoration: underline;
 }
 
-.screen {
+div.screen {
+	white-space: pre;
+	font-family: monospace;
 	padding: 1ex;
 }
 
-.programlisting {
+div.programlisting {
+	white-space: pre;
+	font-family: monospace;
 	padding: 1ex;
 	background-color: #eee;
 	border: 1px solid #ccc;
+	border-radius: 6px;
 	line-height: 1.1;
 }
 
@@ -183,42 +259,41 @@ svnref {
 	text-align: left;
 }
 
-blockquote, .example, .programlisting {
+.note, .tip, .important, .warning, .caution, .example, div.procedure {
 	border-radius: 6px;
+	padding: 2ex 2ex;
+	margin: .75em 3em .75em 3em;
+        line-height: 1.3;
 }
 
-blockquote {
-	padding: 0 2ex;
-}
-
-blockquote.note {
+.note, div.procedure {
 	color: #222;
 	background: #eee;
 	border: 1px solid #ccc;
 	width: 85%;
 }
 
-blockquote.tip {
+.tip {
 	color: #004F00;
 	background: #d8ecd6;
 	border: 1px solid green;
 	width: 85%;
 }
 
-blockquote.important {
+.important {
 	font-style:italic;
 	border: 1px solid #a00;
 	border-left: 12px solid #c00;
 }
 
-blockquote.warning {
+.warning {
 	color: #9F1313;
 	background: #f8e8e8;
 	border: 1px solid #e59595;
 	width: 85%;
 }
 
-blockquote.caution {
+.caution {
 	color: #3E3535;
 	background: #FFC;
 	border: 1px solid #e59595;
@@ -233,7 +308,39 @@ blockquote.caution {
 	width: 90%;
 }
 
+.admontitle {
+	display: inline;
+	line-height: 1;
+	margin-right: 0;
+}
+
+.procedure-title {
+	font-weight: bold;
+        line-height: 1;
+        margin-right: 0;
+}
+
+.note p, .tip p, .important p, .warning p, .caution p, .example p {
+	display: inline;
+}
+
 .informaltable table.calstable tr td {
         padding-left: 1em;
         padding-right: 1em;
 }
+
+.authorgroup {
+	font-style: italic;
+}
+
+.application {
+	font-weight: bold;
+}
+
+.userinput {
+	font-weight: normal;
+}
+
+pre.screen strong {
+	font-weight: normal;
+}

Copied: translations/share/misc/svn_props.txt (from r41735, head/share/misc/svn_props.txt)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ translations/share/misc/svn_props.txt	Thu May 23 20:30:42 2013	(r41738, copy of r41735, head/share/misc/svn_props.txt)
@@ -0,0 +1,72 @@
+# Make sure you have a ~/.subversion/config.  Simply using it (svn --help)
+# will cause a default one to be created if you don't already have one.
+# Add the following changes to ~/.subversion/config:
+#
+#
+# Set:
+# enable-auto-props = yes
+#
+#
+# Append/edit auto-props section:
+#
+
+[auto-props]
+*.c     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.h     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.s     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.S     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.cc    = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.cpp   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.cxx   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.in    = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.sh    = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain; svn:executable
+*.pl    = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain; svn:executable
+*.pm    = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.py    = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.rb    = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.awk   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.sed   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.txt   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.log   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.conf  = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+Makefile* = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.1     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.2     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.3     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.4     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.5     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.6     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.7     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.8     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.9     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+
+*.css   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/css
+*.docbook = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/sgml
+*.dtd   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xml-dtd
+*.ent   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xml-dtd
+*.html  = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/html
+*.mml   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/mathml+xml
+*.js    = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/javascript
+*.rss   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/rss+xml
+*.sgml   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/sgml
+*.xhtml = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/html+xml
+*.xml   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xml
+*.xsd   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xml
+*.xsl   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xslt+xml
+*.xslt  = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xslt+xml
+*.xul   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xul
+
+*.bin   = svn:mime-type=application/octet-stream
+*.eps   = svn:mime-type=application/postscript
+*.exe   = svn:mime-type=application/octet-stream
+*.gz    = svn:mime-type=application/gzip
+*.pdf   = svn:mime-type=application/pdf
+*.ps    = svn:mime-type=application/postscript
+
+*.gif   = svn:mime-type=image/gif
+*.ico   = svn:mime-type=image/vnd.microsoft.icon
+*.jpeg  = svn:mime-type=image/jpeg
+*.jpg   = svn:mime-type=image/jpeg
+*.png   = svn:mime-type=image/png
+*.svg   = svn:mime-type=image/svg+xml
+*.tiff  = svn:mime-type=image/tiff

Copied: translations/share/mk/doc.commands.mk (from r41735, head/share/mk/doc.commands.mk)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ translations/share/mk/doc.commands.mk	Thu May 23 20:30:42 2013	(r41738, copy of r41735, head/share/mk/doc.commands.mk)
@@ -0,0 +1,171 @@
+#
+# $FreeBSD$
+#
+
+#
+# General commands
+#
+
+AWK?=		/usr/bin/awk
+CP?=		/bin/cp
+CAT?=		/bin/cat
+ECHO_CMD?=	echo
+FETCH?=		/usr/bin/fetch
+FIND?=		/usr/bin/find
+GREP?=		/usr/bin/grep
+LN?=		/bin/ln
+MKDIR?=		/bin/mkdir
+MV?=		/bin/mv
+RM?=		/bin/rm
+ISPELL?=	ispell
+ISPELLOPTS?=	-l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
+.if exists(/usr/bin/perl)
+PERL?=		/usr/bin/perl
+.elif exists(/usr/local/bin/perl)
+PERL?=		/usr/local/bin/perl
+.else
+PERL?=		perl
+.endif
+PKG_CREATE?=	/usr/sbin/pkg_create
+REALPATH?=	/bin/realpath
+SED?=		/usr/bin/sed
+SETENV?=	/usr/bin/env
+SH?=		/bin/sh
+SORT?=		/usr/bin/sort
+TOUCH?=		/usr/bin/touch
+TRUE?=		/usr/bin/true
+XARGS?=		/usr/bin/xargs
+
+#
+# Compession and decompression
+#
+
+BUNZIP2?=	/usr/bin/bunzip2
+BZIP2?=		bzip2
+BZIPOPTS?=	-qf9
+GZIP?=		gzip
+GZIPOPTS?=	-qf9
+TAR?=		/usr/bin/tar
+ZIP?=		${PREFIX}/bin/zip
+ZIPOPTS?=	-9X
+
+#
+# Rendering and format conversion
+#
+
+DVIPS?=		${PREFIX}/bin/dvips
+.if defined(PAPERSIZE)
+DVIPSOPTS?=	-t ${PAPERSIZE:L}
+.endif
+DVIPSOPTS+=	${DVIPSFLAGS}
+
+FOP?=		${PREFIX}/bin/fop
+FOPOPTS?=
+
+GROFF?=		groff
+
+HTML2PDB?=	${PREFIX}/bin/iSiloBSD
+HTML2PDBOPTS?=	-y -d0 -Idef ${HTML2PDBFLAGS}
+HTML2TXT?=	${PREFIX}/bin/w3m
+HTML2TXTOPTS?=	-dump ${HTML2TXTFLAGS}
+
+.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
+JADE?=		${ENV} SP_ENCODING=XML ${PREFIX}/bin/jade
+.else
+JADE?=		${ENV} SP_ENCODING=XML ${PREFIX}/bin/openjade
+JADEFLAGS+=	-V openjade
+.endif
+
+XMLLINT?=	${PREFIX}/bin/xmllint
+XSLTPROC?=	${PREFIX}/bin/xsltproc
+
+#
+# In teTeX 3.0 and later, pdfetex(1) is used as the default TeX
+# engine for JadeTeX and tex(1) cannot be used as ${TEX_CMD} anymore
+# due to incompatibility of the format file.  Since the teTeX 3.0
+# distribution has "${PREFIX}/share/texmf-dist/LICENSE.texmf,"
+# it is checked here to determine which TeX engine should be used.
+.if exists(${PREFIX}/share/texmf-dist/LICENSE.texmf)
+TEX_CMD?=	${PREFIX}/bin/etex
+PDFTEX_CMD?=	${PREFIX}/bin/pdfetex
+.else
+TEX_CMD?=	${PREFIX}/bin/tex
+PDFTEX_CMD?=	${PREFIX}/bin/pdftex
+.endif
+LATEX_CMD?=	${PREFIX}/bin/latex
+JADETEX_CMD?=	${PDFTEX_CMD} "&jadetex"
+JADETEX_PREPROCESS?=	/bin/cat
+PDFJADETEX_CMD?=${PDFTEX_CMD} "&pdfjadetex"
+PDFJADETEX_PREPROCESS?= /bin/cat
+PS2PDF?=	${PREFIX}/bin/ps2pdf
+FOP_CMD?=	${PREFIX}/share/fop/fop.sh
+XEP_CMD?=	sh ${HOME}/XEP/xep.sh
+JAVA_CMD?=	${PREFIX}/bin/javavm
+SAXON_CMD?=	${JAVA_CMD} -jar ${PREFIX}/share/java/classes/saxon.jar
+
+#
+# Currently, we have to use the FixRTF utility available as textproc/fixrtf
+# to apply several RTF fixups:
+#
+# 1. Embed PNGs into RTF. (Option: -p)
+# 2. Embed FreeBSD-specific information into RTF, such as organization name,
+#    building time. But unfortunately, so far only Microsoft Word can read
+#    them. In contrast, Microsoft Word Viewer and OpenOffice even cannot read
+#    this kind of information from RTF created by Microsoft Word and
+#    OpenOffice. (Option: -i)
+# 3. Do some locale-specific fixing. (Option: -e <encoding>)
+#
+# This is a transitional solution before Jade/OpenJade provides these features.
+#
+FIXRTF?=	${PREFIX}/bin/fixrtf
+FIXRTFOPTS?=	-i -p
+.if defined(SP_ENCODING)
+FIXRTFOPTS+=	-e ${SP_ENCODING}
+.endif
+
+#
+# Image processing
+#
+
+SCR2PNG?=	${PREFIX}/bin/scr2png
+SCR2PNGOPTS?=	${SCR2PNGFLAGS}
+SCR2TXT?=	${PREFIX}/bin/scr2txt
+SCR2TXTOPTS?=	-l ${SCR2TXTFLAGS}
+EPS2PNM?=	${PREFIX}/bin/gs
+EPS2PNMOPTS?=	-q -dBATCH -dGraphicsAlphaBits=4 -dTextAlphaBits=4 \
+		-dEPSCrop -r${EPS2PNM_RES}x${EPS2PNM_RES} \
+		-dNOPAUSE -dSAFER -sDEVICE=pnm -sOutputFile=-
+#
+# epsgeom is a perl script for 1) extracting geometry information
+# from a .eps file and 2) arrange it for ghostscript's pnm driver.
+#
+EPSGEOM?=	${PERL} ${DOC_PREFIX}/share/misc/epsgeom
+EPSGEOMOPTS?=	${EPS2PNM_RES} ${EPS2PNM_RES}
+PNMTOPNG?=	${PREFIX}/bin/pnmtopng
+PNMTOPNGOPTS?=	${PNGTOPNGFLAGS}
+PNGTOPNM?=	${PREFIX}/bin/pngtopnm
+PNGTOPNMOPTS?=	${PNGTOPNMFLAGS}
+PPMTOPGM?=	${PREFIX}/bin/ppmtopgm
+PPMTOPGMOPTS?=	${PPMTOPGMFLAGS}
+PNMTOPS?=	${PREFIX}/bin/pnmtops
+PNMTOPSOPTS?=	-noturn ${PNMTOPSFLAGS}
+EPSTOPDF?=	${PREFIX}/bin/epstopdf
+EPSTOPDFOPTS?=	${EPSTOPDFFLAGS}
+#
+PIC2PS?=	${GROFF} -p -S -Wall -mtty-char -man
+#
+PS2EPS?=	${PREFIX}/bin/gs
+PS2EPSOPTS?=	-q -dNOPAUSE -dSAFER -dDELAYSAFER \
+		-sPAPERSIZE=letter -r72 -sDEVICE=bit \
+		-sOutputFile=/dev/null ${PS2EPSFLAGS} ps2epsi.ps
+PS2BBOX?=	${PREFIX}/bin/gs
+PS2BBOXOPTS?=	-q -dNOPAUSE -dBATCH -dSAFER -dDELAYSAFER \
+		-sPAPERSIZE=letter -r72 -sDEVICE=bbox \
+		-sOutputFile=/dev/null ${PS2BBOXFLAGS}
+
+#
+# Spell checking
+#
+
+ISPELL?=	ispell
+ISPELLOPTS?=	-l -p /usr/share/dict/freebsd ${ISPELLFLAGS}

Modified: translations/share/mk/doc.common.mk
==============================================================================
--- translations/share/mk/doc.common.mk	Thu May 23 20:30:18 2013	(r41737)
+++ translations/share/mk/doc.common.mk	Thu May 23 20:30:42 2013	(r41738)
@@ -5,14 +5,6 @@
 # documents commonly used in doc/ and www/ tree.
 #
 
-AWK?=		/usr/bin/awk
-GREP?=		/usr/bin/grep
-REALPATH?=	/bin/realpath
-SED?=		/usr/bin/sed
-# a hack to keep tidy from converting tabs to spaces
-# replace them with 	 before calling tidy
-REINPLACE_TABS_CMD?=	${SED} -i "" -e 's/	/\&\#09;/g'
-
 # ------------------------------------------------------------------------
 #
 # Work out the language and encoding used for this document.
@@ -28,20 +20,8 @@ DOC_PREFIX_NAME?=	head
 .endif
 
 .if (!defined(LANGCODE) || empty(LANGCODE))
-# Calculate _LANGCODE.
-_LANGCODE:=	${.CURDIR}
-. for _ in 1 2 3 4 5 6 7 8 9 10
-.  if !(${_LANGCODE:H:T} == ${DOC_PREFIX_NAME})
-_LANGCODE:=	${_LANGCODE:H}
-.  endif
-. endfor
-_LANGCODE:=	${_LANGCODE:T}
-.else # (!defined(LANGCODE) || empty(LANGCODE))
-# when LANGCODE is defined, use the value.
-_LANGCODE?=	${LANGCODE}
-.endif # (!defined(LANGCODE) || empty(LANGCODE))
-
-LANGCODE?=	${_LANGCODE}
+LANGCODE!=	echo ${.CURDIR} | grep -o '[a-z]*_[A-Z]*\.[-A-Za-z0-9]*' || echo "."
+.endif
 
 # normalize DOC_PREFIX
 DOC_PREFIX!=	${REALPATH} ${DOC_PREFIX}

Modified: translations/share/mk/doc.docbook.mk
==============================================================================
--- translations/share/mk/doc.docbook.mk	Thu May 23 20:30:18 2013	(r41737)
+++ translations/share/mk/doc.docbook.mk	Thu May 23 20:30:42 2013	(r41738)
@@ -40,14 +40,9 @@
 #			used to set additional variables, such as
 #			"%generate-article-toc%".
 #
-#	TIDYFLAGS	Additional flags to pass to Tidy.  Typically
-#			used to set "-raw" flag to handle 8bit characters.
-#
 #	EXTRA_CATALOGS	Additional catalog files that should be used by
 #			any XML processing applications.
 #
-#	NO_TIDY		If you do not want to use tidy, set this to "YES".
-#
 #       GEN_INDEX       If this document has an index (HAS_INDEX) and this
 #                       variable is defined, then index.xml will be added 
 #                       to the list of dependencies for source files, and 
@@ -62,45 +57,6 @@
 #			spellchecker.  For example, PGP keys and filenames
 #			will be omitted from this output.
 #
-# Print-output options :
-#
-#       NICE_HEADERS    If defined, customized chapter headers will be created
-#			that you may find more aesthetically pleasing.	Note
-#			that this option only effects print output formats for
-#			English language books.
-#
-#       MIN_SECT_LABELS If defined, do not display the section number for 4th
-#                       and 5th level section titles.  This would change 
-#                       "N.N.N.N Section title" into "Section Title" while
-#                       higher level sections are still printed with numbers.
-#
-#       TRACE={1,2}     Trace TeX's memory usage.  Set this to 1 for minimal
-#                       tracing or 2 for maximum tracing.  TeX memory 
-#                       statistics will be written out to <filename>.log.
-#                       For more information see the TeXbook, p301.
-#
-#       TWO_SIDE        If defined, two sided output will be created.  This 
-#                       means that new chapters will only start on odd 
-#                       numbered (aka right side, aka recto) pages and the 
-#                       headers and footers will be aligned appropriately 
-#                       for double sided paper.  Blank pages may be added as
-#                       needed.
-#
-#       JUSTIFY         If defined, text will be right justified so that the
-#                       right edge is smooth.  Words may be hyphenated using
-#                       the default TeX hyphenation rules for this purpose.
-#
-#       BOOK_OUTPUT     A collection of options are set suitable for printing
-#                       a book.  This option may be an order of magnitude more
-#                       CPU intensive than the default build.
-#
-#       RLE             Use Run-Length Encoding for EPS files, this will
-#                       result in significantly smaller PostScript files, 
-#                       but may take longer for a printer to process.
-#
-#       GREYSCALE_IMAGES Convert the screenshots to greyscale before
-#                        embedding them into the PostScript output.
-#
 # Package building options:
 # 
 #       BZIP2_PACKAGE  Use bzip2(1) utility to compress package tarball
@@ -115,115 +71,56 @@
 
 MASTERDOC?=	${.CURDIR}/${DOC}.xml
 
-# List of supported SP_ENCODINGs
-SP_ENCODING_LIST?=	ISO-8859-2 KOI8-R
+# Either jade or fop
+RENDERENGINE?=	jade
 
-# Which stylesheet type to use.  'dsssl' or 'xsl'
-STYLESHEET_TYPE?=	dsssl
+XMLDECL?=	/usr/local/share/sgml/docbook/dsssl/modular/dtds/decls/xml.dcl
 
-.if defined(SPELLCHECK)
-DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl
-.endif
+DSLHTML?=	${DOC_PREFIX}/share/xml/spellcheck.dsl
+DSLPRINT?=	${DOC_PREFIX}/share/xml/default.dsl
 
-XMLLINT?=	/usr/local/bin/xmllint
-XMLDECL?=	/usr/local/share/sgml/docbook/dsssl/modular/dtds/decls/xml.dcl
+XSLPROF?=	/usr/local/share/xsl/docbook/profiling/profile.xsl
+XSLXHTML?=	${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-xhtml.xsl
+XSLXHTMLCHUNK?=	${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-xhtml-chunk.xsl
+XSLEPUB?=	${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-epub.xsl
+XSLFO?=		${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-fo.xsl
+XSLPGP?=	${DOC_PREFIX}/share/xsl/freebsd-pgpkeyring.xsl
+
+XSLSCH?=	/usr/local/share/xsl/iso-schematron/xslt1/iso_schematron_skeleton_for_xslt1.xsl
+
+IMAGES_LIB?=
+
+SCHEMATRONS?=	${DOC_PREFIX}/share/xml/freebsd.sch
 
 .if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
-JADE?=		${PREFIX}/bin/jade
 JADECATALOG?=	${PREFIX}/share/sgml/jade/catalog
-SX?=		${PREFIX}/bin/sx
 .else
-JADE?=		${PREFIX}/bin/openjade
 JADECATALOG?=	${PREFIX}/share/sgml/openjade/catalog
-JADEFLAGS+=	-V openjade
-SX?=		${PREFIX}/bin/osx
-.endif
-
-.if defined(SP_ENCODING)
-JADE_ENV+=	SP_ENCODING=${SP_ENCODING}
 .endif
-JADE_CMD=	${SETENV} ${JADE_ENV} ${JADE}
-
-DSLHTML?=	${DOC_PREFIX}/share/xml/default.dsl
-DSLPRINT?=	${DOC_PREFIX}/share/xml/default.dsl
-DSLPGP?=	${DOC_PREFIX}/share/xml/pgp.dsl
 FREEBSDCATALOG=	${DOC_PREFIX}/share/xml/catalog
 LANGUAGECATALOG=${DOC_PREFIX}/${LANGCODE}/share/xml/catalog
-
-ISO8879CATALOG=	${PREFIX}/share/sgml/iso8879/catalog
-
-.if ${STYLESHEET_TYPE} == "dsssl"
-DOCBOOKCATALOG=	${PREFIX}/share/sgml/docbook/catalog
-.elif ${STYLESHEET_TYPE} == "xsl"
-DOCBOOKCATALOG= ${PREFIX}/share/xml/docbook/catalog
-.endif
-
-CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
-
 DSSSLCATALOG=	${PREFIX}/share/sgml/docbook/dsssl/modular/catalog
-COLLATEINDEX=	${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl
-
-XSLTPROCFLAGS?=	--nonet
-XSLHTML?=	${DOC_PREFIX}/share/xsl/freebsd-html.xsl
-XSLHTMLCHUNK?=	${DOC_PREFIX}/share/xsl/freebsd-html-chunk.xsl
-XSLFO?=		${DOC_PREFIX}/share/xsl/freebsd-fo.xsl
-INDEXREPORTSCRIPT= ${DOC_PREFIX}/share/misc/indexreport.pl
-
-IMAGES_LIB?=
-
-.for c in ${LANGUAGECATALOG} ${FREEBSDCATALOG} ${DSSSLCATALOG} ${ISO8879CATALOG} ${DOCBOOKCATALOG} ${JADECATALOG} ${EXTRA_CATALOGS} ${CATALOG_PORTS_SGML}
+.for c in ${LANGUAGECATALOG} ${FREEBSDCATALOG} ${DSSSLCATALOG} ${JADECATALOG}
 .if exists(${c})
 CATALOGS+=	-c ${c}
 .endif
 .endfor
-XMLFLAGS+=	-D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR}
-JADEOPTS=	${JADEFLAGS} ${XMLFLAGS} ${CATALOGS}
-XSLTPROCOPTS=	${XSLTPROCFLAGS}
+
+JADEOPTS?=	-ijade.compat -w no-valid ${JADEFLAGS} \
+		-D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR} \
+		${CATALOGS}
+XSLTPROCOPTS?=	--nonet
 
 KNOWN_FORMATS=	html html.tar html-split html-split.tar \
-		txt rtf ps pdf tex dvi tar pdb
+		epub txt rtf ps pdf tex dvi tar pdb
 
 CSS_SHEET?=	${DOC_PREFIX}/share/misc/docbook.css
-PDFTEX_DEF?=	${DOC_PREFIX}/share/web2c/pdftex.def
-
-HTMLOPTS?=	-ioutput.html -d ${DSLHTML} ${HTMLFLAGS}
-
-HTMLTXTOPTS?=	-ioutput.html -d ${DSLHTML} ${HTMLTXTFLAGS}
 
 PRINTOPTS?=	-ioutput.print -d ${DSLPRINT} ${PRINTFLAGS}
 
-.if defined(BOOK_OUTPUT)
-NICE_HEADERS=1
-MIN_SECT_LABELS=1
-TWO_SIDE=1
-JUSTIFY=1
-#WITH_FOOTNOTES=1
-#GEN_INDEX=1
-.endif
-.if defined(JUSTIFY)
-TEX_CMDSEQ+=	\RequirePackage{url}
-PRINTOPTS+=	-ioutput.print.justify
-.endif
-.if defined(TWO_SIDE)
-PRINTOPTS+=	-V %two-side% -ioutput.print.twoside
-TEX_CMDSEQ+=	\def\PageTwoSide{1}
-.endif
-.if defined(NICE_HEADERS)
-PRINTOPTS+=    -ioutput.print.niceheaders
-.endif
-.if defined(MIN_SECT_LABELS)
-PRINTOPTS+=    -V minimal-section-labels
-.endif
-.if defined(TRACE)
-TEX_CMDSEQ+=	\tracingstats=${TRACE}
-.endif
-.if defined(RLE)
-PNMTOPSFLAGS+=	-rle
-.endif
 .if defined(WWWFREEBSDORG)
 HTMLFLAGS+=	-V %html-header-script%
 .endif
-
 .if !defined(WITH_INLINE_LEGALNOTICE) || empty(WITH_INLINE_LEGALNOTICE)
 HTMLFLAGS+=	-V %generate-legalnotice-link%
 .endif
@@ -245,63 +142,19 @@ HTMLFLAGS+=	-V %show-all-trademark-symbo
 PRINTFLAGS+=	-V %show-all-trademark-symbols%
 .endif
 
-PERL?=		/usr/bin/perl
-PKG_CREATE?=	/usr/sbin/pkg_create
-SORT?=		/usr/bin/sort
-TAR?=		/usr/bin/tar
-TOUCH?=		/usr/bin/touch
-XARGS?=		/usr/bin/xargs
-
-GROFF?=		groff
-TIDY_VER!=	${TIDY} -v 2>&1
-.if ${TIDY_VER} == "HTML Tidy for FreeBSD released on 7 December 2008"
-TIDYOPTS?=	-wrap 90 -m -raw --preserve-entities yes -f /dev/null -asxml ${TIDYFLAGS}
-.else
-TIDYOPTS?=	-wrap 90 -m -raw -preserve -f /dev/null -asxml ${TIDYFLAGS}
-.endif
-HTML2TXT?=	${PREFIX}/bin/links
-HTML2TXTOPTS?=	-dump -width 72 ${HTML2TXTFLAGS}
-HTML2PDB?=	${PREFIX}/bin/iSiloBSD
-HTML2PDBOPTS?=	-y -d0 -Idef ${HTML2PDBFLAGS}
-DVIPS?=		${PREFIX}/bin/dvips
-.if defined(PAPERSIZE)
-DVIPSOPTS?=	-t ${PAPERSIZE:L}
-.endif
-DVIPSOPTS+=	${DVIPSFLAGS}
-
-#
-# Currently, we have to use the FixRTF utility available as textproc/fixrtf
-# to apply several RTF fixups:
-#
-# 1. Embed PNGs into RTF. (Option: -p)
-# 2. Embed FreeBSD-specific information into RTF, such as organization name,
-#    building time. But unfortunately, so far only Microsoft Word can read
-#    them. In contrast, Microsoft Word Viewer and OpenOffice even cannot read
-#    this kind of information from RTF created by Microsoft Word and
-#    OpenOffice. (Option: -i)
-# 3. Do some locale-specific fixing. (Option: -e <encoding>)
-# 
-# This is a transitional solution before Jade/OpenJade provides these features.
-#
-FIXRTF?=	${PREFIX}/bin/fixrtf
-FIXRTFOPTS?=	-i -p
-.if defined(SP_ENCODING)
-FIXRTFOPTS+=	-e ${SP_ENCODING}
-.endif
-
-GZIP?=	-9
-GZIP_CMD?=	gzip -qf ${GZIP}
-BZIP2?=	-9
-BZIP2_CMD?=	bzip2 -qf ${BZIP2}
-ZIP?=	-9
-ZIP_CMD?=	${PREFIX}/bin/zip -j ${ZIP}
-
 #
 # Instruction for bsd.subdir.mk to not to process SUBDIR directive.
 # It is not necessary since doc.docbook.mk do it too.
 #
 NO_SUBDIR=      YES
 
+#
+# Index generation
+#
+
+.if defined(GEN_INDEX)
+XSLTPROCOPTS+= --param generate.index "1"
+.endif
 
 # ------------------------------------------------------------------------
 #
@@ -351,6 +204,8 @@ LOCAL_CSS_SHEET= ${.OBJDIR}/${CSS_SHEET:
 LOCAL_CSS_SHEET= ${CSS_SHEET:T}
 .endif
 
+CLEANFILES+= ${DOC}.parsed.xml ${DOC}.parsed.print.xml
+
 .for _curformat in ${FORMATS}
 _cf=${_curformat}
 
@@ -369,6 +224,10 @@ CLEANFILES+= PLIST.${_curformat}
 CLEANFILES+= $$([ -f HTML.manifest ] && ${XARGS} < HTML.manifest) \
 		HTML.manifest ln*.html
 
+.elif ${_cf} == "epub"
+CLEANFILES+= ${DOC}.epub mimetype
+CLEANDIRS+= META-INF OEBPS
+
 .elif ${_cf} == "html.tar"
 CLEANFILES+= ${DOC}.html
 
@@ -385,17 +244,15 @@ CLEANFILES+= ${DOC}.rtf-nopng
 CLEANFILES+= ${DOC}.aux ${DOC}.log
 
 .elif ${_cf} == "ps"
-CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-ps ${DOC}.tex ${DOC}.tex-tmp
+CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-ps \
+	${DOC}.tex ${DOC}.tex-tmp ${DOC}.fo
 .for _curimage in ${LOCAL_IMAGES_EPS:M*share*}
 CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
 .endfor
 
 .elif ${_cf} == "pdf"
 CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-pdf ${DOC}.tex-pdf-tmp \
-		${DOC}.tex
-.for _curimage in ${IMAGES_PDF:M*share*}
-CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
-.endfor
+		${DOC}.tex ${DOC}.fo
 .for _curimage in ${LOCAL_IMAGES_EPS:M*share*}
 CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
 .endfor
@@ -407,10 +264,6 @@ CLEANFILES+= ${.CURDIR:T}.pdb
 .endif
 .endif
 
-.if (${STYLESHEET_TYPE} == "xsl")
-CLEANFILES+= ${DOC}.xml .sxerr
-.endif
-
 .if (${LOCAL_CSS_SHEET} != ${CSS_SHEET}) && \
     (${_cf} == "html-split" || ${_cf} == "html-split.tar" || \
      ${_cf} == "html" || ${_cf} == "html.tar" || ${_cf} == "txt")
@@ -420,7 +273,6 @@ CLEANFILES+= ${LOCAL_CSS_SHEET}
 .if !defined(WITH_INLINE_LEGALNOTICE) || empty(WITH_INLINE_LEGALNOTICE) && \
     (${_cf} == "html-split" || ${_cf} == "html-split.tar" || \
      ${_cf} == "html" || ${_cf} == "html.tar" || ${_cf} == "txt")
-CLEANFILES+= LEGALNOTICE.html trademarks.html
 .endif
 
 .endfor		# _curformat in ${FORMATS} #
@@ -438,7 +290,7 @@ CLEANFILES+= LEGALNOTICE.html trademarks
 _cf=${_curformat}
 .for _curcomp in ${INSTALL_COMPRESSED}
 
-.if ${_cf} != "html-split" && ${_cf} != "html"
+.if ${_cf} != "html-split" && ${_cf} != "html" && ${_cf} != "epub"
 _curinst+= install-${_curformat}.${_curcomp}
 _docs+= ${DOC}.${_curformat}.${_curcomp}
 CLEANFILES+= ${DOC}.${_curformat}.${_curcomp}
@@ -453,28 +305,9 @@ CLEANFILES+= ${.CURDIR:T}.${_curformat}.
 .endfor
 .endif
 
-#
-# Index generation
-#
-
-.if defined(GEN_INDEX) && defined(HAS_INDEX)
-JADEFLAGS+=		-i chap.index
-HTML_SPLIT_INDEX?=	html-split.index
-HTML_INDEX?=		html.index
-PRINT_INDEX?=		print.index
-INDEX_SGML?=		index.xml
-
-CLEANFILES+= 		${INDEX_SGML} ${HTML_SPLIT_INDEX} ${HTML_INDEX} ${PRINT_INDEX}
-
-INIT_INDEX_SGML_CMD?=	${PERL} ${COLLATEINDEX} -i doc-index -N -o ${INDEX_SGML}
-GEN_INDEX_SGML_CMD?=	${PERL} ${COLLATEINDEX} -i doc-index -g -o ${INDEX_SGML} ${.ALLSRC:M*.index}
-.else
-GEN_INDEX_SGML_CMD?=	@${ECHO} "Index is disabled or no index to generate."
-.endif
-
 .MAIN: all
 
-all: ${_docs}
+all: ${SRCS} ${_docs}
 
 # put languages which have a problem on rendering printable formats
 # by using TeX to NO_TEX_LANG.
@@ -500,62 +333,46 @@ NO_RTF=		yes
 .endif
 .endfor
 
-# HTML-SPLIT -------------------------------------------------------------
+.if defined(SCHEMATRONS)
+.for sch in ${SCHEMATRONS}
+schxslts+=	${sch}.xsl
+
+${sch}.xsl: ${sch}
+	${XSLTPROC} --param allow-foreign "true" ${XSLSCH} ${.ALLSRC} > ${.TARGET}
+.endfor
+.endif
+
+# Parsed XML  -------------------------------------------------------
 
-.if ${STYLESHEET_TYPE} == "dsssl"
-index.html HTML.manifest: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
-			  ${LOCAL_IMAGES_TXT} ${HTML_SPLIT_INDEX} ${LOCAL_CSS_SHEET}
-	${GEN_INDEX_SGML_CMD}
-	${JADE_CMD} -V html-manifest ${HTMLOPTS} -ioutput.html.images \
-		${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC}
-.elif ${STYLESHEET_TYPE} == "xsl"
-index.html: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
+${DOC}.parsed.xml: ${SRCS}
+	${GREP} '^<?xml version=.*?>' ${DOC}.xml > ${.TARGET}.tmp
+.if ${DOC} == "book"
+	${ECHO_CMD} '<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${.TARGET}.tmp
+.else
+	${ECHO_CMD} '<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${.TARGET}.tmp
+.endif
+	@${ECHO} "==> Basic validation"
+	${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} | \
+	${GREP} -v '^<?xml version=.*?>' >> ${.TARGET}.tmp
+.if defined(PROFILING)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
