diff --git a/sr_YU.ISO8859-2/articles/dialup-firewall/article.sgml b/sr_YU.ISO8859-2/articles/dialup-firewall/article.sgml
index 8cdc345fb2..9a127316ae 100644
--- a/sr_YU.ISO8859-2/articles/dialup-firewall/article.sgml
+++ b/sr_YU.ISO8859-2/articles/dialup-firewall/article.sgml
@@ -1,3 +1,11 @@
+
+<?xml version="1.0" encoding="ISO-8859-2" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//SR" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
      The FreeBSD Documentation Project
 
@@ -5,12 +13,7 @@
      Original revision: 1.7
 -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-]>
-
-<article>
+<article lang='sr'>
   <articleinfo>
     <title>Dialup-firewalling sa FreeBSD-om</title>
 
@@ -25,7 +28,9 @@
       </author>
     </authorgroup>
 
-    <pubdate>$Date: 2002-02-06 17:01:34 $</pubdate>
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
 
     <abstract>
       <para>Ovaj članak dokumentuje kako podesiti firewall koristeći PPP dialup
@@ -44,7 +49,7 @@ pode
 	podesio firewall na FreeBSD-u u slučaju kada imate dinamički
 	dodeljenu IP adresu. Mnogo truda je bilo uloženo u to da ovaj
 	dokument budeš što informativniji i tačniji, svaki vaš
-	komentar/sugestija <ulink URL="mailto:marcs@draenor.org">autoru</ulink> je 
+	komentar/sugestija <ulink url="mailto:marcs@draenor.org">autoru</ulink> je 
 	dobrodošla.</para>
    </sect1>
 
@@ -55,7 +60,7 @@ pode
 	FreeBSD-a. Ako vam je potrebno više informacija o tome kako da
 	rekompajlirate kernel, onda je svakako najbolje mesto da počnete poglavlje 
 	o konfigurisanju kernela u <ulink
-    URL="http://www.freebsd.org/handbook/kernelconfig.html">Priričniku</ulink>.
+    url="http://www.freebsd.org/handbook/kernelconfig.html">Priričniku</ulink>.
 	Morate iskompajlirati kernel sa sledećim opcijama:</para>
 
     <variablelist>
diff --git a/sr_YU.ISO8859-2/articles/diskless-x/article.sgml b/sr_YU.ISO8859-2/articles/diskless-x/article.sgml
index af34c2428c..41d8861aa4 100644
--- a/sr_YU.ISO8859-2/articles/diskless-x/article.sgml
+++ b/sr_YU.ISO8859-2/articles/diskless-x/article.sgml
@@ -1,15 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-2" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//SR" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
      The FreeBSD Documentation Project
 
      $FreeBSD$
 -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-]>
-
 <article lang="sr">
   <articleinfo>
     <title>Diskless X Server: "how to" vodič</title>
@@ -31,6 +32,8 @@
       <year>1996</year>
       <holder>Jerry Kendall</holder>
     </copyright>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
     
     <abstract>
       <para>Uz pomoć nekih prijatelja sa FreeBSD-hackers liste, napravio
@@ -132,7 +135,7 @@ nb8390.com
       <filename>nb8390.com</filename>.</para>
     
     <screen><prompt>C:&gt;</prompt> <userinput>cd \netboot</userinput>
-<prompt>C:&gt</prompt> <userinput>nb8390</userinput>
+<prompt>C:&gt;</prompt> <userinput>nb8390</userinput>
 
 <prompt>Boot from Network (Y/N) ?</prompt>  <userinput>Y</userinput>
 
@@ -328,7 +331,7 @@ export PATH
 # mount the /usr filesystem via NFS
 /sbin/mount antares:/DiskLess/usr /usr
 #
-/usr/X11R6/bin/XF86_SVGA -query antares -xf86config /etc/XF86Config.altair >/dev/null 2>&1
+/usr/X11R6/bin/XF86_SVGA -query antares -xf86config /etc/XF86Config.altair >/dev/null 2&gt;&amp;1
 #
 # Reboot after X exits
 /sbin/reboot
diff --git a/sr_YU.ISO8859-2/share/sgml/bookinfo.ent b/sr_YU.ISO8859-2/share/sgml/bookinfo.ent
deleted file mode 100644
index 5587c3bebd..0000000000
--- a/sr_YU.ISO8859-2/share/sgml/bookinfo.ent
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--
-     References to other files that can be included within a DocBook
-     BookInfo element.
-
-     Entity names take the form "bookinfo.<element>", where <element> is
-     the name of the outermost element in the entity.  Examples would
-     be "bookinfo.legalnotice", and "bookinfo.preface".
-
-     $FreeBSD$
--->
-
-<!ENTITY bookinfo.legalnotice SYSTEM "legalnotice.sgml">
diff --git a/sr_YU.ISO8859-2/share/sgml/entities.ent b/sr_YU.ISO8859-2/share/sgml/entities.ent
new file mode 100644
index 0000000000..b4c55ae637
--- /dev/null
+++ b/sr_YU.ISO8859-2/share/sgml/entities.ent
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO8859-1"?>
+<!-- $FreeBSD$ -->
+
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+%freebsd;
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+%l10n;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+%mailing-lists;
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+%newsgroups;
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+%teams;
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
diff --git a/sr_YU.ISO8859-2/share/sgml/legalnotice.sgml b/sr_YU.ISO8859-2/share/sgml/legalnotice.sgml
deleted file mode 100644
index ecb8ba6cee..0000000000
--- a/sr_YU.ISO8859-2/share/sgml/legalnotice.sgml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!-- 
-     Standard FreeBSD Documentation Project Legal Notice.
-
-     $FreeBSD$
--->
-
-<legalnotice>
-  <para>Redistribution and use in source (SGML DocBook) and 'compiled'
-    forms (SGML, HTML, PDF, PostScript, RTF and so forth) with or without
-    modification, are permitted provided that the following conditions are
-    met:</para>
-
-  <orderedlist>
-    <listitem>
-      <para>Redistributions of source code (SGML DocBook) must retain the
-        above copyright notice, this list of conditions and the following
-        disclaimer as the first lines of this file unmodified.</para>
-    </listitem>
-
-    <listitem>
-      <para>Redistributions in compiled form (transformed to other DTDs,
-        converted to PDF, PostScript, RTF and other formats) must
-        reproduce the above copyright notice, this list of conditions and
-        the following disclaimer in the documentation and/or other
-        materials provided with the distribution.</para>
-    </listitem>
-  </orderedlist>
-
-  <important>
-    <para>THIS DOCUMENTATION IS PROVIDED BY THE FREEBSD DOCUMENTATION 
-      PROJECT "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-      BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
-      FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
-      THE FREEBSD DOCUMENTATION PROJECT BE LIABLE FOR ANY DIRECT, INDIRECT, 
-      INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-      BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS 
-      OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-      ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR 
-      TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
-      USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-      DAMAGE.</para>
-  </important>
-</legalnotice>
-