diff --git a/en/releases/2.0.5R/Makefile b/en/releases/2.0.5R/Makefile
index eb4dbb3af2..9fa8efc88c 100644
--- a/en/releases/2.0.5R/Makefile
+++ b/en/releases/2.0.5R/Makefile
@@ -1,12 +1,13 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/2.0.5R/Makefile,v 1.2 2000/11/07 04:05:23 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml
+DOCS=	announce.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.0/Makefile b/en/releases/2.0/Makefile
index 8a5d3feb39..255afad52c 100644
--- a/en/releases/2.0/Makefile
+++ b/en/releases/2.0/Makefile
@@ -1,12 +1,15 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/2.0/Makefile,v 1.2 2000/11/07 04:05:23 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml credits.sgml install.sgml notes.sgml
+DOCS=	announce.sgml
+DOCS+=	credits.sgml
+DOCS+=	install.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.1.5R/Makefile b/en/releases/2.1.5R/Makefile
index eb4dbb3af2..565abe5866 100644
--- a/en/releases/2.1.5R/Makefile
+++ b/en/releases/2.1.5R/Makefile
@@ -1,12 +1,13 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/2.1.5R/Makefile,v 1.2 2000/11/07 04:05:24 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml
+DOCS=	announce.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.1.6R/Makefile b/en/releases/2.1.6R/Makefile
index a4c4cf0f92..0c45c04ded 100644
--- a/en/releases/2.1.6R/Makefile
+++ b/en/releases/2.1.6R/Makefile
@@ -1,12 +1,14 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/2.1.6R/Makefile,v 1.3 2000/11/07 04:05:26 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml security.sgml
+DOCS=	announce.sgml
+DOCS+=	notes.sgml
+DOCS+=	security.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.1.7R/Makefile b/en/releases/2.1.7R/Makefile
index eb4dbb3af2..4ad66f33ae 100644
--- a/en/releases/2.1.7R/Makefile
+++ b/en/releases/2.1.7R/Makefile
@@ -1,12 +1,13 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/2.1.7R/Makefile,v 1.2 2000/11/07 04:05:26 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml
+DOCS=	announce.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.1R/Makefile b/en/releases/2.1R/Makefile
index eb4dbb3af2..c564650efc 100644
--- a/en/releases/2.1R/Makefile
+++ b/en/releases/2.1R/Makefile
@@ -1,12 +1,13 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/2.1R/Makefile,v 1.2 2000/11/07 04:05:27 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml
+DOCS=	announce.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.2.2R/Makefile b/en/releases/2.2.2R/Makefile
index 196a4d0cc8..d8f236c548 100644
--- a/en/releases/2.2.2R/Makefile
+++ b/en/releases/2.2.2R/Makefile
@@ -1,12 +1,13 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/2.2.2R/Makefile,v 1.3 2000/11/07 04:05:29 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	notes.sgml errata.sgml
+DOCS=	notes.sgml
+DOCS+=	errata.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.2.5R/Makefile b/en/releases/2.2.5R/Makefile
index 7a7b42dfce..8a3fe062ef 100644
--- a/en/releases/2.2.5R/Makefile
+++ b/en/releases/2.2.5R/Makefile
@@ -1,12 +1,14 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/2.2.5R/Makefile,v 1.3 2000/11/07 04:05:29 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.sgml
+DOCS+=	errata.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.2.6R/Makefile b/en/releases/2.2.6R/Makefile
index 7a7b42dfce..a6342f2048 100644
--- a/en/releases/2.2.6R/Makefile
+++ b/en/releases/2.2.6R/Makefile
@@ -1,12 +1,14 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/2.2.6R/Makefile,v 1.2 2000/11/07 04:05:30 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.sgml
+DOCS+=	errata.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.2.7R/Makefile b/en/releases/2.2.7R/Makefile
index 7a7b42dfce..87be843b74 100644
--- a/en/releases/2.2.7R/Makefile
+++ b/en/releases/2.2.7R/Makefile
@@ -1,12 +1,14 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/2.2.7R/Makefile,v 1.2 2000/11/07 04:05:30 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.sgml
+DOCS+=	errata.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.2.8R/Makefile b/en/releases/2.2.8R/Makefile
index 7a7b42dfce..33d862e33e 100644
--- a/en/releases/2.2.8R/Makefile
+++ b/en/releases/2.2.8R/Makefile
@@ -1,12 +1,14 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/2.2.8R/Makefile,v 1.2 2000/11/07 04:05:31 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.sgml
+DOCS+=	errata.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.2R/Makefile b/en/releases/2.2R/Makefile
index f488ebb62f..004f351c8e 100644
--- a/en/releases/2.2R/Makefile
+++ b/en/releases/2.2R/Makefile
@@ -1,12 +1,14 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/2.2R/Makefile,v 1.3 2000/11/07 04:05:31 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml install-media.sgml notes.sgml
+DOCS=	announce.sgml
+DOCS+=	install-media.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/3.0R/Makefile b/en/releases/3.0R/Makefile
index 7a7b42dfce..9f1e545563 100644
--- a/en/releases/3.0R/Makefile
+++ b/en/releases/3.0R/Makefile
@@ -1,12 +1,14 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/3.0R/Makefile,v 1.2 2000/11/07 04:05:32 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.sgml
+DOCS+=	errata.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/3.1R/Makefile b/en/releases/3.1R/Makefile
index 7a7b42dfce..a34811d51d 100644
--- a/en/releases/3.1R/Makefile
+++ b/en/releases/3.1R/Makefile
@@ -1,12 +1,14 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/3.1R/Makefile,v 1.2 2000/11/07 04:05:33 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.sgml
+DOCS+=	errata.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/3.2R/Makefile b/en/releases/3.2R/Makefile
index 7a7b42dfce..15951662b7 100644
--- a/en/releases/3.2R/Makefile
+++ b/en/releases/3.2R/Makefile
@@ -1,12 +1,14 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/3.2R/Makefile,v 1.2 2000/11/07 04:05:33 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.sgml
+DOCS+=	errata.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/3.3R/Makefile b/en/releases/3.3R/Makefile
index 7a7b42dfce..adfda02e42 100644
--- a/en/releases/3.3R/Makefile
+++ b/en/releases/3.3R/Makefile
@@ -1,12 +1,14 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/3.3R/Makefile,v 1.2 2000/11/07 04:05:34 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.sgml
+DOCS+=	errata.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/3.4R/Makefile b/en/releases/3.4R/Makefile
index 7a7b42dfce..a12eec6e63 100644
--- a/en/releases/3.4R/Makefile
+++ b/en/releases/3.4R/Makefile
@@ -1,12 +1,14 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/3.4R/Makefile,v 1.2 2000/11/07 04:05:34 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.sgml
+DOCS+=	errata.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/3.5R/Makefile b/en/releases/3.5R/Makefile
index 7a7b42dfce..a18a3fa987 100644
--- a/en/releases/3.5R/Makefile
+++ b/en/releases/3.5R/Makefile
@@ -1,12 +1,14 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/3.5R/Makefile,v 1.2 2000/11/07 04:05:34 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.sgml
+DOCS+=	errata.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/4.0R/Makefile b/en/releases/4.0R/Makefile
index 7a7b42dfce..c255b86e28 100644
--- a/en/releases/4.0R/Makefile
+++ b/en/releases/4.0R/Makefile
@@ -1,12 +1,14 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/4.0R/Makefile,v 1.2 2000/11/07 04:05:35 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.sgml
+DOCS+=	errata.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/4.1.1R/Makefile b/en/releases/4.1.1R/Makefile
index 7a7b42dfce..e0d4b9750e 100644
--- a/en/releases/4.1.1R/Makefile
+++ b/en/releases/4.1.1R/Makefile
@@ -1,12 +1,14 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/4.1.1R/Makefile,v 1.2 2000/11/07 04:05:35 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.sgml
+DOCS+=	errata.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/4.10R/Makefile b/en/releases/4.10R/Makefile
index 48ae79c2b9..7b40b95b4d 100644
--- a/en/releases/4.10R/Makefile
+++ b/en/releases/4.10R/Makefile
@@ -1,14 +1,18 @@
-# $FreeBSD: www/en/releases/4.9R/Makefile,v 1.4 2003/10/29 07:30:30 murray Exp $
+# $FreeBSD: www/en/releases/4.10R/Makefile,v 1.1 2004/03/29 23:18:19 scottl Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	hardware.sgml relnotes.sgml schedule.sgml todo.sgml qa.sgml
+DOCS=	hardware.sgml
+DOCS+=	qa.sgml
+DOCS+=	relnotes.sgml
+DOCS+=	schedule.sgml
+DOCS+=	todo.sgml
 
 DATA=	docbook.css
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/4.1R/Makefile b/en/releases/4.1R/Makefile
index 7a7b42dfce..d2968a9951 100644
--- a/en/releases/4.1R/Makefile
+++ b/en/releases/4.1R/Makefile
@@ -1,12 +1,14 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/4.1R/Makefile,v 1.2 2000/11/07 04:05:36 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.sgml
+DOCS+=	errata.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/4.2R/Makefile b/en/releases/4.2R/Makefile
index 7a7b42dfce..8811e6a1e0 100644
--- a/en/releases/4.2R/Makefile
+++ b/en/releases/4.2R/Makefile
@@ -1,12 +1,14 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/4.2R/Makefile,v 1.1 2000/11/21 20:40:39 jkh Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.sgml
+DOCS+=	errata.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/4.3R/Makefile b/en/releases/4.3R/Makefile
index 761a932528..4267740269 100644
--- a/en/releases/4.3R/Makefile
+++ b/en/releases/4.3R/Makefile
@@ -1,12 +1,14 @@
-# $FreeBSD: www/en/releases/4.2R/Makefile,v 1.1 2000/11/21 20:40:39 jkh Exp $
+# $FreeBSD: www/en/releases/4.3R/Makefile,v 1.1 2001/04/21 07:58:32 jkh Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.sgml
+DOCS+=	errata.sgml
+DOCS+=	notes.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/4.4R/Makefile b/en/releases/4.4R/Makefile
index 784472ac37..6162bf88f9 100644
--- a/en/releases/4.4R/Makefile
+++ b/en/releases/4.4R/Makefile
@@ -1,19 +1,21 @@
-# $FreeBSD: www/en/releases/4.4R/Makefile,v 1.4 2001/09/20 16:48:56 bmah Exp $
+# $FreeBSD: www/en/releases/4.4R/Makefile,v 1.5 2001/10/21 23:21:27 bmah Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml hardware.sgml notes.sgml
+DOCS=	announce.sgml
+DOCS+=	hardware.sgml
+DOCS+=	notes.sgml
 
 DATA=	docbook.css
 DATA+=	errata.html
 DATA+=	hardware-alpha.html
 DATA+=	hardware-i386.html
 DATA+=	relnotes-alpha.html
 DATA+=	relnotes-i386.html
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/4.5R/Makefile b/en/releases/4.5R/Makefile
index be45d6681c..b4fe1b70dd 100644
--- a/en/releases/4.5R/Makefile
+++ b/en/releases/4.5R/Makefile
@@ -1,21 +1,26 @@
-# $FreeBSD: www/en/releases/4.5R/Makefile,v 1.5 2002/01/30 04:53:38 murray Exp $
+# $FreeBSD: www/en/releases/4.5R/Makefile,v 1.6 2002/01/30 14:25:02 murray Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	hardware.sgml notes.sgml qa.sgml announce.sgml schedule.sgml
+DOCS=	announce.sgml
 DOCS+=	contents.sgml
