Skip to content

Reorganize end remove stale entities #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jordikroon merged 1 commit into from
Sep 8, 2026
Merged

Reorganize end remove stale entities #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions docbookcs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,7 @@
</paths>

<entities>
<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>
<directory>../doc-base/temp/file-entities</directory>
<file>../doc-base/temp/doctype.dtd</file>
</entities>

<exclude>
Expand Down
52 changes: 4 additions & 48 deletions entities/entities.acronyms.ent
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
This is a translatable XML Entity file.
See doc-base/scripts/text-entities.php for details.

Everything about acronyms resides in this file, as two kinds of
entities:
Everything about acronyms resides in this file. In doc-en it holds
two kinds of entities; this repository only keeps the second one:

- Acronym definitions, entities named after the acronym itself
(for example &php;), which render the term wrapped in an
<acronym> tag;
<acronym> tag.
- Acronym expansions, entities named acronym.expansion.<term>,
where <term> is the exact text used inside <acronym> tags,
holding the expanded meaning of the term.
Expand All @@ -33,57 +33,13 @@ Because of these direct uses, some extra restrictions apply:
- Entities that are not acronym definitions or expansions do not
belong in this file, and are ignored by the tools above.

Both groups should be listed in alphabetical order.
Entities should be listed in alphabetical order.

-->

<entities xmlns = "http://docbook.org/ns/docbook"
translate = "yes">

<!-- Acronym definitions -->

<entity name="api"><acronym>API</acronym></entity>
<entity name="ascii"><acronym>ASCII</acronym></entity>
<entity name="ca"><acronym>CA</acronym></entity>
<entity name="cgi"><acronym>CGI</acronym></entity>
<entity name="cli"><acronym>CLI</acronym></entity>
<entity name="cli.sapi"><acronym>CLI</acronym> <acronym>SAPI</acronym></entity>
<entity name="curl"><acronym>cURL</acronym></entity>
<entity name="der"><acronym>DER</acronym></entity>
<entity name="dns"><acronym>DNS</acronym></entity>
<entity name="dom"><acronym>DOM</acronym></entity>
<entity name="fpm"><acronym>FPM</acronym></entity>
<entity name="ftp"><acronym>FTP</acronym></entity>
<entity name="ftps"><acronym>FTPS</acronym></entity>
<entity name="hmac"><acronym>HMAC</acronym></entity>
<entity name="hsts"><acronym>HSTS</acronym></entity>
<entity name="html"><acronym>HTML</acronym></entity>
<entity name="http"><acronym>HTTP</acronym></entity>
<entity name="https"><acronym>HTTPS</acronym></entity>
<entity name="ip"><acronym>IP</acronym></entity>
<entity name="ipv4"><acronym>IPv4</acronym></entity>
<entity name="ipv6"><acronym>IPv6</acronym></entity>
<entity name="json"><acronym>JSON</acronym></entity>
<entity name="ldap"><acronym>LDAP</acronym></entity>
<entity name="pdo"><acronym>PDO</acronym></entity>
<entity name="pem"><acronym>PEM</acronym></entity>
<entity name="phar"><acronym>Phar</acronym></entity>
<entity name="php"><acronym>PHP</acronym></entity>
<entity name="pop3"><acronym>POP3</acronym></entity>
<entity name="rtsp"><acronym>RTSP</acronym></entity>
<entity name="sapi"><acronym>SAPI</acronym></entity>
<entity name="sftp"><acronym>SFTP</acronym></entity>
<entity name="smtp"><acronym>SMTP</acronym></entity>
<entity name="spl"><acronym>SPL</acronym></entity>
<entity name="ssh"><acronym>SSH</acronym></entity>
<entity name="ssl"><acronym>SSL</acronym></entity>
<entity name="tcp"><acronym>TCP</acronym></entity>
<entity name="tls"><acronym>TLS</acronym></entity>
<entity name="udp"><acronym>UDP</acronym></entity>
<entity name="uri"><acronym>URI</acronym></entity>
<entity name="url"><acronym>URL</acronym></entity>
<entity name="xml"><acronym>XML</acronym></entity>

<!-- Acronym expansions -->

