diff --git a/de/Makefile b/de/Makefile
index 0ba71c392f..e750b8fdb7 100644
--- a/de/Makefile
+++ b/de/Makefile
@@ -1,78 +1,72 @@
 # The FreeBSD Documentation Project
 # The FreeBSD German Documentation Project
-# $FreeBSD: www/de/Makefile,v 1.13 2004/01/11 00:32:03 mheinen Exp $
+# $FreeBSD: www/de/Makefile,v 1.14 2004/04/05 14:17:52 phantom Exp $
 # $FreeBSDde: de-www/Makefile,v 1.21 2004/01/05 11:08:11 mheinen Exp $
 # basiert auf: 1.105
 
 .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+= availability.sgml
 DOCS+= features.sgml
 DOCS+= internet.sgml
 DOCS+= mailto.sgml
 DOCS+= relnotes.sgml
 DOCS+= where.sgml
 
 # These will be directly installed.
 
 #DATA=	favicon.ico
 #DATA+=	robots.txt
 #DATA+=	freebsd.css
 #DATA+=	vendors.html
 
 # Subdirectories
 # SGML
 SUBDIR= news
 SUBDIR+= FAQ
 SUBDIR+= handbook
 SUBDIR+= platforms
 SUBDIR+= releases
 SUBDIR+= security
 .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
 
-COOKIE=	FAQ handbook
-
 WEBDIR?=	data/de
 
 # index.html is special, and generated from index.xsl and news/news.xml
 DATA+=		index.html
 CLEANFILES+=	index.html
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
 
 index.html: index.xsl ${XML_INCLUDES}\
 		${XML_NEWS_INCLUDES} ${XML_NEWS_NEWS} ${XML_NEWS_PRESS}\
 		${XML_MIRRORS} ${XML_ADVISORIES}
 	${XSLTPROC} ${XSLTPROCOPTS} \
 		-o $@ \
 		--param mirrors.xml "'${XML_MIRRORS}'" \
 		--param advisories.xml "'${XML_ADVISORIES}'" \
 		--param news.press.xml "'${XML_NEWS_PRESS}'" \
 		--param news.project.xml "'${XML_NEWS_NEWS}'" \
 		${.CURDIR}/index.xsl ${XML_NEWS_NEWS}
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
diff --git a/en/Makefile b/en/Makefile
index 2597304b14..8b7e48f2f3 100644
--- a/en/Makefile
+++ b/en/Makefile
@@ -1,110 +1,104 @@
-# $FreeBSD: www/en/Makefile,v 1.107 2004/02/01 00:02:58 josef Exp $
+# $FreeBSD: www/en/Makefile,v 1.108 2004/04/05 14:21:26 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
 DATA+=	freebsd.css
 DATA+=  vendors.html
 
 # Subdirectories
 # SGML
 SUBDIR=	 security
 SUBDIR+= commercial
 SUBDIR+= docproj
 SUBDIR+= news
 SUBDIR+= advocacy
 
 SUBDIR+= events
 SUBDIR+= FAQ
 SUBDIR+= handbook
+SUBDIR+= tutorials
 SUBDIR+= internal
 SUBDIR+= java
 SUBDIR+= copyright
 SUBDIR+= search
 SUBDIR+= gallery
 SUBDIR+= projects
 SUBDIR+= prstats
 SUBDIR+= platforms
 SUBDIR+= releases
 SUBDIR+= releng
 SUBDIR+= smp
 SUBDIR+= kse
 SUBDIR+= gnome
 SUBDIR+= donations
 .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?=	da de es fr it ja pt_BR ru tr zh
 
-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
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
 
 index.html: index.xsl ${XML_INCLUDES}\
 		${XML_NEWS_INCLUDES} ${XML_NEWS_NEWS} ${XML_NEWS_PRESS}\
 		${XML_MIRRORS} ${XML_TRANSTABLE} ${XML_ADVISORIES} ${XML_NAVIGATION}
 	${XSLTPROC} ${XSLTPROCOPTS} \
 		-o $@ \
 		--param mirrors.xml "'${XML_MIRRORS}'" \
 		--param advisories.xml "'${XML_ADVISORIES}'" \
 		--param news.press.xml "'${XML_NEWS_PRESS}'" \
 		--param news.project.xml "'${XML_NEWS_NEWS}'" \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		--param navigation.xml "'${XML_NAVIGATION}'" \
 		${.CURDIR}/index.xsl ${XML_NEWS_NEWS}
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
diff --git a/fr/Makefile b/fr/Makefile
index 23990c090e..26158a3876 100644
--- a/fr/Makefile
+++ b/fr/Makefile
@@ -1,115 +1,108 @@
-# $FreeBSD: www/fr/Makefile,v 1.4 2004/03/06 17:33:18 stephane Exp $
+# $FreeBSD: www/fr/Makefile,v 1.5 2004/04/05 14:17:52 phantom Exp $
 
 # The FreeBSD French Documentation Project
 # Original revision: 1.107
 
 .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
 DATA+=	freebsd.css
 DATA+=  vendors.html
 
 # Subdirectories
 # SGML
 SUBDIR=	 security
 SUBDIR+= commercial
 SUBDIR+= docproj
 SUBDIR+= news
 SUBDIR+= advocacy
 
 SUBDIR+= events
 SUBDIR+= FAQ
 SUBDIR+= handbook