+DOCS+=	hardware.sgml
+DOCS+=	notes.sgml
+DOCS+=	qa.sgml
+DOCS+=	schedule.sgml
 
 DATA=	docbook.css
 DATA+=	errata.html
 DATA+=	hardware-alpha.html
 DATA+=	hardware-i386.html
 DATA+=	relnotes-alpha.html
 DATA+=	relnotes-i386.html
+
 DATA+=  cd1.txt cd2.txt cd3.txt cd4.txt
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/4.6.2R/Makefile b/en/releases/4.6.2R/Makefile
index d5c1f9848c..12cf2a7cbe 100644
--- a/en/releases/4.6.2R/Makefile
+++ b/en/releases/4.6.2R/Makefile
@@ -1,21 +1,22 @@
-# $FreeBSD: www/en/releases/4.6.2R/Makefile,v 1.2 2002/08/15 20:28:43 murray Exp $
+# $FreeBSD: www/en/releases/4.6.2R/Makefile,v 1.3 2004/04/05 23:52:12 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	hardware.sgml relnotes.sgml
-DOCS+=	announce.sgml
-# contents.sgml
+DOCS=	announce.sgml
+DOCS+=	hardware.sgml
+DOCS+=	relnotes.sgml
 
 DATA=	docbook.css
 DATA+=	errata.html
