diff --git a/en/Makefile b/en/Makefile
index 78066d5b69..097a40672f 100644
--- a/en/Makefile
+++ b/en/Makefile
@@ -1,120 +1,122 @@
-# $FreeBSD: www/en/Makefile,v 1.75 2001/11/14 18:31:14 phantom Exp $
+# $FreeBSD: www/en/Makefile,v 1.76 2001/12/12 11:57:36 phantom Exp $
 .if exists(Makefile.conf)
 .include "Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
 # These are turned into validated, normalized HTML files.
 
 DOCS=  applications.sgml
 DOCS+= auditors.sgml
 DOCS+= availability.sgml
 DOCS+= docs.sgml 
 DOCS+= features.sgml
 DOCS+= register.sgml
 DOCS+= internet.sgml 
 DOCS+= mailto.sgml 
 DOCS+= publish.sgml
 DOCS+= relnotes.sgml
 DOCS+= send-pr.sgml
 DOCS+= support.sgml
 DOCS+= where.sgml 
 DOCS+= y2kbug.sgml 
 
 # These will be directly installed.
 
 DATA=	favicon.ico
 DATA+=	robots.txt
 
 # Subdirectories
 # SGML
 SUBDIR=	 security
 SUBDIR+= commercial
 SUBDIR+= docproj
 SUBDIR+= news
 
 SUBDIR+= internal
 SUBDIR+= java
 SUBDIR+= copyright
 SUBDIR+= search
 SUBDIR+= gallery
 SUBDIR+= projects
 SUBDIR+= prstats
 SUBDIR+= platforms
 SUBDIR+= releases 
 SUBDIR+= smp
 SUBDIR+= conspectus
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 SUBDIR+= ports
 SUBDIR+= doc
 .endif
 .if defined(BUILD_RELNOTES)
 SUBDIR+= relnotes
 .endif
 
 # These *must* be listed after the "doc" subdir, as they create symlinks
 # in to it.
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 SUBDIR+= tutorials
 .endif
 
 # Non-SGML
 SUBDIR+= gifs
 SUBDIR+= cgi
 
 WEB_LANG?=	ja es ru zh de
 
 COOKIE=	FAQ handbook
 
 # Non-English
 
 .if !defined(ENGLISH_ONLY) || empty(ENGLISH_ONLY)
 .for DIR in ${WEB_LANG}
 SUBDIR+=	../${DIR}
 .endfor
 .endif
 
 WEBDIR=		data
 
 # index.html is special, and generated from index.xsl and news/news.xml
 DATA+=		index.html
 CLEANFILES+=	index.html
 
 index.html: index.xsl news/news.xml news/press.xml includes.xsl news/includes.xsl
 	${XSLTPROC} ${XSLTPROCOPTS} -o index.html \
 		${.CURDIR}/index.xsl ${.CURDIR}/news/news.xml
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} index.html
+.endif
 
 # Handle the FAQ/ and handbook/ directories specially.
 FAQ:
 	${LN} -fs ${.OBJDIR}/../../doc/en_US.ISO8859-1/books/faq FAQ
 
 handbook:
 	${LN} -fs ${.OBJDIR}/../../doc/en_US.ISO8859-1/books/handbook handbook
 
 # In "make obj" case FAQ and handbook are symlinks and have to be removed
 # at "make clean"
 .if ${.OBJDIR} != ${.CURDIR}
 CLEANFILES+=	FAQ
 CLEANFILES+=	handbook
 .endif
 
 afterinstall:
 	cd ${DOCINSTALLDIR}; \
 		${LN} -fs doc/en_US.ISO8859-1/books/faq ${DOCINSTALLDIR}/FAQ
 	cd ${DOCINSTALLDIR}; \
 		${LN} -fs doc/en_US.ISO8859-1/books/handbook ${DOCINSTALLDIR}/handbook
 
 LINBOT?=	${PREFIX}/bin/linbot
 LINBOTOPTS?=	-ab
 LINBOTDIR?=	/linbot
 LINBOTINSTALLDIR?= ${DESTDIR}${LINBOTDIR}
 LINBOTURL?=	http://www.FreeBSD.org/
 
 linbot:
 	@[ -d ${LINBOTINSTALLDIR} ] || ${MKDIR} ${LINBOTINSTALLDIR}
 	${LINBOT} ${LINBOTOPTS} -o ${LINBOTINSTALLDIR} ${LINBOTURL}
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/gallery/Makefile b/en/gallery/Makefile
index 60036dc450..4daa43d2bf 100644
--- a/en/gallery/Makefile
+++ b/en/gallery/Makefile
@@ -1,39 +1,47 @@
-# $FreeBSD: www/en/gallery/Makefile,v 1.14 2001/10/29 10:14:31 murray Exp $
+# $FreeBSD: www/en/gallery/Makefile,v 1.15 2001/12/12 11:57:36 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
 XSLTPROCFLAGS=	--catalogs
 XSLT=	${SETENV} SGML_CATALOG_FILES=${PREFIX}/share/xml/dtd/xhtml/xhtml.soc \
 	${XSLTPROC} ${XSLTPROCOPTS}
 
 INDEXLINK= gallery.html
 
 DATA+=	gallery.html cgallery.html npgallery.html pgallery.html
 
 CLEANFILES+= ${DATA}
 
 gallery.html: gallery.xml gallery.xsl ../includes.xsl
 	${XSLT} ${.CURDIR}/gallery.xsl ${.CURDIR}/gallery.xml > ${.TARGET}
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 cgallery.html: gallery.xml gallery-entry.xsl
 	${XSLT} --param type \'commercial\' \
 		${.CURDIR}/gallery-entry.xsl ${.CURDIR}/gallery.xml > ${.TARGET}
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 npgallery.html: gallery.xml gallery-entry.xsl
 	${XSLT} --param type \'nonprofit\' \
 		${.CURDIR}/gallery-entry.xsl ${.CURDIR}/gallery.xml > ${.TARGET}
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 pgallery.html: gallery.xml gallery-entry.xsl
 	${XSLT} --param type \'personal\' \
 		${.CURDIR}/gallery-entry.xsl ${.CURDIR}/gallery.xml > ${.TARGET}
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/news/Makefile b/en/news/Makefile
index 3abb95c27c..cb2b4d928d 100644
--- a/en/news/Makefile
+++ b/en/news/Makefile
@@ -1,51 +1,55 @@
-# $FreeBSD: www/en/news/Makefile,v 1.30 2001/10/29 10:14:31 murray Exp $
+# $FreeBSD: www/en/news/Makefile,v 1.31 2001/12/12 11:57:37 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
 #DOCS+= press.sgml
 DOCS+= news.sgml
 #DOCS+= webchanges.sgml
 
 # press releases
 DOCS+= pressreleases.sgml
 DOCS+= press-rel-1.sgml
 DOCS+= press-rel-2.sgml
 DOCS+= press-rel-3.sgml
 DOCS+= press-rel-4.sgml
 DOCS+= press-rel-5.sgml
 
 # The yearly State of the Union address
 DOCS+= sou1999.sgml
 
 INDEXLINK= news.html
 
 SUBDIR= 	1996
 SUBDIR+= 	1997
 SUBDIR+= 	1998
 SUBDIR+= 	1999
 SUBDIR+= 	2000
 SUBDIR+=	status
 
 DATA=		newsflash.html news.rdf press.html
 CLEANFILES+=	newsflash.html news.rdf press.html
 
 newsflash.html: newsflash.xsl news.xml includes.xsl ../includes.xsl
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
 		${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 news.rdf: news-rdf.xsl news.xml includes.xsl ../includes.xsl
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
 		${.CURDIR}/news-rdf.xsl ${.CURDIR}/news.xml
 
 press.html: press.xsl press.xml includes.xsl ../includes.xsl
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
 		${.CURDIR}/press.xsl ${.CURDIR}/press.xml
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/news/status/Makefile b/en/news/status/Makefile
index 5facacfbaf..6ae06258ae 100644
--- a/en/news/status/Makefile
+++ b/en/news/status/Makefile
@@ -1,31 +1,33 @@
-# $FreeBSD: www/en/news/status/Makefile,v 1.10 2001/11/12 22:25:12 chris Exp $
+# $FreeBSD: www/en/news/status/Makefile,v 1.11 2001/12/12 11:57:37 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
 .SUFFIXES:	.xml .html
 
 DOCS=	status.sgml
 
 DATA=	report-june-2001.html
 DATA+=	report-july-2001.html
 DATA+=	report-august-2001.html
 DATA+=	report-september-2001.html
 
 # Install a sample <project> entry.
 DATA+=	report-sample.xml
 
 CLEANFILES+=	${DATA:M*.html}
 
 .xml.html:	report.xsl includes.xsl
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
 		${.CURDIR}/report.xsl ${.IMPSRC}
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 INDEXLINK=	status.html
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/Makefile b/ja/Makefile
index e60158607f..d07a178ed7 100644
--- a/ja/Makefile
+++ b/ja/Makefile
@@ -1,91 +1,93 @@
-# $FreeBSD: www/ja/Makefile,v 1.53 2001/11/17 17:21:09 hrs Exp $
+# $FreeBSD: www/ja/Makefile,v 1.54 2001/12/12 11:57:38 phantom Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.75
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
 # These are turned into validated, normalized HTML files.
 
 DOCS=  applications.sgml
 DOCS+= auditors.sgml
 DOCS+= availability.sgml
 DOCS+= docs.sgml 
 DOCS+= features.sgml
 DOCS+= register.sgml
 DOCS+= internet.sgml 
 DOCS+= mailto.sgml 
 DOCS+= publish.sgml
 #DOCS+= relnotes.sgml
 DOCS+= send-pr.sgml
 DOCS+= support.sgml
 DOCS+= where.sgml 
 DOCS+= y2kbug.sgml 
 
 # Japanese-only file
 DOCS+= jabout.sgml
 
 # These will be directly installed.
 
 #DATA=	favicon.ico
 #DATA+=	robots.txt
 
 # Subdirectories
 # SGML
 SUBDIR=	 security
 SUBDIR+= commercial
 SUBDIR+= docproj
 SUBDIR+= news
 
 SUBDIR+= internal
 SUBDIR+= java
 SUBDIR+= copyright
 SUBDIR+= search
 SUBDIR+= gallery
 SUBDIR+= projects
 #SUBDIR+= prstats
 SUBDIR+= platforms
 SUBDIR+= releases
 SUBDIR+= smp
 SUBDIR+= conspectus
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 SUBDIR+= ports
 # SUBDIR+= doc
 # .endif
 # .if defined(BUILD_RELNOTES)
 # SUBDIR+= relnotes
 # .endif
 #
 # # These *must* be listed after the "doc" subdir, as they create symlinks
 # # in to it.
 # .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 SUBDIR+= tutorials
 
 DOCSUBDIR=	FAQ handbook
 .endif
 
 # Non-SGML
 #SUBDIR+= gifs
 #SUBDIR+= cgi
 
 SGMLFLAGS=	-links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr -e EUC-JP
 
 WEBDIR=		data/ja
 
 # index.html is special, and generated from index.xsl and news/news.xml
 DATA+=		index.html
 CLEANFILES+=	index.html
 
 index.html: index.xsl news/news.xml news/press.xml includes.xsl news/includes.xsl
 	${XSLTPROC} ${XSLTPROCOPTS} -o index.html \
 		${.CURDIR}/index.xsl ${.CURDIR}/news/news.xml
-	-${TIDY} ${TIDYOPTS} index.html
+.if !defined(NO_TIDY)
+	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 ### Revision checking
 REVCHECK=	yes
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/gallery/Makefile b/ja/gallery/Makefile
index 8f3085b2aa..5115821e32 100644
--- a/ja/gallery/Makefile
+++ b/ja/gallery/Makefile
@@ -1,46 +1,54 @@
-# $FreeBSD: www/ja/gallery/Makefile,v 1.16 2001/11/18 22:33:58 hrs Exp $
+# $FreeBSD: www/ja/gallery/Makefile,v 1.17 2001/12/12 11:57:38 phantom Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.14
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
 XSLTPROCFLAGS=	--catalogs
 XSLT=	${SETENV} SGML_CATALOG_FILES=${PREFIX}/share/xml/dtd/xhtml/xhtml.soc \
 	${XSLTPROC} ${XSLTPROCFLAGS}
 
 SRC=	../../en/gallery/gallery.xml
 
 INDEXLINK= gallery.html
 
 DATA+=	gallery.html cgallery.html npgallery.html pgallery.html
 
 CLEANFILES+= ${DATA}
 
 gallery.html: ${SRC} gallery.xsl ../includes.xsl
 	${XSLT} ${.CURDIR}/gallery.xsl ${.CURDIR}/${SRC} > ${.TARGET}
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 cgallery.html: ${SRC} gallery-entry.xsl
 	${XSLT} --param type \'commercial\' \
 		${.CURDIR}/gallery-entry.xsl ${.CURDIR}/${SRC} > ${.TARGET}
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 npgallery.html: ${SRC} gallery-entry.xsl
 	${XSLT} --param type \'nonprofit\' \
 		${.CURDIR}/gallery-entry.xsl ${.CURDIR}/${SRC} > ${.TARGET}
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 pgallery.html: ${SRC} gallery-entry.xsl
 	${XSLT} --param type \'personal\' \
 		${.CURDIR}/gallery-entry.xsl ${.CURDIR}/${SRC} > ${.TARGET}
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 ### Revision checking
 REVCHECK=	yes
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/news/Makefile b/ja/news/Makefile
index 2f64546c20..2405bc26e1 100644
--- a/ja/news/Makefile
+++ b/ja/news/Makefile
@@ -1,57 +1,61 @@
-# $FreeBSD: www/ja/news/Makefile,v 1.30 2001/11/19 15:35:42 hrs Exp $
+# $FreeBSD: www/ja/news/Makefile,v 1.31 2001/12/12 11:57:42 phantom Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.30
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
 #DOCS= press.sgml
 DOCS+= news.sgml
 #DOCS+= webchanges.sgml
 
 # press releases
 DOCS+= pressreleases.sgml
 DOCS+= press-rel-1.sgml
 DOCS+= press-rel-2.sgml
 DOCS+= press-rel-3.sgml
 DOCS+= press-rel-4.sgml
 DOCS+= press-rel-5.sgml
 
 # The yearly State of the Union address
 #DOCS+=	sou1999.sgml
 
 INDEXLINK= news.html
 
 SUBDIR= 	1996
 SUBDIR+= 	1997
 #SUBDIR+= 	1998
 #SUBDIR+= 	1999
 #SUBDIR+= 	2000
 #SUBDIR+=	status
 
 DATA=		newsflash.html press.html
 #+= news.rdf
 CLEANFILES+=	newsflash.html press.html
 
 newsflash.html: newsflash.xsl news.xml includes.xsl ../includes.xsl
 	${XSLTPROC} ${XSLTPROCFLAGS} -o ${.TARGET} \
 		${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 news.rdf: news-rdf.xsl news.xml includes.xsl ../includes.xsl
 	${XSLTPROC} ${XSLTPROCFLAGS} -o ${.TARGET} \
 		${.CURDIR}/news-rdf.xsl ${.CURDIR}/news.xml
 
 press.html: press.xsl press.xml includes.xsl ../includes.xsl
 	${XSLTPROC} ${XSLTPROCFLAGS} -o ${.TARGET} \
 		${.CURDIR}/press.xsl ${.CURDIR}/press.xml
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 ### Revision checking
 REVCHECK=	YES
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"