13 files changed, 522 insertions, 563 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 -->
+'>
+
+<![ %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 ''>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '<div id="SIDENAV">
+<![ %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 -->
+'>
+
+<![ %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 % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!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 -->
+'>
+
+<![ %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 ''>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '
-<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
+<![ %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 -->
+'>
+
+<![ %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 % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '<div id="SIDENAV">
+<!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 -->
+'>
+
+<![ %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 ''>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<![ %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 -->
+'>
+
+<![ %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 % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '<div id="SIDENAV">
+<!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 -->'>
-]]>
-
-<!ENTITY % navinclude.gnome "IGNORE">
-<![ %navinclude.gnome; [
-]]>
+</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">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 -->
+'>
+
+<![ %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 % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!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 -->
+'>
+
+<![ %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 % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!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 -->
+'>
+
+<![ %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 % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '<div id="SIDENAV">
+<!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 -->'>
-]]>
-
-<!ENTITY % navinclude.gnome "IGNORE">
-<![ %navinclude.gnome; [
-]]>
+</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">ï ÐÏÒÔÁÈ</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 -->
+'>
+
+<![ %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 % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '<div id="SIDENAV">
+<!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 -->
+'>
+
+<![ %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 % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '<div id="SIDENAV">
+<!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 -->'>
-]]>
-
-<!ENTITY % navinclude.gnome "IGNORE">
-<![ %navinclude.gnome; [
-]]>
+</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="&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 -->
+'>
+