-DATA+=	hardware-alpha.html hardware-i386.html
-DATA+=	relnotes-alpha.html relnotes-i386.html
+DATA+=	hardware-alpha.html
+DATA+=	hardware-i386.html
 DATA+=	readme.html
-#DATA+=	cd1.txt cd2.txt cd3.txt cd4.txt mini.txt
+DATA+=	relnotes-alpha.html
+DATA+=	relnotes-i386.html
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/4.6R/Makefile b/en/releases/4.6R/Makefile
index 717c99b77b..f43cc4996b 100644
--- a/en/releases/4.6R/Makefile
+++ b/en/releases/4.6R/Makefile
@@ -1,21 +1,29 @@
-# $FreeBSD: www/en/releases/4.6R/Makefile,v 1.5 2004/04/05 23:52:12 phantom Exp $
+# $FreeBSD: www/en/releases/4.6R/Makefile,v 1.6 2004/04/05 23:57:54 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml contents.sgml
-DOCS+=	hardware.sgml relnotes.sgml qa.sgml schedule.sgml
+DOCS=	announce.sgml
+DOCS+=	contents.sgml
+DOCS+=	hardware.sgml
 DOCS+=	installation.sgml
+DOCS+=	qa.sgml
+DOCS+=	relnotes.sgml
+DOCS+=	schedule.sgml
 
 DATA=	docbook.css
 DATA+=	errata.html
