From f5b3523ae67b54d37a077d0031f43cb9623b4696 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 24 Aug 2012 10:52:17 +0000
Subject: [PATCH] - Properly localize navibar entities - Fix enntities of beta
 releases

Approved by:	doceng (implicit)
---
 de_DE.ISO8859-1/share/sgml/navibar.l10n.ent  |  88 +++++++--------
 el_GR.ISO8859-7/share/sgml/navibar.l10n.ent  | 102 ++++++++---------
 es_ES.ISO8859-1/share/sgml/navibar.l10n.ent  | 110 +++++++++----------
 fr_FR.ISO8859-1/share/sgml/navibar.l10n.ent  |  96 ++++++++--------
 hu_HU.ISO8859-2/share/sgml/navibar.l10n.ent  | 108 +++++++++---------
 it_IT.ISO8859-15/share/sgml/navibar.l10n.ent |  89 ++++++++-------
 ja_JP.eucJP/share/sgml/navibar.l10n.ent      |  93 ++++++++--------
 nl_NL.ISO8859-1/share/sgml/navibar.l10n.ent  | 104 +++++++++---------
 ru_RU.KOI8-R/share/sgml/navibar.l10n.ent     |  90 ++++++++-------
 share/sgml/navibar.ent                       |  16 +++
 tr_TR.ISO8859-9/share/sgml/navibar.l10n.ent  |  32 ------
 zh_CN.GB2312/share/sgml/navibar.l10n.ent     |  89 +++++++--------
 zh_TW.Big5/share/sgml/navibar.l10n.ent       |  90 +++++++--------
 13 files changed, 533 insertions(+), 574 deletions(-)

diff --git a/de_DE.ISO8859-1/share/sgml/navibar.l10n.ent b/de_DE.ISO8859-1/share/sgml/navibar.l10n.ent
index 00c353bb59..50a0999d25 100644
--- a/de_DE.ISO8859-1/share/sgml/navibar.l10n.ent
+++ b/de_DE.ISO8859-1/share/sgml/navibar.l10n.ent
@@ -5,9 +5,8 @@
   basiert auf: 1.37
 -->
 
