Skip to content

Commit b8da203

Browse files
committed
Inherit changes proposed in php#1963
1 parent 791712c commit b8da203

File tree

108 files changed

+231
-231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+231
-231
lines changed

appendices/migration70/changed-functions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<listitem>
4747
<simpara>
4848
<function>setlocale</function> function no longer accepts <parameter>category</parameter>
49-
passed as string. <constant>LC_*</constant> constants must be used instead.
49+
passed as string. <constant>LC_<replaceable>*</replaceable></constant> constants must be used instead.
5050
</simpara>
5151
</listitem>
5252
<listitem>

appendices/migration70/incompatible/removed-functions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<function>mcrypt_cbc</function>, <function>mcrypt_cfb</function> and
4646
<function>mcrypt_ofb</function> functions have been removed in favour of
4747
using <function>mcrypt_decrypt</function> with the appropriate
48-
<constant>MCRYPT_MODE_*</constant> constant.
48+
<constant>MCRYPT_MODE_<replaceable>*</replaceable></constant> constant.
4949
</para>
5050
</sect3>
5151

appendices/migration80/other-changes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<methodname>ZipArchive::addEmptyDir</methodname>, <methodname>ZipArchive::addFile</methodname>
7474
and <methodname>ZipArchive::addFromString</methodname>
7575
methods have a new <parameter>flags</parameter> argument. This allows managing name encoding
76-
(<constant>ZipArchive::FL_ENC_*</constant>) and entry replacement
76+
(<constant>ZipArchive::FL_ENC_<replaceable>*</replaceable></constant>) and entry replacement
7777
(<constant>ZipArchive::FL_OVERWRITE</constant>).
7878
</para>
7979
</listitem>

language-snippets.ent

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,7 @@ Passing untrusted data to this parameter is <emphasis>insecure</emphasis>, unles
11951195

11961196
<!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>'>
11971197

1198-
<!ENTITY intl.property.parameter '<para xmlns="http://docbook.org/ns/docbook">The Unicode property to lookup (see the <constant>IntlChar::PROPERTY_*</constant> constants).</para>'>
1198+
<!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>'>
11991199

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

@@ -1344,7 +1344,7 @@ encoding value will be used.</para>'>
13441344
<!ENTITY memcached.result.delete-multi '<para xmlns="http://docbook.org/ns/docbook">
13451345
Returns an array indexed by <parameter>keys</parameter>. Each element
13461346
is &true; if the corresponding key was deleted, or one of the
1347-
<constant>Memcached::RES_*</constant> constants if the corresponding deletion
1347+
<constant>Memcached::RES_<replaceable>*</replaceable></constant> constants if the corresponding deletion
13481348
failed.
13491349
</para>
13501350
<para xmlns="http://docbook.org/ns/docbook">

reference/curl/functions/curl-getinfo.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,12 +279,12 @@
279279
</listitem>
280280
<listitem>
281281
<simpara>
282-
<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
282+
<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
283283
</simpara>
284284
</listitem>
285285
<listitem>
286286
<simpara>
287-
<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
287+
<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
288288
</simpara>
289289
</listitem>
290290
<listitem>

reference/curl/functions/curl-multi-info-read.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</row>
7373
<row>
7474
<entry><literal>result</literal></entry>
75-
<entry>One of the <constant>CURLE_*</constant> constants. If everything is
75+
<entry>One of the <constant>CURLE_<replaceable>*</replaceable></constant> constants. If everything is
7676
OK, the <constant>CURLE_OK</constant> will be the result.</entry>
7777
</row>
7878
<row>

reference/curl/functions/curl-multi-setopt.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<term><parameter>option</parameter></term>
2929
<listitem>
3030
<para>
31-
One of the <constant>CURLMOPT_*</constant> constants.
31+
One of the <constant>CURLMOPT_<replaceable>*</replaceable></constant> constants.
3232
</para>
3333
</listitem>
3434
</varlistentry>

reference/curl/functions/curl-pause.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<term><parameter>flags</parameter></term>
3030
<listitem>
3131
<para>
32-
One of <constant>CURLPAUSE_*</constant> constants.
32+
One of <constant>CURLPAUSE_<replaceable>*</replaceable></constant> constants.
3333
</para>
3434
</listitem>
3535
</varlistentry>

0 commit comments

Comments
 (0)