-DATA+=	installation-alpha.html installation-i386.html
-DATA+=	hardware-alpha.html hardware-i386.html
-DATA+=	relnotes-alpha.html relnotes-i386.html
+DATA+=	installation-alpha.html
+DATA+=	installation-i386.html
+DATA+=	hardware-alpha.html
+DATA+=	hardware-i386.html
+DATA+=	relnotes-alpha.html
+DATA+=	relnotes-i386.html
+
 DATA+=	cd1.txt cd2.txt cd3.txt cd4.txt mini.txt
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/4.7R/Makefile b/en/releases/4.7R/Makefile
index c80880c4bf..8d4ed30036 100644
--- a/en/releases/4.7R/Makefile
+++ b/en/releases/4.7R/Makefile
@@ -1,21 +1,29 @@
-# $FreeBSD: www/en/releases/4.7R/Makefile,v 1.8 2004/04/05 23:52:12 phantom Exp $
+# $FreeBSD: www/en/releases/4.7R/Makefile,v 1.9 2004/04/05 23:57:55 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	hardware.sgml relnotes.sgml schedule.sgml qa.sgml announce.sgml
-DOCS+=  installation.sgml
+DOCS=	announce.sgml
+DOCS+=	hardware.sgml
+DOCS+=	installation.sgml
+DOCS+=	qa.sgml
+DOCS+=	relnotes.sgml
+DOCS+=	schedule.sgml
 
 DATA=	docbook.css
 DATA+=	errata.html
-DATA+=	installation-alpha.html installation-i386.html
-DATA+=	hardware-alpha.html hardware-i386.html
-DATA+=	relnotes-alpha.html relnotes-i386.html
+DATA+=	installation-alpha.html
+DATA+=	installation-i386.html
+DATA+=	hardware-alpha.html
+DATA+=	hardware-i386.html
 DATA+=	readme.html
+DATA+=	relnotes-alpha.html
+DATA+=	relnotes-i386.html
+
 DATA+=  CHECKSUM-i386.MD5
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/4.8R/Makefile b/en/releases/4.8R/Makefile
index d0c184e3a4..b2c59ecbab 100644
--- a/en/releases/4.8R/Makefile
+++ b/en/releases/4.8R/Makefile
@@ -1,20 +1,27 @@
-# $FreeBSD: www/en/releases/4.8R/Makefile,v 1.5 2004/04/05 23:52:12 phantom Exp $
+# $FreeBSD: www/en/releases/4.8R/Makefile,v 1.6 2004/04/05 23:57:55 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml hardware.sgml relnotes.sgml schedule.sgml qa.sgml
-DOCS+=  installation.sgml
+DOCS=	announce.sgml
+DOCS+=	hardware.sgml
+DOCS+=	installation.sgml
+DOCS+=	qa.sgml
+DOCS+=	relnotes.sgml
+DOCS+=	schedule.sgml
 
 DATA=	docbook.css
 DATA+=	errata.html
-DATA+=	installation-alpha.html installation-i386.html
-DATA+=	hardware-alpha.html hardware-i386.html
-DATA+=	relnotes-alpha.html relnotes-i386.html
+DATA+=	hardware-alpha.html
+DATA+=	hardware-i386.html
+DATA+=	installation-alpha.html
+DATA+=	installation-i386.html
 DATA+=	readme.html
+DATA+=	relnotes-alpha.html
+DATA+=	relnotes-i386.html
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/4.9R/Makefile b/en/releases/4.9R/Makefile
index 1e2afd7580..089ae3646d 100644
--- a/en/releases/4.9R/Makefile
+++ b/en/releases/4.9R/Makefile
@@ -1,21 +1,28 @@
-# $FreeBSD: www/en/releases/4.9R/Makefile,v 1.5 2004/04/05 23:52:12 phantom Exp $
+# $FreeBSD: www/en/releases/4.9R/Makefile,v 1.6 2004/04/05 23:57:55 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	hardware.sgml relnotes.sgml schedule.sgml todo.sgml qa.sgml
-DOCS+=	announce.sgml installation.sgml
-
+DOCS=	announce.sgml
+DOCS+=	hardware.sgml
+DOCS+=	installation.sgml
+DOCS+=	relnotes.sgml
+DOCS+=	qa.sgml
+DOCS+=	schedule.sgml
+DOCS+=	todo.sgml
 
 DATA=	docbook.css
 DATA+=	errata.html
-DATA+=	installation-alpha.html installation-i386.html
-DATA+=	hardware-alpha.html hardware-i386.html
-DATA+=	relnotes-alpha.html relnotes-i386.html
+DATA+=	hardware-alpha.html
+DATA+=	hardware-i386.html
+DATA+=	installation-alpha.html
+DATA+=	installation-i386.html
 DATA+=	readme.html
+DATA+=	relnotes-alpha.html
+DATA+=	relnotes-i386.html
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/5.0R/DP1/Makefile b/en/releases/5.0R/DP1/Makefile
index 4c0d5e2a34..87cad30ce1 100644
--- a/en/releases/5.0R/DP1/Makefile
+++ b/en/releases/5.0R/DP1/Makefile
@@ -1,28 +1,28 @@
-# $FreeBSD: www/en/releases/5.0R/DP1/Makefile,v 1.2 2002/04/08 22:21:35 murray Exp $
+# $FreeBSD: www/en/releases/5.0R/DP1/Makefile,v 1.3 2004/04/05 23:52:12 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	hardware.sgml relnotes.sgml installation.sgml
-DOCS+=	announce.sgml
-# contents.sgml
+DOCS=	announce.sgml
+DOCS+=	hardware.sgml
+DOCS+=	installation.sgml
+DOCS+=	relnotes.sgml
 
 DATA=	docbook.css
 DATA+=	errata.html
 DATA+=	hardware-alpha.html
 DATA+=	hardware-i386.html
 DATA+=	hardware-sparc64.html
-DATA+=	relnotes-alpha.html
-DATA+=	relnotes-i386.html
-DATA+=	relnotes-sparc64.html
 DATA+=	installation-alpha.html
 DATA+=	installation-i386.html
 DATA+=	installation-sparc64.html
 DATA+=	readme.html
-# DATA+=  cd1.txt cd2.txt cd3.txt cd4.txt
+DATA+=	relnotes-alpha.html
+DATA+=	relnotes-i386.html
+DATA+=	relnotes-sparc64.html
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/5.0R/DP2/Makefile b/en/releases/5.0R/DP2/Makefile
index 942778fe62..dbabb7d76d 100644
--- a/en/releases/5.0R/DP2/Makefile
+++ b/en/releases/5.0R/DP2/Makefile
@@ -1,35 +1,35 @@
-# $FreeBSD: www/en/releases/5.0R/DP2/Makefile,v 1.3 2002/11/19 00:41:51 bmah Exp $
+# $FreeBSD: www/en/releases/5.0R/DP2/Makefile,v 1.4 2004/04/05 23:52:12 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	hardware.sgml relnotes.sgml installation.sgml
-DOCS+=	announce.sgml
-# contents.sgml
+DOCS=	announce.sgml
+DOCS+=	hardware.sgml
+DOCS+=	installation.sgml
+DOCS+=	relnotes.sgml
 
 DATA=	docbook.css
 DATA+=	errata.html
 DATA+=	early-adopter.html
 DATA+=	hardware-alpha.html
 DATA+=	hardware-ia64.html
 DATA+=	hardware-i386.html
 DATA+=	hardware-pc98.html
 DATA+=	hardware-sparc64.html
-DATA+=	relnotes-alpha.html
-DATA+=	relnotes-ia64.html
-DATA+=	relnotes-i386.html
-DATA+=	relnotes-pc98.html
-DATA+=	relnotes-sparc64.html
 DATA+=	installation-alpha.html
 DATA+=	installation-ia64.html
 DATA+=	installation-i386.html
 DATA+=	installation-pc98.html
 DATA+=	installation-sparc64.html
 DATA+=	readme.html
-# DATA+=  cd1.txt cd2.txt cd3.txt cd4.txt
+DATA+=	relnotes-alpha.html
+DATA+=	relnotes-ia64.html
+DATA+=	relnotes-i386.html
+DATA+=	relnotes-pc98.html
+DATA+=	relnotes-sparc64.html
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/5.0R/Makefile b/en/releases/5.0R/Makefile
index 53829e8d26..33421551eb 100644
--- a/en/releases/5.0R/Makefile
+++ b/en/releases/5.0R/Makefile
@@ -1,35 +1,40 @@
-# $FreeBSD: www/en/releases/5.0R/Makefile,v 1.6 2003/01/19 16:04:02 bmah Exp $
+# $FreeBSD: www/en/releases/5.0R/Makefile,v 1.7 2004/04/05 23:52:12 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml schedule.sgml todo.sgml
-DOCS+=	hardware.sgml relnotes.sgml installation.sgml
+SUBDIR=  DP1
+SUBDIR+= DP2
+
+DOCS=	announce.sgml
+DOCS+=	hardware.sgml
+DOCS+=	installation.sgml
+DOCS+=	relnotes.sgml
+DOCS+=	schedule.sgml
+DOCS+=	todo.sgml
 
 DATA=	docbook.css
 DATA+=	errata.html
 DATA+=	early-adopter.html
 DATA+=	hardware-alpha.html
 DATA+=	hardware-ia64.html
 DATA+=	hardware-i386.html
 DATA+=	hardware-pc98.html
 DATA+=	hardware-sparc64.html
