[DOC-CVS] [doc-en] master: Minimize DTD sybsystem (#5742)
[email protected] (alfsb via GitHub)
| Newsgroups | php.doc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: alfsb (alfsb)
Committer: GitHub (web-flow)
Pusher: alfsb
Date: 2026-08-13T15:51:15-03:00
Commit: https://github.com/php/doc-en/commit/c9e22e43641734cec2eebeabde19ab404a3d8ed8
Raw diff: https://github.com/php/doc-en/commit/c9e22e43641734cec2eebeabde19ab404a3d8ed8.diff
Minimize DTD sybsystem (#5742)
Removes all PEReference from manual.xml, besides one, and also convert another DTD entity file.
Changed paths:
A entities/entities.title.ent
D language-defs.ent
M docbookcs.xml
M manual.xml
Diff:
diff --git a/docbookcs.xml b/docbookcs.xml
index ac688f6f7d04..901661a9bc31 100644
--- a/docbookcs.xml
+++ b/docbookcs.xml
@@ -22,14 +22,12 @@
</paths>
<entities>
- <file>extensions.ent</file>
- <file>language-defs.ent</file>
<file>language-snippets.ent</file>
<directory>entities/</directory>
<directory>../doc-base/entities/</directory>
<file>../doc-base/temp/manual.ent</file>
- <file>../doc-base/temp/entities.ent</file>
- <file>../doc-base/temp/file-entities.ent</file>
+ <file>../doc-base/temp/text-entities.dtd</file>
+ <file>../doc-base/temp/file-entities.dtd</file>
<directory>../doc-base/temp/file-entities</directory>
</entities>
diff --git a/entities/entities.title.ent b/entities/entities.title.ent
new file mode 100644
index 000000000000..92a91de4b740
--- /dev/null
+++ b/entities/entities.title.ent
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ -->
+<!--
+
+Textual titles used mostly in manual.xml itself, and title
+tags used in reference/ and other files to mark section titles.
+
+-->
+
+<entities xmlns = "http://docbook.org/ns/docbook"
+ translate = "yes">
+
+<!-- Simple text -->
+
+<entity name="AbstractionLayers">Abstraction Layers</entity>
+
+<entity name="AffectingPHPsBehaviour">Affecting PHP's Behaviour</entity>
+
+<entity name="Alias">Alias of</entity>
+
+<entity name="AndSeveralOthers">And several others</entity>
+
+<entity name="Appendices">Appendices</entity>
+
+<entity name="AudioFormatsManipulation">Audio Formats Manipulation</entity>
+
+<entity name="AuthenticationServices">Authentication Services</entity>
+
+<entity name="CalendarandEventRelatedExtensions">Date and Time Related Extensions</entity>
+
+<entity name="Changeable">Changeable</entity>
+
+<entity name="Changelog">Changelog</entity>
+
+<entity name="ChangelogListingBundledDescription">The following changes have
+ been made to functions of bundled extensions.</entity>
+
+<entity name="ChangelogListingDescription">The following changes have been made
+ to classes/functions/methods of this extension.</entity>
+
+<entity name="ChangelogListingTitle">Changelog</entity>
+
+<entity name="CHMEdition">HTML Help Edition</entity>
+
+<entity name="CommandLineSpecificExtensions">Command Line Specific Extensions</entity>
+
+<entity name="CompressionExtensions">Compression and Archive Extensions</entity>
+
+<entity name="ConfigureOptions">Configure Options</entity>
+
+<entity name="Constants">Constants</entity>
+
+<entity name="Constructor">Constructor</entity>
+
+<entity name="CreditCardProcessing">Credit Card Processing</entity>
+
+<entity name="CryptographyExtensions">Cryptography Extensions</entity>
+
+<entity name="DatabaseExtensions">Database Extensions</entity>
+
+<entity name="Date">Date:</entity>
+
+<entity name="Default">Default</entity>
+
+<entity name="Definition">Definition</entity>
+
+<entity name="Description">Description</entity>
+
+<entity name="ExampleListingDescription">List of all the examples in the manual</entity>
+
+<entity name="ExampleListing">Example listing</entity>
+
+<entity name="FAQabbrev">FAQ</entity>
+
+<entity name="FAQ">Frequently Asked Questions</entity>
+
+<entity name="Features">Features</entity>
+
+<entity name="FileSystemRelatedExtensions">File System Related Extensions</entity>
+
+<entity name="FunctionListingDescription">List of all the functions and methods in the manual</entity>
+
+<entity name="FunctionListing">Function and Method listing</entity>
+
+<entity name="FunctionReference">Function Reference</entity>
+
+<entity name="Functions">Functions</entity>
+
+<entity name="GettingStarted">Getting Started</entity>
+
+<entity name="HumanLanguageandCharacterEncodingSupport">Human Language and
+ Character Encoding Support</entity>
+
+<entity name="ImageProcessingandGeneration">Image Processing and Generation</entity>
+
+<entity name="IndexListing">Index listing</entity>
+
+<entity name="InheritedConstants">Inherited constants</entity>
+
+<entity name="InheritedMethods">Inherited methods</entity>
+
+<entity name="InheritedProperties">Inherited properties</entity>
+
+<entity name="InstallAndConfigure">Installation and Configuration</entity>
+
+<entity name="Installation">Installation</entity>
+
+<entity name="Internals2">PHP at the Core: A Hacker's Guide</entity>
+
+<entity name="Internals">PHP and Zend Engine Internals</entity>
+
+<entity name="LanguageReference">Language Reference</entity>
+
+<entity name="MailRelatedExtensions">Mail Related Extensions</entity>
+
+<entity name="MathematicalExtensions">Mathematical Extensions</entity>
+
+<entity name="Methods">Methods</entity>
+
+<entity name="MiscExtensions">Misc Extensions</entity>
+
+<entity name="MissingStuff">Missing Stuff</entity>
+
+<entity name="Name">Name</entity>
+
+<entity name="NonTextMIMEOutput">Non-Text MIME Output</entity>
+
+<entity name="NotAvailable">Not Available</entity>
+
+<entity name="OtherBasicExtensions">Other Basic Extensions</entity>
+
+<entity name="OtherServices">Other Services</entity>
+
+<entity name="PEAR">PEAR: the PHP Extension and Application Repository</entity>
+
+<entity name="PHPManual">PHP Manual</entity>
+
+<entity name="ProcessControlExtensions">Process Control Extensions</entity>
+
+<entity name="Properties">Properties</entity>
+
+<entity name="ReservedConstants">Predefined Constants</entity>
+
+<entity name="SearchEngineExtensions">Search Engine Extensions</entity>
+
+<entity name="Security">Security</entity>
+
+<entity name="Seealso">See also</entity>
+
+<entity name="ServerSpecificExtensions">Server Specific Extensions</entity>
+
+<entity name="SessionExtensions">Session Extensions</entity>
+
+<entity name="TextProcessing">Text Processing</entity>
+
+<entity name="Type">Type</entity>
+
+<entity name="UIExtensions">GUI Extensions</entity>
+
+<entity name="VariableandTypeRelatedExtensions">Variable and Type Related Extensions</entity>
+
+<entity name="VendorSpecificDatabaseExtensions">Vendor Specific Database Extensions</entity>
+
+<entity name="Version">Version</entity>
+
+<entity name="WebServices">Web Services</entity>
+
+<entity name="WindowsOnlyExtensions">Windows Only Extensions</entity>
+
+<entity name="XMLManipulation">XML Manipulation</entity>
+
+<entity name="ZendAPI">Zend API: Hacking the Core of PHP</entity>
+
+<!-- Title tag -->
+
+<entity name="reftitle.changelog"><title>&Changelog;</title></entity>
+
+<entity name="reftitle.classes"><title>Predefined Classes</title></entity>
+
+<entity name="reftitle.classsynopsis"><title>Class synopsis</title></entity>
+
+<entity name="reftitle.constants"><title>Predefined Constants</title></entity>
+
+<entity name="reftitle.constructor"><title>Constructor</title></entity>
+
+<entity name="reftitle.description"><title>Description</title></entity>
+
+<entity name="reftitle.encoding"><title>Encoding</title></entity>
+
+<entity name="reftitle.enumsynopsis"><title>Enum synopsis</title></entity>
+
+<entity name="reftitle.errors"><title>Errors/Exceptions</title></entity>
+
+<entity name="reftitle.examples"><title>Examples</title></entity>
+
+<entity name="reftitle.exceptions"><title>Exceptions</title></entity>
+
+<entity name="reftitle.faq"><title>&FAQ;</title></entity>
+
+<entity name="reftitle.indices"><title>Indices</title></entity>
+
+<entity name="reftitle.install"><title>Installation</title></entity>
+
+<entity name="reftitle.interfacesynopsis"><title>Interface synopsis</title></entity>
+
+<entity name="reftitle.intro"><title>Introduction</title></entity>
+
+<entity name="reftitle.methods"><title>Methods</title></entity>
+
+<entity name="reftitle.mysqlnd"><title>MySQL Native Driver Only</title></entity>
+
+<entity name="reftitle.notes"><title>Notes</title></entity>
+
+<entity name="reftitle.options"><title>Options</title></entity>
+
+<entity name="reftitle.parameters"><title>Parameters</title></entity>
+
+<entity name="reftitle.properties"><title>Properties</title></entity>
+
+<entity name="reftitle.required"><title>Requirements</title></entity>
+
+<entity name="reftitle.resources"><title>Resource Types</title></entity>
+
+<entity name="reftitle.returnvalues"><title>Return Values</title></entity>
+
+<entity name="reftitle.runtime"><title>Runtime Configuration</title></entity>
+
+<entity name="reftitle.seealso"><title>See Also</title></entity>
+
+<entity name="reftitle.setup"><title>Installing/Configuring</title></entity>
+
+<entity name="reftitle.unicode"><title>Unicode</title></entity>
+
+<entity name="reftitle.usage"><title>Usage</title></entity>
+
+</entities>
diff --git a/language-defs.ent b/language-defs.ent
deleted file mode 100644
index dcbe3d0fa986..000000000000
--- a/language-defs.ent
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<!-- Part titles used mostly in manual.xml itself -->
-<!ENTITY PHPManual "PHP Manual">
-<!ENTITY Seealso "See also">
-<!ENTITY Date "Date:">
-<!ENTITY GettingStarted "Getting Started">
-<!ENTITY InstallAndConfigure "Installation and Configuration">
-<!ENTITY Installation "Installation">
-<!ENTITY LanguageReference "Language Reference">
-<!ENTITY Features "Features">
-<!ENTITY Security "Security">
-<!ENTITY FunctionReference "Function Reference">
-<!ENTITY VariableandTypeRelatedExtensions "Variable and Type Related Extensions">
-<!ENTITY TextProcessing "Text Processing">
-<!ENTITY AffectingPHPsBehaviour "Affecting PHP's Behaviour">
-<!ENTITY SessionExtensions "Session Extensions">
-<!ENTITY OtherBasicExtensions "Other Basic Extensions">
-<!ENTITY DatabaseExtensions "Database Extensions">
-<!ENTITY AbstractionLayers "Abstraction Layers">
-<!ENTITY VendorSpecificDatabaseExtensions "Vendor Specific Database Extensions">
-<!ENTITY XMLManipulation "XML Manipulation">
-<!ENTITY WebServices "Web Services">
-<!ENTITY CreditCardProcessing "Credit Card Processing">
-<!ENTITY MathematicalExtensions "Mathematical Extensions">
-<!ENTITY CryptographyExtensions "Cryptography Extensions">
-<!ENTITY HumanLanguageandCharacterEncodingSupport "Human Language and Character Encoding Support">
-<!ENTITY FileSystemRelatedExtensions "File System Related Extensions">
-<!ENTITY ProcessControlExtensions "Process Control Extensions">
-<!ENTITY MailRelatedExtensions "Mail Related Extensions">
-<!ENTITY AuthenticationServices "Authentication Services">
-<!ENTITY OtherServices "Other Services">
-<!ENTITY CompressionExtensions "Compression and Archive Extensions">
-<!ENTITY CalendarandEventRelatedExtensions "Date and Time Related Extensions">
-<!ENTITY NonTextMIMEOutput "Non-Text MIME Output">
-<!ENTITY ImageProcessingandGeneration "Image Processing and Generation">
-<!ENTITY AudioFormatsManipulation "Audio Formats Manipulation">
-<!ENTITY CommandLineSpecificExtensions "Command Line Specific Extensions">
-<!ENTITY WindowsOnlyExtensions "Windows Only Extensions">
-<!ENTITY ServerSpecificExtensions "Server Specific Extensions">
-<!ENTITY SearchEngineExtensions "Search Engine Extensions">
-<!ENTITY MiscExtensions "Misc Extensions">
-<!ENTITY UIExtensions "GUI Extensions">
-<!ENTITY Appendices "Appendices">
-<!ENTITY PEAR "PEAR: the PHP Extension and Application Repository">
-<!ENTITY FAQ "Frequently Asked Questions">
-<!ENTITY FAQabbrev "FAQ">
-<!ENTITY Internals "PHP and Zend Engine Internals">
-<!ENTITY Internals2 "PHP at the Core: A Hacker's Guide">
-<!ENTITY ZendAPI "Zend API: Hacking the Core of PHP">
-<!ENTITY IndexListing "Index listing">
-<!ENTITY FunctionListing "Function and Method listing">
-<!ENTITY FunctionListingDescription "List of all the functions and methods in the manual">
-<!ENTITY ExampleListing "Example listing">
-<!ENTITY ExampleListingDescription "List of all the examples in the manual">
-<!ENTITY ChangelogListingTitle "Changelog">
-<!ENTITY ChangelogListingDescription "The following changes have been made to classes/functions/methods of this extension.">
-<!ENTITY ChangelogListingBundledDescription "The following changes have been made to functions of bundled extensions.">
-<!ENTITY CHMEdition "HTML Help Edition">
-<!ENTITY ReservedConstants "Predefined Constants">
-<!ENTITY MissingStuff "Missing Stuff">
-<!ENTITY AndSeveralOthers "And several others">
-<!ENTITY Version "Version">
-<!ENTITY Description "Description">
-<!ENTITY Changeable "Changeable">
-<!ENTITY ConfigureOptions "Configure Options">
-<!ENTITY Default "Default">
-<!ENTITY Definition "Definition">
-<!ENTITY Functions "Functions">
-<!ENTITY Name "Name">
-<!ENTITY Alias "Alias of">
-<!ENTITY Type "Type">
-<!ENTITY Changelog "Changelog">
-<!ENTITY Methods "Methods">
-<!ENTITY InheritedMethods "Inherited methods">
-<!ENTITY InheritedProperties "Inherited properties">
-<!ENTITY Properties "Properties">
-<!ENTITY InheritedConstants "Inherited constants">
-<!ENTITY Constants "Constants">
-<!ENTITY Constructor "Constructor">
-<!ENTITY NotAvailable "Not Available">
-
-<!-- These are used in reference/$extname/reference.xml and other
-supplemental files to mark section titles -->
-<!ENTITY reftitle.changelog '<title xmlns="http://docbook.org/ns/docbook">&Changelog;</title>'>
-<!ENTITY reftitle.classes '<title xmlns="http://docbook.org/ns/docbook">Predefined Classes</title>'>
-<!ENTITY reftitle.classsynopsis '<title xmlns="http://docbook.org/ns/docbook">Class synopsis</title>'>
-<!ENTITY reftitle.enumsynopsis '<title xmlns="http://docbook.org/ns/docbook">Enum synopsis</title>'>
-<!ENTITY reftitle.constants '<title xmlns="http://docbook.org/ns/docbook">Predefined Constants</title>'>
-<!ENTITY reftitle.constructor '<title xmlns="http://docbook.org/ns/docbook">Constructor</title>'>
-<!ENTITY reftitle.description '<title xmlns="http://docbook.org/ns/docbook">Description</title>'>
-<!ENTITY reftitle.encoding '<title xmlns="http://docbook.org/ns/docbook">Encoding</title>'>
-<!ENTITY reftitle.examples '<title xmlns="http://docbook.org/ns/docbook">Examples</title>'>
-<!ENTITY reftitle.exceptions '<title xmlns="http://docbook.org/ns/docbook">Exceptions</title>'>
-<!ENTITY reftitle.errors '<title xmlns="http://docbook.org/ns/docbook">Errors/Exceptions</title>'>
-<!ENTITY reftitle.faq '<title xmlns="http://docbook.org/ns/docbook">&FAQ;</title>'>
-<!ENTITY reftitle.install '<title xmlns="http://docbook.org/ns/docbook">Installation</title>'>
-<!ENTITY reftitle.intro '<title xmlns="http://docbook.org/ns/docbook">Introduction</title>'>
-<!ENTITY reftitle.indices '<title xmlns="http://docbook.org/ns/docbook">Indices</title>'>
-<!ENTITY reftitle.interfacesynopsis '<title xmlns="http://docbook.org/ns/docbook">Interface synopsis</title>'>
-<!ENTITY reftitle.methods '<title xmlns="http://docbook.org/ns/docbook">Methods</title>'>
-<!ENTITY reftitle.mysqlnd '<title xmlns="http://docbook.org/ns/docbook">MySQL Native Driver Only</title>'>
-<!ENTITY reftitle.notes '<title xmlns="http://docbook.org/ns/docbook">Notes</title>'>
-<!ENTITY reftitle.parameters '<title xmlns="http://docbook.org/ns/docbook">Parameters</title>'>
-<!ENTITY reftitle.options '<title xmlns="http://docbook.org/ns/docbook">Options</title>'>
-<!ENTITY reftitle.properties '<title xmlns="http://docbook.org/ns/docbook">Properties</title>'>
-<!ENTITY reftitle.required '<title xmlns="http://docbook.org/ns/docbook">Requirements</title>'>
-<!ENTITY reftitle.resources '<title xmlns="http://docbook.org/ns/docbook">Resource Types</title>'>
-<!ENTITY reftitle.runtime '<title xmlns="http://docbook.org/ns/docbook">Runtime Configuration</title>'>
-<!ENTITY reftitle.returnvalues '<title xmlns="http://docbook.org/ns/docbook">Return Values</title>'>
-<!ENTITY reftitle.seealso '<title xmlns="http://docbook.org/ns/docbook">See Also</title>'>
-<!ENTITY reftitle.setup '<title xmlns="http://docbook.org/ns/docbook">Installing/Configuring</title>'>
-<!ENTITY reftitle.unicode '<title xmlns="http://docbook.org/ns/docbook">Unicode</title>'>
-<!ENTITY reftitle.usage '<title xmlns="http://docbook.org/ns/docbook">Usage</title>'>
diff --git a/manual.xml b/manual.xml
index e111ed75f1e6..84c6986aa404 100644
--- a/manual.xml
+++ b/manual.xml
@@ -1,26 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<?do-not-translate?>
-<!DOCTYPE PHPDOC [
+<!DOCTYPE PHPDOC [
<!ENTITY % configure SYSTEM "./temp/conf.dtd">
%configure;
-
-%text-entities;
-
-%translation-defs;
-%translation-snippets;
-%translation-extensions;
-
-%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">
+<set xml:id="index" xml:lang="" version="5.2"
+ xmlns = "http://docbook.org/ns/docbook"
+ xmlns:xi = "http://www.w3.org/2001/XInclude"
+ xmlns:xlink = "http://www.w3.org/1999/xlink">
+
<title>&PHPManual;</title>
&bookinfo;
@@ -107,7 +97,7 @@
<set xml:id="funcref">
<title>&FunctionReference;</title>
- <info xmlns="http://docbook.org/ns/docbook" xml:id="funcrefinfo">
+ <info xml:id="funcrefinfo">
<abstract>
<para>
<tip>
@@ -449,8 +439,22 @@
&appendices.userlandnaming;
&appendices.about;
&appendices.license;
- &global.function-index;
- <appendix xmlns="http://docbook.org/ns/docbook" xml:id="doc.changelog">
+
+ <appendix xml:id="indexes">
+ <title>&IndexListing;</title>
+ <section xml:id="indexes.functions">
+ <title>&FunctionListing;</title>
+ <para>&FunctionListingDescription;</para>
+ <?phpdoc generate-index-for="refentry"?>
+ </section>
+ <section xml:id="indexes.examples">
+ <title>&ExampleListing;</title>
+ <para>&ExampleListingDescription;</para>
+ <?phpdoc generate-index-for="examples"?>
+ </section>
+ </appendix>
+
+ <appendix xml:id="doc.changelog">
<title>&ChangelogListingTitle;</title>
<para>&ChangelogListingBundledDescription;</para>
<?phpdoc changelog-config-since="5.0.0" ?>