-<!ENTITY % navinclude.about "IGNORE">
-<![ %navinclude.about; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.about '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Navigation-Men�</h2>
 <ul>
 <li><a href="&base;/about.html">�ber FreeBSD</a></li>
@@ -27,12 +26,11 @@
 <li><a href="&enbase;/copyright/">Rechtliches</a></li>
 <li><a href="&enbase;/privacy.html">Privacy Policy</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.community "IGNORE">
-<![ %navinclude.community; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.community '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/community.html">Community</a></li>
@@ -45,12 +43,11 @@
 <li><a href="&base;/community/webresources.html">Internetressourcen</a></li>
 <li><a href="&enbase;/community/social.html">Soziale Netzwerke</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.developers "IGNORE">
-<![ %navinclude.developers; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.developers '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/projects/index.html">Entwicklung</a></li>
@@ -62,12 +59,11 @@
 <li><a href="http://wiki.FreeBSD.org/IdeasPage">Projektvorschl�ge</a></li>
 <li><a href="&enbase;/doc/&url.doc.langcode;/articles/contributing/index.html">FreeBSD unterst�tzen</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.docs "IGNORE">
-<![ %navinclude.docs; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.docs '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/docs.html">Dokumentation</a></li>
@@ -81,12 +77,25 @@
 <li><a href="&base;/docproj/">Documentation Project</a></li>
 <li><a href="https://doc.bsdgroup.de/index.html">German Documentation Project</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '<div id="SIDENAV">
+<![ %beta.testing; [
+<!ENTITY beta.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">Testversion: &betarel.current;</a></li>
+'>
+]]>
+<!ENTITY beta.listitem ''>
+
+<![ %beta2.testing; [
+<!ENTITY beta2.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">Testversion: &betarel2.current;</a></li>
+'>
+]]>
+<!ENTITY beta2.listitem ''>
+
+<!ENTITY nav.download '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/where.html">FreeBSD Bezugsquellen</a></li>
@@ -94,25 +103,19 @@
 	<ul>
 		<li>Produktivversion: <a href="&u.rel.announce;">&rel.current;</a>
 		  <a href="&u.rel2.announce;">&rel2.current;</a></li>
-		<li>Alte Produktivversion:<br> <a href="&u.rel3.announce;">&rel3.current;</a></li>
+		<li>Alte Produktivversion:<br/> <a href="&u.rel3.announce;">&rel3.current;</a></li>
 		<li><a href="&base;/snapshots/">Snapshots</a></li>
-	      <![ %beta.testing; [
-		<li><a href="&u.betarel.schedule;">Testversion: &betarel.current;</a></li>
-              ]]>
-	      <![ %beta2.testing; [
-                <li><a href="&u.betarel2.schedule;">Testversion: &betarel2.current;</a></li>
-              ]]>
+		&beta.listitem;
+		&beta2.listitem;
 	</ul>
 </li>
 <li><a href="&base;/ports/">Anwendungen (Ports)</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.ports "IGNORE">
-<![ %navinclude.ports; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.ports '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Section Navigation</h2>
   <ul>
     <li><a href="&base;/ports/index.html">Allgemeines</a></li>
@@ -127,12 +130,11 @@
     <li><a href="&base;/ports/master-index.html">Alle Ports</a></li>
     <li><a href="&base;/ports/references.html">Weitere Informationen</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.support "IGNORE">
-<![ %navinclude.support; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.support '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/support.html">Hilfe</a></li>
@@ -158,5 +160,5 @@
 </li>
 <li><a href="&base;/support/webresources.html">Internet-Ressourcen</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
diff --git a/el_GR.ISO8859-7/share/sgml/navibar.l10n.ent b/el_GR.ISO8859-7/share/sgml/navibar.l10n.ent
index 06b24d59e3..1ecfe0c011 100644
--- a/el_GR.ISO8859-7/share/sgml/navibar.l10n.ent
+++ b/el_GR.ISO8859-7/share/sgml/navibar.l10n.ent
@@ -7,10 +7,8 @@
   %SRCID%	1.27
 -->
 
-<!ENTITY % navinclude.about "IGNORE">
-<![ %navinclude.about; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.about '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">����������� ��������</h2>
 
   <ul>
@@ -30,13 +28,11 @@
     <li><a href="&base;/donations/">������</a></li>
     <li><a href="&base;/copyright/">���������� ����������</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.community "IGNORE">
-<![ %navinclude.community; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.community '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">����������� ��������</h2>
 
   <ul>
@@ -50,13 +46,11 @@
     <li><a href="&base;/community/webresources.html">����� Web</a></li>
     <li><a href="&base;/community/social.html">��������� ������</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.developers "IGNORE">
-<![ %navinclude.developers; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.developers '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">����������� ��������</h2>
 
   <ul>
@@ -69,13 +63,11 @@
     <li><a href="&base;/projects/ideas/">����� ��� ��������</a></li>
     <li><a href="&base;/doc/en_US.ISO8859-1/articles/contributing/index.html">��� �� ������������</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.docs "IGNORE">
-<![ %navinclude.docs; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.docs '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">����������� ��������</h2>
 
   <ul>
@@ -89,13 +81,25 @@
     <li><a href="&base;/projects/newbies.html">��� ����� �������</a></li>
     <li><a href="&base;/docproj/">����� �����������</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<![ %beta.testing; [
+<!ENTITY beta.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">� ������� ������: &betarel.current;</a></li>
+'>
+]]>
+<!ENTITY beta.listitem ''>
+
+<![ %beta2.testing; [
+<!ENTITY beta2.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">� ������� ������: &betarel2.current;</a></li>
+'>
+]]>
+<!ENTITY beta2.listitem ''>
+
+<!ENTITY nav.download '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">����������� ��������</h2>
   <ul>
     <li><a href="&base;/where.html">��������� �� FreeBSD</a></li>
@@ -104,22 +108,16 @@
         <li><a href="&u.rel.announce;">������� ������: &rel.current;</a></li>
         <li><a href="&u.rel2.announce;">������� ������ (Legacy): &rel2.current;</a></li>
         <li><a href="&base;/snapshots/">�������� Snapshot</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>
-]]>
+	&beta.listitem;
+	&beta2.listitem;
       </ul></li>
     <li><a href="&base;/ports/">��������� ��� FreeBSD</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.gnome "IGNORE">
-<![ %navinclude.gnome; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.gnome '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">����������� ��������</h2>
 
   <ul>
@@ -143,13 +141,11 @@
         <li><a href="&base;/gnome/docs/faq226.html#q4">������ ����������</a></li>
       </ul></li>
     </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.ports "IGNORE">
-<![ %navinclude.ports; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.ports '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">����������� ��������</h2>
   <ul>
     <li><a href="&base;/ports/index.html">����������� ��� �� ports</a></li>
@@ -164,13 +160,11 @@
     <li><a href="&base;/ports/master-index.html">����� ���� ��� Ports</a></li>
     <li><a href="&base;/ports/references.html">������������ �����������</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.support "IGNORE">
-<![ %navinclude.support; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.support '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">����������� ��������</h2>
 
   <ul>
@@ -193,5 +187,5 @@
       </ul></li>
     <li><a href="&base;/support/webresources.html">����� Web</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
diff --git a/es_ES.ISO8859-1/share/sgml/navibar.l10n.ent b/es_ES.ISO8859-1/share/sgml/navibar.l10n.ent
index d7f3ae5bb4..63995c9335 100644
--- a/es_ES.ISO8859-1/share/sgml/navibar.l10n.ent
+++ b/es_ES.ISO8859-1/share/sgml/navibar.l10n.ent
@@ -4,10 +4,8 @@
 <!-- The FreeBSD Spanish Documentation Project
      Original Revision: r1.20					-->
 
-<!ENTITY % navinclude.about "IGNORE">
-<![ %navinclude.about; [
-<!ENTITY nav '
-<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
+<!ENTITY nav.about '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Navegaci�n por secciones</h2>
 
   <ul>
@@ -26,13 +24,11 @@
     <li><a href="&enbase;/donations/">Donaciones</a></li>
     <li><a href="&base;/copyright/">Copyright</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.community "IGNORE">
-<![ %navinclude.community; [
-<!ENTITY nav '
-<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
+<!ENTITY nav.community '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Navegaci�n por secci�n</h2>
 
   <ul>
@@ -44,13 +40,11 @@
     <li><a href="&enbase;/events/events.html">Eventos</a></li>
     <li><a href="&enbase;/community/webresources.html">Recursos web</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.developers "IGNORE">
-<![ %navinclude.developers; [
-<!ENTITY nav '
-<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
+<!ENTITY nav.developers '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Navegaci�n por secciones</h2>
 
   <ul>
@@ -63,20 +57,18 @@
     <li><a href="&enbase;/projects/ideas/">Ideas de proyectos</a></li>
     <li><a href="&enbase;/doc/es_ES.ISO8859-1/articles/contributing/index.html">Contribuir a FreeBSD</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.docs "IGNORE">
-<![ %navinclude.docs; [
-<!ENTITY nav '
-<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
+<!ENTITY nav.docs '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Navegaci�n por secciones</h2>
 
   <ul>
     <li><a href="&base;/docs.html">Documentaci�n</a></li>
     <li><a href="&enbase;/doc/es_ES.ISO8859-1/books/faq/">FAQ</a></li>
     <li><a href="&enbase;/doc/es_ES.ISO8859-1/books/handbook/">Manual de FreeBSD</a></li>
-    <li><a href="&cgibase;/man.cgi">Manuales en l�nea</a>
+    <li><a href="&cgibase;/man.cgi">Manuales en l�nea</a></li>
     <li><a href="&enbase;/docs/books.html">Libros y art�culos en l�nea</a></li>
     <li><a href="&base;/publish.html">Publicaciones</a></li>
     <li><a href="&enbase;/docs/webresources.html">Recursos web</a></li>
@@ -84,13 +76,25 @@
     <li><a href="&base;/docproj/">Proyecto de documentaci�n</a></li>
     <li><a href="&enbase;/doc/es_ES.ISO8859-1/articles/fdp-es/">Proyecto de documentaci�n en castellano</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '
-<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
+<![ %beta.testing; [
+<!ENTITY beta.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">Pr�xima release: &betarel.current;</a></li>
+'>
+]]>
+<!ENTITY beta.listitem ''>
+
+<![ %beta2.testing; [
+<!ENTITY beta2.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">Pr�xima release: &betarel2.current;</a></li>
+'>
+]]>
+<!ENTITY beta2.listitem ''>
+
+<!ENTITY nav.download '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Navegaci�n por secciones</h2>
   <ul>
     <li><a href="&base;/where.html">Descargar</a></li>
@@ -99,22 +103,16 @@
         <li><a href="&u.rel.announce;">Release stable: &rel.current;</a></li>
         <li><a href="&u.rel2.announce;">Release stable (heredera): &rel2.current;</a></li>
         <li><a href="&enbase;/snapshots/">Instant�neas:</a></li>
-<![ %beta.testing; [
-        <li><a href="&u.betarel.schedule;">Pr�xima release: &betarel.current;</a></li>
-]]>
-<![ %beta2.testing; [
-        <li><a href="&u.betarel2.schedule;">Pr�xima release: &betarel2.current;</a></li>
-]]>
+	&beta.listitem;
+	&beta2.listitem;
       </ul></li>
     <li><a href="&enbase;/ports/">Aplicaciones portadas</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.gnome "IGNORE">
-<![ %navinclude.gnome; [
-<!ENTITY nav '
-<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
+<!ENTITY nav.gnome '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Navegaci�n por secciones</h2>
 
   <ul>
@@ -138,13 +136,11 @@
         <li><a href="&base;/gnome/docs/faq222.html#q4">Problemas conocidos</a></li>
       </ul></li>
     </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.ports "IGNORE">
-<![ %navinclude.ports; [
-<!ENTITY nav '
-<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
+<!ENTITY nav.ports '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Navegaci�n por secciones</h2>
   <ul>
     <li><a href="&base;/ports/index.html">Sobre los ports</a></li>
@@ -159,13 +155,11 @@
     <li><a href="&base;/ports/master-index.html">Lista de todos los ports</a></li>
     <li><a href="&base;/ports/references.html">M�s informaci�n</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.support "IGNORE">
-<![ %navinclude.support; [
-<!ENTITY nav '
-<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
+<!ENTITY nav.support '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Navegaci�n por secciones</h2>
 
   <ul>
@@ -178,15 +172,15 @@
       <li><a href="&enbase;/commercial/isp.html">ISP</a></li>
       <li><a href="&enbase;/commercial/misc.html">Otros</a></li>
     </ul></li>
-    <li><a href="&base;/security/index.html">Informaci�n de seguridad</a></li>
-    <li><ul>
+    <li><a href="&base;/security/index.html">Informaci�n de seguridad</a>
+    <ul>
       <li><a href="&base;/security/advisories.html">Avisos</a></li>
     </ul></li>
     <li><a href="&enbase;/support/bugreports.html">Informes de error</a>
-      <li><ul>
+      <ul>
         <li><a href="&base;/send-pr.html">Enviar un informe de error</a></li>
       </ul></li>
     <li><a href="&enbase;/support/webresources.html">Recursos web</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
diff --git a/fr_FR.ISO8859-1/share/sgml/navibar.l10n.ent b/fr_FR.ISO8859-1/share/sgml/navibar.l10n.ent
index 14359bbf30..4800fa0d03 100644
--- a/fr_FR.ISO8859-1/share/sgml/navibar.l10n.ent
+++ b/fr_FR.ISO8859-1/share/sgml/navibar.l10n.ent
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- $FreeBSD$ -->
 
-<!ENTITY % navinclude.about "IGNORE">
-<![ %navinclude.about; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.about '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/about.html">A propos</a></li>
@@ -20,12 +19,11 @@
 <li><a href="&base;/donations/">Donations</a></li>
 <li><a href="&base;/copyright/">Informations l�gales</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.community "IGNORE">
-<![ %navinclude.community; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.community '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/community.html">Communaut�</a></li>
@@ -35,12 +33,11 @@
 <li><a href="&enbase;/usergroups.html">Groupes d&apos;utilisateurs</a></li>
 <li><a href="&base;/community/webresources.html">Ressources Web</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.developers "IGNORE">
-<![ %navinclude.developers; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.developers '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/projects/index.html">D�veloppement</a></li>
@@ -64,12 +61,11 @@
 </li>
 <li><a href="&enbase;/doc/&url.doc.langcode;/articles/contributing/index.html">Contribuer</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.docs "IGNORE">
-<![ %navinclude.docs; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.docs '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/docs.html">Documentation</a></li>
@@ -86,12 +82,25 @@
 <li><a href="&base;/projects/newbies.html">Pour les d�butants</a></li>
 <li><a href="&base;/docproj/">Projet de Documentation</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '<div id="SIDENAV">
+<![ %beta.testing; [
+<!ENTITY beta.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">Version � venir: &betarel.current;</a></li>
+'>
+]]>
+<!ENTITY beta.listitem ''>
+
+<![ %beta2.testing; [
+<!ENTITY beta2.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">Version � venir: &betarel2.current;</a></li>
+'>
+]]>
+<!ENTITY beta2.listitem ''>
+
+<!ENTITY nav.download '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/where.html">Obtenir FreeBSD</a></li>
@@ -100,22 +109,17 @@
 		<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�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>
-	      ]]>
+		&beta.listitem;
+		&beta2.listitem;
 	</ul>
 </li>
 <li><a href="&enbase;/ports/">Applications disponibles</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.gnome "IGNORE">
-<![ %navinclude.gnome; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.gnome '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/gnome/index.html">FreeBSD/GNOME</a>
@@ -137,12 +141,11 @@
 		<li><a href="&enbase;/gnome/docs/faq214.html#q5">Probl�mes connus</a></li>
 	</ul></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.ports "IGNORE">
-<![ %navinclude.ports; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.ports '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/ports/index.html">� propos des ports</a></li>
@@ -156,14 +159,13 @@
 	</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>
+<li><a href="&base;/ports/references.html">Pour Plus d&apos;Informations</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.support "IGNORE">
-<![ %navinclude.support; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.support '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/support.html">Support</a></li>
@@ -184,5 +186,5 @@
 </li>
 <li><a href="&base;/support.html#general">Ressources Web</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
diff --git a/hu_HU.ISO8859-2/share/sgml/navibar.l10n.ent b/hu_HU.ISO8859-2/share/sgml/navibar.l10n.ent
index 9f8500cd47..4d1faa84c0 100644
--- a/hu_HU.ISO8859-2/share/sgml/navibar.l10n.ent
+++ b/hu_HU.ISO8859-2/share/sgml/navibar.l10n.ent
@@ -7,10 +7,8 @@
      %SRCID%	1.31
 -->
 
-<!ENTITY % navinclude.about "IGNORE">
-<![ %navinclude.about; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.about '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Fejezetek k�zti navig�ci�</h2>
 
   <ul>
@@ -30,13 +28,11 @@
     <li><a href="&enbase;/donations/">Adom�nyok</a></li>
     <li><a href="&base;/copyright/">Jogi megjegyz�sek</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.community "IGNORE">
-<![ %navinclude.community; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.community '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Fejezetek k�zti navig�ci�</h2>
 
   <ul>
@@ -50,13 +46,11 @@
     <li><a href="&base;/community/webresources.html">Webes forr�sok</a></li>
     <li><a href="&enbase;/community/social.html">Ismerts�gi h�l�zatok</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.developers "IGNORE">
-<![ %navinclude.developers; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.developers '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Fejezetek k�zti navig�ci�</h2>
 
   <ul>
@@ -69,20 +63,18 @@
     <li><a href="&enbase;/projects/ideas/">Projekt�tletek</a></li>
     <li><a href="&enbase;/doc/en/articles/contributing/index.html">Hozz�j�rul�s</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.docs "IGNORE">
-<![ %navinclude.docs; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.docs '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Fejezetek k�zti navig�ci�</h2>
 
   <ul>
     <li><a href="&base;/docs.html">Dokument�ci�</a></li>
     <li><a href="&enbase;/doc/hu/books/faq/">GYIK</a></li>
     <li><a href="&enbase;/doc/hu/books/handbook/">K�zik�nyv</a></li>
-    <li><a href="&cgibase;/man.cgi">Man oldalak</a>
+    <li><a href="&cgibase;/man.cgi">Man oldalak</a></li>
     <li><a href="&base;/docs/books.html">K�nyvek �s cikkek</a></li>
     <li><a href="&enbase;/publish.html">Publik�ci�k</a></li>
     <li><a href="&base;/docs/webresources.html">Webes forr�sok</a></li>
@@ -90,13 +82,25 @@
     <li><a href="&base;/docproj/">Dokument�ci�s Projekt</a></li>
     <li><a href="&base;/docproj/hungarian.html">A Magyar Dokument�ci�s Projekt</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<![ %beta.testing; [
+<!ENTITY beta.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">K�vetkez� kiad�s: &betarel.current;</a></li>
+'>
+]]>
+<!ENTITY beta.listitem ''>
+
+<![ %beta2.testing; [
+<!ENTITY beta2.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">K�vetkez� kiad�s: &betarel2.current;</a></li>
+'>
+]]>
+<!ENTITY beta2.listitem ''>
+
+<!ENTITY nav.download '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Fejezetek k�zti navig�ci�</h2>
   <ul>
     <li><a href="&base;/where.html">A &os; let�lt�se</a></li>
@@ -105,22 +109,16 @@
         <li><a href="&u.rel.announce;">Stabil kiad�s: &rel.current;</a></li>
         <li><a href="&u.rel2.announce;">Stabil (kifut�) kiad�s: &rel2.current;</a></li>
         <li><a href="&enbase;/snapshots/">B�ta (id�k�zi) kiad�sok</a></li>
-<![ %beta.testing; [
-        <li><a href="&u.betarel.schedule;">K�vetkez� kiad�s: &betarel.current;</a></li>
-]]>
-<![ %beta2.testing; [
-        <li><a href="&u.betarel2.schedule;">K�vetkez� kiad�s: &betarel2.current;</a></li>
-]]>
+	&beta.listitem;
+	&beta2.listitem;
       </ul></li>
     <li><a href="&enbase;/ports/">Portolt alkalmaz�sok</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.gnome "IGNORE">
-<![ %navinclude.gnome; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.gnome '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Fejezetek k�zti navig�ci�</h2>
 
   <ul>
@@ -144,13 +142,11 @@
         <li><a href="&base;/gnome/docs/faq232.html#q4">Ismert probl�m�k</a></li>
       </ul></li>
     </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.ports "IGNORE">
-<![ %navinclude.ports; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.ports '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Fejezetek k�zti navig�ci�</h2>
   <ul>
     <li><a href="&base;/ports/index.html">A portokr�l</a></li>
@@ -165,13 +161,11 @@
     <li><a href="&base;/ports/master-index.html">Az �sszes port</a></li>
     <li><a href="&base;/ports/references.html">B�vebb inform�ci�</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.support "IGNORE">
-<![ %navinclude.support; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.support '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Fejezetek k�zti navig�ci�</h2>
 
   <ul>
@@ -186,19 +180,17 @@
 	<li><a href="&enbase;/commercial/misc.html">Egy�b</a></li>
       </ul>
     </li>
-    <li><a href="&base;/security/index.html">Biztons�gi tudnival�k</a></li>
-    <li>
+    <li><a href="&base;/security/index.html">Biztons�gi tudnival�k</a>
       <ul>
 	<li><a href="&base;/security/advisories.html">Biztons�gi figyelmeztet�sek</a></li>
       </ul>
     </li>
     <li><a href="&base;/support/bugreports.html">Hibajelent�sek</a>
-    <li>
       <ul>
 	<li><a href="&base;/send-pr.html">Hibajelent�sek k�ld�se</a></li>
       </ul>
     </li>
     <li><a href="&base;/support/webresources.html">Webes forr�sok</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
diff --git a/it_IT.ISO8859-15/share/sgml/navibar.l10n.ent b/it_IT.ISO8859-15/share/sgml/navibar.l10n.ent
index 6a1a2f8579..fdb3ad6290 100644
--- a/it_IT.ISO8859-15/share/sgml/navibar.l10n.ent
+++ b/it_IT.ISO8859-15/share/sgml/navibar.l10n.ent
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-15"?>
 <!-- $FreeBSD$ -->
 
-<!ENTITY % navinclude.about "IGNORE">
-<![ %navinclude.about; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.about '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Sezione di Navigazione</h2>
 <ul>
 <li><a href="&base;/about.html">Info</a></li>
@@ -20,12 +19,11 @@
 <li><a href="&enbase;/donations/">Donazioni</a></li>
 <li><a href="&base;/copyright/">Note Legali</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.community "IGNORE">
-<![ %navinclude.community; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.community '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Navigazione della Sezione</h2>
 <ul>
 <li><a href="&base;/community.html">Comunit�</a></li>
@@ -35,12 +33,11 @@
 <li><a href="&enbase;/usergroups.html">Gruppi Utenti</a></li>
 <li><a href="&enbase;/community/webresources.html">Risorse Web</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.developers "IGNORE">
-<![ %navinclude.developers; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.developers '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Navigazione della Sezione</h2>
 <ul>
 <li><a href="&enbase;/projects/index.html">Sviluppo</a></li>
@@ -65,12 +62,11 @@
 <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 -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.docs "IGNORE">
-<![ %navinclude.docs; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.docs '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Sezione di Navigazione</h2>
 <ul>
 <li><a href="&base;/docs.html">Documentazione</a></li>
@@ -89,12 +85,25 @@
 <li><a href="&enbase;/projects/newbies.html">Per i Neofiti</a></li>
 <li><a href="&enbase;/docproj/">Documentation Project</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '<div id="SIDENAV">
+<![ %beta.testing; [
+<!ENTITY beta.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">Prossima Release: &betarel.current;</a></li>
+'>
+]]>
+<!ENTITY beta.listitem ''>
+
+<![ %beta2.testing; [
+<!ENTITY beta2.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">Prossima Release: &betarel2.current;</a></li>
+'>
+]]>
+<!ENTITY beta2.listitem ''>
+
+<!ENTITY nav.download '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Navigazione della Sezione</h2>
 <ul>
 <li><a href="&base;/where.html">Ottenere FreeBSD</a></li>
@@ -103,26 +112,17 @@
 		<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>
-	      ]]>
+		&beta.listitem;
+		&beta2.listitem;
 	</ul>
 </li>
 <li><a href="&enbase;/ports/">Applicazioni Portate</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.gnome "IGNORE">
-<![ %navinclude.gnome; [
-]]>
-
-<!ENTITY % navinclude.ports "IGNORE">
-<![ %navinclude.ports; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.ports '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Sezione di Navigazione</h2>
 <ul>
 <li><a href="&base;/ports/index.html">Info sui port</a></li>
@@ -138,12 +138,11 @@
 <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 -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.support "IGNORE">
-<![ %navinclude.support; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.support '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Navigazione della Sezione</h2>
 <ul>
 <li><a href="&base;/support.html">Supporto</a></li>
@@ -164,5 +163,5 @@
 </li>
 <li><a href="&enbase;/support/webresources.html">Risorse Web</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
diff --git a/ja_JP.eucJP/share/sgml/navibar.l10n.ent b/ja_JP.eucJP/share/sgml/navibar.l10n.ent
index bbcab8741d..49010c4879 100644
--- a/ja_JP.eucJP/share/sgml/navibar.l10n.ent
+++ b/ja_JP.eucJP/share/sgml/navibar.l10n.ent
@@ -3,9 +3,8 @@
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.37 -->
 
-<!ENTITY % navinclude.about "IGNORE">
-<![ %navinclude.about; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.about '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/about.html">FreeBSD �Ȥ�</a></li>
@@ -25,12 +24,11 @@
 <li><a href="&base;/copyright/">ˡΧ������ջ���</a></li>
 <li><a href="&enbase;/privacy.html">�ץ饤�Х����ݥꥷ��</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.community "IGNORE">
-<![ %navinclude.community; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.community '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/community.html">���ߥ�˥ƥ�</a></li>
@@ -43,12 +41,11 @@
 <li><a href="&base;/community/webresources.html">�����־�ξ���</a></li>
 <li><a href="&enbase;/community/social.html">���������ͥåȥ��</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.developers "IGNORE">
-<![ %navinclude.developers; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.developers '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/projects/index.html">��ȯ</a></li>
@@ -60,12 +57,11 @@
 <li><a href="http://wiki.freebsd.org/IdeasPage">�ץ��������ȥ����ǥ���</a></li>
 <li><a href="&enbase;/doc/&url.doc.langcode;/articles/contributing/index.html">��ȯ�ؤζ���</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.docs "IGNORE">
-<![ %navinclude.docs; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.docs '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/docs.html">�ɥ������</a></li>
@@ -78,42 +74,46 @@
 <li><a href="&base;/projects/newbies.html">���Ƥ��������ξ���</a></li>
 <li><a href="&base;/docproj/">�ɥ�����ơ������ץ���������</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<![ %beta.testing; [
+<!ENTITY beta.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">�����꡼��ͽ��: &betarel.current;</a></li>
+'>
+]]>
+<!ENTITY beta.listitem ''>
+
+<![ %beta2.testing; [
+<!ENTITY beta2.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">�����꡼��ͽ��: &betarel2.current;</a></li>
+'>
+]]>
+<!ENTITY beta2.listitem ''>
+
+<!ENTITY nav.download '
+<div xmlns="http://www.w3.org/1999/xhtml" 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> <a href="&u.rel2.announce;">&rel2.current;</a></li>
-	<li>�ץ���������� (����) ��꡼��:<br>
+	<li>�ץ���������� (����) ��꡼��:<br/>
 	      <a href="&u.rel3.announce;">&rel3.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>
-]]>
+	&beta.listitem;
+	&beta2.listitem;
       </ul></li>
     <li><a href="&base;/ports/">ports �˼�Ͽ����Ƥ��륢�ץꥱ�������</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.gnome "IGNORE">
-<![ %navinclude.gnome; [
-]]>
+<!ENTITY nav.gnome ''>
 
-<!ENTITY % navinclude.ports "IGNORE">
-<![ %navinclude.ports; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.ports '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Section Navigation</h2>
   <ul>
     <li><a href="&base;/ports/index.html">ports �ˤĤ���</a></li>
@@ -128,12 +128,11 @@
     <li><a href="&base;/ports/master-index.html">���٤Ƥ� ports ����</a></li>
     <li><a href="&base;/ports/references.html">����¾�ξ���</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.support "IGNORE">
-<![ %navinclude.support; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.support '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/support.html">���ݡ���</a></li>
@@ -159,5 +158,5 @@
 </li>
 <li><a href="&base;/support/webresources.html">�����־�ξ���</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
diff --git a/nl_NL.ISO8859-1/share/sgml/navibar.l10n.ent b/nl_NL.ISO8859-1/share/sgml/navibar.l10n.ent
index ccf0d7ec6e..ba2dad647a 100644
--- a/nl_NL.ISO8859-1/share/sgml/navibar.l10n.ent
+++ b/nl_NL.ISO8859-1/share/sgml/navibar.l10n.ent
@@ -5,10 +5,8 @@
      %SRCID%	38826
  -->
 
-<!ENTITY % navinclude.about "IGNORE">
-<![ %navinclude.about; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.about '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Sectienavigatie</h2>
 
   <ul>
@@ -29,13 +27,11 @@
     <li><a href="&enbase;/copyright/">Wettelijke mededelingen</a></li>
     <li><a href="&base;/privacy.html">Privacybeleid</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.community "IGNORE">
-<![ %navinclude.community; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.community '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Sectienavigatie</h2>
 
   <ul>
@@ -49,13 +45,11 @@
     <li><a href="&enbase;/community/webresources.html">Bronnen op het web</a></li>
     <li><a href="&enbase;/community/social.html">Sociale netwerken</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.developers "IGNORE">
-<![ %navinclude.developers; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.developers '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Sectienavigatie</h2>
 
   <ul>
@@ -68,13 +62,11 @@
     <li><a href="http://wiki.FreeBSD.org/IdeasPage">Projectidee�n</a></li>
     <li><a href="&enbase;/doc/nl_NL.ISO8859-1/articles/contributing/index.html">Bijdragen</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.docs "IGNORE">
-<![ %navinclude.docs; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.docs '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Sectienavigatie</h2>
 
   <ul>
@@ -88,38 +80,44 @@
     <li><a href="&enbase;/projects/newbies.html">Voor nieuwelingen</a></li>
     <li><a href="&enbase;/docproj/">Documentatieproject</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<![ %beta.testing; [
+<!ENTITY beta.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">Aankomende uitgave: &betarel.current;</a></li>
+'>
+]]>
+<!ENTITY beta.listitem ''>
+
+<![ %beta2.testing; [
+<!ENTITY beta2.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">Aankomende uitgave: &betarel2.current;</a></li>
+'>
+]]>
+<!ENTITY beta2.listitem ''>
+
+<!ENTITY nav.download '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Sectienavigatie</h2>
   <ul>
     <li><a href="&base;/where.html">Verkrijg &os;</a></li>
     <li><a href="&enbase;/releases/">Uitgave-informatie</a>
       <ul>
 	<li>Productie-uitgave: <a href="&u.rel.announce;">&rel.current;</a> <a href="&u.rel2.announce;">&rel2.current;</a></li>
-	<li>Productie-uitgave (ouder):<br>
+	<li>Productie-uitgave (ouder):<br/>
 	  <a href="&u.rel3.announce;">&rel3.current;</a></li>
         <li><a href="&enbase;/snapshots/">Snapshot-uitgaven</a></li>
-<![ %beta.testing; [
-        <li><a href="&u.betarel.schedule;">Aankomende uitgave: &betarel.current;</a></li>
-]]>
-<![ %beta2.testing; [
-        <li><a href="&u.betarel2.schedule;">Aankomende uitgave: &betarel2.current;</a></li>
-]]>
+	&beta.listitem;
+	&beta2.listitem;
       </ul></li>
     <li><a href="&enbase;/ports/">Geporteerde toepassingen</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.gnome "IGNORE">
-<![ %navinclude.gnome; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.gnome '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Sectienavigatie</h2>
 
   <ul>
@@ -143,13 +141,11 @@
         <li><a href="&enbase;/gnome/docs/faq232.html#q4">Bekende problemen</a></li>
       </ul></li>
     </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.ports "IGNORE">
-<![ %navinclude.ports; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.ports '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Sectienavigatie</h2>
   <ul>
     <li><a href="&enbase;/ports/index.html">Over ports</a></li>
@@ -164,13 +160,11 @@
     <li><a href="&enbase;/ports/master-index.html">Lijst van alle ports</a></li>
     <li><a href="&enbase;/ports/references.html">Voor meer informatie</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.support "IGNORE">
-<![ %navinclude.support; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.support '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Sectienavigatie</h2>
 
   <ul>
@@ -194,5 +188,5 @@
       </ul></li>
     <li><a href="&enbase;/support/webresources.html">Bronnen op het web</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
diff --git a/ru_RU.KOI8-R/share/sgml/navibar.l10n.ent b/ru_RU.KOI8-R/share/sgml/navibar.l10n.ent
index 71b13cf354..179698f9ca 100644
--- a/ru_RU.KOI8-R/share/sgml/navibar.l10n.ent
+++ b/ru_RU.KOI8-R/share/sgml/navibar.l10n.ent
@@ -7,9 +7,8 @@
      Original revision: 1.36
 -->
 
-<!ENTITY % navinclude.about "IGNORE">
-<![ %navinclude.about; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.about '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">��������� �� �������</h2>
 <ul>
 <li><a href="&base;/about.html">� FreeBSD</a></li>
@@ -29,12 +28,11 @@
 <li><a href="&base;/copyright/">����������� ���������</a></li>
 <li><a href="&enbase;/privacy.html">�������� ������������������</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.community "IGNORE">
-<![ %navinclude.community; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.community '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">��������� �� �������</h2>
 <ul>
 <li><a href="&base;/community.html">����������</a></li>
@@ -47,12 +45,11 @@
 <li><a href="&base;/community/webresources.html">Web �������</a></li>
 <li><a href="&base;/community/social.html">���������� ����</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.developers "IGNORE">
-<![ %navinclude.developers; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.developers '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">��������� �� �������</h2>
 <ul>
 <li><a href="&base;/projects/index.html">������������</a></li>
@@ -64,12 +61,11 @@
 <li><a href="http://wiki.freebsd.org/IdeasPage">���� ��� �������</a></li>
 <li><a href="&enbase;/doc/&url.doc.langcode;/articles/contributing/index.html">���������� �������</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.docs "IGNORE">
-<![ %navinclude.docs; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.docs '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">��������� �� �������</h2>
 <ul>
 <li><a href="&base;/docs.html">������������</a></li>
@@ -82,12 +78,25 @@
 <li><a href="&base;/projects/newbies.html">��� ��������</a></li>
 <li><a href="&base;/docproj/">������ ����������������</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '<div id="SIDENAV">
+<![ %beta.testing; [
+<!ENTITY beta.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">����������� �����: &betarel.current;</a></li>
+'>
+]]>
+<!ENTITY beta.listitem ''>
+
+<![ %beta2.testing; [
+<!ENTITY beta2.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">����������� �����: &betarel2.current;</a></li>
+'>
+]]>
+<!ENTITY beta2.listitem ''>
+
+<!ENTITY nav.download '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">��������� �� �������</h2>
 <ul>
 <li><a href="&base;/where.html">�������� FreeBSD</a></li>
@@ -97,27 +106,17 @@
 		  <a href="&u.rel2.announce;">&rel2.current;</a></li>
 		<li>(������) ������������ �����: <a href="&u.rel3.announce;">&rel3.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>
-              ]]>
+		&beta.listitem;
+		&beta2.listitem;
 	</ul>
 </li>
 <li><a href="&base;/ports/">������������� ����������</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.gnome "IGNORE">
-<![ %navinclude.gnome; [
-]]>
-
-<!ENTITY % navinclude.ports "IGNORE">
-<![ %navinclude.ports; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.ports '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Section Navigation</h2>
   <ul>
     <li><a href="&base;/ports/index.html">� ������</a></li>
@@ -132,12 +131,11 @@
     <li><a href="&base;/ports/master-index.html">������ ���� ������</a></li>
     <li><a href="&enbase;/ports/references.html">������ ����������</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.support "IGNORE">
-<![ %navinclude.support; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.support '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">��������� �� �������</h2>
 <ul>
 <li><a href="&base;/support.html">���������</a></li>
@@ -163,5 +161,5 @@
 </li>
 <li><a href="&base;/support/webresources.html">Web �������</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
diff --git a/share/sgml/navibar.ent b/share/sgml/navibar.ent
index eb1f9635be..5774b8afc9 100644
--- a/share/sgml/navibar.ent
+++ b/share/sgml/navibar.ent
@@ -74,6 +74,20 @@
   </ul>
 </div> <!-- SIDENAV -->'>
 
+<![ %beta.testing; [
+<!ENTITY beta.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">Upcoming Release: &betarel.current;</a></li>
+'>
+]]>
+<!ENTITY beta.listitem ''>
+
+<![ %beta2.testing; [
+<!ENTITY beta2.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">Upcoming Release: &betarel2.current;</a></li>
+'>
+]]>
+<!ENTITY beta2.listitem ''>
+
 <!ENTITY nav.download '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Section Navigation</h2>
@@ -85,6 +99,8 @@
         <li>Production (Legacy) Release:<br />
 	  <a href="&u.rel3.announce;">&rel3.current;</a></li>
         <li><a href="&base;/snapshots/">Snapshot Releases</a></li>
+	&beta.listitem;
+	&beta2.listitem;
       </ul></li>
     <li><a href="&base;/ports/">Ported Applications</a></li>
   </ul>
diff --git a/tr_TR.ISO8859-9/share/sgml/navibar.l10n.ent b/tr_TR.ISO8859-9/share/sgml/navibar.l10n.ent
index ab0fbe2c92..b5b4598cf9 100644
--- a/tr_TR.ISO8859-9/share/sgml/navibar.l10n.ent
+++ b/tr_TR.ISO8859-9/share/sgml/navibar.l10n.ent
@@ -1,34 +1,2 @@
 <?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.GB2312/share/sgml/navibar.l10n.ent b/zh_CN.GB2312/share/sgml/navibar.l10n.ent
index 92afa782b7..4e276d0cef 100644
--- a/zh_CN.GB2312/share/sgml/navibar.l10n.ent
+++ b/zh_CN.GB2312/share/sgml/navibar.l10n.ent
@@ -4,9 +4,8 @@
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
 <!-- From FreeBSD: www/share/sgml/navibar.ent,v 1.12 2007/09/12 02:11:47 bland -->
 
-<!ENTITY % navinclude.about "IGNORE">
-<![ %navinclude.about; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.about '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/about.html">����</a></li>
@@ -24,12 +23,11 @@
 <li><a href="&base;/donations/">����</a></li>
 <li><a href="&base;/copyright/">������֪</a></li>
 </ul>
-</div> <!-- sidenav -->'>
-]]>
+</div> <!-- sidenav -->
+'>
 
-<!ENTITY % navinclude.community "IGNORE">
-<![ %navinclude.community; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.community '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/community.html">����</a></li>
@@ -39,12 +37,11 @@
 <li><a href="&enbase;/usergroups.html">�û���</a></li>
 <li><a href="&enbase;/community/webresources.html">Web ��Դ</a></li>
 </ul>
-</div> <!-- sidenav -->'>
-]]>
+</div> <!-- sidenav -->
+'>
 
-<!ENTITY % navinclude.developers "IGNORE">
-<![ %navinclude.developers; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.developers '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&enbase;/projects/index.html">����</a></li>
@@ -69,12 +66,11 @@
 <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 -->'>
-]]>
+</div> <!-- sidenav -->
+'>
 
-<!ENTITY % navinclude.docs "IGNORE">
-<![ %navinclude.docs; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.docs '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/docs.html">�ĵ�</a></li>
@@ -88,12 +84,25 @@
 <li><a href="&enbase;/projects/newbies.html">������·</a></li>
 <li><a href="&enbase;/docproj/">FreeBSD �ĵ��ƻ�</a></li>
 </ul>
-</div> <!-- sidenav -->'>
-]]>
+</div> <!-- sidenav -->
+'>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '<div id="SIDENAV">
+<![ %beta.testing; [
+<!ENTITY beta.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">�������İ汾��: &betarel.current;</a></li>
+'>
+]]>
+<!ENTITY beta.listitem ''>
+
+<![ %beta2.testing; [
+<!ENTITY beta2.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">�������İ汾��: &betarel2.current;</a></li>
+'>
+]]>
+<!ENTITY beta2.listitem ''>
+
+<!ENTITY nav.download '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/where.html">��� FreeBSD</a></li>
@@ -102,26 +111,19 @@
 		<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>
-	      ]]>
+		&beta.listitem;
+		&beta2.listitem;
 	</ul>
 </li>
 <li><a href="&enbase;/ports/">��ֲ��Ӧ�ó��� (ports)</a></li>
 </ul>
-</div> <!-- sidenav -->'>
-]]>
+</div> <!-- sidenav -->
+'>
 
-<!ENTITY % navinclude.gnome "IGNORE">
-<![ %navinclude.gnome; [
-]]>
+<!ENTITY nav.gnome ''>
 
-<!ENTITY % navinclude.ports "IGNORE">
-<![ %navinclude.ports; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.ports '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&enbase;/ports/index.html">���� ports</a></li>
@@ -137,12 +139,11 @@
 <li><a href="&enbase;/ports/master-index.html">ȫ�� Ports</a></li>
 <li><a href="&enbase;/ports/references.html">������Ϣ</a></li>
 </ul>
-</div> <!-- sidenav -->'>
-]]>
+</div> <!-- sidenav -->
+'>
 
-<!ENTITY % navinclude.support "IGNORE">
-<![ %navinclude.support; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.support '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&enbase;/support.html">֧��</a></li>
@@ -163,5 +164,5 @@
 </li>
 <li><a href="&enbase;/support/webresources.html">Web ��Դ</a></li>
 </ul>
-</div> <!-- sidenav -->'>
-]]>
+</div> <!-- sidenav -->
+'>
diff --git a/zh_TW.Big5/share/sgml/navibar.l10n.ent b/zh_TW.Big5/share/sgml/navibar.l10n.ent
index 75b5308bb3..0759774041 100644
--- a/zh_TW.Big5/share/sgml/navibar.l10n.ent
+++ b/zh_TW.Big5/share/sgml/navibar.l10n.ent
@@ -5,9 +5,8 @@
   Original Revision: 1.11
 -->
 
-<!ENTITY % navinclude.about "IGNORE">
-<![ %navinclude.about; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.about '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/about.html">����</a></li>
@@ -24,12 +23,11 @@
 <li><a href="&base;/donations/">����</a></li>
 <li><a href="&base;/copyright/">�k�߶���</a></li>
 </ul>
-</div> <!-- sidenav -->'>
-]]>
+</div> <!-- sidenav -->
+'>
 
-<!ENTITY % navinclude.community "IGNORE">
-<![ %navinclude.community; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.community '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/community.html">���s</a></li>
@@ -39,12 +37,11 @@
 <li><a href="&enbase;/usergroups.html">�R�Ϊ̲�´</a></li>
 <li><a href="&enbase;/community/webresources.html">Web �귽</a></li>
 </ul>
-</div> <!-- sidenav -->'>
-]]>
+</div> <!-- sidenav -->
+'>
 
-<!ENTITY % navinclude.developers "IGNORE">
-<![ %navinclude.developers; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.developers '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&enbase;/projects/index.html">�}�o</a></li>
@@ -69,12 +66,11 @@
 <li><a href="&base;/projects/ideas/">�s�I�l�p��</a></li>
 <li><a href="&enbase;/doc/zh_TW.Big5/articles/contributing/index.html">�� FreeBSD �������U</a></li>
 </ul>
-</div> <!-- sidenav -->'>
-]]>
+</div> <!-- sidenav -->
+'>
 
-<!ENTITY % navinclude.docs "IGNORE">
-<![ %navinclude.docs; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.docs '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/docs.html">���</a></li>
@@ -88,12 +84,25 @@
 <li><a href="&enbase;/projects/newbies.html">�s��W��</a></li>
 <li><a href="&enbase;/docproj/">FreeBSD ���p��</a></li>
 </ul>
-</div> <!-- sidenav -->'>
-]]>
+</div> <!-- sidenav -->
+'>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '<div id="SIDENAV">
+<![ %beta.testing; [
+<!ENTITY beta.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">�Y�N�o�G: &betarel.current;</a></li>
+'>
+]]>
+<!ENTITY beta.listitem ''>
+
+<![ %beta2.testing; [
+<!ENTITY beta2.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">�Y�N�o�G: &betarel2.current;</a></li>
+'>
+]]>
+<!ENTITY beta2.listitem ''>
+
+<!ENTITY nav.download '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/where.html">���o FreeBSD</a></li>
@@ -102,26 +111,17 @@
 		<li><a href="&enbase;/&u.rel.announce;">Production Release: &rel.current;</a></li>
 		<li><a href="&enbase;/&u.rel2.announce;">Production Release(�¦�): &rel2.current;</a></li>
 		<li><a href="&enbase;/snapshots/">Snapshot Releases</a></li>
-	      <![ %beta.testing; [
-		<li><a href="&enbase;/&u.betarel.schedule;">�Y�N�o�G: &betarel.current;</a></li>
-	      ]]>
-	      <![ %beta2.testing; [
-		<li><a href="&u.betarel2.schedule;">�Y�N�o�G: &betarel2.current;</a></li>
-	      ]]>
+		&beta.listitem;
+		&beta2.listitem;
 	</ul>
 </li>
 <li><a href="&enbase;/ports/">���Ӫ����ε{��(ports)</a></li>
 </ul>
-</div> <!-- sidenav -->'>
-]]>
+</div> <!-- sidenav -->
+'>
 
-<!ENTITY % navinclude.gnome "IGNORE">
-<![ %navinclude.gnome; [
-]]>
-
-<!ENTITY % navinclude.ports "IGNORE">
-<![ %navinclude.ports; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.ports '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&enbase;/ports/index.html">���� ports</a></li>
@@ -137,12 +137,11 @@
 <li><a href="&enbase;/ports/master-index.html">���� Ports</a></li>
 <li><a href="&enbase;/ports/references.html">��h��T</a></li>
 </ul>
-</div> <!-- sidenav -->'>
-]]>
+</div> <!-- sidenav -->
+'>
 
-<!ENTITY % navinclude.support "IGNORE">
-<![ %navinclude.support; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.support '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&enbase;/support.html">�䴩</a></li>
@@ -163,5 +162,6 @@
 </li>
 <li><a href="&enbase;/support/webresources.html">Web �귽</a></li>
 </ul>
-</div> <!-- sidenav -->'>
-]]>
+</div> <!-- sidenav -->
+'>
+