Contributions are ready for review
| From: | phpdoc at lists dot php dot net | Date: | Mon, 06 Oct 2014 12:00:02 +0000 |
| Subject: | Contributions are ready for review | ||
| Groups: | php.doc | ||
| Request: | Send a blank email to phpdoc+get-969385208@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/faq/installation.xml
By: mattficken on 2014-09-04 14:39:45
===================================================================
--- en/faq/installation.xml
+++ en/faq/installation.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 334758 $ -->
+<!-- $Revision: 311461 $ -->
<chapter xml:id="faq.installation" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Installation</title>
<titleabbrev>Installation</titleabbrev>
@@ -394,9 +394,9 @@
<function>phpinfo</function>. Near the top, there will be a
listing called <literal>Configuration File (php.ini)</literal>.
This will tell you where PHP is looking for &php.ini; and
- whether or not it's being read. If just a directory <envar>PATH</envar>
exists,
+ whether or not it's being read. If just a directory PATH exists,
then it's not being read, and you should put your &php.ini;
- in that directory. If &php.ini; is included within the <envar>PATH</envar>,
+ in that directory. If &php.ini; is included within the PATH,
it is being read.
</para>
<para>
@@ -413,18 +413,16 @@
<qandaentry xml:id="faq.installation.addtopath">
<question>
<para>
- How do I add my PHP directory to the <envar>PATH</envar>
+ How do I add my PHP directory to the <varname>PATH</varname>
on Windows?
</para>
</question>
<answer>
<para>
- On Windows NT+ and Windows Server 2000+:
+ On Windows 7, XP, Vista, 2008, 2012 and up
<itemizedlist>
<listitem><para>
- Go to Control Panel and open the System icon (Start -> Settings
- -> Control Panel -> System, or just Start -> Control Panel
- -> System for Windows XP/2003+)
+ Go to Control Panel and open the System icon (Start -> Control Panel)
</para></listitem>
<listitem><para>
Go to the Advanced tab
@@ -450,107 +448,18 @@
</para></listitem>
</itemizedlist>
</para>
- <para>
- On Windows 98/Me you need to edit the <filename>autoexec.bat</filename>
- file:
- <itemizedlist>
- <listitem><para>
- Open the Notepad (Start -> Run and enter notepad)
- </para></listitem>
- <listitem><para>
- Open the <filename>C:autoexec.bat</filename> file
- </para></listitem>
- <listitem><para>
- Locate the line with PATH=C:WINDOWS;C:WINDOWSCOMMAND;..... and add:
- <literal>;C:php</literal> to the end of the line
- </para></listitem>
- <listitem><para>
- Save the file and restart your computer
- </para></listitem>
- </itemizedlist>
- </para>
- <note>
- <simpara>
- Be sure to reboot after following the steps above to ensure that the
- <envar>PATH</envar> changes are applied.
- </simpara>
- </note>
- <para>
- The PHP manual used to promote the copying of files into the Windows
- system directory, this is because this directory
+
+ <para>
+ The PHP manual used to promote the copying of files into the Windows
+ system directory, this is because this directory
(<filename>C:Windows</filename>, <filename>C:WINNT</filename>, etc.)
- is by default in the system's <envar>PATH</envar>. Copying files into the
Windows
+ is by default in the systems PATH. Copying files into the Windows
system directory has long since been deprecated and may cause problems.
</para>
</answer>
</qandaentry>
- <qandaentry xml:id="faq.installation.phprc">
- <question>
- <para>
- How do I make the &php.ini; file available to PHP on windows?
- </para>
- </question>
- <answer>
- <para>
- There are several ways of doing this. If you are using Apache, read
- their installation specific instructions (<link
- linkend="install.windows.apache1">Apache 1</link>, <link
- linkend="install.windows.apache2">Apache 2</link>), otherwise you must
- set the <varname>PHPRC</varname> environment variable:
- </para>
- <para>
- On Windows NT, 2000, XP and 2003:
- <itemizedlist>
- <listitem><para>
- Go to Control Panel and open the System icon (Start -> Settings
- -> Control Panel -> System, or just Start -> Control Panel
- -> System for Windows XP/2003)
- </para></listitem>
- <listitem><para>
- Go to the Advanced tab
- </para></listitem>
- <listitem><para>
- Click on the 'Environment Variables' button
- </para></listitem>
- <listitem><para>
- Look into the 'System variables' pane
- </para></listitem>
- <listitem><para>
- Click on 'New' and enter 'PHPRC' as the variable name and the
- directory where &php.ini; is located as the variable value (e.g.
- <literal>C:php</literal>)
- </para></listitem>
- <listitem><para>
- Press OK and restart your computer
- </para></listitem>
- </itemizedlist>
- </para>
- <para>
- On Windows 98/Me you need to edit the <filename>autoexec.bat</filename>
- file:
- <itemizedlist>
- <listitem><para>
- Open the Notepad (Start -> Run and enter notepad)
- </para></listitem>
- <listitem><para>
- Open the <filename>C:autoexec.bat</filename> file
- </para></listitem>
- <listitem><para>
- Add a new line to the end of the file: <literal>set
- PHPRC=C:php</literal> (replace <literal>C:php</literal> with the
- directory where &php.ini; is located). Please note that the path
- cannot contain spaces. For instance, if you have installed PHP in
- <filename>C:Program FilesPHP</filename>, you would enter
- <filename>C:PROGRA~1PHP</filename> instead.
- </para></listitem>
- <listitem><para>
- Save the file and restart your computer
- </para></listitem>
- </itemizedlist>
- </para>
- </answer>
- </qandaentry>
+
<qandaentry xml:id="faq.installation.apache.multiviews">
<question>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=57941
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=57941
------------------------------------------------------------------
Modified: en/reference/reflection/reflectionparameter/allowsnull.xml
By: ajf on 2014-09-13 18:30:56
===================================================================
--- en/reference/reflection/reflectionparameter/allowsnull.xml
+++ en/reference/reflection/reflectionparameter/allowsnull.xml
@@ -14,7 +14,7 @@
<void />
</methodsynopsis>
<para>
- Checks whether the parameter allows &null;.
+ Checks whether the parameter is nullable, i.e. that it allows &null;.
</para>
&warn.undocumented.func;
@@ -29,7 +29,7 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- &true; if &null; is allowed, otherwise &false;
+ &true; if nullable, otherwise &false;
</para>
</refsect1>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58093
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58093
------------------------------------------------------------------
Modified: en/reference/imap/functions/imap-search.xml
By: nathanb on 2014-09-15 17:19:37
===================================================================
--- en/reference/imap/functions/imap-search.xml
+++ en/reference/imap/functions/imap-search.xml
@@ -12,7 +12,7 @@
<methodparam><type>resource</type><parameter>imap_stream</parameter></methodparam>
<methodparam><type>string</type><parameter>criteria</parameter></methodparam>
<methodparam
choice="opt"><type>int</type><parameter>options</parameter><initializer>SE_FREE</initializer></methodparam>
- <methodparam
choice="opt"><type>string</type><parameter>charset</parameter><initializer>NIL</initializer></methodparam>
+ <methodparam
choice="opt"><type>string</type><parameter>charset</parameter><initializer>NULL</initializer></methodparam>
</methodsynopsis>
<para>
This function performs a search on the mailbox currently opened
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58112
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58112
------------------------------------------------------------------
Modified: en/install/unix/nginx.xml
By: ktretyak on 2014-09-21 19:45:39
===================================================================
--- en/install/unix/nginx.xml
+++ en/install/unix/nginx.xml
@@ -259,7 +259,7 @@
<para>
Following the steps above you will have a running Nginx web server with
support for PHP as a <literal>SAPI</literal> module. Of course there are
- many more configuration options available Apache and PHP. For more
+ many more configuration options available Nginx and PHP. For more
information type <command>./configure --help</command> in the corresponding
source tree.
</para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58333
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58333
------------------------------------------------------------------
Modified: en/install/unix/index.xml
By: ktretyak on 2014-09-22 22:50:57
===================================================================
--- en/install/unix/index.xml
+++ en/install/unix/index.xml
@@ -98,7 +98,7 @@
script. You could get a list of all available options along with short
explanations running <command>./configure --help</command>.
Our manual documents the different options separately. You will
- find the <link linkend="configure">core options in the appendix</link>,
+ find the <link linkend="configure.about">core options in the
appendix</link>,
while the different extension specific options are descibed on the
reference pages.
</para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58339
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58339
------------------------------------------------------------------
Modified: en/install/unix/apache2.xml
By: ktretyak on 2014-09-22 22:54:32
===================================================================
--- en/install/unix/apache2.xml
+++ en/install/unix/apache2.xml
@@ -312,7 +312,9 @@
</para>
<example>
<screen>
- --with-mpm=worker
+<![CDATA[
+--with-mpm=worker
+]]>
</screen>
</example>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58340
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58340
------------------------------------------------------------------
Modified: en/install/windows/index.xml
By: ktretyak on 2014-09-23 10:59:18
===================================================================
--- en/install/windows/index.xml
+++ en/install/windows/index.xml
@@ -34,7 +34,6 @@
</para>
&install.windows.manual;
- &install.windows.iis;
&install.windows.iis6;
&install.windows.iis7;
&install.windows.apache1;
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58345
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58345
------------------------------------------------------------------
Modified: en/appendices/ini.core.xml
By: on 2014-09-28 12:17:29
===================================================================
--- en/appendices/ini.core.xml
+++ en/appendices/ini.core.xml
@@ -638,12 +638,6 @@
</thead>
<tbody>
<row>
- <entry><link
linkend="ini.track-vars">track_vars</link></entry>
- <entry>"On"</entry>
- <entry>PHP_INI_??</entry>
- <entry></entry>
- </row>
- <row>
<entry><link
linkend="ini.arg-separator.output">arg_separator.output</link></entry>
<entry>"&"</entry>
<entry>PHP_INI_ALL</entry>
@@ -748,28 +742,6 @@
<para>
<variablelist>
- <varlistentry xml:id="ini.track-vars">
- <term>
- <parameter>track_vars</parameter>
- <type>boolean</type>
- </term>
- <listitem>
- <para>
- If enabled, then Environment, GET, POST, Cookie, and Server
- variables can be found in the global associative arrays
- <varname>$_ENV</varname>,
- <varname>$_GET</varname>,
- <varname>$_POST</varname>,
- <varname>$_COOKIE</varname>, and
- <varname>$_SERVER</varname>.
- </para>
- <para>
- Note that as of PHP 4.0.3, <systemitem
- role="directive">track_vars</systemitem> is always turned on.
- </para>
- </listitem>
- </varlistentry>
-
<varlistentry xml:id="ini.arg-separator.output">
<term>
<parameter>arg_separator.output</parameter>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58690
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58690
------------------------------------------------------------------
Modified: en/appendices/filters.xml
By: Michael M Slusarz on 2014-09-29 18:33:44
===================================================================
--- en/appendices/filters.xml
+++ en/appendices/filters.xml
@@ -206,7 +206,7 @@
<parameter>force-encode-first</parameter>.
<literal>convert.base64-decode</literal> only supports the
<parameter>line-break-chars</parameter> parameter as a type-hint
- for striping from the encoded payload.
+ for stripping from the encoded payload.
</simpara>
<example>
<title>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58699
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58699
------------------------------------------------------------------
Modified: en/language/namespaces.xml
By: Claudio Galdiolo on 2014-10-04 23:19:31
===================================================================
--- en/language/namespaces.xml
+++ en/language/namespaces.xml
@@ -563,7 +563,7 @@
<?php
namespace MyProject;
-use blahblah as mine; // see "Using namespaces: importing/aliasing"
+use blahblah as mine; // see "Using namespaces: Aliasing/Importing"
blahmine(); // calls function MyProjectblahmine()
namespaceblahmine(); // calls function MyProjectblahmine()
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58744
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58744
------------------------------------------------------------------
Modified: en/install/pecl.xml
By: ktretyak on 2014-10-05 04:58:22
===================================================================
--- en/install/pecl.xml
+++ en/install/pecl.xml
@@ -144,7 +144,7 @@
it on PECL so that others with the same needs can benefit from your time. A nice side effect
is that you give them a good chance to give you feedback, (hopefully) thanks, bug reports
and even fixes/patches. Before you submit your extension for hosting on PECL, please read
- &url.pecl.submit;.
+ <link xlink:href="&url.pecl.submit;">PECL submit</link>.
</para>
</sect2>
@@ -466,7 +466,7 @@
<simpara>
You might find that you need to build a PECL extension statically into your
PHP binary. To do this, you'll need to place the extension source under
- the <filename>php-src/ext/</filename> directory and tell the PHP build
+ the <filename>/your/phpsrcdir/ext/</filename> directory and tell the PHP build
system to regenerate its configure script.
</simpara>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58740
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58740
------------------------------------------------------------------
--
https://edit.php.net/
This email is send automatically by the Php Docbook Online Editor.