From 9b85c2d7f5bec58bbbc43d7dccea2eecbc337752 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 22 Sep 2012 19:20:16 +0000
Subject: [PATCH] - Remove old web content and references to them

Discussed with:	doc@, www@
---
 de_DE.ISO8859-1/htdocs/docs/webresources.sgml |    5 -
 de_DE.ISO8859-1/htdocs/projects/projects.sgml |   10 -
 .../htdocs/releases/5.2R/early-adopter.html   |    3 +-
 .../htdocs/releases/5.3R/migration-guide.html |    4 +-
 en_US.ISO8859-1/htdocs/Makefile               |    3 -
 en_US.ISO8859-1/htdocs/docs/webresources.sgml |    5 -
 .../htdocs/internal/developer.sgml            |    1 -
 en_US.ISO8859-1/htdocs/java/dists/10.sgml     |   55 -
 en_US.ISO8859-1/htdocs/java/dists/11.sgml     |  114 -
 en_US.ISO8859-1/htdocs/java/dists/12.sgml     |   83 -
 en_US.ISO8859-1/htdocs/java/dists/13.sgml     |  227 --
 en_US.ISO8859-1/htdocs/java/dists/14.sgml     |   97 -
 en_US.ISO8859-1/htdocs/java/dists/Makefile    |    7 +-
 en_US.ISO8859-1/htdocs/java/news.xml          |   72 +-
 en_US.ISO8859-1/htdocs/kse/Makefile           |   12 -
 en_US.ISO8859-1/htdocs/kse/index.sgml         |  243 --
 en_US.ISO8859-1/htdocs/news/1998/index.sgml   |    9 -
 .../htdocs/news/status/report-2001-11.xml     |    4 +-
 .../news/status/report-2001-12-2002-01.xml    |    5 +-
 .../news/status/report-2002-02-2002-04.xml    |    8 +-
 .../news/status/report-2002-05-2002-06.xml    |    9 +-
 .../news/status/report-2002-09-2002-10.xml    |    1 -
 .../news/status/report-2003-03-2003-09.xml    |    5 +-
 .../news/status/report-2003-10-2003-12.xml    |    4 +-
 .../news/status/report-2004-03-2004-04.xml    |    7 +-
 .../news/status/report-2004-05-2004-06.xml    |    5 +-
 .../news/status/report-2004-07-2004-12.xml    |    4 +-
 .../htdocs/projects/netperf/index.sgml        |    7 +-
 en_US.ISO8859-1/htdocs/projects/projects.sgml |    8 -
 .../htdocs/releases/5.0R/schedule.sgml        |    4 +-
 .../htdocs/releases/5.1R/schedule.sgml        |    4 +-
 .../htdocs/releases/5.2.1R/early-adopter.html |    4 +-
 .../htdocs/releases/5.2R/early-adopter.html   |    4 +-
 .../htdocs/releases/5.3R/migration-guide.html |    4 +-
 .../htdocs/releases/5.4R/migration-guide.html |    4 +-
 en_US.ISO8859-1/htdocs/search/sitemap.xml     |   50 -
 en_US.ISO8859-1/htdocs/smp/Makefile           |   12 -
 en_US.ISO8859-1/htdocs/smp/index.sgml         | 2802 ----------------
 en_US.ISO8859-1/htdocs/y2kbug.sgml            |  249 --
 es_ES.ISO8859-1/books/faq/book.sgml           |   13 -
 es_ES.ISO8859-1/htdocs/Makefile               |    1 -
 es_ES.ISO8859-1/htdocs/news/newsflash.sgml    |    8 -
 es_ES.ISO8859-1/htdocs/projects/projects.sgml |    1 -
 es_ES.ISO8859-1/htdocs/search/sitemap.xml     |    8 +-
 es_ES.ISO8859-1/htdocs/y2kbug.sgml            |  265 --
 fr_FR.ISO8859-1/htdocs/Makefile               |    3 -
 fr_FR.ISO8859-1/htdocs/docs/webresources.sgml |    5 -
 .../htdocs/internal/developer.sgml            |    1 -
 fr_FR.ISO8859-1/htdocs/java/dists/10.sgml     |   64 -
 fr_FR.ISO8859-1/htdocs/java/dists/11.sgml     |  133 -
 fr_FR.ISO8859-1/htdocs/java/dists/12.sgml     |   92 -
 fr_FR.ISO8859-1/htdocs/java/dists/13.sgml     |  239 --
 fr_FR.ISO8859-1/htdocs/java/dists/14.sgml     |  105 -
 fr_FR.ISO8859-1/htdocs/java/dists/Makefile    |    7 +-
 fr_FR.ISO8859-1/htdocs/java/index.sgml        |    4 -
 fr_FR.ISO8859-1/htdocs/java/newsflash.sgml    |   34 +-
 fr_FR.ISO8859-1/htdocs/kse/Makefile           |   15 -
 fr_FR.ISO8859-1/htdocs/kse/index.sgml         |  252 --
 fr_FR.ISO8859-1/htdocs/news/1998/index.sgml   |    9 -
 fr_FR.ISO8859-1/htdocs/news/webchanges.sgml   |    4 -
 fr_FR.ISO8859-1/htdocs/projects/projects.sgml |    9 -
 fr_FR.ISO8859-1/htdocs/search/sitemap.xml     |   53 +-
 fr_FR.ISO8859-1/htdocs/smp/Makefile           |   15 -
 fr_FR.ISO8859-1/htdocs/smp/index.sgml         |   31 -
 fr_FR.ISO8859-1/htdocs/y2kbug.sgml            |  258 --
 hu_HU.ISO8859-2/htdocs/docs/webresources.sgml |    7 -
 hu_HU.ISO8859-2/htdocs/projects/projects.sgml |   13 -
 hu_HU.ISO8859-2/htdocs/search/sitemap.xml     |   53 +-
 .../articles/committers-guide/article.sgml    |    4 +-
 ja_JP.eucJP/books/faq/book.sgml               |   15 -
 ja_JP.eucJP/htdocs/Makefile                   |    2 -
 ja_JP.eucJP/htdocs/docs/webresources.sgml     |    5 -
 ja_JP.eucJP/htdocs/internal/developer.sgml    |    1 -
 ja_JP.eucJP/htdocs/java/dists/10.sgml         |   70 -
 ja_JP.eucJP/htdocs/java/dists/11.sgml         |  115 -
 ja_JP.eucJP/htdocs/java/dists/12.sgml         |  107 -
 ja_JP.eucJP/htdocs/java/dists/13.sgml         |  248 --
 ja_JP.eucJP/htdocs/java/dists/14.sgml         |  115 -
 ja_JP.eucJP/htdocs/java/dists/Makefile        |    7 +-
 ja_JP.eucJP/htdocs/java/news.xml              |   36 +-
 ja_JP.eucJP/htdocs/projects/projects.sgml     |    8 -
 ja_JP.eucJP/htdocs/search/sitemap.xml         |   50 -
 ja_JP.eucJP/htdocs/smp/Makefile               |   14 -
 ja_JP.eucJP/htdocs/smp/index.sgml             | 2813 -----------------
 ja_JP.eucJP/htdocs/y2kbug.sgml                |  261 --
 pt_BR.ISO8859-1/books/faq/book.sgml           |   13 -
 .../articles/committers-guide/article.sgml    |    4 +-
 ru_RU.KOI8-R/htdocs/Makefile                  |    3 -
 ru_RU.KOI8-R/htdocs/docs/webresources.sgml    |    4 -
 ru_RU.KOI8-R/htdocs/internal/developer.sgml   |    3 -
 ru_RU.KOI8-R/htdocs/java/dists/10.sgml        |   68 -
 ru_RU.KOI8-R/htdocs/java/dists/11.sgml        |  125 -
 ru_RU.KOI8-R/htdocs/java/dists/12.sgml        |  119 -
 ru_RU.KOI8-R/htdocs/java/dists/13.sgml        |  242 --
 ru_RU.KOI8-R/htdocs/java/dists/14.sgml        |   90 -
 ru_RU.KOI8-R/htdocs/java/dists/Makefile       |    7 +-
 ru_RU.KOI8-R/htdocs/java/index.sgml           |    4 -
 ru_RU.KOI8-R/htdocs/java/newsflash.sgml       |   54 +-
 ru_RU.KOI8-R/htdocs/kse/Makefile              |   19 -
 ru_RU.KOI8-R/htdocs/kse/index.sgml            |  254 --
 ru_RU.KOI8-R/htdocs/news/1998/index.sgml      |    9 -
 ru_RU.KOI8-R/htdocs/projects/projects.sgml    |    9 -
 .../htdocs/releases/5.3R/migration-guide.html |    4 +-
 .../htdocs/releases/5.4R/migration-guide.html |    4 +-
 ru_RU.KOI8-R/htdocs/search/sitemap.xml        |   53 +-
 ru_RU.KOI8-R/htdocs/smp/Makefile              |   16 -
 ru_RU.KOI8-R/htdocs/smp/index.sgml            | 2516 ---------------
 ru_RU.KOI8-R/htdocs/y2kbug.sgml               |  285 --
 share/sgml/multimedia.dtd                     |    5 +-
 tr_TR.ISO8859-9/htdocs/docs.sgml              |    5 -
 zh_CN.GB2312/htdocs/Makefile                  |    1 -
 zh_CN.GB2312/htdocs/y2kbug.sgml               |  252 --
 zh_TW.Big5/htdocs/docs/webresources.sgml      |    4 -
 113 files changed, 143 insertions(+), 13756 deletions(-)
 delete mode 100644 en_US.ISO8859-1/htdocs/java/dists/10.sgml
 delete mode 100644 en_US.ISO8859-1/htdocs/java/dists/11.sgml
 delete mode 100644 en_US.ISO8859-1/htdocs/java/dists/12.sgml
 delete mode 100644 en_US.ISO8859-1/htdocs/java/dists/13.sgml
 delete mode 100644 en_US.ISO8859-1/htdocs/java/dists/14.sgml
 delete mode 100644 en_US.ISO8859-1/htdocs/kse/Makefile
 delete mode 100644 en_US.ISO8859-1/htdocs/kse/index.sgml
 delete mode 100644 en_US.ISO8859-1/htdocs/smp/Makefile
 delete mode 100644 en_US.ISO8859-1/htdocs/smp/index.sgml
 delete mode 100644 en_US.ISO8859-1/htdocs/y2kbug.sgml
 delete mode 100644 es_ES.ISO8859-1/htdocs/y2kbug.sgml
 delete mode 100644 fr_FR.ISO8859-1/htdocs/java/dists/10.sgml
 delete mode 100644 fr_FR.ISO8859-1/htdocs/java/dists/11.sgml
 delete mode 100644 fr_FR.ISO8859-1/htdocs/java/dists/12.sgml
 delete mode 100644 fr_FR.ISO8859-1/htdocs/java/dists/13.sgml
 delete mode 100644 fr_FR.ISO8859-1/htdocs/java/dists/14.sgml
 delete mode 100644 fr_FR.ISO8859-1/htdocs/kse/Makefile
 delete mode 100644 fr_FR.ISO8859-1/htdocs/kse/index.sgml
 delete mode 100644 fr_FR.ISO8859-1/htdocs/smp/Makefile
 delete mode 100644 fr_FR.ISO8859-1/htdocs/smp/index.sgml
 delete mode 100644 fr_FR.ISO8859-1/htdocs/y2kbug.sgml
 delete mode 100644 ja_JP.eucJP/htdocs/java/dists/10.sgml
 delete mode 100644 ja_JP.eucJP/htdocs/java/dists/11.sgml
 delete mode 100644 ja_JP.eucJP/htdocs/java/dists/12.sgml
 delete mode 100644 ja_JP.eucJP/htdocs/java/dists/13.sgml
 delete mode 100644 ja_JP.eucJP/htdocs/java/dists/14.sgml
 delete mode 100644 ja_JP.eucJP/htdocs/smp/Makefile
 delete mode 100644 ja_JP.eucJP/htdocs/smp/index.sgml
 delete mode 100644 ja_JP.eucJP/htdocs/y2kbug.sgml
 delete mode 100644 ru_RU.KOI8-R/htdocs/java/dists/10.sgml
 delete mode 100644 ru_RU.KOI8-R/htdocs/java/dists/11.sgml
 delete mode 100644 ru_RU.KOI8-R/htdocs/java/dists/12.sgml
 delete mode 100644 ru_RU.KOI8-R/htdocs/java/dists/13.sgml
 delete mode 100644 ru_RU.KOI8-R/htdocs/java/dists/14.sgml
 delete mode 100644 ru_RU.KOI8-R/htdocs/kse/Makefile
 delete mode 100644 ru_RU.KOI8-R/htdocs/kse/index.sgml
 delete mode 100644 ru_RU.KOI8-R/htdocs/smp/Makefile
 delete mode 100644 ru_RU.KOI8-R/htdocs/smp/index.sgml
 delete mode 100644 ru_RU.KOI8-R/htdocs/y2kbug.sgml
 delete mode 100644 zh_CN.GB2312/htdocs/y2kbug.sgml

diff --git a/de_DE.ISO8859-1/htdocs/docs/webresources.sgml b/de_DE.ISO8859-1/htdocs/docs/webresources.sgml
index d186c02b83..fe67d3be54 100644
--- a/de_DE.ISO8859-1/htdocs/docs/webresources.sgml
+++ b/de_DE.ISO8859-1/htdocs/docs/webresources.sgml
@@ -43,11 +43,6 @@
         </li>
       </ul>
 
-    <h3><a href="&enbase;/y2kbug.html">Die Jahr-2000-Kompatibilit�t</a></h3>
-
-    <p>Ver�ffentlichungen und Kommentare des FreeBSD Projects zur
-      Jahr-2000-Kompatibilit�t.</p>
-
     <h3><a href="http://fxr.watson.org/">The Source Code</a></h3>
 
     <p>Wenn Sie gerne im Quellcode herumst�bern, sollten Sie sich
diff --git a/de_DE.ISO8859-1/htdocs/projects/projects.sgml b/de_DE.ISO8859-1/htdocs/projects/projects.sgml
index 486919ca07..ebdfa1b9d1 100644
--- a/de_DE.ISO8859-1/htdocs/projects/projects.sgml
+++ b/de_DE.ISO8859-1/htdocs/projects/projects.sgml
@@ -261,12 +261,6 @@
   <h3>Kernel und Sicherheit</h3>
 
   <ul>
-    <li><a name="kse" href="&enbase;/kse/index.html">Kernel Scheduler
-      Entities</a>: Ein Projekt zur Verbesserung der
-      Threading-Unterst�tzung in FreeBSD; es nutzt ein
-      Threading-System, das im Design �hnlich den Scheduler
-      Activations ist.</li>
-
     <li><a name="lotteryscheduling"
       href="http://www.cs.cmu.edu/~dpetrou/research.html"> Lottery
       Scheduling Kernel</a>: Diese Arbeit basiert auf dem lottery
@@ -286,10 +280,6 @@
       die TrustedBSD Audit Implementierung zur Verf�gung, welche
       in FreeBSD integriert werden wird.</li>
 
-    <li><a name="SMP" href="&enbase;/smp/index.html">Symmetric
-      MultiProcessor Support</a>: Dokumentation und Informationen
-      zur Nutzung von Mehrprozessor-Systemen mit FreeBSD.</li>
-
     <li><a name="trustedbsd"
       href="http://www.TrustedBSD.org/">TrustedBSD</a>: Stellt eine
       Sammlung von zuverl�ssigen Betriebssystem-Erweiterungen
diff --git a/de_DE.ISO8859-1/htdocs/releases/5.2R/early-adopter.html b/de_DE.ISO8859-1/htdocs/releases/5.2R/early-adopter.html
index 7d5017ba67..1e88316147 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.2R/early-adopter.html
+++ b/de_DE.ISO8859-1/htdocs/releases/5.2R/early-adopter.html
@@ -175,8 +175,7 @@ dagegen schon nach 4-STABLE 
 mehreren Prozessoren (noch nicht abgeschlossen). Die Arbeit konzentriert sich zur Zeit
 darauf, Locks fuer m�glichst kleine Bereiche der diversen Subsysteme des Kernels zu
 implementieren, damit m�glichst viele Vorg�nge (Threads) gleichzeitig im Kernel
-ablaufen k�nnen. Weitere Informationen finden Sie auf den Seiten des <a
-href="http://www.FreeBSD.org/smp/" target="_top">FreeBSD SMP Project</a>.</p>
+ablaufen k�nnen.</p>
 </li>
 
 <li>
diff --git a/de_DE.ISO8859-1/htdocs/releases/5.3R/migration-guide.html b/de_DE.ISO8859-1/htdocs/releases/5.3R/migration-guide.html
index 45d6985268..cc5089b8f1 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.3R/migration-guide.html
+++ b/de_DE.ISO8859-1/htdocs/releases/5.3R/migration-guide.html
@@ -186,9 +186,7 @@ enth
 Mehrprozessorsysteme (SMP). Die Arbeit konzentriert sich zur Zeit darauf, Locks f�r
 m�glichst kleine Bereiche der diversen Subsysteme des Kernels zu implementieren,
 damit m�glichst viele Vorg�nge (Threads) gleichzeitig im Kernel ablaufen
-k�nnen. Dabei wurde besonderes auf die Geschwindigkeit des Netzwerk-Stacks geachtet.
-Weitere Informationen finden Sie auf den Seiten des <a
-href="http://www.FreeBSD.org/smp/index.html" target="_top">FreeBSD SMP Project</a>.</p>
+k�nnen. Dabei wurde besonderes auf die Geschwindigkeit des Netzwerk-Stacks geachtet.</p>
 </li>
 
 <li>
diff --git a/en_US.ISO8859-1/htdocs/Makefile b/en_US.ISO8859-1/htdocs/Makefile
index 917dc029dd..9611b39fde 100644
--- a/en_US.ISO8859-1/htdocs/Makefile
+++ b/en_US.ISO8859-1/htdocs/Makefile
@@ -25,7 +25,6 @@ DOCS+= relnotes.sgml
 DOCS+= send-pr.sgml
 DOCS+= support.sgml
 DOCS+= where.sgml
-DOCS+= y2kbug.sgml
 
 XMLDOCS=	index:xsl:${XML_NEWS_NEWS}:
 DEPENDSET.index=transtable mirrors news press events \
@@ -63,7 +62,6 @@ SUBDIR+= handbook
 SUBDIR+= internal
 SUBDIR+= ipv6
 SUBDIR+= java
-SUBDIR+= kse
 SUBDIR+= marketing
 SUBDIR+= multimedia
 SUBDIR+= news
@@ -75,7 +73,6 @@ SUBDIR+= releases
 SUBDIR+= releng
 SUBDIR+= search
 SUBDIR+= security
-SUBDIR+= smp
 SUBDIR+= snapshots
 SUBDIR+= support
 SUBDIR+= tutorials
diff --git a/en_US.ISO8859-1/htdocs/docs/webresources.sgml b/en_US.ISO8859-1/htdocs/docs/webresources.sgml
index 158d9176cb..f8e4702bce 100644
--- a/en_US.ISO8859-1/htdocs/docs/webresources.sgml
+++ b/en_US.ISO8859-1/htdocs/docs/webresources.sgml
@@ -44,11 +44,6 @@
 
 	    <h2>Additional resources</h2>
 
-	    <h3><a href="../y2kbug.html">Year 2000 Compatibility</a></h3>
-
-	    <p>The FreeBSD project's current statement about its Year 2000
-	      compatibility.</p>
-
 	    <h3><a href="http://fxr.watson.org/">The
 		Source Code</a></h3>
 
diff --git a/en_US.ISO8859-1/htdocs/internal/developer.sgml b/en_US.ISO8859-1/htdocs/internal/developer.sgml
index 8c2f708e50..4adcb71cf6 100644
--- a/en_US.ISO8859-1/htdocs/internal/developer.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/developer.sgml
@@ -58,7 +58,6 @@ the FreeBSD Web pages from the CVS repository by hand.</p>
   <li><a href="../platforms/ia64/index.html">FreeBSD/IA-64 Project</a></li>
   <li><a href="../platforms/ppc.html">FreeBSD/PPC Project</a></li>
   <li><a href="../platforms/sparc.html">FreeBSD/SPARC Project</a></li>
-  <li><a href="../smp/">SMP Next Generation Project</a></li>
   <li><a href="http://www.TrustedBSD.org/">TrustedBSD Project</a></li>
   <li><a href="../projects/index.html">FreeBSD Development Projects</a></li>
 </ul>
diff --git a/en_US.ISO8859-1/htdocs/java/dists/10.sgml b/en_US.ISO8859-1/htdocs/java/dists/10.sgml
deleted file mode 100644
index 5dcdaebd85..0000000000
--- a/en_US.ISO8859-1/htdocs/java/dists/10.sgml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "FreeBSD Java Project: JDK 1.0 - UNSUPPORTED">
-]>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-
-<h2>&jdk; 1.0.x</h2>
-<p>Although it is noted below, this distribution is no longer found on freefall.FreeBSD.org.  If you can find this port, feel free to use it. :)</p>
-<pre>
-Announcement
-------------
-A native FreeBSD binary distribution of the JDK 1.0.2 is now available from
-  freefall.FreeBSD.org:/pub/FreeBSD/LOCAL_PORTS/jdk102.tar.gz
-This port contains the java interpreter, compiler, and appletviewer.
-This is a completely unsupported distribution.
-
-Installation
-------------
-1. Grab freefall.FreeBSD.org:/pub/FreeBSD/LOCAL_PORTS/jdk102.tar.gz.
-2. Create a directory and untar the FreeBSD distribution in there.
-3. Install the pdksh port.
-
-Running the JDK
----------------
-If your JDK directory is rooted at &lt;jdk&gt;, you need to set
-  1. your path to include the &lt;jdk&gt;/bin directory
-  2. CLASSPATH environment variable to .:&lt;jdk&gt;/classes
-  3. LD_LIBRARY_PATH to include &lt;jdk&gt;/lib/i386
-To compile a java program, invoke 'javac program.java'.
-To run it, use 'java &lt;name of main class&gt;'.
-
-Answers to Common Questions
----------------------------
-Q: Do I need Motif?
-A: No.
-
-Q: Which version of FreeBSD does this work on?
-A: I run the current version of FreeBSD, so that's the only version which
-   I've verified.     /*"FreeBSD-current?" -comment added by Dave Hummel, not
-                                   original author */
-
-Q: It doesn't work on my machine.  What do I do?
-A: You are out of luck.  This is a completely unsupported distribution.
-</pre>
-
-</body>
-</html>
diff --git a/en_US.ISO8859-1/htdocs/java/dists/11.sgml b/en_US.ISO8859-1/htdocs/java/dists/11.sgml
deleted file mode 100644
index 128debcac5..0000000000
--- a/en_US.ISO8859-1/htdocs/java/dists/11.sgml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "FreeBSD &java; Project: &jdk; 1.1">
-]>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-
-<p>The latest version is
-<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/jdk1.1.8_ELF.V1999-11-9.tar.gz">jdk1.1.8_ELF.V1999-11-9.tar.gz</a>.
-for ELF (FreeBSD versions 3 or 4) or for older 2.2 releases you can grab
-<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/nate/JDK1.1/jdk1.1.8_AOUT.V1999-11-9.tar.gz">jdk1.1.8_AOUT.V1099-11-9.tar.gz</a>.
-Patches which were used to build both releases are available
-<a href="http://www.FreeBSD.org/~patrick/patches.tar.gz">here</a>.  These are only useful if you have the actual Java source code.</p>
-
-<p> In addition, the appropriate internationalized JRE&trade; releases are
-also available.</p>
-<ul>
-<li>
-<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/nate/JDK1.1/jre1.1.8i_AOUT.V1999-11-9.tar.gz">jre1.1.8i_AOUT.V1999-11-9.tar.gz</a></li>
-<li>
-<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/nate/JDK1.1/jre1.1.8i_ELF.V1999-11-9.tar.gz">jre1.1.8i_ELF.V1999-11-9.tar.gz</a></li>
-</ul>
-
-<p>You might trying getting it from a site that is a bit closer to you,
-      or you might be http impaired.  Try to get it from one of these mirrors.:</p>
-<ul>
-<li>
-<a href="ftp://ftp.nuxi.com/pub/FreeBSD/JDK/">ftp://ftp.nuxi.com/pub/FreeBSD/JDK/</a>
-<br/>Thanks go to David O'Brien (obrien@NUXI.com), who gave me an account
-on his box, so this mirror should always be correct.</li>
-
-<li>
-<a href="http://mirror.aarnet.edu.au/pub/FreeBSD/JDK/">http://mirror.aarnet.edu.au/pub/FreeBSD/JDK/</a></li>
-
-<li>
-<a href="ftp://mirror.aarnet.edu.au/pub/FreeBSD/JDK/">ftp://mirror.aarnet.edu.au/pub/FreeBSD/JDK/</a>
-<br/>Available in Australia/New Zealand only.  Thanks go to Jason Andrade
-(jason@dstc.edu.au) for supplying these mirror sites across the pond.</li>
-
-<li>
-<a href="ftp://ftp.se.FreeBSD.org/pub/FreeBSD/JDK/">ftp://ftp.se.FreeBSD.org/pub/FreeBSD/JDK/</a>
-<br/>Thanks go to Johan Larsson (gozer@ludd.luth.se).</li>
-
-<li>
-<a href="ftp://ftp7.de.FreeBSD.org/pub/FreeBSD/JDK/">ftp://ftp7.de.FreeBSD.org/pub/FreeBSD/JDK/</a>
-<br/><a href="http://ftp7.de.FreeBSD.org/pub/FreeBSD/JDK/">http://ftp7.de.FreeBSD.org/pub/FreeBSD/JDK/</a>
-<br/>Thanks go to Oliver Fromme (olli@dorifer.heim3.tu-clausthal.de).</li>
-
-<li>
-<a href="ftp://ftp.gwdg.de/pub/freebsd/JDK/">ftp://ftp.gwdg.de/pub/freebsd/JDK/</a>
-<br/><a href="http://ftp.gwdg.de/pub/freebsd/JDK/">http://ftp.gwdg.de/pub/freebsd/JDK/</a>
-<br/>Thanks go to Eberhard Moenkeberg (emoenke@gwdg.de).</li>
-
-<li>
-<a href="ftp://nofinesse.lib.surrey.ac.uk/pub/FreeBSD/JDK/">ftp://nofinesse.lib.surrey.ac.uk/pub/FreeBSD/JDK/</a>
-<br/>Thanks go to Jose Marques who set this to automate the process.</li>
-
-<li>
-<a href="ftp://ftp.spline.net/pub/FreeBSD/JDK/">ftp://ftp.spline.net/pub/FreeBSD/JDK/</a>
-<br/>Thanks go to Alexander Tatmaniants (tat@Spline.NET) .</li>
-</ul>
-
-<p>These releases do not require a Motif license as they are compiled
-against a Motif library which allows public distribution of the JDK
-libraries and binaries.</p>
-
-<h3>README.FreeBSD:</h3>
-<pre>
-JDK1.1.8 for FreeBSD
---------------------
-Fixed in this release:
-- Printing from the JDK should now work reliably.
-- Updated to now use the assembly version of the interpreter.  Performance
-  should be increased.
-- Better handling of signals like DIVIDE and SIGFPE which are trapped and
-  handled correctly now.
-- The ELF version should work better with AWT/Swing applications.  The
-  FreeBSD project donated a more modern copy of Motif that should avoid
-  some weird X errors that occurred previously.
-
-For best results, we suggest you run the most recent releases of FreeBSD,
-which are 2.2.8 for the a.out releases, and FreeBSD 3.2R, to take advantage
-of the fixes in those releases.
-
-If you find bug or have bug-fixes you'd like to see integrated, please send
-email to 'java-port@FreeBSD.org' so we can make future releases even better.
-
-Known Bugs/Limitations:
-------------------------------------
-The number of sockets that can be used at any one time is hard-coded ahead
-of time (at this time, it's 2000).  This is not necessarily a limitation of
-the FreeBSD kernel, but coming up with a 'dynamic' scheme is non-trivial so
-none of the developers has written the code, and no-one else has
-provided any patches to the development team.  If this is important to you,
-we welcome any patches to provide a more 'dynamic' scheme that doesn't limit
-the number of file descriptors (sockets).
-------------------------------------
-To make a distribution that works without X *and* with X, two binaries
-are provided. The first is linked without X, and is the standard binary.
- The second binary is linked against a static version of X, and against
-the shared X libraries.  The version used is controlled by the setting
-of the DISPLAY environment variable, which is used by X to determine
-where to send the output.
-</pre>
-
-</body>
-</html>
diff --git a/en_US.ISO8859-1/htdocs/java/dists/12.sgml b/en_US.ISO8859-1/htdocs/java/dists/12.sgml
deleted file mode 100644
index bc455cf94d..0000000000
--- a/en_US.ISO8859-1/htdocs/java/dists/12.sgml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "FreeBSD &java; Project: &jdk; 2 (aka JDK 1.2)">
-]>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-
-<p>
-<b>September 18, 2002:</b> Greg Lewis has released a new patchset for
-&jdk;&nbsp;1.2.2.</p>
-<p>Of most interest to FreeBSD users is the inclusion of JPDA support.
-The other significant changes are support for both
-<a href="http://www.netbsd.org/">NetBSD</a> and
-<a href="http://www.openbsd.org/">OpenBSD</a>.</p>
-
-<p>As previously stated, the patchset is available from
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk.html">http://www.eyesbeyond.com/freebsddom/java/jdk.html</a>, although FreeBSD users are encouraged
-to use the port in ports/java/jdk12.</p>
-
-<p>
-<b>October 14, 2000:</b> Greg Lewis' native FreeBSD JDK 1.2.2 is now in beta
-test stage and is now available in the ports directory (ports/java/jdk12-beta).
-<br/>While this is only for i386 architecture at the moment, this will allow anyone
-running the i386 (most of you) the opportunity to build a native JDK2, and then
-test them out against your favorite apps and custom code.  If you use something
-regularly, why not make a port of it?  Instructions are available at <a href="../../doc/en_US.ISO8859-1/books/porters-handbook/index.html">Porters Handbook</a>.</p>
-
-<p>If you want to try to build it by hand, due to SCSL concerns, you now have to go to
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk.html">http://www.eyesbeyond.com/freebsddom/java/jdk.html</a>
-and agree to the SCSL before downloading.</p>
-<p><b>Note</b>:  This port will take a lot of hard drive space to build (around 250 MB).</p>
-
-<p>
-<b>May 3, 2000:</b> Greg Lewis has just announced that the native FreeBSD
-JDK 1.2.2 port has entered alpha test stage.
-<br/>In its current form, the port will build and run on most FreeBSD releases
-(3.4, 4.0 and 5.0 on x86) and work is being done on the others (2.2.8 on x86
-and 4.0 alpha).  Most demo applets and applications run.
-<br/>Currently we are looking for enthusiasts who are willing to spend a
-little time testing the new port.  While this is not a trivial task, there are
- clear step-by-step insturctions on how to build and use the port.
-<br/>The patches may be found, as usual on:
-<br/><a href="http://www.eyesbeyond.com/freebsddom/java/jdk.html">
-http://www.eyesbeyond.com/freebsddom/java/jdk.html</a>
-<br/>More information, open issues and step-by-step instructions may be found at:
-<br/><a href="http://www.kjkoster.org/java/index.html">
-http://www.kjkoster.org/java/index.html</a></p>
-<p>
-<b>March 22, 2000:</b> Greg Lewis releases the pre-alpha patches for enterprising
-Java users to build their own native FreeBSD JDK&nbsp;1.2.2 from. This
-process is not for the faint of heart, and the resulting JDK is not for
-production systems. Having said that, most AWT and Swing demo's have been
-found to run. There is plenty of work to do, and we need all the testers we
-can find. Patches and build instructions may be downloaded from
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk.html">http://www.eyesbeyond.com/freebsddom/java/jdk.html</a>
-Current issues and test results may be found at
-<a href="http://www.kjkoster.org/java/index.html">http://www.kjkoster.org/java/index.html.</a> </p>
-<p>
-<b>January 30, 2000:</b> The Linux Blackdown Port Team has released RC4 of JDK 1.2
-.  It has been tested on FreeBSD 3.4-STABLE and later and runs all demo applets
-and jfc demos.  Several people have mentioned some problems running it with
-Apache JServ.  Until it can be added to the FreeBSD port tree, it can be found
-at <a href="http://www.jmcm.org/tech/ports/linux_jdk.html">
-http://www.jmcm.org/tech/ports/linux_jdk.html</a>.  (Reported by Jose Marques)</p>
-
-<p>
-<b>October 11, 1999:</b> Work has re-started on the Java2/JDK1.2 port.
-Expect an early 'alpha' release in the coming weeks for FreeBSD
-3.3-stable/ELF boxes.</p>
-
-<p>For most JDK2 development issues, you can use the JDK1 release and the
-<a href="http://java.sun.com/products/jfc/index.html#download-swing">Swing</a>
-releases provided by Sun for JDK1, which works very well under FreeBSD.</p>
-
-</body>
-</html>
diff --git a/en_US.ISO8859-1/htdocs/java/dists/13.sgml b/en_US.ISO8859-1/htdocs/java/dists/13.sgml
deleted file mode 100644
index 5544fe6cc0..0000000000
--- a/en_US.ISO8859-1/htdocs/java/dists/13.sgml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "FreeBSD &java; Project: &jdk; 1.3">
-]>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-
-<p>
-<b>December 19, 2003:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> has released an updated patchset (patchlevel 9) for the JDK 1.3.1
-software and updated the ports/java/jdk13 port accordingly. The updated
-patches may be found, as usual, at <a href=
-"http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-<br/>This release contains many fixes and improvements, so please upgrade
-before reporting a problem.
-</p>
-
-<p>
-<b>February 12, 2003:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> has released an updated patchset (patchlevel 8) for the &jdk; 1.3.1
-software and updated the ports/java/jdk13 port accordingly. The updated
-patches may be found, as usual, at <a href=
-"http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-<br/>This release is the first release for the JDK 1.3.1 software which
-has passed Sun's compatibility tests.  It contains many fixes and
-improvements, so please upgrade before reporting a problem.
-</p>
-
-<p>
-<b>July 26, 2002:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> has released an updated patchset (patchlevel 7) for the JDK 1.3.1
-software and updated the ports/java/jdk13 port accordingly. The updated
-patches may be found, as usual, at <a href=
-"http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-<br/>This release contains many fixes and improvements, so please upgrade
-before reporting a problem.
-</p>
-
-<p>
-<b>February 13, 2002:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> has released an updated patchset (patchlevel 6) for the JDK 1.3.1
-software and updated the ports/java/jdk13 port accordingly. The updated
-patches may be found, as usual, at <a href=
-"http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-<br/>This release contains many fixes and improvements, so please upgrade
-before reporting a problem.
-</p>
-
-<p>
-<b>October 16, 2001:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> has released an updated patchset (patchlevel 5) for the JDK 1.3.1
-software and updated the ports/java/jdk13 port accordingly. The updated
-patches may be found, as usual, at <a href=
-"http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-<br/>This release contains many fixes and improvements, so please upgrade
-before reporting a problem.
-</p>
-
-<p>
-<b>September 10, 2001:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> has released an updated patchset (patchlevel 4) for the JDK 1.3.1
-software and updated the ports/java/jdk13 port accordingly. The updated
-patches may be found, as usual, at <a href=
-"http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-<br/>This release contains many fixes and improvements, so please upgrade
-before reporting a problem.
-</p>
-
-<p>
-<b>August 27, 2001:</b> <a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
-has released a long-awaited port of the JDK 1.3.1 software.  It can now be
-built from the ports directory ports/java/jdk13.  It should be noted that all
-notes below apply and it is still very much a <strong>developer-only</strong>
-release and it is not recommended for use in production environment.
-</p>
-
-<p>
-<b>July 16, 2001:</b> <a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
-releases patches for developers interested in building a native
-FreeBSD JDK&nbsp;1.3.1.  It should be noted that this is very much a
-<strong>developer only</strong> release and will not build a working JDK.
-The patches are primarily being released as an opportunity for interested
-people to be able to contribute to the porting effort without having to
-start from scratch.  The patches and some cursory build instructions may be
-downloaded at
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-</p>
-
-<p><b>September 15, 2000:</b> <a href="mailto:gallatin@cs.duke.edu">Andrew
- Gallatin</a> and <a href="mailto:sean@stat.Duke.EDU">Sean O'Connell</a>
-have been working on getting IBM's JDK 1.3 working.  To make them work
-on your system, you will have to patch some of your FreeBSD sources.
-They have provided patches based on your version:
-<br/>
-<a href="http://www.cs.duke.edu/~gallatin/linux_sa_siginfo/4.0-release.diff">
-4.0-RELEASE</a>
-<br/><a href="http://people.FreeBSD.org/~patrick/ibmjdk/linux.patch2">
-4.0-STABLE</a>
-<br/><a href="http://www.cs.duke.edu/~gallatin/linux_sa_siginfo/diff">
--CURRENT</a> (pre-SMPng)</p>
-
-<p>To quote Drew's message:</p>
-<br/><pre>
-I've finally gotten the IBM jdk 1.3 working. I haven't tested it very
-heavily    AWT stuff seems to finally work though.
-
-Here's an updated patchset to a pre-SMPng -current. The patchset
-does the following:
-
-- changes MINSIGSTKSZ from 8192  to 2048
-- implements linux_rt_sendsig() &amp; linux_rt_sigreturn()
-- implements userland sigtramp code for linux_rt_sigreturn()
-- implements linux_to_bsd_sigaltstack &amp; bsd_to_linux_sigaltstack() to
-        fix a bug in linux_sigaltstack &amp; to avoid lots of cut-n-paste in
-        linux_rt_sigreturn().  This also fixes the "Java HotSpot(TM)
-        Client VM warning: cannot uninstall alt signal stack" one sees with
-        Sun's 1.3 JDK.
-- changes the MAP_STACK flag to MAP_ANON for  LINUX_MAP_GROWSDOWN
-        mmaps.  This was the final step in getting it working.  Any VM gurus
-        out there want to talk about this one?  There's apparently
-        something wrong with autogrowing linux thread stacks[*]
-
-Patches at: http://www.cs.duke.edu/~gallatin/linux_sa_siginfo/diff
-
-[*]The "problem" is the heuristic used by vm_map_growstack() to
-determine whether the stack part of the main process stack.  We
-currently use:
-
-        is_procstack = addr >= (vm_offset_t)vm->vm_maxsaddr;
-
-where vm->vm_maxsaddr comes from exec_new_vmspace():
-        vmspace->vm_maxsaddr = (char *)USRSTACK - MAXSSIZ;
-
-The IBM JDK's main thread reduces it's stack size to rlim_cur="2040"*1024.
-It then creates stacks for its threads at addresses which are greater
-than vm_maxsaddr but less than the current bottom of the main process
-stack as defined by p->p_rlimit[RLIMIT_STACK].rlim_cur. The first time
-a thread accesses something requiring this region to grow, it goes
-down in flames.
-</pre>
-
-<p>And Sean's email:</p>
-<pre>
-I did a Quick&amp;Dirty MFC of Andrew Gallatin's work on getting the
-IBM Java SDK to work.  I was able to run the appletviewer on one
-of the demos and it worked.  I cannot say much more than that.
-
-The patches are all relative to /usr/src (or / since they are
-all in sys )
-
-The majority of the patches are for files in /sys/i386/linux.
-You should be able to apply the patch; cd to /sys/modules/linux;
-type make; kldunload linux; type make install; and kldload linux
-
-There is an additional change which sets the MINSIGSTKSZ to 2048
-in sys/sys/signal.h .. this will require a kernel rebuild to
-take effect.
-</pre>
-
-<p><b>July 18, 2000:</b> <a href="ernst@jollem.com">Ernst de Haan</a>
-has done some work getting Sun's Linux JDK 1.3.0b9 to run on
-4.0-STABLE. The .java_wrapper file can be found
-<a href="http://people.FreeBSD.org/~patrick/sunjdk/java_wrapper">
-here</a>.  (Don't forget to rename it to .java_wrapper)</p>
-
-<p>Ernst's email:</p>
-<pre>
-Just one more hint: Change the jre/lib/jvm.cfg and put the last line on
-top. So you will get:
-
-   -classic
-   -hotspot
-   -server
-
-I _do_ get one warning, BTW, when running the Swing app:
-
-   Warning: Cannot convert string "MetaCtrl&lt;Key&gt;Insert" to type VirtualBinding
-
-Ernst
-
-
-Ernst de Haan wrote:
-> Hi folkz,
->
-> I have the Sun JDK 1.3.0 for Linux, beta 9 running on my FreeBSD
-> 4.0-STABLE system. Runs pretty nicely too.
->
-> java -version reports:
->
->    bash-2.04$ java -version
->    expr: syntax error
->    java version "1.3.0beta_refresh"
->    Java(TM) 2 Runtime Environment, Standard Edition (build 1.3.0beta_refresh-b09)
->    Classic VM (build 1.3.0beta_refresh-b09, green threads, nojit)
->
-> The first line with the syntax error is a small problem with
-> .java_wrapper, but it seems harmless. I had to make some modifications
-> to the .java_wrapper script to make it work on my system. I've attached
-> the version I use.
->
-> I haven't done much testing yet, but I have tried a single Swing
-> application. I did notice some differences in fonts, but it all seems to
-> work pretty nice and fast :)
->
-> Wow, soon FreeBSD will be the platform with the greatest number of
-> working JDKs on it, once we get WINE to work so we can run the Windows
-> JDKs too, and write an AS/400 emulator, and... and... ;-)
->
-> Ernst
->
-> P.S.  Thanks go to Victor Salaman how pointed me in the right direction.
->       He has been running the Sun JDK 1.3 for Linux for quite a while.
-</pre>
-
-<p><b>January 29, 2000:</b> Work has not begun on the JDK 1.3 port.
-It will not be until after our JDK 1.2 release is done that we will begin
-on JDK 1.3.</p>
-
-</body>
-</html>
diff --git a/en_US.ISO8859-1/htdocs/java/dists/14.sgml b/en_US.ISO8859-1/htdocs/java/dists/14.sgml
deleted file mode 100644
index 51abf6cab7..0000000000
--- a/en_US.ISO8859-1/htdocs/java/dists/14.sgml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "FreeBSD &java; Project: &jdk; 1.4">
-]>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-
-<p>
-<b>December 19, 2005:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> has released the eighth patchset (patchlevel 8) for the
-&jdk;&nbsp;1.4 software.  This patchset provides several bug fixes
-and adds support for DragonFly.
-Information on downloading the patchset can be found at
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>.
-</p>
-
-<p>
-<b>December 13, 2004:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> has released the seventh patchset (patchlevel 7) for the
-&jdk;&nbsp;1.4 software.  This patchset provides several bug fixes,
-including fixes for the critical security vulnerabilities recently
-discovered in the browser plugin.
-Information on downloading the patchset can be
-found at
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>.
-</p>
-
-<p>
-<b>December 30, 2003:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> has released the sixth patchset (patchlevel 6) for the &jdk;&nbsp;1.4
-software.  This release should be suitable for most applications.  The &jdk; it
-produces is de facto compliant, but use in a production environment is still at
-your own risk.  This patchset is mainly a bugfix release over 1.4.2p5.
-Information on downloading the patchset can be
-found at
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>.
-</p>
-
-<p>
-<b>November 11, 2003:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> has released the fifth patchset (patchlevel 5) for the &jdk;&nbsp;1.4
-software.  This release updates the &jdk; to version 1.4.2.  Thanks to
-a lot of hard work by <a href="mailto:phantom@FreeBSD.org">Alexey Zelkin</a>
-this release passes Sun's compatibility tests in all but a mixed IPv4 and
-IPv6 environment.  Information on downloading the patchset can be found at
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>.
-</p>
-
-<p>
-<b>October 10, 2003:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> has released the fourth patchset (patchlevel 4) for the &jdk;&nbsp;1.4
-software.  The code is now suitable for most applications, although it does
-still contain some problems.  Browser plugin support works, GCC 3.3 is
-supported and many bugfixes are included.  This patchset is the
-result of a lot of hard work by the BSD Java Porting Team and continued
-support from the FreeBSD Foundation.  Information on downloading the patchset
-can be found at
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>.
-</p>
-
-<p>
-<b>March 7, 2003:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> has released the third patchset (patchlevel 3) for the &jdk;&nbsp;1.4
-software.  The code is now ready for general testing, although not all
-features have been implemented (e.g. plugin, NIO).  This patchset is the
-result of a lot of hard work by <a href="mailto:phantom@FreeBSD.org">Alexey
-Zelkin</a>.  Information on downloading the patchset can be found at
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>.
-</p>
-
-<p>
-<b>February 4, 2003:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> has released the second patchset (patchlevel 2) for the &jdk;&nbsp;1.4
-software.  Please keep in mind that this patchset is still for experienced
-testers and developers.  This patchset is based on &jdk;&nbsp;1.4.1 and is the
-result of a lot of hard work by <a href="mailto:phantom@FreeBSD.org">Alexey
-Zelkin</a>.  Information on downloading the patchset can be found at
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>.
-</p>
-
-<p>
-<b>November 15, 2002:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> has released an initial patchset (patchlevel 1) for the &jdk;&nbsp;1.4.0
-software. Keep in mind that it's an initial patchset, so it is supposed for
-developers (mostly). Patches may be found at <a href=
-"http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>
-</p>
-
-</body></html>
-
diff --git a/en_US.ISO8859-1/htdocs/java/dists/Makefile b/en_US.ISO8859-1/htdocs/java/dists/Makefile
index 813362c0aa..e3ddc00604 100644
--- a/en_US.ISO8859-1/htdocs/java/dists/Makefile
+++ b/en_US.ISO8859-1/htdocs/java/dists/Makefile
@@ -7,12 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS =	10.sgml
-DOCS+=	11.sgml
-DOCS+=	12.sgml
-DOCS+=	13.sgml
-DOCS+=	14.sgml
-DOCS+=	15.sgml
+DOCS=	15.sgml
 DOCS+=	16.sgml
 DOCS+=	17.sgml
 DOCS+=	index.sgml
diff --git a/en_US.ISO8859-1/htdocs/java/news.xml b/en_US.ISO8859-1/htdocs/java/news.xml
index a1bc437d48..4453ba34b6 100644
--- a/en_US.ISO8859-1/htdocs/java/news.xml
+++ b/en_US.ISO8859-1/htdocs/java/news.xml
@@ -494,8 +494,8 @@
 
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> has
 	    released the eighth patchset (patchset 8) in the
-	    &jdk;&nbsp;1.4 series.  See the <a
-	    href="dists/14.html">JDK 1.4.x page</a> for more
+	    &jdk;&nbsp;1.4 series.  See the
+	    JDK 1.4.x page for more
 	    details.</p>
 	</event>
       </day>
@@ -554,8 +554,8 @@
 
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> has
 	    released the seventh patchset (patchset 7) in the
-	    &jdk;&nbsp;1.4 series.  See the <a
-	    href="dists/14.html">JDK 1.4.x page</a> for more
+	    &jdk;&nbsp;1.4 series.  See the
+	    JDK 1.4.x page for more
 	    details.</p>
 
 	</event>
@@ -599,8 +599,8 @@
 
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> has
 	    released the sixth patchset (patchset 6) in the
-	    &jdk;&nbsp;1.4 series.  See the <a
-	    href="dists/14.html">JDK 1.4.x page</a> for more
+	    &jdk;&nbsp;1.4 series.  See the
+	    JDK 1.4.x page for more
 	    details.</p>
 	</event>
       </day>
@@ -613,8 +613,8 @@
 
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> has
 	    released an updated patchset (patchset 9) for the
-	    &jdk;&nbsp;1.3.1 software. See the <a
-	    href="dists/13.html">JDK 1.3.x page</a> for more
+	    &jdk;&nbsp;1.3.1 software. See the
+	    JDK 1.3.x page for more
 	    details.</p>
 
 	</event>
@@ -632,8 +632,8 @@
 
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> has
 	    released the fifth patchset (patchset 5) in the
-	    &jdk;&nbsp;1.4 series.  See the <a
-	    href="dists/14.html">JDK 1.4.x page</a> for more
+	    &jdk;&nbsp;1.4 series.  See the
+	    JDK 1.4.x page for more
 	    details.</p>
 
 	</event>
@@ -651,8 +651,8 @@
 
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> has
 	    released the fourth patchset (patchset 4) in the
-	    &jdk;&nbsp;1.4 series.  See the <a
-	    href="dists/14.html">JDK 1.4.x page</a> for more
+	    &jdk;&nbsp;1.4 series.  See the
+	    JDK 1.4.x page for more
 	    details.</p>
 
 	</event>
@@ -689,8 +689,8 @@
 
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> has
 	    released the third patchset (patchset 3) in the
-	    &jdk;&nbsp;1.4 series.  See the <a
-	    href="dists/14.html">JDK 1.4.x page</a> for more
+	    &jdk;&nbsp;1.4 series.  See the
+	    JDK 1.4.x page for more
 	    details.</p>
 
 	</event>
@@ -708,8 +708,8 @@
 
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> has
 	    released an updated patchset (patchlevel 8) for the
-	    &jdk;&nbsp;1.3.1 software. See the <a
-	    href="dists/13.html">JDK 1.3.x page</a> for more
+	    &jdk;&nbsp;1.3.1 software. See the
+	    JDK 1.3.x page for more
 	    details.</p>
 	</event>
       </day>
@@ -722,8 +722,8 @@
 
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> has
 	    released the second patchset (patchset 2) in the
-	    &jdk;&nbsp;1.4 series.  See the <a
-	    href="dists/14.html">JDK 1.4.x page</a> for more
+	    &jdk;&nbsp;1.4 series.  See the
+	    JDK 1.4.x page for more
 	    details.</p>
 
 	</event>
@@ -745,8 +745,8 @@
 
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> has
 	    released a first patchset (patchlevel 1) for the
-	    &jdk;&nbsp;1.4.0 software. See the <a
-	    href="dists/14.html">JDK 1.4.x page</a> for more
+	    &jdk;&nbsp;1.4.0 software. See the
+	    JDK 1.4.x page for more
 	    details.</p>
 
 	</event>
@@ -764,8 +764,8 @@
 
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> has
 	    released an updated patchset (patchlevel 11) for the
-	    &jdk;&nbsp;1.2.2 software. See the <a
-	    href="dists/12.html">JDK 1.2.x page</a> for more
+	    &jdk;&nbsp;1.2.2 software. See the
+	    JDK 1.2.x page for more
 	    details.</p>
 	</event>
       </day>
@@ -797,8 +797,8 @@
 
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> has
 	    released an updated patchset (patchlevel 7) for the
-	    &jdk;&nbsp;1.3.1 software. See the <a
-	    href="dists/13.html">JDK 1.3.x page</a> for more
+	    &jdk;&nbsp;1.3.1 software. See the
+	    JDK 1.3.x page for more
 	    details.</p>
 
 	</event>
@@ -816,8 +816,8 @@
 
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> has
 	    released an updated patchset (patchlevel 6) for the
-	    &jdk;&nbsp;1.3.1 software. See the <a
-	    href="dists/13.html">JDK 1.3.x page</a> for more
+	    &jdk;&nbsp;1.3.1 software. See the
+	    JDK 1.3.x page for more
 	    details.</p>
 
 	</event>
@@ -881,8 +881,8 @@
 
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> has
 	    released an updated patchset (patchlevel 5) for the
-	    &jdk;&nbsp;1.3.1 software. See the <a
-	    href="dists/13.html">JDK 1.3.x page</a> for more
+	    &jdk;&nbsp;1.3.1 software. See the
+	    JDK 1.3.x page for more
 	    details.</p>
 
 	</event>
@@ -900,8 +900,8 @@
 
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> has
 	    released an updated patchset (patchlevel 4) for the
-	    &jdk;&nbsp;1.3.1 software. See the <a
-	    href="dists/13.html">JDK 1.3.x page</a> for more
+	    &jdk;&nbsp;1.3.1 software. See the
+	    JDK 1.3.x page for more
 	    details.</p>
 
 	</event>
@@ -940,8 +940,8 @@
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> has
 	    released a long-awaited port of the &jdk;&nbsp;1.3.1
 	    software.  It can now be built from the ports directory
-	    ports/java/jdk13.  See <a href="dists/13.html">JDK
-	    1.3.x</a> for more details.</p>
+	    ports/java/jdk13.  See JDK
+	    1.3.x for more details.</p>
 
 	  <p>It should be noted that this is very much a
 	    developer-only release and it is not recommended for use
@@ -967,8 +967,8 @@
 	  <p><a href="mailto:sobomax@FreeBSD.org">Maxim Sobolev</a>
 	    has produced a port of the &jdk;&nbsp;1.2.2 software.  It
 	    can now be built from the ports directory
-	    ports/java/jdk12-beta.  See <a href="dists/12.html">JDK
-	    1.2.x</a> for more details.</p>
+	    ports/java/jdk12-beta.  See JDK
+	    1.2.x for more details.</p>
 
 	  <p>All the issues noted below are still in place,
 	    however.</p>
@@ -996,8 +996,8 @@
 
 	  <p><a href="mailto:ernst@jollem.com">Ernst de Haan</a> has
 	    been able to get Sun's Linux &jdk;&nbsp;1.3.0b9 running on
-	    4.0-STABLE.  Full details on both can be found <a
-	    href="dists/13.html">here</a>.</p>
+	    4.0-STABLE.  Full details on both can be found
+	    here.</p>
 
 	</event>
       </day>
diff --git a/en_US.ISO8859-1/htdocs/kse/Makefile b/en_US.ISO8859-1/htdocs/kse/Makefile
deleted file mode 100644
index 9abf6c563a..0000000000
--- a/en_US.ISO8859-1/htdocs/kse/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
-.endif
-.if exists(../Makefile.inc)
-.include "../Makefile.inc"
-.endif
-
-DOCS=   index.sgml
-
-.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/kse/index.sgml b/en_US.ISO8859-1/htdocs/kse/index.sgml
deleted file mode 100644
index 175ca67ecf..0000000000
--- a/en_US.ISO8859-1/htdocs/kse/index.sgml
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "FreeBSD KSE Project">
-<!ENTITY email 'mini'>
-
-<!-- Status levels -->
-<!ENTITY status.done "<font xmlns='http://www.w3.org/1999/xhtml' color='green'>Done</font>">
-<!ENTITY status.wip "<font xmlns='http://www.w3.org/1999/xhtml' color='blue'>In progress</font>">
-<!ENTITY status.stalled "<font xmlns='http://www.w3.org/1999/xhtml' color='purple'>Stalled</font>">
-<!ENTITY status.new "<font xmlns='http://www.w3.org/1999/xhtml' color='red'>Not Started</font>">
-<!ENTITY status.resolved "<font xmlns='http://www.w3.org/1999/xhtml' color='green'>Resolved</font>">
-<!ENTITY status.unresolved "<font xmlns='http://www.w3.org/1999/xhtml' color='red'>Unresolved</font>">
-
-<!-- The list of contributors was moved to a separate file so that it can
-  be used by other documents in the FreeBSD web site. -->
-
-
-]>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.about">
-
-    <h2>Contents</h2>
-    <ul>
-      <li><a href="#overview">Project Overview</a></li>
-      <li><a href="#using">Using KSE</a></li>
-      <li><a href="#further.reading">Further Reading</a></li>
-      <li><a href="#status.kernel">Project Status</a></li>
-    </ul>
-
-    <a id="overview" name="overview"></a>
-    <h2>Overview</h2>
-
-    <p>Kernel Scheduler Entities (KSE), is a kernel-supported threading
-      system similar in design to Scheduler Activations [Anderson, et. al.]. It
-      strikes a balance between user-level (1:N) and kernel-level (1:1)
-      threading models, giving most of the advantages of both, and
-      few of the disadvantages of either.</p>
-
-    <p>There are two halves of this project: kernel support and user
-      support. The kernel support consists of modifications to the
-      FreeBSD scheduler; The user half is a &posix; threads implementation
-      which takes advantage of the extra facilities the kernel provides.</p>
-
-    <p>The goal is to replace the current user threading system provided by
-      the libc_r library, and the <tt>-pthread</tt> gcc option, with a new
-      libpthread library which will be linked with the <tt>-lpthread</tt>
-      gcc option.</p>
-
-    <a name="using"></a>
-    <h2>Using KSE</h2>
-
-    <p>All KSE development is being done in 5.0-CURRENT. No special
-    kernel configuration options are required to build a kernel with
-    the KSE-related changes (the changes are inextricable from the
-    FreeBSD scheduler).</p>
-
-    <p>In order to use KSE in an application, you need to link it against
-    libpthread; this is straightforward. In the application's makefile(s),
-    change the <tt>-pthread</tt> compiler switch or <tt>-lc_r</tt> link
-    option to <tt>-lpthread</tt> and relink. Alternatively, you can use
-    <tt>/etc/libmap.conf</tt> to map libc_r to libpthread (see
-    <tt>libmap.conf(5)</tt>).</p>
-
-    <a name="further.reading"></a>
-    <h2>Further Reading</h2>
-
-    <ul>
-      <li><a href="http://www.aims.net.au/chris/kse/">
-       Kernel-Scheduled Entities for FreeBSD</a>, by Jason Evans.
-        (Slightly out of date).
-      </li>
-      <li><a href="http://www.FreeBSD.org/cgi/man.cgi?query=kse&amp;apropos=0&amp;sektion=0&amp;manpath=FreeBSD+5.0-current&amp;format=html">KSE man page</a>
-      </li>
-      <li><a href="http://people.FreeBSD.org/~deischen/docs/Scheduler.pdf">
-       Scheduler Activations</a>, by Anderson, et al.
-      </li>
-    </ul>
-
-    <a name="status.kernel"></a>
-    <a name="status"></a>
-    <h2>Project Status</h2>
-
-    <p>Following is an incomplete general list of tasks:</p>
-
-    <table class="tblbasic">
-      <tr>
-	<th> Module </th>
-	<th> Task </th>
-	<th> Responsible </th>
-	<th> Last updated </th>
-	<th> Status </th>
-      </tr>
-
-      <tr>
-      	<td> libpthread </td>
-	<td> Write kse(2) man page documenting new system calls. </td>
-	<td> &a.archie; </td>
-	<td> 10 September 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> libpthread </td>
-	<td> Repo-copy the libpthread library from libc_r. </td>
-	<td> cvs meister </td>
-	<td> 16 September 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> libpthread </td>
-	<td> Use KSE to schedule processes. </td>
-	<td> &a.mini; </td>
-	<td> 30 October 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> libpthread </td>
-	<td> Schedule an idle context when appropriate. </td>
-	<td> &a.mini; </td>
-	<td> 2 November 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> libpthread </td>
-	<td> Deliver signals to threads. </td>
-	<td> &a.deischen; &a.davidxu; </td>
-	<td> 28 June 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> libpthread </td>
-	<td> Locking for SMP. </td>
-	<td> &a.deischen; </td>
-	<td> 3 May 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> kernel </td>
-	<td> Locking for SMP. </td>
-	<td> &a.davidxu; </td>
-	<td> 3 May 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> libpthread </td>
-	<td> Launch multiple KSEs (one per CPU). </td>
-	<td> &a.davidxu; </td>
-	<td> 3 May 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> libpthread, kernel </td>
-        <td> Implement alpha machine-dependent functions. </td>
-        <td> &a.marcel; </td>
-        <td> 30 Aug 2003 </td>
-        <td> &status.wip; </td>
-      </tr>
-
-      <tr>
-      	<td> libpthread, kernel </td>
-        <td> Implement amd64 machine-dependent functions. </td>
-        <td> &a.davidxu; &a.deischen; </td>
-        <td> 30 Aug 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> libpthread, kernel </td>
-        <td> Implement i386 machine-dependent functions. </td>
-        <td> &a.davidxu; &a.deischen; </td>
-        <td> 30 Aug 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> libpthread, kernel </td>
-        <td> Implement ia64 machine-dependent functions. </td>
-        <td> &a.marcel; </td>
-        <td> 30 Aug 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> libpthread, kernel </td>
-        <td> Implement sparc64 machine-dependent functions. </td>
-        <td> &a.jake; </td>
-        <td> 30 Aug 2003 </td>
-        <td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> kernel </td>
-        <td> Implement KSE-specific signaling. </td>
-        <td> &a.davidxu; </td>
-        <td> 28 June 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> libpthread </td>
-        <td> Implement scope system threads. </td>
-        <td> &a.deischen; </td>
-        <td> 3 May 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> kernel </td>
-        <td> Efficient scope system threads (no upcalls when they block). </td>
-        <td> &a.davidxu; </td>
-        <td> 30 Aug 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-<!--
-      <tr>
-	<td> &nbsp; </td>
-        <td>  </td>
-        <td> &nbsp; </td>
-        <td> D M 2002 </td>
-        <td> &status.new; </td>
-      </tr>
-
--->
-    </table>
-
-  </body>
-</html>
diff --git a/en_US.ISO8859-1/htdocs/news/1998/index.sgml b/en_US.ISO8859-1/htdocs/news/1998/index.sgml
index 4a26fb5746..0dde11a069 100644
--- a/en_US.ISO8859-1/htdocs/news/1998/index.sgml
+++ b/en_US.ISO8859-1/htdocs/news/1998/index.sgml
@@ -218,15 +218,6 @@
 	2.2.6 that you should know about.</p></li>
     </ul>
 
-    <h2>February 1998</h2>
-
-    <ul>
-      <li><p><b>08-Feb-98</b>
-	A page detailing the <a href="&base;/y2kbug.html">FreeBSD Year 2000
-	compliance statement</a> is now available, linked through the <a
-	href="&base;/docs.html">Documentation</a> page.</p></li>
-    </ul>
-
     <h2>January 1998</h2>
 
     <ul>
diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2001-11.xml b/en_US.ISO8859-1/htdocs/news/status/report-2001-11.xml
index f93286c19b..4fa80bc002 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report-2001-11.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2001-11.xml
@@ -996,9 +996,7 @@
       </person>
     </contact>
 
-    <links>
-      <url href="http://www.FreeBSD.org/smp/" />
-    </links>
+    <links/>
 
     <body>
       <p>October ended up being a bit busier than November for
diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2001-12-2002-01.xml b/en_US.ISO8859-1/htdocs/news/status/report-2001-12-2002-01.xml
index 77b4ec6789..7ed031cb6f 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report-2001-12-2002-01.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2001-12-2002-01.xml
@@ -696,10 +696,7 @@
       </person>
     </contact>
 
-    <links>
-      <url href="http://www.FreeBSD.org/smp/">SMPng project
-	website</url>
-    </links>
+    <links/>
 
     <body>
       <p>Alfred Perlstein committed file descriptor locking code
diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2002-02-2002-04.xml b/en_US.ISO8859-1/htdocs/news/status/report-2002-02-2002-04.xml
index c25432ec92..3bdcc9dd28 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report-2002-02-2002-04.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2002-02-2002-04.xml
@@ -956,9 +956,7 @@ messages.</url>
       </person>
     </contact>
 
-    <links>
-      <url href="http://www.FreeBSD.org/smp/" />
-    </links>
+    <links/>
 
     <body>
       <p>I've been mentoring someone on locking up the protocol control
@@ -1189,9 +1187,7 @@ messages.</url>
       </person>
     </contact>
 
-    <links>
-      <url href="http://www.FreeBSD.org/smp/" />
-    </links>
+    <links/>
 
     <body>
       <p>The SMPng project has been picking up steam in the last few
diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2002-05-2002-06.xml b/en_US.ISO8859-1/htdocs/news/status/report-2002-05-2002-06.xml
index c0eab75fe6..58e7e30936 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report-2002-05-2002-06.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2002-05-2002-06.xml
@@ -740,9 +740,7 @@ includes porting this facility to the -current tree.</p>
       </person>
     </contact>
 
-    <links>
-      <url href="http://www.FreeBSD.org/smp/" />
-    </links>
+    <links/>
 
     <body>
       <p>The SMPng project has continued to make steady progress in
@@ -1321,10 +1319,7 @@ includes porting this facility to the -current tree.</p>
     </person>
   </contact>
 
-  <links>
-    <!-- And/or one without. -->
-    <url href="http://www.FreeBSD.org/smp" />
-  </links>
+  <links/>
 
   <body>
     <p>Jennifer Yang's patch was committed June 10 for the BSD Summit.
diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2002-09-2002-10.xml b/en_US.ISO8859-1/htdocs/news/status/report-2002-09-2002-10.xml
index 6ac7f85553..e362af1f49 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report-2002-09-2002-10.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2002-09-2002-10.xml
@@ -578,7 +578,6 @@
   </contact>
 
   <links>
-    <url href="http://www.FreeBSD.org/kse/">KSE Project web page</url>
     <url href="http://www.FreeBSD.org/~julian">some links</url>
   </links>
 
diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2003-03-2003-09.xml b/en_US.ISO8859-1/htdocs/news/status/report-2003-03-2003-09.xml
index e7c3db97e0..87cda8db68 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report-2003-03-2003-09.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2003-03-2003-09.xml
@@ -75,10 +75,7 @@
     </person>
   </contact>
 
-  <links>
-    <url href="http://www.FreeBSD.org/kse/index.html">KSE Project
-      Page</url>
-  </links>
+  <links/>
 
   <body>
     <p>KSE seems to be working well on x86, amd64, and ia64.  The
diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2003-10-2003-12.xml b/en_US.ISO8859-1/htdocs/news/status/report-2003-10-2003-12.xml
index 4c9159c027..74a70c9934 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report-2003-10-2003-12.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2003-10-2003-12.xml
@@ -1330,9 +1330,7 @@
       </person>
     </contact>
 
-    <links>
-      <url href="http://www.FreeBSD.org/smp/" />
-    </links>
+    <links/>
 
     <body>
       <p>Work is progressing on SMPng on several different fronts.  Sam
diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2004-03-2004-04.xml b/en_US.ISO8859-1/htdocs/news/status/report-2004-03-2004-04.xml
index 54990c2cb8..9fa82eea04 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report-2004-03-2004-04.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2004-03-2004-04.xml
@@ -633,8 +633,6 @@
     <links>
       <url href="http://people.freebsd.org/~marcel/tls.html">basic data on
         TLS</url>
-      <url href="http://www.freebsd.org/kse/index.html">basic threads
-        page</url>
     </links>
 
     <body>
@@ -791,9 +789,7 @@
       </person>
     </contact>
 
-    <links>
-      <url href="http://www.FreeBSD.org/smp/"/>
-    </links>
+    <links/>
 
     <body>
       <p>Several folks continue to work on the locking the network stack
@@ -887,7 +883,6 @@
     </contact>
 
     <links>
-      <url href="http://www.freebsd.org/smp/">SMPng Web Page</url>
       <url href="http://www.watson.org/~robert/freebsd/netperf/">Robert's
         Network Stack Locking Page</url>
     </links>
diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2004-05-2004-06.xml b/en_US.ISO8859-1/htdocs/news/status/report-2004-05-2004-06.xml
index 104f2f3b8d..573799835a 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report-2004-05-2004-06.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2004-05-2004-06.xml
@@ -52,7 +52,6 @@
     </contact>
 
     <links>
-      <url href="http://www.freebsd.org/smp/">FreeBSD SMPng Web Page</url>
       <url href="http://www.watson.org/~robert/freebsd/netperf/">Netperf Web Page</url>
     </links>
 
@@ -449,9 +448,7 @@
       </person>
     </contact>
 
-    <links>
-      <url href="http://www.FreeBSD.org/smp/" />
-    </links>
+    <links/>
 
     <body>
       <p>Not a lot happened on the SMPng front outside of the work on
diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2004-07-2004-12.xml b/en_US.ISO8859-1/htdocs/news/status/report-2004-07-2004-12.xml
index 8e1c0909c8..86ec3a3459 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report-2004-07-2004-12.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2004-07-2004-12.xml
@@ -840,9 +840,7 @@
       </person>
     </contact>
 
-    <links>
-      <url href="http://www.FreeBSD.org/smp/" />
-    </links>
+    <links/>
 
     <body>
       <p>Lots of changes happened inside the network stack that will
diff --git a/en_US.ISO8859-1/htdocs/projects/netperf/index.sgml b/en_US.ISO8859-1/htdocs/projects/netperf/index.sgml
index e9a57cf100..e7c57da53c 100644
--- a/en_US.ISO8859-1/htdocs/projects/netperf/index.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/netperf/index.sgml
@@ -36,7 +36,7 @@
 
     <p>The netperf project is working to enhance the performance of the
       FreeBSD network stack.  This work grew out of the
-      <a href="../../smp">SMPng Project</a>, which moved the FreeBSD kernel from
+      SMPng Project, which moved the FreeBSD kernel from
       a "Giant Lock" to more fine-grained locking and multi-threading.  SMPng
       offered both performance improvement and degradation for the network
       stack, improving parallelism and preemption, but substantially
@@ -368,16 +368,13 @@
       <li><p><a href="http://www.watson.org/~robert/freebsd/netperf/20051027-eurobsdcon2005-netperf.pdf">"Introduction to Multithreading and Multiprocessing in the FreeBSD SMPng Network Stack", EuroBSDCon 2005, Basel, Switzerland</a>.</p></li>
     </ul>
 
-    <p>Additional papers can be found on the <a href="../../smp/">SMPng
-      Project</a> web page.</p>
-
     <a name="links"></a>
     <h2>Links</h2>
 
     <p>Some useful links relating to the netperf work:</p>
 
     <ul>
-      <li><p><a href="../../smp/">SMPng Project</a> -- Project to introduce
+      <li><p>SMPng Project -- Project to introduce
 	finer grained locking in the FreeBSD kernel.</p></li>
 
       <li><p><a href="http://www.watson.org/~robert/freebsd/netperf/">Robert
diff --git a/en_US.ISO8859-1/htdocs/projects/projects.sgml b/en_US.ISO8859-1/htdocs/projects/projects.sgml
index f3380794da..0225df721d 100644
--- a/en_US.ISO8859-1/htdocs/projects/projects.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/projects.sgml
@@ -202,10 +202,6 @@ brings benefits mainly to the users of NFS and WWW.</li>
 <a name="kernelandsecurity"></a>
 <h3>Kernel, security</h3>
 <ul>
-<li><a name="kse" href="../kse/index.html">Kernel Scheduler Entities</a>:
-A project to enhance the threading support on FreeBSD, using a threading
-system similar in design to Scheduler Activations.</li>
-
 <li><a name="lotteryscheduling"
 href="http://www.cs.cmu.edu/~dpetrou/research.html">
 Lottery Scheduling Kernel</a>: This work is based on
@@ -221,10 +217,6 @@ format.  OpenBSM provides the userland libraries, tools, and documentation
 for the TrustedBSD audit implementation that will be integrated into
 FreeBSD.</li>
 
-<li><a name="SMP" href="&base;/smp/index.html">Symmetric MultiProcessor Support</a>:
-Documentation and other information about taking advantage of multiple
-processors under FreeBSD.</li>
-
 <li><a name="trustedbsd" href="http://www.TrustedBSD.org/">TrustedBSD</a>:
 Provides a set of trusted operating system extensions to the FreeBSD operating
 system.  This includes features such as fine-grained privileges (capabilities),
diff --git a/en_US.ISO8859-1/htdocs/releases/5.0R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/5.0R/schedule.sgml
index 2b790c0a0b..f0e33a9aa7 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.0R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.0R/schedule.sgml
@@ -30,9 +30,7 @@
   href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.</p>
 
 <p>One of the major new features of FreeBSD 5.0 will be completely
-  re-worked SMP support.  For specific information about the progress
-  towards 5.0-RELEASE in this area, please see the <a
-  href="&base;/smp/index.html">SMP Project</a> page.</p>
+  re-worked SMP support.</p>
 
 <p>The current release engineering <a
   href="&base;/releases/5.0R/todo.html">TODO list</a> is also available.
diff --git a/en_US.ISO8859-1/htdocs/releases/5.1R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/5.1R/schedule.sgml
index 15e296f62c..4e0bc76336 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.1R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.1R/schedule.sgml
@@ -30,9 +30,7 @@
   href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.</p>
 
 <p>One of the major features of FreeBSD 5.1 will be further refinement of
-  the re-worked SMP support introduced in FreeBSD 5.0.  For specific
-  information about the progress towards 5.1-RELEASE in this area, please
-  see the <a href="&base;/smp/index.html">SMP Project</a> page.</p>
+  the re-worked SMP support introduced in FreeBSD 5.0.</p>
 
 <p>FreeBSD 5.1 will continue to be released from the 5-CURRENT development
   stream.  For more details about the milestones for reaching
diff --git a/en_US.ISO8859-1/htdocs/releases/5.2.1R/early-adopter.html b/en_US.ISO8859-1/htdocs/releases/5.2.1R/early-adopter.html
index 0458ac1d48..5b47b42851 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.2.1R/early-adopter.html
+++ b/en_US.ISO8859-1/htdocs/releases/5.2.1R/early-adopter.html
@@ -159,9 +159,7 @@ utilities, have already been ported.) A brief, but not exhaustive list includes:
 <li>
 <p>SMPng: The ``next generation'' support for SMP machines (work in progress). Ongoing
 work aims to perform fine-grained locking of various kernel subsystems to increase the
-number of threads of execution that can be running in the kernel. More information can be
-found on the <a href="http://www.FreeBSD.org/smp/" target="_top">FreeBSD SMP Project</a>
-page.</p>
+number of threads of execution that can be running in the kernel.</p>
 </li>
 
 <li>
diff --git a/en_US.ISO8859-1/htdocs/releases/5.2R/early-adopter.html b/en_US.ISO8859-1/htdocs/releases/5.2R/early-adopter.html
index eb8f3a9a7e..e8a9aa31bb 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.2R/early-adopter.html
+++ b/en_US.ISO8859-1/htdocs/releases/5.2R/early-adopter.html
@@ -159,9 +159,7 @@ utilities, have already been ported.) A brief, but not exhaustive list includes:
 <li>
 <p>SMPng: The ``next generation'' support for SMP machines (work in progress). Ongoing
 work aims to perform fine-grained locking of various kernel subsystems to increase the
-number of threads of execution that can be running in the kernel. More information can be
-found on the <a href="http://www.FreeBSD.org/smp/" target="_top">FreeBSD SMP Project</a>
-page.</p>
+number of threads of execution that can be running in the kernel.</p>
 </li>
 
 <li>
diff --git a/en_US.ISO8859-1/htdocs/releases/5.3R/migration-guide.html b/en_US.ISO8859-1/htdocs/releases/5.3R/migration-guide.html
index 1796e06103..30c3cee97d 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.3R/migration-guide.html
+++ b/en_US.ISO8859-1/htdocs/releases/5.3R/migration-guide.html
@@ -175,9 +175,7 @@ been ported.) A brief, but not exhaustive list includes:</p>
 <p>SMPng: The ``next generation'' support for Symmetric MultiProcessor (SMP) machines.
 Ongoing work aims to perform fine-grained locking of various kernel subsystems to
 increase the number of threads of execution that can be running in the kernel. Particular
-attention has been paid to the performance of the network stack. More information can be
-found on the <a href="http://www.FreeBSD.org/smp/index.html" target="_top">FreeBSD SMP
-Project</a> page.</p>
+attention has been paid to the performance of the network stack.</p>
 </li>
 
 <li>
diff --git a/en_US.ISO8859-1/htdocs/releases/5.4R/migration-guide.html b/en_US.ISO8859-1/htdocs/releases/5.4R/migration-guide.html
index 22c201f0fb..2c0fb388da 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.4R/migration-guide.html
+++ b/en_US.ISO8859-1/htdocs/releases/5.4R/migration-guide.html
@@ -175,9 +175,7 @@ been ported.) A brief, but not exhaustive list includes:</p>
 <p>SMPng: The ``next generation'' support for Symmetric MultiProcessor (SMP) machines.
 Ongoing work aims to perform fine-grained locking of various kernel subsystems to
 increase the number of threads of execution that can be running in the kernel. Particular
-attention has been paid to the performance of the network stack and storage drivers. More
-information can be found on the <a href="http://www.FreeBSD.org/smp/index.html"
-target="_top">FreeBSD SMP Project</a> page.</p>
+attention has been paid to the performance of the network stack and storage drivers.</p>
 </li>
 
 <li>
diff --git a/en_US.ISO8859-1/htdocs/search/sitemap.xml b/en_US.ISO8859-1/htdocs/search/sitemap.xml
index 7249f6dc76..6fdb02b6c4 100644
--- a/en_US.ISO8859-1/htdocs/search/sitemap.xml
+++ b/en_US.ISO8859-1/htdocs/search/sitemap.xml
@@ -829,21 +829,6 @@
     <destination>&base;/ipv6/w6d.html</destination>
   </term>
 
-  <term>
-    <text>KSE</text>
-    <destination>&base;/kse/index.html</destination>
-  </term>
-
-  <term>
-    <text>Threads, KSE</text>
-    <destination>&base;/kse/index.html</destination>
-  </term>
-
-  <term>
-    <text>POSIX threads</text>
-    <destination>&base;/kse/index.html</destination>
-  </term>
-
   <term>
     <text>Contact us</text>
     <destination>&base;/mailto.html</destination>
@@ -1254,16 +1239,6 @@
     <destination>&base;/send-pr.html</destination>
   </term>
 
-  <term>
-    <text>Symmetric MultiProcessing (SMP)</text>
-    <destination>&base;/smp/index.html</destination>
-  </term>
-
-  <term>
-    <text>SMP</text>
-    <destination>&base;/smp/index.html</destination>
-  </term>
-
   <term>
     <text>Support</text>
     <destination>&base;/support.html </destination>
@@ -1299,26 +1274,6 @@
     <destination>&base;/where.html</destination>
   </term>
 
-  <term>
-    <text>y2k</text>
-    <destination>&base;/y2kbug.html</destination>
-  </term>
-
-  <term>
-    <text>Year 2000 bug</text>
-    <destination>&base;/y2kbug.html</destination>
-  </term>
-
-  <term>
-    <text>Millennium bug</text>
-    <destination>&base;/y2kbug.html</destination>
-  </term>
-
-  <term>
-    <text>2000, year bug</text>
-    <destination>&base;/y2kbug.html</destination>
-  </term>
-
   <term>
     <text>4.4BSD Documents</text>
     <destination>http://docs.freebsd.org/44doc/</destination>
@@ -1538,11 +1493,6 @@
       <text>Bibliography</text>
       <destination>&base;/doc/en_US.ISO8859-1/books/handbook/bibliography.html</destination>
     </item>
-
-    <item>
-      <text>Year2000</text>
-      <destination>&base;/y2kbug.html</destination>
-    </item>
   </category>
 
   <category name="Community">
diff --git a/en_US.ISO8859-1/htdocs/smp/Makefile b/en_US.ISO8859-1/htdocs/smp/Makefile
deleted file mode 100644
index 9abf6c563a..0000000000
--- a/en_US.ISO8859-1/htdocs/smp/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
-.endif
-.if exists(../Makefile.inc)
-.include "../Makefile.inc"
-.endif
-
-DOCS=   index.sgml
-
-.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/smp/index.sgml b/en_US.ISO8859-1/htdocs/smp/index.sgml
deleted file mode 100644
index 6d598dd075..0000000000
--- a/en_US.ISO8859-1/htdocs/smp/index.sgml
+++ /dev/null
@@ -1,2802 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "FreeBSD SMPng Project">
-<!ENTITY email 'freebsd-smp'>
-
-<!-- Status levels -->
-<!ENTITY status.done "<font xmlns='http://www.w3.org/1999/xhtml' color='green'>Done</font>">
-<!ENTITY status.wip "<font xmlns='http://www.w3.org/1999/xhtml' color='blue'>In&nbsp;progress</font>">
-<!ENTITY status.stalled "<font xmlns='http://www.w3.org/1999/xhtml' color='purple'>Stalled</font>">
-<!ENTITY status.new "<font xmlns='http://www.w3.org/1999/xhtml' color='red'>Not&nbsp;done</font>">
-<!ENTITY status.resolved "<font xmlns='http://www.w3.org/1999/xhtml' color='green'>Resolved</font>">
-<!ENTITY status.unresolved "<font xmlns='http://www.w3.org/1999/xhtml' color='red'>Unresolved</font>">
-]>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-
-    <h2>Contents</h2>
-    <ul>
-      <li><a href="#goal">Project Goal</a></li>
-      <li><a href="#status">Project Status</a></li>
-      <li><a href="#history">Project History</a></li>
-      <li><a href="#plan">Project Plan (Historical)</a></li>
-      <li><a href="#resources">Resources and Links</a></li>
-      <li><a href="#subsystems">Subsystems and Staffing (Historical)</a></li>
-      <li><a href="#tasks">Tasks (Historical)</a></li>
-      <li><a href="#issues">Known Issues (Historical)</a></li>
-      <li><a href="#news">News (Historical)</a></li>
-    </ul>
-
-    <a name="goal"></a>
-    <h2>Project Goal</h2>
-
-    <p>The FreeBSD Next Generation Symmetric Multi-Processing Project,
-      generally referred to as SMPng, had the goal of introducing parallelism
-      into the FreeBSD kernel.
-      While earlier versions of FreeBSD (3.x, 4.x) supported parallel
-      execution of user processes, the kernel was limited to running on a
-      single processor at a time, using a "Giant lock" around the kernel to
-      prevent more than one kernel thread or interrupt handler from executing
-      at once.
-      For many interesting workloads, Giant-locked kernels give substantial
-      speed-up when compared with uniprocessor systems, as significant
-      computation occurs in user processes--especially for applications such
-      as rendering and compilation.
-      However, for kernel-intensive applications, such as intensive network
-      or file system I/O, contention on the kernel lock results in little or
-      no speed-up.
-      The goal of the SMPng Project was to decompose the Giant lock into a
-      number of smaller locks, resulting in reduced contention (and improved
-      SMP performance).
-      Important steps along the way included redesigning significant portions
-      of the FreeBSD kernel architecture around the notion of ubiquitous
-      parallelism: that at any moment, many processors might enter the kernel
-      at the same time.
-      This included the introduction of more mature threading and
-      synchronization primitives, interrupt threads, cache-aware allocation
-      and scheduling, and topology-aware scheduling. </p>
-
-    <p>The FreeBSD Project wishes to recognize the contributions of the
-      BSD/OS development team, including architectural direction and
-      suggestions, as well as for initial locking strategies for some system
-      components, and source code for some of the starting primitives, not to
-      mention BSDI's contributions in staffing and resources for early parts
-      of this project.  Likewise, we wish to recognize significant
-      sponsorship of SMPng work by Yahoo!, Isilon, and the FreeBSD
-      Foundation.</p>
-
-    <a name="status"></a>
-    <h2>Project Status</h2>
-
-    <p>While limited sections of the FreeBSD kernel still require Giant,
-      especially more obscure device drivers and file systems, most parts of
-      the kernel now neither require nor run with the Giant lock.
-      As of FreeBSD 6.0, the SMPng Project is considered "complete", in that
-      the goal of moving to parallelized kernel operation has been met for
-      most significant parts of the kernel.
-      This web page is largely historical, and is not up-to-date with respect
-      to the completion status of items in the task list, etc.</p>
-
-    <a name="history"></a>
-    <h2>Project History</h2>
-
-    <p>SMPng debuted in FreeBSD 5.0-RELEASE in January of 2003, and involved
-      over five years of continuous development by a large number of members
-      of the FreeBSD development team as well as many external contributors.
-      Since 5.0, the implementation has substantially matured; in the 5.0
-      release, the basic architectural changes required to support SMPng were
-      complete, including new kernel memory allocators, synchronization
-      routines, the move to ithreads, and the removal of the Giant lock from
-      activities such as process scheduling and several common forms of IPC.
-      Since 5.0, the architecture has been refined in a number of ways,
-      including optimizing synchronization approaches, stability and
-      performance testing on larger systems (up to 32 processor threads), and the
-      removal of Giant from several significant parts of the operating
-      system, including large parts of Virtual Memory (VM), the Virtual File
-      System (VFS), UNIX File System (UFS), most parts of the network stack,
-      including IPv4, IPV6, FAST_IPSEC, UNIX domain sockets, and NetGraph,
-      and also from inter-process communication primitives.
-      The SMP-aware kernel slab allocator is now used almost universally, and
-      the focus has changed from "make it work", to "optimize it".
-      Simultaneous work on KSE 1:1 and M:N threading has also allowed
-      applications to take advantage of new kernel parallelism.
-      The FreeBSD 5.3 kernel introduced Giant-free network stack execution
-      for most relevant code paths, and the FreeBSD 6.0 kernel introduced
-      MPSAFE VFS, as well as wide-spread performance optimization.</p>
-
-    <p>Continuing work on SMPng in the 6.x branch has included work sweeping
-      up the "loose ends" that remain under Giant, such as parts of NFS, and
-      less commonly used network stack components.</p>
-
-    <p>Throughout SMPng, an important focus was performance measurement and
-      optimization, which build on and refine the SMPng architecture: the
-      introduction of features such as the kernel trace facility (KTR),
-      hardware performance monitor counters (hwpmc), lock profiling, and
-      improved memory monitoring play important roles in this process.
-      Other important debugging and testing facilities include WITNESS, a
-      run-time kernel lock order verifier, and wide-spread use of lock
-      assertions and run-time invariants testing.</p>
-
-    <a name="plan"></a>
-    <h2>Project Plan (Historical)</h2>
-
-    <p>This web page contains information relating to the SMPng effort;
-      because of the immense scope of the work and rapid pace of development,
-      it captures only a subset of what has been done.  As the base SMPng
-      Project, moving towards fine-grained locking, is complete, this
-      information is largely historical, and does not attempt to capture
-      more recent work on locking and multi-processor performance.</p>
-
-    <p>The task list below is not intended to be complete, but does
-      represent a set of relevant and/or important components of the
-      overall work.  The "Responsible" field identifies a developer who
-      has expressed willingness to be responsible for completing the
-      identified task; this doesn't preclude others working on it,
-      but suggests that coordination with the responsible party might
-      be appropriate so as to avoid unnecessary duplication of work,
-      and to maximize forward progress.  If beginning work on a new
-      area of substantial size, or one that appears unclaimed, it may
-      be worth dropping an e-mail to the FreeBSD SMP mailing list to
-      see if any progress has been made.</p>
-
-    <p>The definition of the date field varies depending on the status
-      of a task.  For completed tasks, it refers to the date completed
-      or reported completed.  For in-progress tasks, it refers to the
-      date of the last update of the entry.  For stalled tasks, it
-      refers to the date that the task was declared stalled.  For
-      new tasks, it refers to the date the task was added to the list.</p>
-
-    <p>Locking down of individual device drivers is tracked at
-      <a href="http://www.FreeBSD.org/projects/busdma/">the busdma and
-      SMPng driver conversion web page</a>.</p>
-
-    <p>Network stack locking information is available at &a.rwatson;'s
-      <a href="http://www.watson.org/~robert/freebsd/netperf/">netperf web
-      page</a> and the FreeBSD.org <a href="../projects/netperf/">Netperf
-      web page</a>.
-      An SMP <a href="../projects/netperf/cluster.html">network performance
-      cluster</a> has also been created for the purposes of testing.</p>
-
-    <p>Tasks are sorted first by status, then by date.</p>
-
-    <a name="resources"></a>
-    <h2>Resources and Links</h2>
-
-    <ul>
-      <li><p>Most SMP-related discussion takes place on the
-	  <a href="mailto:freebsd-smp@FreeBSD.org">freebsd-smp</a>
-	  mailing list.  You can read more about mailing lists in the
-	  <a href="../doc/en_US.ISO8859-1/books/handbook/eresources.html#ERESOURCES-MAIL">
-	  Resources on the Internet</a> appendix of the
-	  <a href="../doc/en_US.ISO8859-1/books/handbook/index.html">FreeBSD Handbook</a>.</p></li>
-
-      <li><p>Steve Passe has been maintaining a
-	  <a href="http://people.FreeBSD.org/~fsmp/SMP/SMP.html">SMP
-	  project page</a> that contains additional information, and
-	  goes back further in time than this web page.</p></li>
-
-      <li><p>&a.rwatson; is maintaining a page for SMP-related network
-	  performance work for the <a href="../projects/netperf/">Netperf
-	  project</a>.  In addition, he has a <a
-	  href="http://www.watson.org/~robert/freebsd/netperf/">a personal
-	  web page with a change log and other information</a>.</p></li>
-
-      <li><p><a href="http://www.osnews.com/">OSNews</a> has run an
-	interview with FreeBSD developers &a.rwatson;, &a.jhb;, and
-	&a.scottl;, who talk about many features in 6.x, including recent
-	SMPng work, SMPVFS, and more.  The <a
-	href="http://www.osnews.com/story.php?news_id=10951">article is
-	here</a>.</p></li>
-
-      <li><p>A series of man pages on kernel synchronization and threading
-	  primitives can be found here:</p>
-
-	    <ul>
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=mutex&amp;apropos=0&amp;sektion=9">Kernel Mutexes (mutex(9))</a></li>
-
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=mtx_pool&amp;apropos=0&amp;sektion=9">Kernel Mutex Pools (mtx_pool(9))</a></li>
-
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=critical&amp;apropos=0&amp;sektion=9">Kernel Critical Sections (critical(9))</a></li>
-
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=sx&amp;apropos=0&amp;sektion=9">Kernel Shared/Exclusive Locks (sx(9))</a></li>
-
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=condvar&amp;apropos=0&amp;sektion=9">Kernel Condition Variables (condvar(9))</a></li>
-
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=sema&amp;apropos=0&amp;sektion=9">Kernel Semaphores (sema(9))</a></li>
-
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=sleep&amp;apropos=0&amp;sektion=9">Kernel sleep/wakeup API (sleep(9))</a></li>
-
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=kthread&amp;apropos=0&amp;sektion=9">Kernel Threads (kthread(9))</a></li>
-
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=ithread&amp;apropos=0&amp;sektion=9">Interrupt Threads (ithread(9))</a></li>
-
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=swi&amp;apropos=0&amp;sektion=9">Software Interrupt Threads (swi(9))</a></li>
-	    </ul>
-
-	  <br/>
-	  <p>In addition, the old <a href="http://www.freebsd.org/cgi/man.cgi?query=spl&amp;apropos=0&amp;sektion=9">SPL man page</a> may be of interest, as it reflects the previous SMP synchronization model.</p>
-	</li>
-
-      <li><p>
-	  Hiten Pandya's <a
-	  href="http://storm.uk.FreeBSD.org/~hiten/smp_synch_rules.html">
-	  SMP kernel synchronization rules</a>.</p></li>
-
-      <li><p>&a.dillon; maintained a
-	  <a href="http://apollo.backplane.com/FreeBSDSmp/">web page</a>
-	  that documented the work he was doing on the SMP project.</p></li>
-
-      <li>
-	<p>
-	  <a href="http://www.usenix.org/events/bsdcon02/full_papers/baldwin/baldwin_html/index.html">
-	  "Locking in the Multithreaded FreeBSD Kernel" USENIX paper by &a.jhb;</a>.
-	</p>
-      </li>
-
-      <li>
-	<p>
-	  <a href="http://www.usenix.org/publications/library/proceedings/bsdcon03/tech/hsu.html">
-	"Reasoning about SMP in FreeBSD" BSDCon'03 paper by &a.hsu;</a>.
-	</p>
-      </li>
-
-      <li>
-	<p>
-	  <a href="http://www.usenix.org/publications/library/proceedings/bsdcon03/tech/roberson.html">
-	"ULE: A Modern Scheduler for FreeBSD" BSDCon'03 paper by &a.jeff;</a>.
-	</p>
-      </li>
-
-      <li>
-	<p>
-	  <a href="http://www.watson.org/~robert/freebsd/netperf/20051027-eurobsdcon2005-netperf.pdf">"Introduction to Multithreading and Multiprocessing in the FreeBSD SMPng Network Stack" EuroBSDCon 2005 paper by &a.rwatson;</a>.
-	</p>
-      </li>
-
-    </ul>
-
-    <a name="subsystems"></a>
-    <h2>Subsystems and Staffing (Historical)</h2>
-
-    <p>This is an incomplete list of high-level kernel subsystems and
-      current, active staff working on SMP architecture and stability.</p>
-
-    <table class="tblbasic">
-      <tr class="heading">
-	<th> Subsystem </th>
-	<th> Status </th>
-	<th> Last updated </th>
-	<th> Staffing </th>
-      </tr>
-
-      <tr>
-	<td> Newbus </td>
-	<td> &status.wip; </td>
-	<td> 5 October 2003 </td>
-	<td> &a.imp;</td>
-      </tr>
-
-      <tr>
-	<td> VM </td>
-	<td> &status.wip; </td>
-	<td> 4 October 2003 </td>
-	<td> &a.alc;</td>
-      </tr>
-
-      <tr>
-	<td> Buffer cache </td>
-	<td> &status.wip; </td>
-	<td> 4 October 2003 </td>
-	<td> &a.jeff;, &a.phk; </td>
-      </tr>
-
-      <tr>
-	<td> VFS </td>
-	<td> &status.done; </td>
-	<td> 24 January 2005 </td>
-	<td> &a.jeff; </td>
-      </tr>
-
-      <tr>
-	<td> Processes and thread operations </td>
-	<td> &status.wip; </td>
-	<td> 5 May 2003 </td>
-	<td> &a.jhb; </td>
-      </tr>
-
-      <tr>
-	<td> Scheduler </td>
-	<td> &status.done; </td>
-	<td> 23 April 2004 </td>
-	<td> &a.jhb;, &a.jeff; </td>
-      </tr>
-
-      <tr>
-	<td> GEOM </td>
-	<td> &status.done; </td>
-	<td> 5 February 2003 </td>
-	<td> &a.phk; </td>
-      </tr>
-
-      <tr>
-	<td> File descriptors </td>
-	<td> &status.done; </td>
-	<td> 5 February 2003 </td>
-	<td> &a.alfred;, &a.tanimura;, &a.rwatson; </td>
-      </tr>
-
-      <tr>
-	<td> TTY subsystem </td>
-	<td> &status.done; </td>
-	<td> 20 August 2008 </td>
-	<td> &a.ed; </td>
-      </tr>
-
-      <tr>
-	<td> Pipe IPC </td>
-	<td> &status.done; </td>
-	<td> 4 October 2003 </td>
-	<td> &a.alfred; </td>
-      </tr>
-
-      <tr>
-	<td> Socket structures and system calls </td>
-	<td> &status.done; </td>
-	<td> 25 November 2004 </td>
-	<td> &a.sam;, &a.rwatson; </td>
-      </tr>
-
-      <tr>
-	<td> KQueue </td>
-	<td> &status.done; </td>
-	<td> 24 November 2004 </td>
-	<td> &a.jmg;, &a.green; </td>
-      </tr>
-
-      <tr>
-	<td> IPv4 </td>
-	<td> &status.done; </td>
-	<td> 23 April 2004 </td>
-	<td> &a.jennifer;, &a.hsu;, &a.sam;, &a.rwatson;, &a.gnn; </td>
-      </tr>
-
-      <tr>
-	<td> IPv6 </td>
-	<td> &status.wip; </td>
-	<td> 01 July 2005 </td>
-	<td> &a.rwatson;, &a.gnn; </td>
-      </tr>
-
-      <tr>
-	<td> IPX/SPX </td>
-	<td> &status.done; </td>
-	<td> 09 January 2005 </td>
-	<td> &a.rwatson; </td>
-      </tr>
-
-      <tr>
-	<td> netatalk </td>
-	<td> &status.done; </td>
-	<td> 02 February 2005 </td>
-	<td> &a.rwatson; </td>
-      </tr>
-
-      <tr>
-	<td> Network stack infrastructure </td>
-	<td> &status.done; </td>
-	<td> 28 August 2004 </td>
-	<td> &a.hsu;, &a.sam;, &a.rwatson;, &a.mlaier;, &a.luigi;, Maurycy Pawlowski-Wieronski &lt;maurycy@fouk.org&gt;, &a.brooks;,
-	  &a.rik; </td>
-      </tr>
-
-      <tr>
-	<td> NFS Client </td>
-	<td> &status.done; </td>
-	<td> 19 May 2006 </td>
-	<td> &a.mohans; </td>
-      </tr>
-
-      <tr>
-	<td> NFS Server </td>
-	<td> &status.wip; </td>
-	<td> 24 February 2007 </td>
-	<td> &a.rwatson;, &a.jeff; </td>
-      </tr>
-
-    </table>
-
-    <a name="tasks"></a>
-    <h2>Tasks (Historical)</h2>
-
-    <p>Following is an incomplete list of general tasks.</p>
-
-    <table class="tblbasic">
-      <tr class="heading">
-	<th> Task </th>
-	<th> Responsible </th>
-	<th> Last updated </th>
-	<th> Status </th>
-      </tr>
-
-      <tr>
-	<td> Convert the giant lock from spinning to blocking, add the
-	  scheduler lock, add per-CPU idle processes. </td>
-	<td> &a.dillon; </td>
-	<td> 25 June 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Port the BSD/OS locking primitives (i386). </td>
-	<td> &a.jake; </td>
-	<td> 3 July 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Implement heavy-weight interrupt threads (i386). </td>
-	<td> &a.grog; </td>
-	<td> 3 August 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Rewrite the low level interrupt code (i386 UP). </td>
-	<td> &a.grog; </td>
-	<td> 3 August 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Demonstrated reasonable stability (self-hosted buildworld)
-	  (i386 UP). </td>
-	<td> -smp developers </td>
-	<td> 12 August 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Port the BSD/OS locking primitives (alpha). </td>
-	<td> &a.dfr; </td>
-	<td> 24 August 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Stub out (disable) spl()s. </td>
-	<td> &a.grog; </td>
-	<td> 30 August 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Port the BSD/OS ktr code. </td>
-	<td> &a.grog;, &a.jhb; </td>
-	<td> 30 August 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Rewrite the low level interrupt code (i386 SMP). </td>
-	<td> &a.jhb; </td>
-	<td> 1 September 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Demonstrated reasonable stability (self-hosted buildworld)
-	  (i386 SMP). </td>
-	<td> -smp developers </td>
-	<td> 6 September 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Demonstrated reasonable stability (self-hosted buildworld)
-	  (alpha). </td>
-	<td> -smp developers </td>
-	<td> 6 September 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make malloc and friends thread-safe. </td>
-	<td> &a.jasone; </td>
-	<td> 10 September 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Implement msleep(), make tsleep() an msleep() wrapper. </td>
-	<td> &a.jake; </td>
-	<td> 11 September 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make fxp driver thread-safe. </td>
-	<td> &a.cp; </td>
-	<td> 17 September 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make mbuf's thread-safe. </td>
-	<td> &a.bmilekic; </td>
-	<td> 29 September 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock manager re-work. </td>
-	<td> &a.jasone; </td>
-	<td> 3 October 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Implement heavy-weight interrupt threads (alpha). </td>
-	<td> &a.jhb;, &a.dfr; </td>
-	<td> 5 October 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Rewrite the low level interrupt code (alpha). </td>
-	<td> &a.dfr;, &a.jhb; </td>
-	<td> 5 October 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Process accounting. </td>
-	<td> &a.tegge;, &a.jhb; </td>
-	<td> 5 October 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make ethernet drivers thread-safe. </td>
-	<td> &a.wpaul; </td>
-	<td> 15 October 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make the mutex headers mostly machine-independent. </td>
-	<td> &a.jhb; </td>
-	<td> 20 October 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Rename SMP_DEBUG to MUTEX_DEBUG. </td>
-	<td> &a.jhb; </td>
-	<td> 20 October 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Give each soft interrupt its own thread. </td>
-	<td> &a.cp; </td>
-	<td> 25 October 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make sf_bufs (sendfile(2)) thread-safe. </td>
-	<td> &a.bmilekic; </td>
-	<td> 5 November 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make the witness code work correctly. </td>
-	<td> &a.jhb; </td>
-	<td> 18 November 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Split the ktr-specific code out of db_interface.c. </td>
-	<td> &a.jhb;  </td>
-	<td> 15 December 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Convert the sio driver to using a spin mutex. </td>
-	<td> &a.jhb; </td>
-	<td> 18 December 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Implement condition variables. </td>
-	<td> &a.jake;, &a.jasone; </td>
-	<td> 15 January 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add a flag to mtx_init() (MTX_RECURSE) that denotes
-	  whether a mutex is allowed to recurse. </td>
-	<td> &a.bmilekic; </td>
-	<td> 19 January 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make the zone allocator thread-safe. </td>
-	<td> &a.des; </td>
-	<td> 21 January 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Convert simplelocks to mutexes. </td>
-	<td> &a.jasone; </td>
-	<td> 24 January 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make kernel preemptive with respect to interrupts. </td>
-	<td> &a.jake; </td>
-	<td> 31 January 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Cleanup of mutex API. </td>
-	<td> &a.bmilekic; </td>
-	<td> 8 February 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Remove COM_LOCK. </td>
-	<td> &a.markm; </td>
-	<td> 11 February 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Merge various scheduling classes into one run queue.
-	  Modify scheduler to support preemptable kernel. </td>
-	<td> &a.jake; </td>
-	<td> 11 February 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make priority propagation work correctly. </td>
-	<td> &a.jake; </td>
-	<td> 11 February 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make most of the interrupt thread code MI and shared
-	  between hardware and software interrupts. </td>
-	<td> &a.jhb; </td>
-	<td> 18 February 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add protection to struct jail and jail-related functionality. </td>
-	<td> &a.rwatson; </td>
-	<td> 20 February 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Implement sx (shared/exclusive) locks. </td>
-	<td> &a.jasone; </td>
-	<td> 5 March 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Generalize/improve witness to handle more complex locking
-	  primitives (mtx, sx). </td>
-	<td> &a.jhb; </td>
-	<td> 28 March 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Convert the allproc and proctree locks from lockmgr locks
-	  to sx locks. </td>
-	<td> &a.jhb; </td>
-	<td> 28 March 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make mbuf system use condition variables instead of
-	  msleep()/wakeup(). </td>
-	<td> &a.bmilekic; </td>
-	<td> 2 April 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Remove &lt;sys/mutex.h&gt; includes from other kernel
-	  headers such as &lt;vm/vm_zone.h&gt;, &lt;sys/resourcevar.h&gt;,
-	  &lt;sys/ucred.h&gt;, and &lt;sys/mbuf.h&gt;. </td>
-	<td> &a.markm; </td>
-	<td> 15 May 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Cleanup the various mp_machdep.c's, unify various SMP
-	  API's such as IPI delivery, etc. </td>
-	<td> &a.jhb; </td>
-	<td> 15 May 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make most of the forward_* and forwarded_* functions MI. </td>
-	<td> &a.jhb; </td>
-	<td> 15 May 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Complete the MD support for SMP on the Alpha platform.</td>
-	<td> &a.gallatin;, &a.dfr;, &a.jhb; </td>
-	<td> 15 May 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Convert select() to use condition variables. </td>
-	<td> &a.tanimura; </td>
-	<td> 15 May 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add a "giant" lock around the VM subsystem. </td>
-	<td> &a.alfred; </td>
-	<td> 13 June 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Introduce a modified slab allocator for the mbuf subsystem. </td>
-	<td> &a.bmilekic; </td>
-	<td> 21 June 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add a witness_assert() function to handle lock assertions. </td>
-	<td> &a.jhb; </td>
-	<td> 27 June 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Extend sx locks to support try lock operations. </td>
-	<td> &a.jhb; </td>
-	<td> 27 June 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Document KTR. </td>
-	<td> &a.jhb; </td>
-	<td> 28 June 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make fork_return, fork_exit, ast, and userret MI. </td>
-	<td> &a.jhb; </td>
-	<td> 29 June 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make sched_lock's savecrit a per-process property saved
-	  and restored in mi_switch and initialized in fork_exit. </td>
-	<td> &a.jhb; </td>
-	<td> 30 June 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make ast() loop. </td>
-	<td> &a.jhb; </td>
-	<td> 10 August 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add upgrade/downgrade sx lock operations. </td>
-	<td> &a.kan;, &a.jasone; </td>
-	<td> 13 August 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Implement semaphores. </td>
-	<td> &a.jasone; </td>
-	<td> 14 August 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add support for upgrade/downgrades in witness. </td>
-	<td> &a.jhb; </td>
-	<td> 23 August 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make most of cpu_wait() and cpu_exit() MI. </td>
-	<td> &a.peter; </td>
-	<td> 9 September 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Split NFS into client and server. </td>
-	<td> &a.peter; </td>
-	<td> 18 Oct 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock taskqueues. </td>
-	<td> &a.arr;, &a.jhb; </td>
-	<td> 25 October 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add a per-thread ucred reference. </td>
-	<td> &a.jhb; </td>
-	<td> 25 October 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make most of the per-CPU stuff MI. </td>
-	<td> &a.jhb; </td>
-	<td> 11 December 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make critical section saved state per-thread instead of per-lock
-	  so that interlocking spin locks work properly. </td>
-	<td> &a.jhb; </td>
-	<td> 17 December 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Replace the APIC-specific imen_mtx with a MI-named icu_lock to
-	  protect interrupt controllers and associated data within the kernel
-	  for both i386 and alpha. </td>
-	<td> &a.jhb; </td>
-	<td> 20 December 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Use the per-thread critical section nesting level in the mutex
-	    and interrupt thread code to automatically determine when to not
-	    preempt.  This makes the MTX_NOSWITCH, SWI_SWITCH, and
-	    SWI_NOSWITCH flags obsolete as the kernel will be able to figure
-	    out the proper behavior on its own. </td>
-	<td> &a.jhb; </td>
-	<td> 5 January 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock struct filedesc and struct file. </td>
-	<td> &a.tanimura;, &a.alfred; </td>
-	<td> 12 January 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock struct pgrp, struct session, and struct sigio. </td>
-	<td> &a.tanimura; </td>
-	<td> 23 February 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock pipe implementation, but not sigio/fown, VM interactions. </td>
-	<td> &a.alfred; </td>
-	<td> 27 February 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Move to explicit reference counting for soft vnode references.
-	  </td>
-	<td> &a.phk; </td>
-	<td> 8 March 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Initialize mutex pools early enough that sx locks can be used
-	  for VM. </td>
-	<td> &a.green; </td>
-	<td> 14 March 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> Place a global lock (sellock) around selinfo structures to fix a
-          variety of lock order reversals, and make select() MP-safe. </td>
-        <td> &a.alfred;, &a.davidc; </td>
-        <td> 14 March 2002 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push down Giant on read, write, pread, pwrite system calls,
-	  acquiring Giant in the per-subsystem fileop layer for sockets, VFS,
-	  etc.</td>
-	<td> &a.alfred; </td>
-	<td> 15 March 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down kernel module structures. </td>
-	<td> &a.arr; </td>
-	<td> 18 March 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down kernel linker globals.</td>
-	<td> &a.arr; </td>
-	<td> 18 March 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Rewrite kernel memory allocator to be a slab allocator that
-	  uses per-cpu caches. </td>
-	<td> &a.jeff; </td>
-	<td> 21 March 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Replace incorrect use of MD critical section API to disable
-	  interrupts with a specific interrupt disable API. </td>
-	<td> &a.imp;, &a.dfr;, &a.benno;, &a.jhb; </td>
-	<td> 21 March 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down access to the shared p_args "process arguments"
-	  structure through appropriate protection of that structure and
-	  references to it. </td>
-	<td> &a.mini; </td>
-	<td> 31 March 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Move from flags/tsleep lock to sx locks to protect sysctl
-	  tree from updates during sysctl operations. </td>
-	<td> &a.mini; </td>
-	<td> 1 April 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Create/port userland tool to manage KTR event dumps. </td>
-	<td> &a.jake; </td>
-	<td> 1 April 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Create MTX_SYSINIT and SX_SYSINIT macros that allow for
-	  initializing locks that are subsystem independent. </td>
-	<td> &a.arr; </td>
-	<td> 2 April 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
- 	<td> Lock down the global securelevel variable. </td>
-	<td> &a.arr; </td>
-	<td> 2 April 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make grow_stack() MI.  Possibly even a macro or inline. </td>
-	<td> &a.alc; </td>
-	<td> 6 April 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock use of p_fd, which otherwise can result in corrupted
-	  p_fd panics during heavy operation.  Start with a global,
-	  and move to per-proc locking. </td>
-	<td> &a.alfred;, &a.tanimura; </td>
-	<td> 8 April 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock struct pargs. </td>
-	<td> &a.mini; </td>
-	<td> 9 April 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock sysctl hierarchy. </td>
-	<td> &a.mini; </td>
-	<td> 9 April 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make {o,}sigreturn() MPSAFE. </td>
-	<td> &a.alc; </td>
-	<td> 11 April 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Rewrite kernel memory allocator so that Giant is not required
-	  for malloc() or free(). </td>
-	<td> &a.jeff; </td>
-	<td> 2 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Replace complex shared/exclusive locking scheme in the VM
-	  system with a purely exclusive lockmgr locking scheme, simplifying
-	  locking and removing potential livelock/deadlock scenarios. </td>
-	<td> &a.green;, &a.alc; </td>
-	<td> 3 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push down Giant into readv/writev system calls in style of
-	  read/write/pread/pwrite once malloc no longer requires Giant in
-	  the handling of iovec structures for uio. </td>
-	<td> &a.alc; </td>
-	<td> 9 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push down Giant in mprotect(), minherit(), and madvise() so
-	  that it is no longer acquired and released directly. </td>
-	<td> &a.alc; </td>
-	<td> 18 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Update suser() and p_can*() APIs to accept threads instead of
-	  processes. </td>
-	<td> &a.jhb; </td>
-	<td> 18 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Broadly transition to td_ucred from p_ucred once KSE dependencies
-	  are in place. </td>
-	<td> &a.jhb; </td>
-	<td> 18 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add a witness_sleep() check to uma_zalloc() to catch code
-	  calling malloc() or uma_zalloc() while holding non-sleepable
-	  locks. </td>
-	<td> &a.jhb; </td>
-	<td> 20 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Optimize UP support by changing spin locks to only perform
-	  critical section enter and exits. </td>
-	<td> &a.jhb; </td>
-	<td> 21 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make sleep mutexes spin if the current lock holder is
-	    executing on another CPU. </td>
-	<td> &a.jhb; </td>
-	<td> 21 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add support for the IA32 pause instruction to spin loops in
-	  locks. </td>
-	<td> &a.jhb; </td>
-	<td> 21 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make KTRACE write into tracefiles asynchronously. </td>
-	<td> &a.jhb; </td>
-	<td> 7 June 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> Remove Giant from modnext(2), modfnext(2),
-          modstat(2),and modfind(2).</td>
-        <td> &a.arr; </td>
-        <td> 25 June 2002 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Fix synchronization of TLB flushes and invlpg() on x86 SMP. </td>
-	<td> &a.peter; </td>
-	<td> 12 July 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add KTR(9) tracing for mutex contention. </td>
-	<td> &a.iedowse; </td>
-	<td> 26 Augist 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make cpu_coredump MI. </td>
-	<td> &a.peter; </td>
-	<td> 7 September 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add a subsystem lock to the accounting code. </td>
-	<td> &a.arr; </td>
-	<td> 11 September 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Allow KTR(9) to write trace records to alq(9) record facility.
-	  </td>
-	<td> &a.jeff; </td>
-	<td> 22 September 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Create mechanism in cdevsw structure to protect
-	  thread-unsafe drivers. </td>
-	<td> &a.phk; </td>
-	<td> 27 September 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Fix SIGXPU and other #if 0'd things in mi_switch(). </td>
-	<td> &a.jhb; </td>
-	<td> 30 September 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down TrustedBSD MAC implementation. </td>
-	<td> &a.rwatson; </td>
-	<td> 11 November 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock eventhandlers. </td>
-	<td> &a.msmith;, &a.mini;, &a.jhb; </td>
-	<td> 11 March 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Fix PHOLD() so that it blocks to guarantee PS_INMEM. </td>
-	<td> &a.jhb; </td>
-	<td> 22 April 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Fix various procfs_machdep.c to not use sched_lock. </td>
-	<td> &a.jhb; </td>
-	<td> 22 April 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock all references to process credentials and remove Giant
-	  from process credential-related system calls. </td>
-	<td> &a.jhb; </td>
-	<td> 1 May 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Merge the procsig and sigacts structures, move the new sigacts
-	  structure out of the U-area and add appropriate locking. </td>
-	<td> &a.jhb; </td>
-        <td> 13 May 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Remove Giant from the kill() and killpg() system calls. </td>
-	<td> &a.jhb; </td>
-        <td> 13 May 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Enhance the mutex pool implementation to allow creation and
-	  use of multiple, dynamically allocated pools with adjustable pool
-	  sizes and mutex options. </td>
-	<td> &a.truckman; </td>
-        <td> 16 July 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Create mutex profiling tool for the kernel so as to measure
-	  contention and behavior of kernel mutexes. </td>
-	<td> &a.eivind;, &a.des; </td>
-	<td> 31 March 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down linker_file_t structures in the kernel linker.</td>
-	<td> &a.arr; </td>
-	<td> 19 June 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock pipe implementation: VM optimizations. </td>
-	<td> &nbsp; </td>
-	<td> 4 October 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> Reimplement i386 interrupt and SMP code so that SMP kernels
-	  work on UP boxes and SMP can be enabled in GENERIC. </td>
-        <td> &a.jhb; </td>
-        <td> 3 November 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> Implement generic turnstiles to use when blocking on non-sleepable
-	  locks. </td>
-        <td> &a.jhb; </td>
-        <td> 11 November 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Split witness_lock() into witness_checkorder() and
-	  witness_lock().  witness_checkorder() would be called before
-	  acquiring a lock to increase the changes of detecting and warning
-	  about a reversal prior to deadlocking.  witness_lock() would
-	  simply update witness' internal state to note that a lock has
-	  been acquired. </td>
-	<td> &a.jhb; </td>
-	<td> 24 January 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock per-process resource limits. </td>
-	<td> &a.mtm;, &a.jhb; </td>
-	<td> 4 February 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> Implement a sleep queue abstraction to be used by both msleep()
-	  and condition variables.  This new abstraction should use a hash
-	  table of sleep queues with a spin lock on each sleep queue chain
-	  similar to turnstile chain locks to make sched_lock finger
-	  grained.</td>
-        <td> &a.jhb; </td>
-        <td> 27 February 2004 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> Remove Giant from jail(2). </td>
-        <td> &a.arr;, &a.rwatson; </td>
-        <td> 23 April 2004 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add subsystem locking to NFSv2, NFSv3 server, permitting upcalls
-	  and other network-related elements to run Giant-free. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add KTR(9) tracing for UMA allocation/free events. </td>
-	<td> &a.rwatson; </td>
-	<td> 05 August 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add KTR(9) tracing for GEOM I/O events. </td>
-	<td> &a.rwatson; </td>
-	<td> 21 October 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add KTR(9) tracing for busdma events. </td>
-	<td> &a.rwatson; </td>
-	<td> 23 October 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add KTR(9) tracing for critical sections. </td>
-	<td> &a.rwatson; </td>
-	<td> 07 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make the kernel fully preemptive. </td>
-	<td> &a.jhb; </td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock pipe implementation: sigio/fown-related evil. </td>
-	<td> &a.alfred; </td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-       <td> Lock down the SysV IPC code. </td>
-	<td> &a.alfred; </td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock contention measurement tool to measure heat of various
-	  locks, including Giant, and permit more directed performance and
-	  locking strategy optimization. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add KTR(9) tracing to scheduler run queues. </td>
-	<td> &a.jeff; </td>
-	<td> 26 December 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Review locking strategy and correctness of VFS operations
-	  and fix up various failure modes associated with enabling
-	  VFS locking assertions. </td>
-	<td> &a.jeff; </td>
-	<td> 01 January 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Document in-vnode locking strategy, clean it up. </td>
-	<td> &a.jeff; </td>
-	<td> 01 January 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Run cross-file system VFS without Giant, acquiring Giant
-	  conditionally based on a file system flag. </td>
-	<td> &a.jeff; </td>
-	<td> 01 January 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Run UFS file system MPSAFE. </td>
-	<td> &a.jeff; </td>
-	<td> 01 January 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add KTR(9) tracing for buffer cache events. </td>
-	<td> &a.jeff; </td>
-	<td> 24 January 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Break out critical section and spin lock APIs, and re-optimize
-	  critical sections to not disable interrupts in hardware due to
-	  the high cost on some hardware architectures. </td>
-	<td> &a.jhb; </td>
-	<td> 04 April 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Modify uma(9) to use critical sections to protect per-CPU
-	  statistics, instead of mutexdes, in order to optimize access. </td>
-	<td> &a.rwatson; </td>
-	<td> 29 April 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Migrate malloc(9) to per-CPU statistics, and use critical
-	  sections to optimize access to those statistics. </td>
-	<td> &a.rwatson; </td>
-	<td> 29 May 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add KTR(9) support for KTR_VFS to trace additional VFS events,
-	  rather than mechanically inserted KTR_VOP events. </td>
-	<td> &a.jeff; </td>
-	<td> 11 June 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push the grabbing of Giant into Linux i386 ABI system calls.</td>
-	<td> &a.jhb; </td>
-	<td> 13 July 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push the grabbing of Giant into Linux AXP ABI system calls.</td>
-	<td> &a.jhb; </td>
-	<td> 13 July 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push the grabbing of Giant into SVR4 i386 ABI system calls.</td>
-	<td> &a.jhb; </td>
-	<td> 13 July 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push the grabbing of Giant into OSF/1 AXP ABI system calls.</td>
-	<td> &a.jhb; </td>
-	<td> 13 July 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push the grabbing of Giant into IBCS i386 ABI system calls.</td>
-	<td> &a.jhb; </td>
-	<td> 13 July 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add a new witness check for exiting threads to verify that
-	  an exiting thread holds no locks. </td>
-	<td> &a.jhb; </td>
-	<td> 2 September 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> Implement atomic_fetchadd() for ints. </td>
-        <td> &a.jhb; </td>
-        <td> 27 September 2005 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> Implement a simple reference count API using atomic operations and
-	  use this to replace locks that just protect a reference count. </td>
-        <td> &a.jhb; </td>
-        <td> 27 September 2005 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Split the interrupt handler list out of struct ithread into
-	  its own structure and only start up kthreads for interrupt
-	  vectors that actually have threaded interrupt handlers. </td>
-	<td> &a.jhb; </td>
-	<td> 25 October 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock aio(4). </td>
-	<td> &a.davidxu; </td>
-	<td> 22 January 2006 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Implement reader/writer locks. </td>
-	<td> &a.jhb; </td>
-	<td> 27 January 2006 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> Remove the MPSAFE syscall flag from the syscall table. </td>
-        <td> &a.jhb; </td>
-        <td> 28 July 2006 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add sufficient synchronization to printf to avoid printing
-	  problems but not so much it doesn't work in debugging contexts. </td>
-	<td> &a.jb; </td>
-	<td> 1 November 2006 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Expand mutex profiling tool to also profile sx locks. </td>
-	<td> &a.kmacy; </td>
-	<td> 11 November 2006 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down the TTY subsystem. </td>
-	<td> &a.ed; </td>
-	<td> 20 August 2008 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <!-- WIP -->
-
-      <tr>
-	<td> Lock struct proc. </td>
-	<td> &a.jhb; </td>
-	<td> 20 February 2001 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Fix clock locking to be the same on all platforms. </td>
-	<td> &a.jhb; </td>
-	<td> 16 November 2001 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Make use of process locking and process reference counting
-	  to protect debugging interfaces (and procfs). </td>
-	<td> &a.jhb; </td>
-	<td> 27 February 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Make use of process locking to protect process monitoring
-	  sysctls, including those employed by 'ps' and related tools.</td>
-	<td> &a.jhb; </td>
-	<td> 27 February 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down newbus infrastructure to support driver
-	  fine-graining. </td>
-	<td> &a.imp; </td>
-	<td> 28 February 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> SMPng architecture document. </td>
-	<td> &a.jhb;, &a.rwatson; </td>
-	<td> 28 February 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Move to shared lock for VOP_GETATTR() to reduce blocking during
-	  frequent lightweight VFS operations.  Modify namei() to provide
-	  a LOOKUP_SHARED flag to indicate when the lock required may be
-	  shared instead of exclusive. </td>
-	<td> &a.jeff; </td>
-	<td> 11 March 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Document existing vm_map locking and verify it's correctness. </td>
-	<td> &a.alc; </td>
-	<td> 18 May 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Document existing vm_object locking and verify it's
-	  correctness. </td>
-	<td> &a.alc; </td>
-	<td> 4 May 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Implement lazy interrupt thread switching (context
-	  stealing) on i386. </td>
-	<td> &a.bmilekic;, &a.kan; </td>
-	<td> 10 December 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Implement lazy interrupt thread switching (context
-	  stealing) on sparc64. </td>
-	<td> &a.jake; </td>
-	<td> 10 December 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Switch from using lockmgr in VM to using a mutex or exclusive
-	  sxlock.  Push down Giant on all VM except for vm_object/VFS and
-	  vm_page/pmap components. </td>
-	<td> &a.alc; </td>
-	<td> 10 December 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Modify device driver API to permit drivers to more easily
-	  split "in interrupt context" and "in interrupt thread"
-	  code so as to acknowledge interrupts faster.  This will permit
-	  lower latency in interrupt handling. </td>
-	<td> &a.piso; </td>
-	<td> 24 February 2007 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <!-- Stalled -->
-
-      <!-- Not Started -->
-
-      <tr>
-	<td> Conditionalize atomic ops in the SMP code that are used
-	  for debugging statistics. </td>
-	<td> &a.peter; </td>
-	<td> 15 March 2001 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Axe schedcpu() in favor of event driven priority updates as
-	  much as possible. </td>
-	<td> &nbsp; </td>
-	<td> 7 September 2001 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Fix *hold (e.g. crhold) to return reference to object. </td>
-	<td> &nbsp; </td>
-	<td> 7 September 2001 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Add witness checking for lockmgr locks. </td>
-	<td> &nbsp; </td>
-	<td> 7 September 2001 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Add ICU spin locks on ia64. </td>
-	<td> &nbsp; </td>
-	<td> 4 January 2002 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Add a witness_sleep() check to copyin/out() and s/fuword(). </td>
-	<td> &a.jhb; </td>
-	<td> 7 June 2002 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Remove Giant from mi_startup() and push Giant down into
-	  individual SYSINIT functions.  Many SYSINIT functions probably do
-	  not need Giant anyway. </td>
-	<td> &nbsp; </td>
-	<td> 21 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-<!--
-      <tr>
-        <td>  </td>
-        <td> &nbsp; </td>
-        <td> D M 2002 </td>
-        <td> &status.new; </td>
-      </tr>
-
--->
-    </table>
-
-    <p>This table lists the todo subtasks for multithreading the network
-      stack.</p>
-
-    <table class="tblbasic">
-      <tr class="heading">
-	<th> Task </th>
-	<th> Responsible </th>
-	<th> Last updated </th>
-	<th> Status </th>
-      </tr>
-
-      <tr>
-	<td> Protect network interface queues. </td>
-	<td> &a.jlemon; </td>
-	<td> 24 November 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock up IP. </td>
-	<td> &a.jennifer;, &a.hsu; </td>
-	<td> 10 June 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock up TCP. </td>
-	<td> &a.jennifer;, &a.hsu;, &a.sam;, &a.rwatson;</td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock up UDP. </td>
-	<td> &a.jennifer;, &a.hsu;, &a.rwatson; </td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock ifaddr reference counts. </td>
-	<td> &a.hsu; </td>
-	<td> 18 December 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock up ifnet list. </td>
-	<td> &a.hsu; </td>
-	<td> 21 December 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock radix trees. </td>
-	<td> &a.hsu; </td>
-	<td> 23 December 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock up ARP. </td>
-	<td> &a.hsu; </td>
-	<td> 16 January 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock up raw IP. </td>
-	<td> &a.sam;, &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock divert sockets. </td>
-	<td> &a.sam; </td>
-	<td> 4 October 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock ipfw2. </td>
-	<td> &a.sam; </td>
-	<td> 4 October 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock DUMMYNET. </td>
-	<td> &a.sam; </td>
-	<td> 4 October 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock ethernet bridge. </td>
-	<td> &a.sam; </td>
-	<td> 4 October 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock IP fragment queues. </td>
-	<td> &a.rwatson; </td>
-	<td> 4 October 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock routing entries. </td>
-	<td> &a.sam; </td>
-	<td> 4 October 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock FAST_IPSEC. </td>
-	<td> &a.sam; </td>
-	<td> 4 October 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Permit parallel entry into isr processing. </td>
-	<td> &a.rwatson;, &a.sam; </td>
-	<td> 11 October 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock if_disc "discard interface". </td>
-	<td> &a.rwatson; </td>
-	<td> 9 March 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock if_faith "IPv6-to-IPv4 TCP relay interface. " </td>
-	<td> &a.sam;, &a.rwatson; </td>
-	<td> 9 March 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock if_gif "generic tunnel interface". </td>
-	<td> &a.rwatson; </td>
-	<td> 9 March 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Review ECN tunnel support (ip_ecn.c). </td>
-	<td> &a.rwatson; </td>
-	<td> 9 March 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> if_tap global and softc locking. </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> if_tun global and softc locking. </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> netatalk/aarp.c locking. </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Cache socket MAC label in inpcb label for IPv4 sockets so that
-	  the label can be used safely at the inet layer without socket
-	  locks. </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> IP encapsulation subroutines (ip_encap.c). </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock globals in loopback interface (if_loop.c). </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Use m_tags in if_gif to limit looping configurations, rather
-	  than a non-MPSAFE static coutner. </td>
-	<td> &a.ru; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> netatalk DDP PCB locking. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock up syncache. </td>
-	<td> &a.hsu;, &a.sam; </td>
-	<td> 10 November 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Permit IP forwarding path to run Giant-free. </td>
-	<td> &a.sam; </td>
-	<td> 1 December 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock &unix; domain protocols, fifofs. </td>
-	<td> &a.sam;, &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Giant lock over NFS server to protect against so_upcall() w/o Giant </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock interface cloning meta-data. </td>
-	<td> &a.brooks; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Apply combination of socket and socket buffer locks, label caching
-	  to MAC labels on sockets so that they can be used safely without
-	  Giant. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make routing socket message dispatch use a netisr to avoid
-	  re-entering the socket code from the routing code, resolving lock
-	  order issues. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Introduce accept locking to protect accept incomplete and
-	  complete queues on listen sockets. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Break out socket buffer wakeup, socket buffer append, socket
-	  state change, socket buffer reserve, flush, etc, calls into
-	  _locked() and unlocked versions, and avoid conditional locking.
-	  </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down AARP, AppleTalk Address Resolution Protocol. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Fix pull/push cache data synchronization issues in sosend(),
-	  soreceive(), allowing them to run Giant-free. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Protect socket global counters/limits and generation number
-	  with a mutex. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down unit allocation meta-data in interface related
-	  netgraph modules. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down socket buffer OOB fields across TCP/IP, IPX. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add MSG_NBIO so that fifofs can avoid frobbing SO_NBIO in
-	  a manner that risks races. </td>
-	<td> &a.truckman; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Protect all use of so_count with socket lock. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Move socket buffer related state from so_state to sb_state so
-	  it can be properly locked by the socket buffer mutex. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Introduce a temporary global lock to lock the if_label field
-	  used by the MAC Framework. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push VFS-specific behavior out of fdrop_locked() and acquire
-	  Giant in the fo_close per-object methods rather than
-	  fdrop_locked(), so that pipes and sockets can run fo_close()
-	  Giant-free. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push Giant acquisition into fo_stat() file descriptor stat
-	  operation, rather than acquiring it in fstat(), so that fstat()
-	  on sockets and pipes can run Giant-free. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Don't hold socket locks over entry to protocol switch methods,
-	  allowing protocol methods to acquire socket locks after protocol
-	  locks in the lock order. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Port inpcb mutex locking, assertions from IPv4 to IPv6. </td>
-	<td> &a.rwatson; </td>
-	<td> 8 August 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add IFF_NEEDSGIANT to allow if_start to run with Giant for
-	  specific interfaces.  Defer if_start to task queue. </td>
-	<td> &a.rwatson; </td>
-	<td> 8 August 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push down Giant in stat(), fo_stat() to allow Giant-free stat
-	  of pipes, sockets. </td>
-	<td> &a.rwatson; </td>
-	<td> 8 August 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add TCP lock assertions. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock socket layer. </td>
-	<td> &a.sam;, &a.rwatson; </td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Review TCP timer code. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Analyze and reduce cost of entropy gathering in network critical
-	  paths. </td>
-	<td> &a.rwatson;, &a.markm; </td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Allow code to declare NET_NEEDS_GIANT(), forcing Giant over the
-	  network stack if that code is compiled into the kernel. </td>
-	<td> &a.rwatson; </td>
-	<td> 28 August 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Disable Giant over the network stack in the default
-	  configuration. </td>
-	<td> &a.rwatson; </td>
-	<td> 28 August 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Additional KTR tracing for UMA, callouts, interrupts, etc. </td>
-	<td> &a.rwatson; </td>
-	<td> 07 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Move to using file descriptor reference counts instead of
-	  socket reference counts for socket system calls, avoiding extra
-	  reference couht operations. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 October 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down netnatm. </td>
-	<td> &a.rwatson; </td>
-	<td> April 2006 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Default to direct dispatch from ithreads </td>
-	<td> &a.rwatson; </td>
-	<td> 28 November 2006 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <!-- WIP -->
-
-      <tr>
-	<td> Lock IPv6. </td>
-	<td> &a.sam;, &a.rwatson;, &a.ume;, &a.mlaier; </td>
-	<td> 8 August 2004 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> if_ppp global, per-softc locking. </td>
-	<td> &a.rwatson;, Maurycy Pawlowski-Wieronski &lt;maurycy@fouk.org&gt; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Lock struct ifnet. </td>
-	<td> &a.mlaier;, &a.luigi;, Maurycy Pawlowski-Wieronski &lt;maurycy@fouk.org&gt; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Lock IPv4, IPv6, atalk interface address lists. </td>
-	<td> &a.mlaier;, &a.rwatson; </td>
-	<td> 8 August 2004 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Lock consumers of BSD compress (bsd_comp.c) code to protect
-	  compression state. </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Lock global and softc state for six-to-four converter (if_stf.c). </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down global and softc state for SLIP (if_sl.c). </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Lock global and softc state for SPPP (if_sppsubr.c). </td>
-	<td> &a.rik;, &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> IGMP locking. </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> IP ID locking. </td>
-	<td> &a.ups; </td>
-	<td> 24 June 2005 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Locking for polling(4). </td>
-	<td> &a.pjd;, &a.glebius; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> BPF locking needs some cleanup, there are some race conditions there relating to interface removal. </td>
-	<td> &a.csjp; </td>
-	<td> 2 June 2006 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <!-- Not Started -->
-
-      <tr>
-	<td> Reduce contention upon locking a socket buffer by replacing
-	     tsleep() and wakeup() with a condvar. </td>
-	<td> &a.tanimura; </td>
-	<td> 21 April 2002 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Lock if_ef "ethernet frame" driver. </td>
-	<td> &nbsp; </td>
-	<td> 9 March 2004 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Further cleanup of socket state machine in order to facilitate finishing socking locking of state transitions. </td>
-	<td> &a.rwatson; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Lock KAME IPSEC. </td>
-	<td> &nbsp; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Only one of our ATM stacks is MPSAFE, the other two should be deleted or fixed. </td>
-	<td> &nbsp; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Lock ND6 (IPv6 Neighbor Discovery). </td>
-	<td> &a.gnn; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Lock IPv6 multicast address lists. </td>
-	<td> &nbsp; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Lock IPv4 and IPv6 global address lists. </td>
-	<td> &nbsp; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Continued cleanup of the stack/device driver ownership and locking for struct ifnet needs to be done. Most fields are now either locked or assigned ownership. Some fields, such as if_flags, need a bit more cleanup due to device drivers modifying stack-owned fields. </td>
-	<td> &a.rwatson; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> When interfaces are torn down, there are a number of races (not all associated with SMPng) that need to be thought about. </td>
-	<td> &nbsp; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Lock if_vlan and inter-layer multicast address manipulation and synchronization in if_vlan. </td>
-	<td> &a.glebius;, &a.yar; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Further investigate locking in in_gif and in6_gif. </td>
-	<td> &nbsp; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> FAST_IPSEC and KAME IPSEC's PF_KEY support likely needs an asynchronous dispatch to prevent socket lock ordering issues similar to what was done for PF_ROUTE. </td>
-	<td> &a.rwatson; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Investigate how to eliminate the use of ACCEPT_LOCK(), which currently prevents races in the tear-down of sockets. </td>
-	<td> &a.rwatson; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Fix SMP problems with netgraph restructuring. </td>
-	<td> &a.glebius; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Verify locking in netgraph nodes and improve where necessary. </td>
-	<td> &a.glebius; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> More finely-grained locking for pf(4). </td>
-	<td> &a.glebius; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-    </table>
-
-    <a name="issues"></a>
-    <h2>Known Issues (Historical)</h2>
-
-    <table class="tblbasic">
-      <tr class="heading">
-	<th> Issue </th>
-	<th> Last updated </th>
-	<th> Status </th>
-      </tr>
-
-      <tr>
-	<td> Idle processor time is not charged to the idle processes. </td>
-	<td> 20 September 2000 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> microuptime creeps backwards. </td>
-	<td> 4 October 2000 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> microuptime() went backwards </td>
-	<td> 4 October 2000 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> Process accounting is not accurate (the more CPUs, the
-	  closer to correct it is). </td>
-	<td> 5 October 2000 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> M_DEVBUF is probably the wrong memory pool for interrupt
-	  stuff and we should think about creating a new malloc pool for
-	  that stuff. </td>
-	<td> 9 February 2001 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> PC card eject panics due to a race condition in the
-	  interrupt thread code. </td>
-	<td> 15 March 2001 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> SMP x86 boxes are seeing NCPU * 100 clk interrupts and
-	  NCPU * 128 rtc interrupts. </td>
-	<td> 15 May 2001 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> Witness will infinitely recurse when it acquires Giant after
-	  sleeping with a sleepable lock. </td>
-	<td> 27 June 2001 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> Serial gdb does not work if boot_ddb and boot_gdb options
-	  are specified. </td>
-	<td> 14 July 2002 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> Serial gdb does not work at 115200 baud. </td>
-	<td> 14 July 2002 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> Serial gdb never regains control once 'cont' has been
-	  entered. </td>
-	<td> 14 July 2002 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <!-- unresolved -->
-
-      <tr>
-	<td> Profiling is broken. </td>
-	<td> 20 February 2001 </td>
-	<td> &status.unresolved; </td>
-      </tr>
-
-<!--
-      <tr>
-        <td> </td>
-        <td> D M 2002 </td>
-        <td> &status.unresolved; </td>
-      </tr>
-
--->
-    </table>
-
-    <a name="news"></a>
-    <h2>News (Historical)</h2>
-
-    <p>The remainder of this page is structured as a
-      reverse-chronological log.</p>
-
-<!--
-<b> D M 2002</b>
-<ul>
-	<li> <p>  </p> </li>
-</ul>
--->
-    <b>28 August 2004</b>
-    <ul>
-      <li>
-	<p>&a.rwatson; threw the switch to change the network stack to run
-	without the Giant lock by default, permitting the network stack to be
-	run on multiple CPUs at a time, as well as to preempt and be
-	preempted by other code.</p>
-      </li>
-    </ul>
-    <b>30 October 2003</b>
-    <ul>
-      <li>
-      <p>&a.grog; submitted a
-        <a href="http://www.lemis.com/grog/SMPng/Singapore/">FreeBSD SMPng paper</a>
-       	to the <a href="http://www.aeosc.org/">Asian Enterprise Open Source
-        Conference</a> in Singapore.  The paper presents a historical view of
-        SMPng development through 2001, but omits discussion of more recent
-        progress on the SMPng project, such as substantial performance enhancements
-        resulting from extensive lock pushdown in the storage subsystem, VM
-        subsystem, and major IPC subsystems.</p>
-      </li>
-    </ul>
-
-    <b>13 January 2002</b>
-    <ul>
-      <li>
-      <p>A <a href =
-        "http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=122646+0+archive/2002/freebsd-smp/20020113.freebsd-smp">
-        status report</a> was sent to the -smp mailing list.</p>
-      </li>
-    </ul>
-
-    <b>15 May 2001</b>
-    <ul>
-      <li>
-	<p>&a.grog; has made his <a href =
-	  "http://www.lemis.com/~grog/SMPng/USENIX/">USENIX paper</a> available,
-	  which he will present in Boston at the end of June.</p>
-      </li>
-    </ul>
-
-    <b>22 March 2001</b>
-    <ul>
-	<li>
-	<p>A <a href =
-	  "http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=41302+0+archive/2001/freebsd-smp/20010325.freebsd-smp">
-	  status report</a> was sent to the -smp mailing list.</p>
-      </li>
-    </ul>
-
-    <b>5 March 2001</b>
-    <ul>
-      <li>
-	<p>A <a href =
-	  "http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=0+0+archive/2001/freebsd-smp/20010311.freebsd-smp">
-	  status report</a> was sent to the -smp mailing list.</p>
-      </li>
-    </ul>
-
-    <b>24 January 2001</b>
-    <ul>
-      <li>
-	<p>A <a href =
-	  "http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=38125+0+archive/2001/freebsd-smp/20010128.freebsd-smp">
-	  status report</a> was sent to the -smp mailing list.</p>
-      </li>
-    </ul>
-
-    <b>12 January 2001</b>
-    <ul>
-      <li>
-	<p>A <a href =
-	  "http://www.FreeBSD.org/cgi/getmsg.cgi?fetch=45111+48223+/usr/local/www/db/text/2001/freebsd-smp/20010114.freebsd-smp">
-	  status report</a> was sent to the -smp mailing list.</p>
-      </li>
-    </ul>
-
-    <b>11 October 2000</b>
-    <ul>
-      <li>
-	<p>&a.jhb; and &a.cp; came up with a preliminary list of
-	  <a href="http://storm.uk.FreeBSD.org/~hiten/smp_synch_rules.html">rules
-	  </a> that should be followed when working on kernel
-	  synchronization.</p>
-      </li>
-    </ul>
-
-    <b>6 September 2000</b>
-    <ul>
-      <li>
-	<p>The SMP code has been committed.  All further work is being
-	  done in cvs rather than with patches.</p>
-      </li>
-
-      <li>
-	<p>An updated <a
-	  href="http://people.FreeBSD.org/~jasone/smp/smpng_patch_9.7">patch</a>
-	  is available for download.  This patch is probably what will
-	  actually get committed.</p>
-      </li>
-    </ul>
-
-    <b>5 September 2000</b>
-    <ul>
-      <li>
-	<p>An updated <a
-	  href="http://people.FreeBSD.org/~jasone/smp/smpng_patch_9.1">patch</a>
-	  is available for download.  This patch makes rtc a fast
-	  interrupt, uses locked instructions for mutexes in MP kernels,
-	  and corrects mtx_*() linkage within modules.</p>
-      </li>
-    </ul>
-
-    <b>1 September 2000</b>
-    <ul>
-      <li>
-	<p>The code is working for the most part now on i386 (UP and MP).
-	  Some additional coding is still necessary for the alpha,
-	  which is being done now.</p>
-      </li>
-    </ul>
-
-    <b>30 August 2000</b>
-    <ul>
-      <li>
-	<p>Updated patches for i386 and alpha are available <a href =
-	  "http://people.FreeBSD.org/~jasone/smp/smpng_patch8.6">here</a>.</p>
-      </li>
-    </ul>
-
-    <b>12 August 2000</b>
-    <ul>
-      <li>
-	<p>Updated patches for i386 are available <a href =
-	  "http://www.FreeBSD.org/~jhb/patches/smpng.patch6">here</a>.
-	  Process accounting still doesn't work correctly, but a number
-	  of other improvements have been made.</p>
-      </li>
-    </ul>
-
-    <b>3 August 2000</b>
-    <ul>
-      <li>
-	<p>Patches with functional heavy-weight threads for the i386
-	  platform are available <a href =
-	  "http://people.FreeBSD.org/~grog/patches4.gz">here</a>.
-	  There are a couple of minor issues with this patch set.
-	  Specifically, process accounting doesn't work correctly.</p>
-      </li>
-    </ul>
-
-    <b>6 July 2000</b>
-    <ul>
-      <li>
-	<p>Sheldon Hearn has prepared a mutex(9) man page based on the
-	  BSD/OS one, which is available <a href =
-	  "http://people.FreeBSD.org/~jake/mutex.9">here</a>.</p>
-      </li>
-    </ul>
-
-    <b>5 July 2000</b>
-    <ul>
-      <li>
-	<p>&a.jake; put an updated patch <a href =
-	  "http://people.FreeBSD.org/~jake/smpng.diff">here</a>.</p>
-      </li>
-    </ul>
-
-    <b>3 July 2000</b>
-    <ul>
-      <li>
-	<p>&a.jake; has the BSD/OS lock code working now, and has
-	  incorporated the pertinent portions of &a.dillon;'s patches
-	  (idle processes, some of the schedlock changes, etc.).
-	  His patch set is available <a href =
-	  "http://people.FreeBSD.org/~jake/smpng2.tar">here</a>.</p>
-      </li>
-    </ul>
-
-    <b>26 June 2000</b>
-    <ul>
-      <li>
-	<p>&a.cp; has provided the PostScript versions of his
-	  presentation slides for the
-	  <a href="http://people.FreeBSD.org/~jasone/smp/smp_meeting_slides_1.ps">first day</a> and
-	  <a href="http://people.FreeBSD.org/~jasone/smp/smp_meeting_slides_2.ps">second day</a> of the
-	  SMP meeting.</p>
-      </li>
-    </ul>
-
-    <b>25 June 2000</b>
-    <ul>
-      <li>
-	<p>Here's a copy of the
-	  <a href="http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=226208+0+archive/2000/freebsd-smp/20000625.freebsd-smp">SMP meeting summary</a>
-	  that was posted to the -smp mailing list.</p>
-      </li>
-    </ul>
-
-    <b>19 June 2000</b>
-    <ul>
-      <li>
-	<p>Here's a copy of the
-	  <a href="http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=154884+0+archive/2000/freebsd-current/20000625.freebsd-current">SMP project announcement</a>
-	  that was posted to the -current mailing list.</p>
-      </li>
-    </ul>
-
-  </body>
-</html>
diff --git a/en_US.ISO8859-1/htdocs/y2kbug.sgml b/en_US.ISO8859-1/htdocs/y2kbug.sgml
deleted file mode 100644
index 2b16bad6e4..0000000000
--- a/en_US.ISO8859-1/htdocs/y2kbug.sgml
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title 'Year 2000 Compatibility (aka "Millennium Bug")'>
-]>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.docs">
-
-    <p>As management understanding of the Year 2000 problem (aka, "The
-      Millennium Bug") increases, more and more companies are demanding
-      official statements from the vendors of their hardware and software as
-      to how their product will handle the year 2000 date rollover.</p>
-
-    <p>Organizations that use &unix; and Unix-like operating systems such as
-      FreeBSD are already one step ahead of the problem.  FreeBSD will
-      properly maintain time long after year 2000 passes.</p>
-
-    <h2>Background information</h2>
-
-    <p><i>(This section based on the text from the <a
-	  href="http://www.linux.org.uk/mbug.html">Linux Y2K compliance
-	  page</a>)</i></p>
-
-    <p>As with all Unix and Unix-like operating systems, time and dates in
-      FreeBSD are represented internally as the number of seconds since the
-      1st of January 1970 (the Unix "epoch").  Currently, that figure is
-      stored as a 32 bit integer, and will run out part way through 2038. By
-      then we should (hopefully) be using a counter of 64 bits (or greater)
-      which should be good until the end of the universe.</p>
-
-    <p>Note that the OS being Y2K compliant will not fix errant applications
-      that are not Y2K compliant.</p>
-
-    <p>Note also that the OS expects to read the current date and time from
-      the CMOS clock of your computer.  Not all of these devices correctly
-      handle the year 2000.  You are advised to test each platform
-      individually to ensure that your hardware clock behaves correctly when
-      going from 1999 to 2000, and that it correctly interprets the year 2000
-      as a leap year.</p>
-
-    <h2>What you can do</h2>
-
-    <p>FreeBSD will continue to properly maintain time well into the next
-      century.  Third party applications, however, might not.  Your best
-      defense against year 2000 issues is a good offense.  Listening to
-      stories claiming the coming meltdown of the world as we know it are
-      <strong>not</strong> the way to solve the millennium bug.  Nor is
-      waiting until the last minute.  The FreeBSD Project recommends that your
-      organization apply sound system administration principles as the
-      millennium approaches.</p>
-
-    <h2>FreeBSD Year 2000 Statement</h2>
-
-    <blockquote>
-      <p>"After extensive analysis and testing, we believe that FreeBSD is
-	100% Y2K compliant.  In the unlikely event that something has been
-	overlooked, we will do our best to fix it as soon as possible."</p>
-
-      <p align="right">David Greenman<br/>Principal Architect, The FreeBSD
-	project</p>
-    </blockquote>
-
-    <h2>Fixed problems</h2>
-
-    <p>The following Y2K problems have been identified and fixed in
-      FreeBSD.</p>
-
-    <dl>
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=1380">misc/1380</a></dt>
-
-      <dd>Several programs have a hardcoded 19%d in responses for the year.
-	Affected programs include: yacc, ftpd, and make.  [Fixed: yacc v1.2
-	1999/01/18; ftpd v1.7 1996/08/05; make v1.4 1996/10/06; fixes in
-	FreeBSD-2.2 and above]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=1382">conf/1382</a></dt>
-
-      <dd>The sed script in /etc/rc.local that builds the host/kernel ID line
-	for the message of the day relies on the year not going past 1999.
-	[Fixed v1.21 1996/10/24; fixes in FreeBSD-2.2 and above]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=3465">misc/3465</a></dt>
-
-      <dd>The etc/namedb/make-localhost command generates the DNS serial
-	number as YYMMDD. In the year 2000, this will be generated as
-	1YYMMDD.  [Fixed v1.2 1997/08/11; fixes in FreeBSD-2.2.5 and
-	above]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=4930">gnu/4930</a> and
-	  <a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=8321">gnu/8321</a></dt>
-
-      <dd>groff tmac macros have hardcoded 19 for generating some dates.
-	[Fixed: tmac.e v1.3 1998/12/06; doc-common v1.10 1999/01/19; fixes in
-	FreeBSD-3.1 and above]</dd>
-
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9323">bin/9323</a></dt>
-
-      <dd>In its obsolescent form, touch doesn't treat the two digit year
-        specification correctly.  Years in the range 00-68 are treated
-        as 1900-1968 instead of 2000-2068.  [Fixed v1.7 1999/01/05; fixes in
-        FreeBSD-3.1 and above]</dd>
-
-      <dt><a
-	  href="http://cvsweb.FreeBSD.org/src/usr.sbin/xntpd/parse/util/dcfd.c">xntpd/parse/util/dcfd.c</a></dt>
-
-      <dd>The leap year calculations for the number of days in a year, and the
-	conversion of DCF77 time to seconds since the Epoch were wrong.  These
-	errors affected all years.  [Fixed v1.6 1999/01/12; fixes in
-	FreeBSD-3.1 and above]</dd>
-
-      <dt><a
-	  href="http://cvsweb.FreeBSD.org/src/gnu/usr.bin/tar/getdate.y">tar/getdate.y</a></dt>
-
-      <dd>Function Convert() was hard-coded for two digit years in range 70-99.
-	Now adjusted to allow two digit years for 1970-2069.  The function
-	does not allow for century non-leap years - y2k1 alert!  [Fixed v1.4
-	1999/01/12; fixes in FreeBSD-3.1 and above]
-      </dd>
-
-      <dt><a
-	  href="http://cvsweb.FreeBSD.org/src/usr.bin/fetch/http.c">fetch/http.c</a></dt>
-
-      <dd>The HTTP protocol includes an obsolete date format which uses a
-	two-digit year.  Previous versions of fetch would interpret all such
-	dates in the 1900s; subsequent to this revision, the pivot described
-	in <a href="ftp://ftp.cdrom.com/pub/internet/rfc/rfc2068.txt">RFC
-	  2068</a> is employed, which causes two-digit years to be interpreted
-	as always belonging to the current century unless they would be 50 or
-	more years in the future.  Since the HTTP servers which use this
-	obsolete format are no longer widespread, this is not expected to have
-	a significant impact.  [Fixed v1.24 1999/01/15; fixes in FreeBSD-3.1
-	and above]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9500">misc/9500</a></dt>
-
-      <dd>The `edithook' script in the CVSROOT directory uses a raw tm_year
-	and will therefore display 01/01/100 for 2000-JAN-01.  [Fixed v1.2
-	1999/01/17; not relevant to FreeBSD releases]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9501">bin/9501</a></dt>
-
-      <dd>Several cvs contrib files are not Y2K compliant.  The log.pl and
-	sccs2rcs.csh scripts prepend `19' to the year resulting in a display
-	of 19100 for 2000.  The log_accum.pl script uses a two digit year in
-	one place and in another place assumes that the tm_year is year within
-	century rather than years since 1900.  [Fixed: log.pl v1.2 1999/01/15;
-	sccs2rcs.csh v1.3 1999/01/15; fixes in FreeBSD-3.1 and above]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9502">bin/9502</a></dt>
-      <dd>The groff number register `yr' is assigned from a (struct
-	tm).tm_year and therefore represents the number of years since 1900,
-	not the year within the century (see definition in troff/input.cc).
-	[Fixed, now set mod 100, troff/input.cc V1.2 1999/06/03; fixed
-	in FreeBSD-3.3]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9503">bin/9503</a></dt>
-
-      <dd>PicoBSD's simple_httpd uses a raw tm_year and will therefore display
-	01/01/100 for 2000-JAN-01.  [Fixed v1.2 1999/01/16; fixes in
-	FreeBSD-3.1 and above]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9505">bin/9505</a></dt>
-
-      <dd>Adduser uses a raw tm_year and will therefore display 100/01/01 for
-	2000-JAN-01.  [Fixed v1.42 1999/01/15; fixes in FreeBSD-3.1 and
-	above]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9506">bin/9506</a></dt>
-
-      <dd>Cron uses a raw tm_year and will therefore display 100 for 2000.
-	[Fixed v1.7 1999/01/16; fixes in FreeBSD-3.1 and above]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9507">bin/9507</a></dt>
-
-      <dd>tcpslice(8) uses a raw tm_year and will therefore display
-	100y01m01d... for 2000-JAN-01.  For compatibility, use a two-digit
-	year until 2000.[Fixed v1.8 1999/01/20; fixes in FreeBSD-3.1 and
-	above]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=14472">bin/14472</a></dt>
-
-      <dd>Date command does not take thousand/hundred digits. [Fixed v1.31 1999/11/10]
-	</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=14511">misc/14511</a></dt>
-
-      <dd>Chpass has a problem using 00 for expiration year.
-	</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=15852">bin/15852</a> and
-	  <a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=16045">gnu/16045</a> and
-	  <a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=16207">bin/16207</a>
-	  </dt>
-
-      <dd>Groff predefined \*(DT [\*(td] string has Y2K bug. [Fixed with import of
-        version 1.15 2000/01/12]
-	</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=15872">bin/15872</a></dt>
-
-      <dd>at(1) has a problem with valid time specifications if tm_year is 100,
-        reports `garbled time'.
-	</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=16238">misc/16238</a></dt>
-
-      <dd>KerberosIV install does not work properly because there is a hard-wired
-	expiration date of 12/31/99 in the Kerberos source for the ticket
-	granter. [Fixed v1.24 1999/09/19]
-	</dd>
-    </dl>
-
-    <h2>More information</h2>
-
-    <p>If you have further questions about FreeBSD's year 2000 compliance, or
-      you have discovered an application running under FreeBSD that is not Y2K
-      compliant, please contact the project at <a
-	href="mailto:freebsd-bugs@FreeBSD.org">freebsd-bugs@FreeBSD.org</a>.</p>
-
-  </body>
-</html>
diff --git a/es_ES.ISO8859-1/books/faq/book.sgml b/es_ES.ISO8859-1/books/faq/book.sgml
index a3e80fc605..5e56c9ff7f 100644
--- a/es_ES.ISO8859-1/books/faq/book.sgml
+++ b/es_ES.ISO8859-1/books/faq/book.sgml
@@ -582,19 +582,6 @@
         </answer>
       </qandaentry>
 
-      <qandaentry>
-        <question>
-          <para>?D�nde encuentro informaci�n sobre el
-          a�o 2000 (Y2K) en FreeBSD?</para>
-        </question>
-
-        <answer>
-	  <para>Tienes toda la informaci�n disponible en la <ulink
-	  url="http://www.freebsd.org/y2kbug.html">p�gina Y2K de
-	  FreeBSD</ulink> </para>
-        </answer>
-      </qandaentry>
-
       <qandaentry>
         <question>
 	  <para>?Qu� grupos de noticias est�n disponibles
diff --git a/es_ES.ISO8859-1/htdocs/Makefile b/es_ES.ISO8859-1/htdocs/Makefile
index 5cebc512fc..ac0a403d6e 100644
--- a/es_ES.ISO8859-1/htdocs/Makefile
+++ b/es_ES.ISO8859-1/htdocs/Makefile
@@ -21,7 +21,6 @@ DOCS+= publish.sgml
 DOCS+= send-pr.sgml
 DOCS+= support.sgml
 DOCS+= where.sgml
-DOCS+= y2kbug.sgml
 
 CLEANFILES+=atoz.sgml site.sgml
 
diff --git a/es_ES.ISO8859-1/htdocs/news/newsflash.sgml b/es_ES.ISO8859-1/htdocs/news/newsflash.sgml
index d59a95e8cc..35fe143958 100644
--- a/es_ES.ISO8859-1/htdocs/news/newsflash.sgml
+++ b/es_ES.ISO8859-1/htdocs/news/newsflash.sgml
@@ -384,14 +384,6 @@ Releases</a></strong>.</p>
 	</li>
     </ul>
 
-    <h2>February 1998</h2>
-    <ul>
-	<li><p><b>08-Feb-98</b>
-	A page detailing the <a href="../y2kbug.html">FreeBSD Year 2000
-	compliance statement</a> is now available, linked through the <a
-	href="../docs.html">Documentation</a> page.</p></li>
-    </ul>
-
     <h2>January 1998</h2>
     <ul>
 	<li><p><b>08-Jan-98</b>
diff --git a/es_ES.ISO8859-1/htdocs/projects/projects.sgml b/es_ES.ISO8859-1/htdocs/projects/projects.sgml
index d9f9da88cc..f91a6f01f4 100644
--- a/es_ES.ISO8859-1/htdocs/projects/projects.sgml
+++ b/es_ES.ISO8859-1/htdocs/projects/projects.sgml
@@ -268,7 +268,6 @@ IPv6/IPsec libre para BSD</a></li>
     <ul>
       <li><a name="drawbridge" href="http://drawbridge.tamu.edu/"> Drawbridge, un firewall</a></li>
       <li><a name="hardening" href="http://www.watson.org/fbsd-hardening/">FreeBSD Hardening Project, un entorno m�s seguro</a></li>
-      <li><a name="SMP" href="http://www.freebsd.org/smp/">Symmetric MultiProcessor Support</a></li>
     </ul>
 
 <a name="devicedrivers"></a>
diff --git a/es_ES.ISO8859-1/htdocs/search/sitemap.xml b/es_ES.ISO8859-1/htdocs/search/sitemap.xml
index 4e8739651f..cb4300715c 100644
--- a/es_ES.ISO8859-1/htdocs/search/sitemap.xml
+++ b/es_ES.ISO8859-1/htdocs/search/sitemap.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE sitemap PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Sitemap//EN"
         "http://www.FreeBSD.org/XML/www/share/sgml/sitemap.dtd">
+
+<!-- $FreeBSD$ -->
+
 <sitemap>
   <term>
     <text>Usage statistics for this server</text>
@@ -888,10 +891,5 @@
       <text>Books</text>
       <destination>../../handbook/bibliography.html</destination>
     </item>
-
-    <item>
-      <text>Year2000</text>
-      <destination>../y2kbug.html</destination>
-    </item>
   </category>
 </sitemap>
diff --git a/es_ES.ISO8859-1/htdocs/y2kbug.sgml b/es_ES.ISO8859-1/htdocs/y2kbug.sgml
deleted file mode 100644
index 5edb21d307..0000000000
--- a/es_ES.ISO8859-1/htdocs/y2kbug.sgml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title 'Compatibilidad a�o  2000 ("Millennium Bug")'>
-]>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.about">
-
-    <p>A medida que se va entendiendo el problema del a�o 2000,
-      m�s y m�s compa��as est�n
-      demandando informes oficiales de los proveedores de hardware y
-      software, de como sus productos responder�n frente al cambio
-      de milenio.</p>
-
-    <p>Las organizaciones que usan sistemas operativos &unix; como FreeBSD
-      est�n un paso por delante del problema. FreeBSD mantendr�
-      sin problemas las fechas posteriores al a�o 2000.</p>
-
-<h2>M�s informaci�n</h2>
-
-    <p><i>(Esta secci�n est� basada en el texto de <a
-     href="http://www.linux.org.uk/mbug.html">Linux Y2K compliance
-     </a>)</i></p>
-
-    <p>Como en todos los sistemas operativos &unix;, la hora y fecha se
-      representa internamente como el n�mero de segundos transcurridos
-      desde el 1 de Enero de 1970 (la "�poca" &unix;). Actualmente,
-      esta figura se almacena en un entero de 32 bits, desbordandose sobre
-      el a�o 2038. Para entonces esperamos (seguro) usar un contador
-      de 64 bits (o mayor) el cual no dar�a problemas hasta el fin
-      del universo.</p>
-
-    <p>Ten en cuenta que un sistema operativo sin el problema Y2K no
-      solucionar� las aplicaciones que no sean Y2k.</p>
-
-    <p>De la misma manera, el sistema operativo espera leer la fecha y hora
-      actual del reloj CMOS de tu computador. No todos estos dispositivos
-      manejan correctamente el a�o 2000. Recomendamos que testees cada
-      plataforma independientemente para asegurar que el reloj de tu hardware
-      soporta sin problemas el paso del a�o 1999 al 2000, y que
-      �ste es interpretado correctamente.</p>
-
-<h2>Qu� puedes hacer.</h2>
-
-      <p>FreeBSD continuar�a manteniendo correctamente tanto la
-      fecha como la hora durante el pr�ximo siglo. Aplicaciones
-      de terceras partes, quiz�s no lo hagan. Tu mejor defensa
-      frente a los problemas del 2000 es un buen ataque. Escuchar las
-      historias clamando el final del mundo pensamos que <strong>no</strong>
-      es la mejor manera de hacer frente al problema. El proyecto FreeBSD
-      te recomienda realizar comprobaciones de tus sistemas antes de
-      la llegada del 2000.</p>
-
-      <p>Hay tests que puedes usar para comprobar la respuesta de tu
-      sistema. Pon el reloj de tu computador a unos minutos antes de la
-      media noche del nuevo a�o y comprueba la fecha. Tu sistema
-      deber�a mostrar el a�o 2000 y no el 1900. Si el
-      a�o mostrado es incorrecto, tendr�s bastante tiempo
-      por delante para actualizar el hardware. Operar los sistemas de
-      informaci�n de tu organizaci�n durante unos
-      d�as con la fecha adelantada, puede darte una idea real de
-      lo que ocurrir� en el cambio del a�o.</p>
-
-    <blockquote>
-      <strong>Importante:</strong> <strong>No</strong> hagas esto en
-      sistemas en producci�n. Puedes confundir y tener muchos
-      problemas en aplicaciones que utilizan las fechas (sistemas de
-      facturaci�n, reg�menes de copias, etc). Utiliza siempre
-      para este tipo de pruebas m�quinas de desarrollo las cuales no
-      puedan afectar datos importantes.
-    </blockquote>
-
-
-    <h2>Estado del Y2K en FreeBSD</h2>
-
-    <blockquote>
-     <p>
-     "Despu�s de extensos an�lisis y tests, creemos que FreeBSD
-      es 100% compatible con el Y2K. En caso de que algo se nos haya pasado
-      por alto, haremos todo lo posible para fijar el problema lo antes
-      posible."
-    </p>
-
-    <p align="right">David Greenman<br/>Arquitecto Principal, The
-	FreeBSD project</p>
-    </blockquote>
-
-    <h2>Problemas solucionados</h2>
-
-    <p>Los siguientes problemas Y2K han sido identificados y solucionados
-      en FreeBSD.</p>
-
-    <dl>
-      <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=1380">misc/1380</a></dt>
-      <dd>Muchos programas ten�an incluido de manera fija el formato
-        19%d para el a�o. Los programas afectados incluyen: yacc, ftpd,
-        y make.
-        [Solucionado: yacc v1.2 1999/01/18; ftpd v1.7 1996/08/05;
-        make v1.4 1996/10/06] </dd>
-
-      <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=1382">conf/1382</a></dt>
-      <dd>El script sed de /etc/rc.local que crea la l�nea del
-        host/kernel ID para el mensaje del d�a depende de que el
-        a�o no sobrepase el 1999. [Solucionado: v1.21 1996/10/24]</dd>
-
-      <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=3465">misc/3465</a></dt>
-      <dd>El comando etc/namedb/make-localhost genera el n�mero
-        serial del DNS como YYMMDD. En el a�o 2000, �ste
-        ser� generado como 1YYMMDD.[Solucionado v1.2 1997/08/11]</dd>
-
-      <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=4930">gnu/4930</a> y
-	  <a href="http://www.freebsd.org/cgi/query-pr.cgi?pr=8321">gnu/8321</a></dt>
-      <dd>Las macros groff ten�an integrado 19 para generar algunas
-         fechas.
-         [Solucionado: tmac.e v1.3 1998/12/06; doc-common v1.10 1999/01/19]</dd>
-
-      <dt><a href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9323">bin/9323</a>
-</dt>
-
-      <dd>El comando touch no trata correctamente los dos digitos del
-        a�o. Los a�os en el rango 00-68 son tratados como
-        1900-1968 en lugar de 2000-2068. [Solucionado: v1.7 1999/01/05]
-      </dd>
-
-      <dt><a href="http://cvsweb.freebsd.org/src/usr.sbin/xntpd/parse/util/dcfd.c">xntpd/parse/util/dcfd.c</a></dt>
-      <dd>El c�lculo de a�os bisiestos para el n�mero de
-        d�as en un a�o, y la conversi�n del tiempo DFC77
-        a segundos desde el Epoch era incorrecta. Estos errores afectaban a
-        todos los a�os. [Solucionado: v1.6 1999/01/12]
-      </dd>
-
-      <dt><a href="http://cvsweb.freebsd.org/src/gnu/usr.bin/tar/getdate.y.diff?r1=1.3&amp;r2=1.4">tar/getdate.y</a></dt>
-      <dd>La funci�n convert() ten�a fijado el uso de dos
-        d�gitos en el a�o para el rango 70-99. Ha sido ajustada
-        para permitir a�os de dos d�gitos para for 1970-2069.
-        La funci�n no permite usar a�os bisiestos -
-        alerta y2k1!. [Solucionado: v1.4 1999/01/12]
-      </dd>
-
-      <dt><a href="http://cvsweb.freebsd.org/src/usr.bin/fetch/http.c.diff?r1=1.22&amp;r2=1.24">fetch/http.c</a></dt>
-      <dd>El protocolo HTTP incluye un formato de fecha obsoleto que usa un
-        a�o de dos d�gitos. Las versiones anteriores de fetch
-        interpretaban todas las fechas en 1900s; con esta revisi�n, se
-        usa la recomendaci�n de la
-        <a href="ftp://ftp.cdrom.com/pub/internet/rfc/rfc2068.txt">RFC
-        2068</a>. [Solucionado: v1.24 1999/01/15]
-      </dd>
-
-      <dt><a href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9500">misc/9500</a></dt>
-      <dd>El script `edithook' en el directorio CVSROOT usa tm_year y
-        mostrar�a 01/01/100 en el 2000-JAN-01.
-        [Solucionado: v1.2 1999/01/17]
-      </dd>
-
-      <dt><a href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9501">bin/9501</a></dt>
-      <dd>Muchos de los ficheros "cvs contrib" tienen el problema del
-        a�o 2000. Los scripts log.pl y sccs2rcs.csh a�aden 19
-        al a�o, resultando en mostrar 19100 para el 2000. El script
-        log_accum.pl usa un a�o de 2 d�gitos en un lugar y en
-        otro asume que tm_year es el a�o dentro del siglo en lugar
-        de a�o desde 1900.
-        [Solucionado: log.pl v1.2 1999/01/15; sccs2rcs.csh v1.3 1999/01/15]
-      </dd>
-
-      <dt><a href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9502">bin/9502</a></dt>
-      <dd>El registro num�rico de groff `yr' es asignado desde
-        (struct tm).tm_year representando el n�mero de a�os desde
-        1900, no el a�o dentro del siglo (mirar la definici�n en
-        troff/input.cc).
-        [Solucionado: ahora usa mod 100, input.cc V1.2 1999/06/03]
-      </dd>
-
-      <dt><a href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9503">bin/9503</a></dt>
-      <dd>El programa simple_httpd de PicoBSD usa tm_year y mostrar�
-        01/01/100 para 2000-JAN-01.
-        [Solucionado: v1.2 1999/01/16]
-      </dd>
-
-      <dt><a href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9505">bin/9505</a></dt>
-      <dd>Adduser usa tm_year y mostrar� 01/01/100 para 2000-JAN-01.
-        [Solucionado: v1.42 1999/01/15]
-      </dd>
-
-      <dt><a href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9506">bin/9506</a></dt>
-      <dd>Cron usa tm_year y mostrar� 01/01/100 para 2000-JAN-01.
-        [Solucionado: v1.7 1999/01/16]
-      </dd>
-
-      <dt><a href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9507">bin/9507</a></dt>
-      <dd>tcpslice(8) usa tm_year y mostrar�a 100y01m01d... para
-        2000-JAN-01. Por compatibilidad, usa un a�o de dos
-        d�gitos hasta el 2000. [Solucionado: v1.8 1999/01/20]
-      </dd>
-
-    </dl>
-
-    <h2>Aplicaciones Problem�ticas</h2>
-
-    <dl>
-      <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=7681">ports/7681</a></dt>
-      <dd>TkDesk 1.0 tiene integrado un 19 en el fichero de lista de
-        ventanas. Un fichero con fecha &gt; 2000 se muestra como
-        "191xx" donde xx son los dos �ltimos n�ros de la
-        fecha real. Este error ha sido fijado en la versi�n 1.1.
-      </dd>
-
-      <dt><a href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9295">ports/9295</a></dt>
-
-      <dd>INN 1.7.2 tiene varios problemas relacionados con Y2K. Uno ocurre
-        cuando purgamos las news (option -f del nntpget) y otro est�
-        relacionado con la cabecera Expire con fechas relativas pasado el
-        a�o 2000.
-        [Ports INN actualizados a INN 2.2 1999/05/02]
-      </dd>
-
-      <dt><a href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9298">ports/9298</a></dt>
-      <dd>Knews tiene varios problemas relacionados con Y2K. Uno ocurre
-        durante la generaci�n del comando NNTP NEWGROUPS. El otro ocurre
-        por que knews no piensa que el 2000 es una a�o bisiesto. Ambos
-        est�n solucionados en knews-1.0b.1. [Port actualizado 1999/01/07]
-      </dd>
-
-      <dt><a href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9300">ports/9300</a></dt>
-      <dd>Nntp-t5 tiene un problema de Y2K durante la generaci�n del
-        comando NEWNEWS. [Port parcheado 1999/01/05]
-      </dd>
-
-      <dt><a href="http://www.freebsd.org/cgi/query-pr.cgi?pr=11144">ports/11144</a></dt>
-      <dd>El port tiff tiene fijado 19xx. Aunque est� en la
-        secci�n contrib (para convertir el formato de SUN a TIFF), y
-        no es instalado por defecto, deber�a ser solucionado.
-        [Solucionado: 1999/04/18]
-      </dd>
-
-      <dt><a href="http://www.freebsd.org/cgi/query-pr.cgi?pr=11145">ports/11145</a></dt>
-      <dd>El port dgs tiene el mismo problema que el port tiff.
-        [Solucionado: 1999/04/18]
-      </dd>
-
-    </dl>
-
-
-
-    <h2>M�s informaci�n</h2>
-
-    <p>Si tienes alguna pregunta sobre la compatibilidad de FreeBSD con el
-      a�o 2000, o has descubierto alguna aplicaci�n ejecutada
-      bajo FreeBSD que no cumple con Y2K, por favor, ponte en contacto con
-      nosotros en la direcci�n <a
-      href="mailto:freebsd-bugs@FreeBSD.ORG">freebsd-bugs@FreeBSD.ORG</a>.</p>
-
-</body>
-</html>
diff --git a/fr_FR.ISO8859-1/htdocs/Makefile b/fr_FR.ISO8859-1/htdocs/Makefile
index a2ba9dccbc..97708f384f 100644
--- a/fr_FR.ISO8859-1/htdocs/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/Makefile
@@ -28,7 +28,6 @@ DOCS+= relnotes.sgml
 DOCS+= send-pr.sgml
 DOCS+= support.sgml
 DOCS+= where.sgml
-DOCS+= y2kbug.sgml
 
 # These will be directly installed.
 
@@ -61,10 +60,8 @@ SUBDIR+= prstats
 SUBDIR+= platforms
 SUBDIR+= releases
 SUBDIR+= releng
-SUBDIR+= smp
 SUBDIR+= snapshots
 SUBDIR+= support
-SUBDIR+= kse
 SUBDIR+= gnome
 SUBDIR+= donations
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
diff --git a/fr_FR.ISO8859-1/htdocs/docs/webresources.sgml b/fr_FR.ISO8859-1/htdocs/docs/webresources.sgml
index 17d6dc0237..864f08dbc9 100644
--- a/fr_FR.ISO8859-1/htdocs/docs/webresources.sgml
+++ b/fr_FR.ISO8859-1/htdocs/docs/webresources.sgml
@@ -66,11 +66,6 @@
 
 	    <h2>Autres ressources</h2>
 
-	    <h3><a href="../y2kbug.html">Compatibilit� An 2000</a></h3>
-
-	    <p>L'avis officiel du Projet FreeBSD &agrave; propos de sa
-	      compatibilit� An 2000.</p>
-
 	    <h3><a href="http://fxr.watson.org/">Le code
 	      source</a></h3>
 
diff --git a/fr_FR.ISO8859-1/htdocs/internal/developer.sgml b/fr_FR.ISO8859-1/htdocs/internal/developer.sgml
index 620a9e90e4..6e01d4c9fc 100644
--- a/fr_FR.ISO8859-1/htdocs/internal/developer.sgml
+++ b/fr_FR.ISO8859-1/htdocs/internal/developer.sgml
@@ -70,7 +70,6 @@ Manuel pour les porteurs d'applications sous FreeBSD</a></h2>
   <li><a href="../platforms/ia64/index.html">Projet FreeBSD/IA-64</a></li>
   <li><a href="../platforms/ppc.html">Projet FreeBSD/PPC</a></li>
   <li><a href="../platforms/sparc.html">Projet FreeBSD/SPARC</a></li>
-  <li><a href="../smp/">Projet SMP de nouvelle g�n�ration</a></li>
   <li><a href="http://www.TrustedBSD.org/">Projet TrustedBSD</a></li>
   <li><a href="../projects/index.html">Projets de d�veloppement FreeBSD</a></li>
 </ul>
diff --git a/fr_FR.ISO8859-1/htdocs/java/dists/10.sgml b/fr_FR.ISO8859-1/htdocs/java/dists/10.sgml
deleted file mode 100644
index f2194e7ecb..0000000000
--- a/fr_FR.ISO8859-1/htdocs/java/dists/10.sgml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "Projet Java pour FreeBSD : JDK 1.0 - NON SUPPORT�">
-]>
-
-<!--
-   The FreeBSD French Documentation Project
-   Original revision: 1.5
-
-   Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
-   Version francaise (mise a jour) : Vincent Tougait <viny@scientiae.net>
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-
-<h2>&jdk; 1.0.x</h2>
-<p>Bien que cela soit not� ci-dessous, cette distribution du JDK n'est plus disponible sur freefall.FreeBSD.org.
-Si vous parvenez &agrave; trouver ce port, vous �tes libre de l'utiliser. :)</p>
-<pre>
-Annonce
--------
-Une distribution native pour FreeBSD du JDK 1.0.2 est maintenant disponible &agrave; l'adresse
-  freefall.FreeBSD.org:/pub/FreeBSD/LOCAL_PORTS/jdk102.tar.gz
-Ce port contient l'interpr�teur java, le compilateur et le lanceur d'applet.
-Cette distribution n'est absolument pas support�e.
-
-Installation
-------------
-1. R�cup�rez la fichier freefall.FreeBSD.org:/pub/FreeBSD/LOCAL_PORTS/jdk102.tar.gz.
-2. Cr�ez un r�pertoire et d�compressez l'archive dans celui-ci.
-3. Installez le port pdksh.
-
-Utilisation du JDK
-------------------
-Si le r�pertoire racine du JDK est &lt;jdk&gt;, vous devez :
-  1. inclure dans votre "path" le r�pertoire &lt;jdk&gt;/bin
-  2. positionner la variable d'environnement CLASSPATH &agrave; .:&lt;jdk&gt;/classes
-  3. configurer LD_LIBRARY_PATH pour inclure &lt;jdk&gt;/lib/i386
-Pour compiler un programme java, utilisez 'javac program.java'.
-Pour le lancer, utilisez 'java &lt;nom_de_la_classe_principale&gt;'.
-
-R�ponses aux questions les plus courantes
------------------------------------------
-Q: Ai-je besoin de Motif ?
-A: Non.
-
-Q: Sur quelle version de FreeBSD fonctionne ce JDK ?
-A: J'utilise la version courante de FreeBSD, c'est donc la seule version que
-   j'ai pu tester.     /* "FreeBSD-current ?" - commentaire ajout� par Dave Hummel, qui
-                                   n'est pas l'auteur original */
-
-Q: Cela ne fonctionne pas sur ma machine. Que puis-je faire ?
-A: Pas de chance, cette distribution n'est absolument pas support�e.
-</pre>
-</body>
-</html>
diff --git a/fr_FR.ISO8859-1/htdocs/java/dists/11.sgml b/fr_FR.ISO8859-1/htdocs/java/dists/11.sgml
deleted file mode 100644
index f6279d0662..0000000000
--- a/fr_FR.ISO8859-1/htdocs/java/dists/11.sgml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "Projet &java; pour FreeBSD : &jdk; 1.1">
-]>
-
-<!--
-   The FreeBSD French Documentation Project
-   Original revision: 1.9
-
-   Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
-   Version francaise (mise a jour) : Vincent Tougait <viny@scientiae.net>
-   Version francaise (mise a jour) : Antoine Brodin <antoine.brodin@laposte.net>
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-
-<p>La derni�re version est
-<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/jdk1.1.8_ELF.V1999-11-9.tar.gz">jdk1.1.8_ELF.V1999-11-9.tar.gz</a>.
-pour ELF (FreeBSD versions 3 ou 4) ou pour les versions plus anciennes de la s�rie 2.2
-<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/nate/JDK1.1/jdk1.1.8_AOUT.V1999-11-9.tar.gz">jdk1.1.8_AOUT.V1099-11-9.tar.gz</a>.
-Les patches utilis�s pour la compilation des 2 versions sont disponibles
-<a href="http://www.FreeBSD.org/~patrick/patches.tar.gz">ici</a>. Ils ne sont utiles que si vous avez le code source Java.</p>
-
-<p>Par ailleurs, les versions internationales du JRE&trade; sont
-disponibles.</p>
-<ul>
-<li>
-<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/nate/JDK1.1/jre1.1.8i_AOUT.V1999-11-9.tar.gz">jre1.1.8i_AOUT.V1999-11-9.tar.gz</a>
-</li>
-<li>
-<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/nate/JDK1.1/jre1.1.8i_ELF.V1999-11-9.tar.gz">jre1.1.8i_ELF.V1999-11-9.tar.gz</a>
-</li>
-</ul>
-
-<p>Vous �tes invit� &agrave; utiliser un site proche de chez vous,
-      &agrave; moins que vous ne soyez limit� au http. Utilisez l'un de ces miroirs :</p>
-<ul>
-<li>
-<a href="ftp://ftp.nuxi.com/pub/FreeBSD/JDK/">ftp://ftp.nuxi.com/pub/FreeBSD/JDK/</a>
-<br/>Merci &agrave; David O'Brien (obrien@NUXI.com) qui m'a donn� un compte
-sur sa machine. Le miroir devrait donc �tre toujours correct.
-</li>
-
-<li>
-<a href="http://mirror.aarnet.edu.au/pub/FreeBSD/JDK/">http://mirror.aarnet.edu.au/pub/FreeBSD/JDK/</a>
-</li>
-
-<li>
-<a href="ftp://mirror.aarnet.edu.au/pub/FreeBSD/JDK/">ftp://mirror.aarnet.edu.au/pub/FreeBSD/JDK/</a>
-<br/>Disponible uniquement en Australie/Nouvelle-Z�lande. Merci &agrave; Jason Andrade
-(jason@dstc.edu.au) pour ce miroir par del&agrave; l'oc�an.
-</li>
-
-<li>
-<a href="ftp://ftp.se.FreeBSD.org/pub/FreeBSD/JDK/">ftp://ftp.se.FreeBSD.org/pub/FreeBSD/JDK/</a>
-<br/>Merci &agrave; Johan Larsson (gozer@ludd.luth.se).
-</li>
-
-<li>
-<a href="ftp://ftp7.de.FreeBSD.org/pub/FreeBSD/JDK/">ftp://ftp7.de.FreeBSD.org/pub/FreeBSD/JDK/</a>
-<br/><a href="http://ftp7.de.FreeBSD.org/pub/FreeBSD/JDK/">http://ftp7.de.FreeBSD.org/pub/FreeBSD/JDK/</a>
-<br/>Merci &agrave; Oliver Fromme (olli@dorifer.heim3.tu-clausthal.de).
-</li>
-
-<li>
-<a href="ftp://ftp.gwdg.de/pub/freebsd/JDK/">ftp://ftp.gwdg.de/pub/freebsd/JDK/</a>
-<br/><a href="http://ftp.gwdg.de/pub/freebsd/JDK/">http://ftp.gwdg.de/pub/freebsd/JDK/</a>
-<br/>Merci &agrave; Eberhard Moenkeberg (emoenke@gwdg.de).
-</li>
-
-<li>
-<a href="ftp://nofinesse.lib.surrey.ac.uk/pub/FreeBSD/JDK/">ftp://nofinesse.lib.surrey.ac.uk/pub/FreeBSD/JDK/</a>
-<br/>Merci &agrave; Jose Marques qui a mis en place une automatisation du processus.
-</li>
-
-<li>
-<a href="ftp://ftp.spline.net/pub/FreeBSD/JDK/">ftp://ftp.spline.net/pub/FreeBSD/JDK/</a>
-<br/>Merci &agrave; Alexander Tatmaniants (tat@Spline.NET) .
-</li>
-</ul>
-
-<p>Ces versions ne n�cessitent pas une licence Motif car elles ont �t� compil�es
-avec une biblioth�que Motif qui autorise la distribution publique des binaires et
-des librairies du JDK.</p>
-
-<h3>README.FreeBSD:</h3>
-<pre>
-JDK1.1.8 pour FreeBSD
---------------------
-Corrig�s dans cette version :
-- l'impression &agrave; partir du JDK devrait maintenant fonctionner correctement.
-- utilisation de la version en assembleur de l'interpr�teur. Les performances
-  devrait �tre meilleure.
-- meilleure gestion des signaux comme DIVIDE et SIGFPE qui sont maintenant
-  intercept�s et g�r�s correctement.
-- la version ELF devrait mieux fonctionner avec les applications AWT/Swing. Le
-  projet FreeBSD a fait don d'une version de Motif plus r�cente qui devrait �viter
-  certaines erreurs �tranges sous interface X.
-
-Pour avoir les meilleures r�sultats, il est recommand� d'utiliser les versions les plus r�centes de FreeBSD,
-&agrave; savoir la 2.2.8 pour les versions a.out et FreeBSD 3.2R, afin de profiter
-de ces am�liorations.
-
-Si vous trouvez un bug ou si vous avez des corrections de bugs que vous voudriez voir int�gr�es, veuillez envoyer
-un courrier �lectronique &agrave; 'java-port@FreeBSD.org' de mani�re &agrave; ce que nous puissions encore am�liorer les prochaines versions.
-
-Limitations/Bugs connus :
-------------------------------------
-Le nombre de sockets qui peuvent �tre utilis�es en m�me temps est cod� en dur avec
-l'ann�e (&agrave; la date d'aujourd'hui, ce nombre est �gal &agrave; 2000). Ce n'est pas sp�cialement une limitation du
-noyau FreeBSD mais arriver &agrave; avoir un m�canisme dynamique n'est pas trivial et donc
-aucun des d�veloppeurs n'a encore �crit le code et personne n'a
-envoy� de patches &agrave; l'�quipe de d�veloppement. Si cette limitation a beaucoup d'importance pour vous,
-nous serons ravi de recevoir tous les patches pour passer &agrave; un m�canisme dynamique qui permettrait de ne plus
-limiter le nombre de descripteurs de fichiers (sockets).
-------------------------------------
-Pour r�aliser une distribution qui fonctionne sans X _et_ avec X, deux binaires
-sont fournis. Le premier est li� sans X et est le binaire standard.
-Le deuxi�me binaire est li� avec une version statique de X et avec
-les librairies X partag�es. La version utilis�e est contr�l�e par la variable
-d'environnement DISPLAY qui est utilis�e par X afin de d�terminer
-le p�riph�rique de sortie.
-</pre>
-</body>
-</html>
diff --git a/fr_FR.ISO8859-1/htdocs/java/dists/12.sgml b/fr_FR.ISO8859-1/htdocs/java/dists/12.sgml
deleted file mode 100644
index e4c21b9df8..0000000000
--- a/fr_FR.ISO8859-1/htdocs/java/dists/12.sgml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "Projet &java; pour FreeBSD : &jdk; 2 (aka JDK 1.2)">
-]>
-
-<!--
-   The FreeBSD French Documentation Project
-   Original revision: 1.17
-
-   Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
-   Version francaise (mise a jour) : Vincent Tougait <viny@scientiae.net>
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-
-<p>
-<b>18 Septembre 2002 :</b> Greg Lewis a sorti un nouveau jeu de patches pour le
-&jdk;&nbsp;1.2.2.</p>
-<p>Le plus int�ressant pour les utilisateurs de FreeBSD est l'inclusion du support JPDA.
-Les autres principaux changements sont le support de
-<a href="http://www.netbsd.org/">NetBSD</a> et
-<a href="http://www.openbsd.org/">OpenBSD</a>.</p>
-
-<p>Comme dit pr�cedemment, les patches sont disponibles &agrave; l'adresse
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk.html">http://www.eyesbeyond.com/freebsddom/java/jdk.html</a>. Les utilisateurs FreeBSD sont invit�s &agrave;
-utiliser le port java/jdk12.</p>
-
-<p>
-<b>14 Octobre 2000 :</b> Le port du JDK 1.2.2 en version native pour FreeBSD de Greg Lewis est maintenant en phase de test
-b�ta. Il est disponible dans les ports (java/jdk12-beta).
-<br/>Bien que le port ne fonctionne que sur architecture i386 pour le moment, cela permettra &agrave; tous ceux
-qui utilisent cette plate-forme (la plupart d'entre vous) de compiler un JDK2 natif et de le
-tester avec vos applications favorites et avec votre code. Si vous utilisez une application
-de mani�re r�guli�re, pourquoi ne pas en faire un port ? Les instructions sont disponibles dans le <a href="&enbase;/doc/en_US.ISO8859-1/books/porters-handbook/index.html">Manuel du Porteur d'Applications</a>.</p>
-
-<p>Si vous voulez essayer de le compiler "&agrave; la main", en raison des contraintes li�es &agrave; la licence SCSL, vous devez dor�navant aller sur
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk.html">http://www.eyesbeyond.com/freebsddom/java/jdk.html</a>
-et d�clarer que vous acceptez les termes de la licence SCSL avant le t�l�chargement.</p>
-<p><b>Note</b> : ce port n�cessite �norm�ment de place disque pour la compilation (environ 250 Mo).</p>
-
-<p>
-<b>3 Mai 2000 :</b> Greg Lewis vient d'annoncer que le port du JDK 1.2.2 en version native pour
-FreeBSD �tait entr� en phase de test alpha.
-<br/>Dans sa forme actuelle, le port compile et fonctionne sur la plupart des versions FreeBSD
-(3.4, 4.0 et 5.0 sur x86) et les choses progressent pour les autres versions (2.2.8 sur x86
-et 4.0 alpha). La plupart des applets et des applications de d�mo fonctionnent.
-<br/>Nous recherchons actuellement des passionn�s qui seraient pr�ts &agrave; prendre un peu
-de temps pour tester le nouveau port. Bien que cela ne soit pas une t�che triviale, il existe
-des instructions claires et d�taill�es sur la compilation et l'utilisation du port.
-<br/>Les patches sont disponibles, comme d'habitude, sur :
-<br/><a href="http://www.eyesbeyond.com/freebsddom/java/jdk.html">
-http://www.eyesbeyond.com/freebsddom/java/jdk.html</a>
-<br/>Plus d'informations, les probl�mes non r�solus et les instructions d�taill�es sont disponibles sur :
-<br/><a href="http://www.kjkoster.org/java/index.html">
-http://www.kjkoster.org/java/index.html</a></p>
-<p>
-<b>22 Mars 2000 :</b> Greg Lewis a sorti les patches pr�-alpha pour les utilisateurs t�m�raires
-qui voudraient compiler leurs propres JDK 1.2.2 en version native pour FreeBSD. Le processus
-&agrave; suivre est r�serv� aux utilisateurs avertis et le JDK produit ne doit pas �tre utilis�
-en production. Cela �tant dit, la plupart des d�mo AWT et Swing semblent
-fonctionner. Il reste encore beaucoup de travail &agrave; faire et nous avons besoin d'un maximum
-de testeurs. Les patches et les instructions pour la compilation peuvent �tre t�l�charg�s sur
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk.html">http://www.eyesbeyond.com/freebsddom/java/jdk.html</a>
-Les probl�mes actuels et les r�sultats des tests sont disponibles sur
-<a href="http://www.kjkoster.org/java/index.html">http://www.kjkoster.org/java/index.html.</a> </p>
-<p>
-<b>January 30, 2000:</b> The Linux Blackdown Port Team has released RC4 of JDK 1.2
-.  It has been tested on FreeBSD 3.4-STABLE and later and runs all demo applets
-and jfc demos.  Several people have mentioned some problems running it with
-Apache JServ.  Until it can be added to the FreeBSD port tree, it can be found
-at <a href="http://www.jmcm.org/tech/ports/linux_jdk.html">
-http://www.jmcm.org/tech/ports/linux_jdk.html</a>.  (Reported by Jose Marques)</p>
-
-<p>
-<b>October 11, 1999:</b> Work has re-started on the Java2/JDK1.2 port.
-Expect an early 'alpha' release in the coming weeks for FreeBSD
-3.3-stable/ELF boxes.</p>
-
-<p>For most JDK2 development issues, you can use the JDK1 release and the
-<a href="http://java.sun.com/products/jfc/index.html#download-swing">Swing</a>
-releases provided by Sun for JDK1, which works very well under FreeBSD.</p>
-
-</body>
-</html>
diff --git a/fr_FR.ISO8859-1/htdocs/java/dists/13.sgml b/fr_FR.ISO8859-1/htdocs/java/dists/13.sgml
deleted file mode 100644
index 4569f6c0a6..0000000000
--- a/fr_FR.ISO8859-1/htdocs/java/dists/13.sgml
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "Projet &java; pour FreeBSD : &jdk; 1.3">
-]>
-
-<!--
-  The FreeBSD French Documentation Project
-  Original revision: 1.15
-
-  Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
-  Version francaise (mise a jour) : Stephane Legrand <stephane@freebsd-fr.org>
-  Version francaise (mise a jour) : Vincent Tougait <viny@scientiae.net>
-  Version francaise (mise a jour) : Antoine Brodin <antoine.brodin@laposte.net>
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-
-<p>
-<b>19 D�cembre 2003 :</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> a sorti un nouveau jeu de patches (version 9) pour le JDK 1.3.1
-et a �galement mis &agrave; jour le port ports/java/jdk13. Ces nouveaux
-patches sont, comme d'habitude, disponibles sur <a href=
-"http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-<br/>Cette nouvelle version contient de nombreuses corrections et am�liorations, il est donc recommand� de faire une mise &agrave; jour
-avant de signaler tout probl�me.
-</p>
-
-<p>
-<b>12 F�vrier 2003 :</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> a sorti un nouveau jeu de patches (version 8) pour le &jdk; 1.3.1
-et a �galement mis &agrave; jour le port ports/java/jdk13. Ces nouveaux
-patches sont, comme d'habitude, disponibles sur <a href=
-"http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-<br/>Cette nouvelle version est la premi�re du JDK 1.3.1 &agrave; passer
-les tests de compatibilit�s de Sun. Elle contient de nombreuses corrections et am�liorations, il est
-donc recommand� de faire cette mise &agrave; jour avant de signaler tout probl�me.
-</p>
-
-<p>
-<b>26 Juillet 2002 :</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> a sorti un nouveau jeu de patches (version 7) pour le JDK 1.3.1
-et a �galement mis &agrave; jour le port ports/java/jdk13. Ces nouveaux
-patches sont, comme d'habitude, disponibles sur <a href=
-"http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-<br/>Cette nouvelle version contient de nombreuses corrections et am�liorations, il est
-donc recommand� de faire cette mise &agrave; jour avant de signaler tout probl�me.
-</p>
-
-<p>
-<b>13 F�vrier 2002 :</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> a sorti un nouveau jeu de patches (version 6) pour le JDK 1.3.1
-et a �galement mis &agrave; jour le port ports/java/jdk13. Ces nouveaux
-patches sont, comme d'habitude, disponibles sur <a href=
-"http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-<br/>Cette nouvelle version contient de nombreuses corrections et am�liorations, il est
-donc recommand� de faire cette mise &agrave; jour avant de signaler tout probl�me.
-</p>
-
-<p>
-<b>16 Octobre 2001 :</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> a sorti un nouveau jeu de patches (version 5) pour le JDK 1.3.1
-et a �galement mis &agrave; jour le port ports/java/jdk13. Ces nouveaux
-patches sont, comme d'habitude, disponibles sur <a href=
-"http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-<br/>Cette nouvelle version contient de nombreuses corrections et am�liorations, il est
-donc recommand� de faire cette mise &agrave; jour avant de signaler tout probl�me.
-</p>
-
-<p>
-<b>10 Septembre 2001 :</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> a sorti un nouveau jeu de patches (version 4) pour le JDK 1.3.1
-et a �galement mis &agrave; jour le port ports/java/jdk13. Ces nouveaux
-patches sont, comme d'habitude, disponibles sur <a href=
-"http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-<br/>Cette nouvelle version contient de nombreuses corrections et am�liorations, il est
-donc recommand� de faire cette mise &agrave; jour avant de signaler tout probl�me.
-</p>
-
-<p>
-<b>27 Ao�t 2001 :</b> <a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
-a sorti le tant attendu port du JDK 1.3.1. Il peut maintenant �tre compil�
-&agrave; partir du r�pertoire ports/java/jdk13. Il faut not� que toutes les
-remarques d�crites ci-dessous s'appliquent et qu'il s'agit toujours d'une version
-<strong>uniquement &agrave; destination des d�veloppeurs</strong>. Il n'est pas
-recommand� de l'utiliser en production.
-</p>
-
-<p>
-<b>16 Juillet 2001 :</b> <a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
-a sorti plusieurs patches pour les d�veloppeurs int�ress�s par la compilation d'une
-version native du JDK&nbsp;1.3.1 pour FreeBSD. Il est &agrave; noter qu'il s'agit d'une
-version <strong>uniquement &agrave; destination des d�veloppeurs</strong> et que cela ne
-compilera pas une version fonctionnelle du JDK.
-Ces patches sont rendus disponibles principalement afin que les personnes int�ress�es
-puissent participer &agrave; ce projet de port en ayant une base pour commencer.
-Ces patches ainsi qu'un r�sum� de la proc�dure de compilation sont disponibles sur
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-</p>
-
-<p><b>15 Septembre 2000 :</b> <a href="mailto:gallatin@cs.duke.edu">Andrew
- Gallatin</a> et <a href="mailto:sean@stat.Duke.EDU">Sean O'Connell</a>
-travaillent actuellement &agrave; faire fonctionner le JDK 1.3 de IBM. Afin de le faire
-fonctionner sur votre syst�me, vous devrez appliquer plusieurs patches au code source de FreeBSD.
-Les patches sont disponibles sur :
-<br/>
-<a href="http://www.cs.duke.edu/~gallatin/linux_sa_siginfo/4.0-release.diff">
-4.0-RELEASE</a>
-<br/><a href="http://people.FreeBSD.org/~patrick/ibmjdk/linux.patch2">
-4.0-STABLE</a>
-<br/><a href="http://www.cs.duke.edu/~gallatin/linux_sa_siginfo/diff">
--CURRENT</a> (pre-SMPng)</p>
-
-<p>Pour citer le message de Drew :</p>
-<br/><pre>
-Je suis finalement parvenu &agrave; faire fonctionner le jdk 1.3 de IBM. Je ne l'ai pas test�
-de mani�re approfondie mais la partie AWT semble cependant enfin fonctionner.
-
-Voici un nouveau jeu de patches &agrave; appliquer sur -current pre-SMPng. Les patches
-concernent :
-
-- changement de la valeur de MINSIGSTKSZ de 8192 &agrave; 2048
-- impl�mentation de linux_rt_sendsig() &amp; linux_rt_sigreturn()
-- impl�mentation du code sigtramp c�t� utilisateur pour linux_rt_sigreturn()
-- impl�mentation de linux_to_bsd_sigaltstack &amp; bsd_to_linux_sigaltstack() afin
-        corriger un bug dans linux_sigaltstack &amp; afin d'�viter des copies de code
-        dans linux_rt_sigreturn(). Cela corrige �galement le "Java HotSpot(TM)
-        Client VM warning: cannot uninstall alt signal stack" qui appara�t avec
-        le JDK 1.3 de Sun.
-- changement du drapeau MAP_STACK &agrave; MAP_ANON pour les mmaps de
-        LINUX_MAP_GROWSDOWN. Cela a �t� l'�tape finale pour que les choses fonctionnent.
-        Y-a-t'il des gourous de la VM pour en discuter ? Il y a apparemment
-        un probl�me avec les piles &agrave; taille dynamique sur les threads linux [*]
-
-Patches disponibles sur : http://www.cs.duke.edu/~gallatin/linux_sa_siginfo/diff
-
-[*]Le "probl�me" est l'heuristique utilis� par vm_map_growstack() afin de
-d�terminer la part de la pile dans le processus principale. Nous
-utilisons actuellement :
-
-        is_procstack = addr >= (vm_offset_t)vm->vm_maxsaddr;
-
-o� vm->vm_maxsaddr provient de exec_new_vmspace():
-        vmspace->vm_maxsaddr = (char *)USRSTACK - MAXSSIZ;
-
-Le thread principal du JDK de IBM r�duit sa taille de pile &agrave; rlim_cur=2040*1024.
-Il cr�� alors des piles pour ses threads &agrave; des adresses sup�rieures
-&agrave; vm_maxsaddr mais inf�rieures &agrave; la limite basse courante de la pile du processus
-principal d�fini par p->p_rlimit[RLIMIT_STACK].rlim_cur. La premi�re fois
-qu'un thread acc�de &agrave; quelque chose qui recquiert une extension de cette r�gion, il part
-en vrilles.
-</pre>
-
-<p>Et le courrier �lectronique de Sean :</p>
-<pre>
-J'ai tr�s rapidement port� sur -stable le travail de Andrew Gallatin pour faire
-fonctionner le SDK Java de IBM. J'ai pu utilis� le lanceur d'applet sur une
-des d�mos et cela a fonctionn�. Je ne peux pas vraiment en dire plus.
-
-Les patches sont tous relatifs au r�pertoire /usr/src (ou / puisqu'ils sont
-tous dans sys)
-
-La majorit� des patches concernent les fichiers du r�pertoire /sys/i386/linux.
-Vous devez appliquer les patches; faire un cd sur /sys/modules/linux;
-taper make; kldunload linux; taper make install; et kldload linux
-
-Il y a une modification suppl�mentaire qui met MINSIGSTKSZ &agrave; 2048
-dans sys/sys/signal.h .. cela n�cessite une recompilation du noyau afin
-que cette modification soit prise en compte.
-</pre>
-
-<p><b>18 Juillet 2000 :</b> <a href="ernst@jollem.com">Ernst de Haan</a>
-travaillent actuellement &agrave; faire fonctionner la version Linux du JDK 1.3.0b9 de Sun
-sur 4.0-STABLE. Le fichier .java_wrapper est disponible
-<a href="http://people.FreeBSD.org/~patrick/sunjdk/java_wrapper">
-ici</a>. (N'oubliez pas de le renommer en .java_wrapper)</p>
-
-<p>Le courrier �lectronique de Ernst :</p>
-<pre>
-Juste une derni�re astuce : modifiez le fichier jre/lib/jvm.cfg et placez la derni�re
-ligne en premier. Vous aurez donc :
-
-   -classic
-   -hotspot
-   -server
-
-J'obtiens un warning, par ailleurs, avec l'application Swing :
-
-   Warning: Cannot convert string "MetaCtrl&lt;Key&gt;Insert" to type VirtualBinding
-
-Ernst
-
-
-Ernst de Haan a �crit :
-> Bonjour &agrave; tous,
->
-> Je parviens &agrave; faire fonctionner la version Linux du JDK 1.3.0 beta 9 de Sun
-> sur mon syst�me FreeBSD 4.0-STABLE. Il fonctionne par ailleurs plut�t bien.
->
-> java -version indique :
->
->    bash-2.04$ java -version
->    expr: syntax error
->    java version "1.3.0beta_refresh"
->    Java(TM) 2 Runtime Environment, Standard Edition (build 1.3.0beta_refresh-b09)
->    Classic VM (build 1.3.0beta_refresh-b09, green threads, nojit)
->
-> La premi�re ligne avec l'erreur de syntaxe est un petit probl�me li� au fichier
-> .java_wrapper mais il est &agrave; priori inoffensif. J'ai du faire quelques modifications
-> au script .java_wrapper afin de le faire fonctionner sur mon syst�me. J'ai mis en attachement
-> la version que j'utilise.
->
-> Je n'ai pas encore r�alis� beaucoup de tests mais j'ai essay� une application
-> Swing. J'ai constat� quelques diff�rences au niveau des fontes sinon tout semble
-> fonctionner plut�t bien et rapidement :)
->
-> Wow, bient�t FreeBSD sera la plate-forme avec le plus grand nombre de
-> JDKs, une fois que nous aurons un WINE fonctionnel ce qui nous permettra d'utiliser
-> �galement les JDKs Windows, et que nous aurons �crit un �mulateur
-> AS/400, et... et... ;-)
->
-> Ernst
->
-> P.S.  Merci &agrave; Victor Salaman qui m'a orient� vers la bonne direction.
->       Il fait fonctionner la version Linux du JDK 1.3 de Sun depuis quelque temps d�j&agrave;.
-</pre>
-
-<p><b>29 Janvier 2000 :</b> Le port du JDK 1.3 n'a pas commenc�.
-Il ne d�butera pas avant que celui du JDK 1.2 ne soit achev�.</p>
-
-</body>
-</html>
diff --git a/fr_FR.ISO8859-1/htdocs/java/dists/14.sgml b/fr_FR.ISO8859-1/htdocs/java/dists/14.sgml
deleted file mode 100644
index 2a50490fb6..0000000000
--- a/fr_FR.ISO8859-1/htdocs/java/dists/14.sgml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "Projet &java; pour FreeBSD : &jdk; 1.4">
-]>
-
-<!--
-   The FreeBSD French Documentation Project
-   Original revision: 1.10
-
-   Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
-   Version francaise (mise a jour) : Stephane Legrand <stephane@freebsd-fr.org>
-   Version francaise (mise a jour) : Vincent Tougait <viny@scientiae.net>
-   Version francaise (mise a jour) : Antoine Brodin <antoine.brodin@laposte.net>
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-
-<table border="0">
-      <tr>
-	<td>
-
-<p>
-<b>13 D�cembre 2004 :</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> a sorti le septi�me jeu de patches (patch niveau 7) pour le
-&jdk;&nbsp;1.4. Ce jeu de patches comprend plusieurs corrections de probl�mes,
-dont des corrections de failles critiques de s�curit� recemment
-d�couvertes dans le plugin navigateur.
-Pour savoir comment t�l�charger ces patches,
-consultez la page
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>.
-</p>
-
-<p>
-<b>30 D�cembre 2003:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> a sorti le sixi�me jeu de patches (patch niveau 6) pour le &jdk;&nbsp;1.4.
-Cette nouvelle version devrait convenir &agrave; la plupart des applications. Le &jdk; produit
-est conforme de fait, mais l'utilisation dans un environnement de production reste &agrave;
-vos risques et p�rils. Ce jeu de patches est principalement une correction de la version 1.4.2p5.
-Pour savoir comment t�l�charger ces patches,
-consultez la page
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>.
-</p>
-
-<p>
-<b>11 Novembre 2003:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> a sorti le cinqui�me jeu de patches (patch niveau 5) pour le &jdk;&nbsp;1.4
-. Cette version met &agrave; jour le &jdk; 1.4.2.  Gr�ce &agrave;
-un travail acharn� de<a href="mailto:phantom@FreeBSD.org">Alexey Zelkin</a>
-cette version passe tous les tests de compatibilit� de Sun sauf dans un environnement mixte IPv4 et
-IPv6. Pour savoir comment t�l�charger ces patches, consultez la page
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>.
-</p>
-
-<p>
-<b>10 Octobre 2003 :</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> a sorti le quatri�me jeu de patches (patch niveau 4) pour le
-&jdk; 1.4. Le code convient maintenant &agrave; toutes les applications, bien qu'il
-contienne encore quelques probl�mes. Le support du plugin pour les navigateurs fonctionne, GCC 3.3
-est support� et de nombreuses corrections ont �t� incluses. Ces patches sont le
-r�sultat du travail acharn� de l'�quipe de portage de Java sous BSD et d'un soutien
-continu de la Fondation FreeBSD. Pour savoir comment t�l�charger ces patches,
-consultez la page
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>.
-</p>
-
-<p>
-<b>7 Mars 2003 :</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> a sorti le troisi�me jeu de patches (patch niveau 3) pour le
-&jdk; 1.4. Le code est maintenant pr�t &agrave; �tre vraiment test�, bien que toutes les
-fonctions ne sont pas encore impl�ment�es (ex. plugin, NIO). Ces patches sont le
-r�sultat du travail acharn� de <a href="mailto:phantom@FreeBSD.org">Alexey
-Zelkin</a>. Pour savoir comment t�l�charger ces patches, consultez la page
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>.
-</p>
-
-<p>
-<b>4 F�vrier 2003 :</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> a sorti le second jeu de patches (patch niveau 2) pour le
-&jdk;&nbsp;1.4. Gardez &agrave; l'esprit que ces patches sont toujours destin�s aux testeurs
-exp�riment�s et aux d�veloppeurs. Ces patches sont bas�s sur le &jdk;&nbsp;1.4.1 et sont le
-r�sultat du travail acharn� de <a href="mailto:phantom@FreeBSD.org">Alexey
-Zelkin</a>. Pour savoir comment t�l�charger ces patches, consultez la page
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>.
-</p>
-
-<p>
-<b>15 Novembre 2002 :</b> <a href="mailto:glewis@FreeBSD.org">Greg
-Lewis</a> a sorti un premier jeu de patches (patch niveau 1) pour le
-&jdk;&nbsp;1.4.0. Gardez &agrave; l'esprit qu'il s'agit d'un tout premier jeu de patches, il est donc surtout
-destin� aux d�veloppeurs. Les patches sont disponibles &agrave; l'adresse <a href=
-"http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>
-</p>
-
-</td>
-</tr>
-</table>
-</body></html>
diff --git a/fr_FR.ISO8859-1/htdocs/java/dists/Makefile b/fr_FR.ISO8859-1/htdocs/java/dists/Makefile
index afb273a7e2..f58c15d4f4 100644
--- a/fr_FR.ISO8859-1/htdocs/java/dists/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/java/dists/Makefile
@@ -10,12 +10,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS =	10.sgml
-DOCS+=	11.sgml
-DOCS+=	12.sgml
-DOCS+=	13.sgml
-DOCS+=	14.sgml
-DOCS+=	15.sgml
+DOCS=	15.sgml
 DOCS+=	index.sgml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/java/index.sgml b/fr_FR.ISO8859-1/htdocs/java/index.sgml
index 472801d02d..c977b45a9e 100644
--- a/fr_FR.ISO8859-1/htdocs/java/index.sgml
+++ b/fr_FR.ISO8859-1/htdocs/java/index.sgml
@@ -58,10 +58,6 @@
 	<ul>
 		<li><a href="install.html">Obtenir Java pour FreeBSD</a></li>
 		<li><a href="dists/">Informations sur les versions</a></li>
-		<li><a href="dists/11.html">JDK 1.1.x</a></li>
-		<li><a href="dists/12.html">JDK 1.2.x</a></li>
-		<li><a href="dists/13.html">JDK 1.3.x</a></li>
-		<li><a href="dists/14.html">JDK 1.4.x</a></li>
 		<li><a href="dists/15.html">JDK 1.5.x</a></li>
 		<li><a href="../ports/java.html">Logiciels port�s disponibles...</a></li>
 		<li><a href="howhelp.html">Comment aider ?</a></li>
diff --git a/fr_FR.ISO8859-1/htdocs/java/newsflash.sgml b/fr_FR.ISO8859-1/htdocs/java/newsflash.sgml
index 5379ef3ed2..d5500eb9ef 100644
--- a/fr_FR.ISO8859-1/htdocs/java/newsflash.sgml
+++ b/fr_FR.ISO8859-1/htdocs/java/newsflash.sgml
@@ -46,7 +46,7 @@ premier jeu de patches (patches niveau 1) pour le &jdk;&nbsp;1.5.  Consultez
 <li><b>13 D�cembre 2004 :</b>
 <br/><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> a sorti le
 septi�me jeu de patches (patches niveau 7) pour le &jdk;&nbsp;1.4.  Consultez
-<a href="dists/14.html">la page JDK 1.4.x</a> pour plus de d�tails.</li>
+la page JDK 1.4.x pour plus de d�tails.</li>
 </ul>
 
 <h2>Novembre 2004</h2>
@@ -64,11 +64,11 @@ Vous pouvez v
 <li><b>30 D�cembre 2003 :</b>
 <br/><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> a sorti le
 sixi�me jeu de patches (patches niveau 6) pour le &jdk;&nbsp;1.4.  Consultez
-<a href="dists/14.html">la page JDK 1.4.x</a> pour plus de d�tails.</li>
+la page JDK 1.4.x pour plus de d�tails.</li>
 <li><b>19 D�cembre 2003 :</b>
 <br/><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> a sorti le
 neuvi�me jeu de patches (patches niveau 9) pour le &jdk;&nbsp;1.3.1. Consultez
-<a href="dists/13.html">la page JDK 1.3.x</a> for more details.</li>
+la page JDK 1.3.x for more details.</li>
 </ul>
 
 <h2>Novembre 2003</h2>
@@ -76,7 +76,7 @@ neuvi
 <li><b>11 Novembre 2003 :</b>
 <br/><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> a sorti le
 cinqui�me jeu de patches (patches niveau 5) pour le &jdk;&nbsp;1.4.  Consultez
-<a href="dists/14.html">la page JDK 1.4.x</a> pour plus de d�tails.</li>
+la page JDK 1.4.x pour plus de d�tails.</li>
 </ul>
 
 <h2>Octobre 2003</h2>
@@ -84,7 +84,7 @@ cinqui
 <li><b>10 Octobre 2003 :</b>
 <br/><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> a sorti le
 quatri�me jeu de patches (patches niveau 4) pour le &jdk;&nbsp;1.4.  Consultez
-<a href="dists/14.html">la page JDK 1.4.x</a> pour plus de d�tails.</li>
+la page JDK 1.4.x pour plus de d�tails.</li>
 </ul>
 
 <h2>Ao�t 2003</h2>
@@ -100,7 +100,7 @@ annonce</a> le support natif du &jdk;&nbsp;1.3.1 sous FreeBSD.</li>
 <li><b>7 Mars 2003 :</b>
 <br/><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> a sorti le troisi�me ensemble
 de patches mis &agrave; jour (patches niveau 3) pour le &jdk;&nbsp;1.4. Consultez
-<a href="dists/14.html">la page JDK 1.4.x</a> pour plus de d�tails.</li>
+la page JDK 1.4.x pour plus de d�tails.</li>
 </ul>
 
 <h2>F�vrier 2003</h2>
@@ -108,11 +108,11 @@ de patches mis &agrave; jour (patches niveau 3) pour le &jdk;&nbsp;1.4. Consulte
 <li><b>12 F�vrier 2003 :</b>
 <br/><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> a sorti un ensemble
 de patches mis &agrave; jour (patches niveau 8) pour le &jdk;&nbsp;1.3.1. Consultez
-<a href="dists/13.html">la page JDK 1.3.x</a> pour plus de d�tails.</li>
+la page JDK 1.3.x pour plus de d�tails.</li>
 <li><b>4 F�vrier 2003 :</b>
 <br/><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> a sorti le second ensemble
 de patches mis &agrave; jour (patches niveau 2) pour le &jdk;&nbsp;1.4. Consultez
-<a href="dists/14.html">la page JDK 1.4.x</a> pour plus de d�tails.</li>
+la page JDK 1.4.x pour plus de d�tails.</li>
 </ul>
 
 <h2>Novembre 2002</h2>
@@ -120,7 +120,7 @@ de patches mis &agrave; jour (patches niveau 2) pour le &jdk;&nbsp;1.4. Consulte
 <li><b>15 Novembre 2002 :</b>
 <br/><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> a sorti un premier ensemble
 de patches mis &agrave; jour (patches niveau 1) pour le &jdk;&nbsp;1.4.0. Consultez
-<a href="dists/14.html">la page JDK 1.4.x</a> pour plus de d�tails.</li>
+la page JDK 1.4.x pour plus de d�tails.</li>
 </ul>
 
 <h2>Septembre 2002</h2>
@@ -128,7 +128,7 @@ de patches mis &agrave; jour (patches niveau 1) pour le &jdk;&nbsp;1.4.0. Consul
 <li><b>18 Septembre 2002 :</b>
 <br/><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> a sorti un ensemble
 de patches mis &agrave; jour (patches niveau 11) pour le &jdk;&nbsp;1.2.2. Consultez
-<a href="dists/12.html">la page JDK 1.2.x</a> pour plus de d�tails.</li>
+la page JDK 1.2.x pour plus de d�tails.</li>
 <li><b>17 Septembre 2002 :</b>
 <br/>Juste apr�s que Sun e�t sorti J2SE 1.4.1 FCS, la version Linux a
 �t� rendue disponible dans le syst�me de ports FreeBSD. Consultez
@@ -141,7 +141,7 @@ d
 <li><b>26 Juillet 2002 :</b>
 <br/><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> a sorti un ensemble
 de patches mis &agrave; jour (patches niveau 7) pour le &jdk;&nbsp;1.3.1. Consultez
-<a href="dists/13.html">la page JDK 1.3.x</a> pour plus de d�tails.</li>
+la page JDK 1.3.x pour plus de d�tails.</li>
 </ul>
 
 <h2>F�vrier 2002</h2>
@@ -149,7 +149,7 @@ de patches mis &agrave; jour (patches niveau 7) pour le &jdk;&nbsp;1.3.1. Consul
 <li><b>13 F�vrier 2002 :</b>
 <br/><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> a sorti un ensemble
 de patches mis &agrave; jour (patches niveau 6) pour le &jdk;&nbsp;1.3.1. Consultez
-<a href="dists/13.html">la page JDK 1.3.x</a> pour plus de d�tails.</li>
+la page JDK 1.3.x pour plus de d�tails.</li>
 </ul>
 
 <h2>D�cembre 2001</h2>
@@ -190,7 +190,7 @@ Vous pouvez trouver le texte complet de l'annonce
 <li><b>16 Octobre 2001 :</b>
 <br/><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> a sorti un ensemble
 de patches mis &agrave; jour (patches niveau 5) pour le &jdk;&nbsp;1.3.1. Consultez
-<a href="dists/13.html">la page JDK 1.3.x</a> pour plus de d�tails.</li>
+la page JDK 1.3.x pour plus de d�tails.</li>
 </ul>
 
 <h2>Septembre 2001</h2>
@@ -198,7 +198,7 @@ de patches mis &agrave; jour (patches niveau 5) pour le &jdk;&nbsp;1.3.1. Consul
 <li><b>10 Septembre 2001 :</b>
 <br/><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> a sorti un ensemble
 de patches mis &agrave; jour (patches niveau 4) pour le &jdk;&nbsp;1.3.1. Consultez
-<a href="dists/13.html">la page JDK 1.3.x</a> pour plus de d�tails.</li>
+la page JDK 1.3.x pour plus de d�tails.</li>
 
 <li><b>6 Septembre 2001 :</b>
 <br/><a href="mailto:sobomax@FreeBSD.org">Maxim Sobolev</a> a cr�� un
@@ -215,7 +215,7 @@ r
 <li><b>27 Ao�t 2001 :</b>
 <br/><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a> a sorti un
 port pour le tant attendu &jdk;&nbsp;1.3.1. Il peut maintenant �tre install� directement depuis
-le r�pertoire ports/java/jdk13. Consultez la page <a href="dists/13.html">JDK 1.3.x</a>
+le r�pertoire ports/java/jdk13. Consultez la page JDK 1.3.x
 pour plus de d�tails.
 
 <p>A noter que cette version est uniquement &agrave; l'intention des d�veloppeurs et qu'il
@@ -227,7 +227,7 @@ n'est pas recommand
 <li><b>14 Octobre 2000 :</b>
 <br/><a href="mailto:sobomax@FreeBSD.org">Maxim Sobolev</a> a cr�� un
 port du &jdk;&nbsp;1.2.2. Il peut maintenant �tre install� directement depuis le r�pertoire
-ports/java/jdk12-beta. Consultez la page <a href="dists/12.html">JDK 1.2.x</a> pour plus de d�tails.
+ports/java/jdk12-beta. Consultez la page JDK 1.2.x pour plus de d�tails.
 <p>Tous les probl�mes indiqu�s ci-dessous sont cependant toujours d'actualit�.</p>
 <p>Donc si vous avez un port de Java2 qui dort sur votre disque dur, c'est votre chance.</p></li>
 </ul>
@@ -240,7 +240,7 @@ ports/java/jdk12-beta. Consultez la page <a href="dists/12.html">JDK 1.2.x</a> p
 des patches pour pouvoir utiliser le &jdk;&nbsp;1.3 de IBM sur FreeBSD.
 <br/><a href="mailto:ernst@jollem.com">Ernst de Haan</a> a r�ussi &agrave; faire
 fonctionner le &jdk;&nbsp;1.3.0b9 de Sun version Linux sur FreeBSD 4.0-STABLE.
-<p>Tous les d�tails sont <a href="dists/13.html">sur cette page</a>.</p></li>
+<p>Tous les d�tails sont sur cette page.</p></li>
 </ul>
 <h2>Ao�t 2000</h2>
 <ul>
diff --git a/fr_FR.ISO8859-1/htdocs/kse/Makefile b/fr_FR.ISO8859-1/htdocs/kse/Makefile
deleted file mode 100644
index 585e6fe8a6..0000000000
--- a/fr_FR.ISO8859-1/htdocs/kse/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-# The FreeBSD French Documentation Project
-# Original revision: 1.1
-
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
-.endif
-.if exists(../Makefile.inc)
-.include "../Makefile.inc"
-.endif
-
-DOCS=   index.sgml
-
-.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/kse/index.sgml b/fr_FR.ISO8859-1/htdocs/kse/index.sgml
deleted file mode 100644
index 1f9ab5a320..0000000000
--- a/fr_FR.ISO8859-1/htdocs/kse/index.sgml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "Projet KSE">
-<!ENTITY email 'mini'>
-
-<!-- Status levels -->
-<!ENTITY status.done "<font xmlns='http://www.w3.org/1999/xhtml' color='green'>Fait</font>">
-<!ENTITY status.wip "<font xmlns='http://www.w3.org/1999/xhtml' color='blue'>En progr�s</font>">
-<!ENTITY status.stalled "<font xmlns='http://www.w3.org/1999/xhtml' color='purple'>En attente</font>">
-<!ENTITY status.new "<font xmlns='http://www.w3.org/1999/xhtml' color='red'>Pas commenc�</font>">
-<!ENTITY status.resolved "<font xmlns='http://www.w3.org/1999/xhtml' color='green'>R�solu</font>">
-<!ENTITY status.unresolved "<font xmlns='http://www.w3.org/1999/xhtml' color='red'>Non r�solu</font>">
-
-<!-- The list of contributors was moved to a separate file so that it can
-  be used by other documents in the FreeBSD web site. -->
-
-
-]>
-
-<!--
-   The FreeBSD French Documentation Project
-   Original revision: 1.17
-
-   Version francaise : Francis Bacque <opl@opltech.net>
-   Version francaise (mise a jour) : Stephane Legrand <stephane@freebsd-fr.org>
-   Version francaise (mise a jour) : Vincent Tougait <viny@scientiae.net>
-   Version francaise (mise a jour) : Antoine Brodin <antoine.brodin@laposte.net>
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-
-    <h2>Contenu</h2>
-    <ul>
-      <li><a href="#overview">Aper�u du projet</a></li>
-      <li><a href="#using">Utilisation de KSE</a></li>
-      <li><a href="#further.reading">Lectures compl�mentaires</a></li>
-      <li><a href="#status.kernel">Etat du Projet</a></li>
-    </ul>
-
-    <a id="overview" name="overview"></a>
-    <h2>Aper�u</h2>
-
-    <p>Le Kernel Scheduler Entities (KSE), est un syst�me de threading support� par
-	  le noyau, au design similaire &agrave; celui du Scheduler Activations [Anderson, et. al.].
-	  Il �tablit un �quilibre entre les mod�les de threading de niveau utilisateur (1:N) et de
-	  niveau noyau (1:1), apportant la plupart des avantages des deux et
-     peu d'inconv�nients de chacun.</p>
-
-    <p>Le projet se compose de deux moiti�s : le support noyau et le support utilisateur.
-	  Le support noyau consiste en modifications du scheduler FreeBSD; L'autre moiti� est
-	  une impl�mentation des threads &posix; qui tire avantage des facilit�s suppl�mentaires
-	  que procure le noyau.</p>
-
-    <p>Le but est de remplacer l'actuel syst�me de threads utilisateur procur�
-	  par la libc_r, et l'option <tt>-pthread</tt> de gcc, par une nouvelle biblioth�que
-	  libpthread qui sera li�e avec l'option <tt>-lpthread</tt> de gcc.</p>
-
-    <a name="using"></a>
-    <h2>Utilisation de KSE</h2>
-
-    <p>Tout le developpement du KSE est effectu� sur la version 5.0-CURRENT.
-	Aucune option de configuration du noyau n'est requise pour compiler un
-	noyau avec les changements relatifs au KSE (ces changements sont inextricables
-	du scheduler de FreeBSD).</p>
-
-    <p>Pour utiliser KSE dans une application, vous devez lier celle-ci &agrave;
-	libpthread, ce qui est assez simple. Dans ses makefiles, remplacez
-	le param�tre de compilation <tt>-pthread</tt> ou l'option de lien
-	<tt>-lc_r</tt> par <tt>-lpthread</tt> et refaites l'�dition des liens. Vous
-  pouvez aussi utiliser <tt>/etc/libmap.conf</tt> pour associer libc_r &agrave; libpthread
-	(voir <tt>libmap.conf(5)</tt>).</p>
-
-    <a name="further.reading"></a>
-    <h2>Lectures compl�mentaires</h2>
-    <p/>
-    <ul>
-      <li><a href="http://www.aims.net.au/chris/kse/">
-       Kernel-Scheduled Entities for FreeBSD</a>, par Jason Evans.
-        (l�g�rement dat�).
-      </li>
-      <li><a href="http://www.FreeBSD.org/cgi/man.cgi?query=kse&amp;apropos=0&amp;sektion=0&amp;manpath=FreeBSD+5.0-current&amp;format=html">page de manuel KSE</a>
-      </li>
-      <li><a href="http://people.FreeBSD.org/~deischen/docs/Scheduler.pdf">
-       Scheduler Activations</a>, par Anderson, et al.
-      </li>
-    </ul>
-
-    <a name="status.kernel"></a>
-    <a name="status"></a>
-    <h2>Etat du projet</h2>
-
-    <p>Ceci est une liste incompl�te de t�ches :</p>
-
-    <table class="tblbasic">
-      <tr>
-	<th> Module </th>
-	<th> T�che </th>
-	<th> Responsable </th>
-	<th> Derni�re mise &agrave; jour </th>
-	<th> Etat </th>
-      </tr>
-
-      <tr>
-      	<td> libpthread </td>
-	<td> Ecrire la page de man kse(2) documentant les nouveaux appels syst�me. </td>
-	<td> &a.archie; </td>
-	<td> 10 Septembre 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> libpthread </td>
-	<td> Repo-copy de la biblioth�que libpthread &agrave; partir de libc_r. </td>
-	<td> responsable du cvs </td>
-	<td> 16 Septembre 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> libpthread </td>
-	<td> Utiliser KSE pour ordonnancer les processus. </td>
-	<td> &a.mini; </td>
-	<td> 30 Octobre 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> libpthread </td>
-	<td> Ordonnancer un contexte "inactif" si n�cessaire. </td>
-	<td> &a.mini; </td>
-	<td> 2 Novembre 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> libpthread </td>
-	<td> Envoyer des signaux aux threads. </td>
-	<td> &a.deischen; &a.davidxu; </td>
-	<td> 28 Juin 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> libpthread </td>
-	<td> Verrous pour le SMP. </td>
-	<td> &a.deischen; </td>
-	<td> 3 Mai 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> noyau </td>
-	<td> Verrous pour le SMP. </td>
-	<td> &a.davidxu; </td>
-	<td> 3 Mai 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> libpthread </td>
-	<td> Lancer plusieurs KSEs (un par processeur). </td>
-	<td> &a.davidxu; </td>
-	<td> 3 Mai 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-      	<td> libpthread, noyau </td>
-        <td> Impl�menter des fonctions machine-d�pendantes pour la plateforme alpha. </td>
-        <td> &a.marcel; </td>
-        <td> 30 Ao�t 2003 </td>
-        <td> &status.wip; </td>
-      </tr>
-
-      <tr>
-        <td> libpthread, noyau </td>
-        <td> Impl�menter des fonctions machine-d�pendantes pour la plateforme amd64. </td>
-        <td> &a.davidxu; &a.deischen; </td>
-		<td> 30 Ao�t 2003 </td>
-		<td> &status.done; </td>
-	  </tr>
-
-      <tr>
-        <td> libpthread, noyau </td>
-        <td> Impl�menter des fonctions machine-d�pendantes pour la plateforme i386. </td>
-        <td> &a.davidxu; &a.deischen; </td>
-		<td> 30 Ao�t 2003 </td>
-		<td> &status.done; </td>
-	  </tr>
-
-      <tr>
-        <td> libpthread, noyau </td>
-        <td> Impl�menter des fonctions machine-d�pendantes pour la plateforme ia64. </td>
-        <td> &a.marcel; </td>
-        <td> 30 Ao�t 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> libpthread, noyau </td>
-        <td> Impl�menter des fonctions machine-d�pendantes pour la plateforme sparc64. </td>
-        <td> &a.jake; </td>
-        <td> 30 Ao�t 2003 </td>
-        <td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> noyau </td>
-        <td> Impl�menter la gestion des signaux sp�cifique &agrave; KSE. </td>
-        <td> &a.davidxu; </td>
-        <td> 28 Juin 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> libpthread </td>
-        <td> Impl�menter les threads dans le domaine syst�me. </td>
-        <td> &a.deischen; </td>
-        <td> 3 Mai 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> noyau </td>
-        <td> Am�liorer la performance des threads du domaine syst�me (pas de nouveaux appels si bloqu�s). </td>
-        <td> &a.davidxu; </td>
-        <td> 30 Ao�t 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-<!--
-      <tr>
-	<td> &nbsp; </td>
-        <td>  </td>
-        <td> &nbsp; </td>
-        <td> D M 2002 </td>
-        <td> &status.new; </td>
-      </tr>
-
--->
-    </table>
-
-  </body>
-</html>
diff --git a/fr_FR.ISO8859-1/htdocs/news/1998/index.sgml b/fr_FR.ISO8859-1/htdocs/news/1998/index.sgml
index efd6e103d7..04d8e948cd 100644
--- a/fr_FR.ISO8859-1/htdocs/news/1998/index.sgml
+++ b/fr_FR.ISO8859-1/htdocs/news/1998/index.sgml
@@ -225,15 +225,6 @@
    2.2.6 que vous devez conna�tre.</p></li>
     </ul>
 
-    <h2>F�vrier 1998</h2>
-
-    <ul>
-      <li><p><b>08-F�v-98</b>
-   Une page d�taillant la <a href="&base;/y2kbug.html">conformit� de FreeBSD
-   &agrave; l'an 2000</a> est disponible &agrave; partir de la page <a
-   href="&base;/docs.html">Documentation</a>.</p></li>
-    </ul>
-
     <h2>Janvier 1998</h2>
 
     <ul>
diff --git a/fr_FR.ISO8859-1/htdocs/news/webchanges.sgml b/fr_FR.ISO8859-1/htdocs/news/webchanges.sgml
index 502d58f82c..c76e526631 100644
--- a/fr_FR.ISO8859-1/htdocs/news/webchanges.sgml
+++ b/fr_FR.ISO8859-1/htdocs/news/webchanges.sgml
@@ -285,10 +285,6 @@ Cette page liste les changements visibles pour les utilisateurs sur le serveur w
   <a href="../support.html#user">/support.html</a>
   Ajout du CFUG (Groupe d'utilisateurs d'Unix Libres du Conneticut).<br/>
 
-  <a href="../y2kbug.html">/y2kbug.html</a>
-  Ajout d'un avertissement pour ne pas modifier les dates sur des syst�mes en production afin d'effectuer les tests pour le bug de l'An 2000.
-  <p></p></li>
-
   <li><b>3-Jui-1999</b><br/>
   <a href="../index.html">/index.html</a> Un nouveau <a
   href="http://freebsd.itworks.com.au/">Miroir web FreeBSD en Chine</a><br/>
diff --git a/fr_FR.ISO8859-1/htdocs/projects/projects.sgml b/fr_FR.ISO8859-1/htdocs/projects/projects.sgml
index 5f3ed0cd0d..25a404de42 100644
--- a/fr_FR.ISO8859-1/htdocs/projects/projects.sgml
+++ b/fr_FR.ISO8859-1/htdocs/projects/projects.sgml
@@ -222,11 +222,6 @@ Journalisation contre Soft Updates : Protection asynchrone des m
 <a name="kernelandsecurity"></a>
 <h3>Noyau et s�curit�</h3>
     <ul>
-<li><a name="kse" href="../kse/index.html">Entit�s d'Ordonnancement Noyau</a>
-est un projet visant &agrave; am�liorer le support des processus l�gers sur FreeBSD
-en utilisant un syst�me &agrave; l'architecture similaire &agrave; celui propos� par
-"Scheduler Activations".</li>
-
 <li><a name="lotteryscheduling"
 href="http://www.cs.cmu.edu/~dpetrou/research.html">
 Ordonnancement du noyau par loterie</a> : Ce projet est bas� sur
@@ -243,10 +238,6 @@ les librairies accessibles depuis l'espace utilisateur, les outils, ainsi que la
 pour l'impl�mentation de l'audit de TrustedBSD qui sera int�gr� &agrave;
 FreeBSD.</li>
 
-<li><a name="SMP" href="&base;/smp/index.html">Support Multi-Processeurs Sym�trique</a>
-	Documentations et autres informations pour tirer avantage des syst�mes
-   multi-processeurs sous FreeBSD.</li>
-
 <li><a name="trustedbsd" href="http://www.TrustedBSD.org/">TrustedBSD</a>
 fournit un ensemble d'extensions �prouv�es au syst�me d'exploitation FreeBSD.
 Cela inclu notamment des fonctions comme les privil�ges que l'on peut d�finir
diff --git a/fr_FR.ISO8859-1/htdocs/search/sitemap.xml b/fr_FR.ISO8859-1/htdocs/search/sitemap.xml
index 4647304279..acc6c6167a 100644
--- a/fr_FR.ISO8859-1/htdocs/search/sitemap.xml
+++ b/fr_FR.ISO8859-1/htdocs/search/sitemap.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE sitemap PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Sitemap//EN"
         "http://www.FreeBSD.org/XML/www/share/sgml/sitemap.dtd">
+
+<!-- $FreeBSD$ -->
+
 <sitemap>
   <term>
     <text>Alpha</text>
@@ -647,21 +650,6 @@
     <destination>../internet.html</destination>
   </term>
 
-  <term>
-    <text>KSE</text>
-    <destination>&base;/kse/index.html</destination>
-  </term>
-
-  <term>
-    <text>Threads, KSE</text>
-    <destination>&base;/kse/index.html</destination>
-  </term>
-
-  <term>
-    <text>Threads POSIX</text>
-    <destination>&base;/kse/index.html</destination>
-  </term>
-
   <term>
     <text>Copyright</text>
     <destination>../copyright/license.html</destination>
@@ -912,16 +900,6 @@
     <destination>../send-pr.html</destination>
   </term>
 
-  <term>
-    <text>Multi-processeurs (SMP)</text>
-    <destination>&base;/smp/index.html</destination>
-  </term>
-
-  <term>
-    <text>SMP</text>
-    <destination>&base;/smp/index.html</destination>
-  </term>
-
   <term>
     <text>FreeBSD/sparc64</text>
     <destination>&base;/platforms/sparc.html</destination>
@@ -1017,26 +995,6 @@
     <destination>../where.html</destination>
   </term>
 
-  <term>
-    <text>y2k</text>
-    <destination>&base;/y2kbug.html</destination>
-  </term>
-
-  <term>
-    <text>Bug de l'An 2000</text>
-    <destination>&base;/y2kbug.html</destination>
-  </term>
-
-  <term>
-    <text>Bug du mill�naire</text>
-    <destination>&base;/y2kbug.html</destination>
-  </term>
-
-  <term>
-    <text>2000, bug de l'an</text>
-    <destination>&base;/y2kbug.html</destination>
-  </term>
-
   <term>
     <text>Bulletins d'informations BSD (TM)</text>
     <destination>http://www.daemonnews.org/newsletter/</destination>
@@ -1203,10 +1161,5 @@
       <text>Bibliographie</text>
       <destination>../../doc/fr_FR.ISO8859-1/books/handbook/bibliography.html</destination>
     </item>
-
-    <item>
-      <text>An 2000</text>
-      <destination>../y2kbug.html</destination>
-    </item>
   </category>
 </sitemap>
diff --git a/fr_FR.ISO8859-1/htdocs/smp/Makefile b/fr_FR.ISO8859-1/htdocs/smp/Makefile
deleted file mode 100644
index 40dc6b3529..0000000000
--- a/fr_FR.ISO8859-1/htdocs/smp/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-# The FreeBSD French Documentation Project
-# Original revision: 1.2
-
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
-.endif
-.if exists(../Makefile.inc)
-.include "../Makefile.inc"
-.endif
-
-DOCS=   index.sgml
-
-.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/smp/index.sgml b/fr_FR.ISO8859-1/htdocs/smp/index.sgml
deleted file mode 100644
index f9b14a3c5c..0000000000
--- a/fr_FR.ISO8859-1/htdocs/smp/index.sgml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "Projet FreeBSD SMPng">
-]>
-
-<!--
-  The FreeBSD French Documentation Project
-  Original revision: 1.1
-
-  Version francaise : Olivier Cherrier <Olivier.Cherrier@cediti.be>
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-
-  <p>La plus grande partie des informations relatives au projet FreeBSD SMPng
-    est disponible &agrave; l'adresse suivante :
-    <a href="http://people.freebsd.org/~jasone/smp/">http://people.freebsd.org/~jasone/smp/</a>.</p>
-
-  <p>Les informations seront d�plac�es ici dans les
-    prochaines semaines.</p>
-
-  </body>
-</html>
diff --git a/fr_FR.ISO8859-1/htdocs/y2kbug.sgml b/fr_FR.ISO8859-1/htdocs/y2kbug.sgml
deleted file mode 100644
index 28f6b5b980..0000000000
--- a/fr_FR.ISO8859-1/htdocs/y2kbug.sgml
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "Compatibilit� An 2000 (bug de l'an 2000)">
-]>
-
-<!--
-   The FreeBSD French Documentation Project
-   Original revision: 1.47
-
-   Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
-   Version francaise (mise a jour) : Nicolas Lecapitaine <Nicolas.Lecapitaine@chirec.be>
-   Version francaise (mise a jour) : Stephane Legrand <stephane@freebsd-fr.org>
-   Version francaise (mise a jour) : Antoine Brodin <antoine.brodin@laposte.net>
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.about">
-
-    <p>A mesure que les d�cideurs prennent conscience du probl�me de l'an 2000 (bug de
-      l'an 2000), de plus en plus de soci�t�s r�clament un avis
-      officiel de la part de leurs fournisseurs de mat�riels et de logiciels sur
-      le passage &agrave; l'an 2000 de leurs produits.</p>
-
-    <p>Les organisations qui utilisent des syst�mes &unix; ou tr�s proche d'Unix tel que
-      FreeBSD ne sont pas concern�es par ce probl�me. FreeBSD conservera
-      un temps correct bien apr�s le passage de l'an 2000.</p>
-
-    <h2>Informations g�n�rales</h2>
-
-    <p><i>(Cette section est bas�e sur le texte de la <a
-	  href="http://www.linux.org.uk/mbug.html">page consacr�e &agrave; la
-	  compatibilit� de Linux avec l'an 2000</a>)</i></p>
-
-    <p>Comme avec tous les syst�mes Unix et tr�s proche d'Unix, les heures et les dates dans
-      FreeBSD sont repr�sent�es de fa�on interne par le nombre de secondes �coul�es depuis le
-      1er Janvier 1970 ("l'Epoque" Unix). Actuellement, ce chiffre est
-      stock� dans un entier 32 bits, ce qui lui permet d'�tre valide jusqu'en 2038. Avant
-      cette date, nous devrions (si tout va bien) utiliser un compteur sur 64 bits (ou plus)
-      qui devrait �tre valide jusqu'&agrave; la fin de l'univers.</p>
-
-    <p>Notez bien qu'un syst�me d'exploitation compatible An 2000 ne pourra pas corriger les applications mal �crites
-      qui ne sont pas compatibles An 2000.</p>
-
-    <p>Notez aussi que le syst�me d'exploitation s'attends &agrave; lire la date et l'heure courante depuis
-      l'horloge CMOS de votre ordinateur. Certains de ces p�riph�riques ne g�rent pas
-      correctement l'an 2000. Nous vous recommandons de tester chaque plate-forme
-      individuellement pour vous assurer que l'horloge de votre mat�riel se comporte correctement
-      lorsqu'elle passe de l'ann�e 1999 &agrave; l'ann�e 2000 et qu'elle interpr�te correctement l'ann�e 2000
-      comme une ann�e bissextile.</p>
-
-    <h2>Ce que vous pouvez faire</h2>
-
-    <p>FreeBSD continuera de maintenir un temps correct lors du si�cle
-      prochain. Certaines applications tierces peuvent cependant poser probl�me. Votre meilleure
-      d�fense contre les probl�mes li�s &agrave; l'an 2000 est l'attaque. Ecouter les
-      histoires clamant la disparition prochaine du monde tel que nous le connaissons
-      <strong>n'est pas</strong> la meilleure fa�on de r�soudre le bug de l'an 2000. Attendre la
-      derni�re minute non plus. Le projet FreeBSD recommande pour votre
-      organisation d'appliquer les principes de l'administration syst�me &agrave; mesure
-      que le nouveau mill�naire approche.</p>
-
-    <h2>Avis officiel concernant FreeBSD et l'an 2000</h2>
-
-    <blockquote>
-      <p>"Apr�s des tests et des analyses approfondis, nous pensons que FreeBSD est
-	100% compatible An 2000. Dans le cas improbable o� quelque chose aurait �t�
-	oubli�, nous ferons de notre mieux pour y rem�dier dans les plus brefs d�lais."</p>
-
-      <p align="right">David Greenman<br/>Architecte principal, Projet FreeBSD</p>
-    </blockquote>
-
-    <h2>Probl�mes r�solus</h2>
-
-    <p>Les probl�mes suivants li�s &agrave; l'an 2000 ont �t� identifi�s et r�solus dans
-      FreeBSD.</p>
-
-    <dl>
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=1380">misc/1380</a></dt>
-
-      <dd>Plusieurs programmes ont un "19%d" cod� en dur pour l'ann�e.
-	Les programmes affect�s inclus : yacc, ftpd, et make. [Correction : yacc v1.2
-	18/01/1999; ftpd v1.7 05/08/1996; make v1.4 06/10/1996; corrections incluses
-	dans FreeBSD 2.2 et sup�rieur]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=1382">conf/1382</a></dt>
-
-      <dd>Le script sed dans /etc/rc.local qui construit la ligne identifiant l'h�te/noyau
-	pour le message du jour suppose que l'ann�e ne d�passe pas 1999.
-	[Correction v1.21 24/10/1996; corrections incluses dans FreeBSD 2.2 et sup�rieur]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=3465">misc/3465</a></dt>
-
-      <dd>La commande etc/namedb/make-localhost g�n�re le num�ro de s�rie DNS
-	sous la forme YYMMDD. En l'an 2000, il sera g�n�r� sous la forme
-	1YYMMDD. [Correction v1.2 11/08/1997; corrections incluses dans FreeBSD 2.2.5 et
-	sup�rieur]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=4930">gnu/4930</a> et
-	  <a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=8321">gnu/8321</a></dt>
-
-      <dd>Les macros groff tmac ont cod� en dur 19 pour la g�n�ration de certaines dates.
-	[Correction : tmac.e v1.3 06/12/1998; doc-common v1.10 19/01/1999; corrections incluses
-	dans FreeBSD 3.1 et sup�rieur]</dd>
-
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9323">bin/9323</a></dt>
-
-      <dd>Dans sa forme obsol�te, touch ne traite pas correctement les ann�es donn�es avec seulement
-        2 chiffres. Les ann�es 00 &agrave; 68 sont trait�es
-        comme 1900 &agrave; 1968 au lieu de 2000 &agrave; 2068. [Correction v1.7 05/01/1999; corrections incluses dans
-        FreeBSD 3.1 et sup�rieur]</dd>
-
-      <dt><a
-	  href="http://cvsweb.FreeBSD.org/src/usr.sbin/xntpd/parse/util/dcfd.c">xntpd/parse/util/dcfd.c</a></dt>
-
-      <dd>Le calcul du nombre de jours dans l'ann�e pour les ann�es bissextiles et la
-	conversion du temps DCF77 en secondes depuis l'Epoque �taient fausses. Ces
-	erreurs affectaient toutes les ann�es. [Correction v1.6 12/01/1999; corrections incluses dans
-	FreeBSD 3.1 et sup�rieur]</dd>
-
-      <dt><a
-	  href="http://cvsweb.FreeBSD.org/src/gnu/usr.bin/tar/getdate.y">tar/getdate.y</a></dt>
-
-      <dd>La fonction Convert() �taient cod�es en dur pour les ann�es en 2 chiffres de 70 &agrave; 99.
-	D�sormais corrig�e pour permettre les ann�es en 2 chiffres de 1970 &agrave; 2069. La fonction
-	ne permet pas les ann�es s�culaires non bissextiles - alerte pour 2100 ! [Correction v1.4
-	12/01/1999; corrections incluses dans FreeBSD 3.1 et sup�rieur]
-      </dd>
-
-      <dt><a
-	  href="http://cvsweb.FreeBSD.org/src/usr.bin/fetch/http.c">fetch/http.c</a></dt>
-
-      <dd>Le protocole HTTP inclut un format de date obsol�te qui utilise une
-	ann�e en 2 chiffres. Les versions pr�c�dentes de fetch interpr�teraient de telles
-	dates comme �tant dans les ann�es 19xx; apr�s cette r�vision, le pivot d�crit
-	dans <a href="ftp://ftp.cdrom.com/pub/internet/rfc/rfc2068.txt">RFC
-	  2068</a> est utilis�, ce qui permet aux ann�es en 2 chiffres d'�tre interpr�t�es
-	comme appartenant toujours au si�cle courant sauf si elles sont situ�es 50 ans ou
-	plus dans le futur. Comme les serveurs HTTP qui utilisent ce
-	format ne sont plus tr�s r�pandus, cela ne devrait pas avoir un
-	impact significatif. [Correction v1.24 15/01/1999; corrections incluses dans FreeBSD 3.1
-	et sup�rieur]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9500">misc/9500</a></dt>
-
-      <dd>Le script `edithook' dans le r�pertoire CVSROOT utilise un tm_year "brut"
-	et affichera par cons�quent 01/01/100 pour 2000-JAN-01. [Correction v1.2
-	17/01/1999; non applicable aux versions de FreeBSD]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9501">bin/9501</a></dt>
-
-      <dd>Plusieurs fichiers cvs ne sont pas compatibles An 2000. Les scripts log.pl et
-	sccs2rcs.csh ajoutent "19" &agrave; l'ann�e ce qui provoque l'affichage
-	de 19100 pour 2000. Le script log_accum.pl utilise &agrave; un endroit une ann�e en
-	2 chiffres et suppose &agrave; un autre endroit que le tm_year est l'ann�e dans le
-	si�cle au lieu du nombre d'ann�es depuis 1900. [Correction : log.pl v1.2 15/01/1999;
-	sccs2rcs.csh v1.3 15/01/1999; corrections incluses dans FreeBSD 3.1 et sup�rieur]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9502">bin/9502</a></dt>
-      <dd>Le num�ro de registre 'yr' de groff est assign� depuis un (struct
-	tm).tm_year et repr�sente par cons�quent le nombre d'ann�es depuis 1900
-	et non pas l'ann�e dans le si�cle (voir d�finition dans troff/input.cc).
-	[Correction, maintenant mis &agrave; modulo 100, troff/input.cc V1.2 03/06/1999; corrections
-	incluses dans FreeBSD 3.3]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9503">bin/9503</a></dt>
-
-      <dd>simple_httpd de PicoBSD utilise un tm_year "brut" et affichera par cons�quent
-	01/01/100 pour 2000-JAN-01. [Correction v1.2 16/01/1999; corrections incluses dans
-	FreeBSD 3.1 et sup�rieur]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9505">bin/9505</a></dt>
-
-      <dd>Adduser utilise un tm_year "brut" et affichera par cons�quent un 100/01/01 pour
-	2000-JAN-01. [Correction v1.42 15/01/1999; corrections incluses dans FreeBSD 3.1 et
-	sup�rieur]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9506">bin/9506</a></dt>
-
-      <dd>Cron utilise un tm_year "brut" et affichera par cons�quent 100 pour 2000.
-	[Correction v1.7 16/01/1999; corrections incluses dans FreeBSD 3.1 et sup�rieur]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9507">bin/9507</a></dt>
-
-      <dd>tcpslice(8) utilise un tm_year "brut" et affichera par cons�quent
-	100y01m01d... pour 2000-JAN-01. Pour des raisons de compatibilit�, utiliser une ann�e en 2 chiffres
-	jusqu'&agrave; l'an 2000. [Correction v1.8 20/01/1999; corrections incluses dans FreeBSD 3.1 et
-	sup�rieur]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=14472">bin/14472</a></dt>
-
-      <dd>La commande Date ne prend pas les chiffres des milliers/centaines. [Correction v1.31 10/11/1999]
-	</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=14511">misc/14511</a></dt>
-
-      <dd>Chpass pose probl�me lorsqu'on utilise 00 comme ann�e d'expiration.
-	</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=15852">bin/15852</a> et
-	  <a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=16045">gnu/16045</a> et
-	  <a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=16207">bin/16207</a>
-	  </dt>
-
-      <dd>La cha�ne pr�d�finie \*(DT [\*(td] de Groff a un bug An 2000. [Corrig� avec la mise &agrave; jour de la
-        version 1.15 12/01/2000]
-	</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=15872">bin/15872</a></dt>
-
-      <dd>at(1) pose probl�me avec des d�finitions de temps correctes si tm_year vaut 100,
-      signale un `garbled time' (temps tronqu�).
-	</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=16238">misc/16238</a></dt>
-
-      <dd>L'installation de KerberosIV ne fonctionne pas correctement &agrave; cause d'une date d'expiration
-	fix�e au 31/12/99 cod�e en dur dans la source Kerberos du 'ticket
-	granter'. [Correction v1.24 19/09/1999]
-	</dd>
-    </dl>
-
-    <h2>Plus d'informations</h2>
-
-    <p>Si vous avez des questions suppl�mentaires &agrave; propos de la compatibilit� An 2000 de FreeBSD ou
-      si vous avez d�couvert une application fonctionnant sous FreeBSD qui n'est pas compatible
-      An 2000, veuillez contacter le projet &agrave; l'adresse <a
-	href="mailto:freebsd-bugs@FreeBSD.org">freebsd-bugs@FreeBSD.org</a>.</p>
-
-  </body>
-</html>
diff --git a/hu_HU.ISO8859-2/htdocs/docs/webresources.sgml b/hu_HU.ISO8859-2/htdocs/docs/webresources.sgml
index 1225ed1acf..6836a175af 100644
--- a/hu_HU.ISO8859-2/htdocs/docs/webresources.sgml
+++ b/hu_HU.ISO8859-2/htdocs/docs/webresources.sgml
@@ -54,13 +54,6 @@
 
   <h2>Tov�bbi forr�sok</h2>
 
-  <h3><a
-      href="&enbase;/y2kbug.html">K�tezredik �v kompatibilit�s</a>
-    </h3>
-
-  <p>A &os; Projekt jelenlegi �ll�spontja a
-    k�tezredik �vi kompatibilit�sr�l.</p>
-
   <h3><a
       href="http://fxr.watson.org/">A forr�sk�d</a>
     </h3>
diff --git a/hu_HU.ISO8859-2/htdocs/projects/projects.sgml b/hu_HU.ISO8859-2/htdocs/projects/projects.sgml
index b844e785a6..c4abdf20d4 100644
--- a/hu_HU.ISO8859-2/htdocs/projects/projects.sgml
+++ b/hu_HU.ISO8859-2/htdocs/projects/projects.sgml
@@ -325,13 +325,6 @@
   <h3>Rendszermag, biztons�g</h3>
 
   <ul>
-    <li><a name="kse"
-	href="&enbase;/kse/index.html">Kernel Scheduler Entities</a>:
-      A projekt c�lja, hogy fejlessze a &os;
-      sz�lkezel�si k�pess�geit a Scheduler
-      Activations fel�p�t�s�hez
-      hasonl� modell alapj�n.</li>
-
     <li><a name="lotteryscheduling"
 	href="http://www.cs.cmu.edu/~dpetrou/research.html">Lottery Scheduling Kernel</a>:
       Ez a munka a Waldspurger-f�le
@@ -356,12 +349,6 @@
       implement�ci�j�hoz, amely k�s�bb
       majd be fognak olvasztani a &os;-be is.</li>
 
-    <li><a name="SMP"
-	href="&enbase;/smp/index.html">Szimmetrikus t�bbprocesszoros t�mogat�s</a>:
-      Dokument�ci� �s egy�b
-      inform�ci�k a t�bbprocesszoros rendszerek
-      kihaszn�l�s�hoz &os; rendszerek alatt.</li>
-
     <li><a name="trustedbsd"
 	href="http://www.TrustedBSD.org/">TrustedBSD</a>:
       Olyan kieg�sz�t�seket k�n�l a
diff --git a/hu_HU.ISO8859-2/htdocs/search/sitemap.xml b/hu_HU.ISO8859-2/htdocs/search/sitemap.xml
index 992637c339..49e66b6412 100644
--- a/hu_HU.ISO8859-2/htdocs/search/sitemap.xml
+++ b/hu_HU.ISO8859-2/htdocs/search/sitemap.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-2"?>
 <!DOCTYPE sitemap PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Sitemap//EN"
         "http://www.FreeBSD.org/XML/www/share/sgml/sitemap.dtd">
+
+<!-- $FreeBSD$ -->
+
 <sitemap>
   <term>
     <text>Alkalmaz�sok</text>
@@ -777,21 +780,6 @@
     <destination>&base;/internet.html</destination>
   </term>
 
-  <term>
-    <text>KSE</text>
-    <destination>&enbase;/kse/index.html</destination>
-  </term>
-
-  <term>
-    <text>Sz�lak, KSE</text>
-    <destination>&enbase;/kse/index.html</destination>
-  </term>
-
-  <term>
-    <text>POSIX sz�lak</text>
-    <destination>&enbase;/kse/index.html</destination>
-  </term>
-
   <term>
     <text>Kapcsolat</text>
     <destination>&base;/mailto.html</destination>
@@ -1182,16 +1170,6 @@
     <destination>&base;/send-pr.html</destination>
   </term>
 
-  <term>
-    <text>Symmetric MultiProcessing (SMP)</text>
-    <destination>&enbase;/smp/index.html</destination>
-  </term>
-
-  <term>
-    <text>SMP</text>
-    <destination>&enbase;/smp/index.html</destination>
-  </term>
-
   <term>
     <text>T�mogat�s</text>
     <destination>&base;/support.html </destination>
@@ -1227,26 +1205,6 @@
     <destination>&base;/where.html</destination>
   </term>
 
-  <term>
-    <text>y2k</text>
-    <destination>&enbase;/y2kbug.html</destination>
-  </term>
-
-  <term>
-    <text>Year 2000 bug</text>
-    <destination>&enbase;/y2kbug.html</destination>
-  </term>
-
-  <term>
-    <text>Millennium bug</text>
-    <destination>&enbase;/y2kbug.html</destination>
-  </term>
-
-  <term>
-    <text>2000, year bug</text>
-    <destination>&enbase;/y2kbug.html</destination>
-  </term>
-
   <term>
     <text>4.4BSD dokument�ci�</text>
     <destination>http://docs.freebsd.org/44doc/</destination>
@@ -1461,11 +1419,6 @@
       <text>Irodalomjegyz�k</text>
       <destination>&enbase;/doc/hu_HU.ISO8859-2/books/handbook/bibliography.html</destination>
     </item>
-
-    <item>
-      <text>Y2K</text>
-      <destination>&enbase;/y2kbug.html</destination>
-    </item>
   </category>
 
   <category name="K�z�ss�g">
diff --git a/it_IT.ISO8859-15/articles/committers-guide/article.sgml b/it_IT.ISO8859-15/articles/committers-guide/article.sgml
index b2b7754a95..a33df813b4 100644
--- a/it_IT.ISO8859-15/articles/committers-guide/article.sgml
+++ b/it_IT.ISO8859-15/articles/committers-guide/article.sgml
@@ -1524,9 +1524,7 @@ docs:Bug di Documentazione:freebsd-doc:</programlisting>
             sull'implementazione del passaggio a un sistema di threading e
             locking del kernel a grana fine.  � anche l'autore
             dell'SMPng Architecture Document.  Se stai lavorando sullo stesso
-            sistema, coordinati con John.  Puoi imparare di pi�
-            sull'SMPng Project dalla sua home page: <ulink
-              url="http://www.FreeBSD.org/smp/"></ulink></para>
+            sistema, coordinati con John.</para>
         </listitem>
       </varlistentry>
 
diff --git a/ja_JP.eucJP/books/faq/book.sgml b/ja_JP.eucJP/books/faq/book.sgml
index d51b31cb6d..f4dd290d31 100644
--- a/ja_JP.eucJP/books/faq/book.sgml
+++ b/ja_JP.eucJP/books/faq/book.sgml
@@ -629,21 +629,6 @@
         </answer>
       </qandaentry>
 
-      <qandaentry>
-        <question id="y2k">
-          <para>FreeBSD ������ 2000 ǯ����˴ؤ������Ϥɤ��ˤ���ޤ���?</para>
-        </question>
-
-        <answer>
-          <para>
-            �����ʾ���
-            <ulink url="http://www.FreeBSD.org/y2kbug.html">
-              FreeBSD Y2K �Υڡ���</ulink>
-            �ˤ���ޤ���
-          </para>
-        </answer>
-      </qandaentry>
-
       <qandaentry>
         <question id="newsgroups">
           <para>FreeBSD �Υ˥塼�����롼�פϲ�������ޤ���?</para>
diff --git a/ja_JP.eucJP/htdocs/Makefile b/ja_JP.eucJP/htdocs/Makefile
index fe660aa9b7..6b967c7106 100644
--- a/ja_JP.eucJP/htdocs/Makefile
+++ b/ja_JP.eucJP/htdocs/Makefile
@@ -27,7 +27,6 @@ DOCS+= relnotes.sgml
 DOCS+= send-pr.sgml
 DOCS+= support.sgml
 DOCS+= where.sgml
-DOCS+= y2kbug.sgml
 
 # Japanese-only file
 DOCS+= jabout.sgml
@@ -80,7 +79,6 @@ SUBDIR+= releases
 #SUBDIR+= releng
 SUBDIR+= search
 SUBDIR+= security
-SUBDIR+= smp
 SUBDIR+= snapshots
 SUBDIR+= support
 SUBDIR+= tutorials
diff --git a/ja_JP.eucJP/htdocs/docs/webresources.sgml b/ja_JP.eucJP/htdocs/docs/webresources.sgml
index f2002943bc..965f8e2633 100644
--- a/ja_JP.eucJP/htdocs/docs/webresources.sgml
+++ b/ja_JP.eucJP/htdocs/docs/webresources.sgml
@@ -46,11 +46,6 @@
 
 	    <h2>����¾�Υ꥽����</h2>
 
-	    <h3><a href="../y2kbug.html">2000 ǯŬ����</a></h3>
-
-	    <p>2000 ǯŬ�������Ф��롢
-	      FreeBSD �ץ��������Ȥθ������Ǥν꿮ɽ���Ǥ���</p>
-
 	    <h3><a href="http://fxr.watson.org/">������������</a></h3>
 
 	    <p>�����������ɤ˼������Ƥߤ����Ȥ������Τ���ˡ�������
diff --git a/ja_JP.eucJP/htdocs/internal/developer.sgml b/ja_JP.eucJP/htdocs/internal/developer.sgml
index 33b1597ce7..e43ea36517 100644
--- a/ja_JP.eucJP/htdocs/internal/developer.sgml
+++ b/ja_JP.eucJP/htdocs/internal/developer.sgml
@@ -58,7 +58,6 @@ FreeBSD Web 
   <li><a href="&base;/platforms/ia64/index.html">FreeBSD/IA-64 �ץ���������</a></li>
   <li><a href="&base;/platforms/ppc.html">FreeBSD/PPC �ץ���������</a></li>
   <li><a href="&base;/platforms/sparc.html">FreeBSD/SPARC �ץ���������</a></li>
-  <li><a href="&base;/smp/">������ SMP �ץ���������</a></li>
   <li><a href="http://www.TrustedBSD.org/">TrustedBSD �ץ���������</a></li>
   <li><a href="&base;/projects/index.html">FreeBSD ��ȯ�ץ���������</a></li>
 </ul>
diff --git a/ja_JP.eucJP/htdocs/java/dists/10.sgml b/ja_JP.eucJP/htdocs/java/dists/10.sgml
deleted file mode 100644
index cc7e4e3393..0000000000
--- a/ja_JP.eucJP/htdocs/java/dists/10.sgml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "FreeBSD Java Project: JDK 1.0 - ���ݡ����оݳ�">
-<!-- $FreeBSD$ -->
-<!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.7 -->
-]>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-
-    <table width="600" border="0">
-        <tr>
-          <td>
-            <h2>&jdk; 1.0.x</h2>
-
-            <p>���˽񤫤�Ƥ������ۤǤ������⤦ freefall.FreeBSD.org �ˤ�¸�ߤ��ޤ���
-              �⤷���ΰܿ��Ǥ����ꤷ���顢��ͳ�˻ȤäƤ������� :-)</p>
-
-<pre>
-���ʥ���
-----------
-FreeBSD �ͥ��ƥ����� JDK 1.0.2 �ΥХ��ʥ����ۤ�
-freefall.FreeBSD.org:/pub/FreeBSD/LOCAL_PORTS/jdk102.tar.gz ����
-���Ѳ�ǽ�ˤʤ�ޤ����� ���ΰܿ��Ǥˤ� java ���󥿥ץ꥿��java ����ѥ��顢
-java appletviewer ���ޤޤ�Ƥ��ޤ���
-����ϴ����˥��ݡ����оݳ��ȤʤäƤ������ۤǤ���
-
-���󥹥ȡ���
-------------
-1. freefall.FreeBSD.org:/pub/FreeBSD/LOCAL_PORTS/jdk102.tar.gz �����ꤷ�ޤ���
-2. �ǥ��쥯�ȥ������������� FreeBSD �Ǥ����ۤ� tar ��ȤäƤ�����Ÿ�����ޤ���
-3. pdksh port �򥤥󥹥ȡ��뤷�ޤ���
-
-JDK �μ¹�
-----------
-JDK �Υǥ��쥯�ȥ�κǾ�̤� &lt;jdk&gt; �Ǥ���ʤ顢
-���Τ褦�����ꤹ��ɬ�פ�����ޤ���
-  1. &lt;jdk&gt;/bin �ǥ��쥯�ȥ꤬ path �˴ޤޤ��褦�ˤ��ޤ���
-  2. CLASSPATH �Ķ��ѿ��� .:&lt;jdk&gt;/classes �����ꤷ�ޤ���
-  3. LD_LIBRARY_PATH �Ķ��ѿ��� &lt;jdk&gt;/lib/i386 ���ޤޤ��褦�ˤ��ޤ���
-java �ץ������򥳥�ѥ��뤹��ˤ� 'javac program.java' ��¹Ԥ��ޤ���
-����ѥ��뤷���ץ�������¹Ԥ���ˤϡ�'java &lt;name of main class&gt;'
-�Ȥ��Ƥ���������
-
-�ɤ��������Ȥ��β���
-----------------------
-Q: Motif ��ɬ�פǤ���?
-A: ��������
-
-Q: �ɤΥС������� FreeBSD ��ư���ΤǤ���?
-A: �錄���Ϻǿ��� FreeBSD (the current version of FreeBSD) ��ȤäƤ��ޤ��Τǡ�
-   ư����ǧ�Ǥ����ΤϤ�������Ȥ������Ȥˤʤ�ޤ���
-   /* "����� FreeBSD-current �Τ��ȤǤ��礦��?"
-                               - ��ʸ�����ԤǤϤʤ� Dave Hummel �ˤ���յ� */
-
-Q: �錄���Υޥ���Ǥ�ư���ޤ��� �ɤ�������ɤ��ΤǤ��礦��?
-A: ��ǰ�Ǥ��������������ä��ȻפäƤ���������
-   ����ϴ����˥��ݡ����оݳ��ȤʤäƤ������ۤǤ���</pre>
-          </td>
-        </tr>
-    </table>
-  </body>
-</html>
diff --git a/ja_JP.eucJP/htdocs/java/dists/11.sgml b/ja_JP.eucJP/htdocs/java/dists/11.sgml
deleted file mode 100644
index 39a39e871d..0000000000
--- a/ja_JP.eucJP/htdocs/java/dists/11.sgml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "FreeBSD &java; Project: &jdk; 1.1">
-<!-- $FreeBSD$ -->
-<!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.11 -->
-]>
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-    <table border="0">
-        <tr>
-          <td>
-            <p>�ǿ��Ǥ� ELF (FreeBSD �С������ 3 �ޤ��� 4) �Ѥ�
-              <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/jdk1.1.8_ELF.V1999-11-9.tar.gz">jdk1.1.8_ELF.V1999-11-9.tar.gz</a> �Ǥ���
-              �ޤ����Ť� 2.2 �ϥ�꡼���Ѥˤ�
-              <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/nate/JDK1.1/jdk1.1.8_AOUT.V1999-11-9.tar.gz">jdk1.1.8_AOUT.V1099-11-9.tar.gz</a> ���뤳�Ȥ��Ǥ��ޤ���
-              ξ���Υ�꡼����ӥ�ɤ��뤿��˻Ȥä��ѥå���
-              <a href="http://www.FreeBSD.org/~patrick/patches.tar.gz">����</a>�ˤ���ޤ���
-              ����ϼºݤ� Java �����������ɤ򤪻��������ˤȤäƤΤ�ͭ�ѤǤ���</p>
-
-            <p>�ޤ�������Ǥ� JRE&trade; �Υ�꡼���⤢��ޤ���</p>
-
-            <ul>
-              <li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/nate/JDK1.1/jre1.1.8i_AOUT.V1999-11-9.tar.gz">jre1.1.8i_AOUT.V1999-11-9.tar.gz</a></li>
-              <li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/nate/JDK1.1/jre1.1.8i_ELF.V1999-11-9.tar.gz">jre1.1.8i_ELF.V1999-11-9.tar.gz</a></li>
-            </ul>
-
-            <p>�ͥåȥ����Ǥ��ᤤ�����Ȥ������ꤷ��������
-              HTTP �����ѤǤ��ʤ����ˤϡ��ʲ��Υߥ顼�����Ȥ����Ѥ��Ƥ���������</p>
-
-            <ul>
-              <li><a href="ftp://ftp.nuxi.com/pub/FreeBSD/JDK/">ftp://ftp.nuxi.com/pub/FreeBSD/JDK/</a><br/>
-                �����Υޥ���ؤΥ�������Ȥ�Ϳ���Ƥ��줿 David O'Brien
-                (obrien@NUXI.com) �˴��դ��ޤ������Τ������ǡ�
-                ���Υߥ顼�����ȤϤ��ĤǤ�ְ㤤�ʤ� (�ܿ����� JDK ��) ����ޤ���</li>
-
-              <li><a href="http://mirror.aarnet.edu.au/pub/FreeBSD/JDK/">http://mirror.aarnet.edu.au/pub/FreeBSD/JDK/</a></li>
-
-              <li><a href="ftp://mirror.aarnet.edu.au/pub/FreeBSD/JDK/">ftp://mirror.aarnet.edu.au/pub/FreeBSD/JDK/</a><br/>
-                �������ȥ�ꥢ/�˥塼�������ɤ���Τ����ѤǤ��ޤ��� ���Υߥ顼�����Ȥ�
-                ����ۤ����󶡤��Ƥ��줿 Jason Andrade (jason@dstc.edu.au) �˴��դ��ޤ���</li>
-
-              <li><a href="ftp://ftp.se.FreeBSD.org/pub/FreeBSD/JDK/">ftp://ftp.se.FreeBSD.org/pub/FreeBSD/JDK/</a><br/>
-                Johan Larsson (gozer@ludd.luth.se) �˴��դ��ޤ���</li>
-
-              <li><a href="ftp://ftp7.de.FreeBSD.org/pub/FreeBSD/JDK/">ftp://ftp7.de.FreeBSD.org/pub/FreeBSD/JDK/</a><br/>
-                <a href="http://ftp7.de.FreeBSD.org/pub/FreeBSD/JDK/">http://ftp7.de.FreeBSD.org/pub/FreeBSD/JDK/</a><br/>
-                Oliver Fromme (olli@dorifer.heim3.tu-clausthal.de) �˴��դ��ޤ���</li>
-
-              <li><a href="ftp://ftp.gwdg.de/pub/freebsd/JDK/">ftp://ftp.gwdg.de/pub/freebsd/JDK/</a><br/>
-                <a href="http://ftp.gwdg.de/pub/freebsd/JDK/">http://ftp.gwdg.de/pub/freebsd/JDK/</a><br/>
-                Eberhard Moenkeberg (emoenke@gwdg.de) �˴��դ��ޤ���</li>
-
-              <li><a href="ftp://nofinesse.lib.surrey.ac.uk/pub/FreeBSD/JDK/">ftp://nofinesse.lib.surrey.ac.uk/pub/FreeBSD/JDK/</a><br/>
-                ��Ȥ���ư�ˤʤ�褦�����ꤷ�Ƥ��줿 Jose Marques �˴��դ��ޤ���</li>
-
-              <li><a href="ftp://ftp.spline.net/pub/FreeBSD/JDK/">ftp://ftp.spline.net/pub/FreeBSD/JDK/</a><br/>
-                Alexander Tatmaniants (tat@Spline.NET) �˴��դ��ޤ���</li>
-            </ul>
-
-            <p>�����Υ�꡼���� Motif �Υ饤���󥹤�ɬ�פȤ��ޤ���
-              ����� JDK �Υ饤�֥���Х��ʥ��ѥ֥�å������ۤ��뤳�Ȥ�������Ƥ���
-              Motif �饤�֥��������ǥ���ѥ��뤷�Ƥ��뤫��Ǥ���</p>
-
-            <h3>README.FreeBSD:</h3>
-
-            <pre>
-JDK1.1.8 for FreeBSD
---------------------
-Fixed in this release:
-- Printing from the JDK should now work reliably.
-- Updated to now use the assembly version of the interpreter.  Performance
-  should be increased.
-- Better handling of signals like DIVIDE and SIGFPE which are trapped and
-  handled correctly now.
-- The ELF version should work better with AWT/Swing applications.  The
-  FreeBSD project donated a more modern copy of Motif that should avoid
-  some weird X errors that occurred previously.
-
-For best results, we suggest you run the most recent releases of FreeBSD,
-which are 2.2.8 for the a.out releases, and FreeBSD 3.2R, to take advantage
-of the fixes in those releases.
-
-If you find bug or have bug-fixes you'd like to see integrated, please send
-email to 'java-port@FreeBSD.org' so we can make future releases even better.
-
-Known Bugs/Limitations:
-------------------------------------
-The number of sockets that can be used at any one time is hard-coded ahead
-of time (at this time, it's 2000).  This is not necessarily a limitation of
-the FreeBSD kernel, but coming up with a 'dynamic' scheme is non-trivial so
-none of the developers has written the code, and and no-one else has
-provided any patches to the development team.  If this is important to you,
-we welcome any patches to provide a more 'dynamic' scheme that doesn't limit
-the number of file descriptors (sockets).
-------------------------------------
-To make a a distribution that works without X *and* with X, two binaries
-are provided. The first is linked without X, and is the standard binary.
- The second binary is linked against a static version of X, and against
-the shared X libraries.  The version used is controlled by the setting
-of the DISPLAY environment variable, which is used by X to determine
-where to send the output.
-            </pre>
-          </td>
-        </tr>
-    </table>
-  </body>
-</html>
diff --git a/ja_JP.eucJP/htdocs/java/dists/12.sgml b/ja_JP.eucJP/htdocs/java/dists/12.sgml
deleted file mode 100644
index 2c41ca91ca..0000000000
--- a/ja_JP.eucJP/htdocs/java/dists/12.sgml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "FreeBSD &java; Project: &jdk; 2 (aka JDK 1.2)">
-<!-- $FreeBSD$ -->
-<!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.19 -->
-]>
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-    <table border="0">
-        <tr>
-          <td>
-
-            <p><b>2002 ǯ 9 �� 18 ��:</b> Greg Lewis �᤬
-              &jdk;&nbsp;1.2.2 �ο������ѥå����åȤ������</p>
-
-            <p>FreeBSD �桼���ˤȤäƺǤ�ؿ��ι⤤��Τϡ�JPDA �б�������Ǥ��礦��
-              �ޤ���<a href="http://www.netbsd.org/">NetBSD</a> ��
-              <a href="http://www.openbsd.org/">OpenBSD</a> ��ξ�����б������뤿���
-              �礭���ѹ���Ԥʤ��ޤ�����</p>
-
-            <p>�����ˤ�񤤤��Ȥ��ꡢ�ѥå����åȤ�
-              <a href="http://www.eyesbeyond.com/freebsddom/java/jdk.html">http://www.eyesbeyond.com/freebsddom/java/jdk.html</a> �Ǹ�������Ƥ��ޤ���
-              FreeBSD �桼���Τߤʤ���ϡ�ports/java/jdk12 ��
-              port ��ȤäƤ���������</p>
-
-	    <p><b>2000 ǯ 10 �� 14 ��:</b> �١����ƥ����ʳ������ä�
-              Greg Lewis ��Υͥ��ƥ����� FreeBSD JDK 1.2.2 ����
-              ports �ǥ��쥯�ȥ� (ports/java/jdk12-beta) �������Ѳ�ǽ�ˤʤ�ޤ�����
-              <br/>�������Ǥ� i386 �������ƥ�����Τߤ��б��ʤΤǡ�
-              i386 ��ȤäƤ���͡� (����ʬ�Ǥ��礦) �����ͥ��ƥ����� JDK2
-              ���ۤ���
-              ����������Υ��ץꥱ�������伫��Υ����ɤǥƥ��Ȥ��뤳�Ȥ��Ǥ���褦�ˤʤ�ޤ�����
-              ���������Ĥ�ȤäƤ����Τ�����ʤ顢���� port ����ޤ��礦��
-              ����<a href="../../../doc/en_US.ISO8859-1/books/porters-handbook/index.html">port
-                �����ԤΤ���Υϥ�ɥ֥å�</a> �˽񤫤�Ƥ��ޤ���</p>
-
-            <p>���٤Ƽ�ʬ�ǹ��ۤ������ȹͤ��Ƥ���ͤϡ�
-              SCSL �����꤬����ޤ��Τǡ��ޤ�
-              <a href="http://www.eyesbeyond.com/freebsddom/java/jdk.html">http://www.eyesbeyond.com/freebsddom/java/jdk.html</a> �˹Ԥ�������������ɤ������� SCSL ��Ʊ�դ���ɬ�פ�����ޤ���
-              ����Υߥ顼������ <a href="http://java2.freebsd.methodsystems.com/java/jdk.html">http://java2.freebsd.methodsystems.com/java/jdk.html</a> �����Ѳ�ǽ�Ǥ���</p>
-            <p><b>����</b>:  ���� port �ϡ����ۤκݤˤ�������Υǥ��������ڡ��� (�� 250MB)
-              ����񤷤ޤ���</p>
-
-            <p><b>2000 ǯ 5 �� 3 ��:</b>
-              �ͥ��ƥ����� FreeBSD JDK 1.2.2 �ΰܿ�������ե��ƥ����ʳ��ˤʤ�ޤ�����
-              <br/>Greg Lewis ���ͥ��ƥ����� FreeBSD JDK 1.2.2 �ΰܿ���
-              ����ե��ƥ����ʳ������ä����Ȥ򥢥ʥ��󥹤��ޤ�����
-              <br/>�������ǡ��ܿ��� FreeBSD �ΤۤȤ�ɤΥ�꡼�� (x86 �� 3.4��4.0��
-              5.0) �ǹ��ۤȼ¹Ԥ�ξ������ǽ�ǡ�¾�Υ�꡼��(x86 �� 2.2.8 ��
-              alpha ��)�ѤϺ����Ǥ���
-              �ۤȤ�ɤΥǥ⥢�ץ�åȤȥ��ץꥱ�������ư��ޤ���
-              <br/>���ߤ錄�������Ϥ��ο����� port �Υƥ��Ȥ˻��֤�䤤�Ƥ����
-              Ǯ���ʥե����õ���Ƥ��ޤ��� ����ϴ�ñ�ʺ�ȤǤϤ���ޤ��󤬡�
-              ���ۤ� port �λ���ˡ���񤫤줿�狼��䤹�����񤬤���ޤ���
-              <br/>�����ѥå��ϰʲ��ξ��ˤ���ޤ���
-              <br/><a href="http://www.eyesbeyond.com/freebsddom/java/jdk.html">
-                http://www.eyesbeyond.com/freebsddom/java/jdk.html</a>
-              <br/>�ܺ٤丽�����Ǵ��Τ����ꡢ����ʤɤϰʲ��ξ��ˤ���ޤ���
-              <br/><a href="http://www.kjkoster.org/java/index.html">http://www.kjkoster.org/java/index.html</a></p>
-
-	    <p><b>2000 ǯ 3 �� 22 ��:</b>
-              Greg Lewis �����ͥ��ƥ��ִĶ��� FreeBSD JDK&nbsp;1.2.2
-              ���ۤ��뤿��Υץ졦����ե��ѥå��򿷤�ʪ������ Java �桼�������˥�꡼�����ޤ�����
-              ����ϳ�ȯ���������夯�ʤä����Ȥˤ���ΤǤϤ���ޤ���
-              �ޤ������ۤ��������� JDK �ϡ�����Ū�ʤ�ΤǤϤ���ޤ���
-              ��������AWT �� Swing �Υǥ�Ϥ�����ʬ�ϼ¹ԤǤ��뤳�Ȥ�Ƚ���������ȸ����Ƥ��ޤ���
-              �ޤ���뤳�ȤϤ������󤢤�ޤ��� �ƥ�������¿�����ˤ��������ȤϤ���ޤ���
-              �ѥå��ȥӥ�ɤμ����
-              <a href="http://www.eyesbeyond.com/freebsddom/java/jdk.html">
-                http://www.eyesbeyond.com/freebsddom/java/jdk.html</a>
-              �������������ɤǤ��ޤ���
-              �������Ǥδ��Τ�����ȥƥ��Ȥη�̤�
-              <a href="http://www.kjkoster.org/java/index.html">http://www.kjkoster.org/java/index.html</a>
-              �ˤ���ޤ���</p>
-
-            <p><b>2000 ǯ 1 �� 30 ��:</b>
-              Linux �� Blackdown �ܿ������ब JDK 1.2 �� RC4 ���꡼�����ޤ�����
-              ����� FreeBSD 3.4-STABLE �ܹԤǥƥ��Ȥ��줹�٤ƤΥǥ⥢�ץ�åȤ�
-              jfc �Υǥ��¹Ԥ���ޤ�����
-              Apache JServ �Ȱ��˼¹Ԥ����Ȥ���������Ŧ���Ƥ����ã�⤤�ޤ���
-              ���줬 FreeBSD �� ports �ĥ꡼���Ȥ߹��ޤ��ޤǡ������
-              <a href="http://www.jmcm.org/tech/ports/linux_jdk.html">
-                http://www.jmcm.org/tech/ports/linux_jdk.html</a>
-              �Ǹ��Ĥ����ޤ��� (Jose Marques �����)</p>
-
-            <p><b>1999 ǯ 10 �� 11 ��:</b>
-              Java2/JDK1.2 �ΰܿ����ƻ�ư���ޤ�����
-              �����˼�ˤϤ��� FreeBSD 3.3-stable/ELF
-              �Ǥ�'����ե�'��꡼���˴��Ԥ��ޤ��礦��</p>
-
-            <p>�ۤȤ�ɤξ�� JDK2 ��ȯ�ǤȤ��ơ�
-              JDK1 ��꡼���� Sun �� JDK1 �Ѥ����ۤ���
-              <a href="http://java.sun.com/products/jfc/index.html#download-swing">Swing</a>
-              ��꡼�����Ȥ��� FreeBSD �Ǽ¤��ɤ���ǽ���ޤ���</p>
-          </td>
-        </tr>
-    </table>
-  </body>
-</html>
diff --git a/ja_JP.eucJP/htdocs/java/dists/13.sgml b/ja_JP.eucJP/htdocs/java/dists/13.sgml
deleted file mode 100644
index 0f932077d3..0000000000
--- a/ja_JP.eucJP/htdocs/java/dists/13.sgml
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "FreeBSD &java; Project: &jdk; 1.3">
-<!-- $FreeBSD$ -->
-<!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.17 -->
-]>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-    <table border="0">
-        <tr>
-          <td>
-	    <p><b>2003 ǯ 12 �� 19 ��:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-	      Lewis</a> �᤬ &jdk; 1.3.1 ���եȥ����������κǿ��Υѥå����å�
-	      (�ѥå���٥� 9) �ȡ�������б����� ports/java/jdk13 port
-	      ��������ޤ������ǿ��Υѥå��ϡ����Ĥ�ɤ���
-	      <a href="http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-	      ���֤���Ƥ��ޤ���
-	      <br/>
-	      ���Υ�꡼���ˤϤ�������ν�������ɤ��ޤޤ�Ƥ��ޤ��Τǡ�
-	      �������𤹤����ˡ��ޤ����åץ��졼�ɤ��Ƥߤ�褦�ˤ��ꤤ���ޤ���</p>
-
-	    <p><b>2003 ǯ 2 �� 12 ��:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-	      Lewis</a> �᤬ &jdk; 1.3.1 ���եȥ����������κǿ��Υѥå����å�
-	      (�ѥå���٥� 8) �ȡ�������б����� ports/java/jdk13 port
-	      ��������ޤ������ǿ��Υѥå��ϡ����Ĥ�ɤ���
-	      <a href="http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-	      ���֤���Ƥ��ޤ���
-	      <br/>
-	      ���Υ�꡼���ϡ�Sun Microsystems �θߴ����ƥ��Ȥ�
-	      �Ϥ���ƹ�ʤ�����꡼���Ǥ���
-	      ��������ν�������ɤ��ޤޤ�Ƥ��ޤ��Τǡ�
-	      �������𤹤����ˡ��ޤ����åץ��졼�ɤ��Ƥߤ�褦�ˤ��ꤤ���ޤ���</p>
-
-	    <p><b>2002 ǯ 7 �� 26 ��:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-                Lewis</a> �᤬ JDK 1.3.1 ���եȥ����������κǿ��Υѥå����å�
-              (�ѥå���٥� 7) �ȡ�������б����� ports/java/jdk13 port
-              ��������ޤ������ǿ��Υѥå��ϡ����Ĥ�ɤ���
-              <a href="http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a> ���֤���Ƥ��ޤ���
-              <br/>
-              ���Υ�꡼���ˤϤ�������ν�������ɤ��ޤޤ�Ƥ��ޤ��Τǡ�
-              �������𤹤����ˡ��ޤ����åץ��졼�ɤ��Ƥߤ�褦�ˤ��ꤤ���ޤ���</p>
-
-            <p><b>2002 ǯ 2 �� 13 ��:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-                Lewis</a> �᤬ JDK 1.3.1 ���եȥ����������κǿ��Υѥå����å�
-              (�ѥå���٥� 6) �ȡ�������б����� ports/java/jdk13 port
-              ��������ޤ������ǿ��Υѥå��ϡ����Ĥ�ɤ���
-              <a href="http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a> ���֤���Ƥ��ޤ���
-              <br/>
-              ���Υ�꡼���ˤϤ�������ν�������ɤ��ޤޤ�Ƥ��ޤ��Τǡ�
-              �������𤹤����ˡ��ޤ����åץ��졼�ɤ��Ƥߤ�褦�ˤ��ꤤ���ޤ���</p>
-
-            <p><b>2001 ǯ 10 �� 16 ��:</b>
-	      <a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
-	      �� JDK 1.3.1 �����ѥå����å� (�ѥå���٥� 5) �򹹿�����
-	      ports/java/jdk13 port �򹹿����ޤ�����
-	      ���Υѥå��Ϥ��Ĥ��̤�
-	      <a href="http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-	      �ˤ���ޤ���<br/>
-	      ���Υ�꡼����¿���ΥХ��ե��å����Ȳ��ɤ�ޤ�Ǥ��ޤ���
-	      �������𤹤����˥��åץ��졼�ɤ��ƤߤƤ���������
-	    </p>
-
-	    <p>
-	      <b>2001 ǯ 9 �� 10 ��:</b>
-	      <a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
-	      �� JDK 1.3.1 �����ѥå����å� (�ѥå���٥� 5) �򹹿�����
-	      ports/java/jdk13 port �򹹿����ޤ�����
-	      ���Υѥå��Ϥ��Ĥ��̤�
-	      <a href="http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-	      �ˤ���ޤ���<br/>
-	      ���Υ�꡼����¿���ΥХ��ե��å����Ȳ��ɤ�ޤ�Ǥ��ޤ���
-	      �������𤹤����˥��åץ��졼�ɤ��ƤߤƤ���������
-	    </p>
-
-	    <p>
-	      <b>2001 ǯ 8 �� 27 ��:</b>
-	      <a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
-	      ���Ԥ�˾�ޤ�Ƥ��� JDK 1.3.1 ���եȥ������ΰܿ��Ǥ�
-	      ��꡼�����ޤ�����
-	      ports/java/jdk13 port �ǥ��쥯�ȥ꤫�鹽�ۤǤ��ޤ���
-	      �ʲ������ս񤭤�Ʊ�ͤ�Ŭ�Ѥ��졢����Ϥ��ޤ���
-	      <strong>��ȯ������</strong> �Υ�꡼���Ǥ������ʴĶ�
-	      �Ȥ��Ƥ����Ѥϴ�����ʤ��Ȥ������Ȥ����դ��Ƥ���������
-	    </p>
-
-	    <p>
-	      <b>2001 ǯ 7 �� 16 ��:</b>
-	      <a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
-	      �ϥͥ��ƥ��֤� FreeBSD JDK&nbsp;1.3.1 ���ۤ��뤳�Ȥ�
-	      ��̣����ij�ȯ�ԤΤ���˥ѥå����꡼�����ޤ�����
-	      ����� <strong>��ȯ������</strong> �Υ�꡼���Ǥ��ꡢ
-	      ���ޤ�ư��� JDK ���ۤ��뤳�Ȥ��Ǥ��ޤ���
-	      ���Υѥå��ϡ��ܿ���Ȥ�����äƤ����ͤ������줫��
-	      �Ϥ�ʤ��Ƥ⤤���褦�ˤ��뤿��Υ�꡼���Ǥ���
-	      �ѥå��ȹ�����ˡ��
-	      <a href="http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-	      �������������ɤǤ��ޤ���</p>
-
-            <p><b>2000 ǯ 9 �� 15 ��:</b>
-              <a href="mailto:gallatin@cs.duke.edu">Andrew Gallatin</a> �ᤪ���
-              <a href="mailto:sean@stat.Duke.EDU">Sean O'Connell</a>
-              �᤬ IBM �Ҥ� JDK 1.3 �˼���Ȥ�Ǥ��ޤ���
-              ����� FreeBSD ��ư�����ˤ� FreeBSD �Υ������ˡ�
-              �����Ĥ��ν����ѥå���Ŭ�Ѥ���ɬ�פ�����ޤ���
-              �����ѥå��ϡ��ƥС����������˰ʲ��ΤȤ������󶡤���Ƥ��ޤ���
-              <br/>
-              <a href="http://www.cs.duke.edu/~gallatin/linux_sa_siginfo/4.0-release.diff">
-                4.0-RELEASE</a>
-              <br/><a href="http://people.FreeBSD.org/~patrick/ibmjdk/linux.patch2">
-                4.0-STABLE</a>
-              <br/><a href="http://www.cs.duke.edu/~gallatin/linux_sa_siginfo/diff">
-                -CURRENT</a> (SMPng Ƴ����)</p>
-
-            <p>Drew ��Υ�å�����������:<br/></p>
-<pre>
-�Ĥ��� IBM jdk 1.3 ��ư����뤳�Ȥ��Ǥ��ޤ����� �ޤ���ʬ�ʥƥ��Ȥ�
-�ԤʤäƤ��ޤ��󤬡�AWT ��Ϣ�Ϥ������ư���Ƥ���褦�Ǥ���
-
-SMPng ��Ƴ����������� -current ���б������������������ѥå����åȤǤ���
-���ν����ѥå����åȤϡ��ʲ��Τ褦���ѹ���Ԥʤ��ޤ���
-
-- MINSIGSTKSZ �� 8192 ���� 2048 ���ѹ���
-- linux_rt_sendsig() ����� linux_rt_sigreturn() �������
-- linux_rt_sigreturn() �Ѥ˥桼�����ɤ� sigtramp �����ɤ������
-- linux_rt_sigreturn() �Ǥ�����ʥ��åȥ���ɥڡ����Ȥ��򤱡�
-  linux_sigaltstack �ˤ��ä��Х��������뤿���
-  linux_to_bsd_sigaltstack ����� bsd_to_linux_sigaltstack() �������
-  ����ˤ�ꡢSun �� 1.3 JDK �Ǹ���줿 "Java HotSpot(TM) Client VM warning:
-  cannot uninstall alt signal stack" �Ȥ����Զ��⽤������ޤ���
-- LINUX_MAP_GROWSDOWN mmaps �Ѥ� MAP_STACK �ե饰�� MAP_ANON ���ѹ���
-  �����ư����뤿���ɬ�פʺǸ�Υ��ƥåפǤ�����
-  linux ����åɤμ�ư��Ĺ�����å� (autogrowing linux thread stack) ��
-  ���餫������������Ƥ���ΤǤ�����VM ���� (����: guru(Ƴ�ա�ã��)���
-  �ͤΤ���) ����������ˤĤ��Ƶ������ޤ���?
-
-�����ѥå��Ϥ�����: http://www.cs.duke.edu/~gallatin/linux_sa_siginfo/diff
-
-[*]���Ρ�����פȤϡ��ᥤ��ץ������Υ����å��ˤ����ƥ����å���ʬ���ɤ�����
-vm_map_growstack() ��Ȥä��¸�Ū����ˡ��Ƚ�̤��Ƥ���Ȥ������Ǥ���
-���ߡ��錄���������Ѥ��Ƥ�����ˡ�ϰʲ��ΤȤ���Ǥ���
-
-        is_procstack = addr >= (vm_offset_t)vm->vm_maxsaddr;
-
-������ vm->vm_maxsaddr �ϡ�exec_new_vmspace() �����������ͤǤ���
-        vmspace->vm_maxsaddr = (char *)USRSTACK - MAXSSIZ;
-
-IBM �Ҥ� JDK �ˤ�����ᥤ�󥹥�åɤϡ��ޤ������å���������
-rlim_cur=2040*1024 �ޤǸ��餷�ޤ��� �����ơ����Υ���å��ѤΥ����å���
-p->p_rlimit[RLIMIT_STACK].rlim_cur ����������ᥤ��ץ�������
-�����å������꾮������vm_maxsaddr ����礭�����ɥ쥹���������ޤ���
-����åɤ������ΰ���礭�����ʤ���Фʤ�ʤ��褦�ʥ������������
-�Ԥʤä�����ư����������ʤäƤ��ޤ��ΤǤ���
-</pre>
-
-            <p>Sean ��Υ᡼�뤫��ΰ���: </p>
-<pre>
-�錄����  IBM Java SDK ��ư����� Andrew Gallatin ������̤�
-ñ�� (Quick&amp;Dirty) �� MFC ���ޤ��� (����: Merge From Current;
-����Ū�ˡ�-CURRENT ���� -STABLE �ؤΥ����ɤμ����ߤ�ؤ��ޤ�)��
-appletviewer �ǥǥ�ץ������Τ����ΰ�Ĥ�¹Ԥ��뤳�Ȥ��Ǥ���
-����Ϥ������ư��ޤ�����������ʾ�Τ��Ȥ��ɤ�ʬ����ޤ���
-
-�����ѥå��Ϥ��٤ơ�/usr/src �����Ȥ������ (���٤� sys �ˤ���Τǡ�
-/ �ȹͤ��뤳�Ȥ�Ǥ��ޤ�) �ˤʤäƤ��ޤ���
-
-�����ѥå�������ʬ�� /sys/i386/linux �ˤ���ե�������Ф����ΤǤ���
-�����ѥå���Ŭ�Ѥ��� /sys/modules/linux �˥����ȥǥ��쥯�ȥ��
-�ѹ�����make; kldunload linux; make install; kldload linux �Ƚ��
-���Ϥ��Ƥ���������
-
-�����ѥå��ˤ� sys/sys/signal.h �� MINSIGSTKSZ �� 2048 �ˤ��뽤����
-�ޤޤ�Ƥ��ޤ��� �����ͭ���ˤ���ˤϡ������ͥ�κƹ��ۤ�ɬ�פǤ���
-</pre>
-
-            <p><b>2000 ǯ 7 �� 18 ��:</b>
-              <a href="ernst@jollem.com">Ernst de Haan</a> ���
-              Sun �� Linux JDK 1.3.0b9 �� 4.0-STABLE
-              ��ư����뤳�Ȥ��������ޤ�����
-              .java_wrapper �ե������
-              <a href="http://people.FreeBSD.org/~patrick/sunjdk/java_wrapper">
-                ����</a>�ˤ�����Ƥ��ޤ�
-              (����� .java_wrapper �Ȥ���̾�����ѹ����뤳�Ȥ�˺��ʤ��Ǥ�������)��</p>
-
-            <p>Ernst ��Υ᡼�������:</p>
-<pre>
-�⤦��Ĥ����ҥ��: jre/lib/jvm.cfg ���ѹ����ơ���Ƭ�˺Ǹ�ιԤ�
-����ƤߤƤ��������� ��������ȡ��ʲ��Τ褦�ˤʤ�Ϥ��Ǥ���
-
-   -classic
-   -hotspot
-   -server
-
-��������Swing ���ץꥱ��������¹Ԥ����ɬ���ٹ�ɽ������ޤ���
-
-   Warning: Cannot convert string "MetaCtrl&lt;Key&gt;Insert" to type VirtualBinding
-
-Ernst
-
-
-Ernst de Haan wrote:
-> Hi folkz��
->
-> Sun JDK 1.3.0 for Linux �Υ١��� 9 �� FreeBSD 4.0-STABLE �����ƥ��
-> ư����뤳�Ȥ��Ǥ��ޤ����� �������ư��Ƥ���ߤ����Ǥ���
->
-> java -version �ϼ��Τ褦��ɽ������ޤ���
->
->    bash-2.04$ java -version
->    expr: syntax error
->    java version "1.3.0beta_refresh"
->    Java(TM) 2 Runtime Environment, Standard Edition (build 1.3.0beta_refresh-b09)
->    Classic VM (build 1.3.0beta_refresh-b09, green threads, nojit)
->
-> �ǽ�ιԤϡ�.java_wrapper ��ʸˡ���顼�Τ����ɽ������Ƥ����Τǡ�
-> ����ʤ�ΤǤϤ���ޤ��� �錄���� JDK ��ư����뤿��� .java_wrapper ��
-> �����Ĥ����ä���ɬ�פ�����ޤ����� ���ȤäƤ����Τ�ź�դ��Ƥ����ޤ���
->
-> �ޤ���ʬ�˥ƥ��Ȥ��Ƥ��ʤ��ΤǤ�����Swing ���ץꥱ����������
-> ��Ƥߤޤ������ե���Ȥ�����äȰ�äƤ������Ȥ�����С��ۤܤ��٤Ƥ�
-> ������ȹ�®��ư��Ƥ���ߤ����Ǥ� :)
->
-> ����FreeBSD �Ϥ����ˤ�Τ��������� JDK ��ư���ץ�åȥե������
-> �ʤ�Ǥ��礦�͡� WINE ��ư���褦�ˤʤ�С�Windows �� JDK ���ä�
-> ư���Ǥ��礦�������Ȥ� AS/400 ���ߥ�졼����񤤤ơ����줫��.... ;-)
->
->
-> Ernst
->
-> P.S�� �錄����������������Ƴ���Ƥ��줿 Victor Salaman ��˴��դ��ޤ���
->       ���������Ĺ���֡�Sun JDK 1.3 for Linux ��ȤäƤ��ޤ�����
-</pre>
-
-            <p><b>2000 ǯ 1 �� 29 ��:</b> JDK 1.3 �ΰܿ��ϻϤޤäƤ��ޤ���
-              JDK 1.2 ����꡼�����줿��ˤʤ�ޤ� JDK 1.3 �κ�ȤϻϤ���ޤ���</p>
-          </td>
-        </tr>
-    </table>
-  </body>
-</html>
diff --git a/ja_JP.eucJP/htdocs/java/dists/14.sgml b/ja_JP.eucJP/htdocs/java/dists/14.sgml
deleted file mode 100644
index 4b53b8b5a0..0000000000
--- a/ja_JP.eucJP/htdocs/java/dists/14.sgml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "FreeBSD &java; Project: &jdk; 1.4">
-<!-- $FreeBSD$ -->
-<!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.13 -->
-]>
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-
-    <table border="0">
-      <tbody>
-        <tr>
-          <td>
-	    <p/>
-	    <p><b>2005 ǯ 12 �� 19 ��:</b> <a
-	      href="mailto:glewis@FreeBSD.org">Greg Lewis</a> �᤬
-	      &jdk;&nbsp;1.4 ���եȥ�����������Ȭ�Ĥ�Υѥå����å�
-	      (�ѥå���٥� 8) ��������ޤ�����
-	      ���Υѥå����åȤǤϡ������Ĥ�ΥХ����������졢
-	      �ޤ� DragonFly ���б����ޤ�����
-	      �ѥå����åȤΥ���������ɤˤĤ��Ƥξ����
-	      <a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>
-	      �Ǹ�������Ƥ��ޤ���</p>
-
-	    <p><b>2004 ǯ 12 �� 13 ��:</b> <a
-	      href="mailto:glewis@FreeBSD.org">Greg Lewis</a> �᤬
-	      &jdk;&nbsp;1.4 ���եȥ����������μ��Ĥ�Υѥå����å�
-	      (�ѥå���٥� 7) ��������ޤ��������Υѥå����åȤǤϡ�
-	      �Ƕᡢ�֥饦���ץ饰�����ȯ�����줿����ʥ������ƥ��ȼ�����ޤࡢ
-	      �����Ĥ�ΥХ�����������Ƥ��ޤ���
-	      �ѥå����åȤΥ���������ɤˤĤ��Ƥξ����
-	      <a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>
-	      �Ǹ�������Ƥ��ޤ���</p>
-
-	    <p><b>2003 ǯ 12 �� 30 ��:</b> <a
-	      href="mailto:glewis@FreeBSD.org">Greg Lewis</a> �᤬
-	      &jdk;&nbsp;1.4 ���եȥ�����������ϻ�Ĥ�Υѥå����å�
-	      (�ѥå���٥� 6) ��������ޤ��������Υ�꡼���ϤۤȤ�ɤ�
-	      ���ץꥱ��������Ŭ�礹��Ǥ��礦�����줬�󶡤��� &jdk; ��
-	      ���¾��ɸ��˽�򤷤Ƥ��ޤ�������̳�Ķ������Ѥ���Τ�
-	      �����ޤǤ⤢�ʤ�����Ǥ�ˤ����ƹԤʤäƤ���������
-	      ���Υѥå����åȤϼ�� 1.4.2p5 ���Ф���Х������Ǥ���
-	      �ѥå����åȤΥ���������ɤˤĤ��Ƥξ����
-	      <a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>
-              �Ǹ�������Ƥ��ޤ���</p>
-
-            <p><b>2003 ǯ 11 �� 11 ��:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-                Lewis</a> �᤬ &jdk;&nbsp;1.4 ���եȥ�����������
-              �ޤĤ�Υѥå����å� (�ѥå���٥� 5) ��������ޤ�����
-              ���Υ�꡼���Ǥϡ��١����Ȥʤ� &jdk; �� 1.4.2 �˹�������Ƥ��ޤ���
-              �ޤ���<a href="mailto:phantom@FreeBSD.org">Alexey
-              Zelkin</a> ��ˤ����ϤΤ������ǡ�Sun Microsystems �θߴ����ƥ��Ȥ�
-              IPv4/IPv6 ���ߴĶ���������٤ƹ�ʤ��ޤ�����
-              �ѥå����åȤΥ���������ɤˤĤ��Ƥξ����
-              <a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>
-              �Ǹ�������Ƥ��ޤ���</p>
-
-            <p><b>2003 ǯ 10 �� 10 ��:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-                Lewis</a> �᤬ &jdk;&nbsp;1.4 ���եȥ�����������
-              �ͤĤ�Υѥå����å� (�ѥå���٥� 4) ��������ޤ�����
-              ���Υ����ɤˤϡ������Ĥ����꤬�ĤäƤϤ����ΤΡ�
-              ¿���Υ��ץꥱ�������ư��뤿��˰��ꤷ���ʼ��˻ž�äƤ��ޤ���
-              �֥饦���ץ饰����ؤ��б���GCC 3.3 �ؤ��б����Ԥ�졢
-              ��¿���ΥХ�����������Ƥ��ޤ���
-              ���Υѥå����åȤ� BSD Java �ܿ�������ο��Ϥ�
-              FreeBSD ���Ĥˤ���³Ū�ʥ��ݡ��Ȥˤ�����̤Ǥ���
-              �ѥå����åȤΥ���������ɤˤĤ��Ƥξ����
-              <a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>
-              �Ǹ�������Ƥ��ޤ���</p>
-
-            <p>
-              <b>2003 ǯ 3 �� 7 ��:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-                Lewis</a> �᤬ &jdk;&nbsp;1.4 ���եȥ�����������
-              ���Ĥ�Υѥå����å� (�ѥå���٥� 3) ��������ޤ�����
-              ���Υ����ɤϰ��̥桼��������Ȥ��Ǥ�����Τ�ΤǤ�����
-              ���٤Ƥε�ǽ (���Ȥ��Хץ饰����� NIO) ����������Ƥ���櫓�ǤϤ���ޤ���
-              ���Υѥå����åȤ�
-              <a href="mailto:phantom@FreeBSD.org">Alexey Zelkin</a>
-              ��ο��Ϥˤ�äƺ�������ޤ�����
-              �ѥå����åȤΥ���������ɤˤĤ��Ƥξ����
-              <a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>
-	    �Ǹ�������Ƥ��ޤ���</p>
-
-            <p><b>2003 ǯ 2 �� 4 ��:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-		Lewis</a> �᤬ &jdk;&nbsp;1.4 ���եȥ�����������
-	    ��Ĥ�Υѥå����å� (�ѥå���٥� 2) ��������ޤ�����
-	    ���Υѥå����åȤϷи����Ѥ����ȯ�Ԥȥƥ������оݤȤ�����ΤǤ���
-	    ���Ȥ����դ��Ƥ���������
-	    ���Υѥå����åȤ� &jdk;&nbsp;1.4.1 ��١����ˤ�����Τǡ�
-	    <a href="mailto:phantom@FreeBSD.org">Alexey Zelkin</a>
-	    ��ο����ι׸��ˤ���ΤǤ���
-	    �ѥå����åȤΥ���������ɤˤĤ��Ƥξ����
-	    <a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>
-	    �Ǹ�������Ƥ��ޤ���</p>
-
-            <p><b>2002 ǯ 11 �� 15 ��:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-                Lewis</a> �᤬ &jdk;&nbsp;1.4.0 ���եȥ����������ν���ѥå����å�
-              (�ѥå���٥� 1) ��������ޤ�����
-              ����Ϥޤ��ѥå����åȤν���ʳ��Ǥ��ꡢ(����ʬ��)
-              ��ȯ�Ԥ��оݤȤ�����ΤǤ��뤳�Ȥ����դ��Ƥ���������
-              �ѥå��� <a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a> �Ǹ�������Ƥ��ޤ���</p>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </body>
-</html>
diff --git a/ja_JP.eucJP/htdocs/java/dists/Makefile b/ja_JP.eucJP/htdocs/java/dists/Makefile
index c4ca4c9086..9cb49f3038 100644
--- a/ja_JP.eucJP/htdocs/java/dists/Makefile
+++ b/ja_JP.eucJP/htdocs/java/dists/Makefile
@@ -9,12 +9,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	10.sgml
-DOCS+=	11.sgml
-DOCS+=	12.sgml
-DOCS+=	13.sgml
-DOCS+=	14.sgml
-DOCS+=	15.sgml
+DOCS=	15.sgml
 #DOCS+=	16.sgml
 #DOCS+=	17.sgml
 DOCS+=	index.sgml
diff --git a/ja_JP.eucJP/htdocs/java/news.xml b/ja_JP.eucJP/htdocs/java/news.xml
index db9be0d85d..3d9c4ffa72 100644
--- a/ja_JP.eucJP/htdocs/java/news.xml
+++ b/ja_JP.eucJP/htdocs/java/news.xml
@@ -490,7 +490,7 @@
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
 	    ��ϡ�&jdk;&nbsp;1.4 ���꡼�������Υѥå����å��� 8 ��
 	    (patchset 8) ���꡼�����ޤ������ܤ�����
-	    <a href="dists/14.html">JDK 1.4.x �Υڡ���</a>
+	    JDK 1.4.x �Υڡ���
 	    ��������������</p>
 	</event>
       </day>
@@ -548,7 +548,7 @@
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
 	    ��ϡ�&jdk;&nbsp;1.4 ���꡼�������Υѥå����å��� 7 ��
 	    (patchset 7) ���꡼�����ޤ������ܤ�����
-	    <a href="dists/14.html">JDK 1.4.x �Υڡ���</a>
+	    JDK 1.4.x �Υڡ���
 	    ��������������</p>
 	</event>
       </day>
@@ -591,7 +591,7 @@
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
 	    ��ϡ�&jdk;&nbsp;1.4 ���꡼�������Υѥå����å��� 6 ��
 	    (patchset 6) ���꡼�����ޤ������ܤ�����
-	    <a href="dists/14.html">JDK 1.4.x �Υڡ���</a>
+	    JDK 1.4.x �Υڡ���
 	    ��������������</p>
 	</event>
       </day>
@@ -605,7 +605,7 @@
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
 	    ��ϡ�&jdk;&nbsp;1.3.1 ���եȥ����������Υѥå����å��� 9 ��
 	    (patchset 9) ���꡼�����ޤ������ܤ�����
-	    <a href="dists/13.html">JDK 1.3.x �Υڡ���</a>
+	    JDK 1.3.x �Υڡ���
 	    ��������������</p>
 	</event>
       </day>
@@ -623,7 +623,7 @@
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
 	    ��ϡ�&jdk;&nbsp;1.4 ���꡼�������Υѥå����å��� 5 ��
 	    (patchset 5) ���꡼�����ޤ������ܤ�����
-	    <a href="dists/14.html">JDK 1.4.x �Υڡ���</a>
+	    JDK 1.4.x �Υڡ���
 	    ��������������</p>
 	</event>
       </day>
@@ -641,7 +641,7 @@
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
 	    ��ϡ�&jdk;&nbsp;1.4 ���꡼�������Υѥå����å��� 4 ��
 	    (patchset 4) ���꡼�����ޤ������ܤ�����
-	    <a href="dists/14.html">JDK 1.4.x �Υڡ���</a>
+	    JDK 1.4.x �Υڡ���
 	    ��������������</p>
 	</event>
       </day>
@@ -674,7 +674,7 @@
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
 	    ��ϡ�&jdk;&nbsp;1.4 ���꡼�������Υѥå����å��� 3 ��
 	    (patchset 3) ���꡼�����ޤ������ܤ�����
-	    <a href="dists/14.html">JDK 1.4.x �Υڡ���</a>
+	    JDK 1.4.x �Υڡ���
 	    ��������������</p>
 	</event>
       </day>
@@ -693,7 +693,7 @@
 	    �� &jdk;&nbsp;1.3.1 �����Υѥå����å� (�ѥå���٥� 8) ���
 	    �꡼�����ޤ�����
 	    �ܺ٤�
-	    <a href="dists/13.html">JDK 1.3.x �ڡ���</a>
+	    JDK 1.3.x �ڡ���
 	    �򻲾Ȥ��Ƥ���������</p>
 	</event>
       </day>
@@ -708,7 +708,7 @@
 	    �� &jdk;&nbsp;1.4 ��������Ĥ�Υѥå����å� (patchset 2) ���
 	    �꡼�����ޤ�����
 	    �ܺ٤�
-	    <a href="dists/14.html">JDK 1.4.x �ڡ���</a>
+	    JDK 1.4.x �ڡ���
 	    �򻲾Ȥ��Ƥ���������</p>
 	</event>
       </day>
@@ -731,7 +731,7 @@
 	    �� &jdk;&nbsp;1.4.0  �����κǽ�Υѥå����å� (�ѥå���٥� 1) ���
 	    �꡼�����ޤ�����
 	    �ܺ٤�
-	    <a href="dists/14.html">JDK 1.4.x �ڡ���</a>
+	    JDK 1.4.x �ڡ���
 	    �򻲾Ȥ��Ƥ���������</p>
 	</event>
       </day>
@@ -749,7 +749,7 @@
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
 	    �� &jdk;&nbsp;1.2.2 �����Υѥå����å� (�ѥå���٥� 11) ���
 	    �꡼�����ޤ�����
-	    �ܺ٤� <a href="dists/12.html">JDK 1.2.x �ڡ���</a>
+	    �ܺ٤� JDK 1.2.x �ڡ���
 	    �򻲾Ȥ��Ƥ���������</p>
 	</event>
       </day>
@@ -781,7 +781,7 @@
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
 	    �� &jdk;&nbsp;1.3.1 �����Υѥå����å� (�ѥå���٥� 7) ���
 	    �꡼�����ޤ�����
-	    �ܺ٤� <a href="dists/13.html">JDK 1.3.x �ڡ���</a>
+	    �ܺ٤� JDK 1.3.x �ڡ���
 	    �򻲾Ȥ��Ƥ���������</p>
 	</event>
       </day>
@@ -799,7 +799,7 @@
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
 	    �� &jdk;&nbsp;1.3.1 �����Υѥå����å� (�ѥå���٥� 6) ���
 	    �꡼�����ޤ�����
-	    �ܺ٤� <a href="dists/13.html">JDK 1.3.x �ڡ���</a>
+	    �ܺ٤� JDK 1.3.x �ڡ���
 	    �򻲾Ȥ��Ƥ���������</p>
 	</event>
       </day>
@@ -868,7 +868,7 @@
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
 	    �� &jdk;&nbsp;1.3.1 �����Υѥå����å� (�ѥå���٥� 5) ���
 	    �꡼�����ޤ�����
-	    �ܺ٤� <a href="dists/13.html">JDK 1.3.x �ڡ���</a>
+	    �ܺ٤� JDK 1.3.x �ڡ���
 	    �򻲾Ȥ��Ƥ���������</p>
 	</event>
       </day>
@@ -886,7 +886,7 @@
 	  <p><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
 	    �� &jdk;&nbsp;1.3.1 �����Υѥå����å� (�ѥå���٥� 4) ���
 	    �꡼�����ޤ�����
-	    �ܺ٤� <a href="dists/13.html">JDK 1.3.x �ڡ���</a>
+	    �ܺ٤� JDK 1.3.x �ڡ���
 	    �򻲾Ȥ��Ƥ���������</p>
 	</event>
       </day>
@@ -925,7 +925,7 @@
 	    ���Ԥ�˾�ޤ�Ƥ��� &jdk;&nbsp;1.3.1 ���եȥ������ΰܿ���
 	    ���꡼�����ޤ�����
 	    ports/java/jdk13 port �ǥ��쥯�ȥ꤫�鹽�ۤǤ��ޤ���
-	    �ܺ٤� <a href="dists/13.html">JDK 1.3.x</a> �򻲾�
+	    �ܺ٤� JDK 1.3.x �򻲾�
 	    ���Ƥ���������</p>
 
 	  <p>
@@ -952,7 +952,7 @@
 	    &jdk;&nbsp;1.2.2 �ΰܿ��Ǥ�������ޤ�����
 	    ����ϸ��ߡ�ports �ǥ��쥯�ȥ��
 	    ports/java/jdk12-beta �ǹ��ۤ��뤳�Ȥ��Ǥ��ޤ���
-	    �ܤ����� <a href="dists/12.html">JDK 1.2.x</a> ��������������</p>
+	    �ܤ����� JDK 1.2.x ��������������</p>
 
 	  <p>���������������������Ϥޤ����٤ƻĤä��ޤޤǤ���</p>
 
@@ -978,7 +978,7 @@
 
 	  <p><a href="mailto:ernst@jollem.com">Ernst de Haan</a> ��ϡ�
 	    Sun �Ҥ� Linux &jdk;&nbsp;1.3.0.b9 �� 4.0-STABLE ���ư����뤳�Ȥ��������ޤ�����
-	    �ܺ٤ˤĤ��Ƥϡ��ɤ����<a href="dists/13.html">����</a>�˽񤫤�Ƥ��ޤ���</p>
+	    �ܺ٤ˤĤ��Ƥϡ��ɤ���⤳���˽񤫤�Ƥ��ޤ���</p>
 	</event>
       </day>
     </month>
diff --git a/ja_JP.eucJP/htdocs/projects/projects.sgml b/ja_JP.eucJP/htdocs/projects/projects.sgml
index a9ed7de56c..0d0f435497 100644
--- a/ja_JP.eucJP/htdocs/projects/projects.sgml
+++ b/ja_JP.eucJP/htdocs/projects/projects.sgml
@@ -204,11 +204,6 @@ FreeBSD 
 <a name="kernelandsecurity"></a>
 <h3>�����ͥ롢�������ƥ�</h3>
     <ul>
-      <li><a name="kse" href="&enbase;/kse/index.html">Kernel Scheduler Entities</a>:
-	�������塼�饢���ƥ��١������ (Scheduler Activation)
-        �Ȼ����߷פΥ���åɥ����ƥ����Ѥ��ơ�
-        FreeBSD �ˤ����륹��å��б��򽼼¤����뤿��Υץ��������ȡ�</li>
-
       <li><a name="lotteryscheduling"
       href="http://www.cs.cmu.edu/~dpetrou/research.html">
       �����������ͥ륹�����塼���(Lottery Scheduling Kernel)</a>:
@@ -228,9 +223,6 @@ FreeBSD 
 	�桼�����ɤΥ饤�֥�ꡢ�ġ��뤪��ӥɥ�����Ȥ��󶡤��ޤ���
 	���μ����� FreeBSD �����礵���ͽ��Ǥ���</li>
 
-      <li><a name="SMP" href="&enbase;/smp/index.html">�оη��ޥ���ץ����å����б�</a>:
-	FreeBSD �ǤΥޥ���ץ����å�������ͥ�����˴ؤ���ʸ��Ȥ���¾�ξ���</li>
-
       <li><a name="trustedbsd" href="http://www.TrustedBSD.org/">TrustedBSD</a>:
 	FreeBSD ��⿮�������ڥ졼�ƥ��󥰥����ƥ�ˤ����ĥ��ǽ�����󶡤��Ƥ��ޤ���
 	����ˤ��㤨�С�����٤����ø� (�����ѥӥ�ƥ�)��
diff --git a/ja_JP.eucJP/htdocs/search/sitemap.xml b/ja_JP.eucJP/htdocs/search/sitemap.xml
index 841ec4bb0b..ab6a46ebd9 100644
--- a/ja_JP.eucJP/htdocs/search/sitemap.xml
+++ b/ja_JP.eucJP/htdocs/search/sitemap.xml
@@ -830,21 +830,6 @@
     <destination>&enbase;/ipv6/w6d.html</destination>
   </term>
 
-  <term>
-    <text>KSE</text>
-    <destination>&enbase;/kse/index.html</destination>
-  </term>
-
-  <term>
-    <text>Threads, KSE</text>
-    <destination>&enbase;/kse/index.html</destination>
-  </term>
-
-  <term>
-    <text>POSIX threads</text>
-    <destination>&enbase;/kse/index.html</destination>
-  </term>
-
   <term>
     <text>Contact us</text>
     <destination>&base;/mailto.html</destination>
@@ -1255,16 +1240,6 @@
     <destination>&base;/send-pr.html</destination>
   </term>
 
-  <term>
-    <text>Symmetric MultiProcessing (SMP)</text>
-    <destination>&base;/smp/index.html</destination>
-  </term>
-
-  <term>
-    <text>SMP</text>
-    <destination>&base;/smp/index.html</destination>
-  </term>
-
   <term>
     <text>Support</text>
     <destination>&base;/support.html </destination>
@@ -1300,26 +1275,6 @@
     <destination>&base;/where.html</destination>
   </term>
 
-  <term>
-    <text>y2k</text>
-    <destination>&base;/y2kbug.html</destination>
-  </term>
-
-  <term>
-    <text>Year 2000 bug</text>
-    <destination>&base;/y2kbug.html</destination>
-  </term>
-
-  <term>
-    <text>Millennium bug</text>
-    <destination>&base;/y2kbug.html</destination>
-  </term>
-
-  <term>
-    <text>2000, year bug</text>
-    <destination>&base;/y2kbug.html</destination>
-  </term>
-
   <term>
     <text>4.4BSD Documents</text>
     <destination>http://docs.freebsd.org/44doc/</destination>
@@ -1539,11 +1494,6 @@
       <text>���Ϳ޽�</text>
       <destination>&enbase;/doc/en_US.ISO8859-1/books/handbook/bibliography.html</destination>
     </item>
-
-    <item>
-      <text>2000 ǯ����</text>
-      <destination>&base;/y2kbug.html</destination>
-    </item>
   </category>
 
   <category name="���ߥ�˥ƥ�">
diff --git a/ja_JP.eucJP/htdocs/smp/Makefile b/ja_JP.eucJP/htdocs/smp/Makefile
deleted file mode 100644
index cef1fc2e3a..0000000000
--- a/ja_JP.eucJP/htdocs/smp/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-# The FreeBSD Japanese Documentation Project
-# Original revision: 1.2
-
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
-.endif
-.if exists(../Makefile.inc)
-.include "../Makefile.inc"
-.endif
-
-DOCS=   index.sgml
-
-.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ja_JP.eucJP/htdocs/smp/index.sgml b/ja_JP.eucJP/htdocs/smp/index.sgml
deleted file mode 100644
index 95bdecf2b2..0000000000
--- a/ja_JP.eucJP/htdocs/smp/index.sgml
+++ /dev/null
@@ -1,2813 +0,0 @@
-<?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "FreeBSD SMPng �ץ���������">
-<!ENTITY email 'freebsd-smp'>
-
-<!-- Status levels -->
-<!ENTITY status.done "<font xmlns='http://www.w3.org/1999/xhtml' color='green'>Done</font>">
-<!ENTITY status.wip "<font xmlns='http://www.w3.org/1999/xhtml' color='blue'>In progress</font>">
-<!ENTITY status.stalled "<font xmlns='http://www.w3.org/1999/xhtml' color='purple'>Stalled</font>">
-<!ENTITY status.new "<font xmlns='http://www.w3.org/1999/xhtml' color='red'>Not Started</font>">
-<!ENTITY status.resolved "<font xmlns='http://www.w3.org/1999/xhtml' color='green'>Resolved</font>">
-<!ENTITY status.unresolved "<font xmlns='http://www.w3.org/1999/xhtml' color='red'>Unresolved</font>">
-]>
-<!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.180 -->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-
-    <h2>�ܼ�</h2>
-    <ul>
-      <li><a href="#goal">�ץ��������Ȥ���ɸ</a></li>
-      <li><a href="#status">�ץ��������Ȥξ���</a></li>
-      <li><a href="#history">�ץ��������Ȥ����</a></li>
-      <li><a href="#plan">�ץ��������ȤΥץ�� (Historical)</a></li>
-      <li><a href="#resources">���󸻤ȥ��</a></li>
-      <li><a href="#subsystems">���֥����ƥ�ȥ����å� (Historical)</a></li>
-      <li><a href="#tasks">������ (Historical)</a></li>
-      <li><a href="#issues">���������� (Historical)</a></li>
-      <li><a href="#news">�˥塼�� (Historical)</a></li>
-    </ul>
-
-    <a name="goal"></a>
-    <h2>�ץ��������Ȥ���ɸ</h2>
-
-    <p>FreeBSD ������ Symmetric Multi-Processing �ץ��������� (���Ф��� SMPng
-      �ȸƤФ�ޤ�) �ϡ�FreeBSD �����ͥ�����󲽤��������ޤ�����
-      FreeBSD �ν���ΥС������ (3.x, 4.x) �Ǥϡ�
-      �桼���ץ����������󲽤ˤ��б����Ƥ��ޤ�������
-      �����ͥ��Ʊ���˼¹ԤǤ���ץ����å��� 1 �Ĥ˸¤��Ƥ��ޤ�����
-      �����ͥ�ˤ����� "Giant lock" �Ǥϡ�
-      1 �İʾ�Υ����ͥ륹��åɤ䡢�ϥ�ɥ餬Ʊ���˼¹ԤǤ��ޤ���
-      ¿���ζ�̣������Ȥˤ�ꡢGiant-lock ���줿�����ͥ�ϡ�
-      �桼���ץ������ˤ����ơ��Ť���Ȥ��Ԥ��Ƥ����
-      (�äˡ�������󥰤䥳��ѥ����) �ˡ�
-      ñ��ץ����å��Υ����ƥ����٤�Ȥ��ʤ�®���ʤ�ޤ�����
-      �������ʤ��顢�ͥåȥ����ե����륷���ƥ�
-      I/O �ʤɤΥ����ͥ��褯�Ȥ����ץꥱ�������Ǥϡ�
-      �����ͥ���å��ζ���Τ��ᡢ���ԡ��ɤϤޤä����夬��ʤ�����
-      �夬�ä��Ȥ��Ƥ⾯���Ǥ�����
-      SMPng �ץ��������Ȥ���Ū�ϡ�Giant lock ��¿���ξ����ʥ��å���ʬ�򤷡�
-      ����򸺤餹 (SMP �Υѥե����ޥ󥹤��������) ���ȤǤ�����
-      �������ˤν��פʥ��ƥåפˤϡ���ӥ���������
-      (���٤ƤΥץ����å��ϡ����ĤǤ⥫���ͥ��Ʊ�������뤳�Ȥ��Ǥ���)
-      �˴ؤ���
-      FreeBSD �����ͥ륢�����ƥ�����ν��פʺ��߷פ�����ޤ�����
-      ����ˤϡ�������Ϥ�������åɤ�Ƴ����Ʊ���ץ�ߥƥ��֡�
-      interrupt ����åɡ�����å���-���������������������
-      ����ӥ������塼��󥰡������ơ�
-      �ȥݥ��������������������塼�뤬�ޤޤ�ޤ���</p>
-
-    <p>FreeBSD �ץ��������Ȥϡ�
-      ���륷���ƥॳ��ݡ��ͥ�Ȥˤ��������Υ��å���ά��
-      ��ȯ�����Υ����������ɤ����Ǥʤ������Ѥ���������ո����Ф�����
-      BSD/OS ��ȯ�ԥ�����ι׸��˴��դ��ޤ���
-      �����ޤǤ�ʤ������Υץ��������Ȥν���Υ����åդ���ӥ꥽�����ˤ����Ƥ�
-      BSDI �ι׸�������ޤ�����
-      �ޤ������פʥ��ݥ󥵡��Ǥ��� Yahoo!, Isilon, the FreeBSD Foundation
-      ���Ф��Ƥⴶ�դ��ޤ���</p>
-
-    <a name="status"></a>
-    <h2>�ץ��������Ȥξ���</h2>
-
-    <p>�ޤ� FreeBSD �����ͥ�ΰ����Υ��������
-      (�äˡ��ܤˤĤ��ʤ��ǥХ����ɥ饤�С��ե����륷���ƥ�)
-      �� Giant ��ɬ�פȤ��Ƥ��ޤ�����
-      �����ͥ��¿���ξ��Ǥ� Giant lock ��ɬ�פȤ������ޤ�
-      Giant lock �ȤȤ�˼¹Ԥ���ޤ���
-      FreeBSD 6.0 �Ǥϡ�
-      �����ͥ�ΤۤȤ�ɤν��פ���ʬ�ǥ����ͥ�����󲽽����˰ܹԤǤ������ᡢ
-      SMPng �ץ��������Ȥ� "��λ����" �ȹͤ��Ƥ��ޤ���
-      ���Υ����֥ڡ����ϡ��ۤȤ�ɤ����Ū�ʤ�Τǡ�
-      �������ꥹ�Ȥʤɤι��ܤξ��֤����ʤ�Τˤ���褦�ʹ����Ϥ���ޤ���</p>
-
-    <a name="history"></a>
-    <h2>�ץ��������Ȥ����</h2>
-
-    <p>SMPng �ϡ�2003 ǯ 1 ��� 5.0-RELEASE �ˤ����ƥǥӥ塼���ޤ�����
-      ����ϡ���¿���γ����ι׸��ԡ�FreeBSD ��ȯ�ԥ�����ˤ��
-      5 ǯ�ʾ�η�³������ȯ�����̤Ǥ���
-      5.0 ����ϡ������Ϥۤ����Ϥ��ޤ�����5.0 ��꡼���ˤ����ơ�
-      SMPng ���ݡ��Ȥ�ɬ�פʴ���Ū�ʵ�����ʬ���ѹ�����λ���ޤ�����
-      �����Ǥϡ������������ͥ����Υ�����������Ʊ���롼����ithreads �ؤΰܹԡ�
-      �ץ������������塼��� IPC �ζ��̥ե����फ��� Giant lock �κ�����Ԥ��ޤ�����
-      5.0 ����ϡ���������ˡ�ˤ�äơ��������ƥ����㤬��������ޤ�����
-      Ʊ�����ץ������κ�Ŭ�����絬�Ϥʥ����ƥ� (32 �ץ����å�����åɤޤ�)
-      �ˤ�������경�ȥѥե����ޥ󥹻��
-      Virtual Memory (VM), Virtual File System (VFS), UNIX File System (UFS) ��
-      �ͥåȥ�������å���¿���ξ��
-      (IPv4, IPV6, FAST_IPSEC, UNIX �ɥᥤ�󥽥��åȤ���� NetGraph) ��
-      ���󥿡��ץ��������ߥ�˥��������ץ�ߥƥ��֤Ȥ��ä���
-      ���ڥ졼�ƥ��󥰥����ƥ�ν��פʾ�꤫��� Giant �κ�����Ԥ��ޤ�����
-      SMP �������������ͥ륹��֥����������ϡ����ߤǤϤۤܰ���Ū�ˤʤꡢ
-      �����ơ������ϡ�"ư���褦�ˤ���" ���� "��Ŭ����Ԥ�" �ؤ��Ѥ��ޤ�����
-      KSE 1:1 �� M:N ����åɤˤ�����Ʊ���¹Ԥϡ����ץꥱ���������Ф���
-      �����������ͥ�ˤ��������󲽤Υ��ɥХ�ơ������󶡤��ޤ���
-      FreeBSD 5.3 �����ͥ�ϡ�
-      �ͥåȥ�������å��˴�Ϣ����ۤȤ�ɤΥ����ɥѥ��ˤ����ơ�
-      Giant ���Ѥ��ʤ��ͥåȥ�������å���Ƴ������
-      FreeBSD 6.0 �����ͥ�Ǥϡ��ѥե����ޥ󥹤κ�Ŭ�������礷��
-      Ʊ�ͤ� MPSAFE VFS ��Ƴ������ޤ�����</p>
-
-    <p>6.x �֥����ˤ����� SMPng �η�³Ū�ʳ�ȯ�Ǥϡ�
-      NFS ��ͥåȥ�������å�����ݡ��ͥ�Ȥʤɤ��ޤ�Ȥ��ʤ��褦�ʾ��˻Ĥ���Ƥ���
-      Giant �򳰤��Ȥ��� "�Ż��Τ��Ĥ�" ��Ԥ��Ƥ��ޤ���</p>
-
-    <p>SMPng ���̤��ƽ��פʾ����ϡ�
-      SMPng �������ƥ�����ι��ۤȲ��ɤˤ��ѥե����ޥ󥹤�¬��Ⱥ�Ŭ���Ǥ�����
-      kernel trace facility (KTR),
-      hardware performance monitor counters (hwpmc), lock profiling��
-      �����ƥ����˥���󥰥ץ쥤�β��ɤʤɤε�ǽ��Ƴ���Ͻ��פ�����̤����ޤ�����
-      ����¾�ν��פʥǥХå���ƥ��ȵ����ϡ�WITNESS��
-      �¹Ի��Υ����ͥ���å��ν���θ��ڡ������Ȥ�����å������������
-      �����Ƽ¹Ի����������λ�ʤɤǤ���</p>
-
-    <a name="plan"></a>
-    <h2>�ץ��������ȤΥץ�� (Historical)</h2>
-
-    <p>�ܥ����֥ڡ����ϡ�SMPng �����̤˴�Ϣ��������ޤ�Ǥ��ޤ���
-      ���κ�Ȥ�������ϰϤȵ�®�ʳ�ȯ�Τ��ᡢ
-      �����Ǥϡ��Ԥ�줿���Ȥΰ����Τߤ����Ȥ館�Ƥ��ޤ���
-      fine-grained ���å��˰ܹԤ���Ȥ��� SMPng �ץ��������ȤΥ١����ϴ�λ�����Τǡ�
-      �����Ǥξ���ϤۤȤ�����Ū�ʤ�ΤǤ���
-      ���å�����ӥޥ���ץ����å��Υѥե����ޥ󥹤˴ؤ��븽�ߤκ�Ȥ�ȿ�Ǥ��Ƥ��ޤ���</p>
-
-    <p>�ʲ��Υ������ꥹ�Ȥϡ������ʤ�Τ��ܻؤ�����ΤǤϤ���ޤ���
-      ���ΤλŻ��˴�Ϣ��������פ����Ǥ�ޤȤ᤿��ΤǤ���
-      "Responsible" �ե�����ɤϡ�
-      ���Υ�������ã������Τ���Ǥ����������Ȥ����ջפ򼨤�����ȯ�Ԥ򵭺ܤ�����ΤǤ��ꡢ
-      ���Υ�������¾�Υ��С����Ԥ����Ȥ���������ΤǤϤ���ޤ���
-      ���Υե�����ɤϡ�ô�����롼�פȤ�Ĵ����Ԥ����Ȥǡ�
-      ɬ�פΤʤ���ʣ������Ȥ��򤱡�����¤˳�ȯ���ʤळ�Ȥ��Ǥ���褦�ˤ��뤳�Ȥ�տޤ��Ƥ��ޤ���
-      �⤷���������ΰ�κ�Ȥ����ʤ��礭���ä��ꡢ
-      �ޤ��������Ƥ��ʤ��褦�Ǥ���С���������ο�Ÿ���ʤ����ɤ�����
-      FreeBSD SMP �᡼��󥰥ꥹ�Ȥإ᡼�������������ͤ�����ޤ���</p>
-
-    <p>���եե�����ɤλ��İ�̣�ϡ��������Υ��ơ������˰�¸���ޤ���
-      ��λ�����������ˤĤ��Ƥϡ����Υ���������λ��������
-      �ޤ��ϴ�λ����𤵤줿���Ǥ���
-      ���߿ʹ���Υ������˴ؤ��Ƥϡ�����ȥ��Ǹ�˥��åץǡ��Ȥ������դ�ɽ���ޤ���
-      ��ߤ����������ˤĤ��Ƥϡ�����������ߤ������Ȥ������������
-      �������������ˤĤ��Ƥϡ����������������ɲä��줿�����̣���ޤ���</p>
-
-    <p>�ġ��ΥǥХ����ɥ饤�ФΥ��å��ξ����ˤĤ��Ƥϡ�
-      <a href="http://www.FreeBSD.org/projects/busdma/">the busdma and
-      SMPng driver conversion web page</a> �ˤ����Ƹ�������Ƥ��ޤ���
-      �ޤ������Ū�� <a href="../../ja/projects/netperf/cluster.html">network performance
-      cluster</a> �����ۤ���ޤ�����</p>
-
-    <p>�ͥåȥ�������å��Υ��å��ξ����ˤĤ��Ƥϡ�&a.rwatson; ��
-      <a href="http://www.watson.org/~robert/freebsd/netperf/">netperf
-      �����֥ڡ���</a>������� FreeBSD.org �� <a href="../projects/netperf/">Netperf
-      �����֥ڡ���</a> �Ǹ��뤳�Ȥ��Ǥ��ޤ���
-      SMP <a href="../projects/netperf/cluster.html">network performance
-      cluster</a> �ϡ��ƥ�����Ū�Ǻ�������Ƥ��ޤ���</p>
-
-    <p>�������ϥ��ơ����������դν���¤�Ǥ��ޤ���</p>
-
-    <a name="resources"></a>
-    <h2>���󸻤ȥ��</h2>
-
-    <ul>
-      <li><p>SMP �˴�Ϣ����������
-	  <a href="mailto:freebsd-smp@FreeBSD.org">freebsd-smp</a>
-	  �᡼��󥰥ꥹ�Ȥˤ����ƹԤ��Ƥ��ޤ���
-	  <a href="../../doc/ja_JP.eucJP/books/handbook/index.html">FreeBSD �ϥ�ɥ֥å�</a>
-	  ����Ͽ�ˤ���
-	  <a href="../../doc/ja_JP.eucJP/books/handbook/eresources.html#ERESOURCES-MAIL">
-	  ���󥿡��ͥåȾ�Υ꥽����</a>
-	  �˥᡼��󥰥ꥹ�Ȥ˴ؤ���ܤ������󤬺ܤäƤ��ޤ���</p></li>
-
-      <li><p>Steve Passe �Ͼ���Ū�ˤ��Υڡ��������礵���Ǥ�����
-	  �ɲþ����ޤ�
-	  <a href="http://people.FreeBSD.org/~fsmp/SMP/SMP.html">SMP
-	  �ץ��������ȥڡ���</a>
-	  ��������Ƥ��ޤ���</p></li>
-
-       <li><p>&a.rwatson; �ϡ�SMP �˴�Ϣ����
-	   <a href="../projects/netperf/">Netperf project</a>
-	  �Υͥåȥ���ѥե����ޥ󥹤˴ؤ��륦���֥ڡ�����������Ƥ��ޤ���
-	  ����ˡ���� <a
- 	  href="http://www.watson.org/~robert/freebsd/netperf/">�ѹ����Υ����䤽��¾�ξ����ޤ�ĿͤΥ����֥ڡ���</a>
-	  ����äƤ��ޤ���</p></li>
-
-      <li><p><a href="http://www.osnews.com/">OSNews</a> �ϡ�
-	FreeBSD ��ȯ�ԤǤ��� &a.rwatson;, &a.jhb; �� &a.scottl;
-	�˥��󥿥ӥ塼���ޤ�����
-	���� 6.x �ˤ����� �Ƕ�� SMPng, SMPVFS �γ�ȯ��ޤ�¿���ε�ǽ�ˤĤ����ä򤷤ޤ�����
-	������ <a
-	href="http://www.osnews.com/story.php?news_id=10951">����
-	</a> �Ǥ���</p></li>
-
-       <li><p>�ʲ��ϡ������ͥ�Ʊ������ӥ���åɥץ�ߥƥ��֤ˤĤ��ƤΥޥ˥奢��ڡ����Ǥ���</p>
-
-	    <ul>
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=mutex&amp;apropos=0&amp;sektion=9">Kernel Mutexes (mutex(9))</a></li>
-
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=mtx_pool&amp;apropos=0&amp;sektion=9">Kernel Mutex Pools (mtx_pool(9))</a></li>
-
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=critical&amp;apropos=0&amp;sektion=9">Kernel Critical Sections (critical(9))</a></li>
-
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=sx&amp;apropos=0&amp;sektion=9">Kernel Shared/Exclusive Locks (sx(9))</a></li>
-
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=condvar&amp;apropos=0&amp;sektion=9">Kernel Condition Variables (condvar(9))</a></li>
-
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=sema&amp;apropos=0&amp;sektion=9">Kernel Semaphores (sema(9))</a></li>
-
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=sleep&amp;apropos=0&amp;sektion=9">Kernel sleep/wakeup API (sleep(9))</a></li>
-
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=kthread&amp;apropos=0&amp;sektion=9">Kernel Threads (kthread(9))</a></li>
-
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=ithread&amp;apropos=0&amp;sektion=9">Interrupt Threads (ithread(9))</a></li>
-
-	      <li><a href="http://www.freebsd.org/cgi/man.cgi?query=swi&amp;apropos=0&amp;sektion=9">Software Interrupt Threads (swi(9))</a></li>
-	    </ul>
-	  <br/>
-	  <p>In addition, the old <a href="http://www.freebsd.org/cgi/man.cgi?query=spl&amp;apropos=0&amp;sektion=9">SPL man page</a> may be of interest, as it reflects the previous SMP synchronization model.</p>
-	  <p>�ޤ���<a href="http://www.freebsd.org/cgi/man.cgi?query=spl&amp;apropos=0&amp;sektion=9">�Ť� SPL �ޥ˥奢��ڡ���</a>
-	    �ˤϰ����� SMP Ʊ����ǥ�ξ��󤬻Ĥ���Ƥ���Τǡ���̣�����Ǥ���</p>
-	</li>
-
-      <li><p>
- 	  Hiten Pandya �ˤ�� <a
-	  href="http://storm.uk.FreeBSD.org/~hiten/smp_synch_rules.html">
- 	  SMP kernel synchronization rules</a>��</p></li>
-
-      <li><p>&a.dillon; ���ब SMP �ץ��������ȤDz��򤷤����ˤĤ��Ƥ�
-	  <a href="http://apollo.backplane.com/FreeBSDSmp/">
-	    �����֥ڡ���</a>
-	  ��������Ƥ��ޤ���</p></li>
-
-      <li>
-	<p>&a.jhb; �ˤ��
-	  <a href="http://www.usenix.org/events/bsdcon02/full_papers/baldwin/baldwin_html/index.html">
-	  "Locking in the Multithreaded FreeBSD Kernel" USENIX paper</a>��
-	</p>
-      </li>
-
-      <li>
-	<p>&a.hsu; �ˤ��
-	  <a href="http://www.usenix.org/publications/library/proceedings/bsdcon03/tech/hsu.html">
-	"Reasoning about SMP in FreeBSD" BSDCon'03 paper</a>��
-	</p>
-      </li>
-
-      <li>
-	<p>&a.jeff; �ˤ��
-	  <a href="http://www.usenix.org/publications/library/proceedings/bsdcon03/tech/roberson.html">
-	"ULE: A Modern Scheduler for FreeBSD" BSDCon'03 paper</a>��
-	</p>
-      </li>
-
-      <li>
-	<p>&a.rwatson; �ˤ��
-	  <a href="http://www.watson.org/~robert/freebsd/netperf/20051027-eurobsdcon2005-netperf.pdf">"Introduction to Multithreading and Multiprocessing in the FreeBSD SMPng Network Stack" EuroBSDCon 2005 paper</a>��
-	</p>
-      </li>
-
-    </ul>
-
-    <a name="subsystems"></a>
-    <h2>���֥����ƥ�ȥ����å� (Historical)</h2>
-
-    <p>�ʲ��Ϥޤ�̤�����Υϥ���٥�Υ����ͥ륵�֥����ƥ�ȡ����ߡ�
-      SMP �������ƥ�����Ȱ������ˤĤ��ƺ�Ȥ��Ƥ����ưŪ�ʥ����åդΰ����Ǥ���</p>
-
-    <table class="tblbasic">
-      <tr class="heading">
-	<th> ���֥����ƥ� </th>
-	<th> ���ơ����� </th>
-	<th> �ǽ����� </th>
-	<th> �����å� </th>
-      </tr>
-
-      <tr>
-	<td> Newbus </td>
-	<td> &status.wip; </td>
-	<td> 5 October 2003 </td>
-	<td> &a.imp;</td>
-      </tr>
-
-      <tr>
-	<td> VM </td>
-	<td> &status.wip; </td>
-	<td> 4 October 2003 </td>
-	<td> &a.alc;</td>
-      </tr>
-
-      <tr>
-	<td> Buffer cache </td>
-	<td> &status.wip; </td>
-	<td> 4 October 2003 </td>
-	<td> &a.jeff;, &a.phk; </td>
-      </tr>
-
-      <tr>
-	<td> VFS </td>
-	<td> &status.done; </td>
-	<td> 24 January 2005 </td>
-	<td> &a.jeff; </td>
-      </tr>
-
-      <tr>
-	<td> Processes and thread operations </td>
-	<td> &status.wip; </td>
-	<td> 5 May 2003 </td>
-	<td> &a.jhb; </td>
-      </tr>
-
-      <tr>
-	<td> Scheduler </td>
-	<td> &status.done; </td>
-	<td> 23 April 2004 </td>
-	<td> &a.jhb;, &a.jeff; </td>
-      </tr>
-
-      <tr>
-	<td> GEOM </td>
-	<td> &status.done; </td>
-	<td> 5 February 2003 </td>
-	<td> &a.phk; </td>
-      </tr>
-
-      <tr>
-	<td> File descriptors </td>
-	<td> &status.done; </td>
-	<td> 5 February 2003 </td>
-	<td> &a.alfred;, &a.tanimura;, &a.rwatson; </td>
-      </tr>
-
-      <tr>
-	<td> TTY subsystem </td>
-	<td> &status.done; </td>
-	<td> 20 August 2008 </td>
-	<td> &a.ed; </td>
-      </tr>
-
-      <tr>
-	<td> Pipe IPC </td>
-	<td> &status.done; </td>
-	<td> 4 October 2003 </td>
-	<td> &a.alfred; </td>
-      </tr>
-
-      <tr>
-	<td> Socket structures and system calls </td>
-	<td> &status.done; </td>
-	<td> 25 November 2004 </td>
-	<td> &a.sam;, &a.rwatson; </td>
-      </tr>
-
-      <tr>
-	<td> KQueue </td>
-	<td> &status.done; </td>
-	<td> 24 November 2004 </td>
-	<td> &a.jmg;, &a.green; </td>
-      </tr>
-
-      <tr>
-	<td> IPv4 </td>
-	<td> &status.done; </td>
-	<td> 23 April 2004 </td>
-	<td> &a.jennifer;, &a.hsu;, &a.sam;, &a.rwatson;, &a.gnn; </td>
-      </tr>
-
-      <tr>
-	<td> IPv6 </td>
-	<td> &status.wip; </td>
-	<td> 01 July 2005 </td>
-	<td> &a.rwatson;, &a.gnn; </td>
-      </tr>
-
-      <tr>
-	<td> IPX/SPX </td>
-	<td> &status.done; </td>
-	<td> 09 January 2005 </td>
-	<td> &a.rwatson; </td>
-      </tr>
-
-      <tr>
-	<td> netatalk </td>
-	<td> &status.done; </td>
-	<td> 02 February 2005 </td>
-	<td> &a.rwatson; </td>
-      </tr>
-
-      <tr>
-	<td> Network stack infrastructure </td>
-	<td> &status.done; </td>
-	<td> 28 August 2004 </td>
-	<td> &a.hsu;, &a.sam;, &a.rwatson;, &a.mlaier;, &a.luigi;, Maurycy Pawlowski-Wieronski &lt;maurycy@fouk.org&gt;, &a.brooks;,
-	  &a.rik; </td>
-      </tr>
-
-      <tr>
-	<td> NFS Client </td>
-	<td> &status.done; </td>
-	<td> 19 May 2006 </td>
-	<td> &a.mohans; </td>
-      </tr>
-
-      <tr>
-	<td> NFS Server </td>
-	<td> &status.wip; </td>
-	<td> 24 February 2007 </td>
-	<td> &a.rwatson;, &a.jeff; </td>
-      </tr>
-
-    </table>
-
-    <a name="tasks"></a>
-    <h2>������ (Historical)</h2>
-
-    <p>���ΰ��̥������ꥹ�Ȥϴ����ǤϤ���ޤ���</p>
-
-    <table class="tblbasic">
-      <tr class="heading">
-	<th> ������ </th>
-	<th> �� </th>
-	<th> �ǽ����� </th>
-	<th> ���ơ����� </th>
-      </tr>
-
-      <tr>
-	<td> Convert the giant lock from spinning to blocking, add the
-	  scheduler lock, add per-CPU idle processes. </td>
-	<td> &a.dillon; </td>
-	<td> 25 June 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Port the BSD/OS locking primitives (i386). </td>
-	<td> &a.jake; </td>
-	<td> 3 July 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Implement heavy-weight interrupt threads (i386). </td>
-	<td> &a.grog; </td>
-	<td> 3 August 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Rewrite the low level interrupt code (i386 UP). </td>
-	<td> &a.grog; </td>
-	<td> 3 August 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Demonstrated reasonable stability (self-hosted buildworld)
-	  (i386 UP). </td>
-	<td> -smp developers </td>
-	<td> 12 August 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Port the BSD/OS locking primitives (alpha). </td>
-	<td> &a.dfr; </td>
-	<td> 24 August 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Stub out (disable) spl()s. </td>
-	<td> &a.grog; </td>
-	<td> 30 August 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Port the BSD/OS ktr code. </td>
-	<td> &a.grog;, &a.jhb; </td>
-	<td> 30 August 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Rewrite the low level interrupt code (i386 SMP). </td>
-	<td> &a.jhb; </td>
-	<td> 1 September 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Demonstrated reasonable stability (self-hosted buildworld)
-	  (i386 SMP). </td>
-	<td> -smp developers </td>
-	<td> 6 September 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Demonstrated reasonable stability (self-hosted buildworld)
-	  (alpha). </td>
-	<td> -smp developers </td>
-	<td> 6 September 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make malloc and friends thread-safe. </td>
-	<td> &a.jasone; </td>
-	<td> 10 September 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Implement msleep(), make tsleep() an msleep() wrapper. </td>
-	<td> &a.jake; </td>
-	<td> 11 September 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make fxp driver thread-safe. </td>
-	<td> &a.cp; </td>
-	<td> 17 September 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make mbuf's thread-safe. </td>
-	<td> &a.bmilekic; </td>
-	<td> 29 September 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock manager re-work. </td>
-	<td> &a.jasone; </td>
-	<td> 3 October 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Implement heavy-weight interrupt threads (alpha). </td>
-	<td> &a.jhb;, &a.dfr; </td>
-	<td> 5 October 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Rewrite the low level interrupt code (alpha). </td>
-	<td> &a.dfr;, &a.jhb; </td>
-	<td> 5 October 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Process accounting. </td>
-	<td> &a.tegge;, &a.jhb; </td>
-	<td> 5 October 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make ethernet drivers thread-safe. </td>
-	<td> &a.wpaul; </td>
-	<td> 15 October 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make the mutex headers mostly machine-independent. </td>
-	<td> &a.jhb; </td>
-	<td> 20 October 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Rename SMP_DEBUG to MUTEX_DEBUG. </td>
-	<td> &a.jhb; </td>
-	<td> 20 October 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Give each soft interrupt its own thread. </td>
-	<td> &a.cp; </td>
-	<td> 25 October 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make sf_bufs (sendfile(2)) thread-safe. </td>
-	<td> &a.bmilekic; </td>
-	<td> 5 November 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make the witness code work correctly. </td>
-	<td> &a.jhb; </td>
-	<td> 18 November 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Split the ktr-specific code out of db_interface.c. </td>
-	<td> &a.jhb;  </td>
-	<td> 15 December 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Convert the sio driver to using a spin mutex. </td>
-	<td> &a.jhb; </td>
-	<td> 18 December 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Implement condition variables. </td>
-	<td> &a.jake;, &a.jasone; </td>
-	<td> 15 January 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add a flag to mtx_init() (MTX_RECURSE) that denotes
-	  whether a mutex is allowed to recurse. </td>
-	<td> &a.bmilekic; </td>
-	<td> 19 January 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make the zone allocator thread-safe. </td>
-	<td> &a.des; </td>
-	<td> 21 January 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Convert simplelocks to mutexes. </td>
-	<td> &a.jasone; </td>
-	<td> 24 January 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make kernel preemptive with respect to interrupts. </td>
-	<td> &a.jake; </td>
-	<td> 31 January 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Cleanup of mutex API. </td>
-	<td> &a.bmilekic; </td>
-	<td> 8 February 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Remove COM_LOCK. </td>
-	<td> &a.markm; </td>
-	<td> 11 February 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Merge various scheduling classes into one run queue.
-	  Modify scheduler to support preemptable kernel. </td>
-	<td> &a.jake; </td>
-	<td> 11 February 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make priority propagation work correctly. </td>
-	<td> &a.jake; </td>
-	<td> 11 February 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make most of the interrupt thread code MI and shared
-	  between hardware and software interrupts. </td>
-	<td> &a.jhb; </td>
-	<td> 18 February 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add protection to struct jail and jail-related functionality. </td>
-	<td> &a.rwatson; </td>
-	<td> 20 February 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Implement sx (shared/exclusive) locks. </td>
-	<td> &a.jasone; </td>
-	<td> 5 March 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Generalize/improve witness to handle more complex locking
-	  primitives (mtx, sx). </td>
-	<td> &a.jhb; </td>
-	<td> 28 March 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Convert the allproc and proctree locks from lockmgr locks
-	  to sx locks. </td>
-	<td> &a.jhb; </td>
-	<td> 28 March 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make mbuf system use condition variables instead of
-	  msleep()/wakeup(). </td>
-	<td> &a.bmilekic; </td>
-	<td> 2 April 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Remove &lt;sys/mutex.h&gt; includes from other kernel
-	  headers such as &lt;vm/vm_zone.h&gt;, &lt;sys/resourcevar.h&gt;,
-	  &lt;sys/ucred.h&gt;, and &lt;sys/mbuf.h&gt;. </td>
-	<td> &a.markm; </td>
-	<td> 15 May 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Cleanup the various mp_machdep.c's, unify various SMP
-	  API's such as IPI delivery, etc. </td>
-	<td> &a.jhb; </td>
-	<td> 15 May 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make most of the forward_* and forwarded_* functions MI. </td>
-	<td> &a.jhb; </td>
-	<td> 15 May 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Complete the MD support for SMP on the Alpha platform.</td>
-	<td> &a.gallatin;, &a.dfr;, &a.jhb; </td>
-	<td> 15 May 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Convert select() to use condition variables. </td>
-	<td> &a.tanimura; </td>
-	<td> 15 May 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add a "giant" lock around the VM subsystem. </td>
-	<td> &a.alfred; </td>
-	<td> 13 June 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Introduce a modified slab allocator for the mbuf subsystem. </td>
-	<td> &a.bmilekic; </td>
-	<td> 21 June 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add a witness_assert() function to handle lock assertions. </td>
-	<td> &a.jhb; </td>
-	<td> 27 June 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Extend sx locks to support try lock operations. </td>
-	<td> &a.jhb; </td>
-	<td> 27 June 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Document KTR. </td>
-	<td> &a.jhb; </td>
-	<td> 28 June 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make fork_return, fork_exit, ast, and userret MI. </td>
-	<td> &a.jhb; </td>
-	<td> 29 June 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make sched_lock's savecrit a per-process property saved
-	  and restored in mi_switch and initialized in fork_exit. </td>
-	<td> &a.jhb; </td>
-	<td> 30 June 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make ast() loop. </td>
-	<td> &a.jhb; </td>
-	<td> 10 August 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add upgrade/downgrade sx lock operations. </td>
-	<td> &a.kan;, &a.jasone; </td>
-	<td> 13 August 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Implement semaphores. </td>
-	<td> &a.jasone; </td>
-	<td> 14 August 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add support for upgrade/downgrades in witness. </td>
-	<td> &a.jhb; </td>
-	<td> 23 August 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make most of cpu_wait() and cpu_exit() MI. </td>
-	<td> &a.peter; </td>
-	<td> 9 September 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Split NFS into client and server. </td>
-	<td> &a.peter; </td>
-	<td> 18 Oct 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock taskqueues. </td>
-	<td> &a.arr;, &a.jhb; </td>
-	<td> 25 October 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add a per-thread ucred reference. </td>
-	<td> &a.jhb; </td>
-	<td> 25 October 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make most of the per-CPU stuff MI. </td>
-	<td> &a.jhb; </td>
-	<td> 11 December 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make critical section saved state per-thread instead of per-lock
-	  so that interlocking spin locks work properly. </td>
-	<td> &a.jhb; </td>
-	<td> 17 December 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Replace the APIC-specific imen_mtx with a MI-named icu_lock to
-	  protect interrupt controllers and associated data within the kernel
-	  for both i386 and alpha. </td>
-	<td> &a.jhb; </td>
-	<td> 20 December 2001 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Use the per-thread critical section nesting level in the mutex
-	    and interrupt thread code to automatically determine when to not
-	    preempt.  This makes the MTX_NOSWITCH, SWI_SWITCH, and
-	    SWI_NOSWITCH flags obsolete as the kernel will be able to figure
-	    out the proper behavior on its own. </td>
-	<td> &a.jhb; </td>
-	<td> 5 January 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock struct filedesc and struct file. </td>
-	<td> &a.tanimura;, &a.alfred; </td>
-	<td> 12 January 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock struct pgrp, struct session, and struct sigio. </td>
-	<td> &a.tanimura; </td>
-	<td> 23 February 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock pipe implementation, but not sigio/fown, VM interactions. </td>
-	<td> &a.alfred; </td>
-	<td> 27 February 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Move to explicit reference counting for soft vnode references.
-	  </td>
-	<td> &a.phk; </td>
-	<td> 8 March 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Initialize mutex pools early enough that sx locks can be used
-	  for VM. </td>
-	<td> &a.green; </td>
-	<td> 14 March 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> Place a global lock (sellock) around selinfo structures to fix a
-          variety of lock order reversals, and make select() MP-safe. </td>
-        <td> &a.alfred;, &a.davidc; </td>
-        <td> 14 March 2002 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push down Giant on read, write, pread, pwrite system calls,
-	  acquiring Giant in the per-subsystem fileop layer for sockets, VFS,
-	  etc.</td>
-	<td> &a.alfred; </td>
-	<td> 15 March 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down kernel module structures. </td>
-	<td> &a.arr; </td>
-	<td> 18 March 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down kernel linker globals.</td>
-	<td> &a.arr; </td>
-	<td> 18 March 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Rewrite kernel memory allocator to be a slab allocator that
-	  uses per-cpu caches. </td>
-	<td> &a.jeff; </td>
-	<td> 21 March 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Replace incorrect use of MD critical section API to disable
-	  interrupts with a specific interrupt disable API. </td>
-	<td> &a.imp;, &a.dfr;, &a.benno;, &a.jhb; </td>
-	<td> 21 March 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down access to the shared p_args "process arguments"
-	  structure through appropriate protection of that structure and
-	  references to it. </td>
-	<td> &a.mini; </td>
-	<td> 31 March 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Move from flags/tsleep lock to sx locks to protect sysctl
-	  tree from updates during sysctl operations. </td>
-	<td> &a.mini; </td>
-	<td> 1 April 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Create/port userland tool to manage KTR event dumps. </td>
-	<td> &a.jake; </td>
-	<td> 1 April 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Create MTX_SYSINIT and SX_SYSINIT macros that allow for
-	  initializing locks that are subsystem independent. </td>
-	<td> &a.arr; </td>
-	<td> 2 April 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
- 	<td> Lock down the global securelevel variable. </td>
-	<td> &a.arr; </td>
-	<td> 2 April 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make grow_stack() MI.  Possibly even a macro or inline. </td>
-	<td> &a.alc; </td>
-	<td> 6 April 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock use of p_fd, which otherwise can result in corrupted
-	  p_fd panics during heavy operation.  Start with a global,
-	  and move to per-proc locking. </td>
-	<td> &a.alfred;, &a.tanimura; </td>
-	<td> 8 April 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock struct pargs. </td>
-	<td> &a.mini; </td>
-	<td> 9 April 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock sysctl hierarchy. </td>
-	<td> &a.mini; </td>
-	<td> 9 April 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make {o,}sigreturn() MPSAFE. </td>
-	<td> &a.alc; </td>
-	<td> 11 April 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Rewrite kernel memory allocator so that Giant is not required
-	  for malloc() or free(). </td>
-	<td> &a.jeff; </td>
-	<td> 2 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Replace complex shared/exclusive locking scheme in the VM
-	  system with a purely exclusive lockmgr locking scheme, simplifying
-	  locking and removing potential livelock/deadlock scenarios. </td>
-	<td> &a.green;, &a.alc; </td>
-	<td> 3 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push down Giant into readv/writev system calls in style of
-	  read/write/pread/pwrite once malloc no longer requires Giant in
-	  the handling of iovec structures for uio. </td>
-	<td> &a.alc; </td>
-	<td> 9 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push down Giant in mprotect(), minherit(), and madvise() so
-	  that it is no longer acquired and released directly. </td>
-	<td> &a.alc; </td>
-	<td> 18 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Update suser() and p_can*() APIs to accept threads instead of
-	  processes. </td>
-	<td> &a.jhb; </td>
-	<td> 18 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Broadly transition to td_ucred from p_ucred once KSE dependencies
-	  are in place. </td>
-	<td> &a.jhb; </td>
-	<td> 18 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add a witness_sleep() check to uma_zalloc() to catch code
-	  calling malloc() or uma_zalloc() while holding non-sleepable
-	  locks. </td>
-	<td> &a.jhb; </td>
-	<td> 20 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Optimize UP support by changing spin locks to only perform
-	  critical section enter and exits. </td>
-	<td> &a.jhb; </td>
-	<td> 21 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make sleep mutexes spin if the current lock holder is
-	    executing on another CPU. </td>
-	<td> &a.jhb; </td>
-	<td> 21 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add support for the IA32 pause instruction to spin loops in
-	  locks. </td>
-	<td> &a.jhb; </td>
-	<td> 21 May 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make KTRACE write into tracefiles asynchronously. </td>
-	<td> &a.jhb; </td>
-	<td> 7 June 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> Remove Giant from modnext(2), modfnext(2),
-          modstat(2),and modfind(2).</td>
-        <td> &a.arr; </td>
-        <td> 25 June 2002 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Fix synchronization of TLB flushes and invlpg() on x86 SMP. </td>
-	<td> &a.peter; </td>
-	<td> 12 July 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add KTR(9) tracing for mutex contention. </td>
-	<td> &a.iedowse; </td>
-	<td> 26 Augist 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make cpu_coredump MI. </td>
-	<td> &a.peter; </td>
-	<td> 7 September 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add a subsystem lock to the accounting code. </td>
-	<td> &a.arr; </td>
-	<td> 11 September 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Allow KTR(9) to write trace records to alq(9) record facility.
-	  </td>
-	<td> &a.jeff; </td>
-	<td> 22 September 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Create mechanism in cdevsw structure to protect
-	  thread-unsafe drivers. </td>
-	<td> &a.phk; </td>
-	<td> 27 September 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Fix SIGXPU and other #if 0'd things in mi_switch(). </td>
-	<td> &a.jhb; </td>
-	<td> 30 September 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down TrustedBSD MAC implementation. </td>
-	<td> &a.rwatson; </td>
-	<td> 11 November 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock eventhandlers. </td>
-	<td> &a.msmith;, &a.mini;, &a.jhb; </td>
-	<td> 11 March 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Fix PHOLD() so that it blocks to guarantee PS_INMEM. </td>
-	<td> &a.jhb; </td>
-	<td> 22 April 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Fix various procfs_machdep.c to not use sched_lock. </td>
-	<td> &a.jhb; </td>
-	<td> 22 April 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock all references to process credentials and remove Giant
-	  from process credential-related system calls. </td>
-	<td> &a.jhb; </td>
-	<td> 1 May 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Merge the procsig and sigacts structures, move the new sigacts
-	  structure out of the U-area and add appropriate locking. </td>
-	<td> &a.jhb; </td>
-        <td> 13 May 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Remove Giant from the kill() and killpg() system calls. </td>
-	<td> &a.jhb; </td>
-        <td> 13 May 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Enhance the mutex pool implementation to allow creation and
-	  use of multiple, dynamically allocated pools with adjustable pool
-	  sizes and mutex options. </td>
-	<td> &a.truckman; </td>
-        <td> 16 July 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Create mutex profiling tool for the kernel so as to measure
-	  contention and behavior of kernel mutexes. </td>
-	<td> &a.eivind;, &a.des; </td>
-	<td> 31 March 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down linker_file_t structures in the kernel linker.</td>
-	<td> &a.arr; </td>
-	<td> 19 June 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock pipe implementation: VM optimizations. </td>
-	<td> &nbsp; </td>
-	<td> 4 October 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> Reimplement i386 interrupt and SMP code so that SMP kernels
-	  work on UP boxes and SMP can be enabled in GENERIC. </td>
-        <td> &a.jhb; </td>
-        <td> 3 November 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> Implement generic turnstiles to use when blocking on non-sleepable
-	  locks. </td>
-        <td> &a.jhb; </td>
-        <td> 11 November 2003 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Split witness_lock() into witness_checkorder() and
-	  witness_lock().  witness_checkorder() would be called before
-	  acquiring a lock to increase the changes of detecting and warning
-	  about a reversal prior to deadlocking.  witness_lock() would
-	  simply update witness' internal state to note that a lock has
-	  been acquired. </td>
-	<td> &a.jhb; </td>
-	<td> 24 January 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock per-process resource limits. </td>
-	<td> &a.mtm;, &a.jhb; </td>
-	<td> 4 February 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> Implement a sleep queue abstraction to be used by both msleep()
-	  and condition variables.  This new abstraction should use a hash
-	  table of sleep queues with a spin lock on each sleep queue chain
-	  similar to turnstile chain locks to make sched_lock finger
-	  grained.</td>
-        <td> &a.jhb; </td>
-        <td> 27 February 2004 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> Remove Giant from jail(2). </td>
-        <td> &a.arr;, &a.rwatson; </td>
-        <td> 23 April 2004 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add subsystem locking to NFSv2, NFSv3 server, permitting upcalls
-	  and other network-related elements to run Giant-free. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add KTR(9) tracing for UMA allocation/free events. </td>
-	<td> &a.rwatson; </td>
-	<td> 05 August 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add KTR(9) tracing for GEOM I/O events. </td>
-	<td> &a.rwatson; </td>
-	<td> 21 October 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add KTR(9) tracing for busdma events. </td>
-	<td> &a.rwatson; </td>
-	<td> 23 October 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add KTR(9) tracing for critical sections. </td>
-	<td> &a.rwatson; </td>
-	<td> 07 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make the kernel fully preemptive. </td>
-	<td> &a.jhb; </td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock pipe implementation: sigio/fown-related evil. </td>
-	<td> &a.alfred; </td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-       <td> Lock down the SysV IPC code. </td>
-	<td> &a.alfred; </td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock contention measurement tool to measure heat of various
-	  locks, including Giant, and permit more directed performance and
-	  locking strategy optimization. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add KTR(9) tracing to scheduler run queues. </td>
-	<td> &a.jeff; </td>
-	<td> 26 December 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Review locking strategy and correctness of VFS operations
-	  and fix up various failure modes associated with enabling
-	  VFS locking assertions. </td>
-	<td> &a.jeff; </td>
-	<td> 01 January 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Document in-vnode locking strategy, clean it up. </td>
-	<td> &a.jeff; </td>
-	<td> 01 January 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Run cross-file system VFS without Giant, acquiring Giant
-	  conditionally based on a file system flag. </td>
-	<td> &a.jeff; </td>
-	<td> 01 January 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Run UFS file system MPSAFE. </td>
-	<td> &a.jeff; </td>
-	<td> 01 January 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add KTR(9) tracing for buffer cache events. </td>
-	<td> &a.jeff; </td>
-	<td> 24 January 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Break out critical section and spin lock APIs, and re-optimize
-	  critical sections to not disable interrupts in hardware due to
-	  the high cost on some hardware architectures. </td>
-	<td> &a.jhb; </td>
-	<td> 04 April 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Modify uma(9) to use critical sections to protect per-CPU
-	  statistics, instead of mutexdes, in order to optimize access. </td>
-	<td> &a.rwatson; </td>
-	<td> 29 April 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Migrate malloc(9) to per-CPU statistics, and use critical
-	  sections to optimize access to those statistics. </td>
-	<td> &a.rwatson; </td>
-	<td> 29 May 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add KTR(9) support for KTR_VFS to trace additional VFS events,
-	  rather than mechanically inserted KTR_VOP events. </td>
-	<td> &a.jeff; </td>
-	<td> 11 June 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push the grabbing of Giant into Linux i386 ABI system calls.</td>
-	<td> &a.jhb; </td>
-	<td> 13 July 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push the grabbing of Giant into Linux AXP ABI system calls.</td>
-	<td> &a.jhb; </td>
-	<td> 13 July 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push the grabbing of Giant into SVR4 i386 ABI system calls.</td>
-	<td> &a.jhb; </td>
-	<td> 13 July 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push the grabbing of Giant into OSF/1 AXP ABI system calls.</td>
-	<td> &a.jhb; </td>
-	<td> 13 July 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push the grabbing of Giant into IBCS i386 ABI system calls.</td>
-	<td> &a.jhb; </td>
-	<td> 13 July 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add a new witness check for exiting threads to verify that
-	  an exiting thread holds no locks. </td>
-	<td> &a.jhb; </td>
-	<td> 2 September 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> Implement atomic_fetchadd() for ints. </td>
-        <td> &a.jhb; </td>
-        <td> 27 September 2005 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> Implement a simple reference count API using atomic operations and
-	  use this to replace locks that just protect a reference count. </td>
-        <td> &a.jhb; </td>
-        <td> 27 September 2005 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Split the interrupt handler list out of struct ithread into
-	  its own structure and only start up kthreads for interrupt
-	  vectors that actually have threaded interrupt handlers. </td>
-	<td> &a.jhb; </td>
-	<td> 25 October 2005 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock aio(4). </td>
-	<td> &a.davidxu; </td>
-	<td> 22 January 2006 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Implement reader/writer locks. </td>
-	<td> &a.jhb; </td>
-	<td> 27 January 2006 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-        <td> Remove the MPSAFE syscall flag from the syscall table. </td>
-        <td> &a.jhb; </td>
-        <td> 28 July 2006 </td>
-        <td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add sufficient synchronization to printf to avoid printing
-	  problems but not so much it doesn't work in debugging contexts. </td>
-	<td> &a.jb; </td>
-	<td> 1 November 2006 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Expand mutex profiling tool to also profile sx locks. </td>
-	<td> &a.kmacy; </td>
-	<td> 11 November 2006 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down the TTY subsystem. </td>
-	<td> &a.ed; </td>
-	<td> 20 August 2008 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <!-- WIP -->
-
-      <tr>
-	<td> Lock struct proc. </td>
-	<td> &a.jhb; </td>
-	<td> 20 February 2001 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Fix clock locking to be the same on all platforms. </td>
-	<td> &a.jhb; </td>
-	<td> 16 November 2001 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Make use of process locking and process reference counting
-	  to protect debugging interfaces (and procfs). </td>
-	<td> &a.jhb; </td>
-	<td> 27 February 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Make use of process locking to protect process monitoring
-	  sysctls, including those employed by 'ps' and related tools.</td>
-	<td> &a.jhb; </td>
-	<td> 27 February 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down newbus infrastructure to support driver
-	  fine-graining. </td>
-	<td> &a.imp; </td>
-	<td> 28 February 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> SMPng architecture document. </td>
-	<td> &a.jhb;, &a.rwatson; </td>
-	<td> 28 February 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Move to shared lock for VOP_GETATTR() to reduce blocking during
-	  frequent lightweight VFS operations.  Modify namei() to provide
-	  a LOOKUP_SHARED flag to indicate when the lock required may be
-	  shared instead of exclusive. </td>
-	<td> &a.jeff; </td>
-	<td> 11 March 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Document existing vm_map locking and verify it's correctness. </td>
-	<td> &a.alc; </td>
-	<td> 18 May 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Document existing vm_object locking and verify it's
-	  correctness. </td>
-	<td> &a.alc; </td>
-	<td> 4 May 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Implement lazy interrupt thread switching (context
-	  stealing) on i386. </td>
-	<td> &a.bmilekic;, &a.kan; </td>
-	<td> 10 December 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Implement lazy interrupt thread switching (context
-	  stealing) on sparc64. </td>
-	<td> &a.jake; </td>
-	<td> 10 December 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Switch from using lockmgr in VM to using a mutex or exclusive
-	  sxlock.  Push down Giant on all VM except for vm_object/VFS and
-	  vm_page/pmap components. </td>
-	<td> &a.alc; </td>
-	<td> 10 December 2002 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Modify device driver API to permit drivers to more easily
-	  split "in interrupt context" and "in interrupt thread"
-	  code so as to acknowledge interrupts faster.  This will permit
-	  lower latency in interrupt handling. </td>
-	<td> &a.piso; </td>
-	<td> 24 February 2007 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <!-- Stalled -->
-
-      <!-- Not Started -->
-
-      <tr>
-	<td> Conditionalize atomic ops in the SMP code that are used
-	  for debugging statistics. </td>
-	<td> &a.peter; </td>
-	<td> 15 March 2001 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Axe schedcpu() in favor of event driven priority updates as
-	  much as possible. </td>
-	<td> &nbsp; </td>
-	<td> 7 September 2001 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Fix *hold (e.g. crhold) to return reference to object. </td>
-	<td> &nbsp; </td>
-	<td> 7 September 2001 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Add witness checking for lockmgr locks. </td>
-	<td> &nbsp; </td>
-	<td> 7 September 2001 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Add ICU spin locks on ia64. </td>
-	<td> &nbsp; </td>
-	<td> 4 January 2002 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Add a witness_sleep() check to copyin/out() and s/fuword(). </td>
-	<td> &a.jhb; </td>
-	<td> 7 June 2002 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Remove Giant from mi_startup() and push Giant down into
-	  individual SYSINIT functions.  Many SYSINIT functions probably do
-	  not need Giant anyway. </td>
-	<td> &nbsp; </td>
-	<td> 21 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-<!--
-      <tr>
-        <td>  </td>
-        <td> &nbsp; </td>
-        <td> D M 2002 </td>
-        <td> &status.new; </td>
-      </tr>
-
--->
-    </table>
-
-    <p>�ʲ��Υơ��֥�ϡ��ͥåȥ�������å��Υޥ������åɲ��˴ؤ��륵�֥�������
-      TODO �ꥹ�ȤǤ���</p>
-
-    <table class="tblbasic">
-      <tr class="heading">
-	<th> ������ </th>
-	<th> �� </th>
-	<th> �ǽ����� </th>
-	<th> ���ơ����� </th>
-      </tr>
-
-      <tr>
-	<td> Protect network interface queues. </td>
-	<td> &a.jlemon; </td>
-	<td> 24 November 2000 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock up IP. </td>
-	<td> &a.jennifer;, &a.hsu; </td>
-	<td> 10 June 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock up TCP. </td>
-	<td> &a.jennifer;, &a.hsu;, &a.sam;, &a.rwatson;</td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock up UDP. </td>
-	<td> &a.jennifer;, &a.hsu;, &a.rwatson; </td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock ifaddr reference counts. </td>
-	<td> &a.hsu; </td>
-	<td> 18 December 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock up ifnet list. </td>
-	<td> &a.hsu; </td>
-	<td> 21 December 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock radix trees. </td>
-	<td> &a.hsu; </td>
-	<td> 23 December 2002 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock up ARP. </td>
-	<td> &a.hsu; </td>
-	<td> 16 January 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock up raw IP. </td>
-	<td> &a.sam;, &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock divert sockets. </td>
-	<td> &a.sam; </td>
-	<td> 4 October 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock ipfw2. </td>
-	<td> &a.sam; </td>
-	<td> 4 October 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock DUMMYNET. </td>
-	<td> &a.sam; </td>
-	<td> 4 October 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock ethernet bridge. </td>
-	<td> &a.sam; </td>
-	<td> 4 October 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock IP fragment queues. </td>
-	<td> &a.rwatson; </td>
-	<td> 4 October 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock routing entries. </td>
-	<td> &a.sam; </td>
-	<td> 4 October 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock FAST_IPSEC. </td>
-	<td> &a.sam; </td>
-	<td> 4 October 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Permit parallel entry into isr processing. </td>
-	<td> &a.rwatson;, &a.sam; </td>
-	<td> 11 October 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock if_disc "discard interface". </td>
-	<td> &a.rwatson; </td>
-	<td> 9 March 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock if_faith "IPv6-to-IPv4 TCP relay interface. " </td>
-	<td> &a.sam;, &a.rwatson; </td>
-	<td> 9 March 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock if_gif "generic tunnel interface". </td>
-	<td> &a.rwatson; </td>
-	<td> 9 March 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Review ECN tunnel support (ip_ecn.c). </td>
-	<td> &a.rwatson; </td>
-	<td> 9 March 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> if_tap global and softc locking. </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> if_tun global and softc locking. </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> netatalk/aarp.c locking. </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Cache socket MAC label in inpcb label for IPv4 sockets so that
-	  the label can be used safely at the inet layer without socket
-	  locks. </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> IP encapsulation subroutines (ip_encap.c). </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock globals in loopback interface (if_loop.c). </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Use m_tags in if_gif to limit looping configurations, rather
-	  than a non-MPSAFE static coutner. </td>
-	<td> &a.ru; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> netatalk DDP PCB locking. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock up syncache. </td>
-	<td> &a.hsu;, &a.sam; </td>
-	<td> 10 November 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Permit IP forwarding path to run Giant-free. </td>
-	<td> &a.sam; </td>
-	<td> 1 December 2003 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock &unix; domain protocols, fifofs. </td>
-	<td> &a.sam;, &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Giant lock over NFS server to protect against so_upcall() w/o Giant </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock interface cloning meta-data. </td>
-	<td> &a.brooks; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Apply combination of socket and socket buffer locks, label caching
-	  to MAC labels on sockets so that they can be used safely without
-	  Giant. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Make routing socket message dispatch use a netisr to avoid
-	  re-entering the socket code from the routing code, resolving lock
-	  order issues. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Introduce accept locking to protect accept incomplete and
-	  complete queues on listen sockets. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Break out socket buffer wakeup, socket buffer append, socket
-	  state change, socket buffer reserve, flush, etc, calls into
-	  _locked() and unlocked versions, and avoid conditional locking.
-	  </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down AARP, AppleTalk Address Resolution Protocol. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Fix pull/push cache data synchronization issues in sosend(),
-	  soreceive(), allowing them to run Giant-free. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Protect socket global counters/limits and generation number
-	  with a mutex. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down unit allocation meta-data in interface related
-	  netgraph modules. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down socket buffer OOB fields across TCP/IP, IPX. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add MSG_NBIO so that fifofs can avoid frobbing SO_NBIO in
-	  a manner that risks races. </td>
-	<td> &a.truckman; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Protect all use of so_count with socket lock. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Move socket buffer related state from so_state to sb_state so
-	  it can be properly locked by the socket buffer mutex. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Introduce a temporary global lock to lock the if_label field
-	  used by the MAC Framework. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push VFS-specific behavior out of fdrop_locked() and acquire
-	  Giant in the fo_close per-object methods rather than
-	  fdrop_locked(), so that pipes and sockets can run fo_close()
-	  Giant-free. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push Giant acquisition into fo_stat() file descriptor stat
-	  operation, rather than acquiring it in fstat(), so that fstat()
-	  on sockets and pipes can run Giant-free. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Don't hold socket locks over entry to protocol switch methods,
-	  allowing protocol methods to acquire socket locks after protocol
-	  locks in the lock order. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 July 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Port inpcb mutex locking, assertions from IPv4 to IPv6. </td>
-	<td> &a.rwatson; </td>
-	<td> 8 August 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add IFF_NEEDSGIANT to allow if_start to run with Giant for
-	  specific interfaces.  Defer if_start to task queue. </td>
-	<td> &a.rwatson; </td>
-	<td> 8 August 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Push down Giant in stat(), fo_stat() to allow Giant-free stat
-	  of pipes, sockets. </td>
-	<td> &a.rwatson; </td>
-	<td> 8 August 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Add TCP lock assertions. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock socket layer. </td>
-	<td> &a.sam;, &a.rwatson; </td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Review TCP timer code. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Analyze and reduce cost of entropy gathering in network critical
-	  paths. </td>
-	<td> &a.rwatson;, &a.markm; </td>
-	<td> 24 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Allow code to declare NET_NEEDS_GIANT(), forcing Giant over the
-	  network stack if that code is compiled into the kernel. </td>
-	<td> &a.rwatson; </td>
-	<td> 28 August 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Disable Giant over the network stack in the default
-	  configuration. </td>
-	<td> &a.rwatson; </td>
-	<td> 28 August 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Additional KTR tracing for UMA, callouts, interrupts, etc. </td>
-	<td> &a.rwatson; </td>
-	<td> 07 November 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Move to using file descriptor reference counts instead of
-	  socket reference counts for socket system calls, avoiding extra
-	  reference couht operations. </td>
-	<td> &a.rwatson; </td>
-	<td> 24 October 2004 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down netnatm. </td>
-	<td> &a.rwatson; </td>
-	<td> April 2006 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <tr>
-	<td> Default to direct dispatch from ithreads </td>
-	<td> &a.rwatson; </td>
-	<td> 28 November 2006 </td>
-	<td> &status.done; </td>
-      </tr>
-
-      <!-- WIP -->
-
-      <tr>
-	<td> Lock IPv6. </td>
-	<td> &a.sam;, &a.rwatson;, &a.ume;, &a.mlaier; </td>
-	<td> 8 August 2004 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> if_ppp global, per-softc locking. </td>
-	<td> &a.rwatson;, Maurycy Pawlowski-Wieronski &lt;maurycy@fouk.org&gt; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Lock struct ifnet. </td>
-	<td> &a.mlaier;, &a.luigi;, Maurycy Pawlowski-Wieronski &lt;maurycy@fouk.org&gt; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Lock IPv4, IPv6, atalk interface address lists. </td>
-	<td> &a.mlaier;, &a.rwatson; </td>
-	<td> 8 August 2004 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Lock consumers of BSD compress (bsd_comp.c) code to protect
-	  compression state. </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Lock global and softc state for six-to-four converter (if_stf.c). </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Lock down global and softc state for SLIP (if_sl.c). </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Lock global and softc state for SPPP (if_sppsubr.c). </td>
-	<td> &a.rik;, &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> IGMP locking. </td>
-	<td> &a.rwatson; </td>
-	<td> 23 April 2004 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> IP ID locking. </td>
-	<td> &a.ups; </td>
-	<td> 24 June 2005 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> Locking for polling(4). </td>
-	<td> &a.pjd;, &a.glebius; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <tr>
-	<td> BPF locking needs some cleanup, there are some race conditions there relating to interface removal. </td>
-	<td> &a.csjp; </td>
-	<td> 2 June 2006 </td>
-	<td> &status.wip; </td>
-      </tr>
-
-      <!-- Not Started -->
-
-      <tr>
-	<td> Reduce contention upon locking a socket buffer by replacing
-	     tsleep() and wakeup() with a condvar. </td>
-	<td> &a.tanimura; </td>
-	<td> 21 April 2002 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Lock if_ef "ethernet frame" driver. </td>
-	<td> &nbsp; </td>
-	<td> 9 March 2004 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Further cleanup of socket state machine in order to facilitate finishing socking locking of state transitions. </td>
-	<td> &a.rwatson; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Lock KAME IPSEC. </td>
-	<td> &nbsp; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Only one of our ATM stacks is MPSAFE, the other two should be deleted or fixed. </td>
-	<td> &nbsp; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Lock ND6 (IPv6 Neighbor Discovery). </td>
-	<td> &a.gnn; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Lock IPv6 multicast address lists. </td>
-	<td> &nbsp; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Lock IPv4 and IPv6 global address lists. </td>
-	<td> &nbsp; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Continued cleanup of the stack/device driver ownership and locking for struct ifnet needs to be done. Most fields are now either locked or assigned ownership. Some fields, such as if_flags, need a bit more cleanup due to device drivers modifying stack-owned fields. </td>
-	<td> &a.rwatson; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> When interfaces are torn down, there are a number of races (not all associated with SMPng) that need to be thought about. </td>
-	<td> &nbsp; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Lock if_vlan and inter-layer multicast address manipulation and synchronization in if_vlan. </td>
-	<td> &a.glebius;, &a.yar; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Further investigate locking in in_gif and in6_gif. </td>
-	<td> &nbsp; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> FAST_IPSEC and KAME IPSEC's PF_KEY support likely needs an asynchronous dispatch to prevent socket lock ordering issues similar to what was done for PF_ROUTE. </td>
-	<td> &a.rwatson; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Investigate how to eliminate the use of ACCEPT_LOCK(), which currently prevents races in the tear-down of sockets. </td>
-	<td> &a.rwatson; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Fix SMP problems with netgraph restructuring. </td>
-	<td> &a.glebius; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> Verify locking in netgraph nodes and improve where necessary. </td>
-	<td> &a.glebius; </td>
-	<td> 19 October 2005 </td>
-	<td> &status.new; </td>
-      </tr>
-
-      <tr>
-	<td> More finely-grained locking for pf(4). </td>
-	<td> &a.glebius; </td>
-	<td> 19 October 2005 </td>
- 	<td> &status.new; </td>
-      </tr>
-
-    </table>
-
-    <a name="issues"></a>
-    <h2>���������� (Historical)</h2>
-
-    <table class="tblbasic">
-      <tr class="heading">
-	<th> ������ </th>
-	<th> �ǽ����� </th>
-	<th> �ơ����� </th>
-      </tr>
-
-      <tr>
-	<td> Idle processor time is not charged to the idle processes. </td>
-	<td> 20 September 2000 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> microuptime creeps backwards. </td>
-	<td> 4 October 2000 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> microuptime() went backwards </td>
-	<td> 4 October 2000 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> Process accounting is not accurate (the more CPUs, the
-	  closer to correct it is). </td>
-	<td> 5 October 2000 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> M_DEVBUF is probably the wrong memory pool for interrupt
-	  stuff and we should think about creating a new malloc pool for
-	  that stuff. </td>
-	<td> 9 February 2001 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> PC card eject panics due to a race condition in the
-	  interrupt thread code. </td>
-	<td> 15 March 2001 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> SMP x86 boxes are seeing NCPU * 100 clk interrupts and
-	  NCPU * 128 rtc interrupts. </td>
-	<td> 15 May 2001 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> Witness will infinitely recurse when it acquires Giant after
-	  sleeping with a sleepable lock. </td>
-	<td> 27 June 2001 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> Serial gdb does not work if boot_ddb and boot_gdb options
-	  are specified. </td>
-	<td> 14 July 2002 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> Serial gdb does not work at 115200 baud. </td>
-	<td> 14 July 2002 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <tr>
-	<td> Serial gdb never regains control once 'cont' has been
-	  entered. </td>
-	<td> 14 July 2002 </td>
-	<td> &status.resolved; </td>
-      </tr>
-
-      <!-- unresolved -->
-
-      <tr>
-	<td> Profiling is broken. </td>
-	<td> 20 February 2001 </td>
-	<td> &status.unresolved; </td>
-      </tr>
-
-<!--
-      <tr>
-        <td> </td>
-        <td> D M 2002 </td>
-        <td> &status.unresolved; </td>
-      </tr>
-
--->
-    </table>
-
-    <a name="news"></a>
-    <h2>�˥塼�� (Historical)</h2>
-
-    <p>���Υڡ����λĤ�Ͽ�������Τ������¤�Ǥ��ޤ���</p>
-
-<!--
-<b> D M 2002</b>
-<ul>
-	<li> <p>  </p> </li>
-</ul>
--->
-    <b>28 August 2004</b>
-    <ul>
-      <li>
-	<p>&a.rwatson; threw the switch to change the network stack to run
-	without the Giant lock by default, permitting the network stack to be
-	run on multiple CPUs at a time, as well as to preempt and be
-	preempted by other code.</p>
-      </li>
-    </ul>
-    <b>30 October 2003</b>
-    <ul>
-      <li>
-      <p>&a.grog; submitted a
-        <a href="http://www.lemis.com/grog/SMPng/Singapore/">FreeBSD SMPng paper</a>
-       	to the <a href="http://www.aeosc.org/">Asian Enterprise Open Source
-        Conference</a> in Singapore.  The paper presents a historical view of
-        SMPng development through 2001, but omits discussion of more recent
-        progress on the SMPng project, such as substantial performance enhancements
-        resulting from extensive lock pushdown in the storage subsystem, VM
-        subsystem, and major IPC subsystems.</p>
-      </li>
-    </ul>
-
-    <b>13 January 2002</b>
-    <ul>
-      <li>
-      <p>A <a href =
-        "http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=122646+0+archive/2002/freebsd-smp/20020113.freebsd-smp">
-        status report</a> was sent to the -smp mailing list.</p>
-      </li>
-    </ul>
-
-    <b>15 May 2001</b>
-    <ul>
-      <li>
-	<p>&a.grog; has made his <a href =
-	  "http://www.lemis.com/~grog/SMPng/USENIX/">USENIX paper</a> available,
-	  which he will present in Boston at the end of June.</p>
-      </li>
-    </ul>
-
-    <b>22 March 2001</b>
-    <ul>
-	<li>
-	<p>A <a href =
-	  "http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=41302+0+archive/2001/freebsd-smp/20010325.freebsd-smp">
-	  status report</a> was sent to the -smp mailing list.</p>
-      </li>
-    </ul>
-
-    <b>5 March 2001</b>
-    <ul>
-      <li>
-	<p>A <a href =
-	  "http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=0+0+archive/2001/freebsd-smp/20010311.freebsd-smp">
-	  status report</a> was sent to the -smp mailing list.</p>
-      </li>
-    </ul>
-
-    <b>24 January 2001</b>
-    <ul>
-      <li>
-	<p>A <a href =
-	  "http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=38125+0+archive/2001/freebsd-smp/20010128.freebsd-smp">
-	  status report</a> was sent to the -smp mailing list.</p>
-      </li>
-    </ul>
-
-    <b>12 January 2001</b>
-    <ul>
-      <li>
-	<p>A <a href =
-	  "http://www.FreeBSD.org/cgi/getmsg.cgi?fetch=45111+48223+/usr/local/www/db/text/2001/freebsd-smp/20010114.freebsd-smp">
-	  status report</a> was sent to the -smp mailing list.</p>
-      </li>
-    </ul>
-
-    <b>11 October 2000</b>
-    <ul>
-      <li>
-	<p>&a.jhb; and &a.cp; came up with a preliminary list of
-	  <a href="http://storm.uk.FreeBSD.org/~hiten/smp_synch_rules.html">rules
-	  </a> that should be followed when working on kernel
-	  synchronization.</p>
-      </li>
-    </ul>
-
-    <b>6 September 2000</b>
-    <ul>
-      <li>
-	<p>The SMP code has been committed.  All further work is being
-	  done in cvs rather than with patches.</p>
-      </li>
-
-      <li>
-	<p>An updated <a
-	  href="http://people.FreeBSD.org/~jasone/smp/smpng_patch_9.7">patch</a>
-	  is available for download.  This patch is probably what will
-	  actually get committed.</p>
-      </li>
-    </ul>
-
-    <b>5 September 2000</b>
-    <ul>
-      <li>
-	<p>An updated <a
-	  href="http://people.FreeBSD.org/~jasone/smp/smpng_patch_9.1">patch</a>
-	  is available for download.  This patch makes rtc a fast
-	  interrupt, uses locked instructions for mutexes in MP kernels,
-	  and corrects mtx_*() linkage within modules.</p>
-      </li>
-    </ul>
-
-    <b>1 September 2000</b>
-    <ul>
-      <li>
-	<p>The code is working for the most part now on i386 (UP and MP).
-	  Some additional coding is still necessary for the alpha,
-	  which is being done now.</p>
-      </li>
-    </ul>
-
-    <b>30 August 2000</b>
-    <ul>
-      <li>
-	<p>Updated patches for i386 and alpha are available <a href =
-	  "http://people.FreeBSD.org/~jasone/smp/smpng_patch8.6">here</a>.</p>
-      </li>
-    </ul>
-
-    <b>12 August 2000</b>
-    <ul>
-      <li>
-	<p>Updated patches for i386 are available <a href =
-	  "http://www.FreeBSD.org/~jhb/patches/smpng.patch6">here</a>.
-	  Process accounting still doesn't work correctly, but a number
-	  of other improvements have been made.</p>
-      </li>
-    </ul>
-
-    <b>3 August 2000</b>
-    <ul>
-      <li>
-	<p>Patches with functional heavy-weight threads for the i386
-	  platform are available <a href =
-	  "http://people.FreeBSD.org/~grog/patches4.gz">here</a>.
-	  There are a couple of minor issues with this patch set.
-	  Specifically, process accounting doesn't work correctly.</p>
-      </li>
-    </ul>
-
-    <b>6 July 2000</b>
-    <ul>
-      <li>
-	<p>Sheldon Hearn has prepared a mutex(9) man page based on the
-	  BSD/OS one, which is available <a href =
-	  "http://people.FreeBSD.org/~jake/mutex.9">here</a>.</p>
-      </li>
-    </ul>
-
-    <b>5 July 2000</b>
-    <ul>
-      <li>
-	<p>&a.jake; put an updated patch <a href =
-	  "http://people.FreeBSD.org/~jake/smpng.diff">here</a>.</p>
-      </li>
-    </ul>
-
-    <b>3 July 2000</b>
-    <ul>
-      <li>
-	<p>&a.jake; has the BSD/OS lock code working now, and has
-	  incorporated the pertinent portions of &a.dillon;'s patches
-	  (idle processes, some of the schedlock changes, etc.).
-	  His patch set is available <a href =
-	  "http://people.FreeBSD.org/~jake/smpng2.tar">here</a>.</p>
-      </li>
-    </ul>
-
-    <b>26 June 2000</b>
-    <ul>
-      <li>
-	<p>&a.cp; has provided the PostScript versions of his
-	  presentation slides for the
-	  <a href="http://people.FreeBSD.org/~jasone/smp/smp_meeting_slides_1.ps">first day</a> and
-	  <a href="http://people.FreeBSD.org/~jasone/smp/smp_meeting_slides_2.ps">second day</a> of the
-	  SMP meeting.</p>
-      </li>
-    </ul>
-
-    <b>25 June 2000</b>
-    <ul>
-      <li>
-	<p>Here's a copy of the
-	  <a href="http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=226208+0+archive/2000/freebsd-smp/20000625.freebsd-smp">SMP meeting summary</a>
-	  that was posted to the -smp mailing list.</p>
-      </li>
-    </ul>
-
-    <b>19 June 2000</b>
-    <ul>
-      <li>
-	<p>Here's a copy of the
-	  <a href="http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=154884+0+archive/2000/freebsd-current/20000625.freebsd-current">SMP project announcement</a>
-	  that was posted to the -current mailing list.</p>
-      </li>
-    </ul>
-
-  </body>
-</html>
diff --git a/ja_JP.eucJP/htdocs/y2kbug.sgml b/ja_JP.eucJP/htdocs/y2kbug.sgml
deleted file mode 100644
index 77ae7b5840..0000000000
--- a/ja_JP.eucJP/htdocs/y2kbug.sgml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title 'Year 2000 bug (aka "Millennium bug")'>
-]>
-<!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.47 -->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.about">
-
-    <p>2000 ǯ���� (��̾������ǯ���ΥХ���)
-      ���Ф���б�¦�����򤬿��ޤ�ˤĤ졢
-      ���¿���δ�Ȥ��顢�ϡ��ɥ������䥽�եȥ������Υ٥�����Ф��ơ�
-      �������ʤ� 2000 ǯ�ˤ�����žʤ�ˤɤΤ褦���н褹��Τ���
-      ��Ū�ʽ꿮ɽ�����׵᤹�������ФƤ��Ƥ��ޤ���</p>
-
-    <p>&unix; �� FreeBSD �Τ褦�� Unix �饤���� OS ����Ѥ��Ƥ������Τϡ�
-      ���ˤ�������ΰ���������Ǥ��ޤ���FreeBSD �� 2000
-      ǯ���᤮�Ƥ����֤��ä���Ǥ⡢���������֤�ݻ����뤳�Ȥ��Ǥ���Ǥ��礦��</p>
-
-    <h2>ͽ���μ�</h2>
-
-    <p><i>(������� <a
-	  href="http://www.linux.org.uk/mbug.html">Linux Y2K compliance
-	  page</a> ��ʸ�Ϥ˴�Ť�����ΤǤ�)</i></p>
-
-    <p>���٤Ƥ� Unix �� Unix �饤���ʥ��ڥ졼�ƥ��󥰥����ƥ��Ʊ���褦�ˡ�
-      FreeBSD �ˤ�������֤����դϡ�����Ū�ˤϡ�
-      1970 ǯ 1 �� 1 �� (Unix �Ρֵ���ǯ��) ������ÿ���ɽ������Ƥ��ޤ���
-      ���ߤΤȤ����������ÿ��� 32 bit Ĺ�������Ȥ��Ƴ�Ǽ����Ƥ��ꡢ
-      2038 ǯ�Ȥ���äȤޤǹԤä��Ȥ����ǻȤ��̤������׻��ˤʤ�ޤ���
-      �����餯�����κ��ˤϡ�
-      ���α���ν����Ȥ��ޤ����Ω�ġ�64 bit Ĺ��
-      (���뤤�Ϥ���ʾ��Ĺ����) �����󥿤���Ѥ��Ƥ���Ǥ��礦��</p>
-
-    <p>2000 ǯ������б��Ѥ� OS ����Ѥ����Ȥ��Ƥ⡢2000
-	ǯ������б����Ƥ��ʤ����ץꥱ�������������
-	ư���櫓�ǤϤ���ޤ������դ��Ƥ���������
-    </p>
-
-    <p>�ޤ���OS �����ߤ����������դ򥳥�ԥ塼���� CMOS
-      �����å������ɤ߹���Ǥ��뤳�Ȥˤ����դ��Ƥ���������
-      �����ΥǥХ������٤Ƥ� 2000 ǯ��������������櫓�ǤϤ���ޤ���
-      �ϡ��ɥ����������å��� 1999 ǯ���� 2000 ǯ���������ܹԤǤ��뤳�ȡ�
-      ������ 2000 ǯ�����������뤦ǯ�Ȥ��ư����뤳�Ȥ�
-      �ƥץ�åȥե�����Ǹ��̤˳Τ��᤿�����ɤ��Ǥ��礦��</p>
-
-    <h2>���ʤ��ˤǤ��뤳��</h2>
-
-    <p>FreeBSD �ϼ������������äƤ⡢
-      ���������֤�ݻ���³���뤳�Ȥ��Ǥ���Ǥ��礦����������
-      �����ɥѡ��ƥ����Υ��ץꥱ�������Ϥ����Ǥʤ����⤷��ޤ���
-      2000 ǯ������Ф��Ƥϡ�����Ϻ�����ɸ�ȸ����ޤ���
-      ���ʤ��ߤ����٤������ν����ˤĤ��Ƥ�ʪ��ˤ������򤹤ޤ��Ƥ�������Ǥϡ�
-      ��ǯ���ΥХ����褹�뤳�Ȥ�<strong>�Ǥ��ޤ���</strong>��
-      �������λ������Τ��ԤäƤ��Ƥ�Ʊ�����ȤǤ���
-      FreeBSD �ץ��������Ȥϡ��ߤʤ�����ȿ������褿����ǯ���˸���
-      ���ä��ꤷ�������ƥ�����θ�§��Ŭ�Ѥ��뤳�Ȥ򤪴��ᤷ�ޤ���</p>
-
-    <h2>FreeBSD 2000 ǯ����꿮ɽ��</h2>
-
-    <blockquote>
-     <p>�ֹ��ϰϤˤ錄��ʬ�ϤȻ�η�̡��桹�� FreeBSD �� 100%
-     2000 ǯ��Ŭ�礷�Ƥ���ȿ�����˻��ޤ�����
-     �Թ��ˤⲿ��������Ȥ���Ƥ������Ǥ⡢
-     �桹��������ǽ�ʸ¤ꤹ�ߤ䤫�˲��Ǥ���褦�˥٥��Ȥ�Ԥ����ޤ�����</p>
-
-    <p align="right">David Greenman<br/>Principal Architect, The
-       FreeBSD project</p>
-    </blockquote>
-
-    <h2>�����Ѥ�����</h2>
-
-    <p>FreeBSD ��Ǥϡ��ʲ��� 2000 ǯ����ϴ���ȯ�����졢��������Ƥ��ޤ���</p>
-
-    <dl>
-      <dt><a
-         href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=1380">misc/1380</a>
-</dt>
-      <dd>yacc, ftpd, make �ʤɤ�ʣ���Υץ�����ब��ǯ��ɽ���Ȥ��� 19%d
-      (����: C �ν񼰻���ʸ�����Ȥäơ�1900 ǯ��Ǥ���ȷ���Ǥ����Ƥ���)
-      ���֤��褦�˥ϡ��ɥ����ɤ���Ƥ��ޤ�����
-       [������: yacc v1.2 1999/01/18; ftpd v1.7 1996/08/05;
-        make v1.4 1996/10/06; FreeBSD-2.2 �ʹߤǽ�����]</dd>
-
-      <dt><a
-         href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=1382">conf/1382</a>
-</dt>
-      <dd>/etc/rc.local ������``message of the day''
-         �Τ���˥ۥ��� / �����ͥ� ID ��ӥ�ɤ��� sed ������ץȤϡ�
-         ǯ�� 1999 �ʹߤˤʤ�ʤ����Ȥ˰�¸���Ƥ��ޤ�����
-       [������ v1.21 1996/10/24; FreeBSD-2.2 �ʹߤǽ�����]</dd>
-
-      <dt><a
-         href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=3465">misc/3465</a>
-</dt>
-      <dd>/etc/namedb/make-localhost ���ޥ�ɤϡ�DNS �Υ��ꥢ���ֹ��
-         YYMMDD �η������������Ƥ��ޤ���2000 ǯ�ˤϡ�
-         �����ֹ�� 1YYMMDD �η��������������Ǥ��礦��
-       [������ v1.2 1997/08/11; FreeBSD-2.2.5 �ʹߤǽ�����]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=4930">gnu/4930</a> and
-	  <a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=8321">gnu/8321</a></dt>
-      <dd>groff �� tmac �ޥ����ϡ����������դ�ưŪ�� 1900
-         ǯ����Ȳ�᤹��褦�˥ϡ��ɥ����ɤ���Ƥ��ޤ�����
-      [������: tmac.e v1.3 1998/12/06; doc-common v1.10 1999/01/19;
-      FreeBSD-3.1 �ʹߤǽ�����]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9323">bin/9323</a></dt>
-
-      <dd>touch �ϡ�����������դ�Ϳ������硢2 ���ǯ�����������
-	�����ޤ���00 ���� 68 �ޤǤ�ǯ����ϡ�2000 ���� 2068 �ǤϤʤ�
-	1900 ���� 1968 �Ȳ�ᤵ��ޤ���
-       [������ v1.7 1999/01/05; FreeBSD-3.1 �ʹߤǽ�����]</dd>
-
-      <dt><a
-	  href="http://cvsweb.FreeBSD.org/src/usr.sbin/xntpd/parse/util/dcfd.c">xntpd/parse/util/dcfd.c</a></dt>
-
-      <dd>UNIX �ˤ����뵪���ΰ������ְ�äƤ��뤿��ˡ����뤦ǯ�������η׻���
-      DCF77 �����λ��֤��Ѵ����������Ԥ��ޤ��󡣤��Υ��顼�ϡ�2000
-	ǯ�����ǤϤʤ����ɤ�ǯ�Ǥ�����Ȥʤ��ΤǤ�����
-       [������ v1.6 1999/01/12; FreeBSD-3.1 �ʹߤǽ�����]</dd>
-
-      <dt><a
-	  href="http://cvsweb.FreeBSD.org/src/gnu/usr.bin/tar/getdate.y">tar/getdate.y</a></dt>
-
-      <dd>Conver() �ؿ��� 70-99 �� 2 ���ǯ�򰷤��褦�˥ϡ��ɥ�����
-      ����Ƥ��ޤ��������� 2 ���ǯ���� 1970-2069 �ޤǰ�����褦��
-      �ѹ�����ޤ�����������������ۤ���ǯ�����뤦ǯ�Ǥʤ�����
-      ���ݡ��Ȥ��Ƥ��ޤ���
-      [������ v1.4 1999/01/12; FreeBSD-3.1 �ʹߤǽ�����]</dd>
-
-      <dt><a
-	  href="http://cvsweb.FreeBSD.org/src/usr.bin/fetch/http.c">fetch/http.c</a></dt>
-
-      <dd>HTTP �ץ��ȥ����ǯ�٤� 2 ���ɽ������������եե����ޥåȤ�
-        �ޤ�Ǥ��ޤ��������ΥС������� fetch �ϡ����Τ褦�� 2 ���ǯ�٤�
-        ���٤� 1900 ǯ��Ȳ�ᤷ�Ƥ��ޤ��������ΥС������ʹߤ�
-        <a href="ftp://ftp.cdrom.com/pub/internet/rfc/rfc2068.txt">RFC 2068</a>
-        �ε��Ҥ˽�����2 ���ǯ�٤ϡ�50 ǯ�ʾ���ξ������������������
-        ǯ�٤Ȥ��ư�����褦�ˤʤ�ޤ���������������եե����ޥåȤ���Ѥ���
-        HTTP �����Фϡ��������Ȥ��ʤ��ʤäƤ��뤿�ᡢ�����Զ�礬�����
-        ���������������ȤϤʤ��Ǥ��礦��
-       [������ v1.24 1999/01/15; FreeBSD-3.1 �ʹߤǽ�����]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9500">misc/9500</a></dt>
-      <dd>CVSROOT �ǥ��쥯�ȥ�ˤ��� `edithook' ������ץȤ����� tm_year ��
-      ���Ѥ��Ƥ���Τǡ�2000 ǯ 1 �� 1 �� �� 01/01/100 ��ɽ������Ǥ��礦��
-      [������ v1.2 1999/01/17; FreeBSD �Υ�꡼���ˤϴط��ʤ�]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9501">bin/9501</a></dt>
-
-      <dd>�����Ĥ��� cvs ���ۥե������ 2000 ǯ��Ŭ�礷�Ƥ��ޤ���
-      log.pl �� sccs2rcs.csh ������ץȤ�ǯ�٤� `19' ��Ĥ��ä���
-      ���η�� 2000 ǯ�� 19100 ǯ��ɽ�����ޤ���log_accum.pl
-      ������ץȤϡ�����Ȥ����Ǥ� 2 ���ǯ�٤�Ȥ����̤ΤȤ����Ǥ�
-      tm_year �� 1900 ǯ�����ǯ����ɽ����ΤǤϤʤ����ष����������
-      ǯ�٤�ɽ����ΤǤ���Ȳ��ꤷ�Ƥ��ޤ���
-      [������: log.pl v1.2 1999/01/15; sccs2rcs.csh v1.3 1999/01/15;
-      FreeBSD-3.1 �ʹߤǽ�����]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9502">bin/9502</a></dt>
-      <dd>groff �Υʥ�С��쥸���� `yr' �ϡ� (struct tm).tm_year ����������
-      ���Ƥ���Τǡ���������ǯ�٤�ɽ���Ƥ���ΤǤϤʤ���1900ǯ�����ǯ����
-      ɽ�����ޤ� (troff/inpuut.cc �������򸫤Ƥ�������)��
-      [������ mod 100 �˥��åȤ���Ƥ��ޤ���troff/input.cc V1.2 1999/06/03;
-      FreeBSD-3.3 �ǽ�����]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9503">bin/9503</a></dt>
-
-      <dd>PicoBSD �� simple_httpd ������ tm_year ����Ѥ��Ƥ���Τǡ�
-      2000 ǯ 1 �� 1 ���� 01/01/100 ��ɽ������Ǥ��礦��
-      [������ v1.2 1999/01/16; FreeBSD-3.1 �ʹߤǽ�����]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9505">bin/9505</a></dt>
-
-      <dd>adduser ������ tm_year ����Ѥ��Ƥ���Τǡ�2000 ǯ 1 �� 1 ����
-      01/01/100 ��ɽ������Ǥ��礦��
-      [������ v1.42 1999/01/15; FreeBSD-3.1 �ʹߤǽ�����]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9506">bin/9506</a></dt>
-
-      <dd>cron ������ tm_year ����Ѥ��Ƥ���Τǡ�2000 ǯ�� 100
-      ��ɽ������Ǥ��礦��
-      [������ v1.7 1999/01/16; FreeBSD-3.1 �ʹߤǽ�����]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9507">bin/9507</a></dt>
-
-      <dd>tcpslice(8) ������ tm_year ����Ѥ��Ƥ���Τǡ�2000 ǯ 1 �� 1 ����
-      100y01m01d... ��ɽ������Ǥ��礦���ߴ����Τ���ˡ�2000ǯ�ޤǤ� 2 ���
-      ǯ�٤���Ѥ��ޤ���
-      [������ v1.8 1999/01/20; FreeBSD-3.1 �ʹߤǽ�����]</dd>
-
-      <dt><a href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=14472">
-	  bin/14472</a></dt>
-
-      <dd>date ���ޥ�ɤ���ǯ/ɴǯ�η�����Ǥ��ޤ���
-	[������ v1.31 1999/11/10]
-	</dd>
-
-      <dt><a href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=14511">
-	  misc/14511</a></dt>
-
-      <dd>chpass ��ͭ�����¤�ǯ�� 00 ����ꤷ�����ν��������꤬����ޤ���
-	</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=15852">bin/15852</a>��
-	  <a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=16045">gnu/16045</a>��
-	  <a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=16207">bin/16207</a>
-	  </dt>
-
-      <dd>\*(DT [\*(td] ʸ�����������Ƥ��� Groff �ˤ� 2000 ǯ���꤬����ޤ���
-        [v1.15 �� import �ˤ�꽤���� 2000/01/12]
-      </dd>
-
-      <dt><a
-          href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=15872">bin/15872</a></dt>
-
-      <dd>at(1) �ˤϡ�tm_year �� 100 �ξ�硢ͭ���ʻ��ֻ��꤬ `�����ʻ���'
-        �Ȥ��������֤��Ȥ������꤬����ޤ���
-      </dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=16238">misc/16238</a></dt>
-
-      <dd>KerberosIV �Υ��󥹥ȡ��뤬�������ư��ޤ���
-        ����ϡ������å�ǧ�ڴ��¤� 12/31/99 �Ȥ����褦�ˡ�
-        �ϡ��ɥ����ǥ��󥰤��줿��ʬ���������ץ��������ˤ��뤿��Ǥ���
-        [������ v1.24 1999/09/19]
-	</dd>
-    </dl>
-
-    <h2>���ʤ����</h2>
-
-    <p>FreeBSD �� 2000 ǯ�б��ˤĤ��ƹ��ʤ����򤪻����Ǥ��뤫��
-      FreeBSD �������� 2000 ǯ�б��ѤǤʤ����ץꥱ��������ȯ��������硢
-      <a href="mailto:freebsd-bugs@FreeBSD.org">freebsd-bugs@FreeBSD.org</a>
-      �ޤ�Ϣ�����Ƥ���������</p>
-
-  </body>
-</html>
diff --git a/pt_BR.ISO8859-1/books/faq/book.sgml b/pt_BR.ISO8859-1/books/faq/book.sgml
index 4da177597b..992e196d42 100644
--- a/pt_BR.ISO8859-1/books/faq/book.sgml
+++ b/pt_BR.ISO8859-1/books/faq/book.sgml
@@ -1155,19 +1155,6 @@ File: +DESC (ignored)</screen>
 	</answer>
       </qandaentry>
 
-      <qandaentry>
-	<question id="y2k">
-	  <para>Onde encontro informa��es sobre a
-	    compatibilidade FreeBSD ano 2000 (FreeBSD Y2K)?</para>
-	</question>
-
-	<answer>
-	  <para>Informa��es completas na <ulink
-	      url="../../../../y2kbug.html">p�gina FreeBSD
-	      Y2K</ulink>.</para>
-	</answer>
-      </qandaentry>
-
       <qandaentry>
 	<question id="newsgroups">
 	  <para>Que grupos de not�cias (<foreignphrase>news
diff --git a/ru_RU.KOI8-R/articles/committers-guide/article.sgml b/ru_RU.KOI8-R/articles/committers-guide/article.sgml
index f2d50b953a..52f58391b4 100644
--- a/ru_RU.KOI8-R/articles/committers-guide/article.sgml
+++ b/ru_RU.KOI8-R/articles/committers-guide/article.sgml
@@ -1504,9 +1504,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
 	    ������ � ���������� �������� �� ������������ ����.  ���� �����
 	    �������� ���������� ������ "����������� SMPng".  ���� �� ���������
 	    � ������� ������������ ������������������ ����, ������������� ����
-	    ������ � ������.  �������������� ���������� � ������� SMPng �����
-	    �������� �� ������
-	    <ulink url="http://www.FreeBSD.org/smp/"></ulink></para>
+	    ������ � ������.</para>
 	</listitem>
       </varlistentry>
 
diff --git a/ru_RU.KOI8-R/htdocs/Makefile b/ru_RU.KOI8-R/htdocs/Makefile
index 3d3f239125..cfdcd7924f 100644
--- a/ru_RU.KOI8-R/htdocs/Makefile
+++ b/ru_RU.KOI8-R/htdocs/Makefile
@@ -31,7 +31,6 @@ DOCS+= relnotes.sgml
 DOCS+= send-pr.sgml
 DOCS+= support.sgml
 DOCS+= where.sgml
-DOCS+= y2kbug.sgml
 
 XMLDOCS=	index:xsl:${XML_NEWS_NEWS}:
 DEPENDSET.index=transtable mirrors news press events \
@@ -68,7 +67,6 @@ SUBDIR+= events
 SUBDIR+= handbook
 SUBDIR+= internal
 SUBDIR+= java
-SUBDIR+= kse
 SUBDIR+= marketing
 #SUBDIR+= multimedia
 SUBDIR+= news
@@ -80,7 +78,6 @@ SUBDIR+= releases
 SUBDIR+= releng
 SUBDIR+= search
 SUBDIR+= security
-SUBDIR+= smp
 SUBDIR+= snapshots
 SUBDIR+= support
 SUBDIR+= tutorials
diff --git a/ru_RU.KOI8-R/htdocs/docs/webresources.sgml b/ru_RU.KOI8-R/htdocs/docs/webresources.sgml
index 6ac338ac4b..1c53fb6a20 100644
--- a/ru_RU.KOI8-R/htdocs/docs/webresources.sgml
+++ b/ru_RU.KOI8-R/htdocs/docs/webresources.sgml
@@ -65,10 +65,6 @@
 
   <h2>�������������� ��������� ����������</h2>
 
-  <h3><a href="../y2kbug.html">�������� 2000</a></h3>
-
-  <p>������� ��������� ������� FreeBSD � �������� 2000'���� ����.</p>
-
   <h3><a href="http://fxr.watson.org/">�������� ���</a></h3>
 
   <p>���� ��� �������� ������� �������� � �������� ����, ��� ��������������
diff --git a/ru_RU.KOI8-R/htdocs/internal/developer.sgml b/ru_RU.KOI8-R/htdocs/internal/developer.sgml
index c487a4ab87..4b70b0c6e9 100644
--- a/ru_RU.KOI8-R/htdocs/internal/developer.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/developer.sgml
@@ -81,9 +81,6 @@
     <li><a href="../platforms/sparc.html">
       ������ FreeBSD/SPARC</a></li>
 
-    <li><a href="&base;/../smp/">
-      ������ SMP Next Generation</a></li>
-
     <li><a href="http://www.TrustedBSD.org/">
       ������ TrustedBSD</a></li>
 
diff --git a/ru_RU.KOI8-R/htdocs/java/dists/10.sgml b/ru_RU.KOI8-R/htdocs/java/dists/10.sgml
deleted file mode 100644
index be70246fcc..0000000000
--- a/ru_RU.KOI8-R/htdocs/java/dists/10.sgml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "������ FreeBSD Java: JDK 1.0">
-]>
-
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSDru: frdp/www/ru/java/dists/10.sgml,v 1.4 2003/10/16 10:57:57 den Exp $
-
-     Original revision: 1.5
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-  <body class="navinclude.developers">
-
-  <h2>&jdk; 1.0.x</h2>
-
-  <p>���� ��� ���������� ����, ����� ������������ �� �������
-    freefall.FreeBSD.org ������ ���.  ���� �� ������� ��� �����, ������
-    �������� ������������. :)</p>
-
-  <pre>
-�����
------
-�������� ����������� JDK 1.0.2 � ������ ����� ��� FreeBSD ������ ��������
-�� ������ freefall.FreeBSD.org:/pub/FreeBSD/LOCAL_PORTS/jdk102.tar.gz
-� ���� ���� �������� ������������� java, ���������� � ����������� ������.
-��� ��������� ���������������� �����������.
-
-���������
----------
-1. �������� freefall.FreeBSD.org:/pub/FreeBSD/LOCAL_PORTS/jdk102.tar.gz.
-2. �������� ������� � ���������� ���� ����������� ��� FreeBSD.
-3. ���������� ���� pdksh.
-
-������ JDK
-----------
-���� ��� ��������� ������� ��� JDK ���������� &lt;jdk&gt;, ��� ����� ��������
-  1. � ���� ��� ������ ������� &lt;jdk&gt;/bin directory
-  2. � ���������� ��������� CLASSPATH .:&lt;jdk&gt;/classes
-  3. � LD_LIBRARY_PATH ���� &lt;jdk&gt;/lib/i386
-��� ���������� �������� java, ��������� 'javac program.java'.
-��� ������� ���������, �������� 'java &lt;��� �������� ������&gt;'.
-
-������ �� ������ �������
-------------------------
-Q: ����� �� ����� Motif?
-A: ���.
-
-Q: �� ����� ������ FreeBSD �� ��������?
-A: � ������� � ������� ������� FreeBSD, ��� ��� � �������� ������ ����
-   ������.   /*"FreeBSD-current?" - ����������� ������� Dave Hummel, ��
-				    ������������ ����� */
-
-Q: ��� �� �������� �� ���� ������.  ��� ��� ������?
-A: ��� �� �������.  ���� ����������� ����� �� ��������������.
-  </pre>
-
-</body>
-</html>
diff --git a/ru_RU.KOI8-R/htdocs/java/dists/11.sgml b/ru_RU.KOI8-R/htdocs/java/dists/11.sgml
deleted file mode 100644
index 53f0ef7318..0000000000
--- a/ru_RU.KOI8-R/htdocs/java/dists/11.sgml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "������ FreeBSD &java;: &jdk; 1.1">
-]>
-
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSDru: frdp/www/ru/java/dists/11.sgml,v 1.4 2003/10/16 10:57:57 den Exp $
-
-     Original revision: 1.8
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-  <body class="navinclude.developers">
-
-  <p>��������� ������� �������� <a
-    href="ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/jdk1.1.8_ELF.V1999-11-9.tar.gz">
-    jdk1.1.8_ELF.V1999-11-9.tar.gz</a>.  ��� ������������� ��� ELF (FreeBSD
-    ������ 3 � 4), � ��� ����� ������ ������� 2.2 �� ������ ������� <a
-    href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/nate/JDK1.1/jdk1.1.8_AOUT.V1999-11-9.tar.gz">
-    jdk1.1.8_AOUT.V1099-11-9.tar.gz</a>.  �����, ������� �������������� ���
-    ���������� ����� �������, �������� <a
-    href="http://www.freebsd.org/~patrick/patches.tar.gz">�����</a>.  ���
-    ���������� ���, ������ ���� � ��� ���� �������� ������ Java.</p>
-
-  <p>����� ����, ������� ��������������� ����������������� ������ JRE&trade;.</p>
-  <ul>
-    <li>
-<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/nate/JDK1.1/jre1.1.8i_AOUT.V1999-11-9.tar.gz">jre1.1.8i_AOUT.V1999-11-9.tar.gz</a></li>
-<li>
-<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/nate/JDK1.1/jre1.1.8i_ELF.V1999-11-9.tar.gz">jre1.1.8i_ELF.V1999-11-9.tar.gz</a></li>
-  </ul>
-
-  <p>���������� ������� �� � ���������� � ��� �����, ���� ��� �������.  ���
-    ���������� ����� �� � ������ �� ���� ������:</p>
-  <ul>
-    <li><a href="ftp://ftp.nuxi.com/pub/FreeBSD/JDK/">ftp://ftp.nuxi.com/pub/FreeBSD/JDK/</a>
-<br/>������� ������ �'������� (David O'Brien) (obrien@NUXI.com), ������� ���
-  ��� ���� �� ��� ������, ��� ��� ��� ������� ������ �������� ����������
-  ����������.</li>
-
-<li>
-<a href="http://mirror.aarnet.edu.au/pub/FreeBSD/JDK/">http://mirror.aarnet.edu.au/pub/FreeBSD/JDK/</a></li>
-
-<li>
-<a href="ftp://mirror.aarnet.edu.au/pub/FreeBSD/JDK/">ftp://mirror.aarnet.edu.au/pub/FreeBSD/JDK/</a>
-<br/>�������� ������ � ���������/����� ��������.  ������� Jason Andrade
-(jason@dstc.edu.au) �� �������� ���� ������ �� �������.</li>
-
-<li>
-<a href="ftp://ftp.se.freebsd.org/pub/FreeBSD/JDK/">ftp://ftp.se.freebsd.org/pub/FreeBSD/JDK/</a>
-<br/>������� Johan Larsson (gozer@ludd.luth.se).</li>
-
-<li>
-<a href="ftp://ftp7.de.freebsd.org/pub/FreeBSD/JDK/">ftp://ftp7.de.freebsd.org/pub/FreeBSD/JDK/</a>
-<br/><a href="http://ftp7.de.freebsd.org/pub/FreeBSD/JDK/">http://ftp7.de.freebsd.org/pub/FreeBSD/JDK/</a>
-<br/>������� Oliver Fromme (olli@dorifer.heim3.tu-clausthal.de).</li>
-
-<li>
-<a href="ftp://ftp.gwdg.de/pub/freebsd/JDK/">ftp://ftp.gwdg.de/pub/freebsd/JDK/</a>
-<br/><a href="http://ftp.gwdg.de/pub/freebsd/JDK/">http://ftp.gwdg.de/pub/freebsd/JDK/</a>
-<br/>������� Eberhard Moenkeberg (emoenke@gwdg.de).</li>
-
-<li>
-<a href="ftp://nofinesse.lib.surrey.ac.uk/pub/FreeBSD/JDK/">ftp://nofinesse.lib.surrey.ac.uk/pub/FreeBSD/JDK/</a>
-<br/>������� Jose Marques, ������� ��������������� ���� �������.</li>
-
-<li>
-<a href="ftp://ftp.spline.net/pub/FreeBSD/JDK/">ftp://ftp.spline.net/pub/FreeBSD/JDK/</a>
-<br/>������� Alexander Tatmaniants (tat@Spline.NET) .</li>
-</ul>
-
-<p>��� ������ �� ������� �������� Motif, ��� ��� ��� �������������� �
-  ����������� Motif, ������� ��������� ��������������� ��������� � ��������
-  ������ JDK.</p>
-
-<h3>README.FreeBSD:</h3>
-<pre>
-JDK1.1.8 ��� FreeBSD
---------------------
-����������� � ���� ������:
-- ������ �� JDK ������ ������ �������� �������.
-- ����������, ���������� ������������� ������������� �������� ��������������.
-  ������������������ ������ ��������.
-- ���������� ��������� �������� ���� DIVIDE � SIGFPE, ������� ������
-  ������������� � �������������� ���������.
-- ELF-������ ������ �������� ����� � ������������ AWT/Swing.  ������ FreeBSD
-  ����������� ����� ����������� ������ Motif, ��� ������� �������� ���������
-  ������� ������ X, ������� ��������� �����.
-
-��� ���������� ������ ����������� � ������ ���� ����������� �� ��������
-�������� � ������ ���������� �������� FreeBSD, �� ���� 2.2.8 ��� �������
-a.out � 3.2 ��� ELF.
-
-���� �� ����� ������ ��� � ��� ������� �����������, ������� �� �� ������
-������ � ����� ������, ������� ������ �� ������ 'java-port@FreeBSD.org',
-����� ������� ������ ����� ��� �����.
-
-��������� ������/�����������:
------------------------------
-���������� �������, ������� ����� ������������ ������������, ������� ������
-(� ��������� ������ 2000).  ��� �� ����������� ����������� ���� FreeBSD, ��
-���������� '������������' ����� ������������, ��� ��� ����� �� �������������
-���� �� ���������, � ����� ��� ����� ����� �� ��������.  ���� ��� ��� �����
-�����, �� ���� ����� ������, ������� �������� ������������ �����
-'������������' �����, ������� �� ������������ ���������� ��������
-������������ (�������).
-------------------------------------
-��� �������� ������������, ������� �������� ��� � X, ��� � ��� X,
-������������ ��� �������� �����.  ������ ��������� ��� X, � ��������
-����������� ������.  ������ �������� ���� ��������� �� ����������� ������� X,
-� ������������� X-������������.  ������������� ��������������� ������
-����������� ���������� ���������� ��������� DISPLAY, ������� ������������
-X ��� ����������� ����, ���� ������������ �����.
-</pre>
-</body>
-</html>
diff --git a/ru_RU.KOI8-R/htdocs/java/dists/12.sgml b/ru_RU.KOI8-R/htdocs/java/dists/12.sgml
deleted file mode 100644
index 307d619ea0..0000000000
--- a/ru_RU.KOI8-R/htdocs/java/dists/12.sgml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "������ FreeBSD &java;: &jdk; 2 (��������� ����� ��� JDK 1.2)">
-]>
-
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSDru: frdp/www/ru/java/dists/12.sgml,v 1.13 2003/10/17 10:05:27 den Exp $
-
-     Original revision: 1.17
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-  <body class="navinclude.developers">
-
-  <p> <b>18 �������� 2002:</b>
-    ���� ����� (Greg Lewis) �������� ����� ����� ������ ��� &jdk;&nbsp;1.2.2.</p>
-
-  <p>���������� ������� ��� ������������� FreeBSD ������������ ���������
-    ��������� JPDA.  ������ ������ ���������� �������� ��������� ��� <a
-    href="http://www.netbsd.org/">NetBSD</a>, ��� � <a
-    href="http://www.openbsd.org/">OpenBSD</a>.</p>
-
-  <p>��� � �����, ���� ����� ������ �������� �� ������ <a
-    href="http://www.eyesbeyond.com/freebsddom/java/jdk.html">
-    http://www.eyesbeyond.com/freebsddom/java/jdk.html</a>, ���� �������������
-    FreeBSD ���������� ������������� ��������������� ������ � ��������
-    ports/java/jdk12.</p>
-
-  <p> <b>14 ������� 2000:</b>
-    ������ ����� ������ (Greg Lewis) ������ JDK 1.2.2 ��� FreeBSD ��������� �
-    ������ ����-������������ � ������ �������� �� �������� ��������� ������
-    (ports/java/jdk12-beta).
-
-    <br/>���� ��� ���������� ���� ������������� ������ ��� ����������� i386,
-    ��� ���� ����, � ���� ���� i386 (����������� �� ���) �����������
-    ��������� JDK2, � ����� �������������� ��� � ������ �������� ������������ �
-    ����������� �����.  ���� � ��� ���� ���-��, ������������ ���� ���������,
-    ������ �� �� ������� ����?  ���������� ��������� � <a
-    href="../../doc/en_US.ISO8859-1/books/porters-handbook/index.html">
-    ����������� �� �������� ������</a>.</p>
-
-  <p>���� �� �������� ���������� ��������� ��� �������, �� ��-�� ������� ��
-    SCSL, ��� ����� ����� �������� �������� <a
-    href="http://www.eyesbeyond.com/freebsddom/java/jdk.html">
-    http://www.eyesbeyond.com/freebsddom/java/jdk.html</a> � ����������� �
-    ��������� SCSL ����� ���, ��� ��������� �������.</p>
-
-  <p><b>���������</b>:
-    ��� ���������� ����� ����� ��������� ����� ����� �� ����� (����� 250 ��).</p>
-
-  <p><b>3 ��� 2000:</b>
-    ���� ����� (Greg Lewis) ������ ��� ������� � ���, ��� ���� JDK 1.2.2
-    ��� ��������� FreeBSD ����ۣ� � ������ �����-������������.
-    <br/>� ��� ����, � ����� �� ������� ������, ���� ����� ��������� �
-    �������� �� ����������� ������� FreeBSD (3.4, 4.0 � 5.0 ��� x86) �
-    ����������� ������ ��� ������� (2.2.8 ��� x86 � 4.0 alpha).  �����������
-    ���������������� ���������� � ������ ��������.
-
-  <br/>������ �� ���� �����������, ������� ��������� ������� ������� ��
-    ������������ ������ �����.  ���� ��� ������������� ������, �������
-    ޣ���� ��������� �������� �� ���������� � ������������� �����.
-
-  <br/>�����, ��� ������, ��������� �� ������
-
-  <br/><a href="http://www.eyesbeyond.com/freebsddom/java/jdk.html">
-    http://www.eyesbeyond.com/freebsddom/java/jdk.html</a>
-
-  <br/>�������������� ����������, �������� ������� � ��������� ����������
-    ����� ���� ������� �� ������:
-
-  <br/><a href="http://www.kjkoster.org/java/index.html">
-    http://www.kjkoster.org/java/index.html</a></p>
-
-  <p><b>22 ����� 2000:</b>
-    ���� ����� (Greg Lewis) �������� ���-����� ����� ��� �������������
-    ������������� Java ��� ���������� �� ��� ����������� ������ FreeBSD
-    JDK&nbsp;1.2.2.  ���� ������� �� ��� ������������ � ������������ JDK
-    �� ������������ ��� ���������� ������.  �������� �� ���, �����������
-    ���������������� ���������� AWT � Swing ��������.  ����� �ݣ ����������
-    ������, � ��� ��������� ��� ����� ������ ��������.  ����� � ����������
-    �� ���������� ����� ���� �������� � <a
-    href="http://www.eyesbeyond.com/freebsddom/java/jdk.html">
-    http://www.eyesbeyond.com/freebsddom/java/jdk.html</a>.  ������� ������
-    ������� � ���������� ������������ ��������� ��
-    ������ <a href="http://www.kjkoster.org/java/index.html">
-    http://www.kjkoster.org/java/index.html.</a></p>
-
-  <p><b>30 ������ 2000:</b>
-    <br/>������� Linux Blackdown Port Team ��������� RC4 ������ JDK 1.2.  �� ���
-    ������������� �� FreeBSD 3.4-STABLE � ����� ������� ������� � � ���
-    �������� ��� ���������������� ������� � ���������������� ��������� jfc.
-    ��������� ������� �������� ��������� �������� ��� ������ � Apache JServ.
-    ���� �� �� �������� � ������ ������ FreeBSD, �� ����� ���� ������ �� ������
-    <a href="http://www.jmcm.org/tech/ports/linux_jdk.html">
-    http://www.jmcm.org/tech/ports/linux_jdk.html</a>.
-    (������� ���� ������ /Jose Marques/)</p>
-
-  <p><b>11 ������� 1999:</b>
-    ������ ������ ��� ������������� Java2/JDK1.2.
-    � ��������� ������ ������ ����� ����� ������ '�����' ����� ��� FreeBSD
-    3.3-stable/ELF.</p>
-
-  <p>��� ����������� �� ��������, ���������� ���������� JDK2, �� ������
-    ������������ ����� JDK1 � ������ <a
-    href="http://java.sun.com/products/jfc/index.html#download-swing">
-    Swing</a>, ��������������� Sun ��� JDK1, ������� ��������� �������� ���
-    FreeBSD.</p>
-
-</body>
-</html>
diff --git a/ru_RU.KOI8-R/htdocs/java/dists/13.sgml b/ru_RU.KOI8-R/htdocs/java/dists/13.sgml
deleted file mode 100644
index 8ba99b56f7..0000000000
--- a/ru_RU.KOI8-R/htdocs/java/dists/13.sgml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "������ FreeBSD &java;: &jdk; 1.3">
-]>
-
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSDru: frdp/www/ru/java/dists/13.sgml,v 1.9 2004/09/21 07:31:08 den Exp $
-
-     Original revision: 1.14
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-  <body class="navinclude.developers">
-
-    <p><b>19 ������� 2003:</b> <a href="mailto:glewis@FreeBSD.org">����
-      �����</a> (Greg Lewis) �������� �����̣���� ����� ������ (patchlevel 9)
-      ��� ������������ ������ JDK 1.3.1 � ��������������� �������
-      �����̣����� ����� ports/java/jdk13.  �����̣���� ����� ����� ��������,
-      ��� ������, �� ������ <a
-      href="http://www.eyesbeyond.com/freebsddom/java/jdk13.html">
-      http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-      <br/>� ���� ����� �������� ��������� ����������� � ���������, ��� ���,
-      ����������, ����� ���, ��� �������� � ���������, ���������
-      ����������.</p>
-
-      <p><b>12 ������� 2003:</b> <a href="mailto:glewis@FreeBSD.org">����
-        �����</a> (Greg Lewis) �������� ����������� ����� ������ (patchlevel 8)
-        ��� ������������ ����������� &jdk; 1.3.1 � �������������� �����̣����
-        ���� ports/java/jdk13.  �����̣���� ����� ����� �����, ��� ������, ��
-        <a href="http://www.eyesbeyond.com/freebsddom/java/jdk13.html">
-        http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-	<br/>��� ������ ����� ������������ ����������� JDK 1.3.1, ���������
-	����� Sun �� �������������.  �� �������� ��������� �����������
-	� ���������, ������� ���������� �������� ���������� ����� ���������
-	��������� �� ������.</p>
-
-      <p>
-	<b>26 ���� 2002:</b> <a href="mailto:glewis@FreeBSD.org">���� �����</a>
-	(Greg Lewis) �������� ����������� ����� ������ (patchlevel 7) ���
-	������������ ����������� JDK 1.3.1 � �������������� ����������� ����
-	ports/java/jdk13.  ����������� ����� ����� �����, ��� ������, ��
-	<a href="http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-	<br/>���� ����� �������� ��������� ����������� � ���������, �������
-	���������� �������� ���������� ����� ��������� ��������� �� ������.
-      </p>
-
-      <p>
-	<b>13 ������� 2002:</b> <a href="mailto:glewis@FreeBSD.org">���� �����</a>
-	(Greg Lewis) �������� ����������� ����� ������ (patchlevel 6) ���
-	������������ ����������� JDK 1.3.1 � �������������� ����������� ����
-	ports/java/jdk13. ����������� ����� ����� �����, ��� ������, ��
-	<a href="http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-	<br/>���� ����� �������� ��������� ����������� � ���������, �������
-	���������� �������� ���������� ����� ��������� ��������� �� ������.
-      </p>
-
-      <p>
-	<b>16 ������� 2001:</b> <a href="mailto:glewis@FreeBSD.org">���� �����</a>
-	(Greg Lewis) �������� ����������� ����� ������ (patchlevel 5) ���
-	������������ ����������� JDK 1.3.1 � �������������� ����������� ����
-	ports/java/jdk13. ����������� ����� ����� �����, ��� ������, ��
-	<a href="http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-	<br/>���� ����� �������� ��������� ����������� � ���������, �������
-	���������� �������� ���������� ����� ��������� ��������� �� ������.
-      </p>
-
-      <p>
-	<b>10 �������� 2001:</b> <a href="mailto:glewis@FreeBSD.org">���� �����</a>
-	(Greg Lewis) �������� ����������� ����� ������ (patchlevel 4) ���
-	������������ ����������� JDK 1.3.1 � �������������� ����������� ����
-	ports/java/jdk13. ����������� ����� ����� �����, ��� ������, ��
-	<a href="http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-	<br/>���� ����� �������� ��������� ����������� � ���������, �������
-	���������� �������� ���������� ����� ��������� ��������� �� ������.
-      </p>
-
-      <p>
-	<b>27 ������� 2001:</b> <a href="mailto:glewis@FreeBSD.org">���� �����</a> (Greg Lewis)
-	�������� ������������ ���� ������������ ����������� JDK 1.3.1.  ������
-	��� ����� ������� �� �������� ������ ports/java/jdk13.  ������� ������,
-	��� ��� ��������� ���� ���������, � ���� ����� ��� ��� ������������
-	<strong>������ ��� �������������</strong>, �� �������������
-	������������ ��� � �������� �������.
-      </p>
-
-      <p>
-	<b>16 ���� 2001:</b> <a href="mailto:glewis@FreeBSD.org">���� �����</a> (Greg Lewis)
-	�������� ����� ������ ��� �������������, �������������� �������
-	��������� FreeBSD JDK&nbsp;1.3.1.  ���������� ������, ��� ��� �����
-	<strong>������ ��� �������������</strong> � ���������� JDK ��
-	����������.  ����� ��������, � ��������, ��� ��������������
-	�������������� ����������� ������ ������� �� ������������, ��� ����,
-	����� �������� � ������ ������. ����� � ��������� ����� ���������� ��
-	������ ����� ��������� �
-	<a href="http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
-      </p>
-
-      <p><b>15 �������� 2000:</b>
-	<a href="mailto:gallatin@cs.duke.edu">����� ��������</a> (Andrew
-        Gallatin) � <a href="mailto:sean@stat.Duke.EDU">��� �'�������</a>
-        (Sean O'Connell) �������� ���
-	���������� �������� ������ JDK 1.3 ����� IBM.  ����� �� ��������� �
-	����� �������, ��� ����� ��������� ����� � ��������� �������� �������
-	FreeBSD.  ��� ������������ ����� � ����������� �� ����� ������:
-	<br/> <a href="http://www.cs.duke.edu/~gallatin/linux_sa_siginfo/4.0-release.diff">
-	4.0-RELEASE</a>
-	<br/><a href="http://people.freebsd.org/~patrick/ibmjdk/linux.patch2">
-	4.0-STABLE</a>
-	<br/><a href="http://www.cs.duke.edu/~gallatin/linux_sa_siginfo/diff">
-	-CURRENT</a> (�� SMPng)</p>
-
-      <p>����������� ��������� �� ���:<br/></p>
-        <pre>
-� �������-�� ������� ������ jdk 1.3 ����� IBM. ���� ������ � �ݣ ţ ��
-����������, ������, ��� AWT ��������.
-
-��� �����̣���� ����� ������ ��� ������ -current �� SMPng.  ����� ������
-������ ���������:
-
-- ������ �������� MINSIGSTKSZ � 8192  �� 2048
-- ��������� linux_rt_sendsig() &amp; linux_rt_sigreturn()
-- ��������� ���������������� ��� sigtramp ��� linux_rt_sigreturn()
-- ��������� linux_to_bsd_sigaltstack &amp; bsd_to_linux_sigaltstack() ���
-	����������� ������ � linux_sigaltstack &amp; �� ��������� ���������
-	������� � linux_rt_sigreturn().  ����� ���������� ��������� ���������
-	"Java HotSpot(TM) Client VM warning: cannot uninstall alt signal stack",
-	������� ���� �������� � JDK 1.3 ����� Sun.
-- ������� ���� MAP_STACK �� MAP_ANON ��� ������������ �������� ������
-	LINUX_MAP_GROWSDOWN. ��� ��� ��������� ��� ��� ����, ����� ���
-	��������. �������� �� ���� VM, ����� ���������� �� ����? ������, ���
-	���-�� �� ��� � ��������� ������� � ����� linux[*]
-
-����� ��������� �����: http://www.cs.duke.edu/~gallatin/linux_sa_siginfo/diff
-
-[*]"��������" � ������������� �������, ����������� � �������
-vm_map_growstack() ��� ����������� ����, �������� �� ���� ������ �����
-��������� ��������. ������ �� ����������:
-
-	is_procstack = addr >= (vm_offset_t)vm->vm_maxsaddr;
-
-��� vm->vm_maxsaddr ���������� �� exec_new_vmspace():
-	vmspace->vm_maxsaddr = (char *)USRSTACK - MAXSSIZ;
-
-������� ���� JDK ����� IBM ��������� ������ ��� ����� �� rlim_cur=2040*1024.
-����� ��� ������� ����� ��� ����� ����� � �������, ������� ���������
-vm_maxsaddr, �� ������, ��� ������� ������ ������� ����� ��������� ��������,
-��� ���������� � p->p_rlimit[RLIMIT_STACK].rlim_cur. ��� ������ ���� ��������
-���������� � ����-����, ��� ���� ��������� ���������� �������, ��� ��������.
-	</pre>
-
-      <p>� ������ ������ �� ����:</p>
-	<pre>
-� �� ������ ���� ������������������� � �����������, ������� �������� �����
-�������� ��� ����, ����� ��������� Java SDK �� IBM.  � ���� ���������
-appletviewer � ����� �� ���������������� ���������� � ��� ��������.  ������
-������� ������ �� ����.
-
-��� ����� ������� ������������ /usr/src (��� /, ������ ��� ��� ��� ���������
-� �������� sys )
-
-����������� ����������� ������� � ������ �� /sys/i386/linux.  �� ������
-����� ��������� ����; ��������� � ������� /sys/modules/linux; ��������
-make; kldunload linux; �������� make install; ����� kldload linux
-
-���� �ݣ ���� ���������, ������� ������ �������� MINSIGSTKSZ ������ 2048
-� sys/sys/signal.h .. ��� ������������ ����� ��������� ��������� ��������������
-����.
-        </pre>
-
-      <p><b>18 ���� 2000:</b>
-        <a href="ernst@jollem.com">����� �� ����</a> (Ernst de Haan) ��������
-        ��������� ������, ��� ��������� ��������� Linux JDK 1.3.0b9 ����� Sun �
-        4.0-STABLE.  ���� .java_wrapper ��������� �� ������ <a
-        href="http://people.freebsd.org/~patrick/sunjdk/java_wrapper">
-        �����</a>.  (�� �������� ������������� ��� � .java_wrapper)</p>
-
-      <p>��� ��� ����� �����:</p>
-        <pre>
-�ݣ ���� �����: �������� ���� jre/lib/jvm.cfg � ����������� ��������� ������
-������.  ����� �� ��������:
-
-   -classic
-   -hotspot
-   -server
-
-������, � ������� ��������� �������������� ��� ������� Swing-����������:
-
-   Warning: Cannot convert string "MetaCtrl&lt;Key&gt;Insert" to type VirtualBinding
-
-Ernst
-
-Ernst de Haan �����:
-> Hi folkz,
->
-> ��� ������� ��������� Sun JDK 1.3.0 for Linux, beta 9 �� ���� ������� FreeBSD
-> 4.0-STABLE. �������� ������ ������.
->
-> java -version ������ ���������:
->
->    bash-2.04$ java -version
->    expr: syntax error
->    java version "1.3.0beta_refresh"
->    Java(TM) 2 Runtime Environment, Standard Edition (build 1.3.0beta_refresh-b09)
->    Classic VM (build 1.3.0beta_refresh-b09, green threads, nojit)
->
-> ������ ������ � �������������� ������ �������� ��������� ��������� � ������
-> .java_wrapper, �� ������, ��� �����أ����. � �������� ��������� �����������
-> � ������� .java_wrapper, ����� �ӣ �������� �� ���� �������. ��������
-> ������, ������� � ���������.
->
-> �������� � �ݣ �� ����������, ������ ���������� ��������� ����
-> Swing-����������. � ������� ��������� ������� � �������, ���� ������, ���
-> �ӣ �������� ���������� ������ � ������ :)
->
-> ���, ����� FreeBSD ������ ���������� � ���������� ����������� ����������
-> �� ��� ������� JDK, ��� ������ �� ��� ���������� WINE, �� ������ ���������
-> ������ JDK �ݣ � ��� Windows, � �ݣ �������� �������� AS/400, � �ݣ... �
-> �ݣ... ;-)
->
-> Ernst
->
-> P.S.  ������� ������� �������� (Victor Salaman), ������� ������ ���
->       ���������� �����������. �� ���������� ����� �������� � Sun JDK 1.3
->       for Linux.
-        </pre>
-
-      <p><b>29 ������ 2000:</b>
-        ������ ��� ������������� JDK 1.3 �ݣ �� ��������.  � �� ��� ���, ����
-        �� ����� ������� ����� JDK 1.2, ������ ��� JDK 1.3 ����������� ��
-        �����.</p>
-
-</body>
-</html>
diff --git a/ru_RU.KOI8-R/htdocs/java/dists/14.sgml b/ru_RU.KOI8-R/htdocs/java/dists/14.sgml
deleted file mode 100644
index f4064054d5..0000000000
--- a/ru_RU.KOI8-R/htdocs/java/dists/14.sgml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "������ FreeBSD &java;: &jdk; 1.4">
-]>
-
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSDru: frdp/www/ru/java/dists/14.sgml,v 1.5 2004/02/04 10:49:36 den Exp $
-
-     Original revision: 1.9
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-
-<p>
-<b>30 ������� 2003:</b> <a href="mailto:glewis@FreeBSD.org">����
-�����</a> (Greg Lewis) �������� ������ ����� ������ (patchlevel 6) ���
-������������ ����������� &jdk;&nbsp;1.4.  ���� ����� ������ ��������� ���
-����������� ����������.  ���������� &jdk; ���������� �������� ������, ��
-� �������� ����������� �� ������ ������������ ��� ������ �� ���� ����.
-����� ������ � �������� ������������ ��� ����������� ������ 1.4.2p5.
-���������� �� �������� ������ ������ ����� ����� ��
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>.
-</p>
-
-<p>
-<b>November 11, 2003:</b> <a href="mailto:glewis@FreeBSD.org">����
-�����</a> (Greg Lewis) �������� ����� ����� ������ (patchlevel 5) ���
-������������ ����������� &jdk;&nbsp;1.4.  ���� ����� ��������� &jdk; �� ������
-1.4.2.  ��������� �������� ������ ������� ������, ����������� <a
-href="mailto:phantom@FreeBSD.org">�������� ���������</a>, ���� ����� ������
-��� ����� Sun �� �������������, ����� ����� � ��������� ����� IPv4 � IPv6.
-���������� � �������� ������ ������ ����� ����� ��
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>.
-</p>
-
-<p>
-<b>10 ������� 2003:</b> <a href="mailto:glewis@FreeBSD.org">����
-�����</a> (Greg Lewis) �������� ��������� ����� ������ (patchlevel 4)
-��� ������������ ����������� &jdk;&nbsp;1.4.  ������ ��� �������� ���
-����������� ����������, ���� ��� ��� ���� ��������� ��������.
-��������� �������� �������� ��������, GCC 3.3 ��������������,
-�������� ��������� �����������.  ���� ����� ������ ��������
-����������� �������� ���������� ������� ������ BSD Java Porting Team
-� FreeBSD Foundation.  ���������� � �������� ������ ������ �����
-����� ��
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>.
-</p>
-
-<p>
-<b>7 �����, 2003:</b> <a href="mailto:glewis@FreeBSD.org">���� �����</a>
-(Greg Lewis) �������� ������ ����� ������ (patchlevel 3) ���  ������������
-����������� &jdk;&nbsp;1.4.  ��� � ��������� ������ ����� ��� �������
-������������, ���� �� ��� ����������� ���� ����������� (��������
-�������, NIO).  ���� ����� ������ ���� ����������� �������� ������
-������� ������ <a href="mailto:phantom@FreeBSD.org">�������
-��������</a>.  ���������� � �������� ������ ������ ����� ����� ��
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>.
-</p>
-
-<p>
-<b>4 �������, 2003:</b> <a href="mailto:glewis@FreeBSD.org">���� �����</a>
-(Greg Lewis) �������� ������ ����� ������ (patchlevel 2) ��� ������������
-����������� &jdk;&nbsp;1.4.  ����������, �������, ��� ���� ����� ������
-������������ ��� ������� �������� � �������������.  ���� ����� ������
-������� �� &jdk;&nbsp;1.4.1 � ���� ����������� ���������� � ������� ������
-<a href="mailto:phantom@FreeBSD.org">�������
-��������</a>.  ���������� � �������� ������ ������ ����� ����� ��
-<a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>.
-</p>
-
-<p>
-<b>15 ������, 2002:</b> <a href="mailto:glewis@FreeBSD.org">���� �����</a>
-(Greg Lewis) �������� ������ ����� ������ (patchlevel 1) ��� ������������
-����������� &jdk;&nbsp;1.4.0.  �������, ��� ��� ������ ����� ������, �������
-�� ������������ ��� ������������� (� ��������).  ����� ����� ����� �� <a href=
-"http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>
-</p>
-
-</body></html>
-
diff --git a/ru_RU.KOI8-R/htdocs/java/dists/Makefile b/ru_RU.KOI8-R/htdocs/java/dists/Makefile
index ad576ae69f..7395961fb7 100644
--- a/ru_RU.KOI8-R/htdocs/java/dists/Makefile
+++ b/ru_RU.KOI8-R/htdocs/java/dists/Makefile
@@ -11,11 +11,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS =	10.sgml
-DOCS+=	11.sgml
-DOCS+=	12.sgml
-DOCS+=	13.sgml
-DOCS+=	14.sgml
-DOCS+=	index.sgml
+DOCS=	index.sgml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/java/index.sgml b/ru_RU.KOI8-R/htdocs/java/index.sgml
index 34c3cb7478..f9b5787a42 100644
--- a/ru_RU.KOI8-R/htdocs/java/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/index.sgml
@@ -66,10 +66,6 @@
 		<ul>
 		  <li><a href="install.html">��������� Java ��� FreeBSD</a></li>
 		  <li><a href="dists/">���������� � �������</a></li>
-		  <li><a href="dists/11.html">JDK 1.1.x</a></li>
-		  <li><a href="dists/12.html">JDK 1.2.x</a></li>
-		  <li><a href="dists/13.html">JDK 1.3.x</a></li>
-		  <li><a href="dists/14.html">JDK 1.4.x</a></li>
 		  <li><a href="../ports/java.html">��������� �����...</a></li>
 		  <li><a href="howhelp.html">��� � ���� ������?</a></li>
 		  <li><a href="howhelp.html#BUG">� ����� ������!?!</a></li>
diff --git a/ru_RU.KOI8-R/htdocs/java/newsflash.sgml b/ru_RU.KOI8-R/htdocs/java/newsflash.sgml
index 7c7d3a20ea..e91c86af9b 100644
--- a/ru_RU.KOI8-R/htdocs/java/newsflash.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/newsflash.sgml
@@ -39,7 +39,7 @@
           <li><b>13 ������� 2004:</b>
             <br/><a href="mailto:glewis@FreeBSD.org">���� �����</a> ��������
             ������� ����� ������ (patchset 7) � ����� &jdk;&nbsp;1.4.
-            ���������� � <a href="dists/14.html">�������� JDK 1.4.x</a> ���
+            ���������� � �������� JDK 1.4.x ���
             ��������� ����� ������ ����������.</li>
         </ul>
 
@@ -61,14 +61,14 @@
 	  <li><b>30 ������� 2003:</b>
 	    <br/><a href="mailto:glewis@FreeBSD.org">���� �����</a> (Greg
 	    Lewis) �������� ������ ����� ������ (patchset 6) � �����
-	    &jdk;&nbsp;1.4.  ���������� � <a href="dists/14.html">��������
-	    JDK 1.4.x</a> �� ���������� �����������.</li>
+	    &jdk;&nbsp;1.4.  ���������� � ��������
+	    JDK 1.4.x �� ���������� �����������.</li>
 
           <li><b>19 ������� 2003:</b>
             <br/><a href="mailto:glewis@FreeBSD.org">���� �����</a> (Greg Lewis)
             �������� �����̣���� ����� ������ (patchset 9) ��� ������ &jdk;&nbsp;1.3.1
-            �������������� ���������� ����� ����� �� �������� � <a
-            href="dists/13.html">JDK 1.3.x</a>.</li>
+            �������������� ���������� ����� ����� �� �������� �
+            JDK 1.3.x.</li>
         </ul>
 
         <h2>������ 2003</h2>
@@ -77,8 +77,8 @@
           <li><b>11 ������ 2003:</b>
             <br/><a href="mailto:glewis@FreeBSD.org">���� �����</a> (Greg Lewis)
             �������� ����� ����� ������ (patchset 5) � ����� &jdk;&nbsp;1.4.
-            �������������� ���������� ����� ����� �� �������� � <a
-            href="dists/14.html">JDK 1.4.x</a>.</li>
+            �������������� ���������� ����� ����� �� �������� �
+            JDK 1.4.x.</li>
         </ul>
 
         <h2>������� 2003</h2>
@@ -87,8 +87,8 @@
           <li><b>10 ������� 2003:</b>
             <br/><a href="mailto:glewis@FreeBSD.org">���� �����</a> (Greg Lewis)
             �������� ���ף���� ����� ������ (patchset 4) � ����� &jdk;&nbsp;1.4.
-            �������������� ���������� ����� ����� �� �������� � <a
-            href="dists/14.html">JDK 1.4.x</a>.</li>
+            �������������� ���������� ����� ����� �� �������� �
+            JDK 1.4.x.</li>
         </ul>
 
 	<h2>������ 2003</h2>
@@ -106,7 +106,7 @@
 	  <li><b>7 ����� 2003:</b>
 	    <br/><a href="mailto:glewis@FreeBSD.org">���� �����</a> (Greg Lewis) �������� ������
 	    ����� ������ (patchset 3) � ����� &jdk;&nbsp;1.4.  ���������� �
-	    <a href="dists/14.html">�������� JDK 1.4.x</a> �� ����� ���������
+	    �������� JDK 1.4.x �� ����� ���������
 	    �����������.</li>
 	</ul>
 
@@ -116,12 +116,12 @@
 	    <br/><a href="mailto:glewis@FreeBSD.org">���� �����</a> (Greg Lewis) ��������
 	    ����������� ����� ������ (patchlevel 8) ��� ������������ �����������
 	    &jdk;&nbsp;1.3.1. ���������� �
-	    <a href="dists/13.html">�������� JDK 1.3.x</a> �� ����� ���������
+	    �������� JDK 1.3.x �� ����� ���������
 	    �����������.</li>
 	  <li><b>4 ������� 2003:</b>
 	    <br/><a href="mailto:glewis@FreeBSD.org">���� �����</a> (Greg Lewis) ��������
 	    ������ ����� ������ (patchset 2) � ����� &jdk;&nbsp;1.4.  ���������� �
-	    <a href="dists/14.html">�������� JDK 1.4.x</a> �� ����� ���������
+	    �������� JDK 1.4.x �� ����� ���������
 	    �����������.</li>
 	</ul>
 
@@ -130,8 +130,8 @@
           <li><b>15 ������ 2002:</b>
             <br/> <a href="mailto:glewis@FreeBSD.org">���� �����</a> (Greg
             Lewis) �������� ������ ����� ������ (patchlevel 1) ��� ������
-            &jdk;&nbsp;1.4.0.  ��� ��������� ����� ������ ���������� ���������� � <a
-            href="dists/14.html">�������� JDK 1.2.x</a>.</li>
+            &jdk;&nbsp;1.4.0.  ��� ��������� ����� ������ ���������� ���������� �
+            �������� JDK 1.2.x.</li>
         </ul>
 
   <h2>�������� 2002</h2>
@@ -139,8 +139,8 @@
     <li><b>18 �������� 2002:</b>
       <br/> <a href="mailto:glewis@FreeBSD.org">���� �����</a> (Greg Lewis)
       �������� �����̣���� ����� ������ (patchlevel 11) ��� ������ &jdk;&nbsp;1.2.2.
-      ��� ��������� ����� ������ ���������� ���������� � <a
-      href="dists/12.html">�������� JDK 1.2.x</a>.</li>
+      ��� ��������� ����� ������ ���������� ���������� �
+      �������� JDK 1.2.x.</li>
 
     <li><b>17 �������� 2002:</b>
       <br/>����� ����� ������� ��������� Sun ������ J2SE 1.4.1 FCS, ������ ���
@@ -154,8 +154,8 @@
     <li><b>26 ���� 2002:</b>
       <br/> <a href="mailto:glewis@FreeBSD.org">���� �����</a> (Greg Lewis)
       �������� �����̣���� ����� ������ (patchlevel 7) ��� ������ &jdk;&nbsp;1.3.1.
-      ��� ��������� ����� ������ ���������� ���������� � <a
-      href="dists/13.html">�������� JDK 1.3.x</a>.</li>
+      ��� ��������� ����� ������ ���������� ���������� �
+      �������� JDK 1.3.x.</li>
   </ul>
 
   <h2>������� 2002</h2>
@@ -163,8 +163,8 @@
     <li><b>13 ������� 2002:</b>
       <br/><a href="mailto:glewis@FreeBSD.org">���� �����</a> (Greg Lewis)
       �������� �����̣���� ����� ������ (patchlevel 6) ��� ������ &jdk;&nbsp;1.3.1.
-      ��� ��������� ����� ������ ���������� ���������� � <a
-      href="dists/13.html">�������� JDK 1.3.x</a>.</li>
+      ��� ��������� ����� ������ ���������� ���������� �
+      �������� JDK 1.3.x.</li>
   </ul>
 
   <h2>������� 2001</h2>
@@ -205,8 +205,8 @@
     <li><b>16 ������� 2001:</b>
       <br/> <a href="mailto:glewis@FreeBSD.org">���� �����</a> (Greg Lewis)
       �������� �����̣���� ����� ������ (patchlevel 5) ��� ������ &jdk;&nbsp;1.3.1.
-      ��� ��������� ����� ������ ���������� ���������� � <a
-      href="dists/13.html">�������� JDK 1.3.x</a>.</li>
+      ��� ��������� ����� ������ ���������� ���������� �
+      �������� JDK 1.3.x.</li>
   </ul>
 
         <h2>�������� 2001</h2>
@@ -214,8 +214,8 @@
           <li><b>10 �������� 2001:</b>
             <br/> <a href="mailto:glewis@FreeBSD.org">���� �����</a> (Greg
             Lewis) �������� �����̣���� ����� ������ (patchlevel 4) ��� ������
-            &jdk;&nbsp;1.3.1.  ��� ��������� ����� ������ ���������� ���������� � <a
-            href="dists/13.html">�������� JDK 1.3.x</a>.</li>
+            &jdk;&nbsp;1.3.1.  ��� ��������� ����� ������ ���������� ���������� �
+            �������� JDK 1.3.x.</li>
 
           <li><b>6 �������� 2001:</b>
             <br/><a href="mailto:sobomax@FreeBSD.org">������ �������</a> (Maxim
@@ -235,7 +235,7 @@
             <br/><a href="mailto:glewis@FreeBSD.org">���� �����</a> (Greg Lewis) ��������
             ������������ ���� ��� ������������ ����������� &jdk;&nbsp;1.3.1.  ������
             �� ����� ��������� �� �������� ������ ports/java/jdk13.  ����������
-            � ��������� <a href="dists/13.html">JDK 1.3.x</a> ��� ���������
+            � ��������� JDK 1.3.x ��� ���������
             ����� ������ ����������.
 
             <p>������� ��������, ��� �� ������� ����� ���� ����� ������������
@@ -249,7 +249,7 @@
       <br/><a href="mailto:sobomax@FreeBSD.org">������ �������</a> (Maxim
       Sobolev) ������ ���� ������ &jdk;&nbsp;1.2.2.  ������ �� ����� ���� ��������
       �� �������� ports/java/jdk12-beta ��������� ������.  ���������� �
-      �������� � <a href="dists/12.html">JDK 1.2.x</a> ��� ��������� �����
+      �������� � JDK 1.2.x ��� ��������� �����
       ��������� ����������.
 
       <p>������ ��� ���������, � ������� �ģ� ���� ����, �������� � ����.</p>
@@ -267,7 +267,7 @@
       <br/><a href="mailto:ernst@jollem.com">Ernst de Haan</a> ������� ���������
       Linux &jdk;&nbsp;1.3.0b9 ����� Sun � 4.0-STABLE.
 
-      <p>������ ���������� ��������� <a href="dists/13.html">�����</a>.</p></li>
+      <p>������ ���������� ��������� �����.</p></li>
   </ul>
 
   <h2>������ 2000</h2>
diff --git a/ru_RU.KOI8-R/htdocs/kse/Makefile b/ru_RU.KOI8-R/htdocs/kse/Makefile
deleted file mode 100644
index f8f2dcaf01..0000000000
--- a/ru_RU.KOI8-R/htdocs/kse/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# The FreeBSD Russian Documentation Project
-#
-# $FreeBSD$
-# $FreeBSDru: frdp/www/ru/kse/Makefile,v 1.1 2004/01/27 19:05:28 andy Exp $
-#
-# Original revision: 1.1
-#
-
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
-.endif
-.if exists(../Makefile.inc)
-.include "../Makefile.inc"
-.endif
-
-DOCS=   index.sgml
-
-.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/kse/index.sgml b/ru_RU.KOI8-R/htdocs/kse/index.sgml
deleted file mode 100644
index 957bdb5022..0000000000
--- a/ru_RU.KOI8-R/htdocs/kse/index.sgml
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "������ FreeBSD KSE">
-<!ENTITY email 'mini'>
-
-<!-- Status levels -->
-<!ENTITY status.done "<font xmlns='http://www.w3.org/1999/xhtml' color='green'>���������</font>">
-<!ENTITY status.wip "<font xmlns='http://www.w3.org/1999/xhtml' color='blue'>�����������</font>">
-<!ENTITY status.stalled "<font xmlns='http://www.w3.org/1999/xhtml' color='purple'>���������</font>">
-<!ENTITY status.new "<font xmlns='http://www.w3.org/1999/xhtml' color='red'>�� ����������</font>">
-<!ENTITY status.resolved "<font xmlns='http://www.w3.org/1999/xhtml' color='green'>������</font>">
-<!ENTITY status.unresolved "<font xmlns='http://www.w3.org/1999/xhtml' color='red'>�� ������</font>">
-]>
-
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSDru: frdp/www/ru/kse/index.sgml,v 1.4 2005/05/27 11:19:40 andy Exp $
-
-     Original revision: 1.17
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.developers">
-
-  <h2>����������</h2>
-  <ul>
-    <li><a href="#overview">����� �������</a></li>
-    <li><a href="#using">������������� KSE</a></li>
-    <li><a href="#further.reading">�������������� ����������</a></li>
-    <li><a href="#status.kernel">��������� �������</a></li>
-  </ul>
-
-  <a id="overview" name="overview"></a>
-  <h2>�����</h2>
-
-  <p>������� ������������ ���� (Kernel Scheduler Entities - KSE) ������������
-    ����� ������� �������������� ���������� ����, ����������� ������� �������
-    Scheduler Activations [�������� � ������].  ��� ������������ ������ �����
-    �������� �������������� ���������� ����������������� ������ (1:N) � ������
-    ���� (1:1), �������� ������������ ����������� ����� ��������, � �����������
-    �� �������������� ���������.</p>
-
-  <p>� ���� ������� ������� ��� �������: ��������� �� ������ ���� � ���������
-    �� ������ ������������.  ��������� �� ������ ���� ������������ �����
-    ����������� � ������������ FreeBSD; ���������������� �������� ��������
-    ����������� &posix;-������� ����������, ������� ���������� ������������
-    �������������� ����� ����.</p>
-
-  <p>����� �������� ������ ��������� �� ������ ������ ���������������� �������
-    �������������� ���������� � ���������� libc_r � ��������� <tt>-pthread</tt>
-    ����������� gcc, �� ����� ���������� libpthread, ������� �����
-    ������������� ��� ������������� ��������� <tt>-lpthread</tt> �����������
-    gcc.</p>
-
-  <a name="using"></a>
-  <h2>������������� KSE</h2>
-
-  <p>��� ������ ��� KSE ����������� � 5.0-CURRENT.  ��� ���������� ���� �
-    �����������, ����������� KSE, �� ��������� ������� ����������� ����������
-    ���� (��������� �� �������� �� ������������ FreeBSD).</p>
-
-  <p>��� ������������� KSE � ���������� ��� ���������� ������������ ��� �
-    ����������� libpthread; ��� �������� ������ ����������� �������.  �
-    make-������ ���������� �������� �������� ����������� <tt>-pthread</tt> ���
-    �������� ������������ <tt>-lc_r</tt> �� <tt>-lpthread</tt> � ���������
-    ���������� ��������.  � �������� ��������������� ������� �� ������
-    ������������ ���� <tt>/etc/libmap.conf</tt> ��� ����������� libc_r �
-    libpthread (���������� � <tt>libmap.conf(5)</tt>).</p>
-
-  <a name="further.reading"></a>
-  <h2>�������������� ����������</h2>
-
-  <p/>
-
-  <ul>
-    <li><a href="http://www.aims.net.au/chris/kse/">
-       Kernel-Scheduled Entities ��� FreeBSD</a>, �������� ������.
-       (��������� ��������).</li>
-
-    <li><a href="http://www.FreeBSD.org/cgi/man.cgi?query=kse&amp;apropos=0&amp;sektion=0&amp;manpath=FreeBSD+5.0-current&amp;format=html">
-      ���������� �������� �� KSE</a></li>
-
-    <li><a href="http://people.FreeBSD.org/~deischen/docs/Scheduler.pdf">
-      Scheduler Activations</a>, �������� � ������.</li>
-  </ul>
-
-  <a name="status.kernel"></a>
-  <a name="status"></a>
-  <h2>��������� �������</h2>
-
-  <p>����� �������� �������� ����� �������� �����:</p>
-
-  <table class="tblbasic">
-    <tr>
-      <th>������</th>
-      <th>������</th>
-      <th>�������������</th>
-      <th>��������� ����������</th>
-      <th>���������</th>
-    </tr>
-
-    <tr>
-      <td>libpthread</td>
-      <td>��������� �������� ������� kse(2), ����������� ����� ���������
-        ������.</td>
-      <td>&a.archie;</td>
-      <td>10 �������� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>libpthread</td>
-      <td>Repo-����� ���������� libpthread �� libc_r.</td>
-      <td>������ cvs</td>
-      <td>16 �������� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>libpthread</td>
-      <td>������������� KSE ��� ������������ ���������.</td>
-      <td>&a.mini;</td>
-      <td>30 ������� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>libpthread</td>
-      <td>������������ �������������� ��������� �� �����������.</td>
-      <td>&a.mini;</td>
-      <td>2 ������ 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>libpthread</td>
-      <td>����������� �������� � ������.</td>
-      <td>&a.deischen; &a.davidxu;</td>
-      <td>28 ���� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>libpthread</td>
-      <td>���������� ��� SMP.</td>
-      <td>&a.deischen;</td>
-      <td>3 ��� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>kernel</td>
-      <td>���������� ��� SMP.</td>
-      <td>&a.davidxu;</td>
-      <td>3 ��� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>libpthread</td>
-      <td>������ ���������� KSE (���� �� ������ CPU).</td>
-      <td>&a.davidxu;</td>
-      <td>3 ��� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>libpthread, kernel</td>
-      <td>���������� �������-��������� ������� ��� alpha.</td>
-      <td>&a.marcel;</td>
-      <td>30 ������� 2003</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>libpthread, kernel</td>
-      <td>���������� �������-��������� ������� ��� amd64.</td>
-      <td>&a.davidxu; &a.deischen;</td>
-      <td>30 ������� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>libpthread, kernel</td>
-      <td>���������� �������-��������� ������� ��� i386.</td>
-      <td>&a.davidxu; &a.deischen;</td>
-      <td>30 ������� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>libpthread, kernel</td>
-      <td>���������� �������-��������� ������� ��� ia64.</td>
-      <td>&a.marcel;</td>
-      <td>30 ������� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>libpthread, kernel</td>
-      <td>���������� �������-��������� ������� ��� sparc64.</td>
-      <td>&a.jake;</td>
-      <td>30 ������� 2003</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>kernel</td>
-      <td>���������� ����� ��������, ����������� ��� KSE.</td>
-      <td>&a.davidxu;</td>
-      <td>28 ���� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>libpthread</td>
-      <td>���������� ������ ��������� �������.</td>
-      <td>&a.deischen;</td>
-      <td>3 ��� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>kernel</td>
-      <td>����������� ����������� ��������� ������� (���������� ������� ���
-        �� ����������).</td>
-      <td>&a.davidxu;</td>
-      <td>30 ������� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-<!--
-      <tr>
-	<td> &nbsp; </td>
-        <td>  </td>
-        <td> &nbsp; </td>
-        <td> D M 2002 </td>
-        <td> &status.new; </td>
-      </tr>
--->
-
-  </table>
-
-
-  </body>
-</html>
diff --git a/ru_RU.KOI8-R/htdocs/news/1998/index.sgml b/ru_RU.KOI8-R/htdocs/news/1998/index.sgml
index 5fb9f7bc53..b9881dc737 100644
--- a/ru_RU.KOI8-R/htdocs/news/1998/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/news/1998/index.sgml
@@ -218,15 +218,6 @@
       ���� ��������� � 2.2.6.</p></li>
   </ul>
 
-  <h2>������� 1998</h2>
-  <ul>
-    <li><p><b>8 ������� 1998</b>
-      ������ ������� ��������, �������������� �������� � <a
-      href="&base;/y2kbug.html">������������� FreeBSD � 2000 �����</a>, ������
-      �� ������� ������� �� �������� <a
-      href="&base;/docs.html">������������</a>.</p></li>
-  </ul>
-
   <h2>������ 1998</h2>
   <ul>
     <li><p><b>8 ������ 1998</b>
diff --git a/ru_RU.KOI8-R/htdocs/projects/projects.sgml b/ru_RU.KOI8-R/htdocs/projects/projects.sgml
index 5763cfb728..f9025a00cf 100644
--- a/ru_RU.KOI8-R/htdocs/projects/projects.sgml
+++ b/ru_RU.KOI8-R/htdocs/projects/projects.sgml
@@ -329,10 +329,6 @@
       �������� ��� ������� �������� ���������� ��������� ������ �
       ����� ����.</li>
 
-      <li><a name="kse" href="../../kse/index.html">Kernel Scheduler Entities</a>:
-	������ �� ���������� ��������� ������� �� FreeBSD, ������������ �������
-	�������, ������� �� ������� �� Scheduler Activations.</li>
-
     <li><a name="lotteryscheduling"
       href="http://www.cs.cmu.edu/~dpetrou/research.html">
       Lottery Scheduling Kernel</a>: � ���� ������� ��� ������������ �����
@@ -349,11 +345,6 @@
       ���������������� ����������, ����������� � ������������ ��� ����������
       ������ � ������ TrustedBSD, ������� ����� ������������ �� FreeBSD.</li>
 
-    <li><a name="SMP" href="&enbase;/smp/index.html">Symmetric
-      MultiProcessor Support</a>
-      ������������ � ������ ���������� �� ������������� �����������
-      ���������� ����������� �� FreeBSD.</li>
-
     <li><a href="http://people.FreeBSD.org/~terry/">����� ��� ������������
       ������ ������ ����</a></li>
 
diff --git a/ru_RU.KOI8-R/htdocs/releases/5.3R/migration-guide.html b/ru_RU.KOI8-R/htdocs/releases/5.3R/migration-guide.html
index bba9f8c5dd..2b622123ee 100644
--- a/ru_RU.KOI8-R/htdocs/releases/5.3R/migration-guide.html
+++ b/ru_RU.KOI8-R/htdocs/releases/5.3R/migration-guide.html
@@ -180,9 +180,7 @@ target="_top">``
 <p>SMPng: ``����� ���������'' ��������� Symmetric MultiProcessor (SMP) �����������.
 ������������ ������ ��� ``fine-grained locking'' ��������� ��������� ���� ��� ����������
 ���������� ������� ����������, ������� ����� �������� � ����. ������ �������� ����
-������� ������������������ �������� �����. �������������� ���������� ����� ����� ��
-�������� <a href="http://www.FreeBSD.org/smp/index.html" target="_top">FreeBSD SMP
-�������</a>.</p>
+������� ������������������ �������� �����.</p>
 </li>
 
 <li>
diff --git a/ru_RU.KOI8-R/htdocs/releases/5.4R/migration-guide.html b/ru_RU.KOI8-R/htdocs/releases/5.4R/migration-guide.html
index c3e1b59738..0b7657fc0b 100644
--- a/ru_RU.KOI8-R/htdocs/releases/5.4R/migration-guide.html
+++ b/ru_RU.KOI8-R/htdocs/releases/5.4R/migration-guide.html
@@ -179,9 +179,7 @@ target="_top">``
 <p>SMPng: ``����� ���������'' ��������� Symmetric MultiProcessor (SMP) �����������.
 ������������ ������ ��� ``fine-grained locking'' ��������� ��������� ���� ��� ����������
 ���������� ������� ����������, ������� ����� �������� � ����. ������ �������� ����
-������� ������������������ �������� ����� � ��������� ��������. �������������� ����������
-����� ����� �� �������� <a href="http://www.FreeBSD.org/smp/index.html"
-target="_top">FreeBSD SMP �������</a>.</p>
+������� ������������������ �������� ����� � ��������� ��������.</p>
 </li>
 
 <li>
diff --git a/ru_RU.KOI8-R/htdocs/search/sitemap.xml b/ru_RU.KOI8-R/htdocs/search/sitemap.xml
index 4563353c3d..751f077744 100644
--- a/ru_RU.KOI8-R/htdocs/search/sitemap.xml
+++ b/ru_RU.KOI8-R/htdocs/search/sitemap.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="koi8-r"?>
 <!DOCTYPE sitemap PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Sitemap//EN"
         "http://www.FreeBSD.org/XML/www/share/sgml/sitemap.dtd">
+
+<!-- $FreeBSD$ -->
+
 <sitemap>
   <term>
     <text>Alpha</text>
@@ -647,21 +650,6 @@
     <destination>../internet.html</destination>
   </term>
 
-  <term>
-    <text>KSE</text>
-    <destination>&base;/kse/index.html</destination>
-  </term>
-
-  <term>
-    <text>Threads, KSE</text>
-    <destination>&base;/kse/index.html</destination>
-  </term>
-
-  <term>
-    <text>POSIX threads</text>
-    <destination>&base;/kse/index.html</destination>
-  </term>
-
   <term>
     <text>Copyright</text>
     <destination>../copyright/license.html</destination>
@@ -912,16 +900,6 @@
     <destination>../send-pr.html</destination>
   </term>
 
-  <term>
-    <text>Symmetric MultiProcessing (SMP)</text>
-    <destination>&base;/smp/index.html</destination>
-  </term>
-
-  <term>
-    <text>SMP</text>
-    <destination>&base;/smp/index.html</destination>
-  </term>
-
   <term>
     <text>FreeBSD/sparc64</text>
     <destination>&base;/platforms/sparc.html</destination>
@@ -1017,26 +995,6 @@
     <destination>../where.html</destination>
   </term>
 
-  <term>
-    <text>y2k</text>
-    <destination>&base;/y2kbug.html</destination>
-  </term>
-
-  <term>
-    <text>Year 2000 bug</text>
-    <destination>&base;/y2kbug.html</destination>
-  </term>
-
-  <term>
-    <text>Millennium bug</text>
-    <destination>&base;/y2kbug.html</destination>
-  </term>
-
-  <term>
-    <text>2000, year bug</text>
-    <destination>&base;/y2kbug.html</destination>
-  </term>
-
   <term>
     <text>BSD Real-Quick (TM) Newsletter</text>
     <destination>http://www.daemonnews.org/newsletter/</destination>
@@ -1203,10 +1161,5 @@
       <text>������������</text>
       <destination>../../doc/ru_RU.KOI8-R/books/handbook/bibliography.html</destination>
     </item>
-
-    <item>
-      <text>������ 2000'�� ����</text>
-      <destination>../y2kbug.html</destination>
-    </item>
   </category>
 </sitemap>
diff --git a/ru_RU.KOI8-R/htdocs/smp/Makefile b/ru_RU.KOI8-R/htdocs/smp/Makefile
deleted file mode 100644
index 72ee858d8d..0000000000
--- a/ru_RU.KOI8-R/htdocs/smp/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# The FreeBSD Russian Documentation Project
-# $FreeBSDru: frdp/www/ru/smp/Makefile,v 1.2 2000/11/10 17:04:54 phantom Exp $
-# Original revision: 1.2
-
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
-.endif
-
-.if exists(../Makefile.inc)
-.include "../Makefile.inc"
-.endif
-
-DOCS=   index.sgml
-
-.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/smp/index.sgml b/ru_RU.KOI8-R/htdocs/smp/index.sgml
deleted file mode 100644
index 5d0c63c71d..0000000000
--- a/ru_RU.KOI8-R/htdocs/smp/index.sgml
+++ /dev/null
@@ -1,2516 +0,0 @@
-<?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "������ FreeBSD SMP">
-<!ENTITY email 'freebsd-smp'>
-
-<!-- Status levels -->
-<!ENTITY status.done "<font xmlns='http://www.w3.org/1999/xhtml' color='green'>���������</font>">
-<!ENTITY status.wip "<font xmlns='http://www.w3.org/1999/xhtml' color='blue'>�����������</font>">
-<!ENTITY status.stalled "<font xmlns='http://www.w3.org/1999/xhtml' color='purple'>���������</font>">
-<!ENTITY status.new "<font xmlns='http://www.w3.org/1999/xhtml' color='red'>�� ����������</font>">
-<!ENTITY status.resolved "<font xmlns='http://www.w3.org/1999/xhtml' color='green'>������</font>">
-<!ENTITY status.unresolved "<font xmlns='http://www.w3.org/1999/xhtml' color='red'>�� ������</font>">
-]>
-
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSDru: frdp/www/ru/smp/index.sgml,v 1.14 2006/01/17 07:27:20 gad Exp $
-
-     Original revision: 1.141
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-  <body class="navinclude.developers">
-
-  <h2>����������</h2>
-
-  <ul>
-    <li><a href="#goal">���� �������</a></li>
-    <li><a href="#plan">���� ����� �������</a></li>
-    <li><a href="#resources">�������������� ������� � ������</a></li>
-    <li><a href="#subsystems">���������� � �� ������������</a></li>
-    <li><a href="#status">������</a></li>
-    <li><a href="#issues">��������� ��������</a></li>
-    <li><a href="#news">�������</a></li>
-  </ul>
-
-  <a name="goal"></a>
-  <h2>���� �������</h2>
-
-  <p>������ FreeBSD Symmetric MultiProcessing (SMP), ����� ��������� ��� SMPng
-    (SMP ���������� ���������), ��������� �� ���������� ��������� SMP �� ������
-    ������ �������� � ���� FreeBSD.  ������� ��� ��������� ��������� � ������
-    2003 ���� � 5.0-RELEASE.  �� ������������ �������� �������� FreeBSD, ���
-    ���� ������ �� ������� ���������� ���������� ���� ����� ������� ����, �
-    ������� ������������� ���������� �� ���� ����� ������ �� ������ ����������.
-    �� ��������������� �� �������� �� ���������� ���� � ����, �� �������� ���
-    ������������� �����������, ��������� � ����.  ���� ������ ��������� ��
-    ������������ ����������, � �� ������������� ������������.</p>
-
-  <a name="plan"></a>
-  <h2>���� ������ �������</h2>
-
-  <p>�� ���� Web-�������� ���������� ����������, ����������� � ��������
-    �������� ��������� SMP �� FreeBSD.  � ����� ������ ���������� �ӣ ���������
-    �� ���������������� ���� BSD/OS 5.0, � �������� ��������� ��, ��� ������
-    ������������ ��������, ��-�� �������� � �������� ����.</p>
-
-  <p>��� � ��� ������ ��������������� �������, ���������� ���������� �����
-    ����� ����������.  �� ������� �������� ������������� ���������
-    ������������������ � ������������, �������� � �������� ������ ���� ������
-    � ������� ������ ���������� ������� ������ ��� ��������, ���� ���
-    ��������� ������ ����� ����������� � � ���������� �����������������
-    -current.</p>
-
-  <p>�������� ����� ���� �� ���������� �� �������, �� ������������ �����
-    ������� ��������� � ���� �/��� ������ ����������� ����� ������.  ����
-    "�������������" ��������� �� ������������, ������� ������� ������� ��������
-    �� ���������� ������̣���� ������; ��� �� ��������� ������� ������, ��
-    ������������ ��������������� ����������� ����� � ������������� �����, �����
-    ��������� ������������ ����� � ����������� �� ��������.  ��� ������ �����
-    � ��������� ��� ����� ������� ������������� ��ߣ�� ����� ��������� ������
-    �� ����������� ����� � ����� ������ �������� FreeBSD �� SMP, ���
-    ����������� ����, ������� �� �����-�� ��������.</p>
-
-  <p>����� ���� ���� ����������� � ����������� �� ��������� ������.  ���
-    ����������� ����� ��� ���������� ���� ���������� ��� ��������� �
-    ����������.  ��� ����������� ����� ��� ���������� ���� ����������
-    ����������.  ��� ����������� ����� ��� ���������� ���� ���������� ��
-    ����.  ��� ����� ����� ��� ���������� ���� ���������� ������ � ������.</p>
-
-  <p>������� ���������� � ��������� ���������� ��������� ��������� ���������
-    ������������� �� <a href="http://www.FreeBSD.org/projects/busdma">
-    Web-�������� �������������� ��������� busdma � SMPng</a>.</p>
-
-  <p>���������� � ���������� ����� ������� ���������� ��������� �� <a
-    href="http://www.watson.org/~robert/freebsd/netperf/">Web-��������
-    netperf</a> ������� ������� � <a href="../projects/netperf/">Web-��������
-    Netperf</a> Web-����� FreeBSD.org.</p>
-
-  <p>������ ������������� ������� �� ���������, ����� �� ����.</p>
-
-  <a name="resources"></a>
-  <h2>������� � ������</h2>
-
-  <ul>
-    <li><p>�������� ���������� SMP �������� � ������ �������� <a
-      href="mailto:freebsd-smp@FreeBSD.org">freebsd-smp</a>.  �� ������ ������
-      ������ � ������� �������� � <a
-      href="&enbase;/doc/ru_RU.KOI8-R/books/handbook/eresources.html#ERESOURCES-MAIL">
-      ����� �� ����������� ��������</a> <a
-      href="&enbase;/doc/ru_RU.KOI8-R/books/handbook/index.html">�����������
-      FreeBSD</a>.</p></li>
-
-    <li><p>���� ����� (Steve Passe) ������������ <a
-      href="http://people.FreeBSD.org/~fsmp/SMP/SMP.html">�������� �������
-      SMP</a>, �� ������� ���������� �������������� ���������� � ����� �������
-      �������� ������� �������, ��� ��� Web-��������.</p></li>
-
-    <li><p>&a.rwatson; ������������ �������� <a
-      href="../projects/netperf/">������� Netperf</a>, � ������ ��������
-      ������� ������, ��������� � ������������������� ���� � SMP.  �����
-      ����, � ���� ���� <a
-      href="http://www.watson.org/~robert/freebsd/netperf/">������������
-      Web-�������� � ���������� ��������� � ������ �����������</a>.</p></li>
-
-    <li>
-      <p>�������� ���������� �������, ����������� ��������� ��� ������ �
-        �������������� �� ������ ���� � ������� ����� ����� �����:</p>
-
-      <ul>
-        <li><a
-          href="http://www.freebsd.org/cgi/man.cgi?query=mutex&amp;apropos=0&amp;sektion=9&amp;manpath=FreeBSD+6.0-current">
-          �������� ���� (mutex(9))</a></li>
-
-        <li><a
-          href="http://www.freebsd.org/cgi/man.cgi?query=mtx_pool&amp;apropos=0&amp;sektion=9&amp;manpath=FreeBSD+6.0-current">
-          ���� ��������� ���� (mtx_pool(9))</a></li>
-
-        <li><a
-          href="http://www.freebsd.org/cgi/man.cgi?query=critical&amp;apropos=0&amp;sektion=9&amp;manpath=FreeBSD+6.0-current">
-          ����������� ������� ���� (critical(9))</a></li>
-
-        <li><a
-          href="http://www.freebsd.org/cgi/man.cgi?query=sx&amp;apropos=0&amp;sektion=9&amp;manpath=FreeBSD+6.0-current">
-          ��������� ������������ � ������������ ���������� ����
-          (sx(9))</a></li>
-
-        <li><a
-          href="http://www.freebsd.org/cgi/man.cgi?query=condvar&amp;apropos=0&amp;sektion=9&amp;manpath=FreeBSD+6.0-current">
-          �������� ���������� ���� (condvar(9))</a></li>
-
-        <li><a
-          href="http://www.freebsd.org/cgi/man.cgi?query=sema&amp;apropos=0&amp;sektion=9&amp;manpath=FreeBSD+6.0-current">
-          �������� ���� (sema(9))</a></li>
-
-        <li><a
-          href="http://www.freebsd.org/cgi/man.cgi?query=sleep&amp;apropos=0&amp;sektion=9&amp;manpath=FreeBSD+6.0-current">
-          ��������� sleep/wakeup ���� (sleep(9))</a></li>
-
-        <li><a
-          href="http://www.freebsd.org/cgi/man.cgi?query=kthread&amp;apropos=0&amp;sektion=9&amp;manpath=FreeBSD+6.0-current">
-          ����� ���� (kthread(9))</a></li>
-
-        <li><a
-          href="http://www.freebsd.org/cgi/man.cgi?query=ithread&amp;apropos=0&amp;sektion=9&amp;manpath=FreeBSD+6.0-current">
-          ����� ���������� (ithread(9))</a></li>
-
-        <li><a
-          href="http://www.freebsd.org/cgi/man.cgi?query=swi&amp;apropos=0&amp;sektion=9&amp;manpath=FreeBSD+6.0-current">
-          ����� ����������� ���������� (swi(9))</a></li>
-      </ul>
-
-      <p>����� ����, ������� ����� ������������ ������ <a
-        href="http://www.freebsd.org/cgi/man.cgi?query=spl&amp;apropos=0&amp;sektion=9&amp;manpath=FreeBSD+6.0-current">
-        ���������� �������� �� SPL</a>, ����������� ����� ������������
-        ������ ������������� SMP.</p>
-    </li>
-
-    <li><p>�������� <a
-      href="http://storm.uk.FreeBSD.org/~hiten/smp_synch_rules.html">
-      ������ ���� ��� ������������� SMP</a> ������ �����.</p></li>
-
-    <li><p>&a.dillon; ������������ <a
-      href="http://apollo.backplane.com/FreeBSDSmp/">Web-��������</a>, ��
-      ������� �� ������������� ���� ������ ��� �������� SMP.</p></li>
-
-    <li><p><a
-      href="http://www.usenix.org/events/bsdcon02/full_papers/baldwin/baldwin_html/index.html">
-      ������ � USENIX "Locking in the Multithreaded FreeBSD Kernel", �������
-      ������� &a.jhb;</a>.</p></li>
-
-    <li><p><a
-      href="http://www.usenix.org/publications/library/proceedings/bsdcon03/tech/hsu.html">
-      ������ � BSDCon'03 "Reasoning about SMP in FreeBSD", �������
-      ������� &a.hsu;</a>.</p></li>
-
-    <li><p><a
-      href="http://www.usenix.org/publications/library/proceedings/bsdcon03/tech/roberson.html">
-      ������ � BSDCon'03 "ULE: A Modern Scheduler for FreeBSD", �������
-      ������� &a.jeff;</a>.</p></li>
-  </ul>
-
-  <a name="subsystems"></a>
-  <h2>���������� � �� ������������</h2>
-
-  <p>��� �������� �������� ��������������� ��������� ���� � ���, ��� �������
-    �������� ��� ������������ SMP � ţ �������������.</p>
-
-  <table class="tblbasic">
-    <tr class="heading">
-      <th>����������</th>
-      <th>���������</th>
-      <th>��������� ����������</th>
-      <th>������������</th>
-    </tr>
-
-    <tr>
-      <td>Newbus</td>
-      <td>&status.wip;</td>
-      <td>5 ������� 2003</td>
-      <td>&a.imp;</td>
-    </tr>
-
-    <tr>
-      <td>VM</td>
-      <td>&status.wip;</td>
-      <td>4 ������� 2003</td>
-      <td>&a.alc;</td>
-    </tr>
-
-    <tr>
-      <td>���-�����</td>
-      <td>&status.wip;</td>
-      <td>4 ������� 2003</td>
-      <td>&a.jeff;, &a.phk;</td>
-    </tr>
-
-    <tr>
-      <td>VFS</td>
-      <td>&status.wip;</td>
-      <td>4 ������� 2003</td>
-      <td>&a.jeff;</td>
-    </tr>
-
-    <tr>
-      <td>�������� � �������� � ��������</td>
-      <td>&status.wip;</td>
-      <td>5 ��� 2003</td>
-      <td>&a.jhb;</td>
-    </tr>
-
-    <tr>
-      <td>�����������</td>
-      <td>&status.wip;</td>
-      <td>23 ������ 2004</td>
-      <td>&a.jhb;, &a.jeff;</td>
-    </tr>
-
-    <tr>
-      <td>GEOM</td>
-      <td>&status.done;</td>
-      <td>5 ������� 2003</td>
-      <td>&a.phk;</td>
-    </tr>
-
-    <tr>
-      <td>�������� �����������</td>
-      <td>&status.done;</td>
-      <td>5 ������� 2003</td>
-      <td>&a.alfred;, &a.tanimura; &a.rwatson;</td>
-    </tr>
-
-    <tr>
-      <td>���������� TTY</td>
-      <td>&status.wip;</td>
-      <td>24 ���� 2004</td>
-      <td>&a.phk;</td>
-    </tr>
-
-    <tr>
-      <td>����������� IPC</td>
-      <td>&status.done;</td>
-      <td>4 ������� 2003</td>
-      <td>&a.alfred;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ������� � ��������� ������</td>
-      <td>&status.done;</td>
-      <td>25 ������ 2004</td>
-      <td>&a.sam;, &a.rwatson;</td>
-    </tr>
-
-    <tr>
-      <td>KQueue</td>
-      <td>&status.done;</td>
-      <td>24 ������ 2004</td>
-      <td>&a.jmg;, &a.green;</td>
-    </tr>
-
-    <tr>
-      <td>IPv4, IPv6</td>
-      <td>&status.wip;</td>
-      <td>23 ������ 2004</td>
-      <td>&a.jennifer;, &a.hsu;, &a.sam;, &a.rwatson;, &a.gnn;</td>
-    </tr>
-
-    <tr>
-      <td>IPX/SPX</td>
-      <td>&status.wip;</td>
-      <td>23 ������ 2004</td>
-      <td>&a.rik;, &a.rwatson;</td>
-    </tr>
-
-    <tr>
-      <td>netatalk</td>
-      <td>&status.wip;</td>
-      <td>24 ������ 2004</td>
-      <td>&a.rwatson;</td>
-    </tr>
-
-    <tr>
-      <td>�������������� �������� �����</td>
-      <td>&status.wip;</td>
-      <td>4 ������� 2003</td>
-      <td>&a.hsu;, &a.sam;, &a.rwatson;, &a.mlaier;, &a.luigi;, Maurycy
-        Pawlowski-Wieronski &lt;maurycy@fouk.org&gt;, &a.brooks;, &a.rik;</td>
-    </tr>
-
-    <tr>
-      <td>������ NFS</td>
-      <td>&status.new;</td>
-      <td>23 ������ 2004</td>
-      <td>&nbsp;</td>
-    </tr>
-
-    <tr>
-      <td>������ NFS</td>
-      <td>&status.wip;</td>
-      <td>24 ������ 2004</td>
-      <td>&a.rwatson;</td>
-    </tr>
-  </table>
-
-  <a name="status"></a>
-  <h2>������</h2>
-
-  <p>����� ������� �������� �������� ����� ������ ���������.</p>
-
-  <table class="tblbasic">
-    <tr class="heading">
-      <th>������</th>
-      <th>�������������</th>
-      <th>��������� ����������</th>
-      <th>���������</th>
-    </tr>
-
-    <tr>
-      <td>������������� giant-���������� �� ���� spinning � blocking,
-        �������� ���������� ������������ � ������������� �������� ��� �������
-        ����������.</td>
-      <td>&a.dillon;</td>
-      <td>25 ���� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� ���������� ���������� �� BSD/OS (i386).</td>
-      <td>&a.jake;</td>
-      <td>3 ���� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>����������� ��֣��� ������ ���������� ��� ���������� (i386).</td>
-      <td>&a.grog;</td>
-      <td>3 ������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� �������������� ��� ���������� (i386 UP).</td>
-      <td>&a.grog;</td>
-      <td>3 ������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ����������� ������������ (���������� ������ ������� ��
-        ����� �����) (i386 UP).</td>
-      <td>������������ -smp</td>
-      <td>12 ������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� ���������� ���������� �� BSD/OS (alpha).</td>
-      <td>&a.dfr;</td>
-      <td>24 ������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ���������� (���������) ������ spl().</td>
-      <td>&a.grog;</td>
-      <td>30 ������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� ���� ktr �� BSD/OS.</td>
-      <td>&a.grog;, &a.jhb;</td>
-      <td>30 ������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� �������������� ��� ��������� ���������� (i386 SMP).</td>
-      <td>&a.jhb;</td>
-      <td>1 �������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ����������� ������������ (���������� ������ ������� ��
-        ����� �����) (i386 SMP).</td>
-      <td>-smp developers</td>
-      <td>6 �������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ����������� ������������ (���������� ������ ������� ��
-        ����� �����) (alpha).</td>
-      <td>-smp developers</td>
-      <td>6 �������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� malloc � ������������� ������� ����������� � ��������
-        ����������.</td>
-      <td>&a.jasone;</td>
-      <td>10 �������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>����������� ���������� msleep(), ������� tsleep() ������������
-        msleep().</td>
-      <td>&a.jake;</td>
-      <td>11 �������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� ������� fxp ���������� � �������� ����������.</td>
-      <td>&a.cp;</td>
-      <td>17 �������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� mbuf ����������� � �������� ����������.</td>
-      <td>&a.bmilekic;</td>
-      <td>29 �������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������������ �������� ����������.</td>
-      <td>&a.jasone;</td>
-      <td>3 ������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>����������� ��֣��� ������ ���������� (alpha).</td>
-      <td>&a.jhb;, &a.dfr;</td>
-      <td>5 ������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� �������������� ��� ��������� ���������� (alpha).</td>
-      <td>&a.dfr;, &a.jhb;</td>
-      <td>5 ������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���� ���������� �� ��������.</td>
-      <td>&a.tegge;, &a.jhb;</td>
-      <td>5 ������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� �������� ethernet ����������� � ��������.</td>
-      <td>&a.wpaul;</td>
-      <td>15 ������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� ������������ ����� ��� ��������� � ��������
-        �������-������������.</td>
-      <td>&a.jhb;</td>
-      <td>20 ������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������������� SMP_DEBUG � MUTEX_DEBUG.</td>
-      <td>&a.jhb;</td>
-      <td>20 ������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ������� ������������ ���������� ����������� �����
-        ����������.</td>
-      <td>&a.cp;</td>
-      <td>25 ������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� sf_bufs (sendfile(2)) ���������� � ��������.</td>
-      <td>&a.bmilekic;</td>
-      <td>5 ������ 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ����������� ��� �������� ���������.</td>
-      <td>&a.jhb;</td>
-      <td>18 ������ 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ����������� ��� ktr ��� �� db_interface.c.</td>
-      <td>&a.jhb;</td>
-      <td>15 ������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������������� ������� sio � ������������� spin-��������.</td>
-      <td>&a.jhb;</td>
-      <td>18 ������� 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>����������� �������� ����������.</td>
-      <td>&a.jake;, &a.jasone;</td>
-      <td>15 ������ 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ���� � mtx_init() (MTX_RECURSE), ������� ��������, �����
-        �� ������������ ������� ����������.</td>
-      <td>&a.bmilekic;</td>
-      <td>19 ������ 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� ������ �������������� ���������� � ��������.</td>
-      <td>&a.des;</td>
-      <td>21 ������ 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������������� ������� ���������� � ���������.</td>
-      <td>&a.jasone;</td>
-      <td>24 ������ 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� ���� ����������� � ��������� ����������.</td>
-      <td>&a.jake;</td>
-      <td>31 ������ 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� API ��� ���������.</td>
-      <td>&a.bmilekic;</td>
-      <td>8 ������� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� COM_LOCK.</td>
-      <td>&a.markm;</td>
-      <td>11 ������� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ��������� ������ ������������ � ���� ������� ����������.
-        �������������� ����������� ��� ��������� ������������ ����.</td>
-	<td>&a.jake;</td>
-	<td>11 ������� 2001</td>
-	<td>&status.done;</td>
-      </tr>
-
-    <tr>
-      <td>��������� ��������������� ����������� �������� ���������.</td>
-      <td>&a.jake;</td>
-      <td>11 ������� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� ��� ����� ��������� ���������� �������-����������� �
-        ��������� ������������ ����� ������������ � �����������
-        ������������.</td>
-      <td>&a.jhb;</td>
-      <td>18 ������� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ������ � ��������� jail � ����������������, ��������� �
-        jail.</td>
-      <td>&a.rwatson;</td>
-      <td>20 ������� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ���������� sx (����������/������������).</td>
-      <td>&a.jasone;</td>
-      <td>5 ����� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������������/��������� �������� ��� ��������� ����� �������
-        ���������� ���������� (mtx, sx).</td>
-      <td>&a.jhb;</td>
-      <td>28 ����� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������������� ���������� allproc � proctree �� ���������� lockmgr
-        � ����������� sx.</td>
-      <td>&a.jhb;</td>
-      <td>28 ����� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>� ������� mbuf ������������ �������� ���������� ������
-        msleep()/wakeup().</td>
-      <td>&a.bmilekic;</td>
-      <td>2 ������ 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� ���������� ����� &lt;sys/mutex.h&gt; �� ������ ����������
-        ������ ����, �����, ��� &lt;vm/vm_zone.h&gt;,
-        &lt;sys/resourcevar.h&gt;, &lt;sys/ucred.h&gt; �
-        &lt;sys/mbuf.h&gt;.</td>
-      <td>&a.markm;</td>
-      <td>15 ��� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ��������� ������ mp_machdep.c, ���������� ��������� API
-        ��� SMP, ��������, �������� IPI � ��� �����.</td>
-      <td>&a.jhb;</td>
-      <td>15 ��� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� ����������� ������� forward_* � forwarded_* �������
-        ������������.</td>
-      <td>&a.jhb;</td>
-      <td>15 ��� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� �������-��������� ����� ��������� SMP �� ���������
-        Alpha.</td>
-      <td>&a.gallatin;, &a.dfr;, &a.jhb;</td>
-      <td>15 ��� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������������� select() � ������������� �������� ����������.</td>
-      <td>&a.tanimura;</td>
-      <td>15 ��� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ���������� "giant" ������ ���������� VM.</td>
-      <td>&a.alfred;</td>
-      <td>13 ���� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� �������� slab-�������������� ��� ���������� mbuf.</td>
-      <td>&a.bmilekic;</td>
-      <td>21 ���� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ������� witness_assert() ��� ��������� ����������
-        ����������.</td>
-      <td>&a.jhb;</td>
-      <td>27 ���� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ���������� sx ��� ��������� �������� �� �������
-        ������������.</td>
-      <td>&a.jhb;</td>
-      <td>27 ���� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>����������������� KTR.</td>
-      <td>&a.jhb;</td>
-      <td>28 ���� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� fork_return, fork_exit, ast � userret
-        �������-������������.</td>
-      <td>&a.jhb;</td>
-      <td>29 ���� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� �������� savecrit �� sched_lock �������� ����������� �
-        ����������������� � mi_switch � ���������������� � fork_exit.</td>
-      <td>&a.jhb;</td>
-      <td>30 ���� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� ���� ast().</td>
-      <td>&a.jhb;</td>
-      <td>10 ������� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� �������� upgrade/downgrade ���������� sx.</td>
-      <td>Alexander Kabaev, &a.jasone;</td>
-      <td>13 ������� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>����������� ��������.</td>
-      <td>&a.jasone;</td>
-      <td>14 ������� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ��������� upgrade/downgrade � witness.</td>
-      <td>&a.jhb;</td>
-      <td>23 ������� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� �������� ��ߣ� cpu_wait() � cpu_exit()
-        �������-�����������.</td>
-      <td>&a.peter;</td>
-      <td>9 �������� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� NFS �� ���������� � ��������� �����.</td>
-      <td>&a.peter;</td>
-      <td>18 ������� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� taskqueues.</td>
-      <td>&a.arr;, &a.jhb;</td>
-      <td>25 ������� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ������ �� ucred � ������ ����.</td>
-      <td>&a.jhb;</td>
-      <td>25 ������� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� ����������� ���������� � ������������
-        �������-�����������.</td>
-      <td>&a.jhb;</td>
-      <td>11 ������� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� � ����������� ������� ����������� ��������� ��� �������
-        �����, ������ ��� ������ ����������, ����� ���������������� ����
-        ���������� ������� ���������.</td>
-      <td>&a.jhb;</td>
-      <td>17 ������� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ����������� ��� APIC imen_mtx �� �������-�����������
-        icu_lock ��� ������ ������������ ���������� � ��������� ������ �
-        ���� ��� i386 � alpha.</td>
-      <td>&a.jhb;</td>
-      <td>20 ������� 2001</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������������ � ����������� ������� ��� ������� ����� ���������
-        ������� � �������� � ��� ����� ���������� ��� ���������������
-        �����������, ����� �� ����� ��������� ������.  ��� ������ �����
-        MTX_NOSWITCH, SWI_SWITCH � SWI_NOSWITCH ���������, ��� ��� ����
-        ������ ���� ���������� ��ϣ ���������� ���������.</td>
-      <td>&a.jhb;</td>
-      <td>5 ������ 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ��������� filedesc � file.</td>
-      <td>&a.tanimura;, &a.alfred;</td>
-      <td>12 ������ 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� �������� pgrp, session � sigio.</td>
-      <td>&a.tanimura;</td>
-      <td>23 ������� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ���������� ���������, �� �� sigio/fown � ��������������
-        � VM</td>
-      <td>&a.alfred;</td>
-      <td>27 ������� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� � ������ ����ޣ�� ������ �� ����������� vnode.</td>
-      <td>&a.phk;</td>
-      <td>8 ����� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������������� ���� ��������� �������, ����� ���������� sx �����
-        ���� ������������ ��� VM.</td>
-      <td>&a.green;</td>
-      <td>14 ����� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ���������� ���������� (sellock) ������ �������� selinfo,
-        ����� ��������� ��������� �������� ������������������ ����������, �
-        ������� select() ���������� � MP.</td>
-      <td>&a.alfred;, &a.davidc;</td>
-      <td>14 ����� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� �� Giant � ��������� ������� read, write, pread, pwrite,
-        ������� Giant �� ������ �������� �������� �� ������ ���������� ���
-        �������, VFS � ��� �����.</td>
-      <td>&a.alfred;</td>
-      <td>15 ����� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ��������� ������� ����.</td>
-      <td>&a.arr;</td>
-      <td>18 ����� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ���������� ������ ������������ ����.</td>
-      <td>&a.arr;</td>
-      <td>18 ����� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� �������������� ������ ����, ����� �� ����
-        slab-���������������, ������������ ���� ������� ����������.</td>
-      <td>&a.jeff;</td>
-      <td>21 ����� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ������������ ������������� �������-��������� �����������
-        ������ API �� ���������� ���������� ��� ������ ������������ API ��
-        �� ����������.</td>
-      <td>&a.imp;, &a.dfr;, &a.benno;, &a.jhb;</td>
-      <td>21 ����� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ������ � ��������� ������������ ��������� "����������
-        ��������" ����� ��������������� ������ ���� ��������� � ������ ��
-        �ţ.</td>
-      <td>&a.mini;</td>
-      <td>31 ����� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� �� ���������� flags/tsleep �� ���������� sx ��� ������
-        ������ sysctl �� ���������� �� ����� ���������� sysctl-��������.</td>
-      <td>&a.mini;</td>
-      <td>1 ������ 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������/��������� ���������������� ���������� ��� ����������
-        ������� �� KTR-��������.</td>
-      <td>&a.jake;</td>
-      <td>1 ������ 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� ������� MTX_SYSINIT � SX_SYSINIT, ������� ��������� ���
-        ������������� ����������, ����������� �� ����������.</td>
-      <td>&a.arr;</td>
-      <td>2 ������ 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ���������� ���������� ������ ������������.</td>
-      <td>&a.arr;</td>
-      <td>2 ������ 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� grow_stack() �������-�����������.  ��������, ���� ��������
-        ��� ������������ ��������.</td>
-      <td>&a.alc;</td>
-      <td>6 ������ 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ������������� p_fd, ��� � ��������� ������ �������� �
-        ���������� p_fd � ���������� ���������� ��� ������� ��������.  ������
-        � ���������� � ������� � ���������� �� ������ ��������.</td>
-      <td>&a.alfred;, &a.tanimura;</td>
-      <td>8 ������ 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ��������� pargs.</td>
-      <td>&a.mini;</td>
-      <td>9 ������ 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� {o,}sigreturn() MPSAFE.</td>
-      <td>&a.alc;</td>
-      <td>11 ������ 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� �������������� ������ ����, ����� Giant �� ����������
-        ��� �������� malloc() ��� free().</td>
-      <td>&a.jeff;</td>
-      <td>2 ��� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ����������� ����� ���������� shared/exclusive � VM-�������
-        �� ��������� ������������ ����� lockmgr, ������� ���������� �
-        �������� ������������� ������ livelock/deadlock.</td>
-      <td>&a.green;, &a.alc;</td>
-      <td>3 ��� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� �� Giant � ��������� ������� readv/writev � �����
-        read/write/pread/pwrite, ��� ������ malloc ������ �� �����������
-        Giant ��� ��������� �������� iovec ��� uio.</td>
-      <td>&a.alc;</td>
-      <td>9 ��� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� �� Giant � mprotect(), minherit() � madvise(), �����
-        �� ������ �� ��������� � �� ������������ ��������.</td>
-      <td>&a.alc;</td>
-      <td>18 ��� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� API ��� suser() � p_can*() API, ����� ��������� �����
-        ������ ���������.</td>
-      <td>&a.jhb;</td>
-      <td>18 ��� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� ������� � td_ucred �� p_ucred, ��� ������ �������� ���
-        ����������� �� KSE.</td>
-      <td>&a.jhb;</td>
-      <td>18 ��� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� �������� witness_sleep() � uma_zalloc() ��� ������������
-        ����, ����������� malloc() ��� uma_zalloc() ��� ���������
-        ��������������� ����������.</td>
-      <td>&a.jhb;</td>
-      <td>20 ��� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������������� ��������� UP, ������� ����� ���������� �� ����,
-        ����������� ������ ���� � ��������� ������ � ������.</td>
-      <td>&a.jhb;</td>
-      <td>21 ��� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ������ �������� �����������, ���� ������� ���������
-        ���������� ����������� �� ������ ����������.</td>
-      <td>&a.jhb;</td>
-      <td>21 ��� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ��������� ��� pause-���������� IA32 ��� ������������
-        ������ � �����������.</td>
-      <td>&a.jhb;</td>
-      <td>21 ��� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� KTRACE ������� � �������������� ����� ����������.</td>
-      <td>&a.jhb;</td>
-      <td>7 ���� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� �� Giant � modnext(2), modfnext(2), modstat(2) �
-        modfind(2).</td>
-      <td>&a.arr;</td>
-      <td>25 ���� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ������������� ������� TLB � invlpg() �� x86 SMP.</td>
-      <td>&a.peter;</td>
-      <td>12 ���� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� cpu_coredump �������-�����������.</td>
-      <td>&a.peter;</td>
-      <td>7 �������� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ���������� ���������� � ���� ����� ����������.</td>
-      <td>&a.arr;</td>
-      <td>11 �������� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� SIGXPU � ������ ���� ���� #if 0 � mi_switch().</td>
-      <td>&a.jhb;</td>
-      <td>30 �������� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ���������� MAC �� TrustedBSD.</td>
-      <td>&a.rwatson;</td>
-      <td>11 ������ 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ������������ �������.</td>
-      <td>&a.msmith;, &a.mini;, &a.jhb;</td>
-      <td>11 ����� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� PHOLD(), ����� ��� ������������� ��� ����������������
-        PS_INMEM.</td>
-      <td>&a.jhb;</td>
-      <td>22 ������ 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ��������� procfs_machdep.c, ������� �� ������
-        ������������ sched_lock.</td>
-      <td>&a.jhb;</td>
-      <td>22 ������ 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ���� ������ �� ���������� ��������� � ������� Giant ��
-        ��������� �������, ��������� � ������������ ���������.</td>
-      <td>&a.jhb;</td>
-      <td>1 ��� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ��������� procsig � sigacts, ��������� ����� ���������
-        sigacts �� U-������� � �������� ��������������� ����������.</td>
-      <td>&a.jhb;</td>
-      <td>13 ��� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� Giant �� ��������� ������� kill() � killpg().</td>
-      <td>&a.jhb;</td>
-      <td>13 ��� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ���������� ���� ���������, �������� �������� �
-        ������������� ���������� ����������� �������������� ����� �
-        �������������� ��������� ����� � ����������� ���������.</td>
-      <td>&a.truckman;</td>
-      <td>16 ���� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� ���������� �������������� ��������� ��� ����, �����
-        �������� ������������� � ��������� ��������� ����.</td>
-      <td>&a.eivind;, &a.des;</td>
-      <td>31 ����� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ���������� ����������: ����������� VM.</td>
-      <td>&nbsp;</td>
-      <td>4 ������� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ����������� ��� ���������� i386 � SMP, ����� SMP-����
-        �������� �� UP-������� � SMP ����� ���� �������� � GENERIC.</td>
-      <td>&a.jhb;</td>
-      <td>3 ������ 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>����������� ����� ������� ��� ������������� ��� ����������� ���
-        ��������.</td>
-      <td>&a.jhb;</td>
-      <td>11 ������ 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� witness_lock() �� witness_checkorder() �
-        witness_lock().  witness_checkorder() ������ ���������� �� ���������
-        ����������, ����� ��������� ����������� ����������� �������������
-        ������� ���������� ���������� � ������ �������������� �� ���� ��
-        ������������� �������� �������� ����������.  witness_lock() �����
-        ������ ��������� ���������� ��������� witness, ���������� ����
-        ��������� ����������.</td>
-      <td>&a.jhb;</td>
-      <td>24 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ����������� �������� �� ������� ��������.</td>
-      <td>&a.mtm;, &a.jhb;</td>
-      <td>4 ������� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>����������� ���������� ������� ���� ��� ������������� ��� �
-        msleep(), ��� � �������� ����������.  ��� ����� ���������� ������
-        ������������ ���-������� �������� ���� � ������������ ����������� �
-        ������ ������� ������� ����, ������� �� ��������� ��������
-        ����������, ����� ������� sched_lock �����.</td>
-      <td>&a.jhb;</td>
-      <td>27 ������� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� Giant �� jail(2).</td>
-      <td>&a.arr;, &a.rwatson;</td>
-      <td>23 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ���������� ��� ��������� NFSv2, ������� NFSv3, �����������
-        ��������� ��������� � ������������ ������ � ������ ���������,
-        ��������� � �����, ��� Giant.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>����������� ���� ��������� � ����������� ����������������.</td>
-      <td>&a.jhb;</td>
-      <td>24 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ���������� ���������: �������� ������� � sigio/fown</td>
-      <td>&a.alfred;</td>
-      <td>24 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ���� SysV IPC.</td>
-      <td>&a.alfred;</td>
-      <td>24 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>����������� ���������� ������ ���������� ��� ������ �������
-        ��������� ����������, � ��� ����� Giant, � ��������� �����
-        ����������� ����������� ��������� ������������������ �
-        ����������.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <!-- WIP -->
-
-    <tr>
-      <td>���������� ��������� proc.</td>
-      <td>&a.jhb;</td>
-      <td>20 ������� 2001</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ���������� tty.</td>
-      <td>Dick Garner, Jeremy Scofield, &a.tmm;, &a.phk;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ���������� �����, ������� ������ ���� ���������� �� ����
-        ����������.</td>
-      <td>&a.jhb;</td>
-      <td>16 ������ 2001</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>������������ ���������� �������� � �ޣ����� ������ �� ������� ���
-        ������ ����������� ������� (� procfs).</td>
-      <td>&a.jhb;</td>
-      <td>27 ������� 2002</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>������������ ���������� ��������� ��� ������ sysctl-�������
-        ����������� ��������, ������� ��, ��� ������������ 'ps' �
-        �������������� �������������.</td>
-      <td>&a.jhb;</td>
-      <td>27 ������� 2002</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>�������� �������������� newbus ��� ��������� ������� ����������
-        ����������.</td>
-      <td>&a.imp;</td>
-      <td>28 ������� 2002</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>������� ���� ������������� ���������� ������ � MP �� �������
-        ��������� �������, � �������� �������������� mtx_lock/unlock ���
-        Giant �� ���� ��������� �������.</td>
-      <td>&a.dillon;, &a.mux;, &a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>���������������� ����������� SMPng.</td>
-      <td>&a.jhb;, &a.rwatson;</td>
-      <td>28 ������� 2002</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>������� � ���������� ���������� VOP_GETATTR() ��� ����������
-        ���������� �� ����� ���������� ������ ������� �������� � VFS.
-        ����������� namei() � ����� �������������� ����� LOOKUP_SHARED,
-        ������� ����������, ��� ��������� ���������� ����� ���� ����������,
-        � �� ��������������.</td>
-      <td>&a.jeff;</td>
-      <td>11 ����� 2002</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>��������� �������� sysctl � ������� �������.</td>
-      <td>&a.mini;</td>
-      <td>9 ������ 2002</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>���������������� ������������ ���������� vm_map � �������� ţ
-        ������������.</td>
-      <td>&a.alc;</td>
-      <td>18 ��� 2002</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>���������������� ������������ ���������� vm_object � �������� ţ
-        ������������.</td>
-      <td>&a.alc;</td>
-      <td>4 ��� 2002</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>��������� �������� linker_file_t � ������������ ����.</td>
-      <td>&a.arr;</td>
-      <td>19 ���� 2002</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ��������� ���������� � ������������ �������� VFS,
-        ����������� ��������� ������� �����, ��������� � ����������
-        ���������� VFS-�������.</td>
-      <td>&a.jeff;</td>
-      <td>10 ������� 2002</td>
-      <td> &status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>���������������� ��������� ���������� ������ vnode, ţ ��������,
-        �������� ���������� ����������, ������������ �� sx-����������.</td>
-      <td>&a.jeff;</td>
-      <td>10 ������� 2002</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>����������� ����ݣ���� ������������ ����� ���������� (�����
-        �����������) �� i386.</td>
-      <td>&a.bmilekic;, &a.kan;</td>
-      <td>10 ������� 2002</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>����������� ����ݣ���� ������������ ����� ���������� (�����
-        �����������) �� sparc64.</td>
-      <td>&a.jake;</td>
-      <td>10 ������� 2002</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>������� �� ������������� lockmgr � VM � ������������� �������� ���
-        ��������������� sxlock.  ���������� �� Giant �� ���� VM, ����� ���
-        ����������� vm_object/VFS � vm_page/pmap.</td>
-      <td>&a.alc;</td>
-      <td>10 ������� 2002</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>����������� API ��������� ���������, ����� ��������� ���������
-        ����� ������ ������ ��� �� "� ��������� ����������" � "� �����
-        ����������" ��� ����� �������� ������������� ����������.  ���
-        �������� ����������� ��������� ����������.</td>
-      <td>&a.peter;</td>
-      <td>4 ������� 2003</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <!-- ��������� -->
-
-    <tr>
-      <td>������� �������� � ��������� cdevsw ��� ������ ���������, ��
-        ����������� �� �������� �����.</td>
-      <td>&a.jhb;</td>
-      <td>15 ��� 2001</td>
-      <td>&status.stalled;</td>
-    </tr>
-
-    <tr>
-      <td>������� printf() ���������� ��� ������ ����������� � ����� �����
-        �� ��������� ������� ����������.</td>
-      <td>&a.cp;</td>
-      <td>15 ��� 2001</td>
-      <td>&status.stalled;</td>
-    </tr>
-
-    <!-- �� ������ -->
-
-    <tr>
-      <td>������� �������� �������������� �� tsleep(), msleep() �
-        cv_*wait*().</td>
-      <td>&nbsp;</td>
-      <td>12 ������ 2001</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ����������� kqueue ��� ������ �������� ����������.</td>
-      <td>&nbsp;</td>
-      <td>15 ����� 2001</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>������� ��������� �������� � SMP-���� ���������, ��� ������������
-        ��� ���������� � ����� �������.</td>
-      <td>&a.peter;</td>
-      <td>15 ����� 2001</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ����� ���������� �������� ��� ������������ ��������� ��
-        ������� ���������� ����������.</td>
-      <td>&a.jhb;</td>
-      <td>13 ���� 2001</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>������� ����������� ��� �������� ����������, ��������� �
-        sx-����������.</td>
-      <td>&nbsp;</td>
-      <td>7 �������� 2001</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>������ �������� schedcpu(), ��������� ���������� �� ��������.</td>
-      <td>&nbsp;</td>
-      <td>7 �������� 2001</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>��������� *hold (��������, crhold) �� ������� ������ ��
-        ������.</td>
-      <td>&nbsp;</td>
-      <td>7 �������� 2001</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ���������� �������� �� ���������� lockmgr.</td>
-      <td>&nbsp;</td>
-      <td>7 �������� 2001</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ���������� ���������� ICU �� ia64.</td>
-      <td>&nbsp;</td>
-      <td>4 ������ 2002</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>������� ���������� �� Giant ��� VOP_READ() � VOP_WRITE().</td>
-      <td>&nbsp;</td>
-      <td>25 ������� 2002</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>������� ������ Giant � ��������� ������ Linux i386 ABI.</td>
-      <td>&nbsp;</td>
-      <td>25 ������� 2002</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>������� ������� Giant � ��������� ������ Linux AXP ABI.</td>
-      <td>&nbsp;</td>
-      <td>25 ������� 2002</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>������� ������� Giant � ��������� ������ SVR4 i386 ABI.</td>
-      <td>&nbsp;</td>
-      <td>25 ������� 2002</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>������� ������� Giant � ��������� ������ OSF/1 AXP ABI.</td>
-      <td>&nbsp;</td>
-      <td>25 ������� 2002</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>������� ������� Giant � ��������� ������ IBCS i386 ABI.</td>
-      <td>&nbsp;</td>
-      <td>25 ������� 2002</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ����������� �������������� ��������� �� ��������������
-        ����� � sx-����������.</td>
-      <td>&a.eivind;, &a.des;</td>
-      <td>1 ������ 2002</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>����������� atomic_fetchadd() ��� ������ int � long � �������� acq
-        � rel.</td>
-      <td>&nbsp;</td>
-      <td>23 ��� 2002</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>����������� ������� API �ޣ����� ������,  ������������ ���������
-        ��������, ��� ������ ����������, ������� ����� ���� �������� �ޣ�����
-        ������.</td>
-      <td>&nbsp;</td>
-      <td>23 ��� 2002</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>�������� �������� witness_sleep() ��� copyin/out() �
-        s/fuword().</td>
-      <td>&a.jhb;</td>
-      <td>7 ���� 2002</td>
-      <td>&status.new;</td>
-    </tr>
-
-<!--
-    <tr>
-      <td></td>
-      <td>&nbsp;</td>
-      <td>D M 2002</td>
-      <td>&status.new;</td>
-    </tr>
--->
-  </table>
-
-  <p>� ���� ������� ����������� ���������, ������� ����� ��������� ���
-    ����, ����� ������� ���� ������� ���������� �������������.</p>
-
-  <table class="tblbasic">
-    <tr class="heading">
-      <th>������</th>
-      <th>�������������</th>
-      <th>��������� ����������</th>
-      <th>���������</th>
-    </tr>
-
-    <tr>
-      <td>�������� ������� ������� �����������.</td>
-      <td>&a.jlemon;</td>
-      <td>24 ������ 2000</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� IP.</td>
-      <td>&a.jennifer;, &a.hsu;</td>
-      <td>10 ���� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� TCP.</td>
-      <td>&a.jennifer;, &a.hsu;, &a.sam;, &a.rwatson;</td>
-      <td>24 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� UDP.</td>
-      <td>&a.jennifer;, &a.hsu;, &a.rwatson;</td>
-      <td>24 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� �ޣ������ ������ ifaddr.</td>
-      <td>&a.hsu;</td>
-      <td>18 ������� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ������ ifnet.</td>
-      <td>&a.hsu;</td>
-      <td>21 ������� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� �������� radix.</td>
-      <td>&a.hsu;</td>
-      <td>23 ������� 2002</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ARP.</td>
-      <td>&a.hsu;</td>
-      <td>16 ������ 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� raw IP.</td>
-      <td>&a.sam;, &a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ������� divert.</td>
-      <td>&a.sam;</td>
-      <td>4 ������� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ipfw2.</td>
-      <td>&a.sam;</td>
-      <td>4 ������� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� DUMMYNET.</td>
-      <td>&a.sam;</td>
-      <td>4 ������� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ����� ethernet.</td>
-      <td>&a.sam;</td>
-      <td>4 October 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� �������� ���������������� IP.</td>
-      <td>&a.rwatson;</td>
-      <td>4 ������� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ������ �������������.</td>
-      <td>&a.sam;</td>
-      <td>4 ������� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� FAST_IPSEC.</td>
-      <td>&a.sam;</td>
-      <td>4 ������� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ������������ ������ � ��������� isr.</td>
-      <td>&a.rwatson;, &a.sam;</td>
-      <td>11 ������� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� "���������� ������" if_disc.</td>
-      <td>&a.rwatson;</td>
-      <td>9 ����� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� "���������� �������� IPv6-to-IPv4 TCP" if_faith.</td>
-      <td>&a.sam;, &a.rwatson;</td>
-      <td>9 ����� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� "������ ���������� ��������������" if_gif.</td>
-      <td>&a.rwatson;</td>
-      <td>9 ����� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ��������� ������� ECN (ip_ecn.c).</td>
-      <td>&a.rwatson;</td>
-      <td>9 ����� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� if_tap ��������� � �� ������ softc.</td>
-      <td>&a.rwatson;</td>
-      <td>23 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� if_tun ��������� � �� ������ softc.</td>
-      <td>&a.rwatson;</td>
-      <td>23 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� netatalk/aarp.c.</td>
-      <td>&a.rwatson;</td>
-      <td>23 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>����������� MAC-����� ������ � ����� inpcb ������� IPv4, ����� ���
-        ����� ����� ��������� �������������� �� ������ inet ��� ����������
-        ������ ������.</td>
-      <td>&a.rwatson;</td>
-      <td>23 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������������ ������������ IP (ip_encap.c).</td>
-      <td>&a.rwatson;</td>
-      <td>23 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� globals � loopback-���������� (if_loop.c).</td>
-      <td>&a.rwatson;</td>
-      <td>23 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������������� m_tags � if_gif ��� ����������� ���������
-        ������������, ������ ������������ �ޣ�����, �� ������������ �
-        MPSAFE.</td>
-      <td>&a.ru;</td>
-      <td>23 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� netatalk DDP PCB.</td>
-      <td>&a.rwatson; </td>
-      <td>23 ������ 2004</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ���������� �������� �������� IP ��� Giant.</td>
-      <td>&a.sam;</td>
-      <td>1 ������� 2003</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ���������� ������ &unix; � fifofs.</td>
-      <td>&a.sam;, &a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>Giant-���������� NFS-������� ��� ���������� so_upcall() ���
-        Giant</td>
-      <td>&a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ����-������ ������������ �����������.</td>
-      <td>&a.brooks;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ���������� ���������� ������ � ��� ������, �����������
-        ����� ��� ����� MAC � �������, ��� ����� �� ����� ���� �������������
-        ������������ ��� Giant.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��� ��������������� ��������� ������ ������������� ������������
-        netisr ��� ��������� ���������� ����� � ��� ������ �� ����
-        �������������, ����� ������� ������������������ ����������.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ���������� accept ��� ������ �� ������������� �������� �
-        ������ �������� �� �������, ������ ����������.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� �������� wakeup, append � ������� ������, ���������
-        ��������� ������, �������������� ������ ������, ��� ������� � ���
-        ����� �� _locked() � ��������������� ������, ��������� ��������
-        ����������.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� AARP, AppleTalk Address Resoluton Protocol.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>����������� ������� � �������������� ������ ���� pull/push �
-        sosend(), soreceive(), �������� �� �������� ��� Giant.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ���������� ��������/������ ������ � ������ ���������
-        ���������.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ��������� ��������� ����-������ � ������� netgraph,
-        ��������� � �����������.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ����� OOB ������ ������ � TCP/IP � IPX.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� MSG_NBIO, ����� fifofs ����� �������� ����������� �
-        SO_NBIO, ��������� � ������.</td>
-      <td>&a.truckman;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ��� ������������� so_count ����������� ������.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ���������, ��������� � ������� ������, �� so_state �
-        sb_state, ����� ��� ����� ���� ����������� ��������� ������
-        ������.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������ ��������� ���������� ���������� ��� ������������ ����
-        if_label, ������������� � ���������� MAC.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ���������, ����������� ��� VFS, �� fdrop_locked(), �
-        �������� Giant � ����������� ������� fo_close, � �� � fdrop_locked(),
-        ����� ��������� � ������ ����� �������� � fo_close() ��� Giant.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� ������� Giant � �������� ���������� ����������� �����
-        fo_stat(), � �� �������� ��� � fstat(), ����� ������ fstat() �
-        �������� � ����������� �������� ��� Giant.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�� ���������� ���������� ������ � ������� ����� � ������
-        ������������ ���������, �������� ������� ��������� ��������
-        ���������� ������ ����� ���������� ���������� � �������
-        ����������.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ���� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������������ ���������� inpcb ��������� � ��� ���������
-        �� IPv4 � IPv6</td>
-      <td>&a.rwatson;</td>
-      <td>8 ������� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� IFF_NEEDSGIANT, ����� ��������� if_start ������������
-        Giant ��� ������ � ������̣����� ������������.  �������� if_start �
-        ������� �����.</td>
-      <td>&a.rwatson;</td>
-      <td>8 ������� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� �� Giant � �������� stat(), fo_stat() ��� �����������
-        ������ stat ��� ���������� � ������� ��� Giant.</td>
-      <td>&a.rwatson;</td>
-      <td>8 ������� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ������� ���������� TCP.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ������ �������.</td>
-      <td>&a.sam;, &a.rwatson;</td>
-      <td>24 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ���� ������� TCP.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������ � �������� ��������� �������� �� ���� ��������� ����������
-        � ����������� ������� �������.</td>
-      <td>&a.rwatson;, &a.markm;</td>
-      <td>24 ������ 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� ���� ������������� NET_NEEDS_GIANT(), �������������
-        ��������������� Giant � ������� �����, ���� ���� ��� ������������� �
-        ����.</td>
-      <td>&a.rwatson;</td>
-      <td>28 ������� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>��������� Giant � ������� ����� � ������������ �� ���������.</td>
-      <td>&a.rwatson;</td>
-      <td>28 ������� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <tr>
-      <td>������� � ������������� �ޣ����� ������ �� ���������� ����� ������
-        �ޣ����� ������ �� ����� ��� ��������� ������� ��� ������ � ��������,
-        �� ��������� �������� �������� �� �ޣ������ ������.</td>
-      <td>&a.rwatson;</td>
-      <td>24 ������� 2004</td>
-      <td>&status.done;</td>
-    </tr>
-
-    <!-- WIP -->
-
-    <tr>
-      <td>���������� syncache.</td>
-      <td>&a.hsu;, &a.sam;</td>
-      <td>10 ������ 2003</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>���������� IPv6.</td>
-      <td>&a.sam;, &a.rwatson;, &a.ume;, &a.mlaier; </td>
-      <td>8 ������� 2004</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ���������� if_ppp ��� ������� softc</td>
-      <td>&a.rwatson;, Maurycy Pawlowski-Wieronski
-        &lt;maurycy@fouk.org&gt;</td>
-      <td>23 ������ 2004</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ��������� ifnet.</td>
-      <td>&a.mlaier;, &a.luigi;, Maurycy Pawlowski-Wieronski
-        &lt;maurycy@fouk.org&gt;</td>
-      <td>23 ������ 2004</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ������ ������� IPv4, IPv6 � atalk �������
-        �����������.</td>
-      <td>&a.mlaier;, &a.rwatson;</td>
-      <td>8 ������� 2004</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ������������� ���� ������ BSD compress (bsd_comp.c) ���
-        ������ ��������� �������� ������.</td>
-      <td>&a.rwatson;</td>
-      <td>23 ������ 2004</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ���������� ��������� � ��������� softc ���
-        ��������������� 6-�-4 (if_stf.c). </td>
-      <td>&a.rwatson;</td>
-      <td>23 ������ 2004</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>������������� ��������� global � softc ��� SLIP (if_sl.c).</td>
-      <td>&a.rwatson;</td>
-      <td>23 ������ 2004</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ��������� global � softc ��� SPPP (if_sppsubr.c).</td>
-      <td>&a.rik;, &a.rwatson;</td>
-      <td>23 ������ 2004</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>���������� IGMP.</td>
-      <td>&a.rwatson;</td>
-      <td>23 ������ 2004</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <tr>
-      <td>�������������� ����������� KTR ��� UMA, �������, ���������� �
-        ������� ����.</td>
-      <td>&a.rwatson;</td>
-      <td>8 ������� 2004</td>
-      <td>&status.wip;</td>
-    </tr>
-
-    <!-- �� ���������� -->
-
-    <tr>
-      <td>���������� �������� ����� ����������� ������ ������ �� �ޣ� ������
-        ������� tsleep() � wakeup() �� �������� ����������.</td>
-      <td>&a.tanimura;</td>
-      <td>21 ������ 2002</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>���������� �������� "������ ethernet" if_ef.</td>
-      <td>&nbsp;</td>
-      <td>9 ����� 2004</td>
-      <td>&status.new;</td>
-    </tr>
-
-    <tr>
-      <td>���������� IP ID.</td>
-      <td>&a.rwatson;</td>
-      <td>23 ������ 2004</td>
-      <td>&status.new;</td>
-    </tr>
-  </table>
-
-  <a name="issues"></a>
-  <h2>��������� ��������</h2>
-
-  <table class="tblbasic">
-    <tr class="heading">
-      <th>��������</th>
-      <th>��������� ����������</th>
-      <th>���������</th>
-    </tr>
-
-    <tr>
-      <td>����� �������� ������ ���������� �� ���������� ��������� ��������
-        ������.</td>
-      <td>20 �������� 2000</td>
-      <td>&status.resolved;</td>
-    </tr>
-
-    <tr>
-      <td>microuptime �������� �������� �������������.</td>
-      <td>4 ������� 2000</td>
-      <td>&status.resolved;</td>
-    </tr>
-
-    <tr>
-      <td>microuptime() ������� �������� �������������</td>
-      <td>4 October 2000</td>
-      <td>&status.resolved;</td>
-    </tr>
-
-    <tr>
-      <td>�ޣ� ��������� ������� (��� ������ �����������, ��� �����
-        ��������).</td>
-      <td>5 ������� 2000</td>
-      <td>&status.resolved;</td>
-    </tr>
-
-    <tr>
-      <td>M_DEVBUF, ��������, ������������ ��� ������ ��� ����������, �
-        �� ������ �������� � �������� ������ ���� ��������� ������ ���
-        �����.</td>
-      <td>9 ������� 2001</td>
-      <td>&status.resolved;</td>
-    </tr>
-
-    <tr>
-      <td>���������� ��-�������� �������� ��������� ���������� ��-��
-        �������� ������ � ���� ����� ��������� ����������.</td>
-      <td>15 ����� 2001</td>
-      <td>&status.resolved;</td>
-    </tr>
-
-    <tr>
-      <td>������ SMP x86 ����� ���������� NCPU * 100 clk � ����������
-        NCPU * 128 rtc.</td>
-      <td>15 ��� 2001</td>
-      <td>&status.resolved;</td>
-    </tr>
-
-    <tr>
-      <td>�������� ����� ���������� ����������� ��� ��������� Giant �����
-        ����� � ����������� � ������������ ��������� �����.</td>
-      <td>27 ���� 2001</td>
-      <td>&status.resolved;</td>
-    </tr>
-
-    <tr>
-      <td>���������������� gdb �� ��������, ���� ������ ��������� boot_ddb �
-        boot_gdb.</td>
-      <td>14 ���� 2002</td>
-      <td>&status.resolved;</td>
-    </tr>
-
-    <tr>
-      <td>���������������� gdb �� �������� �� �������� 115200.</td>
-      <td>14 ���� 2002</td>
-      <td>&status.resolved;</td>
-    </tr>
-
-    <tr>
-      <td>���������������� gdb ������� �� �������� ���������� �������, ����
-        ��� ���ģ� 'cont'.</td>
-      <td>14 ���� 2002</td>
-      <td>&status.resolved;</td>
-    </tr>
-
-    <!-- ����ۣ���� -->
-
-    <tr>
-      <td>�������������� �� ��������.</td>
-      <td>20 ������� 2001</td>
-      <td>&status.unresolved;</td>
-    </tr>
-
-<!--
-    <tr>
-      <td></td>
-      <td>D M 2002</td>
-      <td>&status.unresolved;</td>
-    </tr>
--->
-  </table>
-
-  <a name="news"></a>
-  <h2>�������</h2>
-
-  <p>���������� ����� �������� ��������������� � ���� ������� � ��������
-    ����������� ������.</p>
-
-<!--
-  <b> D M 2002</b>
-
-  <ul>
-    <li> <p>  </p> </li>
-  </ul>
--->
-
-  <b>28 ������� 2004</b>
-
-  <ul>
-    <li>&a.rwatson; ������� ��������� �������� �����, ������� ������ ��
-      ��������� �������� ��� ���������� Giant, ��� ��������� ����� �������
-      ���������� �������� �� ���������� ����������� ������������, � �����
-      �������� � ����������� ������, � ��� ����� � � ����������� �������
-      ����������.</li>
-  </ul>
-
-  <b>30 ������� 2003</b>
-
-  <ul>
-    <li><p>&a.grog; ������ �� ������������ ����������� <a
-      href="http://www.aeosc.org/">Asian Enterprise Open Source Conference</a>
-      ���� ������ <a href="http://www.lemis.com/grog/SMPng/Singapore/">FreeBSD
-      SMPng</a>.  � ������� ����������� ������������ ����� ���������� SMPng,
-      ������� � 2001 ����, ���� ������� ���������� ��������� ���������� �������
-      SMPng, �����, ��� ���������� ��������� ������������������ � ����������
-      ������������� ������ �� ���������� � ����������� ��������, VM �
-      �������� ��������� IPC.</p></li>
-  </ul>
-
-  <b>13 ������ 2002</b>
-
-  <ul>
-    <li><p><a
-      href="http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=122646+0+archive/2002/freebsd-smp/20020113.freebsd-smp">
-      ��������� �����</a> ���� ������������ � ������ �������� -smp.</p></li>
-  </ul>
-
-  <b>15 ��� 2001</b>
-
-  <ul>
-    <li><p>&a.grog; ����������� ���� <a
-      href="http://www.lemis.com/~grog/SMPng/USENIX/">������ ��� USENIX</a>,
-      ������� ����� ����������� � ������� � ����� ����.</p></li>
-  </ul>
-
-  <b>22 ����� 2001</b>
-
-  <ul>
-    <li><p>� ������ �������� -smp ���� ������������ <a
-      href="http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=41302+0+archive/2001/freebsd-smp/20010325.freebsd-smp">
-      ��������� �����</a>.</p></li>
-  </ul>
-
-  <b>5 ����� 2001</b>
-
-  <ul>
-    <li><p>� ������ �������� -smp ���� ������������ <a
-      href="http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=0+0+archive/2001/freebsd-smp/20010311.freebsd-smp">
-      ��������� �����</a>.</p></li>
-  </ul>
-
-  <b>24 ������ 2001</b>
-
-  <ul>
-    <li><p>� ������ �������� -smp ���� ������������ <a
-      href="http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=38125+0+archive/2001/freebsd-smp/20010128.freebsd-smp">
-      ��������� �����</a>.</p></li>
-  </ul>
-
-  <b>12 ������ 2001</b>
-
-  <ul>
-    <li><p>� ������ �������� -smp ���� ������������ <a
-      href="http://www.FreeBSD.org/cgi/getmsg.cgi?fetch=45111+48223+/usr/local/www/db/text/2001/freebsd-smp/20010114.freebsd-smp">
-      ��������� �����</a>.</p></li>
-  </ul>
-
-  <b>11 ������� 2000</b>
-
-  <ul>
-    <li><p>&a.jhb; � &a.cp; ��������� � ��������������� �������� <a
-      href="http://storm.uk.FreeBSD.org/~hiten/smp_synch_rules.html">
-      ������</a>, ������� ����� ��������� ��� ������ ��� �������������� �
-      ����.</p></li>
-  </ul>
-
-  <b>6 �������� 2000</b>
-
-  <ul>
-    <li><p>�������� ������ SMP-����.  ��� ���������� ������ ����� �����������
-      � cvs, � �� ��� ������ ������.</p></li>
-
-    <li><p>�������� ��� �������� �����̣���� <a
-      href="http://people.FreeBSD.org/~jasone/smp/smpng_patch_9.7">
-      ����</a>.  ��, ��������� �����, �������� ��, ��� ����� ���������� �
-      ������ �������� �������.</p></li>
-  </ul>
-
-  <b>5 �������� 2000</b>
-
-  <ul>
-    <li><p>�������� ��� �������� �����̣���� <a
-      href="http://people.FreeBSD.org/~jasone/smp/smpng_patch_9.1">
-      ����</a>.  ���� ���� ������ rtc ������� �����������, ����������
-      ���������� ���������� ��� ��������� � MP-����� � ������������
-      ������ � mtx_*() ������ �������.</p></li>
-  </ul>
-
-  <b>1 �������� 2000</b>
-
-  <ul>
-    <li><p>������� ������ ���� ������ ��� ����� ��� i386 (UP � MP).  ���
-      alpha �ӣ �ݣ ���������� �������������� �����������, ������� ������
-      �������.</p></li>
-  </ul>
-
-  <b>30 ������� 2000</b>
-
-  <ul>
-    <li><p>��� i386 � alpha �������� �����̣���� �����, ������� ��������� <a
-      href="http://people.FreeBSD.org/~jasone/smp/smpng_patch8.6">
-      �����</a>.</p></li>
-  </ul>
-
-  <b>12 ������� 2000</b>
-
-  <ul>
-    <li><p><a href="http://www.FreeBSD.org/~jhb/patches/smpng.patch6">�����</a>
-      ��������� �����̣���� ����� ��� i386.  �ޣ� ��������� �ӣ �ݣ
-      �������� �����������, ������ ������� ��������� ������ ���������.</p></li>
-  </ul>
-
-  <b>3 ������� 2000</b>
-
-  <ul>
-    <li><p>����� � ���������������� ��֣���� ������� ��� ��������� i386
-      �������� <a href="http://people.FreeBSD.org/~grog/patches4.gz">�����</a>.
-      ������� ��������� ��������� ������� � ���� ������� ������.  � ������
-      ������������ ������ �ޣ�� ���������.</p></li>
-  </ul>
-
-  <b>6 ���� 2000</b>
-
-  <ul>
-    <li><p>Sheldon Hearn ���������� ���������� �������� �� mutex(9) �� ������
-      BSD/OS, ������� �������� <a
-      href="http://people.FreeBSD.org/~jake/mutex.9">�����</a>.</p></li>
-  </ul>
-
-  <b>5 ���� 2000</b>
-
-  <ul>
-    <li><p>&a.jake; �������� �����̣���� ���� <a
-      href="http://people.FreeBSD.org/~jake/smpng.diff">�����</a>.</p></li>
-  </ul>
-
-  <b>3 ���� 2000</b>
-
-  <ul>
-    <li><p>� &a.jake; ������� ������� ��� ���������� BSD/OS, � �� ������� �
-      ���������������� ������� ������ &a.dillon; (������������� ��������,
-      ��������� ��������� � ����������� ������������ � ��� �����).  ���
-      ����� ������ �������� <a
-      href="http://people.FreeBSD.org/~jake/smpng2.tar">�����</a>.</p></li>
-  </ul>
-
-  <b>26 ���� 2000</b>
-
-  <ul>
-    <li><p>&a.cp; ����������� PostScript-������ ����� ������� ����������� ���
-      <a href="http://people.FreeBSD.org/~jasone/smp/smp_meeting_slides_1.ps">
-      �������</a> � <a
-      href="http://people.FreeBSD.org/~jasone/smp/smp_meeting_slides_2.ps">
-      �������</a> ��� ���������� SMP.</p></li>
-  </ul>
-
-  <b>25 ���� 2000</b>
-
-  <ul>
-    <li><p>��� ����� <a
-      href="http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=226208+0+archive/2000/freebsd-smp/20000625.freebsd-smp">
-      ������ ���������� SMP</a>, ������� ���� ������������ � ������
-      �������� -smp.</p></li>
-  </ul>
-
-  <b>19 ���� 2000</b>
-
-  <ul>
-    <li><p>��� ����� <a
-      href="http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=154884+0+archive/2000/freebsd-current/20000625.freebsd-current">
-      ������ ������� SMP</a>, ������� ��� ����������� � ������
-      �������� -current.</p></li>
-  </ul>
-
-
-  </body>
-</html>
diff --git a/ru_RU.KOI8-R/htdocs/y2kbug.sgml b/ru_RU.KOI8-R/htdocs/y2kbug.sgml
deleted file mode 100644
index d6bd4f2674..0000000000
--- a/ru_RU.KOI8-R/htdocs/y2kbug.sgml
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title '���������� � 2000 ���� ("������ �����������")'>
-]>
-
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSDru: frdp/www/ru/y2kbug.sgml,v 1.10 2006/06/08 08:14:55 gad Exp $
-
-     Original revision: 1.46
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.about">
-
-    <p>��� ��� ��������� �������� 2000 ���� (��������� ����� ���
-      ��������� "������ �����������") �����������, ��� ������� ����������
-      �������� ������� ����������� ��������� �� ����������� �� �����������
-      � ������������ ����������� � ���, ��������� ��������� �� ������������
-      ��������� ������� � 2000 ���.</p>
-
-    <p>�����������, ������������ &unix; � Unix-�������� ������������ �������
-      ���� FreeBSD, ��� ������� ���� ��� ���ң� � ������� ���� ��������.
-      FreeBSD ������ ���� ����� ��������� ������������ ����� ����� �����������
-      2000 ����.></p>
-
-    <h2>������� ����������</h2>
-
-    <p><i>(���� ������ ������� �� ����������, ��������� �� �������� <a
-      href="http://www.linux.org.uk/mbug.html">����������
-      Linux � �2000</a>)</i></p>
-
-    <p>��� ��� ����� ����� �� ����� Unix � Unix-��������� �������������
-      ���������, ����� � ���� �� FreeBSD ����� ���������� ������������� � ����
-      ����� ������, ��������� � 1 ������ 1970 ���� ("���" Unix).  � ���������
-      ����� ��� ����� �������� � ���� 32-���������� ������ � ��������� ����
-      ������ � 2038 ����.  � ���� ������� �� ��� (��������) ����� ������������
-      ������� �� 64 (��� ������) ��������, �������� ������ ������� ��
-      ��������� ����.</p>
-
-    <p>��������, ��� ���������� �� � �2000 �� ��������, ��� ����������,
-      �� ������� � �2000, ����� �������� ���������.</p>
-
-    <p>�������� �����, ��� ��� ������ �� �������������� ������ ������� ����
-      � ������� �� ����� CMOS �� ����� ����������.  �� ��� ����� ����������
-      ��������� ������������ 2000 ���.  �������� ��� �������������
-      �������������� ������ ������, ����� ���������, ��� ���� ���������� ����
-      ����� ���� ��������� ��� �������� �� 1999 ���� � 2000. � ��� ���
-      ��������� �������������� ��� 2000 ��� ����������.</p>
-
-    <h2>��� �� ������ �������</h2>
-
-    <p>FreeBSD ����� ���������� ��������� ����� ������ ������� � ���������
-      ����.  ���������� ������� ����, ������, ����� ����� � �� �������.
-      ������ ����� ������� �� �������, ��������� � 2000 �����, �������� ������
-      ����������� �����. ������������ ������� � ����������� ����� ����, ���
-      �� ��� ���� ������������, <strong>�� �����</strong> ��������
-      �����������, ��� �������, � ������� �������� ���������� ����. ������
-      FreeBSD �����������, ����� ���� ����������� ���������� ���������
-      �������������� ������� � ������� �����, ���������� �������� �2000.</p>
-
-    <h2>��������� FreeBSD �� ������ �2000</h2>
-
-    <blockquote>
-      <p>"����� ����������� ������������ � ������������, �� ��������, ���
-        FreeBSD �������� ��������, ������� � �2000 �� 100%.  � ������, ����
-        ���-�� ���� ���������, �� �������� ��� ������, ����� ��������� �ӣ ���
-        ����� ������."</p>
-
-      <p align="right">David Greenman<br/>Principal Architect, The
-        FreeBSD project</p>
-    </blockquote>
-
-    <h2>������������ ��������</h2>
-
-    <p>�� FreeBSD ���� ������� � ���������� ��������� �������� �2000.</p>
-
-    <dl>
-      <dt><a
-        href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=1380">misc/1380</a></dt>
-
-      <dd>��������� ��������� ����� ���������������� ������ 19%d
-	��� ������ ����. � ����� ���������� ���������: yacc, ftpd, � make.
-	[����������: yacc v1.2 1999/01/18; ftpd v1.7 1996/08/05;
-	make v1.4 1996/10/06; ����������� �������� FreeBSD-2.2 � ����]
-      </dd>
-
-      <dt><a
-        href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=1382">conf/1382</a></dt>
-
-      <dd>sed-������ � /etc/rc.local, ����������� ������ �������������
-        ������/���� � ��������� ���, ������� �� ������ ���� � �� ��������
-	����� 1999.[���������� v1.21 1996/10/24; ����������� ��������
-        FreeBSD-2.2 � ����]
-      </dd>
-
-      <dt><a
-	href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=3465">misc/3465</a></dt>
-
-      <dd>������� etc/namedb/make-localhost ���������� �������� ����� DNS
-	� ������� YYMMDD. � 2000 ����, �� ����� ����� ��� 1YYMMDD.
-	[���������� v1.2 1997/08/11; ����������� �������� FreeBSD-2.2.5 � ����]
-      </dd>
-
-      <dt><a
-	href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=4930">gnu/4930</a> �
-	<a href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=8321">gnu/8321</a></dt>
-
-      <dd>������ tmac ��� groff ���������� ���������������� ����� 19 ���
-	��������� ��������� ���.
-      	[����������: tmac.e v1.3 1998/12/06; doc-common v1.10 1999/01/19;
-	����������� �������� FreeBSD-3.1 � ����]
-      </dd>
-
-      <dt><a
-	href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9323">bin/9323</a></dt>
-
-      <dd>� ����� ���������� ����� touch ����������� ������������ ���
-	����� ������������ ����.  ���� � ��������� 00-68 �������������� ���
-	1900-1968, � �� 2000-2068. [���������� v1.7 1999/01/05; �����������
-	�������� FreeBSD-3.1 � ����]
-      </dd>
-
-      <dt><a
-        href="http://cvsweb.FreeBSD.org/src/usr.sbin/xntpd/parse/util/dcfd.c">xntpd/parse/util/dcfd.c</a></dt>
-
-      <dd>���������� ����������� ���� ��� ��������� ����� ���� � ���� �
-	�������������� ������� DCF77 � ����� ������, ��������� � ������ ����
-	����������� �����������.  ��� ������ ������ �� ��� ����.
-	[���������� v1.6 1999/01/12; ����������� �������� FreeBSD-3.1 � ����]
-      </dd>
-
-      <dt><a
-        href="http://cvsweb.FreeBSD.org/src/gnu/usr.bin/tar/getdate.y">tar/getdate.y</a></dt>
-
-      <dd>� ������� Convert() ���� ������ ������������� ������ ����, ����������
-        �� ���� ����, ��� ��� � ��������� 70-99.  ������ ��� ����������, �����
-        ����� ���� ������������ ��� ����� ���� ��� ��� �� ��������� 1970-2069.
-        ������� �� �������� ��� ������� ��� ������������ ��� - ������ y2k1!
-        [���������� v1.4 1999/01/12; ����������� �������� FreeBSD-3.1 � ����]
-      </dd>
-
-      <dt><a
-        href="http://cvsweb.FreeBSD.org/src/usr.bin/fetch/http.c">fetch/http.c</a></dt>
-
-      <dd>�������� HTTP ��������� ���������� ������ ������������� ����, �
-	������� ������������ ��� ����� ����.  ���������� ������ ������� fetch
-	����� ���������������� ��� ����� ���� ��� ����������� � 20 ����;
-	��� ������� � ����������� ��������� <a
-	href="ftp://ftp.cdrom.com/pub/internet/rfc/rfc2068.txt">RFC
-	2068</a>, ��� ��������� ���������������� ��� �� ���� ���� ���
-	����������� � ������� ��������, ���� �� ��� ����� �������� ������
-	50 ���.  ��� ��� �������� HTTP, ������� ���������� ������ ������,
-	�������� �� ��� �� �����, ���� �� ��� ������� ������������
-	���������. [���������� v1.24 1999/01/15; ����������� ��������
-        FreeBSD-3.1 � ����]
-      </dd>
-
-      <dt><a
-	href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9500">misc/9500</a></dt>
-
-      <dd>������ `edithook' � �������� CVSROOT ���������� �������� tm_year
-	��������������� � ������� ����� �������� 01/01/100 ��� 2000-JAN-01.
-	[���������� � v1.2 1999/01/17; �� ����� ��������� �� � ������ ������]
-      </dd>
-
-      <dt><a
-	href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9501">bin/9501</a></dt>
-
-      <dd>��������� �� �������������� ������ �������� cvs �� ���������� �
-      	�2000.  ������� log.pl � sccs2rcs.csh ��������� `19' � ������ ����,
-      	��� �������� � ������ 19100 ��� 2000 ����. ������ log_accum.pl
-      	� ����� ����� ���������� ��� ����� ����, � � ������ ������������, ���
-      	tm_year - ��� ����� ���, ��������� � ������ ��������, � �� � 1900 ����.
-      	[����������: log.pl v1.2 1999/01/15; sccs2rcs.csh v1.3 1999/01/15;
-      	����������� �������� FreeBSD-3.1 � ����]
-      </dd>
-
-      <dt><a
-	href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9502">bin/9502</a></dt>
-
-      <dd>������� `yr' ������� groff, ���������������� �� (struct tm).tm_year
-      	� ������� ������������ ����� ����� ���, ��������� � 1900 ����, � ��
-	� ������ �������� ���� (�������� ����������� � �����
-	troff/input.cc).
-	[����������, ������ ��������������� �������� �� ������ 100,
-	troff/input.cc V1.2 1999/06/03; ���������� �� FreeBSD-3.3]
-      </dd>
-
-      <dt><a
-	href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9503">bin/9503</a></dt>
-
-      <dd>� PicoBSD simple_httpd ���������� ���������������� �������� tm_year
-	� ������� ����� �������� 01/01/100 ��� 2000-JAN-01.
-	[���������� � v1.2 1999/01/16; ����������� �������� FreeBSD-3.1 � ����]
-      </dd>
-
-      <dt><a
-	href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9505">bin/9505</a></dt>
-
-      <dd>������� adduser ���������� ���������������� �������� tm_year �
-	������� ����� �������� 100/01/01 ��� ���� 2000-JAN-01.
-	[���������� � v1.42 1999/01/15; ����������� �������� FreeBSD-3.1 � ����]
-      </dd>
-
-      <dt><a
-	href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9506">bin/9506</a></dt>
-
-      <dd>Cron ���������� �������� tm_year ��������������� � ������� �����
-	�������� �������� 100 ��� 2000 ����.
-	[Fixed v1.7 1999/01/16]
-      </dd>
-
-      <dt><a
-	href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9507">bin/9507</a></dt>
-
-      <dd>������� tcpslice(8) ���������� �������� tm_year ��������������� �
-	������� ����� �������� 100y01m01d... ��� 2000-JAN-01.  ���
-	���������� ������������� ����������� ��� ����� ���� �� 2000 ����.
-	[���������� � v1.8 1999/01/20; ����������� �������� FreeBSD-3.1 �
-	����]
-      </dd>
-
-      <dt><a
-	href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=14472">bin/14472</a></dt>
-
-      <dd>������� date �� ������������ �����, ����������� ������/�����.
-	[���������� � v1.31 1999/11/10]
-      </dd>
-
-      <dt><a
-	href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=14511">misc/14511</a>
-      </dt>
-
-      <dd>� ������� �hpass ������� �������� ��� ������������� 00 ��� ��������
-	���� ��������� �����.
-      </dd>
-
-      <dt><a
-	href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=15852">bin/15852</a>,
-	<a
-	href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=16045">gnu/16045</a> �
-	<a href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=16207">bin/16207</a>
-      </dt>
-
-      <dd>� ��������� groff ������� �������� � ����������̣���� �������
-	\*(DT [\*(td].  [���������� � ���������� ������ 1.15 2000/01/12]
-      </dd>
-
-      <dt><a
-	href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=15872">bin/15872</a>
-      </dt>
-
-      <dd>� ��������� at(1) ������� �������� � ��������� �������� �������,
-	����� ��� ������� tm_year ������ 100 �������� ����������� `garbled
-	time'.
-      </dd>
-
-      <dt><a
-	href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=16238">misc/16238</a>
-      </dt>
-
-      <dd>��������� KerberosIV �������� �����������, ��� ��� � �������� �������
-	Kerberos ֣���� ������ ����� 12/31/99 ��������� ����� ������ ����������
-	������.  [���������� � v1.24 1999/09/19]
-      </dd>
-    </dl>
-
-    <h2>�������������� ����������</h2>
-
-    <p>���� � ��� ���� ������� �� ������ ���������� FreeBSD � 2000 ���� ���
-      �� ���������� ���������� FreeBSD, ������� �� ������ � 2000 ����,
-      ����������, �������� ��� �� ������ <a
-      href="mailto:freebsd-bugs@FreeBSD.org">freebsd-bugs@FreeBSD.org</a>.</p>
-
-  </body>
-</html>
diff --git a/share/sgml/multimedia.dtd b/share/sgml/multimedia.dtd
index 3705344d04..84d56e9ba2 100644
--- a/share/sgml/multimedia.dtd
+++ b/share/sgml/multimedia.dtd
@@ -1,9 +1,12 @@
+<!-- $FreeBSD$ -->
+
 <!ELEMENT multimedia (items, sources)>
 
 <!ELEMENT items (item*)>
 <!ELEMENT item (title, overview, desc, tags)>
 <!ELEMENT overview (#PCDATA)>
-<!ELEMENT tags (#PCDATA)>
+<!ELEMENT tags (tag)+>
+<!ELEMENT tag (#PCDATA)>
 
 <!ATTLIST item
 	source IDREF #REQUIRED
diff --git a/tr_TR.ISO8859-9/htdocs/docs.sgml b/tr_TR.ISO8859-9/htdocs/docs.sgml
index 4f86efb042..e5265bf9d7 100644
--- a/tr_TR.ISO8859-9/htdocs/docs.sgml
+++ b/tr_TR.ISO8859-9/htdocs/docs.sgml
@@ -633,11 +633,6 @@
 
     <h2><a name="additional">Ek Kaynaklar</a></h2>
 
-    <h3><a href="y2kbug.html">2000 Y�l� Uyumlulu&eth;u</a></h3>
-
-    <p>The FreeBSD projesinin 2000 Y�l� Uyumlulu&eth;u
-      beyan�.</p>
-
     <h3><a href="http://www.daemonnews.org/newsletter/">BSD Real-Quick (TM) Gazetesi</a></h3>
 
     <p>FreeBSD arenas�nda ger�ekle�en
diff --git a/zh_CN.GB2312/htdocs/Makefile b/zh_CN.GB2312/htdocs/Makefile
index f4f52d704c..dae1ebd276 100644
--- a/zh_CN.GB2312/htdocs/Makefile
+++ b/zh_CN.GB2312/htdocs/Makefile
@@ -25,7 +25,6 @@ DOCS+= relnotes.sgml
 DOCS+= send-pr.sgml
 DOCS+= support.sgml
 DOCS+= where.sgml
-DOCS+= y2kbug.sgml
 
 XMLDOCS=	index:xsl:${XML_NEWS_NEWS}:
 DEPENDSET.index=transtable mirrors news press events \
diff --git a/zh_CN.GB2312/htdocs/y2kbug.sgml b/zh_CN.GB2312/htdocs/y2kbug.sgml
deleted file mode 100644
index 0d057b5aab..0000000000
--- a/zh_CN.GB2312/htdocs/y2kbug.sgml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="GB2312"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title 'Year 2000 Compatibility (aka "Millennium Bug")'>
-]>
-
-<!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- Original Revision www/en/y2kbug.sgml,v 1.46 2005/10/04 19:43:47 hrs -->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-    <body class="navinclude.docs">
-
-    <p>As management understanding of the Year 2000 problem (aka, "The
-      Millennium Bug") increases, more and more companies are demanding
-      official statements from the vendors of their hardware and software as
-      to how their product will handle the year 2000 date rollover.</p>
-
-    <p>Organizations that use &unix; and Unix-like operating systems such as
-      FreeBSD are already one step ahead of the problem.  FreeBSD will
-      properly maintain time long after year 2000 passes.</p>
-
-    <h2>Background information</h2>
-
-    <p><i>(This section based on the text from the <a
-	  href="http://www.linux.org.uk/mbug.html">Linux Y2K compliance
-	  page</a>)</i></p>
-
-    <p>As with all Unix and Unix-like operating systems, time and dates in
-      FreeBSD are represented internally as the number of seconds since the
-      1st of January 1970 (the Unix "epoch").  Currently, that figure is
-      stored as a 32 bit integer, and will run out part way through 2038. By
-      then we should (hopefully) be using a counter of 64 bits (or greater)
-      which should be good until the end of the universe.</p>
-
-    <p>Note that the OS being Y2K compliant will not fix errant applications
-      that are not Y2K compliant.</p>
-
-    <p>Note also that the OS expects to read the current date and time from
-      the CMOS clock of your computer.  Not all of these devices correctly
-      handle the year 2000.  You are advised to test each platform
-      individually to ensure that your hardware clock behaves correctly when
-      going from 1999 to 2000, and that it correctly interprets the year 2000
-      as a leap year.</p>
-
-    <h2>What you can do</h2>
-
-    <p>FreeBSD will continue to properly maintain time well into the next
-      century.  Third party applications, however, might not.  Your best
-      defense against year 2000 issues is a good offense.  Listening to
-      stories claiming the coming meltdown of the world as we know it are
-      <strong>not</strong> the way to solve the millennium bug.  Nor is
-      waiting until the last minute.  The FreeBSD Project recommends that your
-      organization apply sound system administration principles as the
-      millennium approaches.</p>
-
-    <h2>FreeBSD Year 2000 Statement</h2>
-
-    <blockquote>
-      <p>"After extensive analysis and testing, we believe that FreeBSD is
-	100% Y2K compliant.  In the unlikely event that something has been
-	overlooked, we will do our best to fix it as soon as possible."</p>
-
-      <p align="right">David Greenman<br/>Principal Architect, The FreeBSD
-	project</p>
-    </blockquote>
-
-    <h2>Fixed problems</h2>
-
-    <p>The following Y2K problems have been identified and fixed in
-      FreeBSD.</p>
-
-    <dl>
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=1380">misc/1380</a></dt>
-
-      <dd>Several programs have a hardcoded 19%d in responses for the year.
-	Affected programs include: yacc, ftpd, and make.  [Fixed: yacc v1.2
-	1999/01/18; ftpd v1.7 1996/08/05; make v1.4 1996/10/06; fixes in
-	FreeBSD-2.2 and above]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=1382">conf/1382</a></dt>
-
-      <dd>The sed script in /etc/rc.local that builds the host/kernel ID line
-	for the message of the day relies on the year not going past 1999.
-	[Fixed v1.21 1996/10/24; fixes in FreeBSD-2.2 and above]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=3465">misc/3465</a></dt>
-
-      <dd>The etc/namedb/make-localhost command generates the DNS serial
-	number as YYMMDD. In the year 2000, this will be generated as
-	1YYMMDD.  [Fixed v1.2 1997/08/11; fixes in FreeBSD-2.2.5 and
-	above]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=4930">gnu/4930</a> and
-	  <a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=8321">gnu/8321</a></dt>
-
-      <dd>groff tmac macros have hardcoded 19 for generating some dates.
-	[Fixed: tmac.e v1.3 1998/12/06; doc-common v1.10 1999/01/19; fixes in
-	FreeBSD-3.1 and above]</dd>
-
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9323">bin/9323</a></dt>
-
-      <dd>In its obsolescent form, touch doesn't treat the two digit year
-        specification correctly.  Years in the range 00-68 are treated
-        as 1900-1968 instead of 2000-2068.  [Fixed v1.7 1999/01/05; fixes in
-        FreeBSD-3.1 and above]</dd>
-
-      <dt><a
-	  href="http://cvsweb.FreeBSD.org/src/usr.sbin/xntpd/parse/util/dcfd.c">xntpd/parse/util/dcfd.c</a></dt>
-
-      <dd>The leap year calculations for the number of days in a year, and the
-	conversion of DCF77 time to seconds since the Epoch were wrong.  These
-	errors affected all years.  [Fixed v1.6 1999/01/12; fixes in
-	FreeBSD-3.1 and above]</dd>
-
-      <dt><a
-	  href="http://cvsweb.FreeBSD.org/src/gnu/usr.bin/tar/getdate.y">tar/getdate.y</a></dt>
-
-      <dd>Function Convert() was hard-coded for two digit years in range 70-99.
-	Now adjusted to allow two digit years for 1970-2069.  The function
-	does not allow for century non-leap years - y2k1 alert!  [Fixed v1.4
-	1999/01/12; fixes in FreeBSD-3.1 and above]
-      </dd>
-
-      <dt><a
-	  href="http://cvsweb.FreeBSD.org/src/usr.bin/fetch/http.c">fetch/http.c</a></dt>
-
-      <dd>The HTTP protocol includes an obsolete date format which uses a
-	two-digit year.  Previous versions of fetch would interpret all such
-	dates in the 1900s; subsequent to this revision, the pivot described
-	in <a href="ftp://ftp.cdrom.com/pub/internet/rfc/rfc2068.txt">RFC
-	  2068</a> is employed, which causes two-digit years to be interpreted
-	as always belonging to the current century unless they would be 50 or
-	more years in the future.  Since the HTTP servers which use this
-	obsolete format are no longer widespread, this is not expected to have
-	a significant impact.  [Fixed v1.24 1999/01/15; fixes in FreeBSD-3.1
-	and above]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9500">misc/9500</a></dt>
-
-      <dd>The `edithook' script in the CVSROOT directory uses a raw tm_year
-	and will therefore display 01/01/100 for 2000-JAN-01.  [Fixed v1.2
-	1999/01/17; not relevant to FreeBSD releases]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9501">bin/9501</a></dt>
-
-      <dd>Several cvs contrib files are not Y2K compliant.  The log.pl and
-	sccs2rcs.csh scripts prepend `19' to the year resulting in a display
-	of 19100 for 2000.  The log_accum.pl script uses a two digit year in
-	one place and in another place assumes that the tm_year is year within
-	century rather than years since 1900.  [Fixed: log.pl v1.2 1999/01/15;
-	sccs2rcs.csh v1.3 1999/01/15; fixes in FreeBSD-3.1 and above]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9502">bin/9502</a></dt>
-      <dd>The groff number register `yr' is assigned from a (struct
-	tm).tm_year and therefore represents the number of years since 1900,
-	not the year within the century (see definition in troff/input.cc).
-	[Fixed, now set mod 100, troff/input.cc V1.2 1999/06/03; fixed
-	in FreeBSD-3.3]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9503">bin/9503</a></dt>
-
-      <dd>PicoBSD's simple_httpd uses a raw tm_year and will therefore display
-	01/01/100 for 2000-JAN-01.  [Fixed v1.2 1999/01/16; fixes in
-	FreeBSD-3.1 and above]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9505">bin/9505</a></dt>
-
-      <dd>Adduser uses a raw tm_year and will therefore display 100/01/01 for
-	2000-JAN-01.  [Fixed v1.42 1999/01/15; fixes in FreeBSD-3.1 and
-	above]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9506">bin/9506</a></dt>
-
-      <dd>Cron uses a raw tm_year and will therefore display 100 for 2000.
-	[Fixed v1.7 1999/01/16; fixes in FreeBSD-3.1 and above]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9507">bin/9507</a></dt>
-
-      <dd>tcpslice(8) uses a raw tm_year and will therefore display
-	100y01m01d... for 2000-JAN-01.  For compatibility, use a two-digit
-	year until 2000.[Fixed v1.8 1999/01/20; fixes in FreeBSD-3.1 and
-	above]</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=14472">bin/14472</a></dt>
-
-      <dd>Date command does not take thousand/hundred digits. [Fixed v1.31 1999/11/10]
-	</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=14511">misc/14511</a></dt>
-
-      <dd>Chpass has a problem using 00 for expiration year.
-	</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=15852">bin/15852</a> and
-	  <a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=16045">gnu/16045</a> and
-	  <a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=16207">bin/16207</a>
-	  </dt>
-
-      <dd>Groff predefined \*(DT [\*(td] string has Y2K bug. [Fixed with import of
-        version 1.15 2000/01/12]
-	</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=15872">bin/15872</a></dt>
-
-      <dd>at(1) has a problem with valid time specifications if tm_year is 100,
-        reports `garbled time'.
-	</dd>
-
-      <dt><a
-	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=16238">misc/16238</a></dt>
-
-      <dd>KerberosIV install does not work properly because there is a hard-wired
-	expiration date of 12/31/99 in the Kerberos source for the ticket
-	granter. [Fixed v1.24 1999/09/19]
-	</dd>
-    </dl>
-
-    <h2>More information</h2>
-
-    <p>If you have further questions about FreeBSD's year 2000 compliance, or
-      you have discovered an application running under FreeBSD that is not Y2K
-      compliant, please contact the project at <a
-	href="mailto:freebsd-bugs@FreeBSD.org">freebsd-bugs@FreeBSD.org</a>.</p>
-
-  </body>
-</html>
diff --git a/zh_TW.Big5/htdocs/docs/webresources.sgml b/zh_TW.Big5/htdocs/docs/webresources.sgml
index 5e820495b6..6090281e53 100644
--- a/zh_TW.Big5/htdocs/docs/webresources.sgml
+++ b/zh_TW.Big5/htdocs/docs/webresources.sgml
@@ -58,10 +58,6 @@
 
 	    <h2>�B�~�귽</h2>
 
-	    <h3><a href="../y2kbug.html">Year 2000 Compatibility</a></h3>
-
-	    <p>FreeBSD �p���ثe���d�H�ΦM���B�z���n���C</p>
-
 	    <h3><a href="http://fxr.watson.org/">The
 		Source Code</a></h3>