<entity name="acronym.expansion.AKA">Also Known As</entity>
Expand Down
80 changes: 0 additions & 80 deletions entities/entities.extcat.ent
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions entities/entities.manual.ent
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ URLs rather than linkends. Any links to other manual books should live here.
<entity name="url.php.manual.configuration.file">&url.php.manual;configuration.file.php</entity>
<entity name="url.php.manual.context.ssl">&url.php.manual;context.ssl.php</entity>
<entity name="url.php.manual.control-structures.foreach">&url.php.manual;control-structures.foreach.php</entity>
<entity name="url.php.manual.datetime.formats">&url.php.manual;datetime.formats.php</entity>
<entity name="url.php.manual.faq.installation.addtopath">&url.php.manual;faq.installation.php#faq.installation.addtopath</entity>
<entity name="url.php.manual.faq.using.shorthandbytes">&url.php.manual;faq.using.php#faq.using.shorthandbytes</entity>
<entity name="url.php.manual.features.commandline">&url.php.manual;features.commandline.php</entity>
Expand Down Expand Up @@ -83,7 +82,6 @@ URLs rather than linkends. Any links to other manual books should live here.
<entity name="url.php.manual.language.types.resource.self-destruct">&url.php.manual;language.types.resource.php#language.types.resource.self-destruct</entity>
<entity name="url.php.manual.language.types.type-juggling">&url.php.manual;language.types.type-juggling.php</entity>
<entity name="url.php.manual.language.variables.scope">&url.php.manual;language.variables.scope.php</entity>
<entity name="url.php.manual.libxml.constants">&url.php.manual;libxml.constants.php</entity>
<entity name="url.php.manual.mysqlinfo.api.choosing">&url.php.manual;mysqlinfo.api.choosing.php</entity>
<entity name="url.php.manual.mysqlinfo.concepts.buffering">&url.php.manual;mysqlinfo.concepts.buffering.php</entity>
<entity name="url.php.manual.mysqlinfo.concepts.charset">&url.php.manual;mysqlinfo.concepts.charset.php</entity>
Expand Down
100 changes: 100 additions & 0 deletions entities/entities.notes.ent
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!--

Notes and warnings shared by several extensions: platform
availability, experimental or deprecated status, undocumented
functions, and similar admonitions.
See doc-base/scripts/text-entities.php for details.

-->

<entities xmlns = "http://docbook.org/ns/docbook"
xmlns:xlink = "http://www.w3.org/1999/xlink"
translate = "yes">

<!-- Notes -->

<entity name="note.no-windows"><note><simpara>This function is not
implemented on Windows platforms.</simpara></note></entity>

<entity name="note.no-windows.extension"><note><simpara>This extension is not
available on Windows platforms.</simpara></note></entity>

<!-- Warnings -->

<entity name="warn.experimental"><warning><simpara>This extension is
<emphasis>EXPERIMENTAL</emphasis>. The behaviour of this extension including
the names of its functions and any other documentation surrounding this
extension may change without notice in a future release of PHP.
This extension should be used at your own risk.</simpara></warning></entity>

<entity name="warn.deprecated.function-7-1-0.removed-7-2-0"><warning><simpara>This function has been
<emphasis>DEPRECATED</emphasis> as of PHP 7.1.0 and
<emphasis>REMOVED</emphasis> as of PHP 7.2.0. Relying on this function
is highly discouraged.</simpara></warning></entity>

<entity name="warn.removed.function-7-0-0"><warning><simpara>This function was
<emphasis>REMOVED</emphasis> in PHP 7.0.0.</simpara></warning></entity>

<entity name="warn.removed.function-7-4-0"><warning><simpara>This function was
<emphasis>REMOVED</emphasis> in PHP 7.4.0.</simpara></warning></entity>

<entity name="warn.experimental.func"><warning><simpara>This function is
<emphasis>EXPERIMENTAL</emphasis>. The behaviour of this function, its name, and
surrounding documentation may change without notice in a future release of PHP.
This function should be used at your own risk.
</simpara></warning></entity>

<entity name="warn.imaprecodeyaz"><warning><simpara>The <link xlink:href="&url.php.manual.book.imap;">IMAP</link>, <link linkend="book.recode">recode</link> and
<link linkend="book.yaz">YAZ</link>
extensions cannot be used in conjunction, because they
share the same internal symbols. Note: Yaz 2.0 and above does not suffer from this problem.</simpara></warning></entity>

<entity name="warn.undocumented.func"><warning><simpara>This function is
currently not documented; only its argument list is available.
</simpara></warning></entity>

<!-- Deprecation and removal warnings designed for use with a list of
alternatives. See en/reference/regex/functions/ereg.xml and
en/reference/regex/reference.xml for examples of these in action. -->

