Repository navigation
Convert and move global.ent into doc-en - #5722
Merged
Merged
Conversation
Member
|
I was asking you if this was all, but then the full list of links came in. I have a strong feeling a big chunk of these links are in third-party extensions. So it would do good to see this file become shorter over time when we migrate those to doc-ext. |
Member
Author
|
After parts of manuals start moving into doc-ext, a tool that lists all entities, and then a tool that tries to build the manual with one entity erased, can be used to check unused entities in doc-en, and also translations, to shrink the language-snippets.ent. I may create an entities/entities.remove.dtd file, to push these cases here, so no conversion into XML would be necessary. |
Member
|
LGTM |
lacatoire
pushed a commit
to lacatoire/doc-extensions
that referenced
this pull request
Aug 5, 2026
Cross-references whose target stays in the main manual cannot use a linkend here, so they go through entities resolving to php.net links. The file follows the format introduced in php/doc-en#5722, and the links are composed from a url.php.manual.en entity rather than repeating the base URL. The README gains a Creating this setup section for the build outside Docker.
KentarouTakeda
added a commit
to KentarouTakeda/php-doc-ja
that referenced
this pull request
Aug 9, 2026
php/doc-en#5722（Convert and move global.ent into doc-en）で、削除予定の エンティティ 3 件（reference.pdo-cubrid.entities.PDO、 reference.pdo-pgsql.entities.PDO、reference.pdo-sqlite.entities.PDO）が このファイルに移された。 原文が「翻訳側は entities を空のままにし、revtag だけ更新する」と明記している ファイルなので、EN-Revision だけを更新する。上記 3 件は ja ツリーからの参照が ゼロであることを確認した。
KentarouTakeda
added a commit
to php/doc-ja
that referenced
this pull request
Aug 9, 2026
* PDO・PDO_PGSQL・PDO_Firebird の PHP 8.4 の変更を追従 php/doc-en#5703（ext/pdo: PHP 8.4 changes across PDO, PDO_PGSQL and PDO_Firebird）に追従。 - reference/pdo/pdo/prepare.xml — ドライバ固有の SQL パーサーの説明を追加。 あわせて 8.4.0 より前のパーサーについての注記を過去形にする - reference/pdo/pdo/getattribute.xml — 取得できる属性の一覧を原文に合わせて差し替え - reference/pdo/pdostatement/getattribute.xml — Pdo\Pgsql::ATTR_RESULT_MEMORY_SIZE を追加 - reference/pdo_pgsql/reference.xml — DSN の認証情報がコンストラクタの引数より 優先される旨の注記を追加 - reference/pdo_pgsql/pdo-pgsql.xml — ドル記号で囲まれた文字列の中で疑問符を ?? としてエスケープすることが非推奨になった旨の注記を追加 - reference/pdo_pgsql/configure.xml — libpq 10.0 以降が必要になった旨を追加 - reference/pdo_firebird/configure.xml — C++ コンパイラと fbclient 3.0 以降が 必要になった旨を追加 * SimpleXML で暗黙の巻き戻しがなくなったことを追従 php/doc-en#5737（ext/simplexml: Document that get methods and string casts no longer implicitly rewind）に追従。PHP 8.4.0 以降、値を取得するメソッドの呼び出しと string へのキャストがイテレータを暗黙的に巻き戻さなくなった旨を追加する。 - reference/simplexml/simplexmlelement.xml - reference/simplexml/simplexmlelement/rewind.xml * language/basic-syntax.xml を原文の修正に追従 - php/doc-en#5724（Fix reference to non-existent "example three"） 短縮タグの説明が、存在しない「例 3」を参照していた誤りを修正する。 このページに example は 1 つしかなく、その中で 3 つのコードが手で番号付け されているだけなので、原文は「上の例の 3 番目」を指す表現に変わった。 あわせて当該段落が para から simpara になったのを反映する。 - php/doc-en#5747（Example emits warning unrelated to content） 「条件を使った高度なエスケープ」のコード例が、未定義の変数 $expression を 参照していて内容と無関係な警告を出していたのを修正する。 * entities/entities.remove.ent の revtag を更新 php/doc-en#5722（Convert and move global.ent into doc-en）で、削除予定の エンティティ 3 件（reference.pdo-cubrid.entities.PDO、 reference.pdo-pgsql.entities.PDO、reference.pdo-sqlite.entities.PDO）が このファイルに移された。 原文が「翻訳側は entities を空のままにし、revtag だけ更新する」と明記している ファイルなので、EN-Revision だけを更新する。上記 3 件は ja ツリーからの参照が ゼロであることを確認した。
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Move global.ent entirely into doc-en, all of it, including URLs, at least while manual split is not complete.
The only thing that is truly global resting in doc-base/entities/global.ent was URLs, but these are also "moved" here as to allow changes to be more easily done, without depending on PRs that cross repositories.
Tested on all languages. As an incidental first result, text-entitites.php found a duplication (url.libevent), already fixed. After, is to change all residual files in doc-base/entities to note these files are to be erased, when doc-ext recreates any (hopefully few) entities they need.
Comments and reviews are welcome. Plan to merge this in one week.