-DATA+=	relnotes-alpha.html
-DATA+=	relnotes-ia64.html
-DATA+=	relnotes-i386.html
-DATA+=	relnotes-pc98.html
-DATA+=	relnotes-sparc64.html
 DATA+=	installation-alpha.html
 DATA+=	installation-ia64.html
 DATA+=	installation-i386.html
 DATA+=	installation-pc98.html
 DATA+=	installation-sparc64.html
 DATA+=	readme.html
-
-SUBDIR=	DP1 DP2
+DATA+=	relnotes-alpha.html
+DATA+=	relnotes-ia64.html
+DATA+=	relnotes-i386.html
+DATA+=	relnotes-pc98.html
+DATA+=	relnotes-sparc64.html
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/5.1R/Makefile b/en/releases/5.1R/Makefile
index 879127aebd..9fc3baf57f 100644
--- a/en/releases/5.1R/Makefile
+++ b/en/releases/5.1R/Makefile
@@ -1,33 +1,37 @@
-# $FreeBSD: www/en/releases/5.1R/Makefile,v 1.3 2003/06/09 16:58:23 bmah Exp $
+# $FreeBSD: www/en/releases/5.1R/Makefile,v 1.4 2004/04/05 23:52:13 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml schedule.sgml todo.sgml
-DOCS+=	hardware.sgml relnotes.sgml installation.sgml
+DOCS=	announce.sgml
+DOCS+=	hardware.sgml
+DOCS+=	installation.sgml
+DOCS+=	relnotes.sgml
+DOCS+=	schedule.sgml
+DOCS+=	todo.sgml
 
 DATA=	docbook.css
 DATA+=	errata.html
 DATA+=	early-adopter.html
 DATA+=	hardware-alpha.html
 DATA+=	hardware-ia64.html
 DATA+=	hardware-i386.html
 DATA+=	hardware-pc98.html
 DATA+=	hardware-sparc64.html
-DATA+=	relnotes-alpha.html
-DATA+=	relnotes-ia64.html
-DATA+=	relnotes-i386.html
-DATA+=	relnotes-pc98.html
-DATA+=	relnotes-sparc64.html
 DATA+=	installation-alpha.html
 DATA+=	installation-ia64.html
 DATA+=	installation-i386.html
 DATA+=	installation-pc98.html
 DATA+=	installation-sparc64.html
 DATA+=	readme.html
+DATA+=	relnotes-alpha.html
+DATA+=	relnotes-ia64.html
+DATA+=	relnotes-i386.html
+DATA+=	relnotes-pc98.html
+DATA+=	relnotes-sparc64.html
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/5.2.1R/Makefile b/en/releases/5.2.1R/Makefile
index 27827889b5..006b48ca5e 100644
--- a/en/releases/5.2.1R/Makefile
+++ b/en/releases/5.2.1R/Makefile
@@ -1,37 +1,38 @@
-# $FreeBSD: www/en/releases/5.2.1R/Makefile,v 1.3 2004/04/05 23:52:13 phantom Exp $
+# $FreeBSD: www/en/releases/5.2.1R/Makefile,v 1.4 2004/04/05 23:57:55 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	hardware.sgml relnotes.sgml
-DOCS+=	announce.sgml
-DOCS+=  installation.sgml
+DOCS=	announce.sgml
+DOCS+=	hardware.sgml
+DOCS+=	installation.sgml
+DOCS+=	relnotes.sgml
 
 DATA=	docbook.css
 DATA+=  errata.html
 DATA+=  early-adopter.html
 DATA+=  hardware-alpha.html
 DATA+=  hardware-amd64.html
 DATA+=  hardware-ia64.html
 DATA+=  hardware-i386.html
 DATA+=  hardware-pc98.html
 DATA+=  hardware-sparc64.html
