From 5305bb945d45d0d674c084c81d5510a07d3afbcc Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sat, 19 Aug 2006 21:26:51 +0000
Subject: [PATCH] www cleanup mega commit:

 - Move includes.nav*.sgml to share/sgml/navibar.ent and
   <lang>/share/sgml/navibar.l10n.ent.

 - Move includes.sgml and includes.xsl to
   share/sgml/common.ent, share/sgml/header.ent, <lang>/share/sgml/l10n.ent,
   and <lang>/share/sgml/header.l10n.ent.

 - Move most of XSLT libraries to share/sgml/*.xsl and
   <lang>/share/sgml/*.xsl.

 - Move news.xml and other *.xml files for the similar purpose
   to share/sgml/*.xml and <lang>/share/sgml/*.xml.

 - Switch to use a custom DTD for HTML document.  Now we use
   "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension", which is
   HTML 4.01 + some entities previously pulled via
   "<!ENTITY % includes SYSTEM "includes.sgml"> %includes;" line.
   The location of entity file will be resolved by using catalog file.

 - Add DOCTYPE declearation to XML documents.  This makes the followings
   possible:

   * Use of &foo; entities for SGML in an XML file instead of defining
     {$foo} as the same content.

   * &symbolic; entities for Latin characters.

 - Duplicated information between SGML and XML, or English and
   translated doc, has been removed as much as possible.
---
 fr/Makefile                              |     3 +-
 fr/about.sgml                            |     7 +-
 fr/advocacy/index.sgml                   |     8 +-
 fr/advocacy/myths.sgml                   |     8 +-
 fr/applications.sgml                     |     7 +-
 fr/art.sgml                              |     7 +-
 fr/auditors.sgml                         |     7 +-
 fr/availability.sgml                     |     7 +-
 fr/commercial/commercial.sgml            |     8 +-
 fr/commercial/consulting.sgml            |     8 +-
 fr/commercial/consulting_bycat.sgml      |     8 +-
 fr/commercial/hardware.sgml              |     8 +-
 fr/commercial/misc.sgml                  |     8 +-
 fr/commercial/software.sgml              |     8 +-
 fr/commercial/software_bycat.sgml        |     8 +-
 fr/community.sgml                        |     7 +-
 fr/community/irc.sgml                    |     8 +-
 fr/community/mailinglists.sgml           |     8 +-
 fr/community/newsgroups.sgml             |     8 +-
 fr/community/webresources.sgml           |     8 +-
 fr/copyright/copyright.sgml              |     8 +-
 fr/copyright/daemon.sgml                 |     8 +-
 fr/copyright/freebsd-doc-license.sgml    |     8 +-
 fr/copyright/freebsd-license.sgml        |     8 +-
 fr/copyright/license.sgml                |     8 +-
 fr/copyright/trademarks.sgml             |     8 +-
 fr/developers/cvs.sgml                   |     8 +-
 fr/docproj/current.sgml                  |     8 +-
 fr/docproj/doc-set.sgml                  |     8 +-
 fr/docproj/docproj.sgml                  |     8 +-
 fr/docproj/handbook.sgml                 |     8 +-
 fr/docproj/handbook3.sgml                |     8 +-
 fr/docproj/sgml.sgml                     |     8 +-
 fr/docproj/submitting.sgml               |     8 +-
 fr/docproj/translations.sgml             |     8 +-
 fr/docproj/who.sgml                      |     8 +-
 fr/docs.sgml                             |     7 +-
 fr/docs/books.sgml                       |     8 +-
 fr/docs/man.sgml                         |     8 +-
 fr/docs/webresources.sgml                |     8 +-
 fr/donations/donors.sgml                 |     8 +-
 fr/donations/index.sgml                  |     8 +-
 fr/donations/wantlist.sgml               |     8 +-
 fr/events/Makefile                       |    39 +-
 fr/events/events.dtd                     |    88 -
 fr/events/events.xsl                     |   263 -
 fr/events/includes.xsl                   |   109 -
 fr/features.sgml                         |     7 +-
 fr/gallery/Makefile                      |    50 -
 fr/gallery/fixurls.pl                    |    57 -
 fr/gallery/gallery-entry.xsl             |   122 -
 fr/gallery/gallery.xml                   | 26819 ---------------------
 fr/gallery/gallery.xsl                   |   117 -
 fr/gallery/merge-mbox.sh                 |    57 -
 fr/gnome/Makefile                        |     6 +-
 fr/gnome/contact.sgml                    |     9 +-
 fr/gnome/docs/22knownissues.sgml         |     9 +-
 fr/gnome/docs/bugging.sgml               |     9 +-
 fr/gnome/docs/faq.sgml                   |     9 +-
 fr/gnome/docs/faq2.sgml                  |     9 +-
 fr/gnome/docs/gnome2_porting.sgml        |     9 +-
 fr/gnome/docs/gnome_porting.sgml         |     9 +-
 fr/gnome/docs/porting.sgml               |     9 +-
 fr/gnome/docs/volunteer.sgml             |     9 +-
 fr/gnome/includes.navgnome.sgml          |    29 -
 fr/gnome/includes.navgnome.xsl           |    44 -
 fr/gnome/includes.sgml                   |    14 -
 fr/gnome/includes.xsl                    |    34 -
 fr/gnome/index.xsl                       |    48 +-
 fr/gnome/newsflash.xsl                   |    84 +-
 fr/gnome/rss.xsl                         |    15 +-
 fr/gnome/screenshots.sgml                |     9 +-
 fr/includes.navabout.sgml                |    20 -
 fr/includes.navcommunity.sgml            |    13 -
 fr/includes.navdevelopers.sgml           |    34 -
 fr/includes.navdocs.sgml                 |    20 -
 fr/includes.navdownload.sgml             |    30 -
 fr/includes.navports.sgml                |    23 -
 fr/includes.navsupport.sgml              |    24 -
 fr/includes.sgml                         |   146 -
 fr/index.xsl                             |   114 +-
 fr/internal/about.sgml                   |     8 +-
 fr/internal/bylaws.sgml                  |     8 +-
 fr/internal/core-vote.sgml               |     8 +-
 fr/internal/developer.sgml               |     8 +-
 fr/internal/expire-bits.sgml             |     8 +-
 fr/internal/homepage.sgml                |     8 +-
 fr/internal/internal.sgml                |     8 +-
 fr/internal/machines.sgml                |     8 +-
 fr/internal/mirror.sgml                  |     8 +-
 fr/internal/new-account.sgml             |     8 +-
 fr/internal/photos.sgml                  |     8 +-
 fr/internal/releng.sgml                  |     8 +-
 fr/internal/statistic.sgml               |     8 +-
 fr/internet.sgml                         |     7 +-
 fr/java/advocacy.sgml                    |     8 +-
 fr/java/dists/10.sgml                    |     8 +-
 fr/java/dists/11.sgml                    |     8 +-
 fr/java/dists/12.sgml                    |     8 +-
 fr/java/dists/13.sgml                    |     8 +-
 fr/java/dists/14.sgml                    |     8 +-
 fr/java/dists/15.sgml                    |     8 +-
 fr/java/dists/index.sgml                 |     8 +-
 fr/java/docs/faq.sgml                    |     8 +-
 fr/java/docs/howtoports.sgml             |     8 +-
 fr/java/docs/newbies.sgml                |     8 +-
 fr/java/docs/performance.sgml            |     8 +-
 fr/java/docs/tutorials.sgml              |     8 +-
 fr/java/howhelp.sgml                     |     8 +-
 fr/java/index.sgml                       |     8 +-
 fr/java/install.sgml                     |     8 +-
 fr/java/links/api.sgml                   |     8 +-
 fr/java/links/development.sgml           |     8 +-
 fr/java/links/documentation.sgml         |     8 +-
 fr/java/links/freebsd.sgml               |     8 +-
 fr/java/links/index.sgml                 |     8 +-
 fr/java/links/resources.sgml             |     8 +-
 fr/java/links/servlets.sgml              |     8 +-
 fr/java/links/tools.sgml                 |     8 +-
 fr/java/links/tutorials.sgml             |     8 +-
 fr/java/links/vendor.sgml                |     8 +-
 fr/java/newsflash.sgml                   |     8 +-
 fr/java/press.sgml                       |     8 +-
 fr/kse/index.sgml                        |     8 +-
 fr/logo.sgml                             |     7 +-
 fr/mailto.sgml                           |     7 +-
 fr/news/1996/index.sgml                  |    10 +-
 fr/news/1997/index.sgml                  |    10 +-
 fr/news/1998/index.sgml                  |    10 +-
 fr/news/1999/index.sgml                  |    10 +-
 fr/news/2000/index.sgml                  |    10 +-
 fr/news/2001/Makefile                    |    15 +-
 fr/news/2002/Makefile                    |    15 +-
 fr/news/Makefile                         |    38 +-
 fr/news/includes.sgml                    |    11 -
 fr/news/includes.xsl                     |    38 -
 fr/news/news-rdf.xsl                     |    54 -
 fr/news/news.sgml                        |     9 +-
 fr/news/newsflash.xsl                    |   139 -
 fr/news/oldnewsflash.xsl                 |   132 -
 fr/news/press-rel-1.sgml                 |     9 +-
 fr/news/press-rel-2.sgml                 |     9 +-
 fr/news/press-rel-3.sgml                 |     9 +-
 fr/news/press-rel-4.sgml                 |     9 +-
 fr/news/press-rel-5.sgml                 |     9 +-
 fr/news/press-rel-6.sgml                 |     9 +-
 fr/news/press-rel-7.sgml                 |     8 +-
 fr/news/press-rel-8.sgml                 |     8 +-
 fr/news/press-rel-9.sgml                 |     9 +-
 fr/news/press.xsl                        |    79 -
 fr/news/pressreleases.sgml               |     9 +-
 fr/news/sou1999.sgml                     |     8 +-
 fr/news/status/Makefile                  |    52 +-
 fr/news/status/report.xsl                |    98 +-
 fr/news/status/status.sgml               |     8 +-
 fr/news/webchanges.sgml                  |     7 +-
 fr/platforms/alpha.sgml                  |     8 +-
 fr/platforms/amd64.sgml                  |     8 +-
 fr/platforms/arm.sgml                    |     9 +-
 fr/platforms/i386.sgml                   |     8 +-
 fr/platforms/ia64.sgml                   |     8 +-
 fr/platforms/ia64/includes.xsl           |    16 -
 fr/platforms/ia64/index.xsl              |    36 +-
 fr/platforms/ia64/machines.sgml          |     8 +-
 fr/platforms/ia64/refs.sgml              |     8 +-
 fr/platforms/ia64/todo.xsl               |    36 +-
 fr/platforms/index.sgml                  |     8 +-
 fr/platforms/mips.sgml                   |    10 +-
 fr/platforms/pc98.sgml                   |     9 +-
 fr/platforms/ppc.sgml                    |     8 +-
 fr/platforms/sparc.sgml                  |     8 +-
 fr/platforms/x86-64.sgml                 |     8 +-
 fr/platforms/xbox.sgml                   |     8 +-
 fr/projects/acpi/index.sgml              |     7 +-
 fr/projects/busdma/index.sgml            |     8 +-
 fr/projects/c99/index.sgml               |     8 +-
 fr/projects/cvsweb.sgml                  |     8 +-
 fr/projects/libh.sgml                    |     8 +-
 fr/projects/mips/index.sgml              |     8 +-
 fr/projects/newbies.sgml                 |     8 +-
 fr/projects/projects.sgml                |     8 +-
 fr/projects/updater.sgml                 |     8 +-
 fr/prstats/index.sgml                    |     8 +-
 fr/publish.sgml                          |     7 +-
 fr/releases/2.0/credits.sgml             |     8 +-
 fr/releases/2.2.8R/notes.sgml            |     8 +-
 fr/releases/3.1R/notes.sgml              |     8 +-
 fr/releases/3.2R/notes.sgml              |     8 +-
 fr/releases/3.3R/notes.sgml              |     8 +-
 fr/releases/3.4R/notes.sgml              |     8 +-
 fr/releases/3.5R/notes.sgml              |     8 +-
 fr/releases/4.0R/announce.sgml           |     8 +-
 fr/releases/4.0R/errata.sgml             |     8 +-
 fr/releases/4.0R/notes.sgml              |     8 +-
 fr/releases/4.1.1R/errata.sgml           |     8 +-
 fr/releases/4.1R/announce.sgml           |     8 +-
 fr/releases/4.1R/errata.sgml             |     8 +-
 fr/releases/4.1R/notes.sgml              |     8 +-
 fr/releases/4.2R/announce.sgml           |     8 +-
 fr/releases/4.2R/errata.sgml             |     8 +-
 fr/releases/4.2R/notes.sgml              |     8 +-
 fr/releases/4.3R/announce.sgml           |     8 +-
 fr/releases/4.3R/errata.sgml             |     8 +-
 fr/releases/4.3R/notes.sgml              |     8 +-
 fr/releases/4.4R/announce.sgml           |     8 +-
 fr/releases/4.5R/announce.sgml           |     8 +-
 fr/releases/4.5R/notes.sgml              |     8 +-
 fr/releases/4.6.2R/relnotes.sgml         |     8 +-
 fr/releases/4.6R/relnotes.sgml           |     8 +-
 fr/releases/4.7R/announce.sgml           |     8 +-
 fr/releases/5.0R/DP1/relnotes.sgml       |     8 +-
 fr/releases/5.1R/installation.sgml       |     8 +-
 fr/releases/5.1R/relnotes.sgml           |     8 +-
 fr/releases/index.sgml                   |     8 +-
 fr/releases/snapshots.sgml               |     8 +-
 fr/releng/charter.sgml                   |     8 +-
 fr/releng/index.sgml                     |     8 +-
 fr/relnotes.sgml                         |     7 +-
 fr/search/index-site.sgml                |     6 +-
 fr/search/search-mid.sgml                |     6 +-
 fr/search/search.sgml                    |     6 +-
 fr/search/searchhints.sgml               |     6 +-
 fr/security/Makefile                     |     6 +-
 fr/security/mkindex.xsl                  |    14 +-
 fr/security/security-rdf.xsl             |    24 -
 fr/security/security.sgml                |    10 +-
 fr/send-pr.sgml                          |     7 +-
 fr/share/sgml/catalog                    |    12 +
 fr/share/sgml/catalog.xml                |    12 +
 fr/{events => share/sgml}/events.xml     |     3 +-
 fr/share/sgml/header.l10n.ent            |    48 +
 fr/share/sgml/l10n.ent                   |    24 +
 fr/share/sgml/libcommon.xsl              |   109 +
 fr/share/sgml/navibar.l10n.ent           |   188 +
 fr/{news => share/sgml}/news.xml         |    84 +-
 fr/{news => share/sgml}/press.xml        |     4 +-
 fr/smp/index.sgml                        |     8 +-
 fr/snapshots/index.sgml                  |     8 +-
 fr/support.sgml                          |     7 +-
 fr/support/bugreports.sgml               |     8 +-
 fr/support/webresources.sgml             |     8 +-
 fr/tutorials/index.sgml                  |     8 +-
 fr/where.sgml                            |     7 +-
 fr/y2kbug.sgml                           |     7 +-
 it/about.sgml                            |     7 +-
 it/community.sgml                        |     7 +-
 it/copyright/copyright.sgml              |     8 +-
 it/docs.sgml                             |     7 +-
 it/docs/books.sgml                       |     8 +-
 it/includes.header.sgml                  |   132 -
 it/includes.navabout.sgml                |    20 -
 it/includes.navcommunity.sgml            |    13 -
 it/includes.navdevelopers.sgml           |    28 -
 it/includes.navdocs.sgml                 |    22 -
 it/includes.navdownload.sgml             |    24 -
 it/includes.navports.sgml                |    19 -
 it/includes.navsupport.sgml              |    24 -
 it/includes.release.sgml                 |    74 -
 it/includes.sgml                         |    38 -
 it/includes.xsl                          |   477 -
 it/index.xsl                             |   111 +-
 it/mailto.sgml                           |     7 +-
 it/platforms/index.sgml                  |    10 +-
 it/ports/index.sgml                      |     9 +-
 it/releases/4.10R/announce.sgml          |     8 +-
 it/releases/4.11R/announce.sgml          |     8 +-
 it/releases/5.2.1R/announce.sgml         |     8 +-
 it/releases/5.2R/announce.sgml           |     8 +-
 it/releases/5.3R/announce.sgml           |     8 +-
 it/releases/5.4R/announce.sgml           |     8 +-
 it/releases/6.0R/announce.sgml           |     8 +-
 it/releases/index.sgml                   |    10 +-
 it/share/sgml/catalog                    |    12 +
 it/share/sgml/catalog.xml                |    12 +
 it/share/sgml/header.l10n.ent            |    50 +
 it/share/sgml/l10n.ent                   |    34 +
 it/share/sgml/libcommon.xsl              |     9 +
 it/share/sgml/navibar.l10n.ent           |   168 +
 it/support.sgml                          |     9 +-
 it/where.sgml                            |     9 +-
 ja/about.sgml                            |     7 +-
 ja/alpha/alpha.sgml                      |     5 +-
 ja/alpha/index.sgml                      |     9 +-
 ja/applications.sgml                     |     7 +-
 ja/availability.sgml                     |     7 +-
 ja/commercial/commercial.sgml            |     7 +-
 ja/community.sgml                        |     7 +-
 ja/conspectus/index.sgml                 |     9 +-
 ja/copyright/copyright.sgml              |     7 +-
 ja/copyright/daemon.sgml                 |     7 +-
 ja/copyright/freebsd-license.sgml        |     7 +-
 ja/copyright/license.sgml                |     7 +-
 ja/copyright/trademarks.sgml             |     7 +-
 ja/docproj/current.sgml                  |     7 +-
 ja/docproj/doc-set.sgml                  |     7 +-
 ja/docproj/docproj.sgml                  |     9 +-
 ja/docproj/sgml.sgml                     |     7 +-
 ja/docproj/submitting.sgml               |     7 +-
 ja/docproj/translations.sgml             |     7 +-
 ja/docproj/who.sgml                      |     7 +-
 ja/docs.sgml                             |     7 +-
 ja/features.sgml                         |     9 +-
 ja/includes.navabout.sgml                |    19 -
 ja/includes.navcommunity.sgml            |    13 -
 ja/includes.navdevelopers.sgml           |    23 -
 ja/includes.navdocs.sgml                 |    20 -
 ja/includes.navdownload.sgml             |    16 -
 ja/includes.navsupport.sgml              |    24 -
 ja/includes.sgml                         |   178 -
 ja/includes.xsl                          |   259 -
 ja/index.xsl                             |   171 +-
 ja/internal/about.sgml                   |     9 +-
 ja/internal/developer.sgml               |     7 +-
 ja/internal/internal.sgml                |     7 +-
 ja/internal/machines.sgml                |     7 +-
 ja/internal/mirror.sgml                  |     7 +-
 ja/internal/statistic.sgml               |     7 +-
 ja/internet.sgml                         |     7 +-
 ja/jabout.sgml                           |     9 +-
 ja/java/advocacy.sgml                    |     9 +-
 ja/java/dists/10.sgml                    |     9 +-
 ja/java/dists/11.sgml                    |     9 +-
 ja/java/dists/12.sgml                    |     9 +-
 ja/java/dists/13.sgml                    |     9 +-
 ja/java/dists/14.sgml                    |     9 +-
 ja/java/dists/15.sgml                    |     7 +-
 ja/java/dists/index.sgml                 |     9 +-
 ja/java/index.sgml                       |     9 +-
 ja/java/install.sgml                     |     9 +-
 ja/java/links/api.sgml                   |     9 +-
 ja/java/links/development.sgml           |     9 +-
 ja/java/links/documentation.sgml         |     9 +-
 ja/java/links/freebsd.sgml               |     9 +-
 ja/java/links/index.sgml                 |     9 +-
 ja/java/links/resources.sgml             |     9 +-
 ja/java/links/servlets.sgml              |     9 +-
 ja/java/links/tools.sgml                 |     9 +-
 ja/java/links/tutorials.sgml             |     9 +-
 ja/java/links/vendor.sgml                |     9 +-
 ja/java/newsflash.sgml                   |     9 +-
 ja/java/press.sgml                       |     9 +-
 ja/mailto.sgml                           |     7 +-
 ja/news/1996/index.sgml                  |     8 +-
 ja/news/1997/index.sgml                  |     8 +-
 ja/news/Makefile                         |    41 +-
 ja/news/includes.sgml                    |     5 -
 ja/news/includes.xsl                     |    26 -
 ja/news/news.sgml                        |     8 +-
 ja/news/newsflash.sgml                   |     7 +-
 ja/news/newsflash.xsl                    |   133 -
 ja/news/press-rel-1.sgml                 |     8 +-
 ja/news/press-rel-2.sgml                 |     8 +-
 ja/news/press-rel-3.sgml                 |     8 +-
 ja/news/press-rel-4.sgml                 |     8 +-
 ja/news/press-rel-5.sgml                 |     8 +-
 ja/news/press.sgml                       |     7 +-
 ja/news/press.xsl                        |    80 -
 ja/news/pressreleases.sgml               |     8 +-
 ja/news/webchanges.sgml                  |     7 +-
 ja/platforms/alpha.sgml                  |    11 +-
 ja/platforms/amd64.sgml                  |     7 +-
 ja/platforms/arm.sgml                    |     8 +-
 ja/platforms/ia64.sgml                   |     7 +-
 ja/platforms/ia64/index.sgml             |     7 +-
 ja/platforms/ia64/machines.sgml          |     7 +-
 ja/platforms/ia64/refs.sgml              |     7 +-
 ja/platforms/ia64/todo.sgml              |     7 +-
 ja/platforms/index.sgml                  |    11 +-
 ja/platforms/mips.sgml                   |     9 +-
 ja/platforms/pc98.sgml                   |     8 +-
 ja/platforms/ppc.sgml                    |    11 +-
 ja/platforms/sparc.sgml                  |     9 +-
 ja/platforms/x86-64.sgml                 |     9 +-
 ja/ports/Makefile                        |    24 +-
 ja/ports/portindex                       |     9 +-
 ja/projects/cvsweb.sgml                  |     7 +-
 ja/projects/mips/index.sgml              |     7 +-
 ja/projects/newbies.sgml                 |     7 +-
 ja/projects/projects.sgml                |     9 +-
 ja/prstats/index.sgml                    |     7 +-
 ja/publish.sgml                          |     7 +-
 ja/releases/2.1.5R/notes.sgml            |     9 +-
 ja/releases/2.1.6R/notes.sgml            |     9 +-
 ja/releases/2.1.6R/security.sgml         |     9 +-
 ja/releases/2.1.7R/notes.sgml            |     9 +-
 ja/releases/2.2.1R/notes.sgml            |     9 +-
 ja/releases/2.2.2R/errata.sgml           |     9 +-
 ja/releases/2.2.2R/notes.sgml            |     9 +-
 ja/releases/2.2.5R/announce.sgml         |     9 +-
 ja/releases/2.2.5R/errata.sgml           |     9 +-
 ja/releases/2.2.5R/notes.sgml            |     9 +-
 ja/releases/2.2.6R/announce.sgml         |     9 +-
 ja/releases/2.2.6R/errata.sgml           |     9 +-
 ja/releases/2.2.6R/notes.sgml            |     9 +-
 ja/releases/2.2.7R/announce.sgml         |     9 +-
 ja/releases/2.2.7R/errata.sgml           |     9 +-
 ja/releases/2.2.7R/notes.sgml            |     9 +-
 ja/releases/2.2.8R/announce.sgml         |     9 +-
 ja/releases/2.2.8R/errata.sgml           |     9 +-
 ja/releases/2.2.8R/notes.sgml            |     9 +-
 ja/releases/2.2R/announce.sgml           |     9 +-
 ja/releases/2.2R/install-media.sgml      |     9 +-
 ja/releases/2.2R/notes.sgml              |     9 +-
 ja/releases/3.0R/announce.sgml           |     9 +-
 ja/releases/3.0R/errata.sgml             |     9 +-
 ja/releases/3.0R/notes.sgml              |     9 +-
 ja/releases/3.1R/announce.sgml           |     9 +-
 ja/releases/3.1R/errata.sgml             |     9 +-
 ja/releases/3.1R/notes.sgml              |     9 +-
 ja/releases/3.2R/announce.sgml           |     9 +-
 ja/releases/3.2R/errata.sgml             |     9 +-
 ja/releases/3.2R/notes.sgml              |     9 +-
 ja/releases/3.3R/announce.sgml           |     9 +-
 ja/releases/3.3R/errata.sgml             |     9 +-
 ja/releases/3.3R/notes.sgml              |     9 +-
 ja/releases/3.4R/announce.sgml           |     9 +-
 ja/releases/3.4R/errata.sgml             |     9 +-
 ja/releases/3.4R/notes.sgml              |     9 +-
 ja/releases/3.5R/announce.sgml           |     9 +-
 ja/releases/3.5R/errata.sgml             |     9 +-
 ja/releases/3.5R/notes.sgml              |     9 +-
 ja/releases/4.0R/announce.sgml           |     9 +-
 ja/releases/4.0R/errata.sgml             |     9 +-
 ja/releases/4.0R/notes.sgml              |     9 +-
 ja/releases/4.1.1R/announce.sgml         |     9 +-
 ja/releases/4.1.1R/errata.sgml           |     9 +-
 ja/releases/4.1.1R/notes.sgml            |     9 +-
 ja/releases/4.10R/announce.sgml          |     7 +-
 ja/releases/4.10R/hardware.sgml          |     7 +-
 ja/releases/4.10R/relnotes.sgml          |     5 +-
 ja/releases/4.11R/announce.sgml          |     7 +-
 ja/releases/4.11R/hardware.sgml          |     7 +-
 ja/releases/4.11R/relnotes.sgml          |     5 +-
 ja/releases/4.1R/announce.sgml           |     9 +-
 ja/releases/4.1R/errata.sgml             |     9 +-
 ja/releases/4.1R/notes.sgml              |     9 +-
 ja/releases/4.2R/announce.sgml           |     9 +-
 ja/releases/4.2R/errata.sgml             |     9 +-
 ja/releases/4.2R/notes.sgml              |     9 +-
 ja/releases/4.3R/announce.sgml           |     9 +-
 ja/releases/4.3R/errata.sgml             |     9 +-
 ja/releases/4.3R/notes.sgml              |     9 +-
 ja/releases/4.4R/announce.sgml           |     9 +-
 ja/releases/4.4R/notes.sgml              |     9 +-
 ja/releases/4.5R/announce.sgml           |     7 +-
 ja/releases/4.5R/contents.sgml           |     8 +-
 ja/releases/4.5R/hardware.sgml           |     7 +-
 ja/releases/4.5R/notes.sgml              |     7 +-
 ja/releases/4.5R/qa.sgml                 |     9 +-
 ja/releases/4.5R/schedule.sgml           |     7 +-
 ja/releases/4.6.2R/announce.sgml         |     7 +-
 ja/releases/4.6.2R/hardware.sgml         |     7 +-
 ja/releases/4.6.2R/relnotes.sgml         |     5 +-
 ja/releases/4.6R/announce.sgml           |     7 +-
 ja/releases/4.6R/hardware.sgml           |     7 +-
 ja/releases/4.6R/relnotes.sgml           |     5 +-
 ja/releases/4.7R/announce.sgml           |     7 +-
 ja/releases/4.7R/hardware.sgml           |     7 +-
 ja/releases/4.7R/relnotes.sgml           |     5 +-
 ja/releases/4.8R/announce.sgml           |     7 +-
 ja/releases/4.8R/hardware.sgml           |     7 +-
 ja/releases/4.8R/relnotes.sgml           |     5 +-
 ja/releases/4.9R/announce.sgml           |     7 +-
 ja/releases/4.9R/hardware.sgml           |     7 +-
 ja/releases/4.9R/relnotes.sgml           |     5 +-
 ja/releases/5.0R/announce.sgml           |     7 +-
 ja/releases/5.0R/hardware.sgml           |     7 +-
 ja/releases/5.0R/installation.sgml       |     7 +-
 ja/releases/5.0R/relnotes.sgml           |     5 +-
 ja/releases/5.1R/announce.sgml           |     7 +-
 ja/releases/5.1R/hardware.sgml           |     7 +-
 ja/releases/5.1R/installation.sgml       |     7 +-
 ja/releases/5.1R/relnotes.sgml           |     5 +-
 ja/releases/5.2.1R/announce.sgml         |     7 +-
 ja/releases/5.2.1R/hardware.sgml         |     7 +-
 ja/releases/5.2.1R/relnotes.sgml         |     5 +-
 ja/releases/5.2R/announce.sgml           |     7 +-
 ja/releases/5.2R/hardware.sgml           |     7 +-
 ja/releases/5.2R/relnotes.sgml           |     5 +-
 ja/releases/5.3R/hardware.sgml           |     7 +-
 ja/releases/5.4R/hardware.sgml           |     7 +-
 ja/releases/index.sgml                   |     9 +-
 ja/releases/snapshots.sgml               |     9 +-
 ja/relnotes.sgml                         |     7 +-
 ja/search/index-site.sgml                |     5 +-
 ja/search/search-mid.sgml                |     5 +-
 ja/search/search.sgml                    |     5 +-
 ja/search/searchhints.sgml               |     5 +-
 ja/security/Makefile                     |    20 +-
 ja/security/mkindex.xsl                  |    16 +-
 ja/security/security.sgml                |     9 +-
 ja/send-pr.sgml                          |     7 +-
 ja/share/sgml/catalog                    |    12 +
 ja/share/sgml/catalog.xml                |    12 +
 ja/share/sgml/header.l10n.ent            |    49 +
 ja/share/sgml/l10n.ent                   |    42 +
 ja/share/sgml/libcommon.xsl              |    90 +
 ja/share/sgml/navibar.l10n.ent           |   156 +
 ja/{news => share/sgml}/news.xml         |    37 +-
 ja/{news => share/sgml}/press.xml        |     4 +-
 ja/share/sgml/templates.usergroups.xsl   |     5 +-
 ja/smp/index.sgml                        |     7 +-
 ja/support.sgml                          |     7 +-
 ja/tutorials/index.sgml                  |     7 +-
 ja/where.sgml                            |     7 +-
 ja/y2kbug.sgml                           |     7 +-
 ru/about.sgml                            |     7 +-
 ru/applications.sgml                     |     7 +-
 ru/art.sgml                              |     7 +-
 ru/availability.sgml                     |     7 +-
 ru/commercial/commercial.sgml            |     7 +-
 ru/community.sgml                        |     7 +-
 ru/community/irc.sgml                    |     7 +-
 ru/community/mailinglists.sgml           |     7 +-
 ru/community/newsgroups.sgml             |     7 +-
 ru/community/webresources.sgml           |     7 +-
 ru/copyright/copyright.sgml              |     7 +-
 ru/copyright/daemon.sgml                 |     7 +-
 ru/copyright/freebsd-license.sgml        |     7 +-
 ru/copyright/license.sgml                |     7 +-
 ru/copyright/trademarks.sgml             |     7 +-
 ru/developers/cvs.sgml                   |     9 +-
 ru/docproj/current.sgml                  |     7 +-
 ru/docproj/doc-set.sgml                  |     7 +-
 ru/docproj/docproj.sgml                  |     7 +-
 ru/docproj/handbook.sgml                 |     7 +-
 ru/docproj/handbook3.sgml                |     7 +-
 ru/docproj/sgml.sgml                     |     7 +-
 ru/docproj/submitting.sgml               |     7 +-
 ru/docproj/translations.sgml             |     7 +-
 ru/docproj/who.sgml                      |     7 +-
 ru/docs.sgml                             |     7 +-
 ru/docs/books.sgml                       |     7 +-
 ru/docs/man.sgml                         |     7 +-
 ru/docs/webresources.sgml                |     7 +-
 ru/donations/donors.sgml                 |     7 +-
 ru/donations/index.sgml                  |     7 +-
 ru/donations/wantlist.sgml               |     7 +-
 ru/events/2003/bsdcon-devsummit.sgml     |     7 +-
 ru/events/Makefile                       |    42 +-
 ru/events/events.dtd                     |    90 -
 ru/events/events.xsl                     |   264 -
 ru/events/includes.xsl                   |   110 -
 ru/features.sgml                         |     7 +-
 ru/gnome/contact.sgml                    |     7 +-
 ru/gnome/docs/bugging.sgml               |     7 +-
 ru/gnome/docs/develfaq.sgml              |     7 +-
 ru/gnome/docs/example-Makefile.sgml      |     9 +-
 ru/gnome/docs/faq2.sgml                  |     7 +-
 ru/gnome/docs/gnome2_porting.sgml        |     7 +-
 ru/gnome/docs/gnome_porting.sgml         |     7 +-
 ru/gnome/docs/knownissues.sgml           |     7 +-
 ru/gnome/docs/porting.sgml               |     7 +-
 ru/gnome/docs/volunteer.sgml             |     7 +-
 ru/gnome/newsflash.xsl                   |    23 +-
 ru/gnome/screenshots.sgml                |     7 +-
 ru/handbook/index.sgml                   |     9 +-
 ru/includes.navabout.sgml                |    23 -
 ru/includes.navcommunity.sgml            |    16 -
 ru/includes.navdevelopers.sgml           |    31 -
 ru/includes.navdocs.sgml                 |    28 -
 ru/includes.navdownload.sgml             |    31 -
 ru/includes.navsupport.sgml              |    27 -
 ru/includes.sgml                         |   217 -
 ru/includes.xsl                          |   272 -
 ru/index.xsl                             |   125 +-
 ru/internal/about.sgml                   |     7 +-
 ru/internal/bylaws.sgml                  |     7 +-
 ru/internal/core-vote.sgml               |     7 +-
 ru/internal/developer.sgml               |     7 +-
 ru/internal/doceng.sgml                  |     7 +-
 ru/internal/expire-bits.sgml             |     7 +-
 ru/internal/fortunes.sgml                |     7 +-
 ru/internal/homepage.sgml                |     7 +-
 ru/internal/internal.sgml                |     7 +-
 ru/internal/machines.sgml                |     7 +-
 ru/internal/mirror.sgml                  |    10 +-
 ru/internal/new-account.sgml             |     7 +-
 ru/internal/photos.sgml                  |     7 +-
 ru/internal/policies.sgml                |     7 +-
 ru/internal/releng.sgml                  |     7 +-
 ru/internal/rtp.sgml                     |     7 +-
 ru/internal/statistic.sgml               |     7 +-
 ru/internet.sgml                         |     7 +-
 ru/java/advocacy.sgml                    |     7 +-
 ru/java/dists/10.sgml                    |     7 +-
 ru/java/dists/11.sgml                    |     7 +-
 ru/java/dists/12.sgml                    |     7 +-
 ru/java/dists/13.sgml                    |     7 +-
 ru/java/dists/14.sgml                    |     7 +-
 ru/java/dists/index.sgml                 |     7 +-
 ru/java/docs/faq.sgml                    |     7 +-
 ru/java/docs/howtoports.sgml             |     7 +-
 ru/java/docs/newbies.sgml                |     7 +-
 ru/java/docs/performance.sgml            |     7 +-
 ru/java/docs/tutorials.sgml              |     7 +-
 ru/java/howhelp.sgml                     |     7 +-
 ru/java/index.sgml                       |     7 +-
 ru/java/install.sgml                     |     7 +-
 ru/java/links/api.sgml                   |     7 +-
 ru/java/links/development.sgml           |     7 +-
 ru/java/links/documentation.sgml         |     7 +-
 ru/java/links/freebsd.sgml               |     7 +-
 ru/java/links/index.sgml                 |     7 +-
 ru/java/links/resources.sgml             |     7 +-
 ru/java/links/servlets.sgml              |     7 +-
 ru/java/links/tools.sgml                 |     7 +-
 ru/java/links/tutorials.sgml             |     7 +-
 ru/java/links/vendor.sgml                |     7 +-
 ru/java/newsflash.sgml                   |     7 +-
 ru/java/press.sgml                       |     7 +-
 ru/kse/index.sgml                        |     7 +-
 ru/mailto.sgml                           |     7 +-
 ru/marketing/os-comparison.sgml          |     7 +-
 ru/news/1996/index.sgml                  |     8 +-
 ru/news/1997/index.sgml                  |     8 +-
 ru/news/1998/Makefile                    |    15 +-
 ru/news/1998/index.sgml                  |     8 +-
 ru/news/1999/Makefile                    |    15 +-
 ru/news/1999/index.sgml                  |     8 +-
 ru/news/2000/Makefile                    |    16 +-
 ru/news/2000/index.sgml                  |     8 +-
 ru/news/2001/Makefile                    |    26 +-
 ru/news/2002/Makefile                    |    25 +-
 ru/news/2003/Makefile                    |    25 +-
 ru/news/Makefile                         |    38 +-
 ru/news/includes.sgml                    |    11 -
 ru/news/includes.xsl                     |    33 -
 ru/news/news-rdf.xsl                     |    52 -
 ru/news/news.sgml                        |     8 +-
 ru/news/newsflash.xsl                    |   141 -
 ru/news/oldnewsflash.xsl                 |   126 -
 ru/news/oldpress.xsl                     |    86 -
 ru/news/press-rel-1.sgml                 |     8 +-
 ru/news/press-rel-2.sgml                 |     8 +-
 ru/news/press-rel-3.sgml                 |     8 +-
 ru/news/press-rel-4.sgml                 |     8 +-
 ru/news/press-rel-5.sgml                 |     8 +-
 ru/news/press.xsl                        |    89 -
 ru/news/pressreleases.sgml               |    10 +-
 ru/news/sou1999.sgml                     |     7 +-
 ru/news/status/status.sgml               |     7 +-
 ru/platforms/alpha.sgml                  |     9 +-
 ru/platforms/amd64.sgml                  |     7 +-
 ru/platforms/amd64/motherboards.sgml     |     9 +-
 ru/platforms/arm.sgml                    |     8 +-
 ru/platforms/i386.sgml                   |     7 +-
 ru/platforms/ia64.sgml                   |     7 +-
 ru/platforms/ia64/index.sgml             |     7 +-
 ru/platforms/ia64/machines.sgml          |     7 +-
 ru/platforms/ia64/refs.sgml              |     7 +-
 ru/platforms/ia64/todo.sgml              |     7 +-
 ru/platforms/index.sgml                  |     9 +-
 ru/platforms/mips.sgml                   |     9 +-
 ru/platforms/pc98.sgml                   |     8 +-
 ru/platforms/ppc.sgml                    |     9 +-
 ru/platforms/sparc.sgml                  |     7 +-
 ru/platforms/x86-64.sgml                 |     7 +-
 ru/platforms/xbox.sgml                   |     7 +-
 ru/portmgr/charter.sgml                  |     7 +-
 ru/portmgr/index.sgml                    |     7 +-
 ru/portmgr/policies.sgml                 |     7 +-
 ru/portmgr/qa.sgml                       |     7 +-
 ru/ports/Makefile                        |    24 +-
 ru/ports/portindex                       |     8 +-
 ru/projects/busdma/index.sgml            |     7 +-
 ru/projects/cvsweb.sgml                  |     7 +-
 ru/projects/newbies.sgml                 |     7 +-
 ru/projects/projects.sgml                |     7 +-
 ru/projects/summerofcode.sgml            |     7 +-
 ru/publish.sgml                          |     7 +-
 ru/releases/5.3R/announce.sgml           |     7 +-
 ru/releases/5.3R/hardware.sgml           |     7 +-
 ru/releases/5.3R/installation.sgml       |     7 +-
 ru/releases/5.3R/relnotes.sgml           |     7 +-
 ru/releases/5.4R/announce.sgml           |     7 +-
 ru/releases/5.4R/hardware.sgml           |     7 +-
 ru/releases/5.4R/installation.sgml       |     7 +-
 ru/releases/5.4R/relnotes.sgml           |     7 +-
 ru/releases/index.sgml                   |     7 +-
 ru/releng/charter.sgml                   |     7 +-
 ru/releng/index.sgml                     |     7 +-
 ru/relnotes.sgml                         |     7 +-
 ru/search/index-site.sgml                |     5 +-
 ru/search/search-mid.sgml                |     5 +-
 ru/search/search.sgml                    |     5 +-
 ru/search/searchhints.sgml               |     5 +-
 ru/security/Makefile                     |    18 +-
 ru/security/mkindex.xsl                  |    16 +-
 ru/security/security.sgml                |     9 +-
 ru/send-pr.sgml                          |     7 +-
 ru/share/sgml/catalog                    |    12 +
 ru/share/sgml/catalog.xml                |    12 +
 ru/{events => share/sgml}/events.xml     |     8 +-
 ru/share/sgml/header.l10n.ent            |    58 +
 ru/share/sgml/l10n.ent                   |    47 +
 ru/share/sgml/libcommon.xsl              |   106 +
 ru/share/sgml/navibar.l10n.ent           |   150 +
 ru/{news => share/sgml}/news.xml         |    78 +-
 ru/{news => share/sgml}/press.xml        |     2 +
 ru/share/sgml/templates.usergroups.xsl   |    65 +-
 ru/smp/index.sgml                        |     7 +-
 ru/snapshots/index.sgml                  |     9 +-
 ru/support.sgml                          |     7 +-
 ru/support/bugreports.sgml               |     7 +-
 ru/support/webresources.sgml             |     7 +-
 ru/tutorials/index.sgml                  |     7 +-
 ru/where.sgml                            |     7 +-
 ru/y2kbug.sgml                           |     7 +-
 tr/Makefile                              |    18 +-
 tr/doc/Makefile                          |    22 +-
 tr/docs.sgml                             |     5 +-
 tr/features.sgml                         |     5 +-
 tr/includes.sgml                         |   134 -
 tr/includes.xsl                          |   117 -
 tr/index.xsl                             |   281 +-
 tr/mailto.sgml                           |     5 +-
 tr/share/sgml/catalog                    |    12 +
 tr/share/sgml/catalog.xml                |    12 +
 tr/share/sgml/header.l10n.ent            |    32 +
 tr/share/sgml/l10n.ent                   |    44 +
 tr/share/sgml/libcommon.xsl              |     9 +
 tr/share/sgml/navibar.l10n.ent           |    34 +
 zh_CN/about.sgml                         |     7 +-
 zh_CN/advocacy/index.sgml                |     7 +-
 zh_CN/advocacy/letter.sgml               |     7 +-
 zh_CN/advocacy/myths.sgml                |     7 +-
 zh_CN/applications.sgml                  |     7 +-
 zh_CN/art.sgml                           |     7 +-
 zh_CN/availability.sgml                  |     7 +-
 zh_CN/community.sgml                     |     7 +-
 zh_CN/copyright/copyright.sgml           |     7 +-
 zh_CN/copyright/daemon.sgml              |     7 +-
 zh_CN/copyright/freebsd-doc-license.sgml |     7 +-
 zh_CN/copyright/freebsd-license.sgml     |     7 +-
 zh_CN/copyright/license.sgml             |     7 +-
 zh_CN/copyright/trademarks.sgml          |     7 +-
 zh_CN/docs.sgml                          |     7 +-
 zh_CN/features.sgml                      |     7 +-
 zh_CN/includes.navabout.sgml             |    23 -
 zh_CN/includes.navcommunity.sgml         |    16 -
 zh_CN/includes.navdevelopers.sgml        |    31 -
 zh_CN/includes.navdocs.sgml              |    24 -
 zh_CN/includes.navdownload.sgml          |    27 -
 zh_CN/includes.navports.sgml             |    22 -
 zh_CN/includes.navsupport.sgml           |    27 -
 zh_CN/includes.sgml                      |   148 -
 zh_CN/index.xsl                          |   109 +-
 zh_CN/internet.sgml                      |     7 +-
 zh_CN/logo.sgml                          |     7 +-
 zh_CN/mailto.sgml                        |     7 +-
 zh_CN/news/Makefile                      |     8 +-
 zh_CN/news/includes.sgml                 |     7 -
 zh_CN/news/includes.xsl                  |    47 -
 zh_CN/news/news-rdf.xsl                  |    76 -
 zh_CN/news/news.sgml                     |     8 +-
 zh_CN/news/newsflash.xsl                 |   122 -
 zh_CN/news/press.xsl                     |    77 -
 zh_CN/news/pressreleases.sgml            |     8 +-
 zh_CN/platforms/alpha.sgml               |     9 +-
 zh_CN/platforms/amd64.sgml               |     8 +-
 zh_CN/platforms/arm.sgml                 |     8 +-
 zh_CN/platforms/i386.sgml                |     7 +-
 zh_CN/platforms/index.sgml               |    10 +-
 zh_CN/releases/5.4R/hardware.sgml        |     7 +-
 zh_CN/releases/5.4R/installation.sgml    |     7 +-
 zh_CN/releases/5.4R/relnotes.sgml        |     7 +-
 zh_CN/releases/5.5R/hardware.sgml        |     7 +-
 zh_CN/releases/5.5R/installation.sgml    |     7 +-
 zh_CN/releases/5.5R/relnotes.sgml        |     7 +-
 zh_CN/releases/6.0R/hardware.sgml        |     7 +-
 zh_CN/releases/6.0R/installation.sgml    |     7 +-
 zh_CN/releases/6.0R/relnotes.sgml        |     7 +-
 zh_CN/releases/6.1R/hardware.sgml        |     7 +-
 zh_CN/releases/6.1R/installation.sgml    |     7 +-
 zh_CN/releases/6.1R/relnotes.sgml        |     7 +-
 zh_CN/releases/index.sgml                |     9 +-
 zh_CN/relnotes.sgml                      |     7 +-
 zh_CN/security/Makefile                  |     6 +-
 zh_CN/security/charter.sgml              |     7 +-
 zh_CN/security/mkindex.xsl               |    17 +-
 zh_CN/security/security-rdf.xsl          |    21 -
 zh_CN/security/security.sgml             |    10 +-
 zh_CN/send-pr.sgml                       |     7 +-
 zh_CN/share/sgml/catalog                 |    12 +
 zh_CN/share/sgml/catalog.xml             |    12 +
 zh_CN/share/sgml/header.l10n.ent         |    47 +
 zh_CN/share/sgml/l10n.ent                |    21 +
 zh_CN/share/sgml/libcommon.xsl           |    87 +
 zh_CN/share/sgml/navibar.l10n.ent        |   167 +
 zh_CN/{news => share/sgml}/news.xml      |   136 +-
 zh_CN/{news => share/sgml}/press.xml     |     2 +
 zh_CN/support.sgml                       |     7 +-
 zh_CN/where.sgml                         |     7 +-
 zh_CN/y2kbug.sgml                        |     7 +-
 795 files changed, 4878 insertions(+), 36943 deletions(-)
 delete mode 100644 fr/events/events.dtd
 delete mode 100644 fr/events/events.xsl
 delete mode 100644 fr/events/includes.xsl
 delete mode 100644 fr/gallery/Makefile
 delete mode 100755 fr/gallery/fixurls.pl
 delete mode 100644 fr/gallery/gallery-entry.xsl
 delete mode 100644 fr/gallery/gallery.xml
 delete mode 100644 fr/gallery/gallery.xsl
 delete mode 100755 fr/gallery/merge-mbox.sh
 delete mode 100644 fr/gnome/includes.navgnome.sgml
 delete mode 100644 fr/gnome/includes.navgnome.xsl
 delete mode 100644 fr/gnome/includes.sgml
 delete mode 100644 fr/gnome/includes.xsl
 delete mode 100644 fr/includes.navabout.sgml
 delete mode 100644 fr/includes.navcommunity.sgml
 delete mode 100644 fr/includes.navdevelopers.sgml
 delete mode 100644 fr/includes.navdocs.sgml
 delete mode 100644 fr/includes.navdownload.sgml
 delete mode 100644 fr/includes.navports.sgml
 delete mode 100644 fr/includes.navsupport.sgml
 delete mode 100644 fr/includes.sgml
 delete mode 100644 fr/news/includes.sgml
 delete mode 100644 fr/news/includes.xsl
 delete mode 100644 fr/news/news-rdf.xsl
 delete mode 100644 fr/news/newsflash.xsl
 delete mode 100644 fr/news/oldnewsflash.xsl
 delete mode 100644 fr/news/press.xsl
 delete mode 100644 fr/platforms/ia64/includes.xsl
 delete mode 100644 fr/security/security-rdf.xsl
 create mode 100644 fr/share/sgml/catalog
 create mode 100644 fr/share/sgml/catalog.xml
 rename fr/{events => share/sgml}/events.xml (98%)
 create mode 100644 fr/share/sgml/header.l10n.ent
 create mode 100644 fr/share/sgml/l10n.ent
 create mode 100644 fr/share/sgml/libcommon.xsl
 create mode 100644 fr/share/sgml/navibar.l10n.ent
 rename fr/{news => share/sgml}/news.xml (91%)
 rename fr/{news => share/sgml}/press.xml (99%)
 delete mode 100644 it/includes.header.sgml
 delete mode 100644 it/includes.navabout.sgml
 delete mode 100644 it/includes.navcommunity.sgml
 delete mode 100644 it/includes.navdevelopers.sgml
 delete mode 100644 it/includes.navdocs.sgml
 delete mode 100644 it/includes.navdownload.sgml
 delete mode 100644 it/includes.navports.sgml
 delete mode 100644 it/includes.navsupport.sgml
 delete mode 100644 it/includes.release.sgml
 delete mode 100644 it/includes.sgml
 delete mode 100644 it/includes.xsl
 create mode 100644 it/share/sgml/catalog
 create mode 100644 it/share/sgml/catalog.xml
 create mode 100644 it/share/sgml/header.l10n.ent
 create mode 100644 it/share/sgml/l10n.ent
 create mode 100644 it/share/sgml/libcommon.xsl
 create mode 100644 it/share/sgml/navibar.l10n.ent
 delete mode 100644 ja/includes.navabout.sgml
 delete mode 100644 ja/includes.navcommunity.sgml
 delete mode 100644 ja/includes.navdevelopers.sgml
 delete mode 100644 ja/includes.navdocs.sgml
 delete mode 100644 ja/includes.navdownload.sgml
 delete mode 100644 ja/includes.navsupport.sgml
 delete mode 100644 ja/includes.sgml
 delete mode 100644 ja/includes.xsl
 delete mode 100644 ja/news/includes.sgml
 delete mode 100644 ja/news/includes.xsl
 delete mode 100644 ja/news/newsflash.xsl
 delete mode 100644 ja/news/press.xsl
 create mode 100644 ja/share/sgml/catalog
 create mode 100644 ja/share/sgml/catalog.xml
 create mode 100644 ja/share/sgml/header.l10n.ent
 create mode 100644 ja/share/sgml/l10n.ent
 create mode 100644 ja/share/sgml/libcommon.xsl
 create mode 100644 ja/share/sgml/navibar.l10n.ent
 rename ja/{news => share/sgml}/news.xml (94%)
 rename ja/{news => share/sgml}/press.xml (99%)
 delete mode 100644 ru/events/events.dtd
 delete mode 100644 ru/events/events.xsl
 delete mode 100644 ru/events/includes.xsl
 delete mode 100644 ru/includes.navabout.sgml
 delete mode 100644 ru/includes.navcommunity.sgml
 delete mode 100644 ru/includes.navdevelopers.sgml
 delete mode 100644 ru/includes.navdocs.sgml
 delete mode 100644 ru/includes.navdownload.sgml
 delete mode 100644 ru/includes.navsupport.sgml
 delete mode 100644 ru/includes.sgml
 delete mode 100644 ru/includes.xsl
 delete mode 100644 ru/news/includes.sgml
 delete mode 100644 ru/news/includes.xsl
 delete mode 100644 ru/news/news-rdf.xsl
 delete mode 100644 ru/news/newsflash.xsl
 delete mode 100644 ru/news/oldnewsflash.xsl
 delete mode 100644 ru/news/oldpress.xsl
 delete mode 100644 ru/news/press.xsl
 create mode 100644 ru/share/sgml/catalog
 create mode 100644 ru/share/sgml/catalog.xml
 rename ru/{events => share/sgml}/events.xml (99%)
 create mode 100644 ru/share/sgml/header.l10n.ent
 create mode 100644 ru/share/sgml/l10n.ent
 create mode 100644 ru/share/sgml/libcommon.xsl
 create mode 100644 ru/share/sgml/navibar.l10n.ent
 rename ru/{news => share/sgml}/news.xml (91%)
 rename ru/{news => share/sgml}/press.xml (99%)
 delete mode 100644 tr/includes.sgml
 delete mode 100644 tr/includes.xsl
 create mode 100644 tr/share/sgml/catalog
 create mode 100644 tr/share/sgml/catalog.xml
 create mode 100644 tr/share/sgml/header.l10n.ent
 create mode 100644 tr/share/sgml/l10n.ent
 create mode 100644 tr/share/sgml/libcommon.xsl
 create mode 100644 tr/share/sgml/navibar.l10n.ent
 delete mode 100644 zh_CN/includes.navabout.sgml
 delete mode 100644 zh_CN/includes.navcommunity.sgml
 delete mode 100644 zh_CN/includes.navdevelopers.sgml
 delete mode 100644 zh_CN/includes.navdocs.sgml
 delete mode 100644 zh_CN/includes.navdownload.sgml
 delete mode 100644 zh_CN/includes.navports.sgml
 delete mode 100644 zh_CN/includes.navsupport.sgml
 delete mode 100644 zh_CN/includes.sgml
 delete mode 100644 zh_CN/news/includes.sgml
 delete mode 100644 zh_CN/news/includes.xsl
 delete mode 100644 zh_CN/news/news-rdf.xsl
 delete mode 100644 zh_CN/news/newsflash.xsl
 delete mode 100644 zh_CN/news/press.xsl
 delete mode 100644 zh_CN/security/security-rdf.xsl
 create mode 100644 zh_CN/share/sgml/catalog
 create mode 100644 zh_CN/share/sgml/catalog.xml
 create mode 100644 zh_CN/share/sgml/header.l10n.ent
 create mode 100644 zh_CN/share/sgml/l10n.ent
 create mode 100644 zh_CN/share/sgml/libcommon.xsl
 create mode 100644 zh_CN/share/sgml/navibar.l10n.ent
 rename zh_CN/{news => share/sgml}/news.xml (91%)
 rename zh_CN/{news => share/sgml}/press.xml (98%)

diff --git a/fr/Makefile b/fr/Makefile
index a234878fa4..3edffd2c66 100644
--- a/fr/Makefile
+++ b/fr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/fr/Makefile,v 1.17 2005/12/30 22:16:41 blackend Exp $
+# $FreeBSD: www/fr/Makefile,v 1.18 2006/05/09 16:59:17 blackend Exp $
 
 # The FreeBSD French Documentation Project
 # Original revision: 1.107
@@ -56,7 +56,6 @@ SUBDIR+= java
 SUBDIR+= copyright
 SUBDIR+= developers
 SUBDIR+= search
-SUBDIR+= gallery
 SUBDIR+= projects
 SUBDIR+= prstats
 SUBDIR+= platforms
diff --git a/fr/about.sgml b/fr/about.sgml
index 2307cd2fab..af4b43a21f 100644
--- a/fr/about.sgml
+++ b/fr/about.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/fr/about.sgml,v 1.3 2006/01/08 21:22:21 blackend Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/about.sgml,v 1.4 2006/07/03 15:42:51 blackend Exp $">
 <!ENTITY title "A propos de FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/advocacy/index.sgml b/fr/advocacy/index.sgml
index 25e3aef195..a700e8cbf3 100644
--- a/fr/advocacy/index.sgml
+++ b/fr/advocacy/index.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/advocacy/index.sgml,v 1.7 2005/11/18 22:18:17 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/advocacy/index.sgml,v 1.8 2005/12/31 11:26:15 blackend Exp $">
 <!ENTITY title "Projet d'Evang&eacute;lisation FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/advocacy/myths.sgml b/fr/advocacy/myths.sgml
index 7751b85cb4..eeee574a52 100644
--- a/fr/advocacy/myths.sgml
+++ b/fr/advocacy/myths.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/fr/advocacy/myths.sgml,v 1.10 2006/01/21 15:32:00 blackend Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/advocacy/myths.sgml,v 1.11 2006/02/16 14:38:45 blackend Exp $">
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
 <!ENTITY title "Projet d'Evang&eacute;lisation FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/applications.sgml b/fr/applications.sgml
index 72a67c68b7..56fd072cb0 100644
--- a/fr/applications.sgml
+++ b/fr/applications.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/fr/applications.sgml,v 1.7 2005/10/05 18:47:07 blackend Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/applications.sgml,v 1.8 2006/02/13 17:53:03 blackend Exp $">
 <!ENTITY title "Les applications pour FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/art.sgml b/fr/art.sgml
index 42b27d8f7e..e57c5414ab 100644
--- a/fr/art.sgml
+++ b/fr/art.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/fr/art.sgml,v 1.1 2004/10/06 12:55:04 stephane Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/art.sgml,v 1.4 2005/10/06 12:56:02 blackend Exp $">
 <!ENTITY title "Ressources artistiques FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "developers.sgml"> %developers;
 ]>
 
diff --git a/fr/auditors.sgml b/fr/auditors.sgml
index 599396623c..d718373389 100644
--- a/fr/auditors.sgml
+++ b/fr/auditors.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/fr/auditors.sgml,v 1.5 2004/08/05 20:29:38 stephane Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/auditors.sgml,v 1.8 2005/10/06 12:56:02 blackend Exp $">
 <!ENTITY title "Projet de v&eacute;rification du code source FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/availability.sgml b/fr/availability.sgml
index 94beb6b0e2..7179752ce9 100644
--- a/fr/availability.sgml
+++ b/fr/availability.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/fr/availability.sgml,v 1.2 2003/11/06 16:43:58 stephane Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/availability.sgml,v 1.5 2005/10/06 12:56:02 blackend Exp $">
 <!ENTITY title "Sur la disponibilit&eacute; de FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/commercial/commercial.sgml b/fr/commercial/commercial.sgml
index e04986e2d0..0852b865fb 100644
--- a/fr/commercial/commercial.sgml
+++ b/fr/commercial/commercial.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/commercial/commercial.sgml,v 1.3 2004/01/06 17:31:39 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/commercial/commercial.sgml,v 1.5 2005/10/06 12:56:02 blackend Exp $">
 <!ENTITY title "Soci&eacute;t&eacute;s commerciales">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/commercial/consulting.sgml b/fr/commercial/consulting.sgml
index 34f72d399e..6828a82f54 100644
--- a/fr/commercial/consulting.sgml
+++ b/fr/commercial/consulting.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/commercial/consulting.sgml,v 1.2 2004/01/06 17:31:39 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/commercial/consulting.sgml,v 1.4 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Rubrique commerciale - Conseil">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 <!ENTITY % vendorincludes SYSTEM "includes.sgml"> %vendorincludes;
 <!ENTITY consulting SYSTEM "consulting.inc">
 ]>
diff --git a/fr/commercial/consulting_bycat.sgml b/fr/commercial/consulting_bycat.sgml
index 3fff027831..ac04eefe57 100644
--- a/fr/commercial/consulting_bycat.sgml
+++ b/fr/commercial/consulting_bycat.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/commercial/consulting_bycat.sgml,v 1.2 2004/01/06 17:31:39 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/commercial/consulting_bycat.sgml,v 1.4 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Rubrique commerciale - Conseil">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 <!ENTITY % vendorincludes SYSTEM "includes.sgml"> %vendorincludes;
 <!ENTITY consultingbycat SYSTEM "consulting_bycat.inc">
 ]>
diff --git a/fr/commercial/hardware.sgml b/fr/commercial/hardware.sgml
index 08c53cf13e..583b2befed 100644
--- a/fr/commercial/hardware.sgml
+++ b/fr/commercial/hardware.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/commercial/hardware.sgml,v 1.2 2004/01/06 17:31:39 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/commercial/hardware.sgml,v 1.4 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Commercial - Mat&eacute;riels">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 <!ENTITY % vendorincludes SYSTEM "includes.sgml"> %vendorincludes;
 <!ENTITY hardware SYSTEM "hardware.inc">
 ]>
diff --git a/fr/commercial/misc.sgml b/fr/commercial/misc.sgml
index b4c4da53cc..b8490586b5 100644
--- a/fr/commercial/misc.sgml
+++ b/fr/commercial/misc.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/commercial/misc.sgml,v 1.2 2004/01/06 17:31:39 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/commercial/misc.sgml,v 1.4 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Rubrique commerciale - Divers">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 <!ENTITY % vendorincludes SYSTEM "includes.sgml"> %vendorincludes;
 <!ENTITY misc SYSTEM "misc.inc">
 ]>
diff --git a/fr/commercial/software.sgml b/fr/commercial/software.sgml
index 7c0c586ed5..130bafc68d 100644
--- a/fr/commercial/software.sgml
+++ b/fr/commercial/software.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/commercial/software.sgml,v 1.2 2004/01/06 17:31:39 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/commercial/software.sgml,v 1.4 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Commercial Vendors - Software">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 <!ENTITY % vendorincludes SYSTEM "includes.sgml"> %vendorincludes;
 <!ENTITY software SYSTEM "software.inc">
 ]>
diff --git a/fr/commercial/software_bycat.sgml b/fr/commercial/software_bycat.sgml
index 865c8da189..1e0a7268f5 100644
--- a/fr/commercial/software_bycat.sgml
+++ b/fr/commercial/software_bycat.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/commercial/software_bycat.sgml,v 1.2 2004/01/06 17:31:39 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/commercial/software_bycat.sgml,v 1.4 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Rubrique commerciale - Logiciels">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 <!ENTITY % vendorincludes SYSTEM "includes.sgml"> %vendorincludes;
 <!ENTITY softwarebycat SYSTEM "software_bycat.inc">
 ]>
diff --git a/fr/community.sgml b/fr/community.sgml
index 7b8a0dd3e7..596b39f678 100644
--- a/fr/community.sgml
+++ b/fr/community.sgml
@@ -1,8 +1,7 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/fr/community.sgml,v 1.1 2005/10/10 20:43:12 blackend Exp $">
+<!doctype HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/community.sgml,v 1.2 2005/10/12 12:37:00 blackend Exp $">
 <!ENTITY title "Communaut&eacute; FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navcommunity.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.community "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/community/irc.sgml b/fr/community/irc.sgml
index 8fba311c57..613b8f9ff2 100644
--- a/fr/community/irc.sgml
+++ b/fr/community/irc.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/community/irc.sgml,v 1.1 2005/10/12 12:29:17 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/community/irc.sgml,v 1.2 2005/10/13 16:21:13 blackend Exp $">
 <!ENTITY title "IRC">
-<!ENTITY % navincludes SYSTEM "../includes.navcommunity.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.community "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/community/mailinglists.sgml b/fr/community/mailinglists.sgml
index 96eefcd458..322a62f568 100644
--- a/fr/community/mailinglists.sgml
+++ b/fr/community/mailinglists.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/community/mailinglists.sgml,v 1.4 2005/12/31 11:26:15 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/community/mailinglists.sgml,v 1.5 2006/02/03 11:54:53 blackend Exp $">
 <!ENTITY title "Mailing Lists">
-<!ENTITY % navincludes SYSTEM "../includes.navcommunity.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.community "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/community/newsgroups.sgml b/fr/community/newsgroups.sgml
index 5d2e5bea42..282a7d4ac3 100644
--- a/fr/community/newsgroups.sgml
+++ b/fr/community/newsgroups.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/community/newsgroups.sgml,v 1.2 2005/10/13 16:21:13 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/community/newsgroups.sgml,v 1.3 2005/12/05 17:49:35 blackend Exp $">
 <!ENTITY title "Newsgroups">
-<!ENTITY % navincludes SYSTEM "../includes.navcommunity.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.community "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/community/webresources.sgml b/fr/community/webresources.sgml
index fbbe09a757..b7ee25c1e9 100644
--- a/fr/community/webresources.sgml
+++ b/fr/community/webresources.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/community/webresources.sgml,v 1.2 2005/10/13 16:21:13 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/community/webresources.sgml,v 1.3 2006/07/03 16:03:57 blackend Exp $">
 <!ENTITY title "Web Resources">
-<!ENTITY % navincludes SYSTEM "../includes.navcommunity.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.community "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/copyright/copyright.sgml b/fr/copyright/copyright.sgml
index 620858d1e1..62febdac8c 100644
--- a/fr/copyright/copyright.sgml
+++ b/fr/copyright/copyright.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/copyright/copyright.sgml,v 1.6 2004/08/09 20:56:33 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/copyright/copyright.sgml,v 1.8 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Informations l&eacute;gales et Copyright FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/copyright/daemon.sgml b/fr/copyright/daemon.sgml
index e918cfee1e..bc75d2dee5 100644
--- a/fr/copyright/daemon.sgml
+++ b/fr/copyright/daemon.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/copyright/daemon.sgml,v 1.6 2004/08/05 20:29:38 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/copyright/daemon.sgml,v 1.8 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Le D&eacute;mon BSD">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/copyright/freebsd-doc-license.sgml b/fr/copyright/freebsd-doc-license.sgml
index 58558ed998..c4ca46b067 100644
--- a/fr/copyright/freebsd-doc-license.sgml
+++ b/fr/copyright/freebsd-doc-license.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/copyright/freebsd-doc-license.sgml,v 1.1 2004/10/24 12:28:16 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/copyright/freebsd-doc-license.sgml,v 1.3 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "La licence de documentation FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/copyright/freebsd-license.sgml b/fr/copyright/freebsd-license.sgml
index a33a31d498..c7fd05c8bd 100644
--- a/fr/copyright/freebsd-license.sgml
+++ b/fr/copyright/freebsd-license.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/copyright/freebsd-license.sgml,v 1.7 2005/10/06 12:56:03 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/copyright/freebsd-license.sgml,v 1.8 2006/03/09 21:26:15 blackend Exp $">
 <!ENTITY title "Le Copyright FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/copyright/license.sgml b/fr/copyright/license.sgml
index 0e4a8b17ac..f870758179 100644
--- a/fr/copyright/license.sgml
+++ b/fr/copyright/license.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/copyright/license.sgml,v 1.3 2004/02/02 20:57:49 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/copyright/license.sgml,v 1.5 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Le Copyright 4.4BSD">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/copyright/trademarks.sgml b/fr/copyright/trademarks.sgml
index 712c6408df..471bc6db83 100644
--- a/fr/copyright/trademarks.sgml
+++ b/fr/copyright/trademarks.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/copyright/trademarks.sgml,v 1.6 2005/10/29 09:21:57 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/copyright/trademarks.sgml,v 1.7 2006/07/03 16:03:57 blackend Exp $">
 <!ENTITY title "L&eacute;gende des marques">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/developers/cvs.sgml b/fr/developers/cvs.sgml
index c99319e491..f5cba7454d 100644
--- a/fr/developers/cvs.sgml
+++ b/fr/developers/cvs.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/developers/cvs.sgml,v 1.2 2005/12/17 10:58:29 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/developers/cvs.sgml,v 1.3 2006/02/13 17:53:03 blackend Exp $">
 <!ENTITY title "D&eacute;p&ocirc;t CVS">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/docproj/current.sgml b/fr/docproj/current.sgml
index 6a096971c7..2c1c93c10d 100644
--- a/fr/docproj/current.sgml
+++ b/fr/docproj/current.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/docproj/current.sgml,v 1.3 2004/01/24 17:57:19 viny Exp $">
+<!ENTITY date "$FreeBSD: www/fr/docproj/current.sgml,v 1.5 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Projet de documentation de FreeBSD : Projects actuels">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 
 <!ENTITY imagebase "&enbase;/gifs">
diff --git a/fr/docproj/doc-set.sgml b/fr/docproj/doc-set.sgml
index bc08544140..9b4c6852fd 100644
--- a/fr/docproj/doc-set.sgml
+++ b/fr/docproj/doc-set.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/docproj/doc-set.sgml,v 1.5 2005/10/06 12:56:03 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/docproj/doc-set.sgml,v 1.6 2005/12/05 17:49:35 blackend Exp $">
 <!ENTITY title "Projet de Documentation FreeBSD  : Les diff&eacute;rents documents">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/docproj/docproj.sgml b/fr/docproj/docproj.sgml
index 385616ce30..5cfd660f32 100644
--- a/fr/docproj/docproj.sgml
+++ b/fr/docproj/docproj.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/docproj/docproj.sgml,v 1.6 2004/10/06 14:12:50 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/docproj/docproj.sgml,v 1.8 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Projet de Documentation FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/docproj/handbook.sgml b/fr/docproj/handbook.sgml
index 678db7aa7c..05365e97db 100644
--- a/fr/docproj/handbook.sgml
+++ b/fr/docproj/handbook.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/docproj/handbook.sgml,v 1.3 2004/10/06 14:12:50 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/docproj/handbook.sgml,v 1.5 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Projet de Documentation FreeBSD : projets en cours">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 
 <!ENTITY done "<font color='green'>Termin&eacute;</font>">
 <!ENTITY inprogress "<font color='blue'>En progr&egrave;s</font>">
diff --git a/fr/docproj/handbook3.sgml b/fr/docproj/handbook3.sgml
index bcf0c78f46..4ed3d883ab 100644
--- a/fr/docproj/handbook3.sgml
+++ b/fr/docproj/handbook3.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/docproj/handbook3.sgml,v 1.4 2004/02/03 12:30:27 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/docproj/handbook3.sgml,v 1.6 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Projet de Documentation FreeBSD : Manuel de r&eacute;f&eacute;rence 3&egrave;me Edition">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
+<!ENTITY % navinclude.docs "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 
 <!ENTITY done "<font color='green'>Fait</font>">
 <!ENTITY inprogress "<font color='blue'>En progr&egrave;s</font>">
diff --git a/fr/docproj/sgml.sgml b/fr/docproj/sgml.sgml
index 7fada29046..55b4c152d9 100644
--- a/fr/docproj/sgml.sgml
+++ b/fr/docproj/sgml.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/docproj/sgml.sgml,v 1.8 2005/10/06 12:56:03 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/docproj/sgml.sgml,v 1.9 2005/10/29 09:19:06 blackend Exp $">
 <!ENTITY title "Projet de documentation FreeBSD : SGML">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/docproj/submitting.sgml b/fr/docproj/submitting.sgml
index 8bab236ecc..70e408df1c 100644
--- a/fr/docproj/submitting.sgml
+++ b/fr/docproj/submitting.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/docproj/submitting.sgml,v 1.7 2005/10/06 12:56:03 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/docproj/submitting.sgml,v 1.8 2005/12/05 17:49:35 blackend Exp $">
 <!ENTITY title "Projet de documentation FreeBSD : Proposer de la documentation">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/docproj/translations.sgml b/fr/docproj/translations.sgml
index 17e8991d5d..e886be3fae 100644
--- a/fr/docproj/translations.sgml
+++ b/fr/docproj/translations.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/docproj/translations.sgml,v 1.9 2005/11/29 18:10:50 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/docproj/translations.sgml,v 1.10 2006/01/21 15:32:01 blackend Exp $">
 <!ENTITY title "Projet de documentation FreeBSD : Traductions">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/docproj/who.sgml b/fr/docproj/who.sgml
index e9136a1a5a..b227f1bf40 100644
--- a/fr/docproj/who.sgml
+++ b/fr/docproj/who.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/docproj/who.sgml,v 1.5 2004/08/09 20:46:17 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/docproj/who.sgml,v 1.7 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Le projet de documentation FreeBSD : qui sommes-nous?">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/docs.sgml b/fr/docs.sgml
index e5d636fefc..de925008f7 100644
--- a/fr/docs.sgml
+++ b/fr/docs.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/en/docs.sgml,v 1.194 2005/10/04 16:07:27 simon Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/docs.sgml,v 1.12 2005/10/18 21:02:45 blackend Exp $">
 <!ENTITY title "Documentation FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/docs/books.sgml b/fr/docs/books.sgml
index 32e2570e9a..07d98283e7 100644
--- a/fr/docs/books.sgml
+++ b/fr/docs/books.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/docs/books.sgml,v 1.7 2006/01/08 21:22:21 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/docs/books.sgml,v 1.8 2006/03/09 21:26:15 blackend Exp $">
 <!ENTITY title "Livres et Articles en ligne">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 
 <!ENTITY url.articles "../doc/en_US.ISO8859-1/articles">
 <!ENTITY url.books "../doc/en_US.ISO8859-1/books">
diff --git a/fr/docs/man.sgml b/fr/docs/man.sgml
index c70216fdba..d6f1833b16 100644
--- a/fr/docs/man.sgml
+++ b/fr/docs/man.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/docs/man.sgml,v 1.3 2005/12/17 10:58:29 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/docs/man.sgml,v 1.4 2006/07/03 16:03:57 blackend Exp $">
 <!ENTITY title "Pages de manuel">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 
 <!ENTITY url.mancgi "http://www.FreeBSD.org/cgi/man.cgi">
 ]>
diff --git a/fr/docs/webresources.sgml b/fr/docs/webresources.sgml
index a94775e7c4..d99fdeda94 100644
--- a/fr/docs/webresources.sgml
+++ b/fr/docs/webresources.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/docs/webresources.sgml,v 1.2 2005/10/20 12:25:34 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/docs/webresources.sgml,v 1.3 2005/12/31 11:26:15 blackend Exp $">
 <!ENTITY title "Ressources Web">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/donations/donors.sgml b/fr/donations/donors.sgml
index 574ce204bf..90effdfa99 100644
--- a/fr/donations/donors.sgml
+++ b/fr/donations/donors.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/donations/donors.sgml,v 1.3 2004/02/03 14:49:51 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/donations/donors.sgml,v 1.5 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Page des donateurs de mat&eacute;riels">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 ]>
 
diff --git a/fr/donations/index.sgml b/fr/donations/index.sgml
index bb3fd59a59..4727deeb0a 100644
--- a/fr/donations/index.sgml
+++ b/fr/donations/index.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/donations/index.sgml,v 1.3 2004/01/06 17:31:40 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/donations/index.sgml,v 1.5 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Coordination des donations au projet FreeBSD">
 <!ENTITY email 'donations'>
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/donations/wantlist.sgml b/fr/donations/wantlist.sgml
index 53a907de96..61b6e040a9 100644
--- a/fr/donations/wantlist.sgml
+++ b/fr/donations/wantlist.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/donations/wantlist.sgml,v 1.4 2004/02/05 17:20:56 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/donations/wantlist.sgml,v 1.6 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Liste des besoins des d&eacute;veloppeurs FreeBSD">
 <!ENTITY email 'donations'>
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/events/Makefile b/fr/events/Makefile
index e39fd9416c..1a5d5c3b0c 100644
--- a/fr/events/Makefile
+++ b/fr/events/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/fr/events/Makefile,v 1.1 2004/03/06 17:33:18 stephane Exp $
+# $FreeBSD: www/fr/events/Makefile,v 1.2 2006/02/03 11:54:53 blackend Exp $
 
 # The FreeBSD French Documentation Project
 # Original revision: 1.11
@@ -11,40 +11,13 @@
 .endif
 
 # SUBDIR= 2002 2003
-DATE?= /bin/date
-TR?= /usr/bin/tr
 
-DATA=	events.css
+DATA=   events.css
 
-CLEANFILES+= curdate.xml
+XMLDOCS+=		events:${XSL_EVENTS}:${XML_EVENTS_EVENTS}:
+DEPENDSET.events=	events
 
-XMLLINT?= /usr/local/bin/xmllint # Part of textproc/libxml2.
-
-XMLDOCS+=	events
-DEPENDSET.events=	events curdate.xml
-SRCS.events=	../includes.xsl curdate.xml
-
-XMLDOCS+=	events_ics:${WEB_PREFIX}/share/sgml/events2ics.xsl:events.xml:events.ics
-
-lint:
-	${XMLLINT} ${XMLLINTOPTS} --valid -o /dev/null ${.CURDIR}/events.xml
-
-.if !make(install)
-.PHONY:	curdate.xml
-.endif
-curdate.xml:
-	@${ECHO} "Generating ${.TARGET}"
-	@${ECHO_CMD} '<?xml version="1.0"?>'	 > ${.TARGET}
-	@${ECHO_CMD} '<curdate>'		>> ${.TARGET}
-	@${ECHO_CMD} -n '  <year>'		>> ${.TARGET}
-	@${DATE} +%Y | ${TR} -d "\n"		>> ${.TARGET}
-	@${ECHO_CMD} '</year>'			>> ${.TARGET}
-	@${ECHO_CMD} -n '  <month>'		>> ${.TARGET}
-	@${DATE} +%m | ${TR} -d "\n"		>> ${.TARGET}
-	@${ECHO_CMD} '</month>'			>> ${.TARGET}
-	@${ECHO_CMD} -n '  <day>'		>> ${.TARGET}
-	@${DATE} +%d | ${TR} -d "\n"		>> ${.TARGET}
-	@${ECHO_CMD} '</day>'			>> ${.TARGET}
-	@${ECHO_CMD} '</curdate>'		>> ${.TARGET}
+XMLDOCS+=		events_ics:${XSL_EVENTS_ICS}:${XML_EVENTS_EVENTS}:events.ics
+DEPENDSET.events_ics=	events
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/fr/events/events.dtd b/fr/events/events.dtd
deleted file mode 100644
index 14eccc468d..0000000000
--- a/fr/events/events.dtd
+++ /dev/null
@@ -1,88 +0,0 @@
-<!-- Copyright (c) 2003 Simon L. Nielsen <simon@FreeBSD.org>
-     All rights reserved.
-
-     Redistribution and use in source and binary forms, with or without
-     modification, are permitted provided that the following conditions
-     are met:
-     1. Redistributions of source code must retain the above copyright
-	notice, this list of conditions and the following disclaimer.
-     2. Redistributions in binary form must reproduce the above copyright
-	notice, this list of conditions and the following disclaimer in the
-	documentation and/or other materials provided with the distribution.
-
-     THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-     ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-     ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-     FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-     DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-     OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-     SUCH DAMAGE.
-
-     $FreeBSD$
--->
-
-<!-- 
-   The FreeBSD French Documentation Project
-   Original revision: 1.1
--->
-
-<!-- DTD for events.xml on the FreeBSD website. -->
-
-<!ELEMENT events (cvs:keywords?, event+)>
-
-<!ELEMENT event (name?, url?, startdate, enddate, location, description?, link*)>
-<!ATTLIST event id ID #REQUIRED>
-
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT url (#PCDATA)>
-<!--
-     Meaning of type attribute:
-       freebsd-website:
-	 The URL is relative to the FreeBSD website root.
-	 The URL should start with a single "/".
-       absolute:
-	 Normal absolute URL.
--->
-<!ATTLIST url type (absolute|freebsd-website) "absolute">
-
-<!ELEMENT startdate (year,month,day)>
-<!ELEMENT enddate (year,month,day)>
-<!ELEMENT year (#PCDATA)>
-<!ELEMENT month (#PCDATA)>
-<!ELEMENT day (#PCDATA)>
-
-<!ELEMENT location (country?,state?,city?,site?,address?)>
-<!ELEMENT country (#PCDATA)>
-<!ELEMENT state (#PCDATA)>
-<!ELEMENT city (#PCDATA)>
-<!ELEMENT site (#PCDATA)>
-<!ELEMENT address (#PCDATA)>
-
-<!ELEMENT description (#PCDATA|a|tt|i|b)*>
-
-<!-- Misc HTML entities which might be used; just add more as needed -->
-<!ELEMENT a (#PCDATA)>
-<!ATTLIST a href CDATA #REQUIRED>
-
-<!ELEMENT b (#PCDATA|a)*>
-<!ELEMENT i (#PCDATA|a)*>
-<!ELEMENT tt (#PCDATA|a)*>
-
-<!--
-     Link to a web page (local or remote) with additional information
-     about the event.  Can also be used for post-event comments/notes.
--->
-<!ELEMENT link (name, url)>
-<!ATTLIST link type (photos|notes|other) "other">
-
-<!-- Common CVS tags -->
-<!ELEMENT cvs:keywords (cvs:keyword+)>
-<!ATTLIST cvs:keywords xmlns:cvs CDATA #FIXED 'http://www.FreeBSD.org/XML/CVS'>
-<!ATTLIST cvs:keywords version CDATA #FIXED '1.0'>
-
-<!ELEMENT cvs:keyword (#PCDATA)>
-<!ATTLIST cvs:keyword name CDATA #REQUIRED>
diff --git a/fr/events/events.xsl b/fr/events/events.xsl
deleted file mode 100644
index 3605ba0f5f..0000000000
--- a/fr/events/events.xsl
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!-- Copyright (c) 2003 Simon L. Nielsen <simon@FreeBSD.org>
-     All rights reserved.
-
-     Redistribution and use in source and binary forms, with or without
-     modification, are permitted provided that the following conditions
-     are met:
-     1. Redistributions of source code must retain the above copyright
-	notice, this list of conditions and the following disclaimer.
-     2. Redistributions in binary form must reproduce the above copyright
-	notice, this list of conditions and the following disclaimer in the
-	documentation and/or other materials provided with the distribution.
-
-     THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-     ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-     ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-     FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-     DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-     OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-     SUCH DAMAGE.
-
-     $FreeBSD: www/fr/events/events.xsl,v 1.2 2005/10/06 12:56:03 blackend Exp $
--->
-
-<!-- 
-   The FreeBSD French Documentation Project
-   Original revision: 1.6
-   
-   Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
-  exclude-result-prefixes="cvs">
-
-  <xsl:import href="../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
-  <xsl:variable name="section" select="'about'"/>
-
-  <xsl:variable name="curdate" select="document('curdate.xml')//curdate"/>
-
-  <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-  <xsl:variable name="email" select="'freebsd-www'"/>
-  <xsl:variable name="title" select="'Ev&#233;nements FreeBSD'"/>
-
-  <xsl:output method="xml" encoding="iso-8859-1"
-    doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-    doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"/>
-
-  <xsl:key name="event-by-month" match="event"
-    use="concat(startdate/year, format-number(startdate/month, '00'))"/>
-
-  <!-- Template: events -->
-  <xsl:template match="events">
-    <html>
-      <xsl:copy-of select="$header1"/>
-
-      <body>
-
-	<div id="containerwrap">
-	  <div id="container">
-	<xsl:copy-of select="$header2"/>
-
-	    <div id="content">
-	      <xsl:copy-of select="$sidenav"/>
-
-	      <div id="contentwrap">
-		<xsl:copy-of select="$header3"/>
- 	<!--
-	     Note the current date to have a reference, if the
-	     upcoming/past events are split incorrectly.
-	-->
-	<xsl:comment>
-	  <xsl:text>G&#233;n&#233;r&#233; le : </xsl:text>
-	  <xsl:value-of select="concat($curdate/year,
-	    format-number($curdate/month, '00'),
-	    format-number($curdate/day, '00'))"/>
-	</xsl:comment>
-
-	<p>Si vous avez connaissance d'&#233;v&#233;nements li&#233;s &#224; FreeBSD, ou d'&#233;v&#233;nements qui
-	  pourraient int&#233;ress&#233;s les utilisateurs FreeBSD, qui ne sont pas indiqu&#233;s
-	  ici, veuillez envoyer tous les d&#233;tails &#224; <a
-	  href="mailto:www@FreeBSD.org">www@FreeBSD.org</a> de mani&#232;re
-	  &#224; ce qu'ils puissent &#234;tre ajout&#233;s.</p>
-
-  <p>Les utilisateurs disposant d'un logiciel d'organisation comprenant le
-	  format iCalendar peuvent s'abonner au
-	  <a>
-	    <xsl:attribute name="href"><xsl:value-of select="$base"/>/events/events.ics</xsl:attribute>
-	    calendrier des &#233;v&#233;nements FreeBSD</a>
-	  qui comprend tous les &#233;v&#233;nements mentionn&#233;s ici.</p>
-
-	<h2 id="upcoming">
-	  <xsl:text>Ev&#233;nements actuels / &#224; venir :</xsl:text>
-	</h2>
-
-	<xsl:for-each select="event[generate-id() =
-          generate-id(key('event-by-month',
-	    concat(startdate/year, format-number(startdate/month, '00')))[1])
-	  and ((number(enddate/year) &gt; number($curdate/year)) or
-	    (number(enddate/year) = number($curdate/year) and
-	     number(enddate/month) &gt; number($curdate/month)) or
-	    (number(enddate/year) = number($curdate/year) and
-	     number(enddate/month) = number($curdate/month) and
-	     enddate/day &gt;= $curdate/day))]">
-
-	  <xsl:sort select="startdate/year" order="ascending"/>
-	  <xsl:sort select="format-number(startdate/month, '00')" order="ascending"/>
-	  <xsl:sort select="format-number(startdate/day, '00')" order="ascending"/>
-
-	  <h3>
-	    <xsl:attribute name="id">
-	      <xsl:text>mois :</xsl:text>
-	      <xsl:value-of select="concat(startdate/year,
-		format-number(startdate/month, '00'))"/>
-	    </xsl:attribute>
-	    <xsl:call-template name="gen-long-en-month">
-	      <xsl:with-param name="nummonth" select="startdate/month"/>
-	    </xsl:call-template>
-	    <xsl:text> </xsl:text>
-	    <xsl:value-of select="startdate/year"/>
-	  </h3>
-
-	  <ul>
-	    <xsl:for-each select="key('event-by-month',
-	      concat(startdate/year, format-number(startdate/month, '00')))">
-
-	      <xsl:sort select="format-number(startdate/day, '00')" order="ascending"/>
-	      <xsl:apply-templates select="."/>
-	    </xsl:for-each>
-	  </ul>
-	</xsl:for-each>
-
-	<h2 id="past">
-	  <xsl:text>Ev&#233;nements pass&#233;s :</xsl:text>
-	</h2>
-
-	<xsl:for-each select="event[generate-id() =
-	  generate-id(key('event-by-month', concat(startdate/year,
-	    format-number(startdate/month, '00')))[1])
-	  and ((number(enddate/year) &lt; number($curdate/year)) or
-	    (number(enddate/year) = number($curdate/year) and
-	     number(enddate/month) &lt; number($curdate/month)) or
-	    (number(enddate/year) = number($curdate/year) and
-	     number(enddate/month) = number($curdate/month) and
-	     number(enddate/day) &lt; number($curdate/day)))]">
-
-	  <xsl:sort select="number(startdate/year)" order="descending"/>
-	  <xsl:sort select="format-number(startdate/month, '00')" order="descending"/>
-	  <xsl:sort select="format-number(startdate/day, '00')" order="descending"/>
-
-	  <h3>
-	    <xsl:attribute name="id">
-	      <xsl:text>mois :</xsl:text>
-	      <xsl:value-of select="concat(startdate/year,
-		format-number(startdate/month, '00'))"/>
-	    </xsl:attribute>
-	    <xsl:call-template name="gen-long-en-month">
-	      <xsl:with-param name="nummonth" select="startdate/month"/>
-	    </xsl:call-template>
-	    <xsl:text> </xsl:text>
-	    <xsl:value-of select="startdate/year"/>
-	  </h3>
-
-	  <ul>
-	    <xsl:for-each select="key('event-by-month',
-	      concat(startdate/year, format-number(startdate/month, '00')))">
-
-	      <xsl:sort select="format-number(startdate/day, '00')" order="descending"/>
-	      <xsl:apply-templates select="."/>
-	    </xsl:for-each>
-	  </ul>
-	</xsl:for-each>
-	      </div> <!-- contentwrap -->
-
-	      <br class="clearboth" />
-	    </div> <!-- content -->
-
-	    <xsl:copy-of select="$footer"/>
-	  </div> <!-- container -->
-	</div> <!-- containerwrap -->
-      </body>
-    </html>
-  </xsl:template>
-
-  <!-- Template: event -->
-  <xsl:template match="event">
-    <li>
-      <xsl:attribute name="id">
-	<xsl:call-template name="generate-event-anchor"/>
-      </xsl:attribute>
-
-      <p>
-	<b>
-	  <xsl:if test="url">
-	    <xsl:apply-templates select="url"/>
-	  </xsl:if>
-	  <xsl:if test="not(url)">
-	    <xsl:value-of select="name"/>
-	  </xsl:if>
-	</b>
-	<xsl:if test="location/site!=''">
-	  <xsl:text>, </xsl:text>
-	  <xsl:value-of select="location/site"/>
-	</xsl:if>
-	<xsl:if test="location/city!=''">
-	  <xsl:text>, </xsl:text>
-	  <xsl:value-of select="location/city"/>
-	</xsl:if>
-	<xsl:if test="location/state!=''">
-	  <xsl:text>, </xsl:text>
-	  <xsl:value-of select="location/state"/>
-	</xsl:if>
-	<xsl:if test="location/country!=''">
-	  <xsl:text>, </xsl:text>
-	  <xsl:value-of select="location/country"/>
-	</xsl:if>
-	<br/>
-	<em>
-	  <xsl:call-template name="gen-date-interval">
-	    <xsl:with-param name="startdate" select="startdate" />
-	    <xsl:with-param name="enddate" select="enddate" />
-	  </xsl:call-template>
-	</em><br/>
-	<xsl:copy-of select="description/child::node()"/>
-      </p>
-      <xsl:if test="link">
-	<p><xsl:apply-templates select="link"/></p>
-      </xsl:if>
-    </li>
-  </xsl:template>
-
-  <!-- Template: link -->
-  <xsl:template match="link">
-    <xsl:apply-templates select="url"/>
-    <xsl:if test="not(position()=last())">
-      <xsl:text>&#160;</xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- Template: url -->
-  <xsl:template match="url">
-    <a>
-      <xsl:attribute name="href">
-	<xsl:choose>
-	  <xsl:when test="@type='freebsd-website'">
-	    <xsl:value-of select="$base"/>
-	  </xsl:when>
-	</xsl:choose>
-        <xsl:value-of select="."/>
-      </xsl:attribute>
-      <xsl:value-of select="../name"/>
-    </a>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/fr/events/includes.xsl b/fr/events/includes.xsl
deleted file mode 100644
index e4f9c96359..0000000000
--- a/fr/events/includes.xsl
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!-- Copyright (c) 2003 Simon L. Nielsen <simon@FreeBSD.org>
-     All rights reserved.
-
-     Redistribution and use in source and binary forms, with or without
-     modification, are permitted provided that the following conditions
-     are met:
-     1. Redistributions of source code must retain the above copyright
-	notice, this list of conditions and the following disclaimer.
-     2. Redistributions in binary form must reproduce the above copyright
-	notice, this list of conditions and the following disclaimer in the
-	documentation and/or other materials provided with the distribution.
-
-     THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-     ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-     ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-     FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-     DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-     OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-     SUCH DAMAGE.
-
-     $FreeBSD$
--->
-
-<!-- 
-   The FreeBSD French Documentation Project
-   Original revision: 1.1
-   
-   Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <!-- Generate a unique anchor for this event. -->
-  <xsl:template name="generate-event-anchor">
-    <xsl:text>&#233;v&#233;nement :</xsl:text>
-    <xsl:value-of select="@id"/>
-  </xsl:template>
-
-  <!-- Generic templates: -->
-
-  <!-- Convert a month number to the corresponding long English name. -->
-  <xsl:template name="gen-long-en-month">
-    <xsl:param name="nummonth"/>
-    <xsl:variable name="month" select="number($nummonth)"/>
-    <xsl:choose>
-      <xsl:when test="$month=1">Janvier</xsl:when>
-      <xsl:when test="$month=2">F&#233;vrier</xsl:when>
-      <xsl:when test="$month=3">Mars</xsl:when>
-      <xsl:when test="$month=4">Avril</xsl:when>
-      <xsl:when test="$month=5">Mai</xsl:when>
-      <xsl:when test="$month=6">Juin</xsl:when>
-      <xsl:when test="$month=7">Juillet</xsl:when>
-      <xsl:when test="$month=8">Ao&#251;t</xsl:when>
-      <xsl:when test="$month=9">Septembre</xsl:when>
-      <xsl:when test="$month=10">Octobre</xsl:when>
-      <xsl:when test="$month=11">Novembre</xsl:when>
-      <xsl:when test="$month=12">D&#233;cembre</xsl:when>
-      <xsl:otherwise>Mois invalide</xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Generate a date interval. -->
-  <!-- Sample: 27 November, 2002 - 29 December, 2003 -->
-  <xsl:template name="gen-date-interval">
-    <xsl:param name="startdate"/>
-    <xsl:param name="enddate"/>
-
-    <xsl:value-of select="startdate/day"/>
-
-    <xsl:if test="number(startdate/month) != number(enddate/month) or
-		  number(startdate/day) != number(enddate/day) or
-		  number(startdate/year) != number(enddate/year)">
-
-      <xsl:if test="number(startdate/month) != number(enddate/month) or
-		    number(startdate/year) != number(enddate/year)">
-	<xsl:text> </xsl:text>
-	<xsl:call-template name="gen-long-en-month">
-	  <xsl:with-param name="nummonth" select="startdate/month"/>
-	</xsl:call-template>
-      </xsl:if>
-
-      <xsl:if test="number(startdate/year) != number(enddate/year)">
-	<xsl:text>, </xsl:text>
-	<xsl:value-of select="startdate/year"/>
-      </xsl:if>
-      <xsl:text> - </xsl:text>
-
-      <xsl:if test="number(startdate/day) != number(enddate/day) or
-		    number(startdate/month) != number(enddate/month) or
-		    number(startdate/year) != number(enddate/year)">
-	<xsl:value-of select="enddate/day"/>
-      </xsl:if>
-    </xsl:if>
-
-    <xsl:text> </xsl:text>
-    <xsl:call-template name="gen-long-en-month">
-      <xsl:with-param name="nummonth" select="enddate/month"/>
-    </xsl:call-template>
-
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="enddate/year"/>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/fr/features.sgml b/fr/features.sgml
index 4ad196ee91..15f963d041 100644
--- a/fr/features.sgml
+++ b/fr/features.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/fr/features.sgml,v 1.1 2002/11/17 16:02:47 stephane Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/features.sgml,v 1.4 2005/10/06 12:56:02 blackend Exp $">
 <!ENTITY title "A propos des particularit&eacute;s technologiques de FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/gallery/Makefile b/fr/gallery/Makefile
deleted file mode 100644
index 7c708a27b2..0000000000
--- a/fr/gallery/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $FreeBSD$
-
-# The FreeBSD French Documentation Project
-# Original revision: 1.16
-
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
-.endif
-.if exists(../Makefile.inc)
-.include "../Makefile.inc"
-.endif
-
-XSLTPROCFLAGS=	--catalogs
-XSLT=	${SETENV} SGML_CATALOG_FILES=${PREFIX}/share/xml/dtd/xhtml/xhtml.soc \
-	${XSLTPROC} ${XSLTPROCOPTS}
-
-INDEXLINK= gallery.html
-
-DATA+=	gallery.html cgallery.html npgallery.html pgallery.html
-
-CLEANFILES+= ${DATA}
-
-gallery.html: gallery.xml gallery.xsl ../includes.xsl
-	${XSLT} ${.CURDIR}/gallery.xsl ${.CURDIR}/gallery.xml > ${.TARGET}
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
-cgallery.html: gallery.xml gallery-entry.xsl
-	${XSLT} --param type \'commercial\' \
-		${.CURDIR}/gallery-entry.xsl ${.CURDIR}/gallery.xml > ${.TARGET}
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
-npgallery.html: gallery.xml gallery-entry.xsl
-	${XSLT} --param type \'nonprofit\' \
-		${.CURDIR}/gallery-entry.xsl ${.CURDIR}/gallery.xml > ${.TARGET}
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
-pgallery.html: gallery.xml gallery-entry.xsl
-	${XSLT} --param type \'personal\' \
-		${.CURDIR}/gallery-entry.xsl ${.CURDIR}/gallery.xml > ${.TARGET}
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/fr/gallery/fixurls.pl b/fr/gallery/fixurls.pl
deleted file mode 100755
index deea59b33d..0000000000
--- a/fr/gallery/fixurls.pl
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/perl
-
-# This script is dedicated to check existing gallery XML file.
-# Check its URLs for duplicates and fixup incorrectly submitted ones.
-#
-# History:
-#   31082001	Alexey Zelkin	Initial version
-#
-# Usage:
-#   fixurls.pl gallery.xml output.xml
-#
-# $FreeBSD$
-
-# The FreeBSD French Documentation Project
-# Original revision: 1.1
-
-if (-f $ARGV[0]) {
-	$src = $ARGV[0];
-} else {
-	die "Could not open source file!"
-}
-
-if ($ARGV[1] eq "") {
-	die "Could not open output file!"
-} else {
-	$dst = $ARGV[1];
-}
-
-open (SRC, $src);
-open (DST, ">$dst");
-
-while (<SRC>) {
-	if ($_ =~ /\<url\>.*\<\/url\>/) {
-		chomp;
-		s/.*url\>(.*)\<\/url.*/$1/;
-		next if ($_ eq "");
-		# add "http://" at the begining of the url unless it (or any
-		# other (like "ftp://") protocol is already specified
-		$_ = "http://" . $_ unless (m/^[a-z]*:\/\/.*$/);
-		if (defined $hhash{$_}) {
-			$hhash{$_}++;
-		} else {
-			$hhash{$_} = 1;
-		}
-		print DST "    <url>$_</url>\n";
-	} else {
-		print DST $_;
-	}
-}
-
-close (SRC);
-close (DST);
-
-print "Duplicated URLs:\n";
-foreach $key (sort keys %hhash) {
-	print "$hhash{$key}: $key\n" if ($hhash{$key} > 1);
-}
diff --git a/fr/gallery/gallery-entry.xsl b/fr/gallery/gallery-entry.xsl
deleted file mode 100644
index 4576dc0dec..0000000000
--- a/fr/gallery/gallery-entry.xsl
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!-- 
-   The FreeBSD French Documentation Project
-   Original revision: 1.2
-
-   Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:import href="../includes.xsl"/>
-  <xsl:variable name="section" select="'about'"/>
-
-  <!-- Should be set on the command line, specifies the type of entries to
-       include in the output.  One of "commercial", "nonprofit", or 
-       "personal" -->
-  <xsl:param name="type"/>
-
-  <xsl:variable name="base" select="'..'"/>
-  
-  <xsl:variable name="date" select="'$FreeBSD: www/fr/gallery/gallery-entry.xsl,v 1.1 2003/08/17 12:22:28 stephane Exp $'"/>
-
-  <xsl:output type="html" encoding="iso-8859-1"/>
-
-  <xsl:variable name="title">
-    <xsl:choose>
-      <xsl:when test="$type = 'commercial'">Galerie - Commercial</xsl:when>
-      <xsl:when test="$type = 'nonprofit'">Galerie - Organisations &#224; but non-lucratif</xsl:when>
-      <xsl:when test="$type = 'personal'">Galerie - Pages personnelles</xsl:when>
-      <xsl:otherwise>
-	Unknown value for $type: <xsl:value-of select="$type"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="commercial-intro">
-    <p>A travers le monde entier, FreeBSD fait fonctionner des applications et 
-      des services Internet innovants. Cette galerie expose les organisations 
-      commerciales qui ont utilis&#233; FreeBSD pour r&#233;aliser leurs travaux. Regardez 
-      et d&#233;couvrez tout ce que FreeBSD peut faire pour <b>vous</b>.</p>
-  </xsl:variable>
-
-  <xsl:variable name="nonprofit-intro">
-    <p>A travers le monde entier, FreeBSD fait fonctionner des applications et 
-      des services Internet innovants. Cette galerie expose les organisations 
-      &#224; but non-lucratif qui ont utilis&#233; FreeBSD pour r&#233;aliser leurs travaux. Regardez
-      et d&#233;couvrez tout ce que FreeBSD peut faire pour <b>vous</b>.</p>
-  </xsl:variable>
-
-  <xsl:variable name="personal-intro">
-    <p>A travers le monde entier, FreeBSD fait fonctionner des applications et 
-      des services Internet innovants. Cette galerie expose les sites 
-      personnels qui ont utilis&#233; FreeBSD pour r&#233;aliser leurs travaux. Regardez
-      et d&#233;couvrez tout ce que FreeBSD peut faire pour <b>vous</b>.</p>
-  </xsl:variable>
-
-  <xsl:template match="gallery">
-    <html>
-      <xsl:copy-of select="$header1"/>
-      
-            <body xsl:use-attribute-sets="att.body">
-      
-        <div id="containerwrap">
-          <div id="container">
-      
-      	<xsl:copy-of select="$header2"/>
-      
-      	<div id="content">
-      
-      	      <xsl:copy-of select="$sidenav"/>
-      
-      	      <div id="contentwrap">
-      	      
-	      <xsl:copy-of select="$header3"/>
-
-	<xsl:choose>
-	  <xsl:when test="$type = 'commercial'">
-	    <xsl:copy-of select="$commercial-intro"/>
-	  </xsl:when>
-	  <xsl:when test="$type = 'nonprofit'">
-	    <xsl:copy-of select="$nonprofit-intro"/>
-	  </xsl:when>
-	  <xsl:when test="$type = 'personal'">
-	    <xsl:copy-of select="$personal-intro"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <p>No clue what to put here for $type = 
-	      <xsl:value-of select="$type">.</xsl:value-of></p>
-	  </xsl:otherwise>
-	</xsl:choose>
-
-	<ul>
-	  <!-- Select all entries of the correct type, doing a case
-               insensitive sort -->
-	  <xsl:apply-templates select="entry[@type = $type]">
-	    <xsl:sort select="translate(string(./name),
-		      'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 
-		      'abcdefghijklmnopqrstuvwxyz')"/>
-	  </xsl:apply-templates>
-	</ul>
-
-	  	</div> <!-- contentwrap -->
-		<br class="clearboth" />
-	
-	</div> <!-- content -->
-	
-	<xsl:copy-of select="$footer"/>
-	
-        </div> <!-- container -->
-   </div> <!-- containerwrap -->
-
-      </body>
-    </html>
-  </xsl:template>
-
-  <xsl:template match="entry">
-    <xsl:variable name="url"><xsl:value-of select="url"/></xsl:variable>
-    <li><a href="{$url}"><b><xsl:value-of select="name"/></b></a> --
-      <xsl:value-of select="descr"/></li>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/fr/gallery/gallery.xml b/fr/gallery/gallery.xml
deleted file mode 100644
index 5748a7a63a..0000000000
--- a/fr/gallery/gallery.xml
+++ /dev/null
@@ -1,26819 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!-- $FreeBSD: www/en/gallery/gallery.xml,v 1.35 2003/08/11 19:36:28 ceri Exp $ -->
-
-<!DOCTYPE gallery [
-<!ENTITY % HTMLlat1 PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"  "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent">
-%HTMLlat1;
-]>
-
-<gallery>
-  <entry type="commercial">
-    <name>A1 Computer Surplus / Planet CR</name>
-    <url>http://www.planetcr.com</url>
-    <descr>Planet CR offers home networking and surplus computers.</descr>
-    <email>sgarringer@planetcr.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AAISE.COM Directories</name>
-    <url>http://www.aaise.com/</url>
-    <descr>Web Directory Service... The Largest in the World</descr>
-    <email>webmater@aaise.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>JMT Enterprises</name>
-    <url>http://www.jmtent.com/</url>
-    <descr>Enterprise Software Development Solution Provider</descr>
-    <email>chansen@jmtent.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Silicon Desert, LLC.</name>
-    <url>http://www.silicon-desert.com/</url>
-    <descr>Internet Service Provider in New Mexico</descr>
-    <email>webmaster@silicon-desert.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SurLink Global Networking, Inc</name>
-    <url>http://www.surlink.net/</url>
-    <descr>Introducing the different ISP of the new millennium. Web Hosting starting at $6.95/mo, Dedicated Servers starting at $85.95/mo.</descr>
-    <email>billm@surlink.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>K&amp;G Network Services, Inc.</name>
-    <url>http://www.kgns.com</url>
-    <descr>Proffesional, inexpensive virtual and dedicated web hosting. Starting at $9.95/month</descr>
-    <email>gregg@kgns.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Digioso Technology Solutions</name>
-    <url>http://digioso.com/</url>
-    <descr>Security consulting, networking,web design,and hosting.  Secure Unix! Encryption!Etc.</descr>
-    <email>info@digioso.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Lucida Communications</name>
-    <url>http://www.lucida.qc.ca/</url>
-    <descr>Lucida Communications is a leading Canadian based shell provider.</descr>
-    <email>admin@LUCIDA.QC.CA</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CASEMaker Inc.</name>
-    <url>http://www.dbmaker.com/</url>
-    <descr>DBMaker provides you with a professional database system with multimedia capabilities, a native ODBC interface, large database features, and cross-platform support.</descr>
-    <email>oscar@lion.syscom.com.tw</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MixedWeb UK</name>
-    <url>http://www.mixedweb.com/</url>
-    <descr>Dedicated Servers, Colocation and Webhosting Packages</descr>
-    <email>tomas@mixedweb.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>escape-hosting.net</name>
-    <url>http://www.escape-hosting.net/</url>
-    <descr>We are the chepest Hoster in Switzerland</descr>
-    <email>info@escape-hosting.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Flash4Cash</name>
-    <url>http://www.flash4cash.org/</url>
-    <descr>FreeBSD-powered Adult Web Site running off a puny 466 Celeron and Cable Modem</descr>
-    <email>pv@lokmail.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Hote Qc.</name>
-    <url>http://www.hote.qc.ca/</url>
-    <descr>Design et h&eacute;bergement de sites web.</descr>
-    <email>admin@hote.qc.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Spawnet Internet Services +</name>
-    <url>http://wwww.spawnet.com/</url>
-    <descr>Dedicated Servers &amp; Web hosting Presence</descr>
-    <email>alex@spawnet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>IntraArts New Zealand Limited</name>
-    <url>http://www.ianz.co.nz/</url>
-    <descr>Providing net technology and information security solutions with a client focus.</descr>
-    <email>support@ianz.co.nz</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Triplet &amp; Co.</name>
-    <url>http://www.Triplet.co.jp/</url>
-    <descr>make the web,server designs</descr>
-    <email>saddy_f@triplet.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Die Netz-Werker GmbH</name>
-    <url>http://www.Netz-Werker.COM/</url>
-    <descr>ISP in Berlin</descr>
-    <email>tomsoft@Netz-Werker.COM</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ClariNET Internet Solutions</name>
-    <url>http://www.clari.net.au/</url>
-    <descr>ClariNET provides business solutions to corporate, business, government departments, and individuals utilising Internet-based technologies. We specialise in corporate web hosting, network/Internet integration, and innovative, cost-effective solutions to business requirements.</descr>
-    <email>jessica@clari.net.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>0RiskNames.com</name>
-    <url>http://www.0risknames.com/</url>
-    <descr>Domain Name Registration &amp; Hosting</descr>
-    <email>dconlon@0risknames.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>123.net</name>
-    <url>http://www.123.net/</url>
-    <descr>Internet 123</descr>
-    <email>admin@123.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>123HostIt</name>
-    <url>http://www.123hostit.com/</url>
-    <descr>Quality web hosting and e-commerce hosting. - Web hosting as easy as 123.</descr>
-    <email>sales@123hostit.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>1AccessWeb</name>
-    <url>http://www.1accessweb.com/</url>
-    <descr>internet community</descr>
-    <email>director@1accessweb.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>3TEC.COM - Tritech Automation Corporation</name>
-    <url>http://www.3tec.com/</url>
-    <descr>Canadian Service Provider of FreeBSD and Linux servers, web hosting and development, domain name services, e-Commerce solutions, dedicated server, database and application services.</descr>
-    <email>mchang@3tec.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>4TEK Seek</name>
-    <url>http://www.4tekseek.com/</url>
-    <descr>Dedicated to providing the most comprehensive Information Technology and Telecommunications resources on the web, and with links to thousands of computer and communications resources, file downloads, news and a help desk.</descr>
-    <email>info@4tekseek.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>7 Solutions</name>
-    <url>http://www.7-solutions.com/</url>
-    <descr>Web Hosting Company In El Paso, Texas</descr>
-    <email>hosting@7-solutions.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>9 Net Avenue</name>
-    <url>http://www.9netave.com/</url>
-    <descr></descr>
-    <email>Web Hosting Solutions</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Class Hosting at South Tech Internet Services</name>
-    <url>http://www.stech.com.br/</url>
-    <descr>Internet Hosting of first quality in Savvis Net, Dallas.</descr>
-    <email>cvianna@stech.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Eclipse Communications</name>
-    <url>http://www.eclipse-comm.com/</url>
-    <descr>A web hosting dedicated to offering great hosting services at great prices. </descr>
-    <email>hosting@eclipse-comm.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>config.com</name>
-    <url>http://www.config.com/</url>
-    <descr>Internet marketing and management. Home of the first URL advertised in Computer Shopper...</descr>
-    <email>joe@config.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>digitec.net</name>
-    <url>http://www.digitec.net/</url>
-    <descr>ISP from San Sebastian (Spain) running FreeBSD/SMP multiprocessor servers</descr>
-    <email>sysop@digitec.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>A team ApS</name>
-    <url>http://www.ateam.dk/</url>
-    <descr>Leading consultancy and training organisation in Denmark</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>A Touch of Friendship - Pantip.com</name>
-    <url>http://www.pantip.com</url>
-    <descr>Thai Biggest Cyber Society. We use FreeBSD as stable web server.</descr>
-    <email>apisilp@pantip.inet.co.th</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>A.I.S. Software</name>
-    <url>http://www.ais.cz</url>
-    <descr>Software for insurance companies</descr>
-    <email>ais@ais.cz</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AA1 - Paradise Web</name>
-    <url>http://www.paradise-web.com/</url>
-    <descr>FreeBSD Put to the Test for over 100,000 CGI Apps.</descr>
-    <email>webmaster@paradise-serve.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ABC Computer System Company</name>
-    <url>http://www.abchk.net/</url>
-    <descr>ABC Computer System Company</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AboveNet Communications, Inc.</name>
-    <url>http://www.above.net/</url>
-    <descr>ISP specializing in colocation services.</descr>
-    <email>jaitken@above.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ABSEILING &amp; CAVING,  Australia</name>
-    <url>http://www.abseil.com.au/</url>
-    <descr>High Angle Adventure Holidays Down Under !!!</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Abyss Systems</name>
-    <url>http://www.abyss.net/</url>
-    <descr>Consulting, Systems, and Internet Services.</descr>
-    <email>ksb@abyss.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Acadix Software Systems</name>
-    <url>http://www.execpc.com/~acadix/</url>
-    <descr>Software Developer.</descr>
-    <email>acadix@execpc.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ACAY Network Computing Pty Ltd</name>
-    <url>http://www.acay.com.au/</url>
-    <descr>Internet Services Provider (Australia) and WAN Consultants</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Accel-Systems</name>
-    <url>http://www.cyberatl.net/~accel/</url>
-    <descr>Disaster Recovery technology provider.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Access Internet Service Inc.</name>
-    <url>http://www.accessmo.com/</url>
-    <descr>Internet Service Provider. Serving the state of Missouri.</descr>
-    <email>info@accessmo.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Access Montana</name>
-    <url>http://www.accessmontana.com</url>
-    <descr>Internet Service Provider, serving northwestern montana</descr>
-    <email>stacyr@ronan.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Access Ohio Internet</name>
-    <url>http://www.accessohio.net/</url>
-    <descr>Internet Service Provider.  Serving Northwest Ohio</descr>
-    <email>jmishka@accessohio.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Access OnLine Pty Limited</name>
-    <url>http://www.accessonline.com.au/</url>
-    <descr>Specialists in developing and producing leading edge interactive solutions.</descr>
-    <email>johnm@accessonline.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ACE TIMING</name>
-    <url>http://www.acetiming.com/</url>
-    <descr>IP access control sofware</descr>
-    <email>charlie.lehoangan@acetiming.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Achei Search Engine</name>
-    <url>http://www.achei.net/</url>
-    <descr>The best Search Engine in Brazil</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ActiveMind, Inc.</name>
-    <url>http://www.activemind.net/</url>
-    <descr>Florida's Premier Web Provider</descr>
-    <email>dan@activemind.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AdarWeb</name>
-    <url>http://adarweb.com/</url>
-    <descr>Internet Hosting for businesses</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Addr.com</name>
-    <url>http://www.addr.com/</url>
-    <descr>FreeBSD based Web Hosting Provider</descr>
-    <email>support@addr.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Addy &amp; Associates</name>
-    <url>http://addy.com/</url>
-    <descr>Full-service web site hosting</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ADM Investor Services, Inc.</name>
-    <url>http://www.admis.com/</url>
-    <descr>Brokerage firm using FreeBSD for DNS servers and firewalls.</descr>
-    <email>chris.silva@admis.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Adonai Enterprises, Inc</name>
-    <url>http://www.adonai.net/</url>
-    <descr>Austin, Texas area computer and system consulting services</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Adult Hosting.com</name>
-    <url>http://www.AdultHosting.com/</url>
-    <descr>high performance adult website hosting.</descr>
-    <email>rick@adulthosting.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Advanced Digital Research</name>
-    <url>http://www.whoweb.com/adrl/</url>
-    <descr>Web Presence Provider and UNIX development</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Advanced Leased Lines</name>
-    <url>http://www.all.de/</url>
-    <descr>ISP in Berlin, Germany</descr>
-    <email>alf@all.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Advanced Web Creations</name>
-    <url>http://www.awc.net/</url>
-    <descr>Advanced Web Creations, Inc. - A leading Internet virtual domain, web hosting company</descr>
-    <email>sales@awc.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AegisNet IT-Dienstleistungen</name>
-    <url>http://www.aegisnet.de/</url>
-    <descr>german provider of IT solutions</descr>
-    <email>ab@aegisnet.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Aeon/Xe Technology Pte Ltd</name>
-    <url>http://www.aeonxe.com/</url>
-    <descr>A solution provider specializing in open source software, network design and implementation, system administration, commercial support, training etc.</descr>
-    <email>eddie@aeonxe.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AEPCO, Inc.</name>
-    <url>http://www.aepco.com/</url>
-    <descr>Engineering, Information Technology, and Multimedia products and services</descr>
-    <email>oconnell@aepco.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Aerotour</name>
-    <url>http://mail.aerotour.ru/</url>
-    <descr>Tourism, travel and worldwide ticketing company</descr>
-    <email>admin@aerotour.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AG Sistemas</name>
-    <url>http://www.ag.com.br/</url>
-    <descr>Software Development and Internet Information Provider. Rio de Janeiro, Brazil.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AG-TECH CORP.</name>
-    <url>http://www.agtech.co.jp/</url>
-    <descr>Software Development in Japan</descr>
-    <email>webmaster@agtech.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Agora/Raindrop Laboratories</name>
-    <url>http://www.rdrop.com/</url>
-    <descr>Internet Access Provider in Portland, Oregon</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Aiko Engineering. Inc.</name>
-    <url>http://www.hechima.co.jp/</url>
-    <descr>Internet Services Provider</descr>
-    <email>admin@hechima.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Airtime Sweden</name>
-    <url>http://www.airtime.se/</url>
-    <descr>AirTime is a full service television rep for satellite, syndication, cable and network properties</descr>
-    <email>webmaster@tech.airtime.se</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AIST</name>
-    <url>http://www.aist.net/</url>
-    <descr>Agency of Information Systems &amp; Telecommunications, Ukraine</descr>
-    <email>info@aist.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AKIRA Inc.</name>
-    <url>http://www.akira.ne.jp/</url>
-    <descr>ISP in Tokyo, Japan</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Alameda Networks, Inc.</name>
-    <url>http://www.Alameda.net/</url>
-    <descr>ISP for Alameda, CA and Reseller of PCs with FreeBSD</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Alanland Ltd</name>
-    <url>http://www.alanland.ru/</url>
-    <descr>Comp &amp; Comm company</descr>
-    <email>ts@alanland.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Aldridge Company, The</name>
-    <url>http://www.aldridge.com/</url>
-    <descr>A networking and software development firm</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ALG Network Systems</name>
-    <url>http://www.alg-int.com/</url>
-    <descr>A One Stop Shop for Creative IT Solutions</descr>
-    <email>enquiries@alg-int.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>alice.connect.pl</name>
-    <url>http://alice.connect.com.pl/</url>
-    <descr>ISP, Networks, Computers &amp; Software</descr>
-    <email>oiram@connect.com.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AlienZoo</name>
-    <url>http://www.alienzoo.com/</url>
-    <descr>Space, Science, Alien/UFO news/entertainment portal.</descr>
-    <email>adam@alienzoo.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ALife.com</name>
-    <url>http://www.alife.com/</url>
-    <descr>Artificial Life</descr>
-    <email>caretaker@alife.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Alldomains.com</name>
-    <url>http://www.alldomains.com/</url>
-    <descr>Complete source of International Domain Name Information</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Allegro</name>
-    <url>http://www.allegro.sk/</url>
-    <descr>Internet Coffe</descr>
-    <email>denis@allegro.sk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Allianz Bulgaria Holding</name>
-    <url>http://www.allianz.bg/</url>
-    <descr>Insurance company, many of our servers run FreeBSD</descr>
-    <email>root@allianz.bg</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Alma</name>
-    <url>http://www.alma.fr/</url>
-    <descr>French Computer Consultants / Software Developers</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ALPcom</name>
-    <url>http://www.alpcom.it/</url>
-    <descr>ISP in Turin, Italy.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AlphaZed Digital Documents</name>
-    <url>http://alphazed.com/</url>
-    <descr>Builders of Database Web Sites</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Alpine Networks. </name>
-    <url>http://www.alpinenetworks.com/</url>
-    <descr>A Premiere Internetworking Company now offering Web Hosting, Server Co-Location, Network Consulting in the areas of VPNs, Extranets, Intranets, Internet, ATM, Ethernet, CISCO, ASCEND, UNIX, NT and much more.  Web Hosting services are offered on our FreeBSD, Linux and Solaris based UltraFast and Rock Stable servers.</descr>
-    <email>info@alpinenetworks.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Altaire Enterprises, Inc.</name>
-    <url>http://www.mato.com/</url>
-    <descr>ISP in Deadwood, SD</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Altech Sp. z o.o.</name>
-    <url>http://www.altech.com.pl/</url>
-    <descr>Poland - IT solution provider/software developer/computer reseller</descr>
-    <email>royal@altech.com.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AM'SOFT</name>
-    <url>http://www.amsoft.ru/</url>
-    <descr>Software development</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Amber Company</name>
-    <url>http://www.Amber.infotecstt.ru/</url>
-    <descr>System Integrator in Taganrog, Russia</descr>
-    <email>admin@amber.org.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>American Business Web</name>
-    <url>http://abw1.com/</url>
-    <descr>Web Hosting Provider</descr>
-    <email>jim@usbusinessweb.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>American Information Network</name>
-    <url>http://www.ai.net/</url>
-    <descr>High Performance Web and Internet Connectivity.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Angel Services Provider</name>
-    <url>http://www.angelsp.org/</url>
-    <descr>Portuguese Shell Provider</descr>
-    <email>info@mail.angelsp.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Anglo Americano Escolas Integradas</name>
-    <url>http://www.anglonet.br/</url>
-    <descr>High School in Brazil, based on WAN network and UNIX Servers. FreeBSD serves as Proxy, Firewall, Router, File Server, Web Server, FTP Server and more.</descr>
-    <email>root@anglonet.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Animal Crackers Costume Hire</name>
-    <url>http://www.animalcrackers.com.au/</url>
-    <descr>mascot costumes Hire and sales</descr>
-    <email>irepin@animalcrackers.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Annamaria Island Florida</name>
-    <url>http://annamaria.net/</url>
-    <descr>Florida vacationing and easy living</descr>
-    <email>webmaster@annamaria.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Apex Consulting</name>
-    <url>http://www.apexusa.com/</url>
-    <descr>Web hosting provider for secure commerce web sites</descr>
-    <email>staff@apexusa.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ApeX Systems Integration Corp.</name>
-    <url>http://www.2boot.com/</url>
-    <descr>Custom Systems, Development and Production</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Appalachian Regional Development Institute</name>
-    <url>http://www.bibd.appstate.edu/aibc/</url>
-    <descr>Promotes Growth in the Mountains of North Carolina</descr>
-    <email>webmaster@porter.appstate.edu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ArabChat Network</name>
-    <url>http://www.ArabChat.Org/</url>
-    <descr>Free Webmail, Chat, Forums, and much more</descr>
-    <email>arabian@ArabChat.Org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ARAT Ltd.</name>
-    <url>http://www.arat.bashnet.ru/</url>
-    <descr>Telecommunication Service Provider</descr>
-    <email>tech@arat.bashnet.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Arcadia, Inc.</name>
-    <url>http://www.arcadia.spb.ru/</url>
-    <descr>Offshore software development company, St. Petersburg, Russia</descr>
-    <email>fetch@arcadia.spb.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Argay Electronics</name>
-    <url>http://www.argay.com.au/</url>
-    <descr>Complete Computer services (Small ISP)</descr>
-    <email>arthur@argay.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Arizona Design Inc.</name>
-    <url>http://www.arizona.ne.jp/</url>
-    <descr>Digital creation/consulting Services</descr>
-    <email>info@arizona.ne.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Arminco Ltd.</name>
-    <url>http://www.aic.net/</url>
-    <descr>ISP in Armenia</descr>
-    <email>ran@styx.aic.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Arminco NK</name>
-    <url>http://www.nk.am/</url>
-    <descr>Internet Service Provider in Nagorno-Karabakh</descr>
-    <email>dev@arminco.nk.am</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Arpnet Communications</name>
-    <url>http://www.arpnet.net/</url>
-    <descr>Web Hosting and E-Mail services</descr>
-    <email>hostmaster@arpnet.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ARTWERKS screenprinting</name>
-    <url>http://www.members.tripod.com/rays12/artwerks.html</url>
-    <descr>commercial screenprinting, and manufacture of cd-r vinyl labels.</descr>
-    <email>roadwolf@cyberhighway.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AS Tallinna Lennujaam</name>
-    <url>http://www.tallinn-airport.ee/</url>
-    <descr>Tallinn Airport</descr>
-    <email>raoul@tllapt.ee</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ascend Communications, Inc.</name>
-    <url>http://www.ascend.com/</url>
-    <descr>Leading WAN access solutions provider.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ascend Software, Inc.</name>
-    <url>http://www.ascendsoftware.com/</url>
-    <descr>IBM S/390 and PC Software Solutions</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Asel Net</name>
-    <url>http://www.asel.net.tr/</url>
-    <descr>Internet Service Provider, Turkey</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ASIS Telemedia</name>
-    <url>http://www.asis.com/</url>
-    <descr>Internet Service Provider, Website design and hosting</descr>
-    <email>nella@asis.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ASU OAO</name>
-    <url>http://www.elcom.ru/</url>
-    <descr>Primary ISP in Vladimir and Vladimir area (Russia)</descr>
-    <email>samond@elcom.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Atmel Norway</name>
-    <url>http://www.atmel.no/</url>
-    <descr>Research &amp; development of the AVR risc microcontroller</descr>
-    <email>rskjetlein@atmel.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Atomic Cow Web Hosting</name>
-    <url>http://www.atomiccow.com/</url>
-    <descr>Professional Web Hosting - 20 second account activation !</descr>
-    <email>bsd@atomiccow.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AtomNET</name>
-    <url>http://www.atom.ru/</url>
-    <descr>The largest home network in Moscow, based on 10BaseT and 10Base2 LANs</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AudetteMedia</name>
-    <url>http://www.audettemedia.com/</url>
-    <descr>Publishers of quality discussion lists. </descr>
-    <email>aa@audettemedia.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Auglink Communications</name>
-    <url>http://www.aug.com/</url>
-    <descr>ISP in St. Augustine, Florida, USA.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AUS - Web Bios Internet Services</name>
-    <url>http://www.webbios.com.au/</url>
-    <descr>Web-Hosting and Design</descr>
-    <email>sales@webbios.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Australian Regional Internet Services Pty Ltd</name>
-    <url>http://www.batemansbay.com/</url>
-    <descr>Australian based regional Internet Service Provider</descr>
-    <email>admin@batemansbay.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Australian WebSearch.COM.AU</name>
-    <url>http://www.websearch.com.au/</url>
-    <descr>Australian Internet Search Engine and Portal</descr>
-    <email>dez@websearch.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AutoNet International, Inc</name>
-    <url>http://www.auto-net.com/</url>
-    <descr>Nationwide Intranet Developer with a farm of FreeBSD Servers</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AVerMedia Technologies, Inc</name>
-    <url>http://www.aver.com/</url>
-    <descr>Bridging PC/MAC to Video</descr>
-    <email>webmaster@aver.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Axiom-IT, LLC</name>
-    <url>http://www.axiom-it.com/</url>
-    <descr>Indianapolis based firm providing - E-commerce, email, web-hosting, DNS, firewall, DHCP, &amp; more.</descr>
-    <email>ddangelo@axiom-it.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AXIS information systems GmbH, Germany</name>
-    <url>http://www.axis.de/</url>
-    <descr>Internet Service Provider, Security Consultants</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Axis Networks</name>
-    <url>http://www.axisnetworks.net/</url>
-    <descr>High Performance Firewall Products and Network security consulting.</descr>
-    <email>seventek@axisnetworks.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AXXIS Internet Services</name>
-    <url>http://www.axxis.com/</url>
-    <descr>Regional ISP based in  Salt Lake City, Utah  USA</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>B&amp;K Gruppe</name>
-    <url>http://www.bkcomputer.de/</url>
-    <descr>Apple/Sun/HP Reseller, WWW/Network/Internet Services</descr>
-    <email>aklemm@bkcomputer.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Backplane</name>
-    <url>http://www.backplane.com</url>
-    <descr>Hosted billing and customer care</descr>
-    <email>info@backplane.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Balboa Enterprises Inc</name>
-    <url>http://www.followme.com/balboa/</url>
-    <descr>Networking solutions, Toronto Canada</descr>
-    <email>jvalens@followme.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Baltic Transpot Systems</name>
-    <url>http://www.baltics.ru/</url>
-    <descr>Transportation from Russia</descr>
-    <email>webmaster@baltics.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Bancrecer</name>
-    <url>http://www.bancrecer.com.mx/</url>
-    <descr>Bancrecer S.A de C.V.</descr>
-    <email>aperez@bancrecer.com.mx</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Barber Colman</name>
-    <url>http://www.barber-colman.com/</url>
-    <descr>Barber Colman Company</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BayScene</name>
-    <url>http://www.bayscenes.com/</url>
-    <descr>web sites for individuals and small businesses in Northern California</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BBS Options</name>
-    <url>http://www.bbsoptions.com.br/</url>
-    <descr>ISP in Florianopolis city, Santa Catarina state, Brazil</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BChosting.com</name>
-    <url>http://bchosting.com/</url>
-    <descr>Co-location, Dedicated Server and Managed Server Specialists</descr>
-    <email>info@bchosting.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Be, Inc.</name>
-    <url>http://www.beincorporated.com/</url>
-    <descr>The makers of BeOS for PowerPC and Pentium</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Beach.Net</name>
-    <url>http://www.beach.net/</url>
-    <descr>ISP in south Orange County, California</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Bear Creek Technologies</name>
-    <url>http://www.bearcreektechnologies.com/</url>
-    <descr>Bear Creek Technologies is a Seattle Consulting firm specializing in Unix-based web technologies and Enterprise Project Management</descr>
-    <email>wardk@bearcreektechnologies.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Bear Paw Enterprises</name>
-    <url>http://bearpawenterprises.com/</url>
-    <descr>Online Retail Business</descr>
-    <email>webmaster@bearpawenterprises.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>bears and books</name>
-    <url>http://www.bearsnbooks.com/</url>
-    <descr>bearly used teddy bears and books</descr>
-    <email>bearsnbooks@aol.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BEIM INFOTECH Co.LTD</name>
-    <url>http://www.beim.net/</url>
-    <descr></descr>
-    <email>master@beim.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Beldar Internet Services</name>
-    <url>http://www.beldar.com/</url>
-    <descr>ISP and Consulting</descr>
-    <email>bod@beldar.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BemarNet's Management</name>
-    <url>http://www.bemarnet.es/</url>
-    <descr>Makes business easier...</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BENCHMARKQA</name>
-    <url>http://www.benchmarkqa.com/</url>
-    <descr>Software Quality Assurance Specialists</descr>
-    <email>mpatin@benchmarkqa.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>bend.com</name>
-    <url>http://bend.com/</url>
-    <descr>Central Oregon's First Online Community</descr>
-    <email>seho@bend.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Benjamin Information Systems</name>
-    <url>http://www.bisworld.com/</url>
-    <descr>FreeBSD Workstations and Servers</descr>
-    <email>dan@bisworld.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Berk Bilgisayar ve Internet Hizmetleri</name>
-    <url>http://www.berkbilgisayar.com/</url>
-    <descr>Web Design &amp; Hosting, lots of other Internet Solutions Provider. Located at Bilecik - TURKEY</descr>
-    <email>info@berkbilgisayar.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BEST Internet Services</name>
-    <url>http://www.best.ca/</url>
-    <descr>Specializing in web hosting, Unix security &amp; networking services</descr>
-    <email>webmaster@best.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BestServ Hosting Solutions</name>
-    <url>http://www.bestserv.com/</url>
-    <descr>BestServ is a Web, Shell, IRCd, and Dedicated Server Hosting Company.</descr>
-    <email>admin@bestserv.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BetaNews.Com</name>
-    <url>http://www.betanews.com/</url>
-    <descr>Daily news and inside information about cutting edge software</descr>
-    <email>nate.mook@betanews.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Beyond Interactive Inc.</name>
-    <url>http://www.beyondjapan.co.jp/</url>
-    <descr>Games and Entertainments developer in Japan</descr>
-    <email>michiya@beyondjapan.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BeyondHost.com</name>
-    <url>http://www.beyondhost.com/</url>
-    <descr>Web hosting on FreeBSD systems (Full shell/ssh/ftp/php/mod_perl/MySQL/more)</descr>
-    <email>ed@beyondhost.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Big Easy</name>
-    <url>http://www.bigeasy.com/</url>
-    <descr>The Big Easy - the ISP in New Orleans</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Bike World</name>
-    <url>http://www.bikeworld.com/</url>
-    <descr>Online mailorder catalog of cycling components.  All of our servers run FreeBSD!</descr>
-    <email>chris@bikeworld.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BITS</name>
-    <url>http://www.BITS.bris.ac.uk/</url>
-    <descr>Bristol Information Technology Society</descr>
-    <email>webmaster@BITS.bris.ac.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BitStorm, Inc.</name>
-    <url>http://www.bitstorm.net/</url>
-    <descr>Central Florida's ISP</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Black Hat Networks</name>
-    <url>http://blackhatnetworks.com/</url>
-    <descr>freebsd powered internet services</descr>
-    <email>info@blackhatnetworks.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Blue Mountain Arts</name>
-    <url>http://www.bluemountainarts.com/</url>
-    <descr>Electronic Greeting Cards</descr>
-    <email>mrinella@bluemountainarts.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Blue Neptune Network Services, Inc.</name>
-    <url>http://www.blueneptune.com/</url>
-    <descr>ISP in San Jose, CA</descr>
-    <email>michael@blueneptune.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Blue Planet NET</name>
-    <url>http://www.bluep.com/</url>
-    <descr>ISP In Melbourne, Australia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Blue Sun Networks</name>
-    <url>http://www.bluesun.net/</url>
-    <descr>Salt Lake City Internet Service Provider</descr>
-    <email>kgb@bluesun.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Blueberry New Media</name>
-    <url>http://www.blueberry.co.uk/</url>
-    <descr>Internet consultancy and web development company in London, UK.</descr>
-    <email>info@blueberry.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Boholnet.com</name>
-    <url>http://206.142.100.66/</url>
-    <descr>ISP</descr>
-    <email>patrick@boholnet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Br@zNet</name>
-    <url>http://braznet.com.br/</url>
-    <descr>ISP in Blumenau city, Santa Catarina state, Brazil</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Braenet Pty Ltd</name>
-    <url>http://www.braenet.com.au/</url>
-    <descr>Asia Pacific Internet Provider Specialising in Intra/Internet Solutions &amp; WAN Development</descr>
-    <email>admin@braenet.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BrainShare Ltd</name>
-    <url>http://www.homestead.com/brainshare/index</url>
-    <descr>Hungarian Company: Software development, Training, security software/hardware distributing</descr>
-    <email>gyurkovics@usa.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Brewers' Witch BBS</name>
-    <url>http://www.brewich.com/</url>
-    <descr>Largest Pagan-oriented BBS on the 'net</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Brighton, Inc.</name>
-    <url>http://www.e-dia.com/</url>
-    <descr>Jewelry Solutions</descr>
-    <email>kato@yin.or.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Brite Ad Network</name>
-    <url>http://www.britead.com/</url>
-    <descr>Internet Advertising firm providing self-managed B2B banner marketing.</descr>
-    <email>derekw@britead.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Bsdadmin</name>
-    <url>http://www.bsdadmin.com/</url>
-    <descr>Quality BSD Administration at fair rates</descr>
-    <email>admin@bsdadmin.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BSDi</name>
-    <url>http://www.bsdi.com/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BSE AD</name>
-    <url>http://www.bse.bg/</url>
-    <descr>BSE Internet Services, BULGARIA</descr>
-    <email>Hristo@BSE.BG</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BSI</name>
-    <url>http://www.bsi.com.br/</url>
-    <descr>Provedor de Acesso Internet (Brazil)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BTR MOLDOVA</name>
-    <url>http://www.btr.md/</url>
-    <descr>Commercial bank in Republic of Moldova</descr>
-    <email>root@btr.md</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BuffNET</name>
-    <url>http://www.buffnet.net/</url>
-    <descr>ISP of Western New York</descr>
-    <email>stevep@buffnet.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Bug Software</name>
-    <url>http://www.bug-software.com/</url>
-    <descr>Bug Software is a leading Application Service Provider the offers Web Based Applications</descr>
-    <email>bugsoft@bug-software.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Bulinfo Ltd.</name>
-    <url>http://www.bulinfo.net/</url>
-    <descr>Internet &amp; Information Provider</descr>
-    <email>tech@bulinfo.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Burlington Resources</name>
-    <url>http://www.br-inc.com/</url>
-    <descr>Exploration, development, production and marketing of oil and gas.</descr>
-    <email>webmaster@br-inc.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Business</name>
-    <url>http://www.geocities.com/eureka/office/5238/</url>
-    <descr>opportunity of Business or job</descr>
-    <email>thatq@hotmail.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BUSINESSNEPAL.com</name>
-    <url>http://www.businessnepal.com/</url>
-    <descr>Web Designing, Web Hosting and Web Publishing Services</descr>
-    <email>prakash@businessnepal.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Butya Co., LTD</name>
-    <url>http://www.butya.kz/</url>
-    <descr>Trade company</descr>
-    <email>bp@butya.kz</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>C and CNET S.A.</name>
-    <url>http://www.teletel.com.ar/</url>
-    <descr>ISP</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>C&amp;S Systems Solutions</name>
-    <url>http://www.vallin.com/</url>
-    <descr>E-Commerce Solution Provider</descr>
-    <email>alan@vallin.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CableData R&amp;D Center</name>
-    <url>http://www.cabledata.com/</url>
-    <descr>Software developer, El Dorado Hills, CA</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cablevision</name>
-    <url>http://www.cablevision.qc.ca/</url>
-    <descr>Cable Operator in Quebec, Abitibi-Temiscamingue</descr>
-    <email>steve@cablevision.qc.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cakrawala Internet Cafe</name>
-    <url>http://www.cakrawala.war.net.id</url>
-    <descr>Public Internet Service</descr>
-    <email>hostmaster@cakra.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Calcasieu Lumber Co.</name>
-    <url>http://www.calcasieu.com/</url>
-    <descr>Serving central Texas builders since 1883</descr>
-    <email>sysop@calcasieu.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CalorieKing.com</name>
-    <url>http://www.calorieking.com/</url>
-    <descr>Online Health &amp; Fitness Portal.</descr>
-    <email>manager@calorieking.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CalWEB Communications, Inc.</name>
-    <url>http://www.calweb.com/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Camping-USA!</name>
-    <url>http://www.camping-usa.com/</url>
-    <descr>Online Camping Info and Directory</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CanadaWired Internet Services</name>
-    <url>http://Www.CanadaWired.Com/</url>
-    <descr>Internet Service Provider in Vancouver, British Columbia</descr>
-    <email>paik@canadawired.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Canea s.c In&iquest;ynieria i Komputery</name>
-    <url>http://www.canea.com.pl/</url>
-    <descr>civil engineering office</descr>
-    <email>arni@canea.com.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Caprice Distributors Ltd.</name>
-    <url>http://www.caprice.mb.ca/</url>
-    <descr>Large Wholesale/Retailer</descr>
-    <email>gord@caprice.mb.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Careerbuilder, Inc.</name>
-    <url>http://www.careerbuilder.com/</url>
-    <descr>(private server)- Used to run DNS, named, httpd, syslogd, samba and a *LOT* more.</descr>
-    <email>alex@careerbuilder.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Carroll Net, Inc.</name>
-    <url>http://www.carroll.com/</url>
-    <descr>North Jersey's Premier Internet Service Provider</descr>
-    <email>jim@carroll.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cascade General, Inc.</name>
-    <url>http://www.casgen.com/</url>
-    <descr>Portland, Oregon's ship repair yard -- FreeBSD is our firewall and DNS server</descr>
-    <email>lhudson@casgen.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cavecreek Wholesale Internet Exchange</name>
-    <url>http://www.cavecreek.net/</url>
-    <descr>Web Hosting Services</descr>
-    <email>ian@cavecreek.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CCS MoR RF</name>
-    <url>http://www.css-mps.ru/</url>
-    <descr>Central Communication Station Ministry of Railways Russian Federation</descr>
-    <email>netadmin@css-mps.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CDNow, Inc. - The World's Largest Online Music Store</name>
-    <url>http://cdnow.com/from=freebsd/</url>
-    <descr>FreeBSD is used for DNS and an email gateway.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CEECOM INC (TXBASE)</name>
-    <url>http://www.ceecom.com/</url>
-    <descr>Collaborative Enterprise e-commerce e-business solution, Order fulfillment, Customer Relationship Management (CRM), ERP, Supply Chain, web-based client</descr>
-    <email>ameer_mazhar@onebox.com, farhad@ceecom.com, llazar@ceecom.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CEISIC Infoarte</name>
-    <url>http://www.cult.cu/</url>
-    <descr>Internet access provider in Havana</descr>
-    <email>carmas@mail.cult.cu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Celedata Technologies</name>
-    <url>http://www.celedata.com/</url>
-    <descr>Web Hosting/Design/Programming, Custom Software, Database, Integration, Contracting, Hardware Solutions, etc</descr>
-    <email>graeme@celedata.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CENIAInternet</name>
-    <url>http://www.ceniainternet.cu/</url>
-    <descr>The Best ISP in Cuba</descr>
-    <email>root@ceniai.inf.cu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Center Gitak</name>
-    <url>http://www.shirak.am/</url>
-    <descr>ISP in Shirak Region in Armenia</descr>
-    <email>serge@shirak.am</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Centerone Media Technologies</name>
-    <url>http://www.centerone.com/</url>
-    <descr>Commercial development/hosting company, plus network services and sales</descr>
-    <email>ralph@centerone.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Centro de Competitividad Internacional, ITESM Campus Toluca</name>
-    <url>http://cci.tol.itesm.mx/</url>
-    <descr>El CCI es el encargado de extensi&oacute;n, Tec.Com, postgrado y Universidad Virtual en el Campus Toluca.</descr>
-    <email>madd@cci.tol.itesm.mx</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Century Software, Inc.</name>
-    <url>http://www.censoft.com/</url>
-    <descr>Terminal emulation and TCP/IP networking software developer</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ceramica Carabobo</name>
-    <url>http://www.ceramica-carabobo.com/</url>
-    <descr>Venezuela's largest ceramic tiles manufacturer.</descr>
-    <email>mocando@hlboulton.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CETLink.Net</name>
-    <url>http://www.cetlink.net/</url>
-    <descr>Internet Service Provider / Network Service Provider</descr>
-    <email>jeff@cetlink.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Chance Publishing House, Ltd</name>
-    <url>http://www.chance.ru/</url>
-    <descr>The publisher of several Russian newspapers and magazines (St.Petersburg)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Chaos Unlimited</name>
-    <url>http://www.chaos.taylored.com/</url>
-    <descr>Mailing lists, web, and anonymous FTP services</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Charis Internet Services</name>
-    <url>http://charis.net/</url>
-    <descr>An Internet Services Provider</descr>
-    <email>duncan@charis.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Charter Communications Intl.</name>
-    <url>http://www.c-com.net/</url>
-    <descr>Internation Telecommunications Firm. We also provide ISP services. 15+ FreeBSD servers providing Web,Mail,DNS,ftp,mirroring, etc. We also do dedicated/leased lines and have teleports in Venezuela and Panama running FreeBSD</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Chaski Telecommunications</name>
-    <url>http://www.chaski.com/</url>
-    <descr>Web design and hosting services.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Chatalot Corporation</name>
-    <url>http://www.chatalot.com/</url>
-    <descr>Community site with live WbeChat, Discussion Boards and a Magazine. This site also offers Cyber Weddings.</descr>
-    <email>micky@chatalot.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Chesney Corporation</name>
-    <url>http://www.chesneycorp.com/</url>
-    <descr>Domain hosting, web design, web applications, and more!</descr>
-    <email>mark@chesneycorp.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Chicago InterFlash</name>
-    <url>http://www.cflash.com/</url>
-    <descr>ISP in Chicago, IL, USA</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CHIMICS @ CEBU UNDERGROUND</name>
-    <url>http://www.chirum.tsx.org/</url>
-    <descr>CHIRUM OR NOTHING AT ALL</descr>
-    <email>chirum@lyrics.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>China House</name>
-    <url>http://www.chalmers.com.au/</url>
-    <descr>Job Placement in Asia. CIBTC  Book Store. R.A.Chalmers Pty Ltd</descr>
-    <email>robert@chalmers.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Chips For Less</name>
-    <url>http://www.chips4less.com/</url>
-    <descr>Memory and Peripherals</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Chubu Video Products Inc.</name>
-    <url>http://www.cvp.co.jp/</url>
-    <descr>Platform for CG making.</descr>
-    <email>info@cvp.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cidera</name>
-    <url>http://www.cidera.com/</url>
-    <descr>Satellite delivered Global Broadcast Services</descr>
-    <email>rao@cidera.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CIGET</name>
-    <url>http://www.atenas.inf.cu/</url>
-    <descr>Centro de Informaci&oacute;n y Gesti&oacute;n Tecnol&oacute;gica</descr>
-    <email>webmaster@atenas.inf.cu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cinema Sights and Sound Technologies</name>
-    <url>http://www.csst.net/</url>
-    <descr>Cinema equipment and ISP services</descr>
-    <email>webmaster@csst.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CISA+ Ltd</name>
-    <url>http://www.tomsk.su/</url>
-    <descr>Official web-site of Tomskaya oblast, Russia</descr>
-    <email>wwwadm@www.tomsk.su</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CISMARKET</name>
-    <url>http://cismarket.com/</url>
-    <descr>CIS Market</descr>
-    <email>admin@cismarket.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CIT-Leasing GmbH</name>
-    <url>http://hamburg.citde.net/</url>
-    <descr>Internet Service Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>citecs GmbH Unternehmensberatung fuer EDV und Telekommunikation</name>
-    <url>http://www.citecs.de/</url>
-    <descr>consultant for security, network, UNIX and much more...</descr>
-    <email>info@citecs.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CityScope Net</name>
-    <url>http://www.cityscope.net/</url>
-    <descr>Internet provider and commercial web hosting site.</descr>
-    <email>info@cityscope.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ClaraNET Ltd</name>
-    <url>http://www.clara.net/</url>
-    <descr>Internet Service Provider</descr>
-    <email>steve@clara.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Clarins</name>
-    <url>http://www.parfums-azzaro.com/</url>
-    <descr>Web Server</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Clarke Advertising &amp; Public Relations</name>
-    <url>http://www.clarkeadvertising.com/</url>
-    <descr>Sarasota-based advertising agency</descr>
-    <email>jclarke@clarkeadvertising.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ClassMAX</name>
-    <url>http://www.classmax.com/</url>
-    <descr>The search engine for classes and seminars</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CleanCo</name>
-    <url>http://www.CleanCoInc.com/</url>
-    <descr>Demolition and cleaning company</descr>
-    <email>admin@cleancoinc.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ClickOregon.com</name>
-    <url>http://www.clickoregon.com/</url>
-    <descr>The gateway to information about Lane County Oregon and beyond.</descr>
-    <email>webmaster@clickoregon.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Closer Communications, Inc</name>
-    <url>http://www.closer.com/</url>
-    <descr>Web Usage Analysis and Tracking</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cloud 9 Consulting, Inc.</name>
-    <url>http://www.cloud9.net/</url>
-    <descr>ISP based in White Plains, NY</descr>
-    <email>staff@cloud9.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ClubNET Inc.</name>
-    <url>http://www.clubnet.net/</url>
-    <descr>ISP in Diamond Bar, California</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CM Informatics Partnership</name>
-    <url>http://www.cmiweb.co.uk/</url>
-    <descr>Internet, Web Design and Software Consultants</descr>
-    <email>sales@cmiweb.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CM Systemhaus GmbH</name>
-    <url>http://www.cmsnet.de/</url>
-    <descr>Software developer in Hannover, Germany (the expo2000 city)</descr>
-    <email>horzela@cmsnet.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CNINEWS</name>
-    <url>http://www.cninews.com/</url>
-    <descr>CNI News for UFO's H.Q.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Coastline Internet Services</name>
-    <url>http://www.coastline.net/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Coffs Harbour City Internet Services</name>
-    <url>http://www.chc.net.au/</url>
-    <descr>ISP WEB Hosting Virtual Domains &amp; Ip's Every Server is BSD Powered and Proud Of it</descr>
-    <email>webmaster@chc.net.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Coherent Technologies, Inc.</name>
-    <url>http://www.coherent.net/</url>
-    <descr>Internet Services Provider for Small Businesses</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Colnet International LTDA.</name>
-    <url>http://chiguiro.colombianet.net/</url>
-    <descr>Internet Prvider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Color Pro</name>
-    <url>http://www.color-pro.com/</url>
-    <descr>prepress studio</descr>
-    <email>info@color-pro.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>COMEX - Comercializadora Mexicana de Pinturas S.A. de C.V.</name>
-    <url>http://www.comex.com.mx/</url>
-    <descr>Mexican private industrial group that manufactures and commercializes a broad variety of paint and coating products. The company was founded in 1952 and is now the national sales leader in architectural paints and wood finishes. The group has a national market share of above 40%.</descr>
-    <email>jester@comex.com.mx</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CommPro International</name>
-    <url>http://www.commpro.com/</url>
-    <descr>ISP in Tustin CA, USA.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Communigate Internet Solutions</name>
-    <url>http://www.communigate.net/</url>
-    <descr>ISP</descr>
-    <email>jdm@communigate.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CommuniTech.Net, Inc.</name>
-    <url>http://www.communitech.net/</url>
-    <descr>Webhosting Provider</descr>
-    <email>bryanh@communitech.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Community ConneXion</name>
-    <url>http://www.c2.net/</url>
-    <descr>Internet Privacy Provider.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Complete Computer Consulting</name>
-    <url>http://www.ccctulsa.com/</url>
-    <descr>Web Hosting, Web Site Design</descr>
-    <email>paul@ccctulsa.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Complex Compuring Systems LTD (COCOS)</name>
-    <url>http://www.cocos.ru/</url>
-    <descr>Internet Service Provider</descr>
-    <email>sau@cocos.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CompuPlus.Net</name>
-    <url>http://www.compuplus.net/</url>
-    <descr>Internet Service Provider, Computer Sales &amp; Service, Networking, Web Services</descr>
-    <email>internetsales@compuplus.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>COMPUTACION UNIXSUPPORT, C.A.</name>
-    <url>http://www.unixsup.com/</url>
-    <descr>System Integrator 10 year old Company of Venezuela with experience supporting Unix, Linux, Solaris, TCP/IP an LAN-WAN Telecomunications.</descr>
-    <email>unixsup@unixsup.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Computer Alternatives, Inc.</name>
-    <url>http://www.computeralt.com/</url>
-    <descr>Computer systems (Apple, Compaq, IBM, Acer, PowerComputing, Motorola), service, software, training, and networks.  Located in Middlebury, VT.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Computer Clothing Research</name>
-    <url>http://www.ccr.ntu.ac.uk/</url>
-    <descr>Being at the forefront of research, CCR capitalises on developments made with new technologies designed to service the needs of the apparel industry.</descr>
-    <email>tim.parkinson@ccr.ntu.ac.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Computer Design Lab</name>
-    <url>http://www.bmtmicro.com/catalog/omnibasic.html</url>
-    <descr>OmniBasic Portable Basic Compiler</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>COMPUTER HOUSE</name>
-    <url>http://www.ch-tunisia.com/</url>
-    <descr>IMAGESETTING, HARDWARE SELLING, SOFTWARE DEVELOPPING and ADVERTISING COMPANY</descr>
-    <email>computer.house@gnet.tn</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Computer Innovations</name>
-    <url>http://www.cibutler.com/</url>
-    <descr>Enterprise Class Internet Solution Provider in Butler PA.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Computer Parts Etc.</name>
-    <url>http://www.cpetc.com/</url>
-    <descr>New Computer sales, web hosting, computer repair, custom computers, e-mail, network solutions</descr>
-    <email>buck@cpetc.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Computer Science Corporation,  VTC Tech Services</name>
-    <url>http://www.csc.com/</url>
-    <descr>CSC solves client problems in information technology</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Computer Zone Internet</name>
-    <url>http://www.c-zone.net/</url>
-    <descr>Nationwide Internet Service Provider</descr>
-    <email>info@c-zone.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Computers-canada</name>
-    <url>http://www.computers-canada.com/</url>
-    <descr>Canadian price comparison engine</descr>
-    <email>vic@findcomp.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ComputerTime, Inc. Kailua-Kona Hawaii</name>
-    <url>http://www.comptime.com/</url>
-    <descr>Service Provider - High Speed Wireless Access</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Computron Systems</name>
-    <url>http://www.computron.se/</url>
-    <descr>Software development / ISP</descr>
-    <email>bg@computron.se</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ComTech Digital Solutions</name>
-    <url>http://www.comtech-admin.co.uk</url>
-    <descr>Computing, Internet and Telecom Solutions Provider</descr>
-    <email>tomn@btinternet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Conceptual Systems &amp; Software</name>
-    <url>http://consys.com/</url>
-    <descr>Distributed Computing Specialists</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ConNet 80</name>
-    <url>http://www.ConNet80.com/</url>
-    <descr>PDX's Internet Fast Lane for High Performance Computing</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Consultation Henoc Inc.</name>
-    <url>http://www.henoc.qc.ca/</url>
-    <descr>Web Hosting and Unix Consulting Services</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Contact Paging</name>
-    <url>http://www.contact-paging.com/</url>
-    <descr>A regional paging carrier with net services in CO</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CopaseticNet</name>
-    <url>http://www.copaseticnet.com/</url>
-    <descr>Hosting Services</descr>
-    <email>sales@copaseticnet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CORBETT FOR COLLECTIONS</name>
-    <url>http://WWW.COLLECTIONS-NEWYORK.COM/</url>
-    <descr>Collection Attorney-New York State</descr>
-    <email>Ryefour@aol.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CoreTrek AS</name>
-    <url>http://www.coretrek.no/</url>
-    <descr>Norwegian company developing and hosting internet-related services</descr>
-    <email>morten@coretrek.no</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CORSICA System Corp.</name>
-    <url>http://www.corsica.com.tw/</url>
-    <descr>a full service computer and network technology, Taiwan.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cosmos CO,LTD</name>
-    <url>http://www.chinaage.com/</url>
-    <descr>ICP at GuangZhou China</descr>
-    <email>dazi@chinaage.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>COSMOTEC CO., LTD</name>
-    <url>http://www.cosmotec.ne.jp/</url>
-    <descr>Network and Security Consulting</descr>
-    <email>takami@cosmotec.ne.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cottontail Originals, Inc.</name>
-    <url>http://www.cottontail.com/</url>
-    <descr>Apparel manufacturer</descr>
-    <email>mark@cottontail.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>craxx</name>
-    <url>http://craxx.com/</url>
-    <descr>craxx is a professional internetworking agency offering designing, implementing, hosting and maintaining websites.</descr>
-    <email>info@craxx.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Creapress</name>
-    <url>http://www.creapress.fr/</url>
-    <descr>Corporate newspapers production</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Creative Software Technologies</name>
-    <url>http://www.cst.com.au/</url>
-    <descr>Multimedia conferencing and Internet services.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cronyx Plus Ltd.</name>
-    <url>http://www.rinet.ru/</url>
-    <descr>RiNet ISP, Moscow, Russia</descr>
-    <email>noc@rinet.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Crown Associates</name>
-    <url>http://www.crownsolutions.net/</url>
-    <descr>Cyber Cafe, Email, Web Domain Hosting</descr>
-    <email>crusader@crownsolutions.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Crown Development Co., Ltd.</name>
-    <url>http://www.crown.co.jp/</url>
-    <descr>UNIX and Windows Software Development Company in Nagoya, Japan</descr>
-    <email>webmaster@crown.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Crystal Wind Communications, Inc.</name>
-    <url>http://www.xtalwind.net/</url>
-    <descr>ISP in Crystal River, Florida</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CS-Services</name>
-    <url>http://www.cs-service.co.jp/</url>
-    <descr>We are software engineers in Kobe, Japan.</descr>
-    <email>root@mail.cs-service.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CSCCS Internet</name>
-    <url>http://www.cs.net.au/</url>
-    <descr>Internet Service Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CTS Multimedia Distribution Europe</name>
-    <url>http://www.ctseuro.com/</url>
-    <descr>THE main distributor for CD-ROM, VIDEO CD, DVD</descr>
-    <email>webadmin@ctseuro.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CuckooNet</name>
-    <url>http://www.cuckoo.com/</url>
-    <descr>Consulting Firm</descr>
-    <email>dbaker@cuckoo.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CultNet Finland</name>
-    <url>http://www.cultnet.fi/</url>
-    <descr>ISP in Helsinki, Finland.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Culver Communications</name>
-    <url>http://www.culcom.net/</url>
-    <descr>Internet Services Culver In</descr>
-    <email>rich@culcom.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Custom Systems</name>
-    <url>http://www.customsystemsonline.com/</url>
-    <descr>Web Hosting, Enterprise Servers, Online Database Applications</descr>
-    <email>sam@customsystemsonline.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CWIE LLC</name>
-    <url>http://www.cavecreek.com/</url>
-    <descr>An Internet Hosting company in Phoenix, AZ</descr>
-    <email>paul@cavecreek.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CXHOST</name>
-    <url>http://www.cxhost.com/</url>
-    <descr>Webhosting on FreeBSD Servers - Cisco Powered Network</descr>
-    <email>doug@cxhost.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CyAlchemy Gaming Haven</name>
-    <url>http://www.cyalchemy.com/ghaven/</url>
-    <descr>Computer Gaming Online Magazine</descr>
-    <email>ghaven@cyalchemy.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cybec Pty Ltd</name>
-    <url>http://www.vet.com.au/</url>
-    <descr>Complete antivirus solutions (desktop, server and the Internet)</descr>
-    <email>LODea@vet.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cyber Services, Inc.</name>
-    <url>http://www.cs.net/</url>
-    <descr>web hosting and web development</descr>
-    <email>lorraine@cs.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cyberchute Publishing &amp; Hosting Services</name>
-    <url>http://www.CyberChute.Com/</url>
-    <descr>Web Virtual Host Services</descr>
-    <email>hartley@cyberchute.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CyberCity Internet</name>
-    <url>http://www.cybercity.dk/</url>
-    <descr>Major Danish ISP. Running all services on FreeBSD</descr>
-    <email>sch@cybercity.dk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CyberLife Labs</name>
-    <url>http://www.cyberlifelabs.com/</url>
-    <descr>Research and Development</descr>
-    <email>milo@cyberlifelabs.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cybermanie</name>
-    <url>http://www.cybermanie.com/</url>
-    <descr>The best place for your computer in Montreal, Quebec, Canada</descr>
-    <email>Roger.Savard@henoc.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cybernet Systems Corporation</name>
-    <url>http://www.netmax.com/</url>
-    <descr>Developer of FreeBSD-powered NetMAX server software.</descr>
-    <email>info@netmax.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CyberStation Inc.</name>
-    <url>http://www.cst.net/</url>
-    <descr>ISP Serving North Central Texas</descr>
-    <email>help@cst.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cybertime Informatik GmbH</name>
-    <url>http://www.cybertime.ch/</url>
-    <descr>ISP in Switzerland</descr>
-    <email>info@cybertime.ch</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cylink Information Services</name>
-    <url>http://www.cylink.com.cy/</url>
-    <descr>Internet Service Provider, Cyprus</descr>
-    <email>tech@cylink.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Czars Internet Service Provider Pvt. Ltd</name>
-    <url>http://www.czarsonline.net.in</url>
-    <descr>ISP/Software and Networking consultants</descr>
-    <email>vvinayak@india.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>D.S.U.</name>
-    <url>http://dsuweb.com/</url>
-    <descr>ISP, Dedicated to Providing web presence and web development Services as well as supporting web developer with unique and special requirements. </descr>
-    <email>val@dsuweb.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>D2k Solutions</name>
-    <url>http://www.d2k.com.au/</url>
-    <descr>One of Queensland's leading IT solution providers</descr>
-    <email>john@d2k.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Daiichi OutSourcing Corporation</name>
-    <url>http://www.docnet.co.jp/</url>
-    <descr></descr>
-    <email>ichishi@docnet.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Danske World Wide Web</name>
-    <url>http://www.danskewww.dk/</url>
-    <descr>Webhotels, webdesign and webhosting</descr>
-    <email>post@danskewww.dk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DATA COMPUTER S.A.</name>
-    <url>http://www.datcom.Tarnobrzeg.TPNET.pl/</url>
-    <descr>Interner Service Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Data Office AB</name>
-    <url>http://www.dataoffice.se/</url>
-    <descr>Computer reseller and Network consulting</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Data-portal.com</name>
-    <url>http://www.data-portal.com/</url>
-    <descr>Linux and FreeBSD online products reseller in Singapore</descr>
-    <email>sam@data-portal.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Datacruz, Inc.</name>
-    <url>http://www.datacruz.com/</url>
-    <descr>Internet Service Provider</descr>
-    <email>info@datacruz.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DataGuard</name>
-    <url>http://www.dataguard.no/</url>
-    <descr>Internet Service Provider in Norway</descr>
-    <email>contact@dataguard.no</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Dataphone Communication Networks</name>
-    <url>http://www.dataphone.net/</url>
-    <descr>Large ISP serving Sweden with over 500 POPs</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>David E. Swain, Attorney at Law</name>
-    <url>http://www.goodnet.com/~azlawyr/</url>
-    <descr>Arizona lawyer (general practice with business and real estate emphasis.)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DBICS International Consulting Services</name>
-    <url>http://www.dbicsinternational.com/</url>
-    <descr>Computer/Hardware/Software consulting firm</descr>
-    <email>daveb@dbicsinternational.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DCWI: Distributed Communication &amp; Worldwide Information</name>
-    <url>http://dcwi.com/</url>
-    <descr>ISP</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>De Reserveerlijn</name>
-    <url>http://www.reserveerlijn.nl</url>
-    <descr>We sell tickets for all the BIG Musicals in Holland. Next to that we were the first to sell tickets on the WWW in the Netherlands.</descr>
-    <email>tjalling.kikkert@stageholding.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Dead BBS</name>
-    <url>http://www.deadbbs.com/</url>
-    <descr>A small web and email hosting provider</descr>
-    <email>kahn@deadbbs.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Deepwell Internet</name>
-    <url>http://www.deepwell.com/</url>
-    <descr>High Availability ISP in Sacramento, California</descr>
-    <email>admin@deepwell.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Denver Online Development</name>
-    <url>http://www.denveronline.net/</url>
-    <descr><b>Internet Solutions Provider, based in Denver.</b>  Uses BSD for customer colocations.</descr>
-    <email>contactus@denveronline.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DEVITNOW.COM</name>
-    <url>http://devitnow.com/</url>
-    <descr>Professional developers resources.</descr>
-    <email>pokojowczyk@devitnow.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DIALix Internet Services</name>
-    <url>http://www.dialix.com.au/</url>
-    <descr>one of Australia's largest Internet access providers</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Dialla Communications, Inc.</name>
-    <url>http://www.dialla.com/</url>
-    <descr>Advertizing agency</descr>
-    <email>hostmaster@dialla.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Dialogue-Science</name>
-    <url>http://www.dials.ru/</url>
-    <descr>Antiviruses development company</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Diegonet</name>
-    <url>http://www.Diegonet.com/</url>
-    <descr>High Speed Secure Web Hosting - Web Programming - Miva Merchant
-      Diegonet Runs Rock Solid FreeBSD Servers with Miva, MySQL, PHP, Control
-      Panel, PhpMyAdmin to Run MySQL Database and More!</descr>
-    <email>FreeBSD@Diegonet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>digit-pub Inc.</name>
-    <url>http://www.digit-pub.com.tw/</url>
-    <descr>digit publish</descr>
-    <email>joson@digit-pub.com.tw</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Digital Animations Group plc</name>
-    <url>http://www.digital-animations.com/</url>
-    <descr>Interactive Entertainment / Game Developer / CGI for games, television and film</descr>
-    <email>web@digital-animations.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Digital Broadcast Systems</name>
-    <url>http://www.livecam.com/</url>
-    <descr>Internet Video</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Digital Masters</name>
-    <url>http://www.digimasters.com/</url>
-    <descr>Home of DigiNews. Internet Entertainment</descr>
-    <email>webmaster@digimasters.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Digital Mechanix</name>
-    <url>http://www.digitalmechanix.com/</url>
-    <descr>Cad Cam, Sofware Design, System Intergration, Networking</descr>
-    <email>info@digitalmechanix.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Digital Media Corporation</name>
-    <url>http://www.digitalmedia-corp.com/</url>
-    <descr>ISP</descr>
-    <email>web@ussr.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Digital Monolith INC.</name>
-    <url>http://www.digitalmonolith.com</url>
-    <descr>IT Consulting</descr>
-    <email>jhayes@digitalmonolith.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Digital Nebula</name>
-    <url>http://www.digitalnebula.com/</url>
-    <descr>Digital Nebula Home Page</descr>
-    <email>pm@digitalnebula.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Digital Web Communications</name>
-    <url>http://www.digital-web.net/</url>
-    <descr>High speed web hosting company, using FreeBSD for LAN/WAN routing, firewalling and web serving on high end servers handling millions of hits/day.</descr>
-    <email>kevin@digital-web.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DigiWorks</name>
-    <url>http://www.digiworks.com/</url>
-    <descr>Full range of Web services and consulting for Mac, PC, and Unix</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Dimension Data Germany</name>
-    <url>http://www.eu.didata.com/</url>
-    <descr>leading global network services and i-Commerce solutions provider</descr>
-    <email>andreas.klemm@eu.didata.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Direct Internet Access</name>
-    <url>http://earth.combase.com/</url>
-    <descr>Internet Service Provider - St. Petersburg, FL</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Direct Source Internet</name>
-    <url>http://www.direct-source.com/</url>
-    <descr>Internet Service Provider of Oregon, USA</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DirectNet Telecommunications</name>
-    <url>http://www.dn.ru/</url>
-    <descr>Internet Service Provider in Moscow, Russia</descr>
-    <email>kuzmin@dn.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>directOne Internet Services</name>
-    <url>http://www.directone.com.au/</url>
-    <descr>ISP</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Distance Communications</name>
-    <url>http://www.distance.net/</url>
-    <descr>Internet Service Provider.</descr>
-    <email>zula@distance.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Diversified Development, Inc</name>
-    <url>http://www.divdev.com/</url>
-    <descr>Internet / Systems Development Consulting Services.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Domeinbroker Internet bv.</name>
-    <url>http://www.domeinbroker.com/</url>
-    <descr>Domeinbroker Internet Services</descr>
-    <email>roger@domeinbroker.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Download Technologies, Inc.</name>
-    <url>http://www.downloadtech.com/</url>
-    <descr>Ultra-high volume file hosting services.</descr>
-    <email>info@downloadtech.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Double Barrel Consultancy &amp; Productions</name>
-    <url>http://www.double-barrel.be/</url>
-    <descr>Unix Consulting &amp; GNU Distributor for Europe &amp; Custom CD-ROM Productions</descr>
-    <email>htdocs@double-barrel.be</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DPC Systems</name>
-    <url>http://www.dpcsys.com/</url>
-    <descr>Business software developer</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DPL Corporation</name>
-    <url>http://www.dpl.co.jp/</url>
-    <descr>Computer School and Internet Cafe</descr>
-    <email>hayashi@dpl.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Draco Networks</name>
-    <url>http://www.draco.net/</url>
-    <descr>web hosting, LAN and WAN deployment</descr>
-    <email>gainho@draco.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DragonData Internet Services</name>
-    <url>http://www.dragondata.com/</url>
-    <descr>Telnet Shell and Web accounts</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Dream Fire Networks</name>
-    <url>http://www.dreamfire.net/</url>
-    <descr>A Sacramento based Computer Consulting Business, specializing with troubleshooting of Windows and MacOS,  UNIX Setup and configuration,  and hardware upgrades.</descr>
-    <email>support@dreamfire.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DreamHaven Internet Services</name>
-    <url>http://www.dreamhaven.org/</url>
-    <descr>Virtual hosting, domain, email, shell, and web services.</descr>
-    <email>staff@dreamhaven.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DruidService</name>
-    <url>http://www.druidservice.net</url>
-    <descr>Web Hoster &amp; Shell Account</descr>
-    <email>staff@druidservice.it</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DTCOMSA</name>
-    <url>http://www.dtcomsa.com/</url>
-    <descr>Internet Service Provider in Poland and WAN Consultants</descr>
-    <email>lemurek@dtcomsa.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DTSA Security Advisors</name>
-    <url>http://www.dtsa.nl/</url>
-    <descr>Practicle security: penetration tests, bulletins, product monitoring.</descr>
-    <email>chris@freebsd.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Duff-Beer</name>
-    <url>http://www.duff-beer.com/</url>
-    <descr>Web Service provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Dundas Loom Company</name>
-    <url>http://www.dundasloom.com/</url>
-    <descr>Handweaving loom and Spinning wheel Manu.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>E-Gate Communications Inc.</name>
-    <url>http://www.egate.net/</url>
-    <descr>Internet Service Provider in Toronto, Ontario, Canada</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>E-Possibility.com, Inc.</name>
-    <url>http://www.e-possibility.com/</url>
-    <descr>Web application development and service provider</descr>
-    <email>rick@e-possibility.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>E.Davis and Associates</name>
-    <url>http://www.beevy.com/card_search/usa?56-7567</url>
-    <descr>Resource Center</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EarthCafe, Inc.</name>
-    <url>http://www.earthcafe.com</url>
-    <descr>ISP/Web Design/Hosting Service in Chicago Illinois USA</descr>
-    <email>freebsd@earthcafe.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Earthoid</name>
-    <url>http://www.earthoid.com/</url>
-    <descr>Earthoid WAPSearch:  Search Engine for wireless devices.</descr>
-    <email>diego@earthoid.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Easeway Internet Consulting</name>
-    <url>http://www.easeway.net/</url>
-    <descr>Complete one stop solutions for doing business on the Internet.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>East Data Hong Kong</name>
-    <url>http://www.easthk.com/</url>
-    <descr>providing FreeBSD on CD set, pre-install and pre-config FreeBSD servers</descr>
-    <email>info@easthk.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EASY Research Institute</name>
-    <url>http://www.easy.re.kr/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EAZNet</name>
-    <url>http://www.eaznet.com/</url>
-    <descr>Internet Service Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EBO, Inc.</name>
-    <url>http://www.ebo.net/</url>
-    <descr>Internet Marketing Consultants and World Wide Web Developers</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Echelon bv</name>
-    <url>http://www.echelon.nl/</url>
-    <descr>Consultancy, software development and network services</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ECHOLIMA WEB SERVICES</name>
-    <url>http://www.echolima.com/</url>
-    <descr>Echolima Web Services offers complete web solutions with steady FreeBSD systems.</descr>
-    <email>echolima@echolima.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Eden Developments</name>
-    <url>http://www.edendev.co.uk/</url>
-    <descr>Affordable Web Hosting and FreeBSD Shell accounts</descr>
-    <email>tom@edendev.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Edward Waters College</name>
-    <url>http://www.ewc.edu/</url>
-    <descr>Private College - </descr>
-    <email>postmaster@ewc.edu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EF3.com</name>
-    <url>http://www.ef3.com/</url>
-    <descr>Entertainment's home on the web!</descr>
-    <email>ajensen@ef3.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>eGenius @ NYC</name>
-    <url>http://www.egenius.com/</url>
-    <descr>Open-Source support, security and integration</descr>
-    <email>contact@egenius.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EH-Datentechnik GbR</name>
-    <url>http://www.eh-data.com/</url>
-    <descr>Hard- und Softwaredevelopment</descr>
-    <email>contact@eh-data.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EJKA IT System AB</name>
-    <url>http://www.ejka.se/</url>
-    <descr>ISP in Wermland, Sweden.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Elan Ltd.</name>
-    <url>http://www.elan-ua.net/</url>
-    <descr>Internet Service Provider, Kiev, Ukraine</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ELB</name>
-    <url>http://www.elb.net/</url>
-    <descr>The electric leather buddha network.</descr>
-    <email>elb@elb.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ELCB Information Services</name>
-    <url>http://elcb.co.za/</url>
-    <descr>ASP for Motor Part Industry</descr>
-    <email>root@elcb.co.za</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ElectroCommunication Inc.</name>
-    <url>http://www.ec.mv.ru/</url>
-    <descr>WEB Server of ElectroCommunication Inc.</descr>
-    <email>webmaster@ec.mv.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Elego GmbH</name>
-    <url>http://www.elego.de/</url>
-    <descr>Configuration Management, Programming and Consulting Services</descr>
-    <email>info@elego.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Elite.Net - ISP</name>
-    <url>http://www.elite.net/</url>
-    <descr>Business domain hosting for the world</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EliteNet</name>
-    <url>http://www.elitenet.com.br/</url>
-    <descr>Internet Service Provider in Brazil</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Elkom Joint-Stock Company</name>
-    <url>http://www.elkom.ru/</url>
-    <descr>is a trade company &amp; internet service provider in Ulyanovsk, Russia</descr>
-    <email>info@elkom.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ellerdcomputers</name>
-    <url>http://www.ellerdcomputers.com/</url>
-    <descr>Quality Web Hosting &amp; Design</descr>
-    <email>sales@ellerdcomputers.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EllisCom</name>
-    <url>http://www.elliscom.com/</url>
-    <descr>Website Hosting Service in Wisconsin</descr>
-    <email>joshe@elliscom.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ElVisti Information Center</name>
-    <url>http://www.elvisti.kiev.ua/</url>
-    <descr>ISP in Kyiv, Ukraine (UA)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>emergent corporation</name>
-    <url>http://www.emergent.com/</url>
-    <descr>the leading scalable systems service provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Emig Software &amp; Heisch AT</name>
-    <url>http://sites.inka.de/heisch/index.html</url>
-    <descr>Rechnerkopplung FreeBSD 4.0 zu SIMATIC S7/S5 (RK512)</descr>
-    <email>gme@heisch.inka.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Empath Media Inc</name>
-    <url>http://www.empathmedia.com/</url>
-    <descr>Web Hosting</descr>
-    <email>hatim@home.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Encoding.com</name>
-    <url>http://www.encoding.com/</url>
-    <descr>The Leading Provider of Audio And Video Encoding for the Net</descr>
-    <email>aron@encoding.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Endero Deutschland GmbH</name>
-    <url>http://www.endero.de/</url>
-    <descr>Internet Solutions Provider</descr>
-    <email>ian.hewlett@endero.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Engulf.com (Quality Shells/Webhosting)</name>
-    <url>http://www.engulf.com/</url>
-    <descr>Quality Shells and Webhosting running FreeBSD!</descr>
-    <email>sales@engulf.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>enphourell.com</name>
-    <url>http://www.enphourell.com</url>
-    <descr>Internet Solutions Provider</descr>
-    <email>info@enphourell.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ENTANET International Ltd</name>
-    <url>http://www.enta.net/</url>
-    <descr>Internet Service Provider in UK</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EnterAct, L.L.C.</name>
-    <url>http://www.enteract.com/</url>
-    <descr>ISP in Chicago, IL USA</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ENTERNET Communications Inc.</name>
-    <url>http://www.ecom.net/</url>
-    <descr>Internet Service Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Enterprise Systems and Solutions</name>
-    <url>http://www.enterprisess.com/</url>
-    <descr>We sell Computers, LAN/WAN products, Computer components and peripherals. We also do installation, design and troubleshooting of networks. </descr>
-    <email>nasir@enterprisess.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Entertainment Unwired</name>
-    <url>http://www.entertainment-unwired.com/</url>
-    <descr>Mobile entertainment for masses (starting from 2002 ->)</descr>
-    <email>pasi.kytola@entertainment-unwired.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Entorno Virtual</name>
-    <url>http://www.worldsfactory.com/</url>
-    <descr>Web design &amp; development - Tenerife- Canary Island-Spain</descr>
-    <email>jesus@worldsfactory.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>entrance group</name>
-    <url>http://www.entrance.com.ar/</url>
-    <descr>web design - hosting</descr>
-    <email>conta@entrance.com.ar</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Envision Tech Inc.</name>
-    <url>http://www.2eti.com/</url>
-    <descr>High-end residential solutions provider - utilizing FreeBSD for intranet/internet services</descr>
-    <email>nathan@vidican.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EPA SYSTEM Inc.</name>
-    <url>http://www.epa.co.jp/</url>
-    <descr>Japanese estimation CAD developer</descr>
-    <email>hara@epa.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EQ Equipment</name>
-    <url>http://maxpages.com/EQequipment/</url>
-    <descr>This is a site where you can rent equipment and you can find lots here!!!</descr>
-    <email>Tenso3179@aol.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ersis Labs</name>
-    <url>http://www.u22.com/</url>
-    <descr>Do It Yourself Computer Solutions</descr>
-    <email>u22@u22.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ethiopian Register Magazine</name>
-    <url>http://www.ethiopianregister.com/</url>
-    <descr>Ethiopian culture, Ethiopian politics, Ethiopian education, Ethiopian religion, Ethiopian press</descr>
-    <email>author@ethiopianregister.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EUnet Bretagne groupe EUnet</name>
-    <url>http://www.EUnet-Bretagne.fr/</url>
-    <descr>First European ISP</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Eurocom International Srl</name>
-    <url>http://www.eurocom.it/</url>
-    <descr>Internet Service Provider</descr>
-    <email>esimone@eurocom.it</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EuroInform</name>
-    <url>http://www.euinf.dp.ua/</url>
-    <descr>Paging Company of Ukraine</descr>
-    <email>sysadm@euinf.dp.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EuroNet Internet BV</name>
-    <url>http://www.euro.net/</url>
-    <descr>Internet Service Provider</descr>
-    <email>frans@euro.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>European ConneXion [eu-X]</name>
-    <url>http://www.eu-x.com</url>
-    <descr>IP and Telecom Solutions Provider</descr>
-    <email>support@eu-X.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Eurosat Inc.</name>
-    <url>http://eurosat.co.uk/</url>
-    <descr>Satellite Provider for UK</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Eurosoft (UK) Ltd</name>
-    <url>http://www.eurosoft-uk.com/</url>
-    <descr>Diagnostic Software Solutions</descr>
-    <email>davidr@eurosoft-uk.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EuShop.NET</name>
-    <url>http://www.eushop.net/</url>
-    <descr>European Online Shopping Services; present your products in Europe</descr>
-    <email>webadmin@eushop.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Evertek Computer Corp</name>
-    <url>http://www.evertek.com/</url>
-    <descr>World Wide Computer Wholesale</descr>
-    <email>webmaster@evertek.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Evertek, Inc.</name>
-    <url>http://www.evertek.net/</url>
-    <descr>Wireless Internet Service Provider</descr>
-    <email>jbumsted@evertek.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Evocative, Inc.</name>
-    <url>http://www.evocative.com/</url>
-    <descr>Internet technology developers and consultants, specializing in business-to-business transaction software via the Internet.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EWON I&amp;C Inc.</name>
-    <url>http://WWW.DrZone.COM/</url>
-    <descr>Medical Internet Solution Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Excelsus Engineering</name>
-    <url>http://www.excelsus.com/</url>
-    <descr>Network Intergration, Consulting and Web Hosting</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Exceltec-inc</name>
-    <url>http://www.exceltec-inc.com/</url>
-    <descr>The best Solution for your applications in ...INSTRUMENTATIONS ...AUTOMATION</descr>
-    <email>Roger.Savard@henoc.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Executive Marketing Services, Inc.</name>
-    <url>http://www.emsphone.com/</url>
-    <descr>Provider of telephone and address information, database management and mail processing services.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>exit1</name>
-    <url>http://exit1.com/</url>
-    <descr>Web page design and hosting, internet and general computer consulting.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Express Copy, Inc.</name>
-    <url>http://www.expresscopy.com/</url>
-    <descr>Internet Copy Shop</descr>
-    <email>dan@expresscopy.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>eXscape Communications</name>
-    <url>http://www.exscape.net/</url>
-    <descr>Web Hosting, dedicated servers, domain registration, TUCOWS mirror</descr>
-    <email>cfarrell@exscape.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ExSoCom S.A. de C.V.</name>
-    <url>http://www.exsocom.com.mx/</url>
-    <descr>Integraci&oacute;n de aplicaciones y bases de datos a Internet; Publicidad en WWW; Servidores empresariales; Sistemas Operativos; Redes LAN y WAN; Reparaci&oacute;n y Mantenimiento de Hardware</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Eyebeep</name>
-    <url>http://www.eyebeep.com</url>
-    <descr>QuickTime Streaming operator in Europe</descr>
-    <email>johan@xtr.nu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>F1 Communications</name>
-    <url>http://www.f1.ru/</url>
-    <descr>ISP, Web design, Software development etc...</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Face in the crowd</name>
-    <url>http://faceinthecrowd1.freeservers.com/</url>
-    <descr>freelance art/portraits/T-Shirts</descr>
-    <email>Jullez6170@AOL.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Family Advocacy Services, Inc.</name>
-    <url>http://www.p-corner.com/ragga/</url>
-    <descr>Works with male adolescents and families who are disfunctional and have severe emotional difficulties.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Family Health Network</name>
-    <url>http://www.familyhealth.com.au/</url>
-    <descr>Online weight-loss, health and fitness.</descr>
-    <email>info@familyhealth.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Far North Networks</name>
-    <url>http://www.networks.nq.nu/</url>
-    <descr>Computer based network specialist utilizing FreeBSD at every opportunity.</descr>
-    <email>mark@networks.nq.nu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FastLane Communications</name>
-    <url>http://www.fastlane.net/</url>
-    <descr>ISP serving Dallas/Ft. Worth (Houston soon!)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Fastmail</name>
-    <url>http://fastmail.ca/</url>
-    <descr>Fastmail is a free web based email system for Canadians</descr>
-    <email>michael@searchcanada.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Fastnet</name>
-    <url>http://www.fast.net.uk/</url>
-    <descr>Internet Service Provider</descr>
-    <email>blair@fastnet.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FastNet International</name>
-    <url>http://fast.net.uk/</url>
-    <descr>Internet Service &amp; Access Provider</descr>
-    <email>sales@fastnet.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FastNet Solutions</name>
-    <url>http://ncc.fns.ru/</url>
-    <descr>Network Control Center Site (public)</descr>
-    <email>ilya@fns.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FASTS Ltd.</name>
-    <url>http://www.fasts.com/</url>
-    <descr>Computer hardware and software trade company</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FastWorks</name>
-    <url>http://fastworks.com/</url>
-    <descr>Web Email System</descr>
-    <email>michael@fastmail.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FeatureCity Networks</name>
-    <url>http://www.featurecity.net/</url>
-    <descr>National ISP based in St. Augustine, FL</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ferguson Enterprises, Inc.</name>
-    <url>http://www.ferginc.com/</url>
-    <descr>Major Distributor of Plumbing and HVAC</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ferno Norden AS</name>
-    <url>http://www.fernonorden.com/</url>
-    <descr>Medical equipment, police equipment</descr>
-    <email>pete@fernonorden.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FFA NET</name>
-    <url>http://www.ffanet.com/</url>
-    <descr>Advertising Network of thousands of sites</descr>
-    <email>bc@ffanet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FindLink.com Search Engine and Banner Exchange</name>
-    <url>http://www.findlink.com/</url>
-    <descr>Internet search and banner exchange</descr>
-    <email>mike@findlink.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>First Bulgarian Internet Store</name>
-    <url>http://www.bgstore.com/</url>
-    <descr>A bulgarian online electronic shop - books, games, etc...</descr>
-    <email>webmaster@bgstore.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>First Link Internet Services</name>
-    <url>http://www.fl.net.au/</url>
-    <descr>ISP in Sydney, Australia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Florida Network Technologies, Inc.</name>
-    <url>http://www.flnet.com/</url>
-    <descr>Full ISP with dialup as low as $11.99!</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Focal Networks</name>
-    <url>http://www.focalnetworks.net/</url>
-    <descr>Provider of web hosting, IRC servers, virtual and dedicated servers to the Internet community at large</descr>
-    <email>support@focalnetworks.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FOCI.Net Internet Services</name>
-    <url>http://www.foci.net/</url>
-    <descr>Shell/Webhosting</descr>
-    <email>info@foci.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ford-Diesel.Com</name>
-    <url>http://www.ford-diesel.com/</url>
-    <descr>Source of information for owners of Ford diesels.</descr>
-    <email>jlester@naxs.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FOTOdotNO</name>
-    <url>http://foto.no/</url>
-    <descr>Norways largest photography site</descr>
-    <email>david@foto.no</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Frag dot Com</name>
-    <url>http://www.frag.com/</url>
-    <descr>The hottest gaming site around</descr>
-    <email>zyfly@frag.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>France Telecom</name>
-    <url>http://www.tecsi.com/</url>
-    <descr>Web2000 : intranet server used for the communication of year 2000 impact on the company's information system</descr>
-    <email>hubert.tournier@tecsi.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FredNet</name>
-    <url>http://www.fred.net/</url>
-    <descr>Internet Service Provider serving Frederick and Washington County, MD USA</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FreeBSD Systems, Inc.</name>
-    <url>http://freebsdsystems.com/</url>
-    <descr>Total Network and Systems builders employing FreeBSD as the core operating system. Systems that are second to none, and are configured to each clients needs now and for the foreseeable future. Included software configurations are web server, mail server, firewall, file and print services. This is a total plug and serve solution.</descr>
-    <email>lnb@freebsdsystems.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FreeGate Corporation</name>
-    <url>http://www.freegate.com/</url>
-    <descr>Manufacturer of OneGate Internet Access Systems</descr>
-    <email>naia@freegate.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>freeinternet.com</name>
-    <url>http://www.freeinternet.com/</url>
-    <descr>Currently over 2 million subscribers, free isp.</descr>
-    <email>gus@freei.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FreeTown</name>
-    <url>http://www.freetown.com/</url>
-    <descr>The Webs Finest, Fastest-Growing Chat Site: over 3 million hits a day served....</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FRF</name>
-    <url>http://www.frf.com/</url>
-    <descr>real estate company</descr>
-    <email>webmaster@frf.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Front Range Internet, Inc.</name>
-    <url>http://www.frii.com/</url>
-    <descr>Internet access to northern and central Colorado.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Frontier Business Technologies</name>
-    <url>http://www.fbti.com/</url>
-    <descr>Large Point of Sales Dealer</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Frontier Internet Services Australia</name>
-    <url>http://www.fisa.com.au/</url>
-    <descr>Sydney, Australia - Specialising in open source corporate solutions based on the FreeBSD platform and Perl applications.</descr>
-    <email>fbsd@fisa.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ftgbox</name>
-    <url>http://www.ftgbox.net/</url>
-    <descr>Internet Service Provider</descr>
-    <email>admin@ftgbox.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Functional Internet and Software Technologies</name>
-    <url>http://www.functional.com/</url>
-    <descr>Web hosting and software development</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>funschool.com Corporation</name>
-    <url>http://www.funschool.com/</url>
-    <descr>Uses FreeBSD for WWW services and development</descr>
-    <email>webmaster@funschool.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Future Communications</name>
-    <url>http://info.net-gw.com/</url>
-    <descr>Provider of Network Gateway services including email paging and web paging</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FutureSouth Communications</name>
-    <url>http://www.futuresouth.com/</url>
-    <descr>A medium-sized ISP in Mississippi</descr>
-    <email>staff@futuresouth.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FutureTrade Technologies</name>
-    <url>http://www.futuretrade.com/</url>
-    <descr>Stock Market Software development</descr>
-    <email>ets@efnet.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Fyne Internet Services, Inc.</name>
-    <url>http://www.fyne.net/</url>
-    <descr>Wisconsin Internet Service Provider</descr>
-    <email>info@fyne.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Gallixy Enterprises,Inc</name>
-    <url>http://www.gallixy.com/</url>
-    <descr>dial-up service provider</descr>
-    <email>webmaster@gallixy.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Gambit Automated Design</name>
-    <url>http://www.gambit.com/</url>
-    <descr>A leading provider of IC Place and Route software products and services for Very Deep Sub-Micron (VDSM) IC design.</descr>
-    <email>info@gambit.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GamersRevolt</name>
-    <url>http://www.gamersrevolt.com/</url>
-    <descr>Online Gaming Provider</descr>
-    <email>delta9@gamersrevolt.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GameSpot</name>
-    <url>http://www.gamespot.com/</url>
-    <descr>The online leader in gaming information, strategy guides and downloadable demos.</descr>
-    <email>ian@gamespot.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Gandi</name>
-    <url>http://www.gandi.net/</url>
-    <descr>ICANN-accredited registrar for COM/ORG/NET</descr>
-    <email>gandi@gandi.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GaniNET</name>
-    <url>http://www.ganiNET.com/</url>
-    <descr>e-BUSINESS developers</descr>
-    <email>office@ganiNET.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Garant-Service</name>
-    <url>http://www.online.garant.ru/</url>
-    <descr>System Garant</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Garudaweb Internet Solution</name>
-    <url>http://www.garudaweb.com/</url>
-    <descr>Web Hosting and Web Design Provider</descr>
-    <email>koro@garudaweb.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GB Data Systems</name>
-    <url>http://WWW.GBData.COM/</url>
-    <descr>FreeBSD/ISP consulting company in Houston, TX.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GedikNet Iletisim ve Teknoloji</name>
-    <url>http://webmail.gedik.net</url>
-    <descr>GedikNet Webmail Server</descr>
-    <email>caglayan@gedik.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Gelendzhik-Relcom Co.</name>
-    <url>http://www.sea.ru/</url>
-    <descr>ISP at Black sea of Russia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Gemica s.n.c.</name>
-    <url>http://www.gemicanet.it/</url>
-    <descr>ISP in Montoro Inf., AV, Italy</descr>
-    <email>rlucia@gemicanet.it</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Generali Insurance Greece</name>
-    <url>http://www.generali.gr</url>
-    <descr>Life, Property and Casualty insurance and investment services</descr>
-    <email>elias.mandouvalos@generali.gr</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Genesis Software Pty. Ltd.</name>
-    <url>http://www.gsoft.com.au/</url>
-    <descr>Genesis Software produces hardware and software to detect meteors in the upper atmosphere</descr>
-    <email>doconnor@gsoft.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Genwell Corporation</name>
-    <url>http://www.genwell.com/</url>
-    <descr>Network Connectivity Products and Services</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Geology Dept. at Florida State University</name>
-    <url>http://quartz.gly.fsu.edu/</url>
-    <descr>Geology at Florida State</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Gerpa Ltd</name>
-    <url>http://www.gerpa.ru/</url>
-    <descr>Sanitary ware and lamp Reseller in Moscow, Russia</descr>
-    <email>gerpa@gerpa.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GetEasY</name>
-    <url>http://www.e-lists.com.cn/</url>
-    <descr>An Free mailing lists provider in China</descr>
-    <email>haifeng@ms.lawton.com.cn</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GF Murray Co.</name>
-    <url>http://www.gfmurray.com/</url>
-    <descr>Distribute-then-print &amp; just-in-time digital printing</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GG&amp;MW</name>
-    <url>http://www.borjomi.com.ge/</url>
-    <descr>Georgian Glass and Mineral Waters</descr>
-    <email>ggmw@borjomi.co.ge</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GIDEON Corp.</name>
-    <url>http://www.gideon.co.jp/</url>
-    <descr>PC Database Development &amp; Sale on PC UNIX</descr>
-    <email>info@gideon.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Gigrovata St. Petersburg</name>
-    <url>http://www.gigrovata.ru/</url>
-    <descr>Producer of cotton wool</descr>
-    <email>tair@gigrovata.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Gimota AG</name>
-    <url>http://www.gimota.ch</url>
-    <descr>Connector Systems</descr>
-    <email>admin@gimota.ch</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Global Communications INTERNETworking Corp.</name>
-    <url>http://www.glci.net/</url>
-    <descr>Internet Services Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Global eMarketing</name>
-    <url>http://www.gemius.pl/</url>
-    <descr></descr>
-    <email>acid@gem.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Global Internet</name>
-    <url>http://www.global.net.pg/</url>
-    <descr>ISP Provider in Papua New Guinea</descr>
-    <email>support@global.net.pg</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Global Net</name>
-    <url>http://www.sby.globalinfo.net/</url>
-    <descr>ISP</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Global Network Solutions Tecnologia</name>
-    <url>http://www.gns.com.br/</url>
-    <descr>ISP in Brazil.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Global Videocom group ltd</name>
-    <url>http://www.globalvc.co.uk/</url>
-    <descr>A video and audio conferencing supplier based utilising both ISDN and IP based networks</descr>
-    <email>hostmaster@globalvc.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GlobalDrum Internet</name>
-    <url>http://www.globaldrum.com/</url>
-    <descr>Email and WWW hosting ISP</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Glock Telecommunications</name>
-    <url>http://www.Glock.COM/</url>
-    <descr>Network installation and administration consultants.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Goodall Software Engineering</name>
-    <url>http://www.goodall.com/</url>
-    <descr>A Software Engineering Company</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>gourad.com</name>
-    <url>http://www.gourad.com</url>
-    <descr>Internet solutions company offering web design, hosting and wireless integration</descr>
-    <email>info@gourad.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GoWebNow</name>
-    <url>http://www.gowebnow.com/</url>
-    <descr>NEW - FREE: Internet Search Engine Service</descr>
-    <email>brian@gowebnow.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Grafica</name>
-    <url>http://www.grafica.co.nz/</url>
-    <descr>Design, Digital printing, Web and Multimeda company</descr>
-    <email>keith@grafica.co.nz</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Grassroots Business Directory</name>
-    <url>http://clowney.homestead.com/index.html</url>
-    <descr>entreprenuerial resources, text archives and directory advertising.</descr>
-    <email>r.clowney@att.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Gravity Internet</name>
-    <url>http://www.gravity.net.au/</url>
-    <descr>ISP in Mebourne Australia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Grayphics Digital Imaging</name>
-    <url>http://www.grayphics.com/</url>
-    <descr>Prepress service bureau.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Great Lakes Digital Labs</name>
-    <url>http://www.digitalabs.net/</url>
-    <descr>An Internet Service Provider in Alexandria, Virginia</descr>
-    <email>ron@digitalabs.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Green Bay Christian School</name>
-    <url>http://www.gbcs.com/</url>
-    <descr>Internet Provider In The Green Bay Area</descr>
-    <email>webmaster@gbcs.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Grey Matter Intelligent and Interactive Inc.</name>
-    <url>http://www.greymatter.ca/</url>
-    <descr>Online Applications Developer</descr>
-    <email>mark@gmi2.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Grey Zone Productions, Inc.</name>
-    <url>http://www.greyzone.com/</url>
-    <descr>Internet Solutions Provider</descr>
-    <email>greyzone@greyzone.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GRN Serveis Telematics</name>
-    <url>http://www.grn.es/</url>
-    <descr>ISP in Girona, Catalonia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ground Zero Communications, Inc.</name>
-    <url>http://www.comsec.net/</url>
-    <descr>Business-only Internet Solutions Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GUEST SRL</name>
-    <url>http://www.guest.net/</url>
-    <descr>INTERNET SERVICE PROVIDER</descr>
-    <email>staff@guest.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Gymnet Communications</name>
-    <url>http://www.gymnet.com/</url>
-    <descr>A Web Presence and remote unix account provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>H.L. Boulton &amp; CO</name>
-    <url>http://www.hlboulton.com/</url>
-    <descr>Venezuela's largest ship terminals.</descr>
-    <email>mocando@hlboulton.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HAL9000 NETWORK SERVICES</name>
-    <url>http://www.hal9000.net.au/</url>
-    <descr>ISP Adelaide, Australia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Hank Marquardt</name>
-    <url>http://web.yerpso.net/</url>
-    <descr>Web (PHP) Development/LAN Consulting</descr>
-    <email>hank@yerpso.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Harbor Communications</name>
-    <url>http://www.harborcom.net/</url>
-    <descr>ISP.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HASIRSER</name>
-    <url>http://WWW.HASIRSER.COM/</url>
-    <descr>PLASTIC MAT</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Hatvany.net</name>
-    <url>http://hatvany.net</url>
-    <descr>Internet Service Provider.  Serving the Boston area.</descr>
-    <email>charles@hatvany.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Have A Heart</name>
-    <url>http://www.haveaheart.net/</url>
-    <descr>Handmade Teddy Bears by Carla Kulka</descr>
-    <email>matt@lqx.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Hawk Technologies, Inc</name>
-    <url>http://www.hawk.com/servers/</url>
-    <descr>Hawk Technologies is a reseller of *BSD-inside machines. Our servers come pre-built and all of of our components are top quality industrial strength.</descr>
-    <email>sales@hawk.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HB Systems, Inc.</name>
-    <url>http://www.hbsystems.com/</url>
-    <descr>Computer Software Development &amp; Systems Integration</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HEITEC AG</name>
-    <url>http://www.heitec.net/</url>
-    <descr>software development, automation, documentation and network consulting</descr>
-    <email>security@heitec.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Heliospace Computer Solutions</name>
-    <url>http://www.heliospace.com/</url>
-    <descr>Web development, hosting, design, and consulting services</descr>
-    <email>agelner@heliospace.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Helpful Web Site</name>
-    <url>http://www.helpfulwebsite.com/</url>
-    <descr>Web Hosting and Design company</descr>
-    <email>info@helpfulwebsite.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Hemisphere Online</name>
-    <url>http://www.hemi.com/</url>
-    <descr>An Internet Service Provider in Denver, Colorado</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Henshaw Consulting, Inc.</name>
-    <url>http://henshaw.net/</url>
-    <descr>Internet consulting firm that specializes in web site and database design on FreeBSD systems running Apache, PHP and MySQL.</descr>
-    <email>ben@henshaw.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Herald Communications</name>
-    <url>http://www.herald.net/</url>
-    <descr>ISP in Dallas, TX. USA</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HERON</name>
-    <url>http://heron.com.pl/</url>
-    <descr>INTERNET &amp; INTRANET Solutions</descr>
-    <email>info@heron.com.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>High5!</name>
-    <url>http://www.high5.net/</url>
-    <descr>Technologies -- NL</descr>
-    <email>mischa@high5.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Highlander International Sound</name>
-    <url>http://www.members.tripod.com/rahtiger/raggalife</url>
-    <descr>music, reggae, danzhall, mp3 format, studio time</descr>
-    <email>rahtiger@bet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Highway I. S. P.</name>
-    <url>http://www.highway.com.py/</url>
-    <descr>Internet Service Provider - Asuncion - Paraguay</descr>
-    <email>admin@highway.com.py</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HiLink Internet</name>
-    <url>http://www.hilink.com.au/</url>
-    <descr>ISP and Internet consultants in Melbourne, Australia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Hirshfield's Inc.</name>
-    <url>http://www.hirshfields.com/</url>
-    <descr>We have 20+ retail stores using FreeBSD to run our POS application software.</descr>
-    <email>rjohnson@hirshfields.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Hiverworld, LLC</name>
-    <url>http://www.hiverworld.com/</url>
-    <descr>Internet Security Specialists</descr>
-    <email>support@hiverworld.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Hogsauce</name>
-    <url>http://www.hogsauce.com/</url>
-    <descr>Sam Fulton's Hogsauce</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Holger Mitterwald Datenkommunikation</name>
-    <url>http://www.mitterwald.de/</url>
-    <descr>Web Server running mainly a German guide for pubs.</descr>
-    <email>hrmitter@mitterwald.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HomePage.com</name>
-    <url>http://www.homepage.com/</url>
-    <descr>Internet ASP</descr>
-    <email>hostmaster@homepagecorp.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Homeyen Computer Co., Ltd.</name>
-    <url>http://www.isdn.com.tw/</url>
-    <descr>The Professional Access Solution Provider in Taiwan.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HOSTEX</name>
-    <url>http://www.hostex.net/</url>
-    <descr>quality web hosting</descr>
-    <email>giedriusk@hostex.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>hosting.morva.net</name>
-    <url>http://hosting.morva.net</url>
-    <descr>Morva.net Hosting Server</descr>
-    <email>hamid@morva.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Hotmail.com</name>
-    <url>http://www.hotmail.com/</url>
-    <descr>Hotmail FreeMail Service. FreeBSD powered web servers and mail servers.</descr>
-    <email>hotmail@hotmail.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Houston InterWeb Design, Inc.</name>
-    <url>http://www.houston-interweb.com/</url>
-    <descr>Developer of web sites and complex web applications</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HowlerMonkey Email Services Co</name>
-    <url>http://www.howlermonkey.net/</url>
-    <descr>Free pop3/smtp AND web mail provider</descr>
-    <email>webmaster@howlermonkey.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Hunt Brothers of Louisiana, LLC</name>
-    <url>http://www.huntbrothers.com/</url>
-    <descr>Network Engineering and Consultion</descr>
-    <email>khunt@huntbrothers.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>i-HIVE COMMUNICATION Inc.</name>
-    <url>http://www.i-hive.co.jp/</url>
-    <descr>Software developer</descr>
-    <email>root@i-hive.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>I-NeX Corporation Pty Ltd</name>
-    <url>http://www.i-nex.com.au/</url>
-    <descr>Corporate SQL database, Web, Java programming and hosting provider</descr>
-    <email>Mark.deRaad@I-NeX.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>iAvenue</name>
-    <url>http://tour.iavenue.com/</url>
-    <descr>Electronic Commerce Providers and Business Center</descr>
-    <email>info@iavenue.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ICG Informationstechnologie Consulting GmbH</name>
-    <url>http://www.icg-online.de/iwg/?bereich=icg</url>
-    <descr>IT Services, Frankfurt, Germany</descr>
-    <email>usselmann.m@icg-online.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ICON Technologies, Inc.</name>
-    <url>http://www.icontech.com/</url>
-    <descr>A computer engineering firm located in Mayfield, PA.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ICP s.r.o.</name>
-    <url>http://www.icp.cz/</url>
-    <descr>Informa&egrave;n&iacute; Centrum Podnikatel&ugrave;</descr>
-    <email>sales@icp.cz</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ICPR</name>
-    <url>http://chemgu.icp.ac.ru/</url>
-    <descr>Site of Chemistry department.</descr>
-    <email>vav@chemgu.icp.ac.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ICRnet</name>
-    <url>http://www.icr.com.au/</url>
-    <descr>Independent Computer Retailers (ISP)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ID Arts</name>
-    <url>http://www.id-arts.com/</url>
-    <descr>Securing Freedom from Passwords and PINs through Cognometrics</descr>
-    <email>info@id-arts.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ID-Net, Inc</name>
-    <url>http://www.id.net/</url>
-    <descr>Michigan based corporate ISP, 100Mb switched Internet connectivity, 15+ FreeBSD servers, serving more than 15,000,000 hits every month!  (Pushing over 10GB of traffic per day!).</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Idianet</name>
-    <url>http://www.idianet.net/</url>
-    <descr>ISP</descr>
-    <email>nait@idianet.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Idiom Consulting</name>
-    <url>http://www.idiom.com/</url>
-    <descr>ISP</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>IDL Inc.</name>
-    <url>http://idlserver.idlinc.com/</url>
-    <descr>Mudlogging services and Drilling Industry software suppliers</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ihatove Co.ltd.</name>
-    <url>http://www.ihatove.co.jp/</url>
-    <descr>Software House etc.</descr>
-    <email>staff@ihatove.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>iHh Communications</name>
-    <url>http://www.ihhcomms.net/</url>
-    <descr>Small Business Information Technology Solutions</descr>
-    <email>woody@ihhcomms.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>IIS Webnet Pty Ltd</name>
-    <url>http://www.webnet.com.au/</url>
-    <descr>Corporate Internet Service Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>IKON Document Services - Indianapolis</name>
-    <url>http://ikon-ddpress.com/</url>
-    <descr>Web, Mail and FTP Services</descr>
-    <email>webmaster@ikon-ddpress.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Imageworks Computing</name>
-    <url>http://www.imagecomp.com/</url>
-    <descr>Computer Services, Multimedia Catalog, Best Internet Selling Tool</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>iMALL, Inc.</name>
-    <url>http://www.imall.com/</url>
-    <descr>Online shopping mall (12 million hit/month)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>iMarc</name>
-    <url>http://www.imarc.net/</url>
-    <descr>Web design and hosting on FreeBSD and Macintosh</descr>
-    <email>dave@imarc.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Imperial Software Technology</name>
-    <url>http://www.ist.co.uk/</url>
-    <descr>Provider of Software tools and expertise for GUIs and mission-critical applications</descr>
-    <email>alan@ist.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Impulse Internet Services</name>
-    <url>http://www.impulse.net/</url>
-    <descr>ISP based in Santa Barbara, CA</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>InComA</name>
-    <url>http://www.incoma.ru/</url>
-    <descr>Frame Relay, X.25, TCP/IP Network Provider in Russia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Indies MusicBox</name>
-    <url>http://indies.musicbox.ne.jp/</url>
-    <descr>noel co.,ltd.</descr>
-    <email>info@noel.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Indonesia Japan Institute</name>
-    <url>http://www.lpkij.ac-id.net/</url>
-    <descr>Computer Education</descr>
-    <email>harry@ns.lpkij.ac-id.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Indonesian Telecom</name>
-    <url>http://www.telkom.go.id/</url>
-    <descr>Information Technology Division</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Infinite Data Solutions</name>
-    <url>http://www.infinitedata.net</url>
-    <descr>Webhosting, Game Server hosting, dedicated servers, co-location</descr>
-    <email>khufford@infinitedata.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Infinite Space Systems Corp.</name>
-    <url>http://w3.inspace.net/</url>
-    <descr>Unlimited Nationwide ISP @ 19.95/mo.  User Services powered by FreeBSD!</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Info Scientific, Inc.</name>
-    <url>http://www.therd.com/</url>
-    <descr>New Home of THERdbASE</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Infobound Technical Training</name>
-    <url>http://www.infobound.com/</url>
-    <descr>LAN, WAN, Remote Access course development and training</descr>
-    <email>tony@infobound.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>InfoCenter Ltd</name>
-    <url>http://www.norilsk.ru/</url>
-    <descr>ISP in Norilsk, Russia</descr>
-    <email>admins@norilsk.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Infologigruppen Pitea AB</name>
-    <url>http://www.infologigruppen.se/</url>
-    <descr>Software Development, Web Services</descr>
-    <email>goran.lowkrantz@infologigruppen.se</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>InfoMeMe Co.,LTD.</name>
-    <url>http://www.memenet.or.jp/</url>
-    <descr>Internet Service Provider</descr>
-    <email>takahama@memenet.or.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>InfoNation (tm) Premier Online Systems</name>
-    <url>http://www.nation.org/</url>
-    <descr>Web hosting ISP</descr>
-    <email>david@nation.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>InfoNet Communications Inc.</name>
-    <url>http://www.icinet.net/</url>
-    <descr>We build ISPs from the bottom up!</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Infopartners S.A.</name>
-    <url>http://www.ip.lu/</url>
-    <descr>Information services and ISP in Luxembourg (Europe)</descr>
-    <email>frank@ip.lu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Informazioni Editoriali I.E. Srl</name>
-    <url>http://www.alice.it/</url>
-    <descr>Internet &amp; DB services for the italian books world</descr>
-    <email>sriva@alice.it</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Informsystem Inc.</name>
-    <url>http://www.inform.co.jp/</url>
-    <descr>*Japan Only* Internet Service Provider &amp; FreeBSD All in One Server Bild</descr>
-    <email>info@inform.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>InfoService S.A.</name>
-    <url>http://www.infoservice.com.pl/</url>
-    <descr>mainly polish language</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>InfoSouth, Inc.</name>
-    <url>http://www.infosouth.com/</url>
-    <descr>ISP in Atlanta GA, USA.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>InfoTeam Corporation</name>
-    <url>http://www.infoteam.com/</url>
-    <descr>Web Site Design, Promotion, Hosting, Domain Name Registration</descr>
-    <email>kmartin@infoteam.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Infotera Co.</name>
-    <url>http://www.dataq.co.kr/</url>
-    <descr>Software Development and Easy Internet Connect Services.</descr>
-    <email>j70nh@dataq.co.kr</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Infoth Corp.</name>
-    <url>http://www.infoth.com/</url>
-    <descr>Internet Service Providor in CD/HN/China</descr>
-    <email>lsz8425@mail.cd.hn.cn</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>InfoWest Global Internet Services, Inc.</name>
-    <url>http://www.infowest.com/</url>
-    <descr>InfoWest, providing Internet services to Southwestern Utah</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Inmap Co. Ltd.</name>
-    <url>http://www.inmap.com.tw/</url>
-    <descr>Search engine for life in Taiwan</descr>
-    <email>jeff@jeffy.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Innogress.com</name>
-    <url>http://www.innogress.com/</url>
-    <descr>Internet Application Development - Innovative Unix Solutions</descr>
-    <email>bixler@innogress.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Innotek Pet Products</name>
-    <url>http://www.pet-products.com/</url>
-    <descr>The World's Largest Manufacturer of Electronic Dog Training Products</descr>
-    <email>dlf@tatnet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Innotek's sportdog.com</name>
-    <url>http://www.sportdog.com/</url>
-    <descr>Training Products for Gun and Field Dogs</descr>
-    <email>dlf@tatnet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Innovative Medical Services</name>
-    <url>http://www.imspure.com/</url>
-    <descr>Pharmaceutical Water Filtration and Dispensing Devices</descr>
-    <email>SMcDonald@imspure.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Innovative Products Sales LLC.</name>
-    <url>http://www.4innovative.com/</url>
-    <descr>High-end residential solutions provider - utilizing FreeBSD for intranet/internet services</descr>
-    <email>nathan@vidican.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>INSART</name>
-    <url>http://www.insart.kharkov.ua/</url>
-    <descr>IBM Business Partner, Kharkov, Ukraine</descr>
-    <email>admin@insart.kharkov.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Instant Communications</name>
-    <url>http://www.in.com.au/</url>
-    <descr>ISP Down under</descr>
-    <email>keith@apcs.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Integrated Ststems Japan Ltd.</name>
-    <url>http://www.isi.co.jp/</url>
-    <descr>Embedded Systems Operating Environment and Development Tools -- Sales and Engineering</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Inteko</name>
-    <url>http://www.inteko.net/</url>
-    <descr>Internet service provider</descr>
-    <email>clubmail@inteko.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Intelecon Services, Inc.</name>
-    <url>http://www.intelecon.com/</url>
-    <descr>Full service audio/visual solutions for industry</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Intelight Co., Ltd.</name>
-    <url>http://www.intelight.co.jp/</url>
-    <descr>System Integrator &amp; Web Service, Japan</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Intelligence Technologies International</name>
-    <url>http://www.inteltec.com/</url>
-    <descr>Large scale law enforcement application development</descr>
-    <email>michael@inteltec.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Inter Lab</name>
-    <url>http://www.ilb.com.br/</url>
-    <descr>Internet Service Provider</descr>
-    <email>interlab@via-rs.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Inter-IntraNet Communications, Inc.</name>
-    <url>http://www.interintranet.com</url>
-    <descr>eBusiness and Technology Planning for Dealer Extranets</descr>
-    <email>info@interintranet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Inter@ccess</name>
-    <url>http://interaccess.com.mx/</url>
-    <descr>Internet Service Provider</descr>
-    <email>lmadrig@acnet.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Interactive Data, Inc.</name>
-    <url>http://www.pelican.net/</url>
-    <descr>ISP in North Myrtle Beach, SC.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Interactive Gateway</name>
-    <url>http://www.igateway.com.au/</url>
-    <descr>Webhosting &amp; Internet Services in Australia</descr>
-    <email>info@igateway.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>interface business GmbH</name>
-    <url>http://www.interface-business.de/</url>
-    <descr>Use for Intranet solutions, workstations, Internet servers; customer-tailored solutions</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Interfax-Ukraine</name>
-    <url>http://www.interfax.com.ua/</url>
-    <descr>Ukrainian News Agency</descr>
-    <email>vega@interfax.com.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Interlicht</name>
-    <url>http://www.interlicht.nl/</url>
-    <descr>Internet shop for interiour lighting</descr>
-    <email>info@interlicht.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Interlog Inc.</name>
-    <url>http://www.interlog.com/</url>
-    <descr>ISP, includes mail spool, USENET, virtual servers, nameserving, ISDN, unix shell servers, more</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Intermedia Service s.r.l</name>
-    <url>http://www.intermediaservice.it/</url>
-    <descr>House Trading - Information Technology</descr>
-    <email>alexmarv@yahoo.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>International Media Company</name>
-    <url>http://www.fun.nl/</url>
-    <descr>Internet Entertainment Company we are proud to use FreeBSD on all our web/mail/DNS/Firewall/Database/Monitor servers. We serve currently 75 Domains wich are all extreme high traffic sites. </descr>
-    <email>hansw@imco.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Access Eindhoven</name>
-    <url>http://www.iaehv.nl/</url>
-    <descr>The ISP for the south of Holland</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Access HK Limited</name>
-    <url>http://www.ia.com.hk/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Application Specialists</name>
-    <url>http://www.ias.las-vegas.nv.us/</url>
-    <descr>Web Application Development</descr>
-    <email>mattm@lvcm.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Assistance</name>
-    <url>http://www.inet-asst.com/</url>
-    <descr>Providing businesses in the US and Canada with a presence on the web</descr>
-    <email>inet@inet-asst.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Cafe LOOZ</name>
-    <url>http://www.looz.com.pl/</url>
-    <descr>Internet coffeehouse in Krak&oacute;w, Poland</descr>
-    <email>looz@looz.com.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Channel</name>
-    <url>http://www.inch.com/</url>
-    <descr>Internet provider in the New York area</descr>
-    <email>access@inch.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Creations By The Hand</name>
-    <url>http://www.bythehand.net/</url>
-    <descr>Is a Nationwide Internet Service Provider and WWW hosting firm.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Cz&ecirc;stochowa s.c.</name>
-    <url>http://www.icz.com.pl/</url>
-    <descr>ISP, Web Presence Designers</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Data Systems of Ely</name>
-    <url>http://www.idsely.com/</url>
-    <descr>ISP for the Ely, Nevada area</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Direct</name>
-    <url>http://www.idirect.com/</url>
-    <descr>A different kind of Internet company</descr>
-    <email>fehr@idirect.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Express</name>
-    <url>http://www.iexpress.net.au/</url>
-    <descr>ISP in Perth, Western Australia</descr>
-    <email>mikey@iexpress.net.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Express Network</name>
-    <url>http://www.ienet.com/</url>
-    <descr>So. California Full Service Internet Service Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Ireland</name>
-    <url>http://www.internet-ireland.ie/</url>
-    <descr>ISP, Web Presence Designers and Consultants in Dublin, Ireland.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet L'Annonciation</name>
-    <url>http://lannon.qc.ca/</url>
-    <descr>ISP located in the High-Laurentians, Quebec, Canada</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Marketing 1, Inc</name>
-    <url>http://www.im1.com/</url>
-    <descr>Web Hosting Provider</descr>
-    <email>bill@im1.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Marketing 1, Inc's WebGears.com</name>
-    <url>http://www.webgears.com/</url>
-    <descr>Internet Access Provider</descr>
-    <email>bill@im1.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Media Services</name>
-    <url>http://fp.imsweb.net/</url>
-    <descr>Internet Service Provider - Web Hosting and Dial-up</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Mexicana S.A. de C.V.</name>
-    <url>http://www.intmex.com/</url>
-    <descr>Mexican ISP dealer. Dialup access, web hosting, web design.</descr>
-    <email>eperez@acnet.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Movie Database</name>
-    <url>http://us.imdb.com/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Oklahoma</name>
-    <url>http://camera.ionet.net/</url>
-    <descr>Internet Relay Chat Server &amp; Camera</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Projects</name>
-    <url>http://www.ipredes.com</url>
-    <descr>Internet Service and Solution Provider</descr>
-    <email>casola@ipredes.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>InterScena inc.</name>
-    <url>http://www.InterScena.com/</url>
-    <descr>Publicity Agency on Internet</descr>
-    <email>Roger.Savard@henoc.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Interspace Australia</name>
-    <url>http://www.interspace.com.au/</url>
-    <descr>95 cents/hour net access, Melbourne, Australia.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>InterSpace cybercafe</name>
-    <url>http://www.interspace.com.br/</url>
-    <descr>cybercafe in Florianopolis</descr>
-    <email>cafe@interspace.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>InterSurf Online, Inc.</name>
-    <url>http://www.intersurf.net/</url>
-    <descr>Full Internet Access for Louisiana</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>InterSvyazSputnik</name>
-    <url>http://www.issp.net/</url>
-    <descr>Global Internet Providing via Satellite</descr>
-    <email>gleb@issp.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>intervista.com</name>
-    <url>http://www.intervista.com/</url>
-    <descr>3D visualization for the Web</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Interworld Communications</name>
-    <url>http://www.interworld.net/</url>
-    <descr>Internet provider in El Segundo, California</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Intrasteller Internet Service</name>
-    <url>http://www.intrastar.net/</url>
-    <descr>ISP in East Texas, USA.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Introspective Technologies USA (Internet resources)</name>
-    <url>http://www.itech-usa.com/</url>
-    <descr>Internet Resources</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Introspective Technologies USA</name>
-    <url>http://www.itechusa.net/</url>
-    <descr>Webhosting, Webdesign, Software Development</descr>
-    <email>webmaster@itechusa.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Intrudetect, Inc</name>
-    <url>http://www.intrudetect.com/</url>
-    <descr>Internet Security Consultants</descr>
-    <email>info@intrudetect.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Intuitive Design</name>
-    <url>http://www.in-design.com/</url>
-    <descr>Web Site Design</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>InvictaNet</name>
-    <url>http://www.invictanet.co.uk/</url>
-    <descr>ISP based in Ashford, kent, UK</descr>
-    <email>support@invicta.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Iowna Software</name>
-    <url>http://www.iowna.com/</url>
-    <descr>Providing custom programming, site hosting and network support (specializing in FreeBSD) as well as internet access to areas of western Pennsylvania.</descr>
-    <email>jdowns@mail.iowna.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>iPAJe Software, Inc.</name>
-    <url>http://www.ipaje.com/</url>
-    <descr>Web Hosting, Web Development, System Administration, Internet Commerce Solutions</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>iPass Inc.</name>
-    <url>http://www.iPass.COM/</url>
-    <descr>Provides true global Internet roaming and corporate access to the world.</descr>
-    <email>otterley@iPass.COM</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>iPlus Internet Services</name>
-    <url>http://www.i-Plus.net/</url>
-    <descr>Full service Internet provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Irm&atilde;os Gullo S/A Artefatos de Metais</name>
-    <url>http://www.gullo.com.br</url>
-    <descr>Fabrica&ccedil;&atilde;o de j&oacute;ias folheadas</descr>
-    <email>root@gullo.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISEB(NET)</name>
-    <url>http://www.surgi.dote.hu/</url>
-    <descr>Medical and other interesting things(links) to Hungary</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISES co.ltd.</name>
-    <url>http://www.ises.co.jp/</url>
-    <descr>Business Application Development and Consulting in JAPAN</descr>
-    <email>webmaster@ises.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>islandhosting.com</name>
-    <url>http://www.islandhosting.com/</url>
-    <descr>High quality low cost web hosting service.</descr>
-    <email>admin@islandhosting.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISM Group</name>
-    <url>http://www.ism.ru/</url>
-    <descr>We make computer systems</descr>
-    <email>arseny@ism.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>isolve ApS</name>
-    <url>http://www.isolve.dk/</url>
-    <descr>Development of .dot.com companies - and ISP</descr>
-    <email>nino@isolve.dk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISOT - Internet Services Of Texas</name>
-    <url>http://www.isot.com/</url>
-    <descr>Internet Services for greater Central Texas Area</descr>
-    <email>yu@isot.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISP Art-Service</name>
-    <url>http://www.art-service.net.ua/</url>
-    <descr></descr>
-    <email>raccoon@art-service.net.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISP Creator.dp.ua</name>
-    <url>http://www.creator.dp.ua/</url>
-    <descr>Internet Service provider from Dniepropetrovsk (Ukraine)</descr>
-    <email>grey@canada.dp.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISP - Dnepr.net.ua</name>
-    <url>http://www.dnepr.net.ua/</url>
-    <descr>ISP in Dnepropetrovsk (Ukraine)</descr>
-    <email>postmaster@dnepr.net.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISP Intercom</name>
-    <url>http://www.intercom.net.ua/</url>
-    <descr>Internet Service Provider</descr>
-    <email>leshik@intercom.net.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISP InterLink Ltd., Kiev, Ukraine</name>
-    <url>http://www.interlink.net.ua/</url>
-    <descr>ISP and ITSP in Kiev</descr>
-    <email>admin@interlink.net.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISP MagNet</name>
-    <url>http://www.kolyma.net/</url>
-    <descr>ISP MagNet</descr>
-    <email>isay@kolyma.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISP NETLAB+, Slovakia</name>
-    <url>http://irc.netlab.sk/</url>
-    <descr>IRC Server, IRCNET Network</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISP Nimblehost</name>
-    <url>http://www.nimblehost.com/</url>
-    <descr>Sells shell services and webhosting</descr>
-    <email>colk@nimblehost.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISP Synchroline</name>
-    <url>http://www.sl.ru</url>
-    <descr>ISP in Moscow. </descr>
-    <email>info@sl.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISP UkrTel</name>
-    <url>http://www.ukrtel.com/</url>
-    <descr>ISP in Kiev, Ukraine</descr>
-    <email>demiurg@ukrtel.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISPRO A.S.</name>
-    <url>http://www.ispro.net.tr/</url>
-    <descr>Internet Service Provider Located in Izmir/TURKEY</descr>
-    <email>yurtesen@ispro.net.tr</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>it4you.at</name>
-    <url>http://www.it4you.at/</url>
-    <descr>domains, webspace and more</descr>
-    <email>hostmaster@it4you.at</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Itautec Philco S.A</name>
-    <url>http://www.itautec.com.br</url>
-    <descr>Brazilian Computer and Server Manufacturer</descr>
-    <email>marcio@itautecamerica.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ITI Inc.</name>
-    <url>http://www.iti.qc.ca/iti/</url>
-    <descr>Internet Service Provider, E-mail, DNS and Web hosting, Montreal, Quebec, Canada</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Itoh Co.</name>
-    <url>http://www.itoh.co.jp/</url>
-    <descr></descr>
-    <email>webmaster@itoh.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ITworks Consulting</name>
-    <url>http://www.itworks.com.au/</url>
-    <descr>IT consultancy and ISP in Melbourne Australia</descr>
-    <email>gavin@itworks.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>iUndertake Inc.</name>
-    <url>http://www.ideathcare.com/</url>
-    <descr>Online B2B Deathcare Industry Portal / Internet Development</descr>
-    <email>jps@funeralexchange.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>IWL Net</name>
-    <url>http://www.iwl.net/</url>
-    <descr>ISP</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>J&amp;Tsystems</name>
-    <url>http://www.jt-sys.co.jp/</url>
-    <descr>joji kiyota</descr>
-    <email>j-kiyota@fa2.so-net.ne.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>J.O. Easley, Inc.</name>
-    <url>http://www.joeasley.com/</url>
-    <descr>Oil and Gas Land Brokerage</descr>
-    <email>richardh@joeasley.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Jakarta Convention Center</name>
-    <url>http://www.jcc.co.id/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Jawa Technologies</name>
-    <url>http://www.jawatech.com/</url>
-    <descr>Jawa Technologies is a global leader in Internet solutions ranging from a basic Web site to a sophisticated, and dedicated e-commerce server.</descr>
-    <email>nospam@jawatech.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Jeack InternetWorking</name>
-    <url>http://www.jeack.com.au/</url>
-    <descr>Internet Service Provider</descr>
-    <email>john@jeack.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Jeah Communications</name>
-    <url>http://www.jeah.net/</url>
-    <descr>Provider of Shell Accounts, Web Hosting &amp; Co-location</descr>
-    <email>chris@jeah.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>JMS Internet, Inc.</name>
-    <url>http://www.jmsinternet.com/</url>
-    <descr>FreeBSD based Web Hosting Provider</descr>
-    <email>webmaster@jmsinternet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Job-Link KALI</name>
-    <url>http://www.job-link.com/home/games.html</url>
-    <descr>Dedicated KALI Game server for FREE Internet play</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>John Leslie Consulting</name>
-    <url>http://www.jlc.net/</url>
-    <descr>ISP in Souhegan Valley, New Hampshire</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Jones-Beach Music Inc.</name>
-    <url>http://jones-beach.innosoft.com/</url>
-    <descr>Homepage for jazz bands under the jones-beach label</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Journal des Affaires</name>
-    <url>http://www.Journal-Affaires.qc.ca/</url>
-    <descr>Downtown Business News in Montreal, Quebec, Canada</descr>
-    <email>Roger.Savard@henoc.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>JOURNYX</name>
-    <url>http://journyx.com/</url>
-    <descr>Web-Based Time and Attendance Tracking</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Jovian Networks, LLC</name>
-    <url>http://www.jovian.net/</url>
-    <descr>Internet Services for the 21st Century</descr>
-    <email>sales@jovian.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>JSC CiNet</name>
-    <url>http://www.ci.net.ua</url>
-    <descr>ISP in Chernihiv, Ukraine. We're using FreeBSD since 1.x.x releases.</descr>
-    <email>al@ci.net.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>JSC Promelec</name>
-    <url>http://www.promelec.ru/</url>
-    <descr>IC components, Datasheets.. </descr>
-    <email>bas@promelec.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISP Tyumen.ru</name>
-    <url>http://www.tyumen.ru/</url>
-    <descr>Internet Service provider in Tyumen/Russian</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>JSC Comlink</name>
-    <url>http://www.comlink.khakassia.ru/</url>
-    <descr></descr>
-    <email>sasha@khakassia.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>JSC QUANTUM</name>
-    <url>http://www.quantum.ru/</url>
-    <descr>ISP &amp; Telecommunications</descr>
-    <email>admin@quantum.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>JSV Multibanka</name>
-    <url>http://ns.multibanka.com/</url>
-    <descr>Commercial bank</descr>
-    <email>mg@multibanka.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Junk Proof Mail</name>
-    <url>http://www.junkproof.com/</url>
-    <descr>Mail filtering service, spam filtering.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>JurisWeb.NET</name>
-    <url>http://www.jurisweb.net/</url>
-    <descr>Lawyers Network Europe</descr>
-    <email>webadmin@jurisweb.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Just In Time Solutions</name>
-    <url>http://www.justintime.com/</url>
-    <descr>The premier solution for Internet Billing and Customer Care</descr>
-    <email>rdas@justintime.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>JWPages Webpage Designs</name>
-    <url>http://www.jwpages.com/</url>
-    <descr>Web Developing Company</descr>
-    <email>jwpauler@jwpages.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>K&amp;K Corporation Ltd. (KK-NET)</name>
-    <url>http://www.kk-net.ne.jp/</url>
-    <descr>INTERNET SERVICE PROVIDER</descr>
-    <email>sales@kk-net.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>K@trinet</name>
-    <url>http://www.katrinet.se/</url>
-    <descr>ISP and FreeBSD mirror site in Sweden.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>KANAYA Inc.</name>
-    <url>http://www.frankyguy.com/</url>
-    <descr>A maker of the POP WEAR BRAND FRANKYGUY. And also deal BSD Daemon licensed wear.</descr>
-    <email>yoshiaki@frankyguy.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Kaschynna Communications</name>
-    <url>http://kaschynna.com/</url>
-    <descr>Internet Presence Provider &amp; MU* Hosting Services</descr>
-    <email>webadmin@kaschynna.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Katsushika FM Broadcasting System</name>
-    <url>http://www.kfm789.co.jp/</url>
-    <descr>Japanese Micro Radio Station,--sorry Japanese only</descr>
-    <email>aya@kfm789.co.jp/</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Kauai Internet</name>
-    <url>http://www.hawaiian.net/</url>
-    <descr>Kauai's #1 Internet Service Provider. Serving the Island of Kauai since 1995. </descr>
-    <email>albert@hawaiian.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Kendryl/3NAAC collaboration</name>
-    <url>http://kendryl.bc.ca/</url>
-    <descr>Play server - doubles as company email/web/dial in server</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Keno Kozie Associates</name>
-    <url>http://www.kka.com</url>
-    <descr>Internet Service Provider/Systems Engineering Firm</descr>
-    <email>exs@kka.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Keskydee Inc.</name>
-    <url>http://keskydee.com/</url>
-    <descr>Internet Services &amp; Web Development. Sarasota Florida</descr>
-    <email>gil@keskydee.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Key Internet Services</name>
-    <url>http://www.key.net.au/</url>
-    <descr>Internet Service Provider in Australia NSW</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>KEY-HOLDING</name>
-    <url>http://www.ku.ru/</url>
-    <descr>Holding company in Orenburg</descr>
-    <email>ssk@ku.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Keycab S.p.A.</name>
-    <url>http://www.keycab.com/</url>
-    <descr>ISP in Italy</descr>
-    <email>root@keycab.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>KEYTEC</name>
-    <url>http://www.keytec.gr.jp/</url>
-    <descr>Original internet service &amp; support in Japan</descr>
-    <email>info@keytec.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Kharkiv Online</name>
-    <url>http://www.kharkiv.net/</url>
-    <descr>Internet service provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Khmelnitskinfocom</name>
-    <url>http://www.infocom.khmelnitskiy.ua/</url>
-    <descr>Internet Service Provider in Khmelnitsky</descr>
-    <email>savyer@softhome.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Kikko Networks</name>
-    <url>http://www.kikko.com</url>
-    <descr>The Leading Managed Web Hosting and Service provider</descr>
-    <email>support@kikko.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Kimpton Hotel and Restaurant Group</name>
-    <url>http://www.kimptongroup.com/</url>
-    <descr>Using FreeBSD for mail and DNS services</descr>
-    <email>jvanboxtel@kimptongroup.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>kips systems co.</name>
-    <url>http://www.kenafric.net/</url>
-    <descr>internet and network services</descr>
-    <email>kenafric@kenafric.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Kiwi Internet Services</name>
-    <url>http://www.kiwi.net/</url>
-    <descr>The Inland Empire's Complete Internet Solution (kiwi.net)</descr>
-    <email>tanimn@kiwi.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>KKS Internetworks</name>
-    <url>http://www.kks.net/</url>
-    <descr>Cable Internet Service Provider</descr>
-    <email>hostmaster@kks.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>KMJ Consulting Austria</name>
-    <url>http://www.kmjeuro.com/</url>
-    <descr>Overstock Trading &amp; Special Services Company</descr>
-    <email>webadmin@kmjeuro.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Knight-Tro Soft Internet and Web Services</name>
-    <url>http://www.knight-trosoft.com/</url>
-    <descr>Midwest Hosting, Software Development, Network development and Installation.</descr>
-    <email>johnp@vwebpage.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Knowledge Access International, Inc.</name>
-    <url>http://www.ka.com/</url>
-    <descr>We provide embedded systems outsourced firmware and software product development and consulting in Atlanta. Our expertise is in real-time systems for telecommunications, consumer electronics, data security and networking.</descr>
-    <email>info@ka.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Konbanwa</name>
-    <url>http://www.konbanwa.com/</url>
-    <descr></descr>
-    <email>info@konbanwa.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Kongo Group Oy</name>
-    <url>http://www.kongogroup.com/</url>
-    <descr></descr>
-    <email>kongo@kongogroup.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>KORAL Multimedia Ltd.</name>
-    <url>http://www.koral.bg/</url>
-    <descr>World Wide CD-ROM Distributor</descr>
-    <email>mitko@koral.bg</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Korax Online Inc.</name>
-    <url>http://www.korax.net/</url>
-    <descr>Web hosting and collocation services provider.</descr>
-    <email>avb@korax.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>KuwaitNet Inc.</name>
-    <url>http://www.Kuwaitnet.net/</url>
-    <descr>Internet Service Provider</descr>
-    <email>big@kuwaitnet.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>KYTEX Computers Ltd. </name>
-    <url>http://www.kytex.bg/</url>
-    <descr>Bulgarian reliable server builder offers K-SERVER family of pre-installed xBSD and Linux Internet appliances. </descr>
-    <email>sales@kytex.bg</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>L.K GlobalSoft.com/INTERNET</name>
-    <url>http://www.globalsoft.com.cy/</url>
-    <descr>ISP</descr>
-    <email>alexander.avanesov@globalsoft.com.cy</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>LA-PHINI-COSMETICS-china-FACTORY</name>
-    <url>http://freedomstarr.com/?LI1962327</url>
-    <descr>NON-KISS-OFF-LIPSTICKS</descr>
-    <email>lin3279@public.xm.fj.cn</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Lakeshore Internet Services</name>
-    <url>http://www.lks.net/</url>
-    <descr>High Speed Internet Access</descr>
-    <email>jmoore@lks.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Lan Systems</name>
-    <url>http://www.lansystems.co.uk/</url>
-    <descr>Network Consultants.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>LanMinds Internet, Inc.</name>
-    <url>http://www.lmi.net/</url>
-    <descr>Internet Service Provider</descr>
-    <email>info@lmi.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Lanttel S.C.</name>
-    <url>http://www.lanttel.com/</url>
-    <descr>Wireless Internet Service Provider in Argentina</descr>
-    <email>juan@lanttel.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Latin OnLine, S.A.</name>
-    <url>http://www.latinol.com/</url>
-    <descr>El Portal de Panam&aacute;</descr>
-    <email>webmaster@latinol.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>LATINMEDIA INTERNET</name>
-    <url>http://www.latinmedia.com.ar/</url>
-    <descr>INTERNET PRESENCE PROVIDER</descr>
-    <email>marcelo@latinmedia.com.ar</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Lazerlink Internet Services</name>
-    <url>http://www.lazerlink.net/</url>
-    <descr>Lazerlink Internet Services of Central Pennsylvania</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Learning Plant</name>
-    <url>http://www.learningplant.se/</url>
-    <descr>Production of tailor made e-learning</descr>
-    <email>info@learningplant.se</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>LEMIS</name>
-    <url>http://www.lemis.com/</url>
-    <descr>UNIX Consulting Services</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>LF.net Netzwerksysteme GmbH</name>
-    <url>http://LF.net</url>
-    <descr>Regional ISP in Stuttgart, Germany</descr>
-    <email>sales@LF.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Liebscher &amp; Partner Werbeagentur GbR</name>
-    <url>http://www.freibergnet.de/</url>
-    <descr>Merchandising, Internet Access And Service Provider</descr>
-    <email>info@freibergnet.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Life Force International</name>
-    <url>http://www.lifeforceint.com/17047701/index1.shtml</url>
-    <descr>The Liquid Vitamins of the future</descr>
-    <email>azor@shore.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Light1 Internet Services</name>
-    <url>http://www.light1.net/</url>
-    <descr>Shell and Webhosting Provider</descr>
-    <email>doug@light1.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>LightStream Internet, Inc.</name>
-    <url>http://www.lightstream.net/</url>
-    <descr>Northeast Ohio Internet Service Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Lindblad Thorden AB</name>
-    <url>http://bsd.ltab.se/</url>
-    <descr>CGI and database driven websites</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Linkeasy Network</name>
-    <url>http://www.linkeasy.net/</url>
-    <descr>2nd Largest International ISP based in Los Angeles County</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>LinkGate Net.</name>
-    <url>http://www.linkgate.net/</url>
-    <descr>FreeBSD &amp; Network consulting, in Gwangju, Korea</descr>
-    <email>me@linkgate.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Little Rapids Corporation</name>
-    <url>http://www.littlerapids.com/</url>
-    <descr>Specialty Paper Manufacturer</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Local Kine Internet Services</name>
-    <url>http://www.localkine.com/</url>
-    <descr>Internet Services, FreeBSD &amp; Network consulting.</descr>
-    <email>Info@localkine.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Local Line, INC.</name>
-    <url>http://www.localline.com/</url>
-    <descr>Internet Service Provider</descr>
-    <email>local@localline.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>LocalLink International Networking Corporation</name>
-    <url>http://www.locallink.net/</url>
-    <descr>Complete Internet Service Provider for SouthWest Michigan</descr>
-    <email>kpitcher@locallink.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Lofty co.,LTD</name>
-    <url>http://www.lofty-tec.co.jp/</url>
-    <descr>Internet Service &amp; Development</descr>
-    <email>tanisi@lofty-tec.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Loopback.ORG TCP/IP</name>
-    <url>http://www.loopback.org/</url>
-    <descr>IT security consulting &amp; webspace provider</descr>
-    <email>akira@loopback.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Lucky Net</name>
-    <url>http://www.lucky.net/</url>
-    <descr>The largest Ukrainian ISP</descr>
-    <email>bsd@lucky.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>LugaNET</name>
-    <url>http://www.luga.ru/</url>
-    <descr>Internet Service Provider in Luga, Leningrad region, Russia</descr>
-    <email>admin@luga.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>LvNet</name>
-    <url>http://www.lvnet.lv/</url>
-    <descr>Largest Latvian ISP (mixed SUN Solaris and FreeBSD)</descr>
-    <email>info@lv.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Lynx-BCC company</name>
-    <url>http://www.lynx.ru/</url>
-    <descr>Unix-based corporative solutions and bank technologies</descr>
-    <email>mur@lynx.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Macroent.Com</name>
-    <url>http://www.macroent.com/</url>
-    <descr>Consulting Services in Houston TX.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MacroWerx</name>
-    <url>http://www.MacroWerx.com/</url>
-    <descr>Providing custom internet and intranet services</descr>
-    <email>julian@macrowerx.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MacSolutions Network</name>
-    <url>http://www.msn.bc.ca/</url>
-    <descr>low cost internet web site hosting</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mag-Net BBS Ltd. </name>
-    <url>http://www.mag-net.com/</url>
-    <descr>ISP</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Magichosts.com</name>
-    <url>http://www.magichosts.com/</url>
-    <descr>Web Hosting Service</descr>
-    <email>mattm@lvcm.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Magnus Ltd</name>
-    <url>http://www.magnus.kiev.ua/</url>
-    <descr>Internet Service Provider in Bila Tserkva, Ukraine</descr>
-    <email>alex@magnus.kiev.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Main Computer Centre of Civil Aviation</name>
-    <url>http://www.fas.ru/</url>
-    <descr>Moscow, Russia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mainstreet</name>
-    <url>http://www.aaa-mainstreet.nl/</url>
-    <descr>ISP in Amsterdam, The Netherlands.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Majapahit Design</name>
-    <url>http://www.majapahit.com/</url>
-    <descr>a solution to your website</descr>
-    <email>webmaster@majapahit.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Majoris System Pvt. Ltd</name>
-    <url>http://www.majoris.com/</url>
-    <descr>Majoris System Private Limited</descr>
-    <email>shyam.kumar@majoris.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Malicia</name>
-    <url>http://www.malicia.com/</url>
-    <descr>Shell, Web, And Other Internet Related Services</descr>
-    <email>reddawg@malicia.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mall City Org</name>
-    <url>http://mallcity.org</url>
-    <descr>ECommerce at its best with Point of sale - Get your 20 store mall today</descr>
-    <email>unix-freebsd@mallcity.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Manavi &amp; Hausmann GmbH</name>
-    <url>http://www.luenenet.de/</url>
-    <descr>Internet Service Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Manchester Computing</name>
-    <url>http://www.mcc.ac.uk/</url>
-    <descr>University of Manchester (UK) Computing Services</descr>
-    <email>tim@mcc.ac.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MAP Ltd   J-S Company</name>
-    <url>http://www.skiftel.ru/map</url>
-    <descr></descr>
-    <email>map@skiftel.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Maps.com</name>
-    <url>http://www.maps.com/</url>
-    <descr>The place on the internet for maps!</descr>
-    <email>chrism@maps.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>marchFIRST</name>
-    <url>http://www.marchfirst.com/</url>
-    <descr>Internet professional services company</descr>
-    <email>john.bock@marchfirst.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mariazell Online - GIWE Design</name>
-    <url>http://www.mariazell.org/</url>
-    <descr>The region of Mariazeller Land on the Internet</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Marineronline</name>
-    <url>http://www.marineronline.net/</url>
-    <descr>internet dialup, hosting, and design in Maryland &amp; DC</descr>
-    <email>capndave@marineronline.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Marlin Internet</name>
-    <url>http://www.marlin.com.br/</url>
-    <descr>ISP - Rio de Janeiro</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Martin SEMRAD - NET WAY</name>
-    <url>http://www.netway.cz/</url>
-    <descr>Web hosting</descr>
-    <email>semrad@netway.cz</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MAS Online Services</name>
-    <url>http://www.mas-online.com/</url>
-    <descr>Professional Web Site Hosting, Page Design, and Site Marketing at Prices You can Afford!</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Masternet</name>
-    <url>http://www2.masternet.it/</url>
-    <descr>Masternet, ISP in Prato (ITALY)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mathsoft Corp</name>
-    <url>http://www.mathsoft.org/</url>
-    <descr>Specialises in technical (Scientific) applications, web site design and hosting, e-commerce, software development in C++,Java and javascript. </descr>
-    <email>starweb@mathsoft.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Matrix Internet</name>
-    <url>http://www.matrix.com.br/</url>
-    <descr>Brazilian ISP</descr>
-    <email>gaiser@matrix.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Maui Gateway</name>
-    <url>http://www.mauigateway.com/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MAX-ISP</name>
-    <url>http://www.max.odessa.ua/</url>
-    <descr>Internet Service Provider</descr>
-    <email>vadim@max.odessa.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MBS Computers Ltd.</name>
-    <url>http://www.microbiz.net/</url>
-    <descr>Computer Hardware and Software Sales</descr>
-    <email>sales@microbiz.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>McCallie Associates, Inc.</name>
-    <url>http://www.mccallie.com/</url>
-    <descr>Omaha, NE - Integrated Networking Specialists</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>McCane Consulting</name>
-    <url>http://bmccane.cavtech.com/</url>
-    <descr>Consulting Company in Independence, MO</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>McKinney Guitar Studio</name>
-    <url>http://www.mckinneyguitarstudio.com/</url>
-    <descr>Fingerstyle Lessons, guitars, and all acustic.</descr>
-    <email>o2oigo@aol.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MCS Internet Services</name>
-    <url>http://www.gld.com/</url>
-    <descr>ISP, Goldsboro, NC</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MCSNet</name>
-    <url>http://www.mcs.com/</url>
-    <descr>ISP in Chicago, IL</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mechafin AG</name>
-    <url>http://www.mechafin.ch</url>
-    <descr>Welding Tools</descr>
-    <email>admin@gimota.ch</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Media Capital</name>
-    <url>http://www.mediacap.com/</url>
-    <descr>A Leasing company for the Electronic Age</descr>
-    <email>dlr@davids.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Media Online Italia s.r.l.</name>
-    <url>http://www.media.it/</url>
-    <descr>Internet Access Provider</descr>
-    <email>giardina@media.it</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Media World</name>
-    <url>http://gatewayofindia.tripod.com</url>
-    <descr>A complete portal</descr>
-    <email>ninas_99@hotmail.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MediaCenter</name>
-    <url>http://www.umc.se/</url>
-    <descr>UNIX and BeOS Software Development</descr>
-    <email>daniel@umc.se</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mediacity World</name>
-    <url>http://www.mediacity.com/</url>
-    <descr>California  ISP. specializing in High speed connectivity, web hosting and colocation.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MediaTrak</name>
-    <url>http://209.249.66.116/</url>
-    <descr>Multimedia search engine (MP3, VQF, and more)</descr>
-    <email>hybrid@slip.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Medinet d.o.o</name>
-    <url>http://www.medinet.si/</url>
-    <descr>ISP in Maribor, Slovenia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Medusa, Media Usuage advice</name>
-    <url>http://www.medusa.nl/</url>
-    <descr>Consulting on internet/intranet</descr>
-    <email>info@medusa.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mega Micro Technologies Group</name>
-    <url>http://www.megamicro.com/</url>
-    <descr>Document and Data Archival</descr>
-    <email>tembrogno@megamicro.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Megabites Cafe Ltd</name>
-    <url>http://www.megabites.co.uk/</url>
-    <descr>Internet cafe in Swindon, England</descr>
-    <email>james@megabites.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Megacom electronics</name>
-    <url>http://www.megacom.com.au/</url>
-    <descr>ISP</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MegaLink Co.</name>
-    <url>http://chita.rt.ru/</url>
-    <descr>ISP (Chita, Siberia, Russia)</descr>
-    <email>citikom@iname.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MegaMedia</name>
-    <url>http://www.megamedia.pt/</url>
-    <descr>Solu es Multimedia, SA</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MegaStyle ltd</name>
-    <url>http://www.megastyle.com/</url>
-    <descr>ISP. Cherkassy, Ukraine</descr>
-    <email>hostmaster@megastyle.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Melim Internet</name>
-    <url>http://www.melim.com.br/</url>
-    <descr>ISP &amp; NSP in Santa Catarina, Brazil</descr>
-    <email>dw@melim.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mercury Technology Services, Inc</name>
-    <url>http://www.mtsvcs.com/</url>
-    <descr>Communications</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Merritt Computers</name>
-    <url>http://www.merrittcomputers.com/</url>
-    <descr>Web Hosting and Design</descr>
-    <email>webmaster@merrittcomputers.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Metadesign</name>
-    <url>http://www.metadesign.com.au</url>
-    <descr>FreeBSD consultancy in Hobart, Tasmania, Australia</descr>
-    <email>info@metadesign.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MexComUSA</name>
-    <url>http://MexComUSA.net/</url>
-    <descr>Research and Development of Internet Applications</descr>
-    <email>mgarber@MexComUSA.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mexico Communicates (MexCom)</name>
-    <url>http://busplan.mexcom.net.mx/</url>
-    <descr>Internet Application Developers</descr>
-    <email>mgarber@webwizard.com.mx</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MFA NKR</name>
-    <url>http://www.mfa.nk.am/</url>
-    <descr>Ministry of Foreign Affairs of Nagorno-Karabakh</descr>
-    <email>dev@arminco.nk.am</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Michigan VHF</name>
-    <url>http://www.michvhf.com/</url>
-    <descr>Custom Controllers and Consulting</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Micro Business Systems Inc.</name>
-    <url>http://www.mbscomputers.com/</url>
-    <descr>Specializing in computer sales and Internet services</descr>
-    <email>webmaster@mbscomputers.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Micro Network Services Pty Ltd</name>
-    <url>http://www.mns.com.au/</url>
-    <descr>NetSMART Network Monitoring Service</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Micromenders</name>
-    <url>http://www.micromenders.com/</url>
-    <descr>Computer hardware experts.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Micromonitors, Inc.</name>
-    <url>http://www.micromonitors.com/</url>
-    <descr>Silicon based gas chromatography for electrical power industry</descr>
-    <email>clark.ritchie@micromonitors.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Microtech Solutions and Communications</name>
-    <url>http://www.mtsc.net/</url>
-    <descr>Oklahoma City ISP</descr>
-    <email>raynman@theshop.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Microtek International Inc.</name>
-    <url>http://www.microtek.com.tw/</url>
-    <descr>Scanner Manufacturing</descr>
-    <email>justinwu@microtek.com.tw</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MindStep Corporation</name>
-    <url>http://www.mindstep.com/</url>
-    <descr>configures and maintains Internet/Intranet applications</descr>
-    <email>info@mindstep.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mint Corporation</name>
-    <url>http://www.mint.ac</url>
-    <descr>Developer in Japan</descr>
-    <email>support@mint.ac</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MiTAC System (ASIA) Limited</name>
-    <url>http://www.mitac.com.hk/</url>
-    <descr>System Integrator in Hong Kong</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mitayai.Net</name>
-    <url>http://www.mitayai.net/</url>
-    <descr>Internet Consulting</descr>
-    <email>mit@mitayai.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Miyazaki System Planning Office</name>
-    <url>http://www.mispo.co.jp/</url>
-    <descr>Design and Develop Embedded System</descr>
-    <email>webmaster@mispo.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MJ Produkties</name>
-    <url>http://www.mj.nl/</url>
-    <descr>Internet presence provider</descr>
-    <email>info@mj.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mobile TeleCom St.Petersburg</name>
-    <url>http://www.mtc.spb.ru/</url>
-    <descr>Paging company from St.Petersburg, Russia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MobileService JSC</name>
-    <url>http://www.scc.ru/</url>
-    <descr>Paging Company</descr>
-    <email>mobile@scc.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mortal Kombat 4</name>
-    <url>http://www.mk4.com/</url>
-    <descr>Official Web Page for the hit arcade game</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mountain Lake Software Corporation</name>
-    <url>http://www.mtnlake.com/</url>
-    <descr>Software Consulting &amp; Development</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>mountgambier.org</name>
-    <url>http://mountgambier.net/</url>
-    <descr>Part of the Mount Gambier (South Australia) Internet Portal</descr>
-    <email>sens@sens.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>mp3.com</name>
-    <url>http://www.mp3.com/</url>
-    <descr>MP3.com - Discover New Music, Download Songs, Buy CDs</descr>
-    <email>mlholloway@yahoo.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mr.DO Virtual Shop</name>
-    <url>http://www.mrdo.com.hk/</url>
-    <descr>Mr.DO Virtual Shop in Hong Kong</descr>
-    <email>mrdo@mrdo.com.hk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MROCZEK IT</name>
-    <url>http://www.mit.pl/</url>
-    <descr>Web Hosting Service, Warsaw, Poland</descr>
-    <email>kajtek@mit.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Multan.com</name>
-    <url>http://www.multan.com/</url>
-    <descr>Providing Training, Internet, and Networking</descr>
-    <email>webmaster@multan.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Multi Media Net S.r.l.</name>
-    <url>http://www.mmnet.it/</url>
-    <descr>Internet Service Provider - Multimedia solutions</descr>
-    <email>webmaster@mmnet.it</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Multimedia Centre</name>
-    <url>http://www.mmc.net.ge/</url>
-    <descr>ISP In Georgia, All + Dial-up servers on FreeBSD</descr>
-    <email>contact@mmc.ge</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Multired Digital Ashton Communications GDL</name>
-    <url>http://guadalajara.net/</url>
-    <descr>Internet Service Provider</descr>
-    <email>lmadrig@acnet.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MWS Enterprises</name>
-    <url>http://www.snsonline.net/</url>
-    <descr>Web hosting and more</descr>
-    <email>msergeant@snsonline.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Myson Technology Incorporated</name>
-    <url>http://www.myson.com/</url>
-    <descr>Analog/Digital, Mixed Signal and Custom IC Solutions - LAN</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>N.Ex.T. Communications</name>
-    <url>http://www.ctn.it/</url>
-    <descr>Web hosting and business services in Salerno, Italy</descr>
-    <email>rlucia@ctn.it</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>N.T.C. Sprl</name>
-    <url>http://www.ntc.be/</url>
-    <descr>Internet Service / Connection provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>N2Interactive.com</name>
-    <url>http://www.n2interactive.com</url>
-    <descr>Digital Media and Programming Development</descr>
-    <email>kasra@n2interactive.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nacamar Data Communications GmbH</name>
-    <url>http://www.nacamar.net/</url>
-    <descr>Internet Service Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nanoteq Pty. Ltd.</name>
-    <url>http://www.nanoteq.com/</url>
-    <descr>Firewall and data security systems</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NAP.NET</name>
-    <url>http://www.nap.net/</url>
-    <descr>High-bandwidth provider to ISPs</descr>
-    <email>noc@nap.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Narcisa d.o.o.</name>
-    <url>http://www.pacta.net</url>
-    <descr>Web hosting</descr>
-    <email>parrko@pacta.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>National Online</name>
-    <url>http://www.nonline.net/</url>
-    <descr>ISP/Network Solutions (from KW, ON, canada)</descr>
-    <email>yossman@nonline.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nedinsco b.v.</name>
-    <url>http://www.nedinsco.nl</url>
-    <descr>Optical and fine-mechanical instruments</descr>
-    <email>admin@nedinsco.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NEG Micon</name>
-    <url>http://www.negmicon.dk/</url>
-    <descr>Wind Turbine Company</descr>
-    <email>npp@negmicon.dk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NeoDyne Inc.,</name>
-    <url>http://www.neodyne.com/</url>
-    <descr>A company hell bent on ruling the world with the help of FreeBSD-STABLE powered servers, we own.</descr>
-    <email>greg@neodyne.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Neon-V Communications Center</name>
-    <url>http://www.neon.dp.ua/</url>
-    <descr>ISP in Dnepropetrovsk City, Ukraine</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NeoSoft</name>
-    <url>http://www.neosoft.com/</url>
-    <descr>ISP, Houston Texas</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-  
-  <entry type="commercial">
-    <name>Nesbitt &amp; Associates</name>
-    <url>http://www.Nesbitt.ca/</url>
-    <descr>Unix programming, System Administration and Network Security servies</descr>
-    <email>murray@nesbitt.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Net Boolean Incorporated</name>
-    <url>http://www.boolean.net/</url>
-    <descr>provides <b>messaging</b> and <b>directory</b> services to businesses</descr>
-    <email>Kurt@Boolean.Net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Net Corps</name>
-    <url>http://www.netcorps.com/</url>
-    <descr>ISP and WEB design service in Walnut Creek CA, USA.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Net Integrated Services, Inc.</name>
-    <url>http://www.nis-guys.com/</url>
-    <descr>Networks, computers and software consulting</descr>
-    <email>maustin@nis-guys.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Net Sonic</name>
-    <url>http://www.netsonic.com/</url>
-    <descr>Internet Presence Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Net Source Chicago, Inc.</name>
-    <url>http://www.netchicago.net/</url>
-    <descr>Internet/Intranet development firm</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Net Tech Inf. Ltda.</name>
-    <url>http://www.nettech.com.br/</url>
-    <descr>Network Support Services</descr>
-    <email>karim@nettech.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NetCarrier</name>
-    <url>http://www.netcarrier.com/</url>
-    <descr>Philadelphia metro ISP</descr>
-    <email>cpeltier@netcarrier.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NETCIS International Corporation</name>
-    <url>http://www.netcis.com/</url>
-    <descr>Internet / Intranet Networks Integration Company</descr>
-    <email>info@netcis.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Netcraft</name>
-    <url>http://www.netcraft.com/</url>
-    <descr>Site showing what system any site runs</descr>
-    <email>netcraft@netcraft.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NETDesign Inc.</name>
-    <url>http://www.cybervillage.com/</url>
-    <descr>Web Chat Server/Special Sites</descr>
-    <email>eric@netdesign1.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NetFx</name>
-    <url>http://www.netfx.co.za/</url>
-    <descr>Web publishing company based in Cape Town, South Africa</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Netherlands congrescentre</name>
-    <url>http://www.congresgebouw.nl/</url>
-    <descr>Congrescentre</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NETLAB+ Inc.</name>
-    <url>http://www.netlab.sk/</url>
-    <descr>Internet Service Provider (ISP), LAN &amp; WAN consulting, UN*X consulting</descr>
-    <email>admin@netlab.sk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NETLAN</name>
-    <url>http://www.netlan.net/</url>
-    <descr>ISP and Networking Solutions for Brazil</descr>
-    <email>netlan@netlan.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Netlink Internet Services</name>
-    <url>http://www.nlink.com.br/</url>
-    <descr>ISP in Recife - Pernambuco - Brasil.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NetMint, LLC</name>
-    <url>http://www.netmint.com/</url>
-    <descr>Web Design and Hosting</descr>
-    <email>admin@netmint.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NetMonger Communications</name>
-    <url>http://www.netmonger.net/</url>
-    <descr>Internet Service Provider</descr>
-    <email>info@netmonger.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Neto Corp.</name>
-    <url>http://www.neto.net/</url>
-    <descr>Internet Service Provider in Taiwan</descr>
-    <email>contact@neto.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NetPics</name>
-    <url>http://www.netpics.com/</url>
-    <descr>USENET to WWW gateway for adult images.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NETPLUS Communication</name>
-    <url>http://www.netplus.fr/</url>
-    <descr>Internet Service Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NetPublishing, Incorporated</name>
-    <url>http://www.netpublishing.com/</url>
-    <descr>Computer network architecture and network security</descr>
-    <email>ggilliss@netpublishing.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NetRamp Solutions</name>
-    <url>http://www.netramp.net/</url>
-    <descr>nationwide ISP located in Tulsa, Oklahoma</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Netropol Digitale Systeme</name>
-    <url>http://www.netropol.de/</url>
-    <descr>UNIX Development, TCP/IP Consulting and Mac Support</descr>
-    <email>jan@netropol.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NetTalk Live!</name>
-    <url>http://www.nettalklive.com/</url>
-    <descr>The Internet Talk Show of the nation!!!</descr>
-    <email>jovan@nettalklive.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NetToll</name>
-    <url>http://www.nettoll.com/</url>
-    <descr>Software company</descr>
-    <email>mchilali@nettoll.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Network Alchemy, Inc.</name>
-    <url>http://www.network-alchemy.com/</url>
-    <descr>Purveyor of commercial IPSEC/LT2P/PP2P clustered IP systems.</descr>
-    <email>ddp@network-alchemy.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NETworkers Pty Ltd</name>
-    <url>http://www.networkers.com.au/</url>
-    <descr>IT Consultants and WEB/ISP Services</descr>
-    <email>reception@networkers.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Networksystem</name>
-    <url>http://www.networksystem.co.uk/</url>
-    <descr>Network Solution Provider</descr>
-    <email>azimali@yahoo.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>New York Internet</name>
-    <url>http://www.nyi.net/</url>
-    <descr>ISP, headquartered in New York City, offering Data Center services</descr>
-    <email>marketing@nyi.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Newman Networking Group, Inc.</name>
-    <url>http://www.n2g.net/</url>
-    <descr>Network and Systems consultation services.</descr>
-    <email>info@n2g.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Newman Research</name>
-    <url>http://www.darkest.demon.nl/</url>
-    <descr>Young Dutch computing company</descr>
-    <email>webmaster@darkest.demon.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NewsReader.Com</name>
-    <url>http://NewsReader.Com/</url>
-    <descr>Web-based access to Usenet newsgroups</descr>
-    <email>curt@kcwc.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nexial Systems</name>
-    <url>http://www.nexial.com/</url>
-    <descr>Search engine software producer</descr>
-    <email>info@nexial.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Next Innovations</name>
-    <url>http://www.nextinnovations.com/</url>
-    <descr>Domain Hosting, Web Development</descr>
-    <email>Questions@nextinnovations.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>nextreme design</name>
-    <url>http://www.nextreme.com/</url>
-    <descr>Web design company in Syracuse, New York.</descr>
-    <email>ben@nextreme.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nexus Comunicaciones, S.A.</name>
-    <url>http://www.ncsa.es/</url>
-    <descr>Spanish Internet Service Provider</descr>
-    <email>jesusr@ncsa.es</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Niagara Online</name>
-    <url>http://www.nfol.com/</url>
-    <descr>Web Presence Provider in Niagara Falls, NY</descr>
-    <email>dan@nfol.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NightFlight</name>
-    <url>http://www.nightflight.com/</url>
-    <descr>Free personal ads, humor, links, Free Online Dictionary of Computing</descr>
-    <email>gcrutchr@nightflight.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NileNet, Ltd.</name>
-    <url>http://www.nilenet.com/</url>
-    <descr>ISP in Denver, Colorado</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ninebees Co.</name>
-    <url>http://www.zoomi.co.kr/</url>
-    <descr>Software Development and Easy Internet Connect Services.</descr>
-    <email>lanopk@chollian.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NIRVANA</name>
-    <url>http://nirvana.ru/</url>
-    <descr>Internet club</descr>
-    <email>root@nirvana.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NISC International, Inc.</name>
-    <url>http://www.nisc.com/</url>
-    <descr>CD-ROM Publishing</descr>
-    <email>achala@nisc.co.in</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nixu Oy</name>
-    <url>http://www.nixu.fi/nixu_engl.html</url>
-    <descr>Network consulting, solutions and training</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>nmrpro</name>
-    <url>http://www.nmrpro.net/</url>
-    <descr>Internet Provider</descr>
-    <email>info@nmrpro.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nobell Communications, Inc.</name>
-    <url>http://www.nobell.com/</url>
-    <descr>Wireless Internet Service Provider</descr>
-    <email>aaron@nobell.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nobreak Technologies</name>
-    <url>http://www.nobreak.com/</url>
-    <descr>Internet Software Development</descr>
-    <email>nobreak@nobreak.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nokia</name>
-    <url>http://www.nokia.com/</url>
-    <descr>Various divisions of Nokia use FreeBSD, from a routing framework, to research testbeds, to NFS servers</descr>
-    <email>TJ@Kniveton.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>North Texas Internet</name>
-    <url>http://www.ntexinet.net/</url>
-    <descr>Dallas/Fort Worth based Internet Services</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NORTHLINK COMMUNICATIONS</name>
-    <url>http://www.nlc.net.au/</url>
-    <descr>ISP in Sydney Australia</descr>
-    <email>john@nlc.net.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Northwest Link</name>
-    <url>http://www.nwlink.com/</url>
-    <descr>Internet Service Provider -- Bellevue, WA</descr>
-    <email>postmaster@NWLINK.COM</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Not A Number</name>
-    <url>http://www.blender.nl/</url>
-    <descr>Home of 3D Blender</descr>
-    <email>blender@oetelaar.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NotHans</name>
-    <url>http://www.nothans.com/</url>
-    <descr>Experimental Software Research and Testing</descr>
-    <email>hans@nothans.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nottingham Alcohol &amp; Drug Team</name>
-    <url>http://www.innotts.co.uk/nadt/</url>
-    <descr>Clinical databases and all network services hosted on FreeBSD.</descr>
-    <email>robmel@nadt.org.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Novadeck</name>
-    <url>http://www.novadeck.com</url>
-    <descr>E-business application</descr>
-    <email>pn@novadeck.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Noxiin</name>
-    <url>http://www.noxiin.com/</url>
-    <descr>Quality Shell Provider</descr>
-    <email>exii@noxiin.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NPK InformBANK</name>
-    <url>http://www.ib.com.ua/</url>
-    <descr>Communication &amp; Information analysation company</descr>
-    <email>informbank@ib.com.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NPO</name>
-    <url>http://www.stravt.ru/</url>
-    <descr>Computer reseller and Network consulting. Archangelsk. Russia.</descr>
-    <email>webmaster@stravt.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NRS Group</name>
-    <url>http://www.atless.net/</url>
-    <descr>Advanced Internet Addressing Technologies</descr>
-    <email>aryeh@atless.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nucleus Communications, Inc.</name>
-    <url>http://www.nuc.net/</url>
-    <descr>Internet, World Wide Web, and LAN/WAN solutions.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NYCONN Data Systems</name>
-    <url>http://www.nyconn.com/</url>
-    <descr>AS/400 Internetworking / Development, PC Networking</descr>
-    <email>nicka@nyconn.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NYI</name>
-    <url>http://nyi.net/</url>
-    <descr>Optimized for Internet Professionals</descr>
-    <email>e@nyi.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Oberon.net Netzwerksysteme GmbH</name>
-    <url>http://www.oberon.net</url>
-    <descr>ISP for japanese users in D&uuml;sseldorf, Germany</descr>
-    <email>sales@oberon.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>OClink Internet Services</name>
-    <url>http://www.oclink.com/</url>
-    <descr>Providing Internet access to over 40 cities in Southern California</descr>
-    <email>webmaster@oclink.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Odin Corporation</name>
-    <url>http://www.odin-corporation.com/</url>
-    <descr>Provides Unix application, system and web development</descr>
-    <email>lars@odin-corporation.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>OeRSTED, Inc.</name>
-    <url>http://www.oersted.co.jp/</url>
-    <descr>Software developer</descr>
-    <email>yav@bigfoot.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Oliver Design, Inc.</name>
-    <url>http://205.179.167.60/</url>
-    <descr>Disk &amp; Wafer Cleaner Manufacturer</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>OMCnet Internet Service GmbH</name>
-    <url>http://www.omc.net/</url>
-    <descr>German Internet Presence Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Omnium Technologies</name>
-    <url>http://www.omnium-tech.net/</url>
-    <descr>Small company providing web hosting and setup.</descr>
-    <email>vince@omnium-tech.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Omnix</name>
-    <url>http://www.omnix.net/</url>
-    <descr>ISP in Paris, France - Reseller of hardware / Software Solutions, technical support for FreeBSD</descr>
-    <email>didier@omnix.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>On-Net Internet Services</name>
-    <url>http://bsd.on-net.net/~iyi/</url>
-    <descr>Internet database solution provider and full service ISP</descr>
-    <email>helpdesk@on-net.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>OneHost</name>
-    <url>http://www.onehost.net/</url>
-    <descr>!!!Web Hosting &amp; Design!!!</descr>
-    <email>sales@onehost.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>OneWay</name>
-    <url>http://www.oneway.com.tw/</url>
-    <descr>Translation and network services in Taiwan</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Online Broadcsating Corp</name>
-    <url>http://www.paradisepalace.com/</url>
-    <descr>Video streaming</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>OnMedia</name>
-    <url>http://www.onmedia.com/</url>
-    <descr>Provides back-end web services for sites that offer free email, personal homepages and more!</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>OOO</name>
-    <url>http://www.foxnet.spb.ru/</url>
-    <descr>EndoVideoSergery Manufacturing Group</descr>
-    <email>fox@foxnet.spb.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>OOO ISTMEDIA</name>
-    <url>http://www.tiritaka.ru/</url>
-    <descr>Russian Internet-Cafe</descr>
-    <email>dmitry@tiritaka.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Open Creative Limited</name>
-    <url>http://www.opencreative.com/</url>
-    <descr>Hong Kong Interactive Multimedia Design Consultancy - Webserver</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Open Lines Communications, LLC</name>
-    <url>http://www.openlines.com/</url>
-    <descr>Internet Service Provider - Serving Arizona</descr>
-    <email>webmaster@openlines.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Open Solution Providers</name>
-    <url>http://www.osp.nl/</url>
-    <descr>UNIX, Windows/NT and Internet consultancy company</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>OPTIMUS-Pro Sp. z o.o.</name>
-    <url>http://www.optimus.waw.pl/</url>
-    <descr>FreeBSD powered ISP in Warsaw, POLAND</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>OptiSoft</name>
-    <url>http://www.optisoft.com/</url>
-    <descr>Affordable Web Hosting Services</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ORBITA LTD</name>
-    <url>http://www.orbita.e-burg.ru/</url>
-    <descr>Supermarket</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ORECULF INTERNATIONAL CONSULTING SERVICES</name>
-    <url>http://www.oreculfinternational.com/</url>
-    <descr>COMPUTER SOFTWARE/HARDWARE CONSULTING SERVICES</descr>
-    <email>FLUCERO@ORECULFINTERNATIONAL.COM</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Orient-Telecom</name>
-    <url>http://www.orient.net.ru/</url>
-    <descr>ISP in Irkutsk, Siberia - provides WEB hosting and fastest Internet access in Eastern Siberia</descr>
-    <email>chief@orient.net.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Orion Technologies Incorporated</name>
-    <url>http://www.orion.ab.ca/</url>
-    <descr>Internet solution provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Orthanc Systems</name>
-    <url>http://www.orthanc.com/</url>
-    <descr>Computer and Network Consulting</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>OSICOM.NET</name>
-    <url>http://www.osicom.net/</url>
-    <descr>ISP in Owen Sound, Ontario, Canada</descr>
-    <email>ken@osicom.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ownserver Corporation</name>
-    <url>http://www.ownserver.com</url>
-    <descr>FreeBSD dedicated servers hosted in state-of-the-art NOC's - USA, Canada, France, UK, Sweden, Japan and other countries. FreeBSD server co-location and high bandwidth hosting. FreeBSD server clusters and global load balancing.</descr>
-    <email>info@ownserver.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>p+p online gmbh</name>
-    <url>http://www.pp-online.de/</url>
-    <descr>Internet Content Provider for Germany</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Pacific Ocean Star newspaper</name>
-    <url>http://www.toz.khv.ru/</url>
-    <descr>The largest news, political, economical and culture newspaper on the Russian Far East</descr>
-    <email>webmaster@toz.khv.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Pair Networks</name>
-    <url>http://www.pair.com/</url>
-    <descr>Web Presence Provider for cost-effective account hosting</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Pakistan Online</name>
-    <url>http://isb.pol.com.pk/</url>
-    <descr>ISP, Web hosting</descr>
-    <email>awais@isb.pol.com.pk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Paladin Corporation</name>
-    <url>http://www.paladincorp.com.au/</url>
-    <descr>Providing Software engineering, Networking, Security, E-commerce solutions and commercial Technical support. Our personnel are university qualified senior engineers with years of experience, so you will be in good hands.</descr>
-    <email>sales@paladincorp.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Pangea.CA</name>
-    <url>http://www.pangea.ca/</url>
-    <descr>ISP in Winnipeg, Manitoba, Canada.</descr>
-    <email>curtis@pangea.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Panorama Point Web Communications</name>
-    <url>http://panoramapoint.com/</url>
-    <descr>High power design, high power hosting.</descr>
-    <email>alex@panoramapoint.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Passage Networking, Inc. </name>
-    <url>http://www.passage.net/</url>
-    <descr>Internet and Novell Networking for Tuscaloosa, AL</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Pavilion Internet plc</name>
-    <url>http://www.pavilion.net/</url>
-    <descr>Internet Service Provider on the south coast of England</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PC Design</name>
-    <url>http://www.pcdesign.co.yu/</url>
-    <descr>PC Hardware &amp; Software, Linux distributions, .....</descr>
-    <email>komac@sezampro.yu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PC Guardian</name>
-    <url>http://www.pcguardian.com/</url>
-    <descr>Maker of anti-theft hardware and encryption software for personal computers</descr>
-    <email>sross@pcguardian.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PCArts</name>
-    <url>http://boruta.pcarts.tarnow.pl/</url>
-    <descr>Computer Store in Tarnow, Poland</descr>
-    <email>root@boruta.pcarts.tarnow.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PChome ONLINE</name>
-    <url>http://www.todo.com.tw/</url>
-    <descr>Chinese portal &amp; Search engine in Taiwan</descr>
-    <email>rimmon@pchome.com.tw</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>pchost.com</name>
-    <url>http://www.pchost.com/</url>
-    <descr>Web hosting and design</descr>
-    <email>kyle@pchost.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PCity Company</name>
-    <url>http://pcity.ru/</url>
-    <descr>Online PC store</descr>
-    <email>dvp@pcity.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>pds(plandosee) Inc.</name>
-    <url>http://www.pds-net.co.jp/</url>
-    <descr>Internet marketing and management in Sapporo, Japan</descr>
-    <email>admin@pds-net.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>peciatky-vizitky</name>
-    <url>http://PECIATKY.SK/</url>
-    <descr>stamps</descr>
-    <email>PECIATKY@PECIATKY.SK</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PEGASUS SEWING MACHINE</name>
-    <url>http://www.pegasus.co.jp/</url>
-    <descr>INDUSTRIAL SEWING MACHINE MANUFACTURING AND SALE</descr>
-    <email>gakuji@pegasus.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Peninsula Technikon</name>
-    <url>http://www.pentech.ac.za/</url>
-    <descr>Techical College</descr>
-    <email>alexandemr@infoserv.pentech.ac.za</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Perceptive Solutions AB</name>
-    <url>http://www.perceptive.se/</url>
-    <descr>System integration and development consulting services</descr>
-    <email>tohu@perceptive.se</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Perceval Technologies</name>
-    <url>http://www.perceval.net/</url>
-    <descr>Belgium based ISP providing shared and dedicated web hosting packages</descr>
-    <email>info@perceval.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Perforce Software</name>
-    <url>http://www.perforce.com/</url>
-    <descr>PERFORCE -- The Fast Software Configuration Management System</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PERnet Communications, Inc.</name>
-    <url>http://www.pernet.net/</url>
-    <descr>Largest local ISP in Southeast Texas</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Perureseller</name>
-    <url>http://www.perureseller.net/</url>
-    <descr>Peruvian Internet Portal for computer business</descr>
-    <email>cprieto@perureseller.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PeterLink Web</name>
-    <url>http://web.peterlink.ru/</url>
-    <descr>Hosting Company</descr>
-    <email>webmaster@peterlink.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Peterson</name>
-    <url>http://www.peterson.nl/</url>
-    <descr>Peterson is an internationally operating group of companies specialising in the combination of dedicated logistic services, quality and quantity control and risk management. It is a privately held group, founded in 1920 in Rotterdam, the Netherlands.</descr>
-    <email>bvdijk@peterson.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Phear.Net</name>
-    <url>http://www.phear.net/</url>
-    <descr>web site design, web hosting &amp; computer services</descr>
-    <email>jim@phrantic.phear.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Philworld Online Pangasinan</name>
-    <url>http://www.pang.pworld.net.ph/</url>
-    <descr>The fastest satellite based ISP in Pangasinan</descr>
-    <email>joel@pang.pworld.net.ph</email>
-  </entry>
-  
-  <entry type="commercial">
-    <name>Phobos Peripherals</name>
-    <url>http://www.phobosinc.com</url>
-    <descr>Phobos designs &amp; manufactures PCI Ethernet cards supporting FreeBSD.</descr>
-    <email>jim@phobosperipherals.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Phoenix Computer Specialists</name>
-    <url>http://www.pcslink.com/</url>
-    <descr>Phoenix AZ, ISP and VAR</descr>
-    <email>ryan@pcslink.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Phoenix DataNET's DALnet Southern US IRC Hub.</name>
-    <url>http://www.phoenix.net/~leigh/dalnet/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Phoenix Internet Technologies, Inc.</name>
-    <url>http://www.pitnet.net/</url>
-    <descr>ISP based in Milwaukee, WI</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Photon Research Associates</name>
-    <url>http://www.photon.com</url>
-    <descr>Aerospace related R&amp;D, modeling and simulation</descr>
-    <email>matt@photon.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PICS Online!</name>
-    <url>http://www.pics.com/</url>
-    <descr>Internet Services</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>pil.dk</name>
-    <url>http://www.pil.dk/</url>
-    <descr>PIL - Professionelle Internet Loesninger</descr>
-    <email>drift@pil.dk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PizzaNet GbR</name>
-    <url>http://www.PizzaNet.de/</url>
-    <descr>Offering Online Pizza Services in Germany</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PlanetHobby.com</name>
-    <url>http://www.planethobby.com/</url>
-    <descr>Seller of competition R/C and control line hobby products</descr>
-    <email>webmaster@planethobby.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PLATINUM Technology</name>
-    <url>http://www.platinum-ebs.com/</url>
-    <descr>Enterprise software &amp; consulting services</descr>
-    <email>webmaster@www.platinum-ebs.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Playboy Enterprises, Inc.</name>
-    <url>http://www.playboy.com/</url>
-    <descr>Playboy, Playboy Magazine</descr>
-    <email>jamie@playboy.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Playdude</name>
-    <url>http://www.playdude.com/</url>
-    <descr>Multimedia search engine. Using FreeBSD on all servers, the webserver and the servers behind like the database server and application server.</descr>
-    <email>webmaster@playdude.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Playgal, Inc.</name>
-    <url>http://www.playgal.com/</url>
-    <descr>Enterprise company which owns several international Adult web sites.</descr>
-    <email>webmaster@playgal.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Pluto Technologies International Inc.</name>
-    <url>http://www.plutotech.com/</url>
-    <descr>High bandwidth Video Disk and RAID arrays running embedded FreeBSD</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Pocket.com, Inc</name>
-    <url>http://www.pocket.com/</url>
-    <descr>Using FreeBSD for development and web servers</descr>
-    <email>brian.nelson@corp.pocket.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Pol-Miedz Trans Sp. z o.o.</name>
-    <url>http://www.pmtrans.com.pl/</url>
-    <descr>Transport, train, oil dealer Company from Lubin, Poland</descr>
-    <email>admin@pmtrans.com.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PolyServe</name>
-    <url>http://www.polyserve.com/</url>
-    <descr>High-availability webserver monitoring and failover utilties for FreeBSD.</descr>
-    <email>vin@polyserve.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Popular Computer Week(PCW) </name>
-    <url>http://www.cpcw.com/</url>
-    <descr>Popular Computer Week (PCW), the only newspaper of</descr>
-    <email>chouyu@cpcw.whyes.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Port Professional Communications</name>
-    <url>http://portpc.spb.ru/</url>
-    <descr>Internet Service Provider</descr>
-    <email>support@portpc.spb.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Portland Software</name>
-    <url>http://www.portsoft.com/</url>
-    <descr>Secure Electronic Software Distribution</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Potiron Inform&aacute;tica</name>
-    <url>http://www.potiron.com.br/</url>
-    <descr></descr>
-    <email>celio_jr@yahoo.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Prisma Verlag &amp; Online KG</name>
-    <url>http://www.prisma-online.de/</url>
-    <descr>Online TV guide (germany)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PrismNet, Inc</name>
-    <url>http://www.prismnet.com/</url>
-    <descr>ISP in Austin, TX.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Private enterprise SOFTLAND, Ukraine</name>
-    <url>http://www.softland.rv.ua/</url>
-    <descr>Complex solutions provider, software developer</descr>
-    <email>german@rivne.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Pro-Net Internet Services</name>
-    <url>http://www.pro-net.net/</url>
-    <descr>A Missouri/Kansas Based Internet Service Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Professional Computer Center Ltd</name>
-    <url>http://www.pcconnet.com/</url>
-    <descr>Web housing and hosting, networking consultant</descr>
-    <email>steve@pcconnet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Projesom Internet Connect</name>
-    <url>http://www.projesom.net/</url>
-    <descr>Internet Provider</descr>
-    <email>jluiz@projesom.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ProKK</name>
-    <url>http://www.prokk.uzhgorod.ua/</url>
-    <descr>ISP in Mukachevo, Ukraine</descr>
-    <email>webmaster@prokk.uzhgorod.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Proline Network Systems</name>
-    <url>http://www.proline.at/</url>
-    <descr>Network and Security Services</descr>
-    <email>webadmin@proline.at</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Prometeo srl</name>
-    <url>http://www.prometeo.it/</url>
-    <descr>Computer Science Projects And Methodologies</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PROPEL Inc.</name>
-    <url>http://www.propel.ne.jp/</url>
-    <descr>Internet Service Provider</descr>
-    <email>netadmin@propel.ne.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Prosolve</name>
-    <url>http://www.prosolve.com</url>
-    <descr>Network Infrastructure and Security Consulting</descr>
-    <email>seanm@prosolve.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Protectix, Inc.</name>
-    <url>http://www.protectix.com/</url>
-    <descr>Provider of Open/Free Source based internet security appliances and outsourced security management.</descr>
-    <email>web@protectix.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Psi-Domain</name>
-    <url>http://www.psi-domain.co.uk/</url>
-    <descr>UK Based FreeBSD and Linux Hardware and Software solutions provider</descr>
-    <email>heckfordj@psi-domain.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PT Telkom UBIS Internet DIVRE5 (E-Commerce)</name>
-    <url>http://www.jatimmall.com</url>
-    <descr>Jatim E-Commerce site</descr>
-    <email>sandy@divre5.telkom.co.id</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PT Telkom UBIS Internet DIVRE5</name>
-    <url>http://www.telkom.net</url>
-    <descr>Telecommication Portal service</descr>
-    <email>sandy@divre5.telkom.co.id</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PT. Telkomsel Indonesia</name>
-    <url>http://www.telkomsel.com/</url>
-    <descr>Cooporate Website</descr>
-    <email>roy@telkomsel.co.id</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PTT-Teleport Moscow</name>
-    <url>http://crocodile.ptt.ru/</url>
-    <descr>ISP in Moscow. Channel provider in Moscow.</descr>
-    <email>webmaster@ptt.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>purplecat.net</name>
-    <url>http://www.purplecat.net/</url>
-    <descr>Superior quality web hosting at competitive rates.</descr>
-    <email>pbrezny@purplecat.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PUTiRB</name>
-    <url>http://www.drogowiec.kielce.pl/</url>
-    <descr>A printing house, located in Kielce, Poland</descr>
-    <email>bystry@drogowiec.kielce.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PVNet</name>
-    <url>http://www.pvnet.com.mx/</url>
-    <descr>ISP in Puerto Vallarta, Mexico.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Pytteinfo AB</name>
-    <url>http://www.pytteinfo.com/</url>
-    <descr>Internet service provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Q Logic Solutions</name>
-    <url>http://www.qlogic.net/</url>
-    <descr>Intranet and Web Development Company</descr>
-    <email>info@q-logic.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Q-Prime IS</name>
-    <url>http://www.q-prime.net/</url>
-    <descr>Q-Prime Internet Services</descr>
-    <email>wim@q-prime.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>QAZNET Project</name>
-    <url>http://www.qaznet.ru/</url>
-    <descr>LAN/WAN consulting</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>QuadraNet Internet Services</name>
-    <url>http://www.qnis.net/</url>
-    <descr>ISP in Fresno, CA</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Quality Benefits Inc.</name>
-    <url>http://www.qualitybenefits.com/</url>
-    <descr>General Insurance</descr>
-    <email>info@QualityBenefits.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Quality Transportation</name>
-    <url>http://www.quality-transportation.com/</url>
-    <descr>Flatbed Trucking Company</descr>
-    <email>mattg@quality-transportation.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Quanta Communications, Inc.</name>
-    <url>http://www.quanta.com/</url>
-    <descr>ISP, Rye, New York</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Quantum Networking Solutions, Inc.</name>
-    <url>http://www.qnet.com/</url>
-    <descr>ISP in Palmdale, CA USA</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>QUEST</name>
-    <url>http://www.quest.pl/</url>
-    <descr>ISP in Poznan,Poland</descr>
-    <email>robert@quest.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Quest-Networks</name>
-    <url>http://www.quest-networks.net</url>
-    <descr>Amazing new &amp; powerful cyberbunker.  Network Hosting starting at $5.99 a month or 10% off any competitors lowest price!! Co-Loc and Virtual Servers AVAILABLE at 5% off the lowest competitive price</descr>
-    <email>sales@quest-networks.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>QuickWeb</name>
-    <url>http://www.quickweb.com/</url>
-    <descr>No-nonsense, high-end web development and hosting services.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Quiknet, Inc.</name>
-    <url>http://www.quiknet.com</url>
-    <descr>Sacramento-based ISP</descr>
-    <email>info@quiknet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Radical Internet</name>
-    <url>http://www.rad-inet.com/</url>
-    <descr>Internet Instructure R&amp;D</descr>
-    <email>aryeh@rad-inet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Radiophone Compani</name>
-    <url>http://www.mupitt.penza.su/</url>
-    <descr>ISP Zarechny area Penza Russia</descr>
-    <email>vlad@19.penza.su</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Raditex AB</name>
-    <url>http://www.raditex.se/</url>
-    <descr>Consultant and education on FreeBSD (Sweden)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ramshaw-Smith Real Estate Brokerage</name>
-    <url>http://www.ramshaw.com</url>
-    <descr>Large commercial real estate company</descr>
-    <email>pea@ramshaw.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Rapid Yazilim Inc</name>
-    <url>http://www.rapid-server.com/</url>
-    <descr>Web Hosting Machine + CVS</descr>
-    <email>alp@rapid-server.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Rapiddata Communications</name>
-    <url>http://lifted.rapiddata.com/</url>
-    <descr>Internet Solutions Provider, Glenside Pennsylvania, USA</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ratmir-Telekom</name>
-    <url>http://www.rtelekom.ru</url>
-    <descr>ISP, high-speed Internet Radio-Ethernet</descr>
-    <email>romus@rtelekom.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Razorfish</name>
-    <url>http://www.razorfish.com/</url>
-    <descr>digital solutions, using FreeBSD for image processing, various network infrastructure components, etc</descr>
-    <email>mohan@razorfish.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RCCS-SPB</name>
-    <url>http://www.rccs.spb.ru/</url>
-    <descr>Saint Petersburg Estimating Centre</descr>
-    <email>devel@rccs.spb.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RCI</name>
-    <url>http://www.rci.net/</url>
-    <descr>Intranets.  Extranets.  Internet.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RCLI, Inc.</name>
-    <url>http://www.dingcalpe.org/</url>
-    <descr>Investment Firm</descr>
-    <email>rodin@dingcalpe.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Reality Check Information</name>
-    <url>http://www.primelocation.net/</url>
-    <descr>Florida-based Realtor/MLS Information Service</descr>
-    <email>admin@primelocation.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Rebel Networks Ltd.</name>
-    <url>http://www.rebel-net.co.uk/</url>
-    <descr>UNIX and Linux only Internet Service Provider</descr>
-    <email>webmaster@rebel-net.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>REBOL Technologies</name>
-    <url>http://www.rebol.com/</url>
-    <descr>A platform-independent, network messaging language for exchange &amp; interpretation of data</descr>
-    <email>dan@rebol.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Reboot Internet Solutions</name>
-    <url>http://www.reboot.cx/</url>
-    <descr>Quality online webhosting and other internet solutions</descr>
-    <email>admin@reboot.cx</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Red Altos Internet</name>
-    <url>http://www.redaltos.com.mx/</url>
-    <descr>El mejor proveedor de acceso a Internet desde Lagos de Moreno</descr>
-    <email>alan@redaltos.com.mx</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Red Rose</name>
-    <url>http://www.red-rose.ru/</url>
-    <descr>Red Rose</descr>
-    <email>root@red-rose.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Redamp</name>
-    <url>http://www.redamp.com.br/</url>
-    <descr>Provedor de acesso a Internet (Brasil)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ReefNet, Inc.</name>
-    <url>http://www.reefnet.com/</url>
-    <descr>ISP in the florida keys</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Reflections Of Time Photography</name>
-    <url>http://reflections.1st.net/</url>
-    <descr>Offering All Of Ohio Professional Photography Services</descr>
-    <email>kylehittle@hotmail.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Reklamaster</name>
-    <url>http://www.reklamaster.com/</url>
-    <descr>Ukrainian portal for adpeople</descr>
-    <email>serge@dialla.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Reliable Internet and Network Solutions, LLC</name>
-    <url>http://www.rinsolutions.com</url>
-    <descr>Website Hosting and Computer Network Solutions</descr>
-    <email>sales@rinsolutions.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Reliv International</name>
-    <url>http://www.reliv.com/</url>
-    <descr>Manufacture of High Tech Food Supplements</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ReplyNet, Inc.</name>
-    <url>http://www.reply.net/</url>
-    <descr>An electronic fulfillment/data collection service for publishers and general business</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>REST ltd</name>
-    <url>http://www.rest.ru/</url>
-    <descr>ISP in Yekaterinbur, Russia</descr>
-    <email>sergey@rest.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Rexx ISP</name>
-    <url>http://www.rexx.com/</url>
-    <descr>Internet Service Provider</descr>
-    <email>webmaster@rexx.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RF Communications, Inc.</name>
-    <url>http://www.rfcinc.com/</url>
-    <descr>Telecommunications and internet provider in the Chicago, IL area.</descr>
-    <email>mattc@rfcnet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RHCE Networks</name>
-    <url>http://www.rhce.net/</url>
-    <descr>RHCE Networks</descr>
-    <email>wwang@home.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RHCE Networks --- US mirror Site</name>
-    <url>http://c36196-a.frmt1.sfba.home.com/</url>
-    <descr>RHCE Networks --- US Mirror Site</descr>
-    <email>wwang@home.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RingZero Computing</name>
-    <url>http://www.ringzero.com/</url>
-    <descr>Internet consulting and development.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Rinotronic snc di De Maio S. &amp; C.</name>
-    <url>http://www.rinotronic.it/</url>
-    <descr>Internet services</descr>
-    <email>demaio@rinotronic.it</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ripple Promotions LTD</name>
-    <url>http://www.indiekid.co.uk/</url>
-    <descr>Club Promotions</descr>
-    <email>scot@indiekid.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RISC Technology Europe</name>
-    <url>http://www.risc-tech.com/</url>
-    <descr>Grossiste UNIX/NT Internet</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RISS-Telecom</name>
-    <url>http://www.riss-telecom.ru/</url>
-    <descr>wireless telecommunications</descr>
-    <email>webmaster@riss-telecom.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>River Industry Bulletin Board (R.I.B.B.)</name>
-    <url>http://www.ribb.com/</url>
-    <descr>The information source for inland waterways towing industry news.</descr>
-    <email>webmaster@ribb.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Rivne Global Networks</name>
-    <url>http://www.ukrwest.net/</url>
-    <descr>Ukrainian ISP</descr>
-    <email>info@ukrwest.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RJM Consulting</name>
-    <url>http://www.wilshire.net/</url>
-    <descr>Network and IntraNet Consulting</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RoamingReader.com</name>
-    <url>http://www.roamingreader.com/</url>
-    <descr>Brings the pleasure of the printed word direct to your mobile phone wherever you are.</descr>
-    <email>david@wisewalk.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Rocknel Fastener, Inc.</name>
-    <url>http://www.rocknel.com/</url>
-    <descr>Automotive Fastener Manufacturer</descr>
-    <email>webmaster@rocknel.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Roma's Internet Business Services</name>
-    <url>http://www.r-i-b-s.com/</url>
-    <descr>ISP in Fontana, CA. USA</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RON's Datacom Co., Ltd.</name>
-    <url>http://www.rons.net.cn</url>
-    <descr>the leading company in China supporting the free software movement</descr>
-    <email>info@mail.rons.net.cn</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Root Access Network Systems</name>
-    <url>http://www.root-access.com/</url>
-    <descr>Network Installations</descr>
-    <email>root@demonic.netkonect.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>rootsr</name>
-    <url>http://www.rootsr.com/</url>
-    <descr>Services for net presence</descr>
-    <email>dehartog@rootsr.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RunTime Computer Systems</name>
-    <url>http://www.runtimecs.com/</url>
-    <descr>Hardware and Software sales</descr>
-    <email>djacobse@runtimecs.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Russian Resource Inc.</name>
-    <url>http://www.russianresource.com</url>
-    <descr>Cost-effective offshore software development and custom programming</descr>
-    <email>info@russianresource.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Rustar</name>
-    <url>http://www.rustar.ru/</url>
-    <descr>Rustar INTERNET agency, Hosting and internet projects -- powered by FreeBSD</descr>
-    <email>root@rustar.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RxList - The Internet Drug Index</name>
-    <url>http://www.rxlist.com/</url>
-    <descr>A searchable database of &gt; 5000 Drugs</descr>
-    <email>rx@rxlist.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ryan Information Services</name>
-    <url>http://www.ryanis.net/</url>
-    <descr>Helping people communicate electronically</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>S h e l l S e r v e r</name>
-    <url>http://www.shellserver.net/</url>
-    <descr>A FreeBSD place for IRC shell accounts.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>S&amp;P Software v.o.f.</name>
-    <url>http://www.plantengids.com</url>
-    <descr>An online flora and gardening database</descr>
-    <email>co9@xs4all.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>S2M.NET Internet Service in Germany</name>
-    <url>http://www.s2m.net/</url>
-    <descr>Service Provider, Graphics + Design, Programming</descr>
-    <email>info@s2m.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SA</name>
-    <url>http://www.sa.net.ua/</url>
-    <descr>SpecAutomatica,  Kharkov,  UA</descr>
-    <email>admin@sa.net.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SA*Net</name>
-    <url>http://www.sanet.ge/</url>
-    <descr>ISP in Georgia (Euroasia).</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SafeMail, Inc.</name>
-    <url>http://www.safemail.com/</url>
-    <descr>ISP. WWW/Internet Business Consulting</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SafetyWeb</name>
-    <url>http://www.safetyweb.com.au/</url>
-    <descr>Specialising in High Functionality Web Site Development</descr>
-    <email>info@safetyweb.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Samond Digital Communications Inc.</name>
-    <url>http://www.samond.org.ru/</url>
-    <descr>Communications and Software Development</descr>
-    <email>samond@elcom.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Samurai Consulting</name>
-    <url>http://samurai.com/</url>
-    <descr>hosting and consulting</descr>
-    <email>bryanf@samurai.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>San Systems Servicos de Informatica ltda</name>
-    <url>http://www.san.psi.br/</url>
-    <descr>Provedor Internet - Santo Angelo - RS - Brasil</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sanctum Internet Pty Ltd</name>
-    <url>http://www.sanctum.com.au/</url>
-    <descr>Australian Web Hosting Company</descr>
-    <email>josh@sanctum.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sanyusan International AB</name>
-    <url>http://www.sanyusan.se/</url>
-    <descr></descr>
-    <email>anders@sanyusan.se</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SarangNET</name>
-    <url>http://www.sarang.net/</url>
-    <descr>Open Community Provider for the people who love free.</descr>
-    <email>sarang@sarang.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sarasota Tax Collector's Office</name>
-    <url>http://taxcollector.co.sarasota.fl.us/</url>
-    <descr>Located in Sarasota Florida</descr>
-    <email>gil@keskydee.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SBA.NET.WEB&reg;</name>
-    <url>http://www.sbanetweb.com/</url>
-    <descr>Internet Consultants/Web Designers/Hosts</descr>
-    <email>webmaster@sbanetweb.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SBE, Inc.</name>
-    <url>http://www.sbei.com/</url>
-    <descr>High Performance WAN Adapters for PCI, PMC, and CompactPCI.  Interfaces include DS3, T1/E1, HSSI, V.35, X.21bis, and more</descr>
-    <email>marketing@sbei.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SBnet</name>
-    <url>http://www.sb.net/</url>
-    <descr>Internet Service Provider</descr>
-    <email>sage@sb.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>sdata - C. Splittgerber Datentechnik</name>
-    <url>http://www.sdata.de/en/index.html</url>
-    <descr>Software development and Consulting</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SDT&amp;IT</name>
-    <url>http://www.spils.lv/</url>
-    <descr>Salaspils city local network provider</descr>
-    <email>info@spils.lv</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Search-SEC.Com Inc.</name>
-    <url>http://www.search-sec.com/</url>
-    <descr>A free site for searching SEC filings</descr>
-    <email>info@search-sec.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SearchCanada</name>
-    <url>http://www.searchcanada.ca/</url>
-    <descr>SearchCanada is a Canadian content search engine</descr>
-    <email>michael@searchcanada.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SecureNet Information Services - Montreal, Que, Canada</name>
-    <url>http://www.securenet.net/</url>
-    <descr>Internet Service Providers, Network consulting</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Seicom GmbH</name>
-    <url>http://www.seicom.net/</url>
-    <descr>Internet Service Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SENAI-DF</name>
-    <url>http://www.df.senai.br/</url>
-    <descr>Servi&ccedil;o Nacional de Aprendizagem Industrial. Departamento Regional do Distrito Federal - Brasil</descr>
-    <email>carrijo@df.senai.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Seraphworks Studios</name>
-    <url>http://www.seraphworks.com/</url>
-    <descr>Animation and Web Development Studio</descr>
-    <email>mario@seraphworks.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ServeLinux Networks, Inc.</name>
-    <url>http://www.servelinux.com/</url>
-    <descr>Leading manufacturer of Internet infrastructure equipment. 1U server from $999.</descr>
-    <email>mchiang@servelinux.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ServNet</name>
-    <url>http://www.serv.net/</url>
-    <descr>Affordable, Reliable, Experienced Internet Service (Seattle)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ServPlex, Inc.</name>
-    <url>http://www.servplex.com/</url>
-    <descr>Software for the Distribution Industry</descr>
-    <email>bill@srisoft.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sexpaper</name>
-    <url>http://sexpaper.cavecreek.net</url>
-    <descr>Enterprise company which owns several international Adult web sites</descr>
-    <email>juggs@justjuggs.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Seychelles.net</name>
-    <url>http://www.seychelles.net/</url>
-    <descr>The only ISP in The Seychelles</descr>
-    <email>muditha@seychelles.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SG Corporation</name>
-    <url>http://www.sgnet.co.jp/</url>
-    <descr>Software Development Company in Tokyo, Japan.</descr>
-    <email>okam-m@sgnet.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SGiC-Net</name>
-    <url>http://www.sgic.fi/</url>
-    <descr>ISP, Finland</descr>
-    <email>jpkh@sgic.fi</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ShadowMatrix Productions, Inc.</name>
-    <url>http://www.smprod.net/</url>
-    <descr>Gotta love the Daemon</descr>
-    <email>sok@smprod.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Shell accts</name>
-    <url>http://www.flare.dynip.com/</url>
-    <descr>pentium 120, 48MB ram, 3.3 gigs diskspace</descr>
-    <email>chrisd@flare.dynip.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Shelton Internet, Inc</name>
-    <url>http://www.sheltonbbs.com/</url>
-    <descr>Internet Service Provider in South East Missouri</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ShocK Web</name>
-    <url>http://www.shockweb.net/</url>
-    <descr>Webhosting, Shell Accounts, Webdesign</descr>
-    <email>greg@shockweb.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>showZ.com.br</name>
-    <url>http://www.showz.com.br/</url>
-    <descr>brazilian independent music, mp3, custom CDs and more...</descr>
-    <email>mau@showz.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Siberian Certification Centre</name>
-    <url>http://scc.tpu.ru/</url>
-    <descr></descr>
-    <email>iplynx@mail2000.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SibPage Co. Ltd.</name>
-    <url>http://www.sibpage.novosibirsk.ru/</url>
-    <descr>Paging service and more...</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SIC NetzWerk Center</name>
-    <url>http://www.siconline.net/</url>
-    <descr>Networking Center &amp; ISP with Novell and FreeBSD</descr>
-    <email>msauder@siconline.ch</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Siegelvision</name>
-    <url>http://www.siegelvision.com/</url>
-    <descr>web consultancy</descr>
-    <email>admin@siegelvision.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Siemens AG, Munich</name>
-    <url>http://www.siemens.de/</url>
-    <descr></descr>
-    <email>andre@curry.zfe.siemens.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sierra Health Services</name>
-    <url>http://www.sierrahealth.com/</url>
-    <descr>Largest Health Care Organization in the United States uses FreeBSD on multiple servers for NFS, Intranet, DNS, and Email.</descr>
-    <email>holloma@sierrahealth.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Silicon Networking</name>
-    <url>http://www.silicon.net/</url>
-    <descr>Internet Service Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Silverstreaming</name>
-    <url>http://www.silverstreaming.co.uk/</url>
-    <descr>Web Hosting, Domain Name registration</descr>
-    <email>info@silverstreaming.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Simple Hosting Solutions, Inc.</name>
-    <url>http://www.simphost.com/</url>
-    <descr>Webhosting, Shells, Domain Parking</descr>
-    <email>support@simphost.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Simplified Computer Solutions</name>
-    <url>http://www.simplepc.com</url>
-    <descr>Greenwood, SC -- Computers, Printers, Networks, Internet -- Technology Solutions for Small Businesses</descr>
-    <email>james.kennemore@simplepc.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Simply Internet</name>
-    <url>http://www.inetworld.net/</url>
-    <descr>ISP, San Diego California</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sintesi Net</name>
-    <url>http://www.sintesi.net/</url>
-    <descr>We're an Internet Service Provider located in Battipaglia (SA) Italy. We offer network software and services and mainly use FreeBSD to develop and deploy our products.</descr>
-    <email>rlucia@utopianet.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sinthesys sas - Perugia (Italy)</name>
-    <url>http://www.sinth.krenet.it/</url>
-    <descr>Internet Service Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sirius Connectrions</name>
-    <url>http://www.sirius.com/</url>
-    <descr>Internet Service Provider for Northern California</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SiSNet S.A. de C.V.</name>
-    <url>http://www.sisnet.net.mx/</url>
-    <descr>ISP on Queretaro, Mexico</descr>
-    <email>webmaster@sisnet.net.mx</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SitesNow!</name>
-    <url>http://www.sitesnow.com/</url>
-    <descr>Internet Presence Providers : Ecommerce, DB and Custom Solutions (Cleveland Ohio)</descr>
-    <email>bsears@sitesnow.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SIWEI Group Corp.</name>
-    <url>http://www.siwei.com/</url>
-    <descr>pharmaceuticals, tours, modern livestocks</descr>
-    <email>siwei@public.tappt.sd.cn</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SKS Internet Consultant</name>
-    <url>http://www.sks.eti.br/</url>
-    <descr>FreeBSD Consultant - Intranet/Extranet in south of Brazil</descr>
-    <email>contato@sks.eti.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SKYNET Open Systems Lab.</name>
-    <url>http://www.opennet.ru/</url>
-    <descr></descr>
-    <email>mc@skyway.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SkynetWEB</name>
-    <url>http://www.skynetweb.com/</url>
-    <descr>Internet Presence Professionals</descr>
-    <email>pryker@skynetweb.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SlashHosting - Im1 Web Hosting</name>
-    <url>http://www.slashhosting.com</url>
-    <descr>Slash Code and PHP-Nuke based Hosting</descr>
-    <email>bill@im1.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SlashHosting.com</name>
-    <url>http://www.slashhosting.com/</url>
-    <descr>Hosting for SlashCode based sites (like slashdot)</descr>
-    <email>hostmaster@im1.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Slingo Computers</name>
-    <url>http://www.slingo.nq.nu/</url>
-    <descr>Small computer business in Australia</descr>
-    <email>mark@slingo.nq.nu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Smalltalk.org</name>
-    <url>http://www.smalltalk.org/</url>
-    <descr>Primary web site for the Smalltalk Object Oriented Language.</descr>
-    <email>peter@smalltalk.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Smart Systems Technology, Ltd.</name>
-    <url>http://smart.net.az/</url>
-    <descr>The best software company in Azerbaijan</descr>
-    <email>tars@smart.net.az</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Smartcanal</name>
-    <url>http://www.smartcanal.com/</url>
-    <descr>E-Learning Solutions</descr>
-    <email>nsaillet@smartcanal.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Smartmedia SRL / Publin</name>
-    <url>http://www.smartmedia.com.ar/</url>
-    <descr>Virtual and NonVirtual Web Hosting, Web Design &amp; Development</descr>
-    <email>mrod@smartmedia.com.ar</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Smartsoft, LLC</name>
-    <url>http://www.smartsoft.cc/</url>
-    <descr>Software Development for FreeBSD in C/C++</descr>
-    <email>jan@smartsoft.cc</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SML Online Ltd</name>
-    <url>http://www.smlnet.com/</url>
-    <descr>ISP, UK</descr>
-    <email>admin@smlt.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sodick Engineering Co.,Ltd.</name>
-    <url>http://www.seng.co.jp/</url>
-    <descr>CAD/CAM/CAE System Developer, Solution Provider.</descr>
-    <email>midorikawa@seng.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Softeam applicazioni di base</name>
-    <url>http://www.softeam.it/</url>
-    <descr>ISP in Italy</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Softronex Corporation</name>
-    <url>http://www.softronex.com/</url>
-    <descr>Pagetrak(c) System. Alphanumeric Entry Systems for handling large message centers (live operators) in paging companies.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Software Development Systems, Inc.</name>
-    <url>http://www.sdsi.com/</url>
-    <descr>Debuggers and Emulators for Embedded Controllers</descr>
-    <email>hal_snyder@sdsi.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Software Forge Inc.</name>
-    <url>http://www.linuxcad.com/</url>
-    <descr>LinuxCAD</descr>
-    <email>unixguy@aol.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>softwarebuero m&amp;b</name>
-    <url>http://www.softwarebuero.de/wipeout-eng.html</url>
-    <descr>WipeOut - C++/Java Integrated Development Environment</descr>
-    <email>info@softwarebuero.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Softweyr LLC</name>
-    <url>http://www.xmission.com/~softweyr/</url>
-    <descr>Network design and software development specialists</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SOHO, Incorporated</name>
-    <url>http://www.4com.ru/</url>
-    <descr>Web outsourcing provider</descr>
-    <email>vick@soho.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sol-3 GmbH&amp;Co KG</name>
-    <url>http://www.sol-3.de</url>
-    <descr>Financial IT Solutions.</descr>
-    <email>sales@sol-3.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Solartech Networks</name>
-    <url>http://www.solartech.net</url>
-    <descr>Networking services, ASP-consulting and programming, datasec-support</descr>
-    <email>toyboy@iobox.fi</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Soligen, Incorporated</name>
-    <url>http://www.PartsNow.com/</url>
-    <descr>Build-to-order metal castings in days!</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SolIT AG Solutions for IT</name>
-    <url>http://www.solit-ag.com/</url>
-    <descr>SAP Consulting, Development and more</descr>
-    <email>holger.kipp@solit-ag.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SolNet</name>
-    <url>http://www.solnet.ch/</url>
-    <descr>Internet Solution Provider, Switzerland</descr>
-    <email>mbinz@solnet.ch</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SoloNet Internet Services.</name>
-    <url>http://www.solo.net/SoloNet/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Some Fly By Night Company</name>
-    <url>http://SomeFlyByNightCompany.com/</url>
-    <descr>Bringing OPERATING SYSTEMS to the masses!</descr>
-    <email>SomeFlyByNightCo@aol.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SONET - Servi&ccedil;os Internet, Lda</name>
-    <url>http://www.sonet.pt/</url>
-    <descr>Co-Location Services</descr>
-    <email>sonet@mail.sonet.pt</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sonnek Communications</name>
-    <url>http://www.soncom.com/</url>
-    <descr>Minnesota Based ISP</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sony Corporation</name>
-    <url>http://www.sony.co.jp/</url>
-    <descr>Electronics</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sony Webtv Microsoft Network Corp.</name>
-    <url>http://www.msnbc.com/</url>
-    <descr>About 900+ visit on my website</descr>
-    <email>Matushoes@webt.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SOS Group</name>
-    <url>http://www.sos.com/</url>
-    <descr>Wireless, commercial grade, e-mail and text messaging software starting at $199.00</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Soultwins RainbowDreams WebDesign</name>
-    <url>http://design.soultwins.com</url>
-    <descr>SoulTwins RainbowDreams Webdesign offers home users and businesses of any kind THE affordable webpage. For information please contact soultwins@soultwins.com or visit our webpage at http://design.soultwins.com</descr>
-    <email>soultwins@soultwins.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>South East Network Solutions</name>
-    <url>http://vk5ham.au.com/</url>
-    <descr>Information Technology Consultants</descr>
-    <email>sens@vk5ham.au.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>South Tech Internet Services</name>
-    <url>http://www.stech.psi.br/</url>
-    <descr>Web-Hosting and co-lo provider in Brasil and San Jose, CA.</descr>
-    <email>cvianna@stech.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Soveran</name>
-    <url>http://www.soveran.com</url>
-    <descr>Leader Multimedia &amp; Internet Consultant in Argentina</descr>
-    <email>info@soveran.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sowah (H.K.) Limited</name>
-    <url>http://www.sowah.com/</url>
-    <descr>Computer products and Internetworking in Hong Kong</descr>
-    <email>kclau@sowah.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Space Research Group</name>
-    <url>http://www.space-research.com/</url>
-    <descr>UNIX/Internet consulting, X programming</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SpaceIllusion, Inc.</name>
-    <url>http://www.spaceillusion.com/english</url>
-    <descr>3D Realtime dancing MP3 player provider</descr>
-    <email>kimhs20@spaceillusion.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SpaceNet</name>
-    <url>http://www.space.net/</url>
-    <descr>SpaceNet is one of the leading Internet Service Providers for business customers in Germany.</descr>
-    <email>info@space.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SpaceView.Net</name>
-    <url>http://www.spaceview.net</url>
-    <descr>Space Flight related news / Now providing web hosting</descr>
-    <email>npolcz@spaceview.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SPaSE BV</name>
-    <url>http://www.spase.com/</url>
-    <descr>SPaSE designs Multimedia Chips (MPEG2/CDI/VIDECD)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Special Design Agency</name>
-    <url>http://ikar.elect.ru/</url>
-    <descr>Multicomputing fault-tolerance systems under FreeBSD</descr>
-    <email>pavel@ikar.elect.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SSI Data Systems</name>
-    <url>http://www.opulence.com/</url>
-    <descr>Consumer Marketplace</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Stadab Norrk ping</name>
-    <url>http://www.nrkp.stadab.se/</url>
-    <descr>ISP in Sweden.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>StarGazer Internet Services</name>
-    <url>http://www.stargazer.net/</url>
-    <descr>Provides Internet Access and Most Internet Services</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Starline STL Group</name>
-    <url>http://www.stl-group.com/</url>
-    <descr>Internet services</descr>
-    <email>j.baggen@stl-group.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>STARMASTER INC.</name>
-    <url>http://www.starmaster.net/</url>
-    <descr>INTERNET HOST &amp; INTERNET SERVICES.</descr>
-    <email>jademox7@starmaster.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>StarMedia</name>
-    <url>http://www.starmedia.com/</url>
-    <descr>StarMedia Network Inc.</descr>
-    <email>postmaster@starmedia.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>StationSoft</name>
-    <url>http://www.stationsoft.fr/</url>
-    <descr>Solutions UNIX NT Internet</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Stavropol Municipal Telephone Network</name>
-    <url>http://www.smtn.stavropol.ru/</url>
-    <descr>Voice &amp; Data Transfere</descr>
-    <email>root@smtn.stavropol.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Step Support Co,.Ltd</name>
-    <url>http://www.step-support.co.jp/</url>
-    <descr>Free BSD Education in Tokyo</descr>
-    <email>info@step-support.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>StickyWeb</name>
-    <url>http://www.mystickyweb.com/</url>
-    <descr>Browser-based website design and hosting, including full WYSIWYG editing, drag-n-drop positioning,  database connectivity, etc...</descr>
-    <email>webmaster@mystickyweb.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Stile Project</name>
-    <url>http://www.stileproject.com/</url>
-    <descr>One of the busiest adult oriented site on the internet</descr>
-    <email>kevin@stileproject.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Stins Coman Corp.</name>
-    <url>http://piglet.stins.msk.su/</url>
-    <descr>System Integrator company in Russia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Stonekeep Consulting</name>
-    <url>http://www.stonekeep.com/</url>
-    <descr>Makers of Keystone - a web-based problem management and ticketing system.</descr>
-    <email>webmaster@stonekeep.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Strandloop</name>
-    <url>http://www.strandloop.com/</url>
-    <descr>New Media Agency</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>StrangeSoft Inc</name>
-    <url>http://www.stranger.com/</url>
-    <descr>Internet and Unix consulting</descr>
-    <email>yg@stranger.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Strongweb Dot Com Sdn Bhd</name>
-    <url>http://www.strongweb.com/</url>
-    <descr>WAP consultants, developers. WAP solutions turn on FreeBSD to serve major network providers in Malaysia. Carrier-Class solutions</descr>
-    <email>wap@strongweb.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SU-Online</name>
-    <url>http://www.suonline.net</url>
-    <descr>Internet Service Provider</descr>
-    <email>admin@suonline.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SulTelecom Networking</name>
-    <url>http://www.sultelecom.net</url>
-    <descr>ISP in Brazil</descr>
-    <email>eduardo@sultelecom.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Summersault</name>
-    <url>http://www.summersault.com/</url>
-    <descr>Website Design and Hosting</descr>
-    <email>info@summersault.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sun Microsystems, Inc.</name>
-    <url>http://www.sun.com/</url>
-    <descr>Computer hardware &amp; software company</descr>
-    <email>scott.mcnealy@corp.sun.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sundial Internet Services</name>
-    <url>http://www.sundial.net/</url>
-    <descr>Brilliant Solutions, for All Your Internet Needs!</descr>
-    <email>sysadmin@sundial.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sungrove Web</name>
-    <url>http://sungroveweb.com/</url>
-    <descr>Web Design service</descr>
-    <email>brett@sungroveweb.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sunland Resource Inc.</name>
-    <url>http://www.srisoft.com/</url>
-    <descr>Software for the Distribution Industry</descr>
-    <email>peter@srisoft.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sunrise (Rostov branch)</name>
-    <url>http://www.sunrise-art.ru/</url>
-    <descr>Web server of a Rostov-na-Donu branch of Sunrise company, the largest computer, peripherals and multimedia product sales company on a South of Russia.</descr>
-    <email>webmaster@sunrise-art.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Superior Net</name>
-    <url>http://www.superior.net/</url>
-    <descr>ISP, New York NY.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SuperWebHost.Com</name>
-    <url>http://www.superwebhost.com/</url>
-    <descr>Web Hosting Provider</descr>
-    <email>sales@superwebhost.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SurfSpinner Internet Communication</name>
-    <url>http://www.surfspin.com/</url>
-    <descr>Webhosting and Development Company</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SWITCH-TI</name>
-    <url>http://www.switch-ti.com/</url>
-    <descr>R&eacute;alisation de sites internet &agrave; valeur ajout&eacute;e, h&eacute;bergement de sites, firewall</descr>
-    <email>sw@switch-ti.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Syn-Work Media, Inc</name>
-    <url>http://www.synwork.com/</url>
-    <descr>WWW Development &amp; Hosting, Life Safety, Systems Integration.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Syncron Tech Oy</name>
-    <url>http://www.syncrontech.com/</url>
-    <descr>Process information tools and expert services for process industry</descr>
-    <email>jussi.kontola@syncrontech.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Synercom AS</name>
-    <url>http://www.zzz.ee/</url>
-    <descr>Estonian media server</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Synthcom Systems, Inc.</name>
-    <url>http://www.synthcom.com/</url>
-    <descr>Synthesizer and musical instrument related products</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Syntunix Technologies</name>
-    <url>http://www.syntunix.com/</url>
-    <descr>Windows NT/UNIX password synchronization and administration solutions</descr>
-    <email>jmiller@syntunix.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>System Brains Co., LTD.</name>
-    <url>http://www.sysbrains.co.jp/</url>
-    <descr>Software house in Japan</descr>
-    <email>webmaster@sysbrains.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SystemPlanning,Inc.</name>
-    <url>http://www.spi.ne.jp/</url>
-    <descr>Network Service in Japan</descr>
-    <email>webmaster@spi.ne.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>T&amp;T di Davide Tom&egrave;</name>
-    <url>http://www.tome.it/</url>
-    <descr>Internet online services and consulting</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Talou Internet Services Corp.</name>
-    <url>http://www.talou.net/</url>
-    <descr>ISP</descr>
-    <email>carl@talou.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tarjema</name>
-    <url>http://www.tarjema.com/</url>
-    <descr>Arabic Translation/Network Management</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tasam</name>
-    <url>http://www.tasam.com/</url>
-    <descr>Shell Accounts, Web Pages, and much much more!</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TBI, Ltd.</name>
-    <url>http://www.inna.net/</url>
-    <descr>ISP, Gloucester, Virginia.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tech Info Pty Ltd</name>
-    <url>http://www.techinfo.com.au/</url>
-    <descr>FreeBSD is operating our proxy server</descr>
-    <email>webmaster@techinfo.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Techmaster Servicos em Informatica LTDA</name>
-    <url>http://www.techmaster.com.br/</url>
-    <descr>Empresa de desenvolvimento de softwares / venda de equipamentos / consultoria em Unix e Internet / Projetos de rede - cabeamento e outras especialidades na area de informatica.</descr>
-    <email>cartola@techmaster.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Technology Communication Centre, Russia, Sochi</name>
-    <url>http://sochi.net.ru/</url>
-    <descr>Phone service, ISP</descr>
-    <email>postmaster@sochi.net.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tecno Software</name>
-    <url>http://www.tecnosoft.ch/</url>
-    <descr>Imaging/Workflow Development</descr>
-    <email>gruenig@tecnosoft.ch</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Teddy Bare Modeling</name>
-    <url>http://www.thebeavershack.com/</url>
-    <descr>Modeling agency that specializes in nude photos for the Internet</descr>
-    <email>webmaster@thebeavershack.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Teknosoft s.r.l.</name>
-    <url>http://www.tekno-soft.com/</url>
-    <descr>Programming, service and Internetworking</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Teksupport Pty Ltd</name>
-    <url>http://www.teksupport.net.au/</url>
-    <descr>Computer Hardware Sales, Service and ISP in Melbourne Australia</descr>
-    <email>sales@teksupport.net.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tele2 UK Ltd</name>
-    <url>http://www.tele2.co.uk/</url>
-    <descr>Wireless telecommunications operator</descr>
-    <email>david.desilva@tele2.net.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Telemation Netzwerke</name>
-    <url>http://www.telemation.de/</url>
-    <descr>LAN-WAN-Corporate Networks-Citynets-Intranet/Internet-Network Management-Network Security</descr>
-    <email>aklemm@banyan.telemation.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TelePad Corporation</name>
-    <url>http://www.telepad.com/</url>
-    <descr>provides Field Force Solutions with Pen Based Laptops</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Telibrick Netoworks Corporation</name>
-    <url>http://www.telibrick.net</url>
-    <descr>Broadband Provider</descr>
-    <email>jason@telibrick.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TeraSolutions, Inc.</name>
-    <url>http://www.terasolutions.com/</url>
-    <descr>Manufacturer of rack-mount Internet servers and RAID storage systems.</descr>
-    <email>info@terasolutions.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tern Computer Technologies</name>
-    <url>http://www.tern.com.hk/</url>
-    <descr>A Software/Network Company in Hong Kong</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TerraNovaNet</name>
-    <url>http://www.terranova.net/</url>
-    <descr>Internet Service Provider in Key Largo, FL</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ThaiZone.Com</name>
-    <url>http://www.thaizone.com/</url>
-    <descr>Web Hosting in Bangkok Thailand.</descr>
-    <email>info@thaizone.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Arces Network</name>
-    <url>http://www.arces.net/</url>
-    <descr>Alternative Internet Services</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The CD-ROM Shop Puerto Rico</name>
-    <url>http://gateway.cdrshop.com/</url>
-    <descr>Web site in Spanish. Producers of multimedia CD-ROMs in Spanish; CD recording service bureau; corporate CD-ROM and Web creation. Located in Guaynabo, Puerto Rico.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Coffee Klatch</name>
-    <url>http://www.thecoffeeklatch.com/</url>
-    <descr>Internet coffeehouse in Kilgore, Texas</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Computer Design Group, Inc.</name>
-    <url>http://www.cdgroup.com/</url>
-    <descr>Network &amp; Commercial Interior Design</descr>
-    <email>lacih@cdgroup.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Computer Works</name>
-    <url>http://www.tcworks.net/</url>
-    <descr>Internet Service Provider</descr>
-    <email>ccook@tcworks.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The DE-Network</name>
-    <url>http://www.de-network.com</url>
-    <descr>Web Hosting and Web Programming for the next generation.</descr>
-    <email>hostmaster@digitalextreme.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>the digibeam netpany</name>
-    <url>http://www.digibeam.net/</url>
-    <descr>pre-bigtime Internet Services Provided</descr>
-    <email>loren@flash.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Docking Bay, Inc.</name>
-    <url>http://www.dockingbay.com/</url>
-    <descr>ISP in Jacksonville, FL</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Duck Pond Public Unix</name>
-    <url>http://dial.kfu.com/</url>
-    <descr>ISP (using FreeBSD as dialup PPP router)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Global Real Estate Registry</name>
-    <url>http://www.goglobal.com/</url>
-    <descr>A Web Advertising Company</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Grantsmanship Center</name>
-    <url>http://www.tgci.com/</url>
-    <descr>The nonprofit sector's leading source of training and funding information.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The HawkeNet Project</name>
-    <url>http://www.hawkenet.com/</url>
-    <descr>Consultation, programming and Web Development</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Illumen Group, Inc.</name>
-    <url>http://www.illumen.com/</url>
-    <descr>Internetworking consultants and web hosting in Colorado</descr>
-    <email>ekraj@illumen.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Internet Port, Inc.</name>
-    <url>http://www.inetport.com/</url>
-    <descr>ISP located in Austin, Tx.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The ISP, Inc.</name>
-    <url>http://www.theisp.net/</url>
-    <descr>An ISP in Columbia, SC, currently discarding NT for FreeBSD</descr>
-    <email>jat@theisp.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The LID STOP</name>
-    <url>http://www.lidstop.com/</url>
-    <descr>The Original Cookware Lid Organizer.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Main Drag</name>
-    <url>http://www.maindrag.com/</url>
-    <descr>Virtual Servers and Hosting</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Nerve Internet Service</name>
-    <url>http://www.thenerve.com/</url>
-    <descr>Extremely high volume reliable Web hosting company.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The NetSys Company</name>
-    <url>http://www.netsys.hn/</url>
-    <descr>Honduras' ISP</descr>
-    <email>admin@netsys.hn</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Nymserver</name>
-    <url>http://www.nymserver.com/</url>
-    <descr>Anonymous Remailer</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Only Net</name>
-    <url>http://www.theonlynet.com/</url>
-    <descr>Internet Service Provider in Salt Lake City, Utah</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Patrick J. Cordon Company</name>
-    <url>http://www.patrickcordon.com</url>
-    <descr>Business Profit Improvement Programs</descr>
-    <email>patrickcordon@aol.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Pink Pages</name>
-    <url>http://www.thepinkpages.com/</url>
-    <descr>A guide to adult content websites.</descr>
-    <email>webmaster@thepinkpages.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Pussycat Network</name>
-    <url>http://www.pussycat.net/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Reprint Mint</name>
-    <url>http://www.reprintmint.com/</url>
-    <descr>Well-known print, poster and framing store on Telegraph Avenue</descr>
-    <email>reprint@reprintmint.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Rochester Group, Inc.</name>
-    <url>http://www.rochgrp.com/</url>
-    <descr>Business Application Development and Consulting</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Stomping Grounds</name>
-    <url>http://www.stomped.com/</url>
-    <descr>6th largest gaming site on the internet.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Web Factory (Leicester) Ltd</name>
-    <url>http://www.webleicester.co.uk/</url>
-    <descr>ISP in Leicester, UK</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TheArchive</name>
-    <url>http://kcsonline.cjb.net/</url>
-    <descr>NewsGroup Mirror, an E-zine, Adult Hosting, Adult Services</descr>
-    <email>kcs@iwc.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TheBelgate.Com</name>
-    <url>http://www.thebelgate.com/</url>
-    <descr>Shells, webhosting and internet solutions company.</descr>
-    <email>jonavdb@thebelgate.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>themail Ltd.</name>
-    <url>http://www.themail.co.uk/</url>
-    <descr>Free UK ISP</descr>
-    <email>hostmaster@themail.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TheRightDeed</name>
-    <url>http://www.therightdeed.com</url>
-    <descr>helping non-profit association gain more revenue</descr>
-    <email>therightdeed@earthlink.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TheWay</name>
-    <url>http://theway.com/</url>
-    <descr>Windows and FreeBSD tech support and entertainment magazine.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>THIMAR AL JAZIRAH CORPORATION</name>
-    <url>http://www.thimar.com/</url>
-    <descr>MEDICAL SUPPLIES</descr>
-    <email>ameer_mazhar@hotmail.com, thimartac@hotmail.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Thin Blue Communications, Inc.</name>
-    <url>http://www.thinblue.net/</url>
-    <descr>Static and Dynamic Web Hosting</descr>
-    <email>maske@thinblue.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Thunder Network Technologies, Inc.</name>
-    <url>http://www.thuntek.net/</url>
-    <descr>ISP in New Mexico, USA.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Thunderhost Internet Services</name>
-    <url>http://www.thunderhost.net/</url>
-    <descr>We are dedicated to providing our users with fast and the most stable internet services around. Whether your looking for a web hosting account to host your webpage or a shell account to run an IRC server or a eggdrop.</descr>
-    <email>rage@thunderhost.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TicketWeb</name>
-    <url>http://www.ticketweb.com/</url>
-    <descr>The Online Ticketing Alternative.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TierraNet Inc.</name>
-    <url>http://www.tierranet.com/</url>
-    <descr>Web Hosting Provider</descr>
-    <email>chris@tierranet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tioga Communications, Inc</name>
-    <url>http://www.tioga.com/</url>
-    <descr>Web presence and unix shell accounts.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TLK</name>
-    <url>http://www.tlk.com/</url>
-    <descr>Dial-Up Routers, ISDN and modems</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Toledo Internet Access, Inc.</name>
-    <url>http://www.toledolink.com/</url>
-    <descr>Internet Service Provider</descr>
-    <email>jmishka@toledolink.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tone Software Corporation/</name>
-    <url>http://www.tonesoft.com/</url>
-    <descr>Automated Systems Management / Enterprise Output Management / Mainframe Productivity Tools</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tool Builders Laboratories</name>
-    <url>http://www.toolbuilders.com/</url>
-    <descr>Security audit and source code conversion from any language to any language lab.</descr>
-    <email>dvk@qwest.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>toonstoday</name>
-    <url>http://www.toonstoday.com</url>
-    <descr>indian cartoon portal</descr>
-    <email>webmasters@toonstoday.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Topend.Com.AU</name>
-    <url>http://www.topend.com.au/</url>
-    <descr>ISP in the Northern Territory Of Australia.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TOUGHBOOK.COM (Panasonic)</name>
-    <url>http://www.toughbook.com/</url>
-    <descr>Personal Computer Division, Matsushita Electric</descr>
-    <email>webmaster@ns.toughbook.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tradeweb, Inc</name>
-    <url>http://www.tradeweb.net/</url>
-    <descr>Tradeweb is a Corporate only ISP, providing ISDN and T1 service.
-      We also produce The Cyborg Firewall based on FreeBSD</descr>
-    <email>john@tradeweb.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Trainix, Inc.</name>
-    <url>http://www.trainix.com/</url>
-    <descr>Unix Computer Training</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Trancer Software Inc.</name>
-    <url>http://www.trancer.com/</url>
-    <descr>Information systems consulting and products.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TransBay.Net</name>
-    <url>http://www.transbay.net/</url>
-    <descr>ISP in Berkeley, CA. (Also U.C. Computer)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TransNet</name>
-    <url>http://www.karpaty.uzhgorod.ua/</url>
-    <descr>ISP in Transcarpathia, Ukraine</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Traxx Network</name>
-    <url>http://www.traxx.ch/</url>
-    <descr>Internet Service Provider in Switzerland</descr>
-    <email>root@traxx.ch</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Triada.bg</name>
-    <url>http://www.triada.bg/</url>
-    <descr>Bulgarian ISP.</descr>
-    <email>blazer@triada.bg</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Triax Internet Services</name>
-    <url>http://www.triax.com/</url>
-    <descr>ISP in Portland, Oregon</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Trinity Internet</name>
-    <url>http://freebsd.trinity-inet.dk/</url>
-    <descr>Running on an 486dx-66 COOL!!!</descr>
-    <email>webmaster@trinity-inet.dk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Triveda Communications, Inc.</name>
-    <url>http://www.triveda.com/</url>
-    <descr>Internet Services in Central FL</descr>
-    <email>jrowley@triveda.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TrueVisions GmbH Germany</name>
-    <url>http://www.truevisions.de</url>
-    <descr>Worldwide Services - SMS / WAP / Ringtones / Software and Application Development / System Engineering</descr>
-    <email>service@truevisions.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>trustBee</name>
-    <url>http://www.trustbee.com/</url>
-    <descr>Web &amp; DB Engineer</descr>
-    <email>yamamoto@trustbee.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TSE TeleService GmbH, WWW-consulting and -developing (Germany)</name>
-    <url>http://www.tse-online.de/</url>
-    <descr>FreeBSD is our main production platform. file-server, internet-gateway, firewall, web-server, etc.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TSN (The Saunders Network)</name>
-    <url>http://www.tsn.cc/</url>
-    <descr>Internet Service Provider</descr>
-    <email>mick@tsn.cc</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TSystems</name>
-    <url>http://www.samuel.cz/~tsystems/</url>
-    <descr>pc-hardware-software-services, web design</descr>
-    <email>ondra.tu@mirnet.cz</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tucker Communications, Inc.</name>
-    <url>http://bsd.tucker-usa.com/</url>
-    <descr>Central Michigan's Internet Service Provider</descr>
-    <email>webmaster@tucker-usa.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TUCOWS Interactive Ltd.</name>
-    <url>http://www.tucows.com/</url>
-    <descr>The Ultimate Collection Of Winsock Software</descr>
-    <email>fehr@idirect.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tumbleweed Software Corp.</name>
-    <url>http://www.tumbleweed.com/</url>
-    <descr>Leading solutions for internet delivery</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tuthsoft de Mexico</name>
-    <url>http://www.tuthsoft.com</url>
-    <descr>high-performance web design &amp; hosting services</descr>
-    <email>garza@tuthsoft.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TV Jisa by Crimea</name>
-    <url>http://www.jisatv.crimea.ua</url>
-    <descr>Jisa Net</descr>
-    <email>vic@jisatv.so-com.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TV Store</name>
-    <url>http://www.TVStore.com/</url>
-    <descr>Your site for Licensed Official Merchandise</descr>
-    <email>webmaster@tvstore.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TV3 Sweden</name>
-    <url>http://www.tv3.se/</url>
-    <descr>One of Swedens biggest commercial TV stations</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tycho Softworks</name>
-    <url>http://www.tycho.com/</url>
-    <descr>Telephony Integration Server</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Typhoon Inc.</name>
-    <url>http://www.typhoon.co.jp/indexe.html</url>
-    <descr>Consulting services serving Tokyo, Japan</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>U. C. Telecommunicatons Company</name>
-    <url>http://www.uctelecommunications.com/</url>
-    <descr>Providing Wireless Internet and LEC services</descr>
-    <email>staff@uctelecommunications.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ubermorgen</name>
-    <url>http://www.ubermorgen.com/</url>
-    <descr>media &amp; shock marketing</descr>
-    <email>hans@ubermorgen.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>UCNET</name>
-    <url>http://www.ucnet.hinet.net/</url>
-    <descr>Internet/Intranet Consulting Services, Taiwan</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>UkrTechBuild Ltd.</name>
-    <url>http://www.utsltd.kharkov.ua/</url>
-    <descr>Heavy machine building (sale) </descr>
-    <email>iesench@utsltd.kharkov.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ukrtehstroy Ltd.</name>
-    <url>http://utsltd.kharkov.ua/</url>
-    <descr></descr>
-    <email>webmaster@utsltd.kharkov.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>UkrTel</name>
-    <url>http://ukrtel.com/</url>
-    <descr>ISP in Kiev, Ukraine</descr>
-    <email>admin@ukrtel.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>UL.net</name>
-    <url>http://ul.net/</url>
-    <descr>offers high-performance web hosting services</descr>
-    <email>info@ul.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ULink</name>
-    <url>http://www.ulink.net/</url>
-    <descr>Sacramento Internet Service Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ultimate Movies</name>
-    <url>http://www.UltimateMovies.com/</url>
-    <descr>Your connection to the official sites for current theatrical releases</descr>
-    <email>webmaster@ultimatemovies.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ultimate Studios</name>
-    <url>http://www.UltimateStudios.com/</url>
-    <descr>Taking internet problems and creating innovative solutions.</descr>
-    <email>webmaster@ultimatestudios.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>UltimateTV</name>
-    <url>http://www.UltimateTV.com/</url>
-    <descr>Website for everything related to TV</descr>
-    <email>webmaster@ultimatetv.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ultra Internet</name>
-    <url>http://www.ultralink.net/</url>
-    <descr>Isp / webhosting</descr>
-    <email>admin@2ultra.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Unamax Corporation</name>
-    <url>http://www.unamax.com/</url>
-    <descr>Website Design/Hosting/ISP</descr>
-    <email>dalin@unamax.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>UNAPEN Inc</name>
-    <url>http://www.unapen.com/</url>
-    <descr>Home of your network and software development needs.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Unauthtenticated Communications</name>
-    <url>http://www.unauthenticated.com/</url>
-    <descr>Network Assessment and Penetration Experts</descr>
-    <email>jmagee@unauthenticated.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>UNetPage</name>
-    <url>http://www.unetpage.kiev.ua/</url>
-    <descr>Paging operator Kiev, Ukraine</descr>
-    <email>tech@unetpage.kiev.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>unicafe.de</name>
-    <url>http://www.unicafe.de/</url>
-    <descr>die Studenten Community - Jobs, Praktika, Wohnungen, Flugtickets, Sprachreisen</descr>
-    <email>alexxx@iltempo.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Unified Computing, LLC</name>
-    <url>http://www.unifiedcomputing.com</url>
-    <descr>Network, Security, IT consulting firm</descr>
-    <email>dag@unifiedcomputing.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>uniGATE</name>
-    <url>http://www.unigate.net/</url>
-    <descr>Internet Server Service, Japan</descr>
-    <email>info@unigate.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Uniprojekt</name>
-    <url>http://www.uniprojekt.com</url>
-    <descr>Network administration</descr>
-    <email>schmielarz@uniprojekt.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>UniSoft Ltd.-RU</name>
-    <url>http://www.murmansk.ru/</url>
-    <descr>ISP-Murmansk-RU</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>United States Wide Web (USWW)</name>
-    <url>http://usww.com/</url>
-    <descr>A - Z Web Services, Hosting, Programming, Search Engines, Banner Exchanges</descr>
-    <email>unix@usww.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Universidade do Vale do Itajai</name>
-    <url>http://www.univali.br</url>
-    <descr>Official Internet/Intranet servers based on FreeBSD/SMP servers</descr>
-    <email>papael@univali.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>UnixPower Internet Services</name>
-    <url>http://www.unixpower.com/</url>
-    <descr>Internet Service Provider</descr>
-    <email>big@kuwait-nation.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>unixstar.com</name>
-    <url>http://www.unixstar.com/</url>
-    <descr>Unix based systems architect and delivery.</descr>
-    <email>charlesr@unixstar.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>UnixTown</name>
-    <url>http://www.unixtown.net</url>
-    <descr>General *nix Resource Database</descr>
-    <email>info@unixtown.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>uphill</name>
-    <url>http://www.uphill.bc.ca/</url>
-    <descr>Consulting (Hardware, Software, Technical Documentation)</descr>
-    <email>info@uphill.bc.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>UPSYS AB</name>
-    <url>http://www.upsys.se/</url>
-    <descr>network / system consulting services, Uppsala, Sweden</descr>
-    <email>janne@upsys.se</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>URAL-EXPRESS</name>
-    <url>http://www.uralexpress.ru/</url>
-    <descr>Smart-card processing center, Russia, Perm-city</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>US Net</name>
-    <url>http://www.us.net/</url>
-    <descr>Regional ISP/NSP for the Mid-Atlantic Region</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>USA Shopper</name>
-    <url>http://usashopper.com/</url>
-    <descr>Programming, Banner Exchanges, Search Engines, Shopping Carts, Security</descr>
-    <email>unix@usashopper.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Utopia Networking</name>
-    <url>http://www.utopianet.net/</url>
-    <descr>ISP ISDN only and business services. Cava de' Tirreni, SA, Italy</descr>
-    <email>rlucia@utopianet.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>UUNET Internet Africa</name>
-    <url>http://www.iafrica.com/</url>
-    <descr>Large ISP in South Africa</descr>
-    <email>info@iafrica.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>UUNET-NL</name>
-    <url>http://www.nl.uu.net/</url>
-    <descr>ISP in Amsterdam, the Netherlands</descr>
-    <email>franke@nl.uu.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>UWSNET</name>
-    <url>http://www.uwsnet.com/</url>
-    <descr>Web Hosting and Shell provider</descr>
-    <email>wop@uwsnet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>V-Real</name>
-    <url>http://www.v-real.spb.su/</url>
-    <descr>We make your PC happy...</descr>
-    <email>sk@v-real.spb.su</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Vail Systems, Inc.</name>
-    <url>http://www.vailsys.com/</url>
-    <descr>Internet Enhanced Telephony</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Valvcon Corporation</name>
-    <url>http://www.valvcon.com/</url>
-    <descr>Valvcon Corporation is in business to Design, Develop, Market, and Sell compact, electronically controlled electric actuators and moderately sophisticated automation products for valves and dampers. Valvcon products are targeted primarily for the process control market.</descr>
-    <email>josh@valvcon.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Vault Information Services</name>
-    <url>http://www.vaultbbs.com/</url>
-    <descr>ISP and Consulting Services</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Vector Informatik GmbH</name>
-    <url>http://www.vector-informatik.de/</url>
-    <descr>Technical software development and Controller Area Network (CAN)</descr>
-    <email>eisele@vector-informatik.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Vektor Modules</name>
-    <url>http://www.vektors.com/</url>
-    <descr>Provides cost effective solutions for business and web-application development.</descr>
-    <email>milko@vektors.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Vektors.com</name>
-    <url>http://vektors.com/</url>
-    <descr>Vektor Modules provides cost effective solutions to local and global business partners using FreeBSD.</descr>
-    <email>bsd@vektors.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Velocet Communications</name>
-    <url>http://www.velocet.net/</url>
-    <descr>Internet Development Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Velton.Link</name>
-    <url>http://www.vlink.kharkov.ua/</url>
-    <descr>ISP</descr>
-    <email>favorit@lincom.kharkov.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Vento I.P</name>
-    <url>http://www.innova.rcanaria.es/</url>
-    <descr>Web design &amp; development - Tenerife - Canary Island-Spain</descr>
-    <email>jesus@correo.worldsfactory.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ventura International Information Super Highway</name>
-    <url>http://www.vcnet.com/efb/</url>
-    <descr>No-So American Unix / BSD / Sun / Security / Firewalls - Technical Support to Education, new Businesses and Government. (Eng + Esp)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Verio</name>
-    <url>http://www.verio.de/</url>
-    <descr>Verio Europe website</descr>
-    <email>gheil@verio.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>VersionTracker.com</name>
-    <url>http://www.versiontracker.com/</url>
-    <descr>Providing timely Macintosh software update info</descr>
-    <email>lvantol@versiontracker.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Verynet Communcation Limited</name>
-    <url>http://www.verynet.com.hk/</url>
-    <descr>The Fastest Hosting Company In Hong Kong</descr>
-    <email>support@verynet.com.hk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Vetica Information Solutions</name>
-    <url>http://www.vetica.com/</url>
-    <descr>Web Hosting/Custom Programming</descr>
-    <email>info@vetica.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Vetorialnet - Rio Grande - RS</name>
-    <url>http://www.vetorialnet.com.br/</url>
-    <descr>Internet Service Provider</descr>
-    <email>marcelo.pias@vetorialnet.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Via RS</name>
-    <url>http://www.via-rs.net</url>
-    <descr>Provedor de acesso e servi&ccedil;os Internet - Rio Grande do Sul - Brasil</descr>
-    <email>robertom@equipe.via-rs.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ViaNet Communications</name>
-    <url>http://www.via.net/</url>
-    <descr>Internet connections and web hosting for busineses in California.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>VICO System Development Company</name>
-    <url>http://www.vicosys.com.hk/</url>
-    <descr>Internet Solution Provider</descr>
-    <email>kachan@vicosys.com.hk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Vicor, Inc. - North Bay</name>
-    <url>http://www.vicor-nb.com/</url>
-    <descr>We create Web-based transaction processing systems.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Video Collage, Inc.</name>
-    <url>http://www.video-collage.com/</url>
-    <descr>Computer Graphics, Performance Benchmarking, SoftImage plug-ins</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Vidican Engineering</name>
-    <url>http://www.buildingdoc.com/</url>
-    <descr>Civil Engineering, specializing in high-end residential systems, using FreeBSD for inter/intra net services</descr>
-    <email>nathan@vidican.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>VIEWS Net, Inc.</name>
-    <url>http://www.viewsnet.com/</url>
-    <descr>Complete web hosting and Internet presence provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ViewTouch, Inc.</name>
-    <url>http://www.viewtouch.com/</url>
-    <descr>X-Terminal Touchscreen Point of Sale for Restaurants &amp; Bars</descr>
-    <email>gene@viewtouch.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Vintners.Net</name>
-    <url>http://vintners.net/</url>
-    <descr>Small scale website hosting for wineries</descr>
-    <email>MikeL@Vintners.Net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Virage, Inc.</name>
-    <url>http://www.virage.com/</url>
-    <descr>Real-time media indexing, search, &amp; retrieval: Videologger and VIR Image Engine</descr>
-    <email>brandon@virage.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Virtual Artists Pty Ltd</name>
-    <url>http://www.va.com.au/</url>
-    <descr>Web Hosting Provider in Australia, application server developers and streaming media services.</descr>
-    <email>jesse@va.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Virtual Data Systems, Inc.</name>
-    <url>http://www.vds-inc.com/</url>
-    <descr>Developer of Web, Communcation and Internet Solutions</descr>
-    <email>webmaster@vds-inc.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Virtual Engineering, Inc.</name>
-    <url>http://www.veng.com/</url>
-    <descr>Mechanical Engineering Design and Analysis Services</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Virtual ISP</name>
-    <url>http://www.visp.co.nz</url>
-    <descr>Internet Service Provider</descr>
-    <email>wade@visp.co.nz</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Virtual Media GmbH</name>
-    <url>http://serv.ch/</url>
-    <descr>Swiss IPP using FreeBSD only :)</descr>
-    <email>roland@serv.ch</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Virtual Servers for Business on the Web</name>
-    <url>http://www.vsbw.com/</url>
-    <descr>When your internet needs are mission critical</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Virtual-Net Networks</name>
-    <url>http://virtual-net.net/</url>
-    <descr>Systems/Web Administration, Local Area Networks, Web Hosting &amp; Web Development</descr>
-    <email>info@virtual-net.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Virtualis Netherlands</name>
-    <url>http://www.netherlands.virtualis.com/</url>
-    <descr>Web Hosting and eASP: Your Home on the Web</descr>
-    <email>netherlands@virtualis.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Vision Interactive Ltd.</name>
-    <url>http://www.visint.co.uk/</url>
-    <descr>ISP, Consultancy and Software.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>VisionNET</name>
-    <url>http://www.vision.net.id/</url>
-    <descr>ISP</descr>
-    <email>hostmaster@vision.net.id</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>VisionNet</name>
-    <url>http://www.vws.net/</url>
-    <descr>Web Site Designer and Internet Service Provider in Milwaukee, Wisconsin USA</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Visutel Corporation</name>
-    <url>http://www.visutel.net</url>
-    <descr>Visutel is a wireless technology company providing communication products for a business use.</descr>
-    <email>jussi.jaurola@visutel.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Vivid Internet Production</name>
-    <url>http://www.vividnet.com/</url>
-    <descr>ISP in Walnut, California</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>VMK-Optoelektronika</name>
-    <url>http://vmk.iae.nsk.su/</url>
-    <descr></descr>
-    <email>max@vmk.iae.nsk.su</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>VolgaLink Ltd.</name>
-    <url>http://www.vlink.ru/</url>
-    <descr>ISP in Volgograd, Russia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Voyager Information Networks</name>
-    <url>http://www.voyager.net/</url>
-    <descr>Michigan's Largest ISP</descr>
-    <email>mholtz@voyager.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Voyager Online</name>
-    <url>http://www.vol.com/</url>
-    <descr>Nation Wide ISP</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>VPM Enterprises</name>
-    <url>http://www.vpm.com/</url>
-    <descr>Providing Secured Web Hosting and Newsgroups</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>VTechnologies S&agrave;rl</name>
-    <url>http://www.vtechnologies.ch/</url>
-    <descr>hardware, destop, high end servers.</descr>
-    <email>info@vtechnologies.ch</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>W. J. &amp; S. Installation Services Pty. Ltd.</name>
-    <url>http://www.shopfixers.com.au/</url>
-    <descr>Shopfitting, Elevator Car fitout, Carpentry and Joinery</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>W3 Technologies</name>
-    <url>http://www.w3-tek.net/</url>
-    <descr>Web Presence Provider</descr>
-    <email>steve@w3-tek.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Wamnetrunner Inc.</name>
-    <url>http://www.wamnetrunner.com/</url>
-    <descr>ISP: Business Internet Solutions</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Warp Net Technologies Romania, Suceava</name>
-    <url>http://www.warp.starnets.ro/</url>
-    <descr>Dual Pentium Server with SMP FreeBSD 3.0</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Water Wheel Systems</name>
-    <url>http://www.waterw.com/</url>
-    <descr>A small ISP in Southern NJ</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Watkins Printing</name>
-    <url>http://www.printwatkins.com/</url>
-    <descr>Commercial offset printer.</descr>
-    <email>postmaster@printwatkins.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WayOut!</name>
-    <url>http://www.wayout.com.br/</url>
-    <descr>Internet Service Provider in Brazil</descr>
-    <email>dab@wayout.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Waystation Networking</name>
-    <url>http://www.waystation.com/</url>
-    <descr>ISP for Eugene, Oregon - Our USENET Box</descr>
-    <email>jlangan@waystation.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WBR a/z</name>
-    <url>http://mail.wbraanzee.nl</url>
-    <descr>Dutch Advertising Company running client lounges on php/mysql</descr>
-    <email>koen@mac.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WCLV-FM</name>
-    <url>http://www.wclv.com/</url>
-    <descr>Website for a classical music format radio station</descr>
-    <email>webmaster@wclv.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WeatherTools.com</name>
-    <url>http://www.weathertools.com/</url>
-    <descr>Online mailorder catalog of weather instruments for home, office, and industry.  All of our servers run FreeBSD!</descr>
-    <email>chris@weathertools.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Web Development Services, Inc.</name>
-    <url>http://www.piva.net/</url>
-    <descr>Web Hosting Company.</descr>
-    <email>na@piva.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Web Eclat Ltd</name>
-    <url>http://www.webeclat.com/</url>
-    <descr>Developers and consultants for Web sites, Internet solutions, system management and software development.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Web Fairmont</name>
-    <url>http://www.webfairmont.com</url>
-    <descr>Web Design and hosting, Software consulting, aerial photography.</descr>
-    <email>carvell@webfairmont.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WEB Ltd.</name>
-    <url>http://www.web.am/</url>
-    <descr>Leading wireless access to Internet provider in Armenia (ISP)</descr>
-    <email>nm@web.am</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Webair Internet Development Inc</name>
-    <url>http://www.webair.com/</url>
-    <descr>Hosting, Design, Marketing</descr>
-    <email>sagi@webair.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WebCaribe Ltda.</name>
-    <url>http://209.88.252.106/</url>
-    <descr>Web hosting/design company and Intranets development. All servers run on FreeBSD</descr>
-    <email>operador@webcaribe.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Webcraft Sdn Bhd</name>
-    <url>http://www.webcraft99.com/</url>
-    <descr>Internet / Intranet Solutions Provider</descr>
-    <email>eddie@webcraft99.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>webFreaks.com, LLC</name>
-    <url>http://www.webFreaks.com/</url>
-    <descr>Website design, personal webpage and UNIX shell accounts.  Uses FreeBSD as corporate firewall.</descr>
-    <email>webmaster@webFreaks.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Webley Systems, Inc.</name>
-    <url>http://www.webley.com/</url>
-    <descr>Voice/Web Activated Telephone/Email Messaging</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WebLogic, Inc.</name>
-    <url>http://www.boholnet.com/</url>
-    <descr>ISP</descr>
-    <email>info@boholnet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WebMaster, Incorporated</name>
-    <url>http://www.webmaster.com/</url>
-    <descr>Offers high-performance Internet chat with web integration</descr>
-    <email>Davids@webmaster.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WebNet Memphis</name>
-    <url>http://www.wnm.net/</url>
-    <descr>Internet access and hosting solutions for the Midsouth</descr>
-    <email>alex@wnm.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Webpath</name>
-    <url>http://www.webpath.net/</url>
-    <descr>Open Source driven search engine featuring the world's largest Internet database and worls's largest human edited directory.</descr>
-    <email>webpath@webpath.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WebSat Internet Services</name>
-    <url>http://www.websat.com.br</url>
-    <descr>Internet service provider</descr>
-    <email>webmaster@websat.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WebSideStory, Inc.</name>
-    <url>http://www.websidestory.com/</url>
-    <descr>FREE Web Site Rating Sytem</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Webspace Worldwide Limited</name>
-    <url>http://www.wwwebspace.co.uk/</url>
-    <descr>UK based provider of World Wide Web space and authoring services</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WebSpace4Rent, Inc.</name>
-    <url>http://www.webspace4rent.com/</url>
-    <descr>Website Hosting and Design, we have space for you!</descr>
-    <email>hostmaster@ws4r.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Webspan Inc.</name>
-    <url>http://www.webspan.net/</url>
-    <descr>New Jersey's premier Internet provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Webstar5 Internet Group</name>
-    <url>http://www.webstar5.com/</url>
-    <descr>Intranet and Software Development</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WebStation, Inc.</name>
-    <url>http://www.webstation.net/</url>
-    <descr>Web Hosting</descr>
-    <email>sales@webstation.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Websurface.net</name>
-    <url>http://www.websurface.net/</url>
-    <descr>affordable web hosting and domain names. CGI,PHP,mySQL,FrontPage extensions from $5.95. Cheap domain names only $10 a year</descr>
-    <email>support@websurface.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Welcome to</name>
-    <url>http://www.kawachi.zaq.ne.jp/tin</url>
-    <descr>TIN World</descr>
-    <email>chin@kawachi.zaq.ne.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WestLake Solutions</name>
-    <url>http://www.westlake.com/</url>
-    <descr>Internet Training and Consulting</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WetterOnline: Worldwide</name>
-    <url>http://en.wetteronline.com/</url>
-    <descr>Weather worldwide</descr>
-    <email>roemer@wetteronline.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WetterOnline: Chinese</name>
-    <url>http://www.t7online.com/</url>
-    <descr>weather in Chinese</descr>
-    <email>roemer@wetteronline.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>wfi WEITERER &amp; FINKE Informationssysteme GmbH</name>
-    <url>http://www.wfi.de/</url>
-    <descr>Baan Solutions; INET Hosting; E-Commerce ...</descr>
-    <email>webmaster@wfi.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Whistle Communications</name>
-    <url>http://www.whistle.com/</url>
-    <descr>FreeBSD based Internet Server manufacturer</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Whiteley Research Inc.</name>
-    <url>http://www.srware.com/</url>
-    <descr>XicTools integrated circuit CAD software</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Wholesale Hosting Inc.</name>
-    <url>http://wholesalehosting.com/</url>
-    <descr>Wholesale WebHosting and Shell Services</descr>
-    <email>hostmaster@wholesalehosting.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Widesoft Internet</name>
-    <url>http://www.widesoft.com.br/</url>
-    <descr>Internet Service for Brazil</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Wiechers &amp; Partner Datentechnik GmbH</name>
-    <url>http://www.wup.de/</url>
-    <descr>Products: Eplan, Logocad, PDM9000, Bauplan</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>wilde publishing</name>
-    <url>http://wilde.webjump.com/</url>
-    <descr>research/publishing</descr>
-    <email>wilde@unm.edu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Wildfire Communications, Inc</name>
-    <url>http://www.wildfire.com/</url>
-    <descr>Home of the Wildfire Personal Assistant</descr>
-    <email>webmaster@wildfire.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Win2IX</name>
-    <url>http://www.win2ix.com/</url>
-    <descr>Open Source Solution Provider</descr>
-    <email>sad@Win2IX.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Wind River Visual Communication</name>
-    <url>http://www.wind-river.com/</url>
-    <descr>Internet Design Firm</descr>
-    <email>jmaslak@wind-river.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Windjammer Communications</name>
-    <url>http://www.windjammer.net/</url>
-    <descr>Small Business Oriented/CoLo ISP - Sacramento CA</descr>
-    <email>brad@bleier.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Windows DTP Conference of Japan</name>
-    <url>http://www.k-wind.ne.jp/</url>
-    <descr>Windows dtp crossover Unit</descr>
-    <email>nakao@dns1.k-wind.ne.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Windsor Match Plate &amp; Tool Ltd.</name>
-    <url>http://www.wmptl.com/</url>
-    <descr>use FreeBSD for inter/intranet communications operations</descr>
-    <email>webmaster@wmptl.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WinNet Communications, Inc.</name>
-    <url>http://www.win.net/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Wintelcom Inc.</name>
-    <url>http://www.wintelcom.net/</url>
-    <descr>Quality web hosting, co-locations services, custom programming and consulting.</descr>
-    <email>bright@wintelcom.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WISE CORPORATION</name>
-    <url>http://www.wise-net.co.jp/</url>
-    <descr>Limited Free Web Service</descr>
-    <email>ynoda@wise-net.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WITH WEB SERVICE</name>
-    <url>http://www.withweb.com/</url>
-    <descr>Web hosting provider located in Korea.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WOFTAM Jones Pty Ltd</name>
-    <url>http://www.woftam.com.au/</url>
-    <descr>ISP and Software Supplier</descr>
-    <email>kurt@woftam.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Woods Applied Technologies</name>
-    <url>http://www.watcorp.com/</url>
-    <descr>Mission Critical Application Development, Engineering and Courseware...We never stop looking for a better way</descr>
-    <email>support@watcorp.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WoodyWare Internet Services</name>
-    <url>http://www.woodyware.com/</url>
-    <descr>Commercial Internet Services</descr>
-    <email>woody@woodyware.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WORLD BUSINESS EXCHANGE</name>
-    <url>http://wbenet.com/</url>
-    <descr>IMPORT/EXPORT CONTENT PROVIDER</descr>
-    <email>roby@wbenet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>World Domination Technologies</name>
-    <url>http://www.molholm.com/</url>
-    <descr>Affordable, complete web solutions (from design to hosting)</descr>
-    <email>webmaster@wdtechnologies.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Worldwide Information Technology, Inc.</name>
-    <url>http://www.wwstaiwan.com/</url>
-    <descr>E-Commerce Platform Support, Network design and consulting</descr>
-    <email>jeff@pop.metalworking.com.tw</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Worldwide Information Technology, Inc. (Chinese Version)</name>
-    <url>http://www.metalworking.com.tw/</url>
-    <descr>E-Commerce Platform Support, Network design and consulting</descr>
-    <email>ya_hsiung@ms2.url.com.tw</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Wrest Point Hotel Casino</name>
-    <url>http://www.wrestpoint.com.au</url>
-    <descr>Australia's first casino</descr>
-    <email>r.reid@wrestpoint.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WTL Computers</name>
-    <url>http://www.wtlcomputers.com/</url>
-    <descr>Specialist in PC Systems, Hardware and Peripherals</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>www.markiza.sk, a.s.</name>
-    <url>http://www.markiza.sk/</url>
-    <descr>The portal division of TV Markiza, Slovakia</descr>
-    <email>juraj.bednar@web.markiza.sk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>www.onet.co.uk</name>
-    <url>http://www.onet.co.uk/</url>
-    <descr>Internet Service Provider</descr>
-    <email>webmaster@onet.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WWW.PersianKitty.COM</name>
-    <url>http://www.persiankitty.com/</url>
-    <descr>Adult Links web site</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>www.shellb0x.com</name>
-    <url>http://www.shellb0x.com/</url>
-    <descr>New Zealand and International Webhosting and Shell Account specialists</descr>
-    <email>cyclone@shellb0x.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>www.unitedwebsite.net</name>
-    <url>http://www.unitedwebsite.net/</url>
-    <descr>web hosting company</descr>
-    <email>hosting@unitedwebsite.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>XGforce.COM</name>
-    <url>http://www.xgforce.com/</url>
-    <descr>UNIX Clustering Software (load balance and Failsafe)</descr>
-    <email>info@xgforce.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Xshare</name>
-    <url>http://www.xshare.com/</url>
-    <descr>Free Software Catalogue for *BSD/Un*x and Linux</descr>
-    <email>plexus@xshare.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>XSite</name>
-    <url>http://www.xsite.net/</url>
-    <descr>An Internet Service Provider in the Chicago loop</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>XTDL</name>
-    <url>http://www.xtdl.com/</url>
-    <descr>New Hampshire's leading Internet Service Provider</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Yahoo!</name>
-    <url>http://www.yahoo.com/</url>
-    <descr>Uses FreeBSD for WWW services and development.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Yes</name>
-    <url>http://yes.ko.if.ua/</url>
-    <descr>ISP</descr>
-    <email>sysadm@yes.ko.if.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>YouKnowWhat.com</name>
-    <url>http://www.youknowwhat.com/</url>
-    <descr>News that stay crunchy in milk</descr>
-    <email>riskable@youknowwhat.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ZDNet Australia</name>
-    <url>http://www.zdnet.com.au/</url>
-    <descr>Australia's computing resource</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ZeD-Net</name>
-    <url>http://www.zednet.lv/</url>
-    <descr>Internet in Jekabpils, Latvia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Zed.Net</name>
-    <url>http://www.znet.net.au/</url>
-    <descr>ISP, Innisfail, Queensland, Australia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Zenon N.S.P.</name>
-    <url>http://www.zenon.net/</url>
-    <descr>Russian Federation largest hosting service provider / Large ISP (Moscow, Russia)</descr>
-    <email>info@zenon.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Zereau Limited</name>
-    <url>http://www.sangoma.co.uk/</url>
-    <descr>UK importer of internal WAN router cards (Sangoma) which runs under Windows, Linux and FreeBSD.  </descr>
-    <email>info@zereau.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Zeus Technology Limited</name>
-    <url>http://www.zeustech.net/</url>
-    <descr>Highest performing most scalable commercial Web server solution available</descr>
-    <email>sales@zeustech.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ZigZag ISP</name>
-    <url>http://www.zigzag.pl/</url>
-    <descr>Polish ISP. E-mail and Web servers.</descr>
-    <email>mkozlowski@zigzag.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>INFOTEK</name>
-    <url>http://infotek.wasantara.com/</url>
-    <descr>Information &amp; Technology Consultant in Manado, North Sulawesi - Indonesia</descr>
-    <email>infotek@wasantara.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISP Wasantara Net Manado</name>
-    <url>http://freebsd.wasantara.com/</url>
-    <descr>FreeBSD on Wasantara Manado</descr>
-    <email>assa@wasantara.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Swebase Network</name>
-    <url>http://playground.swebase.com/</url>
-    <descr>Yor shell provider...... In Sweden.... And your local ISP</descr>
-    <email>kasper@swebase.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Institute</name>
-    <url>http://oii.urc.ac.ru/</url>
-    <descr>Orsk Industrial Institute</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Zonora</name>
-    <url>http://zonora.uno.mx/</url>
-    <descr>P&aacute;gina en PRO de los OS UNIX-like y anti microsoft</descr>
-    <email>sepa@zonora.uno.mx</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Free Russian Postcard Service</name>
-    <url>http://www.postcard.ru/</url>
-    <descr>Send a virtual postcard to your friends from the best postcard server in Russia.</descr>
-    <email>art@radio-msu.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>4 Net Co</name>
-    <url>http://www.bgzone.com/</url>
-    <descr>Bulgarian WEB News</descr>
-    <email>mitko@bgzone.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>A Microsoft Alternative - Linux Country</name>
-    <url>http://www.linuxcountry.com/</url>
-    <descr>Large website for file downloads in nix flavors.  Help for linux/unix, and lots of cool stuff to do</descr>
-    <email>webmaster@linuxcountry.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ACTA</name>
-    <url>http://www.acta.nl/</url>
-    <descr>Academic Centre for Dentistry Amsterdam</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Advanced Network Daemons</name>
-    <url>http://www.and.or.jp/</url>
-    <descr>An amateur creative group</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Amatir Radio Club ITB</name>
-    <url>http://www.arc.itb.ac.id/</url>
-    <descr>Radio Club on Bandung Institut Of Technology</descr>
-    <email>admin@arc.itb.ac.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>An bhandia</name>
-    <url>http://www.gromit.pinpt.com/</url>
-    <descr>Expand your self through the many different avenues of spirituality.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>APANA SA</name>
-    <url>http://www.sa.apana.org.au/</url>
-    <descr>Australian Public Access Network Association (SA Region)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>APANA WA</name>
-    <url>http://wa.apana.org.au/</url>
-    <descr>Australian Public Access Network Association (WA Region) </descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Applied Research Labs, The University Of Texas at Austin</name>
-    <url>http://www.arlut.utexas.edu/gash2/</url>
-    <descr>Ganymede, a GPL'ed Network Directory Management System</descr>
-    <email>jonabbey@arlut.utexas.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Arch Ford Education Service Cooperative</name>
-    <url>http://moonraker.afsc.k12.ar.us/</url>
-    <descr>Educational Resource Institution</descr>
-    <email>webmaster@moonraker.afsc.k12.ar.us</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Architecture ITB</name>
-    <url>http://167.205.15.229/</url>
-    <descr>Dept. of Architecture, Bandung Institute of Technology</descr>
-    <email>jay@arsitektur.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Arkadia LPMud</name>
-    <url>http://arkadia.rpg.org.pl/</url>
-    <descr>First Polish LPMud (in polish language)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Arlington Public Schools</name>
-    <url>http://www.arlington.k12.va.us/</url>
-    <descr>Public School System</descr>
-    <email>cebrown@arlington.k12.va.us</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ARP</name>
-    <url>http://www.arp-fr.org/</url>
-    <descr>Association de Recherche sur la Polyarthrite</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ARSU</name>
-    <url>http://www.arsu.nk.am/</url>
-    <descr>Artsakh State University</descr>
-    <email>dev@arminco.nk.am</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Arts Center of NTHU Taiwan</name>
-    <url>http://arts.nthu.edu.tw/</url>
-    <descr>Arts Center of NTHU in Taiwan. A Chinese-Big5 site. Base on Apache + PHP + MySQL with FreeBSD</descr>
-    <email>aska@arts.nthu.edu.tw</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Association of Brewers</name>
-    <url>http://beertown.org/</url>
-    <descr>Non-Profit Educational Organization</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Association of C and C++ Users (ACCU)</name>
-    <url>http://www.accu.org/</url>
-    <descr>For professionalism in C, C++ &amp; Java Programming</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Association of Synchronous Data Formats</name>
-    <url>http://www.asdf.org/</url>
-    <descr>non-profit</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Associazione Industriali Perugia</name>
-    <url>http://www.assind.krenet.it/</url>
-    <descr>Perugia, Italy.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Ateneo de Naga University</name>
-    <url>http://www.adn.edu.ph/</url>
-    <descr>A University in Bicol Philippines</descr>
-    <email>art@topmax.com.ph</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Atlantic Community College</name>
-    <url>http://www.atlantic.edu/</url>
-    <descr>Mays Landing / Atlantic City / Cape May, NJ</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Austin High School</name>
-    <url>http://shark.co.net/</url>
-    <descr>Public high school in Austin, Minnesota</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Awfulhak Limited.</name>
-    <url>http://www.Awfulhak.org/</url>
-    <descr>A one-man (&amp; wife) consultancy</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>B-1000 Radio Brunel</name>
-    <url>http://b1000.brunel.ac.uk:8080/</url>
-    <descr>broadcasting across campus over the computer network</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>B.C. Burn Network Society</name>
-    <url>http://www.vanserve.org/</url>
-    <descr>Information networking for burn victims</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>B.P.L. Friends</name>
-    <url>http://www.tripod.com/bplfriends/index.html</url>
-    <descr>Friends</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Babel</name>
-    <url>http://www.babel.dk/</url>
-    <descr>Internet Caf&eacute;, Copenhagen, Denmark</descr>
-    <email>darth@vader.dk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>BadNet IRC Network</name>
-    <url>http://www.badnet.net/</url>
-    <descr>BadNet IRC Networks Home Page</descr>
-    <email>badz@badnet.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>BaWue-Net Site Nadia</name>
-    <url>http://www.bawue.de/</url>
-    <descr>the best Internet Service in Germany</descr>
-    <email>admin@nadia.s.bawue.de</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>BBS of NTOU Department of Computer Science</name>
-    <url>telnet://bbs.cs.ntou.edu.tw/</url>
-    <descr>National Taiwan Ocean University Department of Computer Science Bulletin Board System (telnet access)</descr>
-    <email>sysop.bbs@bbs.cs.ntou.edu.tw</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Berkeley Adult School</name>
-    <url>http://bas.berkeley.net/</url>
-    <descr>continuing education, skills remediation</descr>
-    <email>webmaster@bas.berkeley.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Big Bend Community College</name>
-    <url>http://www.bbcc.ctc.edu/</url>
-    <descr>2-year community college in Moses Lake, WA</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Bitcity BBS (From Taiwan)</name>
-    <url>http://bbs.ee.njtc.edu.tw/</url>
-    <descr>A bbs in taiwan powered by FreeBSD</descr>
-    <email>bigfoot@hello.com.tw</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Blackened Industries</name>
-    <url>http://www.blackened.com/</url>
-    <descr>Specializing in wasting bandwidth by offering superfluous services!</descr>
-    <email>dmjr@blackened.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>BOFH, Israel.</name>
-    <url>http://www.bofh.org.il/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Brandenburg Individual Network e.V.</name>
-    <url>http://loch.in-brb.de/</url>
-    <descr>non-commercial ISP in the country around Berlin</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Brookdale Community College</name>
-    <url>http://www.brookdale.cc.nj.us/</url>
-    <descr>Official College Web Server</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>bytezone channel organization</name>
-    <url>http://www.bytezone-undernet.org/</url>
-    <descr>official url of #bytezone of the undernet organization</descr>
-    <email>richie@bytezone.zzn.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Bytic Foundation Of New Technologies In Education</name>
-    <url>http://www.bytic.troitsk.ru/</url>
-    <descr>Computer club for children</descr>
-    <email>rk@bytic.troitsk.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>calx</name>
-    <url>http://dart.dhs.org/</url>
-    <descr>a site that does things</descr>
-    <email>calx@purdue.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>CCACC Computer Club</name>
-    <url>http://compclub.ccacc.cc.pa.us/</url>
-    <descr>The Student Computer Club at Cambria County Area Community College</descr>
-    <email>paco@compclub.ccacc.cc.pa.us</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>CCFA</name>
-    <url>http://www.ccfa.org.au/</url>
-    <descr>Christian Childrens Fund of Australia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>CDCC/USP Sao Carlos</name>
-    <url>http://www.cdcc.sc.usp.br/</url>
-    <descr>Centro de Divulgacao Cientifica e Cultural</descr>
-    <email>octavio@cdcc.sc.usp.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Center for Information &amp; Development Studies</name>
-    <url>http://www.CIDES.or.id/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Center for Robotics and Manufacturing Systems</name>
-    <url>http://www.crms.engr.uky.edu/</url>
-    <descr>College of Engineering, University of Kentucky</descr>
-    <email>webmaster@crms.engr.uky.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Center Of New Informational Technologies</name>
-    <url>http://www.cnti.moldnet.md/</url>
-    <descr>Use of computer in moldavian schools.</descr>
-    <email>root@cnti.moldnet.md</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Centro de Informaci\xf3n Internacional Nicarao</name>
-    <url>http://www.nicarao.com/</url>
-    <descr>News about Nicaragua</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>CEOS Information Locator System</name>
-    <url>http://cils.ceo.org/</url>
-    <descr>Collaborative Remote Sensing and Earth Observation focusing on developing countries</descr>
-    <email>dirk.vangulik@jrc.it</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Cetys universidad campus</name>
-    <url>http://orca.ens.cetys.mx/</url>
-    <descr>Ensenada's distance education program and Internet services</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Chaos 11 BusServer, Universit&auml;t des Saarlandes</name>
-    <url>http://busserver.cs.uni-sb.de/</url>
-    <descr>an interactive public transport information system</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Chapmanskolan Karlskrona</name>
-    <url>http://chapman.karlskrona.se/</url>
-    <descr></descr>
-    <email>erik@chapman.karlskrona.se</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Charles Darwin Research Station</name>
-    <url>http://fcdarwin.org.ec/</url>
-    <descr>Research in the Galapagos Islands</descr>
-    <email>jpinson@polaris.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Chernigov Technological Institute</name>
-    <url>http://www.ti.chernigov.ua/</url>
-    <descr>Education. FreeBSD is widely used.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Child Welfare Partnership, Portland State University</name>
-    <url>http://www.cwp.pdx.edu/</url>
-    <descr>Ongoing welfare research and training project for Oregon's Dept. of Human Resources</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Children's Hospital of Michigan, Psychiatry/Psychology Division</name>
-    <url>http://chmpsych.med.wayne.edu/</url>
-    <descr>Departmental Server</descr>
-    <email>billings@chmpsych.med.wayne.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Chung Cheng Institute of Technology: FTP</name>
-    <url>ftp://ftp.ccit.edu.tw/</url>
-    <descr>Anonymous FTP Server</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Chung Cheng Institute of Technology: NEWS</name>
-    <url>http://news.ccit.edu.tw/</url>
-    <descr>InterNet News Server</descr>
-    <email>yuan@ccit.edu.tw</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>CIAM</name>
-    <url>http://ciam.comtel.ru/</url>
-    <descr>Central Institute of Aviation Motors</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>CIDES</name>
-    <url>http://www.cides.or.id/</url>
-    <descr>Center for Information and Development Studies</descr>
-    <email>apih@cides.or.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Club BBS</name>
-    <url>telnet://club.gdl.iteso.mx/</url>
-    <descr>A Spanish spoken 100+ user bulletin board</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Computing Research Lab for the Environment</name>
-    <url>http://www.crle.uoguelph.ca/</url>
-    <descr>Environmental informatics research, with a statistical and data computing centre built with FreeBSD!</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Conselho da Justica Federal</name>
-    <url>http://www.cjf.gov.br/</url>
-    <descr>Council of the Federal Justice - Brasilia, DF, Brazil</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>COPPE/UFRJ</name>
-    <url>http://www.coppe.ufrj.br/</url>
-    <descr>Graduate School of Engineering, Rio de Janeiro, Brazil</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Copyleft.Org</name>
-    <url>http://www.copyleft.org/</url>
-    <descr>Copyleft Issue is gathered all over the earth</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>CPCU Society</name>
-    <url>http://www.cpcusociety.org/</url>
-    <descr>Non-profit continuing education.</descr>
-    <email>gmsmith@cpcusociety.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>cyberDrug BBS and Web server</name>
-    <url>http://cyberDrug.m8.ntu.edu.tw/</url>
-    <descr>a group of oversea students in taiwan.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>cyberNOTHING</name>
-    <url>http://www.cybernothing.org/</url>
-    <descr>Nothing is cooler just because it is cyber</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Dakota State University Computing Services</name>
-    <url>http://www.departments.dsu.edu/computing_services/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>DALnet</name>
-    <url>http://www.dal.net/</url>
-    <descr>International chat network</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Datre Net.</name>
-    <url>http://www.geocities.com/Athens/4016/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Daviess County Public Schools, Kentucky</name>
-    <url>http://www.daviess.k12.ky.us/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Decision Support Systems Laboratory</name>
-    <url>http://www.lsad.eps.ufsc.br/</url>
-    <descr>Laboratory in the Federal University of Santa Catarina (Brazil) that studies ERPs softwares.</descr>
-    <email>labsad@eps.ufsc.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Defiance</name>
-    <url>http://www.defiance.org/</url>
-    <descr>San Diego, CA</descr>
-    <email>noc@defiance.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Democritus University of Thrace</name>
-    <url>http://indefix.ee.duth.gr/</url>
-    <descr>Laboratory of Computer Analysis</descr>
-    <email>fandrit@usa.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Departamento de electronica (Universidad Francisco Marroquin)</name>
-    <url>http://ie.fisicc-ufm.edu/</url>
-    <descr>laboratorio de electronica</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Departamento de Quimica - Universidade Federal de Sao Carlos</name>
-    <url>http://www.dq.ufscar.br/</url>
-    <descr>www and e-mail servers</descr>
-    <email>capelatto@dq.ufscar.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Department of Chinese Literature of NCCU, Taiwan, R.O.C.</name>
-    <url>http://chinese.nccu.edu.tw/</url>
-    <descr>Chinese literature, Chinese culture &amp; Chinese education etc...</descr>
-    <email>root@chinese.nccu.edu.tw</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Department of Computational Science, National University of Singapore</name>
-    <url>http://www.cz3.nus.edu.sg/</url>
-    <descr></descr>
-    <email>wongyw@cz3.nus.edu.sg</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Department of Computer Engineering, Kasetsart University</name>
-    <url>http://www.pluto.cpe.ku.ac.th/</url>
-    <descr>Robotics and Intelligent Machines Laboratory</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Department of Computer Science,RIUBON</name>
-    <url>http://www.cs.riubon.ac.th/</url>
-    <descr>Rajabhat Institute Ubonratchathani,Thailand</descr>
-    <email>prayong@cs.riubon.ac.th</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Department of Electrical Engineering, University of Coimbra.</name>
-    <url>http://www.dee.uc.pt/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Department of Electronic Engineering, NKIT</name>
-    <url>http://ohm.ec.nkit.edu.tw/</url>
-    <descr>National Kaohsiung Institute of Technology</descr>
-    <email>csshieh@ohm.ec.nkit.edu.tw</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Department of Physics, Tamkang University</name>
-    <url>http://www.phys.tku.edu.tw/</url>
-    <descr>Laberatory of Computational Physics</descr>
-    <email>contact@phys.tku.edu.tw</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>DF da UFPE</name>
-    <url>http://www.df.ufpe.br/</url>
-    <descr>Departamento de F&iacute;sica da Universidade Federal de PE</descr>
-    <email>root@df.ufpe.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Digitale Stad Eindhoven</name>
-    <url>http://www.dse.nl/</url>
-    <descr>Digital City of Eindhoven, an informationpoint for inhabitants of Eindhoven, The Netherlands</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>digivill!</name>
-    <url>http://www.digivill.net/</url>
-    <descr>And I fell down the stairs and my shoes fell off.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>dinoex</name>
-    <url>http://www.dinoex.org/</url>
-    <descr>email and news service for special intrests</descr>
-    <email>admin@dinoex.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Distributed.net (DCTI)</name>
-    <url>http://www.distributed.net/</url>
-    <descr>Distributed Computing Effort</descr>
-    <email>dbaker@distributed.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Division of Electronics, ITS</name>
-    <url>http://www.elka.ee.its-sby.edu/</url>
-    <descr>Division of Electronics, Electrical Engineer Departement, ITS (Institut Teknologi Sepuluh Nopember) </descr>
-    <email>elkagtw@elka.ee.its-sby.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Division of Molecular and Life Sciences, University of Abertay Dundee</name>
-    <url>http://scinet.tay.ac.uk/</url>
-    <descr>The Division is the home of Chemistry and Biology at the University of Abertay Dundee Scotland.</descr>
-    <email>keith@weasel.tay.ac.uk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>DonSTU</name>
-    <url>http://www.dgtu.donetsk.ua/</url>
-    <descr>Donetsk State Technical University</descr>
-    <email>yk@dgtu.donetsk.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Drew College Preparatory School</name>
-    <url>http://ns.drew.pvt.k12.ca.us/</url>
-    <descr>A Small private school in San Francisco</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>EarthLINX.Org</name>
-    <url>http://EarthLINX.Org/</url>
-    <descr>We are a flat-sharing community in Dachau, Germany. </descr>
-    <email>noc@EarthLINX.Org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>EBRP School Net</name>
-    <url>http://isis.ebrps.subr.edu/</url>
-    <descr>the worlds only ISP totaly run by students, we provide students and teachers with full PPP and mail accounts, and we provide a webpage for our school system and all the schools in EBRP. We also provide tech support for teachers in EBRP schools and Internet training. </descr>
-    <email>jfried@isis.ebrps.subr.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ECKANKAR</name>
-    <url>http://www.eckankar.org/</url>
-    <descr>the Religion of Light &amp; Sound</descr>
-    <email>dmeredee@aol.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Edmonton Public Schools</name>
-    <url>http://www.epsb.net/</url>
-    <descr>Public school district in Edmonton, Alberta, Canada</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Edoropolis</name>
-    <url>http://www.edoropolis.org/</url>
-    <descr>Hosts pages for Samurai Pizza Cats fans.</descr>
-    <email>warlock@tccn.cs.kun.nl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>EDUCATE</name>
-    <url>http://www.educate.net.au/</url>
-    <descr>Organisation of teachers, students and community to develop an electronic educational resource for students everywhere</descr>
-    <email>jordan@educate.net.au</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Eglise Chretienne d'Ahuntsic</name>
-    <url>http://www.eca.qc.ca/</url>
-    <descr>Church in Montreal, Quebec, Canada</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Eindhoven University of Technology</name>
-    <url>http://www.gewis.win.tue.nl/</url>
-    <descr>Student Society GEWIS</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ekonet</name>
-    <url>http://www.bapedal.go.id/</url>
-    <descr>Indonesia Environmental Impact Management Agency</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Faculdade de Medicina de Ribeir&atilde;o Preto</name>
-    <url>http://rfi.fmrp.usp.br/</url>
-    <descr>Medical School</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Faculty of Engineering, University of the West Indies</name>
-    <url>http://www.uwi.tt/</url>
-    <descr>Official server for the Faculty of Engineering</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Faculty Of Physics and Technology, NTUU</name>
-    <url>http://ptf.ntu-kpi.kiev.ua/</url>
-    <descr></descr>
-    <email>root@ptf.ntu-kpi.kiev.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Faculty of Psychology, Warsaw University</name>
-    <url>http://www.psych.uw.edu.pl/</url>
-    <descr></descr>
-    <email>admin@psych.uw.edu.pl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Faculty of sociology, Saint-Petersburg State University</name>
-    <url>http://www.soc.pu.ru/</url>
-    <descr>Faculty of sociology: WEB-sity</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Feminism Net</name>
-    <url>http://www.feminism.net/</url>
-    <descr>Feminism Network Service</descr>
-    <email>sysop@bbs.feminism.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Fight Spam on the Internet</name>
-    <url>http://spam.abuse.net/</url>
-    <descr>The pseudo-famous Internet spam boycott</descr>
-    <email>scott@zorch.sf-bay.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Foreign Languages Department, Huafan U, Taiwan</name>
-    <url>http://fl.hfu.edu.tw/</url>
-    <descr>A FreeBSD server offering WWW, PROXY, FTP, BBS, Mailing Lists, and other services.</descr>
-    <email>webmaster@mail.fl.hfu.edu.tw</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Forster High School, NSW Australia.</name>
-    <url>http://www1.tpgi.com.au/users/eirvine/freebsd/hermione.html</url>
-    <descr>A private intranet server for staff and students.</descr>
-    <email>eirvine@tpgi.com.au</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Fort Hays State University Department of Physics</name>
-    <url>http://www.physics.fhsu.edu/</url>
-    <descr>Departmental Web Server</descr>
-    <email>gbuffing@scatcat.fhsu.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Fort Hays State University High Performance Computing Group</name>
-    <url>http://www.physics.fhsu.edu/~hpcg/</url>
-    <descr>Network of FreeBSD machines running MPI`</descr>
-    <email>gbuffing@scatcat.fhsu.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Free BSD STT Telkom  Bandung - Networking  Community And Research</name>
-    <url>http://zoel.stttelkom.ac.id:12345/</url>
-    <descr>We are user of IT product of computing and networking</descr>
-    <email>sysadmin@stttelkom.ac.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>FreeBSD Inc.</name>
-    <url>http://www.freebsd.org/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>FreeBSD UK User's Group</name>
-    <url>http://ukug.uk.freebsd.org/</url>
-    <descr>The UK User's Group provides support and services for UK FreeBSD Users</descr>
-    <email>lee@uk.freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>FreeDNS</name>
-    <url>http://www.eu.org/</url>
-    <descr>Free Domain Name registration service</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Freenix Norge</name>
-    <url>http://www.freenix.no/</url>
-    <descr>A Norwegian organization promoting open solutions</descr>
-    <email>morten@freenix.no</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>FTP Search</name>
-    <url>http://ftpsearch.ntnu.no/</url>
-    <descr>FTP Search Engine</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>fusion computer corp</name>
-    <url>http://hackers.the-core.net/x-hackers/</url>
-    <descr>X-hackers: computer security: personal webserver: part of fusion magazine</descr>
-    <email>clm@hackers.the-core.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Ganymed Web Services</name>
-    <url>http://www.ganymed.org/</url>
-    <descr>Little Projects for BIG People</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>General Physics Chair, Physics Department of Moscow State University</name>
-    <url>http://genphys.phys.msu.su/</url>
-    <descr>Web-site for education and information services</descr>
-    <email>silver@gateway.phys.msu.su</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Gesellschaft f&uuml;r wissenschaftliche Datenverarbeitung mbH G&ouml;ttingen</name>
-    <url>http://www.gwdg.de/</url>
-    <descr>Computer Center of the University of G&ouml;ttingen and the Max-Planck-Gesellschaft</descr>
-    <email>kheuer@gwdg.de</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Gimnasium N10</name>
-    <url>http://sch10.siberia.net/</url>
-    <descr>Novosibirsk secondary school</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Glass Art Society</name>
-    <url>http://www.glass.or.jp/</url>
-    <descr>An information on Glass Art Society's 1998 Seto conference. </descr>
-    <email>koji@marin.or.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>GooGoo</name>
-    <url>http://googoo.ipv6.irdu.nus.sg/</url>
-    <descr>webserver and god knows what else</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>GPAD</name>
-    <url>http://www.gpad.ac.ru/</url>
-    <descr>General Physics and Astronomy Department of the Russian Academy of Science</descr>
-    <email>dima@gpad.ac.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Granite Peak Unitarian Universalist Church</name>
-    <url>http://www.granitepeakuu.org/</url>
-    <descr>Prescott Arizona UUs Website</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Greater Victoria Public Library</name>
-    <url>http://www.gvpl.victoria.bc.ca/</url>
-    <descr>Proxy server for a public library's Internet connection</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Hal 9000's Birthday</name>
-    <url>http://www.halbday.com/</url>
-    <descr>Cybercast of Arthur C. Clarke - Used FreeBSD for sending video footage from Sri Lanka</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>HAL-PC</name>
-    <url>http://www.hal-pc.org/</url>
-    <descr>Houston's computer club, 10,000+ members strong!</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Hancock school district</name>
-    <url>http://hancock.k12.mo.us/bsfh/</url>
-    <descr>hancock high school</descr>
-    <email>ingres@hancock.k12.mo.us</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Hanse Networking e.V.</name>
-    <url>http://www.hanse.de/</url>
-    <descr>Internet Users Group in Hamburg, Germany</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Harju County Government</name>
-    <url>http://www.harju.ee/</url>
-    <descr>Local Government</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Harry Reid Center for Environmental Studies</name>
-    <url>http://eeyore.lv-hrc.nevada.edu/therd.shtml</url>
-    <descr>Home of THERdbASE</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Hepcat On-Line!</name>
-    <url>http://www.hepcat.org/</url>
-    <descr>Online Beatnik Forum</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Heritage Park Community</name>
-    <url>http://www.heritage-park.org/</url>
-    <descr>Local Community Information Server</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>HGM e.V</name>
-    <url>http://www.mabi.de/</url>
-    <descr>Non-profit ISP in Marburg/Biedenkopf, Hessen, GERMANY.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Holt Public Schools</name>
-    <url>http://www.holt.k12.mi.us/</url>
-    <descr>Public School District Serving Local K-12 Students</descr>
-    <email>melson@holt.k12.mi.us</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>HPEB</name>
-    <url>http://www.hpeb.re.kr/</url>
-    <descr>Health Technology Planning &amp; Evaluation Board of Korea</descr>
-    <email>zual@hpeb.re.kr</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ICEM of Folkwang-Hochschule Essen, Germany</name>
-    <url>http://www.folkwang.uni-essen.de/</url>
-    <descr>Institute for computermusic and electronic media</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>illusion.ca</name>
-    <url>http://www.illusion.ca/</url>
-    <descr>illusion internet services</descr>
-    <email>ken@illusion.ca</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>IMASY</name>
-    <url>http://www.imasy.or.jp/</url>
-    <descr>Internet Mutual Aid Society YOKOHAMA</descr>
-    <email>webmaster@imasy.or.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Individual Network Berlin e.V.</name>
-    <url>http://www.in-berlin.de/</url>
-    <descr>non-commercial ISP in Berlin</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Infocenter Chernobyl</name>
-    <url>http://www.ic-chernobyl.kiev.ua/</url>
-    <descr>Information Center in the Chernobyl Exclusion Zone</descr>
-    <email>admin@ic-chernobyl.kiev.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Information and Computer Technology at Niagara College</name>
-    <url>http://technology.niagarac.on.ca/</url>
-    <descr>A small college of applied arts and technology in Welland, Ontario, Canada</descr>
-    <email>mboldin@niagarac.on.ca</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Information Management Dept. National Taiwan University</name>
-    <url>http://www.tw.gnome.org/</url>
-    <descr>News/WWW server , mirror site of www.gnome.org</descr>
-    <email>eric@freebsd.im.ntu.edu.tw</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Information Management Dept. NTU Taiwan</name>
-    <url>http://god.im.ntu.edu.tw/</url>
-    <descr>A BBS server based on FreeBSD (god.im.ntu.edu.tw).</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Information Network Association of R.O.C.</name>
-    <url>http://web.ina.org.tw/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Information Technologies Center</name>
-    <url>http://www.itcnet.ru/</url>
-    <descr>Information Technologies Center of the Murmansk State Technical University, Murmansk, Russia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Inorganic Chemistry Division of MSU</name>
-    <url>http://www.inorg.chem.msu.ru/</url>
-    <descr>Moscow State University</descr>
-    <email>root@inorg.chem.msu.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Institut fuer Physik der Atmosphaere, Universitaet Mainz, BRD</name>
-    <url>http://ipamzlx.physik.uni-mainz.de/</url>
-    <descr>Department of Physic of the Atmosphere, University of Mainz, Germany</descr>
-    <email>webmaster@ipamzlx.physik.uni-mainz.de</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Institut f&uuml;r Informationssysteme, Vienna University of Technology</name>
-    <url>http://www.dbai.tuwien.ac.at/</url>
-    <descr></descr>
-    <email>pfeifer@dbai.tuwien.ac.at (Gerald Pfeifer)</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Institut Teknologi 10 Nopember Surabaya</name>
-    <url>http://its-sby.edu/</url>
-    <descr>Institut Teknologi terbesar di INDONESIA TIMUR</descr>
-    <email>apreman@hotmail.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Institut Teknologi Bandung</name>
-    <url>http://www.ee.itb.ac.id/</url>
-    <descr>Department of Electrical Engineering</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Institute for Laser Science, The University of Electro-Communications.</name>
-    <url>http://www-osa.ils.uec.ac.jp/</url>
-    <descr>internet server ,www,sendmail etc.</descr>
-    <email>www@ils.uec.ac.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Institute of Applied Mechanics</name>
-    <url>http://ipm.uni.udm.ru/</url>
-    <descr>Scientific Research Institute at Ural Branch of RAS</descr>
-    <email>tnk@ipm.uni.udm.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Institute of Artificial Intelligence</name>
-    <url>http://www.iai.donetsk.ua/</url>
-    <descr>Research and Scientifical Institute</descr>
-    <email>info@iai.donetsk.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Institute of Radioengineering &amp; Electronics, Russian Academy of Science. </name>
-    <url>http://www.cplire.ru/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Instituto de F&iacute;sica de S&atilde;o Carlos/USP</name>
-    <url>http://www.ifqsc.sc.usp.br/</url>
-    <descr>Servidor WWW</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Instituto de Quimica</name>
-    <url>http://www.iqm.unicamp.br/</url>
-    <descr>UNICAMP</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Instituto de Telecomunica&ccedil;&otilde;es - Polo de Coimbra</name>
-    <url>http://www.it.uc.pt/</url>
-    <descr>Telecommunications Institute at Coimbra - Portugal</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Instituto Tecnologico y de Estudios Superiores de Occcidente (ITESO)</name>
-    <url>http://www.iteso.mx/</url>
-    <descr>University in Guadalajara, Mexico.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>International Black Student Alliance, Inc.</name>
-    <url>http://www.ibsa-inc.org/</url>
-    <descr>Community Resource Development and Social, Economic Consultants</descr>
-    <email>ibsa@mymail.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Internet Gebruikersvereniging Interlink</name>
-    <url>http://il.fontys.nl/</url>
-    <descr>A students internet association</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Internet Macintosh Users Group</name>
-    <url>http://www.netmug.org/</url>
-    <descr>Group of Macintosh Users on the Internet</descr>
-    <email>perl@netmug.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Internet Navigor</name>
-    <url>http://www.nv.dn.ru/</url>
-    <descr>Small Internet Navigator</descr>
-    <email>kuzmin@dn.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Internet Reseaux et Communications</name>
-    <url>http://irc-france.fr.eu.org/</url>
-    <descr>IRC and RFC1459 in France</descr>
-    <email>irc@irc-france.fr.eu.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Ion</name>
-    <url>http://www.ion.sci.fi/</url>
-    <descr>Private computer club</descr>
-    <email>tech@ion.sci.fi</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>IONIAN UNIVERSITY</name>
-    <url>http://www.ionio.gr/</url>
-    <descr>University</descr>
-    <email>gvlachos@ionio.gr</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Iowa State University</name>
-    <url>http://www.cce.iastate.edu/</url>
-    <descr>Civil and Construction Engineering Department</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>IPS Radio and Space Services</name>
-    <url>http://www.ips.gov.au/</url>
-    <descr>Ionospheric Research and Forecasting</descr>
-    <email>www@ips.gov.au</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Irkutsk State University</name>
-    <url>http://www.isu.ru/</url>
-    <descr>The largest university in East Siberia, Russia.</descr>
-    <email>webmaster@isu.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Iroquois Falls Pentecostal Church</name>
-    <url>http://www.ifpc.on.ca/</url>
-    <descr>Ontario, Canada</descr>
-    <email>webmaster@ifpc.on.ca</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Ishikawa National College of Tech.</name>
-    <url>http://momiji.i.ishikawa-nct.ac.jp/</url>
-    <descr>(Free) Digital Filter Design Service(in Japanese)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Islandia</name>
-    <url>http://www.islandia.is/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ITECS</name>
-    <url>http://gremlin.eos.ncsu.edu/</url>
-    <descr>This is Only a Test</descr>
-    <email>nsj@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ITESM Campus Mazatl&aacute;n</name>
-    <url>http://academ02.maz.itesm.mx/</url>
-    <descr>University in M&eacute;xico</descr>
-    <email>gus@academ02.maz.itesm.mx</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>IUPUI Department of Continuing Studies</name>
-    <url>http://dcs.iupui.edu/</url>
-    <descr>Student Application Development Platform</descr>
-    <email>sysop@dcs.iupui.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>JakartaMail INC</name>
-    <url>http://www.jakartamail.com/</url>
-    <descr>Indonesian Free email service</descr>
-    <email>postman@jakartamail.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Japan Red Cros NAGOYA 1st Hospital</name>
-    <url>http://www.nagoya-1st.jrc.or.jp/</url>
-    <descr>JAPAN</descr>
-    <email>makokato@nagoya-1st.jrc.or.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Japan Research Association</name>
-    <url>http://www.jra.net/</url>
-    <descr></descr>
-    <email>webmaster@jra.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Jofrassi</name>
-    <url>http://www.jofrassi.qc.ca/</url>
-    <descr>International Adoption Magazine (French)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>JSK</name>
-    <url>http://www.iaia.irk.ru/</url>
-    <descr>Aircraft manufacturing (SU-27, SU-30)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Karpov Institute</name>
-    <url>http://www.nifhi.ac.ru/</url>
-    <descr>Karpov Institute of Physical Chemistry, Moscow, Russia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Kesher.Net</name>
-    <url>http://www.kesher.net/</url>
-    <descr>Strategic Information Systems Research</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Kharkiv State Polytechnic University</name>
-    <url>http://www.kpi.kharkov.ua/</url>
-    <descr>The largest University in Kharkiv, Ukraine</descr>
-    <email>vvc@kpi.kharkov.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>KhSTU</name>
-    <url>http://www.khstu.khabarovsk.su/</url>
-    <descr>Khabarovsk State Technical University</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>KISS</name>
-    <url>http://www.kiss.uni-lj.si/</url>
-    <descr>Student ISP</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Kona's Pawpals Wolfdog Rescue (KPWR)</name>
-    <url>http://www.pawpals.org/</url>
-    <descr>Wolfdog animal rescue, shelter, and education.</descr>
-    <email>rick@pawpals.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Korea FreeBSD Users Group</name>
-    <url>http://www.kr.freebsd.org/</url>
-    <descr>Korea FreeBSD Users Group</descr>
-    <email>webmaster@kr.freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Korea Medline</name>
-    <url>http://koreamed.kams.or.kr/</url>
-    <descr>Medical Thesis and Journal Search</descr>
-    <email>shuh@sun.hallym.ac.kr</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>KSPU Network Operaions Centre</name>
-    <url>http://noc.kspu.kr.ua/</url>
-    <descr>Kirovograd Satate Pedagogical Univ. NOC</descr>
-    <email>john@kspu.kr.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>KZSU Radio, Stanford University</name>
-    <url>http://www-kzsu.stanford.edu/</url>
-    <descr>Database and WWW servers</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Laboratoium Bidang Studi Eletronika,  Jurusan Teknik Elektro, Fakultas Teknologi Industri,  Institut Teknologi Sepuluh Nopember   (  I T S  )</name>
-    <url>http://202.155.4.246/</url>
-    <descr></descr>
-    <email>postmaster@elka.ee.its-sby.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Laboratorio de Quimica Teorica</name>
-    <url>http://www.lqt.dq.ufscar.br/</url>
-    <descr>www server, simulation of chemical systems</descr>
-    <email>gomide@lqt.dq.ufscar.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Lahore University of Management Sciences, Pakistan</name>
-    <url>http://www.lums.edu.pk/</url>
-    <descr>University offering programs in Computer Science, Economics, and Management Sciences</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>LARamie Internet Access and Telecommunications</name>
-    <url>http://www.lariat.org/</url>
-    <descr>A non-profit community network in Laramie, Wyoming.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Library System at Politecnico di Torino</name>
-    <url>http://wwwbiblio.polito.it/</url>
-    <descr>Educational Site for searches on our library server database (200000 record on four different databases).</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Liceum 1511</name>
-    <url>http://www.liceum.x-atom.ru/</url>
-    <descr>Moscow MEPHI Liceum 1511 Computer Center</descr>
-    <email>rd@atom.x-atom.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Light</name>
-    <url>http://light.pomona.edu/</url>
-    <descr>student access server for the Claremont Colleges</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>LINCC</name>
-    <url>http://www.lincc.lib.or.us/</url>
-    <descr>Library Information Network of Clackamas County (OR)</descr>
-    <email>george@lincc.lib.or.us</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Lincoln County School District #2</name>
-    <url>http://www.lcsd2.org/</url>
-    <descr>School District that runs FreeBSD &amp; OpenBSD for Web/Firewall/DHCP Services</descr>
-    <email>tstevenson@lcsd2.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Lions Club Whyalla Mount Laura Inc: 201S2  South Australia</name>
-    <url>http://www.gulf.net.au/~mtlauralions/</url>
-    <descr>Service Organisation - Assisting the needy in our community</descr>
-    <email>donvanw@gulf.net.au</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Liquid Magnesium Networks</name>
-    <url>http://www.magnesium.net/</url>
-    <descr>A not-for-profit FreeBSD learning environment.</descr>
-    <email>admins@magnesium.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Lotos ltd</name>
-    <url>http://lotos.kiev.ua/</url>
-    <descr>City Web Server of Slavutych, Ukraine</descr>
-    <email>egor@lotos.kiev.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Luchshe Home Network</name>
-    <url>http://www.luchshe.net/</url>
-    <descr>Local Friend Net in Moskow</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Lyrics HQ</name>
-    <url>http://www.lyricshq.com/</url>
-    <descr>The number one lyrics archive in the USA!</descr>
-    <email>tom@lyricshq.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Manchester College</name>
-    <url>http://www.manchester.edu/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Maranatha Christian University</name>
-    <url>http://www.maranatha.edu/</url>
-    <descr>Universitas Kristen Maranatha</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Mariborska razvojna agencija</name>
-    <url>http://www.mra.si/</url>
-    <descr>Regional Development Agency</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Medical College of Wisconsin Department of Neurology</name>
-    <url>http://www.neurology.mcw.edu/</url>
-    <descr>milic@www.neurology.mcw.edu</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Medical Library at Rikshospitalet, Norway</name>
-    <url>ftp://ftp.litestep.uio.no/</url>
-    <descr>FTP server for the National Hospital, Norway</descr>
-    <email>espenra@galenos.uio.no</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Megabyte-Inform</name>
-    <url>http://www.km.sifu.net/</url>
-    <descr>Interregional Information Center, Khmelnitskiy, Ukraine</descr>
-    <email>vovk@km.sifu.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Mendeleyev University of Chemical Technology of Russia</name>
-    <url>http://www.muctr.edu.ru/</url>
-    <descr>All servers running FreeBSD.</descr>
-    <email>webmaster@muctr.edu.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>MEPhI</name>
-    <url>http://www.eldep.mephi.ru/</url>
-    <descr>Moscow Engineering Physics Institute, Dep. of Electronics</descr>
-    <email>webmaster@eldep.mephi.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Missouri FreeNet</name>
-    <url>http://www.mfn.org/</url>
-    <descr>Non-Profit Community Access and Hosting Services: Based in Missouri, but serving the world!</descr>
-    <email>info@mfn.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Moldova State University</name>
-    <url>http://www.usm.md/</url>
-    <descr>This is STATE university of Moldova :)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Monterey High School</name>
-    <url>http://www.montereyhigh.com/</url>
-    <descr>Monterey High School uses FreeBSD to support Internet access (via proxy and NAT) and the school web page, as well as Windows &amp; Mac file sharing for 100+ computers on a single machine</descr>
-    <email>theatrus@usa.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Moscow CyberPunk Club</name>
-    <url>http://www.CyberPunk.ru/</url>
-    <descr>First CuberPunk organization in Russia</descr>
-    <email>YuH@CyberPunk.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Moscow State Institute of Electronic Techologies</name>
-    <url>http://www.miee.ru/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Moscow State University, Chemistry Department</name>
-    <url>http://www.chem.msu.ru/</url>
-    <descr>FreeBSD is our preferred system! </descr>
-    <email>noc@chem.msu.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>MU.Org</name>
-    <url>http://mu.org/</url>
-    <descr>Free applications writen for Univerisity of Missouri students</descr>
-    <email>paul@mu.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>MUC.DE</name>
-    <url>http://www.muc.de/</url>
-    <descr>Foundation providing individuals internet access in Munich, Germany</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Multiple Sclerosis Foundation</name>
-    <url>http://www.msfacts.org/</url>
-    <descr>Supporting people suffering from Multiple Sclerosis</descr>
-    <email>kip@msfacts.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Murmansk State Technical University</name>
-    <url>http://www.mstu.edu.ru/</url>
-    <descr>The first university in the world's biggest city located beyond the Arctic circle.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Muscular Dystrophy Association Australia</name>
-    <url>http://www.mda.org.au/</url>
-    <descr>Support Network for Nueromuscular Disorders</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>National Library of Australia</name>
-    <url>http://www.nla.gov.au/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>National TsingHua University, Taiwan.</name>
-    <url>telnet://bbs.life.nthu.edu.tw/</url>
-    <descr>Life Science BBS system.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>NCTU CSIE FreeBSD WebServer (Taiwan)</name>
-    <url>http://freebsd.csie.nctu.edu.tw/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Neuro Net Recordings</name>
-    <url>http://www.nnr.to/</url>
-    <descr>An independent group of techno music creators and lovers</descr>
-    <email>nnr@nnr.to</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>New Breed Software</name>
-    <url>http://zippy.sonoma.edu/kendrick/nbs/</url>
-    <descr>Games for X Window</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>New Mexico School for the Deaf</name>
-    <url>http://www.nmsd.k12.nm.us/</url>
-    <descr>Grade school (K-12) for deaf and hard-of-hearing students in the state of New Mexico.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>NUUG</name>
-    <url>http://www.nuug.no/</url>
-    <descr>Norwegian UNIX User Group</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Nothing</name>
-    <url>http://www.angelfire.com/il/LyNguyen/</url>
-    <descr>I am a student</descr>
-    <email>lydn@dwci.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>NTI-skolan</name>
-    <url>http://www.nti.se/</url>
-    <descr>Technical school of education</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>NTY Consulting</name>
-    <url>http://www.jted.com/</url>
-    <descr>Java Applet Game JTed, better than Tetris, big Fun Guaranteed</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Oakland Unified School District</name>
-    <url>http://tlc1.ousd.k12.ca.us/bb/</url>
-    <descr>DHCP and Squid cache servers for schools</descr>
-    <email>cgn@hjw.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Ohio Northern University</name>
-    <url>http://www.onu.edu/</url>
-    <descr>Campus-wide e-mail service</descr>
-    <email>r-beer@onu.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Ohio State University, Lima regional campus.</name>
-    <url>http://www.lima.ohio-state.edu/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Omahug</name>
-    <url>http://www.omahug.org/</url>
-    <descr>User Group</descr>
-    <email>jsw@ivgate.omahug.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Ormond College</name>
-    <url>http://www.ormond.unimelb.edu.au/</url>
-    <descr>A residential college at the University of Melbourne</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Osaka University</name>
-    <url>http://aria.mp.es.osaka-u.ac.jp/</url>
-    <descr>Cho Laboratory</descr>
-    <email>ushida@aria.mp.es.osaka-u.ac.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Penn State Amateur Radio Club</name>
-    <url>http://k3cr.ecsel.psu.edu/</url>
-    <descr>Amateur Radio enthusiasts at PSU</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Penza Technological Institute</name>
-    <url>http://www.pti.ac.ru/</url>
-    <descr>Penza Technological Institute (Russia)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Perfect Productions Ltd.</name>
-    <url>http://www.lqx.net/</url>
-    <descr>Various Public Internet Services</descr>
-    <email>matt@lqx.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Petrozavodsk State University</name>
-    <url>http://students.soros.karelia.ru/</url>
-    <descr>Server for students of PSU</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Philosophy Department, York University</name>
-    <url>http://thales.yorku.ca/</url>
-    <descr>Unofficial site running from the philosophy department's storage room.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Physics Computer Network, Purdue University</name>
-    <url>http://copernicus.physics.purdue.edu/</url>
-    <descr>Copernicus: Our Behind-the-Scenes Maintenance Server</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>PLiG</name>
-    <url>http://www.plig.net/</url>
-    <descr>Loose conglomeration of people</descr>
-    <email>info@plig.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Pobalscoil Neasain</name>
-    <url>http://www.psn.ie/</url>
-    <descr>Irish information-age secondary school</descr>
-    <email>ad@psn.ie</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Poot Poot</name>
-    <url>http://pootpoot.com/</url>
-    <descr>For all your poot needs!</descr>
-    <email>david@pootpoot.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>PPGA-UFRGS-Brazil</name>
-    <url>http://www.ppga.ufrgs.br/</url>
-    <descr>Programa em Pos-Graduacao em Administracao - UFRGS</descr>
-    <email>dfucs@adm.ufrgs.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Procuradoria da Rep&uacute;blica no DF</name>
-    <url>http://www.prdf.mpf.gov.br/</url>
-    <descr>&Oacute;rg&atilde;o do Minist&eacute;rio P&uacute;blico da Uni&atilde;o - Brasil</descr>
-    <email>smiranda@prdf.mpf.gov.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>PROSA</name>
-    <url>http://www.prosa.dk/</url>
-    <descr>Association of Computer Professionals in Denmark</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Psychology Department, University of Tasmania, Australia</name>
-    <url>http://www.psychol.utas.edu.au/</url>
-    <descr>Departmental home page</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Public DNS Service</name>
-    <url>http://soa.granitecanyon.com/</url>
-    <descr>Provides free primary and secondary DNS service</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Queen Mary's Post Graduate University Hospital</name>
-    <url>http://www.qmpgmc.ac.uk/</url>
-    <descr>Part of the NHS trust in the Roehampton United Kingdom</descr>
-    <email>greg@qmpgmc.ac.uk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Rackmount Studies.</name>
-    <url>http://www.rackmount.org/</url>
-    <descr>Development of low end networking solutions.</descr>
-    <email>info@rackmount.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Radio-MSU</name>
-    <url>http://www.radio-msu.net/</url>
-    <descr>RUHEP/Radio-MSU Internet project for high energy physics institutes in Russia and CIS countries</descr>
-    <email>yar@radio-msu.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Rajabhat Institute Ubonratchathani</name>
-    <url>http://www.riubon.ac.th/</url>
-    <descr>Higher Education in Nort-East of Thailand</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Raven.Scorch.Net</name>
-    <url>http://raven.scorch.net/</url>
-    <descr>The Raven.Scorch.Net Site</descr>
-    <email>jason@raven.scorch.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Rhodes University Computer Users Society (RUCUS)</name>
-    <url>http://www.rucus.ru.ac.za/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Riga Aviation University</name>
-    <url>http://www.rau.lv/</url>
-    <descr>University</descr>
-    <email>mg@rau.lv</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>RosAgroFond</name>
-    <url>http://www.raf.org.ru/</url>
-    <descr>Foundation for Support of Agrarian Reform and Rural Development (Russia)</descr>
-    <email>web@raf.org.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Rosenstiel School of Marine and Atmospheric Science</name>
-    <url>http://nauplius.rsmas.miami.edu/fishery.html</url>
-    <descr>Fisheries Science Group</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Rostov State University Open Systems Lab.</name>
-    <url>http://www.unird.ac.ru/</url>
-    <descr>Rostov-on-Don, Russia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>RoundHouse</name>
-    <url>http://www.fh-muenchen.de/htbin/htimage/home/ze/rz/services/projects/xcdroast/d_xcdroast.conf</url>
-    <descr>X-CD-Roast</descr>
-    <email>nathan@khmere.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Russian FTP Search</name>
-    <url>http://ftpsearch.directnet.ru:8000/</url>
-    <descr>Search through russian ftp-servers. </descr>
-    <email>kuzmin@dn.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SaxNet e. V.</name>
-    <url>http://www.sax.de/</url>
-    <descr>Internet access for private persons</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SBO</name>
-    <url>http://apeli.tky.hut.fi/~sbo/</url>
-    <descr>La Soci&eacute;t&eacute; du Billard d'Otaniemi</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>School of Information Technology, Northern Territory University, Australia.</name>
-    <url>http://www.cs.ntu.edu.au/</url>
-    <descr>WWW Servers, teaching and research.</descr>
-    <email>pjm@cs.ntu.edu.au</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SCISC</name>
-    <url>http://www.cip.nsk.su/</url>
-    <descr>Siberian Civic Initiatives Support Center</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Scotlandville Magnet High School</name>
-    <url>http://scotmhs.engr.subr.edu/</url>
-    <descr>Providing k12 newsgroups and e-mail (via Waffle BBS software) as well as full SLIP accounts and Internet training</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Scottish Mirror of the GNU website</name>
-    <url>http://gnu.cybersurf.co.uk/</url>
-    <descr>GNU Site mirrored daily</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Scottlandville Magnet High School</name>
-    <url>http://smhs.ebrps.subr.edu/</url>
-    <descr>Providing k12 newsgroups and e-mail (via Waffle BBS software) as well as full SLIP/PPP accounts and Internet training</descr>
-    <email>jfried@smhs.ebrps.subr.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Sentral Community School</name>
-    <url>http://206.72.51.200/</url>
-    <descr>Small, but technicalogically advanced... :-)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SFM</name>
-    <url>http://moldnet.md/</url>
-    <descr>Soros Foundaton Molodva</descr>
-    <email>vr@moldnet.md</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Shimin Forum 21 NPO Centre</name>
-    <url>http://www.sf21npo.gr.jp/</url>
-    <descr>NPO support Centre(MSO) in Tokai area(Japan).</descr>
-    <email>office@sf21npo.gr.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Slurpee Dot Net</name>
-    <url>http://www.slurpee.net/</url>
-    <descr>Group of unix ninja's</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Smack</name>
-    <url>http://smack.ebrps.subr.edu/</url>
-    <descr>a server run totaly by a class of seven students for teaching and entertainment purposes</descr>
-    <email>jfried@smack.ebrps.subr.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Social Information Networking Group (in South Korea)</name>
-    <url>http://www.sing-kr.org/</url>
-    <descr>Human rights in the cyberspace.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Sociedad Astronomica de Espana y America</name>
-    <url>http://www.sadeya.cesca.es/</url>
-    <descr>Astronomical Society of Spain and America</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Sociedade Brasileira de Quimica</name>
-    <url>http://www.sbq.org.br/SBQT/sbqt.html</url>
-    <descr>(Brazilian Chemical Society)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>South Dakota Library Network</name>
-    <url>http://webpals.sdln.net/</url>
-    <descr>WebPals -- Patrons can search the online catalog, reference files, and indexes</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>South Dakota School of Mines and Technology</name>
-    <url>http://www.sdsmt.edu/</url>
-    <descr>Higher Education for Engineering and Science disciplines</descr>
-    <email>sbauer@silver.sdsmt.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Southern Illinois University at Edwardsville - EE Dept.</name>
-    <url>http://www.ee.siue.edu/CVIPtools/</url>
-    <descr>CVIPtools - a free, comprehensive software package for Computer Vision and Image Processing</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Southwestern Adventist University - SIFE</name>
-    <url>http://sife.swau.edu/</url>
-    <descr>SWAU SIFE Computer Team</descr>
-    <email>franky@sife.swau.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Soymeal InfoSource</name>
-    <url>http://www.soymeal.org/</url>
-    <descr>Developments in the processing and uses for soybean meal.</descr>
-    <email>webmaster@soymeal.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Spejderskolen</name>
-    <url>http://www.spejdko.edu.eu.org/</url>
-    <descr>Guide &amp; Schout school in Denmark</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Spring Arbor College</name>
-    <url>http://www.arbor.edu/</url>
-    <descr>Christian college in Spring Arbor, Michigan</descr>
-    <email>martym@arbor.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>St. Aidan's Anglican Girls School</name>
-    <url>http://www.staidan.qld.edu.au/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>St. Kennoch's Renaissance Acting Guild</name>
-    <url>http://www.stkennoch.org/</url>
-    <descr>Theatrical Guild portraying life and death in 16th Century Scotland</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Stanford Chaparral</name>
-    <url>http://chappie.stanford.edu/</url>
-    <descr>Stanford Humor Magazine</descr>
-    <email>fancylad@chappie.stanford.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Stichting Signature</name>
-    <url>http://www.signature.nl/</url>
-    <descr>Technische ondersteuning voor (podium) kunst</descr>
-    <email>henk@signature.nl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>STT TELEKOM BANDUNG</name>
-    <url>http://www.stttelkom.ac.id/</url>
-    <descr>IMS laboratory</descr>
-    <email>syadmin@stttelkom.ac.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Student Cable Works</name>
-    <url>http://scw.ucsd.edu/</url>
-    <descr>student-run cable tv/radio at University of California, San Diego</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Sundsvalls Commsoft</name>
-    <url>http://www.commsoft.se/</url>
-    <descr>Computer society in Sundsvall, Sweden.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>sunward.net</name>
-    <url>http://www3.sunward.net/</url>
-    <descr></descr>
-    <email>iida@sunad03.sunward.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SUNY Stony Brook</name>
-    <url>http://www.ug.cs.sunysb.edu/</url>
-    <descr>SUNY Stony Brook Undergraduate lab</descr>
-    <email>webmaster@ug.cs.sunysb.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Surrey High School</name>
-    <url>http://www.shsnet.com/</url>
-    <descr>Public School in Surrey, North Dakota</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Syracuse University</name>
-    <url>http://soa.syr.edu/soa.html</url>
-    <descr>School of Architecture</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Taiwan Agriculture Infor. Serv.</name>
-    <url>http://home.tais.com.tw/</url>
-    <descr>Taiwan Agriculture Information Services</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Team on mountaineering of Bauman MSTU</name>
-    <url>http://www.theory.ru/</url>
-    <descr>Mountaineering and climbing in Russia</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Tech-NIC</name>
-    <url>http://www.tech-nic.dk/</url>
-    <descr>TECHnical Network Informations Center</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Technisch Creatief Centrum Nijmegen</name>
-    <url>http://tccn.cs.kun.nl/</url>
-    <descr>promotes childrens' technical and scientific understanding</descr>
-    <email>sparky@tccn.cs.kun.nl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Technisch Creatief Jeugdcentrum Arnhem</name>
-    <url>http://www.tcja.nl/</url>
-    <descr>teaches kids that technical subjects can be fun!</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Teknik Fisika ITB</name>
-    <url>http://server.tf.itb.ac.id/</url>
-    <descr>major study in applied physics with new paradigm !</descr>
-    <email>admin@tf.itb.ac.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>TFUG</name>
-    <url>http://www.tfug.org/</url>
-    <descr>Tucson Free Unix Group</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Bawdy Caste</name>
-    <url>http://www.bawdycaste.org/</url>
-    <descr>Fremont, California's Rocky Horror Picture Show performing cast</descr>
-    <email>zenin@bawdycaste.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Chi Chi Rodriguez Youth Foundation</name>
-    <url>http://www.chichi.org/</url>
-    <descr>Site creating awareness about golf for disadvantaged youth</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Children of Technology</name>
-    <url>http://www.c0t.org/</url>
-    <descr>Research Center for the sciences</descr>
-    <email>mbernstein@c0t.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Cold Project</name>
-    <url>http://www.cold.org/</url>
-    <descr>ColdC OO database development</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>THE CYRENE NETWORK</name>
-    <url>http://THE-CYRENE-NETWORK.webjump.com/</url>
-    <descr>GOOD NEWS DISTRIBUTION</descr>
-    <email>simoncyrene@hotmail.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Digibeam Compire</name>
-    <url>http://www.digibeam.com/</url>
-    <descr>Texas, Jesus &amp; Freedom a' go-go</descr>
-    <email>loren@flash.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The ETEXT Archives</name>
-    <url>http://www.etext.org/</url>
-    <descr>Free resources for independent online publishers</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Flexible Scheduling Program</name>
-    <url>http://www.flex.org/</url>
-    <descr>An alternative educational program for High School students.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Greater Houston Free-Net</name>
-    <url>http://www.ghofn.org/</url>
-    <descr>The Greater Houston Free-Net is dedicated to making Internet access and services available to community organizations and to those who are otherwise unable to afford it.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Handsome Network</name>
-    <url>http://www.handsome.ne.jp/</url>
-    <descr>An amateur creative group for new public license of software</descr>
-    <email>hikawa@handsome.ne.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Heavy Badge</name>
-    <url>http://www.heavybadge.com/</url>
-    <descr>Law Enforcement Pyscology and Corrections</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Homeport Collective</name>
-    <url>http://www.homeport.org/</url>
-    <descr>An Intentional Community in Bolton, MA</descr>
-    <email>webmaster@homeport.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Hungry Programmers</name>
-    <url>http://www.hungry.com/</url>
-    <descr>A free software collective.  And other stuff.</descr>
-    <email>tspencer@hungry.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Loomis Chaffee Student.Net</name>
-    <url>http://puk.loomis.org/</url>
-    <descr>a high school student run network ever</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Lycaeum</name>
-    <url>http://www.lycaeum.org/</url>
-    <descr>Drug Information Server</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The MEGIDO High School</name>
-    <url>http://www.megido.inter.net.il/</url>
-    <descr>A regional Highschool, Located in Kibbutz Ein-Hashofet, Israel.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Project</name>
-    <url>http://www.the-project.org/</url>
-    <descr>IRC Related informational site</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Rocky Horror Archive</name>
-    <url>http://www.archive.rhps.org/</url>
-    <descr>Fan archive for followers of the cult movie, The Rocky Horror Picture Show</descr>
-    <email>zenin@archive.rhps.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The South-East Central Network Consortium</name>
-    <url>http://www.scnc.k12.mi.us/</url>
-    <descr>88 School districts, and 10 Intermediate School Districts.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Star Wars Multimedia Archive</name>
-    <url>http://www.skywalker.net/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The students' association of Dokkyo University School of Medicine</name>
-    <url>http://gakuyu.dokkyomed.ac.jp/index.html</url>
-    <descr>The student's association of Dokkyo University School of Medicine Home-Page.In Japanese, called</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Tech's Revenge</name>
-    <url>http://www.antix.org/</url>
-    <descr>The premier Quake and Halflife Clan</descr>
-    <email>webmaster@antix.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Webring</name>
-    <url>http://www.webring.org/</url>
-    <descr>A new way to surf the web.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>TheBandit Internet Service</name>
-    <url>http://www.thebandit.com/</url>
-    <descr>Providing Free Internet Access To The World</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Timisoara Condensed Matter Research Institute, Romania</name>
-    <url>http://icmct.uvt.ro/</url>
-    <descr>crystal growth, fundamental research, nanoparticles, nonlinear optics, plasma physics, X-ray spectroscopy</descr>
-    <email>baroti@icmct.uvt.ro</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Today In Black History</name>
-    <url>http://www.tibh.com/</url>
-    <descr>The World's Foremost Black Historical Site</descr>
-    <email>curator@tibh.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Tokyo Easy Line</name>
-    <url>http://www.telnet.or.jp/</url>
-    <descr>Non commercial small ISP in Tokyo Japan.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Tokyo Institute of Technology</name>
-    <url>http://www.cc.titech.ac.jp/</url>
-    <descr>mail &amp; proxy server for education system</descr>
-    <email>ysakazum@e.cc.titech.ac.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Tomsk Oblast Center of Information Technologies</name>
-    <url>http://obluo.tomsk.su/</url>
-    <descr>Education, support and consalting</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Toth Arpad Gimnazium</name>
-    <url>http://www.tagdebr.sulinet.hu/</url>
-    <descr>secondary school</descr>
-    <email>tibor@tagdebr.sulinet.hu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>TUSUR</name>
-    <url>http://www.tusur.ru/</url>
-    <descr>Tomsk State University of Control Systems and Radioelectronics</descr>
-    <email>chch@tasur.edu.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Tyumen state oil and gas university</name>
-    <url>http://rbnet.tsogu.ru/</url>
-    <descr></descr>
-    <email>sv@conjurer.tyumen.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>U W Swansea, Dept. of Computer Science</name>
-    <url>http://www-compsci.swan.ac.uk/</url>
-    <descr>Staff web,appletalk,netbios,mail,nfs,nis server</descr>
-    <email>p.roberts-davies@swan.ac.uk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>UC Santa Barbara, Extension</name>
-    <url>http://www.unex.ucsb.edu/</url>
-    <descr>Continuing Education</descr>
-    <email>webmaster@xlrn.ucsb.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Uenohouka Business Professional School</name>
-    <url>http://www.uenohouka.ac.jp/</url>
-    <descr>Educational Foundation</descr>
-    <email>fujie@uenohouka.ac.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>UKMA Internet Project</name>
-    <url>http://snark.ukma.kiev.ua/</url>
-    <descr>University of Kiev-Mohyla Academy, Kiev, Ukraine</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Ukrainian Physical Society</name>
-    <url>http://www.ups.kiev.ua/</url>
-    <descr>Self-managing public organization</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>UNDP - Uzbekistan</name>
-    <url>http://www.undp.uz/</url>
-    <descr>UN Office in Uzbekistan</descr>
-    <email>webber@fouzb.undp.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Uni Bielefeld, Fakultaet fuer Chemie, Abt. DC2</name>
-    <url>http://dc2.uni-bielefeld.de/</url>
-    <descr>Medienserver</descr>
-    <email>mbehrendt@dc2.uni-bielefeld.de</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Unia Lubelska High School, Lublin, Poland</name>
-    <url>http://lagoon.freebsd.org.pl/</url>
-    <descr>Main school server (user accounts, w3cache, UUCP, INN)</descr>
-    <email>venglin@lagoon.freebsd.org.pl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Unia Lubelska High School, Lublin, Poland</name>
-    <url>http://www.3lo.lublin.pl/</url>
-    <descr>Main school server (user accounts)</descr>
-    <email>bka@unia.3lo.lublin.pl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Unincorporated Society of Plastic Sheep</name>
-    <url>http://www.plastic-sheep.org/</url>
-    <descr>The life and loves of Barbara the Plastic Sheep</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Uninet-ZA</name>
-    <url>http://www.uni.net.za/</url>
-    <descr>Uninet-ZA network server project</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>United States Office of Surface Mining Reclamation and Enforcement</name>
-    <url>http://www.osmre.gov/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Universidad Autonoma de Baja California</name>
-    <url>http://fciencias.ens.uabc.mx/</url>
-    <descr>Faculty of Sciences</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Universidad de San Buenaventura</name>
-    <url>http://argos.usb.edu.co/</url>
-    <descr>Facultad de Ingenier&iacute;a de Sistemas</descr>
-    <email>root@argos.usb.edu.co</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Universitas Parahyangan</name>
-    <url>http://student.unpar.ac.id/</url>
-    <descr>Student Site of Parahyangan Catholic University</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Universiti Sains Malaysia</name>
-    <url>http://www.usm.my/</url>
-    <descr>Malaysia University Of Science - DNS server and very soon WWW, Firewall &amp; Proxy server</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of California, Davis</name>
-    <url>http://www.vmth.ucdavis.edu/</url>
-    <descr>Veterinary Medical Teaching Hospital</descr>
-    <email>spzeck@ucdavis.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of Jyv skyl</name>
-    <url>http://www.jyu.fi/</url>
-    <descr>e-mail, news, irc, www, gopher and other services.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of Kentucky</name>
-    <url>http://www.uky.edu/</url>
-    <descr>40,000 user pop3 server. Main campus www server, news server, misc. other services</descr>
-    <email>soward@uky.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of Ljubljana</name>
-    <url>http://www.lecad.uni-lj.si/</url>
-    <descr>CAD lab of Mech.Eng.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of Natal, Durban: Internet society</name>
-    <url>http://beastie.cs.und.ac.za/</url>
-    <descr>Providing Internet access to undergraduate students</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of North Texas</name>
-    <url>http://www.cs.unt.edu/</url>
-    <descr>Computer Science Department</descr>
-    <email>sysadm@cs.unt.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of Oregon Residence Networking</name>
-    <url>http://resnet.uoregon.edu/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of Piraeus</name>
-    <url>http://www.unipi.gr/</url>
-    <descr>University</descr>
-    <email>noc@unipi.gr</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of South Africa</name>
-    <url>http://fasc.unisa.ac.za/</url>
-    <descr>Faculty of Science Computer Lab</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of Tanjungpura</name>
-    <url>http://www.untan.ac.id/</url>
-    <descr>University in Kalimantan Barat (Indonesia)</descr>
-    <email>odhienx@untan.ac.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of the Virgin Islands</name>
-    <url>http://yoda.uvi.edu/</url>
-    <descr>Student maintained FreeBSD-2.2.5 server running Apache 1.2.6 and Samba 1.9.18p4</descr>
-    <email>marshall@uvi.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University Of Western Australia Computer Club</name>
-    <url>http://www.ucc.gu.uwa.edu.au/</url>
-    <descr>The First One And Only Computer Club</descr>
-    <email>accmurphy@ucc.gu.uwa.edu.au</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Universit&auml;t Bielefeld</name>
-    <url>http://dc2.uni-bielefeld.de/rse/</url>
-    <descr>Fakult&auml;t f&uuml;r Chemie, DC2</descr>
-    <email>manfred.behrendt@dc2.uni-bielefeld.de</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>UnixBrasil</name>
-    <url>http://www.unixbrasil.com.br/</url>
-    <descr>Information about FreeBSD / *nix on Brazil. Available in Portuguese</descr>
-    <email>silveira@unixbrasil.com.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>unixdrivers.org</name>
-    <url>http://ns.unixdrivers.org/</url>
-    <descr>Free help with unix/linux software, drivers(hardware configuration), and more!  This is an open project!</descr>
-    <email>admin@xpro.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Urban Planning and Architectural Committee</name>
-    <url>http://www.kga.neva.ru/</url>
-    <descr>A division in St.Petersburg (Russia) City Administration dealing with urban planning, architecture and construction</descr>
-    <email>eugene@kga.neva.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>US Embass, Kyiv (Ukraine)</name>
-    <url>http://www.usemb.kiev.ua/</url>
-    <descr>an official web site of the US Embassy in Kyiv</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>USIS Stockholm</name>
-    <url>http://www.usis.usemb.se/</url>
-    <descr>United States Information Service, American Embassy Stockholm</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Utah Valley State College</name>
-    <url>http://www.uvsc.edu/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>VE7TCP</name>
-    <url>http://ve7tcp.ampr.org/</url>
-    <descr>Amateur Radio Web Site and Mailing List Host</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>venuswars</name>
-    <url>http://128.210.192.169/</url>
-    <descr>a nice site. we handle things. </descr>
-    <email>calx@purdue.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Videomove</name>
-    <url>http://www.videomove.org/</url>
-    <descr>Media movements international (SING &amp; Videazimut)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Virginia Tech ACM Student Chapter</name>
-    <url>http://www.acm.vt.edu/</url>
-    <descr>Local student chapter of the International ACM</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Virginia Tech undergraduate computing lab</name>
-    <url>http://www.cs.vt.edu/</url>
-    <descr>116MCB uses FreeBSD as it's PC-based UNIX OS.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Virginia VIEW</name>
-    <url>http://vaview.vavu.vt.edu/</url>
-    <descr>Career and college information delivery system for the state of Virginia</descr>
-    <email>dglynn@vaview.vavu.vt.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>VTEC.net</name>
-    <url>http://www.vtec.net/</url>
-    <descr>Honda/Acura Enthusiasts Website</descr>
-    <email>admin@vtec.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Wafu</name>
-    <url>http://wafu.netgate.net/eindex.html</url>
-    <descr>Wafu Internet server (Japanese Taste)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Walnut Grove Secondary School</name>
-    <url>http://www.wgss.net/</url>
-    <descr>High School in Langley, British Columbia, Canada</descr>
-    <email>webmaster@wgss.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Warren Area High School</name>
-    <url>http://www.warrenweb.net/</url>
-    <descr>Student based web server</descr>
-    <email>csteva@penn.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Warthen DataComm Technologies</name>
-    <url>http://kermit.wwarthen.com/</url>
-    <descr>Kermit for Windows Communications Software</descr>
-    <email>WWarthen@WWarthen.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Web server of NTOU Department of Computer Science</name>
-    <url>http://cyber.cs.ntou.edu.tw/</url>
-    <descr>National Taiwan Ocean University Department of Computer Science Web page for under graduated students</descr>
-    <email>root@cyber.cs.ntou.edu.tw</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>WebSearch . com . au</name>
-    <url>http://www.WebSearch.com.au/</url>
-    <descr>The Australian Search Engine - Indexing local .AU content only !!</descr>
-    <email>dez@websearch.com.au</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>West University of Timisoara, Romania.</name>
-    <url>http://www.uvt.ro/</url>
-    <descr>abcdefg</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Williams College</name>
-    <url>http://wso.williams.edu/</url>
-    <descr>Williams Students Online</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>WMHT Educational Telecommunications</name>
-    <url>http://www.wmht.org/</url>
-    <descr>Albany, NY PBS TV &amp; Radio Station</descr>
-    <email>bruth@wmht.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Wollongong APANA Inc</name>
-    <url>http://www.wollongong.apana.org.au/</url>
-    <descr>Non-Profit organisation, gives cheap internet access to the local community</descr>
-    <email>staff@wollongong.apana.org.au</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>WRLZ</name>
-    <url>http://www.wrlz.org/</url>
-    <descr>Dedicated to UNIX and new network techonologies</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>WTC museum of photography, Arts and Crafts network.</name>
-    <url>http://museum.osakawtc.or.jp/</url>
-    <descr></descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>XCarrier.net</name>
-    <url>http://www.xcarrier.net/</url>
-    <descr>Communication Experimentation Group</descr>
-    <email>webmaster@xcarrier.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Yaroslavl Astronomical Society</name>
-    <url>http://www.yspu.yar.ru/astronomy/</url>
-    <descr>Yaroslavl Astronomical Society (State Pedagogical Institute). Main research area - Celestial mechanics and Solar system astronomy</descr>
-    <email>rosaev@nedra.yar.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Yaroslvl Network Center</name>
-    <url>http://saturn.yars.free.net/</url>
-    <descr>Yaroslavl State University central web proxy (squid)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Yoyo Internet Services</name>
-    <url>http://www.yoyo.org/</url>
-    <descr>Internet Collective</descr>
-    <email>root@yoyo.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>YVBB Foundation</name>
-    <url>http://www.teuton.org/</url>
-    <descr></descr>
-    <email>info@teuton.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>&Eacute;quipe ASIM, LIP6, UPMC, Universit&eacute; Paris 6</name>
-    <url>http://cao-vlsi.ibp.fr/index.gb.html</url>
-    <descr>Research team at the University Paris 6 (France)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>#Networkinghelp on the Undernet</name>
-    <url>http://www.networkinghelp.org/</url>
-    <descr>Networking support channel on the Undernet IRC network</descr>
-    <email>webmaster@networkinghelp.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>NOUFS.ORG: The NOUFS Community</name>
-    <url>http://noufs.org</url>
-    <descr>FreeBSD Rulezzzz , The Best OS =) , PIII 550 , 512 Mo RAM , 13 Giga HD  , Mail , www , Ntp , Bind , Ftp , Irc</descr>
-    <email>choooli@noufs.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>200sx.org</name>
-    <url>http://www.200sx.org/</url>
-    <descr>Racing a Nissan 200SX in Australia</descr>
-    <email>chris@200sx.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>A Merging of Fates</name>
-    <url>http://www.merging.org/</url>
-    <descr>Merging runs FreeBSD on their main and developmental servers to run a mud.</descr>
-    <email>maccleod@merging.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>AAMM Learning COOP</name>
-    <url>http://aamm.unm.edu/</url>
-    <descr>Medical Student Information Exchange Database</descr>
-    <email>mfidel@aamm.unm.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>AccessIRC Network</name>
-    <url>http://www.accessirc.net/</url>
-    <descr>IRC network</descr>
-    <email>sdsmith@thwap.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>activeZONE Development Group</name>
-    <url>http://activezone.org/</url>
-    <descr>Programming in Germany ;-)</descr>
-    <email>info@activezone.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Ada Trembli (Fux0red Bitch)</name>
-    <url>http://www.fux0redbitch.org/</url>
-    <descr>A free services/personal FreeBSD Box</descr>
-    <email>atrembli@fux0redbitch.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Affiliated Health Services</name>
-    <url>http://www.affiliatedhealth.org</url>
-    <descr>Hospital and health care system in Skagit County, WA</descr>
-    <email>rschilling@affiliatedhealth.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>alienwebshop</name>
-    <url>http://www.alienwebshop.com/</url>
-    <descr>Don't Panic!</descr>
-    <email>brian@alienwebshop.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>AllTheWeb</name>
-    <url>http://www.alltheweb.com/</url>
-    <descr>World famous, non-commercial search engine</descr>
-    <email>hallingdal@webdesign.bu.no</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>American Robert College</name>
-    <url>http://vm.robcol.k12.tr/</url>
-    <descr>VisualMail Server</descr>
-    <email>alisoylu@robcol.k12.tr</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Andromeda</name>
-    <url>http://andromeda.merseine.nu/</url>
-    <descr>organisation of students dedicated to learning and perfecting computer theory and structure</descr>
-    <email>rain@andromeda.merseine.nu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Angeles Chapter, Sierra Club</name>
-    <url>http://angeles.sierraclub.org/</url>
-    <descr>Environmental/Outdoor Non Profit Organization</descr>
-    <email>jim@usbusinessweb.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Angelo State University</name>
-    <url>http://physics.angelo.edu/</url>
-    <descr>Department of Physics</descr>
-    <email>awallace@physics.angelo.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Anime</name>
-    <url>http://www.anime-fansubs.org</url>
-    <descr>Anime Fansubs Website</descr>
-    <email>snipe@narusegawa.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Arbornet, Inc.</name>
-    <url>http://www.arbornet.org/</url>
-    <descr>America's First Public Access UNIX Server</descr>
-    <email>www@arbornet.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ASDG</name>
-    <url>http://www.asdg.ru/</url>
-    <descr>Association of Siberian and Far Eastern cities</descr>
-    <email>postmaster@asdg.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Asociacion Comunitarios</name>
-    <url>http://www.comunitarios.org</url>
-    <descr>Students organization. San Juan. Argentina</descr>
-    <email>webmaster@comunitarios.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>AssociAAMM learning coop</name>
-    <url>http://aamm.unm.edu</url>
-    <descr>A distributed learning environment for medical students</descr>
-    <email>mfidel@aamm.unm.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Aston University</name>
-    <url>http://mis.aston.ac.uk/</url>
-    <descr>University MIS Department Web server</descr>
-    <email>steve@megawebsites.co.uk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Atlantis MUSH</name>
-    <url>http://123inter.net/atlantis/index.html</url>
-    <descr>Internet MUSH game site.</descr>
-    <email>sharper@123inter.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>AUSTRIAN UNIX USER COMMUNITY</name>
-    <url>http://www.altf4.at/</url>
-    <descr>FreeBSD System Administration</descr>
-    <email>Egon.Rath@telecom.at</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Balakovo RUS</name>
-    <url>http://www.balakovo.san.ru/</url>
-    <descr>ISP</descr>
-    <email>webmaster@balakovo.san.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>beancrock.net</name>
-    <url>http://www.beancrock.net/</url>
-    <descr>Small internet based services (email, shell, etc...)</descr>
-    <email>mgtak@beancrock.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>BeZip</name>
-    <url>http://bezip.de/</url>
-    <descr>big download archiv  for BeOS software</descr>
-    <email>webmaster@bezip.de</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Bidang Studi Elektronika ITS</name>
-    <url>http://elka.ee.its-sby.edu/</url>
-    <descr>Bidang Studi Elektronika Jurusan Teknik Elektro Institut Teknologi Sepuluh Nopember Surabaya</descr>
-    <email>intranet@elka.ee.its-sby.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>BMSTU SM faculty</name>
-    <url>http://www.sm.bmstu.ru</url>
-    <descr>Bauman Moscow State Technical University Special Machinery faculty server</descr>
-    <email>gusev@sm.bmstu.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Bossier Parish Technical School</name>
-    <url>http://bpts.wox.org/</url>
-    <descr>student operated web/telnet/ftp/mail server for teachers and students</descr>
-    <email>rain@pinkpunk.staticky.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>brained.org</name>
-    <url>http://www.brained.org/</url>
-    <descr>Unix advocacy, networking, security, programming, free sub domain / e-mail forwarding and more.</descr>
-    <email>zerash@brained.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Brooklyn Academy of Music</name>
-    <url>http://www.bam.org/</url>
-    <descr>America's oldest performing arts center.. unfortunately our homepage is hosted off-site on an NT server.. but we use FreeBSD for our intranet!</descr>
-    <email>tcrescenzi@bam.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>BSD@work</name>
-    <url>http://www.bsdatwork.com/</url>
-    <descr>A site dedicated to promoting BSD Unix</descr>
-    <email>bsd@reaction.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>California Academy of Sciences</name>
-    <url>http://www.calacademy.org/</url>
-    <descr>Natural History Museum, Aquarium and Planetarium</descr>
-    <email>mmurrell@calacademy.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>California State University, Chico</name>
-    <url>http://webclass.csuchico.edu/</url>
-    <descr>University Classroom Site</descr>
-    <email>fcondo@csuchico.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>CASAMIA BBS</name>
-    <url>http://bbs.as.ntu.edu.tw/</url>
-    <descr>An Bulletin Board System of Nation Taiwan University the department of atmospheric science</descr>
-    <email>rookie.bbs@bbs.as.ntu.edu.tw</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Catholic Student Center at Washington University St. Louis</name>
-    <url>http://rescomp.wustl.edu/~newman/</url>
-    <descr>Provides online homilies in MP3 format and serves as a Firewall</descr>
-    <email>jha@aughey.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>CEFET-BA</name>
-    <url>http://www.cefetba.br</url>
-    <descr>Federal Center of Technological Education of Bahia - a Governamental Education Institute in Salvador, Bahia, Brazil</descr>
-    <email>root@cefetba.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Champaign County Regional Planning Commission</name>
-    <url>http://www.ccrpc.org</url>
-    <descr>Regional government agency</descr>
-    <email>pea@ccrpc.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Champaign-Urbana Public Health District</name>
-    <url>http://www.cuphd.org</url>
-    <descr>Local community public health department</descr>
-    <email>pea@cuphd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Charlottesville Albemarle Rescue Squad Inc.</name>
-    <url>http://warhammer.mcc.virginia.edu/</url>
-    <descr>Busiest ALL Volunteer Rescue Squad. Largest Web Presence in the Rescue Community.</descr>
-    <email>pth3k@Virginia.EDU</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Chemistry Departement, Bandung Institute of Technology</name>
-    <url>http://www.chem.itb.ac.id/</url>
-    <descr>Chemistry Departement Cool</descr>
-    <email>cello@students.chem.itb.ac.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Colorado State Public Defender</name>
-    <url>http://www.state.co.us/</url>
-    <descr>Intranet EIP Zope/PostgreSQL server</descr>
-    <email>nsmu@state.co.us</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Compiled.org</name>
-    <url>http://www.compiled.org/</url>
-    <descr>Programmers Resources.</descr>
-    <email>apiowns@bellsouth.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Computer Science Network (CS-NET)</name>
-    <url>http://digital.its-sby.edu/</url>
-    <descr>Computer Science Network of Informatics Engineering 10 Nopember Institute of Technology Surabaya Indonesia</descr>
-    <email>asfik@its-sby.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Consejo Estatal Electoral del Estado de Sonora</name>
-    <url>http://www.ceesonora.org.mx/</url>
-    <descr>This network and computer security  uses FreeBSD for high speed intrusion detection, virtual private networking, and data warehousing applications. Network Security  and uses FreeBSD at several undisclosed hackers and intruders in the electoral process in Sonora and protect our internal process on line in the preliminar result program.</descr>
-    <email>nojeda@iname.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Corporacion Universitaria Autonoma de Occidente</name>
-    <url>http://www.cuao.edu.co</url>
-    <descr>University , Educational Services</descr>
-    <email>cat@cuao.edu.co</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Corporacion Universitaria Autonoma de Occidente - CUAO</name>
-    <url>http://www.cuao.edu.co/</url>
-    <descr>Firewall and Proxy Server</descr>
-    <email>catv@mail.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Crimean State Industrial-Pedagogical Institute</name>
-    <url>http://www.csipi.simfi.net/</url>
-    <descr>State-run education institution</descr>
-    <email>root@csipi.simfi.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Crosswinds</name>
-    <url>http://home.crosswinds.net/</url>
-    <descr>Crosswinds.net free unlimited internet hosting</descr>
-    <email>lenny@crosswinds.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>CSP</name>
-    <url>http://www.csp.it/</url>
-    <descr>Centre of Excellence for Research, Development and Experimentation of Advanced Computer Science and Information</descr>
-    <email>info@csp.it</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>CyberData Computer Services</name>
-    <url>http://www.lucban.net/</url>
-    <descr>Lucban.net</descr>
-    <email>cyberdata@lucban.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Cybernetics faculty</name>
-    <url>http://www.unicyb.kiev.ua/</url>
-    <descr>Kiev National University Cybernetic faculty</descr>
-    <email>butch@unicyb.kiev.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Dallas Magic Clubs</name>
-    <url>http://www.dallasmagic.org/</url>
-    <descr>The local DFW clubs that are into magic</descr>
-    <email>pulcher@killercomputing.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Dark Zen</name>
-    <url>http://www.darkzen.com/</url>
-    <descr>Mystical Zen Buddhism</descr>
-    <email>webmaster@darkzen.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Darkforce</name>
-    <url>http://www.darkforce.ch/</url>
-    <descr>The Webserver of the Computer Scientist apprentices of Baden, Switzerland</descr>
-    <email>webmaster@darkforce.ch</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Department of Engineering Gadjah Mada University</name>
-    <url>http://www.teknikugm.ac.id</url>
-    <descr>Main Server</descr>
-    <email>admin@teknikugm.ac.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Dept of Geophysics and Meteorology, Institute of Technology, Bandung</name>
-    <url>http://students.geoph.itb.ac.id/</url>
-    <descr>Students Mail Server</descr>
-    <email>admin@students.geoph.itb.ac.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Dept. of System Engineering, National Taiwan Ocean University</name>
-    <url>http://www.se.ntou.edu.tw/</url>
-    <descr>FreeBSD is the only choice to build our internet and intranet servers.</descr>
-    <email>ylchang@se.ntou.edu.tw</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Digital Nexus</name>
-    <url>http://www.diginex.net/</url>
-    <descr>OpenSource Gateway</descr>
-    <email>dadexter@videotron.ca</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>dinoex.sub.org</name>
-    <url>http://www.dinoex.sub.org/</url>
-    <descr>email and news service for special intrests</descr>
-    <email>dirk.meyer@dinoex.sub.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>disflux.org</name>
-    <url>http://www.disflux.org/</url>
-    <descr>Devoted to free information on the net</descr>
-    <email>phrac@disflux.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>DktBot.org</name>
-    <url>http://dktbot.org/</url>
-    <descr>DktBot - Free IRC Bot</descr>
-    <email>same@dktbot.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Dolnoslaska Fundacja Ekorozwoju</name>
-    <url>http://www.eko.org.pl/</url>
-    <descr>Environmental organization from Poland, Lower Silesian region.</descr>
-    <email>webmaster@eko.org.pl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>DOW</name>
-    <url>http://dow.fisica.ufsc.br/</url>
-    <descr>Director's-Outworld</descr>
-    <email>ataylor@bol.com.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>DSUET</name>
-    <url>http://www.trade.donbass.com/</url>
-    <descr>Donetsk state university of economic and trading</descr>
-    <email>admin@trade.donbass.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>e-coli productions</name>
-    <url>http://www.e-coli.net/</url>
-    <descr>art gallery and useless things</descr>
-    <email>webmaster@e-coli.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Eccentrica.org</name>
-    <url>http://www.eccentrica.org</url>
-    <descr>free web hosting service</descr>
-    <email>elements@dada.it</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>EnderUnix Software Development Team</name>
-    <url>http://www.enderunix.org</url>
-    <descr>Main site runs on FreeBSD. Besides, software development  (c/++) is on FreeBSD.</descr>
-    <email>murat@enderunix.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Equi LAN</name>
-    <url>http://equilan.dhs.org/</url>
-    <descr>Networking resources</descr>
-    <email>trodery@equilan.dhs.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>esg</name>
-    <url>http://www.pgsm-group.com/</url>
-    <descr>French school group (Paris) - smtp,pop,webmail,firewall,proxy... all services run under FreeBSD</descr>
-    <email>christophe.yayon@nbux.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Espace Mend&egrave;s France, Poitiers, France</name>
-    <url>http://pictascience.univ-poitiers.fr/</url>
-    <descr>Centre de culture scientifique, technique et industrielle en Poitou-Charentes</descr>
-    <email>thierry.pasquier@pictascience.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Eugene Unix and GNU/Linux User Group</name>
-    <url>http://www.euglug.org/</url>
-    <descr>User Group for Unix and Linux Users in Eugene, Oregon</descr>
-    <email>webmaster@euglug.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>F-1 fano puslapis (F-1 fan's page)</name>
-    <url>http://www.f-1.lt/</url>
-    <descr>Everthing about formula one in lithuanian: news, results, statistics, totalisator, discussion board and oth</descr>
-    <email>jaudrius@f-1.lt</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Fachschaft OrientAsia</name>
-    <url>http://www.orientasia.uni-bonn.de/</url>
-    <descr>Oriental Studies students' association at the University of Bonn, Germany</descr>
-    <email>fachschaft@orientasia.uni-bonn.de</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Faculdade de Tecnologia de Taquaritinga - EeviacBSD Server</name>
-    <url>http://freebsd.fatectq.com.br/</url>
-    <descr>FreeBSD Braziliam Computing University Project</descr>
-    <email>eksffa@fatectq.com.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Fight to end windows</name>
-    <url>http://users.linkfast.net/~darkking</url>
-    <descr>Freebsd and game server</descr>
-    <email>darkking@linkfast.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Filmshooting.com</name>
-    <url>http://www.filmshooting.com/</url>
-    <descr>8mm, 16mm and 35mm filmshooting</descr>
-    <email>webmaster@filmshooting.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>FreeBSD Indonesia</name>
-    <url>http://www.freebsd.or.id/</url>
-    <descr>FreeBSD Indonesia User Group</descr>
-    <email>koro@freebsd.or.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>FreeBSDcluster.dk</name>
-    <url>http://www.freebsdcluster.dk/</url>
-    <descr>Open source development..</descr>
-    <email>mich@freebsd.dk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>FreeNet.Kharkov.Ua</name>
-    <url>http://www.freenet.kharkov.ua/</url>
-    <descr>Small Site for friends</descr>
-    <email>artem@freenet.kharkov.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ftyczka.org</name>
-    <url>http://ftyczka.org/</url>
-    <descr>Promoting free software in Poland.</descr>
-    <email>ftyczka@olsza.krakow.pl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Georgia Center for Continuing Education</name>
-    <url>http://train.gactr.uga.edu/</url>
-    <descr>Educational Lab</descr>
-    <email>nate@gactr.uga.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Golem</name>
-    <url>http://jives.kst.dit.ie/</url>
-    <descr>Kevin St DIT Netsoc</descr>
-    <email>ggunning@jives.kst.dit.ie</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Guilin Normal College</name>
-    <url>http://www.glnc.edu.cn/</url>
-    <descr>Guilin Normal College</descr>
-    <email>sbrong@mail.glnc.edu.cn</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>HammerNode Internet Services, Int'l.</name>
-    <url>http://www.hn.org/</url>
-    <descr>Free Public DNS Service Provider</descr>
-    <email>keefeg@keefeg.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Haus-Regenbogen</name>
-    <url>http://www.haus-regenbogen.de/</url>
-    <descr>non-profit-org/Jugendbegegnungsst&auml;tte</descr>
-    <email>hausregenbogen@ndh.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>HSNU-867</name>
-    <url>http://www.hsnuer.net</url>
-    <descr>class 867 of The Affiliated Senior High School of National Taiwan Normal University  P!!! 450 256M 20G</descr>
-    <email>alex867@ms23.hinet.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>IEAV (Integrated Electronics and Audio/Video Network)</name>
-    <url>http://www.ieav.net/</url>
-    <descr>Database-driven free forum for the IEAV professionals, using FreeBSD for servers/devlopment</descr>
-    <email>webmaster@ieav.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>IIAT-KSPU</name>
-    <url>http://www.mipk-kspu.kharkov.ua/</url>
-    <descr>Interbranch Institute for Advanced Training in modern Field of Technics and Technology</descr>
-    <email>artem@mipk-kspu.kharkov.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Indonesia Amateur Radio Web Server</name>
-    <url>http://www.orari.or.id</url>
-    <descr>Free Webspace for ORARI members</descr>
-    <email>hostmaster@cakra.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Informatics Engineering Dept. of ITS</name>
-    <url>http://www.its-sby.edu/</url>
-    <descr>Informatics Engineering Dept. of 10 Nopember Institute of Technology Surabaya Indonesia</descr>
-    <email>asfik@its-sby.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Institut fuer angewandte Biographie- und Lebensweltforschung, Universitaet Bremen</name>
-    <url>http://www.ibl.uni-bremen.de/</url>
-    <descr>Institute for Applied Biographical and Lifeworld Research, University of Bremen</descr>
-    <email>ibl@ibl.uni-bremen.de</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Institut Teknologi Bandung: NII</name>
-    <url>http://nii.itb.ac.id/</url>
-    <descr>National Information Infrastructure</descr>
-    <email>admin@nii.itb.ac.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Institute of Nuclear Reactors of RRC</name>
-    <url>http://www.vver.kiae.ru/</url>
-    <descr>The VVER Division of Institute of Nuclear Reactor (INR) specialize in pressurized water reactor engineering.</descr>
-    <email>root@vver.kiae.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Institute of Technology, Bandung</name>
-    <url>http://medac.geoph.itb.ac.id/</url>
-    <descr>Meteorology Database Server of  Dept Geophysics and Meteorology</descr>
-    <email>admin@medac.geoph.itb.ac.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Institute of Transpotology</name>
-    <url>http://www.transpl.org.ru/</url>
-    <descr>Russian Medical Center</descr>
-    <email>abc@transpl.org.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Internews Ukraine</name>
-    <url>http://www.internews.kiev.ua/</url>
-    <descr>Internews' Mission in Ukraine</descr>
-    <email>postmaster@internews.kiev.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>IP Australia</name>
-    <url>http://www.ipaustralia.gov.au/</url>
-    <descr>Patents Designs and Trademarks for Australia</descr>
-    <email>Carl.Makin@IPAustralia.gov.au</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Japan Society of Transfusion Medicine</name>
-    <url>http://yuketsu.gr.jp/</url>
-    <descr></descr>
-    <email>root@yuketsu.gr.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>JAPAN-duskinhkr.co.jp</name>
-    <url>http://www2.duskinhkr.co.jp/</url>
-    <descr>The club in the company for the welfare purpose</descr>
-    <email>a_nakayama@dskn.co.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>JCA-NET</name>
-    <url>http://www.jca.apc.org/</url>
-    <descr>Support activities of NGOs and people's movements beyond borders.</descr>
-    <email>webmaster@jca.apc.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>jp.qmail.org</name>
-    <url>http://www.jp.qmail.org/</url>
-    <descr>qmail.org Japan site</descr>
-    <email>tmaeno-freebsd@hpcl.titech.ac.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>JSC</name>
-    <url>http://www.yakute.elektra.ru</url>
-    <descr></descr>
-    <email>andrew@yakute.elektra.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Kaf17</name>
-    <url>http://junior.mephi.ru/</url>
-    <descr>Site dedicated to Junior Competition</descr>
-    <email>root@junior.mephi.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>KANA Zory</name>
-    <url>http://www.kana.zory.pl</url>
-    <descr>Katolickie Centrum Edukacji Mlodziezy Kana w Zorach</descr>
-    <email>admin@zory.pl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Kappa Zeta Chapter of the Chi Phi Fraternity</name>
-    <url>http://www.chiphikz.org/</url>
-    <descr>Chi Phi Fraternity</descr>
-    <email>house@chiphikz.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Karadeniz Technical University</name>
-    <url>http://www.ktu.edu.tr/</url>
-    <descr>Karadeniz Tecnical University WEB Server</descr>
-    <email>kinay@ktu.edu.tr</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Karadeniz Technical University, Turkey</name>
-    <url>http://www.ktu.edu.tr</url>
-    <descr>web servers and firewall machines</descr>
-    <email>kinay@ktu.edu.tr</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>KBCU FM 88.1 Bethel College</name>
-    <url>http://www.radiogate.bethelks.edu/</url>
-    <descr></descr>
-    <email>ctl4u@bethelks.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>KEISHANIAGA</name>
-    <url>http://keishaniaga.cjb.net/</url>
-    <descr>Small Home Business</descr>
-    <email>keishaniaga@malaysia.st</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Kelompok Air BPPT (Kelair)</name>
-    <url>http://www.water.enviro.bppt.go.id/</url>
-    <descr>Water Treatment Group</descr>
-    <email>heru@pentium.as.bppt.go.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Kenoh Network Association</name>
-    <url>http://www.kenoh.net/</url>
-    <descr>Internet user group of Japan.</descr>
-    <email>info@kenoh.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>KEPA</name>
-    <url>http://www.kepa.fi/</url>
-    <descr>Service Centre for Development Cooperation</descr>
-    <email>kalle.korhonen@kepa.fi</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Kernel Networks(China)</name>
-    <url>http://www.kernelnetworks.com</url>
-    <descr>FreeMail System</descr>
-    <email>webmaster@kernelnetworks.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Kibiji-net</name>
-    <url>http://www.kibiji.gr.jp/</url>
-    <descr>okayama,japan kibiji</descr>
-    <email>webmaster@kibiji.gr.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Klaipeda University</name>
-    <url>http://www.ik.ku.lt/</url>
-    <descr>Computer Science Department</descr>
-    <email>info@ik.ku.lt</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>KSJF NET RADIO(from Salina,Kansas )Urban Conemporary Music Live</name>
-    <url>http://www.hometown.aol.com/ksjfnetradio/myhomepage/index.html</url>
-    <descr>NON-PROFIT INTERNET RADIO &amp; TV STATION &amp; info page</descr>
-    <email>jfearsm@aol.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Kuldiga district council</name>
-    <url>http://www.kuldiga.lv/</url>
-    <descr>Municipality in Latvia</descr>
-    <email>kasio@kuldiga.lv</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Kuli Loach</name>
-    <url>http://www.loach.net/</url>
-    <descr>Kuli Loach is a Seattle-based rock and roll band</descr>
-    <email>wardk@loach.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Lake County, Ohio</name>
-    <url>http://www.lakecountyohio.org/</url>
-    <descr>Lake County Local Government</descr>
-    <email>pmassey@lakecountyohio.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>LaSiD@6bone</name>
-    <url>http://www.6bone.lasid.ufba.br/</url>
-    <descr>Site of the project LaSiD@6bone that uses FreeBSD/Kame/IPv6.</descr>
-    <email>boozy@rabelo.eti.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>LEO - Link Everything Online</name>
-    <url>http://www.leo.org/</url>
-    <descr>We carry the famous LEO Dictionary, a large FTP archive, a selected link collection, an IRCnet server and much more</descr>
-    <email>leo-admin@leo.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Liceum 239</name>
-    <url>http://club.sch239.spb.ru</url>
-    <descr>St-Petersburg's mathematical school</descr>
-    <email>julia@wid.sch239.spb.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>LINUX USER ASSOCIATION</name>
-    <url>http://srinivasr.8k.com/</url>
-    <descr>SUPERB STUFF</descr>
-    <email>tribelinux@chequemail.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Lipetsk Centre of Legal Information</name>
-    <url>http://www.lcpi.lipetsk.ru/</url>
-    <descr>The Lipetsk Centre of Legal Information is official part of the Ministry of Justice of the Russian Federation</descr>
-    <email>webmaster@lcpi.lipetsk.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>lost-angel</name>
-    <url>http://lost-angel.com/</url>
-    <descr>for kids missing their college unix accounts</descr>
-    <email>sammy@lost-angel.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Louisiana Department of Environmental Quality</name>
-    <url>http://www.ldeq.org/</url>
-    <descr></descr>
-    <email>mandresen@ldeq.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Malexa</name>
-    <url>http://www.malexa.org/</url>
-    <descr>#Malexa</descr>
-    <email>sku@malexa.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Mari Telecommunication</name>
-    <url>http://www.magewar.com/</url>
-    <descr>Creator and service provider of web based simulated strategy game Archmage.</descr>
-    <email>keg@maritel.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Materials Research Society</name>
-    <url>http://www.mrs.org</url>
-    <descr>International collaboration of scientists and engineers in the field of Material Science.</descr>
-    <email>fleeger@mrs.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Mathematical Liceum 239 in Saint-Petersburg</name>
-    <url>http://www.sch239.spb.ru/</url>
-    <descr>FreeBSD 4.0 - internet &amp; mail server</descr>
-    <email>julia@wid.sch239.spb.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>MCGV Stack</name>
-    <url>http://www.stack.nl/</url>
-    <descr>Students' Computer Association of Eindhoven University of Technology</descr>
-    <email>dean@stack.nl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Merging of Fates</name>
-    <url>http://realms.merging.org/</url>
-    <descr>A Role Play, fantasy based mud runs FreeBSD as it's OS of choice for internet services.</descr>
-    <email>maccleod@merging.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>METAKULTURA</name>
-    <url>http://www.metakultura.ru/</url>
-    <descr>Russian art. Conservative project.</descr>
-    <email>master@metakultura.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Metal Industries Development Centre / Balai Besar Logam dan Mesin</name>
-    <url>http://www.bblm.go.id/</url>
-    <descr>Institute Research &amp; Development For Metal &amp; Machinery Industries - - Bandung Indonesia</descr>
-    <email>webmaster@bblm.go.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>migla</name>
-    <url>http://migla.ktu.lt/</url>
-    <descr>Kaunas University's of Technology hostel Nr.10</descr>
-    <email>angelas@migla.ktu.lt</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Mike's Free Certification Practice</name>
-    <url>http://www.freetestpractice.com</url>
-    <descr>IT Certification Site</descr>
-    <email>michael@freetestpractice.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Mississippi University for Women</name>
-    <url>http://www.MUW.Edu/</url>
-    <descr>Campus Main Cache Server</descr>
-    <email>marco@MUW.Edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Mobible</name>
-    <url>http://www.mobible.org/</url>
-    <descr>The complete Holy Bible available on your mobile phone.</descr>
-    <email>david@desilva.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Monterey Institute of International Studies</name>
-    <url>http://www.miis.edu/</url>
-    <descr>Graduate School for International Careers</descr>
-    <email>webmaster@miis.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Moscow State Forestry University</name>
-    <url>http://www.mgul.ac.ru/</url>
-    <descr>Our primary servers running FreeBSD</descr>
-    <email>andrey@mgul.ac.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Moscow State University, Student's Hostel</name>
-    <url>http://www.fds.chem.msu.ru/</url>
-    <descr>We just use FreeBSD ...</descr>
-    <email>aospan@fds.chem.msu.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Moscow Steel&amp;Alloys Institute</name>
-    <url>http://www.misa.ac.ru/</url>
-    <descr>metallurgy and semiconductor teaching institute</descr>
-    <email>Dmitry.Karpov@misa.ac.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>NetBSD.hu</name>
-    <url>http://www.netbsd.hu/</url>
-    <descr>*BSD/Linux Mirror Site</descr>
-    <email>webmaster@netbsd.hu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>NetFriend Org</name>
-    <url>http://www.netfriend.org/</url>
-    <descr>IRCD Network in Poland</descr>
-    <email>lemurek@netfriend.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>netzwerk.it</name>
-    <url>http://www.netzwerk.it/</url>
-    <descr>Open Soruce Group</descr>
-    <email>harald@netzwerk.it</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>NeverNET IRC</name>
-    <url>http://www.nevernet.net/</url>
-    <descr>A Fun IRC Network</descr>
-    <email>admin@nevernet.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Niuean Centre for American Pop Culture</name>
-    <url>http://www.unknown.nu/</url>
-    <descr>Tracking the important stuff.</descr>
-    <email>user@unknown.nu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Northern Illinois Technology Group</name>
-    <url>http://www.nitg.org/</url>
-    <descr>Technology Specialists in the Northern Illinois and Southern Wisconsin area</descr>
-    <email>hex@ns1.nitg.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>NosferatU</name>
-    <url>http://www.nosferatu.nl/</url>
-    <descr>Dutch Demogroup / software developers</descr>
-    <email>allodox@nosferatu.nl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Novosibirsk State University</name>
-    <url>http://iclub.nsu.ru/</url>
-    <descr>web, e-mail, database &amp; shell server</descr>
-    <email>fjoe@iclub.nsu.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Ole Brunei Supporters</name>
-    <url>http://www.olebrunei.org</url>
-    <descr>Brunei Darussalam Sports Enthusiasts Supporters Website</descr>
-    <email>admin@olebrunei.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Operating System Wars (OSWARS.NET)</name>
-    <url>http://www.oswars.net/</url>
-    <descr>Project to provide resources for freebsd, linux, beos, and others.</descr>
-    <email>webmaster@oswars.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Orlando Royal Stewarts Bag Pipe Band</name>
-    <url>http://www.kaboing.net/royalstewarts</url>
-    <descr>Royal Stewarts Bag Pipe Band</descr>
-    <email>Keith@kaboing.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ORT-Odessa</name>
-    <url>http://www.ort.odessa.net/</url>
-    <descr>Educational Charity Organization</descr>
-    <email>root@ort.odessa.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Osaka City University</name>
-    <url>http://www3.bus.osaka-cu.ac.jp/</url>
-    <descr>Accounting Web</descr>
-    <email>sakagami@bus.osaka-cu.ac.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Pacific Institute for the Mathematical Sciences</name>
-    <url>http://www.pims.math.ca/</url>
-    <descr>supports research, education and industrial collaboration in the mathematical sciences.</descr>
-    <email>sandy@pims.math.ca</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Palo Alto French Film Society</name>
-    <url>http://www.pafff.org/</url>
-    <descr>French-language non-profit film society</descr>
-    <email>jgc@pafff.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Paris south University</name>
-    <url>http://www.u-psud.fr/</url>
-    <descr>Irc Server</descr>
-    <email>sebot@lri.fr</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>PC Room, Dept. of IECS, FCU</name>
-    <url>http://www.pcroom.iecs.fcu.edu.tw/</url>
-    <descr>A Department of University's PC Class room</descr>
-    <email>wwwadm@pcroom.iecs.fcu.edu.tw</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>PLEA Foundation</name>
-    <url>http://www.plea-foundation.org/</url>
-    <descr>Program for Learning and Education in Africa</descr>
-    <email>dehartog@rootsr.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>PoProstu.pl</name>
-    <url>http://poprostu.pl/</url>
-    <descr>Polish libertarian portal.</descr>
-    <email>webmaster@poprostu.pl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Prefectura UVAO</name>
-    <url>http://www.uvao.mos.ru/</url>
-    <descr>Goverment organization of Moscow city</descr>
-    <email>jack@uvao.mos.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Primer Congreso Virtual de Cardiolog&iacute;a</name>
-    <url>http://pcvc.sminter.com.ar/</url>
-    <descr>First Virtual Cardiology Congress</descr>
-    <email>fpscha@pcvc.sminter.com.ar</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Project MINDTech, University of Malaya, Kuala Lumpur, Malaysia.</name>
-    <url>http://education2020.um.edu.my/</url>
-    <descr>This website is develop under project MINDTech of University Malaya, Malaysia. Its web server host in campus network using T1 backbone. This is non-profit site aimed at teachers, lecturers, trainers, students, administrators, researchers, parents and the community interested in education. Project MINDTech (mind and technology) is a research project funded by IRPA (Intensified Research in Priority Areas) which aim to develop and test various methodologies integrating information &amp; communication technology (ICT) in teaching and learning at all levels of education. </descr>
-    <email>ded1@education2020.um.edu.my</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Purdue University Department of Earth and Atmospheric Sciences</name>
-    <url>http://www.eas.purdue.edu/computing/civl4247/</url>
-    <descr>Lab for students</descr>
-    <email>computing@eas.purdue.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Pusat Penelitian dan Pengabdian Pada Masyarakat STMIK Budi Luhur</name>
-    <url>http://www.pppm.bl.ac.id/</url>
-    <descr>Lab. PPPM STMIK Budi Luhur</descr>
-    <email>cah@vision.net.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Rivne State Technical University, Ukraine</name>
-    <url>http://RSTU.rv.ua/</url>
-    <descr>Internet gateway / Web server</descr>
-    <email>artem@rstu.rv.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Role playing games</name>
-    <url>http://www.anglefire.com/rnb/ClubInsomnia/index.html</url>
-    <descr>this is a vampire room,that play VTM</descr>
-    <email>Ravege@billysmail.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Royal Northern College of Music</name>
-    <url>http://www.rncm.ac.uk/</url>
-    <descr>A world renowned conservatoire sited in the North-West of England.  Apache, PHP and MySQL with FreeBSD (of course)</descr>
-    <email>info@rncm.ac.uk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Rudolf Steiner Archive</name>
-    <url>http://www.elib.com/Steiner/</url>
-    <descr>Repository of written works of philosopher Rudolf Steiner: architecture, biodynamics, eurhythmy, medicine, science ...</descr>
-    <email>elibrarian@elib.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Scouting Pack 174</name>
-    <url>http://www.pack174.org/</url>
-    <descr>Scout Pack 174 Round Rock, Texas</descr>
-    <email>cparker@the-parkers.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ShadoNet</name>
-    <url>http://www.shadonet.com</url>
-    <descr>providing real time java-enabled chat to visitors worldwide</descr>
-    <email>shadowalker@rmci.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Shizuoka University</name>
-    <url>http://www.ia.inf.shizuoka.ac.jp/</url>
-    <descr>E-mail, WWW, DNS server for Information Arts, Faculty of Information, Shizuoka University</descr>
-    <email>tsumai@ia.inf.shizuoka.ac.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Smeird Systems</name>
-    <url>http://www.smeird.net/</url>
-    <descr>Unsigned &amp; Unknown Bands</descr>
-    <email>dom@smeird.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SoulTwins RainbowDreams</name>
-    <url>http://www.soultwins.com</url>
-    <descr>SoulTwins RainbowDreams presents FREE FLASH Postcards in german and english, deutsch und englisch. Are you a Dreamer? Do you believe in Rainbows? Angels? Smileys as the meaning of Life? Share your attitude with the ones you care about and send a dreamy Postcard...</descr>
-    <email>soultwins@soultwins.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>St Louis BSD Organization</name>
-    <url>http://www.stlbsd.org/</url>
-    <descr>The St Louis, Missouri BSD user community promoting BSD in our area.</descr>
-    <email>john@stlbsd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>St. Anthony's College</name>
-    <url>http://www.sac.edu.ph/</url>
-    <descr>Diocesan college in San Jose, Antique, Philippines</descr>
-    <email>jay@sac.edu.ph</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>STMIK STIKUBANK</name>
-    <url>http://www.stmik-stikubank.ac.id/</url>
-    <descr>Computer College located at Semarang ,Indonesia</descr>
-    <email>edhinug@stmik-stikubank.ac.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>StuBoNet Support Grupp</name>
-    <url>http://www.stubonet.student.mh.se/</url>
-    <descr>Swedish Student Supportgroup for StuBoNet in Sundsvall</descr>
-    <email>trevlig@solace.mh.se</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>St&auml;dt. Berufsschule f&uuml;r Kommunikationselektronik</name>
-    <url>http://www.bskomm.musin.de/</url>
-    <descr>M&uuml;nchner Berufschule f&uuml;r Kommunikationselektronik</descr>
-    <email>webmaster@bskomm.musin.de</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Sundsvalls Studentdatan&auml;t Supportgrupp</name>
-    <url>http://stubonet.student.mh.se/</url>
-    <descr>Supportgroup for the Mid Sweden University Campus/Nacksta Network.</descr>
-    <email>trevlig@solace.mh.se</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SWAMP</name>
-    <url>http://www.swamp.dk/</url>
-    <descr>Demo and Party organizing group</descr>
-    <email>sos@swamp.dk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SWAMP / DiSTORTiON</name>
-    <url>http://se2k.dk/</url>
-    <descr>Home of Scene Event 2K</descr>
-    <email>sos@swamp.dk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Sweet Sorrow</name>
-    <url>http://www.sweet-sorrow.com/</url>
-    <descr>Metal Band From Slovenia</descr>
-    <email>us@sweet-sorrow.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Sysdaemon</name>
-    <url>http://www.marketrends.net/sysdaemon</url>
-    <descr>Unix System Monitor</descr>
-    <email>tigger@marketrends.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SYSTEMV.NET</name>
-    <url>http://www.systemv.net/</url>
-    <descr>Austrian Unix User Community</descr>
-    <email>Egon.Rath@telecom.at</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SZN</name>
-    <url>http://www.security.za.net/</url>
-    <descr>#1 South African Internet Security Resource</descr>
-    <email>jus@security.za.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>TakiWeb</name>
-    <url>http://www.takiweb.com/</url>
-    <descr>Free shell accounts</descr>
-    <email>takiman@takiweb.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Tartu Pushkin Gymnasium</name>
-    <url>http://www.tpg.edu.ee/</url>
-    <descr>High School in Tartu, Estonia</descr>
-    <email>root@tpg.edu.ee</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Team Poverty</name>
-    <url>http://www.teampoverty.com/</url>
-    <descr>Geekdom at a low price.</descr>
-    <email>elessin@hotmail.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>TekNap.com</name>
-    <url>http://www.TekNap.com/</url>
-    <descr>TekNap is a console Napster client written by the Author of BitchX</descr>
-    <email>edwards@teknap.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Testphase</name>
-    <url>http://testphase.at/</url>
-    <descr></descr>
-    <email>markus@testphase.at</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Bishopston Network</name>
-    <url>http://www.bishopston.net/</url>
-    <descr>FreeBSD 4.1 - PIII 450, 128Mb ram, 26Gb disk, hosts 50+ domains and virtual web sites and email addresses, DNS, newsserver, irc, ssh, apache+ssl, php, mysql, realaudio server, etc.</descr>
-    <email>jamie@bishopston.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Dreaming Network</name>
-    <url>http://www.dreaming.org/</url>
-    <descr>A community of individuals</descr>
-    <email>admin@dreaming.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Duct Tape Server (DTS.CX)</name>
-    <url>http://www.dts.cx/</url>
-    <descr>The Duct Tape Server</descr>
-    <email>drew@dts.cx</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The ircII Organization</name>
-    <url>http://www.ircII.org/</url>
-    <descr>Information regarding UNIX-based ircII clients can be found here.</descr>
-    <email>staff@ircII.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Vulnerable.org Project</name>
-    <url>http://www.vulnerable.org</url>
-    <descr>freebsd help, personal website.</descr>
-    <email>scottx@vulnerable.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Wasteland</name>
-    <url>http://www.wastelandranger.org/</url>
-    <descr>Site dedicated to the RPG game Wasteland</descr>
-    <email>jga@wastelandranger.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>TRI Osaka</name>
-    <url>http://www.tri.pref.osaka.jp/</url>
-    <descr>Technology Research Institute of Osaka Prefecture (JAPAN)</descr>
-    <email>www-admin@tri.pref.osaka.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Tver State University</name>
-    <url>http://uic.tversu.ru/</url>
-    <descr>Internet Center</descr>
-    <email>starbeast@tversu.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>UFOP</name>
-    <url>http://www.ufop.br</url>
-    <descr>Federal University of Ouro Preto / BR</descr>
-    <email>mfontana@ufop.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Ukranian Navy</name>
-    <url>http://ukr-navy.iuf.net/</url>
-    <descr>Site of Ukranian Navy</descr>
-    <email>kirill@ukr-navy.iuf.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Ulyanovsk State University</name>
-    <url>http://www.ulsu.ru/</url>
-    <descr>all internet servers with FreeBSD</descr>
-    <email>cvb@ulsu.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>UniBG</name>
-    <url>http://www.unibg.online.bg/</url>
-    <descr>IRC Network</descr>
-    <email>thunder@online.bg</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>United Safe Boating Insitute</name>
-    <url>http://www.usbi.org/</url>
-    <descr>Dedicated to safe boating, USBI is an umbrella organization of some of the largest boating organizations</descr>
-    <email>wspivak@usbi.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>United States Court of International Trade</name>
-    <url>http://search.uscit.gov/</url>
-    <descr>our local search engine runs on FreeBSD</descr>
-    <email>tcren@uscit.gov</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>United States Power Squadrons</name>
-    <url>http://www.usps.org/</url>
-    <descr>Largest non-profit educational boating organization in the world</descr>
-    <email>wspivak@usps.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>UNIVALI</name>
-    <url>http://www.big.univali.br/</url>
-    <descr>University of Itajai Valley</descr>
-    <email>marcus@big.univali.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Universidad Iberoamericana Golfo Centro</name>
-    <url>http://www.pue.uia.mx/</url>
-    <descr>University - Education</descr>
-    <email>webmaster@uiagc.pue.uia.mx</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Universidad Santiago de Cali</name>
-    <url>http://www.usaca.edu.co/</url>
-    <descr>Firewall , Intranet File Server, backup Server, Internet Server</descr>
-    <email>cat@usaca.edu.co</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Universidade Gama Filho</name>
-    <url>http://www.ugf.br/</url>
-    <descr>Rio de Janeiro/RJ - Brasil</descr>
-    <email>suporte@ugf.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of Hawaii School of Nursing and Dental Hygiene</name>
-    <url>http://www.nursing.hawaii.edu/</url>
-    <descr></descr>
-    <email>cstark@hawaii.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of Texas at Austin</name>
-    <url>http://resnet.utexas.edu</url>
-    <descr>Dorm network services</descr>
-    <email>shanson@mail.utexas.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University Radio York</name>
-    <url>http://ury.york.ac.uk</url>
-    <descr>University Of York (UK) Campus Radio Station</descr>
-    <email>ury@york.ac.uk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University Radio York (URY)</name>
-    <url>http://ury.york.ac.uk/</url>
-    <descr>University of York, UK, campus radio station. The server provides web and email, talk, samba shares and hosts our databases.</descr>
-    <email>ury@york.ac.uk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Ural State Conservatry</name>
-    <url>http://www.uscon.ru</url>
-    <descr>Music Education</descr>
-    <email>philip@lyceum.usu.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>USAC</name>
-    <url>http://www.usac.edu.gt/</url>
-    <descr>Universidad de San Carlos de Guatemala</descr>
-    <email>webmaster@usac.edu.gt</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Vermillion Sea Field Station</name>
-    <url>http://www.vsfs.org/</url>
-    <descr>Marine Research Station in Baja California, Mexico</descr>
-    <email>simguru@bigfoot.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Washington Skipjacks Hockey Club</name>
-    <url>http://www.skipjacks.net/</url>
-    <descr>Recreational adult ice hockey team</descr>
-    <email>joe@skipjacks.net, joebarnett@starpower.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Washington-Lee High School</name>
-    <url>http://general.washlee.arlington.k12.va.us</url>
-    <descr>Student-run server hosting user accounts, www, ftp and mail</descr>
-    <email>bradj@washlee.arlington.k12.va.us</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Wasteland</name>
-    <url>http://www.wastelandranger.org</url>
-    <descr>Site dedicated to the 80's game Wasteland</descr>
-    <email>jga@wastelandranger.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>WhimSicaL</name>
-    <url>http://www.geocities.com/wslpage/</url>
-    <descr>Music</descr>
-    <email>thewhimsical@hotmail.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Wing Chun Kung Fu</name>
-    <url>http://www.wingchun.ch</url>
-    <descr>Kung Fu School</descr>
-    <email>marcel.sauder@wingchun.ch</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>WU LIN Kampfkunstschule</name>
-    <url>http://www.wulin.ch</url>
-    <descr>Kung Fu School in Switzerland</descr>
-    <email>marcel.sauder@wulin.ch</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>www.apsfilter.org</name>
-    <url>http://www.apsfilter.org/</url>
-    <descr>Apsfilter developement</descr>
-    <email>andreas@apsfilter.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>YMCA of the USA</name>
-    <url>http://www.ymca.net/</url>
-    <descr>National Headquarters of the YMCA Organizations.</descr>
-    <email>corey.wheeler@ymca.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>youzi</name>
-    <url>http://youzi.com</url>
-    <descr>entertainment</descr>
-    <email>youzi@youzi.com/</email>
-  </entry>
-
-  <entry type="personal">
-    <name>jan-olof.com</name>
-    <url>http://www.jan-olof.com</url>
-    <descr></descr>
-    <email>jan-olof@bsdmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Mathematics</name>
-    <url>http://24.21.227.202/math.html</url>
-    <descr>Mathematics homepage.</descr>
-    <email>mathemajikian@home.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>NOUFS.COM</name>
-    <url>http://www.noufs.com/</url>
-    <descr>PII 450 mhz ; 256 mo Ram ; 10 Gig ; Mail and Web : Apache 2.0a3 </descr>
-    <email>choooli@noufs.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>123.org</name>
-    <url>http://123.org/</url>
-    <descr>private Site, Kiel, Germany</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>5 UnrulyJanitors</name>
-    <url>http://www.5unruly.com/</url>
-    <descr>The 5 Unruly Janitors (comedic organization)</descr>
-    <email>5unruly@5unruly.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>5000 Standard Staples</name>
-    <url>http://trunks.dhs.org/</url>
-    <descr>Home of PicoScript (free RPN scripting language)</descr>
-    <email>lucas@trunks.dhs.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>A General Site</name>
-    <url>http://satan.flash.net/</url>
-    <descr>BSD and other topics</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>About Unix</name>
-    <url>http://www.geocities.com/jacky_apple/</url>
-    <descr>About Unix</descr>
-    <email>jackyab@pd.jaring.my</email>
-  </entry>
-
-  <entry type="personal">
-    <name>ABOX</name>
-    <url>http://www.abox.org</url>
-    <descr>Pictures, Free counters, Links, Powered by FreeBSD!</descr>
-    <email>averyp@averyp.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Adam Stanislav's CGI Tutorial</name>
-    <url>http://www.whizkidtech.net/cgi-bin/tutorial/</url>
-    <descr>Hands-on tutorial about CGI programming</descr>
-    <email>adam@whizkidtech.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Aerob.net</name>
-    <url>http://www.aerob.net</url>
-    <descr>the art of graphiti</descr>
-    <email>andrew@aerob.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>AHZE.NET</name>
-    <url>http://ahze.net/</url>
-    <descr>Personal WebSite/Couple FreeBSD how-to's</descr>
-    <email>ahze@ahze.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Aimee Morgan</name>
-    <url>http://aimeemorgan.com</url>
-    <descr>Briar Rose Grafiks:  Aimee Morgan's online portfolio of original artwork and illustrations</descr>
-    <email>ladyamiel@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>AJIANG.COM</name>
-    <url>http://www.ajiang.com/</url>
-    <descr>:)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Alex W. Wang's Home Page</name>
-    <url>http://members.home.net/wwang/</url>
-    <descr>Network Reference Page</descr>
-    <email>wwang@home.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Alex W. Wang's Homepage --- US Mirror Site</name>
-    <url>http://c36196-a.frmt1.sfba.home.com/~alexw/</url>
-    <descr>Alex W. Wang's Homepage US Mirror Site</descr>
-    <email>wwang@home.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Alexey Shumak Web server</name>
-    <url>http://www.shumak.spb.ru/</url>
-    <descr>Web server of Alexey Shumak</descr>
-    <email>alexey@shumak.spb.ru</email>
-  </entry>
-
-  <entry type="personal">
-    <name>almuhairi.com</name>
-    <url>http://www.almuhairi.com/</url>
-    <descr>arabic songs _ Mohamed Abdu_ UAE links</descr>
-    <email>almuhairi@almuhairi.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Anais-nin.org</name>
-    <url>http://www.anais-nin.org/</url>
-    <descr>Website about the writer Anais Nin</descr>
-    <email>webmaster@anais-nin.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Andrey A. Chernov (aka Ache)</name>
-    <url>http://nagual.pp.ru/</url>
-    <descr>Russian Personal Nagual Web Server</descr>
-    <email>ache@nagual.pp.ru</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Ankh's Home...</name>
-    <url>http://alcatraz141.wohnheim.uni-kl.de/</url>
-    <descr>YagWp (Yet another gothic Webpage)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Annetta Family</name>
-    <url>http://www.annetta.com/</url>
-    <descr>The Annetta Family Web/Email/Domain Server</descr>
-    <email>Robert@Annetta.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Annetta Family gateway system</name>
-    <url>http://robgate.kiwi.net/</url>
-    <descr>This page may be down from time to time, it is on a modem connection (to prove freebsds abilities), it shows pictures and explains how FreeBSD is being used as a router in a house in California</descr>
-    <email>robert@annetta.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Aood Games Center</name>
-    <url>http://members.thaicentral.com/kungporn/</url>
-    <descr>Game,Roms,Emulator,Download,Screensaver</descr>
-    <email>kungporn@ksc.th.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Apetalon.net</name>
-    <url>http://www.apetalon.net/</url>
-    <descr>My personal Domain...</descr>
-    <email>wiggy@apetalon.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Apostate Cafe</name>
-    <url>http://www.apostate.com/</url>
-    <descr>Arts and Theology and Programming, oh my!</descr>
-    <email>josh@apostate.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Ari &amp; Johanna Suutari</name>
-    <url>http://www.suutari.iki.fi/</url>
-    <descr>Home page hosted by {Free,Net}BSD i386/vax farm.</descr>
-    <email>ari@suutari.iki.fi</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Art Homepage</name>
-    <url>http://www.radio-msu.net/~art/</url>
-    <descr>Web server of Artem Podstreshny</descr>
-    <email>art@radio-msu.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Avians.net</name>
-    <url>http://www.avians.net/</url>
-    <descr>Feathered creatures of the world unite in a blend of technology, fantasy, and friendship. Powered by FreeBSD - IRC, Web, MUCK, email, and more!</descr>
-    <email>skandranon@avians.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>azzh0le.org</name>
-    <url>http://www.azzh0le.org/</url>
-    <descr>personal site with a Mirror of the FreeBSD ,software, lots of other stuff</descr>
-    <email>hanhan@azzh0le.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>b0ng</name>
-    <url>http://b0ng.yi.org/</url>
-    <descr>A personal website of a FreeBSD/Slackware Linux fanatic. Info on FreeBSD, Linux, Administration, Security, Networking.</descr>
-    <email>zerash@b0ng.yi.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Bangheadhere.org</name>
-    <url>http://bangheadhere.org/</url>
-    <descr>My personal server running httpd, ftpd, and a Citadel V4 BBS. Telnet to the server and login as citadel for the BBS.</descr>
-    <email>smorris@bangheadhere.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Benemerita Universidad Autonoma de Puebla</name>
-    <url>http://148.228.20.8/</url>
-    <descr>University</descr>
-    <email>freddy@mail.cs.buap.mx</email>
-  </entry>
-
-  <entry type="personal">
-    <name>BigShot</name>
-    <url>http://www.bigshot.com.br</url>
-    <descr>AMD K6-II 500Mhz, 128MB RAM, 12GB HD</descr>
-    <email>bigshot@bigshot.com.br</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Bitmap.net</name>
-    <url>http://www.bitmap.net/</url>
-    <descr>Land of reverence devoted to the mystical God known as gdb.</descr>
-    <email>graham@bitmap.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>BLT Clan</name>
-    <url>http://www.bltclan.com</url>
-    <descr>Half-Life mod gaming site</descr>
-    <email>shaklee3@pacbell.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Bouncing Badger</name>
-    <url>http://www.bouncingbadger.com/</url>
-    <descr>We have nothing to do with Badgers!</descr>
-    <email>spankey@bouncingbadger.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Broadcast Network Channel</name>
-    <url>http://www.ars.ism.ru/</url>
-    <descr>Personal server</descr>
-    <email>arseny@ars.ism.ru</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Bryan Ink</name>
-    <url>http://www.geocities.com/big_y2k_bug_3/</url>
-    <descr>Gamez and Jokez</descr>
-    <email>big_y2k_bug@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>BSD Squirrel</name>
-    <url>http://www.bsdsquirrel.com/</url>
-    <descr>Site run out of my room, everything on my FreeBSD 4.0 machine</descr>
-    <email>squirrel@flashcom.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Burkard Meyendriesch</name>
-    <url>http://www.malepartus.de/</url>
-    <descr>Malepartus - The Home of Reineke Fuchs</descr>
-    <email>bm@malepartus.de</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Burkmat</name>
-    <url>http://burkmat.nu</url>
-    <descr>We are Broadband of IT. Resistance is futile. You will be assimilated.</descr>
-    <email>lander@rejva.nu</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Caleb Walker</name>
-    <url>http://www.cwalk.org/</url>
-    <descr>My Resume ,etc.</descr>
-    <email>cwalker@cwalk.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>CapsulaNet</name>
-    <url>http://www.capsula.net</url>
-    <descr>My personal site over ADSL connection</descr>
-    <email>barraenrico@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Central-European key maps</name>
-    <url>http://www.whizkidtech.net/ISO-8859-2/</url>
-    <descr>FreeBSD key maps for Slovak, Czech, Romanian, and other CE languages. Also a VGA 8x16 console font for ISO-8859-2.</descr>
-    <email>adam@whizkidtech.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Cesium Hyperfine Enterprises - CowbertNet</name>
-    <url>http://cowbert.2y.net/</url>
-    <descr>home to a geek's life and so much more</descr>
-    <email>sirmoo@cowbert.2y.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Charm City Soul club</name>
-    <url>http://www.nothingbutsoul.com/</url>
-    <descr>Mish mash of the music style called soul.</descr>
-    <email>cbachman@ai.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Chris Angell Foundation</name>
-    <url>http://www.chrisangell.com</url>
-    <descr>My little homepage/site, run on my freebsd machine</descr>
-    <email>chris62vw@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Chris Hancock</name>
-    <url>http://riola2.cwnet.com/~ochanco/</url>
-    <descr>home page</descr>
-    <email>ochanco@riola2.cwnet.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Chris's Geeky Home Page</name>
-    <url>http://www.aa.net/~cmh/</url>
-    <descr>Updates on my IDE and C++ class library for FreeBSD and X (along with other geeky boring stuff)</descr>
-    <email>cmh@aa.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>CJ</name>
-    <url>http://www.capitaljustice.com/</url>
-    <descr>Local Area Roleplaying game site</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Connection Lab</name>
-    <url>http://www.connectionlab.com/</url>
-    <descr>Robotics, math and more</descr>
-    <email>jansipke@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Curt Welch</name>
-    <url>http://CurtWelch.Com/</url>
-    <descr>My personal FreeBSD powered web site</descr>
-    <email>curt@kcwc.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Cuss Computer Service</name>
-    <url>http://www.Houston.rr.com/</url>
-    <descr>Computer Sevice Upgrade</descr>
-    <email>eortiz1@houston.rr.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>D.R.I Team</name>
-    <url>http://dri-team.scriptmania.com/</url>
-    <descr>Security and safe internet, free software and alternative Os</descr>
-    <email>dixman@cool.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Dan Friedman</name>
-    <url>http://www.orange-carb.org/boywithmachine</url>
-    <descr>Free original music (mp3's), scores, code, etc.</descr>
-    <email>boywithmachine@orange-carb.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>DarkSideofOZ custom systems and Web design</name>
-    <url>http://www.darksideofoz.com</url>
-    <descr>bringing quality Web design and some fun too</descr>
-    <email>darksideofoz@unrealcenter.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>DaTaiV</name>
-    <url>http://www.dataiv.peon.net/</url>
-    <descr>Personal FreeBSD Box used for NAT from a LAN</descr>
-    <email>nosp@dataiv.peon.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>DaTaiV Network Services</name>
-    <url>http://www.dataiv.net/</url>
-    <descr>FreeBSD Tutorials, some services to come soon... and more...</descr>
-    <email>admin@dataiv.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Dave's Bike Shed</name>
-    <url>http://www.bikeshed.com/</url>
-    <descr>Free classified ads for bicycles and parts</descr>
-    <email>dave@bikeshed.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>dave.imarc.net</name>
-    <url>http://dave.imarc.net/</url>
-    <descr>[[[[ design | type | freebsd | perl | cgi ]]]]</descr>
-    <email>dave@imarc.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Daves Place</name>
-    <url>http://daves-place.com/</url>
-    <descr>Personal Website but its run on FreeBSD</descr>
-    <email>dave@daves-place.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Davids.Org</name>
-    <url>http://www.davids.org/</url>
-    <descr>A collection of Davids</descr>
-    <email>dlr@davids.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>DeathAngel</name>
-    <url>http://www.deathangel.4t.com/</url>
-    <descr>DeathAngel Web Site</descr>
-    <email>lavallee2@videotron.ca</email>
-  </entry>
-
-  <entry type="personal">
-    <name>ded1 suX Organization</name>
-    <url>http://www.ded1.cjb.net/</url>
-    <descr>some link to freebsd, downloadable software, mp3 etc.</descr>
-    <email>ded1@u.dal.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>DeepLooz, Inc</name>
-    <url>http://www.boyhedy.com</url>
-    <descr>Welcome to Under Constrictions</descr>
-    <email>deeplooz@boyhedy.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Dennis Potechin</name>
-    <url>http://www.potechin.com/</url>
-    <descr>My home network - gateway/firewall/mail</descr>
-    <email>root@darkpower.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Digital Aquarium</name>
-    <url>http://www.digital-aquarium.org/</url>
-    <descr>Technical Assistance at your reach</descr>
-    <email>fxbezak@nac.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Don't Worry, the Pentiums are Harmless</name>
-    <url>http://www.brad-x.com/</url>
-    <descr>FreeBSD - The Power to Serve Brad-x.com</descr>
-    <email>brad@brad-x.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Dragon V</name>
-    <url>http://www.dragonv.com/</url>
-    <descr>Personal website</descr>
-    <email>dragonv@email.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Dwarf Nebula Laboratories</name>
-    <url>http://www.dwarfnebula.org/</url>
-    <descr>Home of the Dwarf Nebula Laboratories powered by FreeBSD</descr>
-    <email>scott@adelphia.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>easy-network.org.</name>
-    <url>http://www.easy-network.org/</url>
-    <descr>Let's begin FreeBSD &amp; Networking</descr>
-    <email>reo@easy-network.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>ecsd's home page</name>
-    <url>http://www.ecsd.com/</url>
-    <descr>updated several times a century</descr>
-    <email>ecsd@ecsd.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Ed Lax</name>
-    <url>http://www.edlax.co.uk/</url>
-    <descr></descr>
-    <email>edwardlax@bigfoot.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Education</name>
-    <url>http://ogino.sakura.ne.jp/</url>
-    <descr>Japan HighSchool Education</descr>
-    <email>togino@ogino.sakura.ne.jp</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Elle Yoko Suzuki</name>
-    <url>http://www.hosers.net/</url>
-    <descr>personal site</descr>
-    <email>suzuki@csua.berkeley.edu</email>
-  </entry>
-
-  <entry type="personal">
-    <name>ELS</name>
-    <url>http://www.els.gr.jp/</url>
-    <descr>Personal server</descr>
-    <email>kuga@els.gr.jp</email>
-  </entry>
-
-  <entry type="personal">
-    <name>epsilon.incredibyte.net</name>
-    <url>http://epsilon.incredibyte.net/</url>
-    <descr>AMD K6-166, 32MB RAM, 1.6gig HD</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Eric Harris</name>
-    <url>http://www.ericharris.com/</url>
-    <descr>Eric Harris Personal Web Site</descr>
-    <email>root@ericharris.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>ERRORBUG Community</name>
-    <url>http://www.errorbug.com/</url>
-    <descr>The community of musicians for publication of their pieces of work and communications.</descr>
-    <email>bugmaster@errorbug.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Escuela Superior de Fisica y Matematicas</name>
-    <url>http://michelle.esfm.ipn.mx/~mrspock/spiro.html</url>
-    <descr>Spirograph</descr>
-    <email>mrspock@esfm.ipn.mx</email>
-  </entry>
-
-  <entry type="personal">
-    <name>etree.org</name>
-    <url>http://finlandia.etree.org/</url>
-    <descr>http site for finlandia.etree.org, a ftp server hosting live, legal music</descr>
-    <email>dlittle@etree.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Evilcomputing.net</name>
-    <url>http://fupc.evilcomputing.net</url>
-    <descr>random interesting things</descr>
-    <email>jroach@evilcomputing.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>evilhackers.org</name>
-    <url>http://www.evilhackers.org/</url>
-    <descr>of course we use FreeBSD!</descr>
-    <email>bgates@evilhackers.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>faraday.homeip.net</name>
-    <url>http://faraday.homeip.net</url>
-    <descr>My personal web server</descr>
-    <email>rthoelen@faraday.homeip.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>fargel.com</name>
-    <url>http://www.fargel.com/</url>
-    <descr>My BSD tinker-around-with box</descr>
-    <email>lilpuppie@mindspring.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Fatal Dimensions MUD server</name>
-    <url>http://fataldimensions.nl.eu.org/</url>
-    <descr>Fatal Dimensions is a fantasy-oriented MUD where players of different classes can explore their ways through varied areas of wonder and imagination. Fatal Dimensions has a few stock areas so any newbie can feel quite at home in the beginning. We have a dedicated group of builders who regularly add new areas to the world. In Fatal Dimensions you can hack-and-slack your career but it is also fun and more rewarding to investigate and interact with the various mobs and environments that you may encounter. </descr>
-    <email>freebsd@oetelaar.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Flashndesign</name>
-    <url>http://www.flashndesign.com/</url>
-    <descr>Webdesigner/developer</descr>
-    <email>jamesy@firstworld.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Fluid Enterprises Inc.</name>
-    <url>http://www.fluidenterprises.net/</url>
-    <descr>My personal home server</descr>
-    <email>markus@fluidenterprises.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Forgotten's FreeBSD Dedication Page</name>
-    <url>http://www.ductape.net/~forgotte/</url>
-    <descr>My FreeBSD Dedication Page</descr>
-    <email>forgotte@theunixplace.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Forth Research</name>
-    <url>http://come.to/forth/</url>
-    <descr>Personal Web Site</descr>
-    <email>forth@mail.net.tw</email>
-  </entry>
-
-  <entry type="personal">
-    <name>fqdn.com</name>
-    <url>http://fqdn.com/</url>
-    <descr>boring links.  gateway kicks freebsd.</descr>
-    <email>greg@fqdn.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Franky Effendy</name>
-    <url>http://sife.swau.edu/~franky/</url>
-    <descr>Peace</descr>
-    <email>franky@sife.swau.edu</email>
-  </entry>
-
-  <entry type="personal">
-    <name>FreeBSD Help Channel</name>
-    <url>http://freebsdhelp.BSDaemon.org</url>
-    <descr>This site is dedicated to the official #freebsdhelp channel of irc network undernet.org</descr>
-    <email>zer0byte@antiOnline.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>FreeBSD Tips</name>
-    <url>http://www.kearneys.ca/FreeBSD/</url>
-    <descr>A little FreeBSD administration site</descr>
-    <email>brent@kearneys.ca</email>
-  </entry>
-
-  <entry type="personal">
-    <name>FreeBSD-Geeks</name>
-    <url>http://www.freebsd-geeks.net/</url>
-    <descr>Beginners Tutorials</descr>
-    <email>hackrat@freebsd-geeks.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Friends of smug</name>
-    <url>http://www.navegalia.com/personal/lord_backdoor</url>
-    <descr>spanish underground</descr>
-    <email>birhkoff@yahoo.es</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Fritzilldo.com</name>
-    <url>http://www.fritzilldo.com</url>
-    <descr>Fun Personal Site</descr>
-    <email>FJU@Fritzilldo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Fyberoptix.net</name>
-    <url>http://www.fyberoptix.net/</url>
-    <descr>PPro 200 running FreeBSD 4.0 with HTTPD / FTPD / IRCD currently active (uptimes.net client also)</descr>
-    <email>tecky@wen.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Galaxy</name>
-    <url>http://www.kawashima.gamo.shiga.jp/</url>
-    <descr>EPA's World</descr>
-    <email>yoshitaka@kawashima.gamo.shiga.jp</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Georg Wagner</name>
-    <url>http://www.datacomm.ch/g.wagner/</url>
-    <descr>The FreeBSD Pages, customising FreeBSD and using the window manager
-      WindowMaker.</descr>
-    <email>g.wagner@datacomm.ch</email>
-  </entry>
-
-  <entry type="personal">
-    <name>George's Website</name>
-    <url>http://vagner.com/</url>
-    <descr>My personal bio and storage</descr>
-    <email>george@vagner.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Gldisater's Website</name>
-    <url>http://gldisater.yi.org/</url>
-    <descr>Warning, being run on a 28.8</descr>
-    <email>gldisater@limpbizkit.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>gothic.net.au</name>
-    <url>http://www.gothic.net.au/</url>
-    <descr>Yet Another Gothic Site</descr>
-    <email>sean@gothic.net.au</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Great Unwashed</name>
-    <url>http://www.unwashed.de/</url>
-    <descr>Punk Rock Band From Germany, Info, MP3 and more...</descr>
-    <email>webmaster@unwashed.de</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Griffdog Enterprises</name>
-    <url>http://www.griffdog.net/</url>
-    <descr>Personal and Small Business Websites</descr>
-    <email>matt@griffdog.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Ground Zero</name>
-    <url>http://www.jimi.dk/</url>
-    <descr>Yes - I'm a nerd..</descr>
-    <email>freebsd@jimi.dk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Gunther Schadow at the Regenstrief Institute for Health Care</name>
-    <url>http://aurora.regenstrief.org</url>
-    <descr>Serves web, mail, DNS, SMB, Novell, and more to me, my colleagues and the world.</descr>
-    <email>gunther@aurora.regenstrief.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Gurft.Net</name>
-    <url>http://www.gurft.net/</url>
-    <descr>Personal Web page / Basis for web development</descr>
-    <email>ktelep@gurft.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Hacking For CAS</name>
-    <url>http://www.xerph.com</url>
-    <descr>Personal site using FreeBSD for web, smtp, ftp and irc servers</descr>
-    <email>ahunt@xerph.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Hal3000.cx</name>
-    <url>http://hal3000.cx/</url>
-    <descr>The Quest for Knowledge Continues</descr>
-    <email>orintz@hal3000.cx</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Happydays</name>
-    <url>http://happydays.dyndns.org/</url>
-    <descr>Personal ftp, mail, web, and samba file server</descr>
-    <email>dweimer@happydays.dyndns.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>heretics</name>
-    <url>http://dumone.yi.org</url>
-    <descr>free webhosting</descr>
-    <email>dum_one@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Hicox Family</name>
-    <url>http://shaggie.dhs.org/</url>
-    <descr>website (with pictures of kids!), serves mail for family, appletalk and samba fileserver ... running on a 486 (66mhz) .. 32meg Ram ... and kicks ass!</descr>
-    <email>scoobie@shaggie.dhs.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Highland @ AcNet</name>
-    <url>http://highland.acnet.net/</url>
-    <descr>Personal server used for development and some fun, also is used to host several personal pages and for give many services to its users. Quake 2 server running 24 hours a day.</descr>
-    <email>jester@highland.acnet.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>HIU-NeT Malang</name>
-    <url>http://www.amien.homestead.com</url>
-    <descr>Amien Homepage</descr>
-    <email>amien@telkom.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Hoku Designs</name>
-    <url>http://hoku.2y.net/</url>
-    <descr>Personal Website w/ UNIX info., links, Hawaii Lunch spots, Wacky stuff &amp; Who Knows!! </descr>
-    <email>Hoku@localkine.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>http://www.ogurok.com</name>
-    <url>http://www.ogurok.com/</url>
-    <descr>Just another friendly place</descr>
-    <email>oleg@ogurok.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Iggys Place</name>
-    <url>http://iggys.org/</url>
-    <descr>Iggys personal playground. You never know what'll be on this page!</descr>
-    <email>ignathius@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>IIUM</name>
-    <url>http://www.angelfire.com/ak/indramir/</url>
-    <descr>electrical</descr>
-    <email>mirzet@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Island Blues 2000</name>
-    <url>http://www.islandblues2000.domainvalet.com</url>
-    <descr>Personal Home Page</descr>
-    <email>sunsetblues2000@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Ismail YENIGUL Home Page</name>
-    <url>http://yenigul.net</url>
-    <descr>Ismail YENIGUL Home Page</descr>
-    <email>ismail@yenigul.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>its</name>
-    <url>http://www.tc.its-sby.edu/</url>
-    <descr>institut teknologi sepuluh nopember</descr>
-    <email>fauzi@its-sby.edu</email>
-  </entry>
-
-  <entry type="personal">
-    <name>ITU UNIX TEAM</name>
-    <url>http://www.unix.itu.edu.tr/</url>
-    <descr>istanbul technical univ. unix team web site it is also mirror site of FreeBSD</descr>
-    <email>yenigul@itu.edu.tr</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Ix Internet Services</name>
-    <url>http://ix.apana.org.au/</url>
-    <descr>One of a group of FreeBSD servers providing Net access &amp; training on all manner of things Computer. (A member of the APANA-SA organisation)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>J. B. Kreplin</name>
-    <url>http://bsd.sytes.net/</url>
-    <descr>Ben's little webserver running on FreeBSD</descr>
-    <email>benjamin@kreplin.de</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Jacco van Buuren</name>
-    <url>http://www.caiw.nl/~bvbuuren/</url>
-    <descr>Learning inter/intra-networking, system administration, crossplatform client/server application engineering, etc. needed a server but didn't have the money -&gt; FreeBSD</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>JAGGeD Networks</name>
-    <url>http://www.jagged.net/</url>
-    <descr>JN's HomePage and Admin Info</descr>
-    <email>razorz@accesspro.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Jeff Mealiffe</name>
-    <url>http://www.mealiffe.org/</url>
-    <descr>Jeff Mealiffe's web &amp; mail server - FreeBSD on a P5-120</descr>
-    <email>jeff@mealiffe.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>jeff.devfoo.org</name>
-    <url>http://jeff.devfoo.org</url>
-    <descr>Jeff's Homepage.</descr>
-    <email>JAK006@home.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Jeje</name>
-    <url>http://www.jeje.org</url>
-    <descr>Personal site for jerome fleury and friends web hosting</descr>
-    <email>jeje@jeje.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Jerry's Homepage</name>
-    <url>http://www.ohmu.dhs.org</url>
-    <descr>Just a personal website, about everything and about nothing.</descr>
-    <email>icmpd@dhs.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Jive!</name>
-    <url>http://jive.nacholand.com/</url>
-    <descr>The FreeBSD box with the most phunk out there!</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Joachim Jaeckel</name>
-    <url>http://home.kamp.net/home/joachim.jaeckel/</url>
-    <descr>a small example, how FreeBSD can run on laptop's</descr>
-    <email>Joachim.Jaeckel@d.kamp.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>John Bergmann's</name>
-    <url>http://www.geocities.com/researchtriangle/6577/home.html</url>
-    <descr>Personal Homepage</descr>
-    <email>bick@cyberport.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Johnson's Studio</name>
-    <url>http://nerv.netfront.net/</url>
-    <descr>PentiumII-300, 128MB RAM, SCSI HD</descr>
-    <email>johnsonm@netfront.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Jon Towne</name>
-    <url>http://198.175.11.195/~haxor/</url>
-    <descr>486sx/25mhz 12MB RAM/210MB HD/14.4 modem, dynamic IP address, untouchable :D</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Jonas Luster</name>
-    <url>http://www.newsbone.org/~jonas/</url>
-    <descr>The ROXEN Server runnig on my Computer at work</descr>
-    <email>jonas@newsbone.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>JR0RXU.NET</name>
-    <url>http://www.jr0rxu.net/</url>
-    <descr>Introduction of FLET'S pseudo leased line with FreeBSD.</descr>
-    <email>hase@jr0rxu.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>jumble.org</name>
-    <url>http://www.jumble.org/</url>
-    <descr>Scrambled word descrambler</descr>
-    <email>freebsd@angiogram.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Just another personal server running on FreeBSD.</name>
-    <url>http://davidmorris.sytes.net/</url>
-    <descr>David Morris' personal web site.</descr>
-    <email>dmorris@davidmorris.sytes.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>K2 Research</name>
-    <url>http://www.k2r.org/</url>
-    <descr>Yet another home with FreeBSD machines :-)</descr>
-    <email>webmaster@k2r.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>KDG Engineering</name>
-    <url>http://www.kdg-engineering.homeip.net/</url>
-    <descr>CAD / CAM / CNC Consulting Services</descr>
-    <email>kdgrills@kdg-engineering.homeip.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Keith Otis' home page</name>
-    <url>http://www.kaboing.net</url>
-    <descr>Keith Otis' home page</descr>
-    <email>keith@kaboing.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Kevans Computers</name>
-    <url>http://www.heydon.org/kevan/collection/</url>
-    <descr>My old computer collection database driven by Python, PostgreSQL and of course FreeBSD</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>KHX</name>
-    <url>http://www.khx.to/</url>
-    <descr>KH eXtention</descr>
-    <email>giger65535@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Kinnee Family</name>
-    <url>http://www.kinnee.net</url>
-    <descr>Not much just a place to put pictures and other things.</descr>
-    <email>erick@kinnee.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>KRYnos.net</name>
-    <url>http://www.krynos.net/</url>
-    <descr>Friendly Personal site</descr>
-    <email>nos@krynos.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Lacaxa</name>
-    <url>http://www.ascelor.es/</url>
-    <descr>PC</descr>
-    <email>fsierra@mimadritel.es</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Land of Legends</name>
-    <url>http://www.legendz.com/</url>
-    <descr>Text-based MUD (Multi-User-Dimension)</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Land81 NSU campus</name>
-    <url>http://land81.nsu.ru/</url>
-    <descr>Campus by Novosibirsk state university</descr>
-    <email>root@land81.nsu.ru</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Lanfear WEB/Freeshell hosting</name>
-    <url>http://lanfear.dhs.org/</url>
-    <descr>Free shells along with WEB hosting... DNS SERVER TO BE UP SOON.... =P  the computer is a dual P200mmx 32mb ram 5 gig hd r unning my in house lan</descr>
-    <email>teckay@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Lanier Network Design</name>
-    <url>http://homepages.lycos.com/~CLanier/lypersonal/Lanier.html</url>
-    <descr>Network Hardware and Software Information Resouce</descr>
-    <email>lacats@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Marcel Sauder</name>
-    <url>http://www.siconline.ch/</url>
-    <descr>Networking Engineer</descr>
-    <email>msauder@siconline.ch</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Mariusz Kosakowski</name>
-    <url>http://www.kosmo.bts.pl/</url>
-    <descr>KOSMO 3D PAGE</descr>
-    <email>kosmo@highnet.pl</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Mark &amp; Jo Ann's Homepage</name>
-    <url>http://www.markandjo.com/</url>
-    <descr>Lots of wedding pics and stuff... Pentium Pro 200 w/FreeBSD 2.2.6 &amp; Apache</descr>
-    <email>mkrueger@best.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Mark's FreeBSD World</name>
-    <url>http://www.vmunix.com/mark/FreeBSD/</url>
-    <descr>a collection of handy programs/docs/whatever that I use on my FreeBSD powered computers.</descr>
-    <email>mark@vmunix.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Marty Bower</name>
-    <url>http://mjhb.marina-del-rey.ca.us/</url>
-    <descr>Free software and more</descr>
-    <email>marty+freebsd-gallery@mjhb.marina-del-rey.ca.us</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Matt Behrens's Own Domain</name>
-    <url>http://www.zigg.com/</url>
-    <descr>Providing services to friends and some cool free software.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>MaximumBSD</name>
-    <url>http://www.maximumbsd.com/</url>
-    <descr>Aimed towards BSD and Linux providing news, articles and HOWTO's</descr>
-    <email>rtroy@maximumbsd.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>McCoysWorld Communications</name>
-    <url>http://www.mccoysworld.com/</url>
-    <descr>web development and hosting, personal art galleries and other things.</descr>
-    <email>dmccoy@mccoysworld.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>memon.tzo.com</name>
-    <url>http://memon.tzo.com/</url>
-    <descr>personal developmental server</descr>
-    <email>stncld@memon.tzo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Midnight BBS</name>
-    <url>telnet://mnbbs.org/</url>
-    <descr>Gateway/Router to My BBS system.</descr>
-    <email>mnbbs@lightstream.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Mikhail Teterin</name>
-    <url>http://www.ziplink.net/~kot/</url>
-    <descr>another one</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Minnie</name>
-    <url>http://minnie.cs.adfa.edu.au/</url>
-    <descr>Mirror of the FreeBSD software, mailing lists, lots of other stuff, all on a 486 with 8M.</descr>
-    <email>wkt@cs.adfa.edu.au</email>
-  </entry>
-
-  <entry type="personal">
-    <name>MMX iT Free Webservices</name>
-    <url>http://www.mmxit.net</url>
-    <descr>Free webhosting and DNS forwarding</descr>
-    <email>mmx@datafast.net.au</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Moscow State University</name>
-    <url>http://isabase.philol.msu.ru/</url>
-    <descr>Just the computer I work on in the university</descr>
-    <email>grg@philol.msu.ru</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Mr.Fast</name>
-    <url>http://www.thesuits.com/</url>
-    <descr>FreeBSD friend</descr>
-    <email>mr-white@pacbell.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>My Mailserver</name>
-    <url>http://at.mymailserver.net/</url>
-    <descr>actually a server complex using FreeBSD and Linux-Mandrake.</descr>
-    <email>postmaster@mymailserver.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Mylanders</name>
-    <url>http://www.mylanders.com/</url>
-    <descr>A place for people who enjoy fantasy and science fiction.</descr>
-    <email>nmorton@mylanders.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>na</name>
-    <url>http://www.thumbs.org/</url>
-    <descr>ThunderThumbs - Everything music and beauty!!</descr>
-    <email>russ@thumbs.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>NARLA - ( Dez Blanchfield )</name>
-    <url>http://www.WebSearch.com.au/dez/</url>
-    <descr>Network Application Research Labs Australia</descr>
-    <email>dez@websearch.com.au</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Nathan Vidican's HomePage</name>
-    <url>http://nathan.vidican.com/</url>
-    <descr>Nathan Vidican's personal homepage</descr>
-    <email>nathan@vidican.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>National Steel Corporation</name>
-    <url>http://www.olops.com/</url>
-    <descr>Olops</descr>
-    <email>pop@olops.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>nbux</name>
-    <url>http://www.nbux.com/</url>
-    <descr>mail server (sendmail+popa3d+neomail), firewall (ipfilter+squid), web server (apache+SSL) ...</descr>
-    <email>lifo@nbux.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>NetMonster Home</name>
-    <url>http://webdemon.vr9.com/</url>
-    <descr>Help the NMRC defend the Internet!</descr>
-    <email>webmaster@webdemon.itgo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>NetRunner</name>
-    <url>http://www.netrunner.nu/</url>
-    <descr>A happy user of FreeBSD</descr>
-    <email>rogers@netrunner.nu</email>
-  </entry>
-
-  <entry type="personal">
-    <name>networkinghelp.org</name>
-    <url>http://networkinghelp.org/</url>
-    <descr>Site for undernet #networking channel</descr>
-    <email>netops@buckminster.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>nicholaswloui.com</name>
-    <url>http://www.nicholaswloui.com/</url>
-    <descr>nicholaswloui.com</descr>
-    <email>nloui@crosswinds.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Nicole Melody Harrington</name>
-    <url>http://www.webweaver.net/</url>
-    <descr>Nicole's Collection of Interests</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Niko Dittmann's personal homepage</name>
-    <url>http://ende.dyndns.org</url>
-    <descr>personal homepage</descr>
-    <email>niko.dittmann@web.de</email>
-  </entry>
-
-  <entry type="personal">
-    <name>nix.cable.nu</name>
-    <url>http://nix.cable.nu/</url>
-    <descr>Personal FreeBSD, with some howto's (adsl) and useful links</descr>
-    <email>xcom@nix.cable.nu</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Noah Games Incorporated</name>
-    <url>http://fftrealm.com/</url>
-    <descr>The Final Fantasy Tactics Realm</descr>
-    <email>Admin@FFTrealm.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Noah's Website</name>
-    <url>http://www.bergen.org/~noacoh</url>
-    <descr>this site is just a little thing a made in my spare time</descr>
-    <email>noacoh@bergen.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>nodata.org</name>
-    <url>http://www.nodata.org/</url>
-    <descr>nodata.org</descr>
-    <email>heath@nodata.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>atropos.fsn.net</name>
-    <url>http://atropos.fsn.net/</url>
-    <descr>David Yeske's web site</descr>
-    <email>dyeske@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>execrel.kiev.ua/twingo.html</name>
-    <url>http://execrel.kiev.ua/twingo.html</url>
-    <descr>My Homepage</descr>
-    <email>pavel@execrel.kiev.ua</email>
-  </entry>
-
-  <entry type="personal">
-    <name>None</name>
-    <url>http://seeberg.dk/freebsd/idaraid/</url>
-    <descr>Home of Compaq Smart-2 controllers on FreeBSD</descr>
-    <email>morten@seeberg.dk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>notgod.com</name>
-    <url>http://www.notgod.com/</url>
-    <descr>Happy FreeBSD user.  serving several virtual hosts.</descr>
-    <email>notgod@notgod.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Nukequarters.com</name>
-    <url>http://www.nukequarters.com/</url>
-    <descr>Chris' play server for trying out ideas</descr>
-    <email>chris@nukequarters.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Odysseyit</name>
-    <url>http://www.odysseyit.com/</url>
-    <descr>Technical Faqs , Scripts etc.</descr>
-    <email>dsoni@usa.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>PAEPS.CX</name>
-    <url>http://www.paeps.cx:8000/</url>
-    <descr>Philip's Boring Site</descr>
-    <email>philip@paeps.cx</email>
-  </entry>
-
-  <entry type="personal">
-    <name>PaLaDiN7</name>
-    <url>http://www.paladin7.net/</url>
-    <descr>personal site</descr>
-    <email>pal@paladin7.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>pamacs</name>
-    <url>http://m40-esztergom.elender.hu/</url>
-    <descr>Home FreeBSD server (Dual Cel (2x500Mhz) 128ram) 2 rls + dial-up router. FreeBSD simply roz ...link is untouchabble cause it is dial up;)</descr>
-    <email>mexy@libero.it</email>
-  </entry>
-
-  <entry type="personal">
-    <name>park.basketonline.dk</name>
-    <url>http://park.basketonline.dk/</url>
-    <descr>A Server for me n' Friends, in my quest to learn more about FreeBSD!</descr>
-    <email>sch@sch.dk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Paul A. Scott</name>
-    <url>http://www.the-frontier.org/pscott/</url>
-    <descr>Yet another FreeBSD zealot</descr>
-    <email>pscott@the-frontier.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Perfect Isolation</name>
-    <url>http://perfectisolation.dyndns.org</url>
-    <descr>This is a website devoted to my adventures with FreeBSD!</descr>
-    <email>daemon@arventerprises.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>personal</name>
-    <url>http://members.tripod.com/~booksnsuch/index2html/</url>
-    <descr>heart doners organ transplants life death</descr>
-    <email>dvankuren@kalamaz00.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Personal study...</name>
-    <url>http://www.dreamedge4u.com/</url>
-    <descr>We are using FreeBsd for WWW, Mail, Real Basic Server..And also running Samba Server...Just for personal study</descr>
-    <email>webmaster@dreamedge4u.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>FreeBSDDesktop.cjb.net</name>
-    <url>http://www.freebsddesktop.cjb.net/</url>
-    <descr>FreeBSD Desktop - Projeto de aux&iacute;lio na instala&ccedil;&atilde;o de FreeBSD em desktop's !</descr>
-    <email>vinis@zaz.com.br</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Personal Web site</name>
-    <url>http://www.milojko.com/</url>
-    <descr>Personal Web site</descr>
-    <email>alex@net-pro.ca</email>
-  </entry>
-
-  <entry type="personal">
-    <name>personal page</name>
-    <url>http://www.freecris.bmm.it/</url>
-    <descr>Just a little personal page. tnx to FreeBSD &amp; Google</descr>
-    <email>deana@bmm.it</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Personal site</name>
-    <url>http://kirill.iuf.net/</url>
-    <descr>Personal site for ukranian system administrators</descr>
-    <email>kirill@kirill.iuf.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Personal Web site by Wadim Shkirmantov</name>
-    <url>http://wad.morion.com.ru/</url>
-    <descr>This is a personal Web site by Wadim Shkirmantov of St.Petersburg, Russia</descr>
-    <email>omon@pisem.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>PheerBSD</name>
-    <url>http://pheerbsd.org/</url>
-    <descr>Hooked on FreeBSD worked for me!</descr>
-    <email>webmaster@pheerbsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Phil Maker</name>
-    <url>http://www.cs.ntu.edu.au/homepages/pjm/</url>
-    <descr>Software development</descr>
-    <email>pjm@cs.ntu.edu.au</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Pierre-Francois LAURAND</name>
-    <url>http://www.pushf.yi.org/</url>
-    <descr>Personal home site</descr>
-    <email>pushf@mail.dotcom.fr</email>
-  </entry>
-
-  <entry type="personal">
-    <name>polymorph</name>
-    <url>http://24.11.209.157/</url>
-    <descr>polymorph's home page</descr>
-    <email>polymorph3@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Prince of Darkness, Daimon's home...</name>
-    <url>http://daimon.idl.com.au/</url>
-    <descr>The homepages for Daimon and all the Users of his web server. Hosted sites, and shell services. All runnning nicely Courtesy of FreeBSD</descr>
-    <email>webmaster@daimon.idl.com.au</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Programming &amp; Unix (Chinese)</name>
-    <url>http://www.netease.com/~gzhuli/</url>
-    <descr>My personal homepage at a site powered by FreeBSD.</descr>
-    <email>gzhuli@netease.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Prosoft Communication Systems Ltd.</name>
-    <url>http://mars.prosoft.com.tr/</url>
-    <descr>My own System at Office(FreeBSD 4.3-RELEASE)</descr>
-    <email>aycan@mars.prosoft.com.tr</email>
-  </entry>
-
-  <entry type="personal">
-    <name>PSEUDONODE</name>
-    <url>http://www.pseudonode.cx/</url>
-    <descr>Internet Security, Unix, site about nothing</descr>
-    <email>setfacl@pseudonode.cx</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Punkball</name>
-    <url>http://www.punkball.com/</url>
-    <descr>Just a place for me to blab and offer my two cents...</descr>
-    <email>punkball@ccs.neu.edu</email>
-  </entry>
-
-  <entry type="personal">
-    <name>quaak.org</name>
-    <url>http://www.quaak.org/</url>
-    <descr>personal</descr>
-    <email>rogier@quaak.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Quadspeed Archive</name>
-    <url>http://freebsd.quadspeed.com/</url>
-    <descr>FreeBSD Mirror</descr>
-    <email>webmaster@quadspeed.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Radoslav Vasilev</name>
-    <url>http://www.deckland.org/</url>
-    <descr>Personal web-site with some UN*X stuff</descr>
-    <email>rvasilev@uni-svishtov.bg</email>
-  </entry>
-
-  <entry type="personal">
-    <name>RavensClaw.com</name>
-    <url>http://www.ravensclaw.com/</url>
-    <descr>RavensClaw.com Internet Content Provider</descr>
-    <email>peter@ravensclaw.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Reagan Family</name>
-    <url>http://www.reagans.org/</url>
-    <descr>Family webmail/http/ftp/samba/pop3 server [P5/100 48Meg]</descr>
-    <email>robin-reply@reagans.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Redfive.Org</name>
-    <url>http://www.redfive.org/</url>
-    <descr>Personal website with FreeBSD and other links</descr>
-    <email>s.taylor@bigfoot.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>redigital.com</name>
-    <url>http://www.redigital.com/</url>
-    <descr>Personal WWW/PHP/MySQL Development</descr>
-    <email>randall@redigital.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>RegEdit : The Windows Registry Editor</name>
-    <url>http://www.regedit.com/</url>
-    <descr>A database of Windows 95, 98 and NT registry keys and information.</descr>
-    <email>regedit@4tekseek.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Rick Noelle</name>
-    <url>http://www.techjapanese.com/</url>
-    <descr>Site about technical Japanese translation</descr>
-    <email>rick@akirapc.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Rick's Home Server</name>
-    <url>http://rknebel.uplink.net/</url>
-    <descr>Home Network, Web and Mail Server</descr>
-    <email>rknebel@uplink.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>riles.ca</name>
-    <url>http://www.riles.ca</url>
-    <descr>Personal, hopefully some useful stuff soon</descr>
-    <email>chris@riles.ca</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Risk Rocks!</name>
-    <url>http://www.riskrocks.homestead.com/</url>
-    <descr>Risk page with tips</descr>
-    <email>pp7_90210@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Robert Skinner's Personal Homepage</name>
-    <url>http://www.skinner.org/</url>
-    <descr>Skinner's Ego :)</descr>
-    <email>skinner@skinner.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>roehsler.dca.net</name>
-    <url>http://roehsler.dca.net/</url>
-    <descr>My home dial-up router, also does etrn mail for my third level domain</descr>
-    <email>roehsler@roehsler.dca.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Ross Kendall</name>
-    <url>http://rossk.sydney.austasia.net/</url>
-    <descr>Personal web site of a web developer</descr>
-    <email>rossk@austasia.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>ruggeddwarf</name>
-    <url>http://www.ruggeddwarf.blinks.net/</url>
-    <descr>entertainment</descr>
-    <email>ruggeddwarf@nc.freei.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Russian Arms Site</name>
-    <url>http://www.bastion.spb.ru/archive/</url>
-    <descr>Site about Russian/Soviet military technology</descr>
-    <email>russianarms@mail.ru</email>
-  </entry>
-
-  <entry type="personal">
-    <name>S&amp;A Network</name>
-    <url>http://alialadin.homeip.net/</url>
-    <descr>Shadowman &amp; AliAladin Homepage</descr>
-    <email>alialadin@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Samurai Enterprises</name>
-    <url>http://samurai.ruin.org/</url>
-    <descr>You need something - I'll get it done!</descr>
-    <email>jmrobins@samurai.ruin.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>San Francisco Seals MSBL</name>
-    <url>http://www.msblseals.com/</url>
-    <descr>30 and over MSBL Baseball Team Site</descr>
-    <email>wavve@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Satanic Networking</name>
-    <url>http://www.satanic.net/</url>
-    <descr>My very own domain and collection of machines for personal hacking pleasure</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Sauders Family Homepage</name>
-    <url>http://www.sauder.ch</url>
-    <descr>Sauder private site</descr>
-    <email>marcel@sauder.ch</email>
-  </entry>
-
-  <entry type="personal">
-    <name>sca packaging lucca</name>
-    <url>http://tin.it/</url>
-    <descr>paper mill</descr>
-    <email>fratos@tin.it</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Self</name>
-    <url>http://www.televar.com/~stevemr2/</url>
-    <descr>Website for the new or experience surfer. Almost 800 links in several categories</descr>
-    <email>stevemr2@bigfoot.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>SERVER.ARENDJE.PHEAR.NL</name>
-    <url>http://arend.mine.nu/</url>
-    <descr>My personal webserver, it hosts about 25 sites.... P166 without mmx and with 32 meg of ram... 540 meg hd space.</descr>
-    <email>arend@belboek.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Shadow Gate</name>
-    <url>http://mindwarp.plymouth.edu/~kadara/</url>
-    <descr>...enter to forget reality...</descr>
-    <email>kadara@mindwarp.plymouth.edu</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Silvertriad</name>
-    <url>http://www.silvertriad.com/</url>
-    <descr>Provides various freeware applications for Windows</descr>
-    <email>questions@silvertriad.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Simpsons</name>
-    <url>http://members.tripod.com/~pobby_ws/</url>
-    <descr>Cool Simpsons Site with trivia</descr>
-    <email>BuffBagwell2@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Slakin.Net Inc.</name>
-    <url>http://www.slakin.net</url>
-    <descr>my Personal site for uhmm... stuff?</descr>
-    <email>admin@slakin.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>slashzero.com</name>
-    <url>http://www.slashzero.com/</url>
-    <descr>Useless, personal server</descr>
-    <email>abx21@slashzero.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Smeird</name>
-    <url>http://www.smeird.com/</url>
-    <descr>Smeird archive</descr>
-    <email>postmaster@smeird.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Sofia Cafe</name>
-    <url>http://hades.dynodns.net/</url>
-    <descr>Information about Bulgaria</descr>
-    <email>vhm3@hades.dynodns.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Sonera Group Ltd.</name>
-    <url>http://jau.tmt.tele.fi/</url>
-    <descr>formerly known as Telecom Finland</descr>
-    <email>Jukka.Ukkonen@sonera.fi</email>
-  </entry>
-
-  <entry type="personal">
-    <name>St. Mike Computer Rentals and Internet Cafe</name>
-    <url>http://www.stmike.com</url>
-    <descr>About Computers</descr>
-    <email>panot_stmike@usa.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Stagecraft.cx</name>
-    <url>http://www.stagecraft.cx/</url>
-    <descr>Homesite of the Makin Family.  FreeBSD, Ham Radio, Theatre.</descr>
-    <email>carl@stagecraft.cx</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Steve's Home Page</name>
-    <url>http://www.prigg.net/</url>
-    <descr>Steve's Home Page</descr>
-    <email>steve@prigg.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>StikomNeT</name>
-    <url>http://www.stikom.edu/</url>
-    <descr>Mahasiswa</descr>
-    <email>s973166@omega.stikom-sby.ac.id/</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Stockholm Pinball Locator</name>
-    <url>http://pinball.fatburen.org/</url>
-    <descr>Database of pinball machines available for playing in Stockholm</descr>
-    <email>staffanu@nada.kth.se</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Student</name>
-    <url>http://FreeBSD.quadspeed.com/</url>
-    <descr>FreeBSD Mirror Site</descr>
-    <email>webmaster@quadspeed.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Student</name>
-    <url>http://safopna.tuniv.szczecin.pl/~skrzat/</url>
-    <descr>?</descr>
-    <email>skrzat@safona.tuniv.szczecin.pl</email>
-  </entry>
-
-  <entry type="personal">
-    <name>studio9x</name>
-    <url>http://studio9x.cjb.net/</url>
-    <descr>personel site</descr>
-    <email>king9x@linux.com.my</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Sunzofman Lt&eacute;e</name>
-    <url>http://www.sunzofman.net/</url>
-    <descr>Sunzofman DALnet</descr>
-    <email>root@sunzofman.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>System Control Networks</name>
-    <url>http://www.sysctl.net/</url>
-    <descr>A network of FreeBSD machines that 'think'</descr>
-    <email>phill@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>SYUNI_COM</name>
-    <url>http://www.geocities.com/syuni_com/</url>
-    <descr>Global Telecommunications</descr>
-    <email>arminco@syunik.am</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Takeoff world</name>
-    <url>http://www.takeoff.ne.jp/</url>
-    <descr>Takeoff World</descr>
-    <email>motani@takeoff.ne.jp</email>
-  </entry>
-
-  <entry type="personal">
-    <name>takeover world</name>
-    <url>http://www.matrixzone.net</url>
-    <descr>You have to see it for yourself...</descr>
-    <email>todorov@space.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>TAKO-YAKI.COM</name>
-    <url>http://www.tako-yaki.com/</url>
-    <descr>TAKO-YAKI is japanese food.</descr>
-    <email>masatomo@tako-yaki.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Tanbing Network</name>
-    <url>http://tanbing.coc.cc/</url>
-    <descr>Internet</descr>
-    <email>jack_tar@email.com.cn</email>
-  </entry>
-
-  <entry type="personal">
-    <name>taromaru</name>
-    <url>http://www.taromaru.org/</url>
-    <descr>personal site</descr>
-    <email>taromaru@taromaru.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Tecnos Corporation Inc.</name>
-    <url>http://www.niki1.f2s.com</url>
-    <descr>NiKi1.com</descr>
-    <email>webmaster@niki1.f2s.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Tequila Master</name>
-    <url>http://www.sunline.com.br/pessoais/fran/</url>
-    <descr>Tequila Master</descr>
-    <email>ving@zipmail.com.br</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The BadBoy Server!</name>
-    <url>http://www.badboy.ch/</url>
-    <descr>A Switzerland Server with many news about Computer, Games, Hardware and very hot news (all in German text!)</descr>
-    <email>webmaster@badboy.ch</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The Bit Mine</name>
-    <url>http://www.bitmine.com/</url>
-    <descr>Some Java and FreeBSD stuff</descr>
-    <email>rdas@bitmine.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The BlackIce Archive</name>
-    <url>http://node1c29.a2000.nl/</url>
-    <descr></descr>
-    <email>blackice@euronet.nl</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Hoodpages</name>
-    <url>http://www.rewa.com/</url>
-    <descr>Hoodpages</descr>
-    <email>rewa@juno.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The Digital Pimp</name>
-    <url>http://netprince.n3.net/</url>
-    <descr>A multifunction network service</descr>
-    <email>netprince@vt.edu</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The Inquisition</name>
-    <url>http://www.mythias.nu/inquisition/</url>
-    <descr>A tribe in the Starsiege:Tribes universe.</descr>
-    <email>colosus@premier1.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The Le Prevost Family Internet Site</name>
-    <url>http://www.leprevost.net/</url>
-    <descr>Set up to learn about Unix and tell the world about the Le Prevost family from Guernsey!!!</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The Lunatic Phringe</name>
-    <url>http://www.phringe.org/</url>
-    <descr>IRC and telnet based chat. No rules. No Censorship</descr>
-    <email>dwrisley@ivexcorp.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The Nuclei.Org</name>
-    <url>http://www.thenuclei.org</url>
-    <descr>My BSD Experiment</descr>
-    <email>webmaster@thenuclei.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The Perambulatory Developer</name>
-    <url>http://www.dev.omegacorp.net/</url>
-    <descr>Random mish-mash of information for developers</descr>
-    <email>malcolm@dev.omegacorp.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The Rosson Family</name>
-    <url>http://www.oneinsane.net/</url>
-    <descr>FreeBSD server/workstation providing Internet access with www, mail, shells, and a gateway for the machines of our inhome LAN of 5. (K5-166 CPU,64M of RAM,3.5G HD space). It definately shows that FreeBSD has the power to SERVE.</descr>
-    <email>insane@oneinsane.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The Schlegel Server</name>
-    <url>http://jschlege.campus.vt.edu/</url>
-    <descr>Free Web Space</descr>
-    <email>schlegel@jschlege.campus.vt.edu</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The Tavern</name>
-    <url>http://tavern.tzo.com/</url>
-    <descr>A FreeBSD LAN; a peek into a home network, some scripts and code, and the cure for the common cold.</descr>
-    <email>moe@tavern.tzo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The World of The Clerk</name>
-    <url>http://www.theclerk.com/</url>
-    <descr>Interests in computer networking, security, and programming.  Also includes information on current affiliations both educational and professional.</descr>
-    <email>webmaster@theclerk.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>thetruechurchoftheblessedgeek.net</name>
-    <url>http://www.thetruechurchoftheblessedgeek.net/</url>
-    <descr>FreeBSD serves the church!</descr>
-    <email>pastor@thetruechurchoftheblessedgeek.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Tiger2 BBS</name>
-    <url>telnet://bbs.tiger2.net/</url>
-    <descr>Taiwan's largest Sexstory collection BBS</descr>
-    <email>root@bbs.tiger2.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>TiMeR's Home</name>
-    <url>http://TiMeR.usf.com.hk/</url>
-    <descr>My Personal Web</descr>
-    <email>timer@Homemail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>tinkerbox</name>
-    <url>http://www.tinkerbox.org/</url>
-    <descr>personal electronics/software site</descr>
-    <email>bruno@tinkerbox.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>TNT productions</name>
-    <url>http://lunar.clinic.net/</url>
-    <descr>Personal Intranet/Fileserver/Firewall</descr>
-    <email>tony@clinic.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Tobbes Crazy Site</name>
-    <url>http://www.tobbe.com/</url>
-    <descr>A swedish site with crazy things</descr>
-    <email>tobbe@tobbe.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Toby A. Rider</name>
-    <url>http://www3.atsbank.com/~tarider/tullochgorm/SCOT1.HTM</url>
-    <descr>A web page devoted to Traditional Scottish Music, running on my own FreeBSD-powered web server!</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Torulf Lundgren</name>
-    <url>http://www.torulf.pp.se/</url>
-    <descr>Me, my family and my motorcycle. In Swedish only.</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>TPS Software Security Society</name>
-    <url>http://tps.sk/</url>
-    <descr>Security consulting &amp; development, FreeBSD support</descr>
-    <email>tps@tps.sk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Travis Walton</name>
-    <url>http://www.travis-walton.com/</url>
-    <descr>The best documented case of alien abduction</descr>
-    <email>pscott@the-frontier.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>TriggerX - The Next Generation Nerd</name>
-    <url>http://triggerx.cjb.net</url>
-    <descr>A personal FreeBSD website (for nerds only)</descr>
-    <email>zariziBSD@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Tropez Networks</name>
-    <url>http://tropez.homeip.net/</url>
-    <descr>Personal Gateway/Firewall</descr>
-    <email>hubert[at]pcforest.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>TropiNet</name>
-    <url>http://www.tropinet.com/</url>
-    <descr>Nigel Gorry's Home Page</descr>
-    <email>nigel@tropinet.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>troysplace.net</name>
-    <url>http://www.troysplace.net/</url>
-    <descr>My server that hosts my projects, friends websites, etc. etc.</descr>
-    <email>troy@troysplace.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>TryCell Communication</name>
-    <url>http://www.trycell.com/</url>
-    <descr>Online communication information personal service</descr>
-    <email>aktush@gmx.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Tsuru Network</name>
-    <url>http://www.tsuru.net/</url>
-    <descr></descr>
-    <email>tsuru@tsuru.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>TundraWare</name>
-    <url>http://www.tundraware.com/</url>
-    <descr>Home Of The pure-silver Photography Mailing List</descr>
-    <email>tundra@tundraware.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Twilight Systems</name>
-    <url>http://www.tw-zone.com/</url>
-    <descr>Twilight Zone Web site</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Twingo inc.</name>
-    <url>http://www.execrel.kiev.ua/twingo.html</url>
-    <descr>My homepage</descr>
-    <email>pavel@execrel.kiev.ua</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Tycho City</name>
-    <url>http://www.tychocity.com/</url>
-    <descr>Rob Furr's personal web site</descr>
-    <email>rsfurr@curie.uncg.edu</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Unix Secrets related org.</name>
-    <url>http://www.extra.hu/Eurocat/</url>
-    <descr>Large scale of Unix realated texts, source codes etc.</descr>
-    <email>zelenak.gabor@ans.lri.hu</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Urban-Whore</name>
-    <url>http://www.angelfire.com/ak4/UrbanWhore</url>
-    <descr>an all UK group here, freeBSD mad</descr>
-    <email>trinix@www.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>van online</name>
-    <url>http://van.web.za/</url>
-    <descr>home box</descr>
-    <email>david@van.web.za</email>
-  </entry>
-
-  <entry type="personal">
-    <name>viperstrike.com</name>
-    <url>http://www.viperstrike.com/</url>
-    <descr>personal development site</descr>
-    <email>lopaka@viperstrike.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Vulcan Center for Supercomputing Applications</name>
-    <url>http://www.spock.mem.net/</url>
-    <descr>Coalition of FreeBSD and Open-Source users in Memphis, TN</descr>
-    <email>webmaster@spock.mem.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>wang long</name>
-    <url>http://freebsd.hbdcb.net.cn/</url>
-    <descr>My personal site of FreeBSD 2.2.5 </descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Ward Kaatz</name>
-    <url>http://ward.org/</url>
-    <descr>My DSL based FreeBSD server/workstation</descr>
-    <email>wardk@wardk.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Web Design- &copy; OMNiTECH SySTEMS 1999</name>
-    <url>http://www.geocities.com/motorcity/lane/5667/</url>
-    <descr>...The world of Z...</descr>
-    <email>RaceR_Z_@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>webdesignz</name>
-    <url>http://www.webdesignz.cc</url>
-    <descr>just for phun web designz</descr>
-    <email>whocarezwhoiam@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Weberworld</name>
-    <url>http://www.weberworld.com/</url>
-    <descr>WeberWorld</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>WestWorld</name>
-    <url>http://www.westenra.com/</url>
-    <descr>Personal homepage of Westenra.</descr>
-    <email>s_puttock@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Windmoon Place</name>
-    <url>http://www.windmoon.nu/</url>
-    <descr>Someone got banned in #freebsd</descr>
-    <email>fengyue@windmoon.nu</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Witches-Unlimited</name>
-    <url>http://www.witches-unlimited.bc.ca</url>
-    <descr>E-zine for Witches and Pagans</descr>
-    <email>inanna@witches-unlimited.bc.ca</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Wrath.Oche.De</name>
-    <url>http://lucy.wrath.oche.de/</url>
-    <descr>Private Dial-on-demand-network</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>www.braingarage.com</name>
-    <url>http://www.braingarage.com/</url>
-    <descr>A place to park yer brain. My virtual apartment.</descr>
-    <email>robert@braingarage.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>www.davidv.net</name>
-    <url>http://www.davidv.net/</url>
-    <descr>Personal FreeBSD playground</descr>
-    <email>david@davidv.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>www.reaper.org</name>
-    <url>http://www.reaper.org/</url>
-    <descr>WWW server for my friends</descr>
-    <email>salvo@reaper.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>www.SeeQue.dk</name>
-    <url>http://moon.seeque.dk/</url>
-    <descr>private homepages, workspace, experimentation, ect.</descr>
-    <email>seeque@get2net.dk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Xscanners.net</name>
-    <url>http://xscanners.net/</url>
-    <descr>*BSD Security, development and informational site</descr>
-    <email>renegade@deviant.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Yasunori Osana Personal Web Site</name>
-    <url>http://yasu.prosou.nu/</url>
-    <descr>Photographies etc...</descr>
-    <email>yasu@via2000.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Zain's World !!!</name>
-    <url>http://cs.svsu.edu/~zain/</url>
-    <descr>Zain's World !!     (FreeBSD Rocks!!)</descr>
-    <email>zain@cs.svsu.edu</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Zapper</name>
-    <url>http://www.zapper.org/</url>
-    <descr>Personal</descr>
-    <email>Zapper@FoxChat.Net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>zebes - cbmeeks FreeBSD Server</name>
-    <url>http://216.227.38.105/</url>
-    <descr>FTP Server for http://www.diabolical-dominion.com</descr>
-    <email>coleco@telocity.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>zer0byte's Domain</name>
-    <url>http://www.geocities.com/razorwave1/frame/</url>
-    <descr>Personal Page</descr>
-    <email>zer0byte@linuxfreemail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>zork.rydnet</name>
-    <url>http://zork.rydnet.lysator.liu.se/</url>
-    <descr>my personal site with some local information</descr>
-    <email>mwass@lysator.liu.se</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Zual56's World</name>
-    <url>http://ritz.DrZone.COM/</url>
-    <descr>Internet Service Provider using FreeBSD</descr>
-    <email>www@freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>ASSA Personal Homepage</name>
-    <url>http://www.assa.web.id/</url>
-    <descr>Nielson Assa Personal Homepage</descr>
-    <email>nielson@assa.web.id</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Anya's workshop</name>
-    <url>http://freebsd.cpcw.com/</url>
-    <descr>Personal page</descr>
-    <email>qap@yesky.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ETC-WEB</name>
-    <url>http://www.etc-web.net</url>
-    <descr>Web hosting and web design</descr>
-    <email>maxim@etc-web.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Zrom.com, LLC</name>
-    <url>http://www.zrom.com</url>
-    <descr>iNetwork Experts</descr>
-    <email>webs@lasrlink.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>3Path Inc.</name>
-    <url>http://www.3path.com/</url>
-    <descr>Content delivery ASP</descr>
-    <email>dcarlson@3path.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Alfa Capital Ukraine</name>
-    <url>http://www.acapital.com</url>
-    <descr>Investment-Banking company corporate site</descr>
-    <email>hostmaster@acapital.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Azintex</name>
-    <url>http://www.azintex.com</url>
-    <descr>Internet service provider</descr>
-    <email>raz@azintex.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BSDatwork.com</name>
-    <url>http://www.bsdatwork.com</url>
-    <descr>An informative site dedicated to providing timely information to the BSD community</descr>
-    <email>support@bsdatwork.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Back&amp;Front Technologies</name>
-    <url>http://www.bftech.com.eg</url>
-    <descr>State Of The Art Networking Solutions Provider</descr>
-    <email>allaelgohary@bftech.com.eg</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Backward Name Servers - DNS Service</name>
-    <url>http://www.backwarddns.com</url>
-    <descr>Provides anonymous DNS for those reselling ISP services under their own organizations label.</descr>
-    <email>admin@backwarddns.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Bi.NET</name>
-    <url>http://www.bi.net.tr</url>
-    <descr>The high secure Internet Service Provider in Turkey</descr>
-    <email>bsimsek@bimel.com.tr</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Claranet France</name>
-    <url>http://www.claranet.fr</url>
-    <descr>Leading French ISP / Hosting company.</descr>
-    <email>contact@claranet.fr</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Claranet Germany</name>
-    <url>http://www.claranet.de</url>
-    <descr>German ISP offering dial up / hosting services</descr>
-    <email>info@claranet.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Claranet Spain</name>
-    <url>http://www.claranet.es</url>
-    <descr>Formally Catworld, now part of the Claranet group</descr>
-    <email>info@catworld.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CommunikAsia Ltd</name>
-    <url>http://www.communikasia.com</url>
-    <descr>Providing IT security and Media Training in Hong Kong</descr>
-    <email>info@communikasia.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cyber Host IT</name>
-    <url>http://www.cyberhostit.com</url>
-    <descr>We have dedicated servers that are FREE BSD ready.  Just mention this site and get $100 off for the first month.</descr>
-    <email>sales@cyberhostit.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cyber-NET</name>
-    <url>http://www.net.bialystok.pl</url>
-    <descr>Cyber-NET Internet Service Provider, Poland</descr>
-    <email>spock@stars.eu.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>De Silva Consulting Ltd.</name>
-    <url>http://www.desilva.org/</url>
-    <descr>Internet consulting services, United Kingdom</descr>
-    <email>david@desilva.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DejaPC</name>
-    <url>http://www.dejapc.com</url>
-    <descr>Authorized Reseller for AMD, Cisco, 3com, Netgear, Aopen, Darma, and FlexStorage products.</descr>
-    <email>info@dejapc.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Dialupforless.com</name>
-    <url>http://www.dialupforless.com</url>
-    <descr>See Websiteforless.com entry below.</descr>
-    <email>support@dialupforless.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Digiweb Norway AS</name>
-    <url>http://www.digiweb.no</url>
-    <descr>Mid-sized Internet Presence Provider located in Bergen, Norway - We use FreeBSD for various things such as databases and backup.</descr>
-    <email>sgt@digiweb.nospam</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ELKO Group</name>
-    <url>http://www.solo.lv</url>
-    <descr>SOLO home PC's</descr>
-    <email>peteris_krisjanis@elkogroup.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Effingham Online</name>
-    <url>http://www.effingham-online.com/</url>
-    <descr>Full Service ISP in Effingham County Georgia, Webservers running Freebsd</descr>
-    <email>webmaster@effingham-online.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Enterprise Studios</name>
-    <url>http://www.enterprisemain.com</url>
-    <descr>Professional music recording in Burbank, CA</descr>
-    <email>tekshop@enterprisemail.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ezehosting</name>
-    <url>http://www.ezehosting.com</url>
-    <descr>Software development, Consultation, E-Commerce, Web-Hosting, FreeBSD servers and workstations, and more! Located in: Saskatoon, Saskatchewan, Canada</descr>
-    <email>dpot@ezehosting.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Fiberbox Network Solutions - Hosting</name>
-    <url>http://www.fiberbox.net</url>
-    <descr>Quality Solutions for all.</descr>
-    <email>tical@fiberbox.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FreeUK</name>
-    <url>http://www.freeuk.com/</url>
-    <descr>Leading independent free ISP in the UK</descr>
-    <email>info@freeuk.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Garibaldi Cafe</name>
-    <url>http://www.garibaldicafe.net/</url>
-    <descr>Internet Club - Sofia, BULGARIA</descr>
-    <email>evil@garibaldicafe.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HeavenCity</name>
-    <url>http://www.heavencity.de/</url>
-    <descr>Interactive Chat and Online Gaming System (german)</descr>
-    <email>ewering@instinctive.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Holloway Studios</name>
-    <url>http://www.hollowaystudios.com/</url>
-    <descr>Advertising, Internet Presence Design and Application Development, Managed Web Hosting</descr>
-    <email>info@hollowaystudios.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>IP Form</name>
-    <url>http://www.ipform.com/</url>
-    <descr>Internet Software Development Company (Web, Unix, Internet)</descr>
-    <email>info@ipform.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Inkwater Technologies, LLC</name>
-    <url>http://www.debateaddict.com</url>
-    <descr>DebateAddict Card Server -- Relational Database to process evidence</descr>
-    <email>adam@debateaddict.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Interaction Virtuelle Senc.</name>
-    <url>http://www.interactionvirtuelle.com/</url>
-    <descr>Web Hosting</descr>
-    <email>mathieu@interactionvirtuelle.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>K&amp;M</name>
-    <url>http://www.km.kz</url>
-    <descr>Small ISP from Kazakstan (Pavlodar)</descr>
-    <email>root@km.kz</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Kharisma Anugrah Persada</name>
-    <url>http://www.karnusada.net</url>
-    <descr>Internet Service Provider in Bandung</descr>
-    <email>vanjava@karnusada.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MHz Design Communications Inc.</name>
-    <url>http://www.mhzdesign.com</url>
-    <descr>Design firm based in Toronto, Canada.</descr>
-    <email>rob@mhzdesign.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MZCH Organika S.A.</name>
-    <url>http://www.organika.pl</url>
-    <descr>Chemical Industry</descr>
-    <email>zi.epd.@organika.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Manex Visual Effects</name>
-    <url>http://www.mvfx.com</url>
-    <descr>A leading edge visual effects production facility.</descr>
-    <email>sys@mvfx.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Manpower MS Exploratory Team</name>
-    <url>http://behind-nat</url>
-    <descr>Hewlett-Packard LaserJet Division</descr>
-    <email>jsheets@shadonet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Maura IT Consulting GmbH</name>
-    <url>http://www.maura-it.com</url>
-    <descr>Internet and Intranet Services and Development</descr>
-    <email>postoffice@maura-it.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mozix Inc.</name>
-    <url>http://www.mozix.co.jp</url>
-    <descr>Web Design, Appication development</descr>
-    <email>ekodera@mozix.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>My Global Website</name>
-    <url>http://www.myglobalwebsite.com</url>
-    <descr>Freebsd powers our entire site except our free homepage and free email servers.</descr>
-    <email>admin@myglobalwebsite.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NICs.com Industries Co. Ltd</name>
-    <url>http://www.nicstel.com</url>
-    <descr>VoIP Product &amp; Technology</descr>
-    <email>islam@nicstel.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Netivity BV, NL</name>
-    <url>http://www.netivity.nl</url>
-    <descr>Complete Internet and Intranet Solutions; specialised in databases</descr>
-    <email>enriko.groen@netivity.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nine Networking</name>
-    <url>http://www.ninenet.net</url>
-    <descr>Networking Consultants, Des Moines,Iowa</descr>
-    <email>Bruce@ninenet.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NishNet</name>
-    <url>http://www.nishnet.ne.jp/</url>
-    <descr></descr>
-    <email>info@nhki.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nocode Inc</name>
-    <url>http://www.nocodeinc.com</url>
-    <descr>Web site creation and content management platform for SP's</descr>
-    <email>sales@nocodeinc.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PVRR</name>
-    <url>http://www.pvrr.ru</url>
-    <descr>Privolzhskaya Railway, Russian Federation</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Parity Invest co.l.t.d I.S.P. Armavir -armenia</name>
-    <url>http://www.armavir.am</url>
-    <descr>Pariti Invest</descr>
-    <email>post@armavir.am</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Practicorp - Bulgaria Inc.</name>
-    <url>http://www.practicorp.com/</url>
-    <descr>Software Development Company</descr>
-    <email>dpavlov@bg.practicorp.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Prepaidonline</name>
-    <url>http://www.prepaidonline.com.au</url>
-    <descr>ISP and telecom's, Australia</descr>
-    <email>noc@prepaidonline.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Proweb (UK) Ltd</name>
-    <url>http://www.proweb.net</url>
-    <descr>Internet Service Provider - Nottingham UK</descr>
-    <email>sales@proweb.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RapidFX</name>
-    <url>http://www.rapidfx.com</url>
-    <descr>From Web site and graphic design, to Databases or Network systems and support.</descr>
-    <email>info@rapidfx.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Reactive Networks</name>
-    <url>http://www.reactive-networks.com</url>
-    <descr>Network design, management and security consultants</descr>
-    <email>support@reactivenetworks.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Real-Marketing.Com, Inc</name>
-    <url>http://real-marketing.com</url>
-    <descr>Hosting over 2,300 Domains World Wide!</descr>
-    <email>admin@real-marketing.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SCREEN Design Group</name>
-    <url>http://screen.scn.ru</url>
-    <descr>Internet Developments in Krasnoyarsk (RUSSIA)</descr>
-    <email>screen@scn.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SOFTEC S.P.A</name>
-    <url>http://www.softecspa.it</url>
-    <descr>Networking,Outsourcing and software developement.</descr>
-    <email>drummino@yahoo.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SOIM.COM</name>
-    <url>http://www.soim.com</url>
-    <descr>Most popular mailing list in China</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Scorpion Technologies Pvt. Ltd.</name>
-    <url>http://www.copperdew.com</url>
-    <descr>Formerly Webz Technologies, Working mainly for Network solutions in India</descr>
-    <email>webmaster@copperdew.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Silicon Computers</name>
-    <url>http://www.siliconco.com</url>
-    <descr>Web Design, Consulting, IT Solutions</descr>
-    <email>tsd@siliconco.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Skypoint Communications</name>
-    <url>http://www.skypoint.com</url>
-    <descr>Internet Service Provider</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Speednet Communications</name>
-    <url>http://www.speednet.com.au/</url>
-    <descr>ISP in Sydney, Australia</descr>
-    <email>andyf@speednet.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Speednet Soluciones comutacionales</name>
-    <url>http://www.speednet.cl</url>
-    <descr>From Chile! - Web Hosting - Shell provider.</descr>
-    <email>aindigo@speednet.cl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Statnet</name>
-    <url>http://statnet.pl</url>
-    <descr>Web Design and Web Hosting</descr>
-    <email>dolny@statnet.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Svanati Industries</name>
-    <url>http://www.svanatiindustries.com</url>
-    <descr>Online e-Commerce Networking Software Development/Computer Hardware Software Sales and Service Company</descr>
-    <email>svanati@hotmail.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TMU Consulting</name>
-    <url>http://62.231.7.36</url>
-    <descr>TMU Consulting</descr>
-    <email>it@tmu.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Technologies Diginex</name>
-    <url>http://www.diginex.net</url>
-    <descr>Web hosting and Unix network services specialists</descr>
-    <email>dadexter@diginex.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TekShop</name>
-    <url>http://www.tek-shop.com</url>
-    <descr>Recording services and support in Burbank, CA</descr>
-    <email>tekshop@enterprisemail.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Telstra</name>
-    <url>http://telstra.com</url>
-    <descr>Australia's largest telecommunications company</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tip Top Auto</name>
-    <url>http://www.tiptopauto.com</url>
-    <descr>auto repair and sales</descr>
-    <email>khatoonabadi@hotmail.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Web Matrix</name>
-    <url>http://www.webmatrix.co.uk/</url>
-    <descr>The finest internet technologies</descr>
-    <email>matt-freebsd@webmatrix.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Websiteforless.Com (helps you start you own ISP)</name>
-    <url>http://www.websiteforless.com</url>
-    <descr>Provides resellers only WEB and DIALUP service anonymously for you to start you own ISP at no capital expense.</descr>
-    <email>info@websiteforless.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Windows Guide Network</name>
-    <url>http://www.winguides.com/</url>
-    <descr>Technical resources and support for tweaking, managing and securing the Windows operating system.</descr>
-    <email>sclausen@winguides.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Zumnet Provider</name>
-    <url>http://www.zumnet.com.br</url>
-    <descr>Internet Service Provider</descr>
-    <email>eagrs@yahoo.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>asdf</name>
-    <url>http://orthopaedic.dsvr.co.uk</url>
-    <descr>asdf asdf</descr>
-    <email>asdf@asdf.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>cafeodin</name>
-    <url>http://superonline.hn.org</url>
-    <descr>netcafe and network solitions</descr>
-    <email>alperyal@yahoo.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>callisto germany.net GmbH</name>
-    <url>http://www.germany.net/</url>
-    <descr>ISP in Germany</descr>
-    <email>bundy@germany.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>edensehri</name>
-    <url>http://www.edensehri.com</url>
-    <descr>chat</descr>
-    <email>IMGBilisim@rekor.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>iNTOUCH iNTERNET(tm)</name>
-    <url>http://www.intouchmail.net</url>
-    <descr>Serves Nationwide Internet Dialup Service</descr>
-    <email>webmaster@intouchmail.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>instinctive new media</name>
-    <url>http://www.instinctive.de/</url>
-    <descr>Web Application Design, Hosting</descr>
-    <email>ewering@instinctive.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>nGENn GmbH</name>
-    <url>http://www.ngenn.net/</url>
-    <descr>Next Generation Networks -- building custom solutions for you on *BSD</descr>
-    <email>alpha@ngenn.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>newclass.net</name>
-    <url>http://www.newclass.net/</url>
-    <descr>ISP in Nova Zagora (Bulgaria)</descr>
-    <email>dpp@newclass.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>omega computer</name>
-    <url>http://computer.lublin.pl</url>
-    <descr>computers, hardware, software, services and stuff ...</descr>
-    <email>root@computer.lublin.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>wearnes</name>
-    <url>http://www.wtwh.com.cn/</url>
-    <descr>A computer company in Wuhan city of China</descr>
-    <email>ssu@wtwh.com.cn</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Jeff Networks - INC</name>
-    <url>http://www.jeffnetworks.com.br</url>
-    <descr>Jeff Networks is a network consulting company that offers enhanced services in BRAZIL or New Zealand.</descr>
-    <email>jefferson@jeffnetworks.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>#Tallinn@IRCNet</name>
-    <url>http://tallinn.ircnet.ee</url>
-    <descr>Homepage of channel #Tallinn on IRCNet.</descr>
-    <email>ilja@tallinn.ircnet.ee</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>AlteredMinds Network</name>
-    <url>http://www.alteredminds.net</url>
-    <descr>Place to ask\answer questions about every part of technology.  Great resources for new and old developers, systems people, and general technical information.</descr>
-    <email>ed@alteredminds.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>BALA</name>
-    <url>http://www.bala.qc.edu</url>
-    <descr>Business and Liberal Arts Program at Queens College of the City University of New York.</descr>
-    <email>edgar@bala.qc.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>CEDIPAD</name>
-    <url>http://www.cedipad.com.cu</url>
-    <descr></descr>
-    <email>gesperon00@netscape.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Canalfeira</name>
-    <url>http://www.canalfeira.com.br</url>
-    <descr>Channel #feira in BrasNet IRC Network</descr>
-    <email>admin@canalfeira.com.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>DOOM-LABS INC</name>
-    <url>http://www.doom-labs.net</url>
-    <descr>Frag Content</descr>
-    <email>cyberratz@doom-labs.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Department of Chemistry, ITB</name>
-    <url>http://www.chem.itb.ac.id</url>
-    <descr>Department of Chemistry, Bandung Institute of Technology (ITB), Indonesia</descr>
-    <email>admin@chem.itb.ac.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Estonian Tourist Board</name>
-    <url>http://visitestonia.com</url>
-    <descr></descr>
-    <email>etb@tourism.ee</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Frazer Valley Regional Library</name>
-    <url>http://www.fvrl.bc.ca</url>
-    <descr>Local library serving the frazer valley</descr>
-    <email></email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>H Zero Sevem</name>
-    <url>http://bskbr1.selfhost.de</url>
-    <descr>H Zero Seven - MemberServer</descr>
-    <email>phantom@h07.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>IPjungle</name>
-    <url>http://www.ipjungle.com</url>
-    <descr>Network Services Administration Project</descr>
-    <email>eh@ipjungle.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Independent Creative Group</name>
-    <url>http://www.techsupport.spb.ru</url>
-    <descr>Tech Support Group Site</descr>
-    <email>webmaster@techsupport.spb.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Lone Star SPCA</name>
-    <url>http://www.lonestarspca.com</url>
-    <descr>Lone Star SPCA, Non-profit Humane Society in Midland, Texas</descr>
-    <email>clint@lonestarspca.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>NixNews.Org</name>
-    <url>http://www.nixnews.org</url>
-    <descr>Free Unix oriented news portal</descr>
-    <email>dadexter@diginex.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>PPIMK</name>
-    <url>http://www.ppimk.or.id</url>
-    <descr>Pusat Pengembangan Informasi dan Manajemen Kesehatan</descr>
-    <email>laksono@ppimk.or.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SCRUS Technologies</name>
-    <url>telnet://scrus.com:10000</url>
-    <descr>SCRUS chat server accessible via telnet/tinyfugee</descr>
-    <email>rawhide@scrus.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SP</name>
-    <url>http://www.sp.nl/</url>
-    <descr>Socialistische Partij</descr>
-    <email>akoole@sp.nl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Sanskrit ltd.</name>
-    <url>http://www.sanskrit.ru/</url>
-    <descr>Informational sponsor of the few projects: scientifics, chat, home page</descr>
-    <email>stas@sanskrit.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Tacoma BSD/Unix User Group</name>
-    <url>http://tbug.org</url>
-    <descr>BSD User Group</descr>
-    <email>bd@tbug.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Hacker's Defense Foundation</name>
-    <url>http://www.hackerz.org</url>
-    <descr>Educational Not-For-Profit Foundation that is dedicated and committed to the advancement of the hacking community, through education, of the social, political, and legal implications of the uses of technology.</descr>
-    <email>roadie@hackerz.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Universidad de La Frontera</name>
-    <url>http://www.ufro.cl</url>
-    <descr>Mail y Web Institucional (3 maquinas)</descr>
-    <email>preyes@ufro.cl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Zvuki.RU</name>
-    <url>http://zvuki.ru/</url>
-    <descr>Ultimate Russian Music Archive</descr>
-    <email>pasha@pasha.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>frerking.org</name>
-    <url>http://www.frerking.org</url>
-    <descr>Frerking family genealogy and eclectic collection of other stuff.</descr>
-    <email>gary@frerking.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>roger4</name>
-    <url>http://roger4.net.eu.org</url>
-    <descr>Amateur NON-PROFIT LAN constructed to provide cheap internet access for whole interested neighbourhood YEAH!!! </descr>
-    <email>root</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>the Nemo Project</name>
-    <url>http://www.nemo-project.org</url>
-    <descr>Non-profit project aiming at creating a stable solution for global hosting of DNS and email, as well as providing its members with such services.</descr>
-    <email>terje@nemo-project.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>webmonster.de community project</name>
-    <url>http://www.webmonster.de/</url>
-    <descr>free network service community in the rhein-main area, germany</descr>
-    <email>karsten@rohrbach.de</email>
-  </entry>
-
-  <entry type="personal">
-    <name>60tbird.com</name>
-    <url>http://60tbird.com</url>
-    <descr>web and email server (web page is about thunderbirds)</descr>
-    <email>steve@60tbird.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>huizeboes.ath.cx</name>
-    <url>http://huizeboes.ath.cx</url>
-    <descr>-=Almost Done WWW and EMAIL SECURE HUIZEBOES=-</descr>
-    <email>eboes@huizeboes.ath.cx</email>
-  </entry>
-
-  <entry type="personal">
-    <name>ipv6.geek</name>
-    <url>http://solar-aquarius.homeip.net/</url>
-    <descr>ipv6.geek, personal site for ipv6 information</descr>
-    <email>aja%ipv6.geek@solar-aquarius.homeip.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>dambiec'es pages</name>
-    <url>http://www.dambiec.com</url>
-    <descr>Personal Webpage for people with the surname dambiec</descr>
-    <email>webmaster@dambiec.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Diplomsurfer</name>
-    <url>http://www.diplomsurfer.de</url>
-    <descr>Studentenplattform Jobb&ouml;rse Powered by FreeBSD!</descr>
-    <email>s701418@tfh-berlin.de</email>
-  </entry>
-
-  <entry type="personal">
-    <name>AJK Computing.com</name>
-    <url>http://www.ajkcomputing.com/</url>
-    <descr>PC and Mac repairs, upgrades web site design and hosting</descr>
-    <email>ajk@ajkcomputing.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>BSDnet.dk</name>
-    <url>http://www.bsdnet.dk</url>
-    <descr>*BSD related links</descr>
-    <email>mojo@bsdnet.dk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Belgian BSD user site</name>
-    <url>http://www.bsdaemon.be</url>
-    <descr>Lot of BSD stuff</descr>
-    <email>Essetee@bsdaemon.be</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Blue-Screen.org.uk</name>
-    <url>http://www.blue-screen.org.uk/</url>
-    <descr>Free online PC support forums -- Although im not running this server at home, however, it's still hosted on FreeBSD!</descr>
-    <email>webmaster@blue-screen.org.uk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Conrado Vardanega</name>
-    <url>http://varda.d2g.com:81/cvarda/</url>
-    <descr>My personal homepage, hosted at my own computer because couldn't find a good, free web hosting like my own :)</descr>
-    <email>cvarda@ig.com.br</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Country Computing</name>
-    <url>http://www.windyplace.com</url>
-    <descr>Family web site</descr>
-    <email>keith@windyplace.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>CurrentCodes.com</name>
-    <url>http://www.currentcodes.com</url>
-    <descr>Secret Discount Coupon Codes for hundreds of online stores</descr>
-    <email>staff@currentcodes.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Cyhackportal</name>
-    <url>http://www.cyhackportal.com</url>
-    <descr>The Cypriot hack portal (Cyprus)</descr>
-    <email>csggk@netscape.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Daniel Wiberg</name>
-    <url>http://www.wiberg.nu</url>
-    <descr>Personal website of Daniel Wiberg</descr>
-    <email>danne@wiberg.nu</email>
-  </entry>
-
-  <entry type="personal">
-    <name>DealHunting.com</name>
-    <url>http://www.dealhunting.com</url>
-    <descr>Deals and Coupon Codes for hundreds of online merchants</descr>
-    <email>boone@dealhunting.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Dmitry Suhodoev</name>
-    <url>http://raven.elk.ru/</url>
-    <descr>raVen's nest (home page)</descr>
-    <email>raven66@mail.ru</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Filipe's Server</name>
-    <url>http://www.filipe.dhs.org</url>
-    <descr>Gateway, Web Server, FTP Server, SMTP and other</descr>
-    <email>filipe@filipe.dhs.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>FreeBSD Azerbaijan User`s Group</name>
-    <url>http://www.freebsd-info.org</url>
-    <descr>Security and software devoloper.</descr>
-    <email>root@freebsd-info.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>FreeBSD Network Center</name>
-    <url>http://networkcenter.dnsalias.net</url>
-    <descr>Articles and tutorials on FreeBSD. Personal FreeBSD webserver (PII 266)</descr>
-    <email>mauler@beldar.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>FreeBSD user</name>
-    <url>http://users.pandora.be/serge.terryn</url>
-    <descr>Dutch FreeBSD howto's</descr>
-    <email>Essetee@pandora.be</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Helsinki University of Technology</name>
-    <url>http://www.niksula.cs.hut.fi/~radu</url>
-    <descr>Radu Pirvu's personal website</descr>
-    <email>radu@niksula.hut.fi</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Huynh's Family</name>
-    <url>http://www.huynh.org/</url>
-    <descr>Huynh's Family</descr>
-    <email>danghuynh@usa.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Industriel team</name>
-    <url>http://www.industriel.org</url>
-    <descr>STUFFS</descr>
-    <email>KevorkiaN@geek.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>James McNaughton</name>
-    <url>http://www.enteract.com/~jtm63/index.html</url>
-    <descr>Personal Web Presence</descr>
-    <email>jtm63@enteract.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>MagNET</name>
-    <url>http://www.webmail.aax.de</url>
-    <descr>private webmail site | K6 2 200 1,6 GB | Germany</descr>
-    <email>magnum00@gmx.de</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Mario Pranjic</name>
-    <url>http://isengard.irb.hr</url>
-    <descr>my private FreeBSD server</descr>
-    <email>keeper@isengard.irb.hr</email>
-  </entry>
-
-  <entry type="personal">
-    <name>MartinLefebvre.com</name>
-    <url>http://martinlefebvre.com</url>
-    <descr>Personnal website for the head of DigiNex.Net and NixNews.Org</descr>
-    <email>dadexter@diginex.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Milojko.com</name>
-    <url>http://www.milojko.com</url>
-    <descr>Welcome to milojko.com, Alex's home page.</descr>
-    <email>admin@milojko.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>NeverThere</name>
-    <url>http://www.neverthere.org</url>
-    <descr>Home Domain on BSD 4.2</descr>
-    <email>mhr@neverthere.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Sanford's FreeBSD pages</name>
-    <url>http://www.sanfordonline.org/</url>
-    <descr>Tutorials and Links. PII 266 Mhz web, e-mail, gateway server</descr>
-    <email>jamaal@sanfordonline.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Stormtrooper Studios</name>
-    <url>http://www.stormtrooper.2y.net</url>
-    <descr>Music and more by phono</descr>
-    <email>phono@stormtrooper.2y.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>SuperRPG</name>
-    <url>http://www.superrpg.com</url>
-    <descr>A Toronto based gaming group!</descr>
-    <email>jamifsud@myrealbox.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>ThE HorDe Of MaD TRoll</name>
-    <url>http://www.mad-troll.com</url>
-    <descr>bi 466 with FreeBSD</descr>
-    <email>j-d@mad-troll.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The Daemon</name>
-    <url>http://www.daemon.uu.dk</url>
-    <descr>Another</descr>
-    <email>mojo@daemon.uu.dk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>V Microsistemas</name>
-    <url>http://www.vmicrosistemas.com</url>
-    <descr>(Computadoras, Web Cafe, Accesorios)</descr>
-    <email>ficovh@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>fwaggledotnet</name>
-    <url>http://fwaggle.net/</url>
-    <descr>fwaggle's homepage</descr>
-    <email>root@fwaggle.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>hack</name>
-    <url>http://www.thehalloftorturedsouls.s5.com/a.html</url>
-    <descr>hack</descr>
-    <email>hack3k@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>netophilia.net</name>
-    <url>http://netophilia.net</url>
-    <descr>netophilia.net</descr>
-    <email>drk@netophilia.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>nova.netdot.net</name>
-    <url>http://nova.netdot.net</url>
-    <descr>ethan wellman's personal site</descr>
-    <email>epw@nova.netdot.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>oksala</name>
-    <url>http://www.oksala.org</url>
-    <descr>Une page de bretteux</descr>
-    <email>silence@oksala.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>shanekinney.net</name>
-    <url>http://www.shanekinney.net</url>
-    <descr>Personal Web Site</descr>
-    <email>shane@shanekinney.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>u4ia.ac by tkyngAnotherWorld</name>
-    <url>http://www.u4ia.ac/</url>
-    <descr>Test Space of serves at FreeBSD</descr>
-    <email>admin@u4ia.ac</email>
-  </entry>
-  <entry type="commercial">
-    <name>Cubical Solutions Ltd</name>
-    <url>http://www.cubical.fi</url>
-    <descr>Embedded &amp; real-time systems, consulting, software development</descr>
-    <email>jml@cubical.fi</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nextex Consulting Solutions</name>
-    <url>http://iridium.nextex.com</url>
-    <descr>Web Hosting, Shell Access, Co-Location, Game Server Leasing.</descr>
-    <email>jconti@nextex.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Obsidian Data Systems, Inc.</name>
-    <url>http://www.obsidian-ds.com</url>
-    <descr>Obsidian Data Systems, specializing in financial software, custom software development, software testing, and computer training</descr>
-    <email>mbetot@obsidian-ds.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PMUE SA</name>
-    <url>http://www.pmue.pl</url>
-    <descr>The Company of Electric Equipment Installation JSC</descr>
-    <email>fux@reger.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Area</name>
-    <url>http://www.area.co.za</url>
-    <descr>Web Services</descr>
-    <email>admin@area.co.za</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WebLab</name>
-    <url>http://www.weblab.pl</url>
-    <descr>Internet Aplications Development, Consulting, WebDesign etc. </descr>
-    <email>gorg@weblab.pl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>APRODOS, hostel's students</name>
-    <url>http://www.abaddon.ntu-kpi.kiev.ua</url>
-    <descr>hostel's server</descr>
-    <email>mich@michael.com.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Michigan Mars Rover Project</name>
-    <url>http://www.umrover.org</url>
-    <descr>University of Michigan students researching a manned mars rover</descr>
-    <email>tkurc@umich.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Tottori College</name>
-    <url>http://www.cygnus.ac.jp</url>
-    <descr>The Most are written in Japanese.</descr>
-    <email>snotsu@ns.cygnus.ac.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ecesis.org</name>
-    <url>http://ecesis.org</url>
-    <descr>interesting e/n for the intelligent person</descr>
-    <email>echs@ecesis.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Bigbull Personal Server</name>
-    <url>http://bigbull.dns2go.com</url>
-    <descr>For personal usage</descr>
-    <email>webmaster@bigbull.dns2go.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>By Net Pl</name>
-    <url>http://by.net.pl/</url>
-    <descr>Just Server ;-)</descr>
-    <email>marcin@by.net.pl</email>
-  </entry>
-
-  <entry type="personal">
-    <name>HBoss.Net</name>
-    <url>http://www.hboss.net</url>
-    <descr>Rogue Spear, Counterstrike, Hockey Pools and more</descr>
-    <email>webmaster@hboss.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ArcticHost</name>
-    <url>http://www.arctichost.com</url>
-    <descr>Cheap, Powerful, Stable shell hosting</descr>
-    <email>dustin@arctichost.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Beauty room</name>
-    <url>http://www.kamiyu.net</url>
-    <descr>Beauty room KAMIYU</descr>
-    <email>usami@kamiyu.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Biolux Corporation</name>
-    <url>http://www.biolux.com</url>
-    <descr>Biolux World Of Technology. We specialise in corporate web hosting, network and Internet integration, innovative, cost-effective solutions to business requirements. </descr>
-    <email>julian@biolux.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Box Network</name>
-    <url>http://www.box-network.net</url>
-    <descr>A network dedicated to MUD and Home/Commerical Hosting.</descr>
-    <email>cerberus@box-network.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Brotsman and Dreger, Inc. - EverQuick Internet Division</name>
-    <url>http://www.everquick.net</url>
-    <descr>EverQuick Internet provides Internet access, Web design and hosting, e-commerce, and consulting services to end-users and providers alike. A big thanks to the FreeBSD team for all their hard work building an excellent operating system!</descr>
-    <email>eddy+freebsd+spam@brotsman.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CameloT e.K.</name>
-    <url>http://www.camelot.de/</url>
-    <descr>ISP in Germany</descr>
-    <email>feedback@camelot.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cooperativa deTrabalho M�dico de Pouso Alegre</name>
-    <url>http://www.unimedpa.com.br</url>
-    <descr>Brazil - We use FreeBSD in our servers</descr>
-    <email>informatica@unimedpa.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Digital Web Business</name>
-    <url>http://www.dwb.it</url>
-    <descr>Application Service Provider (Italy)</descr>
-    <email>admin@dwb.it</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EXTERNALL</name>
-    <url>http://www.externall.net</url>
-    <descr>hosting e-applications &amp; e-business solutions (HA)</descr>
-    <email>info@fr.externall.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GT Computers</name>
-    <url>http://www.gtu.com</url>
-    <descr>Retail, Service, and Support</descr>
-    <email>charlietav@gtu.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISP -=ATV plus=-</name>
-    <url>http://www.atv.net.ua/</url>
-    <descr>Internet Service Provider -=ATV plus=-. Poltava. Ukraine.</descr>
-    <email>info@atv.net.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISPserver</name>
-    <url>http://ISPserver.com</url>
-    <descr>ISPserver is the creator of the Virtual Dedicated Server.  Based on latest FreeBSD technologies, ISPserver have create IspBSD, a Virtual Operating System.  ISPserver is now providing the strongest Virtual Dedicated Server technology available today.  IspBSD comes with a strong and multi-users level webinterface (ISPmanager) that will allow anybody (even the less experimented) to manage administrative tasks on their server.  With a Virtual Dedicated Server, our customers and resellers can provide their customers with strong services and features and make benefit out of it.</descr>
-    <email>sales@ISPserver.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Infocom Ltd.</name>
-    <url>http://www.iberiapac.ge</url>
-    <descr>ISP in Georgia</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Loopia</name>
-    <url>http://www.loopia.se</url>
-    <descr>One of Sweden's best ISP's.</descr>
-    <email>freebsd@loopia.se</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Motion Create SYSTEM</name>
-    <url>http://www.mcs-jp.net/</url>
-    <descr>Web Hosting Service</descr>
-    <email>info@mcs-jp.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Muncca Internetworking Oy</name>
-    <url>http://www.muncca.com</url>
-    <descr>ISP, broadband specialist, on business since 1989</descr>
-    <email>info@muncca.fi</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Netgalaxy</name>
-    <url>http://www.netgalaxy.ch</url>
-    <descr>Web, Application and database hosting</descr>
-    <email>info@netgalaxy.ch</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Portent Interactive</name>
-    <url>http://www.portentinteractive.com</url>
-    <descr>a full service web strategy, design and development firm since 1995</descr>
-    <email>ian@portentinteractive.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Shark Software</name>
-    <url>http://www.shark-software.com</url>
-    <descr>Cross platform development [FreeBSD, Linux, PalmOS, Windows]</descr>
-    <email>webmaster@shark-software.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Spectrum Net</name>
-    <url>http://www.spnet.net</url>
-    <descr>Biggest Bulgarian ISP</descr>
-    <email>plamen@triada.bg</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tidal247 - Next Wave Time Management</name>
-    <url>http://www.tidal247.com</url>
-    <descr>Best Web-based full-featured Timesheet Service for professionals</descr>
-    <email>pyoung@tidal247.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>UUNET Namibia</name>
-    <url>http://www.uunet.com.na</url>
-    <descr>The largest ISP in Namibia</descr>
-    <email>rolf@uunet.com.na</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>VPOP Technologies</name>
-    <url>http://www.vpop.net</url>
-    <descr>Web hosting, application design</descr>
-    <email>tom@vpop.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>VTechnologies S�rl</name>
-    <url>http://www.vtechnologies.ch</url>
-    <descr>Real Life pcs, servers and hardware</descr>
-    <email>info@vtechnologies.ch</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>X-Rain Network</name>
-    <url>http://www.x-rain.net</url>
-    <descr>Professional Web Hosting</descr>
-    <email>gig@x-rain.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>bTurtle</name>
-    <url>http://www.bturtle.ch</url>
-    <descr>Professional Security Solutions</descr>
-    <email>info@bturtle.ch</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>3i Experimental Media</name>
-    <url>http://3iem.net/</url>
-    <descr>Web development community</descr>
-    <email>phil_3iem@yahoo.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>HELLNET</name>
-    <url>http://devil.hellnet.cz</url>
-    <descr>Private Network Group</descr>
-    <email>brother@hellnet.cz</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Inep</name>
-    <url>http://www.inep.co.yu</url>
-    <descr>Institute For Application of Nuclear Energy - Belgrade</descr>
-    <email>bilke@inep.co.yu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>KSUB Radio</name>
-    <url>http://www.seattleu.edu/ksub/</url>
-    <descr>Seattle University: Streaming Radio Server</descr>
-    <email>griffik@seattleu.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Slug Rugby</name>
-    <url>http://go.to/slugrugby</url>
-    <descr>UC Santa Cruz Rugby Football Club</descr>
-    <email>daikichi@cats.ucsc.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>twisted</name>
-    <url>http://www.twistedzone.org</url>
-    <descr>international chat room on IRC DALnet</descr>
-    <email>twisted@twistedzone.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>DesignCurve.Net</name>
-    <url>http://www.designcurve.net</url>
-    <descr>Tools to stay ahead of the design curve</descr>
-    <email>shannon@designcurve.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>D�lcio Palma</name>
-    <url>http://www.scobra.eng.br</url>
-    <descr>Developer</descr>
-    <email>delcio@scobra.eng.br</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Saint-Kid.COM</name>
-    <url>http://www.saint-kid.com</url>
-    <descr>My little website</descr>
-    <email>edylie@sg.freebsd.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Visit:</name>
-    <url>http://www.mike.or.at</url>
-    <descr>mike.or.at</descr>
-    <email>mike@mike.or.at</email>
-  </entry>
-
-  <entry type="personal">
-    <name>leetx</name>
-    <url>http://www.leetx.org</url>
-    <descr>computer arts</descr>
-    <email>leetx@leetx.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>pineypl.com</name>
-    <url>http://www.pineypl.com</url>
-    <descr>My thoughts hosted on an AMD K6-2/550 FreeBSD 4.3 SMTP, APACHE, SMB, etc</descr>
-    <email>bob@pineypl.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>the extr acti on  po int</name>
-    <url>http://www.extractionpoint.com</url>
-    <descr>Santa Barbara geekhouse &amp; development server</descr>
-    <email>root@extractionpoint.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AltaVoz S.A.</name>
-    <url>http://www.altavoz.net</url>
-    <descr>Specialists in developing and producing internet solutions</descr>
-    <email>admin@altavoz.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Black Sphere Interactive</name>
-    <url>http://www.blacksphere.ca</url>
-    <descr>Consulting, custom solutions, and hosting.</descr>
-    <email>webdev@blacksphere.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>E-PARLOR Communications, Inc.</name>
-    <url>http://www.e-parlor.com/</url>
-    <descr>Internet Content Provider of JAPAN</descr>
-    <email>info@e-parlor.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Egyptcdstore</name>
-    <url>http://www.egyptcdstore.8m.com</url>
-    <descr>Cd Macker</descr>
-    <email>zero_call_80@hotmail.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Farising Network Information Co., Ltd.</name>
-    <url>http://www.farising.com</url>
-    <descr>Farising helps you to utilizing Internet-based technologies. Call us if you need web hosting, Internet/Intranet integration, and innovative, cost-effective solutions.</descr>
-    <email>service@farising.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Game Players</name>
-    <url>http://www.gampla.com</url>
-    <descr>Tienda virtual de videojuegos</descr>
-    <email>gameplayers@gampla.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Hilton Seattle</name>
-    <url>http://www.seattlehilton.com</url>
-    <descr>Interfce between Hilton Corp and Hotels' Reservations Systems</descr>
-    <email>derek@rchco.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>I Travel, You Travel</name>
-    <url>http://www.ityt.com/</url>
-    <descr>An Interactive Travel Resource and Community</descr>
-    <email>dbaker-freebsd@ityt.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Keystone Automotive Industries</name>
-    <url>http://www.keystone-auto.com/</url>
-    <descr>Keystone is the only nationwide distributor of new and recycled autobody replacement parts.</descr>
-    <email>rootuser@keystone-auto.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Lanco Global Systems</name>
-    <url>http://www.lancoglobal.com</url>
-    <descr>LANCO Global Systems (LGSL), based in India, Hyderabad, provides and specializes in Application Development, Shell Scripting, PHP, C, C++ and Perl Programming, Networking Solutions, Unix device driver development, Web page Designing and Hosting , Web Server Solutions and configurations, ISP Services especially on Linux, FreeBSD and Solaris. </descr>
-    <email>vivek100@altavista.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Netmar Web Hosting Inc.</name>
-    <url>http://www.netmar.com</url>
-    <descr>Web Hosting Company, founded in 1994, everything from virtual domains to dedicated servers and up!</descr>
-    <email>mweber@netmar.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Renaissance Madison Hotel - Seattle</name>
-    <url>http://www.themadison.com</url>
-    <descr>Mail, DNS and other apps</descr>
-    <email>derek@themadison.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sitemasters</name>
-    <url>http://www.sitemasterswebdesign.com</url>
-    <descr>Ran on cable internet</descr>
-    <email>jrich@sitemasterswebdesign.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SmileNetPlanning.Pa,Ltd</name>
-    <url>http://www.smile-box.net/</url>
-    <descr>ISP in Saitama, Japan</descr>
-    <email>info@smile-box.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>StartPage Canada</name>
-    <url>http://startpage.ca/</url>
-    <descr>Directory with a range of free websolutions</descr>
-    <email>webmaster@startpage.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TRIASIA.NET</name>
-    <url>http://www.triasia.net</url>
-    <descr>A national ISP Catering to the growing needs of internet solutions and state of the art access.</descr>
-    <email>engineering@triasia.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TeleStream Internet Services</name>
-    <url>http://www.telestream.com</url>
-    <descr>Portland, OR local ISP</descr>
-    <email>sysadmin@telestream.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tex.NET TELECOMUNICAZIONI srl</name>
-    <url>http://www.texnet.it</url>
-    <descr>The first ISP in Prato, Italy</descr>
-    <email>texnet@texnet.it</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Unix Consult Technologies</name>
-    <url>http://www.unixconsult.org/</url>
-    <descr>Unix Consultation Services.</descr>
-    <email>reel@freebsd-fr.rog</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>_FreeBSD Virtual Dediacted Server</name>
-    <url>http://freebsdvirtualdedicatedserver.com</url>
-    <descr>FreeBSD Virtual Dedicated Server is the strongest Virtual Server technology.  With a FreeBSD Virtual Dedicated Server, you get all the power of FreeBSD for a fraction of the costs of a Dedicated Server.</descr>
-    <email>info@FreeBSDVirtualDedicatedServer.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>abacus trade ltd.</name>
-    <url>http://www.abacustrade.com</url>
-    <descr>hosting server</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>eBuz Internetdienste</name>
-    <url>http://www.ebuz.de</url>
-    <descr>ISP in Germany</descr>
-    <email>info@ebuz.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>iTL Company</name>
-    <url>http://www.itl.net.ua/</url>
-    <descr>Internet Service and Content Provider in Kharkov, Ukraine</descr>
-    <email>dmitry.deineka@itl-networks.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>#irchelp@chatster.org by BMC, Inc.</name>
-    <url>http://www.chatster.org</url>
-    <descr>Help Channel for Chatters</descr>
-    <email>bmc@chatster.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ASU-Beebe Radio Station</name>
-    <url>http://w5asu.dynodns.net</url>
-    <descr>Non-profit Radio Station Created by the Students at Arkansas State University-Beebe</descr>
-    <email>fixed@theblackmoor.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Arcad NetWork</name>
-    <url>http://www.arcadnet.net</url>
-    <descr>The African Corner</descr>
-    <email>ahouans@yahoo.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Believers Ministries In Christ, Inc. </name>
-    <url>http://believers-ministries.org</url>
-    <descr>Providing Free Hosting for NPOs</descr>
-    <email>webmaster@believers-ministries.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Community  Action Program of Lancaster County</name>
-    <url>http://www.caplanc.org</url>
-    <descr>Non Profit Social Service Agency.</descr>
-    <email>bsd-admin@caplanc.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Cornerstone Christian Fellowship</name>
-    <url>http://www.ccfvt.org</url>
-    <descr>Christian Fellowship at Virginia Tech, hosting several sites including: ecclesiavt.org, servantsministry.org, ccfvt.org, iagreewith.com, etc</descr>
-    <email>mweber@ccfvt.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ExtremeIRC Network</name>
-    <url>http://www.extreme-irc.net</url>
-    <descr>Internet Relay Chat Network</descr>
-    <email>webmaster@extreme-irc.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Fac. de Ciencias Humanas. U.Nacional de Colombia</name>
-    <url>http://www.humanas.unal.edu.co</url>
-    <descr>LAN Management and Intranet services.</descr>
-    <email>gcabrale@bacata.usc.unal.edu.co</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>FreeBSD-BG</name>
-    <url>http://www.FreeBSD-BG.org</url>
-    <descr>Bulgarian unofficial FreeBSD site!</descr>
-    <email>cheffo@FreeBSD-BG.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Gamers Garrison</name>
-    <url>http://www.gamersgarrison.com</url>
-    <descr>Your place on the 'net for all things in Gaming</descr>
-    <email>webmaster@gamersgarrison.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ISZF</name>
-    <url>http://iszf.irk.ru</url>
-    <descr>SEPI Institute</descr>
-    <email>admin@iszf.irk.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>MyIRC Chat Network</name>
-    <url>http://www.myirc.net</url>
-    <descr>IRC Chat Services</descr>
-    <email>webmaster@myirc.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>PHPBeginner.com</name>
-    <url>http://www.phpbeginner.com</url>
-    <descr>Where PHP Begins /// -- articles, code samples, forums and tutorials for beginners of PHP.</descr>
-    <email>info@phpbeginner.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Studentenserver der Fachschaft GIS, Hochschule f�r Technik und Wirtschaft Saarbr�cken</name>
-    <url>http://stud-gis.htw-saarland.de</url>
-    <descr>Studentenserver</descr>
-    <email>jschley@htw-saarland.de</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>TamKamg University FTP Service</name>
-    <url>http://ftp.tku.edu.tw/</url>
-    <descr>TamKamg University , TamSui, Taiwan</descr>
-    <email>tkuftp@ftp.tku.edu.tw</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>TowardEX Technologies</name>
-    <url>http://www.towardex.com</url>
-    <descr>IT Research/Deployment</descr>
-    <email>haesu@mec.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Universidade Federal RURAL do Rio de Janeiro</name>
-    <url>http://www.ufrrj.br</url>
-    <descr>Servidor WEB da Institui��o, Serop�dica - RJ, Brazil</descr>
-    <email>coinfo@ufrrj.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>YMCA of the USA National Headquarters</name>
-    <url>http://www.ymca.net</url>
-    <descr>HTTP, FTP, DNS, Samba, Listserv, Email, etc...We do it all on FreeBSD.</descr>
-    <email>corey.wheeler@ymca.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>gr3p dot com</name>
-    <url>http://www.gr3p.com/</url>
-    <descr>gr3p dot com</descr>
-    <email>gr3p@phreaker.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ncux-online</name>
-    <url>http://www.ncux-online.com</url>
-    <descr>FreeBSD Newbies Support Program (russian lang.)</descr>
-    <email>root@ncux-online.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>kayo.homeip.net</name>
-    <url>http://kayo.homeip.net</url>
-    <descr>Educational, Unix, Computer, Related</descr>
-    <email>oksanenjason@qwest.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>tf.hny</name>
-    <url>http://horney.at</url>
-    <descr>horney.at</descr>
-    <email>mail@horney.at</email>
-  </entry>
-
-  <entry type="personal">
-    <name>AdiC</name>
-    <url>http://quake2.telestream.com</url>
-    <descr>l33t Q3A and Counter-Strike Server</descr>
-    <email>m0gely@telestream.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Acydrain Inc.</name>
-    <url>http://www.acydrain.org</url>
-    <descr>My personal FreeBSD playground</descr>
-    <email>admin@acydrain.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Astron</name>
-    <url>http://www.blastwave.narod.ru</url>
-    <descr>Programming</descr>
-    <email>antiloop@aport.ru</email>
-  </entry>
-
-  <entry type="personal">
-    <name>H.A.L. Plant</name>
-    <url>http://halplant.com:88/</url>
-    <descr>Site owned and operated by Andrew J. Caines, hosted on his FreeBSD box, HAL9000.</descr>
-    <email>A.J.Caines@halplant.com:</email>
-  </entry>
-
-  <entry type="personal">
-    <name>North_East Agricultural University</name>
-    <descr>Teachers</descr>
-    <email>zhaojingkao@YAHOO.COM</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Nova Server</name>
-    <url>http://nv.xs4all.nl</url>
-    <descr>Projects Webserver</descr>
-    <email>taal@novaserver.dyndns.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Parshev Mikhail</name>
-    <url>http://www.parshev.ru</url>
-    <descr>Personal Home Page</descr>
-    <email>mikhail@parshev.ru</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Yz</name>
-    <url>http://yz.kiev.ua</url>
-    <descr>Yz's Personal Page.</descr>
-    <email>yz@iptcom.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>music</name>
-    <url>http://www.juliesexkittykat.com</url>
-    <descr>singing</descr>
-    <email>schafroiuden@yahoo.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Albury Local Internet Pty Ltd</name>
-    <url>http://www.albury.net.au</url>
-    <descr>Internet Service Provider</descr>
-    <email>stuart@asitis.net.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Asitis Technology Pty Ltd</name>
-    <url>http://www.asitis.net.au</url>
-    <descr>Internet Service Provider</descr>
-    <email>stuart@asitis.net.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Beach Boy Web Service</name>
-    <url>http://beachboy.net</url>
-    <descr>Web design and hosting</descr>
-    <email>webmaster@beachboy.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DIIS.net Networks</name>
-    <url>http://www.dybn.com</url>
-    <descr>Providing interactive media and secure communications channels for intranets and extranets</descr>
-    <email>SiteSecurity@dybn.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DS Computing Services</name>
-    <url>http://www.dscomputing.au.com</url>
-    <descr>Computer Consultancy &amp; Web Hosting Services</descr>
-    <email>david@dscomputing.au.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>E-NET Latvia</name>
-    <url>http://e-net.lv</url>
-    <descr>Internet software development</descr>
-    <email>admin@e-net.lv</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Gemini Solutions</name>
-    <url>http://www.geminisolutions.com</url>
-    <descr>Gemini Solutions, Inc.</descr>
-    <email>sysadmin@geminisolutions.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HOTNET</name>
-    <url>http://www.hot.net.au</url>
-    <descr>ISP AND WEB HOSTING NSW AUSTRALIA</descr>
-    <email>manager@hot.net.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Peace Arch Entertainment Group Inc.</name>
-    <url>http://www.peacearch.com</url>
-    <descr>Television, movie, documentary, and commercial producer.</descr>
-    <email>admin@peacearch.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Potential Technology</name>
-    <url>http://www.potentialtech.com</url>
-    <descr>Providing a range of technical services, specializing in solutions built on FreeBSD.</descr>
-    <email>wmoran@potentialtech.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Razrez</name>
-    <url>http://nur.yakutugol.ru</url>
-    <descr>Official web-site</descr>
-    <email>eugene@nur.yakutugol.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>S.C. Teleson SRL</name>
-    <url>http://www.teleson.ro</url>
-    <descr>ISP Located in Sighisoara, Romania</descr>
-    <email>web@teleson.ro</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Spiderplant.net</name>
-    <url>http://www.spiderplant.net/</url>
-    <descr>Web hosting and design</descr>
-    <email>daniel.fairs@spiderplant.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TravelGuideS.com</name>
-    <url>http://www.travelguides.com</url>
-    <descr>On-Line Bed and Breakfast Database and more</descr>
-    <email>cliff@travelguides.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Zutrax Systems</name>
-    <url>http://www.zutrax.com</url>
-    <descr>Information Technology integration and Consulting services</descr>
-    <email>webadmin@zutrax.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Kuban Institute of International Business and Management</name>
-    <url>http://gwkib.kuban.ru</url>
-    <descr>Educational Institution, Economics, Business, Management, Tourism.</descr>
-    <email>nial@gwkib.kuban.ru</email>
-  </entry>
-
-  <entry type="personal">
-    <name>www.cryotank2.com</name>
-    <url>http://www.cryotank2.com</url>
-    <descr>art and web design. unrealtournament and halflife gameserver</descr>
-    <email>webmaster@cryotank2.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>CnNode.com</name>
-    <url>http://www.cnnode.com</url>
-    <descr>we love BSD.</descr>
-    <email>leo@52speed.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>FreeBSD Tips</name>
-    <url>http://www.freebsdtips.com</url>
-    <descr>New FreeBSD site with useful tips and tricks for FreeBSD.</descr>
-    <email>s0ul@geek.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Sheriy Chang (website)</name>
-    <url>http://www.skyzoprenick.com</url>
-    <descr>personal Website</descr>
-    <email>skizoprenick@softhome.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The Acidpit</name>
-    <url>http://www.acidpit.org</url>
-    <descr>Blackacid's Place</descr>
-    <email>blkacid@acidpit.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HostPod</name>
-    <url>http://www.hostpod.com</url>
-    <descr>Offers dedicated freeBSD servers,and server colocation services supporting the freeBSD operating system.</descr>
-    <email>night@hostpod.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>123India.com</name>
-    <url>http://www.123india.com/</url>
-    <descr>Leading Indian Portal- uses FreeBSD 4.x for all servers</descr>
-    <email>silajit@corp.123india.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Bluebite Solutions</name>
-    <url>http://www.bluebite.net</url>
-    <descr>Bluebite Solutions uses FreeBSD on it's Intranet / Extranet Servers providing database driven content to clients and staff. As well as using it as the server operating system of choice for it's thin client solutions, they let FreeBSD handle both of the name servers.</descr>
-    <email>Robert.Duffy@bluebite.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CashFlow S.A.</name>
-    <url>http://www.cashflow.com.pl</url>
-    <descr>Finnance firm from Poland</descr>
-    <email>kw@cashflow.com.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Centauri RSC</name>
-    <url>http://www.rsc.pl</url>
-    <descr>WebDevelopers, WebHosting, Database Applications</descr>
-    <email>pawel@NO_S_PAMrsc.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Curious ICT Solutioins</name>
-    <url>http://www.curious.be/</url>
-    <descr>A consultancy and integration workshop based in Beligum specializing in networking, Internet presence, mobility, information flow, and information security.</descr>
-    <email>david.monosov@curious.be</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cyber-Consulting</name>
-    <url>http://www.cyber-consulting.net</url>
-    <descr>Web Hosting Company</descr>
-    <email>webmaster@cyber-consulting.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DAUM Commercial Real Estate Services</name>
-    <url>http://www.daumcommercial.com</url>
-    <descr>Founded in 1904, DAUM Commercial Real Estate Services is the most experienced industrial and commercial real estate firm in California.</descr>
-    <email>support@daumcommercial.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EnterAct</name>
-    <url>http://www.enteract.com</url>
-    <descr>Regional ISP - Chicago, IL, US</descr>
-    <email>ryanb@enteract.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Exousia Design &amp; Development</name>
-    <url>http://exousia.stormpages.com</url>
-    <descr>World Wide Web Global server for developers, web page designers, programmers, and businesses providing products and services that make the net what it is.</descr>
-    <email>bolmi@bellsouth.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Fastserve Network</name>
-    <url>http://www.fastserve.net</url>
-    <descr>Fully Managed Advanced Complex Hosting Services</descr>
-    <email>sales@fastserve.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ict-id</name>
-    <url>http://spin.ict-id.com</url>
-    <descr>SPINid - Studie Planning Information Network</descr>
-    <email>patric@liefdeis.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>JSC MultiCom</name>
-    <url>http://www.multicom.lv/</url>
-    <descr>Telecom systems</descr>
-    <email>andris@multicom.lv</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>M&amp;M Consulting and Desktop Services</name>
-    <url>http://www.maratas.net</url>
-    <descr></descr>
-    <email>bob@maratas.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MISN</name>
-    <url>http://www.acco.com</url>
-    <descr>ACCO</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NetSol CONNECT (Pvt.) Ltd</name>
-    <url>http://www.netsolir.com/</url>
-    <descr>ISP in Pakistan</descr>
-    <email>info@netsolir.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Northern Brewer</name>
-    <url>http://www.northernbrewer.com</url>
-    <descr>On-line home brewing supplies, largely powered by FreeBSD!</descr>
-    <email>chris@northernbrewer.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Pegasus Network</name>
-    <url>http://www.redepegasus.com.br</url>
-    <descr>Technical and technological partner of some Brazilian ISP�s</descr>
-    <email>jb@redepegasus.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SIMCOM</name>
-    <url>http://www.simcom.net</url>
-    <descr>Barrie Ontario Corporate Computer Solutions</descr>
-    <email>freebsd@simcom.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sakurai Soy Factory</name>
-    <url>http://www.sakura-soy.com/</url>
-    <descr>Maker of Soy sauce and Miso</descr>
-    <email>customer@sakura-soy.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TNT Consultants.net</name>
-    <url>http://www.tntconsultants.net</url>
-    <descr>Web Hosting/Design/Programming, Custom Software, Database, Integration, Contracting, Hardware Solutions, etc</descr>
-    <email>webmaster@tntconsultants.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Telum International</name>
-    <url>http://www.teluminternational.com</url>
-    <descr>Multimedia and Video Conferencing Solutions</descr>
-    <email>webmaster@telumintl.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Web4all Network</name>
-    <url>http://www.web4all.net</url>
-    <descr>Web Hosting and E-Commerce solutions</descr>
-    <email>sales@web4all.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>concept software gmbh</name>
-    <url>http://www.concept-software.de</url>
-    <descr>software development company, some servers running FreeBSD</descr>
-    <email>mail@concept-software.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>moat.net</name>
-    <url>http://moat.net/</url>
-    <descr>Virtual web hosting, Mailing List, UNIX install tips, and music (house-eey) archives.</descr>
-    <email>hidenori@moat.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>mp3asoft.com</name>
-    <url>http://www.mp3asoft.com</url>
-    <descr>Free Download Mp3 &amp; Ogg Audio Software !</descr>
-    <email>webmaster@mp3asoft.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Alexandria</name>
-    <url>http://www.alexandria.com.pt</url>
-    <descr>Internet Service Provider</descr>
-    <email></email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>H Zero Seven</name>
-    <url>http://freeshell.h07.org</url>
-    <descr>FreeShell Server</descr>
-    <email>phantom@h07.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>International Society for Krishna Consciousness</name>
-    <url>http://www.iskcon.org.au</url>
-    <descr>Hare Krishna Movement</descr>
-    <email>tirtharaj@iskcon.org.au</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>LUMS Alumni Relations Office</name>
-    <url>http://alumni.lums.edu.pk</url>
-    <descr></descr>
-    <email>arsalan@lums.edu.pk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Newlands College</name>
-    <url>http://www.newlands.school.nz</url>
-    <descr>Secondary School</descr>
-    <email>jtopp@newlands.school.nz</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Pittgoth</name>
-    <url>http://www.pittgoth.com</url>
-    <descr>A Dark Portal, exposure for underground music and information</descr>
-    <email>darklogik@pittgoth.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Polish Chamber Of Insurance</name>
-    <url>http://english.piu.org.pl</url>
-    <descr></descr>
-    <email>arkad@piu.org.pl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SmoothWeb Networks</name>
-    <url>http://smoothweb.no-ip.com</url>
-    <descr>Free Shell Provider, For anyone to learn FreeBSD and Coding</descr>
-    <email>hani@ednet.co.uk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Soap Naturally</name>
-    <url>http://www.soapnaturally.org/</url>
-    <descr>An Australian international forum for natural soapmakers</descr>
-    <email>marina@reliance.it</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Tastybrew.com</name>
-    <url>http://www.tastybrew.com/</url>
-    <descr>Homebrew resource and recipe database</descr>
-    <email>webmaster@tastybrew.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Two Fucking Ants</name>
-    <url>http://2fa.org/</url>
-    <descr>A tiny german org for several software and page projects</descr>
-    <email>webmaster@2fa.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>mphknet free shell provider</name>
-    <url>http://www.mphknet.org/</url>
-    <descr>A free shell provider that runs soley on the *BSD platforms, mainly FreeBSD due to it's security, and reliablity; has been providing shells to people since early 1999.</descr>
-    <email>peter@mphknet.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Ding-Jie Zhu@Taiwan</name>
-    <url>http://alastor.ath.cx</url>
-    <descr>private</descr>
-    <email>alastor@alastor.ath.cx</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Eli K Breen</name>
-    <url>http://www.gopostal.ca</url>
-    <descr>Webmail Server</descr>
-    <email>eli@gopostal.ca</email>
-  </entry>
-
-  <entry type="personal">
-    <name>GRADUS-BG</name>
-    <url>http://free.top.bg/gradus/</url>
-    <descr>personal</descr>
-    <email>gmg@mail.bg</email>
-  </entry>
-
-  <entry type="personal">
-    <name>GRADUS-BG</name>
-    <url>http://gradus.hit.bg</url>
-    <descr>personal</descr>
-    <email>gmg@mail.bg</email>
-  </entry>
-
-  <entry type="personal">
-    <name>King-Root.com</name>
-    <url>http://www.king-root.com</url>
-    <descr>FreeBSD - Dedication to perfection - Website deicated to FreeBSD</descr>
-    <email>webmaster@milojko.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Prikid</name>
-    <url>http://www.prikid.net</url>
-    <descr>prikid's network</descr>
-    <email>prikid@prikid.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>SoCruel.NU</name>
-    <url>http://www.socruel.nu</url>
-    <descr>My own place in the big kahula called the internet.</descr>
-    <email>waldi@xs4all.nl</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Sven Berkvens-Matthijsse</name>
-    <url>http://www.berkvens.net/</url>
-    <descr>My personal sites, mostly about my cats :-)</descr>
-    <email>sven@berkvens.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Wixwax</name>
-    <url>http://www.wixwax.de</url>
-    <descr>Personal Website of Wixwax</descr>
-    <email>webmaster@wixwax.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>1fusion.com</name>
-    <url>http://www.onefusion.com</url>
-    <descr>Web hosting with reseller plans</descr>
-    <email>sales@onefusion.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>1steKeuze</name>
-    <url>http://www.1stekeuze.nl</url>
-    <descr>Dutch search engine / portal (dutch language only)</descr>
-    <email>damian@1stekeuze.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AS Eesti Telefon</name>
-    <url>http://einar.vanakoolimees.ee</url>
-    <descr>Freedom. FreeBSD</descr>
-    <email>einaraleksejev@yahoo.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Best ISP</name>
-    <url>http://www.thebestisp.com/</url>
-    <descr>OC-12 Connected ISP Offering Colocation, dedicated, and virtual FreeBSD servers</descr>
-    <email>joe@thebestisp.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FalconSoft</name>
-    <url>http://www.falconsoft.com/</url>
-    <descr>Internet Service Provider</descr>
-    <email>support@falconsoft.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GroupSecure.com LLC</name>
-    <url>https://groupsecure.com/</url>
-    <descr>Payment Aggregation And Secure Communications</descr>
-    <email>freebsd-gallery@groupsecure.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HostingworX Internet</name>
-    <url>http://www.hostingworx.net</url>
-    <descr>ISP in the Netherlands, offers dedicated servers with FreeBSD installed. Als runs MySQL DB servers on FreeBSD.</descr>
-    <email>info@hostingworx.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>IT Canada</name>
-    <url>http://www.it.ca/</url>
-    <descr>Internet services for ISPs.  Custom programming, integration and implementation of FreeBSD-based solutions.</descr>
-    <email>sales@it.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>InetKing Internet Services Inc.</name>
-    <url>http://www.inetking.com</url>
-    <descr>Corporate / Small Bussiness / Personal Web hosting, Dialup, and shell accounts.</descr>
-    <email>kj125@inetking.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>KVG Konvergencia Ltd.</name>
-    <url>http://konvergencia.hu</url>
-    <descr>internet solutions for everyone (who has enough money)</descr>
-    <email>kvg@konvergencia.hu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MIPS-INFORMATICS</name>
-    <url>http://www.mips-informatics.com</url>
-    <descr>UNIX Servers: FreeBSD,  OpenBSD, NetBSD, GNU/Linux, WindowsNT/2000/XP.  - Hardware: Components &amp; Computers - Software - Internet/Intranet Security. (Spain)</descr>
-    <email>mips@mips-informatics.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MTK Twins</name>
-    <url>http://www.mtk-twins.ru</url>
-    <descr>Moscow Transport Company</descr>
-    <email>admin@mtk-twins.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Malexa.Org</name>
-    <url>http://www.malexa.org</url>
-    <descr>A Mexico BSD project.</descr>
-    <email>trekz@phayze.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Neowebspace Network Solutions</name>
-    <url>http://www.neowebspace.com</url>
-    <descr>Quality webhosting/DNS/email services.</descr>
-    <email>support@neowebspace.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Netfilter Computer Services</name>
-    <url>http://www.netfilter.com.br</url>
-    <descr>Content Filtering Software</descr>
-    <email>rafael@netfilter.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nixu Oy</name>
-    <url>http://www.nixu.com</url>
-    <descr>Products and solutions for secure Internet</descr>
-    <email>info@nixu.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>One Net</name>
-    <url>http://www.one.net.pk</url>
-    <descr>The Fastest and Most proficient ISP, Running totally on FreeBSD</descr>
-    <email>aaghaz@one.net.pk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Opteq Securities</name>
-    <url>http://www.optec.co.za</url>
-    <descr>Gigabit Bandwidth Management; Intrusion Detection; 24/7 Server Monitoring</descr>
-    <email>sales@optec.co.za</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PWHS Networks</name>
-    <url>http://www.pwhsnet.com</url>
-    <descr>UNIX Shell/Web Hosting</descr>
-    <email>patrick@pwhsnet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Pacific Dreamsites</name>
-    <url>http://www.pacificdreamsites.com</url>
-    <descr>Web design and web hosting</descr>
-    <email>adam@pacificdreamsites.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Qbrick AB</name>
-    <url>http://www.qbrick.com/eng/qbrick.html</url>
-    <descr>Streamingmedia</descr>
-    <email>johan@xtr.nu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Samara Telecom JSC</name>
-    <url>http://www.smrtlc.ru</url>
-    <descr>Internet Service Provider and Telephony Operator</descr>
-    <email>tech@smrtlc.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sanalnet</name>
-    <url>http://WWW.MasterBeast.Org</url>
-    <descr>Beast IS Master Luleburgaz City Around The World UNIX -W�ndowsNT-2/k-Networking-HackerService</descr>
-    <email>biist@hotmail.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SecNet</name>
-    <url>http://www.secnet.dk</url>
-    <descr>Danish Web Hosting Provider</descr>
-    <email>jkr@secnet.dk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Shanghai Environment Protection Equipment Plant</name>
-    <url>http://www.shep.com.cn</url>
-    <descr>Powered by FreeBSD</descr>
-    <email>shenwei@yorku.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Stack Ltd.</name>
-    <url>http://citynet.tomsk.net</url>
-    <descr>ISP (Tomsk, Russia)</descr>
-    <email>admin@tomsk.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>StanServ Inc.</name>
-    <url>http://www.stanserv.com</url>
-    <descr>The Internet Server  Hardware and Software Provider</descr>
-    <email>stan@stanserv.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Statscout</name>
-    <url>http://www.statscout.com</url>
-    <descr>Blanket network monitoring</descr>
-    <email>c.strom@statscout.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Stomped.com</name>
-    <url>http://www.stomped.com</url>
-    <descr>World's oldest online gaming community site</descr>
-    <email>admin@stomped.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Syndicate Consulting Group, Inc.</name>
-    <url>http://www.syndicate.net/</url>
-    <descr>Web Service Provider, Consulting, and Design Firm</descr>
-    <email>info@syndicate.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TechnoGeeksOnWheels</name>
-    <url>http://www.technogeeksonwheels.com</url>
-    <descr>A Computer Maintenance Company; equipped with a van which has everything onboard to fix computers onsite</descr>
-    <email>kai@technogeeksonwheels.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Terabyte ACS</name>
-    <url>http://www.terabyte.com.ua</url>
-    <descr>Computers and networks: planning, repairing, upgrade, serving, consulting. Internet solutions.</descr>
-    <email>mishka@terabyte.com.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ukrainian RadioSystems (WellCOM)</name>
-    <url>http://www.welcome2well.com/</url>
-    <descr>Ukrainian GSM900 operator</descr>
-    <email>postmaster@welcome2well.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Voljatel telekomunikacije d.d.</name>
-    <url>http://www.voljatel.si</url>
-    <descr>Free dialup ISP in Slovenia</descr>
-    <email>damir@voljatel.si</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Witzel Development</name>
-    <url>http://www.witzeldevelopment.com</url>
-    <descr>Custom commerical software &amp; free gnu software solutions.</descr>
-    <email>wayne@gnu.witzeldevelopment.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Xpoint.CZ</name>
-    <url>http://www.xpoint.cz</url>
-    <descr>chat and communication server</descr>
-    <email>remet@xpoint.cz</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Zook.pt - Communication Store</name>
-    <url>http://www.zook.pt</url>
-    <descr>graphic design - publicity - multimedia ..</descr>
-    <email>FranciscoCabrita@mestredeaviz.pt</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ice.com</name>
-    <url>http://www.ice.com</url>
-    <descr>We use freeBSD for rock solid firewalls and Samba Servers due to the 2GB limit in samba on linux.</descr>
-    <email>cody@ice.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>�zler Plastic Inc.</name>
-    <url>http://www.ozlerplastik.com</url>
-    <descr>We use FreeBSD internally for browsing internet with proxy server, sending and reciving mail, reciving fax, and as a database server.</descr>
-    <email>ertank@ozlerplastik.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Avanport</name>
-    <url>http://avanport.com</url>
-    <descr>Avanport.com</descr>
-    <email>support@avanport.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>CIUEM</name>
-    <url>http://www.ci.uem.mz</url>
-    <descr>Centre of Informatics of the Eduardo Mondlane University</descr>
-    <email>godinho@zebra.uem.mz</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Colegiul National 'Cantemir-Voda'</name>
-    <url>http://www.ldc.ro/</url>
-    <descr>Public high school, Bucharest, Romania</descr>
-    <email>razor@ldc.ro</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>DIT NetSoc</name>
-    <url>http://netsoc.kst.dit.ie</url>
-    <descr>Dublin Institute of Technology networking society</descr>
-    <email>netsoc@eircom.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Fuga Mundi Foundation</name>
-    <url>http://www.telepraca.org</url>
-    <descr>Portal Telepraca</descr>
-    <email>admin@telepraca.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>GCC</name>
-    <url>http://www.gcc.ne.jp/</url>
-    <descr>A Computer Circle in University of Aizu</descr>
-    <email>masa@gcc.ne.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Gino Paradise</name>
-    <url>http://www.badboy29.com</url>
-    <descr>MP3s for the clubbers</descr>
-    <email>tmontana2k@hotmail.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Kahramanmaras Sutcu Imam University</name>
-    <url>http://engizek.ksu.edu.tr</url>
-    <descr>Kahramanmaras Sutcu Imam University</descr>
-    <email>alicayli@ksu.edu.tr</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Linux Online</name>
-    <url>http://www.linux-on-line.net</url>
-    <descr>Linux Online International Community</descr>
-    <email>prikid@linux-on-line.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Nieformalna Grupa Komputerowa</name>
-    <url>http://www.sztynx.lublin.pl</url>
-    <descr>Nieformalna Grupa Komputerowa</descr>
-    <email>hostmaster@sztynx.lublin.pl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Vengence sp00fed</name>
-    <url>http://vengence.sp00fed.net</url>
-    <descr>The ultimate information site</descr>
-    <email>webmaster@vengence.sp00fed.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Yserver.net</name>
-    <url>http://www.yserver.net</url>
-    <descr>WWW, DNS, IRC, Mail, etc. Hosting</descr>
-    <email>admin@yserver.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>cafe</name>
-    <url>http://www.cafe-flamingo.narod.ru/</url>
-    <descr>cafe - restoran in Tenerife</descr>
-    <email>2gether@freemail.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ieskok.lt</name>
-    <url>http://www.ieskok.lt</url>
-    <descr>Friend finder portal, Lithuania</descr>
-    <email>info@ieskok.lt</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Ali's Hobbies</name>
-    <descr>RC Heli Flying Tips</descr>
-    <email>http://alishobbies.freeservers.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>BlastMasters CREW</name>
-    <url>http://bmc.newmail.ru</url>
-    <descr>Researches, development and computer art FREE CREW</descr>
-    <email>bmc@newmail.ru</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Broadband Tips and Tricks Forum</name>
-    <url>http://bhj.dyndns.org</url>
-    <descr>Personal Web Server (ran from home)</descr>
-    <email>john@bhj.dyndns.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>CollinsVille Illinois</name>
-    <url>http://collinsville.no-ip.com</url>
-    <descr>Collinsville Illinois Info Site</descr>
-    <email>Mobil1man@alias.chatnet.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Extarlarge Band</name>
-    <url>http://www.extralarge-band.de</url>
-    <descr>Music Project from Hamburg called Extralarge !</descr>
-    <email>marcus@hamburg.de</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Extralarge-Band Project</name>
-    <url>http://www.extralarge-band.ath.cx</url>
-    <descr>Music, Hamburg, Fusion</descr>
-    <email>marcus@hamburg.de</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Fatal Dimensions MUD server</name>
-    <url>http://www.fataldimensions.org</url>
-    <descr>Fatal Dimensions is a fantasy-oriented MUD</descr>
-    <email>council@fataldimensions.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Gollucci Inc.</name>
-    <url>http://www.p6m7g8.com</url>
-    <descr>Personal Homepage and Dev Server</descr>
-    <email>philip@p6m7g8.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Intron's Homepage</name>
-    <url>http://intron.126.com/</url>
-    <descr></descr>
-    <email>ethyl@peoplemail.com.cn</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Joe Thornes</name>
-    <url>http://www.joe.thornes.ws</url>
-    <descr>Home Site, CV stuff.</descr>
-    <email>joe@thornes.ws</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Miha.Biz</name>
-    <url>http://miha.biz</url>
-    <descr>Miha's Server</descr>
-    <email>root@roots.ac</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Neal Koss</name>
-    <descr>Personal home gateway &amp; server</descr>
-    <email>neal@kossweb.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>New Road Team</name>
-    <url>http://www.newroad.com.ar</url>
-    <descr>Buscador / Portal / Search / Site 1ro de Argentina</descr>
-    <email>pedidos@newroad.com.ar</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Personal</name>
-    <url>http://www.joe.org.uk</url>
-    <descr>Personal website for Joe Hill</descr>
-    <email>joe@joe.org.uk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>action</name>
-    <url>http://www.peacesex.com</url>
-    <descr>design</descr>
-    <email></email>
-  </entry>
-
-  <entry type="personal">
-    <name>black.pl</name>
-    <url>http://www.black.pl/</url>
-    <descr>Private shell, ftp, mail, www server located in Poland</descr>
-    <email>erph@freebsd.net.pl</email>
-  </entry>
-
-  <entry type="personal">
-    <name>brettsbsd.net</name>
-    <url>http://www.brettsbsd.net/</url>
-    <descr>My personal/development playground site on a server at home -- 200mhz PII/mmx</descr>
-    <email>estrabd@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>goanga.com</name>
-    <url>http://ww.goanga.com</url>
-    <descr>just a site for people who like to laugh, to see nice pics, to read smtg intersting and other things... i put there what i like, check it out, maybe you find smtg you like, too...</descr>
-    <email>webgod@goanga.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>i386.unknown.ca</name>
-    <url>http://i386.unknown.ca</url>
-    <descr>FreeBSD Help &amp; Scripts</descr>
-    <email>ncash@unknown.ca</email>
-  </entry>
-
-  <entry type="personal">
-    <name>nuclearzone.org</name>
-    <url>http://www.nuclearzone.org</url>
-    <descr>personal shell box</descr>
-    <email>trinity@netikka.fi</email>
-  </entry>
-
-  <entry type="personal">
-    <name>personal site</name>
-    <url>http://bsd.servebeer.com:8080/</url>
-    <descr>BSDBoy comic strip, tadpole cam, etc.</descr>
-    <email>pvaden@we.mediaone.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>www.mialkowski.com</name>
-    <url>http://www.mialkowski.com</url>
-    <descr>Roger Mialkowski's Personal Website</descr>
-    <email>Roger@Mialkowski.Com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Commonwealth/Martin</name>
-    <url>http://cms-mpc.com</url>
-    <descr>Publishers of Direct Mail, Printers and Data Processors</descr>
-    <email>Bryant Martin &gt;bryant@cms-mpc.com&lt;</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Fishercad Services</name>
-    <url>http://www.fishercad.co.uk</url>
-    <descr>Proxy\File Servers, Networking, Support</descr>
-    <email>rob@fishercad.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FreeBSD forums</name>
-    <url>http://www.freebsdforums.org</url>
-    <descr>FreeBSD discussion boards and forums</descr>
-    <email>info@freebsdforums.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Homepage-Design Seibert GmbH in Germany</name>
-    <url>http://www.homepage-design.net</url>
-    <descr>web development, web site design, e-commerce</descr>
-    <email>bkendinibilir@hpds.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Honda Accord Forums</name>
-    <url>http://www.accordforums.com</url>
-    <descr>Accord Sedan, Honda Coup Message Forums Discussion Boards</descr>
-    <email>info@accordforums.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ITmom.com</name>
-    <url>http://www.itmom.com/</url>
-    <descr>Web Hosting Provider</descr>
-    <email>dphillips@getmegabits.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Icon</name>
-    <url>http://www.icon.net.mx</url>
-    <descr>Web Hosting,  Intranet/Extranet Systems Development, Networking Engineers.  Hermosillo Sonora Mexico</descr>
-    <email>antonio@icon.net.mx</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Infinology.com</name>
-    <url>http://www.infinology.com</url>
-    <descr>Web hosting, Shared, Dedicated and Virtual Dedicated</descr>
-    <email>keith@infinology.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Interdotnet Philippines</name>
-    <url>http://www.ph.inter.net</url>
-    <descr>Internet Service Provider based in the Philippines</descr>
-    <email>sysops@team.ph.inter.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>JEAH Communications, LLC</name>
-    <url>http://www.JEAH.net</url>
-    <descr>JEAH Communications, LLC provides internet services to the global market.  JEAH Communications, LLC services include UNIX shell accounts, virtual web hosting, and domain registration.</descr>
-    <email>chris@JEAH.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MrHost Web Hosting</name>
-    <url>http://www.mrhost.ca/</url>
-    <descr>Offering Web, Mail and DNS hosting solutions.</descr>
-    <email>mike@mrhost.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>OpenMobile Corporation</name>
-    <url>http://www.openmobile.com</url>
-    <descr>Important server's running FreeBSD</descr>
-    <email>dan.airinen@openmobile.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Presedia, Inc.</name>
-    <url>http://www.presedia.com/</url>
-    <descr>Only FreeBSD for our security- and reliability-sensitive services</descr>
-    <email>freebsd@presedia.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Select Motor Company</name>
-    <url>http://www.selectmotorcompany.com</url>
-    <descr>Select Motor Company offers custom restorations of classic cars, premium new models, financing, ACDelco Service, Nationwide Shipping, Nationwide Warranties, Used Parts, Auctions, also offers American Muscle Cars, Vintage Classic Automobiles, and more.</descr>
-    <email>gpseledt@aol.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Subterrain Networks</name>
-    <url>http://www.subterrain.net/</url>
-    <descr>A high traffic information security portal with news, downloads, reviews, and polls.</descr>
-    <email>jbl@subterrain.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>UNIXsmith Corporation</name>
-    <url>http://www.unixsmith.com</url>
-    <descr>Managed Services and FreeBSD-based Appliances</descr>
-    <email>jesse@unixsmith.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Volodata</name>
-    <url>http://www.volodata.com</url>
-    <descr>High performance hosting</descr>
-    <email>info@volodata.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Westdale Asset Management</name>
-    <url>http://www.westdale.com</url>
-    <descr>Real Estate</descr>
-    <email>jaymz@wamltd.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Xecunet, LLC</name>
-    <url>http://www.xecu.net</url>
-    <descr>Full Service Internet Provider offering web hosting, high-speed, and dialup solutions in over 11,000 locations across the US and Canada</descr>
-    <email>dallas@xecu.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>mail-production.com</name>
-    <url>http://mail-production.com</url>
-    <descr>Data Processors for USPS Mailfile Hygienics and Data Mining</descr>
-    <email>Bryant Martin &gt;admin@cms-mpc.com&lt;</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>webnetix softMedia</name>
-    <url>http://www.webnetix.cc/</url>
-    <descr>Developer Company</descr>
-    <email>hostmaster@webnetix.cc</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Ang Dating Daan</name>
-    <url>http://www.angdatingdaan.org</url>
-    <descr>An evangelical television program hosted by Bro. Eli Soriano</descr>
-    <email>systems@angdatingdaan.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Australian National Janitors Association</name>
-    <url>http://www.anja.org.au</url>
-    <descr>Australia's largest non-profit assocation</descr>
-    <email>cheifjanitor@anja.org.au</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>B.M.I</name>
-    <url>http://www.bmi.edu.my</url>
-    <descr>British Malaysian Institute</descr>
-    <email>hisham@bmi.edu.my</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Boerde.DE e.V.</name>
-    <url>http://www.boerde.de</url>
-    <descr>Organisation of the non-profit internet users in the Magdeburg (Germany) area</descr>
-    <email>admin@boerde.de</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Cyberdoom</name>
-    <descr>Most important server's running FreeBSD</descr>
-    <email>dan.airinen@cyberdoom.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Czer Network</name>
-    <url>http://czer.cjb.net</url>
-    <descr>Network Application System Research And Development</descr>
-    <email>info@czer.cjb.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Department of Health and Human Services - Slovak Republic</name>
-    <url>http://www.health.gov.sk</url>
-    <descr>Part of Slovak Government Network</descr>
-    <email>monkus@monkus.sk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>EnderUNIX.ORG</name>
-    <url>http://www.EnderUNIX.ORG</url>
-    <descr>BSD Related Open Source site @ Turkey (Also offical mirror of *BSD sites)</descr>
-    <email>roots@enderunix.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Green Networks</name>
-    <url>http://www.greennet.ge/</url>
-    <descr>Systems integrator and network solutions provider in Georgia.</descr>
-    <email>gia@greennet.ge</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Queen Mary, University of London</name>
-    <url>http://www.qmul.ac.uk/</url>
-    <descr>Research and Teaching University</descr>
-    <email>D.M.Pick@qmul.ac.uk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>S.N.O.T.</name>
-    <url>http://www.snot.co.za/</url>
-    <descr>S.N.O.T.</descr>
-    <email>root@snot.co.za</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SUNY Institute of Technology</name>
-    <url>http://www.cs.sunyit.edu</url>
-    <descr>Computer Science Department (DogNET)</descr>
-    <email>merantn@cs.sunyit.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SmartWare Corp</name>
-    <url>http://www.shadox.biz</url>
-    <descr>This is my test site, but i will use it for a exchange place about various O.S ( freeBSD,openBSD,Solaris,etc)</descr>
-    <email>ronnie@shadox.biz</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Sumy State University</name>
-    <url>http://www.ssu.sumy.ua</url>
-    <descr>Ukraine</descr>
-    <email>vadimsiniak@yahoo.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>TechForum INFO</name>
-    <descr>Technology Forum to discuss security issues, networking, firewalls, share ideas, tools, etc.</descr>
-    <email>techforum@needguide.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The One Ring</name>
-    <url>http://theonering.mine.nu</url>
-    <descr>News Site for Nerds and other people</descr>
-    <email>ariejan@theonering.mine.nu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of Minnesota - Aerospace Engineering and Mechanics</name>
-    <url>http://www.aem.umn.edu/</url>
-    <descr>Web, Mail servers</descr>
-    <email>hokan+fbsd-gallery@me.umn.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of Minnesota - Mechanical Engineering</name>
-    <url>http://www.me.umn.edu/</url>
-    <descr>Web, Mail servers; workstation</descr>
-    <email>hokan+fbsd-gallery@me.umn.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>XUZHOU MEDICAL COLLEGE</name>
-    <url>http://www.xzmc.edu.cn</url>
-    <descr>XUZHOU MEDICAL COLLEGE OF CHINA</descr>
-    <email>lzw@xzmc.edu.cn</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Yemeni Free Software and Open Source Association</name>
-    <url>http://www.linuxarabia.org</url>
-    <descr>Promoting the use of BSD within Yemen and the Arab world</descr>
-    <email>project@linuxarabia.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>BSDLaptops.org</name>
-    <url>http://www.bsdlaptops.org</url>
-    <descr>Information on running BSD on your laptop</descr>
-    <email>www@bsdlaptops.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>mariquita.net</name>
-    <url>http://www.mariquita.net/</url>
-    <descr>A funny site (still under construction) with a nice msgboard...</descr>
-    <email>unix@mariquita.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Private HP</name>
-    <url>http://erdgeist.org</url>
-    <descr>Private HP</descr>
-    <email>lenin@weltregierung.de</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Stef's homepage</name>
-    <url>http://www.extinction.doesntexist.com</url>
-    <descr>Stef's homepage running FreeBSD4.4-rel</descr>
-    <email>stef@quicknet.nl</email>
-  </entry>
-
-  <entry type="personal">
-    <name>http://www.stolarski.org</name>
-    <url>http://www.stolarski.org</url>
-    <descr>Short on Content, but loaded with rock solid FreeBSD stability :)</descr>
-    <email>webmaster@stolarski.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>www.uglenet.dk</name>
-    <url>http://www.uglenet.dk</url>
-    <descr>My nice little server, got BIG on FreeBSD</descr>
-    <email>erikss@uglenet.dk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>oliver.webnetix.cc // 2ktwo</name>
-    <url>http://oliver.webnetix.cc/</url>
-    <descr>Oliver Kaufmann is only hosted on FreeBSD machines!</descr>
-    <email>hostmaster@webnetix.cc</email>
-  </entry>
-
-  <entry type="personal">
-    <name>AYPWIP?</name>
-    <url>http://www.aypwip.org</url>
-    <descr>Are You Pondering What I'm Pondering? - a personal web site running FreeBSD, Apache, mod_perl and MySQL</descr>
-    <email></email>
-  </entry>
-
-  <entry type="personal">
-    <name>BSDBoy Comic Strip</name>
-    <url>http://bsd.bounceme.net</url>
-    <descr>My li'l tribute to FreeBSD including BSD-based cartoon.</descr>
-    <email>bsdboy@yog-sothoth.dyndns.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Heder Inacio</name>
-    <url>http://heder.homeunix.com</url>
-    <descr>Meu Home Server</descr>
-    <email>heder@yahoo.com.br</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Mark's Emporium of Goodness</name>
-    <url>http://meg.rh.rit.edu/</url>
-    <descr>Goodness and much more...</descr>
-    <email></email>
-  </entry>
-
-  <entry type="personal">
-    <name>McArio.com</name>
-    <url>http://www.mcario.com</url>
-    <descr>My personal home site</descr>
-    <email>mcario@mcario.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>NeoBeach</name>
-    <url>http://neobeach.com/</url>
-    <descr>open community IT website</descr>
-    <email>trent.mcgrath@neobeach.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Philip Southam</name>
-    <url>http://12.246.2.224</url>
-    <descr>My travel pictures and other misc. stuff about me and FreeBSD</descr>
-    <email>webmaster@philipsoutham.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Sinuhe.org</name>
-    <url>http://www.sinuhe.org</url>
-    <descr>Skepticism, freethought, Unix and me.</descr>
-    <email>bsdhacker@netscape.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Smarason.com</name>
-    <url>http://www.smarason.com</url>
-    <descr>My Unix Playground</descr>
-    <email>steini@gateway.smarason.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Syrstad Free Consulting</name>
-    <url>http://freedom.syrstad.org</url>
-    <descr>Free Network and Security Consulting</descr>
-    <email>thomasr@freedom.syrstad.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The Nerdery</name>
-    <url>http://www.thenerdery.org</url>
-    <descr>Fighting the Intellectual Proletariat . . . and other such nonsense</descr>
-    <email>cbunn@udel.edu</email>
-  </entry>
-
-  <entry type="personal">
-    <name>freenet-ag.de (michael radzewitz)</name>
-    <url>http://radzewitz.freenet-ag.de</url>
-    <descr>my workstation at office (behind a firewall)</descr>
-    <email>michael.radzewitz@freenet-ag.de</email>
-  </entry>
-
-  <entry type="personal">
-    <name>www.meappy.com</name>
-    <url>http://www.meappy.com/</url>
-    <descr>Home server, these are just some of the goodies installed: file/print server with Samba, NAT routing with IPFilters, Http Server with Apache..and lots more!!</descr>
-    <email>root@home.meappy.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ringnebula Systems</name>
-    <url>http://www.ringnebula.net</url>
-    <descr>Unix, Linux, and Windows 2000 Solutions</descr>
-    <email>jturner@pacific.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GigHost.com</name>
-    <url>http://www.gighost.com</url>
-    <descr>Cost effective, High performance Shared and Dedicated Hosting</descr>
-    <email>support@gighost.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Asia Allied Technologies</name>
-    <url>http://www.asiaallied.com</url>
-    <descr>I.T. Solutions For Your Business</descr>
-    <email>jessien@asiaallied.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AIC INCORPORATED dba NikKa Enterprises LLC</name>
-    <url>http://www.nikka.biz</url>
-    <descr>Authorized Computer Products Sales and Service center</descr>
-    <email>nikkallc@crosslink.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AccuRev, Inc.</name>
-    <url>http://www.accurev.com</url>
-    <descr>Next-Generation Configuration Management and Version Control Software - Conquering Complexity</descr>
-    <email>info@accurev.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Apex Embedded Systems</name>
-    <url>http://www.apexembeded.com</url>
-    <descr>Apex Embedded Systems is a full service provider of PC/104 modules, analog I/O solutions, systems integration, custom hardware design engineering and software development.</descr>
-    <email>dsp@apexembedded.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Astral-plus ltd.</name>
-    <url>http://www.123.com.ua</url>
-    <descr>Astral-plus ltd.</descr>
-    <email>info@123.com.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Atlantech Online, Inc</name>
-    <url>http://www.atlantech.net</url>
-    <descr>Internet Service Provider</descr>
-    <email>webmaster@atlantech.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>August.net</name>
-    <url>http://www.august.net</url>
-    <descr>Broadband access internet service provider</descr>
-    <email>info@august.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Centre of Scientific and Technical Information. Nizhny Novgorod</name>
-    <url>http://www.cnti.nnov.ru</url>
-    <descr>Scientific and Technical Information</descr>
-    <email>support@cnti.nnov.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cinemas OnLine</name>
-    <url>http://www.cinemas-online.co.uk</url>
-    <descr>Website for UK cinemas</descr>
-    <email>colin@cinemas-online.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DGware</name>
-    <url>http://www.dbware.com.br</url>
-    <descr>A solution provider specialising in software development, Logistics Systems, Web based systems programming and custom sofware. Wireless Network design and implementation. Hardware reseller. Piracicaba/SP - Brazil</descr>
-    <email>luis.carlos.toledo@dgware.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DOVICO Software</name>
-    <url>http://www.dovico.com</url>
-    <descr>Time and project management software</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Desarrollos Inform�ticos de M�xico S.C.</name>
-    <url>http://www.dim.com.mx</url>
-    <descr>Software development on freeBSD, hybrid systems (Clients running on Windows, Servers using freeBSD), Security, Firewalls, Proxy Servers</descr>
-    <email>ganguiano@dim.com.mx</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Digital Generation Ltd.</name>
-    <url>http://www.dg.net.ua</url>
-    <descr>major Ukrainian ISP</descr>
-    <email>acid@dg.net.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Digital Overload</name>
-    <url>http://www.digitaloverload.net</url>
-    <descr>Network solutions using Linux, FreeBSD, OpenBSD</descr>
-    <email>info@digitaloverload.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Enic</name>
-    <url>http://www.enic.cc</url>
-    <descr>.cc domain registry</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Evalesco Systems</name>
-    <url>http://www.evalesco.com</url>
-    <descr>SysOrb Network Monitoring Software</descr>
-    <email>sales@evalesco.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Gmotion.com</name>
-    <url>http://www.gmotion.com</url>
-    <descr>World-class web development firm based in Memphis, TN. USA</descr>
-    <email>webmaster@gmotion.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HS Leader Srl</name>
-    <url>http://bsd.hsleader.net</url>
-    <descr>Web Design And Hosting</descr>
-    <email>megashells@hsleader.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Happ Controls, Inc.</name>
-    <url>http://www.happcontrols.com</url>
-    <descr>Manufacturer and distributor for gaming, amusement, vending, and industrial applications</descr>
-    <email>ben@happcontrols.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>IF DRAUDIMAS</name>
-    <url>http://www.if.lt</url>
-    <descr>Insurance company</descr>
-    <email>vaidas.damosevicius@if.lt</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>IKON as</name>
-    <url>http://www.ikon.as</url>
-    <descr>Using FreeBSD for running POP3, SMTP, webmail and other things for the companys roadwarriors.</descr>
-    <email>twa@ikon.as</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Icelab Networks</name>
-    <url>http://icelab.net</url>
-    <descr>Icelab is an internet content provider offering shell accounts and hosting solutions</descr>
-    <email>info@icelab.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>KANAYA Co.,Ltd.</name>
-    <url>http://kanaya.com/</url>
-    <descr>BSD Daemon Apparel Company</descr>
-    <email>info@kanaya.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>KC Consulting Group Inc.</name>
-    <url>http://www.kcconsultants.com</url>
-    <descr>FreeBSD, Microsoft consulting firm based in Kansas City, MO. Please mention freebsd.org for discounts.</descr>
-    <email>zaw@kcconsultants.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Kristianstad Teknikverkstad</name>
-    <url>http://www.ktv.se</url>
-    <descr>Server provider</descr>
-    <email>leo@ktv.se</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MediaWave Communications Corp.</name>
-    <url>http://www.mediawaveonline.com/</url>
-    <descr>Web design &amp; hosting provider located in Kamloops, British Columbia, Canada.</descr>
-    <email>hampton@mediawaveonline.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Neo-Line XXI</name>
-    <url>http://www.neolinexxi.ru/</url>
-    <descr>Deals with the sale of the supplemental equipment for the off-roads vehicles: front bar, tail light guard, rear bumper guards, step bars, step boards, side tubes, light bar, winches, hitches, exhaust tips, floor &amp; cargo mats, deflectors, light covers, custom wings &amp; flares and also for many variant of ordinary cars, minivan and even for the lorries. All this equipment is produced by the following world leader companies: Cobra, Antec, Delta, Schiessler, Warn, Manik, Hella, Piaa and many others</descr>
-    <email>nline21@mail.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PT. Rahajasa Media Internet</name>
-    <url>http://radmail.rad.net.id</url>
-    <descr>RADNET Webmail Service</descr>
-    <email>heritriw@rad.net.id</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Progressix Internet</name>
-    <url>http://www.progressix.com</url>
-    <descr>Internet application development and hosting services. We're using FreeBSD as main platform for our workstations and servers.</descr>
-    <email>marcel@progressix.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RING</name>
-    <url>http://www.geocities.co.jp/Bookend-Ryunosuke/7105/index.htm</url>
-    <descr>belly good HP! welcome!</descr>
-    <email>cbl12915@nifty.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ramdown Networks INC</name>
-    <url>http://www.ramdown.com</url>
-    <descr>Web Hosting , Design and Security</descr>
-    <email>mata@ramdown.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ringnebula Systems</name>
-    <url>http://ringnebula.net</url>
-    <descr>Ringnebula Systems offers FreeBSD servers and workstations as well as other services</descr>
-    <email>sales@ringnebula.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Skybeamer</name>
-    <url>http://www.skybeamer.de</url>
-    <descr>Internet Service Provider / Software Developer - we are using FreeBSD as Development-Platform, Mailserver, Webserver, DBserver and just for fun ;-)</descr>
-    <email>info@skybeamer.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TERA d.o.o. Tolmin, Slovenija</name>
-    <url>http://www.tera.si</url>
-    <descr>Slovenian supplier of thermoplastic resins&amp;machinery</descr>
-    <email>We use FreeBSD internally for browsing internet with proxy server,ftp,web server, sending&amp;reciving mail, sending&amp;reciving fax, and as a database server</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Technical University of Koszalin, Poland</name>
-    <url>http://www.tu.koszalin.pl</url>
-    <descr>On FreeBSD is DNS, Mail, WWW</descr>
-    <email>administrator@tu.koszalin.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>VestNet A/S Denmark</name>
-    <url>http://www.zite3.com</url>
-    <descr>Local ISP and software developer</descr>
-    <email>per@vestnet.dk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Volyn state univercity</name>
-    <url>http://www.csd.univer.lutsk.ua</url>
-    <descr></descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Vpn4all</name>
-    <url>http://vpn4all.com</url>
-    <descr>Vpn services</descr>
-    <email>support@vpn4all.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Wish Computing</name>
-    <url>http://www.wish.com.mx</url>
-    <descr>Software and Networking Consulting Firm</descr>
-    <email>wish@wish.com.mx</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>qwest.net</name>
-    <url>http://www.qwest.com</url>
-    <descr>phone, internet, cell phone provider</descr>
-    <email>jnachio@qwest.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>segment:offset</name>
-    <url>http://www.segment.org</url>
-    <descr>Web Design/Hosting/Database Integration</descr>
-    <email>admin@segment.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>unit51 computer forensics</name>
-    <url>http://www.unit51.com</url>
-    <descr>unit51 provides computer forensic services for businesses and corporations,accountants,banks,police,court,lawyers and lawfirms,insurance companies,fraud examiners and other victims of computercrimes nationally and worldwide.</descr>
-    <email>info@unit51.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>www.danubetech.com</name>
-    <url>http://www.danubetech.com</url>
-    <descr>Danube Technologies, Inc. - custom software solutions</descr>
-    <email>victor@danubetech.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>jyrki</name>
-    <url>http://www.jyrki.wha.la/</url>
-    <descr>Anton</descr>
-    <email>apaasi@yahoo.co.uk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>#pichove - Undernet</name>
-    <url>http://pichove.dhs.org</url>
-    <descr>Bulgarian IRC channel</descr>
-    <email>admin@pichove.dhs.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ARP-SAPC Sociedad para el Avance del Pensamiento Cr�tico</name>
-    <url>http://www.arp-sapc.org</url>
-    <descr>Spanish skeptic society</descr>
-    <email></email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Advanced Science and Technology Institute</name>
-    <url>http://www.asti.dost.gov.ph</url>
-    <descr>ASTI supports R&amp;D</descr>
-    <email>info@asti.dost.gov.ph</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Athabasca University</name>
-    <url>http://depth.athabascau.ca</url>
-    <descr>DEPTH</descr>
-    <email>scottw@icaap.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Bogazici University, Management Information Systems Department</name>
-    <url>http://skywalker.mis.boun.edu.tr</url>
-    <descr>Multi-purpose Unix Server</descr>
-    <email>levent@mis.boun.edu.tr</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Colorado Climate Center</name>
-    <url>http://ccc2.atmos.colostate.edu/</url>
-    <descr>Climate center for the state of Colorado</descr>
-    <email>tarcieri@atmos.colostate.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>DemianBSD</name>
-    <url>http://demian.dhis.org</url>
-    <descr>a small free software developer community</descr>
-    <email>rael@vectorstar.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>DtMF &amp; DigitalRebel</name>
-    <url>http://www.dtmf.com.ar</url>
-    <descr>Security Information and Technology</descr>
-    <email>asy@dtmf.com.ar</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>JTG Programming</name>
-    <url>http://www.jtgprogramming.org/</url>
-    <descr>Programming help and tutorials</descr>
-    <email>john@jtgprogramming.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Kaanib.Net</name>
-    <url>http://www.kaanib.net</url>
-    <descr>The Christian Edge for Digital Relations</descr>
-    <email>support@angdatingdaan.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Kentucky Council of Teachers of English / Language Arts</name>
-    <url>http://www.kcte.org</url>
-    <descr>Teachers' professional organization</descr>
-    <email>webmaster@kcte.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Laboratory for Information and Decision Systems @MIT</name>
-    <url>http://lids.mit.edu</url>
-    <descr>LIDS uses FreeBSD on its webserver and for all security related functions.</descr>
-    <email>petr@mit.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>MRE - Minist�rio das Rela��es Exteriores</name>
-    <url>http://www.mre.gov.br</url>
-    <descr>Ministry of Foreign Affairs, Brazil (DNS, PostFix, MRTG)</descr>
-    <email>suporte@mre.gov.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Major Losers</name>
-    <url>http://www.major-losers.com</url>
-    <descr>Humor site, columns, reviews and forums</descr>
-    <email>Webmaster@major-losers.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Management of the Ministry of Taxes and Tax Collection of the Russian Federation on the Tambov area</name>
-    <url>http://www.tmbtax.ru</url>
-    <descr>The official body subordinated to the Ministry of Taxes and Tax Collection of the Russian Federation. Uses FreeBSD as a corporate internet-server in regional management and as intranet-servers in local inspections on territory of the Tambov area.</descr>
-    <email>anthony@tmbtax.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Nice Dreams Car Club</name>
-    <url>http://www.nicedreamscc.com/</url>
-    <descr>Maryland's Finest Car Club</descr>
-    <email>webmaster@nicedreamscc.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Nightfalls.de</name>
-    <url>http://www.nightfalls.de</url>
-    <descr>Computer web Portal</descr>
-    <email>johannes@nightfalls.de</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Oca.Org.BR</name>
-    <url>http://www.oca.org.br</url>
-    <descr>Hosting of community projects</descr>
-    <email>LLazarte@mat.unb.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Palo Alto Unified School District</name>
-    <url>http://www.pausd.palo-alto.ca.us</url>
-    <descr>Public school district in Palo Alto, California</descr>
-    <email>cgrant@pausd.palo-alto.ca.us</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SCRUS</name>
-    <url>http://rome.scrus.com</url>
-    <descr>Simple Chat Relay Unix Server (Chat Server)</descr>
-    <email>engi@scrus.com; rawhide@volcanus.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Scarfies.Net Consultants</name>
-    <url>http://www.scarfies.net/</url>
-    <descr>Network Consulting and Design</descr>
-    <email>dan@scarfies.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Seawolf</name>
-    <url>http://flarock.servehttp.com/seawolf</url>
-    <descr>A group revolving around PHP development &amp; Open Source.</descr>
-    <email>djlethal@unixhideout.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>St. Anthony's college, San Jose antique, Phillipines 5700</name>
-    <url>http://www.sac.edu.ph</url>
-    <descr>The first and Only ISP in Antique, Servers are powered by FREEBSD</descr>
-    <email>axel@sac.edu.ph</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>State Science Technical Center of NRS Ukraine</name>
-    <url>http://www.sstc.kiev.ua</url>
-    <descr>Goverment</descr>
-    <email>locust@sstc.kiev.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Drunken Force of Mediocre Magnitude</name>
-    <url>http://www.dfmm.org</url>
-    <descr>UNIX Sysadmins and Developers</descr>
-    <email>pat@dfmm.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Microsoft Eradication Society</name>
-    <url>http://www.fuckMicrosoft.com</url>
-    <descr>A website that informs about the evils of Microsoft software, with information about alternatives, and user forums.</descr>
-    <email>webmaster@ms-eradication.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Universidade de Brasilia</name>
-    <url>http://www.unb.br</url>
-    <descr>WWW, FTP and mail servers</descr>
-    <email>LLazarte@mat.unb.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Vintage Glider Club in Poland</name>
-    <url>http://www.vgc.aleja.info</url>
-    <descr>Oldtimer gliders pilots club in Poland</descr>
-    <email>wwojcik@vgc.aleja.info</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Web Experts</name>
-    <url>http://web.azrabita.net</url>
-    <descr>A Web project aimed to providence of freedom to all who want a borderless internet.</descr>
-    <email>promo@web.azrabita.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Webjunker Software</name>
-    <url>http://webjunker.com</url>
-    <descr>Free Custom CGI Scripts</descr>
-    <email>kevidag@yahoo.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>XGoogle.ORG</name>
-    <url>http://XGoogle.ORG</url>
-    <descr>Fast IRC Search for channels in almost 300 IRC Networks</descr>
-    <email>same@XGoogle.ORG</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>cH1pMuNk Pr0j3cTz</name>
-    <url>http://chipmunkprojectz.tk</url>
-    <descr>AIM, CAD, Winamp Skinning, Programming, Flash 5</descr>
-    <email>chipmunkprojectz@msn.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>cepek</name>
-    <url>http://www.cepeknet.com</url>
-    <descr>non profit organization</descr>
-    <email>cepek@cepeknet.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>indecline</name>
-    <url>http://www.indecline.net</url>
-    <descr>politics, society and punk rock</descr>
-    <email>sir0n@indecline.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>so36.NET e.V.</name>
-    <url>http://so36.net</url>
-    <descr>Berlin-Kreuzberg internetworking. opensource projects, workshops, communication!... entirely powered by FreeBSD</descr>
-    <email>ths@so36.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>davidmorris.sytes.net</name>
-    <url>http://davidmorris.sytes.net</url>
-    <descr>davidmorris.sytes.net</descr>
-    <email>garfield@davidmorris.sytes.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>http://mingrone.org</name>
-    <url>http://mingrone.org</url>
-    <descr>personal site</descr>
-    <email>joey@mingrone.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>http://www.mareto.xpam.de</name>
-    <url>http://www.mareto.xpam.de</url>
-    <descr>Linux,Unix,Windows,Ipv6</descr>
-    <email>admin@mareto.xpam.de</email>
-  </entry>
-
-  <entry type="personal">
-    <name>.jduB / The CareBears Network</name>
-    <url>http://carebears.mine.nu</url>
-    <descr>Personal server for Christer Gundersen alias dizzy tun3Z of .jduB</descr>
-    <email>dtunez@online.no</email>
-  </entry>
-
-  <entry type="personal">
-    <name>A local network powered by FreeBSD (Dutch)</name>
-    <url>http://koetze.xs4all.nk</url>
-    <descr>A local network powered by FreeBSD (Dutch)</descr>
-    <email>netmaster@koetze.xs4all.nl</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Arthur!</name>
-    <url>http://www.lugtigheid.org</url>
-    <descr>I'm proud to be a nerd!</descr>
-    <email>arthur@ambacht.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Bactroid.net</name>
-    <url>http://www.bactroid.net</url>
-    <descr>Technology/Critical Theory/Gaming discussion site</descr>
-    <email>fuzzcat@bactroid.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Claudius Zingerli</name>
-    <url>http://walhalla.ksz.ch</url>
-    <descr>Statistics more and more</descr>
-    <email>bsd@zeuz.ch</email>
-  </entry>
-
-  <entry type="personal">
-    <name>College Friends at Siruvani, Coimbatore.</name>
-    <url>http://www.sathishmls.freeurl.com</url>
-    <descr>About &amp; For my College Friends by B.SATHISH KUMAR</descr>
-    <email>sathishmls@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>DukeTech</name>
-    <url>http://www.duketech.net</url>
-    <descr>Personal Experimental Site</descr>
-    <email>neigaard@gadefejer.dk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Ed Servaas</name>
-    <url>http://eservaas.xs4all.nl</url>
-    <descr>phpnuke powered site under freeBSD</descr>
-    <email>krokodil.nl@xs4all.nl</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Eskes</name>
-    <url>http://www.eskes.com</url>
-    <descr></descr>
-    <email>freebsd@eskes.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Europa</name>
-    <url>http://europa.ath.cx</url>
-    <descr>My rantings, resume, music, band demos etc</descr>
-    <email>jturner@pacific,net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>For Hire</name>
-    <url>http://zaw.kcconsultants.com</url>
-    <descr>Kansas City Consultant For Hire</descr>
-    <email>zaw@kcconsultants.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>FreeBSD Hackers Net</name>
-    <url>http://www.freebsdhackers.net</url>
-    <descr>Help and All things related to FreeBSD on irc.freebsdhackers.net  #freebsd</descr>
-    <email>shane@freebsdhackers.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Gielstrup</name>
-    <url>http://www.gielstrup.dk</url>
-    <descr>webmail hosting based on FreeBSD Apache PHP Horde IMP and...</descr>
-    <email>christian@gielstrup.dk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Jacob Turner</name>
-    <url>http://j-turner.org</url>
-    <descr>My site that sometimes changes</descr>
-    <email>me@j-turner.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Jonathan's FreeBSD Journal</name>
-    <url>http://jdarnold.tzo.com/FreeBSD</url>
-    <descr>Travels &amp; travails with FreeBSD</descr>
-    <email>jdarnold@buddydog.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Kim Tae-woo</name>
-    <url>http://www.wizzet.net</url>
-    <descr>www.wizzet.net</descr>
-    <email>wizzet@wizzet.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>alwaysdrunk.com</name>
-    <url>http://www.alwaysdrunk.com</url>
-    <descr>Funny drunken antics!</descr>
-    <email>drew@alwaysdrunk.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>droid_bsd</name>
-    <url>http://bsd.hopto.org</url>
-    <descr>Italian site</descr>
-    <email>androidex@micanet.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>iamadan productions</name>
-    <url>http://www.iamadan.com</url>
-    <descr>Personal site for pianist, composer, and audio engineer...</descr>
-    <email>danmorton@iamadan.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>none</name>
-    <url>http://www.Danovitsch.dnsq.org</url>
-    <descr>Site with electronics-projects I've build and some personal photos</descr>
-    <email>Danovitsch@Danovitsch.dnsq.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>probsd.ws</name>
-    <url>http://probsd.ws</url>
-    <descr>Pro BSD Site</descr>
-    <email>ms@probsd.ws</email>
-  </entry>
-
-  <entry type="personal">
-    <name>rwx.to</name>
-    <url>http://rwx.to</url>
-    <descr>Gordon McAllister's personal site.  Shells, mail service and web hosting for friends and family, UNIX-related articles, documentation and mirrors available. </descr>
-    <email>gordonm-web@rwx.to</email>
-  </entry>
-
-  <entry type="personal">
-    <name>simple3</name>
-    <url>http://simple3.dhs.org</url>
-    <descr>Personal Site</descr>
-    <email>simple3@simple3.dhs.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>tan tock seng hospital</name>
-    <url>http://www.ttsh.com.sg</url>
-    <descr>health care</descr>
-    <email>jennylz720@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>thumper.lefty.ca</name>
-    <url>http://thumper.lefty.ca</url>
-    <descr>personal site</descr>
-    <email>thumpermail@lefty.ca</email>
-  </entry>
-
-  <entry type="personal">
-    <name>webmail-demo.elga.net.id</name>
-    <url>http://webmail-demo.elga.net.id</url>
-    <descr>webmail aplication</descr>
-    <email>gian@elga.net.id</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Eazynet</name>
-    <url>http://www.eazy.net.id</url>
-    <descr>Internet Service Provider &amp; IT Solution</descr>
-    <email>webmaster@eazy.net.id</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>2BLC</name>
-    <url>http://www.2blc.com</url>
-    <descr>French WEB HOSTING COMPANY</descr>
-    <email>contact@2blc.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>4BSoftware</name>
-    <url>http://www.4bsoftware.com</url>
-    <descr>Technology Consultancy</descr>
-    <email>info@4bsoftware.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AAA - Mountpoint KEG</name>
-    <url>http://www.mountpoint.at</url>
-    <descr>Internet Service Provider Content Provider Network Solutions</descr>
-    <email>mg@mountpoint.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ADWIN</name>
-    <url>http://www.adwin.com/index_english.html</url>
-    <descr>we produce teaching and training materials of electric ,electronic , mechanical scene.</descr>
-    <email>ttsuda@adwin.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Absolight</name>
-    <url>http://www.absolight.net/</url>
-    <descr>French Web Hosting Company  In Paris, France</descr>
-    <email>info@absolight.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AcademNet</name>
-    <url>http://www.academ.org</url>
-    <descr>Internet provider, hosting, web-mail</descr>
-    <email>lucky@academ.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Active High Ltd</name>
-    <url>http://www.active-high.co.uk/</url>
-    <descr>Web solutions provider</descr>
-    <email>info@active-high.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Adhost Internet</name>
-    <url>http://adhost.com</url>
-    <descr>Full service Web hosting, co-location and development</descr>
-    <email>sales@adhost.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Aperion Information Technologies Inc.</name>
-    <url>http://www.aperion.com</url>
-    <descr>Computer Sales and Service Company</descr>
-    <email>kblanzy@aperion.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Asia Solution Philippines, Inc.</name>
-    <url>http://www.asol.com.ph</url>
-    <descr>IT Solution Provider</descr>
-    <email>andrew@asol.com.ph</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Auto - Atlas.cz</name>
-    <url>http://auto.atlas.cz</url>
-    <descr>WWW all about cars</descr>
-    <email>radamcz@seznam.cz</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Aveks ltd.</name>
-    <url>http://aveks.ru</url>
-    <descr>computer service company</descr>
-    <email>episkop@inbox.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Azuria Conseil SARL</name>
-    <url>http://www.azuria.net/</url>
-    <descr>consulting and hosting french company</descr>
-    <email>pviet@azuria.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Blazingdot</name>
-    <url>http://www.blazingdot.com</url>
-    <descr>Internet hosting and services in Santa Barbara, California, USA</descr>
-    <email>info@blazingdot.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Boengo</name>
-    <url>http://www.boengo.com</url>
-    <descr>Business solutions for non-technical companies.</descr>
-    <email>lei@boengo.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BriteSiteInet Inc.</name>
-    <url>http://www.britesite.net</url>
-    <descr>ISP in Chicago. Dialup,  Website design and hosting.</descr>
-    <email>sysadmin@bsinet.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Business-expert K</name>
-    <url>http://www.busexpert.ru/</url>
-    <descr>Business consulting and solutions, including hosting services</descr>
-    <email>webmaster@busexpert.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CIGER sa</name>
-    <url>http://www.ciger.be/</url>
-    <descr>IT solutions for public administrations in Belgium</descr>
-    <email>info@ciger.be</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Calvaria Publishing House</name>
-    <url>http://www.calvaria.org</url>
-    <descr>Ukrainian publisher of modern literature</descr>
-    <email>admin@calvaria.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Catch Communications AS</name>
-    <url>http://www.catchcom.com/</url>
-    <descr>Larger norwegian ISP</descr>
-    <email>info@catchcom.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Computer Supplies</name>
-    <descr>Wholesale Computer</descr>
-    <email>tekmancomputers@aol.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Corvette-Telecom ISP</name>
-    <url>http://www.corvette-telecom.ru</url>
-    <descr>ISP in Moscow, Russia</descr>
-    <email>lm@corvette-telecom.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DIA Travel LCC Ltd.</name>
-    <url>http://www.diatravel.ru</url>
-    <descr>TOGLIATTI Travel Company &amp; Lufthansa City Center</descr>
-    <email>admin@diatravel.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DLmaker Communication Inc.</name>
-    <url>http://www.dlmaker.com</url>
-    <descr>B2B e-Office Solution</descr>
-    <email>support@dlmaker.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Digi-Net Technologies, Inc.</name>
-    <url>http://www.groopz.com/wizard.html</url>
-    <descr>Groopz is an entirely new way to connect to visitors to your web site. Groopz allows you to monitor your web site in real-time through the Groopz Operator program. Your sales representatives can proactively contact a web site visitor, retrieve detailed user information, including their path through your site, their browser, their IP Address, and offer sales assistance via a one-to-one instant messaging interface.</descr>
-    <email>lindroth@digi-net.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Digital Works,Inc.</name>
-    <url>http://www.digital-heart.com/</url>
-    <descr>Quality web hosting and E-Commerce hosting and Service in Yamanashi JAPAN. </descr>
-    <email>office@digital-heart.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EN Communications, Inc Singapore</name>
-    <url>http://www.en.com.sg</url>
-    <descr>Singapore based Webhosting Company</descr>
-    <email>slash@en.com.sg</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Egenieria</name>
-    <url>http://www.e-genieria.com</url>
-    <descr>Avant-garde Internet company that provides PHP web development, database backed web sites, web design, internet and intranet servers with FreeBSD and Open Source solutions. </descr>
-    <email>info@e-genieria.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Elkdata Inc</name>
-    <url>http://elkdata.com</url>
-    <descr>Web hosting and e-commerce hosting in Estonia based on FreeBSD servers</descr>
-    <email>elkon@elkdata.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FLORIVAL FM</name>
-    <url>http://www.florival-fm.com</url>
-    <descr>Florival FM is a french radio station. We use FREEBSD as network gateway, for our broadband internet connection, we use FREEBSD for our daily backups, and Apache/PHP/Mysql/CACTI, and many many more things ;o) FREEBSD RULEzzzzz !!</descr>
-    <email>tech@florival-fm.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Gaming Unlimited Network</name>
-    <url>http://www.playwithgun.com</url>
-    <descr>Gaming Site with Ladder systems, news, forums, and more.</descr>
-    <email>markmark@playwithgun.com, focus@playwithgun.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Geek-A-Byte Computer Solutions</name>
-    <url>http://www.geek-a-byte.com</url>
-    <descr>Computer Repair, Web Design, Programming, Networking</descr>
-    <email>www@geek-a-byte.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Genesis Technology Solutions, Inc</name>
-    <url>http://www.gentechinc.com</url>
-    <descr>Software Development</descr>
-    <email>ebrown@gentechinc.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GigGuardian, Inc.</name>
-    <url>http://www.gigguardian.com/</url>
-    <descr>GigGuardian - Managed Solutions ISP</descr>
-    <email>vhm3@gigguardian.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Hawaii Wireless &amp; Broadband</name>
-    <url>http://www.hawaiibroadband.net</url>
-    <descr>Bringing High-Speed Internet via WiFi and PowerLine.</descr>
-    <email>jsy@hawaiibroadband.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Host on Fly S.A.</name>
-    <url>http://www.hostonfly.net/</url>
-    <descr>Cluster based web-hosting</descr>
-    <email>office@hostonfly.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ImpSat Comunicacoes</name>
-    <url>http://www.impsat.com.br</url>
-    <descr>Corporative ISP, Carries, Telephony, Fiber Optics Provider</descr>
-    <email>dsantos@impsat.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Infohet Szamitastechnikai Kft.</name>
-    <url>http://www.infohet.hu</url>
-    <descr>IBM Business Partner - Budapest, Dunaujvaros, Szombathely, Szeged (Hungary)</descr>
-    <email>its@infohet.hu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>InterNExT Studio</name>
-    <url>http://www.inext.hu</url>
-    <descr>ISP in Hungary</descr>
-    <email>fifteen@inext.hu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Haven Corporation</name>
-    <url>http://www.ihc.com.ph</url>
-    <descr>ISP based in Bacolod City, Philippines</descr>
-    <email>ktalledo@vast.com.ph</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Internet Networking Group</name>
-    <url>http://ing-group.net</url>
-    <descr>Web Hosting &amp; Internet Payment Systems</descr>
-    <email>support@ing-group.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Kanka GmbH</name>
-    <url>http://www.kanka.de</url>
-    <descr>Software Developement, Consulting - we use FreeBSD on our Web- and Application Server</descr>
-    <email>bvdb@kanka.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Kibernet Zavod</name>
-    <url>http://www.kibernet.si</url>
-    <descr>IT solutions</descr>
-    <email>info@kibernet.si</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Konzoom, LTD.</name>
-    <url>http://www.konzoom.com</url>
-    <descr>Providing low-cost quality internet services.</descr>
-    <email>info@konzoom.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>LocalIsps.net</name>
-    <url>http://www.localisps.net</url>
-    <descr>ISP in Pittsburgh, PA area.</descr>
-    <email>durham@jcdurham.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Masaoka Technology Research Co.,Ltd</name>
-    <url>http://www.masaoka.co.jp</url>
-    <descr>A think tank</descr>
-    <email>masaoka@masaoka.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MediaWebGroup</name>
-    <url>http://www.m-w-g.com</url>
-    <descr>Media &amp; Web Design &amp; Hosting</descr>
-    <email>admin@m-w-g.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Monarch Cable Systems</name>
-    <url>http://www.monarch.net</url>
-    <descr>High Speed Internet Provider</descr>
-    <email>tluttman@monarch.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NEP Supershooters</name>
-    <url>http://www.nepinc.com</url>
-    <descr>Television Mobile Production Facilities</descr>
-    <email>jimd@nepinc.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Net.Style Ltd. (Ukraine)</name>
-    <url>http://www.netstyle.com.ua/</url>
-    <descr>Webdevelopment and hosting company</descr>
-    <email>never@netstyle.com.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NetFriend LTD</name>
-    <url>http://www.ircf.net</url>
-    <descr>Polish Service Provider of FreeBSD  servers, web hosting and development, domain name services, e-Commerce solutions, dedicated server, database and application services. </descr>
-    <email>rw@netfriend.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NetFriend Ltd</name>
-    <url>http://www.netfriend.org</url>
-    <descr>Internet Service Provider and IT Technology Poland</descr>
-    <email>rw@netfriend.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NetMails.NET</name>
-    <url>http://www.netmails.net</url>
-    <descr>Web email system for SPAM prevention</descr>
-    <email>afcuycxyav@email.netmails.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Netfirms Web Hosting</name>
-    <url>http://www.netfirms.com</url>
-    <descr>Massive scale clustered self healing web hosting platform</descr>
-    <email>thomas@netfirms.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nordpoint Solutions AB</name>
-    <url>http://www.nordpoint.com</url>
-    <descr>Video and broadcasting technology, uses freebsd for intranet services.</descr>
-    <email>kristjan@nordpoint.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NovoDesign S.A.</name>
-    <url>http://www.novodesign.pt</url>
-    <descr>Whe use FreeBSD 4.5 for: DNS, Mail Relay Server, FTP servers, proxy server, database servers, web servers/Java servers conected by informix java client to the database servers, and IDS too.</descr>
-    <email>francisco@nortenet.pt</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>OgreLand [tm]</name>
-    <url>http://ogreland.lv</url>
-    <descr>IT solutions</descr>
-    <email>core@ogreland.lv</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Orenda Sdn Bhd</name>
-    <url>http://www.orenda.com.my</url>
-    <descr>The ORENDA Solution</descr>
-    <email>admin@orenda.com.my</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Penny Pages Hosting</name>
-    <url>http://www.penny.ca</url>
-    <descr>Webdesign, Domain Hosting &amp; Registration</descr>
-    <email>pam@penny.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Powweb Inc.</name>
-    <url>http://powweb.com</url>
-    <descr>The perfect hosting solution.</descr>
-    <email>starr@powweb.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RESEAUNIX</name>
-    <url>http://www.reseaunix.net</url>
-    <descr>ISP</descr>
-    <email>derf@reseaunix.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ROMmon Ltd</name>
-    <url>http://www.rommon.com/</url>
-    <descr>Robust Online Metric Monitoring System</descr>
-    <email>pete@rommon.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RT Technologies</name>
-    <url>http://www.rtelectronics.net</url>
-    <descr>Computer and electronics sales and service</descr>
-    <email>rct@rtelectronics.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ringtail Solutions</name>
-    <url>http://www.ringtail.com.au</url>
-    <descr>We use freebsd for our email servers, dns, proxy, dhcp and all low level networking tasks.</descr>
-    <email>jimbo@ringtail.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Rubicon Group</name>
-    <url>http://www.rub.nl</url>
-    <descr>ICT consultancy</descr>
-    <email>r.morsman@rubicongroup.biz</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Rus-Sell online store - Russian goods direct</name>
-    <url>http://www.rus-sell.com</url>
-    <descr>Online store selling Russian goods</descr>
-    <email>alex@rus-sell.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SUNICOM Ltd.</name>
-    <url>http://www.syunik.am</url>
-    <descr>Internet Service Provider in Southern Armenia</descr>
-    <email>info@syunik.am</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Santos Andir� Ind�stria de M�veis Ltda</name>
-    <url>http://www.santosandira.com.br</url>
-    <descr>The Brazilian Family�s Furniture</descr>
-    <email>santos@santosandira.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SleekSystems, Inc.</name>
-    <url>http://www.sleeksys.com</url>
-    <descr>Integrated computer systems and flat panel displays.</descr>
-    <email>ttaylor@sleeksys.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Softinfo Network</name>
-    <url>http://www.softinfo.com.br</url>
-    <descr>All of our servers run FreeBSD! </descr>
-    <email>info@softinfo.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sophistic Systems ApS</name>
-    <url>http://sophistic.com</url>
-    <descr>Danish inernet development company using FreeDSB servers as hosting platform for Websites and Content Management software</descr>
-    <email>contact@sophistic.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SpeedyLine</name>
-    <url>http://speedyline.ru</url>
-    <descr>Internet access in small town Mosrentgen(near Moscow)</descr>
-    <email>cemehehko@mail.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Spicker.corp</name>
-    <url>http://www.Spicker.com02.com</url>
-    <descr>Computer,info,cheats...</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Superintend�ncia do Porto do Rio Grande</name>
-    <url>http://www.portoriogrande.com.br</url>
-    <descr>The Port of Rio Grande administration - Brazil</descr>
-    <email>dtartari@portoriogrande.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>THINK-ING</name>
-    <url>http://think-ing.be</url>
-    <descr>Credit Card Affiliations &amp; POS terminals</descr>
-    <email>technical@think-ing.be</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TecnoStore</name>
-    <url>http://www.tecnostore.cl</url>
-    <descr>TecnoStore Chile Ltda.</descr>
-    <email>eduardo@tecnostore.cl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tensor</name>
-    <url>http://tensor.ru</url>
-    <descr>Computer components supplier and software developer</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Public Internet</name>
-    <url>http://www.thePublicInternet.org</url>
-    <descr>Freelance Web development and tech support consulting agency</descr>
-    <email>info@thePublicInternet.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>UniSE</name>
-    <url>http://www.unise.nl</url>
-    <descr>UNIX services and consultancy 'eenmanszaak' in Nederland</descr>
-    <email>peter@unise.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Unipress</name>
-    <url>http://www.searchforu.nl</url>
-    <descr>Advertisement</descr>
-    <email>upa@xs4all.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WERTZ.hu</name>
-    <url>http://www.wertz.hu</url>
-    <descr>FreeBSD based Web Hosting Provider - reseller, developer</descr>
-    <email>info@wertz.hu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Webhosting.net Inc</name>
-    <url>http://www.webhosting.net</url>
-    <descr>Virtual Hosting, Dedicated Hosting, Co-location and hosting automation</descr>
-    <email>dave@webhosting.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>XYZ systems inc.</name>
-    <url>http://www.dejaweb.ne.jp/</url>
-    <descr>Dejaweb rental server</descr>
-    <email>ikeda@xyzsys.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>XinYuan tech.</name>
-    <url>http://www.oh100.com</url>
-    <descr>www.oh100.com</descr>
-    <email>market@oh100.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>adendum.com - banner exchange</name>
-    <url>http://www.adendum.com/</url>
-    <descr>banner exchange and free banner design</descr>
-    <email>wlodek@adendum.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>e-Nexgen</name>
-    <url>http://www.e-nexgen.com</url>
-    <descr>Internet Service Provider</descr>
-    <email>mail@e-nexgen.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>e-value</name>
-    <url>http://www2.e-value.fr</url>
-    <descr>Financial Newswire</descr>
-    <email>max@e-value.fr</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>eCamp Messaging Services</name>
-    <url>http://www.ecamp.net</url>
-    <descr>Camp Comminity Software</descr>
-    <email>adam@pobox.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>opensource-consult</name>
-    <url>http://www.opensource-consult.com</url>
-    <descr>yet another try to spread the good news about free software</descr>
-    <email>info@opensource-consult.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>veco video &amp; musica</name>
-    <url>http://www.vecovideoemusica.it</url>
-    <descr>music &amp; video store</descr>
-    <email>webmaster@vecovideoemusica.it</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>aa's delphi page</name>
-    <url>http://delphi.formasi.com</url>
-    <descr>download delphi components + source code</descr>
-    <email>aa@formasi.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>AIII-Institut Teknologi Bandung</name>
-    <url>http://www.ai3.itb.ac.id</url>
-    <descr>The gateway of Asian Internet Interconnection Initiatives in Indonesia</descr>
-    <email>humas@ai3.itb.ac.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Aston University Careers Service</name>
-    <url>http://www.careers.aston.ac.uk/</url>
-    <descr>Careers Service Web Application Server</descr>
-    <email>S.P.Goodman@aston.ac.uk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Aston University MIS Department</name>
-    <url>http://www.mis.aston.ac.uk/</url>
-    <descr>Web Application Server</descr>
-    <email>S.P.Goodman@aston.ac.uk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Bureau of Chemistry (EUITOP-UPM)</name>
-    <url>http://pc32-96.op.upm.es</url>
-    <descr>Academic (chemistry) site</descr>
-    <email>jgobantes@op.upm.es</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Cube Inc</name>
-    <url>http://cube.ftyczka.org</url>
-    <descr>Free Hosting Server located in Cracow,Poland</descr>
-    <email>freeze@cube.ftyczka.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Department of Electronic Engineering, Universidad Federico Santa Maria, Chile</name>
-    <url>http://www.elo.utfsm.cl</url>
-    <descr>web site</descr>
-    <email>gastudil@elo.utfsm.cl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>E-Supinfo</name>
-    <url>http://www.e-supinfo.com</url>
-    <descr>Web hosting</descr>
-    <email>e@supinfo.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>EURO</name>
-    <descr>David Duke's office Website</descr>
-    <email>sales@davidduke.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>FEU-Nicanor Reyes Medical Foundation</name>
-    <url>http://www.feu-nrmf.ph</url>
-    <descr>FEU-NRMF Hospital uses FreeBSD as a proxy server to it's network.</descr>
-    <email></email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>FreeBSDChamp</name>
-    <url>http://www.linuxchamp.4t.com</url>
-    <descr>Started Work on Unix Base Platform and sort it out FreeBSD, Because FreeBSD is really Excellent.</descr>
-    <email>nomankhn@yahoo.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Frydenlund vgs</name>
-    <url>http://www.frydenlund.vgs.no</url>
-    <descr>Norwegian college in narvik</descr>
-    <email>webmaster@frydenlund.vgs.no</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>GamesNET eV.</name>
-    <url>http://www.gamesnetlan.de</url>
-    <descr>German Lanparty Organisation</descr>
-    <email>tlott@gamesnetev.de</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>H Zero Seven</name>
-    <url>http://www.h07.org</url>
-    <descr>Intranet Gateway for exp-shells.org</descr>
-    <email>phantom@h07.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Halozat az Ifjusagert Kht.</name>
-    <url>http://www.ngo.hu</url>
-    <descr>A non-profit Internet Service Provider on Hungary</descr>
-    <email>bob@ngo.hu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Hungarian Astronomical Association</name>
-    <url>http://www.mcse.hu/</url>
-    <descr>The official site of the HAA. More webservers for hungarian amateur astonomers, public observatorys, mailing-lists, etc. ;-) Content only hungarian!</descr>
-    <email>nyozo@mcse.hu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Joek Geldrop</name>
-    <url>http://joek.dnsq.org</url>
-    <descr>Joek's Homepage</descr>
-    <email>sander@joek.dnsq.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Manicmoment Network Services</name>
-    <url>http://www.manicmoment.net</url>
-    <descr>Low or No-cost hosting and E-Mail services for Non-Profit Groups.</descr>
-    <email>admin@manicmoment.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Nanodot</name>
-    <url>http://www.nanodot.org</url>
-    <descr>Nanodot - News and Discussion of Emerging Technologies</descr>
-    <email>ben@foresight.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Northshells.net</name>
-    <url>http://www.northshells.net</url>
-    <descr>free unix shell accounts (limited for type of use)</descr>
-    <email>support@northshells.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Phuket Community College</name>
-    <url>http://proxy1.pcc.psu.ac.th</url>
-    <descr>Using for Proxy Server</descr>
-    <email>simon@pcc.psu.ac.th</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>School of Fine Arts Hamburg</name>
-    <url>http://www.kunsthochschule.uni-hamburg.de</url>
-    <descr>the university of fine arts in hamburg, germany.</descr>
-    <email>grzlbmpf@kunsthochschule.uni-hamburg.de</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>TCBUG</name>
-    <url>http://www.tcbug.org</url>
-    <descr>Twin Cities (Minneapolis/St.Paul MN, USA) BSD User Group</descr>
-    <email>friar_josh@webwarrior.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Oxford Greek Play</name>
-    <url>http://medea.org.uk/</url>
-    <descr>Website for Medea by Euripedes - at the Oxford Playhouse in the UK.</descr>
-    <email>chris@medea.org.uk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>UK Gamer Networks Ltd</name>
-    <url>http://www.ukgamer.net</url>
-    <descr>The premier resource for gamers in the UK</descr>
-    <email>llatif@ukgamer.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Univ. of Connecticut - Dept. of Molecular &amp; Cell Biology</name>
-    <url>http://lynes.mcb.uconn.edu/</url>
-    <descr>The Lynes Laboratory</descr>
-    <email>peter.lai@uconn.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Universidad APEC</name>
-    <url>http://www.unapec.edu.do</url>
-    <descr>Dominican University.</descr>
-    <email>edwinc@unapec.edu.do</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University Muhammadiyah of Malang</name>
-    <url>http://www.umm.ac.id</url>
-    <descr>FreeBSD user site</descr>
-    <email>admin@umm.ac.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of California, San Diego</name>
-    <url>http://facilities.ucsd.edu</url>
-    <descr>FacilitiesLink</descr>
-    <email>rnanderson@ucsd.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of Connecticut - Dept. of Molecular &amp; Cell Biology</name>
-    <url>http://fccif.mcb.uconn.edu/</url>
-    <descr>Flow Cytometry &amp; Confocal Imaging Facility</descr>
-    <email>sirmoo@cowbert.2y.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Unsavoury.net</name>
-    <url>http://unsavoury.net</url>
-    <descr>fantastic webhosting for and by fantastic people</descr>
-    <email>admin@unsavoury.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Versailles St-Quentin University</name>
-    <url>http://www.uvsq.fr/</url>
-    <descr>University-Education</descr>
-    <email></email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>altyday</name>
-    <url>http://www.altyday.com02.com</url>
-    <descr>for all in the web!</descr>
-    <email>dyab18@caramail.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>c0n</name>
-    <url>http://www.c0nclan.com</url>
-    <descr>Unreal Tournament clan web site</descr>
-    <email>shiva@c0nclan.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>polarhome.com</name>
-    <url>http://www.polarhome.com</url>
-    <descr>Gateway to freedom - shell on all available systems</descr>
-    <email>support@polarhome.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>speakunix.net</name>
-    <url>http://www.speakunix.net</url>
-    <descr>Forum for Unix users. And some other stuff will appear soon.</descr>
-    <email>theman@speakunix.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>tango free services</name>
-    <url>http://tango.flipp.net/</url>
-    <descr>Ideal organization contributing free internet services to chosen individuals.</descr>
-    <email>dixie+freebsdweb@tango.flipp.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>tku</name>
-    <url>http://ftp.im.tku.edu.tw/webftpd</url>
-    <descr>tku university</descr>
-    <email>athlon@ftp.im.tku.edu.tw</email>
-  </entry>
-
-  <entry type="personal">
-    <name>0xE.net</name>
-    <url>http://www.0xe.net</url>
-    <descr>0xE.net Network</descr>
-    <email>root@0xe.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>23x</name>
-    <url>http://www.23x.net/</url>
-    <descr>A non-introspective weblog. Geeky and fun.</descr>
-    <email>jared@23x.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>AlphaSystem</name>
-    <url>http://alphasystem.dnsalias.net/~amaryl</url>
-    <descr>A.I. resources.</descr>
-    <email>johan.baltie@wanadoo.fr</email>
-  </entry>
-
-  <entry type="personal">
-    <name>BSDBox</name>
-    <url>http://bsdbox.homeunix.com</url>
-    <descr>Winston Smith: Personal Weblog &amp; IT Security Resources</descr>
-    <email>winston.smith@bsdbox.homeunix.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Cyborgs</name>
-    <url>http://cyborgs.got2get.net</url>
-    <descr>Quake 3 Rocket Arena Clan</descr>
-    <email>cyborgs@got2get.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>DanFX</name>
-    <url>http://www.DanFX.com</url>
-    <descr>Personal Developed System</descr>
-    <email>Admin@DanFX.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>DaveyJ.Com</name>
-    <url>http://www.daveyj.com</url>
-    <descr>David J. Meier's blip on the WWW...</descr>
-    <email>freebsd@daveyj.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>F.Kimura's Homepage (fkimura.com)</name>
-    <url>http://fkimura.com/</url>
-    <descr>I show a memo of server setting by Traveler's Diary and FreeBSD of the Federated States of Micronesia. However, it is written only in Japanese.</descr>
-    <email>jfkimura@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Gumbyware Internotional</name>
-    <url>http://www.gumbyware.com/</url>
-    <descr>Personal site: web &amp; mail server, and router; indoors, file and database (PostgreSQL) server</descr>
-    <email>occupant@gumbyware.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Home User</name>
-    <url>http://www.tungxuanquan.com:8080/</url>
-    <descr>home server for my personal photography use</descr>
-    <email>onguyen@optonline.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>ICONPLN</name>
-    <url>http://rino.iconpln.net.id</url>
-    <descr>FreeBSD user site</descr>
-    <email>rino@iconpln.net.id</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Induced Reality</name>
-    <url>http://www.inducedreality.net</url>
-    <descr>Personal site for David Vetter</descr>
-    <email>david@inducedreality.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Lonecore Longboarding site</name>
-    <url>http://wero.dyndns.org/Lonecore</url>
-    <descr>Lonecore</descr>
-    <email>ueli_niggli@web.de</email>
-  </entry>
-
-  <entry type="personal">
-    <name>MarkPude.com</name>
-    <url>http://www.markpude.com/</url>
-    <descr>Always keep on keepin' on.</descr>
-    <email></email>
-  </entry>
-
-  <entry type="personal">
-    <name>New Devices</name>
-    <url>http://www.newdevices.com</url>
-    <descr>Seminars and tutorials</descr>
-    <email>lupolo@newdevices.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Personal</name>
-    <url>http://free-tech.ns0.it</url>
-    <descr>Adding performances to old hardware using Open Source technologies</descr>
-    <email>Sergio.Stellato@tin.it</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Sal Quaranta &amp; Assoc, Ltd.</name>
-    <url>http://SalQuarantaAssocltd.com</url>
-    <descr>Educational / Research / Master Photography</descr>
-    <email>Sal@SalQuaranta.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Sigstop</name>
-    <url>http://www.sigstop.com</url>
-    <descr>Useless information for no one in particular...</descr>
-    <email>mike@sigstop.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Sofia Internet Cafe</name>
-    <url>http://hades.gigguardian.com/</url>
-    <descr>The Sofia Internet Cafe</descr>
-    <email>vhm3@hades.gigguardian.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>SqueakyWeasel.net</name>
-    <url>http://squeakyweasel.net</url>
-    <descr>All the insanity wrapped into one package</descr>
-    <email></email>
-  </entry>
-
-  <entry type="personal">
-    <name>Stan and Cathy's web server</name>
-    <url>http://cosmo.pasadena.ca.us</url>
-    <descr>Schwarz family web site in Pasadena, California</descr>
-    <email>stan@cosmo.pasadena.ca.us</email>
-  </entry>
-
-  <entry type="personal">
-    <name>StevieG</name>
-    <url>http://www.stevieg.org/</url>
-    <descr>Steve Goodman's Homepage</descr>
-    <email>steve@stevieg.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Teapottraveler</name>
-    <url>http://www.teapottraveler.com</url>
-    <descr>David Hares personel web site.</descr>
-    <email>david420h@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Tufan DEVECi</name>
-    <url>http://tufanonline.net</url>
-    <descr>HeLLo !!! I am Using CooL FreeBSD 4.5 RELEASE Web, Dns, Qmail, Mysql, FirewaLL &amp; more...</descr>
-    <email>admin@tufanonline.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>code-fu</name>
-    <url>http://www.code-fu.com/</url>
-    <descr>msmith's personal website</descr>
-    <email>msmith@code-fu.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>cognel</name>
-    <url>http://cognel.darktech.org</url>
-    <descr>personal site</descr>
-    <email>cd@x0r.dk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>draschl.cc</name>
-    <url>http://www.draschl.cc</url>
-    <descr>Personal Site of Draschl Clemens</descr>
-    <email>clemens@draschl.cc</email>
-  </entry>
-
-  <entry type="personal">
-    <name>jobeus.net</name>
-    <url>http://jobeus.net</url>
-    <descr>Just a little site about me, Jobe</descr>
-    <email>jobe-www@jobeus.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>lm3.net</name>
-    <url>http://www.lm3.net</url>
-    <descr>Personal Server</descr>
-    <email>enfo@bigfoot.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>mlodzik.com</name>
-    <url>http://mlodzik.com</url>
-    <descr>Homepage of the Mlodzik familly (Poland)</descr>
-    <email>lukasz@mlodzik.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>nc.EDiGiC.com</name>
-    <url>http://nc.edigic.com</url>
-    <descr>A personal page with a few interesting features.</descr>
-    <email>vaxcine@nc.edigic.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>student</name>
-    <url>http://kheops.unice.fr/~ylievin/projet/</url>
-    <descr>student's web site of telecoms and networks</descr>
-    <email>ylievin@iutsoph.unice.fr</email>
-  </entry>
-
-  <entry type="personal">
-    <name>supermorten.dk</name>
-    <url>http://supermorten.dk</url>
-    <descr>Personal Homepage (in Danish)</descr>
-    <email>webmaster@supermorten.dk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>12 Design Group</name>
-    <url>http://www.12designgroup.com</url>
-    <descr>Marketing</descr>
-    <email>webmaster@12designgroup.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>123LogAnalyzer</name>
-    <url>http://www.123loganalyzer.com</url>
-    <descr>Fast, powerful and detailed web log analysis software.</descr>
-    <email>biz@123loganalyzer.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>5280 Technologies</name>
-    <url>http://www.5280tech.com</url>
-    <descr>Hosting and Internet services provider in Denver, CO</descr>
-    <email>rforsythe@5280tech.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ABLogic LLC</name>
-    <url>http://www.ablogic.ru</url>
-    <descr>ISP. Uses FreeBSD for PROXY and DNS services</descr>
-    <email>ablogic@ablogic.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ALLNEO</name>
-    <url>http://allneo.com</url>
-    <descr>Dallas Texas, USA Service Provider of FreeBSD servers, web hosting and development, domain name services, e-Commerce solutions, dedicated server, database and application services.</descr>
-    <email>info@allneo.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AVNET.COM</name>
-    <url>http://home.aveironet.com</url>
-    <descr>Portuguese hosting / design solutions working with freeBSD systems</descr>
-    <email>geral@aveironet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AWD Computing</name>
-    <url>http://www.awdcomputing.net</url>
-    <descr>Computer Support company in Kansas City, MO</descr>
-    <email>webmaster@awdcomputing.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Advanced Web Hosting from Seiretto</name>
-    <url>http://www.seiretto.com</url>
-    <descr>Web Hosting on Unix with PHP and MySQL</descr>
-    <email>webmaster@seiretto.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Aerre Multimedia</name>
-    <url>http://www.aerre.biz</url>
-    <descr>Internet service provider, portal systems and multimedia</descr>
-    <email>luca@aerre.biz</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Affinitas</name>
-    <url>http://www.affinitas.net</url>
-    <descr>Marketing Firm</descr>
-    <email>ggregory@affinitas.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Agentbrand</name>
-    <descr>Builds Websites 'on the fly' for Realtors</descr>
-    <email>frank@agentbrand.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Alternative Web Services</name>
-    <url>http://www.alternative.net.au</url>
-    <descr>Providing web hosting, email hosting, DNS, IRCd, shell accounts</descr>
-    <email>ceo@alternative.net.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Asgard Internet Services</name>
-    <url>http://www.asgard.net.au</url>
-    <descr>Internet Service Provider</descr>
-    <email>hostmaster@asgard.net.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Atom e-City Ltd.</name>
-    <url>http://www.atomecity.com</url>
-    <descr>Translation and localization services</descr>
-    <email>webmaster@atomecity.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Aus PC Market</name>
-    <url>http://www.auspcmarket.com.au</url>
-    <descr>Australia's Premiere PC Sales Site</descr>
-    <email>alan@auspcmarket.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Aztronaut</name>
-    <url>http://www.aztronaut.com</url>
-    <descr>internet services</descr>
-    <email>freebsd@aztronaut.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BTREE NET</name>
-    <url>http://www.btree.ne.jp/</url>
-    <descr>BTREE NET Network Service</descr>
-    <email>masaki@btree.ne.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BTSoftware BV</name>
-    <url>http://www.btsoftware.com</url>
-    <descr>European Shareware Registration</descr>
-    <email>btsoftware@btsoftware.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Beast</name>
-    <url>http://www.masterbeast.com</url>
-    <descr>Beast Is DIRECTOR Master Hacking  &amp; Hack And Hackers Home &amp; Luleburgazcity/TURKEY</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BlastHosting</name>
-    <url>http://www.blasthosting.com</url>
-    <descr>Professional web hosting at a low price with PHP, MySQL, FreeBSD, and more</descr>
-    <email>justin@hot.rr.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BlastNet InterNet Services</name>
-    <url>http://www.blast.net</url>
-    <descr>NJ Based ISP. Web hosting, Dialup, SDSL, T1, &amp; T3 </descr>
-    <email>sysadmin@blast.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Capital Internet, LLC</name>
-    <url>http://www.capital-internet.net</url>
-    <descr>ISP</descr>
-    <email>brian@capital-internet.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Chasma, Inc</name>
-    <url>http://www.chasma.net</url>
-    <descr>Wireless Software Publisher</descr>
-    <email>eross_a@chasma.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Chinese Patent Infonet</name>
-    <url>http://www.patent.com.cn/</url>
-    <descr>Chinese Patent Information,Patent Searching, Transformation of Chinese Patent</descr>
-    <email>webmaster@patent.com.cn</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CintriX Technologies</name>
-    <url>http://www.cintrix.net</url>
-    <descr>Deploying and maintaining FreeBSD/Linux servers. Web services employing a full spectrum of both client and server side development. Our Intranet server is powered by FreeBSD with Atlon 1.7</descr>
-    <email>solutions@cintrix.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Coreix Systems</name>
-    <url>http://www.coreixsystems.com.au</url>
-    <descr>Perth, Australia - Based development company which specialises in the development of BSD Unix servers and software.</descr>
-    <email>info@coreixsystems.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CriticalHost.com</name>
-    <url>http://www.criticalhost.com/</url>
-    <descr>FreeBSD dedicated servers for mission critical application. Fully managed dedicated servers with high bandwidth and security</descr>
-    <email>custhelp@criticalhost.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cyber Consulting A/S</name>
-    <url>http://www.cyber.no</url>
-    <descr>Consulting and software development, specializing in J2EE. Bergen, Norway</descr>
-    <email>info@cyber.no</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DEMO Studio Co.</name>
-    <url>http://myhosting.hu</url>
-    <descr>WEB Hosting services</descr>
-    <email>info@myhosting.hu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Dauria Ltd</name>
-    <url>http://www.promsnab.ru</url>
-    <descr>Our main activity is trading and deliveries of wide range of industrial products to big enterprises, mostly working in power and nuclear industries. </descr>
-    <email>kuzmich@promsnab.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Dotlinux</name>
-    <url>http://www.dotlinux.net</url>
-    <descr>We use FreeBSD as a database, mail and web severs for BSD and Linux development tools and nerd news.</descr>
-    <email>shadhown@dotlinux.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Dvx Computer Systems</name>
-    <url>http://www.dvx-systems.net</url>
-    <descr>Dvx Systems services that make a diffrence</descr>
-    <email>troy@dvx-systems.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Etek Consultant</name>
-    <url>http://www.etek.com.hk</url>
-    <descr>A solution provider specialising in opensource software. Network design and implementation, system administration, commercial support, training etc. </descr>
-    <email>admin@etek.com.hk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Exploitz.com Travel and Adventure Guide</name>
-    <url>http://www.exploitz.com/</url>
-    <descr>Adventure community, destination guide and travel deals</descr>
-    <email>css_freebsd@exploitz.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Fillmore Labs</name>
-    <url>http://www.fillmore-labs.com/</url>
-    <descr>managing intellectual property: DRM (Digital Rights Management) solutions for your software</descr>
-    <email>eikemeier@fillmore-labs.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FingernailCare.com</name>
-    <url>http://www.fingernailcare.com</url>
-    <descr>Sells special cream for growing healthy fingernails</descr>
-    <email>barbara@fingernailcare.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Funeral Exchange</name>
-    <url>http://www.funeralexchange.com</url>
-    <descr>Internet Solutions for the Death Care industry: Website Design, Hosting, ASP Solutions, Custom Application Development</descr>
-    <email>info@funeralexchange.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Gunbow Trading Company</name>
-    <url>http://www.gunbow.biz</url>
-    <descr>Export Trade</descr>
-    <email>samson@myrealbox.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HotSurvey.com</name>
-    <url>http://HotSurvey.com</url>
-    <descr>Market research for technology, financial, consumer, goverment and entertaiment industries</descr>
-    <email>info@Hotsurvey.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ISP Kahovka Net</name>
-    <url>http://www.kahovka.net</url>
-    <descr>Inetnet Service Provider</descr>
-    <email>admin@kahovka.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>InformAsic.com</name>
-    <url>http://www.InformAsic.com</url>
-    <descr>InformAsic is a fabless ASIC and SoC design house. We use FreeBSD internally on engineering workstations and general servers with great success and little if no problems at all.</descr>
-    <email>Joachim.Strombergson@InformAsic.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Kumprang Internet Cafe</name>
-    <url>http://www.kumprang.or.id/</url>
-    <descr>Internet cafe and game PC kumprang - Bandung - West Java - Indonesia</descr>
-    <email>budsz@kumprang.or.id</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>LiWing IT-Services</name>
-    <url>http://www.liwing.de/</url>
-    <descr>FreeBSD client, server &amp; gateway configuration &amp; installation in germany</descr>
-    <email>freebsd@liwing.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Like Whoa, Inc.</name>
-    <url>http://www.likewhoa.com</url>
-    <descr>Premiere web hosting and Internet services</descr>
-    <email>ben@likewhoa.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>LikeTelevision</name>
-    <url>http://tesla.liketelevision.com/</url>
-    <descr>Watch Broadband movies, classic tv, Sci-Fi TV, vintage commercials and cartoons at LikeTelevision</descr>
-    <email>willy@liketelevision.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>LogicInternet.Com</name>
-    <url>http://www.logicinternet.com</url>
-    <descr>The World #1 Web Hosting Service Provider</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MIcrobit Ltd</name>
-    <url>http://www.microbit.ru</url>
-    <descr>Microbit Notebook Company</descr>
-    <email>noc@microbit.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Maju Holdings Sdn Bhd</name>
-    <url>http://www.maju.com.my</url>
-    <descr>ENGINEERING, TRANSPORTATION, TRAVEL, SHIPPING and the LEISURE INDUSTRY</descr>
-    <email>admin@maju.com.my</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mawit Ltd.</name>
-    <url>http://www.mawit.com/</url>
-    <descr>M@wit Ltd, Helsinki, Finland</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>McLaut ISP</name>
-    <url>http://web.2upost.com</url>
-    <descr></descr>
-    <email>kurstak@2mcl.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mentor of the dark technologie</name>
-    <url>http://www.mentr.cc</url>
-    <descr>Network Security knownledge-platform</descr>
-    <email>s1ash@mentr.cc</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MyBSD Enterprise</name>
-    <url>http://www.mybsd.org.my</url>
-    <descr>Malaysian BSD Team</descr>
-    <email>info@mybsd.org.my</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NEWSITE INTERNET</name>
-    <url>http://www.newsite.com.br/</url>
-    <descr>Broadband Internet Access Provider</descr>
-    <email>suporte@newsite.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Netwave Technologies Inc.</name>
-    <url>http://www.netwave.com</url>
-    <descr>Premier Disaster Recovery &amp; Backup Services. Dedicated Servers &amp; Colocation Services.</descr>
-    <email>ngeyer@netwave.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Northumberland Network Services</name>
-    <url>http://www.northnetworks.ca</url>
-    <descr>Network Consultants/Integrators Providing Network &amp; Internet Solutions</descr>
-    <email>info@northnetworks.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Oregon Dept. of Forestry</name>
-    <url>http://swo.odf.state.or.us</url>
-    <descr>Medford, Oregon Weathercam</descr>
-    <email>bill.m.ostrander@odf.state.or.us</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Oslonett AS</name>
-    <url>http://www.oslonett.no</url>
-    <descr>This ISP uses FreeBSD for routing and firewalling. </descr>
-    <email>morten@oslonett.no</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Pittsburgh Technical Institute</name>
-    <url>http://www.pti-tec.com</url>
-    <descr>Technical School</descr>
-    <email>showers@pti-tec.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PlazaNetwork.Com</name>
-    <url>http://www.plazanetwork.com</url>
-    <descr>One of Mexico's most visited websites, with 18 million hits per month. Also one of the biggest webhosting companies in Mexico.</descr>
-    <email>bebo@plazanetworks.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Progtech GmbH</name>
-    <url>http://www.progtech.net/</url>
-    <descr>Full Service Provider in Germany</descr>
-    <email>info@progtech.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RacingWeb.NET</name>
-    <url>http://racingweb.net</url>
-    <descr>The Biggest Racing car Website in Thailand.</descr>
-    <email>webmaster@racingweb.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RacingWeb.NET</name>
-    <url>http://racingweb.net/</url>
-    <descr>The Biggest Racing car Website in Thailand.</descr>
-    <email>webmaster@racingweb.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RecursoWeb</name>
-    <url>http://recursoweb.com</url>
-    <descr>Build you bussines on the net</descr>
-    <email>rodrigoglz@recursoweb.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Referable.Com, Inc</name>
-    <url>http://www.referable.com/</url>
-    <descr>Web Hosting Services</descr>
-    <email>freebsdlisting@referable.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Response Networking Inc.</name>
-    <url>http://www.ResponseNetworking.com</url>
-    <descr>Systems integration in Manhattan using FreeBSD as Windows NT/2K/.net server replacment</descr>
-    <email>gdew@responsenetworking.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Riau University</name>
-    <url>http://freebsd.unri.ac.id</url>
-    <descr>FreeBSD server at Riau University</descr>
-    <email>ariel@unri.ac.id</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SMU-Net</name>
-    <url>http://www.smu-net.de</url>
-    <descr>Webhosting Provider</descr>
-    <email>info@smu-net.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ServiHosting S.L.</name>
-    <url>http://www.servihosting.com</url>
-    <descr>Services of Hosting, Housing, Coalocation &amp; shells in Spain</descr>
-    <email>hostmaster@servihosting.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Simplicato</name>
-    <url>http://www.simplicato.com</url>
-    <descr>Provides Web Hosting, Website Development, Domain Registration.  FreeBSD Servers serve DNS, Mail, FTP, and Apache.</descr>
-    <email>info@simplicato.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>So-In Network Media</name>
-    <url>http://www.so-in.com</url>
-    <descr>The entertainment in China's website.</descr>
-    <email>sunny@so-in.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sportnetwork</name>
-    <url>http://www.sportnetwork.net</url>
-    <descr>Network of fanzine and official sport club sites</descr>
-    <email>jon@sportnetwork.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>StepTech Inc.</name>
-    <url>http://www.steptech.com.tw</url>
-    <descr>Embedded FreeBSD system</descr>
-    <email>ppear@vip.sina.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>StepTech,Inc.</name>
-    <url>http://www,steptech.com.tw</url>
-    <descr>Embedded FreeBSD system</descr>
-    <email>david@steptech.com.tw</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Sylhet Online</name>
-    <url>http://www.sol-bd.com</url>
-    <descr>Internet Service Provider</descr>
-    <email>litu@sol-bd.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Teraoka System Corporation</name>
-    <url>http://www.trs-sys.co.jp/</url>
-    <descr>Network design - Japanese only</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Thai Cold Rolled Steel Sheet Public Company Limited</name>
-    <url>http://www.tcrss.com</url>
-    <descr>Bangkok,Thailand</descr>
-    <email>rachane_k@hotmail.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Golfline, Inc</name>
-    <url>http://www.thegolfline.net</url>
-    <descr>Golf marketing, reservation, tournament, travel, and transportation services</descr>
-    <email>franky@thegolfline.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Sun Factory</name>
-    <url>http://www.sunfactory.fr/en</url>
-    <descr>Shop in South of France</descr>
-    <email>marc@sunfactory.fr</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Typhoon Technologies, Inc.</name>
-    <url>http://www.typhoontech.net</url>
-    <descr>Networking and Security Services for small and medium sized businesses.</descr>
-    <email>Steve@@typhoontech.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ventana Technology, Inc</name>
-    <url>http://www.ventanatech.com</url>
-    <descr>SysAdmins at VentanaTech.com: senior large site UNIX consultants</descr>
-    <email>UNIXconsultants@ventanatech.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WebTimeTMS</name>
-    <url>http://www.webtimetms.com</url>
-    <descr>Web enabled Time and Task Management Solutions</descr>
-    <email>mark.yadegar@romseyassoc.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Webalianza Consortium</name>
-    <url>http://www.webalianza.com</url>
-    <descr>An group of IT start-ups from Spain</descr>
-    <email>admin@lambdanw.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Wedding Central Australia</name>
-    <url>http://www.weddingcentral.com.au</url>
-    <descr>Full featured open source portal focusing on weddings in Australia</descr>
-    <email>info@weddingcentral.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Wilco</name>
-    <url>http://wilcoworld.net</url>
-    <descr>Recording Artist</descr>
-    <email>kwaagner@mac.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Wirelink Coprporate Provider</name>
-    <url>http://www.wirelink.com.br</url>
-    <descr>Provedor de Acesso Wireless - Fortaleza - Ceara</descr>
-    <email>pedrohernando@wirelink.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>XS4ALL NEDERLAND BV</name>
-    <url>http://www.xs4all.nl</url>
-    <descr>XS4ALL INTERNET PROVIDER</descr>
-    <email>info@xs4all.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>XT6</name>
-    <url>http://mboxca.tripod.com</url>
-    <descr>computer repair</descr>
-    <email>cyberpunk@blackcodemail.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Xinag</name>
-    <url>http://xinag.nl</url>
-    <descr>A dutch IT consultancy/troubleshooting company</descr>
-    <email>webmaster@xinag.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>adendum</name>
-    <url>http://www.adendum.com</url>
-    <descr>banner excahnge</descr>
-    <email>adendum@adendum.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>hederi.com</name>
-    <url>http://hederi.com</url>
-    <descr>Suporte e e solu�oes baseadas em Freebsd - Belo Horizonte Minas Gerais Brasil</descr>
-    <email>heder@hederi.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>iemployee</name>
-    <url>http://www.iemployee.com</url>
-    <descr>Timesheet Management Software</descr>
-    <email>yogita_sarla@hotmail.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>linopryne corporation</name>
-    <url>http://www.linopryne.com</url>
-    <descr>*BSD network services</descr>
-    <email>jorge@linopryne.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>lipstickandcigarettes.com</name>
-    <url>http://www.lipstickandcigarettes.com</url>
-    <descr>community site including board and profiles</descr>
-    <email>scott@lipstickandcigarettes.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>litio.net</name>
-    <url>http://www.litio.net/</url>
-    <descr>spanish studio dedicated to the arts and sciences of the XXI century</descr>
-    <email>info@litio.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>logirent</name>
-    <url>http://www.logirent.com</url>
-    <descr>Internet security</descr>
-    <email>yvan.merle@logirent.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>nahlo.com</name>
-    <url>http://www.nahlo.com</url>
-    <descr>IT Solution Provider and powered by freebsd</descr>
-    <email>eggie@nahlo.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>scoobysNET ISP</name>
-    <url>http://www.scoobysnet.com</url>
-    <descr>Dumaguete City, PH ISP</descr>
-    <email>jhay@scoobysnet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>sportweb</name>
-    <url>http://www.sportweb.8k.com</url>
-    <descr>hosting and web sesign</descr>
-    <email>daniel57@hotmail.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ACIDH</name>
-    <url>http://www.acidh.org</url>
-    <descr>Catalonian Association of Human Development and Integration</descr>
-    <email>jdomingo@acidh.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Abakan Internet community</name>
-    <url>http://www.abakan.ru</url>
-    <descr>Site of Abakan city, Russia</descr>
-    <email>sk@mail.abakan.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>BBS-Unilanet</name>
-    <url>http://www.unila.ac.id</url>
-    <descr>Provider Internet on University of Lampung - Indonesia</descr>
-    <email>riki@unila.ac.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>BTREE NET</name>
-    <url>http://www.btree.org/</url>
-    <descr>BTREE NET Network Service</descr>
-    <email>masaki@btree.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Bay Area Legal Services, Inc.</name>
-    <url>http://www.bals.org</url>
-    <descr>A nonprofit law firm providing free services to low-income and special-needs groups.</descr>
-    <email>rwilhoite@bals.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Bluemosque Fraternity</name>
-    <url>http://www.bluemosquefraternity.net/</url>
-    <descr>Bluemosque Charity Network</descr>
-    <email>info@bluemosquefraternity.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>CSACC</name>
-    <url>http://www.minagro.crimea.ua</url>
-    <descr>The Crimean state agrarian consultation centre</descr>
-    <email>info@minagro.crimea.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Canadian Historical Aircraft Association</name>
-    <url>http://www.ch2a.ca</url>
-    <descr></descr>
-    <email>james.wilson22@sympatico.ca</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>DVM-Siberia Ltd</name>
-    <url>http://www.dvm-siberia.ru</url>
-    <descr></descr>
-    <email>admin@dvm-siberia.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Duke University Statistics Department</name>
-    <url>http://www.stat.duke.edu/</url>
-    <descr>(nearly) all of the department's Unix workstations run FreeBSD</descr>
-    <email>help@stat.duke.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Escola T�cnica Santo In�cio</name>
-    <url>http://www.stoinacio.linux-site.net</url>
-    <descr>Servidor de Acesso a Internet</descr>
-    <email>juliano@stoinacio.com.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>FreeBSD folks</name>
-    <url>http://www.freebsdfolks.org</url>
-    <descr>FreeBSD newbie friendly community</descr>
-    <email>jorge@linopryne.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Gadjah Mada University</name>
-    <url>http://ugm.ac.id</url>
-    <descr>The biggest university in Indonesia with more than 50,000 students...  powered by FreeBSD as Domain Name Server</descr>
-    <email>prastowo@ugm.ac.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Hawaii Association of School Psychologists (HASP)</name>
-    <url>http://www.hasp.org/</url>
-    <descr>Professional organization for school psychologists in Hawaii (affiliated with NASP)</descr>
-    <email>webmaster@hasp.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Hudiksvalls Kommun</name>
-    <url>http://www.hudiksvall.se</url>
-    <descr>Hudiksvalls kommun public network. For internet and application servers and employee communication</descr>
-    <email>webmaster@hudiksvall.se</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>IH8UFKR Inc.</name>
-    <url>http://freebsd.ih8ufkr.com</url>
-    <descr>Non Profit FreeBSD Shell Server for Undernet #FreeBSD members</descr>
-    <email>jps@ih8ufkr.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>InfoFreeBSD</name>
-    <url>http://www.InfoFreeBSD.org</url>
-    <descr>FreeBSD User group in Indonesia</descr>
-    <email>riki@unila.ac.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Klaipeda University</name>
-    <url>http://www.ku.lt</url>
-    <descr>Main WWW site</descr>
-    <email>tomas.padrieza@ku.lt</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Laptop Malag Net</name>
-    <url>http://laptop.malag.net</url>
-    <descr>Brief howto run FreeBSD on your Pioneer/Clevo P5800 laptop</descr>
-    <email>laptop@malag.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Logical Security</name>
-    <url>http://www.logical-security.com</url>
-    <descr>A site Dedicated for Security and Related stuff</descr>
-    <email>logic@logical-security.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Morons.org</name>
-    <url>http://www.morons.org/</url>
-    <descr>Morons in the news, with commentary and rants</descr>
-    <email>webmaster@morons.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Museum of Microcomputing</name>
-    <url>http://www.museummc.org.uk</url>
-    <descr>Site dedicated to information and support for classic computer products. (Username: freebsd, password: daemon)</descr>
-    <email>mharrodine@blueyonder.co.uk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Netdot.org</name>
-    <url>http://www.netdot.org</url>
-    <descr>network tools, useful sites, etc.</descr>
-    <email>james@netdot.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Oklahoma Medical Research Foundation - Arthritis &amp; Immunology</name>
-    <url>http://lupus.omrf.ouhsc.edu</url>
-    <descr>Genetic research in Immunology</descr>
-    <email>kilpatjr@lupus.omrf.ouhsc.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Orbit Visualization Tool</name>
-    <url>http://ovt.irfu.se</url>
-    <descr>a software designed for interactive 3D visualization of satellite orbits in the terrestrial magnetosphere. </descr>
-    <email>ko@nest.irfu.se</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Rabbitwalker Network Association</name>
-    <url>http://www.phetast.nu</url>
-    <descr>Computer- and Network Association in J�nk�ping, Sweden.</descr>
-    <email>louie@phetast.nu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Rudjer Boskovic Institute, Library</name>
-    <url>http://triton.irb.hr</url>
-    <descr>triton.irb.hr</descr>
-    <email>keeper@fly.srk.fer.hr</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Ryebox Shells</name>
-    <url>http://www.ryebox.webhop.org</url>
-    <descr>Free *BSD Shell Accounts</descr>
-    <email>ryebox@linuxmail.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>School of Experiential Education</name>
-    <url>http://damien.homeunix.net</url>
-    <descr>SEE|Net Student Server</descr>
-    <email>unixfreeek@hotmail.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ScoutNet Switzerland</name>
-    <url>http://www.pfadi.ch/</url>
-    <descr>non-profit webspace provider for Swiss scout units</descr>
-    <email></email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Secondary School</name>
-    <url>http://www.sko.bg</url>
-    <descr>School's web, mail, DNS and so on server</descr>
-    <email>webmaster@sko.bg</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Sportcenter University Nijmegen</name>
-    <url>http://www.kun.nl/usc</url>
-    <descr>Webserver, printserver</descr>
-    <email>r.druten@usc.kun.nl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Taekwon-Do Hoechberg, Germany</name>
-    <url>http://www.taekwondo-hoechberg.de</url>
-    <descr>Taekwon-Do Club in Germany</descr>
-    <email>info@taekwondo-hoechberg.de</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Telefono Azzurro</name>
-    <url>http://www.azzurro.it</url>
-    <descr>Volunteers non-profit organization protecting child rights</descr>
-    <email>francesco.cicala@azzurro.it</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Testing State Centre of Uzbekistan</name>
-    <url>http://www.dtm.uz</url>
-    <descr>Internal multi-purpose UNIX server</descr>
-    <email>vaska80s@mail.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Ukrainian FreeBSD User Group (UAFUG)</name>
-    <url>http://uafug.org.ua/</url>
-    <descr>Website for Ukrainian FreeBSD community, also running cvsup, www and ftp mirrors.</descr>
-    <email>never@nevermind.kiev.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of Novi Sad, Department of Mathematics and Informatics</name>
-    <url>http://perun.im.ns.ac.yu/</url>
-    <descr>Web, proxy, dial-in, ftp, database services</descr>
-    <email>zjb@im.ns.ac.yu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Unix Fanatic</name>
-    <url>http://www.aldemonio.org</url>
-    <descr>My personal homepage on FreeBSD</descr>
-    <email>victor@aldemonio.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Vicki &amp; Stacey</name>
-    <url>http://www.vickiandstacey.com</url>
-    <descr>Personal development site, running on FreeBSD</descr>
-    <email>stacey@vickiandstacey.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Vilnius Hardcore</name>
-    <url>http://www.hardcore.lt/</url>
-    <descr>punk rock and anarcho activists website from Lithuania</descr>
-    <email>vhc@hardcore.lt</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>[mame.dk]</name>
-    <url>http://www.mame.dk/</url>
-    <descr>arcade rom and information repository</descr>
-    <email>mameadm@chaos.dk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>fengyue</name>
-    <url>http://www.fengyue.net</url>
-    <descr>fengyue net club ,gateway,firewall,www,php,mysql,samba</descr>
-    <email>lys3000cn@163.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>lobbyNet</name>
-    <url>http://www.lobbynet.net</url>
-    <descr>lobbyNet is the online community and official web site of the lobby music project.</descr>
-    <email>lobby@lobbynet.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ramdac.org  :   News, games, Forums, conspiracies...etc</name>
-    <url>http://www.ramdac.org</url>
-    <descr>News, and cool stuff for everyone in the world</descr>
-    <email>ramdac@ramdac.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Nazgull</name>
-    <url>http://nazgull.ath.cx/</url>
-    <descr>a personnal web/ftp/mail server ... in french for the moment</descr>
-    <email>nazgull@nazgull.ath.cx</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Andrew Ridland's personal site</name>
-    <url>http://ridland.ca</url>
-    <descr>Andrew Ridland's personal site</descr>
-    <email>andrew@ridland.ca</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Larry West's Homepage</name>
-    <url>http://www.delacom.demon.co.uk/larry/</url>
-    <descr>Larry West's Homepage</descr>
-    <email>Larry@delacom.demon.co.uk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>David Friedman's Personal Web Site</name>
-    <url>http://www.driz.org/</url>
-    <descr>David Friedman's Personal Web Site</descr>
-    <email>webmaster@driz.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Ender Networks</name>
-    <url>http://ender.tog.net</url>
-    <descr>Counter-Strike WarCraft III server</descr>
-    <email>bnet_webpage@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>442spot.com</name>
-    <url>http://www.442spot.com</url>
-    <descr>FreeBSD powered website documenting the restoration of my 1970 Oldsmobile and other Olds related info.</descr>
-    <email>domain@442spot.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>An electronic noticeboard</name>
-    <url>http://web.quick.cz/a.mackal</url>
-    <descr>Home page -- Adam Mackal</descr>
-    <email>a.mackal@ieee.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Andrew Novikov</name>
-    <url>http://www.an.kiev.ua/</url>
-    <descr>Andrew Novikov's personal site</descr>
-    <email>an@an.kiev.ua</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Arctic Linux &amp; FreeBSD</name>
-    <url>http://arctic-linux.tnett.no</url>
-    <descr>Linux and FreeBSD support site</descr>
-    <email>kolbjorn@arctic-linux.tnett.no</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Area366 Soho Style Plus</name>
-    <url>http://www.area366.net/</url>
-    <descr>Japanese site. Job matching for soho style workers. Powered by FreeBSD, PostgreSQL.</descr>
-    <email>info@area366.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>BSDBoy's Personal Site</name>
-    <url>http://bsd.servebeer.com</url>
-    <descr>Personal FreeBSD site. See my FreeBSD tattoo!</descr>
-    <email>bsdboy@nyarlathotep.dyndns.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Bigjames.net</name>
-    <url>http://www.bigjames.net</url>
-    <descr>My FreeBSD server project!    Love it</descr>
-    <email>admin@bigjames.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Bsd.pe.kr</name>
-    <url>http://www.bsd.pe.kr</url>
-    <descr>personal  projects ,documents  and  miscellaneous</descr>
-    <email>webmaster@bsd.pe.kr</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Bug-Man's Place on the Web</name>
-    <url>http://bugman.dyns.cx/</url>
-    <descr>Website of Bug-Man</descr>
-    <email>bugman@tshrew.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Christ Church, Oxford University</name>
-    <url>http://kant1.chch.ox.ac.uk/</url>
-    <descr>A Twiki site -- Contains my work and teaching material.</descr>
-    <email>robert.frazier@chch.ox.ac.uk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Direx</name>
-    <url>http://isp.direx.org</url>
-    <descr>Direx - Ukrainian Providers review</descr>
-    <email>digireg@ua.fm</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Essetee's webpagina's</name>
-    <url>http://www.essetee.be</url>
-    <descr>FreeBSD -- Dutch Help Pages</descr>
-    <email>serge@essetee.be</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Festina Lente</name>
-    <url>http://festinalente.info</url>
-    <descr>Personal photo site of Erwin Kooi and Willeke Moleman</descr>
-    <email>erwin@ewak.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Ghost.serveftp.net</name>
-    <url>http://ghost.serveftp.net</url>
-    <descr>Free Unix shell account server running FreeBSD</descr>
-    <email>jkuo@ghost.serveftp.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Han-soft</name>
-    <url>http://www.han-soft.8800.org</url>
-    <descr>Han-soft Devloper</descr>
-    <email>hanjy@han-soft.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Home</name>
-    <url>http://www.freeman.org.ua</url>
-    <descr>Alexandr Peresunko (aka freeman) homepage</descr>
-    <email>hostmaster@freeman.org.ua</email>
-  </entry>
-
-  <entry type="personal">
-    <name>JSpit</name>
-    <url>http://www.jspit.org</url>
-    <descr>JSpit chat project homepage.</descr>
-    <email>shane@freebsdhackers.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>K4HVK.COM</name>
-    <url>http://www.k4hvk.com</url>
-    <descr>Ham Radio open source links and Ham Radio links of general interest</descr>
-    <email>red@k4hvk.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Ketoprak Dot Com</name>
-    <url>http://wima.ketoprak.com</url>
-    <descr>My personal WebLOG</descr>
-    <email>wima@ketoprak.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>LukasMaly.NET</name>
-    <url>http://LukasMaly.NET</url>
-    <descr>LukasMaly.NET</descr>
-    <email>im@LukasMaly.NET</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Marshallworld</name>
-    <url>http://www.marshallworld.com</url>
-    <descr>Marshall family home page, with Marshalls from around the world</descr>
-    <email>admin@marshallworld.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>NedBSD</name>
-    <url>http://nedbsd.nl</url>
-    <descr>A general BSD portal, for newbies and experts</descr>
-    <email>wijnand@wiersma.be</email>
-  </entry>
-
-  <entry type="personal">
-    <name>PAF-NET</name>
-    <url>http://www.paf-net.com</url>
-    <descr>We use the FreeBSD and Linux just for Peace And Free</descr>
-    <email>aimin@paf-net.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>PoorHeart Dot Com</name>
-    <url>http://www.poorheart.com</url>
-    <descr>A geek's personal website, SOAP/Mod_Perl Applications</descr>
-    <email>webmaster@poorheart.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Redlawn</name>
-    <url>http://www.redlawn.zapto.org/</url>
-    <descr>FreeBSD servers in Anglesey, Wales, UK!</descr>
-    <email>matthew@redlawn.zapto.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Rob Mason</name>
-    <url>http://robmason.dyndns.org</url>
-    <descr>Personal Web Server</descr>
-    <email>masonr@robmason.dyndns.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>S.D.M</name>
-    <url>http://sdmad.eu.org</url>
-    <descr>have a nice 486 :)</descr>
-    <email>sdm@sdmad.eu.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Tatsuya Yamamoto</name>
-    <url>http://rcn.oyt.jp/Estereogram.rhtml</url>
-    <descr>Stereograms (photographs, Java applications)</descr>
-    <email>rcn@gol.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The Humpy Communication Network</name>
-    <url>http://humpy.dyndns.org</url>
-    <descr>Fun site for me and people I meet and like to give shells to.</descr>
-    <email>camel@humpy.dyndns.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The King Tribe</name>
-    <url>http://www.thekingtribe.com</url>
-    <descr>Family website running on a FreeBSD Server</descr>
-    <email>jhks@thekingtribe.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The Nygren Family</name>
-    <url>http://familjen.nygrens.info</url>
-    <descr>Personal info in Swedish about the family Nygren</descr>
-    <email>erik@nygrens.info</email>
-  </entry>
-
-  <entry type="personal">
-    <name>TooManySecrets' HeadQuarters</name>
-    <url>http://www.toomany.net</url>
-    <descr>Personal web about FreeBSD, Perl and Open Source.</descr>
-    <email>toomany@toomany.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Tragic Kingdom</name>
-    <url>http://tragic-kingdom.net</url>
-    <descr>Just my everything unix box!</descr>
-    <email>abrandt@tragic-kingodm.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>UROBOROS.ORG</name>
-    <url>http://www.uroboros.org/</url>
-    <descr>I created the home server using FreeBSD and qmail.It is written in Japanese.</descr>
-    <email>nagaraja@uroboros.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Victor Reyes Personal Site</name>
-    <url>http://www.vicreyes.com</url>
-    <descr>Victor Reyes Personal Site</descr>
-    <email>vicreyes@vicreyes.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Zoltanium</name>
-    <url>http://www.zoltanium.com</url>
-    <descr>FreeBSD used as Web Servers, E-mail, DNS, Reverse SSL Proxies, Firewall, File Servers, etc.</descr>
-    <email>chris@zoltanium.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>aldis.times.lv</name>
-    <url>http://www.aldis.times.lv</url>
-    <descr>aldis</descr>
-    <email>alddis@one.lv</email>
-  </entry>
-
-  <entry type="personal">
-    <name>closedsrc.org</name>
-    <url>http://closedsrc.org/</url>
-    <descr>Personal website and playground for it's owner</descr>
-    <email>question@closedsrc.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>dweimer.org</name>
-    <url>http://www.dweimer.org/</url>
-    <descr>Home Broad Band - Firewall, Gateway, Mail, and Web Server - Demonstrates The Abilities of FreeBSD - Web Pages Includes some FreeBSD HowTo Files</descr>
-    <email>dweimer@dweimer.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>e-dataweb.com</name>
-    <url>http://www.elsilicio.net</url>
-    <descr>free project</descr>
-    <email>bluehack@e-daweb.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>freebsdfr.org</name>
-    <url>http://www.freebsdfr.org</url>
-    <descr>freebsd links, docs, tests ; and powered by freebsd of course ...</descr>
-    <email>lifo@freebsdfr.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>hhd.kingisme.com</name>
-    <url>http://hhd.kingisme.com</url>
-    <descr>Kingise.com</descr>
-    <email>webmaster@kingisme.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>kirkhus.org</name>
-    <url>http://www.kirkhus.org</url>
-    <descr>Personal webserver</descr>
-    <email>lars@kirkhus.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>kolte.dk</name>
-    <url>http://www.kolte.dk/</url>
-    <descr>Family web site (in Danish)</descr>
-    <email>webmaster@kolte.dk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>meijo</name>
-    <url>http://wwwecono.meijo-u.ac.jp/~sawada/html/freebsd/</url>
-    <descr>FreeBSD</descr>
-    <email>sawada@ccmfs.meijo-u.ac.jp</email>
-  </entry>
-
-  <entry type="personal">
-    <name>mod6 Net</name>
-    <url>http://www.mod6.net</url>
-    <descr>mod6's home page</descr>
-    <email>shane@freebsdhackers.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>myrte</name>
-    <url>http://myrte.dns2go.com</url>
-    <descr>my little piece of internet ;-)</descr>
-    <email></email>
-  </entry>
-
-  <entry type="personal">
-    <name>pegaheno</name>
-    <url>http://www.pegaheno.com</url>
-    <descr>ISP</descr>
-    <email>info@pegaheno.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>skywolf's home page</name>
-    <url>http://www.skywolf.net</url>
-    <descr>Web email and named virtual web hosting for family and friends, hosted on FreeBSD. </descr>
-    <email>jeep@skywolf.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>www.cybershade.us</name>
-    <url>http://www.cybershade.us</url>
-    <descr>FreeBSD server (K6 2-300) for projects, emails, ideas, docs and more... located in Toronto, Canada.</descr>
-    <email>miro@cybershade.us</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>34SP.com</name>
-    <url>http://www.34SP.com</url>
-    <descr>Fully featured, affordable web host</descr>
-    <email>info@34SP.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>A.S. Internet Club</name>
-    <url>http://N/A</url>
-    <descr>A club in Odessa, Ukraine. FreeBSD installed on the gateway. Cool.</descr>
-    <email>lazydog@mail.od.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AMTkom JSC</name>
-    <url>http://www.amtkom.ru.</url>
-    <descr>ISP, Moscow, Russia</descr>
-    <email>noc@amtcom.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ASP.pl</name>
-    <url>http://asp.pl</url>
-    <descr>Application Service Providing in Poland</descr>
-    <email>paulina@asp.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Aaex Corp.</name>
-    <url>http://www.aaex.com</url>
-    <descr>Developes and  operates numerous database driven web sites running on FreeBSD, including X-Mail.net and Teradex.com</descr>
-    <email>aaex@x-mail.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Acintrix</name>
-    <url>http://www.acintrix.net/</url>
-    <descr>Web Hosting, Builds Corporate Networks</descr>
-    <email>matthew@acintrix.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Adept Information Technology</name>
-    <url>http://www.AdeptIT.com.au</url>
-    <descr>Computers, Networks, Servers, Installations, hosting and more. Newcastle NSW Australia.</descr>
-    <email>geoff@AdeptIT.net.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Affiliate Tracking Network</name>
-    <url>http://affiliatetracking.net</url>
-    <descr>Company provides affiliate tracking solutions</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AirSurfer Wireless Internet</name>
-    <url>http://www.airsurfer.ca</url>
-    <descr>Alberta based wireless ISP</descr>
-    <email>michael@airsurfer.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Appalachian Web Solutions</name>
-    <url>http://www.appws.com</url>
-    <descr>BSD based web hosting company with focus on security and customer satisfaction.</descr>
-    <email>bnewport@appws.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Arcor Ag &amp; Co</name>
-    <url>http://www.arcor.de</url>
-    <descr>Full Service Provider in Germany</descr>
-    <email>i.ullmann@arcor-ip.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Arsenal PC Inc</name>
-    <url>http://www.arsenalpc.com</url>
-    <descr>Wholesale computer company. Systems and parts.</descr>
-    <email>alex@arsenalpc.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Assecura GmbH Germany</name>
-    <url>http://www.assecura.net</url>
-    <descr>Insurance brokers</descr>
-    <email>milagro@linuxppc.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ataris Technologies</name>
-    <url>http://www.ataris.co.za/</url>
-    <descr>Small ISP based in Cape Town, South Africa</descr>
-    <email>info@ataris.co.za</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Auguri</name>
-    <url>http://www.auguricorp.com</url>
-    <descr>Revlutionary query technology. Trade-off enabled, fo rthe next generation of applications</descr>
-    <email>sales@auguricorp.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Azerin JV</name>
-    <url>http://www.azerin.com</url>
-    <descr>The leader Internet Service Provider in the Azerbaijan Republic</descr>
-    <email>admin@azerin.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Aznetcard Ltd.</name>
-    <url>http://www.aznetcard.com</url>
-    <descr>Internet Service Provider</descr>
-    <email>admin@azerin.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AztlanSystems.net</name>
-    <url>http://www.aztlansystems.net/</url>
-    <descr>Aztlan Systems sells White Box computers, based on Intel and AMD architecture with FreeBSD preloaded. They also offer support in using FreeBSD</descr>
-    <email>info@aztlansystems.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Best Linux CDs.com</name>
-    <url>http://www.bestlinuxcds.com</url>
-    <descr>Got FreeBSD?  If you don't, we have the latest and greatest versions for ridiculously low prices.  Visit us now!</descr>
-    <email>sales@bestlinuxcds.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Biznethosting</name>
-    <url>http://www.biznethosting.com</url>
-    <descr>Web Hosting &amp; Design</descr>
-    <email>estamato@biznethosting.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Blackjack Review Network</name>
-    <url>http://www.BJRnet.com</url>
-    <descr>The premier blackjack, poker, gambling, and card counting information site for players who think.  Over 45 message boards,  chat rooms,  casino blackjack rules,  gambling archives, free links,  and a full product catalog for the serious player.  </descr>
-    <email>editor@BJRnet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Blair Mowchenko Computer Solutions</name>
-    <url>http://206.163.242.74</url>
-    <descr>Blair Mowchenko Computer Solutions</descr>
-    <email>bmcs@sasktel.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Bzerk Internet Services</name>
-    <url>http://www.bzerk.nl</url>
-    <descr>Hosting &amp; Open Source Solutions</descr>
-    <email>info@bzerk.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CIAdoSOM</name>
-    <url>http://www.ciadosom.net</url>
-    <descr>Radio on line</descr>
-    <email>webmaster@ciadosom.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CamTrace</name>
-    <url>http://camtrace.com</url>
-    <descr>video surveillance appliance server</descr>
-    <email>camtrace@axis.fr</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Canadian Net</name>
-    <url>http://www.canadian.net</url>
-    <descr>Web Hosting Provider</descr>
-    <email>dave@canadian.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ClickOn SYSTEMS, Inc.</name>
-    <url>http://www.clickonsystems.com</url>
-    <descr>Value Added Reseller, Web Hosting, Tier 2 ISP</descr>
-    <email>info@clickonsystems.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Cornet-AM</name>
-    <url>http://www.cornet.am</url>
-    <descr>Internet Service Provider In Armenia</descr>
-    <email>admin@cornet.am</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Datafull.com</name>
-    <url>http://datafull.com</url>
-    <descr>PC Downloads, News, Games, Tutorials (#1 site in Argentina) </descr>
-    <email>juan@datafull.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Designer Webpages Australia</name>
-    <url>http://www.des-web.com.au</url>
-    <descr>Website design firm specializing in eCommerce and eBusiness solutions using PHP, Perl, MySQL and hosting on FreeBSD.</descr>
-    <email>info@des-web.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Digital People Australia</name>
-    <url>http://www.digitalpeople.com.au</url>
-    <descr>Providing webhosting and internet related services in Melbourne, Australia.</descr>
-    <email>andrew@digitalpeople.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DysE Network</name>
-    <url>http://www.dyse.net</url>
-    <descr>Hosting, Mailservers, DNS, ISP, IPv6</descr>
-    <email>miguel@dyse.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ElgaNet</name>
-    <url>http://www.elga.net.id</url>
-    <descr>Indonesia ISP</descr>
-    <email>admin@elga.net.id</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FORMASI Group</name>
-    <url>http://www.formasi.com</url>
-    <descr>Consulting, Training-Education, Publishing, Trading, Production House, Jakarta - Indonesia</descr>
-    <email>aa@formasi.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Fen LAN Arena</name>
-    <url>http://www.fenlanarena.co.uk</url>
-    <descr>LAN Party Gaming in Lincolnshire &amp; Cambridgeshire, UK</descr>
-    <email>lan_mine@fenlanarena.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Finexcor S.A.</name>
-    <descr></descr>
-    <email>dsosa@finexcor.com.ar</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Full Color Prints</name>
-    <url>http://fullcolorprints.net</url>
-    <descr>An online print shop.</descr>
-    <email>ek@aperion.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GNUnetworks</name>
-    <url>http://www.gnunetworks.com</url>
-    <descr>Professional Agroupation (Networking, Systems, Security, E-Business, etc.) </descr>
-    <email>info@gnunetworks.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Hibbing Community College</name>
-    <url>http://www.hcc.mnscu.edu</url>
-    <descr>A Technical and Community College in Northern Minnesota</descr>
-    <email>donbrearley@hcc.mnscu.edu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Highlight Productions</name>
-    <url>http://highlightpro.sytes.net</url>
-    <descr>Video and Multimedia Productions</descr>
-    <email>webmaster@highlightpro.sytes.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Highveld Computing Solutions</name>
-    <url>http://www.highveldcs.com/</url>
-    <descr>Computer and Networking Consultancy</descr>
-    <email>will@highveldcs.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Hostlab BV</name>
-    <url>http://www.hostlab.nl/</url>
-    <descr>ISP</descr>
-    <email>leon@hostlab.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>JSC Konkrit</name>
-    <url>http://konkrit.perm.ru</url>
-    <descr>Joint Stock Company</descr>
-    <email>hostmaster@konkrit.perm.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>KOCMOC</name>
-    <url>http://kosmos.net.ru/</url>
-    <descr>PC Game club</descr>
-    <email>webmaster@kosmos.net.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>KPF Comserve SDN. BDH.</name>
-    <url>http://www.kpfcomserve.com</url>
-    <descr>IT Solutions</descr>
-    <email>leesuening@kpfcomserve.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Korbank Sp. z o.o.</name>
-    <url>http://www.korbank.com</url>
-    <descr>Ledaing ISP in Wroclaw (Poland)</descr>
-    <email>info@korbank.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Lanier Bed and Breakfast</name>
-    <url>http://www.lanierbb.com</url>
-    <descr>Lanier Bed and Breakfast. Directory</descr>
-    <email>webmaster@lanierbb.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Marko Karppinen Consulting</name>
-    <url>http://www.markokarppinen.com/</url>
-    <descr>Web-based solutions for complex business problems.</descr>
-    <email>karppinen@pobox.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Merz, spol. s r. o.</name>
-    <url>http://www.merz.cz</url>
-    <descr>Software for industrial information systems</descr>
-    <email>karel.picman@merz.cz</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MixJuiceNetwork.</name>
-    <url>http://mixjuice.ws/</url>
-    <descr>Japanese Rental CGI Service.</descr>
-    <email>info@mixjuice.ws</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Moatware</name>
-    <url>http://Moatware.com</url>
-    <descr>FreeBSD based Firewall with VPN</descr>
-    <email>patc@moatware.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NONI</name>
-    <url>http://www.noni.cx</url>
-    <descr>noni</descr>
-    <email>mako@noni.cx</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NTInfor - N�cleo de Tecnologia em Inform�tica</name>
-    <url>http://www.ntinfor.com.br</url>
-    <descr>Internet, Intranet and Software Development. FreeBSD, Apache, PHP, MySQL and Postgres solutions.</descr>
-    <email>contato@ntinfor.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nadi Computer Service Sdn.Bhd.</name>
-    <url>http://www.nadi-it.com</url>
-    <descr>System Integration Malaysia</descr>
-    <email>rasfan@nadi-it.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NetFusion Corporation</name>
-    <url>http://www.fusiongroup.info</url>
-    <descr>An IT Outsourcing firm specializing in software outsourcing, managed services, integrated digital communication solutions, and e-Learning content development. CMMI guided process, management and QAI.</descr>
-    <email>mchang@fusiongroup.info</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Netlink 2000, Inc.</name>
-    <url>http://www.jellico.com</url>
-    <descr>Regional S.E. US Internet Service Provider</descr>
-    <email>lisa@jellico.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Office Stray Cat</name>
-    <url>http://www.stcat.com/</url>
-    <descr>Japanese Internet Radio Station.Live and On-demand services.</descr>
-    <email>aya@stcat.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ojolali.com</name>
-    <url>http://www.ojolali.com</url>
-    <descr>online retailer</descr>
-    <email>support@plasmedia.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>OneLink Enterprises</name>
-    <url>http://www.onelink.ca</url>
-    <descr>Canadian ISP / Web Hosting Company</descr>
-    <email>danny@prcn.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Passive Revenue Guide</name>
-    <url>http://www.passive-revenue.com</url>
-    <descr>The Passive Revenue Guide is a directory providing links to resources for affiliate and associate webmasters as well as MPAM resources.</descr>
-    <email>admin@passive-revenue.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Printa Systems Incorporated</name>
-    <url>http://www.printa.com</url>
-    <descr>Complete Commercial Screen Printing Equipment &amp; Pad Printing Systems, Training and Supplies. Custom Promotional Product Printing In A Box.</descr>
-    <email>webmaster@printa.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>QSV Ltd</name>
-    <url>http://www.quality-spanish-villas.com</url>
-    <descr>property rentals and sales in SPAIN/mortgages/long and short holiday rentals/villas, fincas, apartments,cortijos etc</descr>
-    <email>QSVLtd@aol.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Radiostation  </name>
-    <url>http://www.lider.crimea.com</url>
-    <descr></descr>
-    <email>admin@lider.crimea.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Rustel company, Perm regional department</name>
-    <url>http://www.permcom.ru</url>
-    <descr>Communications, telephony, ISP.</descr>
-    <email>akurganov@permcom.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SP Vision Ltd.</name>
-    <url>http://www.ispvision.net</url>
-    <descr>Bulgarian Hosting Provider</descr>
-    <email>mitko@mitko.info</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SPECKLESS</name>
-    <url>http://www.fiber.ru</url>
-    <descr>Fiber Optics design &amp; developtment - Rostov-on-Don- Russia</descr>
-    <email>fiber@fiber.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SecuriNetworks</name>
-    <url>http://www.securinetworks.com</url>
-    <descr>Your computer security resource.</descr>
-    <email>omega@securinetworks.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Svanska Netflower AB</name>
-    <url>http://www.netflower.se</url>
-    <descr>Webshop for flowers</descr>
-    <email>vallee@netflower.se</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SvyazInform Ltd.</name>
-    <url>http://www.rlan.ru</url>
-    <descr>ISP in Volgograd, Russia.</descr>
-    <email>admin@rlan.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TRK7</name>
-    <descr>Regional telivision</descr>
-    <email>alex_k@trk7.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tele Info Media</name>
-    <url>http://www.tim.com.pl</url>
-    <descr>Polish IT Ousourcer &amp; ISP &amp; ASP</descr>
-    <email>stelmach@tim.com.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Terra Sat Comp</name>
-    <url>http://www.terrasat.ro</url>
-    <descr>Large ISP in Romania - relying on FreeBSD's robustness and stability since the beginnings for most firewall and QOS solutions implemented on a carrier-level grade.</descr>
-    <email>wck@terrasat.ro</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>The Corral</name>
-    <url>http://www.corral.net</url>
-    <descr>THE Late Model Mustang Web Site, Dedicated to Mustangs from 1979 - Present with tech articles, product reviews, message forums, free classifieds, news and more!</descr>
-    <email>cihara@corral.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>TrackingSoft LLC</name>
-    <url>http://trackingsoft.com</url>
-    <descr>ad tracking solutions</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Trakya Net</name>
-    <url>http://www.Trakya.Net</url>
-    <descr>UNIX Servers: FreeBSD, OpenBSD, NetBSD, GNU/Linux, WindowsNT/2000/XP. - Hardware: Components &amp; Computers - Software - Internet/Intranet Security. (TURKEY) Beast &amp; Tiger</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Vovoid Software &amp; Multimedia</name>
-    <url>http://vovoid.com</url>
-    <descr>We do graphical systems development, Web Server Management systems, Art &amp; Multimedia. We are well known for our realtime music visualizations. We use FreeBSD as a workstation platform. It provides the flexibility and power of a UNIX system on cheap i386 hardware which we rely on when developing our high-tech products and services for win32/BSD/Linux.</descr>
-    <email>info@vovoid.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WL CO.,LTD</name>
-    <url>http://www.heartonegroup.com</url>
-    <descr>COMPUTER</descr>
-    <email>yixin@heartonegroup.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Wasabi Hosting</name>
-    <url>http://www.wasabihosting.com</url>
-    <descr>Fast, reliable domain hosting.</descr>
-    <email>support@wasabihosting.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>X-Philes Online</name>
-    <url>http://www.x-philes.com/</url>
-    <descr>Mailing lists, web sites</descr>
-    <email>webmaster@x-philes.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Xtreme Networking</name>
-    <url>http://www.xtremenetworking.com</url>
-    <descr>Real-time VoIP services for real-time needs!</descr>
-    <email>cardenas@xtremenetworking.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>YouView Ltd</name>
-    <url>http://www.youview.co.uk</url>
-    <descr>Infoimageing Products</descr>
-    <email>info@youview.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Youssef Warda</name>
-    <url>http://cis.arc.losrios.edu/~w0854333</url>
-    <descr>Personel</descr>
-    <email>youssef_warda@hotmail.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Yp.Net</name>
-    <url>http://www.yp.net</url>
-    <descr>Online yellow page listing directory, custom search engine and ISP located in Mesa, AZ.</descr>
-    <email>maxc@yp.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ZeroWeb Information Services</name>
-    <url>http://www.zeroweb.dnip.net</url>
-    <descr>Internet Security Consulting and Service provider</descr>
-    <email>support@zeroweb.dnip.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Zydot, Unlimited</name>
-    <url>http://www.zydot.com</url>
-    <descr>International purification products company - uses FreeBSD-powered Web, SMTP, DNS and Samba servers and IT workstations. </descr>
-    <email>neptune321@excite.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>barga.com</name>
-    <url>http://www.barga.com</url>
-    <descr>Internet Solutions</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>empyrean hosting</name>
-    <url>http://www.empyreanhosting.com</url>
-    <descr>Shared, Dedicated and Complex Hosting Provider and Professional Services Organization</descr>
-    <email>info@empyreanhosting.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>huehn-software</name>
-    <url>http://huehn-software.de</url>
-    <descr>Software Development</descr>
-    <email>info@huehn-software.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>inTEXT Communications Inc.</name>
-    <url>http://www.networkinformation.com</url>
-    <descr>Unix System Administration / Security</descr>
-    <email>security@networkinformation.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>vinabad</name>
-    <url>http://www.vinabad.ru</url>
-    <descr>Medic site</descr>
-    <email>landex@mail.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Ambon@DalNet</name>
-    <url>http://ambon.cah.web.id</url>
-    <descr>Ambon IRC Channel</descr>
-    <email>cah@vision.net.id</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Association of Computing Machinery at Queens College</name>
-    <url>http://acm.cs.qc.edu</url>
-    <descr>Computing Club and Chapter of the National Organization at Queens College</descr>
-    <email>webmaster@acm.cs.qc.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>BEETAS.org</name>
-    <url>http://www.beetas.org/</url>
-    <descr>Opensource softwares.</descr>
-    <email>webmaster@beetas.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>CIAM</name>
-    <url>http://www.ciam.ru</url>
-    <descr>Central Institute of Aviation Motors in Moscow</descr>
-    <email>sem@ciam.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>City &amp; Guilds College Union</name>
-    <url>http://www.cgcu.net/</url>
-    <descr>Student union of the engineering faculty of Imperial College, University of London</descr>
-    <email>ma499@doc.ic.ac.uk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Crimean Centre of Upgrading Cvalification</name>
-    <url>http://www.cpk.crimea.ua</url>
-    <descr>Crimean Centre of Upgrading Cvalification</descr>
-    <email></email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>FaxYourMP</name>
-    <url>http://www.faxyourmp.com/</url>
-    <descr>Enabling representative democracy in the UK by letting constituents get in touch with their MP for free.</descr>
-    <email>james@faxyourmp.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>FreeDNS at Afraid.org</name>
-    <url>http://freedns.afraid.org</url>
-    <descr>Shared free dynamic dns, use domains others are sharing, over 1500 registered domains.</descr>
-    <email>dnsadmin@afraid.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Indiana Academy Alumni Web Site</name>
-    <url>http://iasmh.net/</url>
-    <descr>Alumni database, news, and information</descr>
-    <email>webmaster@iasmh.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Internet Club</name>
-    <url>http://igc.bigline.net</url>
-    <descr>FreeBSD serve 12 computers :)</descr>
-    <email>montana@igc.bigline.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>JKaNsoft</name>
-    <url>http://jkansoft.mine.nu</url>
-    <descr>Anti-Microsoft, news, astrology (currently worked on), software</descr>
-    <email>jkxx2@yahoo.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Live!</name>
-    <url>http://live.cgcu.net/</url>
-    <descr>Online student newspaper of the engineering faculty of Imperial College, University of London.</descr>
-    <email>ma499@doc.ic.ac.uk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Matica srpska Novi Sad</name>
-    <url>http://www.maticasrpska.org.yu</url>
-    <descr>Mail, DNS services</descr>
-    <email></email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Mustang Club of Central PA</name>
-    <url>http://www.pamustang.org</url>
-    <descr>Mustang Car Club</descr>
-    <email>mike@gti.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>NIIF/HUNGARNET</name>
-    <url>http://www.niif.hu/</url>
-    <descr>Hungarian Research and Education Network Organization</descr>
-    <email>maray@niif.hu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Network Information Center,Beijing University of Technology</name>
-    <url>http://www.cn.proftpd.org</url>
-    <descr>An offical mirror site of proftpd in China</descr>
-    <email>liukang@bjpu.edu.cn</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Norcal LS1/LT1 Car Club</name>
-    <url>http://www.norcal-ls1.com</url>
-    <descr>Northern California Muscle Car Enthusiasts</descr>
-    <email>jimmyz@wyrespeed.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Radio X Basel Switzerland</name>
-    <url>http://www.radiox.ch</url>
-    <descr>community radio using FreeBSD as web-, DNS- and mailserver</descr>
-    <email>ptschudin@datanetworks.ch</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Second Foundation School</name>
-    <url>http://www.sfs.pvt.k12.mn.us/</url>
-    <descr>a K-12 school in Minneapolis, Minnesota, USA</descr>
-    <email>sfs@sfs.pvt.k12.mn.us</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SuraSoft.com Network Security</name>
-    <url>http://www.surasoft.com</url>
-    <descr>Resource dedicated to network and data security</descr>
-    <email>webmaster@surasoft.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Jagelman Institute</name>
-    <url>http://www.jaginst.org</url>
-    <descr>Church growth and Christian leadership</descr>
-    <email>admin@jaginst.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Tomoe Shinohara</name>
-    <url>http://tomoe.soundex.org</url>
-    <descr>tomoeshinohara.com germany mirror</descr>
-    <email>milagro@linuxppc.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>UnixLife Inc</name>
-    <url>http://www.unixlife.net</url>
-    <descr>Unix Help Forum</descr>
-    <email>kyle@unixlife.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Windsor UNIX Users Group</name>
-    <url>http://www.wuug.org</url>
-    <descr>UUG for residents of Windsor, Ontario, Canada.</descr>
-    <email>xavier@wuug.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Wormhole</name>
-    <url>http://www.wormhole.org/</url>
-    <descr>Artists and friends...</descr>
-    <email>derick@wormhole.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>XPi Network &amp; Internet Applications</name>
-    <url>http://www.xpi.org.uk</url>
-    <descr>Fast, reliable and stable Internet &amp; Network application.</descr>
-    <email>webmaster@kweeky.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>bsd.sjeemz.nl</name>
-    <url>http://bsd.sjeemz.nl/</url>
-    <descr>Heavy-duty webserver.</descr>
-    <email>freebsd-gallery@sjeemz.nl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>frontfree technology club, school of computer, Beijing University of Technology</name>
-    <url>http://www.frontfree.net/</url>
-    <descr>frontfree technology club</descr>
-    <email>liukang@bjpu.edu.cn</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>s28</name>
-    <url>http://www.s28.zp.ua</url>
-    <descr>School</descr>
-    <email>admin@s28.zsu.zp.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Constantine The Philosopher University In Nitra</name>
-    <url>http://www.studnet.sk</url>
-    <descr>FreeBSD hosting francis.unitra.sk, www.studnet.sk, www.unixrulez.sk and many 3rd level domains</descr>
-    <email>wildman@studnet.sk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>www.codepoets.org</name>
-    <url>http://www.codepoets.org/</url>
-    <descr>Unix systems code repository</descr>
-    <email>steve@codepoets.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>T A S T I K</name>
-    <url>http://tastik.net:81</url>
-    <descr>this is just a test-site for code and other projects, currently running on a FreeBSD 4.6 server [AMD K62 450 / 224 MB RAM]</descr>
-    <email>leper@tastik.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>1buck4me</name>
-    <url>http://www.1buck4me.com</url>
-    <descr>Trying to make it BIG -- using FreeBSD and Apache, of course</descr>
-    <email>info@1buck4me.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Ali Ashraf</name>
-    <url>http://www.geocities.com/ali25june</url>
-    <descr></descr>
-    <email>ali25june@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Andy Knapp</name>
-    <url>http://www.knappster.net</url>
-    <descr>Webserver/File Server</descr>
-    <email>knappster@knappster.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>BSD-Unix</name>
-    <url>http://www.bsd-unix.net</url>
-    <descr>Personal Colocation</descr>
-    <email></email>
-  </entry>
-
-  <entry type="personal">
-    <name>BSD-UserGroup-Schaumburg</name>
-    <url>http://www.cfenns.ath.cx</url>
-    <descr>Usergroup in Germany (Niedersachsen)</descr>
-    <email>chris@cfenns.ath.cx</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Barry Morgan dot Com</name>
-    <url>http://www.barrymorgan.com</url>
-    <descr>Personal Website For Barry Morgan</descr>
-    <email>barry@barrymorgan.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>CORY's Index</name>
-    <url>http://www.cory.to/</url>
-    <descr>CORY's personal site about PC-9800, FreeBSD(98), and more for Japanese users.</descr>
-    <email></email>
-  </entry>
-
-  <entry type="personal">
-    <name>Coen Alfred Hukom</name>
-    <url>http://www.cah.web.id</url>
-    <descr>My personal FreeBSD powered web site</descr>
-    <email>me@cah.web.id</email>
-  </entry>
-
-  <entry type="personal">
-    <name>DR Consutants, Inc</name>
-    <url>http://ix@netcom.com</url>
-    <descr>Communications</descr>
-    <email>adaphil@ix.netcom.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Der Keiler</name>
-    <url>http://www.der-keiler.de</url>
-    <descr>Real-time updated archive of all important security mailing-lists</descr>
-    <email>ulrich@der-keiler.de</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Internet Club TLC</name>
-    <url>http://www.landcruiser.4wd.ru</url>
-    <descr>Internet Club Toyota Land Cruiser</descr>
-    <email>nline21@mail.ru</email>
-  </entry>
-
-  <entry type="personal">
-    <name>John's Homepage</name>
-    <url>http://john.netnoggin.net</url>
-    <descr>Personal homepage of John Callanta</descr>
-    <email>register@netnoggin.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>JonLaBass.net</name>
-    <url>http://www.jonlabass.net</url>
-    <descr>Online just to fill up space.</descr>
-    <email></email>
-  </entry>
-
-  <entry type="personal">
-    <name>Mahui's Personal site</name>
-    <url>http://cyberspace.org/~mahui</url>
-    <descr>Personal unofficial site(China) about freebsd/unix, perl/c and Personal information.</descr>
-    <email>mahui@cyberspace.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Maritime Scoots Board</name>
-    <url>http://maritimescoots.dyndns.org</url>
-    <descr>Discussion forum for scooter enthusiasts from the east coast of Canada</descr>
-    <email>maritimescootsboard@xemaps.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Mips.be.tf</name>
-    <url>http://www.mips.be.tf</url>
-    <descr>MIps Webserver   :-)</descr>
-    <email>mips@be.tf</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Misu.us</name>
-    <url>http://www.misu.us</url>
-    <descr>personal family page</descr>
-    <email>misu@misu.us</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Nightwish UNIX Brazil</name>
-    <url>http://www.nightwish.com.br</url>
-    <descr>Nightwish UNIX Brazilian Group</descr>
-    <email>hostmaster@nightwish.com.br</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Orca Productions</name>
-    <url>http://orca.dyn.nu</url>
-    <descr>Just a 486 DX2 that has been turned into a webserver as a project.</descr>
-    <email>eca2k@ns.sympatico.ca</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Perfect Challange</name>
-    <url>http://www.perfectchallenge.com</url>
-    <descr>Sports pools</descr>
-    <email></email>
-  </entry>
-
-  <entry type="personal">
-    <name>Piscitella Family Website</name>
-    <url>http://www.piscitella.com</url>
-    <descr>The Piscitella/Baron Family WebSite includes hundreds of web pages full of pictures and information about our family, our trips around the world, family get togethers and visits, our hikes, and other good times.  Two redundant FreeBSD servers run our apache websites, DNS, mail servers, firewalls, and are ROCK SOLID!</descr>
-    <email>joe@piscitella.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Rogerio Resende Soares</name>
-    <url>http://www.rogerio.unis.edu.br</url>
-    <descr>Pagina Pessoal</descr>
-    <email>rogerio@unis.edu.br</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Soft Line</name>
-    <url>http://www.softline.zp.ua</url>
-    <descr>Intenet Club</descr>
-    <email>adminset@yandex.ru</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Tullingberg Sweden</name>
-    <url>http://tullinge.mine.nu</url>
-    <descr>[BAJS] Counter-strike clan server!</descr>
-    <email>jonas@polisen.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>UNIXMEXICO</name>
-    <url>http://www.unixmexico.org</url>
-    <descr>comunidad *nix en todo mexico</descr>
-    <email>nbari@unixmexico.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Warren &amp; Ramona Smith</name>
-    <url>http://www.wandrsmith.net/</url>
-    <descr>Our Family Web Server</descr>
-    <email>warren@wandrsmith.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>trance.org</name>
-    <url>http://www.trance.org/</url>
-    <descr>Technical Research in Acoustic Neural Consciousness Enhancement</descr>
-    <email>niels@trance.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>angstmonster</name>
-    <url>http://www.angstmonster.org</url>
-    <descr>we don't have to explain our art to you!</descr>
-    <email>gir@angstmonster.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>bhills.NET</name>
-    <url>http://www.bhills.net/</url>
-    <descr>A aimless site, online games, online chat, downloads, email, and more!</descr>
-    <email>jimmy@bhills.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>crowders.org</name>
-    <url>http://www.crowders.org/</url>
-    <descr>Personal site for Steve Crowder</descr>
-    <email>steve@crowders.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>erdgeist.org</name>
-    <url>http://erdgeist.org/</url>
-    <descr>powered by beer, pico and FreeBSD</descr>
-    <email>erdgeist@erdgeist.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>freshtao.net</name>
-    <url>http://freshtao.net</url>
-    <descr>A reluctant Taoist's fresh perspective on technology and life.</descr>
-    <email>sequoia124@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>hoorspel.nednl.net</name>
-    <url>http://hoorspel.nednl.net</url>
-    <descr>Website containing Dutch radioplays etc.</descr>
-    <email>hoorspel@nednl.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>igotnothin.net</name>
-    <url>http://igotnothin.net</url>
-    <descr>Just another UNIX geek</descr>
-    <email>initium@igotnothin.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>ito.no-ip.com</name>
-    <url>http://ito.no-ip.com</url>
-    <descr>Victor's FreeBSD Playground</descr>
-    <email>victor@ito.no-ip.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>japey</name>
-    <url>http://www.japey.com</url>
-    <descr>Page perso d' Alex :-)</descr>
-    <email></email>
-  </entry>
-
-  <entry type="personal">
-    <name>kamifuji</name>
-    <url>http://kamifuji.dyndns.org/</url>
-    <descr>My personal site over B-flets(opt 100M) connection</descr>
-    <email>kamifuji@kamifuji.dyndns.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>linuts</name>
-    <url>http://www.linuts.idv.tw</url>
-    <descr>linuts</descr>
-    <email>linuts77@yahoo.com.tw</email>
-  </entry>
-
-  <entry type="personal">
-    <name>milagro.linuxppc.net</name>
-    <url>http://milagro.linuxppc.net</url>
-    <descr>Alexander Liemen</descr>
-    <email>milagro@linuxppc.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>rcfile.org</name>
-    <url>http://rcfile.org</url>
-    <descr>just anode</descr>
-    <email>fbsd.gallery@rcfile.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>sorted-it.net</name>
-    <url>http://sorted-it.net</url>
-    <descr>home/business server</descr>
-    <email>admin@sorted-it.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>www.SeeQue.dk</name>
-    <url>http://www.seeque.dk</url>
-    <descr>Personal site</descr>
-    <email></email>
-  </entry>
-
-  <entry type="personal">
-    <name>xoltan</name>
-    <url>http://www.xoltan.com</url>
-    <descr>This is just my personal freeBSD learning space</descr>
-    <email>isaacpeel@hotmail.com</email>
-  </entry>
-
-XYZ
-
-  <entry type="commercial">
-    <name>@Mail WebMail Solution</name>
-    <url>http://www.atmail.nl</url>
-    <descr>Complete email application, enabling users to access email via a web browser or wireless device. </descr>
-    <email>steven@calacode.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ABR-PROM Sp. z o.o.</name>
-    <url>http://www.abr.com.pl</url>
-    <descr>internet, computers, service</descr>
-    <email>jasiu@abr.com.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Aderecos</name>
-    <url>http://www.aderecos.com</url>
-    <descr>Aderecos.com : Logistica e aluguer de adere�os</descr>
-    <email>francisco@nortenet.pt</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Amazone Informatique</name>
-    <url>http://www.amazoneinformatique.com</url>
-    <descr>Computer  reseller</descr>
-    <email>amazone@sh.cgocable.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>AviaPort.Ru</name>
-    <url>http://www.aviaport.ru/</url>
-    <descr>Russian portal dedicated to aviation and aviation industry</descr>
-    <email>info@aviaport.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>B&amp;G Internet Group</name>
-    <descr>Virtual and Dedicated Server Hosting</descr>
-    <email>info@bgig.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BSDSECURITY</name>
-    <url>http://bsdsecurity.net</url>
-    <descr>BSD security solutions.</descr>
-    <email>sid@bsdsecurity.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Bankir.RU</name>
-    <url>http://Bankir.RU/</url>
-    <descr>Russian banker's forum</descr>
-    <email>bankir@bankir.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BenefitPilot</name>
-    <url>http://www.benefitpilot.com</url>
-    <descr>Employee Benefits Websites</descr>
-    <email>kevin@benefitpilot.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Bisou Gifts</name>
-    <url>http://www.bisou.fr</url>
-    <descr>French Gift Idea Shop</descr>
-    <email>bisou.fr@caramail.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>COMP-iNET</name>
-    <url>http://www.compinet.com/</url>
-    <descr>Computer and Internet Services</descr>
-    <email>bberry@compinet.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ColdCore.com</name>
-    <url>http://coldcore.com</url>
-    <descr>FreeBSD powered Java Web site</descr>
-    <email>sector@hot.ee</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>College of Administration UNIFLOR</name>
-    <url>http://www.uniflor.edu.br</url>
-    <descr>Server of names and security guard</descr>
-    <email>claudio@uniflor.edu.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ColoCall</name>
-    <url>http://www.colocall.net</url>
-    <descr>Largest ukrainian internet data center</descr>
-    <email>info@colocall.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Computer Partners</name>
-    <url>http://www.compar.com</url>
-    <descr>E-Commerce site development and hosting</descr>
-    <email>matt@compar.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Computer System Inc.</name>
-    <url>http://www.eka.ru</url>
-    <descr>Computers &amp; Multimedia reseller, Russia, Ekaterinburg</descr>
-    <email>alexey@eka.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>CyberSpace</name>
-    <url>http://www.cyberspacepc.com</url>
-    <descr>Cool E-Commerce</descr>
-    <email>entonees@hotmail.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DLF Sp. z o.o. - DELFNET</name>
-    <url>http://www.delfnet.pl</url>
-    <descr>ISP in Gdynia, Poland</descr>
-    <email>sebastian@delfnet.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>DNA Logic Corporation</name>
-    <url>http://www.DNALOGIC.NET</url>
-    <descr>Internet and Related Services Provider</descr>
-    <email>vince@DNALOGIC.NET</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Dimante Computer Services</name>
-    <url>http://www.dimante.net</url>
-    <descr>Consulting and email hosting</descr>
-    <email>dimante@dimante.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Dothost</name>
-    <url>http://www.dothost.dk</url>
-    <descr>Professional secure hosting!</descr>
-    <email>tech@dothost.dk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Dynamic DNS Network Services</name>
-    <url>http://www.dyndns.org/</url>
-    <descr>Provides static and dynamic DNS management and HTTP redirection through a web based.</descr>
-    <email>jeremy@dyndns.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>E&amp;L Produ��es de Software</name>
-    <url>http://www.el.com.br/</url>
-    <descr>Governamental ERP development</descr>
-    <email>npd@el.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>E-Shipping.ro</name>
-    <url>http://www.e-shipping.ro</url>
-    <descr>E-shipping site owned by EMSol Group</descr>
-    <email>graicu@emsolgroup.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Empresa de Aguas Ouro Fino Ltda</name>
-    <url>http://www.aguasourofino.com.br</url>
-    <descr>Company with headquarters in Curitiba (Brazil), has its servers of InterNet all in freebsd, company of envaze of mineral water</descr>
-    <email>allan@aguasourofino.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ender PvPgn Bnetd Server</name>
-    <url>http://bnet.tog.net</url>
-    <descr>Run a 100,000+ user BNETD server providing support for every Blizzard game</descr>
-    <email>x_enderx11@yahoo.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Energo-Tel SA</name>
-    <url>http://www.energocert.pl</url>
-    <descr>System Integrator. Telecommunication Service Provider.</descr>
-    <email>jacek.maliszewski@energocert.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Entic/TM2</name>
-    <url>http://trademymedia.com</url>
-    <descr>Net trade and Internet services</descr>
-    <email>dns@entic.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>EscapeBox Germany</name>
-    <url>http://www.escapebox.net/</url>
-    <descr>The ISP-in-a-Box: Managed on-demand UNIX servers. Time efficient and affordable!</descr>
-    <email>info@escapebox.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Eweka BV</name>
-    <url>http://www.eweka.nl</url>
-    <descr>Dutch Internet Service Provider</descr>
-    <email>paul@langedaik.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FarHeap Solutions, Inc.</name>
-    <url>http://www.farheap.com</url>
-    <descr>Colocation/Internet Service Provider, Network Security, Software Development</descr>
-    <email>domainmaster@farheap.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>FreeNetName</name>
-    <url>http://www.freenetname.co.uk/</url>
-    <descr>Dialup and ADSL ISP in the UK offering a free .uk domain name</descr>
-    <email>tech@brightview.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>GKI</name>
-    <url>http://www.gki.ri</url>
-    <descr>Gruppa Kompaniy Integral</descr>
-    <email>root@gki.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Giga Media</name>
-    <url>http://www.giga.net.tw/</url>
-    <descr>Internet Service Provider in Taiwan, ROC. Providing broadband internet access with ADSL and Cable technology.</descr>
-    <email>cdsheen@corp.giga.net.tw</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Glas Istre d.o.o.</name>
-    <url>http://www.glasistre.hr</url>
-    <descr>Daily newspaper in Istria (Croatia)</descr>
-    <email>webmaster@glasistre.hr</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HanGame Japan</name>
-    <url>http://www.hangame.co.jp/</url>
-    <descr>Free! online game site</descr>
-    <email>webmaster@hangame.co.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HostingSys.com, Corp.</name>
-    <url>http://www.hostingsys.com/</url>
-    <descr>powerful freebsd dedicated servers for web servering, virtual private servers, streaming, and managed critical application hosting</descr>
-    <email>sales@hostingsys.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Hurricaneseye</name>
-    <url>http://www.hurricaneseye.com</url>
-    <descr>Telecoms and Billing</descr>
-    <email>shaywood@hurricaneseye.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Hybyte Solutions &amp; Services LTD</name>
-    <url>http://www.hybyte.com</url>
-    <descr>Messaging Consultancy &amp; Provider (International)</descr>
-    <email>alex.trull@hybyte.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HyperMethod Company</name>
-    <url>http://www.hypermethod.com</url>
-    <descr>Multimedia software development company (St. Petersburg, Russia)</descr>
-    <email>isp@hypermethod.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Hyperline Networks Telecom.</name>
-    <url>http://www.hln.com.br</url>
-    <descr>Internet Service Provider (Brazil)</descr>
-    <email>andre@redamp.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>HyundaiPerformance.com</name>
-    <url>http://www.hyundaiperformance.com</url>
-    <descr>Rally Tested, Tuner Approved</descr>
-    <email>clint@hyundaiperformance.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>INTERNETWAY</name>
-    <url>http://www.internetway.dz</url>
-    <descr>ISP provider</descr>
-    <email>info@internetway.dz</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>IT-Solutions Co. Ltd</name>
-    <url>http://it-solutions.pl</url>
-    <descr>Polish OpenSource software &amp; Unix systems experts</descr>
-    <email>info@it-solutions.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>IceSystems</name>
-    <url>http://www.icesystems.dk</url>
-    <descr>Secure and stable hosting.</descr>
-    <email>info@icesystems.dk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ihr K�chenkeller</name>
-    <url>http://www.kuechenkeller.de</url>
-    <descr>kitchens, K�chen</descr>
-    <email>sfinni@aol.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Informes Incofisa</name>
-    <url>http://www.incofisa.com/freebsd</url>
-    <descr>incofisa uses FreeBSD on it's Intranet / Extranet Servers like database, mail,firewall,dns,web severs ...</descr>
-    <email>simeo@incofisa.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Institute of the New Information Technologies</name>
-    <url>http://www.init.ru</url>
-    <descr>IT &amp; Radio MAN/WAN Service Provider</descr>
-    <email>info@init.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Interbet Internet Ltda.</name>
-    <url>http://www.interbet.com.br</url>
-    <descr>Wireless ISP Provider - Betim - MG - Brasil</descr>
-    <email>frederick@interbet.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Interplex Telecom</name>
-    <url>http://www.interplex.ca</url>
-    <descr>Internet solutions and building owners IT solutions</descr>
-    <email>dblais@interplex.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Intersonic AB</name>
-    <url>http://www.inter-sonic.com</url>
-    <descr>Uses include smtp, www, mailing lists, database, fileserv</descr>
-    <email>peo@intersonic.se</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>JCB</name>
-    <url>http://strategia.kostroma.net</url>
-    <descr>Commercial Bank</descr>
-    <email>slapsh@strategia.kostroma.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Jk comercial e servi�os Ltda</name>
-    <url>http://www.jkexpress.com.br</url>
-    <descr>mail the surmounting</descr>
-    <email>gborges@jkexpress.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>JustHosting.ca</name>
-    <url>http://www.justhosting.ca</url>
-    <descr>Affordable Web Hosting, Design and Domain Name Registrations in Canada</descr>
-    <email>keith@justhosting.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Key Afric  Communications, Inc.</name>
-    <url>http://www.keyafric.com</url>
-    <descr>Internet and Private Network Solution Provider.</descr>
-    <email>keyafric@keyafric.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Kompas Media</name>
-    <url>http://www.kompas-media.nl/</url>
-    <descr>Dutch graphics/media production agency</descr>
-    <email>bas@kompas-media.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>LAN Xtreme</name>
-    <url>http://beta.lanxtreme.net.au</url>
-    <descr>Australian computer gaming company</descr>
-    <email>admin@trinicle.net.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>LICO Innovations</name>
-    <url>http://www.lico.nl/</url>
-    <descr>Dutch web hosting on FreeBSD since 1998!</descr>
-    <email>info@lico.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>LPMud hosting</name>
-    <url>http://lpmud.com</url>
-    <descr>LPMud.com is a fast and efficient MUD hosting service. We strive to give you the best service and full support for new or advanced MUDs.</descr>
-    <email>Dale@lpmud.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>LTD</name>
-    <url>http://www.inet.org.ua</url>
-    <descr>Small ISP</descr>
-    <email>misha@root.net.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Lagonet Internet</name>
-    <url>http://www.lagonet.com.br</url>
-    <descr>Wireless ISP Provider - Sete Lagoas - MG - Brasil</descr>
-    <email>frederick@lagonet.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Localinet</name>
-    <url>http://www.localinet.co.uk</url>
-    <descr>Hosting Services @ Telehouse UK</descr>
-    <email>peter@localinet.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MELATI IT</name>
-    <url>http://www.meltech.net.my</url>
-    <descr>Networking And Security</descr>
-    <email>irwan@meltech.net.my</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Maninfor</name>
-    <url>http://www.maninfor.com</url>
-    <descr>Computer maintenance of companies</descr>
-    <email>admin@maninfor.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Marka</name>
-    <url>http://www.marka.net.ua</url>
-    <descr>An ISP placed in Zaporozhye, Ukraine</descr>
-    <email>support@marka.net.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MediaXtend</name>
-    <url>http://www.mediaxtend.net</url>
-    <descr>Web site creation/hosting</descr>
-    <email>contact@mediaxtend.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mindworks-Networking</name>
-    <descr>Server &amp; Workstation solutions, education, application &amp; webhosting. Of course, powered by FreeBSD</descr>
-    <email>info@mindworks.hu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mindworks-Networking</name>
-    <url>http://www.mindworks.hu</url>
-    <descr>*BSD support, servers, developement</descr>
-    <email>info@mindworks.hu</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Moscow cellular communications</name>
-    <url>http://www.mcc.ru</url>
-    <descr>Mobile telecommunications operator and ISP</descr>
-    <email>noc@mcc.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MountHill.NET</name>
-    <url>http://mounthill.no-ip.org</url>
-    <descr>FreeBSD based Internet Server manufacturer - PL</descr>
-    <email>e_x-e@morellos.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mpthrill Software</name>
-    <url>http://www.mpthrill.com</url>
-    <descr>A software solution provider specialising in opensource/nms software. Network design and implementation, system administration, commercial support, and hardware appliances.</descr>
-    <email>shayh@mpthrill.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Mpthrill.com Software Industries</name>
-    <url>http://www.mpthrill.com/freebsd</url>
-    <descr>Mpthrill.com Software - we sell the FreeBSD/Apache Appliance, based on Intel and AMD architecture.</descr>
-    <email>systemunix@mpthrill.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NIS OAO</name>
-    <url>http://www.tatneft.ru</url>
-    <descr>Standart Research Senter</descr>
-    <email>sf@tatneft.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nemesis IT</name>
-    <url>http://nemesisit.rdsnet.ro</url>
-    <descr>I decided to use FreeBSD to maximize performance and uptime while minimizing hardware costs and maintenance time</descr>
-    <email>marilen.corciovei@nemesisit.ro</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NetOne - Silistra</name>
-    <url>http://www.net1.cc</url>
-    <descr>Internet Service Provider</descr>
-    <email>admin@net1.cc</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nethouse Ltd.</name>
-    <url>http://www.majordomo.ru</url>
-    <descr>Web hosting company in Saint-Petersburg, Russia</descr>
-    <email>support@majordomo.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nowy Dziennik - Bicentenial Publishing Corp.</name>
-    <url>http://www.ksiazkionline.com</url>
-    <descr>Polish Bookstore Online</descr>
-    <email>adamw@dziennik.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>OverNightPrints.com</name>
-    <url>http://www.OverNightPrints.com</url>
-    <descr>Online Design and Order System for Business Cards and Post Card printed Overnight</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Philip S Wiener Inc.</name>
-    <url>http://ww.philipwiener.com</url>
-    <descr>Simple Server For Company, Web, Mail, Domain</descr>
-    <email>jim@philipwiener.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Plex Communications AS</name>
-    <url>http://www.plexcom.no</url>
-    <descr>Internet Presence Provider and ASP located in Norway</descr>
-    <email>sgt@rasterburn.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Punched.us Hosting Solutions</name>
-    <url>http://www.punched.us</url>
-    <descr>A hosting service for individuals all the way up to high end enterprise clients.</descr>
-    <email>support@punched.us</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RIVC</name>
-    <url>http://www.romb.kz</url>
-    <descr>Support of small business in Kazakhstan.</descr>
-    <email>admin@romb.kz</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Rad�com B.V.</name>
-    <url>http://www.radecom.nl</url>
-    <descr>Dutch company that uses *BSD servers for web/mail/file/database and firewalling services.</descr>
-    <email>info@radecom.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ragemedia Inc.</name>
-    <url>http://www.ragemedia.ca</url>
-    <descr>Shared Hosting &amp; Managed Hosting solutions.</descr>
-    <email>info@ragemedia.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Red Star Networks, INC</name>
-    <url>http://redstarnetworks.net</url>
-    <descr>Web Hosting and System Administration - Las Vegas, Nevada USA</descr>
-    <email>info@redstarnetworks.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Riverside Hospital Inc.</name>
-    <url>http://www.rivermedcenter.net</url>
-    <descr>Riverside Hospital is a medical institution with 300 beds and serving the city of Bacolod, Philippines.  FreeBSD is used in our mailserver</descr>
-    <email>root@rivermedcenter.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>RoboBidder</name>
-    <url>http://www.RoboBidder.com</url>
-    <descr>Electronic Auction Bidding Management Services</descr>
-    <email>help@robobidder.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>S&amp;I</name>
-    <url>http://www.si.kbrod.net/</url>
-    <descr>IT consulting services, design, implementation and support</descr>
-    <email>info@si.kbrod.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>S.I.TO (Sistemi Informatici Torino)</name>
-    <url>http://www.sito.it</url>
-    <descr>ISP in Italy (VPN,webmail,stat,security,multicast,mailing)</descr>
-    <email>davide@sito.it</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SAGE Automation</name>
-    <url>http://www.sageautomation.com</url>
-    <descr>Electrical Engineering &amp; Automation Solutions Provider</descr>
-    <email>sage@sageautomation.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SC Martens SA</name>
-    <url>http://www.martens.ro</url>
-    <descr>Romanian Brew Producer</descr>
-    <email>admin@martens.ro</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SCALA SISTEMAS, S.L.</name>
-    <url>http://www.scalasistemas.com</url>
-    <descr>FreeBSD + MySQL + Samba as a domain server.</descr>
-    <email>scala@scalasistemas.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Scarafiotti Network</name>
-    <url>http://www.scarafiotti.it</url>
-    <descr>Italian Hosting and WEB solution. SMP, Clustering and high tech system for your Internet business.</descr>
-    <email>info@scarafiotti.it</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Solutions IT Consulting</name>
-    <url>http://www.solutionsitconsulting.com</url>
-    <descr>Web Hosting/Design/Programming, Custom Software, Database, Integration, Contracting, Hardware Solutions, Voice Solutions, Wireless Networks, etc</descr>
-    <email>info@solutionsitconsulting.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Soul Hosting</name>
-    <url>http://www.soulhosting.com</url>
-    <descr>Cheap Web Hosting w/ FTP Access, CGI-BIN, Perl, PHP Support, MySQL, ASP, Frontpage Extensions, E-Mail, SSL, and lots more!</descr>
-    <email>john@soulhosting.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Spingen Media</name>
-    <url>http://www.spingen.com</url>
-    <descr>Website Hosting / Design</descr>
-    <email>support@spingen.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Stornet Inc.</name>
-    <url>http://www.stornet.ph</url>
-    <descr>ISP, Webhosting</descr>
-    <email>leonil@stornet.ph</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>T-CNET Co., Ltd.</name>
-    <url>http://www.t-cnet.or.jp</url>
-    <descr>Internet Service Provider</descr>
-    <email>nakamura@t-cnet.or.jp</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>T1 Shopper</name>
-    <url>http://www.t1shopper.com</url>
-    <descr>T1 Price from all the top T1 service providers</descr>
-    <email>info@t1shopper.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ties Informatica b.v.</name>
-    <url>http://www.ties-informatica.nl</url>
-    <descr>ICT Consultants, The Netherlands. </descr>
-    <email>b.gosselink@ties-informatica.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Tovaris Email Security Solutions</name>
-    <url>http://www.tovaris.com/</url>
-    <descr>Enterprise-grade email encryption systems</descr>
-    <email>jmalone@tovaris.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>US Technology Co.</name>
-    <url>http://www.ustco.com</url>
-    <descr>Multi-faceted holding company, managing many distinct e-commerce venues</descr>
-    <email>jrl@ustco.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Unlugar.com</name>
-    <url>http://www.unlugar.com</url>
-    <descr>Hosting company located in Buenos Aires, Argentina</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Vip Plus Computers SRL Romania</name>
-    <url>http://www.vipnet.ro</url>
-    <descr>Medium size ISP for the Bucharest area</descr>
-    <email>mirapoint@vipnet.ro</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Vivesta</name>
-    <url>http://www.vivesta.nl</url>
-    <descr>Solution provider for interactive media and broadcast automation. </descr>
-    <email>info@vivesta.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WILCAT Valve Hardware Service</name>
-    <url>http://www.building.com/texis/memberd/products/distributors/wilcatvalvhrdwar/</url>
-    <descr>Valve and Actuator supply, sales, and service</descr>
-    <email>wilcatvalvhrdwar@aol.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WNet ISP</name>
-    <url>http://wnet.ua/</url>
-    <descr>Internet Service Provider, leased lines, using FreeBSD for core routers, located in Kiev, Ukraine</descr>
-    <email>never@wnet.ua</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WOPR S�rl</name>
-    <url>http://www.wopr.ch</url>
-    <descr>Winning Operations Programmed Response</descr>
-    <email>frandin@wopr.ch</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Wurldlink Corporation</name>
-    <url>http://www.WURLDLINK.NET</url>
-    <descr>Internet and Related Services Provider</descr>
-    <email>vince@WURLDLINK.NET</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Yunzhi Technology</name>
-    <url>http://www.wecanhelpyou.com</url>
-    <descr>IT Service in Nanjing ,China</descr>
-    <email>info@wecanhelpyou.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>astellar</name>
-    <url>http://www.astellar.com</url>
-    <descr>web hosting solutions, open source scripts support</descr>
-    <email>info@astellar.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>iLawCorp.com</name>
-    <url>http://www.iLawcorp.com</url>
-    <descr>Interactive Legal Assistance on the Web - Online talking head to assist in various legal tasks including filing Domestic Violence Restraining Orders</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ilse media</name>
-    <url>http://www.ilse.nl/</url>
-    <descr>Dutch search engine company</descr>
-    <email>marcolz@ilse.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>kolorbit.com</name>
-    <url>http://www.kolorbit.com</url>
-    <descr>Portuguese dedicated and virtual hosting company powered by FreeBSD servers</descr>
-    <email>info@kolorbit.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>lodown magazine</name>
-    <url>http://www.lodown.com</url>
-    <descr>music. sports. entertainment.</descr>
-    <email>hirosh@lodown.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>pro communication GmbH</name>
-    <url>http://www.pro-communication.de</url>
-    <descr>internet/intranet - software - development. </descr>
-    <email>peters@pro-communication.de</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>wicom.li</name>
-    <url>http://wicom.li/</url>
-    <descr>Concept/Net/Software Internet Services, Intranet Development, Security and Audits</descr>
-    <email>kh.wild@wicom.li</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>2600 Denmark</name>
-    <url>http://2600.dk</url>
-    <descr>We use FreeBSD in our internal network for databases mainly</descr>
-    <email>db@year2000.dk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>3AS - Active Aeroelastic Aircraft Structures</name>
-    <url>http://3as.ist.utl.pt</url>
-    <descr>A European Project funded by the European Commission</descr>
-    <email>francisco@nortenet.pt</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Administration of Kostroma region</name>
-    <url>http://www.region.kostroma.net</url>
-    <descr>government establishment</descr>
-    <email>slapsh@kos-obl.kmtn.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Air Network</name>
-    <url>http://www.airnet.ru</url>
-    <descr>Non-commercial ISP in Saint-Petersburg, Russia</descr>
-    <email>nikola@airnet.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Bruno Manser Fonds</name>
-    <url>http://www.bmf.ch/</url>
-    <descr>The BMF office is using FreeBSD</descr>
-    <email>webmaster@bmf.ch</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Bulgarian Rose 1</name>
-    <url>http://cyberzone.odessos.org</url>
-    <descr>Internet &amp; Game Club. We use FreeBSD for all of our servers.</descr>
-    <email>cyberzone@odessos.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>CCC Offenbach</name>
-    <url>http://ccc.homeunix.org</url>
-    <descr>Meeting of UNIX Geek's and Nerd's in Offenbach/Main (GER)</descr>
-    <email>ccc@ccc.homeunix.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>ChIRT</name>
-    <url>http://www.chirt.ru/</url>
-    <descr>The Chelyabinsk Institute of a Railway Transport (Russia)</descr>
-    <email>kdl@chirt.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>CyDem Group</name>
-    <url>http://cydem.org.ua</url>
-    <descr>Internet Security</descr>
-    <email>cydem@cydem.org.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Deadlinks</name>
-    <url>http://www.deadlinks.org</url>
-    <descr>A collection of dead links and other useless stuff</descr>
-    <email>raist@cs.auc.dk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Eng KMITNB</name>
-    <url>http://www.eng.kmitnb.ac.th</url>
-    <descr>Faculty of Engineering : KMITNB</descr>
-    <email>gapy@eng.kmitnb.ac.th</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Free Linux CD Project</name>
-    <url>http://www.freelinuxcd.org</url>
-    <descr>Crossing boundaries, one free CD at a time.</descr>
-    <email>oktay@freelinuxcd.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>FreeBSD Chile.</name>
-    <url>http://www.freebsd.cl</url>
-    <descr>Comunidad FreeBSD Chilena.</descr>
-    <email>kuarzo@freebsd</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>FreeBSD China Community</name>
-    <url>http://www.freebsdchina.org</url>
-    <descr>A community of FreeBSD users in the mainland china</descr>
-    <email>webmaster@freebsdchina.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Frontfree Technology Network</name>
-    <url>http://www.frontfree.net</url>
-    <descr>An educational website related on Computer Science and Technology</descr>
-    <email>webmaster@frontfree.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Hokkaido University - Employment data room</name>
-    <url>http://shushoku.academic.hokudai.ac.jp/</url>
-    <descr>The site which offers the employment information to the student of Hokkaido University</descr>
-    <email>shushoku@academic.hokudai.ac.jp</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>INetForce Community</name>
-    <url>http://www.inetforce.net/</url>
-    <descr>Computer Technology Research Center</descr>
-    <email>warhead@sunguru.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Lviv academic gymansium</name>
-    <url>http://proxy.lag.lviv.ua</url>
-    <descr>School Network Multi Server</descr>
-    <email>weber@lag.lviv.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>MatNET</name>
-    <url>http://www.matnet.net</url>
-    <descr>MatNET project in development, planned to provide some Slovenian language documentation for FreeBSD, also webcam from base point, some ham-radio stuff and so on... everything will grow by time.</descr>
-    <email>matej@matnet.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Mechanics and Mathematics Faculty, Rostov State University</name>
-    <url>http://www.mmf.rsu.ru/</url>
-    <descr>Web and mail servers</descr>
-    <email>foot@mmf.rsu.ru</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Medical College of Wisconsin</name>
-    <url>http://www.neuro.mcw.edu</url>
-    <descr>Servers and workstations for neurology research</descr>
-    <email></email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Minist�rio P�blico do Trabalho</name>
-    <url>http://www.mpt.gov.br</url>
-    <descr>Institution that has for obligation to watch so that the constitution of Brasil is respected in that it refers to to the Justice of the Work, as well as all the law derived. </descr>
-    <email>cotta@pgt.mpt.gov.br</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Molodechno region center of communicacy</name>
-    <url>http://www.molodechno.by</url>
-    <descr>officaial site of Molodechno</descr>
-    <email>webmaster@molodechno.by</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>National Technical University of Athens</name>
-    <url>http://www.ntua.gr</url>
-    <descr></descr>
-    <email>webmaster@ntua.gr</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>National Technical University of Athens - Data Bases Laboratory</name>
-    <url>http://www.dbnet.ece.ntua.gr</url>
-    <descr></descr>
-    <email>staff@dbnet.ece.ntua.gr</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>National institute of Laser, Plasma and Radiation Physics - Bucharest, Romania</name>
-    <url>http://www.inflpr.ro</url>
-    <descr>Research and Development</descr>
-    <email>bmihal@alpha1.infim.ro</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Network-ca</name>
-    <url>http://www.network-ca.net</url>
-    <descr>A free website with php and mysql, shell and eggdrop</descr>
-    <email>service@network-ca.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Northwestern University Associated Student Government</name>
-    <url>http://groups.northwestern.edu/</url>
-    <descr>Hosting services for Northwestern University community</descr>
-    <email>technology@asg.northwestern.edu</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>NullNet</name>
-    <url>http://www.nullnet.net</url>
-    <descr>NullNet IRC Network</descr>
-    <email>cable@nullnet.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>PacketLove</name>
-    <url>http://www.packetlove.com</url>
-    <descr>PacketLove Organization</descr>
-    <email>john@packetlove.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Rockwell City Lytton Schools</name>
-    <url>http://www.rockwell-city-lytton.k12.ia.us</url>
-    <descr>k-12 Schools</descr>
-    <email>rpeterson@rockwell-city-lytton.k12.ia.us</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Seattle BSD Network</name>
-    <url>http://www.seabsd.net</url>
-    <descr>Local Internet Service - Training Seminars - Security</descr>
-    <email>lizsac@yahoo.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SwedCore.Net</name>
-    <url>http://www.swedcore.net/</url>
-    <descr>Free WebHosting for the masses.</descr>
-    <email>info@swedcore.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The FreeBSD Unix Project - UAE</name>
-    <url>http://www.freebsd.ae</url>
-    <descr>A local mirror of The FreeBSD Project</descr>
-    <email>afawaz@freebsd.ae</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>The Udder Organization</name>
-    <url>http://www.udder.org</url>
-    <descr>Network of cow-lovers</descr>
-    <email>freebsd@udder.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>UMIST Computer Users Society</name>
-    <url>http://www.cus.org.uk</url>
-    <descr>Baa, the UMIST CUS new main machine runs FreeBSD</descr>
-    <email>info@cus.org.uk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Universal Postal Union</name>
-    <url>http://www.upu.int/</url>
-    <descr>The UPU is a specialised agency of the United Nations.</descr>
-    <email>webmaster@upu.int</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>University of the Witwatersrand</name>
-    <url>http://www.wits.ac.za</url>
-    <descr>Faculty of Engineering - E-mail, proxy, gateway, firewall, printing, workstations.</descr>
-    <email>admin@pcpool.eng.wits.ac.za</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Vancouver WeatherPage</name>
-    <url>http://vancouver.weatherpage.ca/</url>
-    <descr>Providing real-time weather info for Vancouver, BC Canada and surrounding areas.</descr>
-    <email>rhondle@hotmail.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Webkot.be</name>
-    <url>http://www.webkot.be</url>
-    <descr>Photos of student parties @ university Namur - Belgium</descr>
-    <email>webkot@fundp.ac.be</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>WomIT - World of mad IT</name>
-    <url>http://www.womit.com</url>
-    <descr>Webserver, Proxy, Fileserver etc....</descr>
-    <email>m.stapf@web.de</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>XScanners Information Warfare Center</name>
-    <url>http://www.xscanners.org</url>
-    <descr>Information and Cyberwarfare Center and discussion</descr>
-    <email>djobes@xscanners.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Zespol Szkol Elektrycznych,Wloclawek,Poland</name>
-    <url>http://www.zsel.edu.pl</url>
-    <descr>Main school server (user accounts, WWW, POP3S, SMTPS, NAT)</descr>
-    <email>michal.palinski@wlc.pl</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>emmerton.org</name>
-    <url>http://www.emmerton.org</url>
-    <descr>Emmerton family genealogy</descr>
-    <email>info@emmerton.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>frapes.org</name>
-    <url>http://www.frapes.org</url>
-    <descr>Hellenic Security</descr>
-    <email>webmaster@frapes.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>i-Radio</name>
-    <url>http://i-radio.com.ua</url>
-    <descr>First ukrainian internet-radio</descr>
-    <email>info@i-radio.ccom.ua</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>k03.org</name>
-    <url>http://sprite.k03.org</url>
-    <descr>Free FreeBSD Shell Accounts, Webhosting and Email accounts</descr>
-    <email>k03@charter.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>o.v.e.r.clolckers.at</name>
-    <url>http://www.overclockers.at</url>
-    <descr>austrias biggest overclocking/g33k/hardware community</descr>
-    <email>petar.forai@overclockers.at</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>phuzion</name>
-    <url>http://www.phuzion.org</url>
-    <descr>gpl software development</descr>
-    <email>contact@phuzion.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>tavo.net</name>
-    <url>http://www.tavo.net</url>
-    <descr>tavo.net network services</descr>
-    <email>mantas@tavo.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>http://marco.istpsycho.de</name>
-    <url>http://marco.istpsycho.de</url>
-    <descr>my personal music and unix site, want to push freebsd by adding a demon logo to my page</descr>
-    <email>marco.langner@web.de</email>
-  </entry>
-
-  <entry type="personal">
-    <name>http://www.sesam.at</name>
-    <url>http://www.sesam.at</url>
-    <descr>Homepage of Family Schymonski</descr>
-    <email>erich.schymonski@sesam.at</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Mia's home page</name>
-    <url>http://www.hcc.co.yu/mia</url>
-    <descr>Mia Stojanovic Home Page</descr>
-    <email>miastojanovic@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>http://www.humming-bird.net</name>
-    <url>http://www.humming-bird.net</url>
-    <descr>http://www.humming-bird.net</descr>
-    <email>wanko@memenet.or.jp</email>
-  </entry>
-
-  <entry type="personal">
-    <name>/dev/null</name>
-    <url>http://www.slashdevslashnull.de</url>
-    <descr>M Steiner - Homepage ;)</descr>
-    <email>mirko.steiner@slashdevslashnull.de</email>
-  </entry>
-
-  <entry type="personal">
-    <name>23degrees.net</name>
-    <url>http://23degrees.net</url>
-    <descr>Photography, Art and Images from Vancouver, Canada</descr>
-    <email>tsvab@23degrees.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>ARIO personal Web Site</name>
-    <url>http://ario.prosou.nu</url>
-    <descr>K.M. HOASHI ARIO :  Personal Web Site</descr>
-    <email>ario@prosou.nu</email>
-  </entry>
-
-  <entry type="personal">
-    <name>BSDTop</name>
-    <url>http://www.bsdtop.net</url>
-    <descr>Our website is here to guide you though operations such as running NetBSD or OpenBSD and of course our on going favorite, FreeBSD. As problems arise  such as an unsupported sound card, troubleshooting apm, and configuring XFree86, to high level problems like getting s-video working...we are here  to help you with these issues.</descr>
-    <email>john@soulhosting.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Bitmand</name>
-    <url>http://www.bitmand.dk</url>
-    <descr>Personal server, hosting domains for friends and family</descr>
-    <email>lasse@bitmand.dk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Brandon's personal Website</name>
-    <url>http://brandon.hardcoremothefucker.com/</url>
-    <descr>Personal Website</descr>
-    <email>bw@cfl.rr.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Codered's home page</name>
-    <url>http://codered.homelinux.org</url>
-    <descr>Codered's home page</descr>
-    <email>codered@bitchx.it</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Culture g�n�rale</name>
-    <url>http://www.culturomania@aol.com</url>
-    <descr>Informations culturelles franco-italiennes</descr>
-    <email>culturomania@aol.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Daniel Goepp</name>
-    <url>http://goepp.com</url>
-    <descr>Personal server, with Friends domains too</descr>
-    <email>freebsd@goepp.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Delaware Homeunix.com</name>
-    <url>http://delaware.homeunix.com</url>
-    <descr>Unix FreeBSD Delaware Meeting Site</descr>
-    <email>kevin@delaware.homeunix.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Doraemon IPv6 club</name>
-    <url>http://doraemon2.ipv6.cc.saga-u.ac.jp</url>
-    <descr>This site is IPv6 resources in our lab</descr>
-    <email>ferryas@cc.saga-u.ac.jp</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Euler.eti.br</name>
-    <url>http://www.euler.eti.br</url>
-    <descr>Install and configure FreeBSD in Brasilia - Brazil</descr>
-    <email>guilherme@euler.eti.br</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Fluid Enterprises Inc.</name>
-    <url>http://www.fluidenterprises.net</url>
-    <descr>Fluid Enterprises</descr>
-    <email>markus@fluidenterprises.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>GojuRyu Karate</name>
-    <url>http://www.nerdcorp.org/karate/index.html</url>
-    <descr>Gojuryu Karate Dojo in ACM-RS at Brazil</descr>
-    <email>krug@uol.com.br</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Hardcore Motherfucker</name>
-    <url>http://russ.hardcoremotherfucker.com</url>
-    <descr></descr>
-    <email></email>
-  </entry>
-
-  <entry type="personal">
-    <name>Hardcore Motherfucker</name>
-    <url>http://www.hardcoremotherfucker.com</url>
-    <descr>Personal website featuring applications, source code, and tutorials.</descr>
-    <email>alexstocko@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Harold's House of Love</name>
-    <url>http://princessharold.net</url>
-    <descr>Personal Page of Harold Kachelmyer</descr>
-    <email>spam@princessharold.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Herbertm.ca</name>
-    <url>http://www.herbertm.ca</url>
-    <descr>Personal Site</descr>
-    <email>admin@herbertm.ca</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Introspection's Lair</name>
-    <url>http://www.method-x.net/~phil/</url>
-    <descr>The area of my rumination, the abode for free thought, the birthplace of ideation: Introspection's Lair</descr>
-    <email>systick@method-x.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Linuxiceberg.com</name>
-    <url>http://www.linuxiceberg.com</url>
-    <descr>5.0 System that is a backup server and CVS server</descr>
-    <email>cfowler@linuxiceberg.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Liukuma.Net</name>
-    <url>http://www.liukuma.net</url>
-    <descr>Testbench and freetime server. </descr>
-    <email>ignatz@liukuma.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Lucas Cotta - Consultoria em Tecnologia</name>
-    <url>http://www.cotta.eti.br</url>
-    <descr>Consulting in Unix, Nets and Technologies derived from the Information. - Contacts: 55 61 99816745   </descr>
-    <email>cotta@cotta.eti.br</email>
-  </entry>
-
-  <entry type="personal">
-    <name>MMM</name>
-    <url>http://www.rastaman.tales.ru</url>
-    <descr>MMM</descr>
-    <email></email>
-  </entry>
-
-  <entry type="personal">
-    <name>Managers Learning Unix</name>
-    <url>http://www.willwilliams.homeunix.net</url>
-    <descr>Manager experimenting with Unix</descr>
-    <email>williamsw@willwilliams.homeunix.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Michael Siegenthaler</name>
-    <url>http://www.msigi.net/</url>
-    <descr>Vacation photos, electronics projects, and more</descr>
-    <email>www@msigi.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Nieuwz.com (Nieuwz maar dan AnderZ)</name>
-    <url>http://www.nieuwz.com</url>
-    <descr>News site. </descr>
-    <email>nieuwz@xs4all.nl</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Poor man's web man page for FreeBSD</name>
-    <url>http://ito.no-ip.com/cgi-bin/man?</url>
-    <descr>12 lines of shell cgi might be better than man2html!</descr>
-    <email>victor@ito.no-ip.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Redbishop</name>
-    <url>http://www.redbishop.org</url>
-    <descr>WWW,FTP,MAIL(pop3|smtp) and NAT Server</descr>
-    <email>matt@redbishop.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>SignalDEV</name>
-    <url>http://metroidclassic.com</url>
-    <descr>Forums for Metroid Classic</descr>
-    <email></email>
-  </entry>
-
-  <entry type="personal">
-    <name>Slapit.org</name>
-    <url>http://www.slapit.org</url>
-    <descr>Open Source Development</descr>
-    <email>here@slapit.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Soul Hosting</name>
-    <url>http://www.bsdtop.org</url>
-    <descr>web hosting</descr>
-    <email>chaz@soulhosting.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Spetson Network</name>
-    <url>http://www.spetson.com</url>
-    <descr>This is my personal portal, where you can find some Delphi &amp; Php source codes, my personal blog, forum, and more...</descr>
-    <email>info@spetson.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>TCHECO</name>
-    <url>http://www.nerdcorp.org</url>
-    <descr>A FreeBSD powered site that host the animated character</descr>
-    <email>krug@uol.com.br</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Tarchive.com</name>
-    <url>http://www.tarchive.com</url>
-    <descr>100 Mbps Open Source Mirror</descr>
-    <email>admin@four10.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The Node</name>
-    <url>http://www.the-node.org</url>
-    <descr>A favourite links page. Most categories are UNIX/Linux/BSD related.</descr>
-    <email>bvdzon@the-node.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Titans.Ath.Cx</name>
-    <url>http://titans.ath.cx</url>
-    <descr>FREEBSD OR BUST</descr>
-    <email>neome0@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>TravisBSD</name>
-    <url>http://www.travisbsd.no-ip.org</url>
-    <descr>A personal server for myself, friends, and fellow developers on projects</descr>
-    <email>travis@travisbsd.no-ip.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>U4IA</name>
-    <url>http://www.u4ia.net/</url>
-    <descr>TEST on FreeBSD!!</descr>
-    <email>admin@jp.u4ia.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Zjee Network</name>
-    <url>http://www.zjee.net</url>
-    <descr>Follenfant Julien's personal website</descr>
-    <email>jsz@nerim.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>carding</name>
-    <url>http://www.end.at/cb23</url>
-    <descr>yescard 2003 dack38 hanouni23cb dackbox</descr>
-    <email>softcb23@yahoo.fr</email>
-  </entry>
-
-  <entry type="personal">
-    <name>chongdagaoke</name>
-    <url>http://www.hitedi.com</url>
-    <descr>it</descr>
-    <email>orayaha@263.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>criptanet.com</name>
-    <url>http://www.criptanet.com</url>
-    <descr>Oficial site of rock music band from madrid - spain</descr>
-    <email>criptanet@criptanet.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>critical.ch</name>
-    <url>http://www.critical.ch</url>
-    <descr>personal site</descr>
-    <email></email>
-  </entry>
-
-  <entry type="personal">
-    <name>demolish.nu</name>
-    <url>http://www.demolish.nu/</url>
-    <descr>Personal server for Demolish</descr>
-    <email>demolish@demolish.nu</email>
-  </entry>
-
-  <entry type="personal">
-    <name>gaddis.org</name>
-    <url>http://www.gaddis.org/</url>
-    <descr>Jeremy L. Gaddis</descr>
-    <email>jeremy@gaddis.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>gdroot</name>
-    <url>http://www.gdroot.tk</url>
-    <descr>video games, computers, assembler</descr>
-    <email>ejevik@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>gswa.ru</name>
-    <url>http://gswa.ru</url>
-    <descr>Personal site of A.S.Roganov</descr>
-    <email>roganov@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>lamenet</name>
-    <url>http://lamenet.mitchell-it.net/</url>
-    <descr>An australian communal irc server, and personal home page.</descr>
-    <email>br3ndan_486@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>leech.dk</name>
-    <url>http://leech.dk</url>
-    <descr>A lot of useless junk - mainly time-wasters</descr>
-    <email>leech@signout.dk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>masclub.org</name>
-    <url>http://www.masclub.org</url>
-    <descr>Ma An Shan City Group</descr>
-    <email>uid@21cn.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>my play space</name>
-    <url>http://www.deadboots.com</url>
-    <descr>local area Jam bands and dead mp3'z</descr>
-    <email>jerry@deadboots.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>nexthop.net</name>
-    <url>http://www.nexthop.net/</url>
-    <descr>FreeBSD 4.x-SECURITY and 5.0 running apache, postfix, mysql and some homegrown perl on several i386 machines.  We use FreeBSD because of it's performance, flexibility, ease of upgrade and overall consistency of procedures and documentation.</descr>
-    <email>unreachable AT nexthop DOT net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>nihili.st</name>
-    <url>http://www.nihili.st/</url>
-    <descr>Adventures in mediocrity</descr>
-    <email>npratt@nihili.st</email>
-  </entry>
-
-  <entry type="personal">
-    <name>sasapurin's Home Page</name>
-    <url>http://sasapurin.dyndns.org/</url>
-    <descr>I am sasapurin.This site is Japanese personal WWW server for my friends and family.Language is japanese only.</descr>
-    <email>sasapurin@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>sjw.com</name>
-    <url>http://www.sjw.com</url>
-    <descr>personal site</descr>
-    <email>webmaster@sjw.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>te-kun</name>
-    <url>http://www.te-kun.com</url>
-    <descr>Windows de Unix Like</descr>
-    <email>te-kun@ma.akari.ne.jp</email>
-  </entry>
-
-  <entry type="personal">
-    <name>tool.eu.org</name>
-    <url>http://tool.eu.org</url>
-    <descr>zieben's home server</descr>
-    <email>zieben@tool.eu.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>undecided's music</name>
-    <url>http://undecided.isa-geek.net</url>
-    <descr>A webpage where people can download my songs</descr>
-    <email>tlevergood@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>www.littlejack85.nl.tt</name>
-    <url>http://www.littlejack85.nl.tt</url>
-    <descr>www.littlejack85.nl.tt personal homepage of Jeffrey</descr>
-    <email>jeffrey@mailtjuh.ath.cx</email>
-  </entry>
-
-  <entry type="personal">
-    <name>www2.brainrender.net</name>
-    <url>http://www2.brainrender.net</url>
-    <descr>A simple Secondary Webpage to www.brainrender.net</descr>
-    <email>ian@brainrender.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>zf.no</name>
-    <url>http://zf.no/</url>
-    <descr>Server for mail, homepages and other personal services. Located in Bergen, Norway.</descr>
-    <email>jinges@zf.no</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Agicom</name>
-    <url>http://www.agicom.no</url>
-    <descr>Web development , hosting services. Uses FreeBSD on all our servers and our corp. firewall. Norway.</descr>
-    <email>post@agicom.no</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Atlas Internet Ltd</name>
-    <url>http://www.atlas.net.uk/</url>
-    <descr>Internet Service Provider (UK) and ENUM registrar</descr>
-    <email>julian.rose@atlas.net.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Axis Integrated</name>
-    <url>http://www.axisintegrated.com/</url>
-    <descr>Based in the Pacific Northwest, Axis Integrated specializes in system integration of rackmount systems and internet business solutions. We tailor every system to individually suit our customers, providing compatable hardware for any FreeBSD or Linux solution. </descr>
-    <email>casey@axisintegrated.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>BITNETS</name>
-    <url>http://www.bitnets.com</url>
-    <descr>Canadian Internet servers consulting</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Bellerophon</name>
-    <url>http://www.bellero.com</url>
-    <descr>Consulting + managed services</descr>
-    <email>nb@bellero.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Canada Life International</name>
-    <descr>Used for MRTG/RRD, NAT Firewalls, Ghostscript LPD/LPR RIP's</descr>
-    <email>sslaytor@canadalifeint.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Coast to Coast Hosting</name>
-    <url>http://www.ctch.net</url>
-    <descr>Web and Email hosting, web development and design, database, name services, domain registration and management, digital certificates and more.</descr>
-    <email>admin@ctch.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Computeasy Telecom</name>
-    <url>http://www.computeasy.com.br</url>
-    <descr>Telecom / ISP - Brazil. Uses FreeBSD for firewall, email , dns, web, database, radius, etc.</descr>
-    <email>suporte@computeasy.com.br</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Computer Systems S.r.l</name>
-    <url>http://www.computer-systems.it</url>
-    <descr>Svilupo di Applicazioni Gestionali, Italia.</descr>
-    <email>info@computer-systems.it</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Desarrollos Tecnol�gicos S.A.</name>
-    <url>http://www.detecsa.net</url>
-    <descr>Internet Service Provider and Technology Solutions Provider</descr>
-    <email>webmaster@detecsa.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Distributel Communications Ltd.</name>
-    <url>http://www.distributel.ca/</url>
-    <descr>IXC - Canadian Long Distance Provider</descr>
-    <email>chrisk@distributel.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Ed Soto</name>
-    <url>http://www.edsoto.com</url>
-    <descr>Ed Soto's Personal Web Site</descr>
-    <email>EddiesNYC@speakeasy.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>ExcessNET Services</name>
-    <url>http://www.xsnet.org</url>
-    <descr>An IT and Internet Service Provider in Australia using FreeBSD for multiple servers!</descr>
-    <email>excess@ansonic.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Faculty of Engineering, University of Waterloo</name>
-    <url>http://www.eng.uwaterloo.ca</url>
-    <descr>university</descr>
-    <email>bruce@uwaterloo.ca</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Gurix Web Professionals</name>
-    <url>http://www.gurix.com</url>
-    <descr>Internet design, programming and marketing</descr>
-    <email>aholmes@pureguru.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>INPI</name>
-    <url>http://www.societe.com</url>
-    <descr>informations about french societies</descr>
-    <email>webmaster@societe.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>IQuest Internet, LLC</name>
-    <url>http://www.iquest.net</url>
-    <descr>One of the largest ISP's in the Midwestern US</descr>
-    <email>operations@iquest.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>InTech Online Limited</name>
-    <url>http://www.intechworld.net</url>
-    <descr>Pioneer Broad Band Service Provider in Bangladesh</descr>
-    <email>litu@intechworld.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Interrupt Network Security</name>
-    <url>http://www.interrupt.nl</url>
-    <descr>Installation of firewall, VPNs, web-, file- and mailservers</descr>
-    <email>Yorick Imthorn</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>JSC</name>
-    <url>http://www.modem.ru</url>
-    <descr>Internet Service Provider in Chelyabinsk, Russia</descr>
-    <email>ivan@modem.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>JSC Gascom</name>
-    <url>http://www.gascom.ru</url>
-    <descr>sattelite telecommunication company/ISP</descr>
-    <email>asa@gascom.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Kaba Benzing America - Time and Attendance Company</name>
-    <url>http://www.kaba-benzing-usa.com</url>
-    <descr>Kaba Benzing America is one of the world's leading suppliers of time and attendance, shop floor data collection, and access control systems. Kaba Benzing's world-wide offices allow on-the-spot consultation, sales and technical service.</descr>
-    <email>htrick@kbs.kaba.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>KenangaNET CybeR ZonE</name>
-    <url>http://www.kenanga-net.com</url>
-    <descr>Internet Cafe On Purwokerto Indonesia</descr>
-    <email>gue_71@linuxmail.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Law Offices of Erik J. Heels</name>
-    <url>http://www.heels.com/</url>
-    <descr>Boston-area intellectual property law firm including patent law, trademark law, and copyright law.</descr>
-    <email>info@heels.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MAILHOSTING.CA</name>
-    <url>http://www.mailhosting.ca</url>
-    <descr>Canadian managed secure mail hosting provider</descr>
-    <email></email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Malaysiakini.com -- ONLY THE NEWS THAT METTERS</name>
-    <url>http://www.malaysiakini.com</url>
-    <descr>Online News</descr>
-    <email>danny@malaysiakini.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>McLaut ISP</name>
-    <url>http://www.2mcl.com</url>
-    <descr>Internet service provider</descr>
-    <email>webmaster@2mcl.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>MediaMonks Interactive Art</name>
-    <url>http://www.mediamonks.com</url>
-    <descr>The monastery for kick-ass art</descr>
-    <email>root@mediamonks.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Misrlink</name>
-    <url>http://www.misrlink.com</url>
-    <descr>IT Organization in Egypt</descr>
-    <email>88.usamahafez@misrnet.com.eg</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Moatware, LLC</name>
-    <url>http://www.moatware.com</url>
-    <descr>FreeBSD Firewall / UCE Challenge-Response System in a single unit</descr>
-    <email>PatrickC@moatware.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>NedForce</name>
-    <url>http://www.nedforce.nl/</url>
-    <descr>ICT Solution Provider</descr>
-    <email>r.s.a.vandomburg@nedforce.nl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Nursery Supplies, Inc.</name>
-    <url>http://www.nurserysupplies.com</url>
-    <descr>Manufacturers of containers for the nursery industry.</descr>
-    <email>steve@nurserysupplies.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>OpenAccess Network Services</name>
-    <url>http://www.openaccess.org</url>
-    <descr>Network Service Provider</descr>
-    <email>vendors@openaccess.org</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PILNET Adam Domanski</name>
-    <url>http://www.pilnet.pl</url>
-    <descr>Internet Service Provider</descr>
-    <email>admin@pilnet.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PLIVA Krakow</name>
-    <url>http://www.pliva.pl</url>
-    <descr>Pharmaceutical company in Poland. HTTP, SMTP, DNS, Internet and Intranet services.</descr>
-    <email>Marcin.Kielek@pliva.pl</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>PRAVDA.Ru</name>
-    <url>http://pravda.ru</url>
-    <descr>PRAVDA.Ru international news and analisys agency. </descr>
-    <email>vp@pravda.ru</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>People Logic</name>
-    <url>http://www.peoplelogic.com.au</url>
-    <descr>E-communications Application Service Provider</descr>
-    <email>joshua@peoplelogic.com.au</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>SoloNet</name>
-    <url>http://www.solo.net/</url>
-    <descr>Specialized web hosting and development services for the film and television music industry</descr>
-    <email>webmaster@solo.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>Spider Networks</name>
-    <url>http://www.spidernz.com</url>
-    <descr>Spider Networks Consultant Service</descr>
-    <email>jay@spidernz.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>VerityNet Communications</name>
-    <url>http://www.veritynet.net/</url>
-    <descr>Web Hosting and Media Streaming</descr>
-    <email>sales@veritynet.net</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>WMHost</name>
-    <url>http://www.wmhost.com</url>
-    <descr>Finnish ISP - hosting services</descr>
-    <email>hostmaster@wmhost.com</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>XILO</name>
-    <url>http://www.xilo.net/?refer=freebsd.org</url>
-    <descr>Internet Hosting and Online Services</descr>
-    <email>spamtrap@mattmartin.co.uk</email>
-  </entry>
-
-  <entry type="commercial">
-    <name>uplink coherent solutions</name>
-    <url>http://www.uplink.at/</url>
-    <descr>ISP, ASP, quality software development, wireless LANs</descr>
-    <email>presse@uplink.at</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>BSDFactory.com</name>
-    <url>http://www.bsdfactory.com</url>
-    <descr>Information site about Tattooing and piercing</descr>
-    <email>webmaster@bsdfactory.com</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>BSD Guides</name>
-    <url>http://www.bsdguides.org</url>
-    <descr>Doing stuff with FreeBSD, OpenBSD, NetBSD, &amp; Mac OS X</descr>
-    <email></email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Bluhayz.org</name>
-    <url>http://www.bluhayz.org</url>
-    <descr>Virginia based mirror server, offering free shell accounts under FreeBSD 4.8</descr>
-    <email>dero@bluhayz.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Cult bg</name>
-    <url>http://www.cult.bg</url>
-    <descr>Bulgarian Server for art and culture</descr>
-    <email>milen@i-space.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>EKCITY.ORG</name>
-    <url>http://www.ekcity.org</url>
-    <descr>Ekological City</descr>
-    <email>kdoulepov@ekcity.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>European Satelite Operator's Association</name>
-    <url>http://www.esoa.net</url>
-    <descr>www, mail server</descr>
-    <email>eskimo@esoa.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Felsted School</name>
-    <url>http://www.felsted.essex.sch.uk/</url>
-    <descr>An independent mixed boarding School in the English countryside</descr>
-    <email>cchd@felsted.essex.sch.uk</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Nitpicker</name>
-    <url>http://www.nitpicker.de</url>
-    <descr>The IP Accounting - NITPICKER</descr>
-    <email>nitpicker@nitpicker.de</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>SlashNET IRC</name>
-    <url>http://www.slashnet.org/</url>
-    <descr>Internet Relay Chat Network proudly powered by FreeBSD</descr>
-    <email>drw@slashnet.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>Text links exchange system</name>
-    <url>http://links.direx.org/</url>
-    <descr>Adveertizing click bazed system - Powered by FreeBSD</descr>
-    <email>digireg@ua.fm</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>coolwater</name>
-    <url>http://cyrus.conjectures.net</url>
-    <descr>FreeBSD Resource &amp; Tutorials / Personal Site</descr>
-    <email>cyrus@conjectures.net</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>i-scream</name>
-    <url>http://www.i-scream.org</url>
-    <descr>i-scream monitoring system for unix operating systems</descr>
-    <email>tdb@i-scream.org</email>
-  </entry>
-
-  <entry type="nonprofit">
-    <name>linefeed.org</name>
-    <url>http://user.linefeed.org/</url>
-    <descr>anarchist/communist information services for organizations around the world</descr>
-    <email>tech@linefeed.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Geofront</name>
-    <url>http://Geofront.homeunix.net</url>
-    <descr>My webserver</descr>
-    <email>mike@the-rubber-chicken-network.co.uk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Thomas Zastrow</name>
-    <url>http://tomz.homelinux.net</url>
-    <descr>Private Server of Thomas Zastrow</descr>
-    <email>chef@thomas-zastrow.de</email>
-  </entry>
-
-  <entry type="personal">
-    <name>2600Hz</name>
-    <url>http://www.2600hz.cjb.net:8080</url>
-    <descr>UNIX sysadm and information</descr>
-    <email>dario@2600hz.cjb.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>ADSLWEB.NET</name>
-    <url>http://fiweb.xs4all.nl</url>
-    <descr>Private network with some friends with VPN-connections and Wifi Connections</descr>
-    <email>paderijk@fiweb-com.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Bishnet</name>
-    <url>http://www.bishnet.net/</url>
-    <descr>Bishnet Website</descr>
-    <email>tim@bishnet.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Chris' Online Hut</name>
-    <url>http://www.chriswillis.com</url>
-    <descr>Personal Server for home LAN - file, print, Name Resolution, Email, PF / NAT, site had info about Audio &amp; Food</descr>
-    <email>kingpinofdisks@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Fernando Almeida</name>
-    <url>http://www.fernandoalmeida.com.br</url>
-    <descr>Personal Site</descr>
-    <email>falmeida@overnet.com.br</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Jalle's digital treehouse</name>
-    <url>http://archimedes.rsn.bth.se</url>
-    <descr>Simplicity is genious! My very own little FreeBSD server...</descr>
-    <email>defacto@home.se</email>
-  </entry>
-
-  <entry type="personal">
-    <name>K7-NeT</name>
-    <url>http://www.k7-net.net</url>
-    <descr>Personal project</descr>
-    <email>k7net@k7-net.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Liu Kang</name>
-    <url>http://www.coredump.cn</url>
-    <descr>One of Liukang's personal site :p</descr>
-    <email>liukang@bjpu.edu.cn</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Loconet</name>
-    <url>http://www.loconet.org</url>
-    <descr>Personal Website for Unix/FreeBSD</descr>
-    <email>chris@loconet.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Madness.at</name>
-    <url>http://www.madness.at/</url>
-    <descr>Personal web-site w/ some *bsd/security-related informational stuff - Located in Salzburg, Austria.</descr>
-    <email>mad@madness.at</email>
-  </entry>
-
-  <entry type="personal">
-    <name>MerlinoBBS.net</name>
-    <url>http://www.merlinobbs.net/</url>
-    <descr>Italian Networking Vortal</descr>
-    <email></email>
-  </entry>
-
-  <entry type="personal">
-    <name>Parachute</name>
-    <descr>Website about me, some of my work, and other fun stuff</descr>
-    <email>floating_in_space_@hotmail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Raj Aditi</name>
-    <url>http://www.rajaditi.com</url>
-    <descr>Personal web site</descr>
-    <email>rajaditi@rajaditi.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Ralph Dratman</name>
-    <url>http://kq9.net</url>
-    <descr>Personal</descr>
-    <email>ralph@maxsoft.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>SantaFe Net</name>
-    <url>http://testbox.untergeek.net</url>
-    <descr>LOVE FREEBSD</descr>
-    <email>stumpy@oasisbb.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Si-Ma</name>
-    <url>http://shitty.dk</url>
-    <descr>Simon's personal homepage</descr>
-    <email>simon@shitty.dk</email>
-  </entry>
-
-  <entry type="personal">
-    <name>SoreN ServeR</name>
-    <url>http://soren.pp.ru</url>
-    <descr>WWW, FTP, Samba server ! hosting!</descr>
-    <email>support@donak.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>The Pridelands BBS</name>
-    <url>http://pridelands.homeip.net</url>
-    <descr>My personal server running HTTP/FTP/PHP/IRC/Samba/MySQL/SSH services + Dial-up and DSL/Cable Router on a P233MMX w/128mb RAM proudly running FreeBSD!</descr>
-    <email>simbavii@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>Trinity.narendil.net</name>
-    <url>http://trinity.narendil.net/</url>
-    <descr>Chris's web server hosting weblog and a wiki + host pages of friends</descr>
-    <email>webmaster@narendil.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>beber</name>
-    <url>http://www.beber.co.za</url>
-    <descr>photographic experiments</descr>
-    <email>simp@africamail.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>bsd.homeunix.com</name>
-    <url>http://bsd.homeunix.com</url>
-    <descr>private homepages, webmail, workspace, experimentation, ect</descr>
-    <email>clas@bsd.homeunix.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>ecoaxis.net</name>
-    <url>http://www.ecoaxis.net</url>
-    <descr>Sustainable Natural Foods, Shelter, Clothing, Health, and Environment Friendly Products and Information Resources</descr>
-    <email>info@ecoaxis.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>madpilot.net</name>
-    <url>http://www.madpilot.net/</url>
-    <descr>Simple ersonal email and a few photoes...(will make it better when I have time :)</descr>
-    <email>mad@madpilot.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>merlinux.com</name>
-    <url>http://www.merlinux.com/</url>
-    <descr>personnal website about *NIX in malaysia and the world</descr>
-    <email>alexis_trotet@yahoo.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>mxut</name>
-    <url>http://www.mxut.org</url>
-    <descr>my home bsd.. :)</descr>
-    <email>erv@mxut.org</email>
-  </entry>
-
-  <entry type="personal">
-    <name>siberhayat.com</name>
-    <url>http://www.siberhayat.com</url>
-    <descr>-A reflection of our cyber lifes-</descr>
-    <email>quantum@siberhayat.com</email>
-  </entry>
-
-  <entry type="personal">
-    <name>snooze</name>
-    <url>http://snooze.legalisiert.de/</url>
-    <descr>http://snooze.legalisiert.de/</descr>
-    <email>snooze@ircnet.de</email>
-  </entry>
-
-  <entry type="personal">
-    <name>stevefoster.org</name>
-    <url>http://www.stevefoster.org</url>
-    <descr>C/C++/Actionscript Programmer</descr>
-    <email>admin@stevefoster.net</email>
-  </entry>
-
-  <entry type="personal">
-    <name>tunes.tameiki.tv</name>
-    <url>http://tunes.tameiki.tv</url>
-    <descr>promoting Japanese music in North America. powered by FreeBSD, Apache and mod_mp3.</descr>
-    <email>steve@tameiki.tv</email>
-  </entry>
-
-  <entry type="personal">
-    <name>whitby.hopto.org</name>
-    <url>http://whitby.hopto.org</url>
-    <descr>My homepage, fileshare and personal server</descr>
-    <email>tobypb@uboot.com</email>
-  </entry>
-
-</gallery>
diff --git a/fr/gallery/gallery.xsl b/fr/gallery/gallery.xsl
deleted file mode 100644
index 75be44a6a3..0000000000
--- a/fr/gallery/gallery.xsl
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!-- 
-   The FreeBSD French Documentation Project
-   Original revision: 1.1
-
-   Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:import href="../includes.xsl"/>
-  <xsl:variable name="section" select="'about'"/>
-
-  <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="title" select="'La Galerie FreeBSD'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/fr/gallery/gallery.xsl,v 1.2 2003/12/29 17:23:43 stephane Exp $'"/>
-
-  <xsl:output type="html" encoding="iso-8859-1"/>
-
-  <xsl:template match="gallery">
-    <html>
-      <xsl:copy-of select="$header1"/>
-      
-            <body xsl:use-attribute-sets="att.body">
-      
-        <div id="containerwrap">
-          <div id="container">
-      
-      	<xsl:copy-of select="$header2"/>
-      
-      	<div id="content">
-      
-      	      <xsl:copy-of select="$sidenav"/>
-      
-      	      <div id="contentwrap">
-      	      
-	      <xsl:copy-of select="$header3"/>
-
-	<p>A travers le monde entier, FreeBSD fait fonctionner des applications
-          et des services Internet innovants. Cette galerie expose <xsl:value-of
-	  select="count(//entry)"/> organisations et particuliers qui ont utilis&#233; 
-          FreeBSD pour r&#233;aliser leurs travaux. Regardez et d&#233;couvrez tout ce que 
-          FreeBSD peut faire pour <b>vous</b>.</p>
-
-	<ul>
-	  <li><a href="cgallery.html"><xsl:value-of 
-              select="count(//entry[@type='commercial'])"/> organisations
-              commerciales</a></li>
-	  <li><a href="npgallery.html"><xsl:value-of
-              select="count(//entry[@type='nonprofit'])"/> organisations
-              &#224; but non-lucratif</a></li>
-          <li><a href="pgallery.html"><xsl:value-of
-              select="count(//entry[@type='personal'])"/> sites
-              personnels</a></li>
-	</ul>
-
-	<p>Pour voir votre site ajout&#233; &#224; ces listes, remplissez simplement
-	  <a href="http://www.FreeBSD.org/cgi/gallery.cgi">ce formulaire</a>.</p>
-
-	<table width="100%" border="0">
-	  <tr>
-	    <td align="left"><img src="{$enbase}/gifs/powerlogo.gif" alt=""
-				  align="left" border="0"/></td>
-
-	    <td align="left"><img src="{$enbase}/gifs/power-button.gif" alt="" 
-				  align="left" border="0"/></td>
-	  </tr>
-
-	  <tr>
-	    <td align="right"><img src="{$enbase}/gifs/pbfbsd2.gif" width="171" 
-				   height="64" border="0"/></td>
-
-	    <td align="right"><img src="{$enbase}/gifs/powerani.gif" width="171"
-				   height="64"/></td>
-
-	    <td align="right"><img src="{$enbase}/gifs/fhp_mini.jpg" width="171"
-				   height="64"/></td>
-	  </tr>
-	</table>
-	
-	<p align="center"><img src="{$enbase}/gifs/banner1.gif" alt="" 
-			       width="446" height="63" border="0"/></p>
-
-	<p align="center"><img src="{$enbase}/gifs/banner2.gif" alt="" width="310" 
-			       height="63" border="0"/></p>
-
-	<p align="center"><img src="{$enbase}/gifs/banner3.gif" alt="" width="250" 
-			       height="35" border="0"/></p>
-
-	<p align="center"><img src="{$enbase}/gifs/banner4.gif" alt="" width="225" 
-			       height="46" border="0"/></p>
-
-	<p>Les logos "Fonctionne gr&#226;ce &#224; FreeBSD" ("Powered by FreeBSD") visibles ci-dessus peuvent &#234;tre
-	  <a href="{$enbase}/gifs/powerlogo.gif">t&#233;l&#233;charg&#233;s</a> et affich&#233;s sur les pages
-	  d'accueils de sites personnels ou commerciaux fonctionnant sous FreeBSD. L'utilisation de
-	  ce logo ou des <a
-	  href="../copyright/daemon.html">D&#233;mons BSD</a> dans un but lucratif
-	  n&#233;cessite l'accord de <a href="mailto:taob@risc.org">Brian Tao</a>
-	  (cr&#233;ateur du logo "Fonctionne gr&#226;ce &#224; FreeBSD") et de <a
-	  href="mailto:mckusick@mckusick.com">Marshall Kirk McKusick</a>
-	  (d&#233;tenteur de la marque relative &#224; l'image du D&#233;mon BSD).</p>
-
-	  	</div> <!-- contentwrap -->
-		<br class="clearboth" />
-	
-	</div> <!-- content -->
-	
-	<xsl:copy-of select="$footer"/>
-	
-        </div> <!-- container -->
-   </div> <!-- containerwrap -->
-
-      </body>
-    </html>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/fr/gallery/merge-mbox.sh b/fr/gallery/merge-mbox.sh
deleted file mode 100755
index d9684bdaad..0000000000
--- a/fr/gallery/merge-mbox.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-# This script is dedicated to help gallery maintainer to parse source
-# mailbox which contains letters submitted by
-# http://www.FreeBSD.org/cgi/gallery.cgi and merge parsed information into 
-# existing gallery.xml file.
-#
-# History:
-#   31082001	Alexey Zelkin	Initial version
-#
-# Usage:
-#  merge-mbox.sh src.mbox output.xml
-#
-# $FreeBSD$
-
-# The FreeBSD French Documentation Project
-# Original revision: 1.1
-
-# source file
-if ! [ -f "$1" ]; then
-	echo "Could not open source mbox!"
-	exit 1
-fi
-
-# destination file (copy of gallery.xml plus new items)
-if [ "$2" = "" ]; then
-	echo "You must specify output file name!"
-	exit 1
-fi
-
-# cleanup mailbox
-/usr/bin/egrep "^[commercial,nonprofit,personal]" $1 | /usr/bin/uniq | /usr/bin/sort > TMP.mbox
-
-# make a copy of gallery.xml except closing </gallery> tag
-/usr/bin/grep -v "^<\/gallery>$" gallery.xml > $2
-
-# add XMLized new items
-awk -F'\t' '{					\
-	print "  <entry type=\""$1"\">";	\
-	print "    <name>"$2"</name>";		\
-	print "    <url>"$3"</url>";		\
-	print "    <descr>"$4"</descr>";	\
-	print "    <email>"$5"</email>";	\
-	print "  </entry>";			\
-	print "";				\
-}' TMP.mbox >> $2
-
-# add closing XML tag
-echo "</gallery>" >> $2
-
-# fixup URLs
-mv $2 $2.tmp
-/usr/bin/perl fixurls.pl $2.tmp $2
-
-# cleanup
-rm $2.tmp
-rm TMP.mbox
diff --git a/fr/gnome/Makefile b/fr/gnome/Makefile
index 0abe5b3f30..7302fd47fc 100644
--- a/fr/gnome/Makefile
+++ b/fr/gnome/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/fr/gnome/Makefile,v 1.1 2003/12/15 16:05:02 stephane Exp $
+# $FreeBSD: www/fr/gnome/Makefile,v 1.2 2006/01/09 19:54:30 blackend Exp $
 
 # The FreeBSD French Documentation Project
 # Original revision: 1.23
@@ -19,10 +19,6 @@ DOCS+=	contact.sgml
 # DATA=	gnome_upgrade.sh
 # DATA+=	gnomelogalyzer.sh
 
-SGML_INCLUDES+=	includes.navgnome.sgml
-
-SRCS.DEFAULT=	includes.xsl
-SRCS.DEFAULT+=	includes.navgnome.xsl
 XML.DEFAULT=	news.xml
 
 XMLDOCS=	index
diff --git a/fr/gnome/contact.sgml b/fr/gnome/contact.sgml
index 4eb0480600..f2e20bd77f 100644
--- a/fr/gnome/contact.sgml
+++ b/fr/gnome/contact.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/gnome/contact.sgml,v 1.10 2005/10/06 12:52:39 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/gnome/contact.sgml,v 1.11 2006/01/09 19:54:30 blackend Exp $">
 <!ENTITY title "Projet GNOME pour FreeBSD : Nous contacter">
-<!ENTITY % navincludes SYSTEM "includes.navgnome.sgml"> %navincludes;
-<!ENTITY % gnomeincludes SYSTEM "includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.gnome "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/gnome/docs/22knownissues.sgml b/fr/gnome/docs/22knownissues.sgml
index 141abadb6d..70d37dcdad 100644
--- a/fr/gnome/docs/22knownissues.sgml
+++ b/fr/gnome/docs/22knownissues.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/gnome/docs/22knownissues.sgml,v 1.2 2004/01/06 17:31:40 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/gnome/docs/22knownissues.sgml,v 1.4 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Projet GNOME pour FreeBSD : probl&egrave;mes connus avec GNOME 2.2">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/gnome/docs/bugging.sgml b/fr/gnome/docs/bugging.sgml
index fee2294286..0c91e0c1a1 100644
--- a/fr/gnome/docs/bugging.sgml
+++ b/fr/gnome/docs/bugging.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/gnome/docs/bugging.sgml,v 1.4 2004/01/23 00:06:30 viny Exp $">
+<!ENTITY date "$FreeBSD: www/fr/gnome/docs/bugging.sgml,v 1.6 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Projet GNOME pour FreeBSD : rapporter un bug">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/gnome/docs/faq.sgml b/fr/gnome/docs/faq.sgml
index 4372912151..146902df29 100644
--- a/fr/gnome/docs/faq.sgml
+++ b/fr/gnome/docs/faq.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/gnome/docs/faq.sgml,v 1.2 2004/01/06 17:31:40 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/gnome/docs/faq.sgml,v 1.4 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Projet GNOME pour FreeBSD : FAQ GNOME 1.4">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/gnome/docs/faq2.sgml b/fr/gnome/docs/faq2.sgml
index bcfc7ff6c8..0fa810a33a 100644
--- a/fr/gnome/docs/faq2.sgml
+++ b/fr/gnome/docs/faq2.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/gnome/docs/faq2.sgml,v 1.2 2004/01/06 17:31:40 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/gnome/docs/faq2.sgml,v 1.4 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Projet GNOME pour FreeBSD : FAQ GNOME 2.2">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/gnome/docs/gnome2_porting.sgml b/fr/gnome/docs/gnome2_porting.sgml
index e6af7c9aea..c9fff307be 100644
--- a/fr/gnome/docs/gnome2_porting.sgml
+++ b/fr/gnome/docs/gnome2_porting.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/gnome/docs/gnome2_porting.sgml,v 1.7 2006/03/01 20:39:40 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/gnome/docs/gnome2_porting.sgml,v 1.8 2006/05/03 18:26:54 blackend Exp $">
 <!ENTITY title "Projet GNOME pour FreeBSD : Composants GNOME 2">
-<!ENTITY % navincludes SYSTEM "../includes.navgnome.sgml"> %navincludes;
-<!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.gnome "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/gnome/docs/gnome_porting.sgml b/fr/gnome/docs/gnome_porting.sgml
index ba2419fae0..817711e56c 100644
--- a/fr/gnome/docs/gnome_porting.sgml
+++ b/fr/gnome/docs/gnome_porting.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/gnome/docs/gnome_porting.sgml,v 1.4 2004/01/23 00:06:30 viny Exp $">
+<!ENTITY date "$FreeBSD: www/fr/gnome/docs/gnome_porting.sgml,v 1.6 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Projet GNOME pour FreeBSD : Composants GNOME ind&#233;pendants du bureau">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/gnome/docs/porting.sgml b/fr/gnome/docs/porting.sgml
index c9562a784d..bce2489a28 100644
--- a/fr/gnome/docs/porting.sgml
+++ b/fr/gnome/docs/porting.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/gnome/docs/porting.sgml,v 1.3 2004/01/06 17:31:40 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/gnome/docs/porting.sgml,v 1.5 2005/10/06 12:56:03 blackend Exp $">
 <!ENTITY title "Projet GNOME pour FreeBSD : Comment cr&eacute;er un port">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/gnome/docs/volunteer.sgml b/fr/gnome/docs/volunteer.sgml
index 28032e2a3e..7eb4b0f86b 100644
--- a/fr/gnome/docs/volunteer.sgml
+++ b/fr/gnome/docs/volunteer.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/gnome/docs/volunteer.sgml,v 1.7 2006/03/01 20:39:40 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/gnome/docs/volunteer.sgml,v 1.8 2006/05/03 18:26:54 blackend Exp $">
 <!ENTITY title "Projet GNOME pour FreeBSD : Comment participer">
-<!ENTITY % navincludes SYSTEM "../includes.navgnome.sgml"> %navincludes;
-<!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.gnome "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/gnome/includes.navgnome.sgml b/fr/gnome/includes.navgnome.sgml
deleted file mode 100644
index 90b0bc306c..0000000000
--- a/fr/gnome/includes.navgnome.sgml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- $FreeBSD: www/fr/gnome/includes.navgnome.sgml,v 1.1 2006/01/09 19:53:57 blackend Exp $ -->
-<!--
-   The FreeBSD French Documentation Project
-   Original revision: 1.3
--->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/gnome/index.html">FreeBSD/GNOME</a>
-	<ul>
-		<li><a href="&base;/gnome/docs/faq2.html#q1">Instructions d&#39;installation</a></li>
-		<li><a href="&enbase;/gnome/docs/faq214.html#q2">Instructions de mise &agrave; jour</a></li>
-		<li><a href="&enbase;/gnome/../ports/gnome.html">Applications disponibles</a></li>
-		<li><a href="&base;/gnome/docs/volunteer.html">Comment participer</a></li>
-		<li><a href="&base;/gnome/docs/bugging.html">Rapporter un bogue</a></li>
-		<li><a href="&base;/gnome/screenshots.html">Captures d&#39;&eacute;cran</a></li>
-		<li><a href="&base;/gnome/contact.html">Nous contacter</a></li>
-	</ul>
-<li><a href="&base;/gnome/index.html">Documentation</a>
-	<ul>
-		<li><a href="&base;/gnome/docs/faq2.html">FAQ</a></li>
-		<li><a href="&enbase;/gnome/docs/faq214.html">FAQ mise &agrave; jour 2.10 &agrave; 2.12</a></li>
-		<li><a href="&enbase;/gnome/docs/develfaq.html">FAQ branche de d&eacute;veloppement</a></li>
-		<li><a href="&base;/gnome/docs/porting.html">Cr&eacute;ation des ports</a></li>
-		<li><a href="&enbase;/gnome/docs/faq214.html#q5">Probl&egrave;mes connus</a></li>
-	</ul>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/fr/gnome/includes.navgnome.xsl b/fr/gnome/includes.navgnome.xsl
deleted file mode 100644
index e03cb2b552..0000000000
--- a/fr/gnome/includes.navgnome.xsl
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!-- $FreeBSD: www/fr/gnome/includes.navgnome.xsl,v 1.2 2006/05/03 18:26:53 blackend Exp $ -->
-<!--
-   The FreeBSD French Documentation Project
-   Original revision: 1.6
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-
-<xsl:variable name="gnome_sidenav">
-	<div id="SIDEWRAP">
-
-	<div id="SIDENAV">
-		<h2 class="blockhide">Section Navigation</h2>
-		<ul>
-			<li><a href="{$base}/gnome/index.html">FreeBSD/GNOME</a>
-				<ul>
-					<li><a href="{$base}/gnome/docs/faq2.html#q1">Instructions d'installation</a></li>
-					<li><a href="{$enbase}/gnome/docs/faq214.html#q2">Instructions de mise &#224; jour</a></li>
-					<li><a href="{$enbase}/gnome/../ports/gnome.html">Applications disponibles</a></li>
-					<li><a href="{$base}/gnome/docs/volunteer.html">Comment participer</a></li>
-					<li><a href="{$base}/gnome/docs/bugging.html">Rapporter un bogue</a></li>
-					<li><a href="{$base}/gnome/screenshots.html">Captures d'�cran</a></li>
-					<li><a href="{$base}/gnome/contact.html">Nous contacter</a></li>
-				</ul>
-			</li>
-			<li><a href="{$base}/gnome/index.html">Documentation</a>
-				<ul>
-					<li><a href="{$base}/gnome/docs/faq2.html">FAQ</a></li>
-					<li><a href="{$enbase}/gnome/docs/faq214.html">FAQ mise &#224; jour 2.12 &#224; 2.14</a></li>
-					<li><a href="{$enbase}/gnome/docs/develfaq.html">FAQ branche de d�veloppement</a></li>
-					<li><a href="{$base}/gnome/docs/porting.html">Cr�ation des ports</a></li>
-					<li><a href="{$enbase}/gnome/docs/faq214.html#q5">Probl�mes connus</a></li>
-				</ul>
-			</li>
-		</ul>
-	</div> <!-- sidenav -->
-
-	</div> <!-- sidewrap -->
-</xsl:variable>
-
-</xsl:stylesheet>
diff --git a/fr/gnome/includes.sgml b/fr/gnome/includes.sgml
deleted file mode 100644
index d6dd0e03df..0000000000
--- a/fr/gnome/includes.sgml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- $FreeBSD: www/fr/gnome/includes.sgml,v 1.6 2006/02/03 11:54:54 blackend Exp $ -->
-
-<!--
-  The FreeBSD French Documentation Project
-  Original revision: 1.13
-
-  Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
-  Version francaise (mise a jour) : Vincent Tougait <viny@FreeBSD-FR.org>
--->
-
-<!ENTITY email 'freebsd-gnome'>
-<!ENTITY gnomeoldver '2.12'>
-<!ENTITY gnomever '2.14'>
-<!ENTITY gnomedevelver '2.15'>
diff --git a/fr/gnome/includes.xsl b/fr/gnome/includes.xsl
deleted file mode 100644
index fcca07361c..0000000000
--- a/fr/gnome/includes.xsl
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!-- $FreeBSD: www/fr/gnome/includes.xsl,v 1.3 2006/02/03 11:54:54 blackend Exp $ -->
-
-<!-- 
-  The FreeBSD French Documentation Project
-  Original revision: 1.13
-
-  Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:variable name="newshome">
-    <a href="{$base}/news/news.html">Accueil Nouvelles FreeBSD</a>
-  </xsl:variable>
-
-  <xsl:variable name="gnomever">
-    2.14
-  </xsl:variable>
-
-  <xsl:variable name="gnomedevelver">
-	2.15
-  </xsl:variable>
-
-  <!-- Generate a unique anchor for this event -->
-  <xsl:template name="generate-event-anchor">
-    <xsl:text>event</xsl:text>
-    <xsl:value-of select="ancestor::year/name"/>
-    <xsl:value-of select="ancestor::month/name"/>
-    <xsl:value-of select="ancestor::day/name"/>:<xsl:value-of select="count(preceding-sibling::event)"/>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/fr/gnome/index.xsl b/fr/gnome/index.xsl
index 28945dfa70..7f15a46720 100644
--- a/fr/gnome/index.xsl
+++ b/fr/gnome/index.xsl
@@ -1,4 +1,10 @@
-<!-- $FreeBSD: www/fr/gnome/index.xsl,v 1.5 2006/05/03 18:26:53 blackend Exp $ -->
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+<!ENTITY base "..">
+<!ENTITY title "Projet GNOME pour FreeBSD">
+<!ENTITY % navinclude.gnome "INCLUDE">
+]>
+<!-- $FreeBSD: www/fr/gnome/index.xsl,v 1.6 2006/07/03 16:03:57 blackend Exp $ -->
 
 <!-- 
    The FreeBSD French Documentation Project 
@@ -12,32 +18,29 @@
 		xmlns:rdf1="http://my.netscape.com/rdf/simple/0.9/"
 		exclude-result-prefixes="rdf rdf1" version="1.0">
 
-  <xsl:import href="includes.navgnome.xsl"/>
-  <xsl:import href="../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
-  <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/fr/gnome/index.xsl,v 1.5 2006/05/03 18:26:53 blackend Exp $'"/>
-  <xsl:variable name="section" select="'gnome'"/>
-  <xsl:variable name="title" select="'Projet GNOME pour FreeBSD'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/fr/gnome/index.xsl,v 1.6 2006/07/03 16:03:57 blackend Exp $'"/>
+  <xsl:variable name="title" select="''"/>
 
   <xsl:output type="html" encoding="iso-8859-1"
               doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/>
 
   <xsl:template match="/">
     <html>
-      <xsl:copy-of select="$header1"/>
-
+      &header1;
       <body>
 
-	<div id="containerwrap">
-	  <div id="container">
-	    <xsl:copy-of select="$header2"/>
+	<div id="CONTAINERWRAP">
+	  <div id="CONTAINER">
+	    &header2;
 
-	    <div id="content">
-	      <xsl:copy-of select="$gnome_sidenav"/>
+	    <div id="CONTENT">
+              <div id="SIDEWRAP">
+                &nav;
+              </div> <!-- SIDEWRAP -->
 
-	      <div id="contentwrap">
+	      <div id="CONTENTWRAP">
 		<div id="rightwrap">
 		  <div class="rightnav">
 
@@ -99,11 +102,11 @@
                   </div> <!-- rightnav -->
                 </div> <!-- rightwrap -->
 
-		<xsl:copy-of select="$header3"/>
+		&header3;
 
 		<h2>Qu'est-ce que GNOME ?</h2>
 
-		<img src="{$enbase}/gnome/images/gnome.png" align="right"
+		<img src="&enbase;/gnome/images/gnome.png" align="right"
                    border="0" alt="GNOME Logo"/>
 
 	       		<p>GNOME est un environnement de travail complet, et une
@@ -125,7 +128,7 @@
 		<h2>Mise &#224; jour vers GNOME 2.14 ?</h2>
 
 		<p>Si vous mettez &#224; jour de GNOME 2.12 &#224; GNOME 2.14, lisez
-		  <a href="{$enbase}/gnome/docs/faq214.html">la FAQ de mise &#224; jour</a> pour des instructions
+		  <a href="&enbase;/gnome/docs/faq214.html">la FAQ de mise &#224; jour</a> pour des instructions
 		  de mise &#224; jour.</p>
 
               <h2>Statut du port</h2>
@@ -140,7 +143,7 @@
 	      <p>GNOME est simple et facile &#224; compiler en utilisant les ports FreeBSD, mais
 	        parfois les choses tournent mal. Si GNOME -- ou quelque chose qui utilise
 		les biblioth&#232;ques GNOME -- ne se compile pas comme il devrait, ex&#233;cutez simplement l'outil
-		<a href="{$enbase}/gnome/gnomelogalyzer.sh">gnomelogalyzer.sh</a>
+		<a href="&enbase;/gnome/gnomelogalyzer.sh">gnomelogalyzer.sh</a>
 		depuis le r&#233;pertoire du port r&#233;calcitrant, et laissez le gnomelogalyzer
 		trouver ce qui va mal et le corriger !</p>
 
@@ -174,7 +177,10 @@
 
 	      <br class="clearboth" />
 	    </div> <!-- content -->
-	    <xsl:copy-of select="$footer"/>
+            <div id="FOOTER">
+	      &copyright;<br />
+	      &date;
+            </div> <!-- FOOTER -->
 	  </div> <!-- container -->
 	</div> <!-- containerwrap -->
       </body>
diff --git a/fr/gnome/newsflash.xsl b/fr/gnome/newsflash.xsl
index b2957f66f0..b153cd4edf 100644
--- a/fr/gnome/newsflash.xsl
+++ b/fr/gnome/newsflash.xsl
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+<!ENTITY base "..">
+<!ENTITY title "Nouvelles sur le projet GNOME pour FreeBSD">
+<!ENTITY email "freebsd-gnome">
+<!ENTITY % navinclude.developers "INCLUDE">
+]>
 
-<!-- $FreeBSD: www/fr/gnome/newsflash.xsl,v 1.4 2006/01/09 19:54:30 blackend Exp $ -->
+<!-- $FreeBSD: www/fr/gnome/newsflash.xsl,v 1.5 2006/02/03 11:54:54 blackend Exp $ -->
 
 <!-- 
      The FreeBSD French Documentation Project
@@ -12,62 +19,47 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS" exclude-result-prefixes="cvs">
 
-  <xsl:import href="includes.navgnome.xsl"/>
-  <xsl:import href="../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
-
-  <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="title" select="'Nouvelles sur le projet GNOME pour FreeBSD'"/>
   <xsl:variable name="date">
     <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
   </xsl:variable>
-  <xsl:variable name="section" select="'developers'"/>
 
   <xsl:output type="html" encoding="iso-8859-1"/>
 
   <xsl:template match="news">
     <html>
-
-      <xsl:copy-of select="$header1"/>
-
+      &header1;
       <body>
 
-	<div id="containerwrap">
-	  <div id="container">
+	<div id="CONTAINERWRAP">
+	  <div id="CONTAINER">
+	    &header2;
 
-	<xsl:copy-of select="$header2"/>
+	    <div id="CONTENT">
+              <div id="SIDEWRAP">
+                &nav;
+              </div> <!-- SIDEWRAP -->
 
-	    <div id="content">
-	      <xsl:copy-of select="$gnome_sidenav"/>
+	      <div id="CONTENTWRAP">
+		&header3;
 
-	      <div id="contentwrap">
-		<xsl:copy-of select="$header3"/>
-
-	<!-- Notice how entity references in SGML become variable references
-	     in the stylesheet, and that the syntax for referring to variables
-	     inside an attribute is "{$variable}".
-
-	     This is just dis-similar enough to Perl and the shell that you
-	     end up writing ${variable} all the time, and then scratch your
-	     head wondering why the stylesheet isn't working.-->
-
-	<!-- Also notice that because this is now XML and not SGML, empty
-             elements, like IMG, must have a trailing "/" just inside the
-   	     closing angle bracket, like this " ... />" -->
-	<img src="{$enbase}/gifs/news.jpg" align="right" border="0" width="193"
+	<img src="&enbase;/gifs/news.jpg" align="right" border="0" width="193"
 	     height="144" alt="FreeBSD GNOME News"/>
 
 	<xsl:apply-templates select="descendant::month"/>
 
-	<xsl:copy-of select="$newshome"/>
+	<xsl:call-templates name="html-news-list-homelink" />
 
 	      </div> <!-- contentwrap -->
 
 	      <br class="clearboth" />
 	    </div> <!-- content -->
 
-	    <xsl:copy-of select="$footer"/>
+            <div id="FOOTER">
+	      &copyright;<br />
+	      &date;
+            </div> <!-- FOOTER -->
 	  </div> <!-- container -->
 	</div> <!-- containerwrap -->
       </body>
@@ -101,35 +93,11 @@
 	  <xsl:text> </xsl:text>
 	  <xsl:value-of select="ancestor::month/name"/>,
 	  <xsl:value-of select="ancestor::year/name"/>:</b><xsl:text> </xsl:text>
-	<xsl:apply-templates select="p"/>
+	<xsl:copy-of select="p"/>
 	</p>
 
     </li>
   </xsl:template>
 
   <xsl:template match="date"/>    <!-- Deliberately left blank -->
-
-  <xsl:template match="i">
-    <i><xsl:value-of select="self::i"/></i>
-  </xsl:template>
-
-
-  <!-- When the href attribute contains a '$base', expand it to the current
-       value of the $base variable. -->
-
-  <!-- All your $base are belong to us.  Ho ho ho -->
-  <xsl:template match="a">
-    <a><xsl:attribute name="href">
-	<xsl:choose>
-	  <xsl:when test="contains(@href, '$base')">
-	    <xsl:value-of select="concat(substring-before(@href, '$base'), $base, substring-after(@href, '$base'))"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:value-of select="@href"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </a>
-  </xsl:template>
 </xsl:stylesheet>
diff --git a/fr/gnome/rss.xsl b/fr/gnome/rss.xsl
index 723c2c711c..0c20b07d08 100644
--- a/fr/gnome/rss.xsl
+++ b/fr/gnome/rss.xsl
@@ -1,4 +1,10 @@
-<!-- $FreeBSD: www/fr/gnome/rss.xsl,v 1.1 2003/12/15 15:41:15 stephane Exp $ -->
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+<!ENTITY base "..">
+<!ENTITY title "Syst&#232;me de nouvelles du Projet GNOME pour FreeBSD">
+]>
+<!-- $FreeBSD: www/fr/gnome/rss.xsl,v 1.2 2005/12/17 10:58:29 blackend Exp $ -->
 
 <!-- 
   The FreeBSD French Documentation Project
@@ -11,12 +17,9 @@
                 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 		version="1.0">
 
-  <xsl:import href="../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
-  <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/fr/gnome/rss.xsl,v 1.1 2003/12/15 15:41:15 stephane Exp $'"/>
-  <xsl:variable name="title" select="'Syst&#232;me de nouvelles du Projet GNOME pour FreeBSD'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/fr/gnome/rss.xsl,v 1.2 2005/12/17 10:58:29 blackend Exp $'"/>
 
   <xsl:output type="xml" />
 
diff --git a/fr/gnome/screenshots.sgml b/fr/gnome/screenshots.sgml
index b75d0b55a8..624cbc37ca 100644
--- a/fr/gnome/screenshots.sgml
+++ b/fr/gnome/screenshots.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/gnome/screenshots.sgml,v 1.9 2006/04/06 20:01:40 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/gnome/screenshots.sgml,v 1.10 2006/05/03 18:26:53 blackend Exp $">
 <!ENTITY title "Projet GNOME pour FreeBSD : Captures d'&eacute;crans">
-<!ENTITY % navincludes SYSTEM "includes.navgnome.sgml"> %navincludes;
-<!ENTITY % gnomeincludes SYSTEM "includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.gnome "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/includes.navabout.sgml b/fr/includes.navabout.sgml
deleted file mode 100644
index 077f6e33b8..0000000000
--- a/fr/includes.navabout.sgml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- $FreeBSD: www/fr/includes.navabout.sgml,v 1.1 2005/10/05 20:09:16 blackend Exp $ -->
-
-<!ENTITY nav '<div id="sidenav">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/about.html">A propos</a></li>
-<li><a href="&base;/features.html">Fonctionnalit&eacute;s</a></li>
-<li><a href="&base;/applications.html">Applications</a></li>
-<li><a href="&base;/internet.html">Internet</a></li>
-<li><a href="&base;/advocacy/">Pros&eacute;lytisme</a></li>
-<li><a href="&enbase;/marketing/">Marketing</a></li>
-<li><a href="&base;/news/newsflash.html">Nouvelles du projet</a></li>
-<li><a href="&base;/events/events.html">Ev&#233;nements</a></li>
-<li><a href="&base;/news/press.html">Dans la presse</a></li>
-<li><a href="&base;/art.html">Ressources artistique</a></li>
-<li><a href="&base;/logo.html">Logo</a></li>
-<li><a href="&base;/donations/">Donations</a></li>
-<li><a href="&base;/copyright/">Informations l&eacute;gales</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/fr/includes.navcommunity.sgml b/fr/includes.navcommunity.sgml
deleted file mode 100644
index 2004749997..0000000000
--- a/fr/includes.navcommunity.sgml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- $FreeBSD: www/fr/includes.navcommunity.sgml,v 1.2 2005/10/11 16:37:30 blackend Exp $ -->
-
-<!ENTITY nav '<div id="sidenav">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/community.html">Communaut&eacute;</a></li>
-<li><a href="&base;/community/mailinglists.html">Listes de diffusion</a></li>
-<li><a href="&base;/community/irc.html">IRC</a></li>
-<li><a href="&base;/community/newsgroups.html">Forums de discussion</a></li>
-<li><a href="&enbase;/usergroups.html">Groupes d&#39;utilisateurs</a></li>
-<li><a href="&base;/community/webresources.html">Ressources Web</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/fr/includes.navdevelopers.sgml b/fr/includes.navdevelopers.sgml
deleted file mode 100644
index c4f83b2ff0..0000000000
--- a/fr/includes.navdevelopers.sgml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-   The FreeBSD Documentation Project
-   The FreeBSD French Documentation Project
-
-   $FreeBSD: www/fr/includes.navdevelopers.sgml,v 1.4 2006/01/14 17:34:08 blackend Exp $
-   Original revision: 1.7
-   based on ../share/sgml/includes.navdevelopers.sgml
--->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/projects/index.html">D&#233;veloppement</a></li>
-<li><a href="&enbase;/doc/&url.doc.langcode;/books/developers-handbook">Manuel du d&#233;veloppeur</a></li>
-<li><a href="&enbase;/doc/en_US.ISO8859-1/books/porters-handbook">Manuel du porteur d&#39;application</a></li>
-<li><a href="&base;/developers/cvs.html">D&#233;p&#244;t CVS</a></li>
-<li><a href="&base;/releng/index.html">Production des versions</a></li>
-<li><a href="&base;/platforms/">Plates-formes</a>
-	<ul>
-		<li><a href="&base;/platforms/alpha.html">alpha</a></li>
-		<li><a href="&base;/platforms/amd64.html">amd64</a></li>
-		<li><a href="&base;/platforms/arm.html">ARM</a></li>
-		<li><a href="&base;/platforms/i386.html">i386</a></li>
-		<li><a href="&base;/platforms/ia64/index.html">ia64</a></li>
-		<li><a href="&base;/platforms/mips.html">MIPS</a></li>
-		<li><a href="&base;/platforms/pc98.html">pc98</a></li>
-		<li><a href="&base;/platforms/ppc.html">ppc</a></li>
-		<li><a href="&base;/platforms/sparc.html">sparc64</a></li>
-		<li><a href="&base;/platforms/xbox.html">xbox</a></li>
-	</ul>
-</li>
-<li><a href="&enbase;/doc/&url.doc.langcode;/articles/contributing/index.html">Contribuer</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/fr/includes.navdocs.sgml b/fr/includes.navdocs.sgml
deleted file mode 100644
index b0824195e0..0000000000
--- a/fr/includes.navdocs.sgml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- $FreeBSD: www/fr/includes.navdocs.sgml,v 1.2 2005/10/06 14:20:31 blackend Exp $ -->
-
-<!ENTITY nav '<div id="sidenav">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/docs.html">Documentation</a></li>
-<li><a href="&enbase;/doc/&url.doc.langcode;/books/faq/">FAQ</a></li>
-<li><a href="&enbase;/doc/&url.doc.langcode;/books/handbook/">Manuel de R&#233;f&#233;rence</a></li>
-<li><a href="&base;/docs/man.html">Pages de manuel</a>
-  <ul>
-    <li><a href="&cgibase;/man.cgi">Pages de manuel en ligne</a></li>
-  </ul>
-</li>
-<li><a href="&base;/docs/books.html">Livres et articles en ligne</a></li>
-<li><a href="&base;/publish.html">Publications</a></li>
-<li><a href="&base;/docs/webresources.html">Ressources Web</a></li>
-<li><a href="&base;/projects/newbies.html">Pour les d&#233;butants</a></li>
-<li><a href="&base;/docproj/">Projet de Documentation</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/fr/includes.navdownload.sgml b/fr/includes.navdownload.sgml
deleted file mode 100644
index ff9404d6dc..0000000000
--- a/fr/includes.navdownload.sgml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- $FreeBSD: www/fr/includes.navdownload.sgml,v 1.3 2005/12/31 11:26:15 blackend Exp $ -->
-
-<!--
-  The FreeBSD French Documentation Project
-  Original Revision: 1.5
-
--->
-
-<!ENTITY % relincludes SYSTEM "../share/sgml/includes.release.sgml"> %relincludes;
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/where.html">Obtenir FreeBSD</a></li>
-<li><a href="&base;/releases/">Information sur les versions</a>
-	<ul>
-		<li><a href="&enbase;/&u.rel.announce;">Version de production: &rel.current;</a></li>
-		<li><a href="&enbase;/&u.rel2.announce;">Version (ancienne) de production: &rel2.current;</a></li>
-		<li><a href="&base;/snapshots/">Instantan&eacute;s</a></li>
-	      <![ %beta.testing; [ 
-		<li><a href="&u.betarel.schedule;">Version &agrave; venir: &betarel.current;</a></li>
-	      ]]>
-	      <![ %beta2.testing; [ 
-		<li><a href="&u.betarel2.schedule;">Version &agrave; venir: &betarel2.current;</a></li>
-	      ]]>
-	</ul>
-</li>
-<li><a href="&enbase;/ports/">Applications disponibles</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/fr/includes.navports.sgml b/fr/includes.navports.sgml
deleted file mode 100644
index 1fa34c3c4d..0000000000
--- a/fr/includes.navports.sgml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-   $FreeBSD$
-   Original revision: 1.1
-   based on ../share/sgml/includes.navports.sgml
--->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/ports/index.html">&#192; propos des ports</a></li>
-<li><a href="&base;/ports/installing.html">Installation</a></li>
-<li><a href="&base;/ports/updating.html">Mise &#224; jour</a></li>
-<li><a href="&base;/ports/searching.html">Recherche</a></li>
-<li>&nbsp;&nbsp;&nbsp;Cat&#233;gories
-	<ul>
-		<li><a href="&base;/ports/categories-alpha.html">class&#233;es par ordre alphab&#233;tique</a></li>
-		<li><a href="&base;/ports/categories-grouped.html">class&#233;es par groupes</a></li>
-	</ul>
-</li>
-<li><a href="&base;/ports/master-index.html">Liste de Tous les Ports</a></li>
-<li><a href="&base;/ports/references.html">Pour Plus d'Informations</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/fr/includes.navsupport.sgml b/fr/includes.navsupport.sgml
deleted file mode 100644
index 0929068c87..0000000000
--- a/fr/includes.navsupport.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- $FreeBSD: www/share/sgml/includes.navsupport.sgml,v 1.5 2005/02/12 13:06:38 ceri Exp $ -->
-
-<!ENTITY nav '<div id="sidenav">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/support.html">Support</a></li>
-<li><a href="&base;/commercial/">Revendeurs</a>
-	<ul>
-		<li><a href="&enbase;/commercial/software_bycat.html">Logiciels</a></li>
-		<li><a href="&enbase;/commercial/hardware.html">Mat&#233;riels</a></li>
-		<li><a href="&enbase;/commercial/consult_bycat.html">Consultants</a></li>
-		<li><a href="&enbase;/commercial/isp.html">Fournisseurs d&#39;Acc&#232;s &#224; Internet</a></li>
-		<li><a href="&enbase;/commercial/misc.html">Divers</a></li>
-	</ul>
-</li>
-<li><a href="&base;/security/">S&#233;curit&#233;</a></li>
-<li><a href="&base;/support.html#gnats">Rapports de Bugs</a>
-	<ul>
-		<li><a href="&base;/send-pr.html">Envoyer un rapport de bug</a></li>
-	</ul>
-</li>
-<li><a href="&base;/support.html#general">Ressources Web</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/fr/includes.sgml b/fr/includes.sgml
deleted file mode 100644
index 86aacdcedf..0000000000
--- a/fr/includes.sgml
+++ /dev/null
@@ -1,146 +0,0 @@
-<!-- $FreeBSD: www/fr/includes.sgml,v 1.12 2005/10/11 16:37:30 blackend Exp $ -->
-
-<!ENTITY url.doc.langcode    'fr_FR.ISO8859-1'>
-
-<!--
-  Base is the absolute URL for the given page, minus the actual page
-  part.  It should either be specified as a fully qualified URL, or
-  relative to the server root.  It should be defined in the prolog
-  <em>before</em> including this file if the page does not live at the
-  default location below.
-
-  When making a  link, use <a href="&base;/mypage.html">foo</a> and
-  &base; will be expanded appropriately.  Base is also used in the
-  definition of standard boilerplate entities in this file, so be sure
-  base is correct!
--->
-
-<!--
-   The FreeBSD French Documentation Project
-   Original revision: 1.62
-
-   Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
-   Version francaise (mise a jour) : Vincent Tougait <viny@scientiae.net>
--->
-
-<!ENTITY base CDATA ".">
-<!ENTITY enbase CDATA "..">
-
-<!-- Components making up the standard headers and footers. -->
-<!-- Override in the prolog <em>before</em> including this  -->
-<!-- file if necessary.                                      -->
-
-<!ENTITY stylesheet '&enbase;/layout/css/fixed.css'>
-<!ENTITY stylesheetlarge '&enbase;/layout/css/fixed_large.css'>
-<!ENTITY nav ''>
-
-<!-- Standard headers and footers -->
-
-<!ENTITY header '<head><title>&title;</title>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta name="MSSmartTagsPreventParsing" content="TRUE">
-<link rel="shortcut icon" href="&enbase;/favicon.ico" type="image/x-icon">
-<link rel="icon" href="&enbase;/favicon.ico" type="image/x-icon">
-<link rel="stylesheet" media="screen" href="&stylesheet;" type="text/css" title="Normal Text">
-<link rel="alternate stylesheet" media="screen" href="&stylesheetlarge;" type="text/css" title="Large Text">
-<script type="text/javascript" src="&enbase;/layout/js/styleswitcher.js"></script>
-</head>
-<body>
-   <div id="containerwrap">
-    <div id="container">
-      <span class="txtoffscreen"><a href="#content" title="Skip site navigation" accesskey="1">Skip site navigation</a> (1)</span>
-      <span class="txtoffscreen"><a href="#contentwrap" title="Skip section navigation" accesskey="2">Skip section navigation</a> (2)</span>
-      <div id="headercontainer">
-
-        <div id="header">
-	      <h2 class="blockhide">Header And Logo</h2>
-          <div id="headerlogoleft">
-            <a href="&base;" title="FreeBSD"><img src="&enbase;/layout/images/logo-red.png" width="457" height="75" alt="FreeBSD"></a>
-          </div> <!-- headerlogoleft -->
-          <div id="headerlogoright">
-			<h2 class="blockhide">Peripheral Links</h2>
-			  <div id="searchnav">
-				<ul id="searchnavlist">
-				  <li>
-					Text Size: <a href="#" onkeypress="return false;" onclick="setActiveStyleSheet(&#39;Normal Text&#39;); return false;" title="Normal Text Size">Normal</a> / <a href="#" onkeypress="return false;" onclick="setActiveStyleSheet(&#39;Large Text&#39;); return false;" title="Large Text Size">Large</a>
-				  </li>
-				  <li>
-					<a href="&base;/donations/" title="Donate">Donations</a>
-				  </li>
-				  <li class="last-child">
-					<a href="&base;/mailto.html" title="Contact">Contact</a>
-				  </li>
-				</ul>
-			  </div> <!-- searchnav -->
-			<div id="search">
-			  <form action="&enbase;/cgi/search.cgi" method="get">
-				<div>
-			      <h2 class="blockhide"><label for="words">Rechercher</label></h2>
-				  <input type="hidden" name="max" value="25"> <input type="hidden" name="source" value="www"><input id="words" name="words" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value=&#39;&#39;;" value="Rechercher"> <input id="submit" name="submit" type="submit" value="Rechercher">
-				</div>
-			  </form>
-			</div> <!-- search -->
-          </div> <!-- headerlogoright -->
-
-        </div> <!-- header -->
-
-  	<h2 class="blockhide">Site Navigation</h2>
-        <div id="topnav">
-          <ul id="topnavlist">
-	  <li>
-		<a href="&base;/" title="Home">Accueil</a>
-	  </li>
-	  <li>
-		<a href="&base;/about.html" title="About">A propos</a>
-	  </li>
-	  <li>
-		<a href="&base;/where.html" title="Obtenir FreeBSD">Obtenir FreeBSD</a>
-	  </li>
-	  <li>
-		<a href="&base;/docs.html" title="Documentation">Documentation</a>
-	  </li>
-	  <li>
-		<a href="&base;/community.html" title="Community">Communaut&eacute;</a>
-	  </li>
-	  <li>
-		<a href="&base;/projects/index.html" title="D&eacute;veloppement">D&eacute;veloppement</a>
-	  </li>
-	  <li>
-		<a href="&base;/support.html" title="Support">Support</a>
-	  </li>
-	  </ul>
-        </div> <!-- topnav -->
-      </div> <!-- headercontainer -->
-
-<div id="content">
-<div id="sidewrap">
-&nav;
-</div> <!-- sidewrap -->
-
-<div id="contentwrap">
-
-<h1>&title;</h1>'>
-
-<!ENTITY footer '</div> <!-- contentwrap -->
-<br class="clearboth">
-
-      </div> <!-- content -->
-      <div id="footer">
-        &copyright;<br>
-        &date;
-      </div> <!-- footer -->
-
-    </div> <!-- container -->
-   </div> <!-- containerwrap -->'>
-
-<!ENTITY % includes.global SYSTEM "../share/sgml/includes.sgml">
-%includes.global;
-
-<!--
-     Local Variables:
-     mode: sgml
-     sgml-indent-data: t
-     sgml-omittag: nil
-     sgml-always-quote-attributes: t
-     End:
--->
diff --git a/fr/index.xsl b/fr/index.xsl
index ef03d85181..153f472f94 100644
--- a/fr/index.xsl
+++ b/fr/index.xsl
@@ -1,5 +1,10 @@
-<!-- $FreeBSD: www/fr/index.xsl,v 1.30 2006/05/03 18:26:53 blackend Exp $ -->
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+<!ENTITY title "Le Projet FreeBSD">
+]>
 
+<!-- $FreeBSD: www/fr/index.xsl,v 1.31 2006/07/03 15:44:07 blackend Exp $ -->
 <!--
    The FreeBSD French Documentation Project
    Original revision: 1.144
@@ -9,13 +14,9 @@
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
-  <xsl:import href="includes.xsl"/>
-  <xsl:import href="news/includes.xsl"/>
-
-  <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/fr/index.xsl,v 1.30 2006/05/03 18:26:53 blackend Exp $'"/>
-  <xsl:variable name="title" select="'Le Projet FreeBSD'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/fr/index.xsl,v 1.31 2006/07/03 15:44:07 blackend Exp $'"/>
 
   <!-- these params should be externally bound. The values
        here are not used actually -->
@@ -36,23 +37,23 @@
 <xsl:template match="/">
     <html>
       <head>
-	<title><xsl:value-of select="$title"/></title>
+	<title>&title;</title>
 	<meta name="description" content="The FreeBSD Project"/>
 	<meta name="keywords" content="FreeBSD, BSD, UNIX, Support, Ports,
 	      Version, Application, Logiciel, Manuel de
 	      R&#233;f&#233;rence, FAQ, Guides, Bugs, CVS, CVSup,
 	      Nouvelles, Revendeurs, homepage, CTM, Unix"/>
-	<link rel="shortcut icon" href="{$enbase}/favicon.ico" type="image/x-icon"/>
-	<link rel="icon" href="{$enbase}/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" media="screen" href="{$enbase}/layout/css/fixed.css" type="text/css" title="Normal Text" />
-    <link rel="alternate stylesheet" media="screen" href="{$enbase}/layout/css/fixed_large.css" type="text/css" title="Large Text" />
-    <script type="text/javascript" src="{$enbase}/layout/js/styleswitcher.js"></script>
+	<link rel="shortcut icon" href="&enbase;/favicon.ico" type="image/x-icon"/>
+	<link rel="icon" href="&enbase;/favicon.ico" type="image/x-icon"/>
+    <link rel="stylesheet" media="screen" href="&enbase;/layout/css/fixed.css" type="text/css" title="Normal Text" />
+    <link rel="alternate stylesheet" media="screen" href="&enbase;/layout/css/fixed_large.css" type="text/css" title="Large Text" />
+    <script type="text/javascript" src="&enbase;/layout/js/styleswitcher.js"></script>
 	<link rel="alternate" type="application/rss+xml"
-	  title="FreeBSD Project News" href="{$enbase}/news/news.rdf" />
+	  title="FreeBSD Project News" href="&enbase;/news/news.rdf" />
 	<link rel="alternate" type="application/rss+xml"
-	  title="FreeBSD Security Advisories" href="{$enbase}/security/advisories.rdf" />
+	  title="FreeBSD Security Advisories" href="&enbase;/security/advisories.rdf" />
 	<link rel="alternate" type="application/rss+xml"
-	  title="FreeBSD GNOME Project News" href="{$enbase}/gnome/news.rdf" />
+	  title="FreeBSD GNOME Project News" href="&enbase;/gnome/news.rdf" />
 	
 	<!-- Formatted to be easy to spam harvest, please do not reformat. -->
 	<xsl:comment>
@@ -65,7 +66,7 @@
 
    <div id="CONTAINERWRAP">
     <div id="CONTAINER">
-      <xsl:copy-of select="$header2"/>
+      &header2;
       <div id="CONTENT">
 
         <div id="FRONTCONTAINER">
@@ -81,16 +82,16 @@
 				les architectures compatibles x86 (y compris Pentium&#174; et Athlon&#8482;), compatibles 
 				amd64 (y compris Opteron&#8482;, Athlon 64 et EM64T), 
 				Alpha/AXP, IA-64, PC-98 et UltraSPARC&#174;.
-				Il est d&#233;riv&#233; de UNIX BSD, la version d'<xsl:value-of select="$unix"/> 
+				Il est d&#233;riv&#233; de UNIX BSD, la version d'&unix; 
 				d&#233;velopp&#233;e &#224;
 				l'Universit&#233; de Californie, Berkeley.
 				Il est d&#233;velopp&#233; et maintenu par
-				<a href="{$enbase}/doc/{$url.doc.langcode}/articles/contributors/staff-committers.html">une
+				<a href="&enbase;/doc/&url.doc.langcode;/articles/contributors/staff-committers.html">une
 				importante &#233;quipe de personnes</a>. D'autres
-				<a href="{$base}/platforms/index.html">plates-formes</a> sont &#224;
+				<a href="&base;/platforms/index.html">plates-formes</a> sont &#224;
 				divers stades de d&#233;veloppement.</p>
 				<div id="txtfrontfeaturelink">
-				&#187;<a href="{$base}/about.html" title="En savoir plus">En savoir plus</a>
+				&#187;<a href="&base;/about.html" title="En savoir plus">En savoir plus</a>
 				</div> <!-- txtfrontfeaturelink -->
 			</div> <!-- frontfeaturecontent -->
 		</div> <!-- frontfeatureleft -->
@@ -99,31 +100,31 @@
 			<div class="frontgetroundbox">
 			  <div class="frontgettop"><div>&#160;</div>&#160;</div>
 				<div class="frontgetcontent">
-				  <a href="{$base}/where.html">Obtenir FreeBSD maintenant</a>
+				  <a href="&base;/where.html">Obtenir FreeBSD maintenant</a>
 				</div> <!-- frontgetcontent -->
 			  <div class="frontgetbot"><div>&#160;</div>&#160;</div>
 			</div> <!-- frontgetroundbox -->
 			
 			<div id="FRONTRELEASES">
 			  <div id="FRONTRELEASESCONTENT" class="txtshortcuts">
-				  <h2><a href="{$base}/releases/">DERNIERES VERSIONS</a></h2>
+				  <h2><a href="&base;/releases/">DERNIERES VERSIONS</a></h2>
 				  <ul id="FRONTRELEASESLIST">
 					<li>
-					  <a href="{$u.rel.announce}">Version de production <xsl:value-of select="$rel.current"/></a>
+					  <a href="&u.rel.announce;">Version de production &rel.current;</a>
 					</li>
 					<li>
-					  <a href="{$u.rel2.announce}">Version (ancienne) de production <xsl:value-of select="$rel2.current"/></a>
+					  <a href="&u.rel2.announce;">Version (ancienne) de production &rel2.current;</a>
 					</li>
-				    <xsl:if test="$beta.testing">
+			    <xsl:if test="'&beta.testing;' != 'IGNORE'">
 					<li>
-					  <a href="{$base}/where.html#helptest">Version &#224; venir
-					    <xsl:value-of select="concat($betarel.current, '-', $betarel.vers)"/></a>
+					  <a href="&base;/where.html#helptest">Version &#224; venir
+					    &betarel.current; - &betarel.vers;</a>
 					</li>
 				    </xsl:if>
-				    <xsl:if test="$beta2.testing">
+			    <xsl:if test="'&beta2.testing;' != 'IGNORE'">
 					<li>
-					  <a href="{$base}/where.html#helptest">Version &#224; venir
-					    <xsl:value-of select="concat($betarel2.current, '-', $betarel2.vers)"/></a>
+					  <a href="&base;/where.html#helptest">Version &#224; venir
+					    &betarel2.current; - &betarel2.vers;</a>
 					</li>
 				    </xsl:if>
 				  </ul>
@@ -136,31 +137,31 @@
 			<div id="LANGUAGENAV">
 				<ul id="LANGUAGENAVLIST">
 				  <li>
-					<a href="{$enbase}/de/" title="Allemand">de</a>
+					<a href="&enbase;/de/" title="Allemand">de</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/" title="Anglais">en</a>
+					<a href="&enbase;/" title="Anglais">en</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/es/" title="Espagnol">es</a>
+					<a href="&enbase;/es/" title="Espagnol">es</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/fr/" title="Fran&#231;ais">fr</a>
+					<a href="&enbase;/fr/" title="Fran&#231;ais">fr</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/it/" title="Italien">it</a>
+					<a href="&enbase;/it/" title="Italien">it</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/ja/" title="Japonais">ja</a>
+					<a href="&enbase;/ja/" title="Japonais">ja</a>
 				  </li>
 				  <li class="last-child">
-					<a href="{$enbase}/ru/" title="Russe">ru</a>
+					<a href="&enbase;/ru/" title="Russe">ru</a>
 				  </li>
 				</ul>
 			</div> <!-- LANGUAGENAV -->
 
 			<div id="MIRROR">
-			  <form action="{$cgibase}/mirror.cgi" method="get">
+			  <form action="&cgibase;/mirror.cgi" method="get">
 				<div>
 				  <h2 class="blockhide"><label for="MIRRORSEL">Mirror</label></h2>
 				  <select id="MIRRORSEL" name="goto">
@@ -178,23 +179,23 @@
 				  <h2>LIENS</h2>
 				  <ul id="FRONTSHORTCUTSLIST">
 					<li>
-					  <a href="{$base}/support.html#mailing-list" title="Listes de diffusion">Listes de diffusion</a>
+					  <a href="&base;/support.html#mailing-list" title="Listes de diffusion">Listes de diffusion</a>
 					</li>
 					<li>
-					  <a href="{$base}/send-pr.html" title="Envoyer un rapport de bogue">Envoyer un rapport de bogue</a>
+					  <a href="&base;/send-pr.html" title="Envoyer un rapport de bogue">Envoyer un rapport de bogue</a>
 					</li>
 					<li>
-					  <a href="{$enbase}/doc/{$url.doc.langcode}/books/faq/index.html" title="FAQ">FAQ</a>
+					  <a href="&enbase;/doc/&url.doc.langcode;/books/faq/index.html" title="FAQ">FAQ</a>
 					</li>
 					<li>
-					  <a href="{$enbase}/doc/{$url.doc.langcode}/books/handbook/index.html" title="Manuel de r&#233;f&#233;rence">Manuel de r&#233;f&#233;rence</a>
+					  <a href="&enbase;/doc/&url.doc.langcode;/books/handbook/index.html" title="Manuel de r&#233;f&#233;rence">Manuel de r&#233;f&#233;rence</a>
 					</li>
 					<li>
 					  <a href="http://www.freebsdfoundation.org/" title="Fondation">Fondation</a>
 					</li>
 					<li>
 					  <a
-					  href="{$enbase}/ports/index.html"
+					  href="&enbase;/ports/index.html"
 					  title="Logiciels
 					  port&#233;s">Logiciels
 					  port&#233;s</a>
@@ -207,7 +208,7 @@
 			<div class="frontnewroundbox">
 			  <div class="frontnewtop"><div>&#160;</div>&#160;</div>
 			    <div class="frontnewcontent">
-			      <a href="{$base}/projects/newbies.html">D&#233;butant sous FreeBSD?</a>
+			      <a href="&base;/projects/newbies.html">D&#233;butant sous FreeBSD?</a>
 			    </div> <!-- frontnewcontent -->
 			  <div class="frontnewbot"><div>&#160;</div>&#160;</div>
 			</div> <!-- frontnewroundbox -->
@@ -230,10 +231,10 @@
 			  <div>
 				<ul class="newseventslist">
 				  <li class="first-child">
-					<a href="{$base}/news/newsflash.html" title="Plus de nouvelles">Plus...</a>
+					<a href="&base;/news/newsflash.html" title="Plus de nouvelles">Plus...</a>
 				  </li>
 				  <li class="last-child">
-					<a href="{$base}/news/news.rdf" title="Flux RSS de nouvelles"><img class="rssimage" src="{$enbase}/layout/images/ico_rss.png" width="27" height="12" alt="Flux RSS de nouvelles" /></a>
+					<a href="&base;/news/news.rdf" title="Flux RSS de nouvelles"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="Flux RSS de nouvelles" /></a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -257,7 +258,7 @@
 			  <div>
 				<ul class="newseventslist">
 				  <li class="only-child">
-					<a href="{$base}/events/" title="Plus d'&#233;v&#233;nements">Plus...</a>
+					<a href="&base;/events/" title="Plus d'&#233;v&#233;nements">Plus...</a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -280,7 +281,7 @@
 			  <div>
 				<ul class="newseventslist">
 				  <li class="only-child">
-					<a href="{$base}/news/press.html" title="Plus...">Plus...</a>
+					<a href="&base;/news/press.html" title="Plus...">Plus...</a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -303,10 +304,10 @@
 			  <div>
 				<ul class="newseventslist">
 				  <li class="first-child">
-					<a href="{$base}/security/" title="Plus d'avis de s&#233;curit&#233;">Plus...</a>
+					<a href="&base;/security/" title="Plus d'avis de s&#233;curit&#233;">Plus...</a>
 				  </li>
 				  <li class="last-child">
-					<a href="{$enbase}/security/advisories.rdf" title="Flux RSS des avis de s&#233;curit&#233;"><img class="rssimage" src="{$enbase}/layout/images/ico_rss.png" width="27" height="12" alt="Flux RSS des avis de s&#233;curit&#233;" /></a>
+					<a href="&enbase;/security/advisories.rdf" title="Flux RSS des avis de s&#233;curit&#233;"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="Flux RSS des avis de s&#233;curit&#233;" /></a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -334,12 +335,17 @@
 
       </div> <!-- CONTENT -->
       <div id="FOOTER">
-        <xsl:copy-of select="$copyright"/><br />
-        <xsl:copy-of select="$date"/>
+	&copyright;
+
+	The mark FreeBSD is a registered trademark of The FreeBSD
+	Foundation and is used by The FreeBSD Project with the
+	permission of <a
+	  href="http://www.freebsdfoundation.org/documents/Guidelines.shtml">The
+	FreeBSD Foundation</a>.
+
       </div> <!-- FOOTER -->
     </div> <!-- CONTAINER -->
    </div> <!-- CONTAINERWRAP -->
-
       </body>
     </html>
   </xsl:template>
diff --git a/fr/internal/about.sgml b/fr/internal/about.sgml
index ff5094188e..5fec51e398 100644
--- a/fr/internal/about.sgml
+++ b/fr/internal/about.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/internal/about.sgml,v 1.5 2005/10/06 12:56:04 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/internal/about.sgml,v 1.6 2005/12/05 17:49:35 blackend Exp $">
 <!ENTITY title "A propos du serveur WWW de FreeBSD.org">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/internal/bylaws.sgml b/fr/internal/bylaws.sgml
index 75b27e3643..8b57f450ff 100644
--- a/fr/internal/bylaws.sgml
+++ b/fr/internal/bylaws.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/internal/bylaws.sgml,v 1.4 2004/10/06 14:12:50 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/internal/bylaws.sgml,v 1.6 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "R&egrave;gles &eacute;tablies par l'&eacute;quipe principale">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/internal/core-vote.sgml b/fr/internal/core-vote.sgml
index f5bd5434ce..05c56c5cd3 100644
--- a/fr/internal/core-vote.sgml
+++ b/fr/internal/core-vote.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/internal/core-vote.sgml,v 1.6 2005/10/06 12:56:04 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/internal/core-vote.sgml,v 1.7 2006/03/01 20:39:40 blackend Exp $">
 <!ENTITY title "Proc&eacute;dures de vote de l'&eacute;quipe principale (&quot;core&quot;)">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/internal/developer.sgml b/fr/internal/developer.sgml
index 043eec2c1c..fd98f8a78c 100644
--- a/fr/internal/developer.sgml
+++ b/fr/internal/developer.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/internal/developer.sgml,v 1.9 2005/11/02 21:39:11 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/internal/developer.sgml,v 1.10 2005/12/17 11:07:07 blackend Exp $">
 <!ENTITY title "Ressources pour les participants &agrave; FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/internal/expire-bits.sgml b/fr/internal/expire-bits.sgml
index d2f9eaa994..ce5b074727 100644
--- a/fr/internal/expire-bits.sgml
+++ b/fr/internal/expire-bits.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/internal/expire-bits.sgml,v 1.2 2004/01/06 17:31:40 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/internal/expire-bits.sgml,v 1.4 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Politique pour l'expiration des droits de commit">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/internal/homepage.sgml b/fr/internal/homepage.sgml
index a90687726d..845c8e8784 100644
--- a/fr/internal/homepage.sgml
+++ b/fr/internal/homepage.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/internal/homepage.sgml,v 1.5 2005/10/06 12:56:04 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/internal/homepage.sgml,v 1.6 2006/05/03 18:26:54 blackend Exp $">
 <!ENTITY title "Les pages web de l'&eacute;quipe FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 <!ENTITY homepage SYSTEM "homepage.inc">
 ]>
 
diff --git a/fr/internal/internal.sgml b/fr/internal/internal.sgml
index 03546b8203..d44799a093 100644
--- a/fr/internal/internal.sgml
+++ b/fr/internal/internal.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/internal/internal.sgml,v 1.6 2004/01/12 20:21:22 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/internal/internal.sgml,v 1.8 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Les coulisses de FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/internal/machines.sgml b/fr/internal/machines.sgml
index 9c6e94a874..b29f143495 100644
--- a/fr/internal/machines.sgml
+++ b/fr/internal/machines.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/internal/machines.sgml,v 1.4 2005/10/06 12:56:04 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/internal/machines.sgml,v 1.5 2005/12/17 11:07:07 blackend Exp $">
 <!ENTITY title "Le r&eacute;seau FreeBSD.org">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/internal/mirror.sgml b/fr/internal/mirror.sgml
index d6bd3b8278..ee21c86083 100644
--- a/fr/internal/mirror.sgml
+++ b/fr/internal/mirror.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/internal/mirror.sgml,v 1.7 2005/10/06 12:56:04 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/internal/mirror.sgml,v 1.8 2006/01/14 17:34:09 blackend Exp $">
 <!ENTITY title "Devenir un site miroir des pages web FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/internal/new-account.sgml b/fr/internal/new-account.sgml
index 919bd8e6b5..de2909fcef 100644
--- a/fr/internal/new-account.sgml
+++ b/fr/internal/new-account.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/internal/new-account.sgml,v 1.6 2005/10/06 12:56:04 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/internal/new-account.sgml,v 1.7 2006/01/21 15:32:01 blackend Exp $">
 <!ENTITY title "Proc&eacute;dure de cr&eacute;ation d'un nouveau compte">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/internal/photos.sgml b/fr/internal/photos.sgml
index 4ea3787f33..310bb0ca78 100644
--- a/fr/internal/photos.sgml
+++ b/fr/internal/photos.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/internal/photos.sgml,v 1.4 2004/10/06 14:12:50 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/internal/photos.sgml,v 1.6 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Gallerie de photo">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/internal/releng.sgml b/fr/internal/releng.sgml
index a7b3b39579..11c4c4dac7 100644
--- a/fr/internal/releng.sgml
+++ b/fr/internal/releng.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
 <!ENTITY email 'murray'>
-<!ENTITY date "$FreeBSD: www/fr/internal/releng.sgml,v 1.3 2004/01/08 00:26:44 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/internal/releng.sgml,v 1.5 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Cr&eacute;ation des versions de FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/internal/statistic.sgml b/fr/internal/statistic.sgml
index ef8a911182..ab5a218e30 100644
--- a/fr/internal/statistic.sgml
+++ b/fr/internal/statistic.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/internal/statistic.sgml,v 1.3 2004/01/06 17:31:41 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/internal/statistic.sgml,v 1.5 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Statistiques FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/internet.sgml b/fr/internet.sgml
index e9b6fb124b..06df6ad915 100644
--- a/fr/internet.sgml
+++ b/fr/internet.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/fr/internet.sgml,v 1.6 2005/10/06 12:56:02 blackend Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/internet.sgml,v 1.7 2005/12/31 11:26:15 blackend Exp $">
 <!ENTITY title "FreeBSD et Internet">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/advocacy.sgml b/fr/java/advocacy.sgml
index fc8ede8b7e..5e1c25c849 100644
--- a/fr/java/advocacy.sgml
+++ b/fr/java/advocacy.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/advocacy.sgml,v 1.5 2004/09/15 14:49:33 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/advocacy.sgml,v 1.7 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : Evang&eacute;lisation">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/dists/10.sgml b/fr/java/dists/10.sgml
index 05cb6c59d7..3143476f89 100644
--- a/fr/java/dists/10.sgml
+++ b/fr/java/dists/10.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/dists/10.sgml,v 1.3 2004/01/06 17:31:41 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/dists/10.sgml,v 1.5 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet Java pour FreeBSD : JDK 1.0 - NON SUPPORT&eacute;">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/dists/11.sgml b/fr/java/dists/11.sgml
index 08c3338ac6..12bcb6635d 100644
--- a/fr/java/dists/11.sgml
+++ b/fr/java/dists/11.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/dists/11.sgml,v 1.4 2004/08/09 20:46:17 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/dists/11.sgml,v 1.6 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : &jdk; 1.1">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/dists/12.sgml b/fr/java/dists/12.sgml
index 58bf4a2817..dbfadad34e 100644
--- a/fr/java/dists/12.sgml
+++ b/fr/java/dists/12.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/dists/12.sgml,v 1.4 2004/01/08 00:26:44 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/dists/12.sgml,v 1.6 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : &jdk; 2 (aka JDK 1.2)">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/dists/13.sgml b/fr/java/dists/13.sgml
index cb6664f3e6..3836fd04fd 100644
--- a/fr/java/dists/13.sgml
+++ b/fr/java/dists/13.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/dists/13.sgml,v 1.4 2004/08/09 20:46:17 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/dists/13.sgml,v 1.6 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : &jdk; 1.3">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/dists/14.sgml b/fr/java/dists/14.sgml
index e5498a6d8c..55ec625a88 100644
--- a/fr/java/dists/14.sgml
+++ b/fr/java/dists/14.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/dists/14.sgml,v 1.5 2005/01/12 16:07:35 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/dists/14.sgml,v 1.7 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : &jdk; 1.4">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/dists/15.sgml b/fr/java/dists/15.sgml
index 26529b3191..8873bafaf2 100644
--- a/fr/java/dists/15.sgml
+++ b/fr/java/dists/15.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/dists/15.sgml,v 1.3 2005/10/04 16:22:31 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/dists/15.sgml,v 1.4 2005/10/06 12:52:39 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : &jdk; 1.5">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/dists/index.sgml b/fr/java/dists/index.sgml
index fffb1bc34f..842f297930 100644
--- a/fr/java/dists/index.sgml
+++ b/fr/java/dists/index.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/dists/index.sgml,v 1.4 2005/02/05 16:32:25 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/dists/index.sgml,v 1.6 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : Distributions">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/docs/faq.sgml b/fr/java/docs/faq.sgml
index 5aaa84204c..0dfca6603a 100644
--- a/fr/java/docs/faq.sgml
+++ b/fr/java/docs/faq.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/docs/faq.sgml,v 1.4 2004/08/09 20:46:17 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/docs/faq.sgml,v 1.6 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : FAQ">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/docs/howtoports.sgml b/fr/java/docs/howtoports.sgml
index 121a6163c1..5daa4f0f2b 100644
--- a/fr/java/docs/howtoports.sgml
+++ b/fr/java/docs/howtoports.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/docs/howtoports.sgml,v 1.5 2005/02/05 16:32:25 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/docs/howtoports.sgml,v 1.7 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : Comment r&eacute;aliser un port">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY url.books "&enbase;/doc/en_US.ISO8859-1/books">
 ]>
 
diff --git a/fr/java/docs/newbies.sgml b/fr/java/docs/newbies.sgml
index 3fa52ef208..784409c364 100644
--- a/fr/java/docs/newbies.sgml
+++ b/fr/java/docs/newbies.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/docs/newbies.sgml,v 1.3 2004/01/06 17:31:41 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/docs/newbies.sgml,v 1.5 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : Guide pour les d&eacute;butants">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/docs/performance.sgml b/fr/java/docs/performance.sgml
index d312aca135..e67352cec4 100644
--- a/fr/java/docs/performance.sgml
+++ b/fr/java/docs/performance.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/docs/performance.sgml,v 1.4 2004/09/15 14:49:34 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/docs/performance.sgml,v 1.6 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : Comparaison des Performances">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/docs/tutorials.sgml b/fr/java/docs/tutorials.sgml
index 6b6d0fd0aa..f7c624c433 100644
--- a/fr/java/docs/tutorials.sgml
+++ b/fr/java/docs/tutorials.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/docs/tutorials.sgml,v 1.4 2004/09/15 14:49:34 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/docs/tutorials.sgml,v 1.6 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : Guides">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/howhelp.sgml b/fr/java/howhelp.sgml
index a059891851..2de87ecae6 100644
--- a/fr/java/howhelp.sgml
+++ b/fr/java/howhelp.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/howhelp.sgml,v 1.4 2004/09/15 14:49:33 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/howhelp.sgml,v 1.6 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : Comment aider">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/index.sgml b/fr/java/index.sgml
index c32eddf5fa..af5f95df8c 100644
--- a/fr/java/index.sgml
+++ b/fr/java/index.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/index.sgml,v 1.9 2005/10/06 12:56:04 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/index.sgml,v 1.10 2006/04/25 14:40:48 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/install.sgml b/fr/java/install.sgml
index 02c1b89f12..398e8e3400 100644
--- a/fr/java/install.sgml
+++ b/fr/java/install.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/install.sgml,v 1.5 2004/01/12 20:21:22 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/install.sgml,v 1.7 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : Comment effectuer l&quot;installation">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/links/api.sgml b/fr/java/links/api.sgml
index 38c0b08380..0a84c007bd 100644
--- a/fr/java/links/api.sgml
+++ b/fr/java/links/api.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/links/api.sgml,v 1.3 2004/01/06 17:31:42 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/links/api.sgml,v 1.5 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : API">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/links/development.sgml b/fr/java/links/development.sgml
index 286735a3b5..7def8fb5a0 100644
--- a/fr/java/links/development.sgml
+++ b/fr/java/links/development.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/links/development.sgml,v 1.3 2004/01/06 17:31:42 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/links/development.sgml,v 1.5 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : Outils de d&eacute;veloppement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/links/documentation.sgml b/fr/java/links/documentation.sgml
index 34c7a71dd5..9cfc4cc47e 100755
--- a/fr/java/links/documentation.sgml
+++ b/fr/java/links/documentation.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/links/documentation.sgml,v 1.3 2004/01/06 17:31:42 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/links/documentation.sgml,v 1.5 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : Documentations">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/links/freebsd.sgml b/fr/java/links/freebsd.sgml
index 9e88a0301f..22b49169f2 100755
--- a/fr/java/links/freebsd.sgml
+++ b/fr/java/links/freebsd.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/links/freebsd.sgml,v 1.3 2004/01/06 17:31:42 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/links/freebsd.sgml,v 1.5 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : Ressources Java sp&eacute;cifiques &agrave; FreeBSD">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/links/index.sgml b/fr/java/links/index.sgml
index 99a2170a42..82d750f5bd 100644
--- a/fr/java/links/index.sgml
+++ b/fr/java/links/index.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/links/index.sgml,v 1.3 2004/01/06 17:31:42 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/links/index.sgml,v 1.5 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : Liens Java">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/links/resources.sgml b/fr/java/links/resources.sgml
index 6f5f4f1892..5e600f2bdf 100755
--- a/fr/java/links/resources.sgml
+++ b/fr/java/links/resources.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/links/resources.sgml,v 1.3 2004/01/06 17:31:42 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/links/resources.sgml,v 1.5 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : Autres Ressources">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/links/servlets.sgml b/fr/java/links/servlets.sgml
index 5cd8cba672..7b8abc093b 100755
--- a/fr/java/links/servlets.sgml
+++ b/fr/java/links/servlets.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/links/servlets.sgml,v 1.3 2004/01/06 17:31:42 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/links/servlets.sgml,v 1.5 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : Servlets">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/links/tools.sgml b/fr/java/links/tools.sgml
index f5ef26f89d..7d3227a1cf 100644
--- a/fr/java/links/tools.sgml
+++ b/fr/java/links/tools.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/links/tools.sgml,v 1.3 2004/01/06 17:31:42 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/links/tools.sgml,v 1.5 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : Outils">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/links/tutorials.sgml b/fr/java/links/tutorials.sgml
index ddd1b6cab0..370061b2ea 100644
--- a/fr/java/links/tutorials.sgml
+++ b/fr/java/links/tutorials.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/links/tutorials.sgml,v 1.3 2004/01/06 17:31:42 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/links/tutorials.sgml,v 1.5 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : Guides">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/links/vendor.sgml b/fr/java/links/vendor.sgml
index 13b30a2555..7b6bfaf524 100644
--- a/fr/java/links/vendor.sgml
+++ b/fr/java/links/vendor.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/links/vendor.sgml,v 1.3 2004/01/06 17:31:42 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/links/vendor.sgml,v 1.5 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : Liens revendeurs">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/newsflash.sgml b/fr/java/newsflash.sgml
index c785984d32..f39a4f1ff3 100644
--- a/fr/java/newsflash.sgml
+++ b/fr/java/newsflash.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/newsflash.sgml,v 1.6 2005/10/06 12:56:04 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/newsflash.sgml,v 1.7 2005/12/31 11:26:15 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : flash info">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/java/press.sgml b/fr/java/press.sgml
index 5acde292e4..81fc59318d 100644
--- a/fr/java/press.sgml
+++ b/fr/java/press.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/java/press.sgml,v 1.3 2004/01/06 17:31:41 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/java/press.sgml,v 1.5 2005/10/06 12:56:04 blackend Exp $">
 <!ENTITY title "Projet &java; pour FreeBSD : Dans la presse...">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/kse/index.sgml b/fr/kse/index.sgml
index 17f9e6c34a..842e69d359 100644
--- a/fr/kse/index.sgml
+++ b/fr/kse/index.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/kse/index.sgml,v 1.4 2004/10/06 14:12:50 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/kse/index.sgml,v 1.6 2005/10/06 12:56:05 blackend Exp $">
 <!ENTITY title "Projet KSE">
 <!ENTITY email 'mini'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 
 <!-- Status levels -->
 <!ENTITY status.done "<font color=green>Fait</font>">
diff --git a/fr/logo.sgml b/fr/logo.sgml
index 92659a83f9..765a4404cc 100644
--- a/fr/logo.sgml
+++ b/fr/logo.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/fr/logo.sgml,v 1.2 2006/05/11 08:12:57 blackend Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/logo.sgml,v 1.3 2006/07/03 16:03:57 blackend Exp $">
 <!ENTITY title "Logo FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "developers.sgml"> %developers;
 ]>
 <!--
diff --git a/fr/mailto.sgml b/fr/mailto.sgml
index 94c0793204..52ca8233d8 100644
--- a/fr/mailto.sgml
+++ b/fr/mailto.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/fr/mailto.sgml,v 1.7 2005/10/06 12:56:02 blackend Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/mailto.sgml,v 1.8 2006/04/25 14:40:48 blackend Exp $">
 <!ENTITY title "Contacts FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/1996/index.sgml b/fr/news/1996/index.sgml
index 6249bf2c11..104940a7b3 100644
--- a/fr/news/1996/index.sgml
+++ b/fr/news/1996/index.sgml
@@ -1,12 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/news/1996/index.sgml,v 1.2 2004/01/06 17:31:42 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/news/1996/index.sgml,v 1.4 2005/10/06 12:56:05 blackend Exp $">
 <!ENTITY title "Flash d'informations FreeBSD ! (1996)">
-<!ENTITY % navincludes SYSTEM "../../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!ENTITY newshome '<a href="../news.html">News Home</a>'>
-<!ENTITY % newsincludes SYSTEM "../includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/1997/index.sgml b/fr/news/1997/index.sgml
index 974f96dbc0..da89a89e71 100644
--- a/fr/news/1997/index.sgml
+++ b/fr/news/1997/index.sgml
@@ -1,13 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/news/1997/index.sgml,v 1.4 2004/01/12 20:21:22 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/news/1997/index.sgml,v 1.6 2005/10/06 12:56:05 blackend Exp $">
 <!ENTITY title "Flash d'informations FreeBSD ! (1997)">
-<!ENTITY % navincludes SYSTEM "../../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!ENTITY newshome '<a href="../news.html">News Home</a>'>
-<!ENTITY % newsincludes SYSTEM "../includes.sgml"> %newsincludes;
 <!ENTITY ftp "ftp://ftp.FreeBSD.org/pub/FreeBSD">
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/1998/index.sgml b/fr/news/1998/index.sgml
index 38f756fe34..e00f3a40fc 100644
--- a/fr/news/1998/index.sgml
+++ b/fr/news/1998/index.sgml
@@ -1,12 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/news/1998/index.sgml,v 1.4 2004/01/12 20:21:22 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/news/1998/index.sgml,v 1.6 2005/10/06 12:56:05 blackend Exp $">
 <!ENTITY title "FreeBSD flash info ! (1998)">
-<!ENTITY % navincludes SYSTEM "../../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!ENTITY newshome '<a href="../news.html">Accueil nouvelles</a>'>
-<!ENTITY % newsincludes SYSTEM "../includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/1999/index.sgml b/fr/news/1999/index.sgml
index dc1406beb5..305004ab0e 100644
--- a/fr/news/1999/index.sgml
+++ b/fr/news/1999/index.sgml
@@ -1,12 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/news/1999/index.sgml,v 1.2 2004/01/06 17:31:42 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/news/1999/index.sgml,v 1.4 2005/10/06 12:56:05 blackend Exp $">
 <!ENTITY title "FreeBSD flash info ! (1999)">
-<!ENTITY % navincludes SYSTEM "../../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!ENTITY newshome '<a href="../news.html">Accueil nouvelles</a>'>
-<!ENTITY % newsincludes SYSTEM "../includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/2000/index.sgml b/fr/news/2000/index.sgml
index 9d5a46c6be..48979c23f6 100644
--- a/fr/news/2000/index.sgml
+++ b/fr/news/2000/index.sgml
@@ -1,12 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/news/2000/index.sgml,v 1.4 2004/01/12 20:21:22 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/news/2000/index.sgml,v 1.6 2005/10/06 12:56:05 blackend Exp $">
 <!ENTITY title "Nouvelles FreeBSD ! (2000)">
-<!ENTITY % navincludes SYSTEM "../../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!ENTITY newshome '<a href="../news.html">Accueil Nouvelles</a>'>
-<!ENTITY % newsincludes SYSTEM "../includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/2001/Makefile b/fr/news/2001/Makefile
index 5ff04112bc..6d5ab469c7 100644
--- a/fr/news/2001/Makefile
+++ b/fr/news/2001/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/fr/news/2001/Makefile,v 1.1 2002/12/22 22:02:24 stephane Exp $
+# $FreeBSD: www/fr/news/2001/Makefile,v 1.2 2004/12/31 07:24:04 hrs Exp $
 
 # The FreeBSD French Documentation Project
 # Original revision: 1.1
@@ -10,16 +10,7 @@
 .include "../Makefile.inc"
 .endif
 
-DATA=		index.html
-CLEANFILES+=	index.html
-
-index.html: ../oldnewsflash.xsl news.xml \
-		${XML_INCLUDES} ${XML_TRANSTABLE}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/../oldnewsflash.xsl ${.CURDIR}/news.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
+XMLDOCS+=	index:${XSL_NEWS_NEWSFLASH_OLD}:news.xml:
+DEPENDSET.index=transtable news
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/fr/news/2002/Makefile b/fr/news/2002/Makefile
index cdc23ff74d..0fc8884e0d 100644
--- a/fr/news/2002/Makefile
+++ b/fr/news/2002/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/fr/news/2002/Makefile,v 1.1 2003/11/17 17:22:21 stephane Exp $
+# $FreeBSD: www/fr/news/2002/Makefile,v 1.2 2004/12/31 07:24:04 hrs Exp $
 
 # The FreeBSD French Documentation Project
 # Original revision: 1.1
@@ -10,16 +10,7 @@
 .include "../Makefile.inc"
 .endif
 
-DATA=		index.html
-CLEANFILES+=	index.html
-
-index.html: ../oldnewsflash.xsl news.xml \
-		${XML_INCLUDES} ${XML_TRANSTABLE}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/../oldnewsflash.xsl ${.CURDIR}/news.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
+XMLDOCS+=	index:${XSL_NEWS_NEWSFLASH_OLD}:news.xml:
+DEPENDSET.index=transtable news
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/fr/news/Makefile b/fr/news/Makefile
index 4ea5e389cd..72b6b0df43 100644
--- a/fr/news/Makefile
+++ b/fr/news/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/fr/news/Makefile,v 1.8 2004/12/30 17:53:44 hrs Exp $
+# $FreeBSD: www/fr/news/Makefile,v 1.9 2006/03/13 21:09:20 blackend Exp $
 
 # The FreeBSD French Documentation Project
 # Original revision: 1.39
@@ -29,6 +29,11 @@ DOCS+= sou1999.sgml
 
 INDEXLINK= news.html
 
+DEPENDSET.DEFAULT=	transtable news press
+
+XMLDOCS=	newsflash:${XSL_NEWS_NEWSFLASH}:${XML_NEWS_NEWS_MASTER}:
+XMLDOCS+=	press:${XSL_NEWS_PRESS}:${XML_NEWS_PRESS_MASTER}:
+
 # SUBDIR       	1993
 SUBDIR+= 	1996
 SUBDIR+= 	1997
@@ -39,35 +44,4 @@ SUBDIR+= 	2001
 SUBDIR+= 	2002
 SUBDIR+=	status
 
-DATA=		newsflash.html news.rdf press.html
-CLEANFILES+=	newsflash.html news.rdf press.html
-
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
-
-newsflash.html: newsflash.xsl news.xml\
-			includes.xsl ${XML_INCLUDES}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param "news.project.xml-master" "'${XML_NEWS_NEWS_MASTER}'" \
-		--param "news.project.xml" "'${XML_NEWS_NEWS}'" \
-		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
-news.rdf: news-rdf.xsl news.xml\
-		includes.xsl ${XML_INCLUDES}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/news-rdf.xsl ${.CURDIR}/news.xml
-
-press.html: press.xsl press.xml\
-		includes.xsl ${XML_INCLUDES}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param "news.press.xml-master" "'${XML_NEWS_PRESS_MASTER}'" \
-		--param "news.press.xml" "'${XML_NEWS_PRESS}'" \
-		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/press.xsl ${.CURDIR}/press.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
diff --git a/fr/news/includes.sgml b/fr/news/includes.sgml
deleted file mode 100644
index 029401fdf5..0000000000
--- a/fr/news/includes.sgml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- $FreeBSD: www/fr/news/includes.sgml,v 1.1 2002/12/01 14:01:57 stephane Exp $ -->
-
-<!--
-   The FreeBSD French Documentation Project
-   Original revision: 1.8
-
-   Version francaise (mise a jour) : Stephane Legrand <stephane@freebsd-fr.org>
--->
-
-<!ENTITY newshome '<A HREF="news.html">Accueil Nouvelles</A>'>
-
diff --git a/fr/news/includes.xsl b/fr/news/includes.xsl
deleted file mode 100644
index 8519121577..0000000000
--- a/fr/news/includes.xsl
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!-- $FreeBSD: www/fr/news/includes.xsl,v 1.1 2002/12/08 16:45:35 stephane Exp $ -->
-
-<!-- 
-   The FreeBSD French Documentation Project
-   Original revision: 1.6
-   
-   Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
-   Version francaise (mise a jour) : Mathieu Arnold <mat@FreeBSD.org>
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:variable name="newshome">
-    <a href="{$base}/news/news.html">Accueil Nouvelles</a>
-  </xsl:variable>
-
-  <xsl:variable name="presshome">
-    <a href="{$base}/news/press.html">Accueil Presse</a>
-  </xsl:variable>
-
-  <!-- Generate a unique anchor for this event -->
-  <xsl:template name="generate-event-anchor">
-    <xsl:text>event</xsl:text>
-    <xsl:value-of select="ancestor::year/name"/>
-    <xsl:value-of select="ancestor::month/name"/>
-    <xsl:value-of select="ancestor::day/name"/>:<xsl:value-of select="count(preceding-sibling::event)"/>
-  </xsl:template>
-
-  <!-- Generate a unique anchor for this story -->
-  <xsl:template name="generate-story-anchor">
-    <xsl:text>story</xsl:text>
-    <xsl:value-of select="ancestor::year/name"/>
-    <xsl:value-of select="ancestor::month/name"/>:<xsl:text/>
-    <xsl:value-of select="count(following-sibling::story)"/>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/fr/news/news-rdf.xsl b/fr/news/news-rdf.xsl
deleted file mode 100644
index 44dc5919ce..0000000000
--- a/fr/news/news-rdf.xsl
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!-- $FreeBSD: www/fr/news/news-rdf.xsl,v 1.1 2002/12/08 16:45:35 stephane Exp $ -->
-
-<!-- 
-   The FreeBSD French Documentation Project
-   Original revision: 1.6
-   
-   Version francaise : Stephane Legrand <stephane@freebsd-fr.org> 
-   Version francaise (mise a jour) : Mathieu Arnold <mat@FreeBSD.org>
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:import href="includes.xsl"/>
-
-  <xsl:output method="xml" indent="yes"/>
-
-  <xsl:variable name="base" select="'..'"/>
-
-  <!-- Generate the main body of the RDF file -->
-  <xsl:template match="news">
-    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	     xmlns="http://my.netscape.com/rdf/simple/0.9/">
-
-      <channel>
-	<title>Nouvelles du Projet FreeBSD</title>
-	<link>http://www.FreeBSD.org/news/</link>
-	<description>Nouvelles du Projet FreeBSD</description>
-      </channel>
-
-      <!-- Only include the last 10 events -->
-      <xsl:apply-templates select="descendant::event[position() &lt;= 10]"/>
-
-      </rdf:RDF>
-  </xsl:template>
-
-  <!-- Generate the <item> elements and their content -->
-  <xsl:template match="event" xmlns="http://my.netscape.com/rdf/simple/0.9/">
-    <item>
-      <xsl:choose>
-	<xsl:when test="count(child::title)">
-	  <title><xsl:value-of select="normalize-space(title)"/></title>
-	</xsl:when>
-	<xsl:otherwise>
-	  <title><xsl:value-of select="normalize-space(p)"/></title>
-	</xsl:otherwise>
-      </xsl:choose>
-      <link>http://www.FreeBSD.org/news/newsflash.html#<xsl:call-template name="generate-event-anchor"/></link>
-    </item>
-  </xsl:template>
-  
-  <xsl:template match="name | date"/>
-</xsl:stylesheet>
diff --git a/fr/news/news.sgml b/fr/news/news.sgml
index 1e06774deb..cc942e3df8 100644
--- a/fr/news/news.sgml
+++ b/fr/news/news.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/news/news.sgml,v 1.6 2005/10/06 12:56:05 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/news/news.sgml,v 1.7 2006/01/14 17:34:09 blackend Exp $">
 <!ENTITY title "Nouvelles FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/newsflash.xsl b/fr/news/newsflash.xsl
deleted file mode 100644
index d1b4a1caa8..0000000000
--- a/fr/news/newsflash.xsl
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!-- $FreeBSD: www/fr/news/newsflash.xsl,v 1.7 2004/12/30 17:53:44 hrs Exp $ -->
-
-<!-- 
-   The FreeBSD French Documentation Project
-   Original revision: 1.11
-   
-   Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
-   Version francaise (mise a jour) : Mathieu Arnold <mat@FreeBSD.org>
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
-
-  <xsl:import href="../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
-  <xsl:variable name="section" select="'about'"/>
-
-  <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="enbase" select="'../..'"/>
-  <xsl:variable name="title" select="'Nouvelles FreeBSD'"/>
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
-  <xsl:param name="news.project.xml-master" select="'none'" />
-  <xsl:param name="news.project.xml" select="'none'" />
-
-  <xsl:output type="html" encoding="iso-8859-1"/>
-
-  <xsl:template match="news">
-    <html>
-
-      <xsl:copy-of select="$header1"/>
-      
-            <body xsl:use-attribute-sets="att.body">
-      
-        <div id="containerwrap">
-          <div id="container">
-      
-      	<xsl:copy-of select="$header2"/>
-      
-      	<div id="content">
-      
-      	      <xsl:copy-of select="$sidenav"/>
-      
-      	      <div id="contentwrap">
-      	      
-	      <xsl:copy-of select="$header3"/>
-
-	<!-- Notice how entity references in SGML become variable references
-	     in the stylesheet, and that the syntax for referring to variables
-	     inside an attribute is "{$variable}".
-
-	     This is just dis-similar enough to Perl and the shell that you
-	     end up writing ${variable} all the time, and then scratch your 
-	     head wondering why the stylesheet isn't working.-->
-
-	<!-- Also notice that because this is now XML and not SGML, empty
-             elements, like IMG, must have a trailing "/" just inside the 
-   	     closing angle bracket, like this " ... />" -->
-	<img src="{$enbase}/gifs/news.jpg" align="right" border="0" width="193"
-	     height="144" alt="Nouvelles FreeBSD"/>
-
-	<p>FreeBSD est un syst&#232;me d'exploitation en constante &#233;volution. Se tenir inform&#233;
-	  des derniers d&#233;veloppements peut devenir une corv&#233;e ! Pour rester &#224; jour,
-	  consultez cette page r&#233;guli&#232;rement. Vous pouvez &#233;galement
-	  vous inscrire &#224; la liste de diffusion
-	  <a href="{$enbase}/doc/{$url.doc.langcode}/books/handbook/eresources.html#ERESOURCES-MAIL">freebsd-announce</a>
-	  ou au <a href="news.rdf">flux RDF</a>.</p>
-
-	     <p>Les projets suivants ont leurs propres pages de nouvelles, vous pouvez les consulter
-          pour les mises &#224; jour sp&#233;cifiques &#224; ces projets.</p>
-
-        <ul>
-          <li><a href="{$base}/java/newsflash.html"><xsl:value-of select="$java"/> sur FreeBSD</a></li>
-          <li><a href="http://freebsd.kde.org/">KDE sur FreeBSD</a></li>
-          <li><a href="{$base}/gnome/newsflash.html">GNOME sur FreeBSD</a></li>
-        </ul>
-
-	<p>Pour une description d&#233;taill&#233;e des versions pass&#233;es, pr&#233;sentes et futures,
-	  consultez la page <strong><a href="{$base}/releases/index.html">d'information
-	      sur les versions</a></strong>.</p>
-
-	<p>Pour les avis de s&#233;curit&#233; concernant FreeBSD, veuillez consulter la page
-	  <a href="{$base}/security/#adv">d'information sur la s&#233;curit&#233;</a>.</p>
-
-	<xsl:call-template name="html-news-list-newsflash">
-          <xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
-          <xsl:with-param name="news.project.xml" select="$news.project.xml" />
-	</xsl:call-template>
-
-	<xsl:copy-of select="$newshome"/>
-
-	  	</div> <!-- contentwrap -->
-		<br class="clearboth" />
-	
-	</div> <!-- content -->
-	
-	<xsl:copy-of select="$footer"/>
-	
-        </div> <!-- container -->
-   </div> <!-- containerwrap -->
-
-      </body>
-    </html>
-  </xsl:template>
-
-  <xsl:template name="html-news-make-olditems-list">
-    <p>Anciennes annonces :
-      <a href="2002/index.html">2002</a>,
-      <a href="2001/index.html">2001</a>,
-      <a href="2000/index.html">2000</a>,
-      <a href="1999/index.html">1999</a>,
-      <a href="1998/index.html">1998</a>,
-      <a href="1997/index.html">1997</a>,
-      <a href="1996/index.html">1996</a></p>
-  </xsl:template>
-
-  <!-- When the href attribute contains a '$base', expand it to the current
-       value of the $base variable. -->
-
-  <!-- All your $base are belong to us.  Ho ho ho -->
-  <xsl:template match="a">
-    <a><xsl:attribute name="href">
-	<xsl:choose>
-	  <xsl:when test="contains(@href, '$base')">
-	    <xsl:value-of select="concat(substring-before(@href, '$base'), $base, substring-after(@href, '$base'))"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:value-of select="@href"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </a>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/fr/news/oldnewsflash.xsl b/fr/news/oldnewsflash.xsl
deleted file mode 100644
index 1e4718923e..0000000000
--- a/fr/news/oldnewsflash.xsl
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!-- $FreeBSD: www/fr/news/oldnewsflash.xsl,v 1.4 2004/08/07 15:33:38 mat Exp $ -->
-
-<!-- 
-   The FreeBSD French Documentation Project
-   Original revision: 1.8
-
-   Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
-   Version francaise (mise a jour) : Mathieu Arnold <mat@FreeBSD.org>
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
-
-  <xsl:import href="../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
-
-
-  <xsl:variable name="year">
-    <xsl:value-of select="descendant::year/name"/>
-  </xsl:variable>
-  <xsl:variable name="base" select="'../..'"/>
-  <xsl:variable name="enbase" select="'../../..'"/>
-  <xsl:variable name="title" select="concat('FreeBSD - Flash info (', $year, ')')"/>
-  <!-- <xsl:variable name="title" select="$year"/> -->
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-  
-  <xsl:output type="html" encoding="iso-8859-1"/>
-
-  <xsl:template match="news">
-    <html>
-      
-      <xsl:copy-of select="$header1"/>
-
-      <body>
-
-	<xsl:copy-of select="$header2"/>
-
-	<!-- Notice how entity references in SGML become variable references
-	     in the stylesheet, and that the syntax for referring to variables
-	     inside an attribute is "{$variable}".
-
-	     This is just dis-similar enough to Perl and the shell that you
-	     end up writing ${variable} all the time, and then scratch your 
-	     head wondering why the stylesheet isn't working.-->
-
-	<!-- Also notice that because this is now XML and not SGML, empty
-             elements, like IMG, must have a trailing "/" just inside the 
-   	     closing angle bracket, like this " ... />" -->
-	<img src="{$enbase}/gifs/news.jpg" align="right" border="0" width="193"
-	     height="144" alt="FreeBSD News"/>
-
-	<xsl:apply-templates select="descendant::month"/>
-	
-	<xsl:copy-of select="$newshome"/>
-	<xsl:copy-of select="$footer"/>
-      </body>
-    </html>
-  </xsl:template>
-
-  <!-- Everything that follows are templates for the rest of the content -->
-  
-  <xsl:template match="month">
-    <h1>
-      <xsl:call-template name="transtable-lookup">
-	<xsl:with-param name="word-group" select="'number-month'" />
-	<xsl:with-param name="word">
-	  <xsl:value-of select="name"/>
-	</xsl:with-param>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select="descendant::day"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match="day">
-    <xsl:apply-templates select="event"/>
-  </xsl:template>
-
-  <xsl:template match="event">
-    <li><p><a>
-	  <xsl:attribute name="name">
-	    <xsl:call-template name="generate-event-anchor"/>
-	  </xsl:attribute>
-	</a>
-
-	<b><xsl:value-of select="ancestor::day/name"/>
-	  <xsl:text> </xsl:text>
-	  <xsl:call-template name="transtable-lookup">
-	    <xsl:with-param name="word-group" select="'number-month'" />
-	    <xsl:with-param name="word">
-	      <xsl:value-of select="ancestor::month/name"/>
-	    </xsl:with-param>
-	  </xsl:call-template>
-	  <xsl:text>, </xsl:text>
-	  <xsl:value-of select="ancestor::year/name"/>:</b><xsl:text> </xsl:text>
-	<xsl:apply-templates select="p"/>
-	</p>
-
-    </li>
-  </xsl:template>
-
-  <xsl:template match="date"/>    <!-- Deliberately left blank -->
-
-  <!-- When the href attribute contains a '$base' or '$enbase', expand it
-       to the current value of the $base or $enbase variable. -->
-
-  <!-- All your $base or $enbase are belong to us.  Ho ho ho -->
-  <xsl:template match="a">
-    <a><xsl:attribute name="href">
-	<xsl:choose>
-	  <xsl:when test="contains(@href, '$base')">
-	    <xsl:value-of select="concat(substring-before(@href, '$base'), $base, substring-after(@href, '$base'))"/>
-	  </xsl:when>
-	  <xsl:when test="contains(@href, '$enbase')">
-	    <xsl:value-of select="concat(substring-before(@href, '$enbase'), $enbase, substring-after(@href, '$enbase'))"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:value-of select="@href"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </a>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/fr/news/press-rel-1.sgml b/fr/news/press-rel-1.sgml
index 5b7685962e..a826744dcc 100644
--- a/fr/news/press-rel-1.sgml
+++ b/fr/news/press-rel-1.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/news/press-rel-1.sgml,v 1.2 2003/12/29 17:23:43 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/news/press-rel-1.sgml,v 1.4 2005/10/06 12:56:05 blackend Exp $">
 <!ENTITY title "FreeBSD - revue de presse : 22 avril 1999">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/press-rel-2.sgml b/fr/news/press-rel-2.sgml
index 8976a6fff8..c5c24b75b6 100644
--- a/fr/news/press-rel-2.sgml
+++ b/fr/news/press-rel-2.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/news/press-rel-2.sgml,v 1.3 2004/02/05 21:33:28 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/news/press-rel-2.sgml,v 1.5 2005/10/06 12:56:05 blackend Exp $">
 <!ENTITY title "FreeBSD - revue de presse : 29 avril 1999">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/press-rel-3.sgml b/fr/news/press-rel-3.sgml
index 3d9f061974..fe3140ae8b 100644
--- a/fr/news/press-rel-3.sgml
+++ b/fr/news/press-rel-3.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/news/press-rel-3.sgml,v 1.2 2003/12/29 17:23:43 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/news/press-rel-3.sgml,v 1.4 2005/10/06 12:56:05 blackend Exp $">
 <!ENTITY title "FreeBSD - revue de presse : 7 juin 1999">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/press-rel-4.sgml b/fr/news/press-rel-4.sgml
index ca8a95b5a6..b9225125a7 100644
--- a/fr/news/press-rel-4.sgml
+++ b/fr/news/press-rel-4.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/news/press-rel-4.sgml,v 1.2 2004/01/06 17:31:42 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/news/press-rel-4.sgml,v 1.4 2005/10/06 12:56:05 blackend Exp $">
 <!ENTITY title "Communiqu&eacute; de presse FreeBSD : 9 Mars 2000">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/press-rel-5.sgml b/fr/news/press-rel-5.sgml
index 068d5273fe..5e57a76142 100644
--- a/fr/news/press-rel-5.sgml
+++ b/fr/news/press-rel-5.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/news/press-rel-5.sgml,v 1.2 2004/01/06 17:31:42 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/news/press-rel-5.sgml,v 1.4 2005/10/06 12:56:05 blackend Exp $">
 <!ENTITY title "Communiqu&eacute; de presse FreeBSD : 18 Octobre 2000">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/press-rel-6.sgml b/fr/news/press-rel-6.sgml
index a3a04b5347..9bd19c35dc 100644
--- a/fr/news/press-rel-6.sgml
+++ b/fr/news/press-rel-6.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/news/press-rel-6.sgml,v 1.3 2004/08/07 15:33:38 mat Exp $">
+<!ENTITY date "$FreeBSD: www/fr/news/press-rel-6.sgml,v 1.5 2005/10/06 12:56:05 blackend Exp $">
 <!ENTITY title "Communiqu&eacute; de presse FreeBSD : 31 Octobre 2002">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/press-rel-7.sgml b/fr/news/press-rel-7.sgml
index 935b13a99d..747b90730e 100644
--- a/fr/news/press-rel-7.sgml
+++ b/fr/news/press-rel-7.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/news/press-rel-7.sgml,v 1.3 2004/02/05 21:33:28 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/news/press-rel-7.sgml,v 1.5 2005/10/06 12:56:05 blackend Exp $">
 <!ENTITY title "Communiqu&eacute; de presse FreeBSD 5.0">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/press-rel-8.sgml b/fr/news/press-rel-8.sgml
index c25529b3e8..9bcdf15624 100644
--- a/fr/news/press-rel-8.sgml
+++ b/fr/news/press-rel-8.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/fr/news/press-rel-8.sgml,v 1.1 2006/03/13 21:09:20 blackend Exp $">
 <!ENTITY title "Le Projet FreeBSD lance FreeBSD 6.0">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/press-rel-9.sgml b/fr/news/press-rel-9.sgml
index da0e85f20e..87729164f3 100644
--- a/fr/news/press-rel-9.sgml
+++ b/fr/news/press-rel-9.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/fr/news/press-rel-9.sgml,v 1.1 2006/03/13 21:09:20 blackend Exp $">
 <!ENTITY title "Hewlett-Packard donne un cluster blade &agrave; FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/press.xsl b/fr/news/press.xsl
deleted file mode 100644
index b87a6cfd36..0000000000
--- a/fr/news/press.xsl
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!-- $FreeBSD: www/fr/news/press.xsl,v 1.3 2004/12/30 17:53:44 hrs Exp $ -->
-
-<!-- 
-   The FreeBSD French Documentation Project
-   Original revision: 1.3
-
-   Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
-
-  <xsl:import href="../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
-  <xsl:variable name="section" select="'about'"/>
-
-  <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="enbase" select="'../..'"/>
-  <xsl:variable name="title" select="'FreeBSD dans la Presse'"/>
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
-  <xsl:param name="news.press.xml-master" select="'none'" />
-  <xsl:param name="news.press.xml" select="'none'" />
-
-  <xsl:output type="html" encoding="iso-8859-1"/>
-
-  <xsl:template match="press">
-    <html>
-
-      <xsl:copy-of select="$header1"/>
-      
-            <body xsl:use-attribute-sets="att.body">
-      
-        <div id="containerwrap">
-          <div id="container">
-      
-      	<xsl:copy-of select="$header2"/>
-      
-      	<div id="content">
-      
-      	      <xsl:copy-of select="$sidenav"/>
-      
-      	      <div id="contentwrap">
-      	      
-	      <xsl:copy-of select="$header3"/>
-
-	<p>Si vous connaissez d'autres articles &#224; propos de FreeBSD que nous n'avons pas
-	  indiqu&#233;s ici, veuillez envoyer tous les d&#233;tails &#224; l'adresse
-	  <a href="mailto:doc@freebsd.org">doc@FreeBSD.org</a> afin que nous puissions
-	  les ajouter.</p>
-
-	<p>Vous pouvez &#233;galement consulter la page <a href="{$base}/java/press.html">FreeBSD/Java
-	    dans la Presse</a> pour des nouvelles sur le projet Java pour FreeBSD</p>
-
-	<xsl:call-template name="html-news-list-press">
-	  <xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
-	  <xsl:with-param name="news.press.xml" select="$news.press.xml" />
-	</xsl:call-template>
-
-	<xsl:copy-of select="$newshome"/>
-
-	  	</div> <!-- contentwrap -->
-		<br class="clearboth" />
-	
-	</div> <!-- content -->
-	
-	<xsl:copy-of select="$footer"/>
-	
-        </div> <!-- container -->
-   </div> <!-- containerwrap -->
-
-      </body>
-    </html>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/fr/news/pressreleases.sgml b/fr/news/pressreleases.sgml
index ee4e085b30..6c1046bf66 100644
--- a/fr/news/pressreleases.sgml
+++ b/fr/news/pressreleases.sgml
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/news/pressreleases.sgml,v 1.5 2005/10/06 12:56:05 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/news/pressreleases.sgml,v 1.6 2006/03/13 21:09:20 blackend Exp $">
 <!ENTITY title "Communiqu&eacute;s de presse">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/sou1999.sgml b/fr/news/sou1999.sgml
index 0a9841a135..173f092786 100644
--- a/fr/news/sou1999.sgml
+++ b/fr/news/sou1999.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/news/sou1999.sgml,v 1.2 2004/01/06 17:31:42 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/news/sou1999.sgml,v 1.4 2005/10/06 12:56:05 blackend Exp $">
 <!ENTITY title "FreeBSD, Etat de l'union, 1999">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/status/Makefile b/fr/news/status/Makefile
index a41aa446cc..56af2748c0 100644
--- a/fr/news/status/Makefile
+++ b/fr/news/status/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/fr/news/status/Makefile,v 1.1 2002/12/22 22:05:07 stephane Exp $
+# $FreeBSD: www/fr/news/status/Makefile,v 1.2 2003/12/15 16:09:26 stephane Exp $
 
 # The FreeBSD French Documentation Project
 # Original revision: 1.21
@@ -14,31 +14,35 @@
 
 DOCS=	status.sgml
 
-# DATA=	report-june-2001.html
-# DATA+=	report-july-2001.html
-# DATA+=	report-august-2001.html
-# DATA+=	report-september-2001.html
-# DATA+=	report-november-2001.html
-# DATA+=	report-dec-2001-jan-2002.html
-# DATA+=	report-feb-2002-apr-2002.html
-# DATA+=	report-may-2002-june-2002.html
-DATA+=	report-july-2002-aug-2002.html
-# DATA+=	report-sept-2002-oct-2002.html
-# DATA+=	report-nov-2002-dec-2002.html
-# DATA+=  	report-jan-2003-feb-2003.html
-# DATA+=	report-mar-2003-sep-2003.html
+#XMLDOCS=	report-june-2001
+#XMLDOCS+=	report-july-2001
+#XMLDOCS+=	report-august-2001
+#XMLDOCS+=	report-september-2001
+#XMLDOCS+=	report-november-2001
+#XMLDOCS+=	report-dec-2001-jan-2002
+#XMLDOCS+=	report-feb-2002-apr-2002
+#XMLDOCS+=	report-may-2002-june-2002
+XMLDOCS+=	report-july-2002-aug-2002
+#XMLDOCS+=	report-sept-2002-oct-2002
+#XMLDOCS+=	report-nov-2002-dec-2002
+#XMLDOCS+=	report-jan-2003-feb-2003
+#XMLDOCS+=	report-mar-2003-sep-2003
+#XMLDOCS+=	report-oct-2003-dec-2003
+#XMLDOCS+=	report-jan-2004-feb-2004
+#XMLDOCS+=	report-mar-2004-apr-2004
+#XMLDOCS+=	report-may-2004-june-2004
+#XMLDOCS+=	report-july-2004-dec-2004
+#XMLDOCS+=	report-jan-2005-mar-2005
+#XMLDOCS+=	report-mar-2005-june-2005
+#XMLDOCS+=	report-july-2005-oct-2005
+#XMLDOCS+=	report-oct-2005-dec-2005
+#XMLDOCS+=	report-jan-2006-mar-2006
+#XMLDOCS+=	report-apr-2006-jun-2006
+
+XSLT.DEFAULT=	report.xsl
 
 # Install a sample <project> entry.
-DATA+=	report-sample.xml
-
-CLEANFILES+=	${DATA:M*.html}
-
-.xml.html:	report.xsl includes.xsl
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		${.CURDIR}/report.xsl ${.IMPSRC}
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
+DATA=		report-sample.xml
 
 INDEXLINK=	status.html
 
diff --git a/fr/news/status/report.xsl b/fr/news/status/report.xsl
index 14f34689e8..242f6ea160 100644
--- a/fr/news/status/report.xsl
+++ b/fr/news/status/report.xsl
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+<!ENTITY base "../..">
+<!ENTITY title "FreeBSD Rapport de Statut">
+<!ENTITY email "freebsd-www">
+<!ENTITY % navinclude.about "INCLUDE">
+]>
 
-<!-- $FreeBSD: www/fr/news/status/report.xsl,v 1.1 2002/12/22 22:05:07 stephane Exp $ -->
+<!-- $FreeBSD: www/fr/news/status/report.xsl,v 1.2 2005/10/06 12:56:05 blackend Exp $ -->
 
 <!-- 
    The FreeBSD French Documentation Project
@@ -12,19 +19,7 @@
 <!-- Standard header material -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
-
-  <xsl:import href="../../includes.xsl"/>
-  <xsl:import href="../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
-  <xsl:variable name="section" select="'about'"/>
-
-  <xsl:variable name="base" select="'../..'"/>
-
-  <xsl:variable name="title">
-    <xsl:value-of select="report/date/month"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="report/date/year"/> Rapport de Statut
-  </xsl:variable>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
   <xsl:variable name="date">
     <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
@@ -39,56 +34,69 @@
 
   <xsl:template match="report">
     <html>
-      
-      <xsl:copy-of select="$header1"/>
-      
-            <body xsl:use-attribute-sets="att.body">
-      
+      &header1;
+
+      <body>
         <div id="containerwrap">
           <div id="container">
-      
-      	<xsl:copy-of select="$header2"/>
-      
-      	<div id="content">
-      
-      	      <xsl:copy-of select="$sidenav"/>
-      
-      	      <div id="contentwrap">
-      	      
-	      <xsl:copy-of select="$header3"/>
+            &header2;
+
+	<div id="content">
+              <div id="SIDEWRAP">
+                &nav;
+              </div> <!-- SIDEWRAP -->
+
+	      <div id="contentwrap">
+                &header3;
 
 	<!-- Process all the <sections>, in order -->
 	<xsl:apply-templates select="section"/>
 
+	<hr/>
+
 	<!-- Generate a table of contents, sorted -->
+	<xsl:for-each select="category">
+	  <h3><xsl:value-of select="description"/></h3>
+	  <xsl:variable name="cat-short" select="name"/>
+	  <ul>
+	    <xsl:for-each select="//project[@cat=$cat-short]">
+  	      <xsl:sort select="translate(title, $lcletters, $ucletters)"/>
+	      <li><a><xsl:attribute name="href">#<xsl:value-of
+	      select="translate(title, ' ',
+	      '-')"/></xsl:attribute><xsl:value-of select="title"/></a>
+	      </li>
+	    </xsl:for-each>
+	  </ul>
+	</xsl:for-each>
 	<ul>
-	  <xsl:for-each select="project">
-	    <xsl:sort select="translate(title, $lcletters, $ucletters)"/>
+	  <xsl:for-each select="//project[not(@cat)]">
+  	    <xsl:sort select="translate(title, $lcletters, $ucletters)"/>
 	    <li><a><xsl:attribute name="href">#<xsl:value-of
-	    select="translate(title, ' ', '-')"/></xsl:attribute><xsl:value-of
-	    select="title"/></a></li>
+	    select="translate(title, ' ',
+	    '-')"/></xsl:attribute><xsl:value-of select="title"/></a>
+	    </li>
 	  </xsl:for-each>
 	</ul>
 
+	<hr/>
+
 	<!-- Process each project, sorted -->
 	<xsl:apply-templates select="project">
 	  <xsl:sort select="translate(title, $lcletters, $ucletters)"/>
 	</xsl:apply-templates>
 
 	<!-- Standard footer -->
-	<xsl:copy-of select="$newshome"/> |
-	<xsl:copy-of select="$statushome"/>
-
-	  	</div> <!-- contentwrap -->
-		<br class="clearboth" />
-	
-	</div> <!-- content -->
-	
-	<xsl:copy-of select="$footer"/>
-	
-        </div> <!-- container -->
-   </div> <!-- containerwrap -->
+	<a href="../news.html">News Home</a> | <a href="status.html">Status Home</a> 
+	      </div> <!-- contentwrap -->
 
+	      <br class="clearboth" />
+	    </div> <!-- content -->
+            <div id="FOOTER">
+               &copyright;<br />
+               &date;
+            </div> <!-- FOOTER -->
+	  </div> <!-- container -->
+	</div> <!-- containerwrap -->
       </body>
     </html>
   </xsl:template>
diff --git a/fr/news/status/status.sgml b/fr/news/status/status.sgml
index df5c319870..019d06d09b 100644
--- a/fr/news/status/status.sgml
+++ b/fr/news/status/status.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/news/status/status.sgml,v 1.8 2006/02/03 11:54:54 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/news/status/status.sgml,v 1.9 2006/04/25 14:40:48 blackend Exp $">
 <!ENTITY title "Rapports de statuts FreeBSD">
-<!ENTITY % navincludes SYSTEM "../../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/news/webchanges.sgml b/fr/news/webchanges.sgml
index 988c3f608f..2b941968f0 100644
--- a/fr/news/webchanges.sgml
+++ b/fr/news/webchanges.sgml
@@ -1,11 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/news/webchanges.sgml,v 1.2 2004/01/06 17:31:42 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/news/webchanges.sgml,v 1.4 2005/10/06 12:56:05 blackend Exp $">
 <!ENTITY title "Changements sur le serveur Web FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/platforms/alpha.sgml b/fr/platforms/alpha.sgml
index be851cb9ca..976c354690 100644
--- a/fr/platforms/alpha.sgml
+++ b/fr/platforms/alpha.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/platforms/alpha.sgml,v 1.4 2004/01/06 17:31:43 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/platforms/alpha.sgml,v 1.6 2005/10/06 12:56:05 blackend Exp $">
 <!ENTITY title "Projet FreeBSD/Alpha">
 <!ENTITY email 'freebsd-alpha'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/platforms/amd64.sgml b/fr/platforms/amd64.sgml
index cb0460583c..7a09499b5f 100644
--- a/fr/platforms/amd64.sgml
+++ b/fr/platforms/amd64.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/platforms/amd64.sgml,v 1.9 2005/11/18 22:18:17 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/platforms/amd64.sgml,v 1.10 2006/04/06 20:01:40 blackend Exp $">
 <!ENTITY title "Projet FreeBSD/amd64">
 <!ENTITY email 'freebsd-amd64'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/platforms/arm.sgml b/fr/platforms/arm.sgml
index 99c85eb11f..4974c3ddc9 100644
--- a/fr/platforms/arm.sgml
+++ b/fr/platforms/arm.sgml
@@ -1,12 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/platforms/arm.sgml,v 1.4 2006/03/09 21:26:15 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/platforms/arm.sgml,v 1.5 2006/04/06 20:01:40 blackend Exp $">
 <!ENTITY title "Projet FreeBSD/ARM">
 <!ENTITY email 'freebsd-arm'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml">
-%includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 ]>
 
diff --git a/fr/platforms/i386.sgml b/fr/platforms/i386.sgml
index 392529de2d..28b3fa48c5 100644
--- a/fr/platforms/i386.sgml
+++ b/fr/platforms/i386.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/platforms/i386.sgml,v 1.5 2005/10/06 12:56:05 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/platforms/i386.sgml,v 1.6 2006/04/06 20:01:40 blackend Exp $">
 <!ENTITY title "Projet FreeBSD/i386">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/platforms/ia64.sgml b/fr/platforms/ia64.sgml
index 6ed61e99e1..ccaae8d429 100644
--- a/fr/platforms/ia64.sgml
+++ b/fr/platforms/ia64.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/platforms/ia64.sgml,v 1.3 2004/01/06 17:31:43 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/platforms/ia64.sgml,v 1.5 2005/10/06 12:56:06 blackend Exp $">
 <!ENTITY title "Projet FreeBSD/ia64">
 <!ENTITY email 'freebsd-ia64'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/platforms/ia64/includes.xsl b/fr/platforms/ia64/includes.xsl
deleted file mode 100644
index 9ee7d8af73..0000000000
--- a/fr/platforms/ia64/includes.xsl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!--
-   The FreeBSD Documentation Project
-   The FreeBSD French Documentation Project
-
-   $FreeBSD$
-   Original revision: 1.1
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:variable name="base" select="'../..'"/>
-  <xsl:variable name="email" select="'freebsd-ia64'"/>
-  <xsl:variable name="title" select="'Projet FreeBSD/ia64'"/>
-</xsl:stylesheet>
diff --git a/fr/platforms/ia64/index.xsl b/fr/platforms/ia64/index.xsl
index bf681c7e3c..45269ac55d 100644
--- a/fr/platforms/ia64/index.xsl
+++ b/fr/platforms/ia64/index.xsl
@@ -1,3 +1,10 @@
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+<!ENTITY base "../..">
+<!ENTITY email "freebsd-ia64">
+<!ENTITY title "FreeBSD/ia64 Project">
+<!ENTITY % navinclude.developers "INCLUDE">
+]>
 <!--
    The FreeBSD Documentation Project
    The FreeBSD French Documentation Project
@@ -6,30 +13,31 @@
 -->
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/fr/platforms/ia64/index.xsl,v 1.2 2005/12/17 10:58:29 blackend Exp $'"/>
-  <xsl:variable name="section" select="'developers'"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
+
+  <xsl:variable name="date" select="'$FreeBSD: www/fr/platforms/ia64/index.xsl,v 1.3 2006/02/03 11:54:54 blackend Exp $'"/>
+
   <xsl:output doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
     encoding="iso-8859-1" method="html"/>
+
   <xsl:template match="/">
     <html>
-      <xsl:copy-of select="$header1"/>
-
+      &header1;
       <body>
 
 	<div id="CONTAINERWRAP">
 	  <div id="CONTAINER">
-	    <xsl:copy-of select="$header2"/>
+	    &header2;
 
 	    <div id="CONTENT">
-
-	      <xsl:copy-of select="$sidenav"/>
+	      <div id="SIDEWRAP">
+                &nav;
+              </div> <!-- SIDEWRAP -->
 
 	      <div id="CONTENTWRAP">
-		<xsl:copy-of select="$header3"/>
+		&header3;
 
-		<img align="right" alt="McKinley die" src="{$enbase}/platforms/ia64/mckinley-die.png"/>
+		<img align="right" alt="McKinley die" src="&enbase;/platforms/ia64/mckinley-die.png"/>
 
 		<p>Rechercher dans les archives de la liste de diffusion
 		  freebsd-ia64:</p>
@@ -95,7 +103,11 @@
 
 	      <br class="clearboth" />
 	    </div> <!-- CONTENT -->
-	    <xsl:copy-of select="$footer"/>
+
+            <div id="FOOTER">
+               &copyright;<br />
+               &date;
+            </div> <!-- FOOTER -->
 	  </div> <!-- CONTAINER -->
 	</div> <!-- CONTAINERWRAP -->
       </body>
diff --git a/fr/platforms/ia64/machines.sgml b/fr/platforms/ia64/machines.sgml
index b8094e0554..6c43f85328 100644
--- a/fr/platforms/ia64/machines.sgml
+++ b/fr/platforms/ia64/machines.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/platforms/ia64/machines.sgml,v 1.3 2005/02/09 21:41:18 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/platforms/ia64/machines.sgml,v 1.5 2005/10/06 12:56:06 blackend Exp $">
 <!ENTITY title "Projet FreeBSD/ia64 -- machines">
 <!ENTITY email 'freebsd-ia64'>
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/platforms/ia64/refs.sgml b/fr/platforms/ia64/refs.sgml
index 9136b811d5..c20707ae0d 100644
--- a/fr/platforms/ia64/refs.sgml
+++ b/fr/platforms/ia64/refs.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/platforms/ia64/refs.sgml,v 1.6 2005/10/06 12:56:06 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/platforms/ia64/refs.sgml,v 1.7 2005/10/15 08:37:59 blackend Exp $">
 <!ENTITY title "Projet FreeBSD/ia64 -- r&eacute;f&eacute;rences">
 <!ENTITY email 'freebsd-ia64'>
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/platforms/ia64/todo.xsl b/fr/platforms/ia64/todo.xsl
index eeecff7ac9..4a0864b624 100644
--- a/fr/platforms/ia64/todo.xsl
+++ b/fr/platforms/ia64/todo.xsl
@@ -1,3 +1,11 @@
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+<!ENTITY base "../..">
+<!ENTITY email "freebsd-ia64">
+<!ENTITY title "FreeBSD/ia64 Project">
+<!ENTITY % navinclude.developers "INCLUDE">
+]>
+
 <!--
    The FreeBSD Documentation Project
    The FreeBSD French Documentation Project
@@ -6,28 +14,31 @@
 -->
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/fr/platforms/ia64/todo.xsl,v 1.2 2005/12/17 10:58:29 blackend Exp $'"/>
-  <xsl:variable name="section" select="'developers'"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
+
+  <xsl:variable name="date" select="'$FreeBSD: www/fr/platforms/ia64/todo.xsl,v 1.3 2006/02/03 11:54:54 blackend Exp $'"/>
+
   <xsl:output doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
     encoding="iso-8859-1" method="html"/>
+
   <xsl:template match="/">
     <html>
-      <xsl:copy-of select="$header1"/>
-
+      &header1;
       <body>
 
 	<div id="CONTAINERWRAP">
 	  <div id="CONTAINER">
-	    <xsl:copy-of select="$header2"/>
+	    &header2;
 
 	    <div id="CONTENT">
-	      <xsl:copy-of select="$sidenav"/>
+	      <div id="SIDEWRAP">
+                &nav;
+              </div> <!-- SIDEWRAP -->
 
 	      <div id="CONTENTWRAP">
-		<xsl:copy-of select="$header3"/>
-		<img align="right" alt="Montecito die" src="{$enbase}/platforms/ia64/montecito-die.png"/>
+		&header3;
+
+		<img align="right" alt="Montecito die" src="&enbase;/platforms/ia64/montecito-die.png"/>
 
 		<p>Rechercher dans la base de PRs de FreeBSD/ia64:</p>
 
@@ -160,7 +171,10 @@
 
 	      <br class="clearboth" />
 	    </div> <!-- CONTENT -->
-	<xsl:copy-of select="$footer"/>
+            <div id="FOOTER">
+               &copyright;<br />
+               &date;
+            </div> <!-- FOOTER -->
 	  </div> <!-- CONTAINER -->
 	</div> <!-- CONTAINERWRAP -->
       </body>
diff --git a/fr/platforms/index.sgml b/fr/platforms/index.sgml
index 761c9c0888..211d23e429 100644
--- a/fr/platforms/index.sgml
+++ b/fr/platforms/index.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
 <!ENTITY email 'freebsd-www'>
 <!ENTITY title "Plates-formes support&eacute;es">
-<!ENTITY date "$FreeBSD: www/fr/platforms/index.sgml,v 1.8 2005/12/05 17:49:35 blackend Exp $">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY date "$FreeBSD: www/fr/platforms/index.sgml,v 1.9 2006/02/13 17:39:35 blackend Exp $">
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/platforms/mips.sgml b/fr/platforms/mips.sgml
index 6e0cc33641..bdb7d42f95 100644
--- a/fr/platforms/mips.sgml
+++ b/fr/platforms/mips.sgml
@@ -1,11 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/platforms/mips.sgml,v 1.3 2004/08/31 20:05:31 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/platforms/mips.sgml,v 1.5 2005/10/06 12:56:06 blackend Exp $">
 <!ENTITY title "Projet FreeBSD/MIPS">
 <!ENTITY email 'freebsd-mips'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;]>
+<!ENTITY % navinclude.developers "INCLUDE">
+]>
+
 
 <!--
    The FreeBSD French Documentation Project
diff --git a/fr/platforms/pc98.sgml b/fr/platforms/pc98.sgml
index 568818e5aa..09d434509f 100644
--- a/fr/platforms/pc98.sgml
+++ b/fr/platforms/pc98.sgml
@@ -1,12 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/platforms/pc98.sgml,v 1.7 2005/10/06 12:52:39 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/platforms/pc98.sgml,v 1.8 2005/12/31 11:26:15 blackend Exp $">
 <!ENTITY title "Projet FreeBSD/pc98">
 <!ENTITY email 're-pc98'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml">
-%includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/platforms/ppc.sgml b/fr/platforms/ppc.sgml
index c728331970..66437ab239 100644
--- a/fr/platforms/ppc.sgml
+++ b/fr/platforms/ppc.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/platforms/ppc.sgml,v 1.7 2005/10/18 19:47:07 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/platforms/ppc.sgml,v 1.8 2006/02/03 11:54:54 blackend Exp $">
 <!ENTITY title "Projet FreeBSD/PPC">
 <!ENTITY email 'freebsd-ppc'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/platforms/sparc.sgml b/fr/platforms/sparc.sgml
index db38a8579e..8259bda364 100644
--- a/fr/platforms/sparc.sgml
+++ b/fr/platforms/sparc.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/platforms/sparc.sgml,v 1.3 2005/09/24 15:31:50 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/platforms/sparc.sgml,v 1.5 2005/10/06 12:56:06 blackend Exp $">
 <!ENTITY title "Projet FreeBSD/Sparc64">
 <!ENTITY email 'freebsd-sparc64'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 ]>
 
diff --git a/fr/platforms/x86-64.sgml b/fr/platforms/x86-64.sgml
index 86303e1d02..cd3d83543c 100644
--- a/fr/platforms/x86-64.sgml
+++ b/fr/platforms/x86-64.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/platforms/x86-64.sgml,v 1.3 2004/01/06 17:31:43 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/platforms/x86-64.sgml,v 1.5 2005/10/06 12:56:06 blackend Exp $">
 <!ENTITY title "Projet FreeBSD/x86-64">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/platforms/xbox.sgml b/fr/platforms/xbox.sgml
index 955ebaf9e1..403bef47c5 100644
--- a/fr/platforms/xbox.sgml
+++ b/fr/platforms/xbox.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/platforms/xbox.sgml,v 1.2 2006/03/09 21:26:15 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/platforms/xbox.sgml,v 1.3 2006/04/06 20:01:40 blackend Exp $">
 <!ENTITY title "Projet FreeBSD/xbox">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 ]>
 
diff --git a/fr/projects/acpi/index.sgml b/fr/projects/acpi/index.sgml
index 37809bb440..ef9858aa8e 100644
--- a/fr/projects/acpi/index.sgml
+++ b/fr/projects/acpi/index.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/fr/projects/acpi/index.sgml,v 1.1 2004/08/09 20:34:09 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/projects/acpi/index.sgml,v 1.3 2005/10/06 12:56:06 blackend Exp $">
 <!ENTITY title "Projet FreeBSD ACPI">
 <!ENTITY email 'marks'>
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 
 <!-- Status levels -->
 <!ENTITY status.na "<font color=green>Non pr&eacute;vu</font>">
diff --git a/fr/projects/busdma/index.sgml b/fr/projects/busdma/index.sgml
index d0b298b71d..74177588b2 100644
--- a/fr/projects/busdma/index.sgml
+++ b/fr/projects/busdma/index.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/projects/busdma/index.sgml,v 1.6 2006/05/03 18:26:54 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/projects/busdma/index.sgml,v 1.7 2006/07/03 16:03:58 blackend Exp $">
 <!ENTITY title "Projet de conversion busdma et SMPng">
 <!ENTITY email 'mux'>
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 
 <!-- Status levels -->
 <!ENTITY status.na "<font color=magenta>Non Applicable</font>">
diff --git a/fr/projects/c99/index.sgml b/fr/projects/c99/index.sgml
index 6df98971ba..b23c840529 100644
--- a/fr/projects/c99/index.sgml
+++ b/fr/projects/c99/index.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/projects/c99/index.sgml,v 1.12 2006/01/08 21:07:05 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/projects/c99/index.sgml,v 1.13 2006/03/09 21:26:16 blackend Exp $">
 <!ENTITY title "Projet de mise en conformit&eacute; de FreeBSD aux normes C99 et &posix;">
 <!ENTITY email 'standards'>
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % developers SYSTEM "../../developers.sgml"> %developers;
 
 <!--
diff --git a/fr/projects/cvsweb.sgml b/fr/projects/cvsweb.sgml
index eb429f4b93..64e3a3be74 100644
--- a/fr/projects/cvsweb.sgml
+++ b/fr/projects/cvsweb.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/projects/cvsweb.sgml,v 1.10 2006/01/08 21:07:05 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/projects/cvsweb.sgml,v 1.11 2006/05/03 18:26:54 blackend Exp $">
 <!ENTITY title 'Projet CVSweb pour FreeBSD'>
 <!ENTITY email 'freebsd-cvsweb'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 ]>
 
diff --git a/fr/projects/libh.sgml b/fr/projects/libh.sgml
index 3df0ff7bfc..542e5d3c7f 100644
--- a/fr/projects/libh.sgml
+++ b/fr/projects/libh.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/projects/libh.sgml,v 1.2 2004/01/06 17:31:43 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/projects/libh.sgml,v 1.4 2005/10/06 12:56:06 blackend Exp $">
 <!ENTITY title 'Projet libh pour FreeBSD'>
 <!ENTITY email 'freebsd-libh'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/projects/mips/index.sgml b/fr/projects/mips/index.sgml
index 74e65dfdf0..92c7cef7e8 100644
--- a/fr/projects/mips/index.sgml
+++ b/fr/projects/mips/index.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/projects/mips/index.sgml,v 1.3 2005/01/12 16:07:35 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/projects/mips/index.sgml,v 1.5 2005/10/06 12:56:06 blackend Exp $">
 <!ENTITY title "Projet FreeBSD/MIPS">
 <!ENTITY email 'freebsd-mips'>
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % developers SYSTEM "../../developers.sgml"> %developers;
 
 <!--
diff --git a/fr/projects/newbies.sgml b/fr/projects/newbies.sgml
index bb38d85d35..b5525c3f6a 100644
--- a/fr/projects/newbies.sgml
+++ b/fr/projects/newbies.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/projects/newbies.sgml,v 1.9 2005/11/18 22:18:17 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/projects/newbies.sgml,v 1.10 2006/02/03 11:54:54 blackend Exp $">
 <!ENTITY title 'Ressources pour les d&eacute;butants'>
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/projects/projects.sgml b/fr/projects/projects.sgml
index 24a8123bfe..ec5776d565 100644
--- a/fr/projects/projects.sgml
+++ b/fr/projects/projects.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/projects/projects.sgml,v 1.2 2004/01/06 17:31:43 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/projects/projects.sgml,v 1.4 2005/10/06 12:56:06 blackend Exp $">
 <!ENTITY title "Projets de d&eacute;veloppement FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/projects/updater.sgml b/fr/projects/updater.sgml
index 0089cab1eb..3daaf5ea43 100644
--- a/fr/projects/updater.sgml
+++ b/fr/projects/updater.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/projects/updater.sgml,v 1.4 2004/01/12 20:21:23 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/projects/updater.sgml,v 1.6 2005/10/06 12:56:06 blackend Exp $">
 <!ENTITY title "Projet de Mise &agrave; jour Binaire pour FreeBSD (binup)">
 <!ENTITY email 'freebsd-binup'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 
 <!ENTITY done "<font color='green'>Fait</font>">
 <!ENTITY inprogress "<font color='blue'>En progr&egrave;s</font>">
diff --git a/fr/prstats/index.sgml b/fr/prstats/index.sgml
index 10b3cf4684..111bdc8d20 100644
--- a/fr/prstats/index.sgml
+++ b/fr/prstats/index.sgml
@@ -1,12 +1,10 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/fr/prstats/index.sgml,v 1.6 2005/10/06 12:56:06 blackend Exp $">
+<!doctype HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/prstats/index.sgml,v 1.7 2006/07/27 14:06:08 blackend Exp $">
 <!ENTITY email 'freebsd-www'>
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
 <!ENTITY graphdir CDATA "">
 <!ENTITY title "Statistiques sur les PR">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/publish.sgml b/fr/publish.sgml
index 3e81509f35..59f9995db5 100644
--- a/fr/publish.sgml
+++ b/fr/publish.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/fr/publish.sgml,v 1.7 2004/10/06 14:12:49 stephane Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/publish.sgml,v 1.10 2005/10/06 12:56:02 blackend Exp $">
 <!ENTITY title "Publications en rapport avec FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/2.0/credits.sgml b/fr/releases/2.0/credits.sgml
index 952a306075..86ac891585 100644
--- a/fr/releases/2.0/credits.sgml
+++ b/fr/releases/2.0/credits.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/2.0/credits.sgml,v 1.2 2004/01/06 17:31:44 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/2.0/credits.sgml,v 1.4 2005/10/06 12:56:07 blackend Exp $">
 <!ENTITY title "Cr&eacute;dits pour FreeBSD 2.0">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/2.2.8R/notes.sgml b/fr/releases/2.2.8R/notes.sgml
index aed0d303b5..f05702e540 100644
--- a/fr/releases/2.2.8R/notes.sgml
+++ b/fr/releases/2.2.8R/notes.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/2.2.8R/notes.sgml,v 1.2 2004/01/06 17:31:44 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/2.2.8R/notes.sgml,v 1.4 2005/10/06 12:56:07 blackend Exp $">
 <!ENTITY title "Notes de version pour FreeBSD 2.2.8">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/3.1R/notes.sgml b/fr/releases/3.1R/notes.sgml
index fc21d18c0c..7947abff9c 100644
--- a/fr/releases/3.1R/notes.sgml
+++ b/fr/releases/3.1R/notes.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/3.1R/notes.sgml,v 1.2 2004/01/06 17:31:44 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/3.1R/notes.sgml,v 1.4 2005/10/06 12:56:07 blackend Exp $">
 <!ENTITY title "Notes de version pour FreeBSD 3.1">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/3.2R/notes.sgml b/fr/releases/3.2R/notes.sgml
index d3a05fa23f..ad74ae5cdd 100644
--- a/fr/releases/3.2R/notes.sgml
+++ b/fr/releases/3.2R/notes.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/3.2R/notes.sgml,v 1.2 2004/01/06 17:31:44 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/3.2R/notes.sgml,v 1.4 2005/10/06 12:56:07 blackend Exp $">
 <!ENTITY title "Notes de version pour FreeBSD 3.2">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/3.3R/notes.sgml b/fr/releases/3.3R/notes.sgml
index 88dacf535f..fabab98cac 100644
--- a/fr/releases/3.3R/notes.sgml
+++ b/fr/releases/3.3R/notes.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/3.3R/notes.sgml,v 1.2 2004/01/06 17:31:44 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/3.3R/notes.sgml,v 1.4 2005/10/06 12:56:07 blackend Exp $">
 <!ENTITY title "Notes de version pour FreeBSD 3.3">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/3.4R/notes.sgml b/fr/releases/3.4R/notes.sgml
index e10bd270d7..87faecc244 100644
--- a/fr/releases/3.4R/notes.sgml
+++ b/fr/releases/3.4R/notes.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/3.4R/notes.sgml,v 1.2 2004/01/06 17:31:44 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/3.4R/notes.sgml,v 1.4 2005/10/06 12:56:07 blackend Exp $">
 <!ENTITY title "Notes de version pour FreeBSD 3.4">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/3.5R/notes.sgml b/fr/releases/3.5R/notes.sgml
index cf5f411bf8..581b2d4d99 100644
--- a/fr/releases/3.5R/notes.sgml
+++ b/fr/releases/3.5R/notes.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/3.5R/notes.sgml,v 1.2 2004/01/06 17:31:45 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/3.5R/notes.sgml,v 1.4 2005/10/06 12:56:07 blackend Exp $">
 <!ENTITY title "Notes de version pour FreeBSD 3.5">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.0R/announce.sgml b/fr/releases/4.0R/announce.sgml
index 44c82e0be1..bb90c819f3 100644
--- a/fr/releases/4.0R/announce.sgml
+++ b/fr/releases/4.0R/announce.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.0R/announce.sgml,v 1.2 2004/01/06 17:31:45 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.0R/announce.sgml,v 1.4 2005/10/06 12:56:07 blackend Exp $">
 <!ENTITY title "Annonce de FreeBSD 4.0">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.0R/errata.sgml b/fr/releases/4.0R/errata.sgml
index 09bca4696f..56a421e3d7 100644
--- a/fr/releases/4.0R/errata.sgml
+++ b/fr/releases/4.0R/errata.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.0R/errata.sgml,v 1.2 2004/01/06 17:31:45 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.0R/errata.sgml,v 1.4 2005/10/06 12:56:07 blackend Exp $">
 <!ENTITY title "Errata pour FreeBSD 4.0">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.0R/notes.sgml b/fr/releases/4.0R/notes.sgml
index 8bc08a1cda..d4e605ed74 100644
--- a/fr/releases/4.0R/notes.sgml
+++ b/fr/releases/4.0R/notes.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.0R/notes.sgml,v 1.2 2004/01/06 17:31:45 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.0R/notes.sgml,v 1.4 2005/10/06 12:56:07 blackend Exp $">
 <!ENTITY title "Notes sur FreeBSD version 4.0">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.1.1R/errata.sgml b/fr/releases/4.1.1R/errata.sgml
index 2b17dcf104..852653b5d3 100644
--- a/fr/releases/4.1.1R/errata.sgml
+++ b/fr/releases/4.1.1R/errata.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.1.1R/errata.sgml,v 1.2 2004/01/06 17:31:45 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.1.1R/errata.sgml,v 1.4 2005/10/06 12:56:07 blackend Exp $">
 <!ENTITY title "Errata pour FreeBSD 4.1.1">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.1R/announce.sgml b/fr/releases/4.1R/announce.sgml
index 151b502ef4..57c54ae344 100644
--- a/fr/releases/4.1R/announce.sgml
+++ b/fr/releases/4.1R/announce.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.1R/announce.sgml,v 1.2 2004/01/06 17:31:45 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.1R/announce.sgml,v 1.4 2005/10/06 12:56:07 blackend Exp $">
 <!ENTITY title "Annonce de FreeBSD 4.1">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.1R/errata.sgml b/fr/releases/4.1R/errata.sgml
index 4a6a83815b..4ad707111e 100644
--- a/fr/releases/4.1R/errata.sgml
+++ b/fr/releases/4.1R/errata.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.1R/errata.sgml,v 1.2 2004/01/06 17:31:45 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.1R/errata.sgml,v 1.4 2005/10/06 12:56:07 blackend Exp $">
 <!ENTITY title "Errata pour FreeBSD 4.1">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.1R/notes.sgml b/fr/releases/4.1R/notes.sgml
index c753dbb390..5dbf4a5bca 100644
--- a/fr/releases/4.1R/notes.sgml
+++ b/fr/releases/4.1R/notes.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.1R/notes.sgml,v 1.2 2004/01/06 17:31:45 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.1R/notes.sgml,v 1.4 2005/10/06 12:56:07 blackend Exp $">
 <!ENTITY title "Notes sur FreeBSD version 4.1">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.2R/announce.sgml b/fr/releases/4.2R/announce.sgml
index bb5cf959dd..57371a0a2a 100644
--- a/fr/releases/4.2R/announce.sgml
+++ b/fr/releases/4.2R/announce.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.2R/announce.sgml,v 1.2 2004/01/06 17:31:45 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.2R/announce.sgml,v 1.4 2005/10/06 12:56:08 blackend Exp $">
 <!ENTITY title "Sortie de FreeBSD 4.2">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.2R/errata.sgml b/fr/releases/4.2R/errata.sgml
index 48ef8a9e1a..4fb6f4cf7e 100644
--- a/fr/releases/4.2R/errata.sgml
+++ b/fr/releases/4.2R/errata.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.2R/errata.sgml,v 1.2 2004/01/06 17:31:45 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.2R/errata.sgml,v 1.4 2005/10/06 12:56:08 blackend Exp $">
 <!ENTITY title "Errata pour FreeBSD 4.2">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.2R/notes.sgml b/fr/releases/4.2R/notes.sgml
index af55cb3953..a6e36e7097 100644
--- a/fr/releases/4.2R/notes.sgml
+++ b/fr/releases/4.2R/notes.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.2R/notes.sgml,v 1.2 2004/01/06 17:31:45 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.2R/notes.sgml,v 1.4 2005/10/06 12:56:08 blackend Exp $">
 <!ENTITY title "Notes sur FreeBSD version 4.2">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.3R/announce.sgml b/fr/releases/4.3R/announce.sgml
index 1397e28ea0..ed4d00bf1b 100644
--- a/fr/releases/4.3R/announce.sgml
+++ b/fr/releases/4.3R/announce.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.3R/announce.sgml,v 1.2 2004/01/06 17:31:45 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.3R/announce.sgml,v 1.4 2005/10/06 12:56:08 blackend Exp $">
 <!ENTITY title "Annonce de FreeBSD 4.3">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.3R/errata.sgml b/fr/releases/4.3R/errata.sgml
index 37f804557b..3879eb1515 100644
--- a/fr/releases/4.3R/errata.sgml
+++ b/fr/releases/4.3R/errata.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.3R/errata.sgml,v 1.2 2004/01/06 17:31:45 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.3R/errata.sgml,v 1.4 2005/10/06 12:56:08 blackend Exp $">
 <!ENTITY title "Errata pour FreeBSD 4.3">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.3R/notes.sgml b/fr/releases/4.3R/notes.sgml
index c97110d0cc..a3cdaa17d4 100644
--- a/fr/releases/4.3R/notes.sgml
+++ b/fr/releases/4.3R/notes.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.3R/notes.sgml,v 1.2 2004/01/06 17:31:45 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.3R/notes.sgml,v 1.4 2005/10/06 12:56:08 blackend Exp $">
 <!ENTITY title "Notes sur la version 4.3 de FreeBSD">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.4R/announce.sgml b/fr/releases/4.4R/announce.sgml
index fe058ba41e..09aaa30c11 100644
--- a/fr/releases/4.4R/announce.sgml
+++ b/fr/releases/4.4R/announce.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.4R/announce.sgml,v 1.2 2004/01/06 17:31:45 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.4R/announce.sgml,v 1.4 2005/10/06 12:56:08 blackend Exp $">
 <!ENTITY title "Annonce de FreeBSD 4.4">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.5R/announce.sgml b/fr/releases/4.5R/announce.sgml
index fe792a6d82..07250c8164 100644
--- a/fr/releases/4.5R/announce.sgml
+++ b/fr/releases/4.5R/announce.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.5R/announce.sgml,v 1.3 2004/02/06 14:48:24 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.5R/announce.sgml,v 1.5 2005/10/06 12:56:08 blackend Exp $">
 <!ENTITY title "Annonce de FreeBSD 4.5">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.5R/notes.sgml b/fr/releases/4.5R/notes.sgml
index 99b3a4157f..28c2a7832f 100644
--- a/fr/releases/4.5R/notes.sgml
+++ b/fr/releases/4.5R/notes.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.5R/notes.sgml,v 1.2 2004/01/06 17:31:46 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.5R/notes.sgml,v 1.4 2005/10/06 12:56:08 blackend Exp $">
 <!ENTITY title "Notes sur FreeBSD 4.5">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.6.2R/relnotes.sgml b/fr/releases/4.6.2R/relnotes.sgml
index c0662dda64..6746109ce9 100644
--- a/fr/releases/4.6.2R/relnotes.sgml
+++ b/fr/releases/4.6.2R/relnotes.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.6.2R/relnotes.sgml,v 1.2 2004/01/06 17:31:46 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.6.2R/relnotes.sgml,v 1.4 2005/10/06 12:56:08 blackend Exp $">
 <!ENTITY title "Notes sur FreeBSD 4.6.2-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.6R/relnotes.sgml b/fr/releases/4.6R/relnotes.sgml
index 746af663ec..28b8ce24eb 100644
--- a/fr/releases/4.6R/relnotes.sgml
+++ b/fr/releases/4.6R/relnotes.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.6R/relnotes.sgml,v 1.2 2004/01/06 17:31:46 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.6R/relnotes.sgml,v 1.4 2005/10/06 12:56:08 blackend Exp $">
 <!ENTITY title "Notes sur FreeBSD 4.6-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/4.7R/announce.sgml b/fr/releases/4.7R/announce.sgml
index 8473681835..aafae3dc30 100644
--- a/fr/releases/4.7R/announce.sgml
+++ b/fr/releases/4.7R/announce.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/4.7R/announce.sgml,v 1.2 2004/01/06 17:31:46 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/4.7R/announce.sgml,v 1.4 2005/10/06 12:56:08 blackend Exp $">
 <!ENTITY title "Annonce de FreeBSD 4.7-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/5.0R/DP1/relnotes.sgml b/fr/releases/5.0R/DP1/relnotes.sgml
index 7574debb70..da3c52d491 100644
--- a/fr/releases/5.0R/DP1/relnotes.sgml
+++ b/fr/releases/5.0R/DP1/relnotes.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/5.0R/DP1/relnotes.sgml,v 1.2 2004/01/06 17:31:46 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/5.0R/DP1/relnotes.sgml,v 1.4 2005/10/06 12:56:08 blackend Exp $">
 <!ENTITY title "Notes sur FreeBSD 5.0-DP1">
-<!ENTITY % navincludes SYSTEM "../../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/5.1R/installation.sgml b/fr/releases/5.1R/installation.sgml
index 50d380768b..f75ca4521a 100644
--- a/fr/releases/5.1R/installation.sgml
+++ b/fr/releases/5.1R/installation.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/5.1R/installation.sgml,v 1.2 2004/01/06 17:31:46 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/5.1R/installation.sgml,v 1.4 2005/10/06 12:56:08 blackend Exp $">
 <!ENTITY title "Notes d'installation pour FreeBSD 5.1-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/5.1R/relnotes.sgml b/fr/releases/5.1R/relnotes.sgml
index b86001d675..c0ec024422 100644
--- a/fr/releases/5.1R/relnotes.sgml
+++ b/fr/releases/5.1R/relnotes.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/5.1R/relnotes.sgml,v 1.2 2004/01/06 17:31:46 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/5.1R/relnotes.sgml,v 1.4 2005/10/06 12:56:08 blackend Exp $">
 <!ENTITY title "Notes de version pour FreeBSD 5.1-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/index.sgml b/fr/releases/index.sgml
index 6b353392e2..c0096a0bee 100644
--- a/fr/releases/index.sgml
+++ b/fr/releases/index.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/index.sgml,v 1.10 2005/11/29 18:02:09 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/index.sgml,v 1.11 2006/01/21 15:32:01 blackend Exp $">
 <!ENTITY title "Information sur les versions">
-<!ENTITY % navincludes SYSTEM "../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releases/snapshots.sgml b/fr/releases/snapshots.sgml
index f061bda5fd..dd78385511 100644
--- a/fr/releases/snapshots.sgml
+++ b/fr/releases/snapshots.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releases/snapshots.sgml,v 1.5 2005/01/12 16:07:35 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releases/snapshots.sgml,v 1.7 2005/10/06 12:56:06 blackend Exp $">
 <!ENTITY title "Parution d'instantan&eacute;s de FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releng/charter.sgml b/fr/releng/charter.sgml
index 27a761aab5..63e9c37b4d 100644
--- a/fr/releng/charter.sgml
+++ b/fr/releng/charter.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releng/charter.sgml,v 1.2 2004/01/06 17:31:46 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releng/charter.sgml,v 1.4 2005/10/06 12:56:08 blackend Exp $">
 <!ENTITY title "Charte pour l'&eacute;quipe en charge des nouvelles versions">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/releng/index.sgml b/fr/releng/index.sgml
index f410f3bacf..a65868f19a 100644
--- a/fr/releng/index.sgml
+++ b/fr/releng/index.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/releng/index.sgml,v 1.10 2005/12/31 11:26:16 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/releng/index.sgml,v 1.11 2006/01/08 21:07:04 blackend Exp $">
 <!ENTITY email 're'>
 <!ENTITY title "Information sur la cr&eacute;ation des versions">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 <!ENTITY contact.re '<a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>'>
 <!ENTITY contact.so '<a href="mailto:security-officer@FreeBSD.org">security-officer@FreeBSD.org</a>'>
diff --git a/fr/relnotes.sgml b/fr/relnotes.sgml
index e30056154d..6f3317c435 100644
--- a/fr/relnotes.sgml
+++ b/fr/relnotes.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/fr/relnotes.sgml,v 1.7 2006/02/03 11:54:53 blackend Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/relnotes.sgml,v 1.8 2006/03/01 20:39:40 blackend Exp $">
 <!ENTITY title "Documentation sur les versions">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/search/index-site.sgml b/fr/search/index-site.sgml
index c7f43c2041..3d0597a914 100644
--- a/fr/search/index-site.sgml
+++ b/fr/search/index-site.sgml
@@ -1,9 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/search/index-site.sgml,v 1.5 2005/01/12 16:07:35 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/search/index-site.sgml,v 1.6 2005/10/04 16:22:36 blackend Exp $">
 <!ENTITY title "Plan du site et index de http://www.FreeBSD.org">
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY atoz SYSTEM "atoz.sgml">
 <!ENTITY site SYSTEM "site.sgml">
 ]>
diff --git a/fr/search/search-mid.sgml b/fr/search/search-mid.sgml
index f82922812e..62b46cc001 100644
--- a/fr/search/search-mid.sgml
+++ b/fr/search/search-mid.sgml
@@ -1,9 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/search/search-mid.sgml,v 1.2 2004/01/06 17:31:46 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/search/search-mid.sgml,v 1.3 2005/10/04 16:22:36 blackend Exp $">
 <!ENTITY title "Recherche des Message-ID des listes de diffusion">
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 
 <!--
diff --git a/fr/search/search.sgml b/fr/search/search.sgml
index 7d0e4493d4..db50d3fd09 100644
--- a/fr/search/search.sgml
+++ b/fr/search/search.sgml
@@ -1,9 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/search/search.sgml,v 1.7 2005/10/04 16:22:36 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/search/search.sgml,v 1.8 2006/03/09 21:26:16 blackend Exp $">
 <!ENTITY title "Recherche">
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 
 <!--
diff --git a/fr/search/searchhints.sgml b/fr/search/searchhints.sgml
index b093680c86..2173ba41c6 100644
--- a/fr/search/searchhints.sgml
+++ b/fr/search/searchhints.sgml
@@ -1,9 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/search/searchhints.sgml,v 1.2 2004/01/06 17:31:46 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/search/searchhints.sgml,v 1.3 2005/10/04 16:22:36 blackend Exp $">
 <!ENTITY title "Trucs pour la recherche">
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 
 <!--
diff --git a/fr/security/Makefile b/fr/security/Makefile
index 8d707aac06..bbe61d342d 100644
--- a/fr/security/Makefile
+++ b/fr/security/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/fr/security/Makefile,v 1.1 2003/12/15 16:04:58 stephane Exp $
+# $FreeBSD: www/fr/security/Makefile,v 1.2 2006/04/03 19:58:44 blackend Exp $
 
 # The FreeBSD French Documentation Project
 # Original revision: 1.14
@@ -15,7 +15,7 @@ DOCS+=	security.sgml
 
 INDEXLINK=	security.html
 
-security.html: advisories.html.inc advisories.rdf
+security.html: advisories.html.inc
 
 DEPENDSET.DEFAULT=	advisories
 XML.DEFAULT=		${XML_ADVISORIES}
@@ -24,6 +24,4 @@ XMLDOCS=	advisories:mkindex.xsl::advisories.html.inc
 NO_DATA.advisories=	yes
 NO_TIDY.advisories=	yes
 
-XMLDOCS+=	advisories-rdf:security-rdf.xsl::advisories.rdf
-
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/fr/security/mkindex.xsl b/fr/security/mkindex.xsl
index fe479ccf7b..b00e73307c 100644
--- a/fr/security/mkindex.xsl
+++ b/fr/security/mkindex.xsl
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+<!ENTITY base ".">
+<!ENTITY title "">
+]>
 
-<!-- $FreeBSD: www/fr/security/mkindex.xsl,v 1.1 2003/12/15 15:41:15 stephane Exp $ -->
+<!-- $FreeBSD: www/fr/security/mkindex.xsl,v 1.2 2006/04/03 19:58:44 blackend Exp $ -->
 
 <!-- 
   The FreeBSD French Documentation Project
@@ -10,12 +15,9 @@
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
-  <xsl:import href="../includes.xsl"/>
-
-  <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/fr/security/mkindex.xsl,v 1.1 2003/12/15 15:41:15 stephane Exp $'"/>
-  <xsl:variable name="title" select="'untitled'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/fr/security/mkindex.xsl,v 1.2 2006/04/03 19:58:44 blackend Exp $'"/>
 
   <xsl:output type="xml" encoding="iso-8859-1"
               omit-xml-declaration="yes" />
diff --git a/fr/security/security-rdf.xsl b/fr/security/security-rdf.xsl
deleted file mode 100644
index 5febb4c02e..0000000000
--- a/fr/security/security-rdf.xsl
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!-- $FreeBSD$ -->
-<!-- 
-  The FreeBSD French Documentation Project
-  Original revision: 1.1
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:import href="../includes.xsl"/>
-
-  <xsl:output method="xml" indent="yes"/>
-
-  <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="date" select="'$FreeBSD$'"/>
-  <xsl:variable name="title" select="'untitled'"/>
-
-  <xsl:template match="/">
-    <xsl:call-template name="rdf-security-advisories">
-       <xsl:with-param name="advisories.xml" select="$advisories.xml" />
-    </xsl:call-template>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/fr/security/security.sgml b/fr/security/security.sgml
index fa305cc266..1de0b58d6d 100644
--- a/fr/security/security.sgml
+++ b/fr/security/security.sgml
@@ -1,14 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/security/security.sgml,v 1.5 2006/04/03 19:58:44 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/security/security.sgml,v 1.6 2006/07/03 16:03:58 blackend Exp $">
 <!ENTITY title "Informations sur la s&eacute;curit&eacute; sous FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 <!ENTITY advisories.html.inc SYSTEM "advisories.html.inc">
 ]>
-<!-- $FreeBSD: www/fr/security/security.sgml,v 1.5 2006/04/03 19:58:44 blackend Exp $ -->
+<!-- $FreeBSD: www/fr/security/security.sgml,v 1.6 2006/07/03 16:03:58 blackend Exp $ -->
 <!--
   The FreeBSD French Documentation Project
   Original revision: 1.185
diff --git a/fr/send-pr.sgml b/fr/send-pr.sgml
index d6b2007633..fb1093f2a5 100644
--- a/fr/send-pr.sgml
+++ b/fr/send-pr.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/fr/send-pr.sgml,v 1.9 2006/02/13 17:53:03 blackend Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/send-pr.sgml,v 1.10 2006/03/09 21:26:15 blackend Exp $">
 <!ENTITY title "Soumettre un rapport de probl&egrave;me">
 <!ENTITY copyright "Ce m&eacute;canisme d'envoi de PR avec gnats est copyright &copy; 1996
  The NetBSD Foundation, Inc. Tous droits r&eacute;serv&eacute;s.">
-<!ENTITY % navincludes SYSTEM "includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 <!ENTITY bugbusters "bugbusters@FreeBSD.org">
 ]>
 
diff --git a/fr/share/sgml/catalog b/fr/share/sgml/catalog
new file mode 100644
index 0000000000..bae3bb06c0
--- /dev/null
+++ b/fr/share/sgml/catalog
@@ -0,0 +1,12 @@
+--
+ $FreeBSD$
+--
+
+PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+       "l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
+       "header.l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
+       "navibar.l10n.ent"
diff --git a/fr/share/sgml/catalog.xml b/fr/share/sgml/catalog.xml
new file mode 100644
index 0000000000..12c0f02504
--- /dev/null
+++ b/fr/share/sgml/catalog.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+                 rewritePrefix="../../"/>
+  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+              rewritePrefix="../../"/>
+</catalog>
diff --git a/fr/events/events.xml b/fr/share/sgml/events.xml
similarity index 98%
rename from fr/events/events.xml
rename to fr/share/sgml/events.xml
index bf29aa1edc..7a5cc1c338 100644
--- a/fr/events/events.xml
+++ b/fr/share/sgml/events.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<!DOCTYPE events SYSTEM "events.dtd">
+<!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
+                        "http://www.FreeBSD.org/XML/www/share/sgml/evenets.dtd">
 <!--
      Events which might be interesting for FreeBSD users.
 
diff --git a/fr/share/sgml/header.l10n.ent b/fr/share/sgml/header.l10n.ent
new file mode 100644
index 0000000000..2dadf12bcb
--- /dev/null
+++ b/fr/share/sgml/header.l10n.ent
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $FreeBSD$ -->
+
+<!-- FreeBSD HTML Header L10N Entities -->
+<!-- PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN" -->
+
+<!-- Standard headers and footers -->
+
+<!ENTITY copyright '<a href="&base;/copyright/">Legal Notices</a> | &copy; 1995-2006 The FreeBSD Project. All rights reserved.'>
+
+<!ENTITY header2.word.search 'Rechercher'>
+<!ENTITY header2.word.textsize 'Text Size'>
+<!ENTITY header2.word.normaltextsize 'Normal Text Size'>
+<!ENTITY header2.word.largetextsize 'Large Text Size'>
+<!ENTITY header2.word.normal 'Normal'>
+<!ENTITY header2.word.large 'Large'>
+<!ENTITY header2.word.donate 'Donate'>
+<!ENTITY header2.word.contact 'Contact'>
+
+<!ENTITY header2.topnav '
+  <h2 class="blockhide">Site Navigation</h2>
+
+  <div id="TOPNAV">
+    <ul id="TOPNAVLIST">
+      <li><a href="&base;/" title="Home">Accueil</a></li>
+      <li><a href="&base;/about.html" title="About">A propos</a></li>
+      <li><a href="&base;/where.html" title="Obtenir FreeBSD">Obtenir FreeBSD</a></li>
+      <li><a href="&base;/docs.html" title="Documentation">Documentation</a></li>
+      <li><a href="&base;/community.html" title="Community">Communaut&eacute;</a></li>
+      <li><a href="&base;/projects/index.html" title="D&eacute;veloppement">D&eacute;veloppement</a></li>
+      <li><a href="&base;/support.html" title="Support">Support</a></li>
+    </ul>
+  </div> <!-- TOPNAV -->
+'>
+
+<!-- macro for webbuild paper -->
+<!ENTITY webbuild '
+<p>This document describes how to build and update
+the FreeBSD Web pages from the CVS repository by hand.</p>'>
+
+<!--
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
+-->
diff --git a/fr/share/sgml/l10n.ent b/fr/share/sgml/l10n.ent
new file mode 100644
index 0000000000..3bfd4c8866
--- /dev/null
+++ b/fr/share/sgml/l10n.ent
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $FreeBSD$ -->
+
+<!--
+   The FreeBSD French Documentation Project
+   Original revision: 1.62
+
+   Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
+   Version francaise (mise a jour) : Vincent Tougait <viny@scientiae.net>
+-->
+
+<!ENTITY url.doc.langcode    'fr_FR.ISO8859-1'>
+<!ENTITY xml.encoding        'iso-8859-1'>
+
+<!ENTITY newshome '<a href="../news.html">Accueil Nouvelles</a>'>
+
+<!--
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
+-->
diff --git a/fr/share/sgml/libcommon.xsl b/fr/share/sgml/libcommon.xsl
new file mode 100644
index 0000000000..1fbf39d2f9
--- /dev/null
+++ b/fr/share/sgml/libcommon.xsl
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>
+
+  <xsl:template name="html-news-list-newsflash-preface">
+    <img src="&enbase;/gifs/news.jpg" align="right" border="0" width="193"
+      height="144" alt="Nouvelles FreeBSD"/>
+
+    <p>FreeBSD est un syst&#232;me d'exploitation en constante &#233;volution. Se tenir inform&#233;
+      des derniers d&#233;veloppements peut devenir une corv&#233;e ! Pour rester &#224; jour,
+      consultez cette page r&#233;guli&#232;rement. Vous pouvez &#233;galement
+      vous inscrire &#224; la liste de diffusion
+      <a href="&enbase;/doc/&url.doc.langcode;/books/handbook/eresources.html#ERESOURCES-MAIL">freebsd-announce</a>
+      ou au <a href="news.rdf">flux RDF</a>.</p>
+
+    <p>Les projets suivants ont leurs propres pages de nouvelles, vous pouvez les consulter
+      pour les mises &#224; jour sp&#233;cifiques &#224; ces projets.</p>
+
+    <ul>
+      <li><a href="&base;/java/newsflash.html">&java; sur FreeBSD</a></li>
+      <li><a href="http://freebsd.kde.org/">KDE sur FreeBSD</a></li>
+      <li><a href="&base;/gnome/newsflash.html">GNOME sur FreeBSD</a></li>
+    </ul>
+
+    <p>Pour une description d&#233;taill&#233;e des versions pass&#233;es, pr&#233;sentes et futures,
+      consultez la page <strong><a href="&base;/releases/index.html">d'information
+	  sur les versions</a></strong>.</p>
+
+    <p>Pour les avis de s&#233;curit&#233; concernant FreeBSD, veuillez consulter la page
+      <a href="&base;/security/#adv">d'information sur la s&#233;curit&#233;</a>.</p>
+  </xsl:template>
+
+  <xsl:template name="html-news-list-newsflash-homelink">
+    <a href="&base;/news/news.html">Accueil Nouvelles</a>
+  </xsl:template>
+
+  <xsl:template name="html-news-make-olditems-list">
+    <p>Anciennes annonces :
+      <a href="2002/index.html">2002</a>,
+      <a href="2001/index.html">2001</a>,
+      <a href="2000/index.html">2000</a>,
+      <a href="1999/index.html">1999</a>,
+      <a href="1998/index.html">1998</a>,
+      <a href="1997/index.html">1997</a>,
+      <a href="1996/index.html">1996</a></p>
+  </xsl:template>
+
+  <xsl:variable name="html-news-list-press-homelink">
+    <a href="&base;/news/press.html">Accueil Presse</a>
+  </xsl:variable>
+
+  <xsl:template name="html-news-list-press-preface">
+    <p>Si vous connaissez d'autres articles &#224; propos de FreeBSD que nous n'avons pas
+      indiqu&#233;s ici, veuillez envoyer tous les d&#233;tails &#224; l'adresse
+      <a href="mailto:doc@freebsd.org">doc@FreeBSD.org</a> afin que nous puissions
+      les ajouter.</p>
+
+    <p>Vous pouvez &#233;galement consulter la page <a href="&base;/java/press.html">FreeBSD/Java
+	dans la Presse</a> pour des nouvelles sur le projet Java pour FreeBSD</p>
+  </xsl:template>
+
+  <xsl:template name="html-events-list-preface">
+    <p>Si vous avez connaissance d'&#233;v&#233;nements li&#233;s &#224; FreeBSD, ou d'&#233;v&#233;nements qui
+      pourraient int&#233;ress&#233;s les utilisateurs FreeBSD, qui ne sont pas indiqu&#233;s
+      ici, veuillez envoyer tous les d&#233;tails &#224; <a
+	href="mailto:www@FreeBSD.org">www@FreeBSD.org</a> de mani&#232;re
+      &#224; ce qu'ils puissent &#234;tre ajout&#233;s.</p>
+
+    <p>Les utilisateurs disposant d'un logiciel d'organisation comprenant le
+      format iCalendar peuvent s'abonner au
+      <a href="&base;/events/events.ics">
+	calendrier des &#233;v&#233;nements FreeBSD</a>
+      qui comprend tous les &#233;v&#233;nements mentionn&#233;s ici.</p>
+  </xsl:template>
+
+  <xsl:template name="html-events-list-upcoming-heading">
+    <h2 id="upcoming">Ev&#233;nements actuels / &#224; venir :</h2>
+  </xsl:template>
+
+  <xsl:template name="html-events-list-past-heading">
+    <h2 id="past">Ev&#233;nements pass&#233;s :</h2>
+  </xsl:template>
+
+  <!-- Convert a month number to the corresponding long English name. -->
+  <xsl:template name="gen-long-en-month">
+    <xsl:param name="nummonth"/>
+    <xsl:variable name="month" select="number($nummonth)"/>
+    <xsl:choose>
+      <xsl:when test="$month=1">Janvier</xsl:when>
+      <xsl:when test="$month=2">F&#233;vrier</xsl:when>
+      <xsl:when test="$month=3">Mars</xsl:when>
+      <xsl:when test="$month=4">Avril</xsl:when>
+      <xsl:when test="$month=5">Mai</xsl:when>
+      <xsl:when test="$month=6">Juin</xsl:when>
+      <xsl:when test="$month=7">Juillet</xsl:when>
+      <xsl:when test="$month=8">Ao&#251;t</xsl:when>
+      <xsl:when test="$month=9">Septembre</xsl:when>
+      <xsl:when test="$month=10">Octobre</xsl:when>
+      <xsl:when test="$month=11">Novembre</xsl:when>
+      <xsl:when test="$month=12">D&#233;cembre</xsl:when>
+      <xsl:otherwise>Mois invalide</xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/fr/share/sgml/navibar.l10n.ent b/fr/share/sgml/navibar.l10n.ent
new file mode 100644
index 0000000000..79b6db6489
--- /dev/null
+++ b/fr/share/sgml/navibar.l10n.ent
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- $FreeBSD$ -->
+
+<!ENTITY % navinclude.about "IGNORE">
+<![ %navinclude.about; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/about.html">A propos</a></li>
+<li><a href="&base;/features.html">Fonctionnalit&eacute;s</a></li>
+<li><a href="&base;/applications.html">Applications</a></li>
+<li><a href="&base;/internet.html">Internet</a></li>
+<li><a href="&base;/advocacy/">Pros&eacute;lytisme</a></li>
+<li><a href="&enbase;/marketing/">Marketing</a></li>
+<li><a href="&base;/news/newsflash.html">Nouvelles du projet</a></li>
+<li><a href="&base;/events/events.html">Ev&#233;nements</a></li>
+<li><a href="&base;/news/press.html">Dans la presse</a></li>
+<li><a href="&base;/art.html">Ressources artistique</a></li>
+<li><a href="&base;/logo.html">Logo</a></li>
+<li><a href="&base;/donations/">Donations</a></li>
+<li><a href="&base;/copyright/">Informations l&eacute;gales</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.community "IGNORE">
+<![ %navinclude.community; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/community.html">Communaut&eacute;</a></li>
+<li><a href="&base;/community/mailinglists.html">Listes de diffusion</a></li>
+<li><a href="&base;/community/irc.html">IRC</a></li>
+<li><a href="&base;/community/newsgroups.html">Forums de discussion</a></li>
+<li><a href="&enbase;/usergroups.html">Groupes d&#39;utilisateurs</a></li>
+<li><a href="&base;/community/webresources.html">Ressources Web</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.developers "IGNORE">
+<![ %navinclude.developers; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/projects/index.html">D&#233;veloppement</a></li>
+<li><a href="&enbase;/doc/&url.doc.langcode;/books/developers-handbook">Manuel du d&#233;veloppeur</a></li>
+<li><a href="&enbase;/doc/en_US.ISO8859-1/books/porters-handbook">Manuel du porteur d&#39;application</a></li>
+<li><a href="&base;/developers/cvs.html">D&#233;p&#244;t CVS</a></li>
+<li><a href="&base;/releng/index.html">Production des versions</a></li>
+<li><a href="&base;/platforms/">Plates-formes</a>
+	<ul>
+		<li><a href="&base;/platforms/alpha.html">alpha</a></li>
+		<li><a href="&base;/platforms/amd64.html">amd64</a></li>
+		<li><a href="&base;/platforms/arm.html">ARM</a></li>
+		<li><a href="&base;/platforms/i386.html">i386</a></li>
+		<li><a href="&base;/platforms/ia64/index.html">ia64</a></li>
+		<li><a href="&base;/platforms/mips.html">MIPS</a></li>
+		<li><a href="&base;/platforms/pc98.html">pc98</a></li>
+		<li><a href="&base;/platforms/ppc.html">ppc</a></li>
+		<li><a href="&base;/platforms/sparc.html">sparc64</a></li>
+		<li><a href="&base;/platforms/xbox.html">xbox</a></li>
+	</ul>
+</li>
+<li><a href="&enbase;/doc/&url.doc.langcode;/articles/contributing/index.html">Contribuer</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.docs "IGNORE">
+<![ %navinclude.docs; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/docs.html">Documentation</a></li>
+<li><a href="&enbase;/doc/&url.doc.langcode;/books/faq/">FAQ</a></li>
+<li><a href="&enbase;/doc/&url.doc.langcode;/books/handbook/">Manuel de R&#233;f&#233;rence</a></li>
+<li><a href="&base;/docs/man.html">Pages de manuel</a>
+  <ul>
+    <li><a href="&cgibase;/man.cgi">Pages de manuel en ligne</a></li>
+  </ul>
+</li>
+<li><a href="&base;/docs/books.html">Livres et articles en ligne</a></li>
+<li><a href="&base;/publish.html">Publications</a></li>
+<li><a href="&base;/docs/webresources.html">Ressources Web</a></li>
+<li><a href="&base;/projects/newbies.html">Pour les d&#233;butants</a></li>
+<li><a href="&base;/docproj/">Projet de Documentation</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.download "IGNORE">
+<![ %navinclude.download; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/where.html">Obtenir FreeBSD</a></li>
+<li><a href="&base;/releases/">Information sur les versions</a>
+	<ul>
+		<li><a href="&enbase;/&u.rel.announce;">Version de production: &rel.current;</a></li>
+		<li><a href="&enbase;/&u.rel2.announce;">Version (ancienne) de production: &rel2.current;</a></li>
+		<li><a href="&base;/snapshots/">Instantan&eacute;s</a></li>
+	      <![ %beta.testing; [ 
+		<li><a href="&u.betarel.schedule;">Version &agrave; venir: &betarel.current;</a></li>
+	      ]]>
+	      <![ %beta2.testing; [ 
+		<li><a href="&u.betarel2.schedule;">Version &agrave; venir: &betarel2.current;</a></li>
+	      ]]>
+	</ul>
+</li>
+<li><a href="&enbase;/ports/">Applications disponibles</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.gnome "IGNORE">
+<![ %navinclude.gnome; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/gnome/index.html">FreeBSD/GNOME</a>
+	<ul>
+		<li><a href="&base;/gnome/docs/faq2.html#q1">Instructions d&#39;installation</a></li>
+		<li><a href="&enbase;/gnome/docs/faq214.html#q2">Instructions de mise &agrave; jour</a></li>
+		<li><a href="&enbase;/gnome/../ports/gnome.html">Applications disponibles</a></li>
+		<li><a href="&base;/gnome/docs/volunteer.html">Comment participer</a></li>
+		<li><a href="&base;/gnome/docs/bugging.html">Rapporter un bogue</a></li>
+		<li><a href="&base;/gnome/screenshots.html">Captures d&#39;&eacute;cran</a></li>
+		<li><a href="&base;/gnome/contact.html">Nous contacter</a></li>
+	</ul></li>
+<li><a href="&base;/gnome/index.html">Documentation</a>
+	<ul>
+		<li><a href="&base;/gnome/docs/faq2.html">FAQ</a></li>
+		<li><a href="&enbase;/gnome/docs/faq214.html">FAQ mise &agrave; jour 2.10 &agrave; 2.12</a></li>
+		<li><a href="&enbase;/gnome/docs/develfaq.html">FAQ branche de d&eacute;veloppement</a></li>
+		<li><a href="&base;/gnome/docs/porting.html">Cr&eacute;ation des ports</a></li>
+		<li><a href="&enbase;/gnome/docs/faq214.html#q5">Probl&egrave;mes connus</a></li>
+	</ul></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.ports "IGNORE">
+<![ %navinclude.ports; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/ports/index.html">&#192; propos des ports</a></li>
+<li><a href="&base;/ports/installing.html">Installation</a></li>
+<li><a href="&base;/ports/updating.html">Mise &#224; jour</a></li>
+<li><a href="&base;/ports/searching.html">Recherche</a></li>
+<li>&nbsp;&nbsp;&nbsp;Cat&#233;gories
+	<ul>
+		<li><a href="&base;/ports/categories-alpha.html">class&#233;es par ordre alphab&#233;tique</a></li>
+		<li><a href="&base;/ports/categories-grouped.html">class&#233;es par groupes</a></li>
+	</ul>
+</li>
+<li><a href="&base;/ports/master-index.html">Liste de Tous les Ports</a></li>
+<li><a href="&base;/ports/references.html">Pour Plus d'Informations</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.support "IGNORE">
+<![ %navinclude.support; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/support.html">Support</a></li>
+<li><a href="&base;/commercial/">Revendeurs</a>
+	<ul>
+		<li><a href="&enbase;/commercial/software_bycat.html">Logiciels</a></li>
+		<li><a href="&enbase;/commercial/hardware.html">Mat&#233;riels</a></li>
+		<li><a href="&enbase;/commercial/consult_bycat.html">Consultants</a></li>
+		<li><a href="&enbase;/commercial/isp.html">Fournisseurs d&#39;Acc&#232;s &#224; Internet</a></li>
+		<li><a href="&enbase;/commercial/misc.html">Divers</a></li>
+	</ul>
+</li>
+<li><a href="&base;/security/">S&#233;curit&#233;</a></li>
+<li><a href="&base;/support.html#gnats">Rapports de Bugs</a>
+	<ul>
+		<li><a href="&base;/send-pr.html">Envoyer un rapport de bug</a></li>
+	</ul>
+</li>
+<li><a href="&base;/support.html#general">Ressources Web</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
diff --git a/fr/news/news.xml b/fr/share/sgml/news.xml
similarity index 91%
rename from fr/news/news.xml
rename to fr/share/sgml/news.xml
index 70bc064219..59e6dbe956 100644
--- a/fr/news/news.xml
+++ b/fr/share/sgml/news.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE news PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for News//EN"
+                      "http://www.FreeBSD.org/XML/www/share/sgml/news.dtd">
 
 <!-- Simple schema for FreeBSD Project news.
 
@@ -9,7 +11,7 @@
 
      Each <event> contains an optional <title>, and then a <p>.  <p> elements
      can contain <a> anchors.  Within the "href" attribute of the anchor
-     $base will be replaced with the base URI necessary to reach the FreeBSD
+     &base; will be replaced with the base URI necessary to reach the FreeBSD
      document root, and should always be used to start URLs at www.FreeBSD.org
      or one of the mirrors.
 
@@ -22,9 +24,9 @@
      *************************************************
      NOTE :
 
-       L'utilisation de $enbase ne fonctionne pas ??!!
+       L'utilisation de &enbase; ne fonctionne pas ??!!
        pas plus que celle de $url.doc.langcode.
-       => on utilise $base/../ et fr_FR.ISO8859-1
+       => on utilise &base;/../ et fr_FR.ISO8859-1
      *************************************************
 -->
 
@@ -42,7 +44,7 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/fr/news/news.xml,v 1.12 2004/08/07 15:33:38 mat Exp $
+      $FreeBSD$
     </cvs:keyword>
   </cvs:keywords>
 
@@ -145,12 +147,12 @@
 	  <event>
 	    <title>FreeBSD 5.3-RELEASE est maintenant disponible</title>
 
-          <p><a href="$base/releases/5.3R/announce.html">FreeBSD
+          <p><a href="&base;/releases/5.3R/announce.html">FreeBSD
 	    5.3-RELEASE</a> est sorti. Veuillez consulter <a
-	    href="$base/releases/5.3R/errata.html">l'errata</a>
+	    href="&base;/releases/5.3R/errata.html">l'errata</a>
 	    avant l'installation pour conna&#238;tre les derni&#232;res informations et/ou
 	    les probl&#232;mes de derni&#232;re minute concernant cette version 5.3. La page <a
-	    href="$base/releases/index.html">d'information sur les versions</a>
+	    href="&base;/releases/index.html">d'information sur les versions</a>
 	    propose plus de d&#233;tails &#224; propos des diff&#233;rentes versions.</p>
 	  </event>
 	</day>
@@ -314,7 +316,7 @@
 	  <title>Rapport de status Mai 2004 - Juin 2004</title>
 
 	  <p>Le rapport de status Mai-Juin est disponible.  Voir
-	    <a href="$base/news/status/status.html">la page des rapports
+	    <a href="&base;/news/status/status.html">la page des rapports
 	    de status</a> pour plus d'informations.</p>
 	 </event>
       </day>
@@ -378,13 +380,13 @@
 	<event>
 	  <title>FreeBSD 4.10-RELEASE est maintenant disponible</title>
 
-	  <p><a href="$base/releases/4.10R/announce.html">FreeBSD
+	  <p><a href="&base;/releases/4.10R/announce.html">FreeBSD
 	    4.10-RELEASE</a> est sorti.  Veuillez consulter <a
-	    href="$base/releases/4.10R/errata.html">l'errata</a> avant
+	    href="&base;/releases/4.10R/errata.html">l'errata</a> avant
 	    l'installation pour conna&#238;tre les derni&#232;res informations
 	    et/ou les probl&#232;mes de derni&#232;re minute concernant cette
 	    version 4.10.  La page <a
-	    href="$base/releases/index.html">d'information sur les versions</a>
+	    href="&base;/releases/index.html">d'information sur les versions</a>
 	    propose plus de d&#233;tails &#224; propos des diff&#233;rentes
 	    versions.</p>
 	</event>
@@ -405,7 +407,7 @@
 	  <title>Rapport de status Mars 2004 - Avril 2004</title>
 
 	  <p>Le rapport de status Mars-Avril est disponible.  Voir <a
-	    href="$base/news/status/status.html">la page des rapports de
+	    href="&base;/news/status/status.html">la page des rapports de
 	    status</a> pour plus d'informations.</p>
 	 </event>
        </day>
@@ -510,7 +512,7 @@
           <title>Rapport de status Janvier 2004 - Fevrier 2004</title>
 
           <p>Le rapport de status Janvier-Fevrier est disponible. Voir
-            <a href="$base/news/status/status.html">la page des rapports de status</a>
+            <a href="&base;/news/status/status.html">la page des rapports de status</a>
             pour plus d'informations.</p>
         </event>
        </day>
@@ -561,12 +563,12 @@
 	<event>
           <title>FreeBSD 5.2.1-RELEASE est maintenant disponible</title>
 
-          <p><a href="$base/releases/5.2.1R/announce.html">FreeBSD
+          <p><a href="&base;/releases/5.2.1R/announce.html">FreeBSD
 	    5.2.1-RELEASE</a> est sorti. Veuillez consulter <a
-	    href="$base/releases/5.2.1R/errata.html">l'errata</a>
+	    href="&base;/releases/5.2.1R/errata.html">l'errata</a>
 	    avant l'installation pour conna&#238;tre les derni&#232;res informations et/ou 
 	    les probl&#232;mes de derni&#232;re minute concernant cette version 5.2.1. La 
-            page <a href="$base/releases/index.html">d'information sur les versions</a>
+            page <a href="&base;/releases/index.html">d'information sur les versions</a>
 	    propose plus de d&#233;tails &#224; propos des diff&#233;rentes versions.</p>
 
 	</event>
@@ -634,7 +636,7 @@
 	  <title>Rapport sur le projet FreeBSD d'Octobre &#224; D&#233;cembre 2003</title>
 
 	  <p>Le rapport sur le projet FreeBSD pour les mois d'Octobre &#224; D&#233;cembre est disponible; voyez la
-	    <a href="$base/news/status/status.html">page sur les rapports du projet</a>
+	    <a href="&base;/news/status/status.html">page sur les rapports du projet</a>
 	    pour plus d'informations.</p>
 	</event>
       </day>
@@ -668,12 +670,12 @@
 	<event>
           <title>FreeBSD 5.2-RELEASE est maintenant disponible</title>
 
-          <p><a href="$base/releases/5.2R/announce.html">FreeBSD
+          <p><a href="&base;/releases/5.2R/announce.html">FreeBSD
 	    5.2-RELEASE</a> est sorti. Veuillez consulter <a
-	    href="$base/releases/5.2R/errata.html">l'errata</a>
+	    href="&base;/releases/5.2R/errata.html">l'errata</a>
 	    avant l'installation pour conna&#238;tre les derni&#232;res informations et/ou 
 	    les probl&#232;mes de derni&#232;re minute concernant cette version 5.2. La 
-            page <a href="$base/releases/index.html">d'information sur les versions</a>
+            page <a href="&base;/releases/index.html">d'information sur les versions</a>
 	    propose plus de d&#233;tails &#224; propos des diff&#233;rentes versions.</p>
 
 	</event>
@@ -778,11 +780,11 @@
 	<event>
 	  <title>FreeBSD 4.9-RELEASE est maintenant disponible</title>
 
-          <p><a href="$base/releases/4.9R/announce.html">FreeBSD
+          <p><a href="&base;/releases/4.9R/announce.html">FreeBSD
 	    4.9-RELEASE</a> est sorti. Veuillez consulter la page <a
-	    href="$base/releases/index.html">d'information sur les versions</a>
+	    href="&base;/releases/index.html">d'information sur les versions</a>
 	    pour plus de d&#233;tails. Consultez &#233;galement <a
-	    href="$base/releases/4.9R/errata.html">l'errata</a>
+	    href="&base;/releases/4.9R/errata.html">l'errata</a>
 	    pour conna&#238;tre les derni&#232;res informations et/ou 
 	    les probl&#232;mes de derni&#232;re minute concernant cette version 4.9.</p>
 	</event>
@@ -797,7 +799,7 @@
 	  <p>Rejoignez-nous le Lundi 24 Novembre pour f&#234;ter les 10 ans de
 	    FreeBSD au <a href="http://www.dnalounge.com">DNA
 	    Lounge</a> &#224; San Francisco. Le nom 'FreeBSD' a &#233;t&#233; <a
-	    href="$base/news/1993/freebsd-coined.html">invent&#233;</a> en
+	    href="&base;/news/1993/freebsd-coined.html">invent&#233;</a> en
 	    Juin 1993 et FreeBSD 1.0 est sorti sur CDROM en
 	    D&#233;cembre 1993. Cliquez <a
 	    href="http://www.offmyserver.com/cgi-bin/store/rsvp.html">ici</a>
@@ -834,7 +836,7 @@
 	<name>17</name>
 	<event>
 	  <title>La page des Ev&#233;nements FreeBSD est maintenant disponible</title>
-	  <p>La page des <a href="$base/events/events.html">Ev&#233;nements 
+	  <p>La page des <a href="&base;/events/events.html">Ev&#233;nements 
             FreeBSD</a> propose des informations sur les &#233;v&#233;nements pass&#233;s et 
             futurs li&#233;s &#224; FreeBSD.</p>
 	</event>
@@ -896,7 +898,7 @@
       <day>
 	<name>18</name>
 	<event>
-	  <p>Le "gel" du code source pour <a href="$base/releases/4.9R/schedule.html">FreeBSD 4.9</a> commencera le 25 Ao&#251;t</p>
+	  <p>Le "gel" du code source pour <a href="&base;/releases/4.9R/schedule.html">FreeBSD 4.9</a> commencera le 25 Ao&#251;t</p>
 	</event>
       </day>
 
@@ -930,12 +932,12 @@
 	  <title>Le Manuel de l'Architecture FreeBSD est maintenant disponible</title>
 
           <p>Le tout nouveau <a
-            href="$base/../doc/en_US.ISO8859-1/books/arch-handbook/index.html">Manuel de 
+            href="&base;/../doc/en_US.ISO8859-1/books/arch-handbook/index.html">Manuel de 
             l'Architecture FreeBSD</a> est maintenant disponible en ligne pour
             les utilisateurs qui voudraient en savoir plus &#224; propos du noyau 
             FreeBSD. La plupart des textes proviennent
             du <a
-            href="$base/../doc/fr_FR.ISO8859-1/books/developers-handbook/index.html">Manuel des
+            href="&base;/../doc/fr_FR.ISO8859-1/books/developers-handbook/index.html">Manuel des
             D&#233;veloppeurs</a>, qui est maintenant d&#233;di&#233; exclusivement &#224; la programmation
             des logiciels utilisateurs sous FreeBSD. Ces deux manuels ne sont pas
             encore totalement achev&#233;s.</p>
@@ -1023,7 +1025,7 @@
 
             <p>Il y a 10 ans jour pour jour, le nom "FreeBSD" a &#233;t&#233; invent&#233; 
 	      par David Greenman dans <a
-	      href="$base/news/1993/freebsd-coined.html">ce
+	      href="&base;/news/1993/freebsd-coined.html">ce
 	      message</a>. Viva FreeBSD !</p>
 
           </event>
@@ -1051,11 +1053,11 @@
 	<event>
 	  <title>FreeBSD 5.1-RELEASE est maintenant disponible</title>
 
-          <p><a href="$base/releases/5.1R/announce.html">FreeBSD
+          <p><a href="&base;/releases/5.1R/announce.html">FreeBSD
 	    5.1-RELEASE</a> est sorti. Veuillez consulter la page <a
-	    href="$base/releases/index.html">d'information sur les versions</a>
+	    href="&base;/releases/index.html">d'information sur les versions</a>
 	    pour plus de d&#233;tails. Consultez &#233;galement <a
-	    href="$base/releases/5.1R/errata.html">l'errata</a>
+	    href="&base;/releases/5.1R/errata.html">l'errata</a>
 	    pour conna&#238;tre les derni&#232;res informations et/ou 
 	    les probl&#232;mes de derni&#232;re minute concernant cette version 5.1.</p>
 	</event>
@@ -1146,7 +1148,7 @@
        compl&#232;te des listes de diffusion sur la page <a
 	    href="http://lists.FreeBSD.org/mailman/listinfo">http://lists.FreeBSD.org/mailman/listinfo</a>
 	    ou bien via la <a
-	    href="$base/../doc/fr_FR.ISO8859-1/books/handbook/eresources.html#ERESOURCES-MAIL">section du Manuel de
+	    href="&base;/../doc/fr_FR.ISO8859-1/books/handbook/eresources.html#ERESOURCES-MAIL">section du Manuel de
        r&#233;f&#233;rence consacr&#233;e aux listes de diffusion</a>. Un grand merci &#224; Peter Wemm
 	    pour s'&#234;tre occup&#233; de ce passage sans heurt &#224; Mailman.</p>
 	</event>
@@ -1157,11 +1159,11 @@
 	<event>
 	  <title>FreeBSD 4.8-RELEASE est maintenant disponible</title>
 
-          <p><a href="$base/releases/4.8R/announce.html">FreeBSD
+          <p><a href="&base;/releases/4.8R/announce.html">FreeBSD
 	    4.8-RELEASE</a> est sorti. Veuillez consulter la page <a
-	    href="$base/releases/index.html">d'information sur les versions</a>
+	    href="&base;/releases/index.html">d'information sur les versions</a>
 	    pour plus de d&#233;tails. Consultez &#233;galement <a
-	    href="$base/releases/4.8R/errata.html">l'errata</a>
+	    href="&base;/releases/4.8R/errata.html">l'errata</a>
 	    apr&#232;s installation pour conna&#238;tre les derni&#232;res informations et/ou 
 	    les probl&#232;mes de derni&#232;re minute concernant cette version 4.8.</p>
 	</event>
@@ -1177,7 +1179,7 @@
 	  <title>Rapport sur le projet FreeBSD de Janvier et F&#233;vrier 2003</title>
 
 	  <p>Le rapport sur le projet FreeBSD de Janvier et F&#233;vrier est disponible; voyez la
-	    <a href="$base/news/status/status.html">page sur les rapports du projet</a>
+	    <a href="&base;/news/status/status.html">page sur les rapports du projet</a>
 	    pour plus d'informations.</p>
 	</event>
       </day>
@@ -1223,7 +1225,7 @@
 	  <title>Rapport sur le projet FreeBSD de Novembre et D&#233;cembre 2002</title>
 
 	  <p>Le rapport sur le projet FreeBSD de Novembre et D&#233;cembre est disponible; voyez la
-	    <a href="$base/news/status/status.html">page sur les rapports du projet</a>
+	    <a href="&base;/news/status/status.html">page sur les rapports du projet</a>
 	    pour plus d'informations.</p>
 	</event>
 	<event>
@@ -1239,11 +1241,11 @@
         <event>
           <title>FreeBSD 5.0-RELEASE est maintenant disponible</title>
 
-          <p><a href="$base/releases/5.0R/announce.html">FreeBSD
+          <p><a href="&base;/releases/5.0R/announce.html">FreeBSD
 	    5.0-RELEASE</a> est sorti. Veuillez consulter la page <a
-	    href="$base/releases/index.html">d'information sur les versions</a>
+	    href="&base;/releases/index.html">d'information sur les versions</a>
 	    pour plus de d&#233;tails. Consultez &#233;galement <a
-	    href="$base/releases/5.0R/errata.html">l'errata</a>
+	    href="&base;/releases/5.0R/errata.html">l'errata</a>
 	    apr&#232;s installation pour conna&#238;tre les derni&#232;res informations et/ou 
 	    les probl&#232;mes de derni&#232;re minute concernant cette version 5.0.</p>
         </event>
diff --git a/fr/news/press.xml b/fr/share/sgml/press.xml
similarity index 99%
rename from fr/news/press.xml
rename to fr/share/sgml/press.xml
index e393fdc16c..0fa0818bcf 100644
--- a/fr/news/press.xml
+++ b/fr/share/sgml/press.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE press PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Press//EN"
+                      "http://www.FreeBSD.org/XML/www/share/sgml/press.dtd">
 <!-- 
  COMMITTERS PLEASE NOTE: 
     News articles referenced in this file are also to be archived under 
@@ -16,7 +18,7 @@
 <press>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/fr/news/press.xml,v 1.2 2003/06/01 15:03:08 stephane Exp $
+      $FreeBSD$
     </cvs:keyword>
   </cvs:keywords>
 
diff --git a/fr/smp/index.sgml b/fr/smp/index.sgml
index 2a012a6036..f2d77b0065 100644
--- a/fr/smp/index.sgml
+++ b/fr/smp/index.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/smp/index.sgml,v 1.2 2004/01/06 17:31:47 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/smp/index.sgml,v 1.4 2005/10/06 12:56:09 blackend Exp $">
 <!ENTITY title "Projet FreeBSD SMPng">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/snapshots/index.sgml b/fr/snapshots/index.sgml
index 1b1010487f..fe06ef9eea 100644
--- a/fr/snapshots/index.sgml
+++ b/fr/snapshots/index.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/snapshots/index.sgml,v 1.3 2006/04/25 14:40:48 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/snapshots/index.sgml,v 1.4 2006/07/03 16:03:58 blackend Exp $">
 <!ENTITY title "Parution d'instantan&eacute;s FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 
 <!ENTITY url.snapshots "ftp://ftp.freebsd.org/pub/FreeBSD/snapshots">
 ]>
diff --git a/fr/support.sgml b/fr/support.sgml
index 0cd6132196..4af1bfcf76 100644
--- a/fr/support.sgml
+++ b/fr/support.sgml
@@ -1,8 +1,7 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/fr/support.sgml,v 1.12 2005/10/13 17:01:40 blackend Exp $">
+<!doctype HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/support.sgml,v 1.13 2005/12/17 10:58:29 blackend Exp $">
 <!ENTITY title "Support">
-<!ENTITY % navincludes SYSTEM "includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/support/bugreports.sgml b/fr/support/bugreports.sgml
index e6ea1e7857..9a55f3edb4 100644
--- a/fr/support/bugreports.sgml
+++ b/fr/support/bugreports.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/support/bugreports.sgml,v 1.1 2005/10/12 19:55:36 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/support/bugreports.sgml,v 1.2 2005/10/13 16:24:34 blackend Exp $">
 <!ENTITY title "Rapport de bogues">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/support/webresources.sgml b/fr/support/webresources.sgml
index 02572f0daa..00798e780f 100644
--- a/fr/support/webresources.sgml
+++ b/fr/support/webresources.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/support/webresources.sgml,v 1.1 2005/10/12 19:55:36 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/fr/support/webresources.sgml,v 1.2 2005/10/13 16:24:34 blackend Exp $">
 <!ENTITY title "Ressources sur le Web">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/tutorials/index.sgml b/fr/tutorials/index.sgml
index e733c44acd..fa235fcdf7 100644
--- a/fr/tutorials/index.sgml
+++ b/fr/tutorials/index.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase "../&base;">
-<!ENTITY date "$FreeBSD: www/fr/tutorials/index.sgml,v 1.2 2004/01/06 17:31:47 stephane Exp $">
+<!ENTITY date "$FreeBSD: www/fr/tutorials/index.sgml,v 1.4 2005/10/06 12:56:09 blackend Exp $">
 <!ENTITY title "Guides FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/fr/where.sgml b/fr/where.sgml
index 0c1a660857..11d8659204 100644
--- a/fr/where.sgml
+++ b/fr/where.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/fr/where.sgml,v 1.14 2006/02/16 12:35:26 blackend Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/where.sgml,v 1.15 2006/04/25 14:40:48 blackend Exp $">
 <!ENTITY title "Obtenir FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
 ]>
 
diff --git a/fr/y2kbug.sgml b/fr/y2kbug.sgml
index 38d234e866..0d6facef7f 100644
--- a/fr/y2kbug.sgml
+++ b/fr/y2kbug.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/fr/y2kbug.sgml,v 1.4 2005/10/04 16:22:29 blackend Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/fr/y2kbug.sgml,v 1.5 2005/10/05 13:35:54 blackend Exp $">
 <!ENTITY title "Compatibilit&eacute; An 2000 (bug de l'an 2000)">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!--
diff --git a/it/about.sgml b/it/about.sgml
index 14641bd2db..a24afc411b 100644
--- a/it/about.sgml
+++ b/it/about.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/it/about.sgml,v 1.2 2005/10/15 13:09:15 ale Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/it/about.sgml,v 1.3 2006/06/06 11:08:49 ale Exp $">
 <!ENTITY title "Info su FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/it/community.sgml b/it/community.sgml
index ec006b1495..7aab3ef7e2 100644
--- a/it/community.sgml
+++ b/it/community.sgml
@@ -1,8 +1,7 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD$">
+<!doctype HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/it/community.sgml,v 1.1 2005/10/15 13:09:15 ale Exp $">
 <!ENTITY title "Comunit� FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navcommunity.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.community "INCLUDE">
 ]>
 
 <html>
diff --git a/it/copyright/copyright.sgml b/it/copyright/copyright.sgml
index 17d86f94cb..3aa59e1e94 100644
--- a/it/copyright/copyright.sgml
+++ b/it/copyright/copyright.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/it/copyright/copyright.sgml,v 1.1 2005/10/15 13:09:16 ale Exp $">
 <!ENTITY title "Copyright e Informazioni Legali su FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/it/docs.sgml b/it/docs.sgml
index 6962df9b29..dba81e8de2 100644
--- a/it/docs.sgml
+++ b/it/docs.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/it/docs.sgml,v 1.8 2005/01/08 11:53:23 ale Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/it/docs.sgml,v 1.9 2005/10/06 14:27:50 ale Exp $">
 <!ENTITY title "Documentazione su FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/it/docs/books.sgml b/it/docs/books.sgml
index e3657397cd..6b1efb6f19 100644
--- a/it/docs/books.sgml
+++ b/it/docs/books.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase CDATA "../..">
-<!ENTITY date "$FreeBSD: www/it/docs/books.sgml,v 1.1 2005/10/06 14:27:50 ale Exp $">
+<!ENTITY date "$FreeBSD: www/it/docs/books.sgml,v 1.2 2005/10/22 09:54:36 ale Exp $">
 <!ENTITY title "Libri e Articoli Tradotti Online">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 
 <!ENTITY url.articles "&enbase;/doc/it_IT.ISO8859-15/articles">
 <!ENTITY url.books "&enbase;/doc/it_IT.ISO8859-15/books">
diff --git a/it/includes.header.sgml b/it/includes.header.sgml
deleted file mode 100644
index 9f2f8d42ee..0000000000
--- a/it/includes.header.sgml
+++ /dev/null
@@ -1,132 +0,0 @@
-<!-- $FreeBSD: www/it/includes.header.sgml,v 1.5 2006/06/06 11:08:49 ale Exp $ -->
-
-<!-- Images -->
-<!ENTITY i.daemon '<img src="&enbase;/gifs/daemon.gif" alt="" align="left"  width="80" height="76">'>
-<!ENTITY i.new '<img src="&enbase;/gifs/new.gif" alt="[New!]" width="28" height="11">'>
-
-<!-- Components making up the standard headers and footers. -->
-<!-- Override in the prolog <em>before</em> including this  -->
-<!-- file if necessary.                                     -->
-<!ENTITY copyright '<a href="&base;/copyright/">Note Legali</a> | &copy; 1995-2006 The FreeBSD Project.
-  Tutti i diritti riservati.'>
-<!ENTITY author '<a href="&base;/index.html">home</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">contatti</a> &nbsp; | &nbsp; <a href="&base;/copyright/index.html">note legali</a> &nbsp; | &nbsp; &copyright;'>
-<!ENTITY home '<a href="&base;/index.html"><img src="&enbase;/gifs/home.gif"
-  alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"></a>'>
-<!ENTITY stylesheet '&enbase;/layout/css/fixed.css'>
-<!ENTITY stylesheetlarge '&enbase;/layout/css/fixed_large.css'>
-<!ENTITY nav ''>
-
-<!-- Standard headers and footers -->
-
-<!ENTITY header '<head><title>&title;</title>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta name="MSSmartTagsPreventParsing" content="TRUE">
-<link rel="shortcut icon" href="&enbase;/favicon.ico" type="image/x-icon">
-<link rel="icon" href="&enbase;/favicon.ico" type="image/x-icon">
-<link rel="stylesheet" media="screen" href="&stylesheet;" type="text/css" title="Normal Text">
-<link rel="alternate stylesheet" media="screen" href="&stylesheetlarge;" type="text/css" title="Large Text">
-<script type="text/javascript" src="&enbase;/layout/js/styleswitcher.js"></script>
-</head>
-<body>
-  <div id="CONTAINERWRAP">
-    <div id="CONTAINER">
-      <span class="txtoffscreen"><a href="#CONTENT" title="Salta la navigazione del sito" accesskey="1">Salta la navigazione del sito</a> (1)</span>
-      <span class="txtoffscreen"><a href="#CONTENTWRAP" title="Salta la navigazione della sezione" accesskey="2">Salta la navigazione della sezione</a> (2)</span>
-      <div id="HEADERCONTAINER">
-
-        <div id="HEADER">
-          <h2 class="blockhide">Intestazione e Logo</h2>
-          <div id="HEADERLOGOLEFT">
-            <a href="&base;" title="FreeBSD"><img src="&enbase;/layout/images/logo-red.png" width="457" height="75" alt="FreeBSD"></a>
-          </div> <!-- HEADERLOGOLEFT -->
-          <div id="HEADERLOGORIGHT">
-            <h2 class="blockhide">Collegamenti Periferici</h2>
-            <div id="SEARCHNAV">
-              <ul id="SEARCHNAVLIST">
-                <li>
-                  Testo: <a href="#" onkeypress="return false;" onclick="setActiveStyleSheet(&#39;Normal Text&#39;); return false;" title="Dimensione Testo Normale">Normale</a> / <a href="#" onkeypress="return false;" onclick="setActiveStyleSheet(&#39;Large Text&#39;); return false;" title="Dimensione Testo Grande">Grande</a>
-                </li>
-                <li>
-                  <a href="&enbase;/donations/" title="Donazioni">Donazioni</a>
-                </li>
-                <li class="last-child">
-                  <a href="&base;/mailto.html" title="Contatti">Contatti</a>
-                </li>
-              </ul>
-            </div> <!-- SEARCHNAV -->
-            <div id="SEARCH">
-              <form action="&cgibase;/search.cgi" method="get">
-                <div>
-                  <h2 class="blockhide"><label for="WORDS">Cerca</label></h2>
-                  <input type="hidden" name="max" value="25"> <input type="hidden" name="source" value="www"><input id="WORDS" name="words" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value=&#39;&#39;;" value="Cerca"> <input id="SUBMIT" name="submit" type="submit" value="Cerca">
-                </div>
-              </form>
-            </div> <!-- SEARCH -->
-          </div> <!-- HEADERLOGORIGHT -->
-
-        </div> <!-- HEADER -->
-
-        <h2 class="blockhide">Navigazione del Sito</h2>
-        <div id="TOPNAV">
-          <ul id="TOPNAVLIST">
-            <li>
-              <a href="&base;/" title="Home">Home</a>
-            </li>
-            <li>
-              <a href="&base;/about.html" title="Info">Info</a>
-            </li>
-            <li>
-              <a href="&base;/where.html" title="Ottenere FreeBSD">Ottenere FreeBSD</a>
-            </li>
-            <li>
-              <a href="&base;/docs.html" title="Documentazione">Documentazione</a>
-            </li>
-            <li>
-              <a href="&base;/community.html" title="Comunit&agrave;">Comunit&agrave;</a>
-            </li>
-            <li>
-              <a href="&enbase;/projects/index.html" title="Sviluppo">Sviluppo</a>
-            </li>
-            <li>
-              <a href="&base;/support.html" title="Supporto">Supporto</a>
-            </li>
-          </ul>
-        </div> <!-- TOPNAV -->
-      </div> <!-- HEADERCONTAINER -->
-
-<div id="CONTENT">
-<div id="SIDEWRAP">
-&nav;
-</div> <!-- SIDEWRAP -->
-
-<div id="CONTENTWRAP">
-
-<h1>&title;</h1>'>
-
-<!ENTITY footer '</div> <!-- CONTENTWRAP -->
-<br class="clearboth">
-
-      </div> <!-- CONTENT -->
-      <div id="FOOTER">
-        &copyright;<br>
-        &date;
-      </div> <!-- FOOTER -->
-    </div> <!-- CONTAINER -->
-   </div> <!-- CONTAINERWRAP -->'>
-
-<!-- macro for webbuild paper --> 
-<!ENTITY webbuild ' 
-<p>Questo documento descrive come creare e aggiornare le pagine web di FreeBSD
-manualmente dal repository CVS.</p>'>
-
-<!ENTITY % includes.header.global SYSTEM "../share/sgml/includes.release.sgml">
-%includes.header.global;
-
-<!-- 
-     Local Variables:
-     mode: sgml
-     sgml-indent-data: t
-     sgml-omittag: nil
-     sgml-always-quote-attributes: t
-     End:
--->
diff --git a/it/includes.navabout.sgml b/it/includes.navabout.sgml
deleted file mode 100644
index 776786188e..0000000000
--- a/it/includes.navabout.sgml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- $FreeBSD: www/it/includes.navabout.sgml,v 1.3 2005/11/17 10:05:06 ale Exp $ -->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">Sezione di Navigazione</h2>
-<ul>
-<li><a href="&base;/about.html">Info</a></li>
-<li><a href="&enbase;/features.html">Caratteristiche</a></li>
-<li><a href="&enbase;/applications.html">Applicazioni</a></li>
-<li><a href="&enbase;/internet.html">Connettivit�</a></li>
-<li><a href="&enbase;/advocacy/">Avvocatura</a></li>
-<li><a href="&enbase;/marketing/">Marketing</a></li>
-<li><a href="&enbase;/news/newsflash.html">News</a></li>
-<li><a href="&enbase;/events/events.html">Eventi</a></li>
-<li><a href="&enbase;/news/press.html">Stampa</a></li>
-<li><a href="&enbase;/art.html">Illustrazioni</a></li>
-<li><a href="&enbase;/logo.html">Logo</a></li>
-<li><a href="&enbase;/donations/">Donazioni</a></li>
-<li><a href="&base;/copyright/">Note Legali</a></li>
-</ul>
-</div> <!-- SIDENAV -->'>
diff --git a/it/includes.navcommunity.sgml b/it/includes.navcommunity.sgml
deleted file mode 100644
index 6580f64f2a..0000000000
--- a/it/includes.navcommunity.sgml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">Navigazione della Sezione</h2>
-<ul>
-<li><a href="&base;/community.html">Comunit�</a></li>
-<li><a href="&enbase;/community/mailinglists.html">Mailing List</a></li>
-<li><a href="&enbase;/community/irc.html">IRC</a></li>
-<li><a href="&enbase;/community/newsgroups.html">Newsgroup</a></li>
-<li><a href="&enbase;/usergroups.html">Gruppi Utenti</a></li>
-<li><a href="&enbase;/community/webresources.html">Risorse Web</a></li>
-</ul>
-</div> <!-- SIDENAV -->'>
diff --git a/it/includes.navdevelopers.sgml b/it/includes.navdevelopers.sgml
deleted file mode 100644
index d1a6a5c59b..0000000000
--- a/it/includes.navdevelopers.sgml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- $FreeBSD: www/it/includes.navdevelopers.sgml,v 1.6 2005/11/17 10:05:06 ale Exp $ -->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">Navigazione della Sezione</h2>
-<ul>
-<li><a href="&enbase;/projects/index.html">Sviluppo</a></li>
-<li><a href="&enbase;/doc/en_US.ISO8859-1/books/developers-handbook">Manuale dello Sviluppatore</a></li>
-<li><a href="&enbase;/doc/en_US.ISO8859-1/books/porters-handbook">Manuale del Porter</a></li>
-<li><a href="&enbase;/developers/cvs.html">Repository CVS</a></li>
-<li><a href="&enbase;/releng/index.html">Release Engineering</a></li>
-<li><a href="&base;/platforms/">Piattaforme</a>
-	<ul>
-		<li><a href="&enbase;/platforms/alpha.html">alpha</a></li>
-		<li><a href="&enbase;/platforms/amd64.html">amd64</a></li>
-		<li><a href="&enbase;/platforms/arm.html">ARM</a></li>
-		<li><a href="&enbase;/platforms/i386.html">i386</a></li>
-		<li><a href="&enbase;/platforms/ia64/index.html">ia64</a></li>
-		<li><a href="&enbase;/platforms/mips.html">MIPS</a></li>
-		<li><a href="&enbase;/platforms/pc98.html">pc98</a></li>
-		<li><a href="&enbase;/platforms/ppc.html">ppc</a></li>
-		<li><a href="&enbase;/platforms/sparc.html">sparc64</a></li>
-		<li><a href="&base;/platforms/xbox.html">xbox</a></li>
-	</ul>
-</li>
-<li><a href="&enbase;/projects/ideas/">Idee</a></li>
-<li><a href="&enbase;/doc/en_US.ISO8859-1/articles/contributing/index.html">Contribuire</a></li>
-</ul>
-</div> <!-- SIDENAV -->'>
diff --git a/it/includes.navdocs.sgml b/it/includes.navdocs.sgml
deleted file mode 100644
index 37902221f1..0000000000
--- a/it/includes.navdocs.sgml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- $FreeBSD: www/it/includes.navdocs.sgml,v 1.4 2005/11/17 10:05:06 ale Exp $ -->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">Sezione di Navigazione</h2>
-<ul>
-<li><a href="&base;/docs.html">Documentazione</a></li>
-<li><a href="&enbase;/doc/en_US.ISO8859-1/books/faq/">FAQ</a></li>
-<li><a href="&enbase;/doc/&url.doc.langcode;/books/handbook/index.html">Manuale</a></li>
-<li><a href="&enbase;/docs/man.html">Pagine man</a>
-	<ul>
-		<li><a href="&cgibase;/man.cgi">Man Online</a></li>
-	</ul>
-</li>
-<li><a href="&base;/docs/books.html">Libri e Articoli Tradotti Online</a></li>
-<li><a href="&enbase;/docs/books.html">Libri e Articoli Online</a></li>
-<li><a href="&enbase;/marketing/">Materiale Pubblicitario</a></li>
-<li><a href="&enbase;/publish.html">Pubblicazioni</a></li>
-<li><a href="&enbase;/docs/webresources.html">Risorse Web</a></li>
-<li><a href="&enbase;/projects/newbies.html">Per i Neofiti</a></li>
-<li><a href="&enbase;/docproj/">Documentation Project</a></li>
-</ul>
-</div> <!-- SIDENAV -->'>
diff --git a/it/includes.navdownload.sgml b/it/includes.navdownload.sgml
deleted file mode 100644
index 3333c58d97..0000000000
--- a/it/includes.navdownload.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- $FreeBSD: www/it/includes.navdownload.sgml,v 1.5 2005/11/17 10:05:06 ale Exp $ -->
-
-<!ENTITY % relincludes SYSTEM "includes.release.sgml"> %relincludes;
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">Navigazione della Sezione</h2>
-<ul>
-<li><a href="&base;/where.html">Ottenere FreeBSD</a></li>
-<li><a href="&base;/releases/">Info sulle Release</a>
-	<ul>
-		<li><a href="&u.rel.announce;">Release di Produzione: &rel.current;</a></li>
-		<li><a href="&u.rel2.announce;">Release di Produzione (Legacy): &rel2.current;</a></li>
-		<li><a href="&enbase;/snapshots/">Snapshot delle Release</a></li>
-	      <![ %beta.testing; [ 
-		<li><a href="&u.betarel.schedule;">Prossima Release: &betarel.current;</a></li>
-	      ]]>
-	      <![ %beta2.testing; [ 
-		<li><a href="&u.betarel2.schedule;">Prossima Release: &betarel2.current;</a></li>
-	      ]]>
-	</ul>
-</li>
-<li><a href="&enbase;/ports/">Applicazioni Portate</a></li>
-</ul>
-</div> <!-- SIDENAV -->'>
diff --git a/it/includes.navports.sgml b/it/includes.navports.sgml
deleted file mode 100644
index b8e7a79638..0000000000
--- a/it/includes.navports.sgml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">Sezione di Navigazione</h2>
-<ul>
-<li><a href="&base;/ports/index.html">Info sui port</a></li>
-<li><a href="&enbase;/ports/installing.html">Installazione</a></li>
-<li><a href="&enbase;/ports/updating.html">Aggiornamento</a></li>
-<li><a href="&enbase;/ports/searching.html">Ricerca</a></li>
-<li>&nbsp;&nbsp;&nbsp;Categorie
-	<ul>
-		<li><a href="&enbase;/ports/categories-alpha.html">in ordine alfabetico</a></li>
-		<li><a href="&enbase;/ports/categories-grouped.html">in gruppi logici</a></li>
-	</ul>
-</li>
-<li><a href="&enbase;/ports/master-index.html">Elenca Tutti i Port</a></li>
-<li><a href="&enbase;/ports/references.html">Per Maggiori Informazioni</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/it/includes.navsupport.sgml b/it/includes.navsupport.sgml
deleted file mode 100644
index ac46a0f0ce..0000000000
--- a/it/includes.navsupport.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">Navigazione della Sezione</h2>
-<ul>
-<li><a href="&base;/support.html">Supporto</a></li>
-<li><a href="&enbase;/commercial/">Fornitori</a>
-	<ul>
-		<li><a href="&enbase;/commercial/software_bycat.html">Software</a></li>
-		<li><a href="&enbase;/commercial/hardware.html">Hardware</a></li>
-		<li><a href="&enbase;/commercial/consult_bycat.html">Consulenza</a></li>
-		<li><a href="&enbase;/commercial/isp.html">Internet Service Providers</a></li>
-		<li><a href="&enbase;/commercial/misc.html">Varie</a></li>
-	</ul>
-</li>
-<li><a href="&enbase;/security/">Sicurezza</a></li>
-<li><a href="&enbase;/support/bugreports.html">Report di Bug</a>
-	<ul>
-		<li><a href="&enbase;/send-pr.html">Invia un report</a></li>
-	</ul>
-</li>
-<li><a href="&enbase;/support/webresources.html">Risorse Web</a></li>
-</ul>
-</div> <!-- SIDENAV -->'>
diff --git a/it/includes.release.sgml b/it/includes.release.sgml
deleted file mode 100644
index 880d7484ea..0000000000
--- a/it/includes.release.sgml
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- $FreeBSD: www/it/includes.release.sgml,v 1.3 2005/11/17 10:05:06 ale Exp $ -->
-
-<!-- XXX rel.current and u.rel.* should be available in doc/ -->
-<!-- The currently released versions of FreeBSD.  This value is used to
-     create some links on web sites and such, so do NOT change it until
-     it's really release time.  When you update this, you should also
-     update (at least) the following:
-
-        - similar entity in the Handbook
-        - similar entity in the Relnotes
-        - releases/index.sgml has the date of the current release
-        - the FAQ has links to the release FTP url
-        - "versions supported" in security.sgml
-
-     (If you're the release engineer, feel free to update this list with
-     other doc-related things you had to do.  It'll save you time and
-     trouble the next time around :-).)
-
-     As of 5.0, we now have the concept of two different "currently"
-     released versions (from two different development branches).  Use
-     rel.* and u.rel.* for the "latest and greatest" version and
-     rel2.* and u.rel2.* for the "conservative users" version.
--->
-
-<!-- If there is no release currently in the release cycle (i.e. we
-      don't have something in BETAn or RCn), then change %beta.testing
-      below to "IGNORE".  If we do, use "INCLUDE". -->
-<!ENTITY % beta.testing "IGNORE">
-<!ENTITY betarel.current '5.5'>
-<!ENTITY betarel.vers 'RC1'>
-<!ENTITY u.betarel.schedule '&enbase;/releases/&betarel.current;R/schedule.html'>
-
-<!-- If we have a second release in the release cycle (e.g. 5.x and 6.y
-      are having release candidates at the same time), do the same here.  -->
-<!ENTITY % beta2.testing "IGNORE">
-<!ENTITY betarel2.current '5.5'>
-<!ENTITY betarel2.vers 'RC1'>
-<!ENTITY u.betarel2.schedule '&enbase;/releases/&betarel2.current;R/schedule.html'>
-
-<!ENTITY rel.current '6.1'>
-<!ENTITY rel.current.date 'Mag 2006'>
-
-<!-- URLs to information on the latest release -->
-<!ENTITY u.rel.notes '&enbase;/releases/&rel.current;R/relnotes.html'>
-<!ENTITY u.rel.announce '&base;/releases/&rel.current;R/announce.html'>
-<!ENTITY u.rel.errata '&enbase;/releases/&rel.current;R/errata.html'>
-<!ENTITY u.rel.hardware '&enbase;/releases/&rel.current;R/hardware.html'>
-<!ENTITY u.rel.installation '&enbase;/releases/&rel.current;R/installation.html'>
-<!ENTITY u.rel.readme '&enbase;/releases/&rel.current;R/readme.html'>
-<!ENTITY u.rel.migration '&enbase;/releases/&rel.current;R/migration-guide.html'>
-
-<!-- Secondary "current release" entities -->
-<!ENTITY rel2.current '5.5'>
-<!ENTITY rel2.current.date 'Mag 2006'>
-
-<!-- URLs to information on the latest release -->
-<!ENTITY u.rel2.notes '&enbase;/releases/&rel2.current;R/relnotes.html'>
-<!ENTITY u.rel2.announce '&base;/releases/&rel2.current;R/announce.html'>
-<!ENTITY u.rel2.errata '&enbase;/releases/&rel2.current;R/errata.html'>
-<!ENTITY u.rel2.hardware '&enbase;/releases/&rel2.current;R/hardware.html'>
-<!ENTITY u.rel2.installation '&enbase;/releases/&rel2.current;R/installation.html'>
-<!ENTITY u.rel2.readme '&enbase;/releases/&rel2.current;R/readme.html'>
-
-<!ENTITY % includes.release.global SYSTEM "../share/sgml/includes.release.sgml">
-%includes.release.global;
-
-<!-- 
-     Local Variables:
-     mode: sgml
-     sgml-indent-data: t
-     sgml-omittag: nil
-     sgml-always-quote-attributes: t
-     End:
--->
diff --git a/it/includes.sgml b/it/includes.sgml
deleted file mode 100644
index 37ea9ac910..0000000000
--- a/it/includes.sgml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!-- $FreeBSD: www/it/includes.sgml,v 1.16 2005/10/08 08:15:43 ale Exp $ -->
-
-<!ENTITY url.doc.langcode    'it_IT.ISO8859-15'>
-
-<!--  
-  Base is the absolute URL for the given page, minus the actual page
-  part.  It should either be specified as a fully qualified URL, or
-  relative to the server root.  It should be defined in the prolog
-  <em>before</em> including this file if the page does not live at the
-  default location below. 
-
-  When making a  link, use <a href="&base;/mypage.html">foo</a> and
-  &base; will be expanded appropriately.  Base is also used in the
-  definition of standard boilerplate entities in this file, so be sure
-  base is correct!
--->
-
-<!ENTITY base CDATA ".">
-<!ENTITY cgibase CDATA "http://www.FreeBSD.org/cgi">
-<!ENTITY enbase CDATA "..">
-
-<!ENTITY % includes.release SYSTEM "includes.release.sgml">
-%includes.release;
-
-<!ENTITY % includes.header SYSTEM "includes.header.sgml">
-%includes.header;
-
-<!ENTITY % includes.misc SYSTEM "../share/sgml/includes.misc.sgml">
-%includes.misc;
-
-<!-- 
-     Local Variables:
-     mode: sgml
-     sgml-indent-data: t
-     sgml-omittag: nil
-     sgml-always-quote-attributes: t
-     End:
--->
diff --git a/it/includes.xsl b/it/includes.xsl
deleted file mode 100644
index 25e0ad9acd..0000000000
--- a/it/includes.xsl
+++ /dev/null
@@ -1,477 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!-- $FreeBSD: www/it/includes.xsl,v 1.22 2006/06/06 11:08:49 ale Exp $ -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:import href="../share/sgml/includes.xsl" />
-
-  <xsl:variable name="url.doc.langcode" select="'it_IT.ISO8859-15'" />
-
-  <xsl:variable name="i.daemon">
-    <img src="{$enbase}/gifs/daemon.gif" alt="" align="left" width="80" height="76"/>
-  </xsl:variable>
-
-  <xsl:variable name="i.new">
-    <img src="{$enbase}/gifs/new.gif" alt="[New!]" width="28" height="11"/>
-  </xsl:variable>
-
-  <xsl:variable name="copyright">
-    <a href="{$base}/copyright/">Note Legali</a> | &#169; 1995-2006 the FreeBSD Project.  Tutti i diritti riservati.
-  </xsl:variable>
-
-  <xsl:variable name="home">
-    <a href="{$base}/index.html"><img src="{$enbase}/gifs/home.gif" alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"/></a>
-  </xsl:variable>
-
-  <xsl:variable name="section" select="''"/>
-
-  <xsl:variable name="header1">
-    <head><title><xsl:value-of select="$title"/></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <meta name="MSSmartTagsPreventParsing" content="TRUE" />
-    <link rel="shortcut icon" href="{$enbase}/favicon.ico" type="image/x-icon" />
-    <link rel="icon" href="{$enbase}/favicon.ico" type="image/x-icon" />
-    <link rel="stylesheet" media="screen" href="{$enbase}/layout/css/fixed.css" type="text/css" title="Normal Text" />
-    <link rel="alternate stylesheet" media="screen" href="{$enbase}/layout/css/fixed_large.css" type="text/css" title="Large Text" />
-    <script type="text/javascript" src="{$enbase}/layout/js/styleswitcher.js"></script>
-    </head>    
-  </xsl:variable>
-  
-  <xsl:variable name="header2">
-            <span class="txtoffscreen"><a href="#CONTENT" title="Salta la navigazione del sito" accesskey="1">Salta la navigazione del sito</a> (1)</span>
-            <xsl:text> </xsl:text>
-            <span class="txtoffscreen"><a href="#CONTENTWRAP" title="Salta la navigazione della sezione" accesskey="2">Salta la navigazione della sezione</a> (2)</span>
-            <div id="HEADERCONTAINER">
-      
-              <div id="HEADER">
-      	      <h2 class="blockhide">Intestazione e Logo</h2>
-                <div id="HEADERLOGOLEFT">
-                  <a href="{$base}" title="FreeBSD"><img src="{$enbase}/layout/images/logo-red.png" width="457" height="75" alt="FreeBSD" /></a>
-                </div> <!-- HEADERLOGOLEFT -->
-                <div id="HEADERLOGORIGHT">
-      			<h2 class="blockhide">Collegamenti Periferici</h2>
-      			  <div id="SEARCHNAV">
-      				<ul id="SEARCHNAVLIST">
-      				  <li>
-      					Testo: <a href="#" onkeypress="return false;" onclick="setActiveStyleSheet('Normal Text'); return false;" title="Dimensione Testo Normale">Normale</a> / <a href="#" onkeypress="return false;" onclick="setActiveStyleSheet('Large Text'); return false;" title="Dimensione Testo Grande">Grande</a>
-      				  </li>
-      				  <li>
-      					<a href="{$enbase}/donations/" title="Donazioni">Donazioni</a>
-      				  </li>
-      				  <li class="last-child">
-      					<a href="{$base}/mailto.html" title="Contatti">Contatti</a>
-      				  </li>
-      				</ul>
-      			  </div> <!-- SEARCHNAV -->
-      			<div id="SEARCH">
-      			  <form action="{$cgibase}/search.cgi" method="get">
-      				<div>
-      			      <h2 class="blockhide"><label for="WORDS">Cerca</label></h2>
-      				  <input type="hidden" name="max" value="25" /> <input type="hidden" name="source" value="www" /><input id="WORDS" name="words" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value='';" value="Cerca" />&#160;<input id="SUBMIT" name="submit" type="submit" value="Cerca" />
-      				</div>
-      			  </form>
-      			</div> <!-- SEARCH -->
-                </div> <!-- HEADERLOGORIGHT -->
-      
-              </div> <!-- HEADER -->
-      
-        	<h2 class="blockhide">Navigazione del Sito</h2>
-              <div id="TOPNAV">
-                <ul id="TOPNAVLIST">
-		  <li>
-			<a href="{$base}/" title="Home">Home</a>
-		  </li>
-		  <li>
-			<a href="{$base}/about.html" title="Info">Info</a>
-		  </li>
-		  <li>
-			<a href="{$base}/where.html" title="Ottenere FreeBSD">Ottenere FreeBSD</a>
-		  </li>
-		  <li>
-			<a href="{$base}/docs.html" title="Documentazione">Documentazione</a>
-		  </li>
-		  <li>
-			<a href="{$base}/community.html" title="Comunit�">Comunit�</a>
-		  </li>
-		  <li>
-			<a href="{$enbase}/projects/index.html" title="Sviluppo">Sviluppo</a>
-		  </li>
-		  <li>
-			<a href="{$base}/support.html" title="Supporto">Supporto</a>
-		  </li>		  
-		</ul>
-              </div> <!-- TOPNAV -->
-            </div> <!-- HEADERCONTAINER -->
-  </xsl:variable>
-  
-  <xsl:variable name="header3">
-  	<h1><xsl:value-of select="$title"/></h1>
-  </xsl:variable>
-  
-  <xsl:variable name="sidenav">
-	<div id="SIDEWRAP">
-	
-	<div id="SIDENAV">
-	<h2 class="blockhide">Navigation della Sezione</h2>
-	
-	<xsl:if test="$section = 'about'" >
-		<ul>
-		<li><a href="{$base}/about.html">Info</a></li>
-		<li><a href="{$enbase}/features.html">Caratteristiche</a></li>
-		<li><a href="{$enbase}/applications.html">Applicazioni</a></li>
-		<li><a href="{$enbase}/internet.html">Connettivit�</a></li>
-		<li><a href="{$enbase}/advocacy/">Avvocatura</a></li>
-		<li><a href="{$enbase}/marketing/">Marketing</a></li>
-		<li><a href="{$enbase}/news/newsflash.html">News</a></li>
-		<li><a href="{$enbase}/events/events.html">Eventi</a></li>
-		<li><a href="{$enbase}/news/press.html">Stampa</a></li>
-		<li><a href="{$enbase}/art.html">Illustrazioni</a></li>
-		<li><a href="{$enbase}/donations/">Donazioni</a></li>
-		<li><a href="{$base}/copyright/">Note Legali</a></li>
-		</ul>
-    	</xsl:if>
-    	
-    	<xsl:if test="$section = 'community'" >
-		<ul>
-		<li><a href="{$base}/community.html">Comunit�</a></li>
-		<!--li><a href="{$enbase}/community/mailinglists.html">Mailing List</a></li>
-		<li><a href="{$enbase}/community/irc.html">IRC</a></li>
-		<li><a href="{$enbase}/community/newsgroups.html">Newsgroup</a></li>
-		<li><a href="{$enbase}/usergroups.html">Gruppi Utenti</a></li>
-		<li><a href="{$enbase}/community/webresources.html">Risorse Web</a></li-->
-		</ul>
-	</xsl:if>
-
-	<xsl:if test="$section = 'developers'" >
-		<ul>
-		<li><a href="{$enbase}/projects/index.html">Sviluppo</a></li>
-		<li><a href="{$enbase}/doc/en_US.ISO8859-1/books/developers-handbook">Manuale dello Sviluppatore</a></li>
-		<li><a href="{$enbase}/doc/en_US.ISO8859-1/books/porters-handbook">Manuale del Porter</a></li>
-		<li><a href="{$enbase}/developers/cvs.html">Repository CVS</a></li>
-		<li><a href="{$enbase}/releng/index.html">Release Engineering</a></li>
-		<li><a href="{$base}/platforms/">Piattaforme</a>
-			<ul>
-				<li><a href="{$enbase}/platforms/alpha.html">alpha</a></li>
-				<li><a href="{$enbase}/platforms/amd64.html">amd64</a></li>
-				<li><a href="{$enbase}/platforms/arm.html">ARM</a></li>
-				<li><a href="{$enbase}/platforms/i386.html">i386</a></li>
-				<li><a href="{$enbase}/platforms/ia64/index.html">ia64</a></li>
-				<li><a href="{$enbase}/platforms/mips.html">MIPS</a></li>
-				<li><a href="{$enbase}/platforms/pc98.html">pc98</a></li>
-				<li><a href="{$enbase}/platforms/ppc.html">ppc</a></li>
-				<li><a href="{$enbase}/platforms/sparc.html">sparc64</a></li>
-				<li><a href="{$enbase}/platforms/xbox.html">xbox</a></li>
-			</ul>
-		</li>
-		<li><a href="{$enbase}/doc/en_US.ISO8859-1/articles/contributing/index.html">Contribuire</a></li>
-		</ul>
-    	</xsl:if>
-
-	<xsl:if test="$section = 'docs'" >
-		<ul>
-		<li><a href="{$base}/docs.html">Documentazione</a></li>
-		<li><a href="{$enbase}/doc/en_US.ISO8859-1/books/faq/">FAQ</a></li>
-		<li><a href="{$enbase}/doc/{$url.doc.langcode}/books/handbook/index.html">Manuale</a></li>
-		<li><a href="{$enbase}/docs/man.html">Pagine man</a>
-			<ul>
-				<li><a href="{$cgibase}/man.cgi">Man Online</a></li>
-			</ul>
-		</li>
-		<li><a href="{$base}/docs/books.html">Libri e Articoli Tradotti Online</a></li>
-		<li><a href="{$enbase}/docs/books.html">Libri e Articoli Online</a></li>
-		<li><a href="{$enbase}/publish.html">Pubblicazioni</a></li>
-		<li><a href="{$enbase}/docs/webresources.html">Risorse Web</a></li>
-		<li><a href="{$enbase}/projects/newbies.html">Per i Neofiti</a></li>
-		<li><a href="{$enbase}/docproj/">Documentation Project</a></li>
-		</ul>
-	</xsl:if>
-
-	<xsl:if test="$section = 'download'" >
-		<ul>
-		<li><a href="{$base}/where.html">Ottenere FreeBSD</a></li>
-		<li><a href="{$base}/releases/">Info sulle Release</a>
-			<ul>
-				<li><a href="{$u.rel.announce}">Release di Produzione: <xsl:value-of select="$rel.current"/></a></li>
-				<li><a href="{$u.rel2.announce}">Release di Produzione (Legacy): <xsl:value-of select="$rel2.current"/></a></li>
-				<li><a href="{$enbase}/snapshots/">Snapshot delle Release</a></li>
-				<xsl:if test="$beta.testing != '0'">
-				  <li><a href="{$base}/where.html">Prossima Release <xsl:value-of
-				    select="concat($betarel.current, '-', $betarel.vers)"/></a>
-				  </li>
-				</xsl:if>
-				<xsl:if test="$beta2.testing != '0'">
-				  <li><a href="{$base}/where.html">Prossima Release <xsl:value-of
-				    select="concat($betarel2.current, '-', $betarel2.vers)"/></a>
-				  </li>
-				</xsl:if>
-			</ul>
-		</li>
-		<li><a href="{$enbase}/ports/">Applicazioni Portate</a></li>
-		</ul>
-	</xsl:if>
-    	
-    	<xsl:if test="$section = 'support'" >
-		<ul>
-		<li><a href="{$base}/support.html">Supporto</a></li>
-		<li><a href="{$enbase}/commercial/">Fornitori</a>
-			<ul>
-				<li><a href="{$enbase}/commercial/software_bycat.html">Software</a></li>
-				<li><a href="{$enbase}/commercial/hardware.html">Hardware</a></li>
-				<li><a href="{$enbase}/commercial/consult_bycat.html">Consulenza</a></li>
-				<li><a href="{$enbase}/commercial/isp.html">Internet Service Providers</a></li>
-				<li><a href="{$enbase}/commercial/misc.html">Varie</a></li>
-			</ul>
-		</li>
-		<li><a href="{$enbase}/security/">Sicurezza</a></li>
-		<li><a href="{$enbase}/support/bugreports.html">Report di Bug</a>
-			<ul>
-				<li><a href="{$enbase}/send-pr.html">Invia un report</a></li>
-			</ul>
-		</li>
-		<li><a href="{$enbase}/support/webresources.html">Risorse Web</a></li>
-		</ul>
-    	</xsl:if>
-	
-	</div> <!-- SIDENAV -->
-	
-	</div> <!-- SIDEWRAP -->
-  </xsl:variable>
-  
-  <xsl:variable name="footer">
-	<div id="FOOTER">
-	<xsl:copy-of select="$copyright"/><br />
-	<xsl:copy-of select="$date"/>
-	</div> <!-- FOOTER -->
-  </xsl:variable>
-
-  <xsl:variable name="u.betarel.schedule">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$betarel.current"/>R/schedule.html</xsl:variable>
-
-  <xsl:variable name="u.rel.notes">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/relnotes.html</xsl:variable>
-
-  <xsl:variable name="u.rel.announce">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/announce.html</xsl:variable>
-  <xsl:variable name="u.rel.errata">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/errata.html</xsl:variable>
-  <xsl:variable name="u.rel.hardware">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/hardware.html</xsl:variable>
-  <xsl:variable name="u.rel.installation">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/installation.html</xsl:variable>
-  <xsl:variable name="u.rel.readme">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/readme.html</xsl:variable>
-  <xsl:variable name="u.rel.migration">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/migration-guide.html</xsl:variable>
-  <xsl:variable name="u.rel2.notes">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel2.current"/>R/relnotes.html</xsl:variable>
-
-  <xsl:variable name="u.rel2.announce">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/announce.html</xsl:variable>
-  <xsl:variable name="u.rel2.errata">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel2.current"/>R/errata.html</xsl:variable>
-  <xsl:variable name="u.rel2.hardware">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel2.current"/>R/hardware.html</xsl:variable>
-  <xsl:variable name="u.rel2.installation">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel2.current"/>R/installation.html</xsl:variable>
-  <xsl:variable name="u.rel2.readme">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel2.current"/>R/readme.html</xsl:variable>
-
-  <!-- template: "html-index-advisories-items"
-       pulls in the 6 most recent security advisories -->
-
-  <xsl:template name="html-index-advisories-items">
-    <xsl:param name="advisories.xml" select="''" />
-    <xsl:param name="type" select="'advisory'" />
-
-    <xsl:choose>
-      <xsl:when test="$type = 'advisory'">
-        <xsl:for-each select="document($advisories.xml)/descendant::advisory[position() &lt;= 4]">
-          <xsl:param name="year" select="../../../name" />
-          <xsl:param name="month" select="../../name" />
-          <xsl:param name="day" select="../name" />
-        <p>
-          <span class="txtdate">
-              <xsl:value-of select='
-                concat(format-number($day, "00"), "-",
-                format-number($month, "00"), "-",
-                format-number($year, "####"))' />
-          </span><br />
-          <xsl:choose>
-            <xsl:when test="@omithref = 'yes'">
-              <xsl:value-of select="name"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <a><xsl:attribute name="href">
-                  <xsl:value-of select="concat($ftpbase, name, '.asc')"/>
-                </xsl:attribute>
-                <xsl:value-of select="name"/></a>
-            </xsl:otherwise>
-          </xsl:choose>
-          </p>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:when test="$type = 'notice'">
-        <xsl:for-each select="document($advisories.xml)/descendant::notice[position() &lt;= 2]">
-        <xsl:param name="year" select="../../../name" />
-        <xsl:param name="month" select="../../name" />
-        <xsl:param name="day" select="../name" />
-        <p>
-          <span class="txtdate">
-              <xsl:value-of select='
-                concat(format-number($day, "00"), "-",
-                format-number($month, "00"), "-",
-                format-number($year, "####"))' />
-          </span><br />
-          <xsl:choose>
-            <xsl:when test="@omithref = 'yes'">
-              <xsl:value-of select="name"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <a><xsl:attribute name="href">
-                  <xsl:value-of select="concat($ftpbaseerrata, name, '.asc')"/>
-                </xsl:attribute>
-                <xsl:value-of select="name"/></a>
-            </xsl:otherwise>
-          </xsl:choose>
-          </p>
-        </xsl:for-each>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- template: "html-index-news-project-items"
-       pulls in the 5 most recent project items -->
-
-  <xsl:template name="html-index-news-project-items">
-    <xsl:param name="news.project.xml" select="'none'" />
-
-    <xsl:for-each select="document($news.project.xml)/descendant::day[position() &lt; 5]">
-      <xsl:param name="year" select="ancestor::year/name" />
-      <xsl:param name="month" select="ancestor::month/name" />
-      <xsl:param name="day" select="name" />
-
-      <xsl:for-each select="event">
-        <xsl:param name="anchor-position" select="position()" />
-
-        <p>
-        <span class="txtdate">
-          <xsl:value-of select='
-              concat(format-number($day, "00"), "-",
-              format-number($month, "00"), "-",
-              format-number($year, "####"))' />
-        </span><br />
-        <a>
-          <xsl:attribute name="href">
-            <xsl:text>../news/newsflash.html#</xsl:text>
-            <xsl:call-template name="html-news-generate-anchor">
-              <xsl:with-param name="label" select="'event'" />
-              <xsl:with-param name="year" select="$year" />
-              <xsl:with-param name="month" select="$month" />
-              <xsl:with-param name="day" select="$day" />
-              <xsl:with-param name="pos" select="$anchor-position" />
-            </xsl:call-template>
-          </xsl:attribute>
-
-          <xsl:choose>
-            <xsl:when test="count(child::title)">
-              <xsl:value-of select="title"/><br/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="p"/><br/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </a>
-        </p>
-      </xsl:for-each>
-    </xsl:for-each>
-  </xsl:template>
-
-  <!-- template: "html-index-news-press-items"
-       pulls in the 5 most recent press items -->
-
-  <xsl:template name="html-index-news-press-items">
-    <xsl:param name="news.press.xml" select="''" />
-
-    <xsl:for-each select="document($news.press.xml)/descendant::story[position() &lt;= 5]">
-      <xsl:param name="year" select="../../name" />
-      <xsl:param name="month" select="../name" />
-      <xsl:param name="day" select="../name" />
-      <xsl:param name="url" select="url" />
-      <xsl:param name="site-url" select="site-url" />
-
-      <xsl:param name="pos">
-        <xsl:for-each select="../story">
-          <xsl:if test="url = $url">
-            <xsl:value-of select="position()" />
-          </xsl:if>
-        </xsl:for-each>
-      </xsl:param>
-
-      <p>
-      <span class="txtdate">
-        <xsl:value-of select='
-            concat(format-number($month, "00"), "-",
-            format-number($year, "####"))' />
-      </span><br />
-      <a>
-        <xsl:attribute name="href">
-          <xsl:text>../news/press.html#</xsl:text>
-          <xsl:call-template name="html-news-generate-anchor">
-            <xsl:with-param name="label" select="'story'" />
-            <xsl:with-param name="year" select="$year" />
-            <xsl:with-param name="month" select="$month" />
-            <xsl:with-param name="pos" select="$pos" />
-          </xsl:call-template>
-        </xsl:attribute>
-
-        <xsl:value-of select="name"/>
-      </a></p>
-      
-    </xsl:for-each>
-  </xsl:template>
-
- <!-- template: "html-index-events-items"
-       pulls in the 5 most recent events items -->
-
-  <xsl:template name="html-index-events-items">
-    <xsl:param name="events.xml" select="''" />
-    <xsl:param name="curdate.xml" select="''" />
-    <xsl:variable name="curdate" select="document($curdate.xml)//curdate"/>
-
-    <xsl:for-each select="document($events.xml)/descendant::event[((number(enddate/year) &gt; number($curdate/year)) or
-                                                                   (number(enddate/year) = number($curdate/year) and
-                                                                    number(enddate/month) &gt; number($curdate/month)) or
-                                                                   (number(enddate/year) = number($curdate/year) and
-                                                                    number(enddate/month) = number($curdate/month) and
-                                                                    enddate/day &gt;= $curdate/day))]">
-      <xsl:sort select="startdate/year" order="ascending"/>
-      <xsl:sort select="format-number(startdate/month, '00')" order="ascending"/>
-      <xsl:sort select="format-number(startdate/day, '00')" order="ascending"/>
-
-      <xsl:if test="position() &lt;= 5">
-        <p>
-        <span class="txtdate">
-           <xsl:value-of select='
-              concat(format-number(startdate/day, "00"), "-",
-              format-number(startdate/month, "00"), "-",
-              format-number(startdate/year, "####"), " -  ",
-              format-number(enddate/day, "00"), "-",
-              format-number(enddate/month, "00"), "-",
-              format-number(enddate/year, "####"))' />
-        </span><br />
-        <a>
-          <xsl:attribute name="href">
-            <xsl:text>../events/#event:</xsl:text><xsl:value-of select='@id' />
-          </xsl:attribute>
-
-          <xsl:value-of select="name"/>
-
-          <br />
-          (<xsl:value-of select='location/city' />, <xsl:value-of select='location/country' />)
-        </a></p>
-      </xsl:if>
-    </xsl:for-each>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/it/index.xsl b/it/index.xsl
index b874c0a705..678b8fb388 100644
--- a/it/index.xsl
+++ b/it/index.xsl
@@ -1,47 +1,48 @@
+<?xml version="1.0" encoding="ISO-8859-15" ?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+<!ENTITY title "The FreeBSD Project">
+]>
+
 <!--
      The FreeBSD Italian Documentation Project
 
-     $FreeBSD: www/it/index.xsl,v 1.29 2006/06/06 11:08:49 ale Exp $
+     $FreeBSD: www/it/index.xsl,v 1.30 2006/06/06 14:22:13 ale Exp $
      Original revision: 1.138
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl" />
 
-  <xsl:import href="includes.xsl"/>
-  <xsl:import href="../en/news/includes.xsl"/>
-
-  <xsl:variable name="date" select="''"/>  
-  <xsl:variable name="title" select="'The FreeBSD Project'"/>
-
-  <xsl:output type="html" encoding="iso-8859-1"
+  <xsl:output type="html" encoding="&xml.encoding;"
               doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/>
 
   <xsl:template match="/">
     <html>
       <head>
-	<title><xsl:value-of select="$title"/></title>
+	<title>&title;</title>
 	<meta name="description" content="The FreeBSD Project"/>
 	<meta name="keywords" content="FreeBSD, BSD, UNIX, Support, Ports,
 	      Release, Application, Software, Handbook, FAQ, Tutorials, Bugs,
 	      CVS, CVSup, News, Commercial Vendors, homepage, CTM, Unix"/>
-	<link rel="shortcut icon" href="{$enbase}/favicon.ico" type="image/x-icon"/>
-	<link rel="icon" href="{$enbase}/favicon.ico" type="image/x-icon"/>
-	<link rel="stylesheet" media="screen" href="{$enbase}/layout/css/fixed.css" type="text/css" title="Normal Text" />
-	<link rel="alternate stylesheet" media="screen" href="{$enbase}/layout/css/fixed_large.css" type="text/css" title="Large Text" />
-	<script type="text/javascript" src="{$enbase}/layout/js/styleswitcher.js"></script>
+	<link rel="shortcut icon" href="&enbase;/favicon.ico" type="image/x-icon"/>
+	<link rel="icon" href="&enbase;/favicon.ico" type="image/x-icon"/>
+	<link rel="stylesheet" media="screen" href="&enbase;/layout/css/fixed.css" type="text/css" title="Normal Text" />
+	<link rel="alternate stylesheet" media="screen" href="&enbase;/layout/css/fixed_large.css" type="text/css" title="Large Text" />
+	<script type="text/javascript" src="&enbase;/layout/js/styleswitcher.js"></script>
 	<link rel="alternate" type="application/rss+xml"
-	  title="FreeBSD Project News" href="{$enbase}/news/news.rdf" />
+	  title="FreeBSD Project News" href="&enbase;/news/news.rdf" />
 	<link rel="alternate" type="application/rss+xml"
-	  title="FreeBSD Security Advisories" href="{$enbase}/security/advisories.rdf" />
+	  title="FreeBSD Security Advisories" href="&enbase;/security/advisories.rdf" />
 	<link rel="alternate" type="application/rss+xml"
-	  title="FreeBSD GNOME Project News" href="{$enbase}/gnome/news.rdf" />
+	  title="FreeBSD GNOME Project News" href="&enbase;/gnome/news.rdf" />
       </head>
 
       <body>
 
    <div id="CONTAINERWRAP">
     <div id="CONTAINER">
-      <xsl:copy-of select="$header2"/>
+      &header2;
       <div id="CONTENT">
 
         <div id="FRONTCONTAINER">
@@ -58,15 +59,15 @@
 				Opteron&#8482;, Athlon 64, e EM64T),
 				UltraSPARC&#174;, IA-64, PC-98 e ARM.
 				&#200; derivato da BSD, la versione di
-				<xsl:value-of select="$unix"/> sviluppata
+				&unix; sviluppata
 				all'Universit&#224; della California, Berkeley.
 				&#200; sviluppato e mantenuto da <a
-				href="{$enbase}/doc/en_US.ISO8859-1/articles/contributors/staff-committers.html">un
+				href="&enbase;/doc/en_US.ISO8859-1/articles/contributors/staff-committers.html">un
 				grande gruppo di individui</a>.
-				<a href="{$base}/platforms/index.html">Piattaforme</a>
+				<a href="&base;/platforms/index.html">Piattaforme</a>
 				aggiuntive sono in varie fasi di sviluppo.</p>
 				<div id="TXTFRONTFEATURELINK">
-				&#187;<a href="{$base}/about.html" title="Approfondisci">Approfondisci</a>
+				&#187;<a href="&base;/about.html" title="Approfondisci">Approfondisci</a>
 				</div> <!-- TXTFRONTFEATURELINK -->
 			</div> <!-- FRONTFEATURECONTENT -->
 		</div> <!-- FRONTFEATURELEFT -->
@@ -75,33 +76,33 @@
 			<div class="frontgetroundbox">
 			  <div class="frontgettop"><div>&#160;</div>&#160;</div>
 				<div class="frontgetcontent">
-				  <a href="{$base}/where.html">Ottieni FreeBSD Ora</a>
+				  <a href="&base;/where.html">Ottieni FreeBSD Ora</a>
 				</div> <!-- frontgetcontent -->
 			  <div class="frontgetbot"><div>&#160;</div>&#160;</div>
 			</div> <!-- frontgetroundbox -->
 			
 			<div id="FRONTRELEASES">
 			  <div id="FRONTRELEASESCONTENT" class="txtshortcuts">
-				  <h2><a href="{$base}/releases/">ULTIME RELEASE</a></h2>
+				  <h2><a href="&base;/releases/">ULTIME RELEASE</a></h2>
 				  <ul id="FRONTRELEASESLIST">
 					<li>
-					  <a href="{$u.rel.announce}">Release di Produzione <xsl:value-of select="$rel.current"/></a>
+					  <a href="&u.rel.announce;">Release di Produzione &rel.current;</a>
 					</li>
 					<li>
-					  <a href="{$u.rel2.announce}">Release di Produzione (Legacy) <xsl:value-of select="$rel2.current"/></a>
+					  <a href="&u.rel2.announce;">Release di Produzione (Legacy) &rel2.current;</a>
 					</li>
-				    <xsl:if test="$beta.testing">
+			    <xsl:if test="'&beta.testing;' != 'IGNORE'">
 					<li>
-					  <a href="{$base}/where.html#helptest">Prossima Release
-					    <xsl:value-of select="concat($betarel.current, '-', $betarel.vers)"/></a>
+					  <a href="&base;/where.html#helptest">Prossima Release
+					    &betarel.current; - &betarel.vers;</a>
 					</li>
-				    </xsl:if>
-				    <xsl:if test="$beta2.testing">
+			    </xsl:if>
+			    <xsl:if test="'&beta2.testing;' != 'IGNORE'">
 					<li>
-					  <a href="{$base}/where.html#helptest">Prossima Release
-					    <xsl:value-of select="concat($betarel2.current, '-', $betarel2.vers)"/></a>
+					  <a href="&base;/where.html#helptest">Prossima Release
+					    &betarel2.current; - &betarel2.vers;</a>
 					</li>
-				    </xsl:if>
+			    </xsl:if>
 				  </ul>
 			  </div> <!-- FRONTRELEASESCONTENT -->
 			</div> <!-- FRONTRELEASES -->
@@ -112,31 +113,31 @@
 			<div id="LANGUAGENAV">
 				<ul id="LANGUAGENAVLIST">
 				  <li>
-					<a href="{$enbase}/de/" title="Tedesco">de</a>
+					<a href="&enbase;/de/" title="Tedesco">de</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/" title="Inglese">en</a>
+					<a href="&enbase;/" title="Inglese">en</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/es/" title="Spagnolo">es</a>
+					<a href="&enbase;/es/" title="Spagnolo">es</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/fr/" title="Francese">fr</a>
+					<a href="&enbase;/fr/" title="Francese">fr</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/it/" title="Italiano">it</a>
+					<a href="&enbase;/it/" title="Italiano">it</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/ja/" title="Giapponese">ja</a>
+					<a href="&enbase;/ja/" title="Giapponese">ja</a>
 				  </li>
 				  <li class="last-child">
-					<a href="{$enbase}/ru/" title="Russo">ru</a>
+					<a href="&enbase;/ru/" title="Russo">ru</a>
 				  </li>
 				</ul>
 			</div> <!-- LANGUAGENAV -->
 
 			<div id="MIRROR">
-			  <form action="{$cgibase}/mirror.cgi" method="get">
+			  <form action="&cgibase;/mirror.cgi" method="get">
 				<div>
 				  <h2 class="blockhide"><label for="MIRRORSEL">Mirror</label></h2>
 				  <select id="MIRRORSEL" name="goto">
@@ -154,22 +155,22 @@
 				  <h2>SCORCIATOIE</h2>
 				  <ul id="FRONTSHORTCUTSLIST">
 					<li>
-					  <a href="{$enbase}/community/mailinglists.html" title="Mailing Lists">Mailing Lists</a>
+					  <a href="&enbase;/community/mailinglists.html" title="Mailing Lists">Mailing Lists</a>
 					</li>
 					<li>
-					  <a href="{$enbase}/send-pr.html" title="Report di Bug">Report di Bug</a>
+					  <a href="&enbase;/send-pr.html" title="Report di Bug">Report di Bug</a>
 					</li>
 					<li>
-					  <a href="{$enbase}/doc/en_US.ISO8859-1/books/faq/index.html" title="FAQ">FAQ</a>
+					  <a href="&enbase;/doc/en_US.ISO8859-1/books/faq/index.html" title="FAQ">FAQ</a>
 					</li>
 					<li>
-					  <a href="{$enbase}/doc/it_IT.ISO8859-15/books/handbook/index.html" title="Manuale">Manuale</a>
+					  <a href="&enbase;/doc/it_IT.ISO8859-15/books/handbook/index.html" title="Manuale">Manuale</a>
 					</li>
 					<li>
 					  <a href="http://www.freebsdfoundation.org/" title="Fondazione">Fondazione</a>
 					</li>
 					<li>
-					  <a href="{$base}/ports/index.html" title="Port">Port</a>
+					  <a href="&base;/ports/index.html" title="Port">Port</a>
 					</li>
 				  </ul>
 			  </div> <!-- FRONTSHORTCUTSCONTENT -->
@@ -178,7 +179,7 @@
 			<div class="frontnewroundbox">
 			  <div class="frontnewtop"><div>&#160;</div>&#160;</div>
 			    <div class="frontnewcontent">
-			      <a href="{$enbase}/projects/newbies.html">Neofita di FreeBSD?</a>
+			      <a href="&enbase;/projects/newbies.html">Neofita di FreeBSD?</a>
 			    </div> <!-- frontnewcontent -->
 			  <div class="frontnewbot"><div>&#160;</div>&#160;</div>
 			</div> <!-- frontnewroundbox -->
@@ -200,10 +201,10 @@
 			  <div>
 				<ul class="newseventslist">
 				  <li class="first-child">
-					<a href="{$enbase}/news/newsflash.html" title="Altre Notizie">Altre Notizie</a>
+					<a href="&enbase;/news/newsflash.html" title="Altre Notizie">Altre Notizie</a>
 				  </li>
 				  <li class="last-child">
-					<a href="{$enbase}/news/news.rdf" title="News RSS Feed"><img class="rssimage" src="{$enbase}/layout/images/ico_rss.png" width="27" height="12" alt="News RSS Feed" /></a>
+					<a href="&enbase;/news/news.rdf" title="News RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="News RSS Feed" /></a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -226,7 +227,7 @@
 			  <div>
 				<ul class="newseventslist">
 				  <li class="only-child">
-					<a href="{$enbase}/events/" title="Altri Eventi">Altri Eventi</a>
+					<a href="&enbase;/events/" title="Altri Eventi">Altri Eventi</a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -248,7 +249,7 @@
 			  <div>
 				<ul class="newseventslist">
 				  <li class="only-child">
-					<a href="{$enbase}/news/press.html" title="Altri Media">Altri Media</a>
+					<a href="&enbase;/news/press.html" title="Altri Media">Altri Media</a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -271,10 +272,10 @@
 			  <div>
 				<ul class="newseventslist">
 				  <li class="first-child">
-					<a href="{$enbase}/security/" title="Altri Avvisi di Sicurezza">Altri</a>
+					<a href="&enbase;/security/" title="Altri Avvisi di Sicurezza">Altri</a>
 				  </li>
 				  <li class="last-child">
-					<a href="{$enbase}/security/advisories.rdf" title="Security Advisories RSS Feed"><img class="rssimage" src="{$enbase}/layout/images/ico_rss.png" width="27" height="12" alt="News RSS Feed" /></a>
+					<a href="&enbase;/security/advisories.rdf" title="Security Advisories RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="News RSS Feed" /></a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -302,7 +303,7 @@
 
       </div> <!-- CONTENT -->
       <div id="FOOTER">
-        <xsl:copy-of select="$copyright"/>
+        &copyright;
 
 	FreeBSD &#232; un marchio registrato della FreeBSD Foundation ed &#232;
 	usato dal FreeBSD Project con il permesso della <a
diff --git a/it/mailto.sgml b/it/mailto.sgml
index 02aa2434bd..f42a85a7df 100644
--- a/it/mailto.sgml
+++ b/it/mailto.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/it/mailto.sgml,v 1.7 2005/10/15 13:09:15 ale Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/it/mailto.sgml,v 1.8 2006/06/06 11:08:49 ale Exp $">
 <!ENTITY title "Contattare FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/it/platforms/index.sgml b/it/platforms/index.sgml
index b96e3d6429..7a22484b37 100644
--- a/it/platforms/index.sgml
+++ b/it/platforms/index.sgml
@@ -1,11 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase CDATA "../..">
 <!ENTITY email 'freebsd-www'>
 <!ENTITY title "Piattaforme Supportate">
-<!ENTITY date "$FreeBSD: www/it/platforms/index.sgml,v 1.1 2005/10/15 13:09:16 ale Exp $">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;]>
+<!ENTITY date "$FreeBSD: www/it/platforms/index.sgml,v 1.2 2006/06/06 11:08:50 ale Exp $">
+<!ENTITY % navinclude.developers "INCLUDE">
+]>
+
 
 <html>
   &header;
diff --git a/it/ports/index.sgml b/it/ports/index.sgml
index e08678f4c0..3a0aebcdae 100644
--- a/it/ports/index.sgml
+++ b/it/ports/index.sgml
@@ -1,13 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA '..'>
-<!ENTITY enbase CDATA '../..'>
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/it/ports/index.sgml,v 1.1 2006/06/06 11:08:50 ale Exp $">
 <!ENTITY title 'Info sui Port di FreeBSD'>
-<!ENTITY % navincludes SYSTEM "../includes.navports.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml">
+<!ENTITY % navinclude.ports "INCLUDE">
 <!ENTITY % ports.ent SYSTEM "ports.ent">
 <!ENTITY email 'ports'>
-%includes;
 %ports.ent;
 ]>
 <html>
diff --git a/it/releases/4.10R/announce.sgml b/it/releases/4.10R/announce.sgml
index 34b7d86e96..f1c447a2d6 100755
--- a/it/releases/4.10R/announce.sgml
+++ b/it/releases/4.10R/announce.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase CDATA "../../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/it/releases/4.10R/announce.sgml,v 1.5 2005/11/17 10:05:07 ale Exp $">
 <!ENTITY local.rel "4.10">
 <!ENTITY title "Annuncio di FreeBSD &local.rel;-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <html>
 &header;
diff --git a/it/releases/4.11R/announce.sgml b/it/releases/4.11R/announce.sgml
index 77af41839d..40ae1d0391 100644
--- a/it/releases/4.11R/announce.sgml
+++ b/it/releases/4.11R/announce.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase CDATA "../../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/it/releases/4.11R/announce.sgml,v 1.3 2005/11/17 10:05:07 ale Exp $">
 <!ENTITY local.rel "4.11">
 <!ENTITY title "Annuncio di FreeBSD &local.rel;-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <html>
 &header;
diff --git a/it/releases/5.2.1R/announce.sgml b/it/releases/5.2.1R/announce.sgml
index 2025a01755..7312125270 100644
--- a/it/releases/5.2.1R/announce.sgml
+++ b/it/releases/5.2.1R/announce.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase CDATA "../../..">
-<!ENTITY date "$FreeBSD: www/it/releases/5.2.1R/announce.sgml,v 1.5 2005/03/31 09:20:01 ale Exp $">
+<!ENTITY date "$FreeBSD: www/it/releases/5.2.1R/announce.sgml,v 1.6 2005/10/06 14:27:50 ale Exp $">
 <!ENTITY title "Annuncio di FreeBSD 5.2.1-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <html>
 &header;
diff --git a/it/releases/5.2R/announce.sgml b/it/releases/5.2R/announce.sgml
index 44143c411b..57aa1ca609 100644
--- a/it/releases/5.2R/announce.sgml
+++ b/it/releases/5.2R/announce.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase CDATA "../../..">
-<!ENTITY date "$FreeBSD: www/it/releases/5.2R/announce.sgml,v 1.6 2005/03/31 09:20:01 ale Exp $">
+<!ENTITY date "$FreeBSD: www/it/releases/5.2R/announce.sgml,v 1.7 2005/10/06 14:27:51 ale Exp $">
 <!ENTITY title "Annuncio di FreeBSD 5.2-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <html>
 &header;
diff --git a/it/releases/5.3R/announce.sgml b/it/releases/5.3R/announce.sgml
index 51ebf30d32..9d8b2074f4 100644
--- a/it/releases/5.3R/announce.sgml
+++ b/it/releases/5.3R/announce.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase CDATA "../../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/it/releases/5.3R/announce.sgml,v 1.4 2005/11/17 10:05:07 ale Exp $">
 <!ENTITY title "Annuncio di FreeBSD 5.3-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <html>
 &header;
diff --git a/it/releases/5.4R/announce.sgml b/it/releases/5.4R/announce.sgml
index 1ed8c675e5..c65d631c35 100644
--- a/it/releases/5.4R/announce.sgml
+++ b/it/releases/5.4R/announce.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase CDATA "../../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/it/releases/5.4R/announce.sgml,v 1.3 2005/11/17 10:05:07 ale Exp $">
 <!ENTITY title "Annuncio di FreeBSD 5.4-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <html>
 &header;
diff --git a/it/releases/6.0R/announce.sgml b/it/releases/6.0R/announce.sgml
index b582d4728f..4d9e71c159 100755
--- a/it/releases/6.0R/announce.sgml
+++ b/it/releases/6.0R/announce.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase CDATA "../../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/it/releases/6.0R/announce.sgml,v 1.1 2005/11/17 10:05:07 ale Exp $">
 <!ENTITY title "Annuncio di FreeBSD 6.0-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <html>
 &header;
diff --git a/it/releases/index.sgml b/it/releases/index.sgml
index f810562c08..0fffae2bba 100644
--- a/it/releases/index.sgml
+++ b/it/releases/index.sgml
@@ -1,17 +1,15 @@
 <!--
      The FreeBSD Italian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: www/it/releases/index.sgml,v 1.12 2005/11/17 10:05:07 ale Exp $
      Original revision: 1.107
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/it/releases/index.sgml,v 1.12 2005/11/17 10:05:07 ale Exp $">
 <!ENTITY title "Informazioni sulle Release">
-<!ENTITY % navincludes SYSTEM "../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <html>
diff --git a/it/share/sgml/catalog b/it/share/sgml/catalog
new file mode 100644
index 0000000000..bae3bb06c0
--- /dev/null
+++ b/it/share/sgml/catalog
@@ -0,0 +1,12 @@
+--
+ $FreeBSD$
+--
+
+PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+       "l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
+       "header.l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
+       "navibar.l10n.ent"
diff --git a/it/share/sgml/catalog.xml b/it/share/sgml/catalog.xml
new file mode 100644
index 0000000000..12c0f02504
--- /dev/null
+++ b/it/share/sgml/catalog.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+                 rewritePrefix="../../"/>
+  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+              rewritePrefix="../../"/>
+</catalog>
diff --git a/it/share/sgml/header.l10n.ent b/it/share/sgml/header.l10n.ent
new file mode 100644
index 0000000000..1c85348f83
--- /dev/null
+++ b/it/share/sgml/header.l10n.ent
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
+<!-- $FreeBSD$ -->
+
+<!-- Components making up the standard headers and footers. -->
+<!-- Override in the prolog <em>before</em> including this  -->
+<!-- file if necessary.                                     -->
+<!ENTITY copyright '<a href="&base;/copyright/">Note Legali</a> | &copy; 1995-2006 The FreeBSD Project.
+  Tutti i diritti riservati.'>
+<!ENTITY author '<a href="&base;/index.html">home</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">contatti</a> &nbsp; | &nbsp; <a href="&base;/copyright/index.html">note legali</a> &nbsp; | &nbsp; &copyright;'>
+
+<!-- Standard headers and footers -->
+
+<!ENTITY header2.word.search 'Cerca'>
+<!ENTITY header2.word.textsize 'Testo'>
+<!ENTITY header2.word.normaltextsize 'Dimensione Testo Normale'>
+<!ENTITY header2.word.largetextsize 'Dimensione Testo Grande'>
+<!ENTITY header2.word.normal 'Normale'>
+<!ENTITY header2.word.large 'Grande'>
+<!ENTITY header2.word.donate 'Donazioni'>
+<!ENTITY header2.word.contact 'Contatti'>
+
+<!ENTITY header2.topnav '
+  <h2 class="blockhide">Navigazione del Sito</h2>
+
+  <div id="TOPNAV">
+    <ul id="TOPNAVLIST">
+      <li><a href="&base;/" title="Home">Home</a></li>
+      <li><a href="&base;/about.html" title="Info">Info</a></li>
+      <li><a href="&base;/where.html" title="Ottenere FreeBSD">Ottenere FreeBSD</a></li>
+      <li><a href="&base;/docs.html" title="Documentazione">Documentazione</a></li>
+      <li><a href="&base;/community.html" title="Comunit&agrave;">Comunit&agrave;</a></li>
+      <li><a href="&enbase;/projects/index.html" title="Sviluppo">Sviluppo</a></li>
+      <li><a href="&base;/support.html" title="Supporto">Supporto</a></li>
+    </ul>
+  </div> <!-- TOPNAV -->
+'>
+
+<!-- macro for webbuild paper --> 
+<!ENTITY webbuild ' 
+<p>Questo documento descrive come creare e aggiornare le pagine web di FreeBSD
+manualmente dal repository CVS.</p>'>
+
+<!-- 
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
+-->
diff --git a/it/share/sgml/l10n.ent b/it/share/sgml/l10n.ent
new file mode 100644
index 0000000000..f9821f1901
--- /dev/null
+++ b/it/share/sgml/l10n.ent
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
+<!-- $FreeBSD$ -->
+
+<!ENTITY url.doc.langcode    'it_IT.ISO8859-15'>
+<!ENTITY xml.encoding        'iso-8859-15'>
+
+<!ENTITY u.betarel.schedule '&enbase;/releases/&betarel.current;R/schedule.html'>
+<!ENTITY u.betarel2.schedule '&enbase;/releases/&betarel2.current;R/schedule.html'>
+
+<!-- URLs to information on the latest release -->
+<!ENTITY u.rel.notes '&enbase;/releases/&rel.current;R/relnotes.html'>
+<!ENTITY u.rel.announce '&base;/releases/&rel.current;R/announce.html'>
+<!ENTITY u.rel.errata '&enbase;/releases/&rel.current;R/errata.html'>
+<!ENTITY u.rel.hardware '&enbase;/releases/&rel.current;R/hardware.html'>
+<!ENTITY u.rel.installation '&enbase;/releases/&rel.current;R/installation.html'>
+<!ENTITY u.rel.readme '&enbase;/releases/&rel.current;R/readme.html'>
+<!ENTITY u.rel.migration '&enbase;/releases/&rel.current;R/migration-guide.html'>
+
+<!-- URLs to information on the latest release -->
+<!ENTITY u.rel2.notes '&enbase;/releases/&rel2.current;R/relnotes.html'>
+<!ENTITY u.rel2.announce '&base;/releases/&rel2.current;R/announce.html'>
+<!ENTITY u.rel2.errata '&enbase;/releases/&rel2.current;R/errata.html'>
+<!ENTITY u.rel2.hardware '&enbase;/releases/&rel2.current;R/hardware.html'>
+<!ENTITY u.rel2.installation '&enbase;/releases/&rel2.current;R/installation.html'>
+<!ENTITY u.rel2.readme '&enbase;/releases/&rel2.current;R/readme.html'>
+
+<!-- 
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
+-->
diff --git a/it/share/sgml/libcommon.xsl b/it/share/sgml/libcommon.xsl
new file mode 100644
index 0000000000..ca4ba434e0
--- /dev/null
+++ b/it/share/sgml/libcommon.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>
+
+</xsl:stylesheet>
diff --git a/it/share/sgml/navibar.l10n.ent b/it/share/sgml/navibar.l10n.ent
new file mode 100644
index 0000000000..a167628508
--- /dev/null
+++ b/it/share/sgml/navibar.l10n.ent
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!-- $FreeBSD$ -->
+
+<!ENTITY % navinclude.about "IGNORE">
+<![ %navinclude.about; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Sezione di Navigazione</h2>
+<ul>
+<li><a href="&base;/about.html">Info</a></li>
+<li><a href="&enbase;/features.html">Caratteristiche</a></li>
+<li><a href="&enbase;/applications.html">Applicazioni</a></li>
+<li><a href="&enbase;/internet.html">Connettivit&agrave;</a></li>
+<li><a href="&enbase;/advocacy/">Avvocatura</a></li>
+<li><a href="&enbase;/marketing/">Marketing</a></li>
+<li><a href="&enbase;/news/newsflash.html">News</a></li>
+<li><a href="&enbase;/events/events.html">Eventi</a></li>
+<li><a href="&enbase;/news/press.html">Stampa</a></li>
+<li><a href="&enbase;/art.html">Illustrazioni</a></li>
+<li><a href="&enbase;/logo.html">Logo</a></li>
+<li><a href="&enbase;/donations/">Donazioni</a></li>
+<li><a href="&base;/copyright/">Note Legali</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.community "IGNORE">
+<![ %navinclude.community; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Navigazione della Sezione</h2>
+<ul>
+<li><a href="&base;/community.html">Comunit&agrave;</a></li>
+<li><a href="&enbase;/community/mailinglists.html">Mailing List</a></li>
+<li><a href="&enbase;/community/irc.html">IRC</a></li>
+<li><a href="&enbase;/community/newsgroups.html">Newsgroup</a></li>
+<li><a href="&enbase;/usergroups.html">Gruppi Utenti</a></li>
+<li><a href="&enbase;/community/webresources.html">Risorse Web</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.developers "IGNORE">
+<![ %navinclude.developers; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Navigazione della Sezione</h2>
+<ul>
+<li><a href="&enbase;/projects/index.html">Sviluppo</a></li>
+<li><a href="&enbase;/doc/en_US.ISO8859-1/books/developers-handbook">Manuale dello Sviluppatore</a></li>
+<li><a href="&enbase;/doc/en_US.ISO8859-1/books/porters-handbook">Manuale del Porter</a></li>
+<li><a href="&enbase;/developers/cvs.html">Repository CVS</a></li>
+<li><a href="&enbase;/releng/index.html">Release Engineering</a></li>
+<li><a href="&base;/platforms/">Piattaforme</a>
+	<ul>
+		<li><a href="&enbase;/platforms/alpha.html">alpha</a></li>
+		<li><a href="&enbase;/platforms/amd64.html">amd64</a></li>
+		<li><a href="&enbase;/platforms/arm.html">ARM</a></li>
+		<li><a href="&enbase;/platforms/i386.html">i386</a></li>
+		<li><a href="&enbase;/platforms/ia64/index.html">ia64</a></li>
+		<li><a href="&enbase;/platforms/mips.html">MIPS</a></li>
+		<li><a href="&enbase;/platforms/pc98.html">pc98</a></li>
+		<li><a href="&enbase;/platforms/ppc.html">ppc</a></li>
+		<li><a href="&enbase;/platforms/sparc.html">sparc64</a></li>
+		<li><a href="&base;/platforms/xbox.html">xbox</a></li>
+	</ul>
+</li>
+<li><a href="&enbase;/projects/ideas/">Idee</a></li>
+<li><a href="&enbase;/doc/en_US.ISO8859-1/articles/contributing/index.html">Contribuire</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.docs "IGNORE">
+<![ %navinclude.docs; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Sezione di Navigazione</h2>
+<ul>
+<li><a href="&base;/docs.html">Documentazione</a></li>
+<li><a href="&enbase;/doc/en_US.ISO8859-1/books/faq/">FAQ</a></li>
+<li><a href="&enbase;/doc/&url.doc.langcode;/books/handbook/index.html">Manuale</a></li>
+<li><a href="&enbase;/docs/man.html">Pagine man</a>
+	<ul>
+		<li><a href="&cgibase;/man.cgi">Man Online</a></li>
+	</ul>
+</li>
+<li><a href="&base;/docs/books.html">Libri e Articoli Tradotti Online</a></li>
+<li><a href="&enbase;/docs/books.html">Libri e Articoli Online</a></li>
+<li><a href="&enbase;/marketing/">Materiale Pubblicitario</a></li>
+<li><a href="&enbase;/publish.html">Pubblicazioni</a></li>
+<li><a href="&enbase;/docs/webresources.html">Risorse Web</a></li>
+<li><a href="&enbase;/projects/newbies.html">Per i Neofiti</a></li>
+<li><a href="&enbase;/docproj/">Documentation Project</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.download "IGNORE">
+<![ %navinclude.download; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Navigazione della Sezione</h2>
+<ul>
+<li><a href="&base;/where.html">Ottenere FreeBSD</a></li>
+<li><a href="&base;/releases/">Info sulle Release</a>
+	<ul>
+		<li><a href="&u.rel.announce;">Release di Produzione: &rel.current;</a></li>
+		<li><a href="&u.rel2.announce;">Release di Produzione (Legacy): &rel2.current;</a></li>
+		<li><a href="&enbase;/snapshots/">Snapshot delle Release</a></li>
+	      <![ %beta.testing; [ 
+		<li><a href="&u.betarel.schedule;">Prossima Release: &betarel.current;</a></li>
+	      ]]>
+	      <![ %beta2.testing; [ 
+		<li><a href="&u.betarel2.schedule;">Prossima Release: &betarel2.current;</a></li>
+	      ]]>
+	</ul>
+</li>
+<li><a href="&enbase;/ports/">Applicazioni Portate</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.gnome "IGNORE">
+<![ %navinclude.gnome; [
+]]>
+
+<!ENTITY % navinclude.ports "IGNORE">
+<![ %navinclude.ports; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Sezione di Navigazione</h2>
+<ul>
+<li><a href="&base;/ports/index.html">Info sui port</a></li>
+<li><a href="&enbase;/ports/installing.html">Installazione</a></li>
+<li><a href="&enbase;/ports/updating.html">Aggiornamento</a></li>
+<li><a href="&enbase;/ports/searching.html">Ricerca</a></li>
+<li>&nbsp;&nbsp;&nbsp;Categorie
+	<ul>
+		<li><a href="&enbase;/ports/categories-alpha.html">in ordine alfabetico</a></li>
+		<li><a href="&enbase;/ports/categories-grouped.html">in gruppi logici</a></li>
+	</ul>
+</li>
+<li><a href="&enbase;/ports/master-index.html">Elenca Tutti i Port</a></li>
+<li><a href="&enbase;/ports/references.html">Per Maggiori Informazioni</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.support "IGNORE">
+<![ %navinclude.support; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Navigazione della Sezione</h2>
+<ul>
+<li><a href="&base;/support.html">Supporto</a></li>
+<li><a href="&enbase;/commercial/">Fornitori</a>
+	<ul>
+		<li><a href="&enbase;/commercial/software_bycat.html">Software</a></li>
+		<li><a href="&enbase;/commercial/hardware.html">Hardware</a></li>
+		<li><a href="&enbase;/commercial/consult_bycat.html">Consulenza</a></li>
+		<li><a href="&enbase;/commercial/isp.html">Internet Service Providers</a></li>
+		<li><a href="&enbase;/commercial/misc.html">Varie</a></li>
+	</ul>
+</li>
+<li><a href="&enbase;/security/">Sicurezza</a></li>
+<li><a href="&enbase;/support/bugreports.html">Report di Bug</a>
+	<ul>
+		<li><a href="&enbase;/send-pr.html">Invia un report</a></li>
+	</ul>
+</li>
+<li><a href="&enbase;/support/webresources.html">Risorse Web</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
diff --git a/it/support.sgml b/it/support.sgml
index 90b9f44507..2b3e8ca29a 100644
--- a/it/support.sgml
+++ b/it/support.sgml
@@ -1,15 +1,14 @@
 <!--
      The FreeBSD Italian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: www/it/support.sgml,v 1.2 2005/11/17 10:05:07 ale Exp $
      Original revision: 1.354
 -->
 
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD$">
+<!doctype HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/it/support.sgml,v 1.2 2005/11/17 10:05:07 ale Exp $">
 <!ENTITY title "Supporto su FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 ]>
 
 <html>
diff --git a/it/where.sgml b/it/where.sgml
index 0b9d55a6ae..68625fa099 100644
--- a/it/where.sgml
+++ b/it/where.sgml
@@ -1,15 +1,14 @@
 <!--
      The FreeBSD Italian Documentation Project
 
-     $FreeBSD: www/it/where.sgml,v 1.3 2005/11/17 10:05:07 ale Exp $
+     $FreeBSD: www/it/where.sgml,v 1.4 2006/06/06 11:08:49 ale Exp $
      Original revision: 1.84
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/it/where.sgml,v 1.3 2005/11/17 10:05:07 ale Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/it/where.sgml,v 1.4 2006/06/06 11:08:49 ale Exp $">
 <!ENTITY title "Ottenere FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
 ]>
 
diff --git a/ja/about.sgml b/ja/about.sgml
index a489de2956..0f10109a14 100644
--- a/ja/about.sgml
+++ b/ja/about.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD$">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ja/about.sgml,v 1.1 2005/10/04 16:21:45 hrs Exp $">
 <!ENTITY title "About FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/alpha/alpha.sgml b/ja/alpha/alpha.sgml
index e9152681b4..9f00456b44 100644
--- a/ja/alpha/alpha.sgml
+++ b/ja/alpha/alpha.sgml
@@ -1,10 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/alpha/alpha.sgml,v 1.15 2002/02/28 05:18:46 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/alpha/alpha.sgml,v 1.16 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "FreeBSD/Alpha Project">
 <!ENTITY email 'freebsd-alpha'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.9 -->
diff --git a/ja/alpha/index.sgml b/ja/alpha/index.sgml
index 8deb743c0f..652d73c432 100644
--- a/ja/alpha/index.sgml
+++ b/ja/alpha/index.sgml
@@ -1,9 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/alpha/index.sgml,v 1.2 2002/02/28 05:18:46 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/alpha/index.sgml,v 1.3 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "FreeBSD/Alpha Project">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;]>
+<!ENTITY % navinclude.developers "INCLUDE">
+]>
+
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
 
diff --git a/ja/applications.sgml b/ja/applications.sgml
index 5a2669078f..e7b5c6ed56 100644
--- a/ja/applications.sgml
+++ b/ja/applications.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/applications.sgml,v 1.24 2005/10/04 16:21:45 hrs Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ja/applications.sgml,v 1.25 2005/10/04 17:15:06 hrs Exp $">
 <!ENTITY title "About Applications for FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.26 -->
diff --git a/ja/availability.sgml b/ja/availability.sgml
index e6a0466c56..da0e05b347 100644
--- a/ja/availability.sgml
+++ b/ja/availability.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/availability.sgml,v 1.21 2005/10/04 16:21:45 hrs Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ja/availability.sgml,v 1.22 2005/10/04 17:15:06 hrs Exp $">
 <!ENTITY title "About FreeBSD's availability">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.33 -->
diff --git a/ja/commercial/commercial.sgml b/ja/commercial/commercial.sgml
index 3f4f4a3023..63665c4a1d 100644
--- a/ja/commercial/commercial.sgml
+++ b/ja/commercial/commercial.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/commercial/commercial.sgml,v 1.18 2004/12/09 19:48:57 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/commercial/commercial.sgml,v 1.19 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "Commercial Vendors">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.39 -->
diff --git a/ja/community.sgml b/ja/community.sgml
index 6689bfb6a2..66b8b23927 100644
--- a/ja/community.sgml
+++ b/ja/community.sgml
@@ -1,8 +1,7 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD$">
+<!doctype HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ja/community.sgml,v 1.1 2005/10/04 16:21:45 hrs Exp $">
 <!ENTITY title "FreeBSD Community">
-<!ENTITY % navincludes SYSTEM "includes.navcommunity.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.community "INCLUDE">
 ]>
 
 <html>
diff --git a/ja/conspectus/index.sgml b/ja/conspectus/index.sgml
index 5c1dd8e5b6..57919e0ff7 100644
--- a/ja/conspectus/index.sgml
+++ b/ja/conspectus/index.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY title "Mailing List Conspectus">
-<!ENTITY date "$FreeBSD: www/ja/conspectus/index.sgml,v 1.7 2003/02/02 13:44:31 rushani Exp $">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY date "$FreeBSD: www/ja/conspectus/index.sgml,v 1.8 2005/10/04 16:21:46 hrs Exp $">
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/conspectus/index.sgml,v 1.7 2003/02/02 13:44:31 rushani Exp $ -->
+<!-- $FreeBSD: www/ja/conspectus/index.sgml,v 1.8 2005/10/04 16:21:46 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.7 -->
 
diff --git a/ja/copyright/copyright.sgml b/ja/copyright/copyright.sgml
index 3ba8f17353..cd306b0b1e 100644
--- a/ja/copyright/copyright.sgml
+++ b/ja/copyright/copyright.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/copyright/copyright.sgml,v 1.14 2003/11/02 07:41:50 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/copyright/copyright.sgml,v 1.15 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "FreeBSD Copyright and Legal Information">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
diff --git a/ja/copyright/daemon.sgml b/ja/copyright/daemon.sgml
index b2d0353a2c..ccdb00aa1c 100644
--- a/ja/copyright/daemon.sgml
+++ b/ja/copyright/daemon.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/copyright/daemon.sgml,v 1.23 2003/11/03 11:41:04 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/copyright/daemon.sgml,v 1.24 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "The BSD Daemon">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.25 -->
diff --git a/ja/copyright/freebsd-license.sgml b/ja/copyright/freebsd-license.sgml
index 5b81f12681..64ea808020 100644
--- a/ja/copyright/freebsd-license.sgml
+++ b/ja/copyright/freebsd-license.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/copyright/freebsd-license.sgml,v 1.17 2004/01/14 19:49:52 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/copyright/freebsd-license.sgml,v 1.18 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "The FreeBSD Copyright">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.15 -->
diff --git a/ja/copyright/license.sgml b/ja/copyright/license.sgml
index 56838098fb..1c5be350c7 100644
--- a/ja/copyright/license.sgml
+++ b/ja/copyright/license.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/copyright/license.sgml,v 1.16 2003/11/08 18:48:45 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/copyright/license.sgml,v 1.17 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "The 4.4BSD Copyright">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.9 -->
diff --git a/ja/copyright/trademarks.sgml b/ja/copyright/trademarks.sgml
index c354abac94..48ddbb91d2 100644
--- a/ja/copyright/trademarks.sgml
+++ b/ja/copyright/trademarks.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/copyright/trademarks.sgml,v 1.3 2004/01/10 18:37:57 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/copyright/trademarks.sgml,v 1.4 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "��Ͽ��ɸ">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.10 -->
diff --git a/ja/docproj/current.sgml b/ja/docproj/current.sgml
index 897a2f1b07..7ce239dd13 100644
--- a/ja/docproj/current.sgml
+++ b/ja/docproj/current.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/docproj/current.sgml,v 1.28 2003/11/02 07:54:23 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/docproj/current.sgml,v 1.29 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "FreeBSD Documentation Project: Current projects">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.42 -->
diff --git a/ja/docproj/doc-set.sgml b/ja/docproj/doc-set.sgml
index 901daba633..87ada24334 100644
--- a/ja/docproj/doc-set.sgml
+++ b/ja/docproj/doc-set.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/docproj/doc-set.sgml,v 1.15 2003/03/19 19:57:51 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/docproj/doc-set.sgml,v 1.16 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "FreeBSD Documentation Project: Documentation Set">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.12 -->
diff --git a/ja/docproj/docproj.sgml b/ja/docproj/docproj.sgml
index 3587e8cd29..400713e493 100644
--- a/ja/docproj/docproj.sgml
+++ b/ja/docproj/docproj.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/docproj/docproj.sgml,v 1.17 2003/07/07 21:10:41 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/docproj/docproj.sgml,v 1.18 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "FreeBSD Documentation Project">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/docproj/docproj.sgml,v 1.17 2003/07/07 21:10:41 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/docproj/docproj.sgml,v 1.18 2005/10/04 16:21:46 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.16 -->
 
diff --git a/ja/docproj/sgml.sgml b/ja/docproj/sgml.sgml
index 756b2fb000..6bd55206a4 100644
--- a/ja/docproj/sgml.sgml
+++ b/ja/docproj/sgml.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/docproj/sgml.sgml,v 1.26 2004/02/21 11:35:24 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/docproj/sgml.sgml,v 1.27 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "FreeBSD Documentation Project: SGML">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.22 -->
diff --git a/ja/docproj/submitting.sgml b/ja/docproj/submitting.sgml
index 42b33913b6..e991694663 100644
--- a/ja/docproj/submitting.sgml
+++ b/ja/docproj/submitting.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/docproj/submitting.sgml,v 1.16 2003/06/11 21:24:47 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/docproj/submitting.sgml,v 1.17 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "FreeBSD Documentation Project: Submitting documentation">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.13 -->
diff --git a/ja/docproj/translations.sgml b/ja/docproj/translations.sgml
index 42abe30bcf..46ac5ffbc2 100644
--- a/ja/docproj/translations.sgml
+++ b/ja/docproj/translations.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/docproj/translations.sgml,v 1.38 2004/11/07 07:08:50 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/docproj/translations.sgml,v 1.39 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "FreeBSD Documentation Project: Translations">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.59 -->
diff --git a/ja/docproj/who.sgml b/ja/docproj/who.sgml
index 0af856f4af..148e120209 100644
--- a/ja/docproj/who.sgml
+++ b/ja/docproj/who.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/docproj/who.sgml,v 1.13 2002/03/17 05:10:11 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/docproj/who.sgml,v 1.14 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "FreeBSD Documentation Project: Who are we?">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.11 -->
diff --git a/ja/docs.sgml b/ja/docs.sgml
index 6e575c2a52..58798a9580 100644
--- a/ja/docs.sgml
+++ b/ja/docs.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/docs.sgml,v 1.65 2005/10/04 16:21:45 hrs Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ja/docs.sgml,v 1.66 2005/10/04 17:15:06 hrs Exp $">
 <!ENTITY title "Documentation">
-<!ENTITY % navincludes SYSTEM "includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 
 <!ENTITY url.en.articles "&enbase;/doc/en_US.ISO8859-1/articles">
 <!ENTITY url.en.books "&enbase;/doc/en_US.ISO8859-1/books">
diff --git a/ja/features.sgml b/ja/features.sgml
index 0ac44abebb..09cff466a6 100644
--- a/ja/features.sgml
+++ b/ja/features.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/features.sgml,v 1.19 2005/10/04 16:21:45 hrs Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ja/features.sgml,v 1.20 2005/10/04 17:15:06 hrs Exp $">
 <!ENTITY title "About FreeBSD's Technological Advances">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/features.sgml,v 1.19 2005/10/04 16:21:45 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/features.sgml,v 1.20 2005/10/04 17:15:06 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.23 -->
 
diff --git a/ja/includes.navabout.sgml b/ja/includes.navabout.sgml
deleted file mode 100644
index 3844ba6589..0000000000
--- a/ja/includes.navabout.sgml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!ENTITY nav '<div id="sidenav">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/about.html">FreeBSD �Ȥ�</a></li>
-<li><a href="&base;/features.html">��ħ</a></li>
-<li><a href="&base;/applications.html">���ץꥱ�������</a></li>
-<li><a href="&base;/internet.html">���󥿡��ͥå�</a></li>
-<li><a href="&enbase;/advocacy/">�ץ��⡼������ư</a></li>
-<li><a href="&enbase;/marketing/">�ޡ����ƥ��󥰳�ư</a></li>
-<li><a href="&base;/news/newsflash.html">�˥塼��</a></li>
-<li><a href="&enbase;/events/events.html">���٥��</a></li>
-<li><a href="&base;/news/press.html">�˥塼������</a></li>
-<li><a href="&enbase;/art.html">����</a></li>
-<li><a href="&enbase;/donations/">���ա���£</a></li>
-<li><a href="&base;/copyright/">ˡΧ������ջ���</a></li>
-</ul>
-</div> <!-- sidenav -->'>
\ No newline at end of file
diff --git a/ja/includes.navcommunity.sgml b/ja/includes.navcommunity.sgml
deleted file mode 100644
index e3c6bb06a4..0000000000
--- a/ja/includes.navcommunity.sgml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!ENTITY nav '<div id="sidenav">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/community.html">���ߥ�˥ƥ�</a></li>
-<!--li><a href="&base;/community/mailinglists.html">�᡼��󥰥ꥹ��</a></li>
-<li><a href="&base;/community/irc.html">IRC</a></li>
-<li><a href="&base;/community/newsgroups.html">�˥塼�����롼��</a></li>
-<li><a href="&base;/usergroups.html">�桼�����롼��</a></li>
-<li><a href="&base;/community/webresources.html">�����־�ξ���</a></li-->
-</ul>
-</div> <!-- sidenav -->'>
\ No newline at end of file
diff --git a/ja/includes.navdevelopers.sgml b/ja/includes.navdevelopers.sgml
deleted file mode 100644
index 98f7a01750..0000000000
--- a/ja/includes.navdevelopers.sgml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- $FreeBSD: www/ja/includes.navdevelopers.sgml,v 1.1 2005/10/04 16:21:45 hrs Exp $ -->
-
-<!ENTITY nav '<div id="sidenav">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/projects/index.html">��ȯ��</a></li>
-<li><a href="&enbase;/doc/en_US.ISO8859-1/books/developers-handbook">��ȯ�ԥϥ�ɥ֥å�</a></li>
-<li><a href="&enbase;/doc/&url.doc.langcode;/books/porters-handbook">ports ��ȯ�ԥϥ�ɥ֥å�</a></li>
-<li><a href="&base;/support.html#cvs">CVS ��ݥ��ȥ�</a></li>
-<li><a href="&enbase;/releng/index.html">��꡼�����󥸥˥����</a></li>
-<li><a href="&base;/platforms/">�ץ�åȥե�����</a>
-	<ul>
-		<li><a href="&base;/platforms/alpha.html">alpha</a></li>
-		<li><a href="&base;/platforms/amd64.html">amd64</a></li>
-		<li><a href="&base;/smp/">i386</a></li>
-		<li><a href="&base;/platforms/ia64.html">ia64</a></li>
-		<li><a href="&base;/platforms/pc98.html">pc98</a></li>
-		<li><a href="&base;/platforms/sparc.html">sparc64</a></li>
-	</ul>
-</li>
-<li><a href="&base;/doc/&url.doc.langcode;/articles/contributing/index.html">��ȯ�ؤζ���</a></li>
-</ul>
-</div> <!-- sidenav -->'>
\ No newline at end of file
diff --git a/ja/includes.navdocs.sgml b/ja/includes.navdocs.sgml
deleted file mode 100644
index a25fbf1329..0000000000
--- a/ja/includes.navdocs.sgml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- $FreeBSD: www/ja/includes.navdocs.sgml,v 1.1 2005/10/04 16:21:45 hrs Exp $ -->
-
-<!ENTITY nav '<div id="sidenav">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/docs.html">Documentation</a></li>
-<li><a href="&enbase;/doc/&url.doc.langcode;/books/faq/">FAQ</a></li>
-<li><a href="&enbase;/doc/&url.doc.langcode;/books/handbook/">�ϥ�ɥ֥å�</a></li>
-<li><a href="&base;/docs.html#man">�ޥ˥奢��ڡ���</a>
-	<ul>
-		<li><a href="&enbase;/cgi/man.cgi">����������</a></li>
-	</ul>
-</li>
-<li><a href="&base;/docs.html#books">Books �� Articles</a></li>
-<li><a href="&base;/publish.html">����ʪ</a></li>
-<li><a href="&base;/docs.html#links">�����־�ξ���</a></li>
-<li><a href="&base;/projects/newbies.html">���Ƥ��������ξ���</a></li>
-<li><a href="&base;/docproj/">�ɥ�����ơ������ץ���������</a></li>
-</ul>
-</div> <!-- sidenav -->'>
\ No newline at end of file
diff --git a/ja/includes.navdownload.sgml b/ja/includes.navdownload.sgml
deleted file mode 100644
index b988ab1fe1..0000000000
--- a/ja/includes.navdownload.sgml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- $FreeBSD: www/share/sgml/includes.navdownload.sgml,v 1.5 2005/02/12 13:06:38 ceri Exp $ -->
-
-<!ENTITY nav '<div id="sidenav">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/where.html">FreeBSD ��������ˡ</a></li>
-<li><a href="&base;/releases/">��꡼������</a>
-	<ul>
-		<li><a href="&u.rel.announce;">�ץ�����������꡼��: &rel.current;</a></li>
-		<li><a href="&u.rel2.announce;">�ץ�����������꡼�� (����): &rel2.current;</a></li>
-		<li><a href="&enbase;/snapshots/">���ʥåץ���åȥ�꡼��</a></li>
-	</ul>
-</li>
-<li><a href="&base;/ports/">ports �˼�Ͽ����Ƥ��륢�ץꥱ�������</a></li>
-</ul>
-</div> <!-- sidenav -->'>
\ No newline at end of file
diff --git a/ja/includes.navsupport.sgml b/ja/includes.navsupport.sgml
deleted file mode 100644
index 608e4dfd56..0000000000
--- a/ja/includes.navsupport.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- $FreeBSD: www/share/sgml/includes.navsupport.sgml,v 1.5 2005/02/12 13:06:38 ceri Exp $ -->
-
-<!ENTITY nav '<div id="sidenav">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/support.html">���ݡ���</a></li>
-<li><a href="&base;/commercial/">�٥��</a>
-	<ul>
-		<li><a href="&enbase;/commercial/software_bycat.html">���եȥ�����</a></li>
-		<li><a href="&enbase;/commercial/hardware.html">�ϡ��ɥ�����</a></li>
-		<li><a href="&enbase;/commercial/consult_bycat.html">���󥵥�ƥ���</a></li>
-		<li><a href="&enbase;/commercial/isp.html">���󥿡��ͥåȥ����ӥ��ץ��Х���</a></li>
-		<li><a href="&enbase;/commercial/misc.html">����¾</a></li>
-	</ul>
-</li>
-<li><a href="&base;/security/">�������ƥ�����</a></li>
-<li><a href="&base;/support.html#gnats">�����</a>
-	<ul>
-		<li><a href="&base;/send-pr.html">�㳲��� (PR) �����</a></li>
-	</ul>
-</li>
-<li><a href="&base;/support.html#general">�����־�ξ���</a></li>
-</ul>
-</div> <!-- sidenav -->'>
\ No newline at end of file
diff --git a/ja/includes.sgml b/ja/includes.sgml
deleted file mode 100644
index 45996b9114..0000000000
--- a/ja/includes.sgml
+++ /dev/null
@@ -1,178 +0,0 @@
-<!-- $FreeBSD: www/ja/includes.sgml,v 1.59 2005/10/04 17:15:06 hrs Exp $ -->
-<!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.62 -->
-
-<!ENTITY url.doc.langcode    'ja_JP.eucJP'>
-
-<!ENTITY rel.current.date '2005 ǯ 5 ��'>
-<!ENTITY rel2.current.date '2005 ǯ 1 ��'>
-
-<!-- XXX: portions of &u.rel.*;/*.html for 5.4R are not available at this moment... -->
-<!ENTITY u.rel.notes '&enbase;/releases/&rel.current;R/relnotes.html'>
-<!ENTITY u.rel.announce '&enbase;/releases/&rel.current;R/announce.html'>
-<!ENTITY u.rel.errata '&enbase;/releases/&rel.current;R/errata.html'>
-<!ENTITY u.rel.installation '&enbase;/releases/&rel.current;R/installation.html'>
-<!ENTITY u.rel.readme '&enbase;/releases/&rel.current;R/readme.html'>
-<!ENTITY u.rel.early '&enbase;/releases/&rel.current;R/migration-guide.html'> <!-- TEMP -->
-<!ENTITY u.rel.migration '&enbase;/releases/&rel.current;R/migration-guide.html'>
-
-<!ENTITY author '<a href="&base;/index.html">�ۡ���</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">Ϣ����</a> &nbsp; | &nbsp; <a href="&base;/copyright/index.html">��Ū�⻺���ˤĤ���</a> &nbsp; | &nbsp; &copyright;'>
-<!ENTITY stylesheet '&enbase;/layout/css/fixed.css'>
-<!ENTITY stylesheetlarge '&enbase;/layout/css/fixed_large.css'>
-<!ENTITY nav ''>
-
-<!ENTITY header '<head><title>&title;</title>
-<meta http-equiv="Content-Type" content="text/html; charset=EUC-JP">
-<meta name="MSSmartTagsPreventParsing" content="TRUE">
-<link rel="shortcut icon" href="&enbase;/favicon.ico" type="image/x-icon">
-<link rel="icon" href="&enbase;/favicon.ico" type="image/x-icon">
-<link rel="stylesheet" media="screen" href="&stylesheet;" type="text/css" title="Normal Text">
-<link rel="alternate stylesheet" media="screen" href="&stylesheetlarge;" type="text/css" title="Large Text">
-<script type="text/javascript" src="&enbase;/layout/js/styleswitcher.js"></script>
-</head>
-<body>
-   <div id="containerwrap">
-    <div id="container">
-      <span class="txtoffscreen"><a href="#content" title="Skip site navigation" accesskey="1">Skip site navigation</a> (1)</span>
-      <span class="txtoffscreen"><a href="#contentwrap" title="Skip section navigation" accesskey="2">Skip section navigation</a> (2)</span>
-      <div id="headercontainer">
-
-        <div id="header">
-	      <h2 class="blockhide">Header And Logo</h2>
-          <div id="headerlogoleft">
-            <a href="&base;" title="FreeBSD"><img src="&enbase;/layout/images/logo.png" width="360" height="40" alt="FreeBSD"></a>
-          </div> <!-- headerlogoleft -->
-          <div id="headerlogoright">
-			<h2 class="blockhide">Peripheral Links</h2>
-			  <div id="searchnav">
-				<ul id="searchnavlist">
-				  <li>
-					ʸ��������: <a href="#" onkeypress="return false;" onclick="setActiveStyleSheet(&#39;Normal Text&#39;); return false;" title="Normal Text Size">��</a> / <a href="#" onkeypress="return false;" onclick="setActiveStyleSheet(&#39;Large Text&#39;); return false;" title="Large Text Size">��</a>
-				  </li>
-				  <li>
-					<a href="&enbase;/donations/" title="���ա���£">���ա���£</a>
-				  </li>
-				  <li class="last-child">
-					<a href="&base;/mailto.html" title="Contact">Ϣ����</a>
-				  </li>
-				</ul>
-			  </div> <!-- searchnav -->
-			<div id="search">
-			  <form action="&cgibase;/search.cgi" method="get">
-				<div>
-			      <h2 class="blockhide"><label for="words">Search</label></h2>
-				  <input type="hidden" name="max" value="25"> <input type="hidden" name="source" value="www"><input id="words" name="words" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value=&#39;&#39;;" value="Search"> <input id="submit" name="submit" type="submit" value="Search">
-				</div>
-			  </form>
-			</div> <!-- search -->
-          </div> <!-- headerlogoright -->
-
-        </div> <!-- header -->
-
-  	<h2 class="blockhide">Site Navigation</h2>
-        <div id="topnav">
-          <ul id="topnavlist">
-	  <li>
-		<a href="&base;/" title="Home">�ۡ���</a>
-	  </li>
-	  <li>
-		<a href="&base;/about.html" title="About">FreeBSD �Ȥ�</a>
-	  </li>
-	  <li>
-		<a href="&base;/where.html" title="Get FreeBSD">FreeBSD ������</a>
-	  </li>
-	  <li>
-		<a href="&base;/docs.html" title="�ɥ������">�ɥ������</a>
-	  </li>
-	  <li>
-		<a href="&base;/community.html" title="Community">���ߥ�˥ƥ�</a>
-	  </li>
-	  <li>
-		<a href="&base;/projects/index.html" title="��ȯ">��ȯ</a>
-	  </li>
-	  <li>
-		<a href="&base;/support.html" title="���ݡ���">���ݡ���</a>
-	  </li>
-	  </ul>
-        </div> <!-- topnav -->
-      </div> <!-- headercontainer -->
-
-<div id="content">
-<div id="sidewrap">
-&nav;
-</div> <!-- sidewrap -->
-
-<div id="contentwrap">
-
-<h1>&title;</h1>'>
-
-<!ENTITY footer '</div> <!-- contentwrap -->
-<br class="clearboth">
-
-      </div> <!-- content -->
-      <div id="footer">
-        &copyright;<br>
-        &date;
-      </div> <!-- footer -->
-
-    </div> <!-- container -->
-   </div> <!-- containerwrap -->'>
-
-<!ENTITY header2 '<head><title>&title;</title>
-<meta http-equiv="Content-Type" content="text/html; charset=EUC-JP">
-<meta name="MSSmartTagsPreventParsing" content="TRUE">
-<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
-<link rel="icon"          href="/favicon.ico" type="image/x-icon">
-<link rel="stylesheet" type="text/css" href="&stylesheet;"></head><body
-text="#000000" bgcolor="#FFFFFF" alink="#FFCC33"><img
-src="&enbase;/gifs/bar.gif" alt="��˥塼" width="565" height="33" border="0" usemap="#bar">
-&rev.msg;
-<h1 align="left"><font color="#660000">&title;</font></h1><br clear="all">
-
-<map name="bar">
-<area shape="rect" coords="1,1,111,31" href="&base;/index.html" alt="�ȥåץڡ���">
-<area shape="rect" coords="112,11,196,31" href="&base;/ports/index.html" alt="���ץꥱ�������">
-<area shape="rect" coords="196,12,257,33" href="&base;/support.html" alt="���ݡ���">
-<area shape="rect" coords="256,12,365,33" href="&base;/docs.html" alt="�ɥ������">
-<area shape="rect" coords="366,13,424,32" href="&base;/commercial/commercial.html" alt="�٥��">
-<area shape="rect" coords="425,16,475,32" href="&base;/search/search.html" alt="����">
-<area shape="rect" coords="477,16,516,33" href="&base;/search/index-site.html" alt="����">
-<area shape="rect" coords="516,15,562,33" href="&base;/index.html" alt="�ȥåץڡ���">
-<area shape="rect" href="&base;/index.html" coords="0,0,564,32" alt="�ȥåץڡ���">
-</map>'>
-
-<!ENTITY footer2 '<HR NOSHADE>
-<address>&author;<br>&date;<br>
-(���ܸ����˴ؤ��뤪�䤤��碌�� doc-jp@jp.FreeBSD.org �ޤǤ��ꤤ���ޤ�)</address>'>
-
-<!ENTITY webbuild '
-<p>����ʸ��ϡ�FreeBSD Web �ڡ������ư�� CVS
-��ݥ��ȥ꤫�鹽�ۤ��ƹ���������ˡ����⤷�Ƥ��ޤ���</p>'>
-
-<!-- Revision checking -->
-
-<!ENTITY % rev.diff "IGNORE">
-<![ %rev.diff; [
-<!ENTITY cvsweb 'http://www.jp.FreeBSD.org/cgi/cvsweb.cgi/'>
-<!ENTITY rev.msg '
-<p>
-(����: �ǿ��� <a href="&file.orgbase;.html">��ʸ</a> �Ȥ�
-<a href="&cvsweb;&file.cvsweb;.diff?r1=&rev.target;&amp;r2=&rev.latest;">
-����</a> ������ޤ���)
-</p>'>
-]]>
-<!ENTITY rev.msg ''>
-
-<!-- Language-specific entities should be put above this line -->
-
-<!ENTITY % includes.global SYSTEM "../share/sgml/includes.sgml">
-%includes.global;
-
-<!--
-     Local Variables:
-     mode: sgml
-     sgml-indent-data: t
-     sgml-omittag: nil
-     sgml-always-quote-attributes: t
-     End:
--->
diff --git a/ja/includes.xsl b/ja/includes.xsl
deleted file mode 100644
index 35b2c0088d..0000000000
--- a/ja/includes.xsl
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP" ?>
-
-<!-- $FreeBSD: www/ja/includes.xsl,v 1.30 2005/10/08 11:45:23 hrs Exp $ -->
-<!-- Original revision: 1.20 -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:import href="../share/sgml/includes.xsl" />
-
-  <xsl:variable name="url.doc.langcode" select="'ja_JP.eucJP'" />
-
-  <!-- default format for date string -->
-  <xsl:param name="param-l10n-date-format-YMD"
-             select="'%Y ǯ %M %D ��'" />
-  <xsl:param name="param-l10n-date-format-YM"
-             select="'%Y ǯ %M'" />
-  <xsl:param name="param-l10n-date-format-MD"
-             select="'%M %D ��'" />
-
-  <xsl:variable name="section" select="''"/>
-
-  <xsl:variable name="header1">
-    <head><title><xsl:value-of select="$title"/></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <meta name="MSSmartTagsPreventParsing" content="TRUE" />
-    <link rel="shortcut icon" href="{$enbase}/favicon.ico" type="image/x-icon" />
-    <link rel="icon" href="{$enbase}/favicon.ico" type="image/x-icon" />
-    <link rel="stylesheet" media="screen" href="{$enbase}/layout/css/fixed.css" type="text/css" title="Normal Text" />
-    <link rel="alternate stylesheet" media="screen" href="{$enbase}/layout/css/fixed_large.css" type="text/css" title="Large Text" />
-    <script type="text/javascript" src="{$enbase}/layout/js/styleswitcher.js"></script>
-    </head>
-  </xsl:variable>
-
-  <xsl:variable name="header2">
-            <span class="txtoffscreen"><a href="#content" title="Skip site navigation" accesskey="1">Skip site navigation</a> (1)</span>
-            <span class="txtoffscreen"><a href="#contentwrap" title="Skip section navigation" accesskey="2">Skip section navigation</a> (2)</span>
-            <div id="headercontainer">
-
-              <div id="header">
-      	      <h2 class="blockhide">Header And Logo</h2>
-                <div id="headerlogoleft">
-                  <a href="{$base}" title="FreeBSD"><img src="{$enbase}/layout/images/logo.png" width="360" height="40" alt="FreeBSD" /></a>
-                </div> <!-- headerlogoleft -->
-                <div id="headerlogoright">
-      			<h2 class="blockhide">Peripheral Links</h2>
-      			  <div id="searchnav">
-      				<ul id="searchnavlist">
-      				  <li>
-      					ʸ��������: <a href="#" onkeypress="return false;" onclick="setActiveStyleSheet('Normal Text'); return false;" title="Normal Text Size">��</a> / <a href="#" onkeypress="return false;" onclick="setActiveStyleSheet('Large Text'); return false;" title="Large Text Size">��</a>
-      				  </li>
-      				  <li>
-      					<a href="{$enbase}/donations/" title="���ա���£">���ա���£</a>
-      				  </li>
-      				  <li class="last-child">
-      					<a href="{$base}/mailto.html" title="Contact">Ϣ����</a>
-      				  </li>
-      				</ul>
-      			  </div> <!-- searchnav -->
-      			<div id="search">
-      			  <form action="{$cgibase}/search.cgi" method="get">
-      				<div>
-      			      <h2 class="blockhide"><label for="words">Search</label></h2>
-      				  <input type="hidden" name="max" value="25" /> <input type="hidden" name="source" value="www" /><input id="words" name="words" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value='';" value="Search" />&#160;<input id="submit" name="submit" type="submit" value="Search" />
-      				</div>
-      			  </form>
-      			</div> <!-- search -->
-                </div> <!-- headerlogoright -->
-
-              </div> <!-- header -->
-
-        	<h2 class="blockhide">Site Navigation</h2>
-              <div id="topnav">
-                <ul id="topnavlist">
-		  <li>
-			<a href="{$base}/" title="Home">�ۡ���</a>
-		  </li>
-		  <li>
-			<a href="{$base}/about.html" title="About">FreeBSD �Ȥ�</a>
-		  </li>
-		  <li>
-			<a href="{$base}/where.html" title="Get FreeBSD">FreeBSD ������</a>
-		  </li>
-		  <li>
-			<a href="{$base}/docs.html" title="�ɥ������">�ɥ������</a>
-		  </li>
-		  <li>
-			<a href="{$base}/community.html" title="Community">���ߥ�˥ƥ�</a>
-		  </li>
-		  <li>
-			<a href="{$base}/projects/index.html" title="��ȯ">��ȯ</a>
-		  </li>
-		  <li>
-			<a href="{$base}/support.html" title="���ݡ���">���ݡ���</a>
-		  </li>
-		</ul>
-              </div> <!-- topnav -->
-            </div> <!-- headercontainer -->
-  </xsl:variable>
-
-  <xsl:variable name="header3">
-  	<h1><xsl:value-of select="$title"/></h1>
-  </xsl:variable>
-
-  <xsl:variable name="sidenav">
-	<div id="sidewrap">
-
-	<div id="sidenav">
-	<h2 class="blockhide">Section Navigation</h2>
-
-	<xsl:if test="$section = 'about'" >
-		<ul>
-		<li><a href="{$base}/about.html">About</a></li>
-		<li><a href="{$base}/features.html">Features</a></li>
-		<li><a href="{$base}/applications.html">Applications</a></li>
-		<li><a href="{$base}/internet.html">Internetworking</a></li>
-		<li><a href="{$enbase}/advocacy/">Advocacy</a></li>
-		<li><a href="{$enbase}/marketing/">Marketing</a></li>
-		<li><a href="{$base}/news/newsflash.html">News</a></li>
-		<li><a href="{$enbase}/events/events.html">Events</a></li>
-		<li><a href="{$base}/news/press.html">Press</a></li>
-		<li><a href="{$enbase}/art.html">Artwork</a></li>
-		<li><a href="{$enbase}/donations/">Donations</a></li>
-		<li><a href="{$base}/copyright/">Legal Notices</a></li>
-		</ul>
-	</xsl:if>
-
-	<xsl:if test="$section = 'community'" >
-		<ul>
-		<li><a href="{$enbase}/community.html">Community</a></li>
-		<!--li><a href="{$base}/community/mailinglists.html">Mailing Lists</a></li>
-		<li><a href="{$base}/community/irc.html">IRC</a></li>
-		<li><a href="{$base}/community/newsgroups.html">Newsgroups</a></li>
-		<li><a href="{$base}/usergroups.html">User Groups</a></li>
-		<li><a href="{$base}/community/webresources.html">Web Resources</a></li-->
-		</ul>
-	</xsl:if>
-
-	<xsl:if test="$section = 'developers'" >
-		<ul>
-		<li><a href="{$base}/projects/index.html">Developers</a></li>
-		<li><a href="{$base}/doc/en_US.ISO8859-1/books/developers-handbook">Developer&#39;s Handbook</a></li>
-		<li><a href="{$base}/doc/{$url.doc.langcode}/books/porters-handbook">Porter&#39;s Handbook</a></li>
-		<li><a href="{$base}/support.html#cvs">CVS Repository</a></li>
-		<li><a href="{$enbase}/releng/index.html">Release Engineering</a></li>
-		<li><a href="{$base}/platforms/">Platforms</a>
-			<ul>
-				<li><a href="{$base}/platforms/alpha.html">alpha</a></li>
-				<li><a href="{$base}/platforms/amd64.html">amd64</a></li>
-				<li><a href="{$base}/smp/">i386</a></li>
-				<li><a href="{$base}/platforms/ia64.html">ia64</a></li>
-				<li><a href="{$base}/platforms/pc98.html">pc98</a></li>
-				<li><a href="{$base}/platforms/sparc.html">sparc64</a></li>
-			</ul>
-		</li>
-		<li><a href="{$base}/doc/{$url.doc.langcode}/articles/contributing/index.html">Contributing</a></li>
-		</ul>
-	</xsl:if>
-
-	<xsl:if test="$section = 'docs'" >
-		<ul>
-		<li><a href="{$base}/docs.html">Documentation</a></li>
-		<li><a href="{$base}/doc/{$url.doc.langcode}/books/faq/">FAQ</a></li>
-		<li><a href="{$base}/doc/{$url.doc.langcode}/books/handbook/">Handbook</a></li>
-		<li><a href="{$base}/docs.html#man">Manual Pages</a>
-			<ul>
-				<li><a href="{$cgibase}/man.cgi">Man Online</a></li>
-			</ul>
-		</li>
-		<li><a href="{$base}/docs.html#books">Books and Articles Online</a></li>
-		<li><a href="{$base}/publish.html">Publications</a></li>
-		<li><a href="{$base}/docs.html#links">Web Resources</a></li>
-		<li><a href="{$base}/projects/newbies.html">For Newbies</a></li>
-		<li><a href="{$base}/docproj/">Documentation Project</a></li>
-		</ul>
-	</xsl:if>
-
-	<xsl:if test="$section = 'download'" >
-		<ul>
-		<li><a href="{$base}/where.html">Get FreeBSD</a></li>
-		<li><a href="{$base}/releases/">Release Information</a>
-			<ul>
-				<li><a href="{$u.rel.announce}">Production Release: {$rel.current}</a></li>
-				<li><a href="{$u.rel2.announce}">Production (Legacy) Release:  {$rel2.current}</a></li>
-				<li><a href="{$enbase}/snapshots/">Snapshot Releases</a></li>
-			</ul>
-		</li>
-		<li><a href="{$base}/ports/">Ported Applications</a></li>
-		</ul>
-	</xsl:if>
-
-	<xsl:if test="$section = 'support'" >
-		<ul>
-		<li><a href="{$base}/support.html">Support</a></li>
-		<li><a href="{$base}/commercial/">Vendors</a>
-			<ul>
-				<li><a href="{$enbase}/commercial/software_bycat.html">Software</a></li>
-				<li><a href="{$enbase}/commercial/hardware.html">Hardware</a></li>
-				<li><a href="{$enbase}/commercial/consult_bycat.html">Consulting</a></li>
-				<li><a href="{$enbase}/commercial/isp.html">Internet Service Providers</a></li>
-				<li><a href="{$enbase}/commercial/misc.html">Miscellaneous</a></li>
-			</ul>
-		</li>
-		<li><a href="{$base}/security/">Security Information</a></li>
-		<li><a href="{$base}/support.html#gnats">Bug Reports</a>
-			<ul>
-				<li><a href="{$base}/send-pr.html">Submit a Problem Report</a></li>
-			</ul>
-		</li>
-		<li><a href="{$base}/support.html#general">Web Resources</a></li>
-		</ul>
-	</xsl:if>
-
-	</div> <!-- sidenav -->
-
-	</div> <!-- sidewrap -->
-  </xsl:variable>
-
-  <xsl:variable name="footer">
-	<div id="footer">
-	<xsl:copy-of select="$copyright"/><br />
-	<xsl:copy-of select="$date"/>
-	</div> <!-- footer -->
-  </xsl:variable>
-
-  <xsl:variable name="u.rel.notes">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/relnotes.html</xsl:variable>
-
-  <xsl:variable name="u.rel.announce">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/announce.html</xsl:variable>
-
-  <xsl:variable name="u.rel.errata">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/errata.html</xsl:variable>
-
-  <xsl:variable name="u.rel.installation">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/installation.html</xsl:variable>
-
-  <xsl:variable name="u.rel.early">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/early-adopter.html</xsl:variable>
-
-  <xsl:variable name="u.rel.migration">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/migration-guide.html</xsl:variable>
-
-<!--
-  <xsl:variable name="u.rel2.notes">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/relnotes.html</xsl:variable>
--->
-
-<!--
-  <xsl:variable name="u.rel2.announce">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/announce.html</xsl:variable>
--->
-
-  <xsl:variable name="u.rel2.errata">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel2.current"/>R/errata.html</xsl:variable>
-
-  <xsl:variable name="u.rel2.installation">
-    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel2.current"/>R/installation.html</xsl:variable>
-
-</xsl:stylesheet>
diff --git a/ja/index.xsl b/ja/index.xsl
index 03db3e944e..363822a93c 100644
--- a/ja/index.xsl
+++ b/ja/index.xsl
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="EUC-JP" ?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+<!ENTITY title "The FreeBSD Project">
+]>
 
-<!-- $FreeBSD: www/ja/index.xsl,v 1.45 2005/10/08 11:57:22 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/index.xsl,v 1.46 2005/10/26 18:15:57 hrs Exp $ -->
 <!-- Original revision: 1.137 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
-  <xsl:import href="includes.xsl"/>
-  <xsl:import href="news/includes.xsl"/>
-
-  <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="enbase" select="'..'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/ja/index.xsl,v 1.45 2005/10/08 11:57:22 hrs Exp $'"/>
-  <xsl:variable name="title" select="'The FreeBSD Project'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/ja/index.xsl,v 1.46 2005/10/26 18:15:57 hrs Exp $'"/>
 
   <!-- these params should be externally bound. The values
        here are not used actually -->
@@ -32,22 +31,22 @@
   <xsl:template match="/">
     <html>
       <head>
-	<title><xsl:value-of select="$title"/></title>
+	<title>&title;</title>
 	<meta name="description" content="The FreeBSD Project"/>
 	<meta name="keywords" content="FreeBSD, BSD, UNIX, Support, Ports,
 	      Release, Application, Software, Handbook, FAQ, Tutorials, Bugs,
 	      CVS, CVSup, News, Commercial Vendors, homepage, CTM, Unix"/>
-	<link rel="shortcut icon" href="{$enbase}/favicon.ico" type="image/x-icon"/>
-	<link rel="icon" href="{$enbase}/favicon.ico" type="image/x-icon"/>
-	<link rel="stylesheet" media="screen" href="{$enbase}/layout/css/fixed.css" type="text/css" title="Normal Text" />
-	<link rel="alternate stylesheet" media="screen" href="{$enbase}/layout/css/fixed_large.css" type="text/css" title="Large Text" />
-	<script type="text/javascript" src="{$enbase}/layout/js/styleswitcher.js"></script>
+	<link rel="shortcut icon" href="&enbase;/favicon.ico" type="image/x-icon"/>
+	<link rel="icon" href="&enbase;/favicon.ico" type="image/x-icon"/>
+	<link rel="stylesheet" media="screen" href="&enbase;/layout/css/fixed.css" type="text/css" title="Normal Text" />
+	<link rel="alternate stylesheet" media="screen" href="&enbase;/layout/css/fixed_large.css" type="text/css" title="Large Text" />
+	<script type="text/javascript" src="&enbase;/layout/js/styleswitcher.js"></script>
 	<link rel="alternate" type="application/rss+xml"
-	  title="FreeBSD Project News" href="{$enbase}/news/news.rdf" />
+	  title="FreeBSD Project News" href="&enbase;/news/news.rdf" />
 	<link rel="alternate" type="application/rss+xml"
-	  title="FreeBSD Security Advisories" href="{$enbase}/security/advisories.rdf" />
+	  title="FreeBSD Security Advisories" href="&enbase;/security/advisories.rdf" />
 	<link rel="alternate" type="application/rss+xml"
-	  title="FreeBSD GNOME Project News" href="{$enbase}/gnome/news.rdf" />
+	  title="FreeBSD GNOME Project News" href="&enbase;/gnome/news.rdf" />
 
 	<!-- Formatted to be easy to spam harvest, please do not reformat. -->
 	<xsl:comment>
@@ -57,15 +56,19 @@
       </head>
 
       <body>
-	<div id="containerwrap">
-	  <div id="container">
-	    <xsl:copy-of select="$header2"/>
-	    <div id="content">
-	      <div id="frontcontainer">
-		<div id="frontmain">
-		  <div id="frontfeaturecontainer">
-		    <div id="frontfeatureleft">
-		      <div id="frontfeaturecontent">
+
+      <div id="CONTAINERWRAP">
+	<div id="CONTAINER">
+	  &header2;
+	  <div id="CONTENT">
+
+	    <div id="FRONTCONTAINER">
+	      <div id="FRONTMAIN">
+		<div id="FRONTFEATURECONTAINER">
+
+		  <div id="FRONTFEATURELEFT">
+		    <div id="FRONTFEATURECONTENT">
+
 			<h1>�١����� BSD UNIX<!-- &#174; -->(R)</h1>
 
 			<p>FreeBSD �� x86 �ߴ��� (Pentium<!-- &#174; -->(R) �� Athlon<!-- &#8482; -->(TM) �ʤ�),
@@ -74,18 +77,18 @@
 			  �γƥ������ƥ�������б���������ǽ�ʥ��ڥ졼�ƥ��󥰥����ƥ�Ǥ���
 			  FreeBSD �� BSD �ȸƤФ�롢����ե���˥���إС����졼���dz�ȯ���줿
 			  UNIX<!-- &#174; -->(R) ��ͳ�褷�Ƥ��ꡢ
-			  <a href="{$base}/doc/ja_JP.eucJP/articles/contributors/index.html"
+			  <a href="&base;/doc/ja_JP.eucJP/articles/contributors/index.html"
 			    >¿���ο͡������ä��볫ȯ�ԥ�����</a>�ˤ�äƳ�ȯ���ݼ餬�����ʤ��Ƥ��ޤ���
-			  �ޤ���̤�б���<a href="{$base}/platforms/">�ץ�åȥե�����</a
+			  �ޤ���̤�б���<a href="&base;/platforms/">�ץ�åȥե�����</a
 			    >�γ�ȯ��Ȥ�ʹ���Ǥ���</p>
 
-			<div id="txtfrontfeaturelink">
-			  &#187;<a href="{$base}/about.html" title="Learn More">�ܤ����Ϥ�����</a>
-			</div> <!-- txtfrontfeaturelink -->
-		      </div> <!-- frontfeaturecontent -->
-		    </div> <!-- frontfeatureleft -->
+				<div id="TXTFRONTFEATURELINK">
+			  &#187;<a href="&base;/about.html" title="Learn More">�ܤ����Ϥ�����</a>
+				</div> <!-- TXTFRONTFEATURELINK -->
+			</div> <!-- FRONTFEATURECONTENT -->
+		</div> <!-- FRONTFEATURELEFT -->
 
-		    <div id="frontfeaturemiddle">
+		  <div id="FRONTFEATUREMIDDLE">
 		      <div class="frontgetroundbox">
 			<div class="frontgettop">
 			  <div>
@@ -94,7 +97,7 @@
 			  &#160;</div>
 
 			<div class="frontgetcontent">
-			  <a href="{$base}/where.html">FreeBSD �����ꤹ��</a>
+			  <a href="&base;/where.html">FreeBSD �����ꤹ��</a>
 			</div> <!-- frontgetcontent -->
 
 			<div class="frontgetbot">
@@ -104,61 +107,65 @@
 			  &#160;</div>
 		      </div> <!-- frontgetroundbox -->
 
-		      <div id="frontreleases">
-			<div id="frontreleasescontent" class="txtshortcuts">
+			<div id="FRONTRELEASES">
+			  <div id="FRONTRELEASESCONTENT" class="txtshortcuts">
 			  <h2>�ǿ���꡼��</h2>
 
-			  <ul id="frontreleaseslist">
+				  <ul id="FRONTRELEASESLIST">
 			    <li>
-			      <a href="{$u.rel.announce}">�ץ�����������꡼�� <xsl:value-of select="$rel.current"/></a>
+			      <a href="&u.rel.announce;">�ץ�����������꡼�� &rel.current;</a>
 			    </li>
 
 			    <li>
-			      <a href="{$u.rel2.announce}">�ץ�����������꡼�� (����) <xsl:value-of select="$rel2.current"/></a>
+			      <a href="&u.rel2.announce;">�ץ�����������꡼�� (����) &rel2.current;</a>
 			    </li>
-			    <xsl:if test="$beta.testing">
-			      <li>
-				<a href="{$base}/where.html#helptest">
-				  �����꡼��ͽ��
-				  <xsl:value-of select="concat($betarel.current, '-', $betarel.vers)"/></a>
-			      </li>
+			    <xsl:if test="'&beta.testing;' != 'IGNORE'">
+			    <li>
+			      <a href="&base;/where.html#helptest">
+				�����꡼��ͽ��
+				&betarel.current; - &betarel.vers;</a></li>
 			    </xsl:if>
-			  </ul>
-			</div> <!-- frontreleasescontent -->
-		      </div> <!-- frontreleases -->
-		    </div> <!-- frontfeaturemiddle -->
+			    <xsl:if test="'&beta2.testing;' != 'IGNORE'">
+			    <li>
+			      <a href="&base;/where.html#helptest">
+				�����꡼��ͽ��
+				&betarel2.current; - &betarel2.vers;</a></li>
+			    </xsl:if>			  </ul>
+			  </div> <!-- FRONTRELEASESCONTENT -->
+			</div> <!-- FRONTRELEASES -->
+		  </div> <!-- FRONTFEATUREMIDDLE -->
 
-		    <div id="frontfeatureright">
+		<div id="FRONTFEATURERIGHT">
 		      <h2 class="blockhide">¾����ؤΥ��</h2>
 
 		      <div id="languagenav">
 			<ul id="languagenavlist">
 			  <li>
-			    <a href="{$enbase}/de/" title="German">de</a>
+			    <a href="&enbase;/de/" title="German">de</a>
 			  </li>
 			  <li>
-			    <a href="{$enbase}/" title="English">en</a>
+			    <a href="&enbase;/" title="English">en</a>
 			  </li>
 			  <li>
-			    <a href="{$enbase}/es/" title="Spanish">es</a>
+			    <a href="&enbase;/es/" title="Spanish">es</a>
 			  </li>
 			  <li>
-			    <a href="{$enbase}/fr/" title="French">fr</a>
+			    <a href="&enbase;/fr/" title="French">fr</a>
 			  </li>
 			  <li>
-			    <a href="{$enbase}/it/" title="Italian">it</a>
+			    <a href="&enbase;/it/" title="Italian">it</a>
 			  </li>
 			  <li>
-			    <a href="{$enbase}/ja/" title="Japanese">ja</a>
+			    <a href="&enbase;/ja/" title="Japanese">ja</a>
 			  </li>
 			  <li class="last-child">
-			    <a href="{$enbase}/ru/" title="Russian">ru</a>
+			    <a href="&enbase;/ru/" title="Russian">ru</a>
 			  </li>
 			</ul>
 		      </div> <!-- languagenav -->
 
 		      <div id="mirror">
-			<form action="{$cgibase}/mirror.cgi" method="get">
+			<form action="&cgibase;/mirror.cgi" method="get">
 			  <div>
 			    <h2 class="blockhide"><label for="mirrorsel">�ߥ顼������</label></h2>
 			    <select id="mirrorsel" name="goto">
@@ -176,22 +183,22 @@
 			  <h2>���硼�ȥ��å�</h2>
 			  <ul id="frontshortcutslist">
 			    <li>
-			      <a href="{$base}/support.html#mailing-list" title="Mailing Lists">�᡼��󥰥ꥹ��</a>
+			      <a href="&base;/support.html#mailing-list" title="Mailing Lists">�᡼��󥰥ꥹ��</a>
 			    </li>
 			    <li>
-			      <a href="{$base}/send-pr.html" title="Report a Bug">�������</a>
+			      <a href="&base;/send-pr.html" title="Report a Bug">�������</a>
 			    </li>
 			    <li>
-			      <a href="{$enbase}/doc/{$url.doc.langcode}/books/faq/index.html" title="FAQ">FAQ</a>
+			      <a href="&enbase;/doc/&url.doc.langcode;/books/faq/index.html" title="FAQ">FAQ</a>
 			    </li>
 			    <li>
-			      <a href="{$enbase}/doc/{$url.doc.langcode}/books/handbook/index.html" title="Handbook">�ϥ�ɥ֥å�</a>
+			      <a href="&enbase;/doc/&url.doc.langcode;/books/handbook/index.html" title="Handbook">�ϥ�ɥ֥å�</a>
 			    </li>
 			    <li>
 			      <a href="http://www.freebsdfoundation.org/" title="Foundation">FreeBSD ����</a>
 			    </li>
 			    <li>
-			      <a href="{$base}/ports/index.html" title="Ports">Ports</a>
+			      <a href="&base;/ports/index.html" title="Ports">Ports</a>
 			    </li>
 			  </ul>
 			</div> <!-- frontshortcutscontent -->
@@ -200,7 +207,7 @@
 		      <div class="frontnewroundbox">
 			<div class="frontnewtop"><div>&#160;</div>&#160;</div>
 			<div class="frontnewcontent">
-			  <a href="{$base}/projects/newbies.html">FreeBSD �����ƤȤ������ϡ�������ؤɤ���</a>
+			  <a href="&base;/projects/newbies.html">FreeBSD �����ƤȤ������ϡ�������ؤɤ���</a>
 			</div> <!-- frontnewcontent -->
 			<div class="frontnewbot"><div>&#160;</div>&#160;</div>
 		      </div> <!-- frontnewroundbox -->
@@ -223,10 +230,10 @@
 			  <div>
 			    <ul class="newseventslist">
 			      <li class="first-child">
-				<a href="{$base}/news/newsflash.html" title="More News">���٤ƤΥ˥塼��</a>
+				<a href="&base;/news/newsflash.html" title="More News">���٤ƤΥ˥塼��</a>
 			      </li>
 			      <li class="last-child">
-				<a href="{$enbase}/news/news.rdf" title="News RSS Feed"><img class="rssimage" src="{$enbase}/layout/images/ico_rss.png" width="27" height="12" alt="News RSS Feed" /></a>
+				<a href="&enbase;/news/news.rdf" title="News RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="News RSS Feed" /></a>
 			      </li>
 			    </ul>
 			  </div> <!-- unnamed -->
@@ -251,7 +258,7 @@
 			  <div>
 			    <ul class="newseventslist">
 			      <li class="only-child">
-				<a href="{$enbase}/events/" title="More Events">���٤ƤΥ��٥��</a>
+				<a href="&enbase;/events/" title="More Events">���٤ƤΥ��٥��</a>
 			      </li>
 			    </ul>
 			  </div> <!-- unnamed -->
@@ -275,7 +282,7 @@
 			  <div>
 			    <ul class="newseventslist">
 			      <li class="only-child">
-				<a href="{$base}/news/press.html" title="More Media">���٤ƤΥ˥塼������</a>
+				<a href="&base;/news/press.html" title="More Media">���٤ƤΥ˥塼������</a>
 			      </li>
 			    </ul>
 			  </div> <!-- unnamed -->
@@ -299,13 +306,13 @@
 			  <div>
 			    <ul class="newseventslist">
 			      <li class="first-child">
-				<a href="{$base}/security/" title="More Security Advisories">���٤�ɽ��</a>
+				<a href="&base;/security/" title="More Security Advisories">���٤�ɽ��</a>
 			      </li>
 			      <li>
-				<a href="{$base}/send-pr.html" title="Submit a Problem Report">���������</a>
+				<a href="&base;/send-pr.html" title="Submit a Problem Report">���������</a>
 			      </li>
 			      <li class="last-child">
-				<a href="{$enbase}/security/advisories.rdf" title="Security Advisories RSS Feed"><img class="rssimage" src="{$enbase}/layout/images/ico_rss.png" width="27" height="12" alt="News RSS Feed" /></a>
+				<a href="&enbase;/security/advisories.rdf" title="Security Advisories RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="News RSS Feed" /></a>
 			      </li>
 			    </ul>
 			  </div> <!-- unnamed -->
@@ -332,13 +339,19 @@
 	      </div> <!-- frontcontainer -->
 	    </div> <!-- content -->
 
-	    <div id="footer">
-	      <xsl:copy-of select="$copyright"/><br />
-	      <xsl:copy-of select="$date"/>
-	    </div> <!-- footer -->
-	  </div> <!-- container -->
-	</div> <!-- containerwrap -->
-      </body>
+      <div id="FOOTER">
+	&copyright;
+
+	The mark FreeBSD is a registered trademark of The FreeBSD
+	Foundation and is used by The FreeBSD Project with the
+	permission of <a
+	  href="http://www.freebsdfoundation.org/documents/Guidelines.shtml">The
+	FreeBSD Foundation</a>.
+
+	  </div> <!-- FOOTER -->
+	</div> <!-- CONTAINER -->
+      </div> <!-- CONTAINERWRAP -->
+    </body>
     </html>
   </xsl:template>
 </xsl:stylesheet>
diff --git a/ja/internal/about.sgml b/ja/internal/about.sgml
index 203c34a5bc..1979877439 100644
--- a/ja/internal/about.sgml
+++ b/ja/internal/about.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/internal/about.sgml,v 1.33 2003/11/03 11:41:04 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/internal/about.sgml,v 1.34 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "About the FreeBSD WWW Server">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/internal/about.sgml,v 1.33 2003/11/03 11:41:04 rushani Exp $ -->
+<!-- $FreeBSD: www/ja/internal/about.sgml,v 1.34 2005/10/04 16:21:46 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.48 -->
 
diff --git a/ja/internal/developer.sgml b/ja/internal/developer.sgml
index 04c9a018a3..1b30052c30 100644
--- a/ja/internal/developer.sgml
+++ b/ja/internal/developer.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/internal/developer.sgml,v 1.26 2003/07/06 10:35:16 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/internal/developer.sgml,v 1.27 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "Resources for FreeBSD Committers">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.27 -->
diff --git a/ja/internal/internal.sgml b/ja/internal/internal.sgml
index 718ebdc17d..e17acd078a 100644
--- a/ja/internal/internal.sgml
+++ b/ja/internal/internal.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/internal/internal.sgml,v 1.22 2003/12/06 08:13:03 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/internal/internal.sgml,v 1.23 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "FreeBSD Internal">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.26 -->
diff --git a/ja/internal/machines.sgml b/ja/internal/machines.sgml
index 103bc2a290..e61ee22351 100644
--- a/ja/internal/machines.sgml
+++ b/ja/internal/machines.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/internal/machines.sgml,v 1.28 2004/01/10 18:37:58 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/internal/machines.sgml,v 1.29 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "The FreeBSD.org Network">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.48 -->
diff --git a/ja/internal/mirror.sgml b/ja/internal/mirror.sgml
index 874ae79c7e..82358af1f1 100644
--- a/ja/internal/mirror.sgml
+++ b/ja/internal/mirror.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/internal/mirror.sgml,v 1.16 2002/11/03 19:29:23 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/internal/mirror.sgml,v 1.17 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "Mirroring the FreeBSD Web Pages">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.16 -->
diff --git a/ja/internal/statistic.sgml b/ja/internal/statistic.sgml
index f2f6dff32a..e850931da2 100644
--- a/ja/internal/statistic.sgml
+++ b/ja/internal/statistic.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/internal/statistic.sgml,v 1.17 2002/11/03 19:29:24 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/internal/statistic.sgml,v 1.18 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "FreeBSD Statistics">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documantation Project -->
 <!-- Original revision: 1.17 -->
diff --git a/ja/internet.sgml b/ja/internet.sgml
index a29288e09e..3a083d0ba9 100644
--- a/ja/internet.sgml
+++ b/ja/internet.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/internet.sgml,v 1.22 2004/12/09 19:48:57 rushani Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ja/internet.sgml,v 1.23 2005/10/04 16:21:45 hrs Exp $">
 <!ENTITY title "About FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.33 -->
diff --git a/ja/jabout.sgml b/ja/jabout.sgml
index 94ef81622a..4397d7d529 100644
--- a/ja/jabout.sgml
+++ b/ja/jabout.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/jabout.sgml,v 1.9 2002/05/13 20:09:03 hrs Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ja/jabout.sgml,v 1.10 2005/10/04 16:21:45 hrs Exp $">
 <!ENTITY title "About Japanese Translation">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % jmember  SYSTEM "jmember.sgml"> %jmember;
 ]>
-<!-- $FreeBSD: www/ja/jabout.sgml,v 1.9 2002/05/13 20:09:03 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/jabout.sgml,v 1.10 2005/10/04 16:21:45 hrs Exp $ -->
 <!-- The FreeBSS Japanese Documentation Project -->
 
 <html>
diff --git a/ja/java/advocacy.sgml b/ja/java/advocacy.sgml
index 5ee2d8113d..15bafe07fc 100644
--- a/ja/java/advocacy.sgml
+++ b/ja/java/advocacy.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/java/advocacy.sgml,v 1.5 2005/06/16 14:51:11 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/advocacy.sgml,v 1.6 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: Advocacy">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/advocacy.sgml,v 1.5 2005/06/16 14:51:11 rushani Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/advocacy.sgml,v 1.6 2005/10/04 16:21:46 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 ]>
diff --git a/ja/java/dists/10.sgml b/ja/java/dists/10.sgml
index aa865892f5..cc72de7475 100644
--- a/ja/java/dists/10.sgml
+++ b/ja/java/dists/10.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/dists/10.sgml,v 1.4 2003/07/05 06:03:15 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/dists/10.sgml,v 1.5 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD Java Project: JDK 1.0 - ���ݡ����оݳ�">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/dists/10.sgml,v 1.4 2003/07/05 06:03:15 hrs Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/dists/10.sgml,v 1.5 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.5 -->
 ]>
diff --git a/ja/java/dists/11.sgml b/ja/java/dists/11.sgml
index a3a8a107bc..7085ee2318 100644
--- a/ja/java/dists/11.sgml
+++ b/ja/java/dists/11.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/dists/11.sgml,v 1.7 2003/07/05 06:03:15 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/dists/11.sgml,v 1.8 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: &jdk; 1.1">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/dists/11.sgml,v 1.7 2003/07/05 06:03:15 hrs Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/dists/11.sgml,v 1.8 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 ]>
diff --git a/ja/java/dists/12.sgml b/ja/java/dists/12.sgml
index 895cb063f2..e65719c6e7 100644
--- a/ja/java/dists/12.sgml
+++ b/ja/java/dists/12.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/dists/12.sgml,v 1.11 2003/07/05 06:03:15 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/dists/12.sgml,v 1.12 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: &jdk; 2 (aka JDK 1.2)">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/dists/12.sgml,v 1.11 2003/07/05 06:03:15 hrs Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/dists/12.sgml,v 1.12 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.17 -->
 ]>
diff --git a/ja/java/dists/13.sgml b/ja/java/dists/13.sgml
index 1b34f281e3..67f21c1bea 100644
--- a/ja/java/dists/13.sgml
+++ b/ja/java/dists/13.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/dists/13.sgml,v 1.13 2004/01/10 18:37:58 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/dists/13.sgml,v 1.14 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: &jdk; 1.3">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/dists/13.sgml,v 1.13 2004/01/10 18:37:58 rushani Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/dists/13.sgml,v 1.14 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.14 -->
 ]>
diff --git a/ja/java/dists/14.sgml b/ja/java/dists/14.sgml
index 3f180273a3..c7950100f2 100644
--- a/ja/java/dists/14.sgml
+++ b/ja/java/dists/14.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/dists/14.sgml,v 1.6 2005/06/16 14:51:35 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/dists/14.sgml,v 1.7 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: &jdk; 1.4">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/dists/14.sgml,v 1.6 2005/06/16 14:51:35 rushani Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/dists/14.sgml,v 1.7 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.10 -->
 ]>
diff --git a/ja/java/dists/15.sgml b/ja/java/dists/15.sgml
index 6f86460f17..e9f1e786d8 100644
--- a/ja/java/dists/15.sgml
+++ b/ja/java/dists/15.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/dists/15.sgml,v 1.1 2005/06/16 14:51:35 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/dists/15.sgml,v 1.2 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: &jdk; 1.5">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original Revision: 1.1 -->
 ]>
diff --git a/ja/java/dists/index.sgml b/ja/java/dists/index.sgml
index d5eba92503..b38bfdf07d 100644
--- a/ja/java/dists/index.sgml
+++ b/ja/java/dists/index.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/dists/index.sgml,v 1.10 2005/06/16 14:51:35 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/dists/index.sgml,v 1.11 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: Distributions">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/dists/index.sgml,v 1.10 2005/06/16 14:51:35 rushani Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/dists/index.sgml,v 1.11 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 ]>
diff --git a/ja/java/index.sgml b/ja/java/index.sgml
index c29fb8aaf2..6e705d6c4d 100644
--- a/ja/java/index.sgml
+++ b/ja/java/index.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/java/index.sgml,v 1.19 2005/06/22 18:17:52 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/index.sgml,v 1.20 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/index.sgml,v 1.19 2005/06/22 18:17:52 rushani Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/index.sgml,v 1.20 2005/10/04 16:21:46 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.22 -->
 ]>
diff --git a/ja/java/install.sgml b/ja/java/install.sgml
index 34fad1bf04..e341558acc 100644
--- a/ja/java/install.sgml
+++ b/ja/java/install.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/java/install.sgml,v 1.8 2004/09/01 15:40:03 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/install.sgml,v 1.9 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: How To Install">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/install.sgml,v 1.8 2004/09/01 15:40:03 hrs Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/install.sgml,v 1.9 2005/10/04 16:21:46 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.12 -->
 ]>
diff --git a/ja/java/links/api.sgml b/ja/java/links/api.sgml
index 92c2c9032e..a42f4c2da2 100644
--- a/ja/java/links/api.sgml
+++ b/ja/java/links/api.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/api.sgml,v 1.3 2003/07/05 06:03:16 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/links/api.sgml,v 1.4 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: API">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/api.sgml,v 1.3 2003/07/05 06:03:16 hrs Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/links/api.sgml,v 1.4 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.6 -->
 ]>
diff --git a/ja/java/links/development.sgml b/ja/java/links/development.sgml
index d13bb3f606..23db7a57e3 100644
--- a/ja/java/links/development.sgml
+++ b/ja/java/links/development.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/development.sgml,v 1.7 2003/11/03 11:41:05 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/links/development.sgml,v 1.8 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: Development Tools">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/development.sgml,v 1.7 2003/11/03 11:41:05 rushani Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/links/development.sgml,v 1.8 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.10 -->
 ]>
diff --git a/ja/java/links/documentation.sgml b/ja/java/links/documentation.sgml
index 9c4e61de70..a51bd5a847 100644
--- a/ja/java/links/documentation.sgml
+++ b/ja/java/links/documentation.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/documentation.sgml,v 1.3 2003/07/05 06:03:16 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/links/documentation.sgml,v 1.4 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: Documentation">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/documentation.sgml,v 1.3 2003/07/05 06:03:16 hrs Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/links/documentation.sgml,v 1.4 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.5 -->
 ]>
diff --git a/ja/java/links/freebsd.sgml b/ja/java/links/freebsd.sgml
index c0d5fc13a4..f9442cc5d5 100644
--- a/ja/java/links/freebsd.sgml
+++ b/ja/java/links/freebsd.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/freebsd.sgml,v 1.5 2003/11/03 11:41:05 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/links/freebsd.sgml,v 1.6 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: FreeBSD Related Java Stuff">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/freebsd.sgml,v 1.5 2003/11/03 11:41:05 rushani Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/links/freebsd.sgml,v 1.6 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 ]>
diff --git a/ja/java/links/index.sgml b/ja/java/links/index.sgml
index 4599db9001..2ed4e002f8 100644
--- a/ja/java/links/index.sgml
+++ b/ja/java/links/index.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/index.sgml,v 1.3 2003/07/05 06:03:16 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/links/index.sgml,v 1.4 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: Java Links">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/index.sgml,v 1.3 2003/07/05 06:03:16 hrs Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/links/index.sgml,v 1.4 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.6 -->
 ]>
diff --git a/ja/java/links/resources.sgml b/ja/java/links/resources.sgml
index debe3c2afa..046f645fbb 100644
--- a/ja/java/links/resources.sgml
+++ b/ja/java/links/resources.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/resources.sgml,v 1.5 2003/09/23 03:56:42 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/links/resources.sgml,v 1.6 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: Other Resources">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/resources.sgml,v 1.5 2003/09/23 03:56:42 hrs Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/links/resources.sgml,v 1.6 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 ]>
diff --git a/ja/java/links/servlets.sgml b/ja/java/links/servlets.sgml
index d6555fc2d2..fbae07783c 100644
--- a/ja/java/links/servlets.sgml
+++ b/ja/java/links/servlets.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/servlets.sgml,v 1.4 2003/07/05 06:03:16 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/links/servlets.sgml,v 1.5 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: Servlets">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/servlets.sgml,v 1.4 2003/07/05 06:03:16 hrs Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/links/servlets.sgml,v 1.5 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.6 -->
 ]>
diff --git a/ja/java/links/tools.sgml b/ja/java/links/tools.sgml
index aa04a65e31..e1f38151a0 100644
--- a/ja/java/links/tools.sgml
+++ b/ja/java/links/tools.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/tools.sgml,v 1.3 2003/07/05 06:03:16 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/links/tools.sgml,v 1.4 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: Tools">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/tools.sgml,v 1.3 2003/07/05 06:03:16 hrs Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/links/tools.sgml,v 1.4 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.5 -->
 ]>
diff --git a/ja/java/links/tutorials.sgml b/ja/java/links/tutorials.sgml
index 40f9ebe3db..1dd11812be 100644
--- a/ja/java/links/tutorials.sgml
+++ b/ja/java/links/tutorials.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/tutorials.sgml,v 1.4 2003/09/23 03:56:42 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/links/tutorials.sgml,v 1.5 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: Tutorials">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/tutorials.sgml,v 1.4 2003/09/23 03:56:42 hrs Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/links/tutorials.sgml,v 1.5 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.6 -->
 ]>
diff --git a/ja/java/links/vendor.sgml b/ja/java/links/vendor.sgml
index 3cb2b03100..6bf5d65eb7 100644
--- a/ja/java/links/vendor.sgml
+++ b/ja/java/links/vendor.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/vendor.sgml,v 1.3 2003/07/05 06:03:16 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/links/vendor.sgml,v 1.4 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: Vendor Links"> 
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/vendor.sgml,v 1.3 2003/07/05 06:03:16 hrs Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/links/vendor.sgml,v 1.4 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.5 -->
 ]>
diff --git a/ja/java/newsflash.sgml b/ja/java/newsflash.sgml
index d52644c936..3b257d6119 100644
--- a/ja/java/newsflash.sgml
+++ b/ja/java/newsflash.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/java/newsflash.sgml,v 1.19 2005/06/16 14:51:11 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/newsflash.sgml,v 1.20 2005/10/04 16:21:46 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: Newsflash">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/newsflash.sgml,v 1.19 2005/06/16 14:51:11 rushani Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+<!-- $FreeBSD: www/ja/java/newsflash.sgml,v 1.20 2005/10/04 16:21:46 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.42 -->
 ]>
diff --git a/ja/java/press.sgml b/ja/java/press.sgml
index c9f990825b..5f532fb3de 100644
--- a/ja/java/press.sgml
+++ b/ja/java/press.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/java/press.sgml,v 1.3 2003/07/05 06:03:15 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/press.sgml,v 1.4 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: In The Press...">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/java/press.sgml,v 1.3 2003/07/05 06:03:15 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/java/press.sgml,v 1.4 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.5 -->
 
diff --git a/ja/mailto.sgml b/ja/mailto.sgml
index 44c868fb3b..5f22a7962d 100644
--- a/ja/mailto.sgml
+++ b/ja/mailto.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/mailto.sgml,v 1.23 2003/10/11 15:47:45 hrs Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ja/mailto.sgml,v 1.24 2005/10/04 16:21:45 hrs Exp $">
 <!ENTITY title "Contacting FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.28 -->
diff --git a/ja/news/1996/index.sgml b/ja/news/1996/index.sgml
index 2b7e55008a..5c8258da2c 100644
--- a/ja/news/1996/index.sgml
+++ b/ja/news/1996/index.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/news/1996/index.sgml,v 1.8 2002/03/17 05:10:12 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/news/1996/index.sgml,v 1.9 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD News Flash! (1996)">
-<!ENTITY % navincludes SYSTEM "../../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "../includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY newshome '<a href="../news.html">News Home</a>'>
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
diff --git a/ja/news/1997/index.sgml b/ja/news/1997/index.sgml
index e80a2700fb..995be2b82b 100644
--- a/ja/news/1997/index.sgml
+++ b/ja/news/1997/index.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/news/1997/index.sgml,v 1.8 2003/07/08 18:19:54 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/news/1997/index.sgml,v 1.9 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD News Flash! (1997)">
-<!ENTITY % navincludes SYSTEM "../../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "../includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY newshome '<a href="../news.html">News Home</a>'>
 <!ENTITY ftp "ftp://ftp.FreeBSD.org/pub/FreeBSD">
 ]>
diff --git a/ja/news/Makefile b/ja/news/Makefile
index 41e1bb7700..8cb9a7e0d4 100644
--- a/ja/news/Makefile
+++ b/ja/news/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/ja/news/Makefile,v 1.35 2003/09/21 17:18:14 hrs Exp $
+# $FreeBSD: www/ja/news/Makefile,v 1.36 2004/12/30 17:53:44 hrs Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.38
 
@@ -26,6 +26,11 @@ DOCS+= press-rel-5.sgml
 
 INDEXLINK= news.html
 
+DEPENDSET.DEFAULT=	transtable news press
+
+XMLDOCS=	newsflash:${XSL_NEWS_NEWSFLASH}:${XML_NEWS_NEWS_MASTER}:
+XMLDOCS+=	press:${XSL_NEWS_PRESS}:${XML_NEWS_PRESS_MASTER}:
+
 #SUBDIR= 	1993
 SUBDIR+= 	1996
 SUBDIR+= 	1997
@@ -36,38 +41,8 @@ SUBDIR+= 	1997
 #SUBDIR+= 	2002
 #SUBDIR+=	status
 
-DATA=		newsflash.html press.html
-CLEANFILES+=	newsflash.html press.html
+### Revision checking
+REVCHECK=	YES
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
 
-newsflash.html: newsflash.xsl news.xml\
-			includes.xsl ${XML_INCLUDES}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param "news.project.xml-master" "'${XML_NEWS_NEWS_MASTER}'" \
-		--param "news.project.xml" "'${XML_NEWS_NEWS}'" \
-		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
-news.rdf: news-rdf.xsl news.xml\
-		includes.xsl ${XML_INCLUDES}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/news-rdf.xsl ${.CURDIR}/news.xml
-
-press.html: press.xsl press.xml\
-		includes.xsl ${XML_INCLUDES}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param "news.press.xml-master" "'${XML_NEWS_PRESS_MASTER}'" \
-		--param "news.press.xml" "'${XML_NEWS_PRESS}'" \
-		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/press.xsl ${.CURDIR}/press.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
-### Revision checking
-REVCHECK=	YES
diff --git a/ja/news/includes.sgml b/ja/news/includes.sgml
deleted file mode 100644
index 7dd5c424ec..0000000000
--- a/ja/news/includes.sgml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- $FreeBSD: www/ja/news/includes.sgml,v 1.8 2001/08/01 14:01:52 kuriyama Exp $ -->
-<!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.8 -->
-
-<!ENTITY newshome '<A HREF="news.html">News �ۡ���</A>'>
diff --git a/ja/news/includes.xsl b/ja/news/includes.xsl
deleted file mode 100644
index 46d1ec6e14..0000000000
--- a/ja/news/includes.xsl
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP" ?>
-
-<!-- $FreeBSD: www/ja/news/includes.xsl,v 1.4 2001/09/18 12:49:14 kuriyama Exp $ -->
-<!-- Original revision: 1.5 -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:variable name="newshome">
-    <a href="{$base}/news/news.html">News �ۡ���</a>
-  </xsl:variable>
-
-  <!-- Generate a unique anchor for this event -->
-  <xsl:template name="generate-event-anchor">
-    <xsl:text>event</xsl:text>
-    <xsl:value-of select="ancestor::year/name"/>
-    <xsl:value-of select="ancestor::month/name"/>
-    <xsl:value-of select="ancestor::day/name"/>:<xsl:value-of select="count(preceding-sibling::event)"/>
-  </xsl:template>
-  
-  <!-- Generate a unique anchor for this story -->
-  <xsl:template name="generate-story-anchor">
-    <xsl:text>story</xsl:text>
-    <xsl:value-of select="ancestor::year/name"/>:<xsl:value-of select="ancestor::month/name"/>:<xsl:text/>
-    <xsl:value-of select="count(following-sibling::story)"/>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/ja/news/news.sgml b/ja/news/news.sgml
index 34da16c32a..2f9bb9b316 100644
--- a/ja/news/news.sgml
+++ b/ja/news/news.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/news/news.sgml,v 1.34 2003/11/03 11:41:05 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/news/news.sgml,v 1.35 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD News">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.41 -->
diff --git a/ja/news/newsflash.sgml b/ja/news/newsflash.sgml
index 7cfb8ee1ff..21d13bba74 100644
--- a/ja/news/newsflash.sgml
+++ b/ja/news/newsflash.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/news/newsflash.sgml,v 1.62 2002/03/04 12:12:40 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/news/newsflash.sgml,v 1.63 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD News Flash!">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
diff --git a/ja/news/newsflash.xsl b/ja/news/newsflash.xsl
deleted file mode 100644
index 2398c7757d..0000000000
--- a/ja/news/newsflash.xsl
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP" ?>
-
-<!-- $FreeBSD: www/ja/news/newsflash.xsl,v 1.11 2004/12/31 07:24:05 hrs Exp $ -->
-<!-- Original revision: 1.9 -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
-
-  <xsl:import href="../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
-  <xsl:variable name="section" select="'about'"/>
-
-  <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="enbase" select="'../..'"/>
-  <xsl:variable name="title" select="'FreeBSD News Flash'"/>
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
-  <xsl:param name="news.project.xml-master" select="'none'" />
-  <xsl:param name="news.project.xml" select="'none'" />
-  
-  <xsl:output type="html" encoding="EUC-JP"/>
-
-  <xsl:template match="news">
-    <html>
-      
-      <xsl:copy-of select="$header1"/>
-      
-            <body xsl:use-attribute-sets="att.body">
-      
-        <div id="containerwrap">
-          <div id="container">
-      
-      	<xsl:copy-of select="$header2"/>
-      
-      	<div id="content">
-      
-      	      <xsl:copy-of select="$sidenav"/>
-      
-      	      <div id="contentwrap">
-      	      
-	      <xsl:copy-of select="$header3"/>
-
-	<!-- Notice how entity references in SGML become variable references
-	     in the stylesheet, and that the syntax for referring to variables
-	     inside an attribute is "{$variable}".
-
-	     This is just dis-similar enough to Perl and the shell that you
-	     end up writing ${variable} all the time, and then scratch your 
-	     head wondering why the stylesheet isn't working.-->
-
-	<!-- Also notice that because this is now XML and not SGML, empty
-             elements, like IMG, must have a trailing "/" just inside the 
-   	     closing angle bracket, like this " ... />" -->
-	<img src="{$base}/../gifs/news.jpg" align="right" border="0" width="193"
-	     height="144" alt="FreeBSD News"/>
-
-	<p>FreeBSD �ϵ�®��ȯŸ��³���륪�ڥ졼�ƥ��󥰥����ƥ�ʤΤǡ�
-	  �ǿ��ο���ˤĤ��ƹԤ��Τ����ݤˤʤ��������ޤ���͡�
-	  �����̤ˤʤ뤿��ˡ����Υڡ��������Ū�˥����å�����褦�ˤ��ޤ��礦��
-	  <a href="{$base}/doc/en_US.ISO8859-1/books/handbook/eresources.html#ERESOURCES-MAIL">
-	    freebsd-announce �᡼��󥰥ꥹ��</a>����ɤ���Ȥ褤�����Τ�ޤ���</p>
-
-        <p>���줾��Υץ��������Ȥκǿ�����ϡ����γƥ����֥ڡ�����������������</p>
-
-        <ul>
-          <li><a href="{$base}/ja/java/newsflash.html"><xsl:value-of select="$java"/> on FreeBSD</a></li>
-          <li><a href="http://freebsd.kde.org/">KDE on FreeBSD</a></li>
-          <li><a href="{$base}/ja/gnome/newsflash.html">GNOME on FreeBSD</a></li>
-        </ul>
-
-	<p>�����ߡ������ƾ���Υ�꡼���ξܺ٤ˤĤ��Ƥϡ�
-	  <strong><a href="{$base}/releases/index.html">��꡼������</a>
-	  </strong>
-	  �Υڡ�����������������</p>
-	
-	<p>FreeBSD �������ƥ�����ˤĤ��Ƥϡ�<a href="{$base}/security/#adv">
-	  �������ƥ�����</a> �Υڡ�����������������</p>
-	
-	<xsl:call-template name="html-news-list-newsflash">
-          <xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
-          <xsl:with-param name="news.project.xml" select="$news.project.xml" />
-	</xsl:call-template>
-
-        <xsl:call-template name="html-news-make-olditems-list" />
-
-	<xsl:copy-of select="$newshome"/>
-
-	  	</div> <!-- contentwrap -->
-		<br class="clearboth" />
-	
-	</div> <!-- content -->
-	
-	<xsl:copy-of select="$footer"/>
-	
-        </div> <!-- container -->
-   </div> <!-- containerwrap -->
-
-      </body>
-    </html>
-  </xsl:template>
-
-  <xsl:template name="html-news-make-olditems-list">
-    <p>���Υ˥塼��:
-      <a href="2002/index.html">2002</a>,
-      <a href="2001/index.html">2001</a>,
-      <a href="2000/index.html">2000</a>,
-      <a href="1999/index.html">1999</a>,
-      <a href="1998/index.html">1998</a>,
-      <a href="1997/index.html">1997</a>,
-      <a href="1996/index.html">1996</a></p>
-  </xsl:template>
-
-  <!-- When the href attribute contains a '$base', expand it to the current
-       value of the $base variable. -->
-
-  <!-- All your $base are belong to us.  Ho ho ho -->
-  <xsl:template match="a">
-    <a><xsl:attribute name="href">
-	<xsl:choose>
-	  <xsl:when test="contains(@href, '$base')">
-	    <xsl:value-of select="concat(substring-before(@href, '$base'), $base, substring-after(@href, '$base'))"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:value-of select="@href"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </a>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/ja/news/press-rel-1.sgml b/ja/news/press-rel-1.sgml
index 629abdb60f..bec3a4dbdb 100644
--- a/ja/news/press-rel-1.sgml
+++ b/ja/news/press-rel-1.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/news/press-rel-1.sgml,v 1.15 2002/03/17 05:10:12 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/news/press-rel-1.sgml,v 1.16 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD Press Release: April 22, 1999">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.7 -->
diff --git a/ja/news/press-rel-2.sgml b/ja/news/press-rel-2.sgml
index bcf5ebd80b..7bf2f93183 100644
--- a/ja/news/press-rel-2.sgml
+++ b/ja/news/press-rel-2.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/news/press-rel-2.sgml,v 1.14 2003/07/08 18:19:54 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/news/press-rel-2.sgml,v 1.15 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD Press Release: April 29, 1999">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.10 -->
diff --git a/ja/news/press-rel-3.sgml b/ja/news/press-rel-3.sgml
index f96b05674b..f2bca73c3c 100644
--- a/ja/news/press-rel-3.sgml
+++ b/ja/news/press-rel-3.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/news/press-rel-3.sgml,v 1.13 2002/03/17 05:10:12 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/news/press-rel-3.sgml,v 1.14 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD Press Release: June 7, 1999">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.6 -->
diff --git a/ja/news/press-rel-4.sgml b/ja/news/press-rel-4.sgml
index c270cdcd1b..97d89fd618 100644
--- a/ja/news/press-rel-4.sgml
+++ b/ja/news/press-rel-4.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/news/press-rel-4.sgml,v 1.8 2002/03/17 05:10:12 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/news/press-rel-4.sgml,v 1.9 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD Press Release: March 9, 2000">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.4 -->
diff --git a/ja/news/press-rel-5.sgml b/ja/news/press-rel-5.sgml
index 8f67f32389..dd2e6119f6 100644
--- a/ja/news/press-rel-5.sgml
+++ b/ja/news/press-rel-5.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/news/press-rel-5.sgml,v 1.6 2002/05/16 12:03:07 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/news/press-rel-5.sgml,v 1.7 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD Press Release: 2000 ǯ 10 �� 18 ��">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.6 -->
diff --git a/ja/news/press.sgml b/ja/news/press.sgml
index 83bfb2e9c1..8bf046e010 100644
--- a/ja/news/press.sgml
+++ b/ja/news/press.sgml
@@ -1,12 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/news/press.sgml,v 1.19 2002/03/04 12:12:40 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/news/press.sgml,v 1.20 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD in the Press">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
-<!-- $FreeBSD: www/ja/news/press.sgml,v 1.19 2002/03/04 12:12:40 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/news/press.sgml,v 1.20 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.173 -->
 
diff --git a/ja/news/press.xsl b/ja/news/press.xsl
deleted file mode 100644
index be32476f77..0000000000
--- a/ja/news/press.xsl
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP" ?>
-
-<!--
-    $FreeBSD: www/ja/news/press.xsl,v 1.5 2004/12/30 17:53:44 hrs Exp $
-    Original revision: 1.5
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:import href="../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
-  <xsl:variable name="section" select="'about'"/>
-
-  <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="title" select="'FreeBSD In The Press'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/ja/news/press.xsl,v 1.5 2004/12/30 17:53:44 hrs Exp $'"/>
-
-  <xsl:param name="news.press.xml-master" select="'none'" />
-  <xsl:param name="news.press.xml" select="'none'" />
-  
-  <xsl:output type="html" encoding="EUC-JP"/>
-
-  <!-- for l10n -->
-  <xsl:template name="html-news-month-headings">
-    <xsl:param name="year" />
-    <xsl:param name="month" />
-
-    <xsl:value-of select="concat($year, ' ǯ ', $month)" />
-  </xsl:template>
-
-  <xsl:template match="press">
-    <html>
-      
-      <xsl:copy-of select="$header1"/>
-      
-            <body xsl:use-attribute-sets="att.body">
-      
-        <div id="containerwrap">
-          <div id="container">
-      
-      	<xsl:copy-of select="$header2"/>
-      
-      	<div id="content">
-      
-      	      <xsl:copy-of select="$sidenav"/>
-      
-      	      <div id="contentwrap">
-      	      
-	      <xsl:copy-of select="$header3"/>
-
-	<p>�����˺ܤäƤ��ʤ� FreeBSD �˴�Ϣ�����˥塼��������¸���ʤ顢
-	  �桹�������˺ܤ�����褦�˾ܺ٤�
-	  <a href="mailto:www@freebsd.org">www@FreeBSD.org</a> �ޤ�
-	  (�Ѹ��) ���äƤ���������</p>
-
-	<p>�ޤ���FreeBSD Java �ץ��������Ȥ���ƻ�����˴ؤ������ϡ�
-	  <a href="{$base}/java/press.html">FreeBSD/Java Press</a>
-	  ������������</p>
-	
-	<xsl:call-template name="html-news-list-press">
-	  <xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
-	  <xsl:with-param name="news.press.xml" select="$news.press.xml" />
-	</xsl:call-template>
-
-	<xsl:copy-of select="$newshome"/>
-
-	  	</div> <!-- contentwrap -->
-		<br class="clearboth" />
-	
-	</div> <!-- content -->
-	
-	<xsl:copy-of select="$footer"/>
-	
-        </div> <!-- container -->
-   </div> <!-- containerwrap -->
-
-      </body>
-    </html>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/ja/news/pressreleases.sgml b/ja/news/pressreleases.sgml
index b7136d2bb4..6407456f5d 100644
--- a/ja/news/pressreleases.sgml
+++ b/ja/news/pressreleases.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/news/pressreleases.sgml,v 1.13 2003/11/03 11:41:05 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/news/pressreleases.sgml,v 1.14 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD Press Releases">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
diff --git a/ja/news/webchanges.sgml b/ja/news/webchanges.sgml
index 6aa0f4c67a..b3d09d1fc1 100644
--- a/ja/news/webchanges.sgml
+++ b/ja/news/webchanges.sgml
@@ -1,14 +1,13 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/news/webchanges.sgml,v 1.15 2002/03/04 12:12:40 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/news/webchanges.sgml,v 1.16 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "Changes at the FreeBSD Web Server">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.53 -->
-<!-- $FreeBSD: www/ja/news/webchanges.sgml,v 1.15 2002/03/04 12:12:40 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/news/webchanges.sgml,v 1.16 2005/10/04 16:21:47 hrs Exp $ -->
 
 <html>
 &header;
diff --git a/ja/platforms/alpha.sgml b/ja/platforms/alpha.sgml
index 393ff123cc..f18c905aff 100644
--- a/ja/platforms/alpha.sgml
+++ b/ja/platforms/alpha.sgml
@@ -1,10 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/platforms/alpha.sgml,v 1.17 2003/12/06 08:13:03 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/platforms/alpha.sgml,v 1.18 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD/Alpha �ץ���������">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;]>
-<!-- $FreeBSD: www/ja/platforms/alpha.sgml,v 1.17 2003/12/06 08:13:03 hrs Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+]>
+
+<!-- $FreeBSD: www/ja/platforms/alpha.sgml,v 1.18 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.3 -->
  
diff --git a/ja/platforms/amd64.sgml b/ja/platforms/amd64.sgml
index e633ebc02c..e241e8f73b 100644
--- a/ja/platforms/amd64.sgml
+++ b/ja/platforms/amd64.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/platforms/amd64.sgml,v 1.5 2004/12/10 18:43:26 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/platforms/amd64.sgml,v 1.6 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD/amd64 �ץ���������">
 <!ENTITY email 'freebsd-amd64'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.9 -->
diff --git a/ja/platforms/arm.sgml b/ja/platforms/arm.sgml
index 08c7d08f66..39873a144d 100644
--- a/ja/platforms/arm.sgml
+++ b/ja/platforms/arm.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/platforms/arm.sgml,v 1.1 2005/01/10 02:39:29 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/platforms/arm.sgml,v 1.2 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD/ARM project">
 <!ENTITY email 'freebsd-arm'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml">
-%includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.4 -->
diff --git a/ja/platforms/ia64.sgml b/ja/platforms/ia64.sgml
index b004fa803a..6c9ef16f23 100644
--- a/ja/platforms/ia64.sgml
+++ b/ja/platforms/ia64.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/platforms/ia64.sgml,v 1.8 2003/11/01 16:24:22 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/platforms/ia64.sgml,v 1.9 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD/ia64 �ץ���������">
 <!ENTITY email 'freebsd-ia64'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.11 -->
diff --git a/ja/platforms/ia64/index.sgml b/ja/platforms/ia64/index.sgml
index da21dee224..c03e7808e9 100644
--- a/ja/platforms/ia64/index.sgml
+++ b/ja/platforms/ia64/index.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/platforms/ia64/index.sgml,v 1.2 2004/11/17 21:52:53 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/platforms/ia64/index.sgml,v 1.3 2005/10/04 16:21:48 hrs Exp $">
 <!ENTITY title "FreeBSD/ia64 �ץ���������">
 <!ENTITY email 'freebsd-ia64'>
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.5 -->
diff --git a/ja/platforms/ia64/machines.sgml b/ja/platforms/ia64/machines.sgml
index 58a3a008e5..6fc2b62b82 100644
--- a/ja/platforms/ia64/machines.sgml
+++ b/ja/platforms/ia64/machines.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/platforms/ia64/machines.sgml,v 1.2 2004/11/17 21:52:53 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/platforms/ia64/machines.sgml,v 1.3 2005/10/04 16:21:48 hrs Exp $">
 <!ENTITY title "FreeBSD/ia64 �ץ��������� -- �ޥ���">
 <!ENTITY email 'freebsd-ia64'>
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.5 -->
diff --git a/ja/platforms/ia64/refs.sgml b/ja/platforms/ia64/refs.sgml
index c06b1d8f06..347172061b 100644
--- a/ja/platforms/ia64/refs.sgml
+++ b/ja/platforms/ia64/refs.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/platforms/ia64/refs.sgml,v 1.2 2004/11/17 21:52:53 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/platforms/ia64/refs.sgml,v 1.3 2005/10/04 16:21:48 hrs Exp $">
 <!ENTITY title "FreeBSD/ia64 �ץ��������� -- ���ͻ���">
 <!ENTITY email 'freebsd-ia64'>
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.6 -->
diff --git a/ja/platforms/ia64/todo.sgml b/ja/platforms/ia64/todo.sgml
index 77c0ffae82..a62d317894 100644
--- a/ja/platforms/ia64/todo.sgml
+++ b/ja/platforms/ia64/todo.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/platforms/ia64/todo.sgml,v 1.3 2004/11/17 21:52:53 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/platforms/ia64/todo.sgml,v 1.4 2005/10/04 16:21:48 hrs Exp $">
 <!ENTITY title "FreeBSD/ia64 �ץ��������� -- ����">
 <!ENTITY email 'freebsd-ia64'>
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.7 -->
diff --git a/ja/platforms/index.sgml b/ja/platforms/index.sgml
index 4f54808223..4590a845cf 100644
--- a/ja/platforms/index.sgml
+++ b/ja/platforms/index.sgml
@@ -1,11 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
 <!ENTITY email 'freebsd-www'>
 <!ENTITY title "�б����Ƥ���ץ�åȥե�����">
-<!ENTITY date "$FreeBSD: www/ja/platforms/index.sgml,v 1.9 2005/01/10 02:39:29 rushani Exp $">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;]>
-<!-- $FreeBSD: www/ja/platforms/index.sgml,v 1.9 2005/01/10 02:39:29 rushani Exp $ -->
+<!ENTITY date "$FreeBSD: www/ja/platforms/index.sgml,v 1.10 2005/10/04 16:21:47 hrs Exp $">
+<!ENTITY % navinclude.developers "INCLUDE">
+]>
+
+<!-- $FreeBSD: www/ja/platforms/index.sgml,v 1.10 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.12 -->
 
diff --git a/ja/platforms/mips.sgml b/ja/platforms/mips.sgml
index de62ec0e73..bfb4a763e4 100644
--- a/ja/platforms/mips.sgml
+++ b/ja/platforms/mips.sgml
@@ -1,10 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/platforms/mips.sgml,v 1.3 2004/11/17 21:52:53 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/platforms/mips.sgml,v 1.4 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD/MIPS �ץ���������">
 <!ENTITY email 'freebsd-mips'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;]>
+<!ENTITY % navinclude.developers "INCLUDE">
+]>
+
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original Revision: 1.4 -->
  
diff --git a/ja/platforms/pc98.sgml b/ja/platforms/pc98.sgml
index e484f01725..9e6baef258 100644
--- a/ja/platforms/pc98.sgml
+++ b/ja/platforms/pc98.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/platforms/pc98.sgml,v 1.4 2004/11/17 21:52:53 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/platforms/pc98.sgml,v 1.5 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD/pc98 �ץ���������">
 <!ENTITY email 're-pc98'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml">
-%includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original Revision: 1.10 -->
diff --git a/ja/platforms/ppc.sgml b/ja/platforms/ppc.sgml
index 40e3b05b10..c62b7128d8 100644
--- a/ja/platforms/ppc.sgml
+++ b/ja/platforms/ppc.sgml
@@ -1,10 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/platforms/ppc.sgml,v 1.6 2004/11/17 21:52:53 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/platforms/ppc.sgml,v 1.7 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD/ppc �ץ���������">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;]>
-<!-- $FreeBSD: www/ja/platforms/ppc.sgml,v 1.6 2004/11/17 21:52:53 rushani Exp $ -->
+<!ENTITY % navinclude.developers "INCLUDE">
+]>
+
+<!-- $FreeBSD: www/ja/platforms/ppc.sgml,v 1.7 2005/10/04 16:21:47 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.9 -->
  
diff --git a/ja/platforms/sparc.sgml b/ja/platforms/sparc.sgml
index bf59673829..923a870239 100644
--- a/ja/platforms/sparc.sgml
+++ b/ja/platforms/sparc.sgml
@@ -1,14 +1,13 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/platforms/sparc.sgml,v 1.7 2004/12/10 18:43:26 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/platforms/sparc.sgml,v 1.8 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD/sparc64 �ץ���������">
 <!ENTITY email 'freebsd-sparc64'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.20 -->
-<!-- $FreeBSD: www/ja/platforms/sparc.sgml,v 1.7 2004/12/10 18:43:26 rushani Exp $ -->
+<!-- $FreeBSD: www/ja/platforms/sparc.sgml,v 1.8 2005/10/04 16:21:47 hrs Exp $ -->
 
 <html>
   &header;
diff --git a/ja/platforms/x86-64.sgml b/ja/platforms/x86-64.sgml
index 64ec98e0be..ba4ecd72e1 100644
--- a/ja/platforms/x86-64.sgml
+++ b/ja/platforms/x86-64.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/platforms/x86-64.sgml,v 1.8 2003/10/26 22:13:07 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/platforms/x86-64.sgml,v 1.9 2005/10/04 16:21:47 hrs Exp $">
 <!ENTITY title "FreeBSD/x86-64 �ץ���������">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.14 -->
-<!-- $FreeBSD: www/ja/platforms/x86-64.sgml,v 1.8 2003/10/26 22:13:07 rushani Exp $ -->
+<!-- $FreeBSD: www/ja/platforms/x86-64.sgml,v 1.9 2005/10/04 16:21:47 hrs Exp $ -->
  
 <html>
   <head>
diff --git a/ja/ports/Makefile b/ja/ports/Makefile
index cd6298d8f0..a83ea75c27 100644
--- a/ja/ports/Makefile
+++ b/ja/ports/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/ja/ports/Makefile,v 1.28 2005/12/04 11:50:51 pav Exp $
+# $FreeBSD: www/ja/ports/Makefile,v 1.29 2006/07/16 11:22:04 simon Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.37
 
@@ -14,13 +14,6 @@
 
 FETCH_OPT?=	-am
 
-#
-# Force NO_TIDY for the ports web pages, since it takes a long time to
-# run tidy on these huge HTML files, and the files are valid HTML when
-# generated by portindex, even without tidy.
-#
-NO_TIDY=	YES
-
 .if defined(PINDEX_OVERRIDE)
 ${INDEX}: ${PINDEX_OVERRIDE}
 	${CP} ${PINDEX_OVERRIDE} ${INDEX}
@@ -65,7 +58,16 @@ packages.exists:
 .endif
 
 Makefile.gen: index.sgml .NOTMAIN
-	${ECHO_CMD} DOCS= *.sgml > Makefile.gen
+	(	${ECHO_CMD} TIDY=${PERL};\
+		${ECHO_CMD} TIDYOPTS="-i'' -npe 's,\"-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN\",\"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\",'";\
+		${ECHO_CMD} DOCS= *.sgml;\
+		${ECHO_CMD} -n "DYNAMIC_DOCS= ";\
+		${ECHO_CMD} -n " master-index.sgml";\
+		${ECHO_CMD} -n " index.sgml";\
+	) > Makefile.gen
+	for categoryfile in ${CATEGORYLIST}; do \
+		${ECHO_CMD} -n " $$categoryfile.sgml" >> Makefile.gen; \
+	done
 .if defined(NO_TIDY)
 	${ECHO_CMD} NO_TIDY=${NO_TIDY} >> Makefile.gen
 .endif
@@ -74,6 +76,10 @@ index.sgml: ${INDEX} categories packages.exists portindex ports.inc .NOTMAIN
 	${RM} -f *.sgml
 	${PORTINDEX} ${INDEX} ${.CURDIR}
 
+# this builds: categories-alpha.sgml, categories-grouped.sgml,
+# master-index.sgml, statistics.ent, <category>.sgml
+CATEGORYLIST=`grep "^[a-z]" ../../en/ports/categories | sed -e s"/,.*//"`
+
 install: all beforeinstall
 
 all install clean:
diff --git a/ja/ports/portindex b/ja/ports/portindex
index 20c2e6513e..7f9e37c946 100755
--- a/ja/ports/portindex
+++ b/ja/ports/portindex
@@ -4,7 +4,7 @@
 #
 # by John Fieber <jfieber@freebsd.org>
 # Mon May 13 10:31:58 EST 1996
-# $FreeBSD: www/ja/ports/portindex,v 1.30 2004/01/10 18:37:59 rushani Exp $
+# $FreeBSD: www/ja/ports/portindex,v 1.31 2005/10/04 16:21:48 hrs Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.49
 
@@ -59,16 +59,13 @@ sub getdate {
 
 sub header {
     local ($fh, $htext) = @_;
-    print $fh "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" [\n";
+    print $fh "<!DOCTYPE html PUBLIC \"-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN\" [\n";
     print $fh "<!ENTITY base CDATA '..'>\n";
-    print $fh "<!ENTITY enbase CDATA '../..'>";
     print $fh "<!ENTITY date  \"<em>$today</em>\">\n";
     print $fh "<!ENTITY title '$htext'>\n";
     print $fh "<!ENTITY blurb  SYSTEM \"ports.inc\">\n";
-    print $fh "<!ENTITY % navincludes SYSTEM \"../includes.navdownload.sgml\"> %navincludes;\n";
-    print $fh "<!ENTITY % includes SYSTEM \"../includes.sgml\">\n";
+    print $fh "<!ENTITY % navinclude.ports \"INCLUDE\">\n";
     print $fh "<!ENTITY email 'ports'>\n";
-    print $fh "%includes;\n";
     print $fh "]>\n";
     print $fh "<html>&header;\n";
 }
diff --git a/ja/projects/cvsweb.sgml b/ja/projects/cvsweb.sgml
index 7600732aad..3b4759c424 100644
--- a/ja/projects/cvsweb.sgml
+++ b/ja/projects/cvsweb.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/projects/cvsweb.sgml,v 1.5 2005/06/16 14:50:45 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/projects/cvsweb.sgml,v 1.6 2005/10/04 16:21:48 hrs Exp $">
 <!ENTITY title 'FreeBSD CVSweb Project'>
 <!ENTITY email 'freebsd-cvsweb'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % developers SYSTEM "../../en/developers.sgml"> %developers;
 ]>
 <!-- FreeBSD Japanese Documentation Project -->
diff --git a/ja/projects/mips/index.sgml b/ja/projects/mips/index.sgml
index 99a0d6addc..73bcaa905f 100644
--- a/ja/projects/mips/index.sgml
+++ b/ja/projects/mips/index.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/projects/mips/index.sgml,v 1.1 2005/01/10 02:16:17 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/projects/mips/index.sgml,v 1.2 2005/10/04 16:21:48 hrs Exp $">
 <!ENTITY title "FreeBSD/MIPS Project">
 <!ENTITY email 'freebsd-mips'>
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % developers SYSTEM "../../../en/developers.sgml"> %developers;
 
 <!-- FreeBSD Japanese Documentation Project -->
diff --git a/ja/projects/newbies.sgml b/ja/projects/newbies.sgml
index e48b70436c..0427864e45 100644
--- a/ja/projects/newbies.sgml
+++ b/ja/projects/newbies.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/projects/newbies.sgml,v 1.31 2005/06/16 14:50:45 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/projects/newbies.sgml,v 1.32 2005/10/04 16:21:48 hrs Exp $">
 <!ENTITY title 'Resources for Newbies'>
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.39 -->
diff --git a/ja/projects/projects.sgml b/ja/projects/projects.sgml
index 3fd940f290..79ca917cea 100644
--- a/ja/projects/projects.sgml
+++ b/ja/projects/projects.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/projects/projects.sgml,v 1.40 2004/11/17 21:52:53 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/projects/projects.sgml,v 1.41 2005/10/04 16:21:48 hrs Exp $">
 <!ENTITY title "FreeBSD Development Projects">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/projects/projects.sgml,v 1.40 2004/11/17 21:52:53 rushani Exp $ -->
+<!-- $FreeBSD: www/ja/projects/projects.sgml,v 1.41 2005/10/04 16:21:48 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.157 -->
 
diff --git a/ja/prstats/index.sgml b/ja/prstats/index.sgml
index c8902a4c74..22ac7aa3c3 100644
--- a/ja/prstats/index.sgml
+++ b/ja/prstats/index.sgml
@@ -1,10 +1,9 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/prstats/index.sgml,v 1.3 2005/10/04 16:21:48 hrs Exp $">
+<!doctype HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ja/prstats/index.sgml,v 1.4 2006/07/28 13:27:12 hrs Exp $">
 <!ENTITY email 'freebsd-www'>
 <!ENTITY base CDATA "..">
 <!ENTITY title "PR Statistics">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.5 -->
diff --git a/ja/publish.sgml b/ja/publish.sgml
index 0e5113257e..d6786d4944 100644
--- a/ja/publish.sgml
+++ b/ja/publish.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/publish.sgml,v 1.37 2004/12/06 19:53:54 rushani Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ja/publish.sgml,v 1.38 2005/10/04 16:21:45 hrs Exp $">
 <!ENTITY title "FreeBSD Related Publications">
-<!ENTITY % navincludes SYSTEM "includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.63 -->
diff --git a/ja/releases/2.1.5R/notes.sgml b/ja/releases/2.1.5R/notes.sgml
index 33dc06630d..3c33e75529 100644
--- a/ja/releases/2.1.5R/notes.sgml
+++ b/ja/releases/2.1.5R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.1.5R/notes.sgml,v 1.9 2002/03/20 01:16:42 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.1.5R/notes.sgml,v 1.10 2005/10/04 16:21:48 hrs Exp $">
 <!ENTITY title "FreeBSD 2.1.5 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.1.5R/notes.sgml,v 1.9 2002/03/20 01:16:42 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.1.5R/notes.sgml,v 1.10 2005/10/04 16:21:48 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.7 -->
 
diff --git a/ja/releases/2.1.6R/notes.sgml b/ja/releases/2.1.6R/notes.sgml
index 97edf47108..63e0d746ac 100644
--- a/ja/releases/2.1.6R/notes.sgml
+++ b/ja/releases/2.1.6R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.1.6R/notes.sgml,v 1.9 2002/03/20 01:16:42 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.1.6R/notes.sgml,v 1.10 2005/10/04 16:21:48 hrs Exp $">
 <!ENTITY title "FreeBSD 2.1.6 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.1.6R/notes.sgml,v 1.9 2002/03/20 01:16:42 kuriyama Exp $-->
+<!-- $FreeBSD: www/ja/releases/2.1.6R/notes.sgml,v 1.10 2005/10/04 16:21:48 hrs Exp $-->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.6 -->
 
diff --git a/ja/releases/2.1.6R/security.sgml b/ja/releases/2.1.6R/security.sgml
index 7dd56b10d1..893df718d2 100644
--- a/ja/releases/2.1.6R/security.sgml
+++ b/ja/releases/2.1.6R/security.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.1.6R/security.sgml,v 1.9 2002/03/20 01:16:42 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.1.6R/security.sgml,v 1.10 2005/10/04 16:21:48 hrs Exp $">
 <!ENTITY title "FreeBSD 2.1.6 Security Update">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.1.6R/security.sgml,v 1.9 2002/03/20 01:16:42 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.1.6R/security.sgml,v 1.10 2005/10/04 16:21:48 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.5 -->
 
diff --git a/ja/releases/2.1.7R/notes.sgml b/ja/releases/2.1.7R/notes.sgml
index f38e0222f4..83fa840c20 100644
--- a/ja/releases/2.1.7R/notes.sgml
+++ b/ja/releases/2.1.7R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.1.7R/notes.sgml,v 1.10 2002/03/20 01:16:42 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.1.7R/notes.sgml,v 1.11 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.1.7 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.1.7R/notes.sgml,v 1.10 2002/03/20 01:16:42 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.1.7R/notes.sgml,v 1.11 2005/10/04 16:21:49 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 
diff --git a/ja/releases/2.2.1R/notes.sgml b/ja/releases/2.2.1R/notes.sgml
index ab8962fb17..a3fbbccbf8 100644
--- a/ja/releases/2.2.1R/notes.sgml
+++ b/ja/releases/2.2.1R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2.1R/notes.sgml,v 1.10 2002/05/16 12:03:07 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.2.1R/notes.sgml,v 1.11 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.2.1 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.2.1R/notes.sgml,v 1.10 2002/05/16 12:03:07 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.2.1R/notes.sgml,v 1.11 2005/10/04 16:21:49 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.7 -->
 
diff --git a/ja/releases/2.2.2R/errata.sgml b/ja/releases/2.2.2R/errata.sgml
index fd69b7f0b4..176cab1f12 100644
--- a/ja/releases/2.2.2R/errata.sgml
+++ b/ja/releases/2.2.2R/errata.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2.2R/errata.sgml,v 1.11 2002/03/20 01:16:43 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.2.2R/errata.sgml,v 1.12 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.2.2 Errata Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.2.2R/errata.sgml,v 1.11 2002/03/20 01:16:43 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.2.2R/errata.sgml,v 1.12 2005/10/04 16:21:49 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 
diff --git a/ja/releases/2.2.2R/notes.sgml b/ja/releases/2.2.2R/notes.sgml
index 7ffc402352..e1f12dc4d9 100644
--- a/ja/releases/2.2.2R/notes.sgml
+++ b/ja/releases/2.2.2R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2.2R/notes.sgml,v 1.10 2002/05/16 12:03:07 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.2.2R/notes.sgml,v 1.11 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.2.2 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.2.2R/notes.sgml,v 1.10 2002/05/16 12:03:07 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.2.2R/notes.sgml,v 1.11 2005/10/04 16:21:49 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.7 -->
 
diff --git a/ja/releases/2.2.5R/announce.sgml b/ja/releases/2.2.5R/announce.sgml
index c1e56e4872..6081fe00b7 100644
--- a/ja/releases/2.2.5R/announce.sgml
+++ b/ja/releases/2.2.5R/announce.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2.5R/announce.sgml,v 1.12 2002/03/20 01:16:43 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.2.5R/announce.sgml,v 1.13 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.2.5 Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.2.5R/announce.sgml,v 1.12 2002/03/20 01:16:43 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.2.5R/announce.sgml,v 1.13 2005/10/04 16:21:49 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.7 -->
 
diff --git a/ja/releases/2.2.5R/errata.sgml b/ja/releases/2.2.5R/errata.sgml
index b1b72dc3ad..6701f52246 100644
--- a/ja/releases/2.2.5R/errata.sgml
+++ b/ja/releases/2.2.5R/errata.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2.5R/errata.sgml,v 1.16 2002/03/20 01:16:43 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.2.5R/errata.sgml,v 1.17 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.2.5 Errata Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.2.5R/errata.sgml,v 1.16 2002/03/20 01:16:43 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.2.5R/errata.sgml,v 1.17 2005/10/04 16:21:49 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.11 -->
 
diff --git a/ja/releases/2.2.5R/notes.sgml b/ja/releases/2.2.5R/notes.sgml
index 46f47cd8f9..91c0393ae5 100644
--- a/ja/releases/2.2.5R/notes.sgml
+++ b/ja/releases/2.2.5R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2.5R/notes.sgml,v 1.11 2002/03/20 01:16:43 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.2.5R/notes.sgml,v 1.12 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.2.5 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.2.5R/notes.sgml,v 1.11 2002/03/20 01:16:43 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.2.5R/notes.sgml,v 1.12 2005/10/04 16:21:49 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.7 -->
 
diff --git a/ja/releases/2.2.6R/announce.sgml b/ja/releases/2.2.6R/announce.sgml
index ff2df713e6..62a77f1ac3 100644
--- a/ja/releases/2.2.6R/announce.sgml
+++ b/ja/releases/2.2.6R/announce.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2.6R/announce.sgml,v 1.13 2002/03/20 01:16:43 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.2.6R/announce.sgml,v 1.14 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.2.6 Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.2.6R/announce.sgml,v 1.13 2002/03/20 01:16:43 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.2.6R/announce.sgml,v 1.14 2005/10/04 16:21:49 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.7 -->
 
diff --git a/ja/releases/2.2.6R/errata.sgml b/ja/releases/2.2.6R/errata.sgml
index c463fbfa33..1115e32629 100644
--- a/ja/releases/2.2.6R/errata.sgml
+++ b/ja/releases/2.2.6R/errata.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2.6R/errata.sgml,v 1.16 2002/03/20 01:16:43 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.2.6R/errata.sgml,v 1.17 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.2.6 Errata Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.2.6R/errata.sgml,v 1.16 2002/03/20 01:16:43 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.2.6R/errata.sgml,v 1.17 2005/10/04 16:21:49 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.12 -->
 
diff --git a/ja/releases/2.2.6R/notes.sgml b/ja/releases/2.2.6R/notes.sgml
index 46fae9914e..065536914f 100644
--- a/ja/releases/2.2.6R/notes.sgml
+++ b/ja/releases/2.2.6R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2.6R/notes.sgml,v 1.10 2002/03/20 01:16:43 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.2.6R/notes.sgml,v 1.11 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.2.6 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.2.6R/notes.sgml,v 1.10 2002/03/20 01:16:43 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.2.6R/notes.sgml,v 1.11 2005/10/04 16:21:49 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.4 -->
 
diff --git a/ja/releases/2.2.7R/announce.sgml b/ja/releases/2.2.7R/announce.sgml
index 025849f2d7..a62c5cb4b8 100644
--- a/ja/releases/2.2.7R/announce.sgml
+++ b/ja/releases/2.2.7R/announce.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2.7R/announce.sgml,v 1.13 2002/03/20 01:16:43 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.2.7R/announce.sgml,v 1.14 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.2.7 Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.2.7R/announce.sgml,v 1.13 2002/03/20 01:16:43 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.2.7R/announce.sgml,v 1.14 2005/10/04 16:21:49 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.10 -->
 
diff --git a/ja/releases/2.2.7R/errata.sgml b/ja/releases/2.2.7R/errata.sgml
index 0dc19d5bf9..31137f889f 100644
--- a/ja/releases/2.2.7R/errata.sgml
+++ b/ja/releases/2.2.7R/errata.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2.7R/errata.sgml,v 1.14 2002/03/20 01:16:43 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.2.7R/errata.sgml,v 1.15 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.2.7 Errata Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.2.7R/errata.sgml,v 1.14 2002/03/20 01:16:43 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.2.7R/errata.sgml,v 1.15 2005/10/04 16:21:49 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.10 -->
 
diff --git a/ja/releases/2.2.7R/notes.sgml b/ja/releases/2.2.7R/notes.sgml
index 1b630ddd66..c81ea3bc0b 100644
--- a/ja/releases/2.2.7R/notes.sgml
+++ b/ja/releases/2.2.7R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2.7R/notes.sgml,v 1.11 2002/03/20 01:16:43 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.2.7R/notes.sgml,v 1.12 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.2.7 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.2.7R/notes.sgml,v 1.11 2002/03/20 01:16:43 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.2.7R/notes.sgml,v 1.12 2005/10/04 16:21:49 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.6 -->
 
diff --git a/ja/releases/2.2.8R/announce.sgml b/ja/releases/2.2.8R/announce.sgml
index b8809e10f9..8493dafd2f 100644
--- a/ja/releases/2.2.8R/announce.sgml
+++ b/ja/releases/2.2.8R/announce.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2.8R/announce.sgml,v 1.9 2002/03/20 01:16:44 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.2.8R/announce.sgml,v 1.10 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.2.8 Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.6 -->
-<!-- $FreeBSD: www/ja/releases/2.2.8R/announce.sgml,v 1.9 2002/03/20 01:16:44 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.2.8R/announce.sgml,v 1.10 2005/10/04 16:21:49 hrs Exp $ -->
 
 <html>
 &header;
diff --git a/ja/releases/2.2.8R/errata.sgml b/ja/releases/2.2.8R/errata.sgml
index 4414fe0f08..74521d564f 100644
--- a/ja/releases/2.2.8R/errata.sgml
+++ b/ja/releases/2.2.8R/errata.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2.8R/errata.sgml,v 1.13 2002/03/20 01:16:44 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.2.8R/errata.sgml,v 1.14 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.2.8 Errata Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.2.8R/errata.sgml,v 1.13 2002/03/20 01:16:44 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.2.8R/errata.sgml,v 1.14 2005/10/04 16:21:49 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.13 -->
 
diff --git a/ja/releases/2.2.8R/notes.sgml b/ja/releases/2.2.8R/notes.sgml
index fc5c3ee8cc..dff4f682d4 100644
--- a/ja/releases/2.2.8R/notes.sgml
+++ b/ja/releases/2.2.8R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2.8R/notes.sgml,v 1.8 2002/03/20 01:16:44 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.2.8R/notes.sgml,v 1.9 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.2.8 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.2.8R/notes.sgml,v 1.8 2002/03/20 01:16:44 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.2.8R/notes.sgml,v 1.9 2005/10/04 16:21:49 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.6 -->
 
diff --git a/ja/releases/2.2R/announce.sgml b/ja/releases/2.2R/announce.sgml
index 1e80fbc475..842b982d12 100644
--- a/ja/releases/2.2R/announce.sgml
+++ b/ja/releases/2.2R/announce.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2R/announce.sgml,v 1.12 2002/03/20 01:16:44 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.2R/announce.sgml,v 1.13 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.2 Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.2R/announce.sgml,v 1.12 2002/03/20 01:16:44 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.2R/announce.sgml,v 1.13 2005/10/04 16:21:49 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.7 -->
 
diff --git a/ja/releases/2.2R/install-media.sgml b/ja/releases/2.2R/install-media.sgml
index e20dfc0ab2..d0f0cdd2e5 100644
--- a/ja/releases/2.2R/install-media.sgml
+++ b/ja/releases/2.2R/install-media.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2R/install-media.sgml,v 1.8 2002/03/20 01:16:44 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.2R/install-media.sgml,v 1.9 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.2 Change Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.2R/install-media.sgml,v 1.8 2002/03/20 01:16:44 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.2R/install-media.sgml,v 1.9 2005/10/04 16:21:49 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.5 -->
 
diff --git a/ja/releases/2.2R/notes.sgml b/ja/releases/2.2R/notes.sgml
index 0ad4e232c9..7cc675d6b9 100644
--- a/ja/releases/2.2R/notes.sgml
+++ b/ja/releases/2.2R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2R/notes.sgml,v 1.10 2002/05/16 12:03:07 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/2.2R/notes.sgml,v 1.11 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 2.2 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/2.2R/notes.sgml,v 1.10 2002/05/16 12:03:07 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/releases/2.2R/notes.sgml,v 1.11 2005/10/04 16:21:49 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 
diff --git a/ja/releases/3.0R/announce.sgml b/ja/releases/3.0R/announce.sgml
index 151bbda7c4..f1f53bf510 100644
--- a/ja/releases/3.0R/announce.sgml
+++ b/ja/releases/3.0R/announce.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.0R/announce.sgml,v 1.9 2002/03/28 14:50:55 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/3.0R/announce.sgml,v 1.10 2005/10/04 16:21:49 hrs Exp $">
 <!ENTITY title "FreeBSD 3.0 Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.7 -->
-<!-- $FreeBSD: www/ja/releases/3.0R/announce.sgml,v 1.9 2002/03/28 14:50:55 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/3.0R/announce.sgml,v 1.10 2005/10/04 16:21:49 hrs Exp $ -->
 
 <html>
 &header;
diff --git a/ja/releases/3.0R/errata.sgml b/ja/releases/3.0R/errata.sgml
index 3c4a6a1a48..c640a5013b 100644
--- a/ja/releases/3.0R/errata.sgml
+++ b/ja/releases/3.0R/errata.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.0R/errata.sgml,v 1.11 2002/03/28 14:50:55 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/3.0R/errata.sgml,v 1.12 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 3.0 Errata Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/3.0R/errata.sgml,v 1.11 2002/03/28 14:50:55 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/3.0R/errata.sgml,v 1.12 2005/10/04 16:21:50 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.9 -->
 
diff --git a/ja/releases/3.0R/notes.sgml b/ja/releases/3.0R/notes.sgml
index 060c8dc438..497036abd7 100644
--- a/ja/releases/3.0R/notes.sgml
+++ b/ja/releases/3.0R/notes.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.0R/notes.sgml,v 1.10 2002/03/28 14:50:55 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/3.0R/notes.sgml,v 1.11 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 3.0 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/releases/3.0R/notes.sgml,v 1.10 2002/03/28 14:50:55 hanai Exp $ -->
+<!ENTITY % navinclude.download "INCLUDE">
+<!-- $FreeBSD: www/ja/releases/3.0R/notes.sgml,v 1.11 2005/10/04 16:21:50 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 ]>
diff --git a/ja/releases/3.1R/announce.sgml b/ja/releases/3.1R/announce.sgml
index 4850b934ed..3a6b85b461 100644
--- a/ja/releases/3.1R/announce.sgml
+++ b/ja/releases/3.1R/announce.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.1R/announce.sgml,v 1.8 2002/03/28 14:50:56 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/3.1R/announce.sgml,v 1.9 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 3.1 Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/3.1R/announce.sgml,v 1.8 2002/03/28 14:50:56 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/3.1R/announce.sgml,v 1.9 2005/10/04 16:21:50 hrs Exp $ -->
 <!-- The Japanese FreeBSD Documentation Project -->
 <!-- Original revision: 1.7 -->
 <html>
diff --git a/ja/releases/3.1R/errata.sgml b/ja/releases/3.1R/errata.sgml
index b35a780bd9..3424066ad3 100644
--- a/ja/releases/3.1R/errata.sgml
+++ b/ja/releases/3.1R/errata.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.1R/errata.sgml,v 1.9 2002/03/28 14:50:56 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/3.1R/errata.sgml,v 1.10 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 3.1 Errata Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/3.1R/errata.sgml,v 1.9 2002/03/28 14:50:56 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/3.1R/errata.sgml,v 1.10 2005/10/04 16:21:50 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 
diff --git a/ja/releases/3.1R/notes.sgml b/ja/releases/3.1R/notes.sgml
index 3b75589956..19323927b7 100644
--- a/ja/releases/3.1R/notes.sgml
+++ b/ja/releases/3.1R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.1R/notes.sgml,v 1.10 2002/03/28 14:50:56 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/3.1R/notes.sgml,v 1.11 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 3.1 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/3.1R/notes.sgml,v 1.10 2002/03/28 14:50:56 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/3.1R/notes.sgml,v 1.11 2005/10/04 16:21:50 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.5 -->
 
diff --git a/ja/releases/3.2R/announce.sgml b/ja/releases/3.2R/announce.sgml
index 635b56eaef..6f5cf55481 100644
--- a/ja/releases/3.2R/announce.sgml
+++ b/ja/releases/3.2R/announce.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.2R/announce.sgml,v 1.8 2002/03/28 14:50:56 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/3.2R/announce.sgml,v 1.9 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 3.2 Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/3.2R/announce.sgml,v 1.8 2002/03/28 14:50:56 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/3.2R/announce.sgml,v 1.9 2005/10/04 16:21:50 hrs Exp $ -->
 <!-- The Japanese FreeBSD Documentation Project -->
 <!-- Original revision: 1.3 -->
 <html>
diff --git a/ja/releases/3.2R/errata.sgml b/ja/releases/3.2R/errata.sgml
index b43939c8a8..9f483e77be 100644
--- a/ja/releases/3.2R/errata.sgml
+++ b/ja/releases/3.2R/errata.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.2R/errata.sgml,v 1.13 2002/03/28 14:50:56 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/3.2R/errata.sgml,v 1.14 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 3.2 Errata Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/3.2R/errata.sgml,v 1.13 2002/03/28 14:50:56 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/3.2R/errata.sgml,v 1.14 2005/10/04 16:21:50 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 
diff --git a/ja/releases/3.2R/notes.sgml b/ja/releases/3.2R/notes.sgml
index 1c64d7572b..b446376406 100644
--- a/ja/releases/3.2R/notes.sgml
+++ b/ja/releases/3.2R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.2R/notes.sgml,v 1.11 2002/03/28 14:50:56 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/3.2R/notes.sgml,v 1.12 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 3.2 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/3.2R/notes.sgml,v 1.11 2002/03/28 14:50:56 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/3.2R/notes.sgml,v 1.12 2005/10/04 16:21:50 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.5 -->
 
diff --git a/ja/releases/3.3R/announce.sgml b/ja/releases/3.3R/announce.sgml
index 7a044bc615..b3937dc42c 100644
--- a/ja/releases/3.3R/announce.sgml
+++ b/ja/releases/3.3R/announce.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.3R/announce.sgml,v 1.6 2003/12/20 17:44:57 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/3.3R/announce.sgml,v 1.7 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 3.3 Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
-<!-- $FreeBSD: www/ja/releases/3.3R/announce.sgml,v 1.6 2003/12/20 17:44:57 rushani Exp $ -->
+<!-- $FreeBSD: www/ja/releases/3.3R/announce.sgml,v 1.7 2005/10/04 16:21:50 hrs Exp $ -->
 
 <html>
 &header;
diff --git a/ja/releases/3.3R/errata.sgml b/ja/releases/3.3R/errata.sgml
index 10ae4406a1..85f0a47339 100644
--- a/ja/releases/3.3R/errata.sgml
+++ b/ja/releases/3.3R/errata.sgml
@@ -1,12 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.3R/errata.sgml,v 1.7 2002/03/28 14:50:56 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/3.3R/errata.sgml,v 1.8 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 3.3 Errata Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- $FreeBSD: www/ja/releases/3.3R/errata.sgml,v 1.7 2002/03/28 14:50:56 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/3.3R/errata.sgml,v 1.8 2005/10/04 16:21:50 hrs Exp $ -->
 <!-- Original revision: 1.8 -->
 
 <html>
diff --git a/ja/releases/3.3R/notes.sgml b/ja/releases/3.3R/notes.sgml
index c0a68db493..ccb3ab6e7c 100644
--- a/ja/releases/3.3R/notes.sgml
+++ b/ja/releases/3.3R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.3R/notes.sgml,v 1.8 2002/05/16 12:03:07 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/3.3R/notes.sgml,v 1.9 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 3.3 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/3.3R/notes.sgml,v 1.8 2002/05/16 12:03:07 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/releases/3.3R/notes.sgml,v 1.9 2005/10/04 16:21:50 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.4 -->
 
diff --git a/ja/releases/3.4R/announce.sgml b/ja/releases/3.4R/announce.sgml
index fcdca4aa50..f96a9fdbe7 100644
--- a/ja/releases/3.4R/announce.sgml
+++ b/ja/releases/3.4R/announce.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.4R/announce.sgml,v 1.7 2002/03/28 14:50:56 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/3.4R/announce.sgml,v 1.8 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 3.4 Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.6 -->
-<!-- $FreeBSD: www/ja/releases/3.4R/announce.sgml,v 1.7 2002/03/28 14:50:56 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/3.4R/announce.sgml,v 1.8 2005/10/04 16:21:50 hrs Exp $ -->
 <html>
 &header;
 
diff --git a/ja/releases/3.4R/errata.sgml b/ja/releases/3.4R/errata.sgml
index 01500f0ddd..1b2f5fd86b 100644
--- a/ja/releases/3.4R/errata.sgml
+++ b/ja/releases/3.4R/errata.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.4R/errata.sgml,v 1.7 2002/03/28 14:50:56 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/3.4R/errata.sgml,v 1.8 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 3.4 Errata Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
-<!-- $FreeBSD: www/ja/releases/3.4R/errata.sgml,v 1.7 2002/03/28 14:50:56 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/3.4R/errata.sgml,v 1.8 2005/10/04 16:21:50 hrs Exp $ -->
 
 <html>
 &header;
diff --git a/ja/releases/3.4R/notes.sgml b/ja/releases/3.4R/notes.sgml
index 9f101c0f6d..2d5c401be3 100644
--- a/ja/releases/3.4R/notes.sgml
+++ b/ja/releases/3.4R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.4R/notes.sgml,v 1.6 2002/03/28 14:50:56 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/3.4R/notes.sgml,v 1.7 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 3.4 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/3.4R/notes.sgml,v 1.6 2002/03/28 14:50:56 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/3.4R/notes.sgml,v 1.7 2005/10/04 16:21:50 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
 
diff --git a/ja/releases/3.5R/announce.sgml b/ja/releases/3.5R/announce.sgml
index 1451fae942..08fee1a58c 100644
--- a/ja/releases/3.5R/announce.sgml
+++ b/ja/releases/3.5R/announce.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.5R/announce.sgml,v 1.5 2002/03/28 14:50:56 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/3.5R/announce.sgml,v 1.6 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 3.5 Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.3 -->
-<!-- $FreeBSD: www/ja/releases/3.5R/announce.sgml,v 1.5 2002/03/28 14:50:56 hanai Exp $-->
+<!-- $FreeBSD: www/ja/releases/3.5R/announce.sgml,v 1.6 2005/10/04 16:21:50 hrs Exp $-->
 <html>
 &header;
 
diff --git a/ja/releases/3.5R/errata.sgml b/ja/releases/3.5R/errata.sgml
index 25c2200bd5..3e36874bef 100644
--- a/ja/releases/3.5R/errata.sgml
+++ b/ja/releases/3.5R/errata.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.5R/errata.sgml,v 1.5 2002/03/28 14:50:56 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/3.5R/errata.sgml,v 1.6 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 3.5 Errata Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
-<!-- $FreeBSD: www/ja/releases/3.5R/errata.sgml,v 1.5 2002/03/28 14:50:56 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/3.5R/errata.sgml,v 1.6 2005/10/04 16:21:50 hrs Exp $ -->
 
 <html>
 &header;
diff --git a/ja/releases/3.5R/notes.sgml b/ja/releases/3.5R/notes.sgml
index 00e8fd11a7..12c4b1a415 100644
--- a/ja/releases/3.5R/notes.sgml
+++ b/ja/releases/3.5R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.5R/notes.sgml,v 1.5 2002/03/28 14:50:56 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/3.5R/notes.sgml,v 1.6 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 3.5 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/3.5R/notes.sgml,v 1.5 2002/03/28 14:50:56 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/3.5R/notes.sgml,v 1.6 2005/10/04 16:21:50 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.4 -->
 
diff --git a/ja/releases/4.0R/announce.sgml b/ja/releases/4.0R/announce.sgml
index d692e29782..6c15d7f9bc 100644
--- a/ja/releases/4.0R/announce.sgml
+++ b/ja/releases/4.0R/announce.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.0R/announce.sgml,v 1.5 2002/03/28 14:50:57 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.0R/announce.sgml,v 1.6 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 4.0 Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.3 -->
-<!-- $FreeBSD: www/ja/releases/4.0R/announce.sgml,v 1.5 2002/03/28 14:50:57 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/4.0R/announce.sgml,v 1.6 2005/10/04 16:21:50 hrs Exp $ -->
 <html>
 &header;
 
diff --git a/ja/releases/4.0R/errata.sgml b/ja/releases/4.0R/errata.sgml
index d4babf4764..576182a617 100644
--- a/ja/releases/4.0R/errata.sgml
+++ b/ja/releases/4.0R/errata.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.0R/errata.sgml,v 1.7 2002/03/28 14:50:57 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.0R/errata.sgml,v 1.8 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 4.0 Errata Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.5 -->
-<!-- $FreeBSD: www/ja/releases/4.0R/errata.sgml,v 1.7 2002/03/28 14:50:57 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/4.0R/errata.sgml,v 1.8 2005/10/04 16:21:50 hrs Exp $ -->
 
 <html>
 &header;
diff --git a/ja/releases/4.0R/notes.sgml b/ja/releases/4.0R/notes.sgml
index 35e9fbc27c..1b289eeddc 100644
--- a/ja/releases/4.0R/notes.sgml
+++ b/ja/releases/4.0R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.0R/notes.sgml,v 1.6 2002/03/28 14:50:57 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.0R/notes.sgml,v 1.7 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 4.0 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/4.0R/notes.sgml,v 1.6 2002/03/28 14:50:57 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/4.0R/notes.sgml,v 1.7 2005/10/04 16:21:50 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.4 -->
 <html>
diff --git a/ja/releases/4.1.1R/announce.sgml b/ja/releases/4.1.1R/announce.sgml
index 0218f777e6..cc7ae39054 100644
--- a/ja/releases/4.1.1R/announce.sgml
+++ b/ja/releases/4.1.1R/announce.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.1.1R/announce.sgml,v 1.3 2002/03/28 14:50:57 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.1.1R/announce.sgml,v 1.4 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 4.1.1 Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
-<!-- $FreeBSD: www/ja/releases/4.1.1R/announce.sgml,v 1.3 2002/03/28 14:50:57 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/4.1.1R/announce.sgml,v 1.4 2005/10/04 16:21:50 hrs Exp $ -->
 <html>
 &header;
 
diff --git a/ja/releases/4.1.1R/errata.sgml b/ja/releases/4.1.1R/errata.sgml
index d9b40def84..deaf9f2132 100644
--- a/ja/releases/4.1.1R/errata.sgml
+++ b/ja/releases/4.1.1R/errata.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.1.1R/errata.sgml,v 1.4 2002/03/28 14:50:57 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.1.1R/errata.sgml,v 1.5 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 4.1.1 Errata Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
-<!-- $FreeBSD: www/ja/releases/4.1.1R/errata.sgml,v 1.4 2002/03/28 14:50:57 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/4.1.1R/errata.sgml,v 1.5 2005/10/04 16:21:50 hrs Exp $ -->
 
 <html>
 &header;
diff --git a/ja/releases/4.1.1R/notes.sgml b/ja/releases/4.1.1R/notes.sgml
index a6ff3dba16..48dc16ba70 100644
--- a/ja/releases/4.1.1R/notes.sgml
+++ b/ja/releases/4.1.1R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.1.1R/notes.sgml,v 1.5 2002/03/28 14:50:57 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.1.1R/notes.sgml,v 1.6 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 4.1.1 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/4.1.1R/notes.sgml,v 1.5 2002/03/28 14:50:57 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/4.1.1R/notes.sgml,v 1.6 2005/10/04 16:21:50 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.4 -->
 <html>
diff --git a/ja/releases/4.10R/announce.sgml b/ja/releases/4.10R/announce.sgml
index 1f9cd13de8..fc2cf91753 100644
--- a/ja/releases/4.10R/announce.sgml
+++ b/ja/releases/4.10R/announce.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.10R/announce.sgml,v 1.1 2004/05/27 07:36:54 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.10R/announce.sgml,v 1.2 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY local.rel "4.10">
 <!ENTITY title "FreeBSD &local.rel;-RELEASE Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/4.10R/hardware.sgml b/ja/releases/4.10R/hardware.sgml
index 1eeccb9583..27d16b1a76 100644
--- a/ja/releases/4.10R/hardware.sgml
+++ b/ja/releases/4.10R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.10R/hardware.sgml,v 1.1 2004/05/27 01:35:33 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.10R/hardware.sgml,v 1.2 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 4.10-RELEASE �ϡ��ɥ������Ρ���">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/4.10R/relnotes.sgml b/ja/releases/4.10R/relnotes.sgml
index 8690dfe79e..23fa75adac 100644
--- a/ja/releases/4.10R/relnotes.sgml
+++ b/ja/releases/4.10R/relnotes.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.10R/relnotes.sgml,v 1.1 2004/05/27 01:35:33 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.10R/relnotes.sgml,v 1.2 2005/10/04 16:21:50 hrs Exp $">
 <!ENTITY title "FreeBSD 4.10-RELEASE ��꡼���Ρ���">
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/4.11R/announce.sgml b/ja/releases/4.11R/announce.sgml
index 1ac668ca2f..ccb5273755 100644
--- a/ja/releases/4.11R/announce.sgml
+++ b/ja/releases/4.11R/announce.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.11R/announce.sgml,v 1.1 2005/02/02 19:15:15 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.11R/announce.sgml,v 1.2 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY local.rel "4.11">
 <!ENTITY title "FreeBSD &local.rel;-RELEASE Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
diff --git a/ja/releases/4.11R/hardware.sgml b/ja/releases/4.11R/hardware.sgml
index 2e561b1181..732f6e9574 100644
--- a/ja/releases/4.11R/hardware.sgml
+++ b/ja/releases/4.11R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.11R/hardware.sgml,v 1.2 2005/03/06 15:09:03 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.11R/hardware.sgml,v 1.3 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.11-RELEASE �ϡ��ɥ������Ρ���">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/4.11R/relnotes.sgml b/ja/releases/4.11R/relnotes.sgml
index ae3517b7a9..d4e017f080 100644
--- a/ja/releases/4.11R/relnotes.sgml
+++ b/ja/releases/4.11R/relnotes.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.11R/relnotes.sgml,v 1.2 2005/02/07 02:07:57 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.11R/relnotes.sgml,v 1.3 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.11-RELEASE ��꡼���Ρ���">
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/4.1R/announce.sgml b/ja/releases/4.1R/announce.sgml
index 79338e8597..ebe94164f1 100644
--- a/ja/releases/4.1R/announce.sgml
+++ b/ja/releases/4.1R/announce.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.1R/announce.sgml,v 1.6 2002/03/28 14:50:57 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.1R/announce.sgml,v 1.7 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.1 Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.3 -->
-<!-- $FreeBSD: www/ja/releases/4.1R/announce.sgml,v 1.6 2002/03/28 14:50:57 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/4.1R/announce.sgml,v 1.7 2005/10/04 16:21:51 hrs Exp $ -->
 <html>
 &header;
 
diff --git a/ja/releases/4.1R/errata.sgml b/ja/releases/4.1R/errata.sgml
index 962fd02c11..2a6e653831 100644
--- a/ja/releases/4.1R/errata.sgml
+++ b/ja/releases/4.1R/errata.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.1R/errata.sgml,v 1.5 2002/03/28 14:50:57 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.1R/errata.sgml,v 1.6 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.1 Errata Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.3 -->
-<!-- $FreeBSD: www/ja/releases/4.1R/errata.sgml,v 1.5 2002/03/28 14:50:57 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/4.1R/errata.sgml,v 1.6 2005/10/04 16:21:51 hrs Exp $ -->
 
 <html>
 &header;
diff --git a/ja/releases/4.1R/notes.sgml b/ja/releases/4.1R/notes.sgml
index 71593fad07..d009ee1b38 100644
--- a/ja/releases/4.1R/notes.sgml
+++ b/ja/releases/4.1R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.1R/notes.sgml,v 1.6 2002/03/28 14:50:57 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.1R/notes.sgml,v 1.7 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.1 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/4.1R/notes.sgml,v 1.6 2002/03/28 14:50:57 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/4.1R/notes.sgml,v 1.7 2005/10/04 16:21:51 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.3 -->
 <html>
diff --git a/ja/releases/4.2R/announce.sgml b/ja/releases/4.2R/announce.sgml
index 877baaf013..0980b8fe5a 100644
--- a/ja/releases/4.2R/announce.sgml
+++ b/ja/releases/4.2R/announce.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.2R/announce.sgml,v 1.3 2002/03/28 14:50:57 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.2R/announce.sgml,v 1.4 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.2 Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
-<!-- $FreeBSD: www/ja/releases/4.2R/announce.sgml,v 1.3 2002/03/28 14:50:57 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/4.2R/announce.sgml,v 1.4 2005/10/04 16:21:51 hrs Exp $ -->
 
 <html>
 &header;
diff --git a/ja/releases/4.2R/errata.sgml b/ja/releases/4.2R/errata.sgml
index 328b63fc6e..8a429aa2e4 100644
--- a/ja/releases/4.2R/errata.sgml
+++ b/ja/releases/4.2R/errata.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.2R/errata.sgml,v 1.3 2002/03/28 14:50:57 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.2R/errata.sgml,v 1.4 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.2 Errata Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
-<!-- $FreeBSD: www/ja/releases/4.2R/errata.sgml,v 1.3 2002/03/28 14:50:57 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/4.2R/errata.sgml,v 1.4 2005/10/04 16:21:51 hrs Exp $ -->
 
 <html>
 &header;
diff --git a/ja/releases/4.2R/notes.sgml b/ja/releases/4.2R/notes.sgml
index 8af0adc0ca..91132523dd 100644
--- a/ja/releases/4.2R/notes.sgml
+++ b/ja/releases/4.2R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.2R/notes.sgml,v 1.3 2002/03/28 14:50:57 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.2R/notes.sgml,v 1.4 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.2 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/4.2R/notes.sgml,v 1.3 2002/03/28 14:50:57 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/4.2R/notes.sgml,v 1.4 2005/10/04 16:21:51 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
 <html>
diff --git a/ja/releases/4.3R/announce.sgml b/ja/releases/4.3R/announce.sgml
index fc9e29f5bc..d0ec68b5a0 100644
--- a/ja/releases/4.3R/announce.sgml
+++ b/ja/releases/4.3R/announce.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.3R/announce.sgml,v 1.4 2002/03/28 14:50:57 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.3R/announce.sgml,v 1.5 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.3 Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
-<!-- $FreeBSD: www/ja/releases/4.3R/announce.sgml,v 1.4 2002/03/28 14:50:57 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/4.3R/announce.sgml,v 1.5 2005/10/04 16:21:51 hrs Exp $ -->
 
 <html>
 &header;
diff --git a/ja/releases/4.3R/errata.sgml b/ja/releases/4.3R/errata.sgml
index 9c4cc098c3..b0b0e9db4a 100644
--- a/ja/releases/4.3R/errata.sgml
+++ b/ja/releases/4.3R/errata.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.3R/errata.sgml,v 1.9 2002/03/28 14:50:58 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.3R/errata.sgml,v 1.10 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.3 Errata Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.18 -->
-<!-- $FreeBSD: www/ja/releases/4.3R/errata.sgml,v 1.9 2002/03/28 14:50:58 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/4.3R/errata.sgml,v 1.10 2005/10/04 16:21:51 hrs Exp $ -->
 
 <html>
 &header;
diff --git a/ja/releases/4.3R/notes.sgml b/ja/releases/4.3R/notes.sgml
index a0199caeb6..64e023e12b 100644
--- a/ja/releases/4.3R/notes.sgml
+++ b/ja/releases/4.3R/notes.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.3R/notes.sgml,v 1.4 2002/03/28 14:50:58 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.3R/notes.sgml,v 1.5 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.3 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/4.3R/notes.sgml,v 1.4 2002/03/28 14:50:58 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/4.3R/notes.sgml,v 1.5 2005/10/04 16:21:51 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.3 -->
 
diff --git a/ja/releases/4.4R/announce.sgml b/ja/releases/4.4R/announce.sgml
index 313eb21087..3a44534532 100644
--- a/ja/releases/4.4R/announce.sgml
+++ b/ja/releases/4.4R/announce.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.4R/announce.sgml,v 1.3 2002/03/28 14:50:58 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.4R/announce.sgml,v 1.4 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.4 Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.4 -->
-<!-- $FreeBSD: www/ja/releases/4.4R/announce.sgml,v 1.3 2002/03/28 14:50:58 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/4.4R/announce.sgml,v 1.4 2005/10/04 16:21:51 hrs Exp $ -->
 <html>
 &header;
 
diff --git a/ja/releases/4.4R/notes.sgml b/ja/releases/4.4R/notes.sgml
index cdb6a79d8d..625183cc3e 100644
--- a/ja/releases/4.4R/notes.sgml
+++ b/ja/releases/4.4R/notes.sgml
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.4R/notes.sgml,v 1.3 2002/03/28 14:50:58 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.4R/notes.sgml,v 1.4 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.4 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.3 -->
-<!-- $FreeBSD: www/ja/releases/4.4R/notes.sgml,v 1.3 2002/03/28 14:50:58 hanai Exp $ -->
+<!-- $FreeBSD: www/ja/releases/4.4R/notes.sgml,v 1.4 2005/10/04 16:21:51 hrs Exp $ -->
 <html>
   &header;
 
diff --git a/ja/releases/4.5R/announce.sgml b/ja/releases/4.5R/announce.sgml
index 910cd8292d..f5ad30e7df 100644
--- a/ja/releases/4.5R/announce.sgml
+++ b/ja/releases/4.5R/announce.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.5R/announce.sgml,v 1.4 2002/05/13 20:09:04 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.5R/announce.sgml,v 1.5 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.5 Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.3 -->
diff --git a/ja/releases/4.5R/contents.sgml b/ja/releases/4.5R/contents.sgml
index e95adb3120..b0f411ca40 100644
--- a/ja/releases/4.5R/contents.sgml
+++ b/ja/releases/4.5R/contents.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY enbase CDATA "../../..">
 <!ENTITY email 'freebsd-qa'>
-<!ENTITY date "$FreeBSD: www/ja/releases/4.5R/contents.sgml,v 1.2 2002/03/28 14:50:58 hanai Exp $ ">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.5R/contents.sgml,v 1.3 2005/10/04 16:21:51 hrs Exp $ ">
 <!ENTITY title "FreeBSD 4.5 Contents">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/4.5R/hardware.sgml b/ja/releases/4.5R/hardware.sgml
index 02da5fba23..eaffaf609f 100644
--- a/ja/releases/4.5R/hardware.sgml
+++ b/ja/releases/4.5R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.5R/hardware.sgml,v 1.4 2002/06/23 20:44:39 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.5R/hardware.sgml,v 1.5 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.5 Hardware Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
diff --git a/ja/releases/4.5R/notes.sgml b/ja/releases/4.5R/notes.sgml
index 76f694a5e4..fad1d6d498 100644
--- a/ja/releases/4.5R/notes.sgml
+++ b/ja/releases/4.5R/notes.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.5R/notes.sgml,v 1.3 2002/03/28 14:50:58 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.5R/notes.sgml,v 1.4 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.5 Release Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
diff --git a/ja/releases/4.5R/qa.sgml b/ja/releases/4.5R/qa.sgml
index 847eb19ff4..24ef42edaa 100644
--- a/ja/releases/4.5R/qa.sgml
+++ b/ja/releases/4.5R/qa.sgml
@@ -1,14 +1,13 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.5R/qa.sgml,v 1.2 2002/02/27 02:20:13 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.5R/qa.sgml,v 1.3 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "Testing Guide for 4.5-RELEASE">
 <!ENTITY email "qa">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.5 -->
-<!-- $FreeBSD: www/ja/releases/4.5R/qa.sgml,v 1.2 2002/02/27 02:20:13 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/releases/4.5R/qa.sgml,v 1.3 2005/10/04 16:21:51 hrs Exp $ -->
 <html>
   &header;
 
diff --git a/ja/releases/4.5R/schedule.sgml b/ja/releases/4.5R/schedule.sgml
index 23478cf2c4..57dbde694f 100644
--- a/ja/releases/4.5R/schedule.sgml
+++ b/ja/releases/4.5R/schedule.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
 <!ENTITY email 'freebsd-qa'>
-<!ENTITY date "$FreeBSD: www/ja/releases/4.5R/schedule.sgml,v 1.1 2002/03/07 03:22:00 kuriyama Exp $ ">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.5R/schedule.sgml,v 1.2 2005/10/04 16:21:51 hrs Exp $ ">
 <!ENTITY title "FreeBSD 4.5 Release Process">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/4.6.2R/announce.sgml b/ja/releases/4.6.2R/announce.sgml
index ba1cab63a7..7e049d82e2 100644
--- a/ja/releases/4.6.2R/announce.sgml
+++ b/ja/releases/4.6.2R/announce.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.6.2R/announce.sgml,v 1.3 2004/02/17 15:57:20 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.6.2R/announce.sgml,v 1.4 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.6.2-RELEASE Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.3 -->
diff --git a/ja/releases/4.6.2R/hardware.sgml b/ja/releases/4.6.2R/hardware.sgml
index 52a10d95c3..5d59a808e8 100644
--- a/ja/releases/4.6.2R/hardware.sgml
+++ b/ja/releases/4.6.2R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.6.2R/hardware.sgml,v 1.1 2002/08/17 20:31:10 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.6.2R/hardware.sgml,v 1.2 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.6.2-RELEASE Hardware Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/4.6.2R/relnotes.sgml b/ja/releases/4.6.2R/relnotes.sgml
index 9667f64e55..2e76d28975 100644
--- a/ja/releases/4.6.2R/relnotes.sgml
+++ b/ja/releases/4.6.2R/relnotes.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.6.2R/relnotes.sgml,v 1.1 2002/08/17 20:31:10 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.6.2R/relnotes.sgml,v 1.2 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.6.2 Release Notes">
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/4.6R/announce.sgml b/ja/releases/4.6R/announce.sgml
index 4ce700b214..880c880faa 100644
--- a/ja/releases/4.6R/announce.sgml
+++ b/ja/releases/4.6R/announce.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.6R/announce.sgml,v 1.3 2004/02/17 15:57:21 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.6R/announce.sgml,v 1.4 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.6-RELEASE Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
diff --git a/ja/releases/4.6R/hardware.sgml b/ja/releases/4.6R/hardware.sgml
index 658ebbecd9..b000502f7f 100644
--- a/ja/releases/4.6R/hardware.sgml
+++ b/ja/releases/4.6R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.6R/hardware.sgml,v 1.1 2002/06/23 20:44:39 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.6R/hardware.sgml,v 1.2 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.6 Hardware Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/4.6R/relnotes.sgml b/ja/releases/4.6R/relnotes.sgml
index 9871d03da4..f9538ae0a7 100644
--- a/ja/releases/4.6R/relnotes.sgml
+++ b/ja/releases/4.6R/relnotes.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.6R/relnotes.sgml,v 1.1 2002/06/23 20:44:39 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.6R/relnotes.sgml,v 1.2 2005/10/04 16:21:51 hrs Exp $">
 <!ENTITY title "FreeBSD 4.6 Release Notes">
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/4.7R/announce.sgml b/ja/releases/4.7R/announce.sgml
index 5cdb18d63a..f078f7f69c 100644
--- a/ja/releases/4.7R/announce.sgml
+++ b/ja/releases/4.7R/announce.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.7R/announce.sgml,v 1.3 2004/02/17 15:57:21 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.7R/announce.sgml,v 1.4 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 4.7-RELEASE Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
diff --git a/ja/releases/4.7R/hardware.sgml b/ja/releases/4.7R/hardware.sgml
index e5975d459e..8c42a12d29 100644
--- a/ja/releases/4.7R/hardware.sgml
+++ b/ja/releases/4.7R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.7R/hardware.sgml,v 1.1 2002/11/02 08:24:19 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.7R/hardware.sgml,v 1.2 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 4.7 Hardware Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/4.7R/relnotes.sgml b/ja/releases/4.7R/relnotes.sgml
index 826dc899b2..6a69fffea4 100644
--- a/ja/releases/4.7R/relnotes.sgml
+++ b/ja/releases/4.7R/relnotes.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.7R/relnotes.sgml,v 1.1 2002/11/02 08:24:19 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.7R/relnotes.sgml,v 1.2 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 4.7 Release Notes">
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/4.8R/announce.sgml b/ja/releases/4.8R/announce.sgml
index ef4edda642..fc863d76b6 100644
--- a/ja/releases/4.8R/announce.sgml
+++ b/ja/releases/4.8R/announce.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.8R/announce.sgml,v 1.2 2004/02/17 15:57:21 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.8R/announce.sgml,v 1.3 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY local.rel "4.8">
 <!ENTITY title "FreeBSD &local.rel;-RELEASE Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/4.8R/hardware.sgml b/ja/releases/4.8R/hardware.sgml
index f6ce9c3cf6..594c2562d2 100644
--- a/ja/releases/4.8R/hardware.sgml
+++ b/ja/releases/4.8R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.8R/hardware.sgml,v 1.1 2003/03/24 21:37:13 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.8R/hardware.sgml,v 1.2 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 4.8 Hardware Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/4.8R/relnotes.sgml b/ja/releases/4.8R/relnotes.sgml
index 251879797e..77fc267471 100644
--- a/ja/releases/4.8R/relnotes.sgml
+++ b/ja/releases/4.8R/relnotes.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.8R/relnotes.sgml,v 1.1 2003/03/24 21:37:13 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.8R/relnotes.sgml,v 1.2 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 4.8 Release Notes">
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/4.9R/announce.sgml b/ja/releases/4.9R/announce.sgml
index 218ddc515f..9b4c8b9705 100644
--- a/ja/releases/4.9R/announce.sgml
+++ b/ja/releases/4.9R/announce.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.9R/announce.sgml,v 1.3 2004/02/17 15:57:21 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.9R/announce.sgml,v 1.4 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY local.rel "4.9">
 <!ENTITY title "FreeBSD &local.rel;-RELEASE Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
diff --git a/ja/releases/4.9R/hardware.sgml b/ja/releases/4.9R/hardware.sgml
index e6bef01361..743672d6cb 100644
--- a/ja/releases/4.9R/hardware.sgml
+++ b/ja/releases/4.9R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.9R/hardware.sgml,v 1.1 2003/10/26 23:58:58 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.9R/hardware.sgml,v 1.2 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 4.9-RELEASE �ϡ��ɥ������Ρ���">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/4.9R/relnotes.sgml b/ja/releases/4.9R/relnotes.sgml
index 9da7b8eef8..aaeaace943 100644
--- a/ja/releases/4.9R/relnotes.sgml
+++ b/ja/releases/4.9R/relnotes.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/4.9R/relnotes.sgml,v 1.2 2003/10/29 10:36:27 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.9R/relnotes.sgml,v 1.3 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 4.9-RELEASE ��꡼���Ρ���">
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/5.0R/announce.sgml b/ja/releases/5.0R/announce.sgml
index 170f29d1e7..923235f92d 100644
--- a/ja/releases/5.0R/announce.sgml
+++ b/ja/releases/5.0R/announce.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/5.0R/announce.sgml,v 1.2 2004/02/17 15:57:21 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/5.0R/announce.sgml,v 1.3 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 5.0-RELEASE Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.3 -->
diff --git a/ja/releases/5.0R/hardware.sgml b/ja/releases/5.0R/hardware.sgml
index 541a29ab8e..42e4f89789 100644
--- a/ja/releases/5.0R/hardware.sgml
+++ b/ja/releases/5.0R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/5.0R/hardware.sgml,v 1.1 2003/01/22 04:11:07 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/5.0R/hardware.sgml,v 1.2 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 5.0-RELEASE Hardware Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.3 -->
diff --git a/ja/releases/5.0R/installation.sgml b/ja/releases/5.0R/installation.sgml
index 390607145c..111b8b0582 100644
--- a/ja/releases/5.0R/installation.sgml
+++ b/ja/releases/5.0R/installation.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/5.0R/installation.sgml,v 1.1 2003/01/22 04:11:07 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/5.0R/installation.sgml,v 1.2 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 5.0-RELEASE Installation Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.3 -->
diff --git a/ja/releases/5.0R/relnotes.sgml b/ja/releases/5.0R/relnotes.sgml
index c5ca2a83f4..51ff4e8556 100644
--- a/ja/releases/5.0R/relnotes.sgml
+++ b/ja/releases/5.0R/relnotes.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/5.0R/relnotes.sgml,v 1.1 2003/01/22 04:11:07 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/5.0R/relnotes.sgml,v 1.2 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 5.0-RELEASE Release Notes">
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
diff --git a/ja/releases/5.1R/announce.sgml b/ja/releases/5.1R/announce.sgml
index 6edb741077..ae05051b98 100644
--- a/ja/releases/5.1R/announce.sgml
+++ b/ja/releases/5.1R/announce.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/5.1R/announce.sgml,v 1.3 2004/02/17 15:57:21 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/5.1R/announce.sgml,v 1.4 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 5.1-RELEASE Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 <!-- Original revision: 1.1 -->
 ]>
 <html>
diff --git a/ja/releases/5.1R/hardware.sgml b/ja/releases/5.1R/hardware.sgml
index 308a704be0..a91c446e94 100644
--- a/ja/releases/5.1R/hardware.sgml
+++ b/ja/releases/5.1R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/5.1R/hardware.sgml,v 1.1 2003/06/09 23:12:42 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/5.1R/hardware.sgml,v 1.2 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 5.1-RELEASE Hardware Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
diff --git a/ja/releases/5.1R/installation.sgml b/ja/releases/5.1R/installation.sgml
index ff00b60f1a..4c69d4f63b 100644
--- a/ja/releases/5.1R/installation.sgml
+++ b/ja/releases/5.1R/installation.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/5.1R/installation.sgml,v 1.1 2003/06/09 23:12:42 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/5.1R/installation.sgml,v 1.2 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 5.1-RELEASE Installation Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
diff --git a/ja/releases/5.1R/relnotes.sgml b/ja/releases/5.1R/relnotes.sgml
index 9ce816cca3..73ddfa1f97 100644
--- a/ja/releases/5.1R/relnotes.sgml
+++ b/ja/releases/5.1R/relnotes.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/5.1R/relnotes.sgml,v 1.1 2003/06/09 23:12:42 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/5.1R/relnotes.sgml,v 1.2 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 5.1-RELEASE Release Notes">
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
diff --git a/ja/releases/5.2.1R/announce.sgml b/ja/releases/5.2.1R/announce.sgml
index a93dc964cc..ac660c5d40 100644
--- a/ja/releases/5.2.1R/announce.sgml
+++ b/ja/releases/5.2.1R/announce.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/5.2.1R/announce.sgml,v 1.1 2004/03/05 04:29:47 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/5.2.1R/announce.sgml,v 1.2 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 5.2.1-RELEASE Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
diff --git a/ja/releases/5.2.1R/hardware.sgml b/ja/releases/5.2.1R/hardware.sgml
index 15b82dcd64..f55e579fe7 100644
--- a/ja/releases/5.2.1R/hardware.sgml
+++ b/ja/releases/5.2.1R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/5.2.1R/hardware.sgml,v 1.1 2004/03/05 04:29:47 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/5.2.1R/hardware.sgml,v 1.2 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 5.2.1-RELEASE Hardware Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/5.2.1R/relnotes.sgml b/ja/releases/5.2.1R/relnotes.sgml
index 183f360245..9001a2b8f4 100644
--- a/ja/releases/5.2.1R/relnotes.sgml
+++ b/ja/releases/5.2.1R/relnotes.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/5.2.1R/relnotes.sgml,v 1.1 2004/03/05 04:29:47 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/5.2.1R/relnotes.sgml,v 1.2 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 5.2.1-RELEASE Release Notes">
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/5.2R/announce.sgml b/ja/releases/5.2R/announce.sgml
index ecf38a4505..0f7b4bef3e 100644
--- a/ja/releases/5.2R/announce.sgml
+++ b/ja/releases/5.2R/announce.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/5.2R/announce.sgml,v 1.4 2004/02/17 15:57:21 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/5.2R/announce.sgml,v 1.5 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 5.2-RELEASE Announcement">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 <!-- Original revision: 1.4 -->
 ]>
 <html>
diff --git a/ja/releases/5.2R/hardware.sgml b/ja/releases/5.2R/hardware.sgml
index d478c01928..aca16401f8 100644
--- a/ja/releases/5.2R/hardware.sgml
+++ b/ja/releases/5.2R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/5.2R/hardware.sgml,v 1.3 2004/01/14 19:01:51 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/5.2R/hardware.sgml,v 1.4 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 5.2-RELEASE Hardware Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/5.2R/relnotes.sgml b/ja/releases/5.2R/relnotes.sgml
index 2ea788d28a..a66fb43085 100644
--- a/ja/releases/5.2R/relnotes.sgml
+++ b/ja/releases/5.2R/relnotes.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/5.2R/relnotes.sgml,v 1.2 2004/01/14 19:01:51 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/5.2R/relnotes.sgml,v 1.3 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 5.2-RELEASE Release Notes">
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/5.3R/hardware.sgml b/ja/releases/5.3R/hardware.sgml
index 99e3d80dfc..4314ea19b9 100644
--- a/ja/releases/5.3R/hardware.sgml
+++ b/ja/releases/5.3R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/5.3R/hardware.sgml,v 1.1 2005/02/28 17:46:22 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/5.3R/hardware.sgml,v 1.2 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 5.3-RELEASE Hardware Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/5.4R/hardware.sgml b/ja/releases/5.4R/hardware.sgml
index 6ca23071ce..95959859c4 100644
--- a/ja/releases/5.4R/hardware.sgml
+++ b/ja/releases/5.4R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/5.4R/hardware.sgml,v 1.1 2005/06/28 16:39:01 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/5.4R/hardware.sgml,v 1.2 2005/10/04 16:21:52 hrs Exp $">
 <!ENTITY title "FreeBSD 5.4-RELEASE Hardware Notes">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
diff --git a/ja/releases/index.sgml b/ja/releases/index.sgml
index 6f3c5e04d1..e924bf5a55 100644
--- a/ja/releases/index.sgml
+++ b/ja/releases/index.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/releases/index.sgml,v 1.74 2005/10/04 16:21:48 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/index.sgml,v 1.75 2005/12/15 09:16:25 rushani Exp $">
 <!ENTITY title "Release Information">
-<!ENTITY % navincludes SYSTEM "../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/index.sgml,v 1.74 2005/10/04 16:21:48 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/releases/index.sgml,v 1.75 2005/12/15 09:16:25 rushani Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.107 -->
 
diff --git a/ja/releases/snapshots.sgml b/ja/releases/snapshots.sgml
index 2befcd2ba4..c170a25601 100644
--- a/ja/releases/snapshots.sgml
+++ b/ja/releases/snapshots.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/releases/snapshots.sgml,v 1.14 2003/01/22 04:11:07 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/snapshots.sgml,v 1.15 2005/10/04 16:21:48 hrs Exp $">
 <!ENTITY title "FreeBSD Snapshot Releases">
-<!ENTITY % navincludes SYSTEM "../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/releases/snapshots.sgml,v 1.14 2003/01/22 04:11:07 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/releases/snapshots.sgml,v 1.15 2005/10/04 16:21:48 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.16 -->
 
diff --git a/ja/relnotes.sgml b/ja/relnotes.sgml
index 44ad3decdb..bf999d4b28 100644
--- a/ja/relnotes.sgml
+++ b/ja/relnotes.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/relnotes.sgml,v 1.6 2003/07/19 08:45:42 hrs Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ja/relnotes.sgml,v 1.7 2005/10/04 16:21:45 hrs Exp $">
 <!ENTITY title "Release Documentation">
-<!ENTITY % navincludes SYSTEM "includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.9 -->
diff --git a/ja/search/index-site.sgml b/ja/search/index-site.sgml
index 8f4048eced..11c6884088 100644
--- a/ja/search/index-site.sgml
+++ b/ja/search/index-site.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/search/index-site.sgml,v 1.17 2003/10/12 10:52:33 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/search/index-site.sgml,v 1.18 2004/12/09 19:48:57 rushani Exp $">
 <!ENTITY title "Site Map and Index of http://www.FreeBSD.org">
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY atoz SYSTEM "atoz.sgml">
 <!ENTITY site SYSTEM "site.sgml">
 ]>
diff --git a/ja/search/search-mid.sgml b/ja/search/search-mid.sgml
index 585e804879..1c78be7a8f 100644
--- a/ja/search/search-mid.sgml
+++ b/ja/search/search-mid.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/search/search-mid.sgml,v 1.12 2002/03/06 01:58:45 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/search/search-mid.sgml,v 1.13 2002/05/13 20:09:05 hrs Exp $">
 <!ENTITY title "Mailing list Message-ID Search">
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
diff --git a/ja/search/search.sgml b/ja/search/search.sgml
index 1c2ef9002f..4820eb96f6 100644
--- a/ja/search/search.sgml
+++ b/ja/search/search.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/search/search.sgml,v 1.42 2003/11/17 20:23:59 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/search/search.sgml,v 1.43 2004/01/10 18:38:00 rushani Exp $">
 <!ENTITY title "Search">
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.93 -->
diff --git a/ja/search/searchhints.sgml b/ja/search/searchhints.sgml
index a2374144fb..1c8ae94800 100644
--- a/ja/search/searchhints.sgml
+++ b/ja/search/searchhints.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/search/searchhints.sgml,v 1.10 2002/05/13 20:09:05 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/search/searchhints.sgml,v 1.11 2003/06/10 15:32:57 rushani Exp $">
 <!ENTITY title "Searching Hints">
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSS Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
diff --git a/ja/security/Makefile b/ja/security/Makefile
index 1d3f0317c9..cab4c79cd3 100644
--- a/ja/security/Makefile
+++ b/ja/security/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/ja/security/Makefile,v 1.16 2004/01/10 18:38:00 rushani Exp $
+# $FreeBSD: www/ja/security/Makefile,v 1.17 2004/01/19 17:19:34 hrs Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.11
 
@@ -14,16 +14,16 @@ DOCS+=	security.sgml
 
 INDEXLINK= security.html
 
+security.html: advisories.html.inc
+
+DEPENDSET.DEFAULT=	advisories
+XML.DEFAULT=		${XML_ADVISORIES}
+
+XMLDOCS=	advisories:mkindex.xsl::advisories.html.inc
+NO_DATA.advisories=	yes
+NO_TIDY.advisories=	yes
+
 ### Revision checking
 REVCHECK=	YES
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
-
-CLEANFILES+= advisories.html.inc
-
-security.html: advisories.html.inc
-
-advisories.html.inc: mkindex.xsl ${XML_ADVISORIES} ${XML_INCLUDES}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param "advisories.xml" "'${XML_ADVISORIES}'" \
-		${.CURDIR}/mkindex.xsl ${XML_ADVISORIES}
diff --git a/ja/security/mkindex.xsl b/ja/security/mkindex.xsl
index 97f58ca3c1..64775ee982 100644
--- a/ja/security/mkindex.xsl
+++ b/ja/security/mkindex.xsl
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="EUC-JP" ?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+<!ENTITY base ".">
+<!ENTITY title "">
+]>
 
-<!-- $FreeBSD: www/ja/security/mkindex.xsl,v 1.1 2003/10/11 07:12:37 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/security/mkindex.xsl,v 1.2 2004/01/19 17:19:34 hrs Exp $ -->
 <!-- Original revision: 1.4 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   
-  <xsl:import href="../includes.xsl"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/ja/security/mkindex.xsl,v 1.2 2004/01/19 17:19:34 hrs Exp $'"/>
 
-  <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/ja/security/mkindex.xsl,v 1.1 2003/10/11 07:12:37 hrs Exp $'"/>
-  <xsl:variable name="title" select="'untitled'"/>
-
-  <xsl:output type="xml" encoding="euc-jp"
+  <xsl:output type="xml" encoding="&xml.encoding;"
               omit-xml-declaration="yes" />
 
   <xsl:template match="/">
diff --git a/ja/security/security.sgml b/ja/security/security.sgml
index 40dd916a41..50c55b95bd 100644
--- a/ja/security/security.sgml
+++ b/ja/security/security.sgml
@@ -1,12 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/security/security.sgml,v 1.83 2004/01/14 19:49:53 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/security/security.sgml,v 1.84 2005/10/04 16:21:53 hrs Exp $">
 <!ENTITY title "FreeBSD Security Information">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 <!ENTITY advisories.html.inc SYSTEM "advisories.html.inc">
 ]>
-<!-- $FreeBSD: www/ja/security/security.sgml,v 1.83 2004/01/14 19:49:53 rushani Exp $ -->
+<!-- $FreeBSD: www/ja/security/security.sgml,v 1.84 2005/10/04 16:21:53 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.150 -->
 
diff --git a/ja/send-pr.sgml b/ja/send-pr.sgml
index b44ce03042..0a8d992bd2 100644
--- a/ja/send-pr.sgml
+++ b/ja/send-pr.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/send-pr.sgml,v 1.25 2004/11/17 21:53:11 rushani Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ja/send-pr.sgml,v 1.26 2005/10/04 16:21:45 hrs Exp $">
 <!ENTITY title "Submit a FreeBSD problem report">
 <!ENTITY copyright "This gnats pr-submission mechanism Copyright &copy; 1996
  The NetBSD Foundation, Inc.  ALL RIGHTS RESERVED.">
- <!ENTITY % navincludes SYSTEM "includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+ <!ENTITY % navinclude.support "INCLUDE">
 <!ENTITY bugbusters "bugbusters@FreeBSD.org">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
diff --git a/ja/share/sgml/catalog b/ja/share/sgml/catalog
new file mode 100644
index 0000000000..bae3bb06c0
--- /dev/null
+++ b/ja/share/sgml/catalog
@@ -0,0 +1,12 @@
+--
+ $FreeBSD$
+--
+
+PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+       "l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
+       "header.l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
+       "navibar.l10n.ent"
diff --git a/ja/share/sgml/catalog.xml b/ja/share/sgml/catalog.xml
new file mode 100644
index 0000000000..12c0f02504
--- /dev/null
+++ b/ja/share/sgml/catalog.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+                 rewritePrefix="../../"/>
+  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+              rewritePrefix="../../"/>
+</catalog>
diff --git a/ja/share/sgml/header.l10n.ent b/ja/share/sgml/header.l10n.ent
new file mode 100644
index 0000000000..c84486d023
--- /dev/null
+++ b/ja/share/sgml/header.l10n.ent
@@ -0,0 +1,49 @@
+<?xml version='1.0' encoding='euc-jp'?>
+<!-- $FreeBSD$ -->
+
+<!-- FreeBSD HTML Header L10N Entities -->
+<!-- PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN" -->
+
+<!-- The FreeBSD Japanese Documentation Project -->
+<!-- Original revision: -->
+
+<!ENTITY copyright '<a href="&base;/copyright/">��Ū�⻺���ˤĤ���</a> | &copy; 1995-2006 The FreeBSD Project.  All rights reserved.'>
+<!ENTITY author '<a href="&base;/index.html">�ۡ���</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">Ϣ����</a> &nbsp; | &nbsp; <a href="&base;/copyright/index.html">��Ū�⻺���ˤĤ���</a> &nbsp; | &nbsp; &copyright;'>
+
+<!ENTITY header2.word.search '����'>
+<!ENTITY header2.word.textsize 'ʸ��������'>
+<!ENTITY header2.word.normaltextsize 'Normal Text Size'>
+<!ENTITY header2.word.largetextsize 'Large Text Size'>
+<!ENTITY header2.word.normal '��'>
+<!ENTITY header2.word.large '��'>
+<!ENTITY header2.word.donate '���ա���£'>
+<!ENTITY header2.word.contact 'Ϣ����'>
+
+<!ENTITY header2.topnav '
+  <h2 class="blockhide">Site Navigation</h2>
+
+  <div id="TOPNAV">
+    <ul id="TOPNAVLIST">
+      <li><a href="&base;/" title="Home">�ۡ���</a></li>
+      <li><a href="&base;/about.html" title="About">FreeBSD �Ȥ�</a></li>
+      <li><a href="&base;/where.html" title="Get FreeBSD">FreeBSD ������</a></li>
+      <li><a href="&base;/docs.html" title="�ɥ������">�ɥ������</a></li>
+      <li><a href="&base;/community.html" title="Community">���ߥ�˥ƥ�</a></li>
+      <li><a href="&base;/projects/index.html" title="��ȯ">��ȯ</a></li>
+      <li><a href="&base;/support.html" title="���ݡ���">���ݡ���</a></li>
+    </ul>
+  </div> <!-- TOPNAV -->
+'>
+
+<!ENTITY webbuild '
+<p>����ʸ��ϡ�FreeBSD Web �ڡ������ư�� CVS
+��ݥ��ȥ꤫�鹽�ۤ��ƹ���������ˡ����⤷�Ƥ��ޤ���</p>'>
+
+<!--
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
+-->
diff --git a/ja/share/sgml/l10n.ent b/ja/share/sgml/l10n.ent
new file mode 100644
index 0000000000..6cff09bb31
--- /dev/null
+++ b/ja/share/sgml/l10n.ent
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='euc-jp'?>
+<!-- $FreeBSD$ -->
+<!-- The FreeBSD Japanese Documentation Project -->
+<!-- Original revision: 1.62 -->
+
+<!ENTITY url.doc.langcode    'ja_JP.eucJP'>
+<!ENTITY xml.encoding        'euc-jp'>
+
+<!ENTITY rel.current.date '2005 ǯ 5 ��'>
+<!ENTITY rel2.current.date '2005 ǯ 1 ��'>
+
+<!-- XXX: portions of &u.rel.*;/*.html for 5.4R are not available at this moment... -->
+<!ENTITY u.rel.notes '&enbase;/releases/&rel.current;R/relnotes.html'>
+<!ENTITY u.rel.announce '&enbase;/releases/&rel.current;R/announce.html'>
+<!ENTITY u.rel.errata '&enbase;/releases/&rel.current;R/errata.html'>
+<!ENTITY u.rel.installation '&enbase;/releases/&rel.current;R/installation.html'>
+<!ENTITY u.rel.readme '&enbase;/releases/&rel.current;R/readme.html'>
+<!ENTITY u.rel.early '&enbase;/releases/&rel.current;R/migration-guide.html'> <!-- TEMP -->
+<!ENTITY u.rel.migration '&enbase;/releases/&rel.current;R/migration-guide.html'>
+
+<!-- Revision checking -->
+
+<!ENTITY % rev.diff "IGNORE">
+<![ %rev.diff; [
+<!ENTITY cvsweb 'http://www.jp.FreeBSD.org/cgi/cvsweb.cgi/'>
+<!ENTITY rev.msg '
+<p>
+(����: �ǿ��� <a href="&file.orgbase;.html">��ʸ</a> �Ȥ�
+<a href="&cvsweb;&file.cvsweb;.diff?r1=&rev.target;&amp;r2=&rev.latest;">
+����</a> ������ޤ���)
+</p>'>
+]]>
+<!ENTITY rev.msg ''>
+
+<!--
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
+-->
diff --git a/ja/share/sgml/libcommon.xsl b/ja/share/sgml/libcommon.xsl
new file mode 100644
index 0000000000..153ce95e73
--- /dev/null
+++ b/ja/share/sgml/libcommon.xsl
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>
+
+  <!-- default format for date string -->
+  <xsl:param name="param-l10n-date-format-YMD"
+             select="'%Y ǯ %M %D ��'" />
+  <xsl:param name="param-l10n-date-format-YM"
+             select="'%Y ǯ %M'" />
+  <xsl:param name="param-l10n-date-format-MD"
+             select="'%M %D ��'" />
+
+  <!-- template: "html-news-list-newsflash-preface" -->
+  <xsl:template name="html-news-list-newsflash-preface">
+    <img src="&base;/gifs/news.jpg" align="right" border="0" width="193"
+      height="144" alt="FreeBSD News"/>
+
+    <p>FreeBSD �ϵ�®��ȯŸ��³���륪�ڥ졼�ƥ��󥰥����ƥ�ʤΤǡ�
+      �ǿ��ο���ˤĤ��ƹԤ��Τ����ݤˤʤ��������ޤ���͡�
+      �����̤ˤʤ뤿��ˡ����Υڡ��������Ū�˥����å�����褦�ˤ��ޤ��礦��
+      <a href="&base;/doc/en_US.ISO8859-1/books/handbook/eresources.html#ERESOURCES-MAIL">
+	freebsd-announce �᡼��󥰥ꥹ��</a>����ɤ���Ȥ褤�����Τ�ޤ���</p>
+
+    <p>���줾��Υץ��������Ȥκǿ�����ϡ����γƥ����֥ڡ�����������������</p>
+
+    <ul>
+      <li><a href="&base;/java/newsflash.html">&java; on FreeBSD</a></li>
+      <li><a href="http://freebsd.kde.org/">KDE on FreeBSD</a></li>
+      <li><a href="&base;/gnome/newsflash.html">GNOME on FreeBSD</a></li>
+    </ul>
+
+    <p>�����ߡ������ƾ���Υ�꡼���ξܺ٤ˤĤ��Ƥϡ�
+      <strong><a href="&base;/releases/index.html">��꡼������</a></strong>
+      �Υڡ�����������������</p>
+
+    <p>FreeBSD �������ƥ�����ˤĤ��Ƥϡ�<a href="&base;/security/#adv">
+	�������ƥ�����</a> �Υڡ�����������������</p>
+  </xsl:template>
+
+  <!-- template: "html-news-list-newsflash-homelink" -->
+  <xsl:template name="html-news-list-newsflash-homelink">
+    <a href="news.html">�˥塼���ڡ���</a>
+  </xsl:template>
+
+  <xsl:template name="html-news-make-olditems-list">
+    <p>���Υ˥塼��:
+      <a href="2002/index.html">2002</a>,
+      <a href="2001/index.html">2001</a>,
+      <a href="2000/index.html">2000</a>,
+      <a href="1999/index.html">1999</a>,
+      <a href="1998/index.html">1998</a>,
+      <a href="1997/index.html">1997</a>,
+      <a href="1996/index.html">1996</a></p>
+  </xsl:template>
+
+  <!-- template: "html-news-list-press-preface" -->
+  <xsl:template name="html-news-list-press-preface">
+    <p>�����˺ܤäƤ��ʤ� FreeBSD �˴�Ϣ�����˥塼��������¸���ʤ顢
+      �桹�������˺ܤ�����褦�˾ܺ٤�
+      <a href="mailto:www@freebsd.org">www@FreeBSD.org</a> �ޤ�
+      (�Ѹ��) ���äƤ���������</p>
+  </xsl:template>
+
+  <!-- for l10n -->
+  <xsl:template name="html-news-month-headings">
+    <xsl:param name="year" />
+    <xsl:param name="month" />
+
+    <xsl:value-of select="concat($year, ' ǯ ', $month)" />
+  </xsl:template>
+
+  <xsl:template name="html-events-list-preface">
+    <p>iCalendar �������б������������塼��������եȥ�������ȤäƤ���ʤ顢
+      ���٥�Ȥ򽸤᤿
+      <a href="&enbase;/events/events.ics">FreeBSD ���٥�ȥ�������</a>
+      �����ѤǤ��ޤ���</p>
+  </xsl:template>
+
+  <xsl:template name="html-events-list-upcoming-heading">
+    <h2 id="upcoming">Current/Upcoming Events:</h2>
+  </xsl:template>
+
+  <xsl:template name="html-events-list-past-heading">
+    <h2 id="past">Past Events:</h2>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/ja/share/sgml/navibar.l10n.ent b/ja/share/sgml/navibar.l10n.ent
new file mode 100644
index 0000000000..319a644f21
--- /dev/null
+++ b/ja/share/sgml/navibar.l10n.ent
@@ -0,0 +1,156 @@
+<?xml version='1.0' encoding='euc-jp'?>
+<!-- $FreeBSD$ -->
+
+<!ENTITY % navinclude.about "IGNORE">
+<![ %navinclude.about; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/about.html">FreeBSD �Ȥ�</a></li>
+<li><a href="&base;/features.html">��ħ</a></li>
+<li><a href="&base;/applications.html">���ץꥱ�������</a></li>
+<li><a href="&base;/internet.html">���󥿡��ͥå�</a></li>
+<li><a href="&enbase;/advocacy/">�ץ��⡼������ư</a></li>
+<li><a href="&enbase;/marketing/">�ޡ����ƥ��󥰳�ư</a></li>
+<li><a href="&base;/news/newsflash.html">�˥塼��</a></li>
+<li><a href="&enbase;/events/events.html">���٥��</a></li>
+<li><a href="&base;/news/press.html">�˥塼������</a></li>
+<li><a href="&enbase;/art.html">����</a></li>
+<li><a href="&enbase;/donations/">���ա���£</a></li>
+<li><a href="&base;/copyright/">ˡΧ������ջ���</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.community "IGNORE">
+<![ %navinclude.community; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/community.html">���ߥ�˥ƥ�</a></li>
+<!--li><a href="&base;/community/mailinglists.html">�᡼��󥰥ꥹ��</a></li>
+<li><a href="&base;/community/irc.html">IRC</a></li>
+<li><a href="&base;/community/newsgroups.html">�˥塼�����롼��</a></li>
+<li><a href="&base;/usergroups.html">�桼�����롼��</a></li>
+<li><a href="&base;/community/webresources.html">�����־�ξ���</a></li-->
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.developers "IGNORE">
+<![ %navinclude.developers; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/projects/index.html">��ȯ��</a></li>
+<li><a href="&enbase;/doc/en_US.ISO8859-1/books/developers-handbook">��ȯ�ԥϥ�ɥ֥å�</a></li>
+<li><a href="&enbase;/doc/&url.doc.langcode;/books/porters-handbook">ports ��ȯ�ԥϥ�ɥ֥å�</a></li>
+<li><a href="&base;/support.html#cvs">CVS ��ݥ��ȥ�</a></li>
+<li><a href="&enbase;/releng/index.html">��꡼�����󥸥˥����</a></li>
+<li><a href="&base;/platforms/">�ץ�åȥե�����</a>
+	<ul>
+		<li><a href="&base;/platforms/alpha.html">alpha</a></li>
+		<li><a href="&base;/platforms/amd64.html">amd64</a></li>
+		<li><a href="&base;/smp/">i386</a></li>
+		<li><a href="&base;/platforms/ia64.html">ia64</a></li>
+		<li><a href="&base;/platforms/pc98.html">pc98</a></li>
+		<li><a href="&base;/platforms/sparc.html">sparc64</a></li>
+	</ul>
+</li>
+<li><a href="&base;/doc/&url.doc.langcode;/articles/contributing/index.html">��ȯ�ؤζ���</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.docs "IGNORE">
+<![ %navinclude.docs; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/docs.html">Documentation</a></li>
+<li><a href="&enbase;/doc/&url.doc.langcode;/books/faq/">FAQ</a></li>
+<li><a href="&enbase;/doc/&url.doc.langcode;/books/handbook/">�ϥ�ɥ֥å�</a></li>
+<li><a href="&base;/docs.html#man">�ޥ˥奢��ڡ���</a>
+	<ul>
+		<li><a href="&enbase;/cgi/man.cgi">����������</a></li>
+	</ul>
+</li>
+<li><a href="&base;/docs.html#books">Books �� Articles</a></li>
+<li><a href="&base;/publish.html">����ʪ</a></li>
+<li><a href="&base;/docs.html#links">�����־�ξ���</a></li>
+<li><a href="&base;/projects/newbies.html">���Ƥ��������ξ���</a></li>
+<li><a href="&base;/docproj/">�ɥ�����ơ������ץ���������</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.download "IGNORE">
+<![ %navinclude.download; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/where.html">FreeBSD ��������ˡ</a></li>
+<li><a href="&base;/releases/">��꡼������</a>
+	<ul>
+		<li><a href="&u.rel.announce;">�ץ�����������꡼��: &rel.current;</a></li>
+		<li><a href="&u.rel2.announce;">�ץ�����������꡼�� (����): &rel2.current;</a></li>
+		<li><a href="&enbase;/snapshots/">���ʥåץ���åȥ�꡼��</a></li>
+<![ %beta.testing; [ 
+        <li><a href="&u.betarel.schedule;">�����꡼��ͽ��: &betarel.current;</a></li>
+]]>
+<![ %beta2.testing; [ 
+        <li><a href="&u.betarel2.schedule;">�����꡼��ͽ��: &betarel2.current;</a></li>
+]]>
+      </ul></li>
+<li><a href="&base;/ports/">ports �˼�Ͽ����Ƥ��륢�ץꥱ�������</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.gnome "IGNORE">
+<![ %navinclude.gnome; [
+]]>
+
+<!ENTITY % navinclude.ports "IGNORE">
+<![ %navinclude.ports; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/where.html">FreeBSD ��������ˡ</a></li>
+<li><a href="&base;/releases/">��꡼������</a>
+	<ul>
+		<li><a href="&u.rel.announce;">�ץ�����������꡼��: &rel.current;</a></li>
+		<li><a href="&u.rel2.announce;">�ץ�����������꡼�� (����): &rel2.current;</a></li>
+		<li><a href="&enbase;/snapshots/">���ʥåץ���åȥ�꡼��</a></li>
+	</ul>
+</li>
+<li><a href="&base;/ports/">ports �˼�Ͽ����Ƥ��륢�ץꥱ�������</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
+
+<!ENTITY % navinclude.support "IGNORE">
+<![ %navinclude.support; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/support.html">���ݡ���</a></li>
+<li><a href="&base;/commercial/">�٥��</a>
+	<ul>
+		<li><a href="&enbase;/commercial/software_bycat.html">���եȥ�����</a></li>
+		<li><a href="&enbase;/commercial/hardware.html">�ϡ��ɥ�����</a></li>
+		<li><a href="&enbase;/commercial/consult_bycat.html">���󥵥�ƥ���</a></li>
+		<li><a href="&enbase;/commercial/isp.html">���󥿡��ͥåȥ����ӥ��ץ��Х���</a></li>
+		<li><a href="&enbase;/commercial/misc.html">����¾</a></li>
+	</ul>
+</li>
+<li><a href="&base;/security/">�������ƥ�����</a></li>
+<li><a href="&base;/support.html#gnats">�����</a>
+	<ul>
+		<li><a href="&base;/send-pr.html">�㳲��� (PR) �����</a></li>
+	</ul>
+</li>
+<li><a href="&base;/support.html#general">�����־�ξ���</a></li>
+</ul>
+</div> <!-- SIDENAV -->'>
+]]>
diff --git a/ja/news/news.xml b/ja/share/sgml/news.xml
similarity index 94%
rename from ja/news/news.xml
rename to ja/share/sgml/news.xml
index e4b82f54a7..a748c7c2b2 100644
--- a/ja/news/news.xml
+++ b/ja/share/sgml/news.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="EUC-JP" ?>
+<!DOCTYPE news PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for News//EN"
+                      "http://www.FreeBSD.org/XML/www/share/sgml/news.dtd">
+
 <!-- Simple schema for FreeBSD Project news.
 
      Divide time in to <year>, <month>, and <day> elements, each of which 
@@ -8,7 +11,7 @@
 
      Each <event> contains an optional <title>, and then a <p>.  <p> elements
      can contain <a> anchors.  Within the "href" attribute of the anchor
-     $base will be replaced with the base URI necessary to reach the FreeBSD
+     &base; will be replaced with the base URI necessary to reach the FreeBSD
      document root, and should always be used to start URLs at www.FreeBSD.org
      or one of the mirrors.
 
@@ -16,13 +19,13 @@
      synopses of this information (e.g., for syndication using RDF files), 
      the contents of <title> will be preferred over <p>.
 
-     $FreeBSD: www/ja/news/news.xml,v 1.11 2002/03/04 12:12:40 hanai Exp $
+     $FreeBSD$
      Original revision: 1.57
 -->
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/ja/news/news.xml,v 1.11 2002/03/04 12:12:40 hanai Exp $
+      $FreeBSD$
     </cvs:keyword>
   </cvs:keywords>
 
@@ -40,7 +43,7 @@
 
 	  <p>FreeBSD 4.5 ��꡼�����󥸥˥���󥰥������
 	    ��� FreeBSD 4.5 ��꡼���Ѥ�
-            <a href="$base/releases/4.5R/qa.html">�ƥ��ȥ�����</a>
+            <a href="&base;/releases/4.5R/qa.html">�ƥ��ȥ�����</a>
 	    ��������ޤ�����
 	    4.5 �����ޤǤˤʤ������������������ǽ�򼨤��褦��
 	    �桹��ٱ礷�Ƥ���������</p>
@@ -54,7 +57,7 @@
           <title>�����塼�ȥꥢ��: "FreeBSD �ǥ桼������"</title>
 
 	  <p>Aaron Kaplan �� FreeBSD �ǿ�����
-	    <a href="$base/../doc/en_US.ISO8859-1/articles/euro/article.html">
+	    <a href="&base;/../doc/en_US.ISO8859-1/articles/euro/article.html">
 	      �桼�������Ȥ�</a> �Ѥ˥����ƥ�����ꤹ����ˡ��
 	    ���Ҥ����������Ƥ��Ƥ���ޤ�����</p>
         </event>
@@ -213,7 +216,7 @@
 	  
 	  <p><a href="mailto:des@FreeBSD.org">Dag-Erling Sm&#248;rgrav</a>
 	    �᤬ <a
-              href="$base/../doc/en_US.ISO8859-1/articles/problem-reports/article.html">
+              href="&base;/../doc/en_US.ISO8859-1/articles/problem-reports/article.html">
               FreeBSD �㳲���</a>�ν����˴ؤ��뵭����񤤤Ƥ��ޤ���</p>
 	</event>
       </day>
@@ -335,7 +338,7 @@
 	<event>
 	  <title>Vinum ������: �������ι⤤�����й��ۤδ���</title>
 	  <p><a href="mailto:Bob@BGPBook.Com">Bob Van Valzah</a> ��ˤ�ꡢ
-            <a href="$base/../doc/en_US.ISO8859-1/articles/vinum/index.html">
+            <a href="&base;/../doc/en_US.ISO8859-1/articles/vinum/index.html">
               �㳲���Ѥ��륵���ФȤϤɤ�������Τ���
               ������ Vinum
               ��ȤäƤ��Τ褦�ʥ����Ф��ۤ�����ˤĤ���</a>�Ҳ𤹤뵭����
@@ -502,9 +505,9 @@
 	<event>
 	  <title>���󥹥ȡ���ɥ�����Ȥ������˲���</title>
 
-	  <p><a href="$base/../doc/en_US.ISO8859-1/books/handbook/index.html">
+	  <p><a href="&base;/../doc/en_US.ISO8859-1/books/handbook/index.html">
 	      �ϥ�ɥ֥å�</a> ��
-	    <a href="$base/../doc/en_US.ISO8859-1/books/handbook/install.html">FreeBSD �Υ��󥹥ȡ���</a>
+	    <a href="&base;/../doc/en_US.ISO8859-1/books/handbook/install.html">FreeBSD �Υ��󥹥ȡ���</a>
 	    ���᤬�����˲��ɡ���������ޤ�����
 	    �������ɥ�����Ȥϥ��󥹥ȡ����ȤΤۤ����Ƥ��ʳ���
 	    "�����꡼�󥷥�å�" �����ʪ�ˤ��Ƥ��ꡢ���󥹥ȡ���γ��ʳ�
@@ -534,7 +537,7 @@
 	  <title>��Ľ��ݡ��� 2001 ǯ 7 ���</title>
 
 	  <p>��Ľ��ݡ��Ȥ� 2001 ǯ 7 ��椬�о줷�ޤ����� �ܤ�����
-	    <a href="$base/../news/status/status.html">��Ľ��ݡ��� Web �ڡ���</a>
+	    <a href="&base;/../news/status/status.html">��Ľ��ݡ��� Web �ڡ���</a>
 	    ������������</p>
 	</event>
       </day>
@@ -566,7 +569,7 @@
 
 	  <p>�����������ȥ�ꥢ�� BSD �桼�����롼�פǤ���
 <a href="http://pandaemonium.newmillennium.net.au/">Pandaemoium</a>
-	    �� <a href="$base/support.html">���ݡ���</a> �ڡ�����
+	    �� <a href="&base;/support.html">���ݡ���</a> �ڡ�����
 	    �ɲä���ޤ�����</p>
         </event>
       </day>
@@ -653,7 +656,7 @@
 	  <title>Solid State Media �� FreeBSD �ǻȤ�</title>
 
 	  <p><a href="mailto:john@kozubik.com">John Kozubik</a> ��
-	    <a href="$base/../doc/en_US.ISO8859-1/articles/solid-state/index.html">
+	    <a href="&base;/../doc/en_US.ISO8859-1/articles/solid-state/index.html">
 	      How to use FreeBSD with solid state media (�Ѹ���)</a>
 	    �Ȥ����������Ƥ��Ƥ���ޤ�����</p>
 	</event>
@@ -669,7 +672,7 @@
 	    �ץ����å���ǡ�FreeBSD �� root �ե����륷���ƥ��
 	    �ޥ���Ȥ��뤿��Υץ���ץ���ʬ�ޤ���ã���ޤ�����
 	    �ܤ�������ˤĤ��Ƥ� PowerPC �ץ�åȥե������
-	    <a href="$base/platforms/ppc.html">�ڡ���</a> �ȥ᡼��󥰥ꥹ�Ȥ�
+	    <a href="&base;/platforms/ppc.html">�ڡ���</a> �ȥ᡼��󥰥ꥹ�Ȥ�
 	    ���Ȥ��Ƥ���������</p>
 	</event>
       </day>
@@ -814,12 +817,12 @@
 	<name>18</name>
 	
 	<event>
-	  <p><a href="$base/../doc/en_US.ISO8859-1/books/developers-handbook/index.html">Developer's Handbook</a>
+	  <p><a href="&base;/../doc/en_US.ISO8859-1/books/developers-handbook/index.html">Developer's Handbook</a>
 	    �������֥����ȤǸ�������ޤ�����
 	    ����ϡ�FreeBSD �ѥ��եȥ�������ȯ�������� 
 	    (FreeBSD ��ȯ���Ƥ��륳�ߥå����ѤǤʤ�) �����Τ�ΤǤ���
 	    �ޤ������Υ����Ȥˤ���
-	    <a href="$base/docs.html">����ʸ��δ����ʥꥹ��</a> �⤪˺��ʤ���
+	    <a href="&base;/docs.html">����ʸ��δ����ʥꥹ��</a> �⤪˺��ʤ���
 	  </p>
 	</event>
       </day>
@@ -831,7 +834,7 @@
 	  <p>Addison Wesley ��ꡢ
 	    <a href="http://cseng.aw.com/book/0,,0201704811,00.html">FreeBSD
 	      Corporate Networker's Guide</a> ��
-	    <a href="$base/../doc/en_US.ISO8859-1/books/corp-net-guide/index.html">�� 8 ��</a>
+	    <a href="&base;/../doc/en_US.ISO8859-1/books/corp-net-guide/index.html">�� 8 ��</a>
 	    ��ƽ��Ǥ�����Ĥ򤤤������ޤ�����
 	    �� 8 �ϤǤ� Windows��WindowsNT��FreeBSD ��ȤäƤ��� Novell
 	    ���饤����Ȥ˥ץ��ȥ����ӥ����󶡤��뤳�Ȥ˴ؤ���
@@ -862,7 +865,7 @@
 	<name>10</name>
 	
 	<event>
-	  <p><a href="$base/ports/index.html">Ports Collection</a>
+	  <p><a href="&base;/ports/index.html">Ports Collection</a>
 	����Ͽ����ȥ���� 5,000 ��Ķ���ޤ���!</p>
 	</event>
       </day>
diff --git a/ja/news/press.xml b/ja/share/sgml/press.xml
similarity index 99%
rename from ja/news/press.xml
rename to ja/share/sgml/press.xml
index 43ae3e97d7..e00d974ae7 100644
--- a/ja/news/press.xml
+++ b/ja/share/sgml/press.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="EUC-JP" ?>
+<!DOCTYPE press PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Press//EN"
+                      "http://www.FreeBSD.org/XML/www/share/sgml/press.dtd">
 <!-- Original revision: 1.21 -->
 
 <press>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/ja/news/press.xml,v 1.4 2002/01/16 05:24:32 kuriyama Exp $
+      $FreeBSD$
     </cvs:keyword>
   </cvs:keywords>
 
diff --git a/ja/share/sgml/templates.usergroups.xsl b/ja/share/sgml/templates.usergroups.xsl
index 564380af1f..aa5b0aac6e 100644
--- a/ja/share/sgml/templates.usergroups.xsl
+++ b/ja/share/sgml/templates.usergroups.xsl
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="euc-jp"?>
 
-<!-- $FreeBSD: www/ja/share/sgml/templates.usergroups.xsl,v 1.1 2005/09/18 06:25:00 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/share/sgml/templates.usergroups.xsl,v 1.2 2005/09/19 07:58:19 hrs Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
   exclude-result-prefixes="cvs">
 
-  <!-- must point to master copy, www/share/sgml/templates.usergroups.xsl -->
-  <xsl:import href="../../../share/sgml/templates.usergroups.xsl" />
+  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/templates.usergroups.xsl" />
 
   <xsl:output type="xml" encoding="euc-jp"
 	      indent="yes"/>
diff --git a/ja/smp/index.sgml b/ja/smp/index.sgml
index 39f72f10db..a87cf8dd3f 100644
--- a/ja/smp/index.sgml
+++ b/ja/smp/index.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/smp/index.sgml,v 1.7 2002/03/06 01:58:45 hanai Exp $">
+<!ENTITY date "$FreeBSD: www/ja/smp/index.sgml,v 1.8 2005/10/04 16:21:53 hrs Exp $">
 <!ENTITY title "FreeBSD SMP Project">
 <!ENTITY email 'freebsd-smp'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 
 <!-- Status levels -->
 <!ENTITY status.done "<font color=green>Done</font>">
diff --git a/ja/support.sgml b/ja/support.sgml
index f7e0de2a23..0f66870e44 100644
--- a/ja/support.sgml
+++ b/ja/support.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/support.sgml,v 1.38 2005/06/23 14:34:10 keramida Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ja/support.sgml,v 1.39 2005/10/04 16:21:45 hrs Exp $">
 <!ENTITY title "Support">
-<!ENTITY % navincludes SYSTEM "includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.260 -->
diff --git a/ja/tutorials/index.sgml b/ja/tutorials/index.sgml
index deda41aa48..c0c27e4394 100644
--- a/ja/tutorials/index.sgml
+++ b/ja/tutorials/index.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/tutorials/index.sgml,v 1.14 2002/05/13 20:09:05 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/tutorials/index.sgml,v 1.15 2005/10/04 16:21:53 hrs Exp $">
 <!ENTITY title "FreeBSD Tutorials">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.23 -->
diff --git a/ja/where.sgml b/ja/where.sgml
index fe3b82416f..cc8f8126f2 100644
--- a/ja/where.sgml
+++ b/ja/where.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/where.sgml,v 1.33 2003/10/11 15:47:45 hrs Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ja/where.sgml,v 1.34 2005/10/04 16:21:45 hrs Exp $">
 <!ENTITY title "Getting FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.60 -->
diff --git a/ja/y2kbug.sgml b/ja/y2kbug.sgml
index 8d980e35b5..355fb5fde5 100644
--- a/ja/y2kbug.sgml
+++ b/ja/y2kbug.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/y2kbug.sgml,v 1.23 2003/07/05 06:03:15 hrs Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ja/y2kbug.sgml,v 1.24 2005/10/04 16:21:45 hrs Exp $">
 <!ENTITY title 'Year 2000 bug (aka "Millennium bug")'>
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.44 -->
diff --git a/ru/about.sgml b/ru/about.sgml
index dabc9facdd..71c9cc46d2 100644
--- a/ru/about.sgml
+++ b/ru/about.sgml
@@ -6,11 +6,10 @@
      Original revision: 1.3
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD$">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ru/about.sgml,v 1.5 2006/06/10 11:22:39 bvs Exp $">
 <!ENTITY title "� FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/applications.sgml b/ru/applications.sgml
index 3bf4a6b8c0..0f75904da9 100644
--- a/ru/applications.sgml
+++ b/ru/applications.sgml
@@ -6,11 +6,10 @@
       Original revision: 1.28
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ru/applications.sgml,v 1.10 2005/05/27 11:11:47 andy Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ru/applications.sgml,v 1.11 2005/10/05 20:39:12 simon Exp $">
 <!ENTITY title "� ����������� ��� FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/art.sgml b/ru/art.sgml
index 69afcdddc9..1d032eebfd 100644
--- a/ru/art.sgml
+++ b/ru/art.sgml
@@ -6,11 +6,10 @@
       Original revision: 1.3
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD$">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ru/art.sgml,v 1.4 2006/06/10 11:22:40 bvs Exp $">
 <!ENTITY title "����������� FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "developers.sgml"> %developers;
 ]>
 
diff --git a/ru/availability.sgml b/ru/availability.sgml
index 45245edae2..e84c2e362f 100644
--- a/ru/availability.sgml
+++ b/ru/availability.sgml
@@ -6,11 +6,10 @@
      Original revision: 1.34
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ru/availability.sgml,v 1.11 2005/10/26 12:29:59 bvs Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ru/availability.sgml,v 1.12 2006/06/10 11:22:39 bvs Exp $">
 <!ENTITY title "��������������� FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/commercial/commercial.sgml b/ru/commercial/commercial.sgml
index 7eb5dbacae..5dcd4b344a 100644
--- a/ru/commercial/commercial.sgml
+++ b/ru/commercial/commercial.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.35
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/commercial/commercial.sgml,v 1.8 2005/10/05 20:59:52 simon Exp $">
+<!ENTITY date "$FreeBSD: www/ru/commercial/commercial.sgml,v 1.9 2006/01/17 09:27:09 bvs Exp $">
 <!ENTITY title "������������ �����������">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 ]>
 
 <!-- NOTE: ��� ������ ��������� �� ���������� commercials -->
diff --git a/ru/community.sgml b/ru/community.sgml
index ceb2eaf756..c5e82c3538 100644
--- a/ru/community.sgml
+++ b/ru/community.sgml
@@ -6,11 +6,10 @@
      Original revision: 1.2
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD$">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ru/community.sgml,v 1.1 2005/11/08 18:22:23 bvs Exp $">
 <!ENTITY title "���������� FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navcommunity.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.community "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/community/irc.sgml b/ru/community/irc.sgml
index 6897c03198..fcccc107d5 100644
--- a/ru/community/irc.sgml
+++ b/ru/community/irc.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.2
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/community/irc.sgml,v 1.2 2006/01/17 09:27:10 bvs Exp $">
 <!ENTITY title "IRC">
-<!ENTITY % navincludes SYSTEM "../includes.navcommunity.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.community "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/community/mailinglists.sgml b/ru/community/mailinglists.sgml
index e5cfb7c435..1cf0b4f4c7 100644
--- a/ru/community/mailinglists.sgml
+++ b/ru/community/mailinglists.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.4
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/community/mailinglists.sgml,v 1.2 2006/01/17 09:27:10 bvs Exp $">
 <!ENTITY title "������ ��������">
-<!ENTITY % navincludes SYSTEM "../includes.navcommunity.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.community "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/community/newsgroups.sgml b/ru/community/newsgroups.sgml
index e801235f34..a673bc307a 100644
--- a/ru/community/newsgroups.sgml
+++ b/ru/community/newsgroups.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.3
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/community/newsgroups.sgml,v 1.1 2005/11/08 18:22:23 bvs Exp $">
 <!ENTITY title "���������������">
-<!ENTITY % navincludes SYSTEM "../includes.navcommunity.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.community "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/community/webresources.sgml b/ru/community/webresources.sgml
index 5facacebc2..fa533d1a03 100644
--- a/ru/community/webresources.sgml
+++ b/ru/community/webresources.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.2
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/community/webresources.sgml,v 1.3 2006/01/17 14:12:49 bvs Exp $">
 <!ENTITY title "Web �������">
-<!ENTITY % navincludes SYSTEM "../includes.navcommunity.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.community "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/copyright/copyright.sgml b/ru/copyright/copyright.sgml
index b2ee4c5824..baf921e140 100644
--- a/ru/copyright/copyright.sgml
+++ b/ru/copyright/copyright.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.8
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/copyright/copyright.sgml,v 1.5 2003/10/08 08:40:39 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/copyright/copyright.sgml,v 1.6 2005/10/05 20:59:52 simon Exp $">
 <!ENTITY title "���������� �� ��������� ������ �� FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/copyright/daemon.sgml b/ru/copyright/daemon.sgml
index a287bab3fb..2741b2ee02 100644
--- a/ru/copyright/daemon.sgml
+++ b/ru/copyright/daemon.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.26
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/copyright/daemon.sgml,v 1.8 2004/09/21 07:50:15 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/copyright/daemon.sgml,v 1.9 2005/10/05 20:59:52 simon Exp $">
 <!ENTITY title "������ BSD">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/copyright/freebsd-license.sgml b/ru/copyright/freebsd-license.sgml
index ca4f4bd6c3..3223f65682 100644
--- a/ru/copyright/freebsd-license.sgml
+++ b/ru/copyright/freebsd-license.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.15
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/copyright/freebsd-license.sgml,v 1.6 2004/02/04 11:04:04 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/copyright/freebsd-license.sgml,v 1.7 2005/10/05 20:59:52 simon Exp $">
 <!ENTITY title "The FreeBSD Copyright">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/copyright/license.sgml b/ru/copyright/license.sgml
index f2a058b438..a25bb656e1 100644
--- a/ru/copyright/license.sgml
+++ b/ru/copyright/license.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.10
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/copyright/license.sgml,v 1.5 2004/09/21 07:50:15 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/copyright/license.sgml,v 1.6 2005/10/05 20:59:52 simon Exp $">
 <!ENTITY title "The 4.4BSD Copyright">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/copyright/trademarks.sgml b/ru/copyright/trademarks.sgml
index f642d026d2..e649e93926 100644
--- a/ru/copyright/trademarks.sgml
+++ b/ru/copyright/trademarks.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.10
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/copyright/trademarks.sgml,v 1.4 2003/12/26 09:03:48 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/copyright/trademarks.sgml,v 1.5 2005/10/05 20:59:52 simon Exp $">
 <!ENTITY title "���������� � �������� ������">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/developers/cvs.sgml b/ru/developers/cvs.sgml
index ef6aca3384..74d47b2540 100644
--- a/ru/developers/cvs.sgml
+++ b/ru/developers/cvs.sgml
@@ -1,14 +1,13 @@
 <!-- The FreeBSD Russian Documentation Project-->
 <!-- $FreeBSDru: frdp/www/ru/developers/cvs.sgml,v 1.1 2006/02/18 18:20:33 gad Exp $ -->
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/ru/developers/cvs.sgml,v 1.1 2006/02/19 11:23:25 bvs Exp $ -->
 <!-- Original revision: 1.3 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/developers/cvs.sgml,v 1.1 2006/02/19 11:23:25 bvs Exp $">
 <!ENTITY title "CVS �����������">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/docproj/current.sgml b/ru/docproj/current.sgml
index c8dab9268b..0b592731bc 100644
--- a/ru/docproj/current.sgml
+++ b/ru/docproj/current.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.87
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/docproj/current.sgml,v 1.18 2006/06/10 10:30:17 bvs Exp $">
 <!ENTITY title "������ ���������������� FreeBSD: ������� �������">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 
 <!ENTITY imagebase "&enbase;/gifs">
diff --git a/ru/docproj/doc-set.sgml b/ru/docproj/doc-set.sgml
index 93afd33a85..e74d4d060e 100644
--- a/ru/docproj/doc-set.sgml
+++ b/ru/docproj/doc-set.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.13
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/docproj/doc-set.sgml,v 1.7 2006/06/10 10:30:17 bvs Exp $">
 <!ENTITY title "������ ���������������� FreeBSD: ����� ������������">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/docproj/docproj.sgml b/ru/docproj/docproj.sgml
index bd672949e4..79ee599497 100644
--- a/ru/docproj/docproj.sgml
+++ b/ru/docproj/docproj.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.17
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/docproj/docproj.sgml,v 1.5 2004/02/04 11:04:04 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/docproj/docproj.sgml,v 1.6 2005/10/05 20:59:52 simon Exp $">
 <!ENTITY title "������ ���������������� FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/docproj/handbook.sgml b/ru/docproj/handbook.sgml
index 684df034b3..fe59b24984 100644
--- a/ru/docproj/handbook.sgml
+++ b/ru/docproj/handbook.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.17
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/docproj/handbook.sgml,v 1.15 2001/10/31 07:36:14 murray Exp $">
+<!ENTITY date "$FreeBSD: www/ru/docproj/handbook.sgml,v 1.4 2006/06/10 10:30:17 bvs Exp $">
 <!ENTITY title "������ ���������������� FreeBSD: ������� �������">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 
 <!ENTITY done "<font color='green'>���������</font>">
 <!ENTITY inprogress "<font color='blue'>�����������</font>">
diff --git a/ru/docproj/handbook3.sgml b/ru/docproj/handbook3.sgml
index 8889b3d6bc..379416cbe4 100644
--- a/ru/docproj/handbook3.sgml
+++ b/ru/docproj/handbook3.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.29
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/docproj/handbook3.sgml,v 1.5 2004/03/10 14:04:06 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/docproj/handbook3.sgml,v 1.6 2005/10/05 20:59:52 simon Exp $">
 <!ENTITY title "������ ���������������� FreeBSD: 3-� ������� �����������">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
+<!ENTITY % navinclude.docs "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 
 <!ENTITY done "<font color='green'>���������</font>">
 <!ENTITY inprogress "<font color='blue'>�����������</font>">
diff --git a/ru/docproj/sgml.sgml b/ru/docproj/sgml.sgml
index 2455b6fae1..36d5417aa1 100644
--- a/ru/docproj/sgml.sgml
+++ b/ru/docproj/sgml.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.26
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/docproj/sgml.sgml,v 1.7 2006/06/10 10:30:17 bvs Exp $">
 <!ENTITY title "������ ���������������� FreeBSD: SGML">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/docproj/submitting.sgml b/ru/docproj/submitting.sgml
index 22def5a33e..325c524535 100644
--- a/ru/docproj/submitting.sgml
+++ b/ru/docproj/submitting.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.14
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/docproj/submitting.sgml,v 1.7 2004/09/21 07:50:15 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/docproj/submitting.sgml,v 1.8 2005/10/05 20:59:52 simon Exp $">
 <!ENTITY title "������ ���������������� FreeBSD: ������� ������������">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/docproj/translations.sgml b/ru/docproj/translations.sgml
index 0a642bcfd7..194988ba30 100644
--- a/ru/docproj/translations.sgml
+++ b/ru/docproj/translations.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.84
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/docproj/translations.sgml,v 1.17 2006/05/21 04:15:53 andy Exp $">
 <!ENTITY title "������ �������� ������������ FreeBSD: ��������">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/docproj/who.sgml b/ru/docproj/who.sgml
index f93f325b4e..2c1a054c38 100644
--- a/ru/docproj/who.sgml
+++ b/ru/docproj/who.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.13
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/docproj/who.sgml,v 1.9 2006/06/10 10:30:17 bvs Exp $">
 <!ENTITY title "������ ���������������� FreeBSD: ��� ��?">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/docs.sgml b/ru/docs.sgml
index ea907da980..a83b30f028 100644
--- a/ru/docs.sgml
+++ b/ru/docs.sgml
@@ -6,11 +6,10 @@
      Original revision: 1.194
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD$">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ru/docs.sgml,v 1.35 2005/12/23 15:34:58 bvs Exp $">
 <!ENTITY title "������������">
-<!ENTITY % navincludes SYSTEM "includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/docs/books.sgml b/ru/docs/books.sgml
index 86386ad3f6..339844829e 100644
--- a/ru/docs/books.sgml
+++ b/ru/docs/books.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.21
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/docs/books.sgml,v 1.3 2006/07/18 10:25:21 den Exp $">
 <!ENTITY title "����� � ������">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 
 <!ENTITY url.articles "../../doc/en_US.ISO8859-1/articles">
 <!ENTITY url.ru.articles "../../doc/ru_RU.KOI8-R/articles">
diff --git a/ru/docs/man.sgml b/ru/docs/man.sgml
index 9c154c2536..5089e2fed3 100644
--- a/ru/docs/man.sgml
+++ b/ru/docs/man.sgml
@@ -5,12 +5,11 @@
      Original revision: 1.7
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/docs/man.sgml,v 1.2 2006/07/18 10:25:21 den Exp $">
 <!ENTITY title "�������� ���������� �������">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 
 <!ENTITY url.mancgi "http://www.FreeBSD.org/cgi/man.cgi">
 ]>
diff --git a/ru/docs/webresources.sgml b/ru/docs/webresources.sgml
index 95d6ab8deb..a85342a32d 100644
--- a/ru/docs/webresources.sgml
+++ b/ru/docs/webresources.sgml
@@ -5,12 +5,11 @@
      Original revision: 1.6
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/docs/webresources.sgml,v 1.2 2006/07/18 10:25:21 den Exp $">
 <!ENTITY title "Web �������">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/donations/donors.sgml b/ru/donations/donors.sgml
index b45df04d9f..b4e3b5a537 100644
--- a/ru/donations/donors.sgml
+++ b/ru/donations/donors.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.315
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/donations/donors.sgml,v 1.9 2006/05/22 07:01:46 andy Exp $">
 <!ENTITY title "�������� ������������� ������������">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 ]>
 
diff --git a/ru/donations/index.sgml b/ru/donations/index.sgml
index a4dabcf4da..55544047a2 100644
--- a/ru/donations/index.sgml
+++ b/ru/donations/index.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.11
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/donations/index.sgml,v 1.5 2005/01/05 10:39:21 maxim Exp $">
+<!ENTITY date "$FreeBSD: www/ru/donations/index.sgml,v 1.6 2005/10/05 20:59:52 simon Exp $">
 <!ENTITY title "����� ������������� FreeBSD">
 <!ENTITY email 'donations'>
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/donations/wantlist.sgml b/ru/donations/wantlist.sgml
index 28c12915d0..cf60c8667c 100644
--- a/ru/donations/wantlist.sgml
+++ b/ru/donations/wantlist.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.336
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/donations/wantlist.sgml,v 1.6 2005/06/16 06:19:28 andy Exp $">
+<!ENTITY date "$FreeBSD: www/ru/donations/wantlist.sgml,v 1.7 2005/10/05 20:59:52 simon Exp $">
 <!ENTITY title "�������� ���������� ������������� FreeBSD ������������">
 <!ENTITY email 'donations'>
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/events/2003/bsdcon-devsummit.sgml b/ru/events/2003/bsdcon-devsummit.sgml
index bd2bc6b1dc..2d7e024bca 100644
--- a/ru/events/2003/bsdcon-devsummit.sgml
+++ b/ru/events/2003/bsdcon-devsummit.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.1
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/events/2003/bsdcon-devsummit.sgml,v 1.2 2004/09/21 07:50:16 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/events/2003/bsdcon-devsummit.sgml,v 1.3 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY email 'hackers'>
 <!ENTITY title "������� ������������� FreeBSD �� BSDCon 2003">
-<!ENTITY % navincludes SYSTEM "../../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "../../developers.sgml"> %developers;
 ]>
 
diff --git a/ru/events/Makefile b/ru/events/Makefile
index 1f9c40a87a..4619e73d82 100644
--- a/ru/events/Makefile
+++ b/ru/events/Makefile
@@ -1,7 +1,7 @@
 #
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: www/ru/events/Makefile,v 1.1 2005/06/18 05:58:59 andy Exp $
 # $FreeBSDru: frdp/www/ru/events/Makefile,v 1.3 2005/06/18 06:00:21 andy Exp $
 #
 # Original revision: 1.7
@@ -18,43 +18,11 @@ SUBDIR=	2003
 #SUBDIR+= 2003
 
 DATA=	events.css
-DATA+=	events.html
 
-CLEANFILES+= events.html
-CLEANFILES+= curdate.xml
+XMLDOCS+=		events:${XSL_EVENTS}:${XML_EVENTS_EVENTS}:
+DEPENDSET.events=	events
 
-INDEXLINK= events.html
-
-DATE?=	/bin/date
-TR?=	/usr/bin/tr
-XMLLINT?= /usr/local/bin/xmllint # Part of textproc/libxml2.
-
-events.html: events.xsl events.xml ../includes.xsl curdate.xml
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		${.CURDIR}/events.xsl ${.CURDIR}/events.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
-lint:
-	${XMLLINT} --valid -o /dev/null ${.CURDIR}/events.xml
-
-.if !make(install)
-.PHONY:	curdate.xml
-.endif
-curdate.xml:
-	@${ECHO} "Generating ${.TARGET}"
-	@${ECHO_CMD} '<?xml version="1.0"?>'	 > ${.TARGET}
-	@${ECHO_CMD} '<curdate>'		>> ${.TARGET}
-	@${ECHO_CMD} -n '  <year>'		>> ${.TARGET}
-	@${DATE} +%Y | ${TR} -d "\n"		>> ${.TARGET}
-	@${ECHO_CMD} '</year>'			>> ${.TARGET}
-	@${ECHO_CMD} -n '  <month>'		>> ${.TARGET}
-	@${DATE} +%m | ${TR} -d "\n"		>> ${.TARGET}
-	@${ECHO_CMD} '</month>'			>> ${.TARGET}
-	@${ECHO_CMD} -n '  <day>'		>> ${.TARGET}
-	@${DATE} +%d | ${TR} -d "\n"		>> ${.TARGET}
-	@${ECHO_CMD} '</day>'			>> ${.TARGET}
-	@${ECHO_CMD} '</curdate>'		>> ${.TARGET}
+XMLDOCS+=		events_ics:${XSL_EVENTS_ICS}:${XML_EVENTS_EVENTS}:events.ics
+DEPENDSET.events_ics=	events
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ru/events/events.dtd b/ru/events/events.dtd
deleted file mode 100644
index 97047357a9..0000000000
--- a/ru/events/events.dtd
+++ /dev/null
@@ -1,90 +0,0 @@
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSD$
-     $FreeBSDru: frdp/www/ru/events/events.dtd,v 1.1 2005/06/17 06:56:00 andy Exp $
-
-     Original revision: 1.1
--->
-
-<!-- Copyright (c) 2003 Simon L. Nielsen <simon@FreeBSD.org>
-     All rights reserved.
-
-     Redistribution and use in source and binary forms, with or without
-     modification, are permitted provided that the following conditions
-     are met:
-     1. Redistributions of source code must retain the above copyright
-	notice, this list of conditions and the following disclaimer.
-     2. Redistributions in binary form must reproduce the above copyright
-	notice, this list of conditions and the following disclaimer in the
-	documentation and/or other materials provided with the distribution.
-
-     THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-     ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-     ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-     FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-     DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-     OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-     SUCH DAMAGE.
--->
-
-<!-- DTD for events.xml on the FreeBSD website. -->
-
-<!ELEMENT events (cvs:keywords?, event+)>
-
-<!ELEMENT event (name?, url?, startdate, enddate, location, description?, link*)>
-<!ATTLIST event id ID #REQUIRED>
-
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT url (#PCDATA)>
-<!--
-     Meaning of type attribute:
-       freebsd-website:
-	 The URL is relative to the FreeBSD website root.
-	 The URL should start with a single "/".
-       absolute:
-	 Normal absolute URL.
--->
-<!ATTLIST url type (absolute|freebsd-website) "absolute">
-
-<!ELEMENT startdate (year,month,day)>
-<!ELEMENT enddate (year,month,day)>
-<!ELEMENT year (#PCDATA)>
-<!ELEMENT month (#PCDATA)>
-<!ELEMENT day (#PCDATA)>
-
-<!ELEMENT location (country?,state?,city?,site?,address?)>
-<!ELEMENT country (#PCDATA)>
-<!ELEMENT state (#PCDATA)>
-<!ELEMENT city (#PCDATA)>
-<!ELEMENT site (#PCDATA)>
-<!ELEMENT address (#PCDATA)>
-
-<!ELEMENT description (#PCDATA|a|tt|i|b)*>
-
-<!-- Misc HTML entities which might be used; just add more as needed -->
-<!ELEMENT a (#PCDATA)>
-<!ATTLIST a href CDATA #REQUIRED>
-
-<!ELEMENT b (#PCDATA|a)*>
-<!ELEMENT i (#PCDATA|a)*>
-<!ELEMENT tt (#PCDATA|a)*>
-
-<!--
-     Link to a web page (local or remote) with additional information
-     about the event.  Can also be used for post-event comments/notes.
--->
-<!ELEMENT link (name, url)>
-<!ATTLIST link type (photos|notes|other) "other">
-
-<!-- Common CVS tags -->
-<!ELEMENT cvs:keywords (cvs:keyword+)>
-<!ATTLIST cvs:keywords xmlns:cvs CDATA #FIXED 'http://www.FreeBSD.org/XML/CVS'>
-<!ATTLIST cvs:keywords version CDATA #FIXED '1.0'>
-
-<!ELEMENT cvs:keyword (#PCDATA)>
-<!ATTLIST cvs:keyword name CDATA #REQUIRED>
diff --git a/ru/events/events.xsl b/ru/events/events.xsl
deleted file mode 100644
index 1c65a93d51..0000000000
--- a/ru/events/events.xsl
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="KOI8-R" ?>
-
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSDru: frdp/www/ru/events/events.xsl,v 1.2 2005/06/17 06:57:45 andy Exp $
-
-     Original revision: 1.3
--->
-
-<!-- Copyright (c) 2003 Simon L. Nielsen <simon@FreeBSD.org>
-     All rights reserved.
-
-     Redistribution and use in source and binary forms, with or without
-     modification, are permitted provided that the following conditions
-     are met:
-     1. Redistributions of source code must retain the above copyright
-	notice, this list of conditions and the following disclaimer.
-     2. Redistributions in binary form must reproduce the above copyright
-	notice, this list of conditions and the following disclaimer in the
-	documentation and/or other materials provided with the distribution.
-
-     THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-     ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-     ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-     FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-     DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-     OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-     SUCH DAMAGE.
-
-     $FreeBSD: www/ru/events/events.xsl,v 1.1 2005/06/18 06:02:24 andy Exp $
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
-  exclude-result-prefixes="cvs">
-
-  <xsl:import href="../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
-  <xsl:variable name="section" select="'about'"/>
-
-  <xsl:variable name="curdate" select="document('curdate.xml')//curdate"/>
-
-  <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-  <xsl:variable name="email" select="'freebsd-www'"/>
-  <xsl:variable name="title" select="'������� ���� FreeBSD'"/>
-
-  <xsl:output method="xml" encoding="koi8-r"
-    doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-    doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"/>
-
-  <xsl:key name="event-by-month" match="event"
-    use="concat(startdate/year, format-number(startdate/month, '00'))"/>
-
-  <!-- Template: events -->
-  <xsl:template match="events">
-    <html>
-      <xsl:copy-of select="$header1"/>
-      
-            <body xsl:use-attribute-sets="att.body">
-      
-        <div id="containerwrap">
-          <div id="container">
-      
-      	<xsl:copy-of select="$header2"/>
-      
-      	<div id="content">
-      
-      	      <xsl:copy-of select="$sidenav"/>
-      
-      	      <div id="contentwrap">
-      	      
-	      <xsl:copy-of select="$header3"/>
-
-	<!--
-	     Note the current date to have a reference, if the
-	     upcoming/past events are split incorrectly.
-	-->
-	<xsl:comment>
-	  <xsl:text>���� ����������: </xsl:text>
-	  <xsl:value-of select="concat($curdate/year,
-	    format-number($curdate/month, '00'),
-	    format-number($curdate/day, '00'))"/>
-	</xsl:comment>
-
-	<p>���� �� ������������ ����������� � ��������, ��������� � FreeBSD,
-          ��� ������� ����� ��������� ������������� FreeBSD, �� �������������
-          �����, ��, ����������, �������� ��� ����������� �� ����� <a
-	  href="mailto:www@FreeBSD.org">www@FreeBSD.org</a>, ����� ���
-          ���������� ��������� �����.</p>
-
-	<h2 id="upcoming">
-	  <xsl:text>������� � ����������� �����������:</xsl:text>
-	</h2>
-
-	<xsl:for-each select="event[generate-id() =
-          generate-id(key('event-by-month',
-	    concat(startdate/year, format-number(startdate/month, '00')))[1])
-	  and ((number(enddate/year) &gt; number($curdate/year)) or
-	    (number(enddate/year) = number($curdate/year) and
-	     number(enddate/month) &gt; number($curdate/month)) or
-	    (number(enddate/year) = number($curdate/year) and
-	     number(enddate/month) = number($curdate/month) and
-	     enddate/day &gt;= $curdate/day))]">
-
-	  <xsl:sort select="startdate/year" order="ascending"/>
-	  <xsl:sort select="format-number(startdate/month, '00')" order="ascending"/>
-	  <xsl:sort select="format-number(startdate/day, '00')" order="ascending"/>
-
-	  <h3>
-	    <xsl:attribute name="id">
-	      <xsl:text>month:</xsl:text>
-	      <xsl:value-of select="concat(startdate/year,
-		format-number(startdate/month, '00'))"/>
-	    </xsl:attribute>
-	    <xsl:call-template name="gen-long-en-month">
-	      <xsl:with-param name="nummonth" select="startdate/month"/>
-	    </xsl:call-template>
-	    <xsl:text> </xsl:text>
-	    <xsl:value-of select="startdate/year"/>
-	  </h3>
-
-	  <ul>
-	    <xsl:for-each select="key('event-by-month',
-	      concat(startdate/year, format-number(startdate/month, '00')))">
-
-	      <xsl:sort select="format-number(startdate/day, '00')" order="ascending"/>
-	      <xsl:apply-templates select="."/>
-	    </xsl:for-each>
-	  </ul>
-	</xsl:for-each>
-
-	<h2 id="past">
-	  <xsl:text>������� �������:</xsl:text>
-	</h2>
-
-	<xsl:for-each select="event[generate-id() =
-	  generate-id(key('event-by-month', concat(startdate/year,
-	    format-number(startdate/month, '00')))[1])
-	  and ((number(enddate/year) &lt; number($curdate/year)) or
-	    (number(enddate/year) = number($curdate/year) and
-	     number(enddate/month) &lt; number($curdate/month)) or
-	    (number(enddate/year) = number($curdate/year) and
-	     number(enddate/month) = number($curdate/month) and
-	     number(enddate/day) &lt; number($curdate/day)))]">
-
-	  <xsl:sort select="number(startdate/year)" order="descending"/>
-	  <xsl:sort select="format-number(startdate/month, '00')" order="descending"/>
-	  <xsl:sort select="format-number(startdate/day, '00')" order="descending"/>
-
-	  <h3>
-	    <xsl:attribute name="id">
-	      <xsl:text>month:</xsl:text>
-	      <xsl:value-of select="concat(startdate/year,
-		format-number(startdate/month, '00'))"/>
-	    </xsl:attribute>
-	    <xsl:call-template name="gen-long-en-month">
-	      <xsl:with-param name="nummonth" select="startdate/month"/>
-	    </xsl:call-template>
-	    <xsl:text> </xsl:text>
-	    <xsl:value-of select="startdate/year"/>
-	  </h3>
-
-	  <ul>
-	    <xsl:for-each select="key('event-by-month',
-	      concat(startdate/year, format-number(startdate/month, '00')))">
-
-	      <xsl:sort select="format-number(startdate/day, '00')" order="descending"/>
-	      <xsl:apply-templates select="."/>
-	    </xsl:for-each>
-	  </ul>
-	</xsl:for-each>
-
-	  	</div> <!-- contentwrap -->
-		<br class="clearboth" />
-	
-	</div> <!-- content -->
-	
-	<xsl:copy-of select="$footer"/>
-	
-        </div> <!-- container -->
-   </div> <!-- containerwrap -->
-
-      </body>
-    </html>
-  </xsl:template>
-
-  <!-- Template: event -->
-  <xsl:template match="event">
-    <li>
-      <xsl:attribute name="id">
-	<xsl:call-template name="generate-event-anchor"/>
-      </xsl:attribute>
-
-      <p>
-	<b>
-	  <xsl:if test="url">
-	    <xsl:apply-templates select="url"/>
-	  </xsl:if>
-	  <xsl:if test="not(url)">
-	    <xsl:value-of select="name"/>
-	  </xsl:if>
-	</b>
-	<xsl:if test="location/site!=''">
-	  <xsl:text>, </xsl:text>
-	  <xsl:value-of select="location/site"/>
-	</xsl:if>
-	<xsl:if test="location/city!=''">
-	  <xsl:text>, </xsl:text>
-	  <xsl:value-of select="location/city"/>
-	</xsl:if>
-	<xsl:if test="location/state!=''">
-	  <xsl:text>, </xsl:text>
-	  <xsl:value-of select="location/state"/>
-	</xsl:if>
-	<xsl:if test="location/country!=''">
-	  <xsl:text>, </xsl:text>
-	  <xsl:value-of select="location/country"/>
-	</xsl:if>
-	<br/>
-	<em>
-	  <xsl:call-template name="gen-date-interval">
-	    <xsl:with-param name="startdate" select="startdate" />
-	    <xsl:with-param name="enddate" select="enddate" />
-	  </xsl:call-template>
-	</em><br/>
-	<xsl:copy-of select="description/child::node()"/>
-      </p>
-      <xsl:if test="link">
-	<p><xsl:apply-templates select="link"/></p>
-      </xsl:if>
-    </li>
-  </xsl:template>
-
-  <!-- Template: link -->
-  <xsl:template match="link">
-    <xsl:apply-templates select="url"/>
-    <xsl:if test="not(position()=last())">
-      <xsl:text>&#160;</xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- Template: url -->
-  <xsl:template match="url">
-    <a>
-      <xsl:attribute name="href">
-	<xsl:choose>
-	  <xsl:when test="@type='freebsd-website'">
-	    <xsl:value-of select="$base"/>
-	  </xsl:when>
-	</xsl:choose>
-        <xsl:value-of select="."/>
-      </xsl:attribute>
-      <xsl:value-of select="../name"/>
-    </a>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/ru/events/includes.xsl b/ru/events/includes.xsl
deleted file mode 100644
index 40bd0a58f9..0000000000
--- a/ru/events/includes.xsl
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="KOI8-R" ?>
-
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSDru: frdp/www/ru/events/includes.xsl,v 1.1 2004/03/01 18:29:15 andy Exp $
-
-     Original revision: 1.1
--->
-
-<!-- Copyright (c) 2003 Simon L. Nielsen <simon@FreeBSD.org>
-     All rights reserved.
-
-     Redistribution and use in source and binary forms, with or without
-     modification, are permitted provided that the following conditions
-     are met:
-     1. Redistributions of source code must retain the above copyright
-	notice, this list of conditions and the following disclaimer.
-     2. Redistributions in binary form must reproduce the above copyright
-	notice, this list of conditions and the following disclaimer in the
-	documentation and/or other materials provided with the distribution.
-
-     THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-     ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-     ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-     FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-     DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-     OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-     SUCH DAMAGE.
-
-     $FreeBSD$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <!-- Generate a unique anchor for this event. -->
-  <xsl:template name="generate-event-anchor">
-    <xsl:text>event:</xsl:text>
-    <xsl:value-of select="@id"/>
-  </xsl:template>
-
-  <!-- Generic templates: -->
-
-  <!-- Convert a month number to the corresponding long English name. -->
-  <xsl:template name="gen-long-en-month">
-    <xsl:param name="nummonth"/>
-    <xsl:variable name="month" select="number($nummonth)"/>
-    <xsl:choose>
-      <xsl:when test="$month=1">������</xsl:when>
-      <xsl:when test="$month=2">�������</xsl:when>
-      <xsl:when test="$month=3">����</xsl:when>
-      <xsl:when test="$month=4">������</xsl:when>
-      <xsl:when test="$month=5">���</xsl:when>
-      <xsl:when test="$month=6">����</xsl:when>
-      <xsl:when test="$month=7">����</xsl:when>
-      <xsl:when test="$month=8">������</xsl:when>
-      <xsl:when test="$month=9">��������</xsl:when>
-      <xsl:when test="$month=10">�������</xsl:when>
-      <xsl:when test="$month=11">������</xsl:when>
-      <xsl:when test="$month=12">�������</xsl:when>
-      <xsl:otherwise>Invalid month</xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Generate a date interval. -->
-  <!-- Sample: 27 November, 2002 - 29 December, 2003 -->
-  <xsl:template name="gen-date-interval">
-    <xsl:param name="startdate"/>
-    <xsl:param name="enddate"/>
-
-    <xsl:value-of select="startdate/day"/>
-
-    <xsl:if test="number(startdate/month) != number(enddate/month) or
-		  number(startdate/day) != number(enddate/day) or
-		  number(startdate/year) != number(enddate/year)">
-
-      <xsl:if test="number(startdate/month) != number(enddate/month) or
-		    number(startdate/year) != number(enddate/year)">
-	<xsl:text> </xsl:text>
-	<xsl:call-template name="gen-long-en-month">
-	  <xsl:with-param name="nummonth" select="startdate/month"/>
-	</xsl:call-template>
-      </xsl:if>
-
-      <xsl:if test="number(startdate/year) != number(enddate/year)">
-	<xsl:text>, </xsl:text>
-	<xsl:value-of select="startdate/year"/>
-      </xsl:if>
-      <xsl:text> - </xsl:text>
-
-      <xsl:if test="number(startdate/day) != number(enddate/day) or
-		    number(startdate/month) != number(enddate/month) or
-		    number(startdate/year) != number(enddate/year)">
-	<xsl:value-of select="enddate/day"/>
-      </xsl:if>
-    </xsl:if>
-
-    <xsl:text> </xsl:text>
-    <xsl:call-template name="gen-long-en-month">
-      <xsl:with-param name="nummonth" select="enddate/month"/>
-    </xsl:call-template>
-
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="enddate/year"/>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/ru/features.sgml b/ru/features.sgml
index 975699a434..0f225d50f9 100644
--- a/ru/features.sgml
+++ b/ru/features.sgml
@@ -6,11 +6,10 @@
      Original revision: 1.20
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ru/features.sgml,v 1.8 2004/09/21 08:08:55 den Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ru/features.sgml,v 1.9 2005/10/05 20:39:12 simon Exp $">
 <!ENTITY title "� ��������������� ������������� FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/gnome/contact.sgml b/ru/gnome/contact.sgml
index 1a7f026f42..b5e05bc41d 100644
--- a/ru/gnome/contact.sgml
+++ b/ru/gnome/contact.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.17
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/gnome/contact.sgml,v 1.4 2004/09/21 07:50:16 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/gnome/contact.sgml,v 1.5 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY title "������ FreeBSD GNOME: ��� � ���� ���������">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % gnomeincludes SYSTEM "includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 
 <html>
diff --git a/ru/gnome/docs/bugging.sgml b/ru/gnome/docs/bugging.sgml
index 8eba1cb6c1..39d90c8472 100644
--- a/ru/gnome/docs/bugging.sgml
+++ b/ru/gnome/docs/bugging.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.9
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/gnome/docs/bugging.sgml,v 1.2 2004/09/21 07:50:16 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/gnome/docs/bugging.sgml,v 1.3 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY title "������ FreeBSD GNOME: ��� �������� �� ������">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 
 <html>
diff --git a/ru/gnome/docs/develfaq.sgml b/ru/gnome/docs/develfaq.sgml
index 567822ded9..9d375f7570 100644
--- a/ru/gnome/docs/develfaq.sgml
+++ b/ru/gnome/docs/develfaq.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.9
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/gnome/docs/develfaq.sgml,v 1.3 2004/09/21 07:50:16 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/gnome/docs/develfaq.sgml,v 1.4 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY title "������ FreeBSD GNOME: FAQ �� ����� ���������� GNOME">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <html>
   &header;
diff --git a/ru/gnome/docs/example-Makefile.sgml b/ru/gnome/docs/example-Makefile.sgml
index 4d403ae0b7..ac3091eeb1 100644
--- a/ru/gnome/docs/example-Makefile.sgml
+++ b/ru/gnome/docs/example-Makefile.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.3
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/gnome/docs/example-Makefile.sgml,v 1.2 2004/09/21 07:50:16 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/gnome/docs/example-Makefile.sgml,v 1.3 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY title "������ FreeBSD GNOME: ��������� Makefile ��� GNOME">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 
 <html>
@@ -26,7 +25,7 @@
 # Date created:						27 December 2003
 # Whom:								Some GNOME User &lt;&email;@FreeBSD.org&gt;
 #
-# $FreeBSD: www/ru/gnome/docs/example-Makefile.sgml,v 1.2 2004/09/21 07:50:16 den Exp $
+# $FreeBSD: www/ru/gnome/docs/example-Makefile.sgml,v 1.3 2005/10/05 20:59:53 simon Exp $
 #
 
 # For this example, assume there was already a gnomeapp in the tree, and that this
diff --git a/ru/gnome/docs/faq2.sgml b/ru/gnome/docs/faq2.sgml
index 26e1588002..f642fe24af 100644
--- a/ru/gnome/docs/faq2.sgml
+++ b/ru/gnome/docs/faq2.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.91
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/gnome/docs/faq2.sgml,v 1.8 2005/06/05 04:00:19 andy Exp $">
+<!ENTITY date "$FreeBSD: www/ru/gnome/docs/faq2.sgml,v 1.9 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY title "������ FreeBSD GNOME: FAQ �� GNOME &gnomever;">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <html>
   &header;
diff --git a/ru/gnome/docs/gnome2_porting.sgml b/ru/gnome/docs/gnome2_porting.sgml
index c17c40d3e6..405089bf5f 100644
--- a/ru/gnome/docs/gnome2_porting.sgml
+++ b/ru/gnome/docs/gnome2_porting.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.8
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/gnome/docs/gnome2_porting.sgml,v 1.3 2004/09/21 07:50:16 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/gnome/docs/gnome2_porting.sgml,v 1.4 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY title "������ FreeBSD GNOME: ���������� GNOME 2">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 
 <html>
diff --git a/ru/gnome/docs/gnome_porting.sgml b/ru/gnome/docs/gnome_porting.sgml
index 1d53a3cabf..45a7b21223 100644
--- a/ru/gnome/docs/gnome_porting.sgml
+++ b/ru/gnome/docs/gnome_porting.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.7
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/gnome/docs/gnome_porting.sgml,v 1.2 2004/09/21 07:50:16 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/gnome/docs/gnome_porting.sgml,v 1.3 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY title "������ FreeBSD GNOME: ���������� GNOME 1">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 
 <html>
diff --git a/ru/gnome/docs/knownissues.sgml b/ru/gnome/docs/knownissues.sgml
index 5132689f16..ab639351cd 100644
--- a/ru/gnome/docs/knownissues.sgml
+++ b/ru/gnome/docs/knownissues.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.9
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/gnome/docs/knownissues.sgml,v 1.2 2004/09/21 07:50:16 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/gnome/docs/knownissues.sgml,v 1.3 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY title "������ FreeBSD GNOME: ��������� �������� � GNOME &gnomever; �� FreeBSD">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 
 <html>
diff --git a/ru/gnome/docs/porting.sgml b/ru/gnome/docs/porting.sgml
index ef27e2d00d..e4bdeba014 100644
--- a/ru/gnome/docs/porting.sgml
+++ b/ru/gnome/docs/porting.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.34
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/gnome/docs/porting.sgml,v 1.3 2004/09/21 07:50:16 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/gnome/docs/porting.sgml,v 1.4 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY title "������ FreeBSD GNOME: ��� ������� ����">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 
 <html>
diff --git a/ru/gnome/docs/volunteer.sgml b/ru/gnome/docs/volunteer.sgml
index 631b0ccecb..2159c2227b 100644
--- a/ru/gnome/docs/volunteer.sgml
+++ b/ru/gnome/docs/volunteer.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.7
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/gnome/docs/volunteer.sgml,v 1.3 2004/09/21 07:50:16 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/gnome/docs/volunteer.sgml,v 1.4 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY title "������ FreeBSD GNOME: ��� ��� ������">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 
 <html>
diff --git a/ru/gnome/newsflash.xsl b/ru/gnome/newsflash.xsl
index 5d21900e4b..aaac248f5f 100644
--- a/ru/gnome/newsflash.xsl
+++ b/ru/gnome/newsflash.xsl
@@ -3,7 +3,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD: www/ru/gnome/newsflash.xsl,v 1.1 2004/01/04 09:42:56 andy Exp $
+     $FreeBSD: www/ru/gnome/newsflash.xsl,v 1.2 2005/10/05 20:59:53 simon Exp $
      $FreeBSDru: frdp/www/ru/gnome/newsflash.xsl,v 1.1 2003/10/26 18:32:48 andy Exp $
 
      Original revision: 1.3
@@ -103,30 +103,11 @@
 	  <xsl:text> </xsl:text>
 	  <xsl:value-of select="ancestor::month/name"/>, 
 	  <xsl:value-of select="ancestor::year/name"/>:</b><xsl:text> </xsl:text>
-	<xsl:apply-templates select="p"/>
+	<xsl:copy-of select="p"/>
 	</p>
 
     </li>
   </xsl:template>
 
   <xsl:template match="date"/>    <!-- Deliberately left blank -->
-
-  <!-- When the href attribute contains a '$base', expand it to the current
-       value of the $base variable. -->
-
-  <!-- All your $base are belong to us.  Ho ho ho -->
-  <xsl:template match="a">
-    <a><xsl:attribute name="href">
-	<xsl:choose>
-	  <xsl:when test="contains(@href, '$base')">
-	    <xsl:value-of select="concat(substring-before(@href, '$base'), $base, substring-after(@href, '$base'))"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:value-of select="@href"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </a>
-  </xsl:template>
 </xsl:stylesheet>
diff --git a/ru/gnome/screenshots.sgml b/ru/gnome/screenshots.sgml
index 114b4650f8..aa2e6c2b5b 100644
--- a/ru/gnome/screenshots.sgml
+++ b/ru/gnome/screenshots.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.27
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/gnome/screenshots.sgml,v 1.2 2004/09/21 07:50:16 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/gnome/screenshots.sgml,v 1.3 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY title "������ FreeBSD GNOME: ������ �������">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % gnomeincludes SYSTEM "includes.sgml"> %gnomeincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 
 <html>
diff --git a/ru/handbook/index.sgml b/ru/handbook/index.sgml
index 1c3a378563..9a61cad83e 100644
--- a/ru/handbook/index.sgml
+++ b/ru/handbook/index.sgml
@@ -1,16 +1,15 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD: www/ru/handbook/index.sgml,v 1.6 2004/04/09 12:10:03 phantom Exp $
+     $FreeBSD: www/ru/handbook/index.sgml,v 1.7 2005/10/05 20:59:53 simon Exp $
      $FreeBSDru: frdp/www/ru/handbook/index.sgml,v 1.5 2004/04/08 13:10:16 den Exp $
 -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/handbook/index.sgml,v 1.6 2004/04/09 12:10:03 phantom Exp $">
+<!ENTITY date "$FreeBSD: www/ru/handbook/index.sgml,v 1.7 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY title "����������� �� FreeBSD">
 <!ENTITY email "freebsd-doc">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/includes.navabout.sgml b/ru/includes.navabout.sgml
deleted file mode 100644
index 2f374edbf0..0000000000
--- a/ru/includes.navabout.sgml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- The FreeBSD Russian Documentation Project -->
-<!-- $FreeBSDru: frdp/www/ru/includes.navabout.sgml,v 1.3 2006/06/10 10:48:17 gad Exp $ -->
-<!-- $FreeBSD$ -->
-<!-- Original revision: 1.4 -->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">��������� �� �������</h2>
-<ul>
-<li><a href="&base;/about.html">� FreeBSD</a></li>
-<li><a href="&base;/features.html">�����������</a></li>
-<li><a href="&base;/applications.html">����������</a></li>
-<li><a href="&base;/internet.html">������ � �����</a></li>
-<li><a href="&enbase;/advocacy/">����������</a></li>
-<li><a href="&enbase;/marketing/">���������</a></li>
-<li><a href="&base;/news/newsflash.html">�������</a></li>
-<li><a href="&base;/events/events.html">�������</a></li>
-<li><a href="&base;/news/press.html">������</a></li>
-<li><a href="&base;/art.html">�����������</a></li>
-<li><a href="&base;/logo.html">�������</a></li>
-<li><a href="&base;/donations/">�������������</a></li>
-<li><a href="&base;/copyright/">����������� ���������</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/ru/includes.navcommunity.sgml b/ru/includes.navcommunity.sgml
deleted file mode 100644
index f82c69fa7f..0000000000
--- a/ru/includes.navcommunity.sgml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- The FreeBSD Russian Documentation Project -->
-<!-- $FreeBSDru: frdp/www/ru/includes.navcommunity.sgml,v 1.3 2006/02/18 17:32:33 gad Exp $ -->
-<!-- $FreeBSD$ -->
-<!-- Original revision: 1.3 -->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">��������� �� �������</h2>
-<ul>
-<li><a href="&base;/community.html">����������</a></li>
-<li><a href="&base;/community/mailinglists.html">������ ��������</a></li>
-<li><a href="&base;/community/irc.html">IRC</a></li>
-<li><a href="&base;/community/newsgroups.html">���������������</a></li>
-<li><a href="&base;/usergroups.html">������ �������������</a></li>
-<li><a href="&base;/community/webresources.html">Web �������</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/ru/includes.navdevelopers.sgml b/ru/includes.navdevelopers.sgml
deleted file mode 100644
index 27d2a73d79..0000000000
--- a/ru/includes.navdevelopers.sgml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- The FreeBSD Russian Documentation Project -->
-<!-- $FreeBSD$ -->
-<!-- $FreeBSDru: frdp/www/ru/includes.navdevelopers.sgml,v 1.5 2006/06/10 10:48:17 gad Exp $ -->
-<!-- Original revision: 1.10 -->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">��������� �� �������</h2>
-<ul>
-<li><a href="&base;/projects/index.html">������������</a></li>
-<li><a href="&enbase;/doc/en_US.ISO8859-1/books/developers-handbook">����������� ������������</a></li>
-<li><a href="&enbase;/doc/&url.doc.langcode;/books/porters-handbook">����������� �� �������� ������</a></li>
-<li><a href="&base;/developers/cvs.html">CVS �����������</a></li>
-<li><a href="&base;/releng/index.html">���������� �������</a></li>
-<li><a href="&base;/platforms/">���������</a>
-	<ul>
-		<li><a href="&base;/platforms/alpha.html">alpha</a></li>
-		<li><a href="&base;/platforms/amd64.html">amd64</a></li>
-                <li><a href="&base;/platforms/arm.html">ARM</a></li>
-		<li><a href="&base;/platforms/i386.html">i386</a></li>
-		<li><a href="&base;/platforms/ia64/index.html">ia64</a></li>
-                <li><a href="&base;/platforms/mips.html">MIPS</a></li>
-		<li><a href="&base;/platforms/pc98.html">pc98</a></li>
-                <li><a href="&base;/platforms/ppc.html">ppc</a></li>
-		<li><a href="&base;/platforms/sparc.html">sparc64</a></li>
-                <li><a href="&base;/platforms/xbox.html">xbox</a></li>
-	</ul>
-</li>
-<li><a href="&enbase;/projects/ideas/">���� ��� �������</a></li>
-<li><a href="&enbase;/doc/&url.doc.langcode;/articles/contributing/index.html">���������� �������</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/ru/includes.navdocs.sgml b/ru/includes.navdocs.sgml
deleted file mode 100644
index 306d94a2ba..0000000000
--- a/ru/includes.navdocs.sgml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-    The FreeBSD Russian Documentation Project
-
-    $FreeBSDru: frdp/www/ru/includes.navdocs.sgml,v 1.3 2006/06/10 10:48:17 gad Exp $
-    $FreeBSD$
-
-    Original revision: 1.6
--->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">��������� �� �������</h2>
-<ul>
-<li><a href="&base;/docs.html">������������</a></li>
-<li><a href="&enbase;/doc/&url.doc.langcode;/books/faq/">FAQ</a></li>
-<li><a href="&enbase;/doc/&url.doc.langcode;/books/handbook/">�����������</a></li>
-<li><a href="&base;/docs/man.html">�������� �����������</a>
-	<ul>
-		<li><a href="&enbase;/cgi/man.cgi">�������� ����������� � ����</a></li>
-	</ul>
-</li>
-<li><a href="&base;/docs/books.html">����� � ������</a></li>
-<li><a href="&enbase;/marketing/">������������� ���������</a></li>
-<li><a href="&base;/publish.html">����������</a></li>
-<li><a href="&base;/docs/webresources.html">Web �������</a></li>
-<li><a href="&base;/projects/newbies.html">��� ��������</a></li>
-<li><a href="&base;/docproj/">������ ����������������</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/ru/includes.navdownload.sgml b/ru/includes.navdownload.sgml
deleted file mode 100644
index 09315c47cd..0000000000
--- a/ru/includes.navdownload.sgml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-    The FreeBSD Russian Documentation Project
-
-    $FreeBSDru: frdp/www/ru/includes.navdownload.sgml,v 1.3 2006/06/10 18:40:56 gad Exp $
-    $FreeBSD$
-
-    Original revision: 1.5
--->
-
-<!ENTITY % relincludes SYSTEM "includes.sgml"> %relincludes;
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">��������� �� �������</h2>
-<ul>
-<li><a href="&base;/where.html">�������� FreeBSD</a></li>
-<li><a href="&base;/releases/">���������� � �������</a>
-	<ul>
-		<li><a href="&u.rel.announce;">������������ �����: &rel.current;</a></li>
-		<li><a href="&u.rel2.announce;">(������) ������������ �����: &rel2.current;</a></li>
-		<li><a href="&base;/snapshots/">�������-������</a></li>
-              <![ %beta.testing; [ 
-                <li><a href="&u.betarel.schedule;">����������� �����: &betarel.current;</a></li>
-              ]]>
-              <![ %beta2.testing; [ 
-                <li><a href="&u.betarel2.schedule;">����������� �����: &betarel2.current;</a></li>
-              ]]>
-	</ul>
-</li>
-<li><a href="&base;/ports/">������������� ����������</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/ru/includes.navsupport.sgml b/ru/includes.navsupport.sgml
deleted file mode 100644
index f35fb34a3b..0000000000
--- a/ru/includes.navsupport.sgml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- The FreeBSD Russian Documentation Project -->
-<!-- $FreeBSDru: frdp/www/ru/includes.navsupport.sgml,v 1.3 2006/02/18 17:32:33 gad Exp $ -->
-<!-- $FreeBSD$ -->
-<!-- Original revision: 1.3 -->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">��������� �� �������</h2>
-<ul>
-<li><a href="&base;/support.html">���������</a></li>
-<li><a href="&base;/commercial/">����������</a>
-	<ul>
-		<li><a href="&enbase;/commercial/software_bycat.html">����������� �����������</a></li>
-		<li><a href="&enbase;/commercial/hardware.html">���������� �����������</a></li>
-		<li><a href="&enbase;/commercial/consult_bycat.html">�������������� ������</a></li>
-		<li><a href="&enbase;/commercial/isp.html">�������� ����������</a></li>
-		<li><a href="&enbase;/commercial/misc.html">������</a></li>
-	</ul>
-</li>
-<li><a href="&base;/security/">���������� � ������������</a></li>
-<li><a href="&base;/support/bugreports.html">��������� �� �������</a>
-	<ul>
-		<li><a href="&base;/send-pr.html">������� ��������� � ��������</a></li>
-	</ul>
-</li>
-<li><a href="&base;/support/webresources.html">Web �������</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/ru/includes.sgml b/ru/includes.sgml
deleted file mode 100644
index ff0d5544e9..0000000000
--- a/ru/includes.sgml
+++ /dev/null
@@ -1,217 +0,0 @@
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSD: www/ru/includes.sgml,v 1.33 2005/11/08 18:22:23 bvs Exp $
-     $FreeBSDru: frdp/www/ru/includes.sgml,v 1.28 2006/07/18 12:21:53 den Exp $
-
-     Original revision: 1.62
--->
-
-<!ENTITY url.doc.langcode    'ru_RU.KOI8-R'>
-
-<!--  
-  Base is the absolute URL for the given page, minus the actual page
-  part.  It should either be specified as a fully qualified URL, or
-  relative to the server root.  It should be defined in the prolog
-  <em>before</em> including this file if the page does not live at the
-  default location below. 
-
-  When making a  link, use <a href="&base;/mypage.html">foo</a> and
-  &base; will be expanded appropriately.  Base is also used in the
-  definition of standard boilerplate entities in this file, so be sure
-  base is correct!
--->
-
-<!ENTITY base CDATA ".">
-<!ENTITY enbase '../&base;'>
-
-<!-- Images -->
-<!ENTITY i.daemon '<img src="&enbase;/gifs/daemon.gif" alt="" align="left"  width="80" height="76">'>
-<!ENTITY i.new '<img src="&enbase;/gifs/new.gif" alt="[New!]" width="28" height="11">'>
-
-<!-- Components making up the standard headers and footers. -->
-<!-- Override in the prolog <em>before</em> including this  -->
-<!-- file if necessary.                                     -->
-<!ENTITY author '<a href="&base;/index.html">�������</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">��������</a> &nbsp; | &nbsp; <a href="&base;/copyright/index.html">��������� �����</a> &nbsp; | &nbsp; &copyright;'>
-<!ENTITY home '<a href="&base;/index.html"><img src="&enbase;/gifs/home.gif"
-  alt="������� �������� FreeBSD" border="0" align="right" width="101" height="33"></a>'>
-<!ENTITY stylesheet '&enbase;/layout/css/fixed.css'>
-<!ENTITY stylesheetlarge '&enbase;/layout/css/fixed_large.css'>
-<!ENTITY nav ''>
-
-<!-- Standard headers and footers -->
-
-<!ENTITY header '<head><title>&title;</title>
-<meta http-equiv="Content-Type" content="text/html; charset=KOI8-R">
-<meta name="MSSmartTagsPreventParsing" content="TRUE">
-<link rel="shortcut icon" href="&enbase;/favicon.ico" type="image/x-icon">
-<link rel="icon" href="&enbase;/favicon.ico" type="image/x-icon">
-<link rel="stylesheet" media="screen" href="&stylesheet;" type="text/css" title="Normal Text">
-<link rel="alternate stylesheet" media="screen" href="&stylesheetlarge;" type="text/css" title="Large Text">
-<script type="text/javascript" src="&enbase;/layout/js/styleswitcher.js"></script>
-</head>
-<body>
-   <div id="containerwrap">
-    <div id="container">
-      <span class="txtoffscreen"><a href="#content" title="Skip site navigation" accesskey="1">����������� ��������� �� �����</a> (1)</span>
-      <span class="txtoffscreen"><a href="#contentwrap" title="Skip section navigation" accesskey="2">����������� ��������� �� �������</a> (2)</span>
-      <div id="headercontainer">
-
-        <div id="header">
-	      <h2 class="blockhide">��������� � �������</h2>
-          <div id="headerlogoleft">
-            <a href="&base;" title="FreeBSD"><img src="&enbase;/layout/images/logo.png" width="360" height="40" alt="FreeBSD"></a>
-          </div> <!-- headerlogoleft -->
-          <div id="headerlogoright">
-			<h2 class="blockhide">�������������� ������</h2>
-			  <div id="searchnav">
-				<ul id="searchnavlist">
-				  <li>
-					Text size: <a href="#" onkeypress="return false;" onclick="setActiveStyleSheet(&#39;Normal Text&#39;); return false;" title="���������� ������ ����">Normal</a> / <a href="#" onkeypress="return false;" onclick="setActiveStyleSheet(&#39;Large Text&#39;); return false;" title="������� ������ ����">Large</a>
-				  </li>
-				  <li>
-					<a href="&base;/donations/" title="�������������">�������������</a>
-				  </li>
-				  <li class="last-child">
-					<a href="&base;/mailto.html" title="���������� ����������">���������� ����������</a>
-				  </li>
-				</ul>
-			  </div> <!-- searchnav -->
-			<div id="search">
-			  <form action="&enbase;/cgi/search.cgi" method="get">
-				<div>
-			      <h2 class="blockhide"><label for="words">�����</label></h2>
-				  <input type="hidden" name="max" value="25"> <input type="hidden" name="source" value="www"><input id="words" name="words" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value=&#39;&#39;;" value="�����"> <input id="submit" name="submit" type="submit" value="�����">
-				</div>
-			  </form>
-			</div> <!-- search -->
-          </div> <!-- headerlogoright -->
-
-        </div> <!-- header -->
-
-  	<h2 class="blockhide">��������� �� �����</h2>
-        <div id="topnav">
-          <ul id="topnavlist">
-	  <li>
-		<a href="&base;/" title="�� �������">�� �������</a>
-	  </li>
-	  <li>
-		<a href="&base;/about.html" title="� FreeBSD">� FreeBSD</a>
-	  </li>
-	  <li>
-		<a href="&base;/where.html" title="��������� FreeBSD">��������� FreeBSD</a>
-	  </li>
-	  <li>
-		<a href="&base;/docs.html" title="������������">������������</a>
-	  </li>
-	  <li>
-		<a href="&base;/community.html" title="����������">����������</a>
-	  </li>
-	  <li>
-		<a href="&base;/projects/index.html" title="����������">����������</a>
-	  </li>
-	  <li>
-		<a href="&base;/support.html" title="���������">���������</a>
-	  </li>
-	  </ul>
-        </div> <!-- topnav -->
-      </div> <!-- headercontainer -->
-
-<div id="content">
-<div id="sidewrap">
-&nav;
-</div> <!-- sidewrap -->
-
-<div id="contentwrap">
-
-<h1>&title;</h1>'>
-
-<!ENTITY footer '</div> <!-- contentwrap -->
-<br class="clearboth">
-
-      </div> <!-- content -->
-      <div id="footer">
-        &copyright;<br>
-        &date;
-      </div> <!-- footer -->
-
-    </div> <!-- container -->
-   </div> <!-- containerwrap -->'>
-
-<!-- XXX rel.current and u.rel.* should be available in doc/ -->
-<!-- The currently released versions of FreeBSD.  This value is used to
-     create some links on web sites and such, so do NOT change it until
-     it's really release time.  When you update this, you should also
-     update (at least) the following:
-
-	- similar entity in the Handbook
-	- similar entity in the Relnotes
-	- releases/index.sgml has the date of the current release
-	- the FAQ has links to the release FTP url
-	- "versions supported" in security.sgml
-
-     (If you're the release engineer, feel free to update this list with
-     other doc-related things you had to do.  It'll save you time and
-     trouble the next time around :-).)
-
-     As of 5.0, we now have the concept of two different "currently"
-     released versions (from two different development branches).  Use
-     rel.* and u.rel.* for the "latest and greatest" version and
-     rel2.* and u.rel2.* for the "conservative users" version.
--->
-<!ENTITY rel.current '6.1'>
-<!ENTITY rel.current.date '��� 2006'>
-<!ENTITY rel.current.major '6'>
-
-<!-- URLs to information on the latest release -->
-<!ENTITY u.rel.notes '&enbase;/releases/&rel.current;R/relnotes.html'>
-<!ENTITY u.rel.announce '&enbase;/releases/&rel.current;R/announce.html'>
-<!ENTITY u.rel.errata '&enbase;/releases/&rel.current;R/errata.html'>
-<!ENTITY u.rel.hardware '&enbase;/releases/&rel.current;R/hardware.html'>
-<!ENTITY u.rel.installation '&enbase;/releases/&rel.current;R/installation.html'>
-<!ENTITY u.rel.readme '&enbase;/releases/&rel.current;R/readme.html'>
-
-<!ENTITY % beta.testing "IGNORE">
-<!ENTITY betarel.current '5.5'>
-<!ENTITY betarel.vers 'RC1'>
-<!ENTITY u.betarel.schedule '&enbase;/releases/&betarel.current;R/schedule.html'>
-
-<!-- Secondary "current release" entities -->
-
-<!ENTITY % beta2.testing "IGNORE">
-<!ENTITY betarel2.current '5.5'>
-<!ENTITY betarel2.vers 'RC1'>
-<!ENTITY u.betarel2.schedule '&enbase;/releases/&betarel2.current;R/schedule.html'>
-<!ENTITY rel2.current '5.5'>
-<!ENTITY rel2.current.date '��� 2006'>
-<!ENTITY rel2.current.major '5'>
-
-<!-- URLs to information on the latest release -->
-<!ENTITY u.rel2.notes '&base;/releases/&rel2.current;R/relnotes.html'>
-<!ENTITY u.rel2.announce '&base;/releases/&rel2.current;R/announce.html'>
-<!ENTITY u.rel2.errata '&base;/releases/&rel2.current;R/errata.html'>
-<!ENTITY u.rel2.hardware '&base;/releases/&rel2.current;R/hardware.html'>
-<!ENTITY u.rel2.installation '&base;/releases/&rel2.current;R/installation.html'>
-<!ENTITY u.rel2.readme '&base;/releases/&rel2.current;R/readme.html'>
-
-<!-- macro for webbuild paper -->
-<!ENTITY webbuild '
-<p>���� �������� ��������� ���������� � ���������� ���-������� FreeBSD ��
-������ CVS � ������ ������.</p>'>
-
-<!-- avoid replacing &nbsp; etc. with hardcoded Latin1 values -->
-<!ENTITY Eacute SDATA "[x00C9 ]">
-
-<!-- Language-specific entities should be put above this line -->
-
-<!ENTITY % includes.global SYSTEM "../share/sgml/includes.sgml">
-%includes.global;
-
-<!-- 
-     Local Variables:
-     mode: sgml
-     sgml-indent-data: t
-     sgml-omittag: nil
-     sgml-always-quote-attributes: t
-     End:
--->
diff --git a/ru/includes.xsl b/ru/includes.xsl
deleted file mode 100644
index 38fcee88ab..0000000000
--- a/ru/includes.xsl
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="KOI8-R" ?>
-
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSD$
-     $FreeBSDru: frdp/www/ru/includes.xsl,v 1.19 2006/07/19 10:45:38 den Exp $
-
-     Original revision: 1.20
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:import href="../share/sgml/includes.xsl" />
-
-  <xsl:variable name="url.doc.langcode" select="'ru_RU.KOI8-R'" />
-
-  <!-- Language-specific definitions should be put below this line -->
-
-  <xsl:variable name="i.daemon">
-    <img src="{$base}/../gifs/daemon.gif" alt="" align="left" width="80" height="76"/>
-  </xsl:variable>
-
-  <xsl:variable name="i.new">
-    <img src="{$base}/../gifs/new.gif" alt="[New!]" width="28" height="11"/>
-  </xsl:variable>
-
-  <xsl:variable name="copyright">
-  <a href="{$base}/copyright/">Legal Notices</a> | Copyright &#169; 1995-2005 The FreeBSD Project.  ��� ����� ��������
-  </xsl:variable>
-
-  <xsl:variable name="home">
-    <a href="{$base}/index.html"><img src="{$base}/../gifs/home.gif" alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"/></a>
-  </xsl:variable>
-
-  <xsl:variable name="section" select="''"/>
-
-  <xsl:variable name="header1">
-    <head><title><xsl:value-of select="$title"/></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=KOI8-R" />
-    <meta name="MSSmartTagsPreventParsing" content="TRUE" />
-    <link rel="shortcut icon" href="{$enbase}/favicon.ico" type="image/x-icon" />
-    <link rel="icon" href="{$enbase}/favicon.ico" type="image/x-icon" />
-    <link rel="stylesheet" media="screen" href="{$enbase}/layout/css/fixed.css" type="text/css" title="Normal Text" />
-    <link rel="alternate stylesheet" media="screen" href="{$enbase}/layout/css/fixed_large.css" type="text/css" title="Large Text" />
-    <script type="text/javascript" src="{$enbase}/layout/js/styleswitcher.js"></script>
-    </head>    
-  </xsl:variable>
-  
-  <xsl:variable name="header2">
-	    <span class="txtoffscreen"><a href="#content" title="Skip site navigation" accesskey="1">����������� ��������� �� �����</a> (1)</span>
-	    <span class="txtoffscreen"><a href="#contentwrap" title="Skip section navigation" accesskey="2">����������� ��������� �� �������</a> (2)</span>
-            <div id="headercontainer">
-      
-              <div id="header">
-	        <h2 class="blockhide">��������� � �������</h2>
-                <div id="headerlogoleft">
-                  <a href="{$base}" title="FreeBSD"><img src="{$enbase}/layout/images/logo.png" width="360" height="40" alt="FreeBSD" /></a>
-                </div> <!-- headerlogoleft -->
-                <div id="headerlogoright">
-			<h2 class="blockhide">�������������� ������</h2>
-      			  <div id="searchnav">
-      				<ul id="searchnavlist">
-      				  <li>
-      					Text Size: <a href="#" onkeypress="return false;" onclick="setActiveStyleSheet('Normal Text'); return false;" title="Normal Text Size">Normal</a> / <a href="#" onkeypress="return false;" onclick="setActiveStyleSheet('Large Text'); return false;" title="Large Text Size">Large</a>
-      				  </li>
-      				  <li>
-      					<a href="{$base}/donations/" title="�������������">�������������</a>
-      				  </li>
-      				  <li class="last-child">
-      					<a href="{$base}/mailto.html" title="���������� ����������">���������� ����������</a>
-      				  </li>
-      				</ul>
-      			  </div> <!-- searchnav -->
-      			<div id="search">
-      			  <form action="{$enbase}/cgi/search.cgi" method="get">
-      				<div>
-      			      <h2 class="blockhide"><label for="words">�����</label></h2>
-      				  <input type="hidden" name="max" value="25" /> <input type="hidden" name="source" value="www" /><input id="words" name="words" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value='';" value="�����" />&#160;<input id="submit" name="submit" type="submit" value="�����" />
-      				</div>
-      			  </form>
-      			</div> <!-- search -->
-                </div> <!-- headerlogoright -->
-      
-              </div> <!-- header -->
-      
-	      <h2 class="blockhide">��������� �� �����</h2>
-              <div id="topnav">
-                <ul id="topnavlist">
-		  <li>
-	       	        <a href="{$base}/" title="�� �������">�� �������</a>
-		  </li>
-		  <li>
-	 	        <a href="{$base}/about.html" title="� FreeBSD">� FreeBSD</a>
-		  </li>
-		  <li>
-			<a href="{$base}/where.html" title="��������� FreeBSD">��������� FreeBSD</a>
-		  </li>
-		  <li>
-			<a href="{$base}/docs.html" title="������������">������������</a>
-		  </li>
-		  <li>
-			<a href="{$base}/community.html" title="����������">����������</a>
-		  </li>
-		  <li>
-			<a href="{$base}/projects/index.html" title="����������">����������</a>
-		  </li>
-		  <li>
-			<a href="{$base}/support.html" title="���������">���������</a>
-		  </li>		  
-		</ul>
-              </div> <!-- topnav -->
-            </div> <!-- headercontainer -->
-  </xsl:variable>
-  
-  <xsl:variable name="header3">
-  	<h1><xsl:value-of select="$title"/></h1>
-  </xsl:variable>
-  
-  <xsl:variable name="sidenav">
-	<div id="sidewrap">
-	
-	<div id="sidenav">
- 	<h2 class="blockhide">��������� �� �������</h2>
-	
-	<xsl:if test="$section = 'about'" >
-		<ul>
-		<li><a href="{$base}/about.html">� FreeBSD</a></li>
-		<li><a href="{$base}/features.html">�����������</a></li>
-		<li><a href="{$base}/applications.html">����������</a></li>
-		<li><a href="{$base}/internet.html">������ � �����</a></li>
-		<li><a href="{$enbase}/advocacy/">����������</a></li>
-		<li><a href="{$enbase}/marketing/">���������</a></li>
-		<li><a href="{$base}/news/newsflash.html">�������</a></li>
-		<li><a href="{$base}/events/events.html">�������</a></li>
-		<li><a href="{$base}/news/press.html">������</a></li>
-		<li><a href="{$base}/art.html">�����������</a></li>
-		<li><a href="{$base}/donations/">�������������</a></li>
-		<li><a href="{$base}/copyright/">����������� ���������</a></li>
-		</ul>
-	</xsl:if>
-
-	<xsl:if test="$section = 'community'" >
-		<ul>
-		<li><a href="{$base}/community.html">����������</a></li>
-		<li><a href="{$base}/community/mailinglists.html">������ ��������</a></li>
-		<li><a href="{$base}/community/irc.html">IRC</a></li>
-		<li><a href="{$base}/community/newsgroups.html">���������������</a></li>
-		<li><a href="{$base}/usergroups.html">������ �������������</a></li>
-		<li><a href="{$base}/community/webresources.html">Web �������</a></li>
-		</ul>
-	</xsl:if>
-
-	<xsl:if test="$section = 'developers'" >
-		<ul>
-		<li><a href="{$base}/projects/index.html">������������</a></li>
-		<li><a href="{$enbase}/doc/en_US.ISO8859-1/books/developers-handbook">����������� ������������</a></li>
-		<li><a href="{$enbase}/doc/{$url.doc.langcode}/books/porters-handbook">����������� �� �������� ������</a></li>
-		<li><a href="{$base}/support.html#cvs">CVS �����������</a></li>
-		<li><a href="{$base}/releng/index.html">���������� �������</a></li>
-		<li><a href="{$base}/platforms/">���������</a>
-			<ul>
-				<li><a href="{$base}/platforms/alpha.html">alpha</a></li>
-				<li><a href="{$base}/platforms/amd64.html">amd64</a></li>
-				<li><a href="{$base}/platforms/i386.html">i386</a></li>
-				<li><a href="{$base}/platforms/ia64.html">ia64</a></li>
-				<li><a href="{$base}/platforms/pc98.html">pc98</a></li>
-				<li><a href="{$base}/platforms/sparc.html">sparc64</a></li>
-			</ul>
-		</li>
-		<li><a href="{$base}/doc/{$url.doc.langcode}/articles/contributing/index.html">���������� �������</a></li>
-		</ul>
-	</xsl:if>
-
-	<xsl:if test="$section = 'docs'" >
-		<ul>
-		<li><a href="{$base}/docs.html">������������</a></li>
-		<li><a href="{$enbase}/doc/{$url.doc.langcode}/books/faq/">FAQ</a></li>
-		<li><a href="{$enbase}/doc/{$url.doc.langcode}/books/handbook/">�����������</a></li>
-		<li><a href="{$base}/docs.html#man">�������� �����������</a>
-			<ul>
-				<li><a href="{$enbase}/cgi/man.cgi">�������� ����������� � ����</a></li>
-			</ul>
-		</li>
-		<li><a href="{$base}/docs.html#books">����� � ������</a></li>
-		<li><a href="{$base}/publish.html">����������</a></li>
-		<li><a href="{$base}/docs.html#links">Web �������</a></li>
-		<li><a href="{$base}/projects/newbies.html">��� ��������</a></li>
-		<li><a href="{$base}/docproj/">������ ����������������</a></li>
-		</ul>
-	</xsl:if>
-
-	<xsl:if test="$section = 'download'" >
-		<ul>
-		<li><a href="{$base}/where.html">�������� FreeBSD</a></li>
-		<li><a href="{$base}/releases/">Release Information</a>
-			<ul>
-				<li><a href="{$u.rel.announce}">������������ �����: {$rel.current}</a></li>
-				<li><a href="{$u.rel2.announce}">(������) ������������ �����: {$rel2.current}</a></li>
-				<li><a href="{$base}/snapshots/">�������-������</a></li>
-			</ul>
-		</li>
-		<li><a href="{$base}/ports/">������������� ����������</a></li>
-		</ul>
-	</xsl:if>
-
-	<xsl:if test="$section = 'support'" >
-		<ul>
-		<li><a href="{$base}/support.html">���������</a></li>
-		<li><a href="{$base}/commercial/">����������</a>
-			<ul>
-				<li><a href="{$enbase}/commercial/software_bycat.html">����������� �����������</a></li>
-				<li><a href="{$enbase}/commercial/hardware.html">���������� �����������</a></li>
-				<li><a href="{$enbase}/commercial/consult_bycat.html">�������������� ������</a></li>
-				<li><a href="{$enbase}/commercial/isp.html">�������� ����������</a></li>
-				<li><a href="{$enbase}/commercial/misc.html">������</a></li>
-			</ul>
-		</li>
-		<li><a href="{$base}/security/">���������� � ������������</a></li>
-		<li><a href="{$base}/support.html#gnats">��������� �� �������</a>
-			<ul>
-				<li><a href="{$base}/send-pr.html">������� ��������� � ��������</a></li>
-			</ul>
-		</li>
-		<li><a href="{$enbase}/support/webresources.html">Web �������</a></li>
-		</ul>
-	</xsl:if>
-	
-	</div> <!-- sidenav -->
-	
-	</div> <!-- sidewrap -->
-  </xsl:variable>
-  
-  <xsl:variable name="footer">
-	<div id="footer">
-	<xsl:copy-of select="$copyright"/><br />
-	<xsl:copy-of select="$date"/>
-	</div> <!-- footer -->
-  </xsl:variable>
-
-  <xsl:variable name="u.rel.notes">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/relnotes.html</xsl:variable>
-
-  <xsl:variable name="u.rel.announce">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/announce.html</xsl:variable>
-  <xsl:variable name="u.rel.errata">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/errata.html</xsl:variable>
-  <xsl:variable name="u.rel.hardware">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/hardware.html</xsl:variable>
-  <xsl:variable name="u.rel.installation">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/installation.html</xsl:variable>
-  <xsl:variable name="u.rel.readme">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/readme.html</xsl:variable>
-  <xsl:variable name="u.rel.early">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/migration-guide.html</xsl:variable>
-  <xsl:variable name="u.rel.migration">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/migration-guide.html</xsl:variable>
-
-  <xsl:variable name="u.rel2.notes">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/relnotes.html</xsl:variable>
-  <xsl:variable name="u.rel2.announce">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/announce.html</xsl:variable>
-  <xsl:variable name="u.rel2.errata">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/errata.html</xsl:variable>
-  <xsl:variable name="u.rel2.hardware">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/hardware.html</xsl:variable>
-  <xsl:variable name="u.rel2.installation">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/installation.html</xsl:variable>
-  <xsl:variable name="u.rel2.readme">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/readme.html</xsl:variable>
-
-</xsl:stylesheet>
diff --git a/ru/index.xsl b/ru/index.xsl
index 2047acb4b8..d898806b98 100644
--- a/ru/index.xsl
+++ b/ru/index.xsl
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="KOI8-R" ?>
+<?xml version="1.0" encoding="koi8-r" ?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+<!ENTITY title "������ FreeBSD">
+]>
 
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD: www/ru/index.xsl,v 1.29 2006/01/09 17:55:19 bvs Exp $
+     $FreeBSD: www/ru/index.xsl,v 1.30 2006/01/17 09:27:09 bvs Exp $
      $FreeBSDru: frdp/www/ru/index.xsl,v 1.47 2006/01/16 21:27:51 gad Exp $
 
      Original revision: 1.127
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  <xsl:import href="includes.xsl"/>
-  <xsl:import href="news/includes.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
-  <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="enbase" select="'..'"/>
-  <xsl:variable name="date" select="'$FreeBSD$'"/>
-  <xsl:variable name="title" select="'������ FreeBSD'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/ru/index.xsl,v 1.30 2006/01/17 09:27:09 bvs Exp $'"/>
 
   <!-- these params should be externally bound. The values
        here are not used actually -->
@@ -29,15 +29,14 @@
   <xsl:param name="news.project.xml" select="'none'"/>
   <xsl:param name="events.xml-master" select="'none'"/>
   <xsl:param name="events.xml" select="'none'"/>
-  <xsl:param name="curdate.xml" select="'none'"/>
 
-  <xsl:output type="html" encoding="koi8-r"
+  <xsl:output type="html" encoding="&xml.encoding;"
     doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/>
 
 <xsl:template match="/">
     <html>
       <head>
-	<title><xsl:value-of select="$title"/></title>
+	<title>&title;</title>
 	<meta name="description" content="������ FreeBSD"/>
 	<meta name="keywords" content="FreeBSD, BSD, UNIX, Support, Gallery,
 	  Release, Application, Software, Handbook, FAQ, Tutorials, Bugs, 
@@ -45,17 +44,17 @@
 	  ���������, �������, �����, ����������, ���������, �����������,
 	  ��������, ������, �������, ������������ ����������,
 	  �������� ��������"/>
-	<link rel="shortcut icon" href="{$enbase}/favicon.ico" type="image/x-icon"/>
-	<link rel="icon" href="{$enbase}/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" media="screen" href="{$enbase}/layout/css/fixed.css" type="text/css" title="Normal Text" />
-    <link rel="alternate stylesheet" media="screen" href="{$enbase}/layout/css/fixed_large.css" type="text/css" title="Large Text" />
-    <script type="text/javascript" src="{$enbase}/layout/js/styleswitcher.js"></script>
+	<link rel="shortcut icon" href="&enbase;/favicon.ico" type="image/x-icon"/>
+	<link rel="icon" href="&enbase;/favicon.ico" type="image/x-icon"/>
+    <link rel="stylesheet" media="screen" href="&enbase;/layout/css/fixed.css" type="text/css" title="Normal Text" />
+    <link rel="alternate stylesheet" media="screen" href="&enbase;/layout/css/fixed_large.css" type="text/css" title="Large Text" />
+    <script type="text/javascript" src="&enbase;/layout/js/styleswitcher.js"></script>
 	<link rel="alternate" type="application/rss+xml"
-	  title="������� ������� FreeBSD" href="{$base}/news/news.rdf" />
+	  title="������� ������� FreeBSD" href="&base;/news/news.rdf" />
 	<link rel="alternate" type="application/rss+xml"
-	  title="FreeBSD Security Advisories" href="{$base}/security/advisories.rdf" />
+	  title="FreeBSD Security Advisories" href="&base;/security/advisories.rdf" />
 	<link rel="alternate" type="application/rss+xml"
-	  title="������� ������� FreeBSD GNOME" href="{$base}/gnome/news.rdf" />
+	  title="������� ������� FreeBSD GNOME" href="&base;/gnome/news.rdf" />
 	
 	<!-- Formatted to be easy to spam harvest, please do not reformat. -->
 	<xsl:comment>
@@ -66,17 +65,17 @@
 
       <body>
 
-   <div id="containerwrap">
-    <div id="container">
-      <xsl:copy-of select="$header2"/>
-      <div id="content">
+   <div id="CONTAINERWRAP">
+    <div id="CONTAINER">
+      &header2;
+      <div id="CONTENT">
 
-        <div id="frontcontainer">
-          <div id="frontmain">
-            <div id="frontfeaturecontainer">
+        <div id="FRONTCONTAINER">
+          <div id="FRONTMAIN">
+            <div id="FRONTFEATURECONTAINER">
 
-		<div id="frontfeatureleft">
-			<div id="frontfeaturecontent">
+		<div id="FRONTFEATURELEFT">
+			<div id="FRONTFEATURECONTENT">
 				<h1>
 				  �������� �� BSD UNIX&#174;
 				</h1>				
@@ -85,14 +84,14 @@
 				Pentium&#174; � Athlon&#8482;), amd64 (������� Opteron&#8482;,
 				Athlon 64 � EM64T), Alpha/AXP, IA-64, PC-98 �
 				UltraSPARC&#174;.  ��� �������� �� BSD, ������
-				<xsl:value-of select="$unix"/>, ��������� � ��������������
+				&unix;, ��������� � ��������������
 				������������ � ������.  ��� ��������������� � �������������� <a
-				href="{$enbase}/doc/en_US.ISO8859-1/articles/contributors/index.html">
+				href="&enbase;/doc/en_US.ISO8859-1/articles/contributors/index.html">
 				������� �������� �������������</a>.  ��������� <a
 				href="platforms/index.html">������ ��������</a>
 				��������� �� ������ ������� ����������.</p>
 				<div id="txtfrontfeaturelink">
-				&#187;<a href="{$base}/about.html" title="�����...">�����...</a>
+				&#187;<a href="&base;/about.html" title="�����...">�����...</a>
 				</div> <!-- txtfrontfeaturelink -->
 			</div> <!-- frontfeaturecontent -->
 		</div> <!-- frontfeatureleft -->
@@ -101,7 +100,7 @@
 			<div class="frontgetroundbox">
 			  <div class="frontgettop"><div>&#160;</div>&#160;</div>
 				<div class="frontgetcontent">
-				<a href="{$base}/where.html">�������� FreeBSD ������</a>
+				<a href="&base;/where.html">�������� FreeBSD ������</a>
 				</div> <!-- frontgetcontent -->
 			  <div class="frontgetbot"><div>&#160;</div>&#160;</div>
 			</div> <!-- frontgetroundbox -->
@@ -111,10 +110,10 @@
 				  <h2>��������� ������</h2>
 				  <ul id="frontreleaseslist">
 					<li>
-					  <a href="../{$u.rel.announce}">������������ ����� <xsl:value-of select="$rel.current"/></a>
+					  <a href="../&u.rel.announce;">������������ ����� &rel.current;</a>
 					</li>
 					<li>
-					  <a href="{$u.rel2.announce}">(������) ������������ ����� <xsl:value-of select="$rel2.current"/></a>
+					  <a href="&u.rel2.announce;">(������) ������������ ����� &rel2.current;</a>
 					</li>
 				  </ul>
 			  </div> <!-- frontreleasescontent -->
@@ -126,31 +125,31 @@
 			<div id="languagenav">
 				<ul id="languagenavlist">
 				  <li>
-					<a href="{$enbase}/de/" title="��������">de</a>
+					<a href="&enbase;/de/" title="��������">de</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/" title="����������">en</a>
+					<a href="&enbase;/" title="����������">en</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/es/" title="���������">es</a>
+					<a href="&enbase;/es/" title="���������">es</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/fr/" title="�����������">fr</a>
+					<a href="&enbase;/fr/" title="�����������">fr</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/it/" title="�����������">it</a>
+					<a href="&enbase;/it/" title="�����������">it</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/ja/" title="��������">ja</a>
+					<a href="&enbase;/ja/" title="��������">ja</a>
 				  </li>
 				  <li class="last-child">
-					<a href="{$enbase}/ru/" title="�������">ru</a>
+					<a href="&enbase;/ru/" title="�������">ru</a>
 				  </li>
 				</ul>
 			</div> <!-- languagenav -->
 
 			<div id="mirror">
-			  <form action="{$enbase}/cgi/mirror.cgi" method="get">
+			  <form action="&enbase;/cgi/mirror.cgi" method="get">
 				<div>
 	 			<h2 class="blockhide"><label for="mirrorsel">�������</label></h2>
 				  <select id="mirrorsel" name="goto">
@@ -167,16 +166,16 @@
 				  <h2>������� ������</h2>
 				  <ul id="frontshortcutslist">
 					<li>
-					  <a href="{$base}/support.html#mailing-list" title="������ ��������">������ ��������</a>
+					  <a href="&base;/support.html#mailing-list" title="������ ��������">������ ��������</a>
 					</li>
 					<li>
-					  <a href="{$base}/platforms/" title="���������">���������</a>
+					  <a href="&base;/platforms/" title="���������">���������</a>
 					</li>
 					<li>
-					  <a href="{$base}/send-pr.html" title="�������� ���������">�������� ���������</a>
+					  <a href="&base;/send-pr.html" title="�������� ���������">�������� ���������</a>
 					</li>
 					<li>
-					  <a href="{$enbase}/doc/{$url.doc.langcode}/books/faq/index.html" title="FAQ">FAQ</a>
+					  <a href="&enbase;/doc/&url.doc.langcode;/books/faq/index.html" title="FAQ">FAQ</a>
 					</li>
 					<li>
 					  <a href="http://www.freebsdfoundation.org/" title="����">���� FreeBSD</a>
@@ -188,7 +187,7 @@
 			<div class="frontnewroundbox">
 			  <div class="frontnewtop"><div>&#160;</div>&#160;</div>
 			    <div class="frontnewcontent">
-			    <a href="{$base}/projects/newbies.html">������� �� FreeBSD?</a>
+			    <a href="&base;/projects/newbies.html">������� �� FreeBSD?</a>
 			    </div> <!-- frontnewcontent -->
 			  <div class="frontnewbot"><div>&#160;</div>&#160;</div>
 			</div> <!-- frontnewroundbox -->
@@ -211,10 +210,10 @@
 			  <div>
 				<ul class="newseventslist">
 				  <li class="first-child">
-				  <a href="{$base}/news/newsflash.html" title="�����...">�����...</a>
+				  <a href="&base;/news/newsflash.html" title="�����...">�����...</a>
 				  </li>
 				  <li class="last-child">
-					<a href="{$base}/news/news.rdf" title="News RSS Feed"><img class="rssimage" src="{$enbase}/layout/images/ico_rss.png" width="27" height="12" alt="News RSS Feed" /></a>
+					<a href="&base;/news/news.rdf" title="News RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="News RSS Feed" /></a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -238,7 +237,7 @@
 			  <div>
 				<ul class="newseventslist">
 				  <li class="only-child">
-				  <a href="{$base}/events/" title="�����...">�����...</a>
+				  <a href="&base;/events/" title="�����...">�����...</a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -261,7 +260,7 @@
 			  <div>
 				<ul class="newseventslist">
 				  <li class="only-child">
-				  <a href="{$base}/news/press.html" title="�����...">�����...</a>
+				  <a href="&base;/news/press.html" title="�����...">�����...</a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -284,13 +283,13 @@
 			  <div>
 				<ul class="newseventslist">
 				  <li class="first-child">
-				  <a href="{$base}/security/" title="���������� ��������� �� ������������">�������������...</a>
+				  <a href="&base;/security/" title="���������� ��������� �� ������������">�������������...</a>
 				  </li>
 				  <li>
-				  <a href="{$base}/send-pr.html" title="������� ��������� �� ������">�������� �� ������</a>
+				  <a href="&base;/send-pr.html" title="������� ��������� �� ������">�������� �� ������</a>
 				  </li>
 				  <li class="last-child">
-					<a href="{$base}/security/advisories.rdf" title="Security Advisories RSS Feed"><img class="rssimage" src="{$enbase}/layout/images/ico_rss.png" width="27" height="12" alt="News RSS Feed" /></a>
+					<a href="&base;/security/advisories.rdf" title="Security Advisories RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="News RSS Feed" /></a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -317,12 +316,18 @@
         </div> <!-- frontcontainer -->
 
       </div> <!-- content -->
-      <div id="footer">
-        <xsl:copy-of select="$copyright"/><br />
-        <xsl:copy-of select="$date"/>
-      </div> <!-- footer -->
-    </div> <!-- container -->
-   </div> <!-- containerwrap -->
+      <div id="FOOTER">
+	&copyright;
+
+	The mark FreeBSD is a registered trademark of The FreeBSD
+	Foundation and is used by The FreeBSD Project with the
+	permission of <a
+	  href="http://www.freebsdfoundation.org/documents/Guidelines.shtml">The
+	FreeBSD Foundation</a>.
+
+      </div> <!-- FOOTER -->
+    </div> <!-- CONTAINER -->
+   </div> <!-- CONTAINERWRAP -->
 
       </body>
     </html>
diff --git a/ru/internal/about.sgml b/ru/internal/about.sgml
index 410de386bf..16f0017347 100644
--- a/ru/internal/about.sgml
+++ b/ru/internal/about.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/internal/about.sgml,v 1.10 2006/02/10 13:15:25 marck Exp $">
 <!ENTITY title "� WWW-������� FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/ru/internal/bylaws.sgml b/ru/internal/bylaws.sgml
index 3253dd9e03..31c75e2771 100644
--- a/ru/internal/bylaws.sgml
+++ b/ru/internal/bylaws.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.6
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/internal/bylaws.sgml,v 1.4 2005/10/05 20:59:53 simon Exp $">
+<!ENTITY date "$FreeBSD: www/ru/internal/bylaws.sgml,v 1.5 2006/02/10 13:15:25 marck Exp $">
 <!ENTITY title "��������� ������� FreeBSD Core">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/internal/core-vote.sgml b/ru/internal/core-vote.sgml
index b72ec71840..094243724e 100644
--- a/ru/internal/core-vote.sgml
+++ b/ru/internal/core-vote.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.6
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/internal/core-vote.sgml,v 1.6 2006/02/18 18:13:16 marck Exp $">
 <!ENTITY title "��������� ����������� ���������">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/internal/developer.sgml b/ru/internal/developer.sgml
index 6d89abc72d..ad50fa6bad 100644
--- a/ru/internal/developer.sgml
+++ b/ru/internal/developer.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.35
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/internal/developer.sgml,v 1.14 2006/07/19 10:59:06 den Exp $">
 <!ENTITY title "���������� ��� ����������� FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/internal/doceng.sgml b/ru/internal/doceng.sgml
index e659bebcb2..8f79570d99 100644
--- a/ru/internal/doceng.sgml
+++ b/ru/internal/doceng.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.7
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/internal/doceng.sgml,v 1.8 2006/02/10 13:15:25 marck Exp $">
 <!ENTITY title "����������� ������ FreeBSD Doceng Team">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 ]>
 <html>
diff --git a/ru/internal/expire-bits.sgml b/ru/internal/expire-bits.sgml
index 2dcd885b93..22c1faff18 100644
--- a/ru/internal/expire-bits.sgml
+++ b/ru/internal/expire-bits.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.2
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/internal/expire-bits.sgml,v 1.2 2005/10/05 20:59:53 simon Exp $">
+<!ENTITY date "$FreeBSD: www/ru/internal/expire-bits.sgml,v 1.3 2006/02/10 13:15:25 marck Exp $">
 <!ENTITY title "������� ����������� ������ ����">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/internal/fortunes.sgml b/ru/internal/fortunes.sgml
index bf8ef31101..7843ff7729 100644
--- a/ru/internal/fortunes.sgml
+++ b/ru/internal/fortunes.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.2
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/internal/fortunes.sgml,v 1.1 2006/02/10 13:15:25 marck Exp $">
 <!ENTITY title "������� �������� � ����� Fortune">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/internal/homepage.sgml b/ru/internal/homepage.sgml
index da2256197c..83f11763a4 100644
--- a/ru/internal/homepage.sgml
+++ b/ru/internal/homepage.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/internal/homepage.sgml,v 1.6 2006/02/10 13:15:25 marck Exp $">
 <!ENTITY title "FreeBSD.org: �������� ��������">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 <!ENTITY homepage SYSTEM "homepage.inc">
 ]>
 
diff --git a/ru/internal/internal.sgml b/ru/internal/internal.sgml
index 00ab413d5e..701ad7c456 100644
--- a/ru/internal/internal.sgml
+++ b/ru/internal/internal.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.30
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/internal/internal.sgml,v 1.14 2006/07/19 10:59:06 den Exp $">
 <!ENTITY title "FreeBSD Internal">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/internal/machines.sgml b/ru/internal/machines.sgml
index 30de87ae36..2656529f2d 100644
--- a/ru/internal/machines.sgml
+++ b/ru/internal/machines.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.62
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/internal/machines.sgml,v 1.14 2006/02/10 13:15:25 marck Exp $">
 <!ENTITY title "���� FreeBSD.org">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/internal/mirror.sgml b/ru/internal/mirror.sgml
index bb80080aa5..3db64466c9 100644
--- a/ru/internal/mirror.sgml
+++ b/ru/internal/mirror.sgml
@@ -1,12 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/internal/mirror.sgml,v 1.7 2006/02/18 18:13:16 marck Exp $">
 <!ENTITY title "�������������� ������� ���-������� FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % url SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/ru/internal/mirror.sgml,v 1.7 2006/02/18 18:13:16 marck Exp $ -->
 <!-- The FreeBSD Russian Documentation Project -->
 <!-- $FreeBSDru: frdp/www/ru/internal/mirror.sgml,v 1.9 2006/02/18 18:10:40 marck Exp $ -->
 <!-- Original revision: 1.21 -->
diff --git a/ru/internal/new-account.sgml b/ru/internal/new-account.sgml
index 95d3c7a008..eab25faf16 100644
--- a/ru/internal/new-account.sgml
+++ b/ru/internal/new-account.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.15
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/internal/new-account.sgml,v 1.8 2006/02/10 13:15:25 marck Exp $">
 <!ENTITY title "��������� ��������� ����� ������� �������">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/internal/photos.sgml b/ru/internal/photos.sgml
index 3e7ae5468a..2de7e6488c 100644
--- a/ru/internal/photos.sgml
+++ b/ru/internal/photos.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/internal/photos.sgml,v 1.13 2006/02/10 13:15:25 marck Exp $">
 <!ENTITY title "�����������">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude..docs "INCLUDE">
 ]>
 
 <!--
diff --git a/ru/internal/policies.sgml b/ru/internal/policies.sgml
index 56bec753e5..d010ffd386 100644
--- a/ru/internal/policies.sgml
+++ b/ru/internal/policies.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.4
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/internal/policies.sgml,v 1.5 2006/07/19 10:59:06 den Exp $">
 <!ENTITY title "��������������� � ����������� ������� ��� ����������� FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/internal/releng.sgml b/ru/internal/releng.sgml
index df8d340823..64e09f7d28 100644
--- a/ru/internal/releng.sgml
+++ b/ru/internal/releng.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.8
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
 <!ENTITY email 'murray'>
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/internal/releng.sgml,v 1.5 2006/07/19 10:59:06 den Exp $">
 <!ENTITY title "���������� ������� FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/internal/rtp.sgml b/ru/internal/rtp.sgml
index fc907f1e24..a5e11c6dd5 100644
--- a/ru/internal/rtp.sgml
+++ b/ru/internal/rtp.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.6
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/internal/rtp.sgml,v 1.6 2006/02/10 13:15:25 marck Exp $">
 <!ENTITY title "���� Rtp.FreeBSD.org">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/internal/statistic.sgml b/ru/internal/statistic.sgml
index 487d065f86..a71a5f856d 100644
--- a/ru/internal/statistic.sgml
+++ b/ru/internal/statistic.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/internal/statistic.sgml,v 1.7 2006/02/10 13:15:25 marck Exp $">
 <!ENTITY title "FreeBSD Statistics">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!--
diff --git a/ru/internet.sgml b/ru/internet.sgml
index 214f8b944b..851dacd5d9 100644
--- a/ru/internet.sgml
+++ b/ru/internet.sgml
@@ -6,11 +6,10 @@
       Original revision: 1.31
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ru/internet.sgml,v 1.9 2004/09/21 07:50:15 den Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ru/internet.sgml,v 1.10 2005/10/05 20:39:12 simon Exp $">
 <!ENTITY title "� ������ FreeBSD � �����">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/advocacy.sgml b/ru/java/advocacy.sgml
index 9f04454a30..bc0f68b53d 100644
--- a/ru/java/advocacy.sgml
+++ b/ru/java/advocacy.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.6
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/java/advocacy.sgml,v 1.5 2003/10/20 08:21:00 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/advocacy.sgml,v 1.6 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: � ������">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/dists/10.sgml b/ru/java/dists/10.sgml
index 85180414be..a00fb3908d 100644
--- a/ru/java/dists/10.sgml
+++ b/ru/java/dists/10.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.5
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/dists/10.sgml,v 1.4 2003/10/17 10:31:25 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/dists/10.sgml,v 1.5 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD Java: JDK 1.0">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/dists/11.sgml b/ru/java/dists/11.sgml
index 33b41bed34..98b4916ed5 100644
--- a/ru/java/dists/11.sgml
+++ b/ru/java/dists/11.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.8
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/dists/11.sgml,v 1.4 2003/10/17 10:31:25 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/dists/11.sgml,v 1.5 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: &jdk; 1.1">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/dists/12.sgml b/ru/java/dists/12.sgml
index cde44399a6..623096a0c6 100644
--- a/ru/java/dists/12.sgml
+++ b/ru/java/dists/12.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.17
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/dists/12.sgml,v 1.7 2003/10/17 10:31:25 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/dists/12.sgml,v 1.8 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: &jdk; 2 (��������� ����� ��� JDK 1.2)">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/dists/13.sgml b/ru/java/dists/13.sgml
index 4b6b0d3372..ecbeaa9e06 100644
--- a/ru/java/dists/13.sgml
+++ b/ru/java/dists/13.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.14
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/dists/13.sgml,v 1.6 2004/09/21 07:50:16 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/dists/13.sgml,v 1.7 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: &jdk; 1.3">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/dists/14.sgml b/ru/java/dists/14.sgml
index 7c4cff21dd..6358b88145 100644
--- a/ru/java/dists/14.sgml
+++ b/ru/java/dists/14.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.9
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/dists/14.sgml,v 1.4 2004/02/04 11:04:04 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/dists/14.sgml,v 1.5 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: &jdk; 1.4">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 <html>
 &header;
diff --git a/ru/java/dists/index.sgml b/ru/java/dists/index.sgml
index 4dad6dfb0d..331166c4ec 100644
--- a/ru/java/dists/index.sgml
+++ b/ru/java/dists/index.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.7
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/dists/index.sgml,v 1.6 2004/09/21 07:50:16 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/dists/index.sgml,v 1.7 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: ������������">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/docs/faq.sgml b/ru/java/docs/faq.sgml
index 0eda1e43f3..477a332d41 100644
--- a/ru/java/docs/faq.sgml
+++ b/ru/java/docs/faq.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.7
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/docs/faq.sgml,v 1.5 2004/01/27 13:55:27 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/docs/faq.sgml,v 1.6 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: FAQ">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/docs/howtoports.sgml b/ru/java/docs/howtoports.sgml
index 4a0f440284..b777e8a69e 100644
--- a/ru/java/docs/howtoports.sgml
+++ b/ru/java/docs/howtoports.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.6
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/docs/howtoports.sgml,v 1.5 2004/04/08 07:46:44 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/docs/howtoports.sgml,v 1.6 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: ��� ������� ����">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/docs/newbies.sgml b/ru/java/docs/newbies.sgml
index fdb30f68e9..2cbc8a0189 100644
--- a/ru/java/docs/newbies.sgml
+++ b/ru/java/docs/newbies.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.5
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/docs/newbies.sgml,v 1.4 2003/10/20 08:21:00 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/docs/newbies.sgml,v 1.5 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: ����������� ��� ����������">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/docs/performance.sgml b/ru/java/docs/performance.sgml
index 75c3e94168..ac08cd1d77 100644
--- a/ru/java/docs/performance.sgml
+++ b/ru/java/docs/performance.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.2
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/docs/performance.sgml,v 1.2 2003/10/20 08:21:00 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/docs/performance.sgml,v 1.3 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: ��������� ������������������">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/docs/tutorials.sgml b/ru/java/docs/tutorials.sgml
index 4c07a233ee..840ed31f29 100644
--- a/ru/java/docs/tutorials.sgml
+++ b/ru/java/docs/tutorials.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.5
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/docs/tutorials.sgml,v 1.4 2003/10/20 08:21:00 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/docs/tutorials.sgml,v 1.5 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: ������� �������">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/howhelp.sgml b/ru/java/howhelp.sgml
index c95c6ffcb3..99d9d7fa71 100644
--- a/ru/java/howhelp.sgml
+++ b/ru/java/howhelp.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.9
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/java/howhelp.sgml,v 1.5 2003/10/20 08:21:00 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/howhelp.sgml,v 1.6 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: ��� ��� ������">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/index.sgml b/ru/java/index.sgml
index 16b0f749f6..922e4d2a96 100644
--- a/ru/java/index.sgml
+++ b/ru/java/index.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/java/index.sgml,v 1.10 2004/09/21 07:50:16 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/index.sgml,v 1.11 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!--
diff --git a/ru/java/install.sgml b/ru/java/install.sgml
index f9c4235e3a..174b84e2f1 100644
--- a/ru/java/install.sgml
+++ b/ru/java/install.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.12
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/java/install.sgml,v 1.7 2004/04/08 07:46:44 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/install.sgml,v 1.8 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: ������� ���������">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/links/api.sgml b/ru/java/links/api.sgml
index e5707f7e60..5b593b8c5e 100644
--- a/ru/java/links/api.sgml
+++ b/ru/java/links/api.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.6
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/links/api.sgml,v 1.5 2003/10/27 10:47:48 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/links/api.sgml,v 1.6 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: API">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/links/development.sgml b/ru/java/links/development.sgml
index 5849716d1c..f8f18d16e4 100644
--- a/ru/java/links/development.sgml
+++ b/ru/java/links/development.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.10
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/links/development.sgml,v 1.5 2003/10/27 10:47:48 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/links/development.sgml,v 1.6 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: ����������� ������������">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/links/documentation.sgml b/ru/java/links/documentation.sgml
index 134cb762b4..7db3d67d13 100644
--- a/ru/java/links/documentation.sgml
+++ b/ru/java/links/documentation.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.5
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/links/documentation.sgml,v 1.4 2003/10/27 10:47:48 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/links/documentation.sgml,v 1.5 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: ������������">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/links/freebsd.sgml b/ru/java/links/freebsd.sgml
index 9843eed21e..ad964fc2b3 100644
--- a/ru/java/links/freebsd.sgml
+++ b/ru/java/links/freebsd.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.8
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/links/freebsd.sgml,v 1.5 2003/10/27 10:47:48 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/links/freebsd.sgml,v 1.6 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: ������� Java, ��������� � FreeBSD">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/links/index.sgml b/ru/java/links/index.sgml
index 0e0e156f2e..70bd8a938d 100644
--- a/ru/java/links/index.sgml
+++ b/ru/java/links/index.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.6
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/links/index.sgml,v 1.5 2003/10/27 10:47:48 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/links/index.sgml,v 1.6 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: �������">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/links/resources.sgml b/ru/java/links/resources.sgml
index 979847459e..7c28ad9bdf 100644
--- a/ru/java/links/resources.sgml
+++ b/ru/java/links/resources.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.8
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/links/resources.sgml,v 1.5 2003/10/27 10:47:48 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/links/resources.sgml,v 1.6 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: ������ �������">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/links/servlets.sgml b/ru/java/links/servlets.sgml
index e4c57f8728..da9a8a795d 100644
--- a/ru/java/links/servlets.sgml
+++ b/ru/java/links/servlets.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.6
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/links/servlets.sgml,v 1.4 2003/10/27 10:47:48 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/links/servlets.sgml,v 1.5 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: ��������">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/links/tools.sgml b/ru/java/links/tools.sgml
index fded2ab590..4ac82eeb26 100644
--- a/ru/java/links/tools.sgml
+++ b/ru/java/links/tools.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.5
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/links/tools.sgml,v 1.4 2003/10/27 10:47:48 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/links/tools.sgml,v 1.5 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: ��������������">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/links/tutorials.sgml b/ru/java/links/tutorials.sgml
index 8f6b8e0237..c28435bec8 100644
--- a/ru/java/links/tutorials.sgml
+++ b/ru/java/links/tutorials.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.6
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/links/tutorials.sgml,v 1.4 2003/10/27 10:47:48 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/links/tutorials.sgml,v 1.5 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: ������� �������">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/links/vendor.sgml b/ru/java/links/vendor.sgml
index 1471733444..3134de9177 100644
--- a/ru/java/links/vendor.sgml
+++ b/ru/java/links/vendor.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.5
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/java/links/vendor.sgml,v 1.4 2003/10/27 10:47:48 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/links/vendor.sgml,v 1.5 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: ����������">
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/newsflash.sgml b/ru/java/newsflash.sgml
index c6428de8b3..1006c4bcf7 100644
--- a/ru/java/newsflash.sgml
+++ b/ru/java/newsflash.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.42
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/java/newsflash.sgml,v 1.9 2005/06/10 06:21:30 andy Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/newsflash.sgml,v 1.10 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: �������">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/java/press.sgml b/ru/java/press.sgml
index 5d3fdb0e88..97ea07f3d5 100644
--- a/ru/java/press.sgml
+++ b/ru/java/press.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.5
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/java/press.sgml,v 1.4 2003/10/20 08:21:00 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/java/press.sgml,v 1.5 2005/10/05 20:59:53 simon Exp $">
 <!ENTITY title "������ FreeBSD &java;: � ������...">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/kse/index.sgml b/ru/kse/index.sgml
index b422346fcb..09a2ab93de 100644
--- a/ru/kse/index.sgml
+++ b/ru/kse/index.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.17
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/kse/index.sgml,v 1.4 2005/06/07 06:23:56 andy Exp $">
+<!ENTITY date "$FreeBSD: www/ru/kse/index.sgml,v 1.5 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������ FreeBSD KSE">
 <!ENTITY email 'mini'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 
 <!-- Status levels -->
 <!ENTITY status.done "<font color=green>���������</font>">
diff --git a/ru/mailto.sgml b/ru/mailto.sgml
index 455e1aa017..333656b7c2 100644
--- a/ru/mailto.sgml
+++ b/ru/mailto.sgml
@@ -6,11 +6,10 @@
      Original revision: 1.28
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ru/mailto.sgml,v 1.9 2005/10/05 20:39:12 simon Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ru/mailto.sgml,v 1.10 2006/01/17 09:27:09 bvs Exp $">
 <!ENTITY title "���������� ����������">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/marketing/os-comparison.sgml b/ru/marketing/os-comparison.sgml
index 9d8f200f8c..a8977294c5 100644
--- a/ru/marketing/os-comparison.sgml
+++ b/ru/marketing/os-comparison.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.3
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/marketing/os-comparison.sgml,v 1.1 2005/06/05 17:06:18 andy Exp $">
+<!ENTITY date "$FreeBSD: www/ru/marketing/os-comparison.sgml,v 1.2 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY email 'marketing'>
 <!ENTITY title "��������� FreeBSD � Linux � Windows 2000">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 ]>
 
diff --git a/ru/news/1996/index.sgml b/ru/news/1996/index.sgml
index 66458e1e29..870e33cd10 100644
--- a/ru/news/1996/index.sgml
+++ b/ru/news/1996/index.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/news/1996/index.sgml,v 1.6 2003/10/02 12:55:58 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/news/1996/index.sgml,v 1.7 2005/10/05 20:59:55 simon Exp $">
 <!ENTITY title "��������� ������� FreeBSD! (1996)">
-<!ENTITY % navincludes SYSTEM "../../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY newshome '<a href="../news.html">News Home</a>'>
-<!ENTITY % newsincludes SYSTEM "../includes.sgml"> %newsincludes;
 ]>
 
 <!-- The FreeBSD Russian Documentation Project -->
diff --git a/ru/news/1997/index.sgml b/ru/news/1997/index.sgml
index 9ed0afe8f1..f53b8c5cc3 100644
--- a/ru/news/1997/index.sgml
+++ b/ru/news/1997/index.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/news/1997/index.sgml,v 1.5 2004/04/08 07:46:45 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/news/1997/index.sgml,v 1.6 2005/10/05 20:59:55 simon Exp $">
 <!ENTITY title "��������� ������� FreeBSD! (1997)">
-<!ENTITY % navincludes SYSTEM "../../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY newshome '<a href="../news.html">�������� ��������</a>'>
-<!ENTITY % newsincludes SYSTEM "../includes.sgml"> %newsincludes;
 <!ENTITY ftp "ftp://ftp.FreeBSD.org/pub/FreeBSD">
 ]>
 
diff --git a/ru/news/1998/Makefile b/ru/news/1998/Makefile
index 5b1967baa6..bfb0561155 100644
--- a/ru/news/1998/Makefile
+++ b/ru/news/1998/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: www/ru/news/1998/Makefile,v 1.2 2004/04/09 12:03:23 phantom Exp $
 # The FreeBSD Russian Documentation Project
 # $FreeBSDru: frdp/www/ru/news/1998/Makefile,v 1.3 2004/04/09 11:16:51 phantom Exp $
 # Original revision: 1.3
@@ -13,16 +13,7 @@
  
 DOCS=	index.sgml
 
-DATA=		press.html
-CLEANFILES+=	press.html
-
-press.html: ../oldpress.xsl press.xml \
-		../includes.xsl ../../includes.xsl ${XML_TRANSTABLE}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/../oldpress.xsl ${.CURDIR}/press.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
+XMLDOCS+=	press:${XSL_NEWS_PRESS_OLD}::
+DEPENDSET.press=transtable press
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ru/news/1998/index.sgml b/ru/news/1998/index.sgml
index d9ac8125c6..5d3318af74 100644
--- a/ru/news/1998/index.sgml
+++ b/ru/news/1998/index.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/news/1998/index.sgml,v 1.6 2004/09/21 07:50:17 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/news/1998/index.sgml,v 1.7 2005/10/05 20:59:55 simon Exp $">
 <!ENTITY title "��������� ������� FreeBSD! (1998)">
-<!ENTITY % navincludes SYSTEM "../../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY newshome '<a href="../news.html">�������� ��������</a>'>
-<!ENTITY % newsincludes SYSTEM "../includes.sgml"> %newsincludes;
 ]>
 
 <!-- The FreeBSD Russian Documentation Project -->
diff --git a/ru/news/1999/Makefile b/ru/news/1999/Makefile
index 6c27e3e970..759fdc7955 100644
--- a/ru/news/1999/Makefile
+++ b/ru/news/1999/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: www/ru/news/1999/Makefile,v 1.2 2004/04/09 12:03:23 phantom Exp $
 # The FreeBSD Russian Documentation Project
 # $FreeBSDru: frdp/www/ru/news/1999/Makefile,v 1.3 2004/04/09 11:16:51 phantom Exp $
 # Original revision: 1.3
@@ -13,16 +13,7 @@
  
 DOCS=	index.sgml
 
-DATA=		press.html
-CLEANFILES+=	press.html
-
-press.html: ../oldpress.xsl press.xml \
-		../includes.xsl ../../includes.xsl ${XML_TRANSTABLE}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/../oldpress.xsl ${.CURDIR}/press.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
+XMLDOCS+=	press:${XSL_NEWS_PRESS_OLD}::
+DEPENDSET.press=transtable press
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ru/news/1999/index.sgml b/ru/news/1999/index.sgml
index 1647fb7b92..33f4527d2e 100644
--- a/ru/news/1999/index.sgml
+++ b/ru/news/1999/index.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/news/1999/index.sgml,v 1.3 2003/10/02 12:55:58 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/news/1999/index.sgml,v 1.4 2005/10/05 20:59:55 simon Exp $">
 <!ENTITY title "��������� ������� FreeBSD! (1999)">
-<!ENTITY % navincludes SYSTEM "../../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY newshome '<a href="../news.html">�������� ��������</a>'>
-<!ENTITY % newsincludes SYSTEM "../includes.sgml"> %newsincludes;
 ]>
 
 <!-- The FreeBSD Russian Documentation Project -->
diff --git a/ru/news/2000/Makefile b/ru/news/2000/Makefile
index 6711127668..b7373d2371 100644
--- a/ru/news/2000/Makefile
+++ b/ru/news/2000/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: www/ru/news/2000/Makefile,v 1.2 2004/04/09 12:03:23 phantom Exp $
 # The FreeBSD Russian Documentation Project
 # $FreeBSDru: frdp/www/ru/news/2000/Makefile,v 1.3 2004/04/09 11:16:51 phantom Exp $
 # Original revision: 1.3
@@ -13,17 +13,7 @@
  
 DOCS=	index.sgml
 
-DATA=		press.html
-CLEANFILES+=	press.html
-
-press.html: ../oldpress.xsl press.xml \
-		../includes.xsl ../../includes.xsl ${XML_TRANSTABLE}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/../oldpress.xsl ${.CURDIR}/press.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
+XMLDOCS+=	press:${XSL_NEWS_PRESS_OLD}::
+DEPENDSET.press=transtable press
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ru/news/2000/index.sgml b/ru/news/2000/index.sgml
index 06605b8e45..9d21a79be8 100644
--- a/ru/news/2000/index.sgml
+++ b/ru/news/2000/index.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/news/2000/index.sgml,v 1.5 2004/04/09 12:01:17 phantom Exp $">
+<!ENTITY date "$FreeBSD: www/ru/news/2000/index.sgml,v 1.6 2005/10/05 20:59:55 simon Exp $">
 <!ENTITY title "��������� ������� FreeBSD! (2000)">
-<!ENTITY % navincludes SYSTEM "../../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY newshome '<a href="../news.html">�������� ��������</a>'>
-<!ENTITY % newsincludes SYSTEM "../includes.sgml"> %newsincludes;
 ]>
 
 <!-- The FreeBSD Russian Documentation Project -->
diff --git a/ru/news/2001/Makefile b/ru/news/2001/Makefile
index b9205962fc..f66a2b7a9f 100644
--- a/ru/news/2001/Makefile
+++ b/ru/news/2001/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: www/ru/news/2001/Makefile,v 1.3 2004/04/09 12:03:23 phantom Exp $
 # $FreeBSDru: frdp/www/ru/news/2001/Makefile,v 1.4 2004/04/09 11:16:51 phantom Exp $
 # Original revision: 1.3
 
@@ -9,26 +9,10 @@
 .include "../Makefile.inc"
 .endif
 
-DATA=		index.html press.html
-CLEANFILES+=	index.html press.html
-
-index.html: ../oldnewsflash.xsl news.xml\
-			../includes.xsl ../../includes.xsl ${XML_TRANSTABLE}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/../oldnewsflash.xsl ${.CURDIR}/news.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
-press.html: ../oldpress.xsl press.xml \
-		../includes.xsl ../../includes.xsl ${XML_TRANSTABLE}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/../oldpress.xsl ${.CURDIR}/press.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
+XMLDOCS+=	index:${XSL_NEWS_NEWSFLASH_OLD}:news.xml:
+DEPENDSET.index=transtable news
 
+XMLDOCS+=	press:${XSL_NEWS_PRESS_OLD}::
+DEPENDSET.press=transtable press
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ru/news/2002/Makefile b/ru/news/2002/Makefile
index 86da47b42c..60a2141907 100644
--- a/ru/news/2002/Makefile
+++ b/ru/news/2002/Makefile
@@ -1,7 +1,7 @@
 #
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: www/ru/news/2002/Makefile,v 1.3 2004/04/09 12:03:23 phantom Exp $
 # $FreeBSDru: frdp/www/ru/news/2002/Makefile,v 1.4 2004/04/09 11:16:52 phantom Exp $
 #
 # Original revision: 1.3
@@ -13,25 +13,10 @@
 .include "../Makefile.inc"
 .endif
 
-DATA=		index.html press.html
-CLEANFILES+=	index.html press.html
+XMLDOCS+=	index:${XSL_NEWS_NEWSFLASH_OLD}:news.xml:
+DEPENDSET.index=transtable news
 
-index.html: ../oldnewsflash.xsl news.xml\
-			../includes.xsl ../../includes.xsl ${XML_TRANSTABLE}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/../oldnewsflash.xsl ${.CURDIR}/news.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
-press.html: ../oldpress.xsl press.xml \
-		../includes.xsl ../../includes.xsl ${XML_TRANSTABLE}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/../oldpress.xsl ${.CURDIR}/press.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
+XMLDOCS+=	press:${XSL_NEWS_PRESS_OLD}::
+DEPENDSET.press=transtable press
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ru/news/2003/Makefile b/ru/news/2003/Makefile
index afce1cf4b5..265c94edee 100644
--- a/ru/news/2003/Makefile
+++ b/ru/news/2003/Makefile
@@ -1,7 +1,7 @@
 #
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: www/ru/news/2003/Makefile,v 1.1 2005/04/27 18:28:35 andy Exp $
 # $FreeBSDru: frdp/www/ru/news/2003/Makefile,v 1.1 2005/04/27 17:55:52 andy Exp $
 #
 # Original revision: 1.1
@@ -14,25 +14,10 @@
 .include "../Makefile.inc"
 .endif
 
-DATA=		index.html press.html
-CLEANFILES+=	index.html press.html
+XMLDOCS+=	index:${XSL_NEWS_NEWSFLASH_OLD}:news.xml:
+DEPENDSET.index=transtable news
 
-index.html: ../oldnewsflash.xsl news.xml \
-		${XML_INCLUDES} ${XML_TRANSTABLE}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/../oldnewsflash.xsl ${.CURDIR}/news.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
-press.html: ../oldpress.xsl press.xml \
-		${XML_INCLUDES} ${XML_TRANSTABLE}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/../oldpress.xsl ${.CURDIR}/press.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
+XMLDOCS+=	press:${XSL_NEWS_PRESS_OLD}::
+DEPENDSET.press=transtable press
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ru/news/Makefile b/ru/news/Makefile
index 2ba5d51995..d9a3d9ea9c 100644
--- a/ru/news/Makefile
+++ b/ru/news/Makefile
@@ -1,7 +1,7 @@
 #
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: www/ru/news/Makefile,v 1.12 2005/04/27 18:37:11 andy Exp $
 # $FreeBSDru: frdp/www/ru/news/Makefile,v 1.11 2005/04/27 18:31:11 andy Exp $
 #
 # Original revision: 1.41
@@ -29,6 +29,11 @@ DOCS+= sou1999.sgml
 
 INDEXLINK= news.html
 
+DEPENDSET.DEFAULT=	transtable news press
+
+XMLDOCS=	newsflash:${XSL_NEWS_NEWSFLASH}:${XML_NEWS_NEWS_MASTER}:
+XMLDOCS+=	press:${XSL_NEWS_PRESS}:${XML_NEWS_PRESS_MASTER}:
+
 SUBDIR =	1996
 SUBDIR+=	1997
 SUBDIR+=	1998
@@ -39,35 +44,4 @@ SUBDIR+=	2002
 SUBDIR+=	2003
 SUBDIR+=	status
 
-DATA=		newsflash.html news.rdf press.html
-CLEANFILES+=	newsflash.html news.rdf press.html
-
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
-
-newsflash.html: newsflash.xsl news.xml\
-			includes.xsl ${XML_INCLUDES}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param "news.project.xml-master" "'${XML_NEWS_NEWS_MASTER}'" \
-		--param "news.project.xml" "'${XML_NEWS_NEWS}'" \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
-news.rdf: news-rdf.xsl news.xml\
-		includes.xsl ${XML_INCLUDES}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/news-rdf.xsl ${.CURDIR}/news.xml
-
-press.html: press.xsl press.xml\
-		includes.xsl ${XML_INCLUDES}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param "news.press.xml-master" "'${XML_NEWS_PRESS_MASTER}'" \
-		--param "news.press.xml" "'${XML_NEWS_PRESS}'" \
-		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/press.xsl ${.CURDIR}/press.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
diff --git a/ru/news/includes.sgml b/ru/news/includes.sgml
deleted file mode 100644
index c188b727c8..0000000000
--- a/ru/news/includes.sgml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSD$
-     $FreeBSDru: frdp/www/ru/news/includes.sgml,v 1.4 2000/11/16 14:37:12 andy Exp $
-
-     Original revision: 1.8
--->
-
-<!ENTITY newshome '<A HREF="news.html">News Home</A>'>
-
diff --git a/ru/news/includes.xsl b/ru/news/includes.xsl
deleted file mode 100644
index d2235656d5..0000000000
--- a/ru/news/includes.xsl
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="KOI8-R" ?>
-
-<!-- $FreeBSD$ -->
-<!-- The FreeBSD Russian Documentation Project -->
-<!-- $FreeBSDru: frdp/www/ru/news/includes.xsl,v 1.3 2004/04/09 11:00:57 phantom Exp $ -->
-<!-- Original revision: 1.6 -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:variable name="newshome">
-    <a href="{$base}/news/news.html">� ��������</a>
-  </xsl:variable>
-
-  <xsl:variable name="presshome">
-    <a href="{$base}/news/news.html">� ���������� � ������</a>
-  </xsl:variable>
-
-  <!-- Generate a unique anchor for this event -->
-  <xsl:template name="generate-event-anchor">
-    <xsl:text>event</xsl:text>
-    <xsl:value-of select="ancestor::year/name"/>
-    <xsl:value-of select="ancestor::month/name"/>
-    <xsl:value-of select="ancestor::day/name"/>:<xsl:value-of select="count(preceding-sibling::event)"/>
-  </xsl:template>
-
-  <!-- Generate a unique anchor for this story -->
-  <xsl:template name="generate-story-anchor">
-    <xsl:text>story</xsl:text>
-    <xsl:value-of select="ancestor::year/name"/>
-    <xsl:value-of select="ancestor::month/name"/>:<xsl:text/>
-    <xsl:value-of select="count(following-sibling::story)"/>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/ru/news/news-rdf.xsl b/ru/news/news-rdf.xsl
deleted file mode 100644
index 924369735b..0000000000
--- a/ru/news/news-rdf.xsl
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="KOI8-R"?>
-
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSDru: frdp/www/ru/news/news-rdf.xsl,v 1.5 2004/10/22 13:25:41 den Exp $
-
-     Original revision: 1.6
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  
-  <xsl:import href="includes.xsl"/>
-
-  <xsl:output method="xml" indent="yes"/>
-
-  <xsl:variable name="base" select="'..'"/>
-
-  <!-- Generate the main body of the RDF file -->
-  <xsl:template match="news">
-    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	     xmlns="http://my.netscape.com/rdf/simple/0.9/">
-
-      <channel>
-	<title>������� FreeBSD</title>
-	<link>http://www.FreeBSD.org/ru/news/</link>
-	<description>��������� ������� ������� FreeBSD</description>
-      </channel>
-
-      <!-- Only include the last 10 events -->
-      <xsl:apply-templates select="descendant::event[position() &lt;= 10]"/>
-
-      </rdf:RDF>
-  </xsl:template>
-
-  <!-- Generate the <item> elements and their content -->
-  <xsl:template match="event" xmlns="http://my.netscape.com/rdf/simple/0.9/">
-    <item>
-      <xsl:choose>
-	<xsl:when test="count(child::title)">
-	  <title><xsl:value-of select="normalize-space(title)"/></title>
-	</xsl:when>
-	<xsl:otherwise>
-	  <title><xsl:value-of select="normalize-space(p)"/></title>
-	</xsl:otherwise>
-      </xsl:choose>
-      <link>http://www.FreeBSD.org/news/newsflash.html#<xsl:call-template name="generate-event-anchor"/></link>
-    </item>
-  </xsl:template>
-  
-  <xsl:template match="name | date"/>
-</xsl:stylesheet>
diff --git a/ru/news/news.sgml b/ru/news/news.sgml
index 53ffdb89f9..e512f40945 100644
--- a/ru/news/news.sgml
+++ b/ru/news/news.sgml
@@ -6,13 +6,11 @@
      Original revision: 1.41
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/news/news.sgml,v 1.10 2004/09/21 07:50:17 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/news/news.sgml,v 1.11 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "������� FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/news/newsflash.xsl b/ru/news/newsflash.xsl
deleted file mode 100644
index 8d09f01513..0000000000
--- a/ru/news/newsflash.xsl
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="KOI8-R" ?>
-
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSD: www/ru/news/newsflash.xsl,v 1.8 2004/12/30 17:53:44 hrs Exp $
-     $FreeBSDru: frdp/www/ru/news/newsflash.xsl,v 1.12 2004/04/09 11:18:50 phantom Exp $
-
-     Original revision: 1.11
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
-
-  <xsl:import href="../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
-  <xsl:variable name="section" select="'about'"/>
-
-  <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="title" select="'��������� ������� FreeBSD'"/>
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-  
-  <xsl:output type="html" encoding="koi8-r"/>
-
-  <xsl:template match="news">
-    <html>
-      
-      <xsl:copy-of select="$header1"/>
-      
-            <body xsl:use-attribute-sets="att.body">
-      
-        <div id="containerwrap">
-          <div id="container">
-      
-      	<xsl:copy-of select="$header2"/>
-      
-      	<div id="content">
-      
-      	      <xsl:copy-of select="$sidenav"/>
-      
-      	      <div id="contentwrap">
-      	      
-	      <xsl:copy-of select="$header3"/>
-
-	<!-- Notice how entity references in SGML become variable references
-	     in the stylesheet, and that the syntax for referring to variables
-	     inside an attribute is "{$variable}".
-
-	     This is just dis-similar enough to Perl and the shell that you
-	     end up writing ${variable} all the time, and then scratch your 
-	     head wondering why the stylesheet isn't working.-->
-
-	<!-- Also notice that because this is now XML and not SGML, empty
-             elements, like IMG, must have a trailing "/" just inside the 
-   	     closing angle bracket, like this " ... />" -->
-	<img src="{$base}/../gifs/news.jpg" align="right" border="0" width="193"
-	     height="144" alt="FreeBSD News"/>
-
-	<p>FreeBSD �������� ������ ������������� ������������ ��������. ����
-	  � ����� ���� ��������� ���������� ������ ������ ����������! �����
-	  ������� ���, ������������ ����������� � ���� ���������. ����� ����, ��
-	  ����� �������� ����������� �� <a
-	  href="../../doc/ru_RU.KOI8-R/books/handbook/eresources.html#ERESOURCES-MAIL">
-          ������ �������� freebsd-announce</a> ��� ������������
-          <a href="news.rdf">RSS</a>.</p>
-
-        <p>��������� ������� ����� ����������� �������� ��������, � �������
-          ����� ���������� � ������� ���������� � ��������, ������������ �
-          ��������������� ��������.</p>
-
-        <ul>
-          <li><a href="../../java/newsflash.html"><xsl:value-of
-            select="$java"/> �� FreeBSD</a></li>
-
-          <li><a href="http://freebsd.kde.org/">KDE �� FreeBSD</a></li>
-
-          <li><a href="../../gnome/newsflash.html">GNOME �� FreeBSD</a></li>
-        </ul>
-
-	<p>��������� �������� �������, ��������� � ������� ������� ��������� ��
-	  �������� <strong><a href="{$base}/releases/index.html">����������
-	  � �������</a></strong>.</p>
-
-	<p>��������� �� ������������ FreeBSD ��������� �� �������� <a
-	  href="{$base}/security/#adv">���������� � ������������</a>.</p>
-
-	<xsl:call-template name="html-news-list-newsflash">
-          <xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
-          <xsl:with-param name="news.project.xml" select="$news.project.xml" />
-	</xsl:call-template>
-
-	<xsl:call-template name="html-news-make-olditems-list" />
-
-	<xsl:copy-of select="$newshome"/>
-
-	  	</div> <!-- contentwrap -->
-		<br class="clearboth" />
-	
-	</div> <!-- content -->
-	
-	<xsl:copy-of select="$footer"/>
-	
-        </div> <!-- container -->
-   </div> <!-- containerwrap -->
-
-      </body>
-    </html>
-  </xsl:template>
-
-  <xsl:template name="html-news-make-olditems-list">
-    <p>������ ������� ���:
-      <a href="2002/index.html">2002</a>,
-      <a href="2001/index.html">2001</a>,
-      <a href="2000/index.html">2000</a>,
-      <a href="1999/index.html">1999</a>,
-      <a href="1998/index.html">1998</a>,
-      <a href="1997/index.html">1997</a>,
-      <a href="1996/index.html">1996</a></p>
-  </xsl:template>
-
-  <!-- When the href attribute contains a '$base', expand it to the current
-       value of the $base variable. -->
-
-  <!-- All your $base are belong to us.  Ho ho ho -->
-  <xsl:template match="a">
-    <a><xsl:attribute name="href">
-	<xsl:choose>
-	  <xsl:when test="contains(@href, '$base')">
-	    <xsl:value-of select="concat(substring-before(@href, '$base'), $base, substring-after(@href, '$base'))"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:value-of select="@href"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </a>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/ru/news/oldnewsflash.xsl b/ru/news/oldnewsflash.xsl
deleted file mode 100644
index d0bd567283..0000000000
--- a/ru/news/oldnewsflash.xsl
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="KOI8-R" ?>
-
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSD$
-     $FreeBSDru: frdp/www/ru/news/oldnewsflash.xsl,v 1.4 2004/01/22 15:09:49 den Exp $
-
-     Original revision: 1.6
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
-
-  <xsl:import href="../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
-
-
-  <xsl:variable name="year">
-    <xsl:value-of select="descendant::year/name"/>
-  </xsl:variable>
-  <xsl:variable name="base" select="'../..'"/>
-  <xsl:variable name="title" select="concat('������� FreeBSD (', $year, ')')"/>
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-  
-  <xsl:output type="html" encoding="koi8-r"/>
-
-  <xsl:template match="news">
-    <html>
-      
-      <xsl:copy-of select="$header1"/>
-
-      <body xsl:use-attribute-sets="att.body">
-
-	<xsl:copy-of select="$header2"/>
-
-	<!-- Notice how entity references in SGML become variable references
-	     in the stylesheet, and that the syntax for referring to variables
-	     inside an attribute is "{$variable}".
-
-	     This is just dis-similar enough to Perl and the shell that you
-	     end up writing ${variable} all the time, and then scratch your 
-	     head wondering why the stylesheet isn't working.-->
-
-	<!-- Also notice that because this is now XML and not SGML, empty
-             elements, like IMG, must have a trailing "/" just inside the 
-   	     closing angle bracket, like this " ... />" -->
-	<img src="{$base}/../gifs/news.jpg" align="right" border="0" width="193"
-	     height="144" alt="FreeBSD News"/>
-
-	<xsl:apply-templates select="descendant::month"/>
-
-	<xsl:copy-of select="$newshome"/>
-	<xsl:copy-of select="$footer"/>
-      </body>
-    </html>
-  </xsl:template>
-
-  <!-- Everything that follows are templates for the rest of the content -->
-  
-  <xsl:template match="month">
-    <h1>
-      <xsl:call-template name="transtable-lookup">
-	<xsl:with-param name="word-group" select="'number-month'" />
-	<xsl:with-param name="word">
-	  <xsl:value-of select="name"/>
-	</xsl:with-param>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select="descendant::day"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match="day">
-    <xsl:apply-templates select="event"/>
-  </xsl:template>
-
-  <xsl:template match="event">
-    <li><p><a>
-	  <xsl:attribute name="name">
-	    <xsl:call-template name="generate-event-anchor"/>
-	  </xsl:attribute>
-	</a>
-
-	<b><xsl:value-of select="ancestor::day/name"/>
-	  <xsl:text> </xsl:text>
-	  <xsl:call-template name="transtable-lookup">
-	    <xsl:with-param name="word-group" select="'number-month'" />
-	    <xsl:with-param name="word">
-	      <xsl:value-of select="ancestor::month/name"/>
-	    </xsl:with-param>
-	  </xsl:call-template>
-	  <xsl:text>, </xsl:text>
-	  <xsl:value-of select="ancestor::year/name"/>:</b><xsl:text> </xsl:text>
-	<xsl:apply-templates select="p"/>
-	</p>
-
-    </li>
-  </xsl:template>
-
-  <xsl:template match="date"/>    <!-- Deliberately left blank -->
-
-  <!-- When the href attribute contains a '$base', expand it to the current
-       value of the $base variable. -->
-
-  <!-- All your $base are belong to us.  Ho ho ho -->
-  <xsl:template match="a">
-    <a><xsl:attribute name="href">
-	<xsl:choose>
-	  <xsl:when test="contains(@href, '$base')">
-	    <xsl:value-of select="concat(substring-before(@href, '$base'), $base, substring-after(@href, '$base'))"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:value-of select="@href"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </a>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/ru/news/oldpress.xsl b/ru/news/oldpress.xsl
deleted file mode 100644
index f1560de991..0000000000
--- a/ru/news/oldpress.xsl
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="KOI8-R" ?>
-
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSD$
-     $FreeBSDru: frdp/www/ru/news/oldpress.xsl,v 1.2 2004/04/09 11:17:28 phantom Exp $
-
-     Original revision: 1.1
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
-
-  <xsl:import href="../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
-
-  <xsl:variable name="year">
-    <xsl:value-of select="descendant::year/name"/>
-  </xsl:variable>
-  <xsl:variable name="base" select="'../..'"/>
-  <xsl:variable name="title" select="concat('FreeBSD � ������ (', $year, ')')"/>
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-  
-  <xsl:output type="html" encoding="koi8-r"/>
-
-  <xsl:template match="press">
-    <html>
-      
-      <xsl:copy-of select="$header1"/>
-
-      <body xsl:use-attribute-sets="att.body">
-
-	<xsl:copy-of select="$header2"/>
-
-	<xsl:apply-templates select="//month"/>
-	
-	<xsl:copy-of select="$presshome"/>,
-	<xsl:copy-of select="$newshome"/>
-	<xsl:copy-of select="$footer"/>
-      </body>
-    </html>
-  </xsl:template>
-
-  <!-- Everything that follows are templates for the rest of the content -->
-  
-  <xsl:template match="month">
-    <h1>
-      <xsl:call-template name="transtable-lookup">
-	<xsl:with-param name="word-group" select="'number-month'" />
-	<xsl:with-param name="word">
-	  <xsl:value-of select="name"/>
-	</xsl:with-param>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select="descendant::story"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match="story">
-    <xsl:variable name="url"><xsl:value-of select="url"/></xsl:variable>
-    <xsl:variable name="site-url"><xsl:value-of
-    select="site-url"/></xsl:variable>
-
-    <li>
-      <a>
-	<xsl:attribute name="name">
-	  <xsl:call-template name="generate-story-anchor"/>
-	</xsl:attribute>
-      </a>
-
-      <p><a href="{$url}"><b><xsl:value-of
-      select="name"/></b></a><br/>
-	  
-	<a href="{$site-url}"><xsl:value-of
-	select="site-name"/></a>, <xsl:value-of select="author"/><br/>
-	<xsl:copy-of select="p/child::node()"/>
-      </p>
-    </li>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/ru/news/press-rel-1.sgml b/ru/news/press-rel-1.sgml
index 84377edb51..1c8259b1ae 100644
--- a/ru/news/press-rel-1.sgml
+++ b/ru/news/press-rel-1.sgml
@@ -6,13 +6,11 @@
      Original revision: 1.7
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/news/press-rel-1.sgml,v 1.5 2003/10/02 12:55:59 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/news/press-rel-1.sgml,v 1.6 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "�����-����� FreeBSD: 22 ������ 1999">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/news/press-rel-2.sgml b/ru/news/press-rel-2.sgml
index b8fa08d362..aca204a84c 100644
--- a/ru/news/press-rel-2.sgml
+++ b/ru/news/press-rel-2.sgml
@@ -6,13 +6,11 @@
      Original revision: 1.10
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/news/press-rel-2.sgml,v 1.5 2003/10/02 12:55:59 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/news/press-rel-2.sgml,v 1.6 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "FreeBSD Press Release: April 29, 1999">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/news/press-rel-3.sgml b/ru/news/press-rel-3.sgml
index e96bf0e6c2..42cc6b9a20 100644
--- a/ru/news/press-rel-3.sgml
+++ b/ru/news/press-rel-3.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/news/press-rel-3.sgml,v 1.5 2003/10/02 12:55:59 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/news/press-rel-3.sgml,v 1.6 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "�����-����� FreeBSD: 7 ���� 1999">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The FreeBSD Russian Documentation Project -->
diff --git a/ru/news/press-rel-4.sgml b/ru/news/press-rel-4.sgml
index 287351d979..617d4518b1 100644
--- a/ru/news/press-rel-4.sgml
+++ b/ru/news/press-rel-4.sgml
@@ -6,13 +6,11 @@
      Original revision: 1.4
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/news/press-rel-4.sgml,v 1.10 2004/09/21 07:50:17 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/news/press-rel-4.sgml,v 1.11 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "�����-����� FreeBSD: 9 ����� 2000">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/news/press-rel-5.sgml b/ru/news/press-rel-5.sgml
index 229b2b30f2..2862123ce0 100644
--- a/ru/news/press-rel-5.sgml
+++ b/ru/news/press-rel-5.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/news/press-rel-5.sgml,v 1.3 2003/10/02 12:55:59 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/news/press-rel-5.sgml,v 1.4 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "FreeBSD Press Release: October 18, 2000">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The FreeBSD Russian Documentation Project -->
diff --git a/ru/news/press.xsl b/ru/news/press.xsl
deleted file mode 100644
index 4187382b6c..0000000000
--- a/ru/news/press.xsl
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="KOI8-R" ?>
-
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSD: www/ru/news/press.xsl,v 1.7 2004/12/30 17:53:44 hrs Exp $
-     $FreeBSDru: frdp/www/ru/news/press.xsl,v 1.6 2004/04/09 10:59:01 phantom Exp $
-
-     Original revision: 1.8
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
-
-  <xsl:import href="../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
-  <xsl:variable name="section" select="'about'"/>
-
-  <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="title" select="'FreeBSD � ������'"/>
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
-  <xsl:param name="news.press.xml-master" select="'none'" />
-  <xsl:param name="news.press.xml" select="'none'" />
-
-  <xsl:output type="html" encoding="koi8-r"/>
-
-  <xsl:template match="press">
-    <html>
-      
-      <xsl:copy-of select="$header1"/>
-      
-            <body xsl:use-attribute-sets="att.body">
-      
-        <div id="containerwrap">
-          <div id="container">
-      
-      	<xsl:copy-of select="$header2"/>
-      
-      	<div id="content">
-      
-      	      <xsl:copy-of select="$sidenav"/>
-      
-      	      <div id="contentwrap">
-      	      
-	      <xsl:copy-of select="$header3"/>
-
-	<p>���� �� �� ����� ����� ������̣���� ����������, ����������,
-	  ��������� ţ URL �� ����� <a
-	  href="mailto:www@FreeBSD.org">www@FreeBSD.org</a></p>
-
-	<p>����� ����, ������� ������ � ������� FreeBSD Java �� ������ �����,
-          ������� ��������� <a
-          href="{$base}/java/press.html">FreeBSD/Java � ������</a>.</p>
-
-	<xsl:call-template name="html-news-list-press">
-	  <xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
-	  <xsl:with-param name="news.press.xml" select="$news.press.xml" />
-	</xsl:call-template>
-
-	<xsl:call-template name="html-news-make-olditems-list" />
-
-	<xsl:copy-of select="$newshome"/>
-
-	  	</div> <!-- contentwrap -->
-		<br class="clearboth" />
-	
-	</div> <!-- content -->
-	
-	<xsl:copy-of select="$footer"/>
-	
-        </div> <!-- container -->
-   </div> <!-- containerwrap -->
-
-      </body>
-    </html>
-  </xsl:template>
-
-  <xsl:template name="html-news-make-olditems-list">
-    <p>���������� ������� ���:
-      <a href="2002/press.html">2002</a>,
-      <a href="2001/press.html">2001</a>,
-      <a href="2000/press.html">2000</a>,
-      <a href="1999/press.html">1999</a>,
-      <a href="1998/press.html">1998-1996</a></p>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/ru/news/pressreleases.sgml b/ru/news/pressreleases.sgml
index 2bf6c27cb1..8d1490a7fc 100644
--- a/ru/news/pressreleases.sgml
+++ b/ru/news/pressreleases.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/news/pressreleases.sgml,v 1.8 2004/09/21 07:50:17 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/news/pressreleases.sgml,v 1.9 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "�����-������ FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;]>
-
+<!ENTITY % navinclude.about "INCLUDE">
+]>
 <!-- The FreeBSD Russian Documentation Project -->
 <!-- $FreeBSDru: frdp/www/ru/news/pressreleases.sgml,v 1.12 2004/09/21 07:31:09 den Exp $ -->
 <!-- Original revision: 1.8 -->
diff --git a/ru/news/sou1999.sgml b/ru/news/sou1999.sgml
index 12236209b1..f3cc029b7b 100644
--- a/ru/news/sou1999.sgml
+++ b/ru/news/sou1999.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/news/sou1999.sgml,v 1.6 2004/04/09 12:04:15 phantom Exp $">
+<!ENTITY date "$FreeBSD: www/ru/news/sou1999.sgml,v 1.7 2005/10/05 20:59:54 simon Exp $">
 <!ENTITY title "��������� ���������� FreeBSD, 1999">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <!-- The FreeBSD Russian Documentation Project -->
 <!-- $FreeBSDru: frdp/www/ru/news/sou1999.sgml,v 1.6 2004/04/09 10:52:50 phantom Exp $ -->
diff --git a/ru/news/status/status.sgml b/ru/news/status/status.sgml
index dc8145f343..b028191d43 100644
--- a/ru/news/status/status.sgml
+++ b/ru/news/status/status.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.18
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/news/status/status.sgml,v 1.2 2004/04/09 12:06:23 phantom Exp $">
+<!ENTITY date "$FreeBSD: www/ru/news/status/status.sgml,v 1.3 2005/10/05 20:59:55 simon Exp $">
 <!ENTITY title "��ޣ�� � ��������� ����� ��� FreeBSD">
-<!ENTITY % navincludes SYSTEM "../../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/platforms/alpha.sgml b/ru/platforms/alpha.sgml
index 76785dcc87..4cb901f0a9 100644
--- a/ru/platforms/alpha.sgml
+++ b/ru/platforms/alpha.sgml
@@ -6,14 +6,15 @@
      Original revision: 1.4
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/platforms/alpha.sgml,v 1.6 2006/06/05 16:06:05 bvs Exp $">
 <!ENTITY base CDATA "..">
 <!ENTITY title "������ FreeBSD/alpha">
 <!ENTITY email 'freebsd-alpha'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;]>
+<!ENTITY % navinclude.developers "INCLUDE">
+]>
+
 
 <html>
   &header;
diff --git a/ru/platforms/amd64.sgml b/ru/platforms/amd64.sgml
index 75f254011f..feace9cf83 100644
--- a/ru/platforms/amd64.sgml
+++ b/ru/platforms/amd64.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.15
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/platforms/amd64.sgml,v 1.8 2006/07/19 10:59:06 den Exp $">
 <!ENTITY title "������ FreeBSD/amd64">
 <!ENTITY email 'freebsd-amd64'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
  
 <html>
diff --git a/ru/platforms/amd64/motherboards.sgml b/ru/platforms/amd64/motherboards.sgml
index e10bffed3d..54c303da45 100644
--- a/ru/platforms/amd64/motherboards.sgml
+++ b/ru/platforms/amd64/motherboards.sgml
@@ -1,19 +1,18 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD: www/ru/platforms/amd64/motherboards.sgml,v 1.3 2005/06/13 07:28:38 andy Exp $
+     $FreeBSD: www/ru/platforms/amd64/motherboards.sgml,v 1.4 2005/10/05 20:59:56 simon Exp $
      $FreeBSDru: frdp/www/ru/platforms/amd64/motherboards.sgml,v 1.7 2005/06/10 18:35:25 andy Exp $
 
      Original revision: 1.24
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/platforms/amd64/motherboards.sgml,v 1.3 2005/06/13 07:28:38 andy Exp $">
+<!ENTITY date "$FreeBSD: www/ru/platforms/amd64/motherboards.sgml,v 1.4 2005/10/05 20:59:56 simon Exp $">
 <!ENTITY title "������ FreeBSD/amd64 -- ����������� �����">
 <!ENTITY email 'freebsd-amd64'>
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/platforms/arm.sgml b/ru/platforms/arm.sgml
index 06d69d7eee..e48d4200a2 100644
--- a/ru/platforms/arm.sgml
+++ b/ru/platforms/arm.sgml
@@ -6,14 +6,12 @@
      Original revision: 1.8
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/platforms/arm.sgml,v 1.3 2006/06/05 16:06:05 bvs Exp $">
 <!ENTITY title "������ FreeBSD/ARM">
 <!ENTITY email 'freebsd-arm'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml">
-%includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 ]>
 
diff --git a/ru/platforms/i386.sgml b/ru/platforms/i386.sgml
index 3466cf7e53..054aa92c2d 100644
--- a/ru/platforms/i386.sgml
+++ b/ru/platforms/i386.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.8
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/platforms/i386.sgml,v 1.3 2006/06/05 16:06:05 bvs Exp $">
 <!ENTITY title "������ FreeBSD/i386">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/platforms/ia64.sgml b/ru/platforms/ia64.sgml
index 20dc039591..54ee37c9b3 100644
--- a/ru/platforms/ia64.sgml
+++ b/ru/platforms/ia64.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.12
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/platforms/ia64.sgml,v 1.7 2006/06/05 16:06:05 bvs Exp $">
 <!ENTITY title "������ FreeBSD/ia64">
 <!ENTITY email 'freebsd-ia64'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/platforms/ia64/index.sgml b/ru/platforms/ia64/index.sgml
index 7b8a8f5c4d..2b4524c373 100644
--- a/ru/platforms/ia64/index.sgml
+++ b/ru/platforms/ia64/index.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.5
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/platforms/ia64/index.sgml,v 1.4 2004/09/21 07:50:17 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/platforms/ia64/index.sgml,v 1.5 2005/10/05 20:59:56 simon Exp $">
 <!ENTITY title "������ FreeBSD/ia64">
 <!ENTITY email 'freebsd-ia64'>
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/platforms/ia64/machines.sgml b/ru/platforms/ia64/machines.sgml
index 7a17985a83..c678423357 100644
--- a/ru/platforms/ia64/machines.sgml
+++ b/ru/platforms/ia64/machines.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.1
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/platforms/ia64/machines.sgml,v 1.2 2004/09/21 07:50:17 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/platforms/ia64/machines.sgml,v 1.3 2005/10/05 20:59:56 simon Exp $">
 <!ENTITY title "������ FreeBSD/ia64 -- ������">
 <!ENTITY email 'freebsd-ia64'>
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/platforms/ia64/refs.sgml b/ru/platforms/ia64/refs.sgml
index 2510f91b5b..66b0f90943 100644
--- a/ru/platforms/ia64/refs.sgml
+++ b/ru/platforms/ia64/refs.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.6
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/platforms/ia64/refs.sgml,v 1.3 2004/09/21 07:50:17 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/platforms/ia64/refs.sgml,v 1.4 2005/10/05 20:59:56 simon Exp $">
 <!ENTITY title "������ FreeBSD/ia64 -- ���������� ��������">
 <!ENTITY email 'freebsd-ia64'>
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/platforms/ia64/todo.sgml b/ru/platforms/ia64/todo.sgml
index bb312fcc96..999f6eca8b 100644
--- a/ru/platforms/ia64/todo.sgml
+++ b/ru/platforms/ia64/todo.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.6
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/platforms/ia64/todo.sgml,v 1.4 2004/09/21 07:50:17 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/platforms/ia64/todo.sgml,v 1.5 2005/10/05 20:59:56 simon Exp $">
 <!ENTITY title "������ FreeBSD/ia64 Project -- ����������� ������">
 <!ENTITY email 'freebsd-ia64'>
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/platforms/index.sgml b/ru/platforms/index.sgml
index a757ceee14..8f4a6b8a5c 100644
--- a/ru/platforms/index.sgml
+++ b/ru/platforms/index.sgml
@@ -6,13 +6,14 @@
      Original revision: 1.10
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
 <!ENTITY email 'freebsd-www'>
 <!ENTITY title "�������������� ���������">
-<!ENTITY date "$FreeBSD$">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;]>
+<!ENTITY date "$FreeBSD: www/ru/platforms/index.sgml,v 1.8 2006/06/05 16:06:05 bvs Exp $">
+<!ENTITY % navinclude.developers "INCLUDE">
+]>
+
 
 <html>
   &header;
diff --git a/ru/platforms/mips.sgml b/ru/platforms/mips.sgml
index 2b6e0186cf..ae3d3ca77c 100644
--- a/ru/platforms/mips.sgml
+++ b/ru/platforms/mips.sgml
@@ -6,13 +6,14 @@
      Original revision: 1.5
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/platforms/mips.sgml,v 1.4 2006/06/05 16:06:05 bvs Exp $">
 <!ENTITY title "������ FreeBSD/MIPS">
 <!ENTITY email 'freebsd-mips'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;]>
+<!ENTITY % navinclude.developers "INCLUDE">
+]>
+
  
 <html>
   &header;
diff --git a/ru/platforms/pc98.sgml b/ru/platforms/pc98.sgml
index 71b264c594..f209dbcca4 100644
--- a/ru/platforms/pc98.sgml
+++ b/ru/platforms/pc98.sgml
@@ -6,14 +6,12 @@
      Original revision: 1.15
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/platforms/pc98.sgml,v 1.6 2005/10/05 20:59:55 simon Exp $">
+<!ENTITY date "$FreeBSD: www/ru/platforms/pc98.sgml,v 1.8 2006/06/05 16:06:05 bvs Exp $">
 <!ENTITY title "������ FreeBSD/pc98">
 <!ENTITY email 're-pc98'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml">
-%includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
  
 <html>
diff --git a/ru/platforms/ppc.sgml b/ru/platforms/ppc.sgml
index 9e2c92e43e..77cf213f6b 100644
--- a/ru/platforms/ppc.sgml
+++ b/ru/platforms/ppc.sgml
@@ -6,13 +6,14 @@
      Original revision: 1.18
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/platforms/ppc.sgml,v 1.6 2006/06/05 16:06:05 bvs Exp $">
 <!ENTITY title "������ FreeBSD/ppc">
 <!ENTITY email 'freebsd-ppc'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;]>
+<!ENTITY % navinclude.developers "INCLUDE">
+]>
+
 
 <html>
   &header;
diff --git a/ru/platforms/sparc.sgml b/ru/platforms/sparc.sgml
index 66ca4929cf..14608f644f 100644
--- a/ru/platforms/sparc.sgml
+++ b/ru/platforms/sparc.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.26
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/platforms/sparc.sgml,v 1.7 2006/06/05 16:37:30 bvs Exp $">
 <!ENTITY title "������ FreeBSD/sparc64">
 <!ENTITY email 'freebsd-sparc64'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 ]>
 
diff --git a/ru/platforms/x86-64.sgml b/ru/platforms/x86-64.sgml
index 9dc05565c8..e0537f81ee 100644
--- a/ru/platforms/x86-64.sgml
+++ b/ru/platforms/x86-64.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.15
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/platforms/x86-64.sgml,v 1.4 2006/06/05 16:06:05 bvs Exp $">
 <!ENTITY title "������ FreeBSD/x86-64">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/platforms/xbox.sgml b/ru/platforms/xbox.sgml
index 0542161adb..2ca6293c76 100644
--- a/ru/platforms/xbox.sgml
+++ b/ru/platforms/xbox.sgml
@@ -6,12 +6,11 @@
   Original revision: 1.4
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/platforms/xbox.sgml,v 1.2 2006/06/05 16:06:05 bvs Exp $">
 <!ENTITY title "������ FreeBSD/xbox">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 ]>
 
diff --git a/ru/portmgr/charter.sgml b/ru/portmgr/charter.sgml
index 89648ebadc..4b2c0b9f9b 100644
--- a/ru/portmgr/charter.sgml
+++ b/ru/portmgr/charter.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.1
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/portmgr/charter.sgml,v 1.1 2005/06/14 06:13:17 andy Exp $">
+<!ENTITY date "$FreeBSD: www/ru/portmgr/charter.sgml,v 1.2 2005/10/05 20:59:56 simon Exp $">
 <!ENTITY title "����� ������ ���������� �������">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/portmgr/index.sgml b/ru/portmgr/index.sgml
index 791de654e6..42545b771d 100644
--- a/ru/portmgr/index.sgml
+++ b/ru/portmgr/index.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.4
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/portmgr/index.sgml,v 1.1 2005/06/14 06:13:52 andy Exp $">
+<!ENTITY date "$FreeBSD: www/ru/portmgr/index.sgml,v 1.2 2005/10/05 20:59:56 simon Exp $">
 <!ENTITY email 'portmgr'>
 <!ENTITY title "������ ���������� �������">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 <!ENTITY contact.re '<a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>'>
 <!ENTITY contact.so '<a href="mailto:security-officer@FreeBSD.org">security-officer@FreeBSD.org</a>'>
diff --git a/ru/portmgr/policies.sgml b/ru/portmgr/policies.sgml
index 0e6c128a48..6604137325 100644
--- a/ru/portmgr/policies.sgml
+++ b/ru/portmgr/policies.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.2
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/portmgr/policies.sgml,v 1.1 2005/06/14 06:14:21 andy Exp $">
+<!ENTITY date "$FreeBSD: www/ru/portmgr/policies.sgml,v 1.2 2005/10/05 20:59:56 simon Exp $">
 <!ENTITY title "�������� ������ ������ ���������� �������">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/portmgr/qa.sgml b/ru/portmgr/qa.sgml
index cada56b348..094db96c66 100644
--- a/ru/portmgr/qa.sgml
+++ b/ru/portmgr/qa.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.2
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/portmgr/qa.sgml,v 1.2 2005/08/08 16:59:35 marck Exp $">
+<!ENTITY date "$FreeBSD: www/ru/portmgr/qa.sgml,v 1.3 2005/10/05 20:59:56 simon Exp $">
 <!ENTITY title "������ �������� �������� ��� ������ ���������� �������">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/ports/Makefile b/ru/ports/Makefile
index bb98855171..9ff76615d5 100644
--- a/ru/ports/Makefile
+++ b/ru/ports/Makefile
@@ -1,7 +1,7 @@
 #
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD: www/ru/ports/Makefile,v 1.9 2005/12/04 11:50:51 pav Exp $
+# $FreeBSD: www/ru/ports/Makefile,v 1.10 2006/07/16 11:22:05 simon Exp $
 # $FreeBSDru: frdp/www/ru/ports/Makefile,v 1.9 2004/03/23 21:09:19 phantom Exp $
 #
 # Original revision: 1.38
@@ -19,13 +19,6 @@
 
 FETCH_OPT?=	-am
 
-#
-# Force NO_TIDY for the ports web pages, since it takes a long time to
-# run tidy on these huge HTML files, and the files are valid HTML when
-# generated by portindex, even without tidy.
-#
-NO_TIDY=	YES
-
 .if defined(PINDEX_OVERRIDE)
 ${INDEX}: ${PINDEX_OVERRIDE}
 	${CP} ${PINDEX_OVERRIDE} ${INDEX}
@@ -69,7 +62,16 @@ packages.exists:
 .endif
 
 Makefile.gen: index.sgml .NOTMAIN
-	${ECHO_CMD} DOCS= *.sgml > Makefile.gen
+	(	${ECHO_CMD} TIDY=${PERL};\
+		${ECHO_CMD} TIDYOPTS="-i'' -npe 's,\"-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN\",\"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\",'";\
+		${ECHO_CMD} DOCS= *.sgml;\
+		${ECHO_CMD} -n "DYNAMIC_DOCS= ";\
+		${ECHO_CMD} -n " master-index.sgml";\
+		${ECHO_CMD} -n " index.sgml";\
+	) > Makefile.gen
+	for categoryfile in ${CATEGORYLIST}; do \
+		${ECHO_CMD} -n " $$categoryfile.sgml" >> Makefile.gen; \
+	done
 .if defined(NO_TIDY)
 	${ECHO_CMD} NO_TIDY=${NO_TIDY} >> Makefile.gen
 .endif
@@ -78,6 +80,10 @@ index.sgml: ${INDEX} categories packages.exists portindex ports.inc .NOTMAIN
 	${RM} -f *.sgml
 	${PORTINDEX} ${INDEX} ${.CURDIR}
 
+# this builds: categories-alpha.sgml, categories-grouped.sgml,
+# master-index.sgml, statistics.ent, <category>.sgml
+CATEGORYLIST=`grep "^[a-z]" ../../en/ports/categories | sed -e s"/,.*//"`
+
 install: all beforeinstall
 
 all install clean:
diff --git a/ru/ports/portindex b/ru/ports/portindex
index f669f997f8..b49282459f 100755
--- a/ru/ports/portindex
+++ b/ru/ports/portindex
@@ -8,7 +8,7 @@
 #
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD: www/ru/ports/portindex,v 1.8 2004/03/23 23:07:16 phantom Exp $
+# $FreeBSD: www/ru/ports/portindex,v 1.9 2005/10/05 20:59:56 simon Exp $
 # $FreeBSDru: frdp/www/ru/ports/portindex,v 1.14 2004/03/23 21:10:07 phantom Exp $
 #
 # Original revision: 1.49
@@ -65,15 +65,13 @@ sub getdate {
 
 sub header {
     local ($fh, $htext) = @_;
-    print $fh "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" [\n";
+    print $fh "<!DOCTYPE HTML PUBLIC \"-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN\" [\n";
     print $fh "<!ENTITY base CDATA '..'>\n";
     print $fh "<!ENTITY date  \"<em>$today</em>\">\n";
     print $fh "<!ENTITY title '$htext'>\n";
     print $fh "<!ENTITY blurb  SYSTEM \"ports.inc\">\n";
-    print $fh "<!ENTITY % navincludes SYSTEM \"../includes.navdownload.sgml\"> %navincludes;\n";
-    print $fh "<!ENTITY % includes SYSTEM \"../includes.sgml\">\n";
+    print $fh "<!ENTITY % navinclude.ports \"INCLUDE\">\n";
     print $fh "<!ENTITY email 'ports'>\n";
-    print $fh "%includes;\n";
     print $fh "]>\n";
     print $fh "<html>&header;\n";
 }
diff --git a/ru/projects/busdma/index.sgml b/ru/projects/busdma/index.sgml
index 49a8fe875e..5569e5e90a 100644
--- a/ru/projects/busdma/index.sgml
+++ b/ru/projects/busdma/index.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.102
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/projects/busdma/index.sgml,v 1.5 2005/06/21 17:13:55 andy Exp $">
+<!ENTITY date "$FreeBSD: www/ru/projects/busdma/index.sgml,v 1.6 2005/10/05 20:59:56 simon Exp $">
 <!ENTITY title "������ ��������� ��������� FreeBSD � busdma � SMPng">
 <!ENTITY email 'mux'>
-<!ENTITY % navincludes SYSTEM "../../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 
 <!-- Status levels -->
 <!ENTITY status.na "<font color=green>�� ���������</font>">
diff --git a/ru/projects/cvsweb.sgml b/ru/projects/cvsweb.sgml
index 1f00a6622d..8cb0a94202 100644
--- a/ru/projects/cvsweb.sgml
+++ b/ru/projects/cvsweb.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.30
 -->
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/projects/cvsweb.sgml,v 1.5 2005/06/02 15:33:18 andy Exp $">
+<!ENTITY date "$FreeBSD: www/ru/projects/cvsweb.sgml,v 1.6 2005/10/05 20:59:56 simon Exp $">
 <!ENTITY title '������ FreeBSD CVSweb'>
 <!ENTITY email 'freebsd-cvsweb'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 ]>
 
diff --git a/ru/projects/newbies.sgml b/ru/projects/newbies.sgml
index 3c907e43f6..a4f9f21665 100644
--- a/ru/projects/newbies.sgml
+++ b/ru/projects/newbies.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.51
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/projects/newbies.sgml,v 1.10 2005/10/05 20:59:56 simon Exp $">
+<!ENTITY date "$FreeBSD: www/ru/projects/newbies.sgml,v 1.12 2006/07/20 05:35:45 den Exp $">
 <!ENTITY title '�������������� ������� ��� ��������'>
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 <!ENTITY url.ru.articles "&base;/doc/ru_RU.KOI8-R/articles">
 <!ENTITY url.ru.books "&base;/doc/ru_RU.KOI8-R/books">
 ]>
diff --git a/ru/projects/projects.sgml b/ru/projects/projects.sgml
index b6a5b7dfb3..da8ee31411 100644
--- a/ru/projects/projects.sgml
+++ b/ru/projects/projects.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.176
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/projects/projects.sgml,v 1.28 2005/06/15 06:33:06 andy Exp $">
+<!ENTITY date "$FreeBSD: www/ru/projects/projects.sgml,v 1.29 2005/10/05 20:59:56 simon Exp $">
 <!ENTITY title "������� ���������� FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/projects/summerofcode.sgml b/ru/projects/summerofcode.sgml
index 2a4191bc22..1b7890f364 100644
--- a/ru/projects/summerofcode.sgml
+++ b/ru/projects/summerofcode.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.31
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/projects/summerofcode.sgml,v 1.2 2005/06/13 07:35:41 andy Exp $">
+<!ENTITY date "$FreeBSD: www/ru/projects/summerofcode.sgml,v 1.3 2005/10/05 20:59:56 simon Exp $">
 <!ENTITY title "������� FreeBSD �� ����">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 ]>
 
diff --git a/ru/publish.sgml b/ru/publish.sgml
index 89aa5c4df3..6ce7b14f7e 100644
--- a/ru/publish.sgml
+++ b/ru/publish.sgml
@@ -6,11 +6,10 @@
      Original revision: 1.59
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ru/publish.sgml,v 1.12 2004/04/08 07:46:43 den Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ru/publish.sgml,v 1.13 2005/10/05 20:39:12 simon Exp $">
 <!ENTITY title "�������� �������, ����������� FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/releases/5.3R/announce.sgml b/ru/releases/5.3R/announce.sgml
index 421b6ab90e..81b69683f0 100644
--- a/ru/releases/5.3R/announce.sgml
+++ b/ru/releases/5.3R/announce.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/releases/5.3R/announce.sgml,v 1.2 2004/11/10 06:15:34 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/releases/5.3R/announce.sgml,v 1.3 2005/10/05 20:59:56 simon Exp $">
 <!ENTITY title "����� FreeBSD 5.3-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru/releases/5.3R/hardware.sgml b/ru/releases/5.3R/hardware.sgml
index 8fcfbf6620..8911522f55 100644
--- a/ru/releases/5.3R/hardware.sgml
+++ b/ru/releases/5.3R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/releases/5.3R/hardware.sgml,v 1.2 2004/11/10 06:15:34 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/releases/5.3R/hardware.sgml,v 1.3 2005/10/05 20:59:56 simon Exp $">
 <!ENTITY title "���������� � ������������ FreeBSD 5.3-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru/releases/5.3R/installation.sgml b/ru/releases/5.3R/installation.sgml
index d86e42647c..c89e206238 100644
--- a/ru/releases/5.3R/installation.sgml
+++ b/ru/releases/5.3R/installation.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/releases/5.3R/installation.sgml,v 1.2 2004/11/10 06:15:34 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/releases/5.3R/installation.sgml,v 1.3 2005/10/05 20:59:56 simon Exp $">
 <!ENTITY title "���������� �� ��������� FreeBSD 5.3-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru/releases/5.3R/relnotes.sgml b/ru/releases/5.3R/relnotes.sgml
index bc9ab1183b..b8714b96ac 100644
--- a/ru/releases/5.3R/relnotes.sgml
+++ b/ru/releases/5.3R/relnotes.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/releases/5.3R/relnotes.sgml,v 1.2 2004/11/10 06:15:34 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/releases/5.3R/relnotes.sgml,v 1.3 2005/10/05 20:59:56 simon Exp $">
 <!ENTITY title "������� � ������ FreeBSD 5.3-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru/releases/5.4R/announce.sgml b/ru/releases/5.4R/announce.sgml
index bea9ce99d8..d07261103b 100644
--- a/ru/releases/5.4R/announce.sgml
+++ b/ru/releases/5.4R/announce.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/releases/5.4R/announce.sgml,v 1.1 2005/05/11 10:14:08 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/releases/5.4R/announce.sgml,v 1.2 2005/10/05 20:59:57 simon Exp $">
 <!ENTITY title "����� FreeBSD 5.4-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru/releases/5.4R/hardware.sgml b/ru/releases/5.4R/hardware.sgml
index 4af8f92b71..0b33851d4a 100644
--- a/ru/releases/5.4R/hardware.sgml
+++ b/ru/releases/5.4R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/releases/5.4R/hardware.sgml,v 1.1 2005/05/11 10:14:08 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/releases/5.4R/hardware.sgml,v 1.2 2005/10/05 20:59:57 simon Exp $">
 <!ENTITY title "���������� � ������������ FreeBSD 5.4-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru/releases/5.4R/installation.sgml b/ru/releases/5.4R/installation.sgml
index b41cb27fe1..4b9c51c490 100644
--- a/ru/releases/5.4R/installation.sgml
+++ b/ru/releases/5.4R/installation.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/releases/5.4R/installation.sgml,v 1.1 2005/05/11 10:14:08 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/releases/5.4R/installation.sgml,v 1.2 2005/10/05 20:59:57 simon Exp $">
 <!ENTITY title "���������� �� ��������� FreeBSD 5.4-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru/releases/5.4R/relnotes.sgml b/ru/releases/5.4R/relnotes.sgml
index b784067215..8cefb12ab4 100644
--- a/ru/releases/5.4R/relnotes.sgml
+++ b/ru/releases/5.4R/relnotes.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ru/releases/5.4R/relnotes.sgml,v 1.1 2005/05/11 10:14:08 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/releases/5.4R/relnotes.sgml,v 1.2 2005/10/05 20:59:57 simon Exp $">
 <!ENTITY title "���������� � ������ FreeBSD 5.4-RELEASE">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru/releases/index.sgml b/ru/releases/index.sgml
index f01d648160..c54c4bc0dd 100644
--- a/ru/releases/index.sgml
+++ b/ru/releases/index.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.110
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/releases/index.sgml,v 1.26 2006/07/19 08:49:34 den Exp $">
 <!ENTITY title "���������� � �������">
-<!ENTITY % navincludes SYSTEM "../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/releng/charter.sgml b/ru/releng/charter.sgml
index ffd032a9f7..c03762191f 100644
--- a/ru/releng/charter.sgml
+++ b/ru/releng/charter.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.1
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/releng/charter.sgml,v 1.3 2004/09/21 07:50:18 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/releng/charter.sgml,v 1.4 2005/10/05 20:59:57 simon Exp $">
 <!ENTITY title "����������� ������ ���������� �������">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/releng/index.sgml b/ru/releng/index.sgml
index 2f9b727b2c..b039cc367a 100644
--- a/ru/releng/index.sgml
+++ b/ru/releng/index.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.95
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/releng/index.sgml,v 1.12 2004/09/21 07:50:18 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/releng/index.sgml,v 1.13 2005/10/05 20:59:57 simon Exp $">
 <!ENTITY email 're'>
 <!ENTITY title "���������� � ���������� �������">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 <!ENTITY contact.re '<a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>'>
 <!ENTITY contact.so '<a href="mailto:security-officer@FreeBSD.org">security-officer@FreeBSD.org</a>'>
diff --git a/ru/relnotes.sgml b/ru/relnotes.sgml
index 7c86b4c371..807d508303 100644
--- a/ru/relnotes.sgml
+++ b/ru/relnotes.sgml
@@ -6,11 +6,10 @@
      Original revision: 1.12
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ru/relnotes.sgml,v 1.6 2005/03/22 14:49:52 den Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ru/relnotes.sgml,v 1.7 2005/10/05 20:39:12 simon Exp $">
 <!ENTITY title "������������ � �������">
-<!ENTITY % navincludes SYSTEM "includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/search/index-site.sgml b/ru/search/index-site.sgml
index 5749251d0d..ca3867a879 100644
--- a/ru/search/index-site.sgml
+++ b/ru/search/index-site.sgml
@@ -6,11 +6,10 @@
      Original revision: 1.25
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/search/index-site.sgml,v 1.5 2004/04/08 07:46:46 den Exp $">
 <!ENTITY title "����� ������� � ���������� ��������� http://www.FreeBSD.org">
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY atoz SYSTEM "atoz.sgml">
 <!ENTITY site SYSTEM "site.sgml">
 ]>
diff --git a/ru/search/search-mid.sgml b/ru/search/search-mid.sgml
index 09450f0470..fd12502640 100644
--- a/ru/search/search-mid.sgml
+++ b/ru/search/search-mid.sgml
@@ -6,11 +6,10 @@
      Original revision: 1.8
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/search/search-mid.sgml,v 1.4 2003/10/07 14:07:17 den Exp $">
 <!ENTITY title "����� �� Message-ID � ������� ��������">
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 
 <html>
diff --git a/ru/search/search.sgml b/ru/search/search.sgml
index bb69c9b664..ba240a3251 100644
--- a/ru/search/search.sgml
+++ b/ru/search/search.sgml
@@ -6,11 +6,10 @@
      Original revision: 1.98
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/search/search.sgml,v 1.13 2005/06/10 06:20:04 andy Exp $">
 <!ENTITY title "�����">
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 
 <html>
diff --git a/ru/search/searchhints.sgml b/ru/search/searchhints.sgml
index b8f94a3d92..4cc5802289 100644
--- a/ru/search/searchhints.sgml
+++ b/ru/search/searchhints.sgml
@@ -6,11 +6,10 @@
      Original revision: 1.8
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/search/searchhints.sgml,v 1.4 2003/10/07 14:07:17 den Exp $">
 <!ENTITY title "������ �� ������">
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 
 <html>
diff --git a/ru/security/Makefile b/ru/security/Makefile
index bd83f7d3bb..b5dbd29137 100644
--- a/ru/security/Makefile
+++ b/ru/security/Makefile
@@ -1,7 +1,7 @@
 #
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: www/ru/security/Makefile,v 1.6 2004/01/26 07:24:12 andy Exp $
 # $FreeBSDru: frdp/www/ru/security/Makefile,v 1.7 2004/01/25 15:18:18 andy Exp $
 #
 # Original revision: 1.11
@@ -19,13 +19,13 @@ DOCS+=	security.sgml
 
 INDEXLINK= security.html
 
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
-
-CLEANFILES+= advisories.html.inc
-
 security.html: advisories.html.inc
 
-advisories.html.inc: mkindex.xsl ${XML_ADVISORIES} ${XML_INCLUDES}
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param "advisories.xml" "'${XML_ADVISORIES}'" \
-		${.CURDIR}/mkindex.xsl ${XML_ADVISORIES}
+DEPENDSET.DEFAULT=	advisories
+XML.DEFAULT=		${XML_ADVISORIES}
+
+XMLDOCS=	advisories:mkindex.xsl::advisories.html.inc
+NO_DATA.advisories=	yes
+NO_TIDY.advisories=	yes
+
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ru/security/mkindex.xsl b/ru/security/mkindex.xsl
index 5ed877fb38..80fe657a69 100644
--- a/ru/security/mkindex.xsl
+++ b/ru/security/mkindex.xsl
@@ -1,21 +1,23 @@
-<?xml version="1.0" encoding="KOI8-R" ?>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+<!ENTITY base ".">
+<!ENTITY title "">
+]>
 
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: www/ru/security/mkindex.xsl,v 1.2 2004/01/26 07:23:31 andy Exp $
      $FreeBSDru: frdp/www/ru/security/mkindex.xsl,v 1.4 2004/01/25 15:22:12 andy Exp $
 
      Original revision: 1.4
  -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  
-  <xsl:import href="../includes.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
-  <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="date" select="'$FreeBSD$'"/>
-  <xsl:variable name="title" select="'untitled'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/ru/security/mkindex.xsl,v 1.2 2004/01/26 07:23:31 andy Exp $'"/>
 
   <xsl:output type="xml" encoding="KOI8-R"
               omit-xml-declaration="yes" />
diff --git a/ru/security/security.sgml b/ru/security/security.sgml
index a9d22ca3c6..850e7db9f6 100644
--- a/ru/security/security.sgml
+++ b/ru/security/security.sgml
@@ -1,18 +1,17 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD: www/ru/security/security.sgml,v 1.16 2004/09/21 07:50:18 den Exp $
+     $FreeBSD: www/ru/security/security.sgml,v 1.17 2005/10/05 20:59:57 simon Exp $
      $FreeBSDru: frdp/www/ru/security/security.sgml,v 1.33 2004/09/21 07:31:12 den Exp $
 
      Original revision: 1.151
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/security/security.sgml,v 1.16 2004/09/21 07:50:18 den Exp $">
+<!ENTITY date "$FreeBSD: www/ru/security/security.sgml,v 1.17 2005/10/05 20:59:57 simon Exp $">
 <!ENTITY title "�������������� ������������ FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 <!ENTITY advisories.html.inc SYSTEM "advisories.html.inc">
 ]>
 
diff --git a/ru/send-pr.sgml b/ru/send-pr.sgml
index e1e43f2edc..a1c50c5550 100644
--- a/ru/send-pr.sgml
+++ b/ru/send-pr.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.39
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ru/send-pr.sgml,v 1.12 2004/09/21 07:50:15 den Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ru/send-pr.sgml,v 1.13 2005/10/05 20:39:12 simon Exp $">
 <!ENTITY title "�������� ��������� � �������� �� FreeBSD">
 <!ENTITY copyright "This gnats pr-submission mechanism Copyright &copy; 1996
  The NetBSD Foundation, Inc.  ALL RIGHTS RESERVED.">
- <!ENTITY % navincludes SYSTEM "includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+ <!ENTITY % navinclude.support "INCLUDE">
 <!ENTITY bugbusters "bugbusters@FreeBSD.org">
 ]>
 
diff --git a/ru/share/sgml/catalog b/ru/share/sgml/catalog
new file mode 100644
index 0000000000..bae3bb06c0
--- /dev/null
+++ b/ru/share/sgml/catalog
@@ -0,0 +1,12 @@
+--
+ $FreeBSD$
+--
+
+PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+       "l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
+       "header.l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
+       "navibar.l10n.ent"
diff --git a/ru/share/sgml/catalog.xml b/ru/share/sgml/catalog.xml
new file mode 100644
index 0000000000..12c0f02504
--- /dev/null
+++ b/ru/share/sgml/catalog.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+                 rewritePrefix="../../"/>
+  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+              rewritePrefix="../../"/>
+</catalog>
diff --git a/ru/events/events.xml b/ru/share/sgml/events.xml
similarity index 99%
rename from ru/events/events.xml
rename to ru/share/sgml/events.xml
index 469976f334..b223e6842f 100644
--- a/ru/events/events.xml
+++ b/ru/share/sgml/events.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="KOI8-R" ?>
-
+<?xml version="1.0" encoding="KOI8-R"?>
+<!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
+                        "http://www.FreeBSD.org/XML/www/share/sgml/evenets.dtd">
+<!-- $FreeBSD$ -->
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -7,8 +9,6 @@
 
      Original revision: 1.49
 -->
-
-<!DOCTYPE events SYSTEM "events.dtd">
 <!--
      �������, ������� ����� ������������ ������� ��� ������������� FreeBSD.
 
diff --git a/ru/share/sgml/header.l10n.ent b/ru/share/sgml/header.l10n.ent
new file mode 100644
index 0000000000..056ba61614
--- /dev/null
+++ b/ru/share/sgml/header.l10n.ent
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!--
+     The FreeBSD Russian Documentation Project
+
+     $FreeBSD$
+     $FreeBSDru: frdp/www/ru/includes.sgml,v 1.27 2006/06/10 18:40:56 gad Exp $
+
+     Original revision: 1.62
+-->
+
+<!-- Components making up the standard headers and footers. -->
+<!-- Override in the prolog <em>before</em> including this  -->
+<!-- file if necessary.                                     -->
+<!ENTITY copyright '<a href="&base;/copyright/">Legal Notices</a> | &copy; 1995-2006 The FreeBSD Project. All rights reserved.'>
+<!ENTITY author '<a href="&base;/index.html">�������</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">��������</a> &nbsp; | &nbsp; <a href="&base;/copyright/index.html">��������� �����</a> &nbsp; | &nbsp; &copyright;'>
+<!ENTITY home '<a href="&base;/index.html"><img src="&enbase;/gifs/home.gif"
+  alt="������� �������� FreeBSD" border="0" align="right" width="101" height="33"></a>'>
+
+<!-- Standard headers and footers -->
+
+<!ENTITY header2.word.search '�����'>
+<!ENTITY header2.word.textsize 'Text Size'>
+<!ENTITY header2.word.normaltextsize '���������� ������ ����'>
+<!ENTITY header2.word.largetextsize '������� ������ ����'>
+<!ENTITY header2.word.normal 'Normal'>
+<!ENTITY header2.word.large 'Large'>
+<!ENTITY header2.word.donate '�������������'>
+<!ENTITY header2.word.contact '���������� ����������'>
+
+<!ENTITY header2.topnav '
+  <h2 class="blockhide">��������� �� �����</h2>
+
+  <div id="TOPNAV">
+    <ul id="TOPNAVLIST">
+      <li><a href="&base;/" title="�� �������">�� �������</a></li>
+      <li><a href="&base;/about.html" title="� FreeBSD">� FreeBSD</a></li>
+      <li><a href="&base;/where.html" title="��������� FreeBSD">��������� FreeBSD</a></li>
+      <li><a href="&base;/docs.html" title="������������">������������</a></li>
+      <li><a href="&base;/community.html" title="����������">����������</a></li>
+      <li><a href="&base;/projects/index.html" title="����������">����������</a></li>
+      <li><a href="&base;/support.html" title="���������">���������</a></li>
+    </ul>
+  </div> <!-- TOPNAV -->
+'>
+
+<!-- macro for webbuild paper -->
+<!ENTITY webbuild '
+<p>���� �������� ��������� ���������� � ���������� ���-������� FreeBSD ��
+������ CVS � ������ ������.</p>'>
+
+<!-- 
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
+-->
diff --git a/ru/share/sgml/l10n.ent b/ru/share/sgml/l10n.ent
new file mode 100644
index 0000000000..983d24c79c
--- /dev/null
+++ b/ru/share/sgml/l10n.ent
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!--
+     The FreeBSD Russian Documentation Project
+
+     $FreeBSD$
+     $FreeBSDru: frdp/www/ru/includes.sgml,v 1.27 2006/06/10 18:40:56 gad Exp $
+
+     Original revision: 1.62
+-->
+
+<!ENTITY url.doc.langcode    'ru_RU.KOI8-R'>
+<!ENTITY xml.encoding        'koi8-r'>
+
+<!ENTITY rel.current.date '��� 2006'>
+
+<!-- URLs to information on the latest release -->
+<!ENTITY u.rel.notes '&enbase;/releases/&rel.current;R/relnotes.html'>
+<!ENTITY u.rel.announce '&enbase;/releases/&rel.current;R/announce.html'>
+<!ENTITY u.rel.errata '&enbase;/releases/&rel.current;R/errata.html'>
+<!ENTITY u.rel.hardware '&enbase;/releases/&rel.current;R/hardware.html'>
+<!ENTITY u.rel.installation '&enbase;/releases/&rel.current;R/installation.html'>
+<!ENTITY u.rel.readme '&enbase;/releases/&rel.current;R/readme.html'>
+
+<!ENTITY u.betarel.schedule '&enbase;/releases/&betarel.current;R/schedule.html'>
+
+<!-- Secondary "current release" entities -->
+
+<!ENTITY u.betarel2.schedule '&enbase;/releases/&betarel2.current;R/schedule.html'>
+
+<!ENTITY rel2.current.date '��� 2006'>
+
+<!-- URLs to information on the latest release -->
+<!ENTITY u.rel2.notes '&base;/releases/&rel2.current;R/relnotes.html'>
+<!ENTITY u.rel2.announce '&base;/releases/&rel2.current;R/announce.html'>
+<!ENTITY u.rel2.errata '&base;/releases/&rel2.current;R/errata.html'>
+<!ENTITY u.rel2.hardware '&base;/releases/&rel2.current;R/hardware.html'>
+<!ENTITY u.rel2.installation '&base;/releases/&rel2.current;R/installation.html'>
+<!ENTITY u.rel2.readme '&base;/releases/&rel2.current;R/readme.html'>
+
+<!-- 
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
+-->
diff --git a/ru/share/sgml/libcommon.xsl b/ru/share/sgml/libcommon.xsl
new file mode 100644
index 0000000000..34d8622f99
--- /dev/null
+++ b/ru/share/sgml/libcommon.xsl
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>
+
+  <xsl:template name="html-news-list-newsflash-preface">
+    <img src="&enbase;/../gifs/news.jpg" align="right" border="0" width="193"
+      height="144" alt="FreeBSD News"/>
+
+    <p>FreeBSD �������� ������ ������������� ������������ ��������. ����
+      � ����� ���� ��������� ���������� ������ ������ ����������! �����
+      ������� ���, ������������ ����������� � ���� ���������. ����� ����, ��
+      ����� �������� ����������� �� <a
+	href="../../doc/ru_RU.KOI8-R/books/handbook/eresources.html#ERESOURCES-MAIL">
+	������ �������� freebsd-announce</a> ��� ������������
+      <a href="news.rdf">RSS</a>.</p>
+
+    <p>��������� ������� ����� ����������� �������� ��������, � �������
+      ����� ���������� � ������� ���������� � ��������, ������������ �
+      ��������������� ��������.</p>
+
+    <ul>
+      <li><a href="../../java/newsflash.html">&java; �� FreeBSD</a></li>
+
+      <li><a href="http://freebsd.kde.org/">KDE �� FreeBSD</a></li>
+
+      <li><a href="../../gnome/newsflash.html">GNOME �� FreeBSD</a></li>
+    </ul>
+
+    <p>��������� �������� �������, ��������� � ������� ������� ��������� ��
+      �������� <strong><a href="&base;/releases/index.html">����������
+	  � �������</a></strong>.</p>
+
+    <p>��������� �� ������������ FreeBSD ��������� �� �������� <a
+	href="&base;/security/#adv">���������� � ������������</a>.</p>
+  </xsl:template>
+
+  <xsl:template name="html-news-list-newsflash-homelink">
+    <a href="&base;/news/news.html">� ��������</a>
+  </xsl:template>
+
+  <xsl:template name="html-news-make-olditems-list">
+    <p>������ ������� ���:
+      <a href="2002/index.html">2002</a>,
+      <a href="2001/index.html">2001</a>,
+      <a href="2000/index.html">2000</a>,
+      <a href="1999/index.html">1999</a>,
+      <a href="1998/index.html">1998</a>,
+      <a href="1997/index.html">1997</a>,
+      <a href="1996/index.html">1996</a></p>
+  </xsl:template>
+
+  <xsl:variable name="html-news-list-press-homelink">
+    <a href="&base;/news/press.html">� ���������� � ������</a>
+  </xsl:variable>
+
+  <xsl:template name="html-news-list-press-preface">
+    <p>���� �� �� ����� ����� ������̣���� ����������, ����������,
+      ��������� ţ URL �� ����� <a
+	href="mailto:www@FreeBSD.org">www@FreeBSD.org</a></p>
+
+    <p>����� ����, ������� ������ � ������� FreeBSD Java �� ������ �����,
+      ������� ��������� <a
+	href="&base;/java/press.html">FreeBSD/Java � ������</a>.</p>
+  </xsl:template>
+
+  <xsl:template name="html-events-list-preface">
+    <p>���� �� ������������ ����������� � ��������, ��������� � FreeBSD,
+      ��� ������� ����� ��������� ������������� FreeBSD, �� �������������
+      �����, ��, ����������, �������� ��� ����������� �� ����� <a
+	href="mailto:www@FreeBSD.org">www@FreeBSD.org</a>, ����� ���
+      ���������� ��������� �����.</p>
+  </xsl:template>
+
+  <xsl:template name="html-events-list-upcoming-heading">
+    <h2 id="upcoming">������� � ����������� �����������:</h2>
+  </xsl:template>
+
+  <xsl:template name="html-events-list-past-heading">
+    <h2 id="past">������� �������:</h2>
+  </xsl:template>
+
+  <!-- Convert a month number to the corresponding long English name. -->
+  <xsl:template name="gen-long-en-month">
+    <xsl:param name="nummonth"/>
+    <xsl:variable name="month" select="number($nummonth)"/>
+    <xsl:choose>
+      <xsl:when test="$month=1">������</xsl:when>
+      <xsl:when test="$month=2">�������</xsl:when>
+      <xsl:when test="$month=3">����</xsl:when>
+      <xsl:when test="$month=4">������</xsl:when>
+      <xsl:when test="$month=5">���</xsl:when>
+      <xsl:when test="$month=6">����</xsl:when>
+      <xsl:when test="$month=7">����</xsl:when>
+      <xsl:when test="$month=8">������</xsl:when>
+      <xsl:when test="$month=9">��������</xsl:when>
+      <xsl:when test="$month=10">�������</xsl:when>
+      <xsl:when test="$month=11">������</xsl:when>
+      <xsl:when test="$month=12">�������</xsl:when>
+      <xsl:otherwise>Invalid month</xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/ru/share/sgml/navibar.l10n.ent b/ru/share/sgml/navibar.l10n.ent
new file mode 100644
index 0000000000..c4f45b0daf
--- /dev/null
+++ b/ru/share/sgml/navibar.l10n.ent
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!-- $FreeBSD$ -->
+
+<!ENTITY % navinclude.about "IGNORE">
+<![ %navinclude.about; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">��������� �� �������</h2>
+<ul>
+<li><a href="&base;/about.html">� FreeBSD</a></li>
+<li><a href="&base;/features.html">�����������</a></li>
+<li><a href="&base;/applications.html">����������</a></li>
+<li><a href="&base;/internet.html">������ � �����</a></li>
+<li><a href="&enbase;/advocacy/">����������</a></li>
+<li><a href="&enbase;/marketing/">���������</a></li>
+<li><a href="&base;/news/newsflash.html">�������</a></li>
+<li><a href="&base;/events/events.html">�������</a></li>
+<li><a href="&base;/news/press.html">������</a></li>
+<li><a href="&base;/art.html">�����������</a></li>
+<li><a href="&base;/logo.html">�������</a></li>
+<li><a href="&base;/donations/">�������������</a></li>
+<li><a href="&base;/copyright/">����������� ���������</a></li>
+</ul>
+</div> <!-- sidenav -->'>
+]]>
+
+<!ENTITY % navinclude.community "IGNORE">
+<![ %navinclude.community; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">��������� �� �������</h2>
+<ul>
+<li><a href="&base;/community.html">����������</a></li>
+<li><a href="&base;/community/mailinglists.html">������ ��������</a></li>
+<li><a href="&base;/community/irc.html">IRC</a></li>
+<li><a href="&base;/community/newsgroups.html">���������������</a></li>
+<li><a href="&base;/usergroups.html">������ �������������</a></li>
+<li><a href="&base;/community/webresources.html">Web �������</a></li>
+</ul>
+</div> <!-- sidenav -->'>
+]]>
+
+<!ENTITY % navinclude.developers "IGNORE">
+<![ %navinclude.developers; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">��������� �� �������</h2>
+<ul>
+<li><a href="&base;/projects/index.html">������������</a></li>
+<li><a href="&enbase;/doc/en_US.ISO8859-1/books/developers-handbook">����������� ������������</a></li>
+<li><a href="&enbase;/doc/&url.doc.langcode;/books/porters-handbook">����������� �� �������� ������</a></li>
+<li><a href="&base;/developers/cvs.html">CVS �����������</a></li>
+<li><a href="&base;/releng/index.html">���������� �������</a></li>
+<li><a href="&base;/platforms/">���������</a>
+	<ul>
+		<li><a href="&base;/platforms/alpha.html">alpha</a></li>
+		<li><a href="&base;/platforms/amd64.html">amd64</a></li>
+                <li><a href="&base;/platforms/arm.html">ARM</a></li>
+		<li><a href="&base;/platforms/i386.html">i386</a></li>
+		<li><a href="&base;/platforms/ia64/index.html">ia64</a></li>
+                <li><a href="&base;/platforms/mips.html">MIPS</a></li>
+		<li><a href="&base;/platforms/pc98.html">pc98</a></li>
+                <li><a href="&base;/platforms/ppc.html">ppc</a></li>
+		<li><a href="&base;/platforms/sparc.html">sparc64</a></li>
+                <li><a href="&base;/platforms/xbox.html">xbox</a></li>
+	</ul>
+</li>
+<li><a href="&enbase;/projects/ideas/">���� ��� �������</a></li>
+<li><a href="&enbase;/doc/&url.doc.langcode;/articles/contributing/index.html">���������� �������</a></li>
+</ul>
+</div> <!-- sidenav -->'>
+]]>
+
+<!ENTITY % navinclude.docs "IGNORE">
+<![ %navinclude.docs; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">��������� �� �������</h2>
+<ul>
+<li><a href="&base;/docs.html">������������</a></li>
+<li><a href="&enbase;/doc/&url.doc.langcode;/books/faq/">FAQ</a></li>
+<li><a href="&enbase;/doc/&url.doc.langcode;/books/handbook/">�����������</a></li>
+<li><a href="&base;/docs/man.html">�������� �����������</a>
+	<ul>
+		<li><a href="&enbase;/cgi/man.cgi">�������� ����������� � ����</a></li>
+	</ul>
+</li>
+<li><a href="&base;/docs/books.html">����� � ������</a></li>
+<li><a href="&enbase;/marketing/">������������� ���������</a></li>
+<li><a href="&base;/publish.html">����������</a></li>
+<li><a href="&base;/docs/webresources.html">Web �������</a></li>
+<li><a href="&base;/projects/newbies.html">��� ��������</a></li>
+<li><a href="&base;/docproj/">������ ����������������</a></li>
+</ul>
+</div> <!-- sidenav -->'>
+]]>
+
+<!ENTITY % navinclude.download "IGNORE">
+<![ %navinclude.download; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">��������� �� �������</h2>
+<ul>
+<li><a href="&base;/where.html">�������� FreeBSD</a></li>
+<li><a href="&base;/releases/">���������� � �������</a>
+	<ul>
+		<li><a href="&u.rel.announce;">������������ �����: &rel.current;</a></li>
+		<li><a href="&u.rel2.announce;">(������) ������������ �����: &rel2.current;</a></li>
+		<li><a href="&base;/snapshots/">�������-������</a></li>
+              <![ %beta.testing; [ 
+                <li><a href="&u.betarel.schedule;">����������� �����: &betarel.current;</a></li>
+              ]]>
+              <![ %beta2.testing; [ 
+                <li><a href="&u.betarel2.schedule;">����������� �����: &betarel2.current;</a></li>
+              ]]>
+	</ul>
+</li>
+<li><a href="&base;/ports/">������������� ����������</a></li>
+</ul>
+</div> <!-- sidenav -->'>
+]]>
+
+<!ENTITY % navinclude.gnome "IGNORE">
+<![ %navinclude.gnome; [
+]]>
+
+<!ENTITY % navinclude.ports "IGNORE">
+<![ %navinclude.ports; [
+]]>
+
+<!ENTITY % navinclude.support "IGNORE">
+<![ %navinclude.support; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">��������� �� �������</h2>
+<ul>
+<li><a href="&base;/support.html">���������</a></li>
+<li><a href="&base;/commercial/">����������</a>
+	<ul>
+		<li><a href="&enbase;/commercial/software_bycat.html">����������� �����������</a></li>
+		<li><a href="&enbase;/commercial/hardware.html">���������� �����������</a></li>
+		<li><a href="&enbase;/commercial/consult_bycat.html">�������������� ������</a></li>
+		<li><a href="&enbase;/commercial/isp.html">�������� ����������</a></li>
+		<li><a href="&enbase;/commercial/misc.html">������</a></li>
+	</ul>
+</li>
+<li><a href="&base;/security/">���������� � ������������</a></li>
+<li><a href="&base;/support/bugreports.html">��������� �� �������</a>
+	<ul>
+		<li><a href="&base;/send-pr.html">������� ��������� � ��������</a></li>
+	</ul>
+</li>
+<li><a href="&base;/support/webresources.html">Web �������</a></li>
+</ul>
+</div> <!-- sidenav -->'>
+]]>
diff --git a/ru/news/news.xml b/ru/share/sgml/news.xml
similarity index 91%
rename from ru/news/news.xml
rename to ru/share/sgml/news.xml
index b6fdf50c81..908b0e474b 100644
--- a/ru/news/news.xml
+++ b/ru/share/sgml/news.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="KOI8-R" ?>
+<!DOCTYPE news PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for News//EN"
+                      "http://www.FreeBSD.org/XML/www/share/sgml/news.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
@@ -17,7 +19,7 @@
 
      Each <event> contains an optional <title>, and then a <p>.  <p> elements
      can contain <a> anchors.  Within the "href" attribute of the anchor
-     $base or $enbase will be replaced with the base URI necessary to reach
+     &base; or &enbase; will be replaced with the base URI necessary to reach
      the FreeBSD document root, and should always be used to start URLs at
      www.FreeBSD.org or one of the mirrors.
 
@@ -49,7 +51,7 @@
             �������� ����� CVS-��������� RELENG_6.  ��������� �����
             6.0-RELEASE � ��� ����������� ������ 6.x ����� ���������� �� ����
             �����.  ��� ��������� ����� ������ ���������� ���������� ���������
-            �������: <a href="$base/releases/6.0R/schedule.html">���� �������
+            �������: <a href="&base;/releases/6.0R/schedule.html">���� �������
             6.0-RELEASE</a>, <a
             href="http://lists.freebsd.org/pipermail/freebsd-stable/2005-July/016855.html">
             ���������� � RELENG_6</a>.</p>
@@ -84,7 +86,7 @@
             ��������� �������-������ 5-STABLE � 6-CURRENT, ����� �����������
             ������������� � ������������ ����� ������� ������� � �������� ţ
             �������.  ��� ��������� ����� ������ ����������, ����������,
-            �������� <a href="$base/snapshots/index.html">�������� �
+            �������� <a href="&base;/snapshots/index.html">�������� �
             ���������</a>.</p>
         </event>
       </day>
@@ -126,13 +128,13 @@
           <title>��������� ���� ��� 6.0-RELEASE</title>
 
           <p>�������� � �������� ��������� ���� <a
-            href="$base/releases/6.0R/schedule.html">FreeBSD
+            href="&base;/releases/6.0R/schedule.html">FreeBSD
             6.0</a>.  ��� �������� ��������� � ����� HEAD �������� src/
             ������������ ������ �������� ��������� �� re@FreeBSD.org.
             ���, ��� ����� ������ � ������������ ������������ ������ ��������
             ������ FreeBSD.  ��� ��������� �������������� ����������,
             ����������, ���������� � ������� Web-�����, �����ݣ����� <a
-            href="$base/releng/index.html">���������� �������</a>.</p>
+            href="&base;/releng/index.html">���������� �������</a>.</p>
         </event>
       </day>
 
@@ -149,7 +151,7 @@
             �������� ���������� ������������ ����������� � �������� �����.
             �������� ��������, ���������� FreeBSD � �������������
             ������������� ���������� ��������� <a
-            href="$base/projects/summerofcode.html">�����</a>.</p>
+            href="&base;/projects/summerofcode.html">�����</a>.</p>
         </event>
 
         <event>
@@ -204,12 +206,12 @@
         <event>
           <title>������� ����� FreeBSD 5.4-RELEASE</title>
 
-          <p>����� � ���� ����� <a href="$base/releases/5.4R/announce.html">
+          <p>����� � ���� ����� <a href="&base;/releases/5.4R/announce.html">
             FreeBSD 5.4-RELEASE</a>.  ����� ����������, ����������,
-            ����������� <a href="$base/releases/5.4R/errata.html">��������
+            ����������� <a href="&base;/releases/5.4R/errata.html">��������
             ��������� ������</a> ��� ��������� ������ ���������� �
             ������������ ���������� � ������������ � 5.4 ���������.  ��
-            �������� � <a href="$base/releases/index.html">����������� �
+            �������� � <a href="&base;/releases/index.html">����������� �
             �������</a> ��������� ����� ������ ���������� � �������
             FreeBSD.</p>
         </event>
@@ -253,7 +255,7 @@
           <title>��ޣ� � ��������� ����� � ������-����� 2005 ����</title>
 
           <p>����������� <a
-            href="$base/news/status/report-jan-2005-mar-2005.html">��ޣ� �
+            href="&base;/news/status/report-jan-2005-mar-2005.html">��ޣ� �
             ��������� �����</a> � ������-����� 2005 ����.  � � ����������
             39 �������.</p>
         </event>
@@ -387,7 +389,7 @@
             ����������, ����� �������� ������������� � ������������ �����
             ������� � ��������� �������.  ��� ��������� ����� ������
             ����������, ����������, �������� <a
-            href="$base/snapshots/index.html">�������� ���������</a>.</p>
+            href="&base;/snapshots/index.html">�������� ���������</a>.</p>
         </event>
       </day>
 
@@ -399,10 +401,10 @@
 
           <p>�������� GNOME 2.10.0, ������� � �������� ���������� � ������
             5.4-RELEASE ���� �������� � ������ ������.  �����������
-            �������� ��� <a href="$base/gnome/docs/faq210.html">FAQ ��
+            �������� ��� <a href="&base;/gnome/docs/faq210.html">FAQ ��
             ����������</a>, ����� ������ ��� ���� ����������, �����������
             �� ���������� � ��������� ���������.  �������������� ��������������
-            ������� ����� ����� �� <a href="$base/gnome/index.html">��������
+            ������� ����� ����� �� <a href="&base;/gnome/index.html">��������
             �������� FreeBSD GNOME</a>.</p>
         </event>
       </day>
@@ -476,12 +478,12 @@
         <event>
           <title>�������� FreeBSD 4.11-RELEASE</title>
 
-          <p>�������� <a href="$base/releases/4.11R/announce.html">FreeBSD
+          <p>�������� <a href="&base;/releases/4.11R/announce.html">FreeBSD
             4.11-RELEASE</a>.  ����� ����������, ����������, �������� <a
-            href="$base/releases/4.11R/errata.html">�������� ������������
+            href="&base;/releases/4.11R/errata.html">�������� ������������
             ������</a> ��� ��������� ���������� �� ������������ � 4.11
             ��������� � ������������ ����������.  �� �������� � <a
-            href="$base/releases/index.html">����������� � �������</a>
+            href="&base;/releases/index.html">����������� � �������</a>
             ��������� ����� ������ ���������� � ������� FreeBSD.</p>
         </event>
       </day>
@@ -492,7 +494,7 @@
         <event>
           <title>��ޣ� � ��������� ����� �� ����-������� 2004</title>
 
-          <p><a href="$base/news/status/report-july-2004-dec-2004.html">
+          <p><a href="&base;/news/status/report-july-2004-dec-2004.html">
             �����������</a> ��ޣ� � ��������� ����� � ���� �� ������� 2004
             ����, � ������� ��������� 44 �������.</p>
         </event>
@@ -505,7 +507,7 @@
             �������� <a
             href="http://docs.freebsd.org/cgi/mid.cgi?20050117020739.GA2736">
             �����</a>.  ������ ����������� ���� ������� 4.11 ��������� <a
-            href="$base/releases/4.11R/schedule.html">�����</a>.</p>
+            href="&base;/releases/4.11R/schedule.html">�����</a>.</p>
         </event>
       </day>
 
@@ -519,7 +521,7 @@
             �������������� � ������ �������� FreeBSD-STABLE, ����� �������� <a
             href="http://docs.freebsd.org/cgi/mid.cgi?20050103054251.GA60361">
             �����</a>.  ������ ����������� ���� ������� ������ 4.11 ���������
-            <a href="$base/releases/4.11R/schedule.html">�����</a>.</p>
+            <a href="&base;/releases/4.11R/schedule.html">�����</a>.</p>
         </event>
       </day>
     </month>
@@ -579,7 +581,7 @@
             �������� FreeBSD-STABLE <a
             href="http://docs.freebsd.org/cgi/getmsg.cgi?fetch=495816+0+archive/2004/freebsd-stable/20041219.freebsd-stable">
             �����</a>.  ������ ����������� ���� ����� ��� �������� ������
-            4.11 ��������� <a href="$base/releases/4.11R/schedule.html">
+            4.11 ��������� <a href="&base;/releases/4.11R/schedule.html">
             �����</a>.</p>
         </event>
       </day>
@@ -689,12 +691,12 @@
         <event>
           <title>�������� FreeBSD 5.3-RELEASE</title>
 
-          <p>������� ����� <a href="$base/releases/5.3R/announce.html">FreeBSD
+          <p>������� ����� <a href="&base;/releases/5.3R/announce.html">FreeBSD
 	    5.3-RELEASE</a>.  ����� ���������� ���������� � <a
-	    href="$base/releases/5.3R/errata.html">������
+	    href="&base;/releases/5.3R/errata.html">������
 	    ������������ �������</a>, ��� ��������� � ��������� ��������
 	    �/��� ��������� 5.3.  �� �������� <a
-	    href="$base/releases/index.html">���������� � �������</a>
+	    href="&base;/releases/index.html">���������� � �������</a>
 	    ��������� ����� ��������� ���������� � ������� FreeBSD.</p>
         </event>
       </day>
@@ -856,7 +858,7 @@
 	   <title>����� � ������� �� ��� 2004 - ���� 2004</title>
 
 	   <p>�������� ����� � ������� �� ���-����; �� �������� <a
-	     href="$base/news/status/status.html">������� � �������</a>
+	     href="&base;/news/status/status.html">������� � �������</a>
 	     ������������ ��������� ����������.</p> </event>
       </day>
 
@@ -919,12 +921,12 @@
 	<event>
 	  <title>�������� ����� FreeBSD 4.10-RELEASE</title>
 
-	  <p>������� ����� <a href="$base/releases/4.10R/announce.html">FreeBSD
+	  <p>������� ����� <a href="&base;/releases/4.10R/announce.html">FreeBSD
 	    4.10-RELEASE</a>.  ����������, �������� �������� <a
-	    href="$base/releases/4.10R/errata.html">���������� � �����������</a>
+	    href="&base;/releases/4.10R/errata.html">���������� � �����������</a>
 	    � ����������� � ��������� �������� �/��� ���������, ��������� �
 	    4.10.  �� �������� <a
-	    href="$base/releases/index.html">���������� � ������</a>
+	    href="&base;/releases/index.html">���������� � ������</a>
 	    ��������� ����� ��������� ���������� � ������� FreeBSD.</p>
 	</event>
       </day>
@@ -944,7 +946,7 @@
 	   <title>����� � ������� �� ���� 2004 - ������ 2004</title>
 
 	   <p>�������� ����� � ������� �� ����-������; ���������� �
-	     <a href="$base/news/status/status.html">�������� ������� �
+	     <a href="&base;/news/status/status.html">�������� ������� �
 	     �������</a> �� �������������� �����������.</p>
 	 </event>
        </day>
@@ -1023,12 +1025,12 @@
 	  <title>�������� �������</title>
 
 	  <p>� ����� �� ���������� ��������� � ����������������� ������,
-	    ���������� ���������� <a href="$base/gallery/">�������</a>
+	    ���������� ���������� <a href="&base;/gallery/">�������</a>
 	    ������� � ������������� Web-������, ���� ������ ����������
 	    �����, ���������� ���������� ���� �������.  ������� �����
 	    ������� � ������� ���� ������, ���������� ����������
 	    ������� �����������.  ������, ��� �� �������� ��
-	    <a href="$base/commercial/">������������ �������</a>.</p>
+	    <a href="&base;/commercial/">������������ �������</a>.</p>
 	</event>
       </day>
 
@@ -1047,7 +1049,7 @@
 	   <title>����� � ������� �� ������ 2004 - ������� 2004</title>
 
 	   <p>�������� ����� � ������� �� ������-�������; ���������� �
-	     <a href="$base/news/status/status.html">�������� ������� �
+	     <a href="&base;/news/status/status.html">�������� ������� �
 	     �������</a> �� �������������� �����������.</p>
 	 </event>
        </day>
@@ -1098,12 +1100,12 @@
 	<event>
 	  <title>�������� FreeBSD 5.2.1-RELEASE</title>
 
-	  <p>�������� <a href="$base/../releases/5.2.1R/announce.html">FreeBSD
+	  <p>�������� <a href="&base;/../releases/5.2.1R/announce.html">FreeBSD
 	    5.2.1-RELEASE</a>.  ���������� � �������� <a
-	    href="$base/../releases/5.2.1R/errata.html">����������� � ����������</a>
+	    href="&base;/../releases/5.2.1R/errata.html">����������� � ����������</a>
 	    ����� ���������� �� ����������� � ��������� �������� �/���
 	    ������������, ���������� ������ 5.2.1.  �� �������� <a
-	    href="$base/../releases/index.html">���������� � �������</a>
+	    href="&base;/../releases/index.html">���������� � �������</a>
 	    ��������� �������������� ���������� � ������� FreeBSD.</p>
 	</event>
       </day>
@@ -1174,7 +1176,7 @@
 	  <title>����� � ������� �� �������-�������</title>
 
 	  <p>�������� ����� � ������� �� �������-�������; ���������� �
-	    <a href="$base/news/status/status.html">�������� ������� �
+	    <a href="&base;/news/status/status.html">�������� ������� �
 	    �������</a> �� ����� ��������� �����������.</p>
 	</event>
       </day>
@@ -1210,12 +1212,12 @@
         <event>
           <title>�������� FreeBSD 5.2-RELEASE</title>
 
-          <p>������� ����� <a href="$base/releases/5.2R/announce.html">FreeBSD
+          <p>������� ����� <a href="&base;/releases/5.2R/announce.html">FreeBSD
             5.2-RELEASE</a>.  ����������, ����������� �������� <a
-            href="$base/releases/5.2R/errata.html">������������ ������</a>
+            href="&base;/releases/5.2R/errata.html">������������ ������</a>
             ����� ���, ��� ��������� ���������, ����� ������� ����������� ���
             ���� ������� �/��� ��������� � 5.2.  �� �������� � <a
-            href="$base/releases/index.html">����������� � �������</a>
+            href="&base;/releases/index.html">����������� � �������</a>
             ����� ����� �������������� ���������� � ������� FreeBSD.</p>
         </event>
       </day>
diff --git a/ru/news/press.xml b/ru/share/sgml/press.xml
similarity index 99%
rename from ru/news/press.xml
rename to ru/share/sgml/press.xml
index 26e77d82b2..b88c8dbe48 100644
--- a/ru/news/press.xml
+++ b/ru/share/sgml/press.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="KOI8-R" ?>
+<!DOCTYPE press PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Press//EN"
+                      "http://www.FreeBSD.org/XML/www/share/sgml/press.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru/share/sgml/templates.usergroups.xsl b/ru/share/sgml/templates.usergroups.xsl
index a33729d1e1..45a3293e75 100644
--- a/ru/share/sgml/templates.usergroups.xsl
+++ b/ru/share/sgml/templates.usergroups.xsl
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
+                                "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+<!ENTITY base "../..">
+<!ENTITY title "������ �������������">
+<!ENTITY email "freebsd-www">
+<!ENTITY % navinclude.community "INCLUDE">
+]>
 
 <!-- The FreeBSD Russian Documentation Project -->
 <!-- $FreeBSDru: frdp/www/ru/share/sgml/templates.usergroups.xsl,v 1.2 2005/11/03 18:27:42 gad Exp $ -->
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/ru/share/sgml/templates.usergroups.xsl,v 1.1 2005/11/08 18:22:23 bvs Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
   exclude-result-prefixes="cvs">
-
-  <xsl:import href="../../includes.xsl" />
-
-   <xsl:output type="xml" encoding="koi8-r" indent="yes"/>
-  <xsl:variable name="section" select="'community'"/>
-
-  <xsl:output method="xml"
-    doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-    doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"/>
-
-  <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-  <xsl:variable name="email" select="'freebsd-www'"/>
-  <xsl:variable name="title" select="'������ �������������'"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/templates.usergroups.xsl"/>
 
   <xsl:template name="html-usergroups-list-header">
     <p>������������ FreeBSD �������� ��������� ���������� �����
@@ -34,43 +26,4 @@
     
     <h3>�������</h3>
   </xsl:template>
-
-  <xsl:template match="/">
-    <html>
-      <xsl:copy-of select="$header1"/>
-
-      <body xsl:use-attribute-sets="att.body">
-        <div id="containerwrap">
-          <div id="container">
-	    <xsl:copy-of select="$header2"/>
-
-	    <div id="content">
-      	      <xsl:copy-of select="$sidenav"/>
-
-      	      <div id="contentwrap">
-		<xsl:copy-of select="$header3"/>
-
-		<xsl:call-template name="html-usergroups-list-header" />
-
-	<xsl:call-template name="html-usergroups-list-regions">
-          <xsl:with-param name="usergroups.xml" select="$usergroups.xml" />
-          <xsl:with-param name="usergroups-local.xml" select="$usergroups-local.xml" />
-	</xsl:call-template>
-
-	<xsl:call-template name="html-usergroups-list-entries">
-          <xsl:with-param name="usergroups.xml" select="$usergroups.xml" />
-          <xsl:with-param name="usergroups-local.xml" select="$usergroups-local.xml" />
-	  </xsl:call-template>
-
-	      </div> <!-- contentwrap -->
-	      <br class="clearboth" />
-	    </div> <!-- content -->
-
-	    <xsl:copy-of select="$footer"/>
-
-	  </div> <!-- container -->
-	</div> <!-- containerwrap -->
-      </body>
-    </html>
-  </xsl:template>
 </xsl:stylesheet>
diff --git a/ru/smp/index.sgml b/ru/smp/index.sgml
index 22ee5b0000..92903f48c4 100644
--- a/ru/smp/index.sgml
+++ b/ru/smp/index.sgml
@@ -6,13 +6,12 @@
      Original revision: 1.141
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/smp/index.sgml,v 1.5 2005/10/05 20:59:57 simon Exp $">
+<!ENTITY date "$FreeBSD: www/ru/smp/index.sgml,v 1.6 2006/01/17 09:27:10 bvs Exp $">
 <!ENTITY title "������ FreeBSD SMP">
 <!ENTITY email 'freebsd-smp'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 
 <!-- Status levels -->
 <!ENTITY status.done "<font color=green>���������</font>">
diff --git a/ru/snapshots/index.sgml b/ru/snapshots/index.sgml
index 51426438d8..11a41069d5 100644
--- a/ru/snapshots/index.sgml
+++ b/ru/snapshots/index.sgml
@@ -1,18 +1,17 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD: www/ru/snapshots/index.sgml,v 1.2 2005/10/05 20:59:57 simon Exp $
+     $FreeBSD: www/ru/snapshots/index.sgml,v 1.3 2006/01/17 09:27:10 bvs Exp $
      $FreeBSDru: frdp/www/ru/snapshots/index.sgml,v 1.4 2006/01/17 07:27:20 gad Exp $
 
      Original revision: 1.8
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/snapshots/index.sgml,v 1.2 2005/10/05 20:59:57 simon Exp $">
+<!ENTITY date "$FreeBSD: www/ru/snapshots/index.sgml,v 1.3 2006/01/17 09:27:10 bvs Exp $">
 <!ENTITY title "�������-������ FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 
 <!ENTITY url.snapshots "ftp://ftp.freebsd.org/pub/FreeBSD/snapshots">
 ]>
diff --git a/ru/support.sgml b/ru/support.sgml
index d7f31f9b74..0113d51d54 100644
--- a/ru/support.sgml
+++ b/ru/support.sgml
@@ -6,11 +6,10 @@
      Original revision: 1.354
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD$">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ru/support.sgml,v 1.46 2006/07/19 10:59:06 den Exp $">
 <!ENTITY title "���������">
-<!ENTITY % navincludes SYSTEM "includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/support/bugreports.sgml b/ru/support/bugreports.sgml
index cbce367c9a..93035442a2 100644
--- a/ru/support/bugreports.sgml
+++ b/ru/support/bugreports.sgml
@@ -2,12 +2,11 @@
 <!-- $FreeBSDru: frdp/www/ru/support/bugreports.sgml,v 1.2 2006/01/17 07:27:20 gad Exp $ -->
 <!-- Original revision: 1.2 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/support/bugreports.sgml,v 1.1 2005/11/08 18:22:23 bvs Exp $">
+<!ENTITY date "$FreeBSD: www/ru/support/bugreports.sgml,v 1.2 2006/01/17 09:27:10 bvs Exp $">
 <!ENTITY title "��������� �� �������">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/support/webresources.sgml b/ru/support/webresources.sgml
index ed2ab0b8b3..67552580ef 100644
--- a/ru/support/webresources.sgml
+++ b/ru/support/webresources.sgml
@@ -2,12 +2,11 @@
 <!-- $FreeBSDru: frdp/www/ru/support/webresources.sgml,v 1.2 2006/06/08 08:14:55 gad Exp $ -->
 <!-- Original revision: 1.2 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/support/webresources.sgml,v 1.2 2006/06/10 03:38:18 bvs Exp $">
 <!ENTITY title "Web �������">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/tutorials/index.sgml b/ru/tutorials/index.sgml
index 9f70fee0ef..0128498769 100644
--- a/ru/tutorials/index.sgml
+++ b/ru/tutorials/index.sgml
@@ -6,12 +6,11 @@
      Original revision: 1.23
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ru/tutorials/index.sgml,v 1.13 2006/06/10 03:38:18 bvs Exp $">
 <!ENTITY title "�������� �� FreeBSD">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <html>
diff --git a/ru/where.sgml b/ru/where.sgml
index 8ca0c6bc7b..afce634df3 100644
--- a/ru/where.sgml
+++ b/ru/where.sgml
@@ -6,11 +6,10 @@
      Original revision: 1.84
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD$">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ru/where.sgml,v 1.13 2006/07/19 10:59:06 den Exp $">
 <!ENTITY title "��������� FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
 ]>
 
diff --git a/ru/y2kbug.sgml b/ru/y2kbug.sgml
index 5fc61eb436..953a9c7ec3 100644
--- a/ru/y2kbug.sgml
+++ b/ru/y2kbug.sgml
@@ -6,11 +6,10 @@
      Original revision: 1.46
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD$">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/ru/y2kbug.sgml,v 1.12 2006/06/10 03:38:18 bvs Exp $">
 <!ENTITY title '���������� � 2000 ���� ("������ �����������")'>
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 <html>
     &header;
diff --git a/tr/Makefile b/tr/Makefile
index 552757aae7..2c614162c7 100644
--- a/tr/Makefile
+++ b/tr/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Documentation Project
 # The FreeBSD Turkish Documentation Project
-# $FreeBSD: www/tr/Makefile,v 1.1 2003/12/01 21:26:21 blackend Exp $
+# $FreeBSD: www/tr/Makefile,v 1.2 2004/01/13 22:59:06 hrs Exp $
 # Original revision: 1.98
 .if exists(Makefile.conf)
 .include "Makefile.conf"
@@ -15,6 +15,10 @@ DOCS= docs.sgml
 DOCS+= features.sgml
 DOCS+= mailto.sgml
 
+XMLDOCS=	index:xsl:${XML_NEWS_NEWS}:
+DEPENDSET.index=transtable mirrors news press events \
+		advisories notices
+
 # These will be directly installed.
 
 #DATA=	favicon.ico
@@ -68,16 +72,4 @@ SUBDIR= doc
 
 WEBDIR=	data/tr
 
-# index.html is special, and generated from index.xsl and news/news.xml
-DATA+=		index.html
-CLEANFILES+=	index.html
-
-index.html: index.xsl ../en/news/news.xml ../en/news/press.xml includes.xsl ../en/news/includes.xsl ../share/sgml/advisories.xml
-	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		${.CURDIR}/index.xsl ${.CURDIR}/../en/news/news.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
-
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/tr/doc/Makefile b/tr/doc/Makefile
index 520f6391c3..2f0497a5ca 100644
--- a/tr/doc/Makefile
+++ b/tr/doc/Makefile
@@ -1,8 +1,9 @@
 #
 # The FreeBSD Documentation Project
 # The FreeBSD Turkish Documentation Project#
-# $FreeBSD$
+# $FreeBSD: www/tr/doc/Makefile,v 1.1 2003/12/01 21:26:21 blackend Exp $
 # Based on: 1.8
+#
 # Build the FreeBSD documentation *outside* of the www tree, and install it
 # in to the right place as necessary.
 #
@@ -10,36 +11,39 @@
 # one another -- this was always the case anyway, so there are no extra
 # requirements here.
 #
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 all: all-all all-install
 
 all-all:
 	@unset DESTDIR || true; \
-	 cd ${.CURDIR}/../../../doc/tr_TR.ISO8859-9; \
+	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} FORMATS="html-split html" \
 			INSTALL_COMPRESSED= all
 all-install:
 	@unset DESTDIR || true; \
-	 cd ${.CURDIR}/../../../doc/tr_TR.ISO8859-9; \
+	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
 			INSTALL_COMPRESSED= install
-
 install clean:
 	@unset DESTDIR || true; \
-	 cd ${.CURDIR}/../../../doc/tr_TR.ISO8859-9; \
+	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
 			INSTALL_COMPRESSED= ${.TARGET}
-
-
 .if make(clean)
 	${RM} -rf tr*
 .endif
 
-.include "${.CURDIR}/../../share/mk/web.site.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
 
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
-	 cd ${.CURDIR}/../../../doc/tr_TR.ISO8859-9; \
+	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}
diff --git a/tr/docs.sgml b/tr/docs.sgml
index 7ae70b47e7..64ff2d8d0a 100644
--- a/tr/docs.sgml
+++ b/tr/docs.sgml
@@ -3,10 +3,9 @@
      Original revision: 1.175
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD$">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/tr/docs.sgml,v 1.1 2003/12/01 21:26:21 blackend Exp $">
 <!ENTITY title "Belgeler">
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
 
 <html>
diff --git a/tr/features.sgml b/tr/features.sgml
index 7c2bb5b63e..7008a07cc8 100644
--- a/tr/features.sgml
+++ b/tr/features.sgml
@@ -3,10 +3,9 @@
      Original revision: 1.19
 -->
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD$">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/tr/features.sgml,v 1.1 2003/12/01 21:26:21 blackend Exp $">
 <!ENTITY title "FreeBSD'nin Teknolojik &Uuml;st&uuml;nl&uuml;kleri">
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
 
 <html>
diff --git a/tr/includes.sgml b/tr/includes.sgml
deleted file mode 100644
index c782102f96..0000000000
--- a/tr/includes.sgml
+++ /dev/null
@@ -1,134 +0,0 @@
-<!--
-     The FreeBSD Turkish Documentation Project
-     Original revision: 1.60
--->
-
-<!-- $FreeBSD$ -->
-<!--
-  Base is the absolute URL for the given page, minus the actual page
-  part.  It should either be specified as a fully qualified URL, or
-  relative to the server root.  It should be defined in the prolog
-  <em>before</em> including this file if the page does not live at the
-  default location below.
-
-  When making a link, use <a href="&base;/mypage.html">foo</a> and
-  &base; will be expanded appropriately.  Base is also used in the
-  definition of standard boilerplate entities in this file, so be sure
-  base is correct!
--->
-
-<!ENTITY base CDATA ".">
-<!ENTITY enbase CDATA "..">
-
-<!-- Images -->
-<!ENTITY i.daemon '<img src="&enbase;/gifs/daemon.gif" alt="" align="left"  width="80" height="76">'>
-<!ENTITY i.new '<img src="&enbase;/gifs/new.gif" alt="[New!]" width="28" height="11">'>
-
-<!-- Components making up the standard headers and footers. -->
-<!-- Override in the prolog <em>before</em> including this  -->
-<!-- file if necessary.                                      -->
-<!ENTITY copyright '&copy; 1995-2003 The FreeBSD Project.
-  All rights reserved.'>
-<!ENTITY email 'freebsd-questions'>
-<!ENTITY author '<a href="&base;/index.html">home</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">contact</a> &nbsp; | &nbsp; <a href="&enbase;/copyright/index.html">legal</a> &nbsp; | &nbsp; &copyright;'>
-<!ENTITY date ''>
-<!ENTITY home '<a href="&base;/index.html"><img src="&enbase;/gifs/home.gif"
-  alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"></a>'>
-<!ENTITY stylesheet '&enbase;/freebsd.css'>
-
-<!-- Standard headers and footers -->
-
-<!ENTITY header '<head><title>&title;</title>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-9">
-<meta name="MSSmartTagsPreventParsing" content="TRUE">
-<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
-<link rel="icon" href="/favicon.ico" type="image/x-icon">
-<link rel="stylesheet" type="text/css" href="&stylesheet;"></head><body
-text="#000000" bgcolor="#FFFFFF" alink="#FFCC33"><img
-src="&enbase;/gifs/bar.gif" alt="Navigation Bar" width="565" height="33" border="0" usemap="#bar">
-<h1 align="left"><font color="#660000">&title;</font></h1><br clear="all">
-
-
-<map name="bar">
-<area shape="rect" coords="1,1,111,31" href="&base;/index.html" alt="Top">
-<area shape="rect" coords="112,11,196,31" href="&enbase;/ports/index.html" alt="Applications">
-<area shape="rect" coords="196,12,257,33" href="&enbase;/support.html" alt="Support">
-<area shape="rect" coords="256,12,365,33" href="&base;/docs.html" alt="Documentation">
-<area shape="rect" coords="366,13,424,32" href="&enbase;/commercial/commercial.html" alt="Vendors">
-<area shape="rect" coords="425,16,475,32" href="&enbase;/search/search.html" alt="Search">
-<area shape="rect" coords="477,16,516,33" href="&enbase;/search/index-site.html" alt="Index">
-<area shape="rect" coords="516,15,562,33" href="&base;/index.html" alt="Top">
-<area shape="rect" href="&base;/index.html" coords="0,0,564,32" alt="Top">
-</map>'>
-
-<!ENTITY footer '<HR NOSHADE>
-<address>&author;<br>&date;</address>'>
-
-<!-- XXX rel.current and u.rel.* should be available in doc/ -->
-<!-- The currently released versions of FreeBSD.  This value is used to
-     create some links on web sites and such, so do NOT change it until
-     it's really release time.  When you update this, you should also
-     update (at least) the following:
-
-	- similar entity in the Handbook
-	- similar entity in the Relnotes
-	- releases/index.sgml has the date of the current release
-	- the FAQ has links to the release FTP url
-	- "versions supported" in security.sgml
-
-     (If you're the release engineer, feel free to update this list with
-     other doc-related things you had to do.  It'll save you time and
-     trouble the next time around :-).)
-
-     As of 5.0, we now have the concept of two different "currently"
-     released versions (from two different development branches).  Use
-     rel.* and u.rel.* for the "latest and greatest" version and
-     rel2.* and u.rel2.* for the "conservative users" version.
--->
-<!ENTITY rel.current '5.1'>
-<!ENTITY rel.current.date 'June 2003'>
-
-<!-- URLs to information on the latest release -->
-<!ENTITY u.rel.notes '&enbase;/releases/&rel.current;R/relnotes.html'>
-<!ENTITY u.rel.announce '&enbase;/releases/&rel.current;R/announce.html'>
-<!ENTITY u.rel.errata '&enbase;/releases/&rel.current;R/errata.html'>
-<!ENTITY u.rel.hardware '&enbase;/releases/&rel.current;R/hardware.html'>
-<!ENTITY u.rel.early '&enbase;/releases/&rel.current;R/early-adopter.html'>
-
-<!-- Secondary "current release" entities -->
-<!ENTITY rel2.current '4.8'>
-<!ENTITY rel2.current.date 'April 2003'>
-
-<!-- URLs to information on the latest release -->
-<!ENTITY u.rel2.notes '&enbase;/releases/&rel2.current;R/relnotes.html'>
-<!ENTITY u.rel2.announce '&enbase;/releases/&rel2.current;R/announce.html'>
-<!ENTITY u.rel2.errata '&enbase;/releases/&rel2.current;R/errata.html'>
-<!ENTITY u.rel2.hardware '&enbase;/releases/&rel2.current;R/hardware.html'>
-
-<!-- macro for webbuild paper -->
-<!ENTITY webbuild '
-<p>This document describe how to build and update
-the FreeBSD Web pages from the CVS repository by hand.</p>'>
-
-<!-- avoid replacing &nbsp; etc. with hardcoded Latin1 values -->
-<!ENTITY nbsp SDATA "[nbsp ]">
-<!ENTITY copy SDATA "[copy ]">
-<!ENTITY reg SDATA "[reg ]">
-<!ENTITY deg SDATA "[deg ]">
-<!ENTITY middot SDATA "[middot ]">
-<!ENTITY raquo SDATA "[raquo ]">
-<!ENTITY laquo SDATA "[laquo ]">
-
-<!-- Often used trademarks -->
-<!ENTITY unix 'UNIX&reg;'>
-<!ENTITY java 'Java&trade;'>
-<!ENTITY jdk 'JDK&trade;'>
-
-<!--
-     Local Variables:
-     mode: sgml
-     sgml-indent-data: t
-     sgml-omittag: nil
-     sgml-always-quote-attributes: t
-     End:
--->
diff --git a/tr/includes.xsl b/tr/includes.xsl
deleted file mode 100644
index b0f069f036..0000000000
--- a/tr/includes.xsl
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-9" ?>
-
-<!--
-     The FreeBSD Turkish Documentation Project
-     Original revision: 1.15
--->
-
-<!-- $FreeBSD$ -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:variable name="i.daemon">
-    <img src="{$base}/gifs/daemon.gif" alt="" align="left" width="80" height="76"/>
-  </xsl:variable>
-
-  <xsl:variable name="i.new">
-    <img src="{$base}/gifs/new.gif" alt="[New!]" width="28" height="11"/>
-  </xsl:variable>
-
-  <xsl:variable name="copyright">
-    <a href="{$base}/copyright/index.html">Copyright</a> &#169; 1995-2003 the FreeBSD Projesi. B�t�n haklar� sakl�d�r.
-  </xsl:variable>
-
-  <!-- Often used trademarks -->
-  <xsl:variable name="unix" select="'UNIX&#174;'"/>
-  <xsl:variable name="java" select="'Java&#8482;'"/>
-  <xsl:variable name="jdk" select="'JDK&#8482;'"/>
-
-  <xsl:variable name="email" select="'freebsd-questions'"/>
-  <xsl:variable name="author">
-    <a>
-      <xsl:attribute name="href">
-	<xsl:value-of select="concat($base, '/mailto.html')"/>
-      </xsl:attribute>
-      <xsl:value-of select="$email"/>@FreeBSD.org</a><br/><xsl:copy-of select="$copyright"/>
-  </xsl:variable>
-
-  <xsl:variable name="home">
-    <a href="{$base}/index.html"><img src="{$base}/gifs/home.gif" alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"/></a>
-  </xsl:variable>
-
-  <xsl:variable name="header1">
-    <head>
-      <title><xsl:value-of select="$title"/></title>
-
-      <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-      <meta name="MSSmartTagsPreventParsing" content="TRUE"/>
-    </head>
-  </xsl:variable>
-
-  <xsl:attribute-set name="att.body">
-    <xsl:attribute name="text">#000000</xsl:attribute>
-    <xsl:attribute name="bgcolor">#FFFFFF</xsl:attribute>
-    <xsl:attribute name="alink">#FFCC33</xsl:attribute>
-  </xsl:attribute-set>
-
-  <xsl:variable name="header2">
-    <img src="{$base}/gifs/bar.gif" alt="Navigation Bar" width="565"
-      height="33" border="0" usemap="#bar"/>
-
-    <h1 align="left"><font color="#660000"><xsl:value-of select="$title"/></font></h1>
-
-    <br clear="all"/>
-
-    <map name="bar">
-      <area shape="rect" coords="1,1,111,31"
-	href="{$base}/index.html" alt="Top"/>
-      <area shape="rect" coords="112,11,196,31"
-	href="{$base}/ports/index.html" alt="Applications"/>
-      <area shape="rect" coords="196,12,257,33"
-	href="{$base}/support.html" alt="Support"/>
-      <area shape="rect" coords="256,12,365,33"
-	href="{$base}/docs.html" alt="Documentation"/>
-      <area shape="rect" coords="366,13,424,32"
-	href="{$base}/commercial/commercial.html" alt="Vendors"/>
-      <area shape="rect" coords="425,16,475,32"
-	href="{$base}/search/search.html" alt="Search"/>
-      <area shape="rect" coords="477,16,516,33"
-	href="{$base}/search/index-site.html" alt="Index"/>
-      <area shape="rect" coords="516,15,562,33"
-	href="{$base}/index.html" alt="Top"/>
-      <area shape="rect" coords="0,0,564,32"
-	href="{$base}/index.html" alt="Top"/>
-    </map>
-  </xsl:variable>
-
-  <xsl:variable name="footer">
-    <hr noshade="noshade"/>
-    <address><xsl:copy-of select="$author"/><br/>
-      <xsl:copy-of select="$date"/></address>
-  </xsl:variable>
-
-  <xsl:variable name="rel.current" select='"5.1"'/>
-  <xsl:variable name="u.rel.notes">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/relnotes.html</xsl:variable>
-
-  <xsl:variable name="u.rel.announce">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/announce.html</xsl:variable>
-  <xsl:variable name="u.rel.errata">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/errata.html</xsl:variable>
-  <xsl:variable name="u.rel.hardware">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/hardware.html</xsl:variable>
-  <xsl:variable name="u.rel.early">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/early-adopter.html</xsl:variable>
-
-  <xsl:variable name="rel2.current" select='"4.8"'/>
-  <xsl:variable name="u.rel2.notes">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/relnotes.html</xsl:variable>
-
-  <xsl:variable name="u.rel2.announce">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/announce.html</xsl:variable>
-  <xsl:variable name="u.rel2.errata">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/errata.html</xsl:variable>
-  <xsl:variable name="u.rel2.hardware">
-    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/hardware.html</xsl:variable>
-
-</xsl:stylesheet>
diff --git a/tr/index.xsl b/tr/index.xsl
index 5d90e26640..da5fcd382f 100644
--- a/tr/index.xsl
+++ b/tr/index.xsl
@@ -1,31 +1,28 @@
-<?xml version="1.0" encoding="ISO-8859-9" ?>
+<?xml version="1.0" encoding="iso-8859-9"?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+<!ENTITY title "The FreeBSD Project">
+]>
 <!--
      The FreeBSD Turkish Documentation Project
      Original revision: 1.77
 -->
 
-<!-- $FreeBSD: www/tr/index.xsl,v 1.2 2003/12/07 09:21:00 blackend Exp $ -->
+<!-- $FreeBSD: www/tr/index.xsl,v 1.3 2004/02/04 15:41:06 ale Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
-  <xsl:import href="includes.xsl"/>
-  <xsl:import href="../en/news/includes.xsl"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/tr/index.xsl,v 1.3 2004/02/04 15:41:06 ale Exp $'"/>
 
-  <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="enbase" select="'..'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/tr/index.xsl,v 1.2 2003/12/07 09:21:00 blackend Exp $'"/>
-  <xsl:variable name="title" select="'FreeBSD Projesi'"/>
-
-  <xsl:output type="html" encoding="iso-8859-9"
+  <xsl:output type="html" encoding="&xml.encoding;"
               doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/>
 
   <xsl:template match="/">
     <html>
       <head>
-	<title><xsl:value-of select="$title"/></title>
-
+	<title>&title;</title>
 	<meta name="description" content="The FreeBSD Projesi"/>
-
 	<meta name="keywords" content="FreeBSD, BSD, UNIX, Support, Gallery,
 	  Release, Application, Software, Handbook, FAQ, Tutorials, Bugs,
 	  CVS, CVSup, News, Commercial Vendors, homepage, CTM, Unix"/>
@@ -39,7 +36,7 @@
 	<table border="0" cellspacing="0" cellpadding="0" width="100%">
 	  <tr>
 	    <td><a href="http://www.FreeBSD.org/tr/index.html">
-	      <img src="{$enbase}/gifs/freebsd_1.gif" height="94" width="306"
+	      <img src="&enbase;/gifs/freebsd_1.gif" height="94" width="306"
 		alt="FreeBSD: The Power to Serve" border="0"/></a></td>
 
 	    <td align="right" valign="bottom">
@@ -166,11 +163,11 @@
 		<br/>
 
 		<font color="#990000"><b>Dil: </b></font>
-		<a href="{$enbase}/it/index.html">�talyanca</a>,
-		<a href="{$enbase}/ja/index.html">Japonca</a>,
-		<a href="{$enbase}/ru/index.html">Rus�a</a>,
-		<a href="{$enbase}/es/index.html">�spanyolca</a>,
-		<a href="{$enbase}/support.html#web">Di�erleri</a>
+		<a href="&enbase;/it/index.html">�talyanca</a>,
+		<a href="&enbase;/ja/index.html">Japonca</a>,
+		<a href="&enbase;/ru/index.html">Rus�a</a>,
+		<a href="&enbase;/es/index.html">�spanyolca</a>,
+		<a href="&enbase;/support.html#web">Di�erleri</a>
 	      </form>
 	    </td>
 	  </tr>
@@ -196,79 +193,79 @@
 
 
 			    <small><br/>
-			      &#183; <a href="{$enbase}/news/newsflash.html">Anonslar</a><br/>
-			      &#183; <a href="{$enbase}/news/press.html">Bas�n</a><br/>
-			      &#183; <a href="{$enbase}/news/index.html">Di�erleri ...</a>
+			      &#183; <a href="&enbase;/news/newsflash.html">Anonslar</a><br/>
+			      &#183; <a href="&enbase;/news/press.html">Bas�n</a><br/>
+			      &#183; <a href="&enbase;/news/index.html">Di�erleri ...</a>
 			    </small></p>
 
 			  <p><font size="+1" color="#990000"><b>Yaz�l�m</b></font>
 			    <small><br/>
-			      &#183; <a href="{$enbase}/doc/en_US.ISO8859-1/books/handbook/mirrors.html">Nereden Bulabilirim?</a><br/>
-			      &#183; <a href="{$enbase}/releases/index.html">S�r�m Bilgileri</a><br/>
-			      &#183; <a href="{$enbase}/ports/index.html">Ports Uygulamalar�</a><br/>
+			      &#183; <a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/mirrors.html">Nereden Bulabilirim?</a><br/>
+			      &#183; <a href="&enbase;/releases/index.html">S�r�m Bilgileri</a><br/>
+			      &#183; <a href="&enbase;/ports/index.html">Ports Uygulamalar�</a><br/>
 			    </small></p>
 
 			  <p><font size="+1" color="#990000"><b>Dok�mantasyon</b></font>
 
 			    <small><br/>
-			      &#183; <a href="{$enbase}/projects/newbies.html">Yeniler ��in</a><br/>
-			      &#183; <a href="{$enbase}/doc/en_US.ISO8859-1/books/handbook/index.html">El Kitab�</a><br/>
-			      &#183; <a href="{$enbase}/doc/en_US.ISO8859-1/books/faq/index.html">SSS</a><br/>
+			      &#183; <a href="&enbase;/projects/newbies.html">Yeniler ��in</a><br/>
+			      &#183; <a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/index.html">El Kitab�</a><br/>
+			      &#183; <a href="&enbase;/doc/en_US.ISO8859-1/books/faq/index.html">SSS</a><br/>
 			      &#183; <a href="http://www.FreeBSD.org/cgi/man.cgi">Klavuz Sayfalar�</a><br/>
-			      &#183; <a href="{$enbase}/docproj/index.html">Dok�mantasyon Proj.</a><br/>
+			      &#183; <a href="&enbase;/docproj/index.html">Dok�mantasyon Proj.</a><br/>
 			      &#183; <a href="docs.html">Di�erleri...</a><br/>
 			    </small></p>
 
 			  <p><font size="+1" color="#990000"><b>Destek</b></font>
 
 			    <small><br/>
-			      &#183; <a href="{$enbase}/support.html#mailing-list">Mail listeleri</a><br/>
-			      &#183; <a href="{$enbase}/support.html#newsgroups">Haber Gruplar�</a><br/>
-			      &#183; <a href="{$enbase}/support.html#user">Kullan�c� Gruplar�</a><br/>
-			      &#183; <a href="{$enbase}/support.html#web">Web Kaynaklar�</a><br/>
-			      &#183; <a href="{$enbase}/security/index.html">G�venlik</a><br/>
-			      &#183; <a href="{$enbase}/support.html">Di�erleri...</a>
+			      &#183; <a href="&enbase;/support.html#mailing-list">Mail listeleri</a><br/>
+			      &#183; <a href="&enbase;/support.html#newsgroups">Haber Gruplar�</a><br/>
+			      &#183; <a href="&enbase;/support.html#user">Kullan�c� Gruplar�</a><br/>
+			      &#183; <a href="&enbase;/support.html#web">Web Kaynaklar�</a><br/>
+			      &#183; <a href="&enbase;/security/index.html">G�venlik</a><br/>
+			      &#183; <a href="&enbase;/support.html">Di�erleri...</a>
 			    </small></p>
 
 			  <p><font size="+1" color="#990000"><b>Hata Bildirimi</b></font>
 			    <small><br/>
-			      &#183; <a href="{$enbase}/send-pr.html">Hata Bildirimi G�nder</a><br/>
+			      &#183; <a href="&enbase;/send-pr.html">Hata Bildirimi G�nder</a><br/>
 			      &#183; <a href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">Hata Sorgulama</a><br/>
 			      &#183; <a href="http://www.FreeBSD.org/cgi/query-pr.cgi">Hata ID'sine G�re Ara</a><br/>
-			      &#183; <a href="{$enbase}/support.html#gnats">Di�erleri...</a><br/>
+			      &#183; <a href="&enbase;/support.html#gnats">Di�erleri...</a><br/>
 			    </small></p>
 
 
 			  <p><font size="+1" color="#990000"><b>Geli�tirim</b></font>
 
 			    <small><br/>
-			      &#183; <a href="{$enbase}/projects/index.html">Projeler</a><br/>
-			      &#183; <a href="{$enbase}/releng/index.html">S�r�m M�hendisli�i</a><br/>
-			      &#183; <a href="{$enbase}/support.html#cvs">CVS Deposu</a><br/>
+			      &#183; <a href="&enbase;/projects/index.html">Projeler</a><br/>
+			      &#183; <a href="&enbase;/releng/index.html">S�r�m M�hendisli�i</a><br/>
+			      &#183; <a href="&enbase;/support.html#cvs">CVS Deposu</a><br/>
 			    </small></p>
 
 			  <p><font size="+1" color="#990000"><b>Sat�n Alma</b></font>
 
 			    <small><br/>
-			      &#183; <a href="{$enbase}/commercial/software_bycat.html">Yaz�l�m</a><br/>
-			      &#183; <a href="{$enbase}/commercial/hardware.html">Donan�m</a><br/>
-			      &#183; <a href="{$enbase}/commercial/consulting_bycat.html">Dan��manl�k</a><br/>
-			      &#183; <a href="{$enbase}/commercial/misc.html">Di�er</a><br/>
+			      &#183; <a href="&enbase;/commercial/software_bycat.html">Yaz�l�m</a><br/>
+			      &#183; <a href="&enbase;/commercial/hardware.html">Donan�m</a><br/>
+			      &#183; <a href="&enbase;/commercial/consulting_bycat.html">Dan��manl�k</a><br/>
+			      &#183; <a href="&enbase;/commercial/misc.html">Di�er</a><br/>
 			    </small></p>
 
 			  <p><font size="+1" color="#990000"><b>Ba���lar</b></font>
 			    <small><br/>
-			      &#183; <a href="{$enbase}/donations/index.html">Ba��s Kurumu</a><br/>
-			      &#183; <a href="{$enbase}/donations/donors.html">Yap�lan Ba���lar</a><br/>
-			      &#183; <a href="{$enbase}/donations/wantlist.html">�htiya� Listesi</a><br/>
+			      &#183; <a href="&enbase;/donations/index.html">Ba��s Kurumu</a><br/>
+			      &#183; <a href="&enbase;/donations/donors.html">Yap�lan Ba���lar</a><br/>
+			      &#183; <a href="&enbase;/donations/wantlist.html">�htiya� Listesi</a><br/>
 			    </small></p>
 
 			  <p><font size="+1" color="#990000"><b>Site i�i</b></font>
 
 			    <small><br/>
-			      &#183; <a href="{$enbase}/search/index-site.html">Site Haritas�</a><br/>
-			      &#183; <a href="{$enbase}/search/search.html">Arama</a><br/>
-			      &#183; <a href="{$enbase}/internal/index.html">Di�er ...</a><br/>
+			      &#183; <a href="&enbase;/search/index-site.html">Site Haritas�</a><br/>
+			      &#183; <a href="&enbase;/search/search.html">Arama</a><br/>
+			      &#183; <a href="&enbase;/internal/index.html">Di�er ...</a><br/>
 
 			    </small></p>
 
@@ -297,12 +294,12 @@
 		UltraSPARC&#174; mimarileri i�in ileri seviye bir
 		i�letim sistemidir.  Berkeleydeki Kaliforniya
 		�niversitesinde geli�tirilmi�
-		<xsl:value-of select="$unix"/> t�revi olan BSD 'yi
+		&unix; t�revi olan BSD 'yi
 		temel alm��t�r.  FreeBSD <a
-		href="{$enbase}/doc/en_US.ISO8859-1/articles/contributors/index.html">bir�ok
+		href="&enbase;/doc/en_US.ISO8859-1/articles/contributors/index.html">bir�ok
 		ki�i </a> taraf�ndan geli�tirilmekte ve
 		devam ettirilmektedir. Ayr�ca ba�ka <a
-		href="{$enbase}/platforms/index.html">mimariler</a>
+		href="&enbase;/platforms/index.html">mimariler</a>
 		i�in geli�tirim de�i�ik
 		a�amalardad�r.</p>
 
@@ -311,7 +308,7 @@
 
 	      <p>FreeBSD ileri seviyede a�, performans,
 		g�venlik ve uyumluluk <a
-		href="{$base}/features.html">�zellikleri</a>sunar.
+		href="&base;/features.html">�zellikleri</a>sunar.
 		Bu �zellikler ticari olan baz� i�letim
 		sistemlerinde bile bulunmamaktad�r.</p>
 
@@ -319,7 +316,7 @@
 		�nternet ��z�mleri</font></h2>
 
 	      <p>FreeBSD ideal bir <a
-		href="{$enbase}/internet.html">�nternet ya da
+		href="&enbase;/internet.html">�nternet ya da
 		�ntranet</a> sunucusu olabilir. A��r
 		a� y�klerinde sa�lam a� hizmetleri
 		verecek yap�dad�r ve ayn� anda
@@ -328,7 +325,7 @@
 		verimli bir �eklilde kullan�r.  FreeBSD ile
 		�al��an uygulama ve servisler
 		i�in <a
-		href="{$enbase}/gallery/gallery.html">galeri</a>
+		href="&enbase;/gallery/gallery.html">galeri</a>
 		sayfam�z� ziyaret edebilirsiniz.</p>
 
 	      <h2><font color="#990000">Binlerce Uygulamay�
@@ -337,11 +334,11 @@
 	      <p>FreeBSD kalitesi g�n�m�zde
 		kullan�lan d���k maliyetli PC
 		donan�mlar� ile birle�ince mevcut
-		ticari <xsl:value-of select="$unix"/> masa�st�
+		ticari &unix; masa�st�
 		sistemlere �ok ekonomik bir alternatif
 		olmaktad�r.  FreeBSD masa�st� ve sunucu
 		<a
-		href="{$enbase}/applications.html">uygulamalar�</a>
+		href="&enbase;/applications.html">uygulamalar�</a>
 		i�in haz�r durumdad�r.</p>
 
 	      <h2><font color="#990000">Kolay Kurulum</font></h2>
@@ -352,24 +349,24 @@
 		anonim FTP ya da NFS ile kurulabilir. B�t�n
 		ihtiyac�n�z bir �ift 1.44MB flopi ve
 		<a
-		href="{$enbase}/doc/en_US.ISO8859-1/books/handbook/install.html">bu</a>
+		href="&enbase;/doc/en_US.ISO8859-1/books/handbook/install.html">bu</a>
 		dok�mand�r.</p>
 
 	      <h2><font color="#990000">FreeBSD
 		<i>�cretsizdir</i></font></h2>
 
-	      <a href="{$enbase}/copyright/daemon.html"><img
-		src="{$enbase}/gifs/dae_up3.gif" alt="" height="81"
+	      <a href="&enbase;/copyright/daemon.html"><img
+		src="&enbase;/gifs/dae_up3.gif" alt="" height="81"
 		width="72" align="right" border="0"/></a>
 
 	      <p>Bu �zelliklere sahip bir i�letim sisteminin
 		y�ksek fiyatlar ile
 		sat�laca��n�
 		d���nebilirsiniz fakat FreeBSD <a
-		href="{$enbase}/copyright/index.html">�cretsiz</a>
+		href="&enbase;/copyright/index.html">�cretsiz</a>
 		bir i�letim sistemidir ve b�t�n kaynak
 		kodu ile beraber gelir. E�er denemek isterseniz <a
-		href="{$enbase}/doc/en_US.ISO8859-1/books/handbook/mirrors.html">daha
+		href="&enbase;/doc/en_US.ISO8859-1/books/handbook/mirrors.html">daha
 		fazla bilgi </a> mevcuttur.</p>
 
 	      <h2><font color="#990000">FreeBSD 'ye Katk�da
@@ -384,7 +381,7 @@
 		g�ndermek olacakt�r.  Yapaca��n�z de�i�iklik
 		dok�mantasyon, sanatsal i�ler ya da kaynak kodu gibi
 		�eyler olabilir.  Ayr�nt�l� bilgi i�in <a
-		href="{$enbase}/doc/en_US.ISO8859-1/articles/contributing/index.html">FreeBSD'ye
+		href="&enbase;/doc/en_US.ISO8859-1/articles/contributing/index.html">FreeBSD'ye
 		Katk�da Bulunmak</a> makalesine ba�vurabilirsiniz.</p>
 
 		<p>Program yazan biri olmasan�z bile FreeBSD
@@ -420,101 +417,50 @@
 			   bgcolor="#ffcc66" width="100%">
 		      <tr>
 			<td valign="top"><p><font size="+1" color="#990000"><b>Yeni Teknololi S�r�m�:
-			    <xsl:value-of select="$rel.current"/></b></font><br/>
+			    &rel.current;</b></font><br/>
 
-			    <small>&#183; <a href="{$u.rel.announce}">Duyuru</a><br/>
-			      &#183; <a href="{$enbase}/doc/en_US.ISO8859-1/books/handbook/install.html">Kurulum Klavuzu</a><br/>
-			      &#183; <a href="{$u.rel.notes}">S�r�m Bilgileri</a><br/>
-			      &#183; <a href="{$u.rel.hardware}">Desteklenen Donan�mlar</a><br/>
-			      &#183; <a href="{$u.rel.errata}">D�zeltilen Hatalar</a><br/>
-			      &#183; <a href="{$u.rel.early}">Erken Adaptasyon Klavuzu</a></small></p>
+			    <small>&#183; <a href="&u.rel.announce;">Duyuru</a><br/>
+			      &#183; <a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/install.html">Kurulum Klavuzu</a><br/>
+			      &#183; <a href="&u.rel.notes;">S�r�m Bilgileri</a><br/>
+			      &#183; <a href="&u.rel.hardware;">Desteklenen Donan�mlar</a><br/>
+			      &#183; <a href="&u.rel.errata;">D�zeltilen Hatalar</a><br/>
+			      &#183; <a href="&u.rel.early;">Erken Adaptasyon Klavuzu</a></small></p>
 
 			  <p><font size="+1" color="#990000"><b>Kararl� S�r�m:
-			    <xsl:value-of select="$rel2.current"/></b></font><br/>
+				&rel2.current;</b></font><br/>
 
-			    <small>&#183; <a href="{$u.rel2.announce}">Duyuru</a><br/>
-			      &#183; <a href="{$enbase}/doc/en_US.ISO8859-1/books/handbook/install.html">Kurulum Klavuzu</a><br/>
-			      &#183; <a href="{$u.rel2.notes}">S�r�m Bilgileri</a><br/>
-			      &#183; <a href="{$u.rel2.hardware}">Desteklenen Donan�mlar</a><br/>
-			      &#183; <a href="{$u.rel2.errata}">D�zeltilen Hatalar</a></small></p>
+			    <small>&#183; <a href="&u.rel2.announce;">Duyuru</a><br/>
+			      &#183; <a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/install.html">Kurulum Klavuzu</a><br/>
+			      &#183; <a href="&u.rel2.notes;">S�r�m Bilgileri</a><br/>
+			      &#183; <a href="&u.rel2.hardware;">Desteklenen Donan�mlar</a><br/>
+			      &#183; <a href="&u.rel2.errata;">D�zeltilen Hatalar</a></small></p>
 
-			  <p><font size="+1" color="#990000"><b>Proje Haberleri</b></font><br/>
-			    <font size="-1">
-			       En Son Haberler:
-			      <xsl:value-of
-				select="descendant::month[position() = 1]/name"/>
-			      <xsl:text> </xsl:text>
-			      <xsl:value-of
-				select="descendant::day[position() = 1]/name"/>,
-			      <xsl:text> </xsl:text>
-			      <xsl:value-of
-				select="descendant::year[position() = 1]/name"/>
-			      <br/>
-			      <!-- Pull in the 10 most recent news items -->
-			      <xsl:for-each select="descendant::event[position() &lt;= 10]">
-				&#183;  <a>
-				  <xsl:attribute name="href">
-				   <xsl:value-of select="$enbase"/>/news/newsflash.html#<xsl:call-template name="generate-event-anchor"/>
-				  </xsl:attribute>
-				  <xsl:choose>
-				    <xsl:when test="count(child::title)">
-				      <xsl:value-of select="title"/><br/>
-				    </xsl:when>
-				    <xsl:otherwise>
-				      <xsl:value-of select="p"/><br/>
-				    </xsl:otherwise>
-				  </xsl:choose>
-				</a>
-			      </xsl:for-each>
-			      <a href="{$enbase}/news/newsflash.html">�ncekiler ...</a>
-			    </font></p>
+			  <p><font size="+1" color="#990000"><b>Proje Haberleri</b></font></p>
 
-			  <p><font size="+1" color="#990000"><b>Bas�nda FreeBSD</b></font><br/>
+			  <xsl:call-template name="html-index-news-project-items">
+			    <xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
+			    <xsl:with-param name="news.project.xml" select="$news.project.xml" />
+			  </xsl:call-template>
 
-			    <font size="-1">
-			      En Son Haberler:
-			      <xsl:value-of
-				select="document('../en/news/press.xml')/descendant::month[position() = 1]/name"/>
-			      <xsl:text> </xsl:text>
-			      <xsl:value-of
-				select="document('../en/news/press.xml')/descendant::year[position() = 1]/name"/>
-			      <br/>
-			      <!-- Pull in the 10 most recent press items -->
-			      <xsl:for-each select="document('../en/news/press.xml')/descendant::story[position() &lt; 10]">
-				&#183; <a>
-				  <xsl:attribute name="href">
-				    <xsl:value-of select="$enbase"/>/news/press.html#<xsl:call-template name="generate-story-anchor"/>
-				  </xsl:attribute>
-				  <xsl:value-of select="name"/>
-				</a><br/>
-			      </xsl:for-each>
-			      <a href="{$enbase}/en/news/press.html">�ncekiler ...</a>
-			    </font>
-			  </p>
+			  <p><a href="&enbase;/news/newsflash.html">�ncekiler ...</a></p>
 
-			  <p><font size="+1" color="#990000"><b>G�venlik Tavsiyeleri</b></font><br/>
+			  <p><font size="+1" color="#990000"><b>Bas�nda FreeBSD</b></font></p>
 
-			    <font size="-1">
-			      En Son Haberler:
-			      <xsl:value-of
-				select="document('../share/sgml/advisories.xml')/descendant::month[position() = 1]/name"/>
-			      <xsl:text> </xsl:text>
-			      <xsl:value-of
-				select="document('../share/sgml/advisories.xml')/descendant::day[position() = 1]/name"/>
-			      <xsl:text>, </xsl:text>
-			      <xsl:value-of
-				select="document('../share/sgml/advisories.xml')/descendant::year[position() = 1]/name"/>
-			      <br/>
-			      <!-- Pull in the 10 most recent security advisories -->
-			      <xsl:for-each select="document('../share/sgml/advisories.xml')/descendant::advisory[position() &lt; 10]">
-				&#183; <a>
-				  <xsl:attribute name="href">ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/<xsl:value-of select="name"/>.asc</xsl:attribute>
-				  <xsl:value-of select="name"/>
-				</a><br/>
-			      </xsl:for-each>
-			      <a href="{$enbase}/security/index.html">�ncekiler ...</a>
-			    </font>
-			  </p>
+			  <xsl:call-template name="html-index-news-press-items">
+			    <xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
+			    <xsl:with-param name="news.press.xml" select="$news.press.xml" />
+			  </xsl:call-template>
+
+			  <p><a href="&enbase;/en/news/press.html">�ncekiler ...</a></p>
+
+			  <p><font size="+1" color="#990000"><b>G�venlik Tavsiyeleri</b></font></p>
+
+			  <xsl:call-template name="html-index-advisories-items">
+			    <xsl:with-param name="advisories.xml" select="$advisories.xml" />
+			    <xsl:with-param name="type" select="'advisory'" />
+			  </xsl:call-template>
+
+			  <p><a href="&enbase;/security/index.html">�ncekiler ...</a></p>
 			</td>
 		      </tr>
 		    </table>
@@ -532,9 +478,9 @@
 		      bgcolor="#FFFFFF" width="100%"><tr> <td>FreeBSD
 		      hakk�nda daha fazla bilgi almak i�in
 		      FreeBSD ile alakali <a
-		      href="{$enbase}/publish.html">yay�nlar</a> ya
+		      href="&enbase;/publish.html">yay�nlar</a> ya
 		      da <a
-		      href="{$enbase}/news/press.html">Bas�nda
+		      href="&enbase;/news/press.html">Bas�nda
 		      FreeBSD</a>, sayfalar�n� ziyaret
 		      edebilirsiniz!</td>
 		      </tr>
@@ -551,20 +497,20 @@
 	<table width="100%" border="0" cellspacing="0" cellpadding="3">
 	  <tr>
 	    <td><a href="http://www.freebsdmall.com/"><img
-							   src="{$enbase}/gifs/mall_title_medium.gif" alt="[FreeBSD Mall]"
+							   src="&enbase;/gifs/mall_title_medium.gif" alt="[FreeBSD Mall]"
 							   height="65" width="165" border="0"/></a></td>
 
-	    <td><a href="http://www.ugu.com/"><img src="{$enbase}/gifs/ugu_icon.gif"
+	    <td><a href="http://www.ugu.com/"><img src="&enbase;/gifs/ugu_icon.gif"
 						   alt="[Sponsor of Unix Guru Universe]"
 						   height="64" width="76"
 						   border="0"/></a></td>
 
-	    <td><a href="http://www.daemonnews.org/"><img src="{$enbase}/gifs/darbylogo.gif"
+	    <td><a href="http://www.daemonnews.org/"><img src="&enbase;/gifs/darbylogo.gif"
 		alt="[Daemon News]" height="45" width="130"
 		border="0"/></a></td>
 
-	    <td><a href="{$enbase}/copyright/daemon.html"><img
-							     src="{$enbase}/gifs/powerlogo.gif"
+	    <td><a href="&enbase;/copyright/daemon.html"><img
+							     src="&enbase;/gifs/powerlogo.gif"
 							     alt="[Powered by FreeBSD]"
 							     height="64"
 							     width="160"
@@ -572,19 +518,16 @@
 	  </tr>
 	</table>
 
-	<table width="100%" cellpadding="0" border="0" cellspacing="0">
-	  <tr>
-	    <td align="left"
-		valign="top"><small><a href="{$base}/mailto.html">Bize Ula��n
-		</a><br/>
-		<xsl:value-of select="$date"/></small></td>
+      <div id="FOOTER">
+	&copyright;
 
-	    <td align="right"
-		valign="top"><small><a href="{$enbase}/copyright/index.html">Yasal</a><br/> &#169; 1995-2003
-		The FreeBSD Projesi<br/>
-		B�t�n Haklar� sakl�d�r.</small></td>
-	  </tr>
-	</table>
+	The mark FreeBSD is a registered trademark of The FreeBSD
+	Foundation and is used by The FreeBSD Project with the
+	permission of <a
+	  href="http://www.freebsdfoundation.org/documents/Guidelines.shtml">The
+	FreeBSD Foundation</a>.
+
+      </div> <!-- FOOTER -->
       </body>
     </html>
   </xsl:template>
diff --git a/tr/mailto.sgml b/tr/mailto.sgml
index acad63a6f7..64c1e45b8f 100644
--- a/tr/mailto.sgml
+++ b/tr/mailto.sgml
@@ -1,7 +1,6 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD$">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/tr/mailto.sgml,v 1.1 2003/12/01 21:26:21 blackend Exp $">
 <!ENTITY title "FreeBSD ile irtibata ge�mek">
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
 <!--
      The FreeBSD Turkish Documentation Project
diff --git a/tr/share/sgml/catalog b/tr/share/sgml/catalog
new file mode 100644
index 0000000000..bae3bb06c0
--- /dev/null
+++ b/tr/share/sgml/catalog
@@ -0,0 +1,12 @@
+--
+ $FreeBSD$
+--
+
+PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+       "l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
+       "header.l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
+       "navibar.l10n.ent"
diff --git a/tr/share/sgml/catalog.xml b/tr/share/sgml/catalog.xml
new file mode 100644
index 0000000000..12c0f02504
--- /dev/null
+++ b/tr/share/sgml/catalog.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+                 rewritePrefix="../../"/>
+  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+              rewritePrefix="../../"/>
+</catalog>
diff --git a/tr/share/sgml/header.l10n.ent b/tr/share/sgml/header.l10n.ent
new file mode 100644
index 0000000000..c332d1240e
--- /dev/null
+++ b/tr/share/sgml/header.l10n.ent
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="iso-8859-9"?>
+<!--
+     The FreeBSD Turkish Documentation Project
+     Original revision: 1.60
+-->
+
+<!-- $FreeBSD$ -->
+
+<!-- Images -->
+<!ENTITY i.daemon '<img src="&enbase;/gifs/daemon.gif" alt="" align="left"  width="80" height="76">'>
+<!ENTITY i.new '<img src="&enbase;/gifs/new.gif" alt="[New!]" width="28" height="11">'>
+
+<!-- Components making up the standard headers and footers. -->
+<!-- Override in the prolog <em>before</em> including this  -->
+<!-- file if necessary.                                      -->
+<!ENTITY copyright '&copy; 1995-2006 The FreeBSD Project.
+  All rights reserved.'>
+<!ENTITY email 'freebsd-questions'>
+<!ENTITY author '<a href="&base;/index.html">home</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">contact</a> &nbsp; | &nbsp; <a href="&enbase;/copyright/index.html">legal</a> &nbsp; | &nbsp; &copyright;'>
+<!ENTITY date ''>
+<!ENTITY home '<a href="&base;/index.html"><img src="&enbase;/gifs/home.gif"
+  alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"></a>'>
+<!ENTITY stylesheet '&enbase;/freebsd.css'>
+
+<!--
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
+-->
diff --git a/tr/share/sgml/l10n.ent b/tr/share/sgml/l10n.ent
new file mode 100644
index 0000000000..d6f5dda390
--- /dev/null
+++ b/tr/share/sgml/l10n.ent
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="iso-8859-9"?>
+<!--
+     The FreeBSD Turkish Documentation Project
+     Original revision: 1.60
+-->
+
+<!-- $FreeBSD$ -->
+<!--
+  Base is the absolute URL for the given page, minus the actual page
+  part.  It should either be specified as a fully qualified URL, or
+  relative to the server root.  It should be defined in the prolog
+  <em>before</em> including this file if the page does not live at the
+  default location below.
+
+  When making a link, use <a href="&base;/mypage.html">foo</a> and
+  &base; will be expanded appropriately.  Base is also used in the
+  definition of standard boilerplate entities in this file, so be sure
+  base is correct!
+-->
+
+<!ENTITY url.doc.langcode    'tr_TR.ISO8859-9'>
+<!ENTITY xml.encoding        'iso-8859-9'>
+
+<!-- URLs to information on the latest release -->
+<!ENTITY u.rel.notes '&enbase;/releases/&rel.current;R/relnotes.html'>
+<!ENTITY u.rel.announce '&enbase;/releases/&rel.current;R/announce.html'>
+<!ENTITY u.rel.errata '&enbase;/releases/&rel.current;R/errata.html'>
+<!ENTITY u.rel.hardware '&enbase;/releases/&rel.current;R/hardware.html'>
+<!ENTITY u.rel.early '&enbase;/releases/&rel.current;R/early-adopter.html'>
+
+<!-- URLs to information on the latest release -->
+<!ENTITY u.rel2.notes '&enbase;/releases/&rel2.current;R/relnotes.html'>
+<!ENTITY u.rel2.announce '&enbase;/releases/&rel2.current;R/announce.html'>
+<!ENTITY u.rel2.errata '&enbase;/releases/&rel2.current;R/errata.html'>
+<!ENTITY u.rel2.hardware '&enbase;/releases/&rel2.current;R/hardware.html'>
+
+<!--
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
+-->
diff --git a/tr/share/sgml/libcommon.xsl b/tr/share/sgml/libcommon.xsl
new file mode 100644
index 0000000000..13a6d05c75
--- /dev/null
+++ b/tr/share/sgml/libcommon.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="iso-8859-9"?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>
+
+</xsl:stylesheet>
diff --git a/tr/share/sgml/navibar.l10n.ent b/tr/share/sgml/navibar.l10n.ent
new file mode 100644
index 0000000000..ab0fbe2c92
--- /dev/null
+++ b/tr/share/sgml/navibar.l10n.ent
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="ISO-8859-9"?>
+<!-- $FreeBSD$ -->
+
+<!ENTITY % navinclude.about "IGNORE">
+<![ %navinclude.about; [
+]]>
+
+<!ENTITY % navinclude.community "IGNORE">
+<![ %navinclude.community; [
+]]>
+
+<!ENTITY % navinclude.developers "IGNORE">
+<![ %navinclude.developers; [
+]]>
+
+<!ENTITY % navinclude.docs "IGNORE">
+<![ %navinclude.docs; [
+]]>
+
+<!ENTITY % navinclude.download "IGNORE">
+<![ %navinclude.download; [
+]]>
+
+<!ENTITY % navinclude.gnome "IGNORE">
+<![ %navinclude.gnome; [
+]]>
+
+<!ENTITY % navinclude.ports "IGNORE">
+<![ %navinclude.ports; [
+]]>
+
+<!ENTITY % navinclude.support "IGNORE">
+<![ %navinclude.support; [
+]]>
diff --git a/zh_CN/about.sgml b/zh_CN/about.sgml
index e0360cc200..1d8f867825 100644
--- a/zh_CN/about.sgml
+++ b/zh_CN/about.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/about.sgml,v 1.1.1000.6 2005/12/17 12:55:25 delphij Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/zh_CN/about.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
 <!ENTITY title "���� FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
diff --git a/zh_CN/advocacy/index.sgml b/zh_CN/advocacy/index.sgml
index 5d6744c5c7..39ae82b366 100644
--- a/zh_CN/advocacy/index.sgml
+++ b/zh_CN/advocacy/index.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/zh_CN/advocacy/index.sgml,v 1.1.1000.4 2006/01/29 19:42:44 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/advocacy/index.sgml,v 1.1 2006/07/11 15:27:48 delphij Exp $">
 <!ENTITY title "FreeBSD �ٽ���Ŀ">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
diff --git a/zh_CN/advocacy/letter.sgml b/zh_CN/advocacy/letter.sgml
index d3566a4abe..3a3c09f6ba 100644
--- a/zh_CN/advocacy/letter.sgml
+++ b/zh_CN/advocacy/letter.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/zh_CN/advocacy/letter.sgml,v 1.1.1000.4 2006/01/29 19:46:28 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/advocacy/letter.sgml,v 1.1 2006/07/11 15:27:48 delphij Exp $">
 <!ENTITY title "FreeBSD Advocacy Project">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
diff --git a/zh_CN/advocacy/myths.sgml b/zh_CN/advocacy/myths.sgml
index 251c6a4f7b..67f0a7f5d7 100644
--- a/zh_CN/advocacy/myths.sgml
+++ b/zh_CN/advocacy/myths.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/zh_CN/advocacy/myths.sgml,v 1.1.1000.4 2006/02/20 17:02:44 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/advocacy/myths.sgml,v 1.1 2006/07/11 15:27:48 delphij Exp $">
 <!ENTITY title "FreeBSD �ٽ���Ŀ">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
diff --git a/zh_CN/applications.sgml b/zh_CN/applications.sgml
index 25e03efaed..b7bec420d7 100644
--- a/zh_CN/applications.sgml
+++ b/zh_CN/applications.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/applications.sgml,v 1.1.1002.4 2006/02/11 23:13:18 delphij Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/zh_CN/applications.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
 <!ENTITY title "���� FreeBSD ��Ӧ��">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Project -->
diff --git a/zh_CN/art.sgml b/zh_CN/art.sgml
index 4908fa4458..5bd9898581 100644
--- a/zh_CN/art.sgml
+++ b/zh_CN/art.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/art.sgml,v 1.1.1002.3 2006/02/11 23:18:18 delphij Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/zh_CN/art.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
 <!ENTITY title "FreeBSD Art">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "developers.sgml"> %developers;
 ]>
 
diff --git a/zh_CN/availability.sgml b/zh_CN/availability.sgml
index dd01561062..2471d97856 100644
--- a/zh_CN/availability.sgml
+++ b/zh_CN/availability.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/availability.sgml,v 1.1.1000.2 2005/12/17 13:31:16 delphij Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/zh_CN/availability.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
 <!ENTITY title "��� FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
diff --git a/zh_CN/community.sgml b/zh_CN/community.sgml
index 72a08a8c35..6c0a143ab5 100644
--- a/zh_CN/community.sgml
+++ b/zh_CN/community.sgml
@@ -1,8 +1,7 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/community.sgml,v 1.1.1000.4 2005/12/17 17:35:09 delphij Exp $">
+<!doctype HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/zh_CN/community.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
 <!ENTITY title "FreeBSD ����">
-<!ENTITY % navincludes SYSTEM "includes.navcommunity.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.community "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
diff --git a/zh_CN/copyright/copyright.sgml b/zh_CN/copyright/copyright.sgml
index f19f1e75a1..c209bb7fea 100644
--- a/zh_CN/copyright/copyright.sgml
+++ b/zh_CN/copyright/copyright.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/zh_CN/copyright/copyright.sgml,v 1.1.1002.2 2006/01/12 04:42:31 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/copyright/copyright.sgml,v 1.1 2006/07/11 15:27:48 delphij Exp $">
 <!ENTITY title "FreeBSD ��Ȩ����ط�����Ϣ">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Project -->
diff --git a/zh_CN/copyright/daemon.sgml b/zh_CN/copyright/daemon.sgml
index 9b1591b64d..3098affcc1 100644
--- a/zh_CN/copyright/daemon.sgml
+++ b/zh_CN/copyright/daemon.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/zh_CN/copyright/daemon.sgml,v 1.1.1002.2 2006/06/26 05:13:33 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/copyright/daemon.sgml,v 1.1 2006/07/11 15:27:48 delphij Exp $">
 <!ENTITY title "The BSD Daemon">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Project -->
diff --git a/zh_CN/copyright/freebsd-doc-license.sgml b/zh_CN/copyright/freebsd-doc-license.sgml
index 79eb5b253c..43b4964c46 100644
--- a/zh_CN/copyright/freebsd-doc-license.sgml
+++ b/zh_CN/copyright/freebsd-doc-license.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/zh_CN/copyright/freebsd-doc-license.sgml,v 1.1.1002.3 2006/03/04 08:04:44 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/copyright/freebsd-doc-license.sgml,v 1.1 2006/07/11 15:27:48 delphij Exp $">
 <!ENTITY title "FreeBSD �ĵ���Ȩ">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Project -->
diff --git a/zh_CN/copyright/freebsd-license.sgml b/zh_CN/copyright/freebsd-license.sgml
index 2fd0f45060..a5f31423ff 100644
--- a/zh_CN/copyright/freebsd-license.sgml
+++ b/zh_CN/copyright/freebsd-license.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/zh_CN/copyright/freebsd-license.sgml,v 1.1.1002.3 2006/03/04 08:06:47 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/copyright/freebsd-license.sgml,v 1.1 2006/07/11 15:27:48 delphij Exp $">
 <!ENTITY title "FreeBSD ��Ȩ">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The Simplified Chinese Project -->
diff --git a/zh_CN/copyright/license.sgml b/zh_CN/copyright/license.sgml
index 3974b3e782..fae27736cd 100644
--- a/zh_CN/copyright/license.sgml
+++ b/zh_CN/copyright/license.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/zh_CN/copyright/license.sgml,v 1.1.1002.1 2005/12/18 06:45:09 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/copyright/license.sgml,v 1.1 2006/07/11 15:27:48 delphij Exp $">
 <!ENTITY title "4.4BSD ��Ȩ">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The Simplified Chinese Project -->
diff --git a/zh_CN/copyright/trademarks.sgml b/zh_CN/copyright/trademarks.sgml
index 1c409fbe47..ef92a26e0e 100644
--- a/zh_CN/copyright/trademarks.sgml
+++ b/zh_CN/copyright/trademarks.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/zh_CN/copyright/trademarks.sgml,v 1.1.1002.4 2006/05/23 16:25:10 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/copyright/trademarks.sgml,v 1.1 2006/07/11 15:27:48 delphij Exp $">
 <!ENTITY title "�̱�˵��">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- Original Revision: 1.17 -->
diff --git a/zh_CN/docs.sgml b/zh_CN/docs.sgml
index 38ca829a86..6fdd5f4d44 100644
--- a/zh_CN/docs.sgml
+++ b/zh_CN/docs.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/docs.sgml,v 1.1.1002.3 2005/12/17 13:40:19 delphij Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/zh_CN/docs.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
 <!ENTITY title "FreeBSD �ĵ�">
-<!ENTITY % navincludes SYSTEM "includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
diff --git a/zh_CN/features.sgml b/zh_CN/features.sgml
index 4206b35983..1123ee75cc 100644
--- a/zh_CN/features.sgml
+++ b/zh_CN/features.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/features.sgml,v 1.1.1000.2 2005/12/17 14:33:39 delphij Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/zh_CN/features.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
 <!ENTITY title "���� FreeBSD �����ϵ��Ƚ���">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
diff --git a/zh_CN/includes.navabout.sgml b/zh_CN/includes.navabout.sgml
deleted file mode 100644
index e2dee9f7d3..0000000000
--- a/zh_CN/includes.navabout.sgml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- $FreeBSD: www/zh_CN/includes.navabout.sgml,v 1.1.1000.7 2006/05/10 14:54:39 delphij Exp $ -->
-
-<!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- From FreeBSD: www/share/sgml/includes.navabout.sgml,v 1.4 2006/05/08 23:15:38 kuriyama -->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/about.html">����</a></li>
-<li><a href="&base;/features.html">����</a></li>
-<li><a href="&base;/applications.html">Ӧ�ó���</a></li>
-<li><a href="&base;/internet.html">������</a></li>
-<li><a href="&base;/advocacy/">�ٽ���Ŀ</a></li>
-<li><a href="&enbase;/marketing/">�г�</a></li>
-<li><a href="&base;/news/newsflash.html">����</a></li>
-<li><a href="&enbase;/events/events.html">���ڻ</a></li>
-<li><a href="&base;/news/press.html">ý�屨��</a></li>
-<li><a href="&enbase;/logo.html">��־</a></li>
-<li><a href="&base;/art.html">��ͼ</a></li>
-<li><a href="&base;/donations/">����</a></li>
-<li><a href="&base;/copyright/">������֪</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/zh_CN/includes.navcommunity.sgml b/zh_CN/includes.navcommunity.sgml
deleted file mode 100644
index b384a6fb1a..0000000000
--- a/zh_CN/includes.navcommunity.sgml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- $FreeBSD: www/zh_CN/includes.navcommunity.sgml,v 1.1.1000.3 2006/03/10 20:41:06 delphij Exp $ -->
-
-<!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- From: www/share/sgml/includes.navcommunity.sgml,v 1.3 2005/11/06 17:21:28 hrs -->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/community.html">����</a></li>
-<li><a href="&enbase;/community/mailinglists.html">�ʼ��б�</a></li>
-<li><a href="&enbase;/community/irc.html">IRC</a></li>
-<li><a href="&enbase;/community/newsgroups.html">������</a></li>
-<li><a href="&enbase;/usergroups.html">�û���</a></li>
-<li><a href="&enbase;/community/webresources.html">Web ��Դ</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/zh_CN/includes.navdevelopers.sgml b/zh_CN/includes.navdevelopers.sgml
deleted file mode 100644
index ba7a06c37a..0000000000
--- a/zh_CN/includes.navdevelopers.sgml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- $FreeBSD: www/zh_CN/includes.navdevelopers.sgml,v 1.1.1000.3 2006/05/10 14:58:06 delphij Exp $ -->
-
-<!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- From FreeBSD: www/share/sgml/includes.navdevelopers.sgml,v 1.10 2006/05/09 15:40:04 pav -->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&enbase;/projects/index.html">����</a></li>
-<li><a href="&enbase;/doc/zh_CN.GB2312/books/developers-handbook">�����ֲ�</a></li>
-<li><a href="&enbase;/doc/zh_CN.GB2312/books/porters-handbook">Porter �ֲ�</a></li>
-<li><a href="&enbase;/developers/cvs.html">CVS �����</a></li>
-<li><a href="&enbase;/releng/index.html">��������</a></li>
-<li><a href="&base;/platforms/">ƽ̨</a>
-	<ul>
-		<li><a href="&base;/platforms/alpha.html">alpha</a></li>
-		<li><a href="&base;/platforms/amd64.html">amd64</a></li>
-		<li><a href="&base;/platforms/arm.html">ARM</a></li>
-		<li><a href="&base;/platforms/i386.html">i386</a></li>
-		<li><a href="&base;/platforms/ia64/index.html">ia64</a></li>
-		<li><a href="&base;/platforms/mips.html">MIPS</a></li>
-		<li><a href="&base;/platforms/pc98.html">pc98</a></li>
-		<li><a href="&base;/platforms/ppc.html">ppc</a></li>
-		<li><a href="&base;/platforms/sparc.html">sparc64</a></li>
-		<li><a href="&base;/platforms/xbox.html">xbox</a></li>
-	</ul>
-</li>
-<li><a href="&base;/projects/ideas/">��Ŀ�µ���</a></li>
-<li><a href="&enbase;/doc/zh_CN.GB2312/articles/contributing/index.html">Ϊ FreeBSD �ṩ����</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/zh_CN/includes.navdocs.sgml b/zh_CN/includes.navdocs.sgml
deleted file mode 100644
index f75adbbe1b..0000000000
--- a/zh_CN/includes.navdocs.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- $FreeBSD: www/zh_CN/includes.navdocs.sgml,v 1.1.1000.5 2006/06/26 05:13:33 delphij Exp $ -->
-
-<!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- From FreeBSD: www/share/sgml/includes.navdocs.sgml,v 1.6 2006/02/13 08:36:50 murray -->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/docs.html">�ĵ�</a></li>
-<li><a href="&enbase;/doc/zh_CN.GB2312/books/faq/">FAQ</a></li>
-<li><a href="&enbase;/doc/zh_CN.GB2312/books/handbook/">ʹ���ֲ�</a></li>
-<li><a href="&enbase;/docs/man.html">�����ֲ�</a>
-	<ul>
-		<li><a href="&cgibase;/man.cgi">���߲鿴�����ֲ�</a></li>
-	</ul>
-</li>
-<li><a href="&enbase;/docs/books.html">����ͼ�������</a></li>
-<li><a href="&enbase;/marketing/">�����</a></li>
-<li><a href="&enbase;/publish.html">������</a></li>
-<li><a href="&enbase;/docs/webresources.html">Web ��Դ</a></li>
-<li><a href="&enbase;/projects/newbies.html">������·</a></li>
-<li><a href="&enbase;/docproj/">FreeBSD �ĵ��ƻ�</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/zh_CN/includes.navdownload.sgml b/zh_CN/includes.navdownload.sgml
deleted file mode 100644
index 5c70b34faa..0000000000
--- a/zh_CN/includes.navdownload.sgml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- $FreeBSD: www/zh_CN/includes.navdownload.sgml,v 1.1.1000.6 2006/05/10 15:02:22 delphij Exp $ -->
-
-<!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- From FreeBSD: www/share/sgml/includes.navdownload.sgml,v 1.5 2006/02/14 19:19:10 ceri -->
-
-<!ENTITY % relincludes SYSTEM "../share/sgml/includes.release.sgml"> %relincludes;
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/where.html">��� FreeBSD</a></li>
-<li><a href="&base;/releases/">���а���Ϣ</a>
-	<ul>
-		<li><a href="&enbase;/&u.rel.announce;">�������ð棺 &rel.current;</a></li>
-		<li><a href="&enbase;/&u.rel2.announce;">�������ð� (��ʽ)�� &rel2.current;</a></li>
-		<li><a href="&enbase;/snapshots/">���հ汾</a></li>
-	      <![ %beta.testing; [ 
-		<li><a href="&enbase;/&u.betarel.schedule;">�������İ汾�� &betarel.current;</a></li>
-	      ]]>
-	      <![ %beta2.testing; [ 
-		<li><a href="&u.betarel2.schedule;">�������İ汾�� &betarel2.current;</a></li>
-	      ]]>
-	</ul>
-</li>
-<li><a href="&enbase;/ports/">��ֲ��Ӧ�ó��� (ports)</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/zh_CN/includes.navports.sgml b/zh_CN/includes.navports.sgml
deleted file mode 100644
index 9e82fd2717..0000000000
--- a/zh_CN/includes.navports.sgml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- $FreeBSD: www/zh_CN/includes.navports.sgml,v 1.1.1000.1 2005/12/17 15:20:57 delphij Exp $ -->
-
-<!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- From: www/share/sgml/includes.navports.sgml,v 1.1 2005/12/15 00:57:05 linimon -->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&enbase;/ports/index.html">���� ports</a></li>
-<li><a href="&enbase;/ports/installing.html">��װ</a></li>
-<li><a href="&enbase;/ports/updating.html">����</a></li>
-<li><a href="&enbase;/ports/searching.html">����</a></li>
-<li>&nbsp;&nbsp;&nbsp;&nbsp;Ŀ¼
-	<ul>
-		<li><a href="&enbase;/ports/categories-alpha.html">����ĸ��</a></li>
-		<li><a href="&enbase;/ports/categories-grouped.html">���߼�������</a></li>
-	</ul>
-</li>
-<li><a href="&enbase;/ports/master-index.html">ȫ�� Ports</a></li>
-<li><a href="&enbase;/ports/references.html">������Ϣ</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/zh_CN/includes.navsupport.sgml b/zh_CN/includes.navsupport.sgml
deleted file mode 100644
index e428214cb1..0000000000
--- a/zh_CN/includes.navsupport.sgml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- $FreeBSD: www/zh_CN/includes.navsupport.sgml,v 1.1.1000.2 2005/12/17 15:17:30 delphij Exp $ -->
-
-<!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- From: www/share/sgml/includes.navsupport.sgml,v 1.3 2005/11/06 17:21:28 hrs -->
-
-<!ENTITY nav '<div id="SIDENAV">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&enbase;/support.html">֧��</a></li>
-<li><a href="&enbase;/commercial/">��ҵ��Ʒ</a>
-	<ul>
-		<li><a href="&enbase;/commercial/software_bycat.html">����</a></li>
-		<li><a href="&enbase;/commercial/hardware.html">Ӳ��</a></li>
-		<li><a href="&enbase;/commercial/consult_bycat.html">��ѯ</a></li>
-		<li><a href="&enbase;/commercial/isp.html">Internet ����</a></li>
-		<li><a href="&enbase;/commercial/misc.html">����</a></li>
-	</ul>
-</li>
-<li><a href="&base;/security/">��ȫ��Ϣ</a></li>
-<li><a href="&enbase;/support/bugreports.html">Bug ����</a>
-	<ul>
-		<li><a href="&enbase;/send-pr.html">�ύ���ⱨ��</a></li>
-	</ul>
-</li>
-<li><a href="&enbase;/support/webresources.html">Web ��Դ</a></li>
-</ul>
-</div> <!-- sidenav -->'>
diff --git a/zh_CN/includes.sgml b/zh_CN/includes.sgml
deleted file mode 100644
index 580884da25..0000000000
--- a/zh_CN/includes.sgml
+++ /dev/null
@@ -1,148 +0,0 @@
-<!-- $FreeBSD: www/zh_CN/includes.sgml,v 1.1.1002.10 2006/05/10 10:20:28 delphij Exp $ -->
-
-<!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- Original Revision www/en/includes.sgml,v 1.62 2003/10/11 18:51:26 hrs -->
-
-<!ENTITY url.doc.langcode    'zh_CN.GB2312'>
-
-<!--  
-  Base is the absolute URL for the given page, minus the actual page
-  part.  It should either be specified as a fully qualified URL, or
-  relative to the server root.  It should be defined in the prolog
-  <em>before</em> including this file if the page does not live at the
-  default location below. 
-
-  When making a  link, use <a href="&base;/mypage.html">foo</a> and
-  &base; will be expanded appropriately.  Base is also used in the
-  definition of standard boilerplate entities in this file, so be sure
-  base is correct!
--->
-
-<!ENTITY base CDATA ".">
-<!ENTITY enbase '../&base;'>
-
-<!-- From FreeBSD: www/share/sgml/includes.header.sgml,v 1.12 2006/05/09 07:30:29 kuriyama -->
-
-<!ENTITY copyright '<a href="&base;/copyright/">��Ȩ��Ϣ</a> | &copy; 1995-2006 The FreeBSD Project.
-  ��������Ȩ����'>
-<!ENTITY email 'freebsd-questions'>
-<!ENTITY author '<a href="&base;/index.html">��ҳ</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">��ϵ</a> &nbsp; | &nbsp; <a href="&base;/copyright/index.html">��Ȩ</a> &nbsp; | &nbsp; &copyright;'>
-<!ENTITY home '<a href="&base;/index.html"><img src="&enbase;/gifs/home.gif"
-  alt="FreeBSD ��ҳ" border="0" align="right" width="101" height="33"></a>'>
-<!ENTITY stylesheet '&base;/layout/css/fixed.css'>
-<!ENTITY stylesheetlarge '&base;/layout/css/fixed_large.css'>
-
-<!ENTITY header '<head><title>&title;</title>
-<meta http-equiv="Content-Type" content="text/html; charset=gb2312">
-<meta name="MSSmartTagsPreventParsing" content="TRUE">
-<link rel="shortcut icon" href="&enbase;/favicon.ico" type="image/x-icon">
-<link rel="icon" href="&enbase;/favicon.ico" type="image/x-icon">
-<link rel="stylesheet" media="screen" href="&stylesheet;" type="text/css" title="Normal Text">
-<link rel="alternate stylesheet" media="screen" href="&stylesheetlarge;" type="text/css" title="Large Text">
-<script type="text/javascript" src="&enbase;/layout/js/styleswitcher.js"></script>
-</head>
-<body>
-   <div id="CONTAINERWRAP">
-    <div id="CONTAINER">
-      <span class="txtoffscreen"><a href="#CONTENT" title="����վ�㵼����" accesskey="1">����վ�㵼����</a> (1)</span>
-      <span class="txtoffscreen"><a href="#CONTENTWRAP" title="������Ŀ������" accesskey="2">������Ŀ������</a> (2)</span>
-      <div id="HEADERCONTAINER">
-
-        <div id="HEADER">
-	      <h2 class="blockhide">Header And Logo</h2>
-          <div id="HEADERLOGOLEFT">
-            <a href="&base;" title="FreeBSD"><img src="&enbase;/layout/images/logo-red.png" width="457" height="75" alt="FreeBSD"></a>
-          </div> <!-- HEADERLOGOLEFT -->
-          <div id="HEADERLOGORIGHT">
-			<h2 class="blockhide">Peripheral Links</h2>
-			  <div id="SEARCHNAV">
-				<ul id="SEARCHNAVLIST">
-				  <li>
-					���ֳߴ� <a href="#" onkeypress="return false;" onclick="setActiveStyleSheet(&#39;Normal Text&#39;); return false;" title="Normal Text Size">����</a> / <a href="#" onkeypress="return false;" onclick="setActiveStyleSheet(&#39;Large Text&#39;); return false;" title="Large Text Size">����</a>
-				  </li>
-				  <li>
-					<a href="&enbase;/donations/" title="����">����</a>
-				  </li>
-				  <li class="last-child">
-					<a href="&base;/mailto.html" title="����">����</a>
-				  </li>
-				</ul>
-			  </div> <!-- SEARCHNAV -->
-			<div id="SEARCH">
-			  <form action="&cgibase;/search.cgi" method="get">
-				<div>
-			      <h2 class="blockhide"><label for="WORDS">Search</label></h2>
-				  <input type="hidden" name="max" value="25"> <input type="hidden" name="source" value="www"><input id="WORDS" name="words" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value=&#39;&#39;;" value="����"> <input id="SUBMIT" name="submit" type="submit" value="����">
-				</div>
-			  </form>
-			</div> <!-- SEARCH -->
-          </div> <!-- HEADERLOGORIGHT -->
-
-        </div> <!-- HEADER -->
-
-  	<h2 class="blockhide">Site Navigation</h2>
-        <div id="TOPNAV">
-          <ul id="TOPNAVLIST">
-	  <li>
-		<a href="&base;/" title="��ҳ">��ҳ</a>
-	  </li>
-	  <li>
-		<a href="&base;/about.html" title="����">����</a>
-	  </li>
-	  <li>
-		<a href="&base;/where.html" title="��� FreeBSD">��� FreeBSD</a>
-	  </li>
-	  <li>
-		<a href="&base;/docs.html" title="�ĵ�">�ĵ�</a>
-	  </li>
-	  <li>
-		<a href="&base;/community.html" title="����">����</a>
-	  </li>
-	  <li>
-		<a href="&enbase;/projects/index.html" title="����">����</a>
-	  </li>
-	  <li>
-		<a href="&base;/support.html" title="֧��">֧��</a>
-	  </li>
-	  </ul>
-        </div> <!-- TOPNAV -->
-      </div> <!-- HEADERCONTAINER -->
-
-<div id="CONTENT">
-<div id="SIDEWRAP">
-&nav;
-</div> <!-- SIDEWRAP -->
-
-<div id="CONTENTWRAP">
-
-<h1>&title;</h1>'>
-
-<!ENTITY footer '</div> <!-- CONTENTWRAP -->
-<br class="clearboth">
-
-      </div> <!-- CONTENT -->
-      <div id="FOOTER">
-        &copyright;<br>
-        &date;
-      </div> <!-- FOOTER -->
-
-    </div> <!-- CONTAINER -->
-   </div> <!-- CONTAINERWRAP -->'>
-
-<!-- From FreeBSD: www/share/sgml/includes.release.sgml,v 1.24 2006/05/09 08:07:48 ceri -->
-<!ENTITY rel.current.date '2006 �� 5 ��'>
-<!ENTITY rel2.current.date '2005 �� 5 ��'>
-
-<!-- Language-specific entities should be put above this line -->
-
-<!ENTITY % includes.global SYSTEM "../share/sgml/includes.sgml">
-%includes.global;
-
-<!-- 
-     Local Variables:
-     mode: sgml
-     sgml-indent-data: t
-     sgml-omittag: nil
-     sgml-always-quote-attributes: t
-     End:
--->
diff --git a/zh_CN/index.xsl b/zh_CN/index.xsl
index e8b4e78c9a..5689333521 100644
--- a/zh_CN/index.xsl
+++ b/zh_CN/index.xsl
@@ -1,18 +1,15 @@
-<?xml version="1.0" encoding="GB2312" ?>
+<?xml version="1.0" encoding="gb2312" ?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+<!ENTITY title "The FreeBSD Project">
+]>
 
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
 <!-- Original revision: 1.151 -->
-<!-- $FreeBSD: www/zh_CN/index.xsl,v 1.1.1002.22 2006/05/23 17:02:10 delphij Exp $ -->
+<!-- $FreeBSD: www/zh_CN/index.xsl,v 1.1 2006/07/11 15:27:47 delphij Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:import href="includes.xsl"/>
-  <xsl:import href="news/includes.xsl"/>
-
-  <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="enbase" select="'..'" />
-  <xsl:variable name="date" select="''"/>
-  <xsl:variable name="title" select="'The FreeBSD Project'"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
   <!-- these params should be externally bound. The values
        here are not used actually -->
@@ -27,28 +24,28 @@
   <xsl:param name="events.xml" select="'none'"/>
   <xsl:param name="curdate.xml" select="'none'"/>
 
-  <xsl:output type="html" encoding="gb2312"
+  <xsl:output type="html" encoding="&xml.encoding;"
               doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/>
 
   <xsl:template match="/">
     <html>
       <head>
-	<title><xsl:value-of select="$title"/></title>
+	<title>&title;</title>
 	<meta name="description" content="The FreeBSD Project"/>
 	<meta name="keywords" content="FreeBSD, BSD, UNIX, ֧��, ����,
 	      ���а�, Ӧ��, ����, �ֲ�, FAQ, �̳�, Bugs,
 	      CVS, CVSup, ����, ��ҵ������, ��ҳ, CTM, Unix"/>
-	<link rel="shortcut icon" href="{$enbase}/favicon.ico" type="image/x-icon"/>
-	<link rel="icon" href="{$enbase}/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" media="screen" href="{$base}/layout/css/fixed.css" type="text/css" title="Normal Text" />
-    <link rel="alternate stylesheet" media="screen" href="{$base}/layout/css/fixed_large.css" type="text/css" title="Large Text" />
-    <script type="text/javascript" src="{$enbase}/layout/js/styleswitcher.js"></script>
+	<link rel="shortcut icon" href="&enbase;/favicon.ico" type="image/x-icon"/>
+	<link rel="icon" href="&enbase;/favicon.ico" type="image/x-icon"/>
+    <link rel="stylesheet" media="screen" href="&base;/layout/css/fixed.css" type="text/css" title="Normal Text" />
+    <link rel="alternate stylesheet" media="screen" href="&base;/layout/css/fixed_large.css" type="text/css" title="Large Text" />
+    <script type="text/javascript" src="&enbase;/layout/js/styleswitcher.js"></script>
 	<link rel="alternate" type="application/rss+xml"
-	  title="FreeBSD Project ����" href="{$base}/news/news.rdf" />
+	  title="FreeBSD Project ����" href="&base;/news/news.rdf" />
 	<link rel="alternate" type="application/rss+xml"
-	  title="FreeBSD ��ȫ����" href="{$enbase}/security/advisories.rdf" />
+	  title="FreeBSD ��ȫ����" href="&enbase;/security/advisories.rdf" />
 	<link rel="alternate" type="application/rss+xml"
-	  title="FreeBSD GNOME Project ����" href="{$enbase}/gnome/news.rdf" />
+	  title="FreeBSD GNOME Project ����" href="&enbase;/gnome/news.rdf" />
 	
 	<!-- Formatted to be easy to spam harvest, please do not reformat. -->
 	<xsl:comment>
@@ -61,7 +58,7 @@
 
    <div id="CONTAINERWRAP">
     <div id="CONTAINER">
-      <xsl:copy-of select="$header2"/>
+      &header2;
       <div id="CONTENT">
 
         <div id="FRONTCONTAINER">
@@ -80,13 +77,13 @@
 				  UltraSPARC&#174;�� IA-64 �� PC-98�� �Լ� ARM
 				  Ӳ���ܹ��ϵ�һ���Ƚ��IJ���ϵͳ�� ��Դ�� BSD��
 				  �ɼ��ݴ�ѧ��������У������ UNIX&#174; �汾��
-				  ��������������ص� <a href="{$enbase}/doc/en_US.ISO8859-1/articles/contributors/staff-committers.html">����־Ը��</a>
+				  ��������������ص� <a href="&enbase;/doc/en_US.ISO8859-1/articles/contributors/staff-committers.html">����־Ը��</a>
 				  ����������ά���� ����һЩ������
-				  <a href="{$base}/platforms/">Ӳ��ƽ̨</a>��
+				  <a href="&base;/platforms/">Ӳ��ƽ̨</a>��
 				  ��Ҳ�ṩ�˲�ͬ�̶ȵ�֧�֡�
 				</p>
 				<div id="TXTFRONTFEATURELINK">
-				&#187;<a href="{$base}/about.html" title="�˽����">�˽����</a>
+				&#187;<a href="&base;/about.html" title="�˽����">�˽����</a>
 				</div> <!-- TXTFRONTFEATURELINK -->
 			</div> <!-- FRONTFEATURECONTENT -->
 		</div> <!-- FRONTFEATURELEFT -->
@@ -95,31 +92,31 @@
 			<div class="frontgetroundbox">
 			  <div class="frontgettop"><div><b style="display: none">.</b></div></div>
 				<div class="frontgetcontent">
-				  <a href="{$base}/where.html">������� FreeBSD</a>
+				  <a href="&base;/where.html">������� FreeBSD</a>
 				</div> <!-- frontgetcontent -->
 			  <div class="frontgetbot"><div><b style="display: none">.</b></div></div>
 			</div> <!-- frontgetroundbox -->
 			
 			<div id="FRONTRELEASES">
 			  <div id="FRONTRELEASESCONTENT" class="txtshortcuts">
-				  <h2><a href="{$base}/releases/">���°汾</a></h2>
+				  <h2><a href="&base;/releases/">���°汾</a></h2>
 				  <ul id="FRONTRELEASESLIST">
 					<li>
-					  <a href="{$enbase}/{$u.rel.announce}">�������ð� <xsl:value-of select="$rel.current"/></a>
+					  <a href="&enbase;/&u.rel.announce;">�������ð� &rel.current;</a>
 					</li>
 					<li>
-					  <a href="{$enbase}/{$u.rel2.announce}">�������ð�(��ʽ) <xsl:value-of select="$rel2.current"/></a>
+					  <a href="&enbase;/&u.rel2.announce;">�������ð�(��ʽ) &rel2.current;</a>
 					</li>
-				    <xsl:if test="$beta.testing">
+			    <xsl:if test="'&beta.testing;' != 'IGNORE'">
 					<li>
-					  <a href="{$base}/where.html#helptest">�������İ汾
-					    <xsl:value-of select="concat($betarel.current, '-', $betarel.vers)"/></a>
+					  <a href="&base;/where.html#helptest">�������İ汾
+					    &betarel.current; - &betarel.vers;</a>
 					</li>
 				    </xsl:if>
-				    <xsl:if test="$beta2.testing">
+			    <xsl:if test="'&beta2.testing;' != 'IGNORE'">
 					<li>
-					  <a href="{$base}/where.html#helptest">�������İ汾
-					    <xsl:value-of select="concat($betarel2.current, '-', $betarel2.vers)"/></a>
+					  <a href="&base;/where.html#helptest">�������İ汾
+					    &betarel2.current; - &betarel2.vers;</a>
 					</li>
 				    </xsl:if>
 				  </ul>
@@ -132,34 +129,34 @@
 			<div id="LANGUAGENAV">
 				<ul id="LANGUAGENAVLIST">
 				  <li>
-					<a href="{$enbase}/zh_CN/" title="��������">cn</a>
+					<a href="&enbase;/zh_CN/" title="��������">cn</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/de/" title="����">de</a>
+					<a href="&enbase;/de/" title="����">de</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/" title="Ӣ��">en</a>
+					<a href="&enbase;/" title="Ӣ��">en</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/es/" title="��������">es</a>
+					<a href="&enbase;/es/" title="��������">es</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/fr/" title="����">fr</a>
+					<a href="&enbase;/fr/" title="����">fr</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/it/" title="�������">it</a>
+					<a href="&enbase;/it/" title="�������">it</a>
 				  </li>
 				  <li>
-					<a href="{$enbase}/ja/" title="����">ja</a>
+					<a href="&enbase;/ja/" title="����">ja</a>
 				  </li>
 				  <li class="last-child">
-					<a href="{$enbase}/ru/" title="����">ru</a>
+					<a href="&enbase;/ru/" title="����">ru</a>
 				  </li>
 				</ul>
 			</div> <!-- LANGUAGENAV -->
 
 			<div id="MIRROR">
-			  <form action="{$cgibase}/mirror.cgi" method="get">
+			  <form action="&cgibase;/mirror.cgi" method="get">
 				<div>
 				  <h2 class="blockhide"><label for="MIRRORSEL">����</label></h2>
 				  <select id="MIRRORSEL" name="goto">
@@ -177,22 +174,22 @@
 				  <h2>��������</h2>
 				  <ul id="FRONTSHORTCUTSLIST">
 					<li>
-					  <a href="{$enbase}/community/mailinglists.html" title="�ʼ��б�">�ʼ��б�</a>
+					  <a href="&enbase;/community/mailinglists.html" title="�ʼ��б�">�ʼ��б�</a>
 					</li>
 					<li>
-					  <a href="{$enbase}/send-pr.html" title="���� Bug">���� Bug</a>
+					  <a href="&enbase;/send-pr.html" title="���� Bug">���� Bug</a>
 					</li>
 					<li>
-					  <a href="{$enbase}/doc/zh_CN.GB2312/books/faq/index.html" title="FAQ">FAQ</a>
+					  <a href="&enbase;/doc/zh_CN.GB2312/books/faq/index.html" title="FAQ">FAQ</a>
 					</li>
 					<li>
-					  <a href="{$enbase}/doc/zh_CN.GB2312/books/handbook/index.html" title="Handbook">ʹ���ֲ�</a>
+					  <a href="&enbase;/doc/zh_CN.GB2312/books/handbook/index.html" title="Handbook">ʹ���ֲ�</a>
 					</li>
 					<li>
 					  <a href="http://www.freebsdfoundation.org/" title="�����">�����</a>
 					</li>
 					<li>
-					  <a href="{$enbase}/ports/index.html" title="Ports">Ports</a>
+					  <a href="&enbase;/ports/index.html" title="Ports">Ports</a>
 					</li>
 
 				  </ul>
@@ -202,7 +199,7 @@
 			<div class="frontnewroundbox">
 			  <div class="frontnewtop"><div><b style="display: none">.</b></div></div>
 			    <div class="frontnewcontent">
-			      <a href="{$enbase}/projects/newbies.html">����Ϥ FreeBSD?</a>
+			      <a href="&enbase;/projects/newbies.html">����Ϥ FreeBSD?</a>
 			    </div> <!-- frontnewcontent -->
 			  <div class="frontnewbot"><div><b style="display: none">.</b></div></div>
 			</div> <!-- frontnewroundbox -->
@@ -225,10 +222,10 @@
 			  <div>
 				<ul class="newseventslist">
 				  <li class="first-child">
-					<a href="{$base}/news/newsflash.html" title="��������">��������</a>
+					<a href="&base;/news/newsflash.html" title="��������">��������</a>
 				  </li>
 				  <li class="last-child">
-					<a href="{$base}/news/news.rdf" title="���� RSS Feed"><img class="rssimage" src="{$enbase}/layout/images/ico_rss.png" width="27" height="12" alt="News RSS Feed" /></a>
+					<a href="&base;/news/news.rdf" title="���� RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="News RSS Feed" /></a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -252,7 +249,7 @@
 			  <div>
 				<ul class="newseventslist">
 				  <li class="only-child">
-					<a href="{$enbase}/events/" title="����">����</a>
+					<a href="&enbase;/events/" title="����">����</a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -275,7 +272,7 @@
 			  <div>
 				<ul class="newseventslist">
 				  <li class="only-child">
-					<a href="{$base}/news/press.html" title="����ý�屨��">����ý�屨��</a>
+					<a href="&base;/news/press.html" title="����ý�屨��">����ý�屨��</a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -298,10 +295,10 @@
 			  <div>
 				<ul class="newseventslist">
 				  <li class="first-child">
-					<a href="{$base}/security/" title="���లȫ����">����</a>
+					<a href="&base;/security/" title="���లȫ����">����</a>
 				  </li>
 				  <li class="last-child">
-					<a href="{$enbase}/security/advisories.rdf" title="��ȫ���� RSS Feed"><img class="rssimage" src="{$enbase}/layout/images/ico_rss.png" width="27" height="12" alt="��ȫ���� RSS Feed" /></a>
+					<a href="&enbase;/security/advisories.rdf" title="��ȫ���� RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="��ȫ���� RSS Feed" /></a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -329,7 +326,7 @@
 
       </div> <!-- CONTENT -->
       <div id="FOOTER">
-        <xsl:copy-of select="$copyright"/>
+	&copyright;
 
 	FreeBSD ��־�� FreeBSD
 	������ע���̱ꡣ FreeBSD Project ʹ�ô��̱�õ��� <a
diff --git a/zh_CN/internet.sgml b/zh_CN/internet.sgml
index ad35375211..1f75710518 100644
--- a/zh_CN/internet.sgml
+++ b/zh_CN/internet.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/internet.sgml,v 1.1.1000.3 2006/01/28 18:45:21 delphij Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/zh_CN/internet.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
 <!ENTITY title "���� FreeBSD �뻥������">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
diff --git a/zh_CN/logo.sgml b/zh_CN/logo.sgml
index db79b025d0..df80598657 100644
--- a/zh_CN/logo.sgml
+++ b/zh_CN/logo.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/logo.sgml,v 1.1.1000.1 2006/05/23 16:50:30 delphij Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/zh_CN/logo.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
 <!ENTITY title "FreeBSD ��־">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "developers.sgml"> %developers;
 ]>
 
diff --git a/zh_CN/mailto.sgml b/zh_CN/mailto.sgml
index 7917fa7401..ae85d143fc 100644
--- a/zh_CN/mailto.sgml
+++ b/zh_CN/mailto.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/mailto.sgml,v 1.1.1002.3 2006/03/04 07:57:11 delphij Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/zh_CN/mailto.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
 <!ENTITY title "���� FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
diff --git a/zh_CN/news/Makefile b/zh_CN/news/Makefile
index 717722abf6..4f262c73a9 100644
--- a/zh_CN/news/Makefile
+++ b/zh_CN/news/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Simplified Chinese Documentation Project
 # Original Revision: 1.45
 #
-# $FreeBSD: www/zh_CN/news/Makefile,v 1.1.1002.5 2006/01/28 18:27:53 delphij Exp $
+# $FreeBSD: www/zh_CN/news/Makefile,v 1.1 2006/07/11 15:27:48 delphij Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -17,11 +17,9 @@ DOCS+= pressreleases.sgml
 
 INDEXLINK= news.html
 
-SRCS.DEFAULT=		includes.xsl
 DEPENDSET.DEFAULT=	transtable news press
 
-XMLDOCS=	newsflash::news.xml:
-XMLDOCS+=	news-rdf::news.xml:news.rdf
-XMLDOCS+=	press
+XMLDOCS=	newsflash:${XSL_NEWS_NEWSFLASH}:${XML_NEWS_NEWS_MASTER}:
+XMLDOCS+=	press:${XSL_NEWS_PRESS}:${XML_NEWS_PRESS_MASTER}:
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN/news/includes.sgml b/zh_CN/news/includes.sgml
deleted file mode 100644
index 3df0c6d7ca..0000000000
--- a/zh_CN/news/includes.sgml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- $FreeBSD: www/zh_CN/news/includes.sgml,v 1.1.1002.3 2005/12/17 18:48:56 delphij Exp $ -->
-
-<!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- Original Revision www/en/news/includes.sgml,v 1.8 2000/10/11 16:33:24 phantom -->
-
-<!ENTITY newshome '<A HREF="news.html">������ҳ</A>'>
-
diff --git a/zh_CN/news/includes.xsl b/zh_CN/news/includes.xsl
deleted file mode 100644
index 91a694618e..0000000000
--- a/zh_CN/news/includes.xsl
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="gb2312" ?>
-
-<!-- $FreeBSD: www/zh_CN/news/includes.xsl,v 1.1.1002.5 2005/12/17 19:59:37 delphij Exp $ -->
-
-<!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- Original Revision www/en/news/includes.xsl,v 1.6 2004/04/07 11:37:55 phantom -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:variable name="newshome">
-    <a href="{$base}/news/news.html">������ҳ</a>
-  </xsl:variable>
-
-  <xsl:variable name="presshome">
-    <a href="{$base}/news/press.html">ý�屨����ҳ</a>
-  </xsl:variable>
-
-  <!-- Generate a unique anchor for this event -->
-  <xsl:template name="generate-event-anchor">
-    <xsl:text>event</xsl:text>
-    <xsl:value-of select="ancestor::year/name"/>
-    <xsl:value-of select="ancestor::month/name"/>
-    <xsl:value-of select="ancestor::day/name"/>:<xsl:value-of select="count(preceding-sibling::event)"/>
-  </xsl:template>
-
-  <!-- Generate a unique anchor for this story -->
-  <xsl:template name="generate-story-anchor">
-    <xsl:text>story</xsl:text>
-    <xsl:value-of select="ancestor::year/name"/>
-    <xsl:value-of select="ancestor::month/name"/>:<xsl:text/>
-    <xsl:value-of select="count(following-sibling::story)"/>
-  </xsl:template>
-
-  <!-- From FreeBSD: www/share/sgml/includes.misc.xsl,v 1.27 2005/11/09 22:10:00 simon -->
-  <xsl:template name="html-news-make-olditems-list">
-    <p>����Ĺ��棺
-      <a href="{$enbase}/news/2003/index.html">2003</a>,
-      <a href="{$enbase}/news/2002/index.html">2002</a>,
-      <a href="{$enbase}/news/2001/index.html">2001</a>,
-      <a href="{$enbase}/news/2000/index.html">2000</a>,
-      <a href="{$enbase}/news/1999/index.html">1999</a>,
-      <a href="{$enbase}/news/1998/index.html">1998</a>,
-      <a href="{$enbase}/news/1997/index.html">1997</a>,
-      <a href="{$enbase}/news/1996/index.html">1996</a></p>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/zh_CN/news/news-rdf.xsl b/zh_CN/news/news-rdf.xsl
deleted file mode 100644
index 4c302b1139..0000000000
--- a/zh_CN/news/news-rdf.xsl
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="GB2312" ?>
-
-<!-- $FreeBSD$ -->
-
-<!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- Original Revision 1.7 -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
-  
-  <xsl:import href="../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
-
-  <xsl:output method="xml" indent="yes"/>
-
-  <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="title" select="'FreeBSD News Flash RDF'"/>
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
-  <!-- Generate the main body of the RDF file -->
-  <xsl:template match="news">
-    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	     xmlns="http://my.netscape.com/rdf/simple/0.9/">
-
-      <channel>
-	<title>FreeBSD ��Ŀ����</title>
-	<link>http://www.FreeBSD.org/news/</link>
-	<description>���� FreeBSD Project ������</description>
-      </channel>
-
-      <!-- Only include the last 10 events -->
-      <xsl:apply-templates select="descendant::event[position() &lt;= 10]"/>
-
-      </rdf:RDF>
-  </xsl:template>
-
-  <!-- Generate the <item> elements and their content -->
-  <xsl:template match="event" xmlns="http://my.netscape.com/rdf/simple/0.9/">
-    <xsl:param name="year" select="../../../name" />
-    <xsl:param name="month" select="../../name" />
-    <xsl:param name="day" select="../name" />
-    <xsl:param name="this" select="." />
-    <xsl:param name="pos">
-      <xsl:for-each select="../event">
-	<xsl:if test=". = $this">
-	  <xsl:value-of select="position()" />
-	</xsl:if>
-      </xsl:for-each>
-    </xsl:param>
-
-    <item>
-      <xsl:choose>
-	<xsl:when test="count(child::title)">
-	  <title><xsl:value-of select="normalize-space(title)"/></title>
-	</xsl:when>
-	<xsl:otherwise>
-	  <title><xsl:value-of select="normalize-space(p)"/></title>
-	</xsl:otherwise>
-      </xsl:choose>
-      <link>
-	<xsl:text>http://www.FreeBSD.org/zh_CN/news/newsflash.html#</xsl:text>
-	<xsl:call-template name="html-news-generate-anchor">
-	  <xsl:with-param name="label" select="'event'" />
-	  <xsl:with-param name="year" select="$year" />
-	  <xsl:with-param name="month" select="$month" />
-	  <xsl:with-param name="day" select="$day" />
-	  <xsl:with-param name="pos" select="$pos" />
-	</xsl:call-template>
-      </link>
-    </item>
-  </xsl:template>
-  
-  <xsl:template match="name | date"/>
-</xsl:stylesheet>
diff --git a/zh_CN/news/news.sgml b/zh_CN/news/news.sgml
index 5518de1877..7a9cdb0c6d 100644
--- a/zh_CN/news/news.sgml
+++ b/zh_CN/news/news.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/zh_CN/news/news.sgml,v 1.1.1002.5 2005/12/17 20:22:58 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/news/news.sgml,v 1.1 2006/07/11 15:27:48 delphij Exp $">
 <!ENTITY title "FreeBSD ����">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
diff --git a/zh_CN/news/newsflash.xsl b/zh_CN/news/newsflash.xsl
deleted file mode 100644
index 5d060b4ec2..0000000000
--- a/zh_CN/news/newsflash.xsl
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="GB2312" ?>
-
-<!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- Original Revision 1.16 -->
-
-<!-- $FreeBSD: www/zh_CN/news/newsflash.xsl,v 1.1.1002.4 2006/01/28 18:21:37 delphij Exp $ -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
-
-  <xsl:import href="../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
-  <xsl:variable name="section" select="'about'"/>
-
-  <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="title" select="'FreeBSD �����ٵ�'"/>
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
-  <xsl:param name="news.project.xml-master" select="'none'" />
-  <xsl:param name="news.project.xml" select="'none'" />
-  
-  <xsl:output type="html" encoding="gb2312"/>
-
-  <xsl:template match="news">
-    <html>
-      
-      <xsl:copy-of select="$header1"/>
-
-      <body>
-
-  <div id="CONTAINERWRAP">
-    <div id="CONTAINER">
-
-	<xsl:copy-of select="$header2"/>
-
-	<div id="CONTENT">
-
-	      <xsl:copy-of select="$sidenav"/>
-
-	      <div id="CONTENTWRAP">
-	      
-	      <xsl:copy-of select="$header3"/>
-
-	<!-- Notice how entity references in SGML become variable references
-	     in the stylesheet, and that the syntax for referring to variables
-	     inside an attribute is "{$variable}".
-
-	     This is just dis-similar enough to Perl and the shell that you
-	     end up writing ${variable} all the time, and then scratch your 
-	     head wondering why the stylesheet isn't working.-->
-
-	<!-- Also notice that because this is now XML and not SGML, empty
-             elements, like IMG, must have a trailing "/" just inside the 
-   	     closing angle bracket, like this " ... />" -->
-	<img src="{$enbase}/gifs/news.jpg" align="right" border="0" width="193"
-	     height="144" alt="FreeBSD News"/>
-
-	<p>FreeBSD ��һ������Ѹ�ٿ����ŵIJ���ϵͳ��
-	����һ�����յĿ������DZȽϷ����ģ�����Զ������鿴���ҳ�棬ͬ���������ϣ������
-	<a href="{$enbase}/doc/{$url.doc.langcode}/books/handbook/eresources.html#ERESOURCES-MAIL">freebsd-announce
-	    �ʼ��б�</a> ��ʹ�� <a href="news.rdf">RSS feed</a>��</p>
-
-        <p>���е�ÿ����Ŀ�����Լ�������ҳ�棬���������Щ��Ŀ����ϸ���¡�</p>
-
-        <ul>
-          <li><a href="{$enbase}/java/newsflash.html">FreeBSD �ϵ� <xsl:value-of select="$java"/></a></li>
-          <li><a href="http://freebsd.kde.org/">FreeBSD �ϵ� KDE</a></li>
-          <li><a href="{$enbase}/gnome/newsflash.html">FreeBSD �ϵ� GNOME</a></li>
-        </ul>
-	  
-	<p>����ϸ�����������ܣ��ͽ����ķ��а汾���뿴<strong><a
-	href="{$base}/releases/index.html">�汾��Ϣ</a></strong>ҳ�档</p>
-	
-	<p>���� FreeBSD �İ�ȫ���棬 ����� <a href="{$base}/security/#adv">��ȫ��Ϣ</a> ҳ�档</p>
-	
-	<xsl:call-template name="html-news-list-newsflash">
-          <xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
-	  <xsl:with-param name="news.project.xml" select="$news.project.xml" />
-	</xsl:call-template>
-
-        <xsl:call-template name="html-news-make-olditems-list" />
-
-	<xsl:copy-of select="$newshome"/>
-	
-	  	</div> <!-- CONTENTWRAP -->
-		<br class="clearboth" />
-	
-	</div> <!-- CONTENT -->
-	
-	<xsl:copy-of select="$footer"/>
-	
-        </div> <!-- CONTAINER -->
-   </div> <!-- CONTAINERWRAP -->
-	
-      </body>
-    </html>
-  </xsl:template>
-
-  <!-- When the href attribute contains a '$base' or '$enbase', expand it
-       to the current value of the $base or $enbase variable. -->
-
-  <!-- All your $base or $enbase are belong to us.  Ho ho ho -->
-  <xsl:template match="a">
-    <a><xsl:attribute name="href">
-	<xsl:choose>
-	  <xsl:when test="contains(@href, '$base')">
-	    <xsl:value-of select="concat(substring-before(@href, '$base'), $base, substring-after(@href, '$base'))"/>
-	  </xsl:when>
-	  <xsl:when test="contains(@href, '$enbase')">
-	    <xsl:value-of select="concat(substring-before(@href, '$enbase'), $enbase, substring-after(@href, '$enbase'))"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:value-of select="@href"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </a>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/zh_CN/news/press.xsl b/zh_CN/news/press.xsl
deleted file mode 100644
index 9ed9d049c0..0000000000
--- a/zh_CN/news/press.xsl
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="GB2312" ?>
-
-<!-- $FreeBSD: www/zh_CN/news/press.xsl,v 1.1.1002.4 2006/01/28 18:26:24 delphij Exp $ -->
-
-<!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- Original Revision 1.13 -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
-
-  <xsl:import href="../includes.xsl"/>
-  <xsl:import href="includes.xsl"/>
-  <xsl:variable name="section" select="'about'"/>
-
-  <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="title" select="'���ű����е� FreeBSD'"/>
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
-  <xsl:param name="news.press.xml-master" select="'none'" />
-  <xsl:param name="news.press.xml" select="'none'" />
-  
-  <xsl:output type="html" encoding="gb2312"/>
-
-  <!-- for l10n -->
-  <xsl:template name="html-news-month-headings">
-    <xsl:param name="year" />
-    <xsl:param name="month" />
-
-    <xsl:value-of select="concat($year, ' �� ', $month)" />
-  </xsl:template>
-
-  <xsl:template match="press">
-    <html>
-      
-      <xsl:copy-of select="$header1"/>
-
-      <body>
-
-  <div id="CONTAINERWRAP">
-    <div id="CONTAINER">
-
-	<xsl:copy-of select="$header2"/>
-
-	<div id="CONTENT">
-
-	      <xsl:copy-of select="$sidenav"/>
-
-	      <div id="CONTENTWRAP">
-	      
-	      <xsl:copy-of select="$header3"/>
-
-	<p>�����֪������û���������г��Ĺ��� FreeBSD ����Ϣ�� ������
-	  <a href="mailto:www@FreeBSD.org">www@FreeBSD.org</a> �Ա����ǰ������ӽ�ȥ��</p>
-
-	<xsl:call-template name="html-news-list-press">
-          <xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
-          <xsl:with-param name="news.press.xml" select="$news.press.xml" />
-	</xsl:call-template>
-
-	<xsl:copy-of select="$newshome"/>
-
-	  	</div> <!-- CONTENTWRAP -->
-		<br class="clearboth" />
-	
-	</div> <!-- CONTENT -->
-	
-	<xsl:copy-of select="$footer"/>
-	
-        </div> <!-- CONTAINER -->
-   </div> <!-- CONTAINERWRAP -->
-
-      </body>
-    </html>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/zh_CN/news/pressreleases.sgml b/zh_CN/news/pressreleases.sgml
index 0a60eeaeea..dd1c43b0c2 100644
--- a/zh_CN/news/pressreleases.sgml
+++ b/zh_CN/news/pressreleases.sgml
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/zh_CN/news/pressreleases.sgml,v 1.1.1002.5 2006/01/28 18:25:14 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/news/pressreleases.sgml,v 1.1 2006/07/11 15:27:48 delphij Exp $">
 <!ENTITY title "FreeBSD ���ŷ���">
-<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
diff --git a/zh_CN/platforms/alpha.sgml b/zh_CN/platforms/alpha.sgml
index 185276a832..7772e872ce 100644
--- a/zh_CN/platforms/alpha.sgml
+++ b/zh_CN/platforms/alpha.sgml
@@ -1,10 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/zh_CN/platforms/alpha.sgml,v 1.1.1002.1 2005/12/18 07:02:26 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/platforms/alpha.sgml,v 1.1 2006/07/11 15:27:49 delphij Exp $">
 <!ENTITY title "FreeBSD/alpha Project">
 <!ENTITY email 'freebsd-alpha'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;]>
+<!ENTITY % navinclude.developers "INCLUDE">
+]>
+
 
 <!-- The FreeBSD Simplified Chinese Document Project -->
 <!-- Original Revision 1.4 -->
diff --git a/zh_CN/platforms/amd64.sgml b/zh_CN/platforms/amd64.sgml
index 09f238aa91..e82fc2d456 100644
--- a/zh_CN/platforms/amd64.sgml
+++ b/zh_CN/platforms/amd64.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase CDATA "../..">
-<!ENTITY date "$FreeBSD: www/zh_CN/platforms/amd64.sgml,v 1.1.1002.3 2006/05/03 17:32:32 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/platforms/amd64.sgml,v 1.1 2006/07/11 15:27:49 delphij Exp $">
 <!ENTITY title "FreeBSD/amd64 Project">
 <!ENTITY email 'freebsd-amd64'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Document Project -->
diff --git a/zh_CN/platforms/arm.sgml b/zh_CN/platforms/arm.sgml
index cb6821716b..f8cac166a9 100644
--- a/zh_CN/platforms/arm.sgml
+++ b/zh_CN/platforms/arm.sgml
@@ -1,11 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/zh_CN/platforms/arm.sgml,v 1.1.1002.5 2006/05/03 17:39:29 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/platforms/arm.sgml,v 1.1 2006/07/11 15:27:49 delphij Exp $">
 <!ENTITY title "FreeBSD/ARM Project">
 <!ENTITY email 'freebsd-arm'>
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml">
-%includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 ]>
 
diff --git a/zh_CN/platforms/i386.sgml b/zh_CN/platforms/i386.sgml
index 7cd00fe4bd..e8acea17fe 100644
--- a/zh_CN/platforms/i386.sgml
+++ b/zh_CN/platforms/i386.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/zh_CN/platforms/i386.sgml,v 1.1.1002.2 2006/05/03 17:34:49 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/platforms/i386.sgml,v 1.1 2006/07/11 15:27:49 delphij Exp $">
 <!ENTITY title "FreeBSD/i386 ��Ŀ">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Document Project -->
diff --git a/zh_CN/platforms/index.sgml b/zh_CN/platforms/index.sgml
index 5cd90a178b..0c046fa01b 100644
--- a/zh_CN/platforms/index.sgml
+++ b/zh_CN/platforms/index.sgml
@@ -1,11 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase '../&base;'>
 <!ENTITY email 'freebsd-www'>
 <!ENTITY title "֧�ֵ�ƽ̨">
-<!ENTITY date "$FreeBSD: www/zh_CN/platforms/index.sgml,v 1.1.1002.4 2006/03/10 20:46:25 delphij Exp $">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;]>
+<!ENTITY date "$FreeBSD: www/zh_CN/platforms/index.sgml,v 1.1 2006/07/11 15:27:49 delphij Exp $">
+<!ENTITY % navinclude.developers "INCLUDE">
+]>
+
 
 <!-- The FreeBSD Simplified Chinese Document Project -->
 <!-- Original Revision 1.19 -->
diff --git a/zh_CN/releases/5.4R/hardware.sgml b/zh_CN/releases/5.4R/hardware.sgml
index 2ea848987a..7edc122c3e 100644
--- a/zh_CN/releases/5.4R/hardware.sgml
+++ b/zh_CN/releases/5.4R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/zh_CN/releases/5.4R/hardware.sgml,v 1.1.1004.1 2006/03/07 16:37:59 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/releases/5.4R/hardware.sgml,v 1.1 2006/07/11 15:27:49 delphij Exp $">
 <!ENTITY title "FreeBSD 5.4-RELEASE Ӳ��������˵��">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
 <!-- Original Revision 1.1 -->
diff --git a/zh_CN/releases/5.4R/installation.sgml b/zh_CN/releases/5.4R/installation.sgml
index 8b84818a91..eaee940a9c 100644
--- a/zh_CN/releases/5.4R/installation.sgml
+++ b/zh_CN/releases/5.4R/installation.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/zh_CN/releases/5.4R/installation.sgml,v 1.1.1004.1 2006/03/07 16:37:59 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/releases/5.4R/installation.sgml,v 1.1 2006/07/11 15:27:49 delphij Exp $">
 <!ENTITY title "FreeBSD 5.4-RELEASE ��װ˵��">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
 <!-- Original Revision 1.1 -->
diff --git a/zh_CN/releases/5.4R/relnotes.sgml b/zh_CN/releases/5.4R/relnotes.sgml
index 4937106fa4..3a36f7ab18 100644
--- a/zh_CN/releases/5.4R/relnotes.sgml
+++ b/zh_CN/releases/5.4R/relnotes.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/zh_CN/releases/5.4R/relnotes.sgml,v 1.1.1004.1 2006/03/07 16:38:00 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/releases/5.4R/relnotes.sgml,v 1.1 2006/07/11 15:27:50 delphij Exp $">
 <!ENTITY title "FreeBSD 5.4-RELEASE ���а�˵��">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
 <!-- Original Revision 1.1 -->
diff --git a/zh_CN/releases/5.5R/hardware.sgml b/zh_CN/releases/5.5R/hardware.sgml
index d102948e9b..7e0e44b305 100644
--- a/zh_CN/releases/5.5R/hardware.sgml
+++ b/zh_CN/releases/5.5R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/zh_CN/releases/5.5R/hardware.sgml,v 1.1.1000.1 2006/05/24 07:51:11 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/releases/5.5R/hardware.sgml,v 1.1 2006/07/11 15:27:50 delphij Exp $">
 <!ENTITY title "FreeBSD 5.5-RELEASE Ӳ��������˵��">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
 <!-- Original Revision 1.1 -->
diff --git a/zh_CN/releases/5.5R/installation.sgml b/zh_CN/releases/5.5R/installation.sgml
index 44fcac68b6..70ccb48acf 100644
--- a/zh_CN/releases/5.5R/installation.sgml
+++ b/zh_CN/releases/5.5R/installation.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/zh_CN/releases/5.5R/installation.sgml,v 1.1.1000.1 2006/05/24 07:51:11 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/releases/5.5R/installation.sgml,v 1.1 2006/07/11 15:27:51 delphij Exp $">
 <!ENTITY title "FreeBSD 5.5-RELEASE ��װ˵��">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
 <!-- Original Revision 1.1 -->
diff --git a/zh_CN/releases/5.5R/relnotes.sgml b/zh_CN/releases/5.5R/relnotes.sgml
index 196f0743d6..73202ee8ea 100644
--- a/zh_CN/releases/5.5R/relnotes.sgml
+++ b/zh_CN/releases/5.5R/relnotes.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/zh_CN/releases/5.5R/relnotes.sgml,v 1.1.1000.1 2006/05/24 07:51:11 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/releases/5.5R/relnotes.sgml,v 1.1 2006/07/11 15:27:51 delphij Exp $">
 <!ENTITY title "FreeBSD 5.5-RELEASE ���а�˵��">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
 <!-- Original Revision 1.1 -->
diff --git a/zh_CN/releases/6.0R/hardware.sgml b/zh_CN/releases/6.0R/hardware.sgml
index 89b23ec6cd..2353b84928 100644
--- a/zh_CN/releases/6.0R/hardware.sgml
+++ b/zh_CN/releases/6.0R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/zh_CN/releases/6.0R/hardware.sgml,v 1.1.1000.2 2005/12/22 17:59:11 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/releases/6.0R/hardware.sgml,v 1.1 2006/07/11 15:27:52 delphij Exp $">
 <!ENTITY title "FreeBSD 6.0-RELEASE Ӳ��������˵��">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
 <!-- Original Revision 1.1 -->
diff --git a/zh_CN/releases/6.0R/installation.sgml b/zh_CN/releases/6.0R/installation.sgml
index 12c8b58287..6412126e11 100644
--- a/zh_CN/releases/6.0R/installation.sgml
+++ b/zh_CN/releases/6.0R/installation.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/zh_CN/releases/6.0R/installation.sgml,v 1.1.1000.2 2005/12/22 17:59:11 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/releases/6.0R/installation.sgml,v 1.1 2006/07/11 15:27:52 delphij Exp $">
 <!ENTITY title "FreeBSD 6.0-RELEASE ��װ˵��">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
 <!-- Original Revision 1.1 -->
diff --git a/zh_CN/releases/6.0R/relnotes.sgml b/zh_CN/releases/6.0R/relnotes.sgml
index cfc1829ad2..8d0e6bd6e0 100644
--- a/zh_CN/releases/6.0R/relnotes.sgml
+++ b/zh_CN/releases/6.0R/relnotes.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/zh_CN/releases/6.0R/relnotes.sgml,v 1.1.1000.2 2005/12/22 17:59:11 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/releases/6.0R/relnotes.sgml,v 1.1 2006/07/11 15:27:52 delphij Exp $">
 <!ENTITY title "FreeBSD 6.0-RELEASE ���а�˵��">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
 <!-- Original Revision 1.1 -->
diff --git a/zh_CN/releases/6.1R/hardware.sgml b/zh_CN/releases/6.1R/hardware.sgml
index a50ac755d0..22775ccbfa 100644
--- a/zh_CN/releases/6.1R/hardware.sgml
+++ b/zh_CN/releases/6.1R/hardware.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/zh_CN/releases/6.1R/hardware.sgml,v 1.1.1000.1 2006/05/10 03:40:13 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/releases/6.1R/hardware.sgml,v 1.1 2006/07/11 15:27:52 delphij Exp $">
 <!ENTITY title "FreeBSD 6.1-RELEASE Ӳ��������˵��">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
 <!-- Original Revision 1.1 -->
diff --git a/zh_CN/releases/6.1R/installation.sgml b/zh_CN/releases/6.1R/installation.sgml
index 8dc8113788..88694a4634 100644
--- a/zh_CN/releases/6.1R/installation.sgml
+++ b/zh_CN/releases/6.1R/installation.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/zh_CN/releases/6.1R/installation.sgml,v 1.1.1000.1 2006/05/10 03:40:13 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/releases/6.1R/installation.sgml,v 1.1 2006/07/11 15:27:52 delphij Exp $">
 <!ENTITY title "FreeBSD 6.1-RELEASE ��װ˵��">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
 <!-- Original Revision 1.1 -->
diff --git a/zh_CN/releases/6.1R/relnotes.sgml b/zh_CN/releases/6.1R/relnotes.sgml
index e28730864c..94bd776905 100644
--- a/zh_CN/releases/6.1R/relnotes.sgml
+++ b/zh_CN/releases/6.1R/relnotes.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/zh_CN/releases/6.1R/relnotes.sgml,v 1.1.1000.1 2006/05/10 03:40:13 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/releases/6.1R/relnotes.sgml,v 1.1 2006/07/11 15:27:52 delphij Exp $">
 <!ENTITY title "FreeBSD 6.1-RELEASE ���а�˵��">
-<!ENTITY % navincludes SYSTEM "../../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
 <!-- Original Revision 1.1 -->
diff --git a/zh_CN/releases/index.sgml b/zh_CN/releases/index.sgml
index 979ab8f1cf..30e5916d9c 100644
--- a/zh_CN/releases/index.sgml
+++ b/zh_CN/releases/index.sgml
@@ -1,11 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/zh_CN/releases/index.sgml,v 1.1.1002.9 2006/06/13 21:41:46 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/releases/index.sgml,v 1.1 2006/07/11 15:27:49 delphij Exp $">
 <!ENTITY title "���а���Ϣ">
-<!ENTITY % navincludes SYSTEM "../includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 ]>
-<!-- $FreeBSD: www/zh_CN/releases/index.sgml,v 1.1.1002.9 2006/06/13 21:41:46 delphij Exp $ -->
+<!-- $FreeBSD: www/zh_CN/releases/index.sgml,v 1.1 2006/07/11 15:27:49 delphij Exp $ -->
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
 <!-- Original Revision 1.110 -->
 
diff --git a/zh_CN/relnotes.sgml b/zh_CN/relnotes.sgml
index b99dad3ac7..588e8c23a9 100644
--- a/zh_CN/relnotes.sgml
+++ b/zh_CN/relnotes.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/relnotes.sgml,v 1.1.1000.3 2006/02/20 16:48:47 delphij Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/zh_CN/relnotes.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
 <!ENTITY title "Release Documentation">
-<!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
diff --git a/zh_CN/security/Makefile b/zh_CN/security/Makefile
index d49bf2e87f..7c61153859 100644
--- a/zh_CN/security/Makefile
+++ b/zh_CN/security/Makefile
@@ -1,5 +1,5 @@
 # Original Revision: 1.14
-# $FreeBSD: www/zh_CN/security/Makefile,v 1.1.1002.1 2005/12/18 08:09:14 delphij Exp $
+# $FreeBSD: www/zh_CN/security/Makefile,v 1.1 2006/07/11 15:27:53 delphij Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -13,7 +13,7 @@ DOCS+=	security.sgml
 
 INDEXLINK=	security.html
 
-security.html: advisories.html.inc advisories.rdf
+security.html: advisories.html.inc
 
 DEPENDSET.DEFAULT=	advisories
 XML.DEFAULT=		${XML_ADVISORIES}
@@ -22,6 +22,4 @@ XMLDOCS=	advisories:mkindex.xsl::advisories.html.inc
 NO_DATA.advisories=	yes
 NO_TIDY.advisories=	yes
 
-XMLDOCS+=	advisories-rdf:security-rdf.xsl::advisories.rdf
-
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN/security/charter.sgml b/zh_CN/security/charter.sgml
index 4f4556cecc..1e581b1ef2 100644
--- a/zh_CN/security/charter.sgml
+++ b/zh_CN/security/charter.sgml
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/zh_CN/security/charter.sgml,v 1.1.1002.2 2006/01/11 09:43:52 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/security/charter.sgml,v 1.1 2006/07/11 15:27:53 delphij Exp $">
 <!ENTITY title "FreeBSD ��ȫ��������">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 ]>
 <!-- The FreeBSD Simplified Chinese Project -->
 <!-- Original Revision: 1.3 -->
diff --git a/zh_CN/security/mkindex.xsl b/zh_CN/security/mkindex.xsl
index 05f3aa4020..00f20b59a9 100644
--- a/zh_CN/security/mkindex.xsl
+++ b/zh_CN/security/mkindex.xsl
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="gb2312" ?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+<!ENTITY base ".">
+<!ENTITY title "">
+]>
 
-<!-- $FreeBSD: www/zh_CN/security/mkindex.xsl,v 1.1.1002.1 2005/12/18 08:09:14 delphij Exp $ -->
+<!-- $FreeBSD: www/zh_CN/security/mkindex.xsl,v 1.1 2006/07/11 15:27:53 delphij Exp $ -->
 <!-- Original Revision: 1.4 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
-  <xsl:import href="../includes.xsl"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/zh_CN/security/mkindex.xsl,v 1.1 2006/07/11 15:27:53 delphij Exp $'"/>
 
-  <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="enbase" select="'..'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/zh_CN/security/mkindex.xsl,v 1.1.1002.1 2005/12/18 08:09:14 delphij Exp $'"/>
-  <xsl:variable name="title" select="'untitled'"/>
-
-  <xsl:output type="xml" encoding="gb2312"
+  <xsl:output type="xml" encoding="&xml.encoding;"
               omit-xml-declaration="yes" />
 
   <xsl:template match="/">
diff --git a/zh_CN/security/security-rdf.xsl b/zh_CN/security/security-rdf.xsl
deleted file mode 100644
index 09bbae3c86..0000000000
--- a/zh_CN/security/security-rdf.xsl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="GB2312" ?>
-
-<!-- $FreeBSD: www/zh_CN/security/security-rdf.xsl,v 1.1.1002.1 2005/12/18 08:09:14 delphij Exp $ -->
-<!-- Original Revision: 1.1 -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:import href="../includes.xsl"/>
-
-  <xsl:output method="xml" indent="yes"/>
-
-  <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="date" select="'$FreeBSD'"/>
-  <xsl:variable name="title" select="'untitled'"/>
-
-  <xsl:template match="/">
-    <xsl:call-template name="rdf-security-advisories">
-       <xsl:with-param name="advisories.xml" select="$advisories.xml" />
-    </xsl:call-template>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/zh_CN/security/security.sgml b/zh_CN/security/security.sgml
index 4df9c025a6..46a3ddd6e9 100644
--- a/zh_CN/security/security.sgml
+++ b/zh_CN/security/security.sgml
@@ -1,17 +1,15 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY enbase CDATA "../..">
-<!ENTITY date "$FreeBSD: www/zh_CN/security/security.sgml,v 1.1.1002.4 2006/06/13 21:38:36 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/zh_CN/security/security.sgml,v 1.1 2006/07/11 15:27:53 delphij Exp $">
 <!ENTITY title "FreeBSD ��ȫ��Ϣ">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 <!ENTITY advisories.html.inc SYSTEM "advisories.html.inc">
 ]>
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
 <!-- Original revision: 1.187 -->
 
-<!-- $FreeBSD: www/zh_CN/security/security.sgml,v 1.1.1002.4 2006/06/13 21:38:36 delphij Exp $ -->
+<!-- $FreeBSD: www/zh_CN/security/security.sgml,v 1.1 2006/07/11 15:27:53 delphij Exp $ -->
 
 <html>
   &header;
diff --git a/zh_CN/send-pr.sgml b/zh_CN/send-pr.sgml
index 15b53174df..5e60d7662a 100644
--- a/zh_CN/send-pr.sgml
+++ b/zh_CN/send-pr.sgml
@@ -1,10 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/send-pr.sgml,v 1.1.1002.3 2006/03/04 08:00:21 delphij Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/zh_CN/send-pr.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
 <!ENTITY title "�ύ FreeBSD ���ⱨ��">
 <!ENTITY copyright "��һ gnats ���ⱨ���ύ������� ��Ȩ���� &copy; 1996
  The NetBSD Foundation, Inc.  ��������Ȩ����">
-<!ENTITY % navincludes SYSTEM "includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 <!ENTITY bugbusters "bugbusters@FreeBSD.org">
 ]>
 
diff --git a/zh_CN/share/sgml/catalog b/zh_CN/share/sgml/catalog
new file mode 100644
index 0000000000..bae3bb06c0
--- /dev/null
+++ b/zh_CN/share/sgml/catalog
@@ -0,0 +1,12 @@
+--
+ $FreeBSD$
+--
+
+PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+       "l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
+       "header.l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
+       "navibar.l10n.ent"
diff --git a/zh_CN/share/sgml/catalog.xml b/zh_CN/share/sgml/catalog.xml
new file mode 100644
index 0000000000..12c0f02504
--- /dev/null
+++ b/zh_CN/share/sgml/catalog.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+                 rewritePrefix="../../"/>
+  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+              rewritePrefix="../../"/>
+</catalog>
diff --git a/zh_CN/share/sgml/header.l10n.ent b/zh_CN/share/sgml/header.l10n.ent
new file mode 100644
index 0000000000..49a798149a
--- /dev/null
+++ b/zh_CN/share/sgml/header.l10n.ent
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!-- $FreeBSD$ -->
+
+<!-- The FreeBSD Simplified Chinese Documentation Project -->
+<!-- Original Revision www/en/includes.sgml,v 1.62 2003/10/11 18:51:26 hrs -->
+
+<!-- From FreeBSD: www/share/sgml/includes.header.sgml,v 1.12 2006/05/09 07:30:29 kuriyama -->
+
+<!ENTITY copyright '<a href="&base;/copyright/">��Ȩ��Ϣ</a> | &copy; 1995-2006 The FreeBSD Project.
+  ��������Ȩ����'>
+<!ENTITY author '<a href="&base;/index.html">��ҳ</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">��ϵ</a> &nbsp; | &nbsp; <a href="&base;/copyright/index.html">��Ȩ</a> &nbsp; | &nbsp; &copyright;'>
+<!ENTITY home '<a href="&base;/index.html"><img src="&enbase;/gifs/home.gif"
+  alt="FreeBSD ��ҳ" border="0" align="right" width="101" height="33"></a>'>
+
+<!ENTITY header2.word.search '����'>
+<!ENTITY header2.word.textsize '���ֳߴ�'>
+<!ENTITY header2.word.normaltextsize 'Normal Text Size'>
+<!ENTITY header2.word.largetextsize 'Large Text Size'>
+<!ENTITY header2.word.normal '����'>
+<!ENTITY header2.word.large '����'>
+<!ENTITY header2.word.donate '����'>
+<!ENTITY header2.word.contact '����'>
+
+<!ENTITY header2.topnav '
+  <h2 class="blockhide">Site Navigation</h2>
+
+  <div id="TOPNAV">
+    <ul id="TOPNAVLIST">
+      <li><a href="&base;/" title="��ҳ">��ҳ</a></li>
+      <li><a href="&base;/about.html" title="����">����</a></li>
+      <li><a href="&base;/where.html" title="��� FreeBSD">��� FreeBSD</a></li>
+      <li><a href="&base;/docs.html" title="�ĵ�">�ĵ�</a></li>
+      <li><a href="&base;/community.html" title="����">����</a></li>
+      <li><a href="&enbase;/projects/index.html" title="����">����</a></li>
+      <li><a href="&base;/support.html" title="֧��">֧��</a></li>
+    </ul>
+  </div> <!-- TOPNAV -->
+'>
+
+<!-- 
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
+-->
diff --git a/zh_CN/share/sgml/l10n.ent b/zh_CN/share/sgml/l10n.ent
new file mode 100644
index 0000000000..4c98bee27d
--- /dev/null
+++ b/zh_CN/share/sgml/l10n.ent
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="gb2312" ?>
+<!-- $FreeBSD$ -->
+
+<!-- The FreeBSD Simplified Chinese Documentation Project -->
+<!-- Original Revision www/en/includes.sgml,v 1.62 2003/10/11 18:51:26 hrs -->
+
+<!ENTITY url.doc.langcode    'zh_CN.GB2312'>
+<!ENTITY xml.encoding        'gb2312'>
+
+<!-- From FreeBSD: www/share/sgml/includes.release.sgml,v 1.24 2006/05/09 08:07:48 ceri -->
+<!ENTITY rel.current.date '2006 �� 5 ��'>
+<!ENTITY rel2.current.date '2005 �� 5 ��'>
+
+<!-- 
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
+-->
diff --git a/zh_CN/share/sgml/libcommon.xsl b/zh_CN/share/sgml/libcommon.xsl
new file mode 100644
index 0000000000..2cb2b2ffad
--- /dev/null
+++ b/zh_CN/share/sgml/libcommon.xsl
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="gb2312" ?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>
+
+  <xsl:template name="html-news-list-newsflash-preface">
+    <img src="&enbase;/gifs/news.jpg" align="right" border="0" width="193"
+      height="144" alt="Nouvelles FreeBSD"/>
+
+    <p>FreeBSD ��һ������Ѹ�ٿ����ŵIJ���ϵͳ��
+      ����һ�����յĿ������DZȽϷ����ģ�����Զ������鿴���ҳ�棬ͬ���������ϣ������
+      <a href="&enbase;/doc/&url.doc.langcode;/books/handbook/eresources.html#ERESOURCES-MAIL">freebsd-announce
+	�ʼ��б�</a> ��ʹ�� <a href="news.rdf">RSS feed</a>��</p>
+
+    <p>���е�ÿ����Ŀ�����Լ�������ҳ�棬���������Щ��Ŀ����ϸ���¡�</p>
+
+    <ul>
+      <li><a href="&enbase;/java/newsflash.html">FreeBSD �ϵ� &java;</a></li>
+      <li><a href="http://freebsd.kde.org/">FreeBSD �ϵ� KDE</a></li>
+      <li><a href="&enbase;/gnome/newsflash.html">FreeBSD �ϵ� GNOME</a></li>
+    </ul>
+	  
+    <p>����ϸ�����������ܣ��ͽ����ķ��а汾���뿴<strong><a
+	  href="&base;/releases/index.html">�汾��Ϣ</a></strong>ҳ�档</p>
+	
+    <p>���� FreeBSD �İ�ȫ���棬 ����� <a href="&base;/security/#adv">��ȫ��Ϣ</a> ҳ�档</p>
+  </xsl:template>
+
+  <xsl:template name="html-news-list-newsflash-homelink">
+    <a href="&base;/news/news.html">������ҳ</a>
+  </xsl:template>
+
+  <xsl:template name="html-news-make-olditems-list">
+    <p>����Ĺ��棺
+      <a href="&enbase;/news/2003/index.html">2003</a>,
+      <a href="&enbase;/news/2002/index.html">2002</a>,
+      <a href="&enbase;/news/2001/index.html">2001</a>,
+      <a href="&enbase;/news/2000/index.html">2000</a>,
+      <a href="&enbase;/news/1999/index.html">1999</a>,
+      <a href="&enbase;/news/1998/index.html">1998</a>,
+      <a href="&enbase;/news/1997/index.html">1997</a>,
+      <a href="&enbase;/news/1996/index.html">1996</a></p>
+  </xsl:template>
+
+  <xsl:variable name="html-news-list-press-homelink">
+    <a href="&base;/news/press.html">ý�屨����ҳ</a>
+  </xsl:variable>
+
+  <xsl:template name="html-news-list-press-preface">
+    <p>�����֪������û���������г��Ĺ��� FreeBSD ����Ϣ�� ������
+      <a href="mailto:www@FreeBSD.org">www@FreeBSD.org</a> �Ա����ǰ������ӽ�ȥ��</p>
+  </xsl:template>
+
+  <xsl:template name="html-events-list-preface">
+  </xsl:template>
+
+  <xsl:template name="html-events-list-upcoming-heading">
+  </xsl:template>
+
+  <xsl:template name="html-events-list-past-heading">
+  </xsl:template>
+
+  <!-- Convert a month number to the corresponding long English name. -->
+  <xsl:template name="gen-long-en-month">
+    <xsl:param name="nummonth"/>
+    <xsl:variable name="month" select="number($nummonth)"/>
+    <xsl:choose>
+      <xsl:when test="$month=1">Janvier</xsl:when>
+      <xsl:when test="$month=2">F&#233;vrier</xsl:when>
+      <xsl:when test="$month=3">Mars</xsl:when>
+      <xsl:when test="$month=4">Avril</xsl:when>
+      <xsl:when test="$month=5">Mai</xsl:when>
+      <xsl:when test="$month=6">Juin</xsl:when>
+      <xsl:when test="$month=7">Juillet</xsl:when>
+      <xsl:when test="$month=8">Ao&#251;t</xsl:when>
+      <xsl:when test="$month=9">Septembre</xsl:when>
+      <xsl:when test="$month=10">Octobre</xsl:when>
+      <xsl:when test="$month=11">Novembre</xsl:when>
+      <xsl:when test="$month=12">D&#233;cembre</xsl:when>
+      <xsl:otherwise>Mois invalide</xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/zh_CN/share/sgml/navibar.l10n.ent b/zh_CN/share/sgml/navibar.l10n.ent
new file mode 100644
index 0000000000..1953f8d536
--- /dev/null
+++ b/zh_CN/share/sgml/navibar.l10n.ent
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!-- $FreeBSD$ -->
+
+<!ENTITY % navinclude.about "IGNORE">
+<![ %navinclude.about; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/about.html">����</a></li>
+<li><a href="&base;/features.html">����</a></li>
+<li><a href="&base;/applications.html">Ӧ�ó���</a></li>
+<li><a href="&base;/internet.html">������</a></li>
+<li><a href="&base;/advocacy/">�ٽ���Ŀ</a></li>
+<li><a href="&enbase;/marketing/">�г�</a></li>
+<li><a href="&base;/news/newsflash.html">����</a></li>
+<li><a href="&enbase;/events/events.html">���ڻ</a></li>
+<li><a href="&base;/news/press.html">ý�屨��</a></li>
+<li><a href="&enbase;/logo.html">��־</a></li>
+<li><a href="&base;/art.html">��ͼ</a></li>
+<li><a href="&base;/donations/">����</a></li>
+<li><a href="&base;/copyright/">������֪</a></li>
+</ul>
+</div> <!-- sidenav -->'>
+]]>
+
+<!ENTITY % navinclude.community "IGNORE">
+<![ %navinclude.community; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/community.html">����</a></li>
+<li><a href="&enbase;/community/mailinglists.html">�ʼ��б�</a></li>
+<li><a href="&enbase;/community/irc.html">IRC</a></li>
+<li><a href="&enbase;/community/newsgroups.html">������</a></li>
+<li><a href="&enbase;/usergroups.html">�û���</a></li>
+<li><a href="&enbase;/community/webresources.html">Web ��Դ</a></li>
+</ul>
+</div> <!-- sidenav -->'>
+]]>
+
+<!ENTITY % navinclude.developers "IGNORE">
+<![ %navinclude.developers; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&enbase;/projects/index.html">����</a></li>
+<li><a href="&enbase;/doc/zh_CN.GB2312/books/developers-handbook">�����ֲ�</a></li>
+<li><a href="&enbase;/doc/zh_CN.GB2312/books/porters-handbook">Porter �ֲ�</a></li>
+<li><a href="&enbase;/developers/cvs.html">CVS �����</a></li>
+<li><a href="&enbase;/releng/index.html">��������</a></li>
+<li><a href="&base;/platforms/">ƽ̨</a>
+	<ul>
+		<li><a href="&base;/platforms/alpha.html">alpha</a></li>
+		<li><a href="&base;/platforms/amd64.html">amd64</a></li>
+		<li><a href="&base;/platforms/arm.html">ARM</a></li>
+		<li><a href="&base;/platforms/i386.html">i386</a></li>
+		<li><a href="&base;/platforms/ia64/index.html">ia64</a></li>
+		<li><a href="&base;/platforms/mips.html">MIPS</a></li>
+		<li><a href="&base;/platforms/pc98.html">pc98</a></li>
+		<li><a href="&base;/platforms/ppc.html">ppc</a></li>
+		<li><a href="&base;/platforms/sparc.html">sparc64</a></li>
+		<li><a href="&base;/platforms/xbox.html">xbox</a></li>
+	</ul>
+</li>
+<li><a href="&base;/projects/ideas/">��Ŀ�µ���</a></li>
+<li><a href="&enbase;/doc/zh_CN.GB2312/articles/contributing/index.html">Ϊ FreeBSD �ṩ����</a></li>
+</ul>
+</div> <!-- sidenav -->'>
+]]>
+
+<!ENTITY % navinclude.docs "IGNORE">
+<![ %navinclude.docs; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/docs.html">�ĵ�</a></li>
+<li><a href="&enbase;/doc/zh_CN.GB2312/books/faq/">FAQ</a></li>
+<li><a href="&enbase;/doc/zh_CN.GB2312/books/handbook/">ʹ���ֲ�</a></li>
+<li><a href="&enbase;/docs/man.html">�����ֲ�</a>
+	<ul>
+		<li><a href="&cgibase;/man.cgi">���߲鿴�����ֲ�</a></li>
+	</ul>
+</li>
+<li><a href="&enbase;/docs/books.html">����ͼ�������</a></li>
+<li><a href="&enbase;/marketing/">�����</a></li>
+<li><a href="&enbase;/publish.html">������</a></li>
+<li><a href="&enbase;/docs/webresources.html">Web ��Դ</a></li>
+<li><a href="&enbase;/projects/newbies.html">������·</a></li>
+<li><a href="&enbase;/docproj/">FreeBSD �ĵ��ƻ�</a></li>
+</ul>
+</div> <!-- sidenav -->'>
+]]>
+
+<!ENTITY % navinclude.download "IGNORE">
+<![ %navinclude.download; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&base;/where.html">��� FreeBSD</a></li>
+<li><a href="&base;/releases/">���а���Ϣ</a>
+	<ul>
+		<li><a href="&enbase;/&u.rel.announce;">�������ð棺 &rel.current;</a></li>
+		<li><a href="&enbase;/&u.rel2.announce;">�������ð� (��ʽ)�� &rel2.current;</a></li>
+		<li><a href="&enbase;/snapshots/">���հ汾</a></li>
+	      <![ %beta.testing; [ 
+		<li><a href="&enbase;/&u.betarel.schedule;">�������İ汾�� &betarel.current;</a></li>
+	      ]]>
+	      <![ %beta2.testing; [ 
+		<li><a href="&u.betarel2.schedule;">�������İ汾�� &betarel2.current;</a></li>
+	      ]]>
+	</ul>
+</li>
+<li><a href="&enbase;/ports/">��ֲ��Ӧ�ó��� (ports)</a></li>
+</ul>
+</div> <!-- sidenav -->'>
+]]>
+
+<!ENTITY % navinclude.gnome "IGNORE">
+<![ %navinclude.gnome; [
+]]>
+
+<!ENTITY % navinclude.ports "IGNORE">
+<![ %navinclude.ports; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&enbase;/ports/index.html">���� ports</a></li>
+<li><a href="&enbase;/ports/installing.html">��װ</a></li>
+<li><a href="&enbase;/ports/updating.html">����</a></li>
+<li><a href="&enbase;/ports/searching.html">����</a></li>
+<li>&nbsp;&nbsp;&nbsp;&nbsp;Ŀ¼
+	<ul>
+		<li><a href="&enbase;/ports/categories-alpha.html">����ĸ��</a></li>
+		<li><a href="&enbase;/ports/categories-grouped.html">���߼�������</a></li>
+	</ul>
+</li>
+<li><a href="&enbase;/ports/master-index.html">ȫ�� Ports</a></li>
+<li><a href="&enbase;/ports/references.html">������Ϣ</a></li>
+</ul>
+</div> <!-- sidenav -->'>
+]]>
+
+<!ENTITY % navinclude.support "IGNORE">
+<![ %navinclude.support; [
+<!ENTITY nav '<div id="SIDENAV">
+<h2 class="blockhide">Section Navigation</h2>
+<ul>
+<li><a href="&enbase;/support.html">֧��</a></li>
+<li><a href="&enbase;/commercial/">��ҵ��Ʒ</a>
+	<ul>
+		<li><a href="&enbase;/commercial/software_bycat.html">����</a></li>
+		<li><a href="&enbase;/commercial/hardware.html">Ӳ��</a></li>
+		<li><a href="&enbase;/commercial/consult_bycat.html">��ѯ</a></li>
+		<li><a href="&enbase;/commercial/isp.html">Internet ����</a></li>
+		<li><a href="&enbase;/commercial/misc.html">����</a></li>
+	</ul>
+</li>
+<li><a href="&base;/security/">��ȫ��Ϣ</a></li>
+<li><a href="&enbase;/support/bugreports.html">Bug ����</a>
+	<ul>
+		<li><a href="&enbase;/send-pr.html">�ύ���ⱨ��</a></li>
+	</ul>
+</li>
+<li><a href="&enbase;/support/webresources.html">Web ��Դ</a></li>
+</ul>
+</div> <!-- sidenav -->'>
+]]>
diff --git a/zh_CN/news/news.xml b/zh_CN/share/sgml/news.xml
similarity index 91%
rename from zh_CN/news/news.xml
rename to zh_CN/share/sgml/news.xml
index b124b4dd13..3802999097 100644
--- a/zh_CN/news/news.xml
+++ b/zh_CN/share/sgml/news.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="GB2312" ?>
+<!DOCTYPE news PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for News//EN"
+                      "http://www.FreeBSD.org/XML/www/share/sgml/news.dtd">
 
 <!-- Simple schema for FreeBSD Project news.
 
@@ -9,7 +11,7 @@
 
      Each <event> contains an optional <title>, and then a <p>.  <p> elements
      can contain <a> anchors.  Within the "href" attribute of the anchor
-     $base or $enbase will be replaced with the base URI necessary to reach
+     &base; or &enbase; will be replaced with the base URI necessary to reach
      the FreeBSD document root, and should always be used to start URLs at
      www.FreeBSD.org or one of the mirrors.
 
@@ -87,7 +89,7 @@
 	  <title>2006 ��ڶ����ȿ������ȱ��淢����</title>
 
 	  <p>2006 ��ڶ����ȵĿ������ȱ��� <a
-	    href="$enbase/news/status/report-apr-2006-jun-2006.html">���ѷ���</a>��
+	    href="&enbase;/news/status/report-apr-2006-jun-2006.html">���ѷ���</a>��
 	    ���н����� 39 �����ݡ�</p>
         </event>
       </day>
@@ -206,11 +208,11 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
         <event>
          <title>FreeBSD 5.5-RELEASE ������</title>
 
-          <p><a href="$enbase/releases/5.5R/announce.html">FreeBSD
+          <p><a href="&enbase;/releases/5.5R/announce.html">FreeBSD
 	    5.5-RELEASE</a> �����ˡ� ��鿴 <a
-	    href="$base/releases/5.5R/errata.html">���а濱��</a>
+	    href="&base;/releases/5.5R/errata.html">���а濱��</a>
 	    ���˽����·��������ź���֪���⡣ <a
-	    href="$base/releases/index.html">���а���Ϣ</a>
+	    href="&base;/releases/index.html">���а���Ϣ</a>
 	    ��ҳ�ṩ�˹��� FreeBSD ���а�Ľ�һ�����顣</p>
         </event>
       </day>
@@ -261,11 +263,11 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
         <event>
          <title>FreeBSD 6.1-RELEASE ������</title>
 
-          <p><a href="$enbase/releases/6.1R/announce.html">FreeBSD
+          <p><a href="&enbase;/releases/6.1R/announce.html">FreeBSD
 	    6.1-RELEASE</a> ��ʽ�����ˡ� �ڰ�װǰ�� ��鿴 <a
-	    href="$base/releases/6.1R/errata.html">���а濱��</a>
+	    href="&base;/releases/6.1R/errata.html">���а濱��</a>
 	    ���˽���� 6.1 ���µ���Ϣ����֪���⡣ �� <a
-	    href="$base/releases/index.html">���а���Ϣ</a>
+	    href="&base;/releases/index.html">���а���Ϣ</a>
 	    ҳ�����ṩ�˹��� FreeBSD ���а�Ľ�һ����Ϣ��</p>
         </event>
 
@@ -276,7 +278,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	    href="http://code.google.com/summerofcode.html">Summer
             of Code 2006</a> �����������������ӳ���̫ƽ��ʱ���ܶ�
 	    11:00AM PDT�� ���� FreeBSD ר����Ŀ�Լ���ѡ��ʦ����Ϣ������ <a
-            href="$enbase/projects/summerofcode.html">here</a> �ҵ���</p>
+            href="&enbase;/projects/summerofcode.html">here</a> �ҵ���</p>
         </event>
 
       </day>
@@ -329,7 +331,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
             of Code 2006</a> �ƻ�����Ŀ���롣
             ����ƻ���Ϊ������Ϊ��Դ��Ŀ�ṩ������ѧ���ṩ������
             FreeBSD ר�е���Ŀ�Լ�DZ�ڵĵ�ʦ������ ������ <a
-            href="$enbase/projects/summerofcode.html">����</a> �ҵ���</p>
+            href="&enbase;/projects/summerofcode.html">����</a> �ҵ���</p>
 
           <p>����ҵ��˺��ʵ���Ŀ�Լ���ʦ�� ������Ȥ������Ŀ��ѧ��Ӧ������룬
 	    ���ύ�� Google�� ��Щ��������������̫ƽ���չ�ʱ�� 2006 ��
@@ -386,7 +388,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	  <title>2006 ��һ�����½��ȱ���</title>
 
 	  <p>���ڿ��Է��ʰ��� 29 ����Ŀ�� 2006 ��һ������ <a
-	    href="$enbase/news/status/report-jan-2006-mar-2006.html">���ȱ���</a>
+	    href="&enbase;/news/status/report-jan-2006-mar-2006.html">���ȱ���</a>
 	    �ˡ�</p>
         </event>
  
@@ -397,7 +399,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
             <a href="http://code.google.com/summerofcode.html">Summer
             of Code 2006</a> �ƻ��� ��һ�ƻ���Ϊ��У�����뿪Դ��Ŀ�ṩ������
             FreeBSD ר���ļƻ��͵�ʦ��ѡ�˿����� <a
-            href="$enbase/projects/summerofcode.html">����</a> ���ʡ�</p>
+            href="&enbase;/projects/summerofcode.html">����</a> ���ʡ�</p>
 	</event>
      </day>
 
@@ -592,7 +594,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	  <title>2005 ��ʮ��ʮ���½��ȱ���</title>
 
 	  <p>���ڿ��Է��ʰ��� 26 ����Ŀ�� 2005 ��ʮ��ʮ���� <a
-	    href="$enbase/news/status/report-oct-2005-dec-2005.html">���ȱ���</a>
+	    href="&enbase;/news/status/report-oct-2005-dec-2005.html">���ȱ���</a>
 	    �ˡ�</p>
         </event>
       </day>
@@ -693,7 +695,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	    �� FreeBSD ��վ��������һ����Ŀ�� �����г�����������Ŀ��
 	    ��������б����д���һ���IJ��䣬 ������ϣ����δ����Ϊ
 	    committer ��־Ը�ߵ�һ���ܺõ���㡣 ������ <a
-	    href="$enbase/projects/ideas/">������鿴��Ŀ�б�</a>��</p>
+	    href="&enbase;/projects/ideas/">������鿴��Ŀ�б�</a>��</p>
 	</event>
       </day>
 
@@ -737,7 +739,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
           <title>�����£� �� FreeBSD ������Ʒ</title>
 
           <p>һƪ�µ����£� <a
-              href="$enbase/doc/en_US.ISO8859-1/articles/building-products/">
+              href="&enbase;/doc/en_US.ISO8859-1/articles/building-products/">
 	      �� FreeBSD ������Ʒ</a> �������ڿ�����Ʒʱ�� FreeBSD
             project �����ĺô��� �ɹ���������Ʒ�еļ���Ͷ���һ�󲿷֣�
             ������������������㲻�ϱ仯���г��������Ҫ�� ͨ��ʹ�ó���ġ�
@@ -754,7 +756,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	  <title>2005 ��������ʮ�½��ȱ���</title>
 
 	  <p>2005 ��������ʮ�µĽ��ȱ��� <a
-	    href="$enbase/news/status/report-july-2005-oct-2005.html">���ڷ�����</a>��
+	    href="&enbase;/news/status/report-july-2005-oct-2005.html">���ڷ�����</a>��
 	    ���а����� 37 �����ݡ�</p>
 	</event>
       </day>
@@ -779,9 +781,9 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
           <title>FreeBSD �汾�� GNOME 2.12.1 ������</title>
 
           <p>������ 6.0 �ķ����� GNOME 2.12.1 Ҳ�Ѿ����� ports ��������
-            ������� <a href="$enbase/gnome/docs/faq212.html">���� FAQ</a>
+            ������� <a href="&enbase;/gnome/docs/faq212.html">���� FAQ</a>
             ���˽�ȫ���޸ġ� ����ָ���� �Լ���֪���⡣
-            ���������� <a href="$enbase/gnome/index.html">FreeBSD GNOME
+            ���������� <a href="&enbase;/gnome/index.html">FreeBSD GNOME
             ��ҳ</a> ���ҵ��������ϡ�</p>
         </event>
       </day>
@@ -792,11 +794,11 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
        <event>
          <title>FreeBSD 6.0-RELEASE ������</title>
 
-          <p><a href="$enbase/releases/6.0R/announce.html">FreeBSD
+          <p><a href="&enbase;/releases/6.0R/announce.html">FreeBSD
 	    6.0-RELEASE</a> �����ˡ� ���ڰ�װǰ�μ� <a
-	    href="$enbase/releases/6.0R/errata.html">���а濱��</a>
+	    href="&enbase;/releases/6.0R/errata.html">���а濱��</a>
 	    ���˽���� 6.0 ���������ź����⡣ �� <a
-	    href="$enbase/releases/index.html">���а���Ϣ</a>
+	    href="&enbase;/releases/index.html">���а���Ϣ</a>
 	    ��ҳ���ṩ�˹��� FreeBSD ���а�Ľ�һ����Ϣ��</p>
        </event>
       </day>
@@ -846,7 +848,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
          <p>FreeBSD 6.0 �ĵ�һ�����к�ѡ�汾 <a
 	   href="http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018790.html">������</a>��
            RC1 ISO ���� �Լ����� FTP �İ�װ֧�ֿ����ھ��������
-           <a href="$enbase/doc/zh_CN.GB2312/books/handbook/mirrors-ftp.html">
+           <a href="&enbase;/doc/zh_CN.GB2312/books/handbook/mirrors-ftp.html">
            FreeBSD ����վ��</a> �ҵ���</p>
 
 	</event>
@@ -858,7 +860,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	  <title>�����ɹ������� Argentina.com</title>
 
 	  <p>�����˳ɹ������� <a
-	    href="$enbase/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/">
+	    href="&enbase;/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/">
 	    argentina.com</a>�� ���������������޵�һ�� ISP
 	    �����ͨ��ʹ�� FreeBSD �ھ������ҵ��г���ȡ�óɹ��ġ�</p>
 	</event>
@@ -975,14 +977,14 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	  <title>������ FreeBSD ��� iCalendar Feed</title>
 
 	  <p>ʹ���ܹ�֧�� iCalendar ��ʽ���ճ��������û��� ���ڿ��Զ���
-	    <a href="$enbase/events/events.ics">FreeBSD ���ڻ��</a> �ˡ�</p>
+	    <a href="&enbase;/events/events.ics">FreeBSD ���ڻ��</a> �ˡ�</p>
 	</event>
 
 	<event>
 	  <title>�������£� ���ѡ�� FreeBSD �汾</title>
 
 	  <p>������һƪ���£� <a
-	    href="$enbase/doc/en_US.ISO8859-1/articles/version-guide/">
+	    href="&enbase;/doc/en_US.ISO8859-1/articles/version-guide/">
 	    ѡ���ʺ����� FreeBSD �汾</a>��
 	    ������ѡ�����ʺϾ���Ӧ�õ� FreeBSD �汾ʱ����Ҫ���ǵ����⡣
 	    ���а������а����֧�� �Լ� FreeBSD-STABLE ��
@@ -1011,7 +1013,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	  <title>�µ� FreeBSD/Linux ��Ƥ��</title>
 
 	  <p>Dru Lavigne �ոշ����� <a
-	    href="$enbase/doc/en_US.ISO8859-1/articles/linux-comparison/">FreeBSD��
+	    href="&enbase;/doc/en_US.ISO8859-1/articles/linux-comparison/">FreeBSD��
 	    Linux ��һ�ֿ�Դ���Ʒ</a>�� ��ƪ��Ƥ���Ŀ���ǣ�
 	    ���� FreeBSD ���ṩ�Ĺ��ܺͺô��� ���� Linux
 	    �����ʵ��ıȽϡ� ��Ϊ��Щ����Ѱ�� Linux
@@ -1030,7 +1032,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	  <title>2005 �� ���������½��ȱ���</title>
 
 	  <p>2005 ���������µĽ��ȱ��� <a
-	      href="$enbase/news/status/report-mar-2005-june-2005.html">���ѷ���</a>��
+	      href="&enbase;/news/status/report-mar-2005-june-2005.html">���ѷ���</a>��
 	     ���а����� 43 ����Ŀ��</p>
 	</event>
       </day>
@@ -1096,7 +1098,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	  CVS ��֧�Ѿ��� HEAD �Ϸ�������� ���������� 6.0-RELEASE��
 	  �Լ����к����� 6.x �汾�� ��������һ��֧�Ͽ�����
 	  ������������
-	  <a href="$enbase/releases/6.0R/schedule.html">6.0-RELEASE �ƻ�</a>��
+	  <a href="&enbase;/releases/6.0R/schedule.html">6.0-RELEASE �ƻ�</a>��
 	  <a href="http://lists.freebsd.org/pipermail/freebsd-stable/2005-July/016855.html">RELENG_6 ����</a>��</p>
 	</event>
 
@@ -1127,7 +1129,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	    FreeBSD ���������鷢���� 5-STABLE �� 6-CURRENT
 	    �Թ������Dz������е��¹��ܣ� ��������ɿ��ԡ�
 	    Ҫ�˽����һ����ϸ�ڣ� ��μ�
-	    <a href="$enbase/snapshots/index.html">������ҳ</a>��</p>
+	    <a href="&enbase;/snapshots/index.html">������ҳ</a>��</p>
 	</event>
       </day>
 
@@ -1167,12 +1169,12 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
         <event>
           <title>6.0-RELEASE ���붳�Ὺʼ</title>
 
-          <p><a href="$enbase/releases/6.0R/schedule.html">FreeBSD
+          <p><a href="&enbase;/releases/6.0R/schedule.html">FreeBSD
           6.0</a> ���붳�Ὺʼ�ˡ� ������Ա�� src/ �� HEAD ��֧���ύ����֮ǰ��
           �������ȵõ� re@FreeBSD.org �����ɡ� �����Դ� FTP վ������
           6.0 �����¿��հ汾�� ��������������µ� FreeBSD ��Ҫ�汾��
           Ҫ�˽��һ������Ϣ�� ��μ���վ�� <a
-          href="$enbase/releng/index.html">��������</a> ���֡�</p>
+          href="&enbase;/releng/index.html">��������</a> ���֡�</p>
         </event>
       </day>
 
@@ -1186,7 +1188,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
             <a href="http://code.google.com/summerofcode.html">Summer
             of Code 2005</a> �ƻ��� Ϊ�������ڲ��뿪Դ������Ŀ����Уѧ���ṩ������
             FreeBSD ר������Ŀ�б��ͺ�ѡ��ʦ������ <a
-            href="$enbase/projects/summerofcode.html">����</a> �ҵ���</p>
+            href="&enbase;/projects/summerofcode.html">����</a> �ҵ���</p>
         </event>
 
         <event>
@@ -1240,11 +1242,11 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
        <event>
          <title>FreeBSD 5.4-RELEASE ��ʽ������</title>
 
-          <p><a href="$enbase/releases/5.4R/announce.html">FreeBSD
+          <p><a href="&enbase;/releases/5.4R/announce.html">FreeBSD
 	    5.4-RELEASE</a> ��ʽ�����ˡ� ��װǰ�� ��鿴 <a
-	    href="$base/releases/5.4R/errata.html">�����</a>
+	    href="&base;/releases/5.4R/errata.html">�����</a>
 	    ���˽� 5.4 ���·��ֵ����⡣ <a
-	    href="$base/releases/index.html">���а���Ϣ</a>
+	    href="&base;/releases/index.html">���а���Ϣ</a>
 	    ��ҳ�ṩ�˹��� FreeBSD ���а�ĸ�����Ϣ��</p>
 
        </event>
@@ -1285,7 +1287,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	  <title>2005 ���һ���ȿ������ȱ���</title>
 
 	  <p>2005 ���һ���ȿ������ȱ��湲�� 39 ����Ŀ�� ������ <a
-	      href="$enbase/news/status/report-jan-2005-mar-2005.html">����</a>���ʡ�</p>
+	      href="&enbase;/news/status/report-jan-2005-mar-2005.html">����</a>���ʡ�</p>
 	</event>
       </day>
 
@@ -1342,7 +1344,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
             ���ǹ�����Ҷ�����汾���в��ԣ�
             �Ա㷢�����е��������Ⲣ���������� RC2 ISO ӳ���ļ���
             �Լ����� FTP �İ�װ֧�֣� �Ѿ����Դ��ڶ�
-            <a href="$enbase/doc/zh_CN.GB2312/books/handbook/mirrors-ftp.html"
+            <a href="&enbase;/doc/zh_CN.GB2312/books/handbook/mirrors-ftp.html"
               >FreeBSD ����վ��</a> �ϻ�á�</p>
         </event>
       </day>
@@ -1369,7 +1371,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
             �ĵ�һ�����к�ѡ�汾�Ѿ������� ���ǹ������ǰ���������в��ԣ�
             �Ա㷢�����е��������Ⲣ���������� RC1 ISO ӳ���ļ���
             �Լ����� FTP �İ�װ֧�֣� �Ѿ����Դ��ڶ�
-            <a href="$enbase/doc/zh_CN.GB2312/books/handbook/mirrors-ftp.html"
+            <a href="&enbase;/doc/zh_CN.GB2312/books/handbook/mirrors-ftp.html"
               >FreeBSD ����վ��</a> ���ҵ���</p>
         </event>
       </day>
@@ -1413,7 +1415,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	    ͨ������ÿ��һ�ε� 5-STABLE �� 6-CURRENT ���հ汾��
 	    ���������dz�ʶ�����ԣ� ����������Ŀɿ��ԡ�
 	    Ҫ�˽����ϸ�ڣ� �����
-	    <a href="$enbase/snapshots/index.html">����</a> ����ҳ��</p>
+	    <a href="&enbase;/snapshots/index.html">����</a> ����ҳ��</p>
 	</event>
       </day>
 
@@ -1425,9 +1427,9 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 
 	      <p>GNOME 2.10.0 �Ѿ������� �������� ports tree��
 		  �Ӷ����Ը��� 5.4-RELEASE �Ľ����ˡ� ������Ķ����ǵ�
-		  <a href="$enbase/gnome/docs/faq210.html">���� FAQ</a>
+		  <a href="&enbase;/gnome/docs/faq210.html">���� FAQ</a>
 		  ���˽���ڱ䶯�� ����ָ���� �Լ���֪�����⡣
-		  ������Դ�� ������ <a href="$enbase/gnome/index.html">FreeBSD GNOME
+		  ������Դ�� ������ <a href="&enbase;/gnome/index.html">FreeBSD GNOME
 		      ��ҳ</a> �ҵ���</p>
 	  </event>
       </day>
@@ -1493,11 +1495,11 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	<event>
 	  <title>FreeBSD 4.11-RELEASE ��ʽ������</title>
 
-	  <p><a href="$enbase/releases/4.11R/announce.html">FreeBSD
+	  <p><a href="&enbase;/releases/4.11R/announce.html">FreeBSD
 	      4.11-RELEASE</a> ��ʽ�����ˡ� ��װ֮ǰ��鿴 <a
-	      href="$enbase/releases/4.11R/errata.html">���а濱��</a>
+	      href="&enbase;/releases/4.11R/errata.html">���а濱��</a>
 	    ���˽��·��ֵ� 4.11 �汾�����⡣ <a
-	      href="$base/releases/index.html">�������</a>
+	      href="&base;/releases/index.html">�������</a>
 	    ҳ�ṩ�˹��� FreeBSD ���а��Ϊ�꾡�����ϡ�</p>
 	</event>
       </day>
@@ -1509,7 +1511,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	  <title>2004 �� �°������Ŀ״������</title>
 
 	  <p>�� <a
-	      href="$enbase/news/status/report-july-2004-dec-2004.html">����</a>
+	      href="&enbase;/news/status/report-july-2004-dec-2004.html">����</a>
 	    �Ϳ��ԴӰ����� 44 ����Ŀ��״�������˽�ȥ�����µ�ʮ���µ���Ŀ��չ����ˡ�</p>
 	</event>
 
@@ -1520,7 +1522,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	    FreeBSD-STABLE �ʼ��б��ϵ� <a
 	    href="http://docs.freebsd.org/cgi/mid.cgi?20050117020739.GA2736">��ݹ���</a>��
 	    ������ 4.11 �����ƻ������� <a
-	    href="$enbase/releases/4.11R/schedule.html">����</a> �ҵ���</p>
+	    href="&enbase;/releases/4.11R/schedule.html">����</a> �ҵ���</p>
 	</event>
       </day>
 
@@ -1534,7 +1536,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	    FreeBSD-STABLE �ʼ��б��ϵ� <a
 	    href="http://docs.freebsd.org/cgi/mid.cgi?20050103054251.GA60361">���</a>
 	    �����Ĺ��档 ������ 4.11 �����ƻ������� <a
-	    href="$enbase/releases/4.11R/schedule.html">����</a> �ҵ���</p>
+	    href="&enbase;/releases/4.11R/schedule.html">����</a> �ҵ���</p>
 	</event>
       </day>
     </month>
@@ -1586,7 +1588,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	    FreeBSD-STABLE �ʼ��б��ϵ� <a
 	      href="http://docs.freebsd.org/cgi/getmsg.cgi?fetch=495816+0+archive/2004/freebsd-stable/20041219.freebsd-stable">��������</a>��
 	    ������ 4.11 �����ƻ������� <a
-	    href="$enbase/releases/4.11R/schedule.html">����</a> �ҵ���</p>
+	    href="&enbase;/releases/4.11R/schedule.html">����</a> �ҵ���</p>
 	  </event>
 	</day>
 
@@ -1686,7 +1688,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 
 	    <p>�� FreeBSD 5.3 ����֮�� GNOME 2.8.1 �Ѿ��ϲ����� ports tree �С�
 	      ��μ�
-	      <a href="$enbase/gnome/index.html">FreeBSD GNOME
+	      <a href="&enbase;/gnome/index.html">FreeBSD GNOME
 	        ��ҳ</a> �Ի�ȡ�����ľ��岽�衣</p>
 	  </event>
 	</day>
@@ -1697,11 +1699,11 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	  <event>
 	    <title>FreeBSD 5.3-RELEASE ������</title>
 
-          <p><a href="$enbase/releases/5.3R/announce.html">FreeBSD
+          <p><a href="&enbase;/releases/5.3R/announce.html">FreeBSD
 	    5.3-RELEASE</a> ��ʽ�����ˡ� �ڰ�װǰ��鿴 <a
-	    href="$enbase/releases/5.3R/errata.html">���а濱��</a>
+	    href="&enbase;/releases/5.3R/errata.html">���а濱��</a>
 	    ���˽� 5.3 �����½����ֵ���������š� <a
-	    href="$base/releases/index.html">���а���Ϣ</a>
+	    href="&base;/releases/index.html">���а���Ϣ</a>
 	    ҳ���ṩ�˸���Ĺ��ڷ��а����Ϣ��</p>
 
 	  </event>
@@ -1863,7 +1865,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	   <title>2004 �����������½��ȱ��淢��</title>
 
 	   <p>���������µĽ��ȱ��淢���ˣ� ��μ� <a
-	     href="$enbase/news/status/status.html">���ȱ��� Web
+	     href="&enbase;/news/status/status.html">���ȱ��� Web
 	     ҳ</a> �˽������Ϣ��</p> </event>
       </day>
 
@@ -1925,12 +1927,12 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	<event>
 	  <title>FreeBSD 4.10-RELEASE ��ʽ������</title>
 
-	  <p><a href="$enbase/releases/4.10R/announce.html">FreeBSD
+	  <p><a href="&enbase;/releases/4.10R/announce.html">FreeBSD
 	      4.10-RELEASE</a> �Ѿ���ʽ�����ˡ� �ڰ�װ֮ǰ�����Ȳο� <a
-	      href="$enbase/releases/4.10R/errata.html">�����濱��</a>
+	      href="&enbase;/releases/4.10R/errata.html">�����濱��</a>
 	    ���˽���� 4.10 �����µ���Ϣ����֪���⡣
 	    <a
-	      href="$base/releases/index.html">Release Information</a>
+	      href="&base;/releases/index.html">Release Information</a>
 	    ҳ�ṩ�˹��� FreeBSD ���а汾�Ľ�һ����Ϣ��</p>
 	</event>
       </day>
@@ -1950,7 +1952,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	   <title>2004 �� 3��4 �¿������ȱ���</title>
 
 	   <p> 3��4 �¿������ȱ��棬������Ϣ�뿴
-	     <a href="$enbase/news/status/status.html">web״̬ҳ��</a>��
+	     <a href="&enbase;/news/status/status.html">web״̬ҳ��</a>��
 	     </p>
 	 </event>
        </day>
@@ -2031,10 +2033,10 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	  <title>ɾȥ�� Gallery</title>
 
 	  <p>����ά�����Ѷ���Ч��΢�� ���Ǿ���ɾȥ
-	    <a href="$enbase/gallery/">gallery</a> ҳ�档
+	    <a href="&enbase;/gallery/">gallery</a> ҳ�档
 	    ��Щ���ݽ������ܺ�ɾ���� ����ύ�����ݽ�����������
 	    ������ �Ⲣ��Ӱ��
-	    <a href="$enbase/commercial/">Commercial Gallery</a>��</p>
+	    <a href="&enbase;/commercial/">Commercial Gallery</a>��</p>
 	</event>
       </day>
 
@@ -2053,7 +2055,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	   <title>2004 ��һ�������½��ȱ���</title>
 
 	   <p>һ�������µĽ��ȱ������ڷ����ˣ� ��μ�
-	     <a href="$enbase/news/status/status.html">���ȱ�����վ</a>
+	     <a href="&enbase;/news/status/status.html">���ȱ�����վ</a>
 	     �˽������Ϣ��</p>
 	 </event>
        </day>
@@ -2103,11 +2105,11 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	<event>
 	  <title>FreeBSD 5.2.1-RELEASE ������</title>
 
-          <p><a href="$enbase/releases/5.2.1R/announce.html">FreeBSD
+          <p><a href="&enbase;/releases/5.2.1R/announce.html">FreeBSD
 	    5.2.1-RELEASE</a> �����ˡ� �ڰ�װǰ�� ��鿴 <a
-	    href="$enbase/releases/5.2.1R/errata.html">���а濱��</a>
+	    href="&enbase;/releases/5.2.1R/errata.html">���а濱��</a>
 	    ���˽�������Ϣ�� 5.2.1 ����֮�������ֵ����⡣ �� <a
-	    href="$base/releases/index.html">���а���Ϣ</a>
+	    href="&base;/releases/index.html">���а���Ϣ</a>
 	    ��ҳ�У� �������ҵ�������� FreeBSD ���а����Ϣ��</p>
 
 	</event>
@@ -2175,7 +2177,7 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	  <title>2003 ��ʮ����ʮ���¿������ȱ���</title>
 
 	  <p>�ոշ�����ʮ����ʮ���µĿ������ȱ��棻 ��μ�
-	    <a href="$enbase/news/status/status.html">���ȱ�����վ</a>
+	    <a href="&enbase;/news/status/status.html">���ȱ�����վ</a>
 	    ���˽��һ������Ϣ��</p>
 	</event>
       </day>
@@ -2209,11 +2211,11 @@ href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki
 	<event>
 	  <title>FreeBSD 5.2-RELEASE ��ʽ������</title>
 
-          <p><a href="$enbase/releases/5.2R/announce.html">FreeBSD
+          <p><a href="&enbase;/releases/5.2R/announce.html">FreeBSD
 	    5.2-RELEASE</a> ��ʽ�����ˡ� ��װ֮ǰ����� <a
-	    href="$enbase/releases/5.2R/errata.html">���а濱����Ϣ</a>
+	    href="&enbase;/releases/5.2R/errata.html">���а濱����Ϣ</a>
 	    �Ա��˽���� 5.2 ����֮������ź����⡣ <a
-	    href="$base/releases/index.html">���а���Ϣ</a>
+	    href="&base;/releases/index.html">���а���Ϣ</a>
 	    �ṩ�˹��� FreeBSD ���а�Ľ�һ����Ϣ��</p>
 
 	</event>
diff --git a/zh_CN/news/press.xml b/zh_CN/share/sgml/press.xml
similarity index 98%
rename from zh_CN/news/press.xml
rename to zh_CN/share/sgml/press.xml
index c4779acf33..6d2f8b30f1 100644
--- a/zh_CN/news/press.xml
+++ b/zh_CN/share/sgml/press.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="GB2312" ?>
+<!DOCTYPE press PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Press//EN"
+                      "http://www.FreeBSD.org/XML/www/share/sgml/press.dtd">
 <!--
  COMMITTERS PLEASE NOTE:
     News articles referenced in this file are also to be archived under
diff --git a/zh_CN/support.sgml b/zh_CN/support.sgml
index bf793dcc5d..d5c7d882c5 100644
--- a/zh_CN/support.sgml
+++ b/zh_CN/support.sgml
@@ -1,8 +1,7 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/support.sgml,v 1.1.1002.2 2005/10/06 14:45:02 delphij Exp $">
+<!doctype HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/zh_CN/support.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
 <!ENTITY title "FreeBSD ֧��">
-<!ENTITY % navincludes SYSTEM "includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.support "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
diff --git a/zh_CN/where.sgml b/zh_CN/where.sgml
index 07879a53ee..d89f6712da 100644
--- a/zh_CN/where.sgml
+++ b/zh_CN/where.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/where.sgml,v 1.1.1002.16 2006/06/13 22:01:07 delphij Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/zh_CN/where.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
 <!ENTITY title "��ȡ FreeBSD">
-<!ENTITY % navincludes SYSTEM "includes.navdownload.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.download "INCLUDE">
 <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
 ]>
 
diff --git a/zh_CN/y2kbug.sgml b/zh_CN/y2kbug.sgml
index a87dc3180f..b2fba2eec2 100644
--- a/zh_CN/y2kbug.sgml
+++ b/zh_CN/y2kbug.sgml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/y2kbug.sgml,v 1.1.1000.1 2005/10/09 07:05:54 loader Exp $">
+<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD: www/zh_CN/y2kbug.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
 <!ENTITY title 'Year 2000 Compatibility (aka "Millennium Bug")'>
-<!ENTITY % navincludes SYSTEM "includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+<!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <!-- The FreeBSD Simplified Chinese Documentation Project -->