<entity name="warn.deprecated.feature.7-1-0.removed.7-2-0.alternatives">
<simpara>
This feature was <emphasis>DEPRECATED</emphasis> in PHP 7.1.0, and
<emphasis>REMOVED</emphasis> in PHP 7.2.0.
</simpara>
<simpara>
Alternatives to this feature include:
</simpara>
</entity>

<entity name="warn.deprecated.function.7-1-0.removed.7-2-0.alternatives">
<simpara>
This function was <emphasis>DEPRECATED</emphasis> in PHP 7.1.0, and
<emphasis>REMOVED</emphasis> in PHP 7.2.0.
</simpara>
<simpara>
Alternatives to this function include:
</simpara>
</entity>

<!-- PS Notes -->

<entity name="note.open-basedir.func"><note><simpara>This function is affected by <link xlink:href="&url.php.manual.ini.open-basedir;">open_basedir</link>.</simpara></note></entity>

<!-- PECL entities -->

<entity name="warn.pecl.unmaintained"><warning>
<simpara>This extension is <emphasis>unmaintained</emphasis>.</simpara>
</warning></entity>

<!-- Database Notes -->

<entity name="database.field-case"><note><simpara>Field names returned by this function
are <emphasis>case-sensitive</emphasis>.</simpara></note></entity>

<entity name="database.fetch-null"><note><simpara>This function sets NULL fields to
the PHP &null; value.</simpara></note></entity>

</entities>
57 changes: 0 additions & 57 deletions entities/entities.php.ent
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,73 +16,16 @@ There are a few <filename> tossed near and there.
translate = "yes">

<entity name="array"><type>array</type></entity>

<entity name="boolean"><type>bool</type></entity>

<entity name="callback.cmp"><methodsynopsis><type>int</type><methodname><replaceable>callback</replaceable></methodname><methodparam><type>mixed</type><parameter>a</parameter></methodparam><methodparam><type>mixed</type><parameter>b</parameter></methodparam></methodsynopsis></entity>

<entity name="catch"><link linkend="language.exceptions.catch"><literal>catch</literal></link></entity>

<entity name="const"><link linkend="language.constants.syntax"><literal>const</literal></link></entity>

<entity name="declare"><link linkend="control-structures.declare"><literal>declare</literal></link></entity>

<entity name="false"><constant>false</constant></entity>

<entity name="finally"><link linkend="language.exceptions.finally"><literal>finally</literal></link></entity>

<entity name="float"><type>float</type></entity>

<entity name="foreach"><link linkend="control-structures.foreach"><literal>foreach</literal></link></entity>

<entity name="function"><link linkend="functions.user-defined"><literal>function</literal></link></entity>

<entity name="global"><link linkend="language.variables.scope.global"><literal>global</literal></link></entity>

<entity name="htaccess"><filename>.htaccess</filename></entity>

<entity name="httpd.conf"><filename>httpd.conf</filename></entity>

<entity name="instanceof"><link linkend="language.operators.type"><literal>instanceof</literal></link></entity>

<entity name="integer"><type>int</type></entity>

<entity name="link.autoload"><link linkend="language.oop5.autoload">__autoload</link></entity>

<entity name="link.superglobals"><link linkend="language.variables.predefined">superglobals</link></entity>

<entity name="mixed"><type>mixed</type></entity>

<entity name="namespace"><link linkend="language.namespaces.definition"><literal>namespace</literal></link></entity>

<entity name="never"><type>never</type></entity>

<entity name="new"><link linkend="language.oop5.basic.new"><literal>new</literal></link></entity>

<entity name="null"><constant>null</constant></entity>

<entity name="object"><type>object</type></entity>

<entity name="php.ini"><filename>php.ini</filename></entity>

<entity name="resource"><type>resource</type></entity>

<entity name="return"><link linkend="function.return"><literal>return</literal></link></entity>

<entity name="string"><type>string</type></entity>

<entity name="throw"><link linkend="language.exceptions"><literal>throw</literal></link></entity>

<entity name="true"><constant>true</constant></entity>

<entity name="try"><link linkend="language.exceptions"><literal>try</literal></link></entity>

<entity name="use.namespace"><link linkend="language.namespaces.importing"><literal>use</literal></link></entity>

<entity name="user-ini"><filename>.user.ini</filename></entity>

<entity name="yield.from"><link linkend="control-structures.yield.from"><literal>yield from</literal></link></entity>

<entity name="yield"><link linkend="control-structures.yield"><literal>yield</literal></link></entity>

</entities>
Loading