-DATA+=  relnotes-alpha.html
-DATA+=  relnotes-amd64.html
-DATA+=  relnotes-ia64.html
-DATA+=  relnotes-i386.html
-DATA+=  relnotes-pc98.html
-DATA+=  relnotes-sparc64.html
 DATA+=  installation-alpha.html
 DATA+=  installation-amd64.html
 DATA+=  installation-ia64.html
 DATA+=  installation-i386.html
 DATA+=  installation-pc98.html
 DATA+=  installation-sparc64.html
 DATA+=  readme.html
+DATA+=  relnotes-alpha.html
+DATA+=  relnotes-amd64.html
+DATA+=  relnotes-ia64.html
+DATA+=  relnotes-i386.html
+DATA+=  relnotes-pc98.html
+DATA+=  relnotes-sparc64.html
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/5.2R/Makefile b/en/releases/5.2R/Makefile
index 149f899e95..8ca7ce323a 100644
--- a/en/releases/5.2R/Makefile
+++ b/en/releases/5.2R/Makefile
@@ -1,37 +1,40 @@
-# $FreeBSD: www/en/releases/5.2R/Makefile,v 1.5 2004/04/05 23:52:13 phantom Exp $
+# $FreeBSD$
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-DOCS=	todo.sgml schedule.sgml
-DOCS+=	announce.sgml installation.sgml
-DOCS+=	hardware.sgml relnotes.sgml
+DOCS=	announce.sgml
+DOCS+=	hardware.sgml
+DOCS+=	installation.sgml
+DOCS+=	relnotes.sgml
+DOCS+=	schedule.sgml
+DOCS+=	todo.sgml
 
 DATA=	docbook.css
 DATA+=  errata.html
 DATA+=  early-adopter.html
 DATA+=  hardware-alpha.html
 DATA+=  hardware-amd64.html
 DATA+=  hardware-ia64.html
 DATA+=  hardware-i386.html
 DATA+=  hardware-pc98.html
 DATA+=  hardware-sparc64.html
-DATA+=  relnotes-alpha.html
-DATA+=  relnotes-amd64.html
-DATA+=  relnotes-ia64.html
-DATA+=  relnotes-i386.html
-DATA+=  relnotes-pc98.html
-DATA+=  relnotes-sparc64.html
 DATA+=  installation-alpha.html
 DATA+=  installation-amd64.html
 DATA+=  installation-ia64.html
 DATA+=  installation-i386.html
 DATA+=  installation-pc98.html
 DATA+=  installation-sparc64.html
 DATA+=  readme.html
+DATA+=  relnotes-alpha.html
+DATA+=  relnotes-amd64.html
+DATA+=  relnotes-ia64.html
+DATA+=  relnotes-i386.html
+DATA+=  relnotes-pc98.html
+DATA+=  relnotes-sparc64.html
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/Makefile b/en/releases/Makefile
index 5a13bd22cc..f26f4aaed8 100644
--- a/en/releases/Makefile
+++ b/en/releases/Makefile
@@ -1,22 +1,22 @@
-# $FreeBSD: www/en/releases/Makefile,v 1.41 2004/02/25 05:10:01 bmah Exp $
+# $FreeBSD: www/en/releases/Makefile,v 1.42 2004/03/29 23:18:19 scottl Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
 DOCS?=	index.sgml snapshots.sgml
 
-SUBDIR=	1.1 1.1.5 2.0 2.0.5R 2.1R 2.1.5R 2.1.6R 2.1.7R 2.2R
+SUBDIR=		1.1 1.1.5 2.0 2.0.5R 2.1R 2.1.5R 2.1.6R 2.1.7R 2.2R
 SUBDIR+=	2.2.1R 2.2.2R 2.2.5R 2.2.6R 2.2.7R 2.2.8R 3.0R 3.1R 3.2R
 SUBDIR+=	3.3R 3.4R 3.5R 4.0R 4.1R 4.1.1R 4.2R 4.3R 4.4R 4.5R 4.6R
 SUBDIR+=	4.6.2R 4.7R 4.8R 4.9R 4.10R
 SUBDIR+=	5.0R 5.1R 5.2R 5.2.1R 5.3R
 
 .if defined $(NEW_BUILD)
 SUBDIR=
 .endif
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"