Contributions are ready for review
| From: | phpdoc at lists dot php dot net | Date: | Mon, 14 Apr 2014 12:00:03 +0000 |
| Subject: | Contributions are ready for review | ||
| Groups: | php.doc | ||
| Request: | Send a blank email to phpdoc+get-969384936@lists.php.net to get a copy of this message | ||
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/array/functions/array-merge.xml
By: anonymous on 2014-04-05 19:38:29
===================================================================
--- en/reference/array/functions/array-merge.xml
+++ en/reference/array/functions/array-merge.xml
@@ -213,6 +213,7 @@
<para>
<simplelist>
<member><function>array_merge_recursive</function></member>
+ <member><function>array_replace</function></member>
<member><function>array_combine</function></member>
<member><link linkend="language.operators.array">array
operators</link></member>
</simplelist>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=53182
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=53182
------------------------------------------------------------------
Modified: en/reference/pthreads/pool/collect.xml
By: anonymous on 2014-04-05 19:41:12
===================================================================
--- en/reference/pthreads/pool/collect.xml
+++ en/reference/pthreads/pool/collect.xml
@@ -83,7 +83,7 @@
usleep(1000);
$pool->collect(function($work){
- return $work->isComplete();
+ return $work->isComplete();
});
var_dump($pool);
?>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=53183
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=53183
------------------------------------------------------------------
Modified: en/reference/pthreads/pool/submitTo.xml
By: anonymous on 2014-04-05 19:41:17
===================================================================
--- en/reference/pthreads/pool/submitTo.xml
+++ en/reference/pthreads/pool/submitTo.xml
@@ -57,7 +57,7 @@
<![CDATA[
<?php
class MyWork extends Threaded {
-
+
public function run() {
/* ... */
}
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=53184
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=53184
------------------------------------------------------------------
Modified: en/reference/pthreads/pool/submit.xml
By: anonymous on 2014-04-05 19:41:23
===================================================================
--- en/reference/pthreads/pool/submit.xml
+++ en/reference/pthreads/pool/submit.xml
@@ -48,7 +48,7 @@
<![CDATA[
<?php
class MyWork extends Threaded {
-
+
public function run() {
/* ... */
}
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=53185
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=53185
------------------------------------------------------------------
Modified: en/reference/pthreads/threaded/count.xml
By: anonymous on 2014-04-05 19:41:28
===================================================================
--- en/reference/pthreads/threaded/count.xml
+++ en/reference/pthreads/threaded/count.xml
@@ -42,7 +42,7 @@
$safe = new Threaded();
while (count($safe) < 10) {
- $safe[] = count($safe);
+ $safe[] = count($safe);
}
var_dump(count($safe));
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=53186
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=53186
------------------------------------------------------------------
Modified: en/reference/solr/solrclient/commit.xml
By: anonymous on 2014-04-05 19:41:34
===================================================================
--- en/reference/solr/solrclient/commit.xml
+++ en/reference/solr/solrclient/commit.xml
@@ -33,10 +33,10 @@
Does nothing, kept for backward compatibility
</para>
<warning>
- <para>
- DEPRECATED: will be removed in the next release.
- </para>
- </warning>
+ <para>
+ DEPRECATED: will be removed in the next release.
+ </para>
+ </warning>
</listitem>
</varlistentry>
<varlistentry>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=53187
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=53187
------------------------------------------------------------------
Modified: en/reference/solr/solrclient/adddocument.xml
By: anonymous on 2014-04-05 19:41:39
===================================================================
--- en/reference/solr/solrclient/adddocument.xml
+++ en/reference/solr/solrclient/adddocument.xml
@@ -42,9 +42,9 @@
</para>
<warning>
<para>
- PECL Solr < 2.0 $allowDups was used instead of $overwrite, which does the same
functionality with exact opposite bool flag.
- </para>
- <para>
+ PECL Solr < 2.0 $allowDups was used instead of $overwrite, which does the same
functionality with exact opposite bool flag.
+ </para>
+ <para>
$allowDups = false is the same as $overwrite = true
</para>
</warning>
@@ -57,12 +57,12 @@
Number of milliseconds within which to auto commit this document. Available since Solr 1.4
. Default (0) means disabled.
</para>
<para>
- When this value specified, it leaves the control of when to do the commit
- to Solr itself, optimizing number of commits to a minimum while still
- fulfilling
- the update latency requirements, and Solr will automatically do a commit
- when the oldest add in the buffer is due.
- </para>
+ When this value specified, it leaves the control of when to do the commit
+ to Solr itself, optimizing number of commits to a minimum while still
+ fulfilling
+ the update latency requirements, and Solr will automatically do a commit
+ when the oldest add in the buffer is due.
+ </para>
</listitem>
</varlistentry>
</variablelist>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=53188
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=53188
------------------------------------------------------------------
Modified: en/reference/uopz/functions/uopz-flags.xml
By: anonymous on 2014-04-05 19:41:44
===================================================================
--- en/reference/uopz/functions/uopz-flags.xml
+++ en/reference/uopz/functions/uopz-flags.xml
@@ -71,9 +71,9 @@
<![CDATA[
<?php
class Test {
- public function method() {
- return __CLASS__;
- }
+ public function method() {
+ return __CLASS__;
+ }
}
$flags = uopz_flags("Test", "method", ZEND_ACC_FETCH);
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=53189
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=53189
------------------------------------------------------------------
Modified: en/reference/zmq/zmq.xml
By: anonymous on 2014-04-05 19:41:55
===================================================================
--- en/reference/zmq/zmq.xml
+++ en/reference/zmq/zmq.xml
@@ -639,7 +639,7 @@
<term><constant>ZMQ::SOCKOPT_ROUTER_RAW</constant></term>
<listitem>
<para>Sets the raw mode on the ROUTER, when set to 1. In raw mode when using tcp://
transport the socket will read and write without ZeroMQ framing.
- Available if compiled against ZeroMQ 4.0 or higher (Value: &string;)</para>
+ Available if compiled against ZeroMQ 4.0 or higher (Value:
&string;)</para>
</listitem>
</varlistentry>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=53190
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=53190
------------------------------------------------------------------
--
https://edit.php.net/
This email is send automatically by the Php Docbook Online Editor.