Fixes, comments, more deprectation notes

Author: André L F S Bacci

configure.php

@@ -630,33 +630,32 @@ function dtd_pe_load( string $name , string $filename ) : string
     $base = $GLOBALS['ac']['LANG_BASE_DIR'];
     $lang = $GLOBALS['ac']["LANG"];
 
-    $contents = "";
-
-    $contents .= "<!ENTITY LANG '{$lang}'>\n\n";
-
-    $contents .= dtd_pe_load( "language-defs"       , __DIR__ . "/../$base/language-defs.ent" );
-    $contents .= dtd_pe_load( "language-snippets"   , __DIR__ . "/../$base/language-snippets.ent" );
-    $contents .= dtd_pe_load( "language-extensions" , __DIR__ . "/../$base/extensions.ent" );
+    $contents = "<!ENTITY LANG '{$lang}'>\n\n";
 
     if ( ! is_single_language() )
     {
         $contents .= dtd_pe_load( "translation-defs"       , __DIR__ . "/../$lang/language-defs.ent" );
         $contents .= dtd_pe_load( "translation-snippets"   , __DIR__ . "/../$lang/language-snippets.ent" );
         $contents .= dtd_pe_load( "translation-extensions" , __DIR__ . "/../$lang/extensions.ent" );
     }
+    $contents .= dtd_pe_load( "language-defs"       , __DIR__ . "/../$base/language-defs.ent" );
+    $contents .= dtd_pe_load( "language-snippets"   , __DIR__ . "/../$base/language-snippets.ent" );
+    $contents .= dtd_pe_load( "language-extensions" , __DIR__ . "/../$base/extensions.ent" );
 
     $contents .= dtd_pe_load( "base-entities" , __DIR__ . '/entities/global.ent' );
     $contents .= dtd_pe_load( "text-entities" , __DIR__ . '/temp/text-entities.dtd' );
     $contents .= dtd_pe_load( "file-entities" , __DIR__ . '/temp/file-entities.dtd' );
 
     if ( $GLOBALS['ac']['CHMENABLED'] == 'yes' )
-        $contents = dtd_pe_load( "manual.chmonly" , __DIR__ . "/chm/manual.chm.xml" );
+        $contents .= dtd_pe_load( "manual.chmonly" , __DIR__ . "/chm/manual.chm.xml" );
     else
         $contents .= "<!ENTITY manual.chmonly ''>\n";
 
-    $outdir = __DIR__ . "/../$base/temp";
-    realpain( $outdir , mkdir: true );
-    file_put_contents( "{$outdir}/conf.dtd" , $contents );
+    $langTempDir = __DIR__ . "/../$base/temp";
+    realpain( $langTempDir , mkdir: true );
+
+    file_put_contents(  __DIR__ . "/temp/lang" , $lang );
+    file_put_contents( "{$langTempDir}/conf.dtd" , $contents );
 }
 
 function dtd_file_entities()
@@ -905,7 +904,7 @@ function xinclude_run_xpointer( DOMDocument $dom ) : int
 
 function xinclude_residual_fixup( DOMDocument $dom )
 {
-    // XInclude failures are soft errors on translations, so we replace
+    // XInclude failures are soft errors on translations, so we erase
     // residual XInclude tags on translations to keep them validating.
 
     $fixups = 0;

manual.xml

@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+
+
+This file is now being ignored, after third-party manual split.
+Yet, it is mentioned by name in configure.php, on PhD related
+code paths.
+
+After these code paths are updated or moved into PhD, this can
+be deleted.
+
+Keep these comments outside SGML comment tags, as to make this
+file invalid for XML loading.
+
+
+
 <!DOCTYPE PHPDOC [
 
 <!-- Parameter entities used to configure manual.xml -->

scripts/file-entities.php

@@ -29,8 +29,9 @@
 - doc-base/temp/file-entites.ent
 - doc-base/temp/file-entites/dir.dir.ent
 
-The file entity for directories (file listings) are keep as individual
-files, to avoid these libxml errors, in some OS/versions:
+The file entity for directory listings is kept as an separate files,
+instead of a monolithic one, to avoid these libxml errors, in some
+OS and/or libxml versions:
 
 - Detected an entity reference loop [1]
 - Maximum entity amplification factor exceeded [2]