diff --git a/share/sgml/freebsd.ent b/share/sgml/freebsd.ent
index a737d8d75b..129eaef687 100644
--- a/share/sgml/freebsd.ent
+++ b/share/sgml/freebsd.ent
@@ -1,64 +1,69 @@
 <!-- -*- sgml -*-
      DocBook Miscellaneous FreeBSD Entities.
 
      $FreeBSD$
+
+This file is now valid XML as well as SGML.  Please do not add CDATA
+attributes or anything else that will prevent this file from being
+used in both environments.
+
 -->
 
 <!-- These will almost certainly remain the same, but are here for
      consistency and in case we ever want to make hyperlinks out of
      some of them. -->
 <!ENTITY os "FreeBSD">
 <!ENTITY os.current "&os;-CURRENT">
 <!ENTITY os.stable "&os;-STABLE">
 
 <!--
-  Use this entity when refering to 'UNIX' in your document.
+  Use this entity when referring to 'UNIX' in your document.
 -->
 <!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
 <!ENTITY nis "<acronym role='Network Information System'>NIS</acronym>">
 
 <!-- Use an entity to define these exactly so that the print output
      stylesheets know what to look for and can format these properly with
      TeX commands. -->
 
 <!ENTITY tex '<application>TeX</application>'>
 <!ENTITY latex '<application>LaTeX</application>'>
 
 <!-- Use an entity for the X.Org X server -->
 
 <!ENTITY xorg "Xorg">
 
 <!-- The currently released version of FreeBSD.  This value is used to
      create some links on web sites and such, so do NOT change it until
      it's really release time -->
-<!ENTITY rel.current CDATA "5.2.1">
-<!ENTITY rel.current.date CDATA "February 2004">
+<!ENTITY rel.current "5.2.1">
+<!ENTITY rel.current.date "February 2004">
 <!ENTITY rel.current.notes 'http://www.FreeBSD.org/releases/&rel.current;R/notes.html'>
 <!ENTITY rel.current.hardware 'http://www.FreeBSD.org/releases/&rel.current;R/hardware.html'>
 <!ENTITY rel.current.errata 'http://www.FreeBSD.org/releases/&rel.current;R/errata.html'>
 
 <!-- Entities for multiple "latest" versions of FreeBSD -->
-<!ENTITY rel2.current CDATA "4.10">
-<!ENTITY rel2.current.date CDATA "May 2004">
+<!ENTITY rel2.current "4.10">
+<!ENTITY rel2.current.date "May 2004">
 <!ENTITY rel2.current.notes 'http://www.FreeBSD.org/releases/&rel2.current;R/notes.html'>
 <!ENTITY rel2.current.hardware 'http://www.FreeBSD.org/releases/&rel2.current;R/hardware.html'>
 <!ENTITY rel2.current.errata 'http://www.FreeBSD.org/releases/&rel2.current;R/errata.html'>
 
 <!-- Entities for the snapshots -->
 <!ENTITY snapshots.stable
   'ftp://snapshots.jp.freebsd.org/pub/FreeBSD/snapshots/i386/4-LATEST'>
 <!ENTITY snapshots.current
   'ftp://snapshots.jp.freebsd.org/pub/FreeBSD/snapshots/i386/5-LATEST'>
 
 <!-- Sections that we don't want to be published -->
 <!ENTITY % not.published 	"IGNORE">
 
 <!-- Number of ports in the ports tree -->
 <!ENTITY os.numports "10,500">
 <!ENTITY ports.size "300&nbsp;MB">
 
 <!-- GUI-buttons -->
 <!ENTITY gui.ok "<guibutton>[&nbsp;OK&nbsp;]</guibutton>">
 <!ENTITY gui.cancel "<guibutton>[&nbsp;Cancel&nbsp;]</guibutton>">
 <!ENTITY gui.yes "<guibutton>[&nbsp;Yes&nbsp;]</guibutton>">
 <!ENTITY gui.no "<guibutton>[&nbsp;No&nbsp;]</guibutton>">