svn commit: r46901 - in head: en_US.ISO8859-1/articles/pgpkeys share/mk

[Warren Block]

Author: wblock
Date: Tue Jun 30 14:47:21 2015
New Revision: 46901
URL: https://svnweb.freebsd.org/changeset/doc/46901

Log:
  Increase the global size of maxvars for xsltproc to help it choke down
  large indigestible blobs like the PGP keys article.  Also remove the
  special settings in the PGP Keys article Makefile that are no longer
  necessary.

Modified:
  head/en_US.ISO8859-1/articles/pgpkeys/Makefile
  head/share/mk/doc.xml.mk

Modified: head/en_US.ISO8859-1/articles/pgpkeys/Makefile
==============================================================================
--- head/en_US.ISO8859-1/articles/pgpkeys/Makefile	Tue Jun 30 11:10:38 2015	(r46900)
+++ head/en_US.ISO8859-1/articles/pgpkeys/Makefile	Tue Jun 30 14:47:21 2015	(r46901)
@@ -19,7 +19,3 @@ URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
-
-# disable hyphenation of long lines in verbatim blocks
-# like <programlistings> to prevent PDF build errors
-XSLTPROCOPTS+=	--param hyphenate.verbatim 0

Modified: head/share/mk/doc.xml.mk
==============================================================================
--- head/share/mk/doc.xml.mk	Tue Jun 30 11:10:38 2015	(r46900)
+++ head/share/mk/doc.xml.mk	Tue Jun 30 14:47:21 2015	(r46901)
@@ -279,7 +279,7 @@ XML_NOTICES=		${DOC_PREFIX}/share/xml/no
 XSLTPROC_ENV+=	XML_CATALOG_FILES="${XML_CATALOG_FILES}"
 
 XSLTPROCOPTS=	${XSLTPROCFLAGS}
-XSLTPROCOPTS+=	--xinclude --nonet
+XSLTPROCOPTS+=	--xinclude --nonet --maxvars 20000
 .if defined(WWWFREEBSDORG)
 XSLTPROCOPTS+=	--param "html.header.script.google" "'INCLUDE'"
 .endif