+SUBDIR+= tutorials
 SUBDIR+= internal
 SUBDIR+= java
 SUBDIR+= copyright
 SUBDIR+= search
 SUBDIR+= gallery
 SUBDIR+= projects
 SUBDIR+= prstats
 SUBDIR+= platforms
 SUBDIR+= releases
 SUBDIR+= releng
 SUBDIR+= smp
 SUBDIR+= kse
 SUBDIR+= gnome
 SUBDIR+= donations
 .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?=	da de es fr it ja pt_BR ru tr zh
 
-COOKIE=	FAQ handbook
-
 # Non-English
 
 # .if !defined(ENGLISH_ONLY) || empty(ENGLISH_ONLY)
 # .for DIR in ${WEB_LANG}
 # SUBDIR+=	../${DIR}
 # .endfor
 # .endif
 
 WEBDIR?=	data/fr
 
 # index.html is special, and generated from index.xsl and news/news.xml
 DATA+=		index.html
 CLEANFILES+=	index.html
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
 
 index.html: index.xsl ${XML_INCLUDES}\
 		${XML_NEWS_INCLUDES} ${XML_NEWS_NEWS} ${XML_NEWS_PRESS}\
 		${XML_MIRRORS} ${XML_TRANSTABLE} ${XML_ADVISORIES} ${XML_NAVIGATION}
 	${XSLTPROC} ${XSLTPROCOPTS} \
 		-o $@ \
 		--param mirrors.xml "'${XML_MIRRORS}'" \
 		--param advisories.xml "'${XML_ADVISORIES}'" \
 		--param news.press.xml "'${XML_NEWS_PRESS}'" \
 		--param news.project.xml "'${XML_NEWS_NEWS}'" \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		--param navigation.xml "'${XML_NAVIGATION}'" \
 		${.CURDIR}/index.xsl ${XML_NEWS_NEWS}
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
 
diff --git a/pt_BR/Makefile b/pt_BR/Makefile
index 359f09e334..3f34d100a4 100644
--- a/pt_BR/Makefile
+++ b/pt_BR/Makefile
@@ -1,27 +1,25 @@
 # The FreeBSD Documentation Project
 # The FreeBSD Brazilian Portuguese Documentation Project
 #
 # Based on: 1.105
 #
-# $FreeBSD: www/pt_BR/Makefile,v 1.1 2002/10/05 16:05:33 lioux Exp $
+# $FreeBSD: www/pt_BR/Makefile,v 1.2 2004/01/05 03:02:25 lioux Exp $
 
 .if exists(Makefile.conf)
 .include "Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
 # Subdirectories
 # SGML
 SUBDIR+= FAQ
 
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 SUBDIR+=	doc
 .endif
 
-COOKIE=	FAQ
-
 WEBDIR?=	data/pt_BR
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ru/Makefile b/ru/Makefile
index e99d3a6ab8..6e616b6c7c 100644
--- a/ru/Makefile
+++ b/ru/Makefile
@@ -1,102 +1,95 @@
 #
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD: www/ru/Makefile,v 1.34 2004/03/23 23:27:57 phantom Exp $
+# $FreeBSD: www/ru/Makefile,v 1.35 2004/04/05 14:17:52 phantom Exp $
 # $FreeBSDru: frdp/www/ru/Makefile,v 1.34 2004/02/11 12:17:39 den Exp $
 #
 # Original revision: 1.107
 #
 
 .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
 
 # Subdirectories
 # SGML
 SUBDIR=  security
 SUBDIR+= commercial
 SUBDIR+= docproj
 SUBDIR+= news
 #SUBDIR+= advocacy
 
 #SUBDIR+= events
 SUBDIR+= FAQ
 SUBDIR+= handbook
+SUBDIR+= tutorials
 SUBDIR+= internal
 SUBDIR+= java
 SUBDIR+= copyright
 SUBDIR+= search
 SUBDIR+= gallery
 SUBDIR+= projects
 #SUBDIR+= prstats
 SUBDIR+= platforms
 SUBDIR+= releases
 SUBDIR+= releng
 SUBDIR+= smp
 SUBDIR+= kse
 #SUBDIR+= gnome
 SUBDIR+= donations
 .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
 
-COOKIE=		FAQ handbook
-
 WEBDIR?=	data/ru
 
 # index.html is special, and generated from index.xsl and news/news.xml
 DATA+=		index.html
 CLEANFILES+=	index.html
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
 
 index.html: index.xsl ${XML_INCLUDES}\
 		${XML_NEWS_INCLUDES} ${XML_NEWS_NEWS} ${XML_NEWS_PRESS}\
 		${XML_MIRRORS} ${XML_TRANSTABLE} ${XML_ADVISORIES} ${XML_NAVIGATION}
 	${XSLTPROC} ${XSLTPROCOPTS} \
 		-o $@ \
 		--param mirrors.xml "'${XML_MIRRORS}'" \
 		--param advisories.xml "'${XML_ADVISORIES}'" \
 		--param news.press.xml "'${XML_NEWS_PRESS}'" \
 		--param news.project.xml "'${XML_NEWS_NEWS}'" \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		--param navigation.xml "'${XML_NAVIGATION}'" \
 		${.CURDIR}/index.xsl ${XML_NEWS_NEWS}
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif