Skip to content

Commit

Permalink
Inherit changes proposed in #1963
Browse files Browse the repository at this point in the history
  • Loading branch information
phansys committed Aug 25, 2023
1 parent 791712c commit 21eb6eb
Show file tree
Hide file tree
Showing 108 changed files with 232 additions and 232 deletions.
2 changes: 1 addition & 1 deletion appendices/migration70/changed-functions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<listitem>
<simpara>
<function>setlocale</function> function no longer accepts <parameter>category</parameter>
passed as string. <constant>LC_*</constant> constants must be used instead.
passed as string. <constant>LC_<replaceable>*</replaceable></constant> constants must be used instead.
</simpara>
</listitem>
<listitem>
Expand Down
2 changes: 1 addition & 1 deletion appendices/migration70/incompatible/removed-functions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<function>mcrypt_cbc</function>, <function>mcrypt_cfb</function> and
<function>mcrypt_ofb</function> functions have been removed in favour of
using <function>mcrypt_decrypt</function> with the appropriate
<constant>MCRYPT_MODE_*</constant> constant.
<constant>MCRYPT_MODE_<replaceable>*</replaceable></constant> constant.
</para>
</sect3>

Expand Down
2 changes: 1 addition & 1 deletion appendices/migration80/other-changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<methodname>ZipArchive::addEmptyDir</methodname>, <methodname>ZipArchive::addFile</methodname>
and <methodname>ZipArchive::addFromString</methodname>
methods have a new <parameter>flags</parameter> argument. This allows managing name encoding
(<constant>ZipArchive::FL_ENC_*</constant>) and entry replacement
(<constant>ZipArchive::FL_ENC_<replaceable>*</replaceable></constant>) and entry replacement
(<constant>ZipArchive::FL_OVERWRITE</constant>).
</para>
</listitem>
Expand Down
4 changes: 2 additions & 2 deletions language-snippets.ent
Original file line number Diff line number Diff line change
Expand Up @@ -1195,7 +1195,7 @@ Passing untrusted data to this parameter is <emphasis>insecure</emphasis>, unles

<!ENTITY intl.locale-len.return '<para xmlns="http://docbook.org/ns/docbook">Returns &null; when the length of <parameter>locale</parameter> exceeds <constant>INTL_MAX_LOCALE_LEN</constant>.</para>'>

<!ENTITY intl.property.parameter '<para xmlns="http://docbook.org/ns/docbook">The Unicode property to lookup (see the <constant>IntlChar::PROPERTY_*</constant> constants).</para>'>
<!ENTITY intl.property.parameter '<para xmlns="http://docbook.org/ns/docbook">The Unicode property to lookup (see the <constant>IntlChar::PROPERTY_<replaceable>*</replaceable></constant> constants).</para>'>

<!ENTITY intl.property.example 'Testing different properties'>

Expand Down Expand Up @@ -1344,7 +1344,7 @@ encoding value will be used.</para>'>
<!ENTITY memcached.result.delete-multi '<para xmlns="http://docbook.org/ns/docbook">
Returns an array indexed by <parameter>keys</parameter>. Each element
is &true; if the corresponding key was deleted, or one of the
<constant>Memcached::RES_*</constant> constants if the corresponding deletion
<constant>Memcached::RES_<replaceable>*</replaceable></constant> constants if the corresponding deletion
failed.
</para>
<para xmlns="http://docbook.org/ns/docbook">
Expand Down
4 changes: 2 additions & 2 deletions reference/curl/functions/curl-getinfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -279,12 +279,12 @@
</listitem>
<listitem>
<simpara>
<constant>CURLINFO_HTTP_VERSION</constant> - The version used in the last HTTP connection. The return value will be one of the defined <constant>CURL_HTTP_VERSION_*</constant> constants or 0 if the version can't be determined
<constant>CURLINFO_HTTP_VERSION</constant> - The version used in the last HTTP connection. The return value will be one of the defined <constant>CURL_HTTP_VERSION_<replaceable>*</replaceable></constant> constants or 0 if the version can't be determined
</simpara>
</listitem>
<listitem>
<simpara>
<constant>CURLINFO_PROTOCOL</constant> - The protocol used in the last HTTP connection. The returned value will be exactly one of the <constant>CURLPROTO_*</constant> values
<constant>CURLINFO_PROTOCOL</constant> - The protocol used in the last HTTP connection. The returned value will be exactly one of the <constant>CURLPROTO_<replaceable>*</replaceable></constant> values
</simpara>
</listitem>
<listitem>
Expand Down
2 changes: 1 addition & 1 deletion reference/curl/functions/curl-multi-info-read.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</row>
<row>
<entry><literal>result</literal></entry>
<entry>One of the <constant>CURLE_*</constant> constants. If everything is
<entry>One of the <constant>CURLE_<replaceable>*</replaceable></constant> constants. If everything is
OK, the <constant>CURLE_OK</constant> will be the result.</entry>
</row>
<row>
Expand Down
2 changes: 1 addition & 1 deletion reference/curl/functions/curl-multi-setopt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<term><parameter>option</parameter></term>
<listitem>
<para>
One of the <constant>CURLMOPT_*</constant> constants.
One of the <constant>CURLMOPT_<replaceable>*</replaceable></constant> constants.
</para>
</listitem>
</varlistentry>
Expand Down
2 changes: 1 addition & 1 deletion reference/curl/functions/curl-pause.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<term><parameter>flags</parameter></term>
<listitem>
<para>
One of <constant>CURLPAUSE_*</constant> constants.
One of <constant>CURLPAUSE_<replaceable>*</replaceable></constant> constants.
</para>
</listitem>
</varlistentry>
Expand Down
Loading

0 comments on commit 21eb6eb

Please sign in to comment.