From 1b382c51041bdce608a3c3d8f69e10efa36ce82f Mon Sep 17 00:00:00 2001 From: Jordi Kroon Date: Tue, 21 Jul 2026 19:38:05 +0200 Subject: [PATCH 1/7] Add acronyms entity file for doc-en --- entities/acronyms.ent | 131 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 entities/acronyms.ent diff --git a/entities/acronyms.ent b/entities/acronyms.ent new file mode 100644 index 000000000000..e23c7ce91c71 --- /dev/null +++ b/entities/acronyms.ent @@ -0,0 +1,131 @@ + + + + + + +Also Known As +Application Programming Interface + + American Standard Code for Information Interchange + +Bitmap +Certificate Authority +Common Gateway Interface +Command Line Interpreter/Interface + + Cryptographically Secure PseudoRandom Number Generator + +Certificate Signing Request +Cascading Style Sheets +Comma Separated Value +Client URL Library +Concurrent Versions System +Distinguished Encoding Rules +Dynamic Link Library +Disjunctive Normal Form +Domain Name System +Document Object Model + + Document Style Semantics and Specification Language + +End Of File +Exchangeable Image File +Frequently Asked Questions +FastCGI Process Manager +File Transfer Protocol +File Transfer Protocol SSL/Secure +Graphics Draw +Graphic Interchange Format +getLastError +GNU Multiple Precision +Hyperwave Information Server +HMAC Key Definition Function +Hash-based Message Authentication Code +Hyper Text Markup Language +Hypertext Transfer Protocol +Hypertext Transfer Protocol Secure +HTTP Strict Transport Security +Integrated Development Environment +Image File Directory +Interchange File Format +Internet Message Access Protocol +Internet Protocol +Internet Protocol version 4 +Internet Protocol version 6 +Joint Bilevel Image Experts Group +JPEG-2000 +Japan Picture +Joint Photographic Experts Group +JavaScript Object Notation +Lightweight Directory Access Protocol +Large File Support +Multipurpose Internet Mail Extensions +Multiple Precision +Microsoft Developer Network +Network News Transfer Protocol + + Password-Based Key Derivation Function 2 + +Portable Document Format +PHP Data Objects +PHP Extension and Application Repository +Privacy-Enhanced Mail +PHP archive +PHP: Hypertext Preprocessor +Public Key Cryptography Standards +Portable Network Graphics +Post Office Protocol version 3 +Portable Operating System Interface +Photoshop Document +Quality of Service +Red-Green-Blue +Real-Time Streaming Protocol +Server Application Programming Interface +Simple Authentication and Security Layer +SSH/Secure File Transfer Protocol +Simple Mail Transfer Protocol +Simple Network Management Protocol +Standard PHP Library +Secure Shell Protocol +Secure Sockets Layer +Shockwave Flash +Transmission Control Protocol +Tagged Image File Format +Transport Layer Security +Transparent Network Substrate +User Defined Functions +User Datagram Protocol + + Unique, Universal, and Uniform character enCoding + +Uniform Resource Identifier +Uniform Resource Locator +Wireless Bitmap +Web Services Description Language +X Bitmap +eXtensible Markup Language +XML Path Language + + eXtensible Stylesheet Language Transformations + + + From ae147533e53e54868628e9df97e3b17c967997b4 Mon Sep 17 00:00:00 2001 From: Jordi Kroon Date: Tue, 21 Jul 2026 20:22:26 +0200 Subject: [PATCH 2/7] style: format acronym entities on single lines Remove the 79-column line length restriction from the file header and consolidate multi-line acronym definitions onto single lines for improved readability and maintainability. Also fix the capitalization of "eXtensible" to "Extensible" in the XSLT entity definition for consistency. --- entities/acronyms.ent | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/entities/acronyms.ent b/entities/acronyms.ent index e23c7ce91c71..f2affb607c2b 100644 --- a/entities/acronyms.ent +++ b/entities/acronyms.ent @@ -12,10 +12,6 @@ tooltips of tags. All acronyms should be listed in alphabetical order. -Keep the lines strictly under 79 columns. If an entity does not -fit on one line, place its text on separate lines, indented by -one space. - --> Also Known As Application Programming Interface - - American Standard Code for Information Interchange - +American Standard Code for Information Interchange Bitmap Certificate Authority Common Gateway Interface Command Line Interpreter/Interface - - Cryptographically Secure PseudoRandom Number Generator - +Cryptographically Secure PseudoRandom Number Generator Certificate Signing Request Cascading Style Sheets Comma Separated Value @@ -44,9 +36,7 @@ one space. Disjunctive Normal Form Domain Name System Document Object Model - - Document Style Semantics and Specification Language - +Document Style Semantics and Specification Language End Of File Exchangeable Image File Frequently Asked Questions @@ -82,9 +72,7 @@ one space. Multiple Precision Microsoft Developer Network Network News Transfer Protocol - - Password-Based Key Derivation Function 2 - +Password-Based Key Derivation Function 2 Portable Document Format PHP Data Objects PHP Extension and Application Repository @@ -114,9 +102,7 @@ one space. Transparent Network Substrate User Defined Functions User Datagram Protocol - - Unique, Universal, and Uniform character enCoding - +Unique, Universal, and Uniform character encoding Uniform Resource Identifier Uniform Resource Locator Wireless Bitmap @@ -124,8 +110,6 @@ one space. X Bitmap eXtensible Markup Language XML Path Language - - eXtensible Stylesheet Language Transformations - +Extensible Stylesheet Language Transformations From d0e0ebcfc8307e97238e27ed37fb1887f158e720 Mon Sep 17 00:00:00 2001 From: Jordi Kroon Date: Wed, 22 Jul 2026 11:22:13 +0200 Subject: [PATCH 3/7] Re-order by alphabet Co-authored-by: Louis-Arnaud --- entities/acronyms.ent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entities/acronyms.ent b/entities/acronyms.ent index f2affb607c2b..746e07632255 100644 --- a/entities/acronyms.ent +++ b/entities/acronyms.ent @@ -51,9 +51,9 @@ All acronyms should be listed in alphabetical order. HMAC Key Definition Function Hash-based Message Authentication Code Hyper Text Markup Language +HTTP Strict Transport Security Hypertext Transfer Protocol Hypertext Transfer Protocol Secure -HTTP Strict Transport Security Integrated Development Environment Image File Directory Interchange File Format From 462b3c26ab39021485d642892097563b489d0ffc Mon Sep 17 00:00:00 2001 From: Jordi Kroon Date: Wed, 22 Jul 2026 20:57:05 +0200 Subject: [PATCH 4/7] Rename acronym entities file and update naming convention --- entities/acronyms.ent | 115 ----------------------------- entities/entities.acronyms.ent | 130 +++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 115 deletions(-) delete mode 100644 entities/acronyms.ent create mode 100644 entities/entities.acronyms.ent diff --git a/entities/acronyms.ent b/entities/acronyms.ent deleted file mode 100644 index 746e07632255..000000000000 --- a/entities/acronyms.ent +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - -Also Known As -Application Programming Interface -American Standard Code for Information Interchange -Bitmap -Certificate Authority -Common Gateway Interface -Command Line Interpreter/Interface -Cryptographically Secure PseudoRandom Number Generator -Certificate Signing Request -Cascading Style Sheets -Comma Separated Value -Client URL Library -Concurrent Versions System -Distinguished Encoding Rules -Dynamic Link Library -Disjunctive Normal Form -Domain Name System -Document Object Model -Document Style Semantics and Specification Language -End Of File -Exchangeable Image File -Frequently Asked Questions -FastCGI Process Manager -File Transfer Protocol -File Transfer Protocol SSL/Secure -Graphics Draw -Graphic Interchange Format -getLastError -GNU Multiple Precision -Hyperwave Information Server -HMAC Key Definition Function -Hash-based Message Authentication Code -Hyper Text Markup Language -HTTP Strict Transport Security -Hypertext Transfer Protocol -Hypertext Transfer Protocol Secure -Integrated Development Environment -Image File Directory -Interchange File Format -Internet Message Access Protocol -Internet Protocol -Internet Protocol version 4 -Internet Protocol version 6 -Joint Bilevel Image Experts Group -JPEG-2000 -Japan Picture -Joint Photographic Experts Group -JavaScript Object Notation -Lightweight Directory Access Protocol -Large File Support -Multipurpose Internet Mail Extensions -Multiple Precision -Microsoft Developer Network -Network News Transfer Protocol -Password-Based Key Derivation Function 2 -Portable Document Format -PHP Data Objects -PHP Extension and Application Repository -Privacy-Enhanced Mail -PHP archive -PHP: Hypertext Preprocessor -Public Key Cryptography Standards -Portable Network Graphics -Post Office Protocol version 3 -Portable Operating System Interface -Photoshop Document -Quality of Service -Red-Green-Blue -Real-Time Streaming Protocol -Server Application Programming Interface -Simple Authentication and Security Layer -SSH/Secure File Transfer Protocol -Simple Mail Transfer Protocol -Simple Network Management Protocol -Standard PHP Library -Secure Shell Protocol -Secure Sockets Layer -Shockwave Flash -Transmission Control Protocol -Tagged Image File Format -Transport Layer Security -Transparent Network Substrate -User Defined Functions -User Datagram Protocol -Unique, Universal, and Uniform character encoding -Uniform Resource Identifier -Uniform Resource Locator -Wireless Bitmap -Web Services Description Language -X Bitmap -eXtensible Markup Language -XML Path Language -Extensible Stylesheet Language Transformations - - diff --git a/entities/entities.acronyms.ent b/entities/entities.acronyms.ent new file mode 100644 index 000000000000..df57009bdae7 --- /dev/null +++ b/entities/entities.acronyms.ent @@ -0,0 +1,130 @@ + + + + + + +Also Known As +Application Programming Interface +American Standard Code for Information Interchange +Bitmap +Certificate Authority +Common Gateway Interface +Command Line Interpreter/Interface +Cryptographically Secure PseudoRandom Number Generator +Certificate Signing Request +Cascading Style Sheets +Comma Separated Value +Client URL Library +Concurrent Versions System +Distinguished Encoding Rules +Dynamic Link Library +Disjunctive Normal Form +Domain Name System +Document Object Model +Document Style Semantics and Specification Language +End Of File +Exchangeable Image File +Frequently Asked Questions +FastCGI Process Manager +File Transfer Protocol +File Transfer Protocol SSL/Secure +Graphics Draw +Graphic Interchange Format +getLastError +GNU Multiple Precision +Hyperwave Information Server +HMAC Key Definition Function +Hash-based Message Authentication Code +HTTP Strict Transport Security +Hyper Text Markup Language +Hypertext Transfer Protocol +Hypertext Transfer Protocol Secure +Integrated Development Environment +Image File Directory +Interchange File Format +Internet Message Access Protocol +Internet Protocol +Internet Protocol version 4 +Internet Protocol version 6 +Joint Bilevel Image Experts Group +JPEG-2000 +Japan Picture +Joint Photographic Experts Group +JavaScript Object Notation +Lightweight Directory Access Protocol +Large File Support +Multipurpose Internet Mail Extensions +Multiple Precision +Microsoft Developer Network +Network News Transfer Protocol +Password-Based Key Derivation Function 2 +Portable Document Format +PHP Data Objects +PHP Extension and Application Repository +Privacy-Enhanced Mail +PHP archive +PHP: Hypertext Preprocessor +Public Key Cryptography Standards +Portable Network Graphics +Post Office Protocol version 3 +Portable Operating System Interface +Photoshop Document +Quality of Service +Red-Green-Blue +Real-Time Streaming Protocol +Server Application Programming Interface +Simple Authentication and Security Layer +SSH/Secure File Transfer Protocol +Simple Mail Transfer Protocol +Simple Network Management Protocol +Standard PHP Library +Secure Shell Protocol +Secure Sockets Layer +Shockwave Flash +Transmission Control Protocol +Tagged Image File Format +Transport Layer Security +Transparent Network Substrate +User Defined Functions +User Datagram Protocol +Unique, Universal, and Uniform character encoding +Uniform Resource Identifier +Uniform Resource Locator +Wireless Bitmap +Web Services Description Language +X Bitmap +eXtensible Markup Language +XML Path Language +Extensible Stylesheet Language Transformations + + From 79cd10272a85e5bbdb2b1250c784ee3a537e41f2 Mon Sep 17 00:00:00 2001 From: Jordi Kroon Date: Wed, 22 Jul 2026 21:02:04 +0200 Subject: [PATCH 5/7] correct and standardize acronym expansion --- entities/entities.acronyms.ent | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/entities/entities.acronyms.ent b/entities/entities.acronyms.ent index df57009bdae7..b01a1c9785c8 100644 --- a/entities/entities.acronyms.ent +++ b/entities/entities.acronyms.ent @@ -40,10 +40,10 @@ All acronyms should be listed in alphabetical order. Certificate Authority Common Gateway Interface Command Line Interpreter/Interface -Cryptographically Secure PseudoRandom Number Generator +Cryptographically Secure Pseudorandom Number Generator Certificate Signing Request Cascading Style Sheets -Comma Separated Value +Comma-Separated Values Client URL Library Concurrent Versions System Distinguished Encoding Rules @@ -53,20 +53,20 @@ All acronyms should be listed in alphabetical order. Document Object Model Document Style Semantics and Specification Language End Of File -Exchangeable Image File +Exchangeable Image File Format Frequently Asked Questions FastCGI Process Manager File Transfer Protocol File Transfer Protocol SSL/Secure Graphics Draw -Graphic Interchange Format +Graphics Interchange Format getLastError GNU Multiple Precision Hyperwave Information Server -HMAC Key Definition Function +HMAC-based Key Derivation Function Hash-based Message Authentication Code HTTP Strict Transport Security -Hyper Text Markup Language +HyperText Markup Language Hypertext Transfer Protocol Hypertext Transfer Protocol Secure Integrated Development Environment @@ -76,9 +76,9 @@ All acronyms should be listed in alphabetical order. Internet Protocol Internet Protocol version 4 Internet Protocol version 6 -Joint Bilevel Image Experts Group +Joint Bi-level Image Experts Group JPEG-2000 -Japan Picture +JPEG 2000 Code Stream Joint Photographic Experts Group JavaScript Object Notation Lightweight Directory Access Protocol @@ -90,11 +90,11 @@ All acronyms should be listed in alphabetical order. Password-Based Key Derivation Function 2 Portable Document Format PHP Data Objects -PHP Extension and Application Repository +PHP Extension Community Library Privacy-Enhanced Mail PHP archive PHP: Hypertext Preprocessor -Public Key Cryptography Standards +Public-Key Cryptography Standards Portable Network Graphics Post Office Protocol version 3 Portable Operating System Interface @@ -123,7 +123,7 @@ All acronyms should be listed in alphabetical order. Wireless Bitmap Web Services Description Language X Bitmap -eXtensible Markup Language +Extensible Markup Language XML Path Language Extensible Stylesheet Language Transformations From 16ba6e8e5e617bc4dd3af772f473fcdaad485396 Mon Sep 17 00:00:00 2001 From: Jordi Kroon Date: Wed, 22 Jul 2026 21:33:20 +0200 Subject: [PATCH 6/7] migrate acronyms from global.ent --- entities/entities.acronyms.ent | 70 ++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 8 deletions(-) diff --git a/entities/entities.acronyms.ent b/entities/entities.acronyms.ent index b01a1c9785c8..689e4ab64899 100644 --- a/entities/entities.acronyms.ent +++ b/entities/entities.acronyms.ent @@ -5,9 +5,15 @@ This is a translatable XML Entity file. See doc-base/scripts/text-entities.php for details. -Each acronym of the manual is defined here as an entity named -acronym.expansion., where is the exact text used -inside tags. +Everything about acronyms resides in this file, as two kinds of +entities: + +- Acronym definitions, entities named after the acronym itself + (for example &php;), which render the term wrapped in an + tag; +- Acronym expansions, entities named acronym.expansion., + where is the exact text used inside tags, + holding the expanded meaning of the term. Besides being collected by text-entities.php like any other entity file, this file is also read directly, as a plain XML @@ -20,12 +26,14 @@ document, by automated tools: Because of these direct uses, some extra restrictions apply: -- Entity contents must be plain text: no child XML elements and - no references to other entities; -- Only acronym.expansion.* entities belong in this file; entities - with other names are ignored by the tools above. +- The contents of acronym.expansion.* entities must be plain + text: no child XML elements; +- No entity in this file may contain references to other + entities; +- Entities that are not acronym definitions or expansions do not + belong in this file, and are ignored by the tools above. -All acronyms should be listed in alphabetical order. +Both groups should be listed in alphabetical order. --> @@ -33,6 +41,52 @@ All acronyms should be listed in alphabetical order. xmlns:xlink = "http://www.w3.org/1999/xlink" translate = "yes"> + + +API +ASCII +CA +CGI +CLI +CLI SAPI +cURL +DER +DNS +DOM +FPM +FTP +FTPS +HMAC +HSTS +HTML +HTTP +HTTPS +IP +IPv4 +IPv6 +JSON +LDAP +PDO +PEM +Phar +PHP +POP3 +RTSP +SAPI +SFTP +SMTP +SPL +SSH +SSL +TCP +TLS +UDP +URI +URL +XML + + + Also Known As Application Programming Interface American Standard Code for Information Interchange From 0d15b7846615229b585691dd0e3184af0971c3fa Mon Sep 17 00:00:00 2001 From: Jordi Kroon Date: Wed, 22 Jul 2026 22:03:17 +0200 Subject: [PATCH 7/7] remove unused xlink namespace ref --- entities/entities.acronyms.ent | 1 - 1 file changed, 1 deletion(-) diff --git a/entities/entities.acronyms.ent b/entities/entities.acronyms.ent index 689e4ab64899..5e55636ee40a 100644 --- a/entities/entities.acronyms.ent +++ b/entities/entities.acronyms.ent @@ -38,7 +38,6 @@ Both groups should be listed in alphabetical order. -->