Contributions are ready for review

Hello PHP EN Documentation team, There are contributions within the online editor queue for this language. Please review, then commit or delete these patches. Patches for review : ----------------------- Modified: en/reference/apcu/constants.xml By: Walt Sorensen on 2016-10-10 09:14:09 =================================================================== --- en/reference/apcu/constants.xml +++ en/reference/apcu/constants.xml @@ -5,6 +5,21 @@ &reftitle.constants; &extension.constants; + <title>The APCu Constants</title> + <titleabbrev>APCu Constants</titleabbrev> + + <partintro> + +<!-- {{{ APCu Constants intro --> + <section xml:id="apcu.constants.intro"> + &reftitle.intro; + <para> + The APCu Constants below are the same as defined in the APC extension, and will only be available when the extension has either been compiled into PHP or dynamically loaded at runtime. + </para> + </section> +<!-- }}} --> + </partintro> + <para> <variablelist> <varlistentry xml:id="constant.apcu-iter-all"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=69094 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=69094 ------------------------------------------------------------------ Modified: en/reference/mcrypt/constants.xml By: leigh on 2017-01-11 07:16:44 =================================================================== --- en/reference/mcrypt/constants.xml +++ en/reference/mcrypt/constants.xml @@ -16,40 +16,40 @@ <listitem> <simpara> <constant>MCRYPT_MODE_ECB</constant> (<literal>electronic - codebook</literal>) is suitable for random data, - such as encrypting other keys. Since data there is short and random, - the disadvantages of ECB have a favorable negative effect. + codebook</literal>) is a block cipher mode that is generally + unsuitable for most purposes. The use of this mode is not recommended. </simpara> </listitem> <listitem> <simpara> <constant>MCRYPT_MODE_CBC</constant> (<literal>cipher block - chaining</literal>) is especially suitable for - encrypting files where the security is increased over <literal>ECB</literal> - significantly. + chaining</literal>) is a block cipher mode that is significantly + more secure than <literal>ECB</literal> mode. </simpara> </listitem> <listitem> <simpara> <constant>MCRYPT_MODE_CFB</constant> (<literal>cipher - feedback</literal>) is the best mode for encrypting byte - streams where single bytes must be encrypted. + feedback, in 8-bit mode</literal>) is a stream cipher mode. + It is recommended to use <literal>NCFB</literal> mode rather + than <literal>CFB</literal> mode. </simpara> </listitem> <listitem> <simpara> <constant>MCRYPT_MODE_OFB</constant> (<literal>output feedback, in - 8bit</literal>) is comparable to <literal>CFB</literal>, but + 8-bit mode</literal>) is a stream cipher mode comparable to <literal>CFB</literal>, but can be used in applications where error propagation cannot - be tolerated. It's insecure (because it operates in 8bit - mode) so it is not recommended to use it. + be tolerated. + It is recommended to use <literal>NOFB</literal> mode rather + than <literal>OFB</literal> mode. </simpara> </listitem> <listitem> <simpara> <constant>MCRYPT_MODE_NOFB</constant> (<literal>output feedback, - in nbit</literal>) is comparable to OFB, but - more secure because it operates on the block size of the algorithm. + in n-bit mode</literal>) is comparable to <literal>OFB</literal> mode, + but operates on the full block size of the algorithm. </simpara> </listitem> <listitem> @@ -60,6 +60,25 @@ </listitem> </itemizedlist> </para> + + <para> + Mcrypt supports some other modes of operation for which there are no predefined constants. + They can be utilised by passing a string in place of the missing constants. + <itemizedlist> + <listitem> + <simpara> + <constant>"ctr"</constant> (<literal>counter mode</literal>) is a stream cipher mode. + </simpara> + </listitem> + <listitem> + <simpara> + <constant>"ncfb"</constant> (<literal>cipher feedback, + in n-bit mode</literal>) is comparable to <literal>CFB</literal> mode, + but operates on the full block size of the algorithm. + </simpara> + </listitem> + </itemizedlist> + </para> <para> Some other mode and random device constants: => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=71828 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=71828 ------------------------------------------------------------------ Modified: en/reference/mbstring/overloading.xml By: kelunik on 2017-02-09 05:20:32 =================================================================== --- en/reference/mbstring/overloading.xml +++ en/reference/mbstring/overloading.xml @@ -1,14 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 342126 $ --> +<!-- $Revision: 297028 $ --> <chapter xml:id="mbstring.overload" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title> Function Overloading Feature </title> - - <para> - &warn.deprecated.feature-7-2-0; - </para> + <caution> + <para> + This directive will break any code that relies on these fundamental + string functions to operate on bytes instead of code points. Its use + has thus been discouraged. It will be deprecated in PHP 7.2.0 and + removed in PHP 8. + </para> + </caution> <para> You might often find it difficult to get an existing PHP application to work in a given multibyte environment. This happens because most @@ -140,14 +144,6 @@ </tgroup> </table> </para> - <note> - <para> - It is not recommended to use the function overloading option in - the per-directory context, because it's not confirmed yet to be - stable enough in a production environment and may lead to undefined - behaviour. - </para> - </note> </chapter> <!-- Keep this comment at the end of the file => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=72330 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=72330 ------------------------------------------------------------------ Modified: en/reference/json/setup.xml By: Peter Kokot on 2017-03-17 05:20:43 =================================================================== --- en/reference/json/setup.xml +++ en/reference/json/setup.xml @@ -13,7 +13,8 @@ &reftitle.install; <para> As of PHP 5.2.0, the JSON extension is bundled and compiled into PHP by - default. + default, although it may be disabled by compiling with + <option role="configure">--disable-json</option>. </para> <para> &pecl.info; => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=73012 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=73012 ------------------------------------------------------------------ Modified: en/reference/fileinfo/configure.xml By: Peter Kokot on 2017-03-17 05:44:47 =================================================================== --- en/reference/fileinfo/configure.xml +++ en/reference/fileinfo/configure.xml @@ -3,7 +3,8 @@ <section xml:id="fileinfo.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> &reftitle.install; <para> - This extension is enabled by default as of PHP 5.3.0. Before this time, + This extension is enabled by default as of PHP 5.3.0. It may be disabled + by compiling with <option role="configure">--disable-fileinfo</option>. Before this time, fileinfo was a PECL extension but is no longer maintained there. However, versions prior to 5.3+ may use the <link xlink:href="&url.pecl.package;fileinfo">discontinued PECL extension</link>. => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=73013 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=73013 ------------------------------------------------------------------ Modified: en/reference/win32service/functions/win32-get-last-control-message.xml By: Jean-Baptiste Nahan on 2017-03-25 06:23:33 =================================================================== --- en/reference/win32service/functions/win32-get-last-control-message.xml +++ en/reference/win32service/functions/win32-get-last-control-message.xml @@ -33,6 +33,15 @@ </para> </refsect1> +<refsect1 role="notes"> +&reftitle.notes; +<caution> +<para> +Since version 0.2.0, this function work only in "cli" SAPI. On other SAPI the function is disabled. +</para> +</caution> +</refsect1> + <refsect1 role="seealso"> &reftitle.seealso; <para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=73075 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=73075 ------------------------------------------------------------------ Modified: en/reference/win32service/functions/win32-set-service-status.xml By: Jean-Baptiste Nahan on 2017-03-25 06:23:46 =================================================================== --- en/reference/win32service/functions/win32-set-service-status.xml +++ en/reference/win32service/functions/win32-set-service-status.xml @@ -67,6 +67,15 @@ </para> </refsect1> +<refsect1 role="notes"> +&reftitle.notes; +<caution> +<para> +Since version 0.2.0, this function work only in "cli" SAPI. On other SAPI the function is disabled. +</para> +</caution> +</refsect1> + <refsect1 role="seealso"> &reftitle.seealso; <para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=73074 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=73074 ------------------------------------------------------------------ Modified: en/reference/win32service/functions/win32-start-service-ctrl-dispatcher.xml By: Jean-Baptiste Nahan on 2017-03-25 06:23:59 =================================================================== --- en/reference/win32service/functions/win32-start-service-ctrl-dispatcher.xml +++ en/reference/win32service/functions/win32-start-service-ctrl-dispatcher.xml @@ -90,6 +90,15 @@ </para> </refsect1> +<refsect1 role="notes"> +&reftitle.notes; +<caution> +<para> +Since version 0.2.0, this function work only in "cli" SAPI. On other SAPI the function is disabled. +</para> +</caution> +</refsect1> + <refsect1 role="seealso"> &reftitle.seealso; <para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=73073 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=73073 ------------------------------------------------------------------ Modified: en/reference/ldap/functions/ldap-get-option.xml By: heiglandreas on 2017-04-17 11:06:45 =================================================================== --- en/reference/ldap/functions/ldap-get-option.xml +++ en/reference/ldap/functions/ldap-get-option.xml @@ -37,135 +37,164 @@ <para> The parameter <parameter>option</parameter> can be one of: <informaltable> - <tgroup cols="2"> + <tgroup cols="3"> <thead> <row> <entry>Option</entry> <entry>Type</entry> + <entry>since</entry> </row> </thead> <tbody> <row> <entry><constant>LDAP_OPT_DEREF</constant></entry> <entry>integer</entry> + <entry></entry> </row> <row> <entry><constant>LDAP_OPT_SIZELIMIT</constant></entry> <entry>integer</entry> + <entry></entry> </row> <row> <entry><constant>LDAP_OPT_TIMELIMIT</constant></entry> <entry>integer</entry> + <entry></entry> </row> <row> <entry><constant>LDAP_OPT_NETWORK_TIMEOUT</constant></entry> <entry>integer</entry> + <entry></entry> </row> <row> <entry><constant>LDAP_OPT_PROTOCOL_VERSION</constant></entry> <entry>integer</entry> + <entry></entry> </row> <row> <entry><constant>LDAP_OPT_ERROR_NUMBER</constant></entry> <entry>integer</entry> + <entry></entry> </row> <row> <entry><constant>LDAP_OPT_REFERRALS</constant></entry> <entry>bool</entry> + <entry></entry> </row> <row> <entry><constant>LDAP_OPT_RESTART</constant></entry> <entry>bool</entry> + <entry></entry> </row> <row> <entry><constant>LDAP_OPT_HOST_NAME</constant></entry> <entry>string</entry> + <entry></entry> </row> <row> <entry><constant>LDAP_OPT_ERROR_STRING</constant></entry> <entry>string</entry> + <entry></entry> </row> <row> <entry><constant>LDAP_OPT_MATCHED_DN</constant></entry> <entry>string</entry> + <entry></entry> </row> <row> <entry><constant>LDAP_OPT_SERVER_CONTROLS</constant></entry> <entry>array</entry> + <entry></entry> </row> <row> <entry><constant>LDAP_OPT_CLIENT_CONTROLS</constant></entry> <entry>array</entry> + <entry></entry> </row> <row> <entry><constant>LDAP_OPT_X_KEEPALIVE_IDLE</constant></entry> <entry>int</entry> - <entry></entry> + <entry>7.1</entry> </row> <row> <entry><constant>LDAP_OPT_X_KEEPALIVE_PROBES</constant></entry> <entry>int</entry> - <entry></entry> + <entry>7.1</entry> </row> <row> <entry><constant>LDAP_OPT_X_KEEPALIVE_INTERVAL</constant></entry> <entry>int</entry> - <entry></entry> + <entry>7.1</entry> </row> <row> <entry><constant>LDAP_OPT_X_TLS_CACERTDIR</constant></entry> <entry>string</entry> - <entry></entry> + <entry>7.1</entry> </row> <row> <entry><constant>LDAP_OPT_X_TLS_CACERTFILE</constant></entry> <entry>string</entry> - <entry></entry> + <entry>7.1</entry> </row> <row> <entry><constant>LDAP_OPT_X_TLS_CERTFILE</constant></entry> <entry>string</entry> - <entry></entry> + <entry>7.1</entry> </row> <row> <entry><constant>LDAP_OPT_X_TLS_CIPHER_SUITE</constant></entry> <entry>string</entry> - <entry></entry> + <entry>7.1</entry> </row> <row> <entry><constant>LDAP_OPT_X_TLS_CRLCHECK</constant></entry> <entry>integer</entry> - <entry></entry> + <entry>7.1</entry> + </row> + <row> + <entry><constant>LDAP_OPT_X_TLS_CRL_NONE</constant></entry> + <entry>integer</entry> + <entry>7.1</entry> + </row> + <row> + <entry><constant>LDAP_OPT_X_TLS_CRL_PEER</constant></entry> + <entry>integer</entry> + <entry>7.1</entry> + </row> + <row> + <entry><constant>LDAP_OPT_X_TLS_CRL_ALL</constant></entry> + <entry>integer</entry> + <entry>7.1</entry> </row> <row> <entry><constant>LDAP_OPT_X_TLS_CRLFILE</constant></entry> <entry>string</entry> - <entry></entry> + <entry>7.1</entry> </row> <row> <entry><constant>LDAP_OPT_X_TLS_DHFILE</constant></entry> <entry>string</entry> - <entry></entry> + <entry>7.1</entry> </row> <row> <entry><constant>LDAP_OPT_X_TLS_KEYILE</constant></entry> <entry>string</entry> - <entry></entry> + <entry>7.1</entry> </row> <row> <entry><constant>LDAP_OPT_X_TLS_PACKAGE</constant></entry> <entry>string</entry> - <entry></entry> + <entry>7.1</entry> </row> <row> <entry><constant>LDAP_OPT_X_TLS_PROTOCOL_MIN</constant></entry> <entry>integer</entry> - <entry></entry> + <entry>7.1</entry> </row> <row> <entry><constant>LDAP_OPT_X_TLS_RANDOM_FILE</constant></entry> <entry>string</entry> - <entry></entry> + <entry>7.1</entry> </row> <row> <entry><constant>LDAP_OPT_X_TLS_REQUIRE_CERT</constant></entry> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=73610 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=73610 ------------------------------------------------------------------ -- https://edit.php.net/ This email is send automatically by the Php Docbook Online Editor.