[HEADSUP] Merging DocBook 5.0 update

[Warren Block]

Some automated conversions in the FDP Primer had problems.  <tag> is not 
allowed inside <literal>, so some of the entities in the FreeBSD 
Entities table lost their markup.

Is there a better solution than using < and >?

Example:

   Usage:  <literal>The manual page for
   <command>cp</command> is &man.cp.1;.</literal>

The usage is supposed to show exactly what the user would enter.  This 
does not work:

   Usage:  <literal>The manual page for
   <tag class="starttag">command</tag>cp<tag class="endtag">command</tag>
   is &man.cp.1;.</literal>

It gives:

element literal: validity error : Element tag is not declared in literal list of possible children