Skip to content

doc-en と同期し 空の xi:fallback と不要なコメントを除去（win32service の同種1件を含む・訳文の変更なし） #418

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
KentarouTakeda merged 2 commits into from
Jul 27, 2026
Merged

doc-en と同期し 空の xi:fallback と不要なコメントを除去（win32service の同種1件を含む・訳文の変更なし） #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c43c19
doc-en と同期し 空の xi:fallback と不要なコメントを除去（訳文の変更なし）
KentarouTakeda Jul 26, 2026
2f15e12
win32service: 原文で除去済みの折りたたみコメントを除去
KentarouTakeda Jul 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
80 changes: 40 additions & 40 deletions appendices/ini.list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<entry><constant>INI_PERDIR</constant></entry>
<entry></entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('bc.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('bc.configuration.list')/*)"/>
<row>
<entry><link linkend="ini.browscap">browscap</link></entry>
<entry>&null;</entry>
Expand Down Expand Up @@ -165,12 +165,12 @@
<entry><constant>INI_ALL</constant></entry>
<entry></entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('readline.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('features.commandline.ini.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('com.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('curl.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('datetime.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('dba.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('readline.configuration.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('features.commandline.ini.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('com.configuration.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('curl.configuration.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('datetime.configuration.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('dba.configuration.list')/*)"/>
<row>
<entry><link linkend="ini.default-charset">default_charset</link></entry>
<entry><literal>"UTF-8"</literal></entry>
Expand Down Expand Up @@ -298,14 +298,14 @@
<entry><constant>INI_ALL</constant></entry>
<entry></entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exif.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exif.configuration.list')/*)"/>
<row>
<entry><link linkend="ini.exit-on-timeout">exit_on_timeout</link></entry>
<entry><literal>""</literal></entry>
<entry><constant>INI_ALL</constant></entry>
<entry></entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('expect.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('expect.configuration.list')/*)"/>
<row>
<entry><link linkend="ini.expose-php">expose_php</link></entry>
<entry><literal>"1"</literal></entry>
Expand Down Expand Up @@ -342,15 +342,15 @@
<entry><constant>INI_SYSTEM</constant></entry>
<entry></entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('filter.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('filter.configuration.list')/*)"/>
<row>
<entry><link linkend="ini.from">from</link></entry>
<entry><literal>""</literal></entry>
<entry><constant>INI_ALL</constant></entry>
<entry></entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('image.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('geoip.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('image.configuration.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('geoip.configuration.list')/*)"/>
<row>
<entry>hard_timeout</entry>
<entry>"2"</entry>
Expand Down Expand Up @@ -393,9 +393,9 @@
<entry><constant>INI_ALL</constant></entry>
<entry></entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('ibase.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('ibm-db2.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('iconv.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('ibase.configuration.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('ibm-db2.configuration.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('iconv.configuration.list')/*)"/>
<row>
<entry><link linkend="ini.ignore-repeated-errors">ignore_repeated_errors</link></entry>
<entry><literal>"0"</literal></entry>
Expand Down Expand Up @@ -426,14 +426,14 @@
<entry><constant>INI_ALL</constant></entry>
<entry></entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('intl.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('intl.configuration.list')/*)"/>
<row>
<entry><link linkend="ini.last-modified">last_modified</link></entry>
<entry><literal>"0"</literal></entry>
<entry><constant>INI_ALL</constant></entry>
<entry></entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('ldap.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('ldap.configuration.list')/*)"/>
<row>
<entry><link linkend="ini.log-errors">log_errors</link></entry>
<entry><literal>"0"</literal></entry>
Expand Down Expand Up @@ -488,21 +488,21 @@
<entry><constant>INI_PERDIR</constant></entry>
<entry></entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mbstring.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mcrypt.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('memcache.ini.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mbstring.configuration.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mcrypt.configuration.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('memcache.ini.list')/*)"/>
<row>
<entry><link linkend="ini.memory-limit">memory_limit</link></entry>
<entry><literal>"128M"</literal></entry>
<entry><constant>INI_ALL</constant></entry>
<entry></entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysql.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqli.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqlnd.config.options.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('oci8.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('odbc.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('opcache.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysql.configuration.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqli.configuration.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqlnd.config.options.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('oci8.configuration.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('odbc.configuration.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('opcache.configuration.list')/*)"/>
<row>
<entry><link linkend="ini.open-basedir">open_basedir</link></entry>
<entry>&null;</entry>
Expand All @@ -521,11 +521,11 @@
<entry><constant>INI_PERDIR</constant></entry>
<entry></entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pcre.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-odbc.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pgsql.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('phar.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pcre.configuration.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo.configuration.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-odbc.configuration.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pgsql.configuration.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('phar.configuration.list')/*)"/>
<row>
<entry><link linkend="ini.post-max-size">post_max_size</link></entry>
<entry><literal>"8M"</literal></entry>
Expand Down Expand Up @@ -574,7 +574,7 @@
<entry><constant>INI_PERDIR</constant></entry>
<entry></entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runkit7.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runkit7.configuration.list')/*)"/>
<row>
<entry><link linkend="ini.sendmail-from">sendmail_from</link></entry>
<entry>&null;</entry>
Expand All @@ -595,7 +595,7 @@
PHP 7.1.0 より前のバージョンでは、デフォルト値は <literal>17</literal> でした。
</entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('session.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('session.configuration.list')/*)"/>
<row>
<entry><link linkend="ini.short-open-tag">short_open_tag</link></entry>
<entry><literal>"1"</literal></entry>
Expand All @@ -614,14 +614,14 @@
<entry><constant>INI_ALL</constant></entry>
<entry></entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('soap.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('soap.configuration.list')/*)"/>
<row>
<entry><link linkend="ini.sql.safe-mode">sql.safe_mode</link></entry>
<entry><literal>"0"</literal></entry>
<entry><constant>INI_SYSTEM</constant></entry>
<entry>PHP 7.2.0 で削除</entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('sqlite3.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('sqlite3.configuration.list')/*)"/>
<row>
<entry><link linkend="ini.syslog.facility">syslog.facility</link></entry>
<entry><literal>"LOG_USER"</literal></entry>
Expand All @@ -646,15 +646,15 @@
<entry><constant>INI_SYSTEM</constant></entry>
<entry></entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('sem.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('tidy.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('sem.configuration.list')/*)"/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('tidy.configuration.list')/*)"/>
<row>
<entry><link linkend="ini.track-errors">track_errors</link></entry>
<entry><literal>"0"</literal></entry>
<entry><constant>INI_ALL</constant></entry>
<entry>PHP 7.2.0 以降は非推奨になり、PHP 8.0.0 で 削除されました。</entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('unserialize.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('unserialize.configuration.list')/*)"/>
<row>
<entry>uploadprogress.file.filename_template</entry>
<entry><literal>"/tmp/upt_%s.txt"</literal></entry>
Expand Down Expand Up @@ -715,7 +715,7 @@
<entry><constant>INI_SYSTEM</constant></entry>
<entry></entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('uopz.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('uopz.configuration.list')/*)"/>
<row>
<entry><link linkend="ini.variables-order">variables_order</link></entry>
<entry><literal>"EGPCS"</literal></entry>
Expand Down Expand Up @@ -818,7 +818,7 @@
<entry>&php.ini; のみ</entry>
<entry></entry>
</row>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('zlib.configuration.list')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('zlib.configuration.list')/*)"/>
</tbody>
</tgroup>
</table>
Expand Down
2 changes: 1 addition & 1 deletion install/ini.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ Replace everything inside the <variablelist> element with an <xi:include>
once libxml2 gets XInclude 1.1 attribute copying support.
The below <xi:include> will include the appropriate elements
but needs all top-level xml:id's removed (see XInclude 1.1 set-xml-id).
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('constant.ini-mode')/*)"><xi:fallback/></xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('constant.ini-mode')/*)"/>
-->
<title>INI モードの定数</title>
<varlistentry>
Expand Down
4 changes: 2 additions & 2 deletions language/context/ftp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</para>
</refsect1>

<refsect1 role="options"><!-- {{{ -->
<refsect1 role="options">
&reftitle.options;
<para>
<variablelist>
Expand Down Expand Up @@ -65,7 +65,7 @@
</varlistentry>
</variablelist>
</para>
</refsect1><!-- }}} -->
</refsect1>

<refsect1 role="notes">
&reftitle.notes;
Expand Down
16 changes: 8 additions & 8 deletions language/context/http.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</para>
</refsect1>

<refsect1 role="options"><!-- {{{ -->
<refsect1 role="options">
&reftitle.options;
<para>
<variablelist>
Expand Down Expand Up @@ -202,13 +202,13 @@
</varlistentry>
</variablelist>
</para>
</refsect1><!-- }}} -->
</refsect1>


<refsect1 role="examples"><!-- {{{ -->
<refsect1 role="examples">
&reftitle.examples;
<para>
<example xml:id="context.http.example-post"><!-- {{{ -->
<example xml:id="context.http.example-post">
<title>ページの取得と POST データの送信</title>
<programlisting role="php">
<![CDATA[
Expand Down Expand Up @@ -236,10 +236,10 @@ $result = file_get_contents('http://example.com/submit.php', false, $context);
?>
]]>
</programlisting>
</example><!-- }}} -->
</example>
</para>
<para>
<example xml:id="context.http.example-fetch-ignore-redirect"><!-- {{{ -->
<example xml:id="context.http.example-fetch-ignore-redirect">
<title>リダイレクトを無視し、ヘッダとコンテンツの取得</title>
<programlisting role="php">
<![CDATA[
Expand Down Expand Up @@ -267,9 +267,9 @@ fclose($stream);
?>
]]>
</programlisting>
</example><!-- }}} -->
</example>
</para>
</refsect1><!-- }}} -->
</refsect1>

<refsect1 role="notes">
&reftitle.notes;
Expand Down
4 changes: 2 additions & 2 deletions language/context/parameters.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</para>
</refsect1>

<refsect1 role="options"><!-- {{{ -->
<refsect1 role="options">
&reftitle.parameters;
<para>
<variablelist>
Expand All @@ -38,7 +38,7 @@
</varlistentry>
</variablelist>
</para>
</refsect1><!-- }}} -->
</refsect1>

</refentry>

Expand Down
4 changes: 2 additions & 2 deletions language/context/phar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</para>
</refsect1>

<refsect1 role="options"><!-- {{{ -->
<refsect1 role="options">
&reftitle.options;
<para>
<variablelist>
Expand Down Expand Up @@ -44,7 +44,7 @@
</varlistentry>
</variablelist>
</para>
</refsect1><!-- }}} -->
</refsect1>

<refsect1 role="seealso">
&reftitle.seealso;
Expand Down
20 changes: 10 additions & 10 deletions language/context/socket.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
<refpurpose>ソケットコンテキストオプション一覧</refpurpose>
</refnamediv>

<refsect1 role="description"><!-- {{{ -->
<refsect1 role="description">
&reftitle.description;
<para>
ここでは、ソケット越しに動作するラッパー
すなわち <literal>tcp</literal>、<literal>http</literal>
あるいは <literal>ftp</literal> でサポートされるオプションを扱います。
</para>
</refsect1><!-- }}} -->
</refsect1>

<refsect1 role="options"><!-- {{{ -->
<refsect1 role="options">
&reftitle.options;
<para>
<variablelist>
Expand Down Expand Up @@ -112,9 +112,9 @@
</varlistentry>
</variablelist>
</para>
</refsect1><!-- }}} -->
</refsect1>

<refsect1 role="changelog"><!-- {{{ -->
<refsect1 role="changelog">
&reftitle.changelog;
<para>
<informaltable>
Expand Down Expand Up @@ -142,12 +142,12 @@
</tgroup>
</informaltable>
</para>
</refsect1><!-- }}} -->
</refsect1>

<refsect1 role="examples"><!-- {{{ -->
<refsect1 role="examples">
&reftitle.examples;
<para>
<example xml:id="context.socket.example-bindto"><!-- {{{ -->
<example xml:id="context.socket.example-bindto">
<title>基本的な <parameter>bindto</parameter> の使用例</title>
<programlisting role="php">
<![CDATA[
Expand Down Expand Up @@ -193,9 +193,9 @@ echo file_get_contents('http://www.example.com', false, $context);
?>
]]>
</programlisting>
</example><!-- }}} -->
</example>
</para>
</refsect1><!-- }}} -->
</refsect1>

</refentry>

Expand Down
Loading
Loading