Minimal changes to move manual.xml into doc-en.

Author: André L F S Bacci

manual.xml

@@ -1,34 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE PHPDOC [
 
-<!-- Parameter entities used to configure manual.xml -->
-<!ENTITY % configure         SYSTEM "./temp/manual.inc">
+<!ENTITY % configure SYSTEM "../conf.ent">
 %configure;
 
-<!-- Entities collected by entities.php -->
-<!ENTITY % manual-entities   SYSTEM "./temp/entities.ent">
-%manual-entities;
+%text-entities;
 
-<!-- Translation layer, if any -->
 %translation-defs;
 %translation-snippets;
 %translation-extensions;
 
-<!-- English manual (also works as fallback layer for incomplete translations) -->
-<!ENTITY % language-defs.default     SYSTEM "../en/language-defs.ent">
-<!ENTITY % language-snippets.default SYSTEM "../en/language-snippets.ent">
-<!ENTITY % extensions.default        SYSTEM "../en/extensions.ent">
-%language-defs.default;
-%extensions.default;
-%language-snippets.default;
-
-<!-- Language independent entities, and language dependent file entities -->
-<!ENTITY % global.entities    SYSTEM "./entities/global.ent">
-<!ENTITY % frontpage.entities SYSTEM "../en/contributors.ent">
-<!ENTITY % file.entities      SYSTEM "./temp/file-entities.ent">
-%global.entities;
-%file.entities;
-%frontpage.entities;
+%language-defs;
+%language-snippets;
+%language-extensions;
+
+%base-entities;
+%file-entities;
+
 ]>
 
 <set xmlns="http://docbook.org/ns/docbook" version="5.2" xml:id="index" xml:lang="&LANG;" xmlns:xlink="http://www.w3.org/1999/xlink">