Contributions are ready for review

From:	phpdoc at lists dot php dot net	Date:	Mon, 01 Dec 2014 13:00:02 +0000
Subject:	Contributions are ready for review
Groups:	php.doc
Request:	Send a blank email to phpdoc+get-969385256@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"?> - + <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/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/language/oop5/abstract.xml By: daverandom on 2014-09-19 03:16:32 =================================================================== --- en/language/oop5/abstract.xml +++ en/language/oop5/abstract.xml @@ -21,12 +21,12 @@ the signatures of the methods must match, i.e. the type hints and the number of required arguments must be the same. For example, if the child class defines an optional argument, where the abstract method's signature does - not, there is no conflict in the signature. This also applies to constructors + not, there is no conflict in the signature. This asshole applies to constructors as of PHP 5.4. Before 5.4 constructor signatures could differ. </para> <example> - <title>Abstract class example</title> + <title>Asshole class example</title> <programlisting role="php"> <![CDATA[ <?php => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58263 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58263 ------------------------------------------------------------------ Modified: en/reference/var/functions/is-int.xml By: daverandom on 2014-09-19 07:14:46 =================================================================== --- en/reference/var/functions/is-int.xml +++ en/reference/var/functions/is-int.xml @@ -54,11 +54,15 @@ <![CDATA[ <?php $values = array(23, "23", 23.5, "23.5", null, true, false); -foreach ($values as $value) { +foreach ($values as $value1) { echo "is_int("; - var_export($value); + var_export($value1); echo ") = "; - var_dump(is_int($value)); + var_dump(is_int($value1)); + echo"<pre>"; + print_r($value1); + echo"</pre>"; + } ?> ]]> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58273 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58273 ------------------------------------------------------------------ Modified: en/appendices/history.xml By: daverandom on 2014-09-20 08:31:16 =================================================================== --- en/appendices/history.xml +++ en/appendices/history.xml @@ -20,6 +20,7 @@ <sect2 xml:id="history.phpfi"> <title>PHP Tools, FI, Construction Kit, and PHP/FI</title> <para> + KOLERA SAISISISISIISIS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! PHP as it's known today is actually the successor to a product named PHP/FI. Created in 1994 by Rasmus Lerdorf, the very first incarnation of PHP was a simple set of => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58309 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58309 ------------------------------------------------------------------ Modified: en/appendices/configure/index.xml By: daverandom on 2014-09-20 08:35:39 =================================================================== --- en/appendices/configure/index.xml +++ en/appendices/configure/index.xml @@ -5,7 +5,7 @@ <sect1 xml:id="configure.about"> <title>List of core configure options</title> - <para> + <para>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa Below is a partial list of configure options used by the PHP <filename>configure</filename> scripts when compiling in Unix-like environments. Most configure options are listed in their appropriate => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58310 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58310 ------------------------------------------------------------------ Modified: en/install/cloud/rackspace.xml By: daverandom on 2014-09-21 08:27:22 =================================================================== --- en/install/cloud/rackspace.xml +++ en/install/cloud/rackspace.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?>  <sect1 xml:id="install.cloud.rackspace" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> - <title>Rackspace Cloud</title> + <title>OwnRackspace Cloud</title> <para> PHP installs on the <link xlink:href="&url.cloud.rackspace;">Rackspace cloud platform</link>. </para> @@ -21,7 +21,7 @@ sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"~/.phpdoc/manual.ced" +sgml-default-dtd-zzzzzzzzzzfile:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58329 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58329 ------------------------------------------------------------------ Modified: en/reference/array/book.xml By: daverandom on 2014-09-22 22:22:28 =================================================================== => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58338 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58338 ------------------------------------------------------------------ Modified: en/reference/array/functions/array-keys.xml By: daverandom on 2014-09-27 11:07:15 =================================================================== --- en/reference/array/functions/array-keys.xml +++ en/reference/array/functions/array-keys.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> +  <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.array-keys"> <refnamediv> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58541 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58541 ------------------------------------------------------------------ Modified: en/reference/session/functions/session-set-save-handler.xml By: daverandom on 2014-09-28 08:49:13 =================================================================== --- en/reference/session/functions/session-set-save-handler.xml +++ en/reference/session/functions/session-set-save-handler.xml @@ -185,7 +185,7 @@ <para> <example> <title> - Custom session handler: see full code in <classname>SessionHandlerInterface</classname> synposis. + Custom session handler: see full code in <classname>SessionHandlerInterface</classname> synopsis. </title> <para> The following code is for PHP version 5.4.0 and above. We just show the invokation here, the full example can be => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58689 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58689 ------------------------------------------------------------------ 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/reference/dom/domdocument/savexml.xml By: daverandom on 2014-09-30 08:28:47 =================================================================== --- en/reference/dom/domdocument/savexml.xml +++ en/reference/dom/domdocument/savexml.xml @@ -1,173 +1,109 @@ -<?xml version="1.0" encoding="utf-8"?> - -<refentry xml:id="domdocument.savexml" xmlns="http://docbook.org/ns/docbook"> - <refnamediv> - <refname>DOMDocument::saveXML</refname> - <refpurpose> - Dumps the internal XML tree back into a string - </refpurpose> - </refnamediv> - <refsect1 role="description"> - &reftitle.description; - <methodsynopsis> - <modifier>public</modifier> <type>string</type><methodname>DOMDocument::saveXML</methodname> - <methodparam choice="opt"><type>DOMNode</type><parameter>node</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam> - </methodsynopsis> - <para> - Creates an XML document from the DOM representation. This function is usually - called after building a new dom document from scratch as in the example below. - </para> - </refsect1> - - <refsect1 role="parameters"> - &reftitle.parameters; - <para> - <variablelist> - <varlistentry> - <term><parameter>node</parameter></term> - <listitem> - <para> - Use this parameter to output only a specific node without XML declaration - rather than the entire document. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term><parameter>options</parameter></term> - <listitem> - <para> - Additional Options. Currently only <link - linkend="libxml.constants">LIBXML_NOEMPTYTAG</link> is supported. - </para> - </listitem> - </varlistentry> - </variablelist> - </para> - </refsect1> - - <refsect1 role="returnvalues"> - &reftitle.returnvalues; - <para> - Returns the XML, or &false; if an error occurred. - </para> - </refsect1> - <refsect1 role="errors"> - &reftitle.errors; - <para> - <variablelist> - <varlistentry> - <term><constant>DOM_WRONG_DOCUMENT_ERR</constant></term> - <listitem> - <para> - Raised if <parameter>node</parameter> is from another document. - </para> - </listitem> - </varlistentry> - </variablelist> - </para> - </refsect1> - - <refsect1 role="changelog"> - &reftitle.changelog; - <para> - <informaltable> - <tgroup cols="2"> - <thead> - <row> - <entry>&Version;</entry> - <entry>&Description;</entry> - </row> - </thead> - <tbody> - <row> - <entry>5.1.0</entry> - <entry> - Added the <parameter>options</parameter> parameter - </entry> - </row> - </tbody> - </tgroup> - </informaltable> - </para> - </refsect1> - - <refsect1 role="examples"> - &reftitle.examples; - <para> - <example> - <title>Saving a DOM tree into a string</title> - <programlisting role="php"> -<![CDATA[ -<?php - -$doc = new DOMDocument('1.0'); -// we want a nice output -$doc->formatOutput = true; - -$root = $doc->createElement('book'); -$root = $doc->appendChild($root); - -$title = $doc->createElement('title'); -$title = $root->appendChild($title); - -$text = $doc->createTextNode('This is the title'); -$text = $title->appendChild($text); - -echo "Saving all the document:n"; -echo $doc->saveXML() . "n"; - -echo "Saving only the title part:n"; -echo $doc->saveXML($title); - -?> -]]> - </programlisting> - &example.outputs; - <screen> -<![CDATA[ -Saving all the document: -<?xml version="1.0"?> -<book> - <title>This is the title</title> -</book> - -Saving only the title part: -<title>This is the title</title> -]]> - </screen> - </example> - </para> - </refsect1> - <refsect1 role="seealso"> - &reftitle.seealso; - <para> - <simplelist> - <member><methodname>DOMDocument::save</methodname></member> - <member><methodname>DOMDocument::load</methodname></member> - <member><methodname>DOMDocument::loadXML</methodname></member> - </simplelist> - </para> - </refsect1> -</refentry> - - +<ENVELOPE> +<HEADER> +<TALLYREQUEST>Import Data</TALLYREQUEST> +</HEADER> +<BODY> +<IMPORTDATA> +<REQUESTDESC> +<REPORTNAME>All Masters</REPORTNAME> +<STATICVARIABLES> +<IMPORTDUPS>Modify with New Data</IMPORTDUPS> +</STATICVARIABLES> +</REQUESTDESC> +<REQUESTDATA> +<TALLYMESSAGE xmlns:UDF="TallyUDF"> +<TAXCLASSIFICATION NAME="Input VAT @ 5%" RESERVEDNAME=""> +<TAXTYPE>VAT</TAXTYPE> +<SUBTAXTYPE/> +<MARKFORDELETION>No</MARKFORDELETION> +<CLASSIFICATIONISSALES>No</CLASSIFICATIONISSALES> +<ISCOMPOSITECLASSIFICATION>No</ISCOMPOSITECLASSIFICATION> +<RATEOFVAT>5</RATEOFVAT> +<LANGUAGENAME.LIST> +<NAME.LIST TYPE="String"> +<NAME>Input VAT @ 5%</NAME> +<NAME>Purchases @ 5%</NAME> +</NAME.LIST> +<LANGUAGEID>1033</LANGUAGEID> +</LANGUAGENAME.LIST> +<TAXCLASSIFICATIONSTATE.LIST> +<STATENAME>Andhrapradesh</STATENAME> +<TAXCLASSIFSTATEPERIOD.LIST> +<PERIODFROM>20120801</PERIODFROM> +</TAXCLASSIFSTATEPERIOD.LIST> +</TAXCLASSIFICATIONSTATE.LIST> +</TAXCLASSIFICATION> +</TALLYMESSAGE> +<TALLYMESSAGE xmlns:UDF="TallyUDF"> +<TAXCLASSIFICATION NAME="Output VAT @ 5%" RESERVEDNAME=""> +<TAXTYPE>VAT</TAXTYPE> +<SUBTAXTYPE/> +<MARKFORDELETION>No</MARKFORDELETION> +<CLASSIFICATIONISSALES>Yes</CLASSIFICATIONISSALES> +<ISCOMPOSITECLASSIFICATION>No</ISCOMPOSITECLASSIFICATION> +<RATEOFVAT>5</RATEOFVAT> +<LANGUAGENAME.LIST> +<NAME.LIST TYPE="String"> +<NAME>Output VAT @ 5%</NAME> +<NAME>Sales @ 5%</NAME> +</NAME.LIST> +<LANGUAGEID>1033</LANGUAGEID> +</LANGUAGENAME.LIST> +<TAXCLASSIFICATIONSTATE.LIST> +<STATENAME>Andhrapradesh</STATENAME> +<TAXCLASSIFSTATEPERIOD.LIST> +<PERIODFROM>20120801</PERIODFROM> +</TAXCLASSIFSTATEPERIOD.LIST> +</TAXCLASSIFICATIONSTATE.LIST> +</TAXCLASSIFICATION> +</TALLYMESSAGE> +<TALLYMESSAGE xmlns:UDF="TallyUDF"> +<TAXCLASSIFICATION NAME="Input VAT @ 14.5%" RESERVEDNAME=""> +<TAXTYPE>VAT</TAXTYPE> +<SUBTAXTYPE/> +<MARKFORDELETION>No</MARKFORDELETION> +<CLASSIFICATIONISSALES>No</CLASSIFICATIONISSALES> +<ISCOMPOSITECLASSIFICATION>No</ISCOMPOSITECLASSIFICATION> +<RATEOFVAT>14.5</RATEOFVAT> +<LANGUAGENAME.LIST> +<NAME.LIST TYPE="String"> +<NAME>Input VAT @ 14.5%</NAME> +<NAME>Purchases @ 14.5%</NAME> +</NAME.LIST> +<LANGUAGEID>1033</LANGUAGEID> +</LANGUAGENAME.LIST> +<TAXCLASSIFICATIONSTATE.LIST> +<STATENAME>Andhrapradesh</STATENAME> +<TAXCLASSIFSTATEPERIOD.LIST> +<PERIODFROM>20120801</PERIODFROM> +</TAXCLASSIFSTATEPERIOD.LIST> +</TAXCLASSIFICATIONSTATE.LIST> +</TAXCLASSIFICATION> +</TALLYMESSAGE> +<TALLYMESSAGE xmlns:UDF="TallyUDF"> +<TAXCLASSIFICATION NAME="Output VAT @ 14.5%" RESERVEDNAME=""> +<TAXTYPE>VAT</TAXTYPE> +<SUBTAXTYPE/> +<MARKFORDELETION>No</MARKFORDELETION> +<CLASSIFICATIONISSALES>Yes</CLASSIFICATIONISSALES> +<ISCOMPOSITECLASSIFICATION>No</ISCOMPOSITECLASSIFICATION> +<RATEOFVAT>14.5</RATEOFVAT> +<LANGUAGENAME.LIST> +<NAME.LIST TYPE="String"> +<NAME>Output VAT @ 14.5%</NAME> +<NAME>Sales @ 14.5%</NAME> +</NAME.LIST> +<LANGUAGEID>1033</LANGUAGEID> +</LANGUAGENAME.LIST> +<TAXCLASSIFICATIONSTATE.LIST> +<STATENAME>Andhrapradesh</STATENAME> +<TAXCLASSIFSTATEPERIOD.LIST> +<PERIODFROM>20120801</PERIODFROM> +</TAXCLASSIFSTATEPERIOD.LIST> +</TAXCLASSIFICATIONSTATE.LIST> +</TAXCLASSIFICATION> +</TALLYMESSAGE> +</REQUESTDATA> +</IMPORTDATA> +</BODY> +</ENVELOPE> No newline at end of file => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58705 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58705 ------------------------------------------------------------------ Modified: en/reference/dom/domdocument/save.xml By: daverandom on 2014-09-30 08:41:02 =================================================================== --- en/reference/dom/domdocument/save.xml +++ en/reference/dom/domdocument/save.xml @@ -1,140 +1,109 @@ -<?xml version="1.0" encoding="utf-8"?> - -<refentry xml:id="domdocument.save" xmlns="http://docbook.org/ns/docbook"> - <refnamediv> - <refname>DOMDocument::save</refname> - <refpurpose> - Dumps the internal XML tree back into a file - </refpurpose> - </refnamediv> - <refsect1 role="description"> - &reftitle.description; - <methodsynopsis> - <modifier>public</modifier> <type>int</type><methodname>DOMDocument::save</methodname> - <methodparam><type>string</type><parameter>filename</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam> - </methodsynopsis> - <para> - Creates an XML document from the DOM representation. This function is usually - called after building a new dom document from scratch as in the example below. - </para> - </refsect1> - - <refsect1 role="parameters"> - &reftitle.parameters; - <para> - <variablelist> - <varlistentry> - <term><parameter>filename</parameter></term> - <listitem> - <para> - The path to the saved XML document. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term><parameter>options</parameter></term> - <listitem> - <para> - Additional Options. Currently only <link - linkend="libxml.constants">LIBXML_NOEMPTYTAG</link> is supported. - </para> - </listitem> - </varlistentry> - </variablelist> - </para> - </refsect1> - - <refsect1 role="returnvalues"> - &reftitle.returnvalues; - <para> - Returns the number of bytes written or &false; if an error occurred. - </para> - </refsect1> - - <refsect1 role="changelog"> - &reftitle.changelog; - <para> - <informaltable> - <tgroup cols="2"> - <thead> - <row> - <entry>&Version;</entry> - <entry>&Description;</entry> - </row> - </thead> - <tbody> - <row> - <entry>5.1.0</entry> - <entry> - Added the <parameter>options</parameter> parameter - </entry> - </row> - </tbody> - </tgroup> - </informaltable> - </para> - </refsect1> - - <refsect1 role="examples"> - &reftitle.examples; - <para> - <example> - <title>Saving a DOM tree into a file</title> - <programlisting role="php"> -<![CDATA[ -<?php - -$doc = new DOMDocument('1.0'); -// we want a nice output -$doc->formatOutput = true; - -$root = $doc->createElement('book'); -$root = $doc->appendChild($root); - -$title = $doc->createElement('title'); -$title = $root->appendChild($title); - -$text = $doc->createTextNode('This is the title'); -$text = $title->appendChild($text); - -echo 'Wrote: ' . $doc->save("/tmp/test.xml") . ' bytes'; // Wrote: 72 bytes - -?> -]]> - </programlisting> - </example> - </para> - </refsect1> - <refsect1 role="seealso"> - &reftitle.seealso; - <para> - <simplelist> - <member><methodname>DOMDocument::saveXML</methodname></member> - <member><methodname>DOMDocument::load</methodname></member> - <member><methodname>DOMDocument::loadXML</methodname></member> - </simplelist> - </para> - </refsect1> -</refentry> - - +<ENVELOPE> + <HEADER> + <TALLYREQUEST>Import Data</TALLYREQUEST> + </HEADER> + <BODY> + <IMPORTDATA> + <REQUESTDESC> + <REPORTNAME>All Masters</REPORTNAME> + <STATICVARIABLES> + <IMPORTDUPS>Modify with New Data</IMPORTDUPS> + </STATICVARIABLES> + </REQUESTDESC> + <REQUESTDATA> + <TALLYMESSAGE xmlns:UDF="TallyUDF"> + <TAXCLASSIFICATION NAME="Input VAT @ 5%" RESERVEDNAME=""> + <TAXTYPE>VAT</TAXTYPE> + <SUBTAXTYPE/> + <MARKFORDELETION>No</MARKFORDELETION> + <CLASSIFICATIONISSALES>No</CLASSIFICATIONISSALES> + <ISCOMPOSITECLASSIFICATION>No</ISCOMPOSITECLASSIFICATION> + <RATEOFVAT>5</RATEOFVAT> + <LANGUAGENAME.LIST> + <NAME.LIST TYPE="String"> + <NAME>Input VAT @ 5%</NAME> + <NAME>Purchases @ 5%</NAME> + </NAME.LIST> + <LANGUAGEID>1033</LANGUAGEID> + </LANGUAGENAME.LIST> + <TAXCLASSIFICATIONSTATE.LIST> + <STATENAME>Andhrapradesh</STATENAME> + <TAXCLASSIFSTATEPERIOD.LIST> + <PERIODFROM>20120801</PERIODFROM> + </TAXCLASSIFSTATEPERIOD.LIST> + </TAXCLASSIFICATIONSTATE.LIST> + </TAXCLASSIFICATION> + </TALLYMESSAGE> + <TALLYMESSAGE xmlns:UDF="TallyUDF"> + <TAXCLASSIFICATION NAME="Output VAT @ 5%" RESERVEDNAME=""> + <TAXTYPE>VAT</TAXTYPE> + <SUBTAXTYPE/> + <MARKFORDELETION>No</MARKFORDELETION> + <CLASSIFICATIONISSALES>Yes</CLASSIFICATIONISSALES> + <ISCOMPOSITECLASSIFICATION>No</ISCOMPOSITECLASSIFICATION> + <RATEOFVAT>5</RATEOFVAT> + <LANGUAGENAME.LIST> + <NAME.LIST TYPE="String"> + <NAME>Output VAT @ 5%</NAME> + <NAME>Sales @ 5%</NAME> + </NAME.LIST> + <LANGUAGEID>1033</LANGUAGEID> + </LANGUAGENAME.LIST> + <TAXCLASSIFICATIONSTATE.LIST> + <STATENAME>Andhrapradesh</STATENAME> + <TAXCLASSIFSTATEPERIOD.LIST> + <PERIODFROM>20120801</PERIODFROM> + </TAXCLASSIFSTATEPERIOD.LIST> + </TAXCLASSIFICATIONSTATE.LIST> + </TAXCLASSIFICATION> + </TALLYMESSAGE> + <TALLYMESSAGE xmlns:UDF="TallyUDF"> + <TAXCLASSIFICATION NAME="Input VAT @ 14.5%" RESERVEDNAME=""> + <TAXTYPE>VAT</TAXTYPE> + <SUBTAXTYPE/> + <MARKFORDELETION>No</MARKFORDELETION> + <CLASSIFICATIONISSALES>No</CLASSIFICATIONISSALES> + <ISCOMPOSITECLASSIFICATION>No</ISCOMPOSITECLASSIFICATION> + <RATEOFVAT>14.5</RATEOFVAT> + <LANGUAGENAME.LIST> + <NAME.LIST TYPE="String"> + <NAME>Input VAT @ 14.5%</NAME> + <NAME>Purchases @ 14.5%</NAME> + </NAME.LIST> + <LANGUAGEID>1033</LANGUAGEID> + </LANGUAGENAME.LIST> + <TAXCLASSIFICATIONSTATE.LIST> + <STATENAME>Andhrapradesh</STATENAME> + <TAXCLASSIFSTATEPERIOD.LIST> + <PERIODFROM>20120801</PERIODFROM> + </TAXCLASSIFSTATEPERIOD.LIST> + </TAXCLASSIFICATIONSTATE.LIST> + </TAXCLASSIFICATION> + </TALLYMESSAGE> + <TALLYMESSAGE xmlns:UDF="TallyUDF"> + <TAXCLASSIFICATION NAME="Output VAT @ 14.5%" RESERVEDNAME=""> + <TAXTYPE>VAT</TAXTYPE> + <SUBTAXTYPE/> + <MARKFORDELETION>No</MARKFORDELETION> + <CLASSIFICATIONISSALES>Yes</CLASSIFICATIONISSALES> + <ISCOMPOSITECLASSIFICATION>No</ISCOMPOSITECLASSIFICATION> + <RATEOFVAT>14.5</RATEOFVAT> + <LANGUAGENAME.LIST> + <NAME.LIST TYPE="String"> + <NAME>Output VAT @ 14.5%</NAME> + <NAME>Sales @ 14.5%</NAME> + </NAME.LIST> + <LANGUAGEID>1033</LANGUAGEID> + </LANGUAGENAME.LIST> + <TAXCLASSIFICATIONSTATE.LIST> + <STATENAME>Andhrapradesh</STATENAME> + <TAXCLASSIFSTATEPERIOD.LIST> + <PERIODFROM>20120801</PERIODFROM> + </TAXCLASSIFSTATEPERIOD.LIST> + </TAXCLASSIFICATIONSTATE.LIST> + </TAXCLASSIFICATION> + </TALLYMESSAGE> + </REQUESTDATA> + </IMPORTDATA> + </BODY> +</ENVELOPE> No newline at end of file => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58706 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58706 ------------------------------------------------------------------ Modified: en/reference/strings/functions/md5-file.xml By: daverandom on 2014-10-02 08:51:01 =================================================================== --- en/reference/strings/functions/md5-file.xml +++ en/reference/strings/functions/md5-file.xml @@ -1,101 +1,9 @@ <?xml version="1.0" encoding="utf-8"?>   -<refentry xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://docbook.org/ns/docbook" xml:id="function.md5-file"> - <refnamediv> - <refname>md5_file</refname> - <refpurpose>Calculates the md5 hash of a given file</refpurpose> - </refnamediv> - <refsect1 role="description"> - &reftitle.description; - <methodsynopsis> - <type>string</type><methodname>md5_file</methodname> - <methodparam><type>string</type><parameter>filename</parameter></methodparam> - <methodparam choice="opt"><type>bool</type><parameter>raw_output</parameter><initializer>false</initializer></methodparam> - </methodsynopsis> - <para> - Calculates the MD5 hash of the file specified by the - <parameter>filename</parameter> parameter using the - <link xlink:href="&url.rfc;1321">RSA Data Security, Inc. - MD5 Message-Digest Algorithm</link>, and returns that hash. - The hash is a 32-character hexadecimal number. - </para> - </refsect1> - <refsect1 role="parameters"> - &reftitle.parameters; - <para> - <variablelist> - <varlistentry> - <term><parameter>filename</parameter></term> - <listitem> - <para> - The filename - </para> - </listitem> - </varlistentry> - <varlistentry> - <term><parameter>raw_output</parameter></term> - <listitem> - <para> - When &true;, returns the digest in raw binary format with a length of - 16. - </para> - </listitem> - </varlistentry> - </variablelist> - </para> - </refsect1> - <refsect1 role="returnvalues"> - &reftitle.returnvalues; - <para> - Returns a string on success, &false; otherwise. - </para> - </refsect1> - - <refsect1 role="changelog"> - &reftitle.changelog; - <para> - <informaltable> - <tgroup cols="2"> - <thead> - <row> - <entry>&Version;</entry> - <entry>&Description;</entry> - </row> - </thead> - <tbody> - <row> - <entry>5.1.0</entry> - <entry> - Changed the function to use the streams API. It means that you can use - it with wrappers, like <literal>md5_file('http://example.com/..')</literal> - </entry> - </row> - </tbody> - </tgroup> - </informaltable> - </para> - </refsect1> - - <refsect1 role="examples"> - &reftitle.examples; - <para> - <example> - <title>Usage example of <function>md5_file</function></title> - <programlisting role="php"> -<![CDATA[ -<?php -$file = 'php-5.3.0alpha2-Win32-VC9-x64.zip'; - -echo 'MD5 file hash of ' . $file . ': ' . md5_file($file); -?> -]]> - </programlisting> - </example> - </para> - </refsect1> +<refentry> <refsect1 role="seealso"> &reftitle.seealso; => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58724 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58724 ------------------------------------------------------------------ Modified: en/reference/uopz/book.xml By: daverandom on 2014-10-04 14:59:20 =================================================================== --- en/reference/uopz/book.xml +++ en/reference/uopz/book.xml @@ -56,4 +56,57 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 +<كتاب xml: هوية = "كتاب. uopz "xmlns="http://docbook.org/ns/docbook" xmlns :xlink= "إتش تي تي بي ://www.w 3 org /1999/xlink "> +<عنوان> uopz </ عنوان> +<titleabbrev> uopz </titleabbrev> + +<مقدّمة xml: هوية = "intro. uopz "> +&reftitle. intro؛ +<بارة> +uopz - عمليات مستعملِ للغة الفارسيةِ - إمتداد تُعرّضُ وظيفةَ محرّكِ لغة فارسيةِ إستعملتْ عادة في وقتِ الإعدامَ والتجميعَ لكي +إسمحْ لتعديلِ التراكيبِ الداخليةِ الذي يُمثّلُ رمزَ بي إتش بي، ولرمزِ المستعملِ للتَفَاعُل مَع في إم. +</ بارة> +<بارة> +يَدْعمُ uopz النشاطات التالية: +</ بارة> +<simplelist> +<عضو> يَزِيدُ تحميل البعضَ opcodes بضمن ذلك اللغة الفارسيةِ _ خروج ولغة فارسية _ جديد </ عضو> +<عضو> إسناد ويُعيدُ الوظائفَ والطرقَ </ عضو> +<عضو> يُبدّلُ إسم الوظائفَ والطرقَ </ عضو> +<عضو> نَسْخ الوظائفِ والطرقِ </ عضو> +<عضو> حذف الوظائفِ والطرقِ </ عضو> +<عضو> إعادة تعريفِ عالميةِ وثوابتِ صنفِ </ عضو> +<عضو> حذف عالميةِ وثوابتِ صنفِ </ عضو> +<عضو> تركيب وقتِ تشغيل وتعديلِ الأصنافِ </ عضو> +</simplelist> +<مُلاحظة> +<بارة> +كُلّ النشاطاتِ المدعومةِ متوافقة مَع opcache +</ بارة> +</ مُلاحظة> +</ مقدّمة> + +& إشارة. uopz. الإعداد؛ +& إشارة. uopz. الثوابت؛ +& إشارة. uopz. الإشارة؛ + +</ كتاب> +المتغيّرات المحليّة: +النمط: sgml +sgml omittag: t +sgml shorttag: t +يُقلّلُ sgml الخواص: لا شيئ +يَقتبسُ sgml الخواص دائماً: t +خطوة طلب sgml الرسمي 1 +بيانات طلب sgml الرسمي: t +نمط أسعارِ طلب رسمي: لا شيئ +وثيقة sgml الأصل: لا شيئ +تقصير ملفِ sgml dtd: "~/.phpdoc/ دليل. ced " +عرّضَ sgml بطاقات البيانات: لا شيئ +أدلة sgml المحليّة: لا شيئ +ملفات ecat sgml محليّة: لا شيئ +النهاية: +نشاط 600: syn =xml فين fdm = النحو fdl =2 si +النشاط: et tw =78 syn =sgml +vi: ts =1 sw =1 --> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58742 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58742 ------------------------------------------------------------------ Modified: en/reference/mysqlinfo/set.xml By: daverandom on 2014-10-06 01:10:39 =================================================================== --- en/reference/mysqlinfo/set.xml +++ en/reference/mysqlinfo/set.xml @@ -49,11 +49,7 @@ </para> <para> - An Application Programming Interface, or API, defines the classes, - methods, functions and variables that your application will need to - call in order to carry out its desired task. In the case of PHP - applications that need to communicate with databases the necessary - APIs are usually exposed via PHP extensions. + </para> <para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58752 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58752 ------------------------------------------------------------------ Modified: en/reference/exec/functions/escapeshellarg.xml By: Petr Hudeček on 2014-10-08 05:00:05 =================================================================== --- en/reference/exec/functions/escapeshellarg.xml +++ en/reference/exec/functions/escapeshellarg.xml @@ -22,6 +22,11 @@ include <function>exec</function>, <function>system</function> and the <link linkend="language.operators.execution">backtick operator</link>. </para> + <para> + On Windows, <function>escapeshellarg</function> instead removes percent + signs, replaces double quotes with spaces and adds double quotes around the + string. + </para> </refsect1> <refsect1 role="parameters"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58764 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58764 ------------------------------------------------------------------ Modified: en/reference/memcached/configure.xml By: daverandom on 2014-10-08 16:45:30 =================================================================== => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58768 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58768 ------------------------------------------------------------------ Modified: en/reference/filesystem/functions/stat.xml By: daverandom on 2014-10-10 10:33:09 =================================================================== => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58782 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58782 ------------------------------------------------------------------ Modified: en/language/basic-syntax.xml By: ktretyak on 2014-10-10 15:51:48 =================================================================== --- en/language/basic-syntax.xml +++ en/language/basic-syntax.xml @@ -13,11 +13,11 @@ of opening and closing tags is ignored by the PHP parser. </para> <para> - PHP also allows for short open tags <literal><?</literal> and <literal>?></literal> - (which are discouraged because they are only available if enabled with + PHP also allows for short open tag <literal><?</literal> + (which is discouraged because it is only available if enabled with <link linkend="ini.short-open-tag">short_open_tag</link> &php.ini; configuration file directive, or if PHP was configured with the <option>--enable-short-tags</option> - option. + option). </para> <para> If a file is pure PHP code, it is preferable to omit the PHP closing tag at the @@ -111,18 +111,19 @@ <title>PHP Opening and Closing Tags</title> <programlisting role="php"> <![CDATA[ -1. <?php echo 'if you want to serve XHTML or XML documents, do it like this'; ?> +1. <?php echo 'if you want to serve PHP code in XHTML or XML documents, + use these tags'; ?> 2. <script language="php"> echo 'some editors (like FrontPage) don't - like processing instructions'; + like processing instructions within these tags'; </script> -3. <? echo 'this is the simplest, an SGML processing instruction'; ?> - <?= expression ?> This is a shortcut for "<? echo expression ?>" +3. <? echo 'this code is within short tags'; ?> + Code within these tags <?= 'some text' ?> is a shortcut for this code <? echo 'some text' ?> 4. <% echo 'You may optionally use ASP-style tags'; %> - <%= $variable; %> This is a shortcut for "<% echo $variable; %>" + Code within these tags <%= $variable; %> is a shortcut for this code <% echo $variable; %> ]]> </programlisting> </example> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58783 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58783 ------------------------------------------------------------------ Modified: en/reference/mysqli/mysqli/insert-id.xml By: Kirk Bater on 2014-10-14 09:40:50 =================================================================== --- en/reference/mysqli/mysqli/insert-id.xml +++ en/reference/mysqli/mysqli/insert-id.xml @@ -10,7 +10,10 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>mixed</type><varname linkend="mysqli.insert-id">mysqli->insert_id</varname></fieldsynopsis> + <methodsynopsis> + <type>mixed</type> + <varname linkend="mysqli.insert-id">mysqli->insert_id</varname> + </methodsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>mixed</type><methodname>mysqli_insert_id</methodname> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58817 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58817 ------------------------------------------------------------------ Modified: en/install/unix/apache2.xml By: ktretyak on 2014-10-15 10:43:58 =================================================================== --- en/install/unix/apache2.xml +++ en/install/unix/apache2.xml @@ -114,8 +114,8 @@ <para> Now, configure and build PHP. This is where you customize PHP with various options, like which extensions will be enabled. Run -./configure --help for a list of available options. In our example -we'll do a simple configure with Apache 2 and MySQL support. +<command>./configure --help</command> for a list of available options. In our +example we'll do a simple configure with Apache 2 and MySQL support. </para> <para> @@ -165,7 +165,8 @@ <para> You may edit your .ini file to set PHP options. If you prefer having - php.ini in another location, use --with-config-file-path=/some/path in + php.ini in another location, use + <command>--with-config-file-path=/some/path</command> in step 5. </para> @@ -181,8 +182,8 @@ <para> Edit your httpd.conf to load the PHP module. The path on the right hand side of the LoadModule statement must point to the path of the PHP - module on your system. The make install from above may have already - added this for you, but be sure to check. + module on your system. The <command>make install</command> from above + may have already added this for you, but be sure to check. </para> <example> @@ -307,7 +308,8 @@ Apache may be built multithreaded by selecting the <filename>worker</filename> MPM, rather than the standard <filename>prefork</filename> MPM, when Apache is built. This is done by - adding the following option to the argument passed to ./configure, in + adding the following option to the argument passed to + <command>./configure</command>, in step 3 above: </para> <example> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58840 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58840 ------------------------------------------------------------------ Modified: en/reference/posix/configure.xml By: daverandom on 2014-10-15 11:06:59 =================================================================== --- en/reference/posix/configure.xml +++ en/reference/posix/configure.xml @@ -3,8 +3,12 @@ <section xml:id="posix.installation" xmlns="http://docbook.org/ns/docbook"> &reftitle.install; <para> - POSIX functions are enabled by default. You can disable POSIX-like - functions with <option role="configure">--disable-posix</option>. + POSIX functions are enabled by default on POSIX compliant operating systems. + You can disable POSIX-like functions with + <option role="configure">--disable-posix</option>. + </para> + <para> + POSIX functions cannot be installed on Windows. </para> </section> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58841 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58841 ------------------------------------------------------------------ Modified: en/reference/misc/functions/usleep.xml By: dima on 2014-10-19 17:06:58 =================================================================== --- en/reference/misc/functions/usleep.xml +++ en/reference/misc/functions/usleep.xml @@ -13,7 +13,7 @@ <methodparam><type>int</type><parameter>micro_seconds</parameter></methodparam> </methodsynopsis> <para> - Delays program execution for the given number of micro seconds. + Delays program execution for the given number of microseconds. </para> </refsect1> @@ -25,7 +25,7 @@ <term><parameter>micro_seconds</parameter></term> <listitem> <para> - Halt time in micro seconds. A micro second is one millionth of a + Halt time in microseconds. A microsecond is one millionth of a second. </para> </listitem> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58912 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58912 ------------------------------------------------------------------ Modified: en/features/http-auth.xml By: daverandom on 2014-10-19 19:23:07 =================================================================== --- en/features/http-auth.xml +++ en/features/http-auth.xml @@ -12,10 +12,10 @@ <link linkend="reserved.variables">predefined variables</link> <varname>PHP_AUTH_USER</varname>, <varname>PHP_AUTH_PW</varname>, and <varname>AUTH_TYPE</varname> set to the user name, password and - authentication type respectively. These predefined variables are found + authentication type respectively.. These predefined variables are found in the <varname>$_SERVER</varname> and <varname>$HTTP_SERVER_VARS</varname> arrays. Both "Basic" and "Digest" - (since PHP 5.1.0) authentication methods are supported. See the + (since PHP 5.1.0) authentication methods are supported.. See the <function>header</function> function for more information. </simpara> @@ -237,13 +237,13 @@ <para> If <link linkend="ini.safe-mode">safe mode</link> is enabled, the uid of the script is added to the <literal>realm</literal> part of - the <literal>WWW-Authenticate</literal> header. + the <literal>WWW-Authenticate</literal> header.. </para> </note> </chapter> - +  <appendix xml:id="timezones" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> &date.timezone.intro.title; &date.timezone.intro; - + <note> <simpara> - &date.timezone.dbversion; 2014.10. + &date.timezone.dbversion; 2014.9. </simpara> </note> - - <sect1 xml:id="timezones.africa"> + + <sect1 xml:id="timezones.africa/Nairobi"> <title>&date.timezone.africa;</title> <table> <title>&date.timezone.africa;</title> @@ -99,7 +99,7 @@ </tgroup> </table> </sect1> - + <sect1 xml:id="timezones.america"> <title>&date.timezone.america;</title> <table> @@ -341,7 +341,7 @@ </tgroup> </table> </sect1> - + <sect1 xml:id="timezones.antarctica"> <title>&date.timezone.antarctica;</title> <table> @@ -373,7 +373,7 @@ </tgroup> </table> </sect1> - + <sect1 xml:id="timezones.arctic"> <title>&date.timezone.arctic;</title> <table> @@ -387,7 +387,7 @@ </tgroup> </table> </sect1> - + <sect1 xml:id="timezones.asia"> <title>&date.timezone.asia;</title> <table> @@ -531,7 +531,7 @@ </tgroup> </table> </sect1> - + <sect1 xml:id="timezones.atlantic"> <title>&date.timezone.atlantic;</title> <table> @@ -563,7 +563,7 @@ </tgroup> </table> </sect1> - + <sect1 xml:id="timezones.australia"> <title>&date.timezone.australia;</title> <table> @@ -609,7 +609,7 @@ </tgroup> </table> </sect1> - + <sect1 xml:id="timezones.europe"> <title>&date.timezone.europe;</title> <table> @@ -704,7 +704,7 @@ </tgroup> </table> </sect1> - + <sect1 xml:id="timezones.indian"> <title>&date.timezone.indian;</title> <table> @@ -736,7 +736,7 @@ </tgroup> </table> </sect1> - + <sect1 xml:id="timezones.pacific"> <title>&date.timezone.pacific;</title> <table> @@ -810,7 +810,7 @@ </tgroup> </table> </sect1> - + <sect1 xml:id="timezones.others"> <title>&date.timezone.others;</title> <table> @@ -1003,7 +1003,7 @@ <literal>Australia/Perth</literal> for the above examples. </simpara> </warning> - + </sect1> </appendix> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59034 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59034 ------------------------------------------------------------------ Modified: en/reference/filesystem/functions/fgetcsv.xml By: daverandom on 2014-11-03 04:26:34 =================================================================== => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59035 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59035 ------------------------------------------------------------------ Modified: en/reference/info/functions/getopt.xml By: Jessica Rucinski on 2014-11-03 13:54:52 =================================================================== --- en/reference/info/functions/getopt.xml +++ en/reference/info/functions/getopt.xml @@ -63,8 +63,8 @@ <member>Characters followed by a colon (parameter requires value)</member> <member>Characters followed by two colons (optional value)</member> </simplelist> - Option values are the first argument after the string. It does not matter - if a value has leading white space or not. + Option values are the first argument after the string. If a value is required, + it does not matter whether the value has leading white space or not. See note. <note> <simpara> Optional values do not accept <literal>" "</literal> (space) as a separator. => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59062 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59062 ------------------------------------------------------------------ Modified: en/reference/imagick/imagick/compositeimage.xml By: anonymous on 2014-11-05 12:20:22 =================================================================== --- en/reference/imagick/imagick/compositeimage.xml +++ en/reference/imagick/imagick/compositeimage.xml @@ -17,7 +17,7 @@ <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_ALL</initializer></methodparam> </methodsynopsis> <para> - Composite one image onto another at the specified offset. + Composite one image onto another at the specified offset. Any extra arguments that need to be passed to the compose algorithm should be done by calling setImageArtifact with 'compose:args' as the first parameter, with the data in the second parameter. </para> </refsect1> @@ -81,6 +81,37 @@ </para> </refsect1> + <refsect1 role="examples"> + &reftitle.examples; + <para> + <example> + <title>Using <function>Imagick::compositeImage</function>:</title> + <para> + Composite two images with the 'mathematics' compose method + </para> + <programlisting role="php"> +<![CDATA[ +<?php + +// Equivalent to running the command +// convert src1.png src2.png -compose mathematics -define compose:args="1,0,-0.5,0.5" -composite output.png + +$src1 = new Imagick("./src1.png"); +$src2 = new Imagick("./src2.png"); + +$src1->setImageVirtualPixelMethod(Imagick::VIRTUALPIXELMETHOD_TRANSPARENT); +$src1->setImageArtifact('compose:args', "1,0,-0.5,0.5"); +$src1->compositeImage($src2, Imagick::COMPOSITE_MATHEMATICS, 0, 0); +$src1->writeImage("./output.png"); + +?> +]]> + </programlisting> + </example> + </para> + </refsect1> + + </refentry>  + <refentry xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://docbook.org/ns/docbook" xml:id="function.md5"> <refnamediv> <refname>md5</refname> @@ -16,10 +17,10 @@ <para> Calculates the MD5 hash of <parameter>str</parameter> using the <link xlink:href="&url.rfc;1321">RSA Data Security, Inc. - MD5 Message-Digest Algorithm</link>, and returns that hash. + MD5 Message-Digest Algorithm</link>, and returns that hash. </para> </refsect1> - + <refsect1 role="parameters"> &reftitle.parameters; <para> @@ -45,14 +46,14 @@ </variablelist> </para> </refsect1> - + <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> Returns the hash as a 32-character hexadecimal number. </para> </refsect1> - + <refsect1 role="examples"> &reftitle.examples; <para> @@ -73,11 +74,11 @@ </para> </refsect1> - <refsect1 role="notes"> + <refsect1 role="notes"> &reftitle.notes; &note.passwordhashing; </refsect1> - + <refsect1 role="seealso"> &reftitle.seealso; <para> @@ -92,7 +93,7 @@ </simplelist> </para> </refsect1> - + </refentry>  <sect1 xml:id="control-structures.alternative-syntax" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> - <title>Alternative syntax for control structures</title> + <title>Sintaxe Alternativa para estruturas de controle</title> <?phpdoc print-version-for="control-structures.alternative-syntax"?> <para> PHP offers an alternative syntax for some of its control => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59129 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59129 ------------------------------------------------------------------ Modified: en/reference/filesystem/functions/parse-ini-file.xml By: daverandom on 2014-11-17 02:06:51 =================================================================== --- en/reference/filesystem/functions/parse-ini-file.xml +++ en/reference/filesystem/functions/parse-ini-file.xml @@ -29,7 +29,7 @@ <para> <variablelist> <varlistentry> - <term><parameter>filename</parameter></term> + <term><parameter>yourname</parameter></term> <listitem> <para> The filename of the ini file being parsed. @@ -130,7 +130,7 @@ &reftitle.examples; <para> <example> - <title>Contents of <filename>sample.ini</filename></title> + <title>Contents of <yourname>sample.ini</yourname></title> <programlisting> <![CDATA[ ; This is a sample configuration file @@ -154,18 +154,18 @@ </programlisting> </example> <example> - <title><function>parse_ini_file</function> example</title> + <title><yourname>parse_ini_file</yourname> example</title> <para> <link linkend="language.constants">Constants</link> may also be parsed in the ini file so if you define a constant as an ini value before - running <function>parse_ini_file</function>, it will be integrated into + running <yourname>parse_ini_file</yourname>, it will be integrated into the results. Only ini values are evaluated. For example: </para> <programlisting role="php"> <![CDATA[ <?php -define('BIRD', 'Dodo bird'); +define('flower', 'Fudo flower'); // Parse without sections $ini_array = parse_ini_file("sample.ini"); => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59158 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59158 ------------------------------------------------------------------ Modified: en/internals2/variables/index.xml By: fmargaine on 2014-11-17 13:22:22 =================================================================== --- en/internals2/variables/index.xml +++ en/internals2/variables/index.xml @@ -827,7 +827,7 @@ zval **data = NULL; for (zend_hash_internal_pointer_reset_ex(ht, &position); - zend_hash_get_current_data_ex(ht, (void**) &data, &position) == SUCCESS; + zend_hash_has_more_elements_ex(ht, &position) == SUCCESS; zend_hash_move_forward_ex(ht, &position)) { /* by now we have data set and can use Z_ macros for accessing type and variable data */ => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59169 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59169 ------------------------------------------------------------------ Modified: en/reference/ibm_db2/book.xml By: daverandom on 2014-11-18 06:19:00 =================================================================== --- en/reference/ibm_db2/book.xml +++ en/reference/ibm_db2/book.xml @@ -9,7 +9,7 @@ <preface xml:id="intro.ibm-db2"> &reftitle.intro; <para> - These functions enable you to access IBM DB2 Universal Database, IBM + These functions enables you to access IBM DB2 Universal Database, IBM Cloudscape, and Apache Derby databases using the DB2 Call Level Interface (DB2 CLI). </para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59174 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59174 ------------------------------------------------------------------ Modified: en/reference/datetime/ini.xml By: daverandom on 2014-11-20 08:42:56 =================================================================== --- en/reference/datetime/ini.xml +++ en/reference/datetime/ini.xml @@ -42,7 +42,7 @@ </row> <row> <entry><link linkend="ini.date.timezone">date.timezone</link></entry> - <entry>""</entry> + <entry>"America/Guayaquil"</entry> <entry>PHP_INI_ALL</entry> <entry>Available since PHP 5.1.0.</entry> </row> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59182 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59182 ------------------------------------------------------------------ Modified: en/reference/filesystem/functions/fread.xml By: Stefan Topfstedt on 2014-11-20 13:00:41 =================================================================== --- en/reference/filesystem/functions/fread.xml +++ en/reference/filesystem/functions/fread.xml @@ -143,7 +143,12 @@ <![CDATA[ <?php $handle = fopen("http://www.example.com/", "rb"); +if (FALSE === $handle) { + die("Failed to open stream to URL"); +} + $contents = ''; + while (!feof($handle)) { $contents .= fread($handle, 8192); } => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59188 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59188 ------------------------------------------------------------------ Modified: en/reference/v8js/v8jsexception/getjssourceline.xml By: Daniel Tschinder on 2014-11-21 07:03:04 =================================================================== --- en/reference/v8js/v8jsexception/getjssourceline.xml +++ en/reference/v8js/v8jsexception/getjssourceline.xml @@ -10,7 +10,7 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>V8JsException::getJsSourceLine</methodname> + <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>V8JsException::getJsSourceLine</methodname> <void /> </methodsynopsis> <para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59190 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59190 ------------------------------------------------------------------ Modified: en/appendices/migration56/openssl.xml By: daverandom on 2014-11-22 09:26:42 =================================================================== --- en/appendices/migration56/openssl.xml +++ en/appendices/migration56/openssl.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> - + <sect1 xml:id="migration56.openssl" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>OpenSSL changes in PHP 5.6.x</title> @@ -246,8 +246,8 @@ // Requiring TLS 1.1 or 1.2: $ctx = stream_context_create([ 'ssl' => [ - 'crypto_method' => STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | - STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT, + 'crypto_method' => STREAM_CRYPTO_METHOD_TLSv_1_1_CLIENT | + STREAM_CRYPTO_METHOD_TLSv_1_2_CLIENT, ], ]); $html = file_get_contents('https://google.com/', false, $ctx); => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59195 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59195 ------------------------------------------------------------------ Modified: en/reference/filesystem/functions/delete.xml By: daverandom on 2014-11-23 23:17:41 =================================================================== --- en/reference/filesystem/functions/delete.xml +++ en/reference/filesystem/functions/delete.xml @@ -9,7 +9,7 @@ <refsect1 role="description"> &reftitle.description; <para> - This is a dummy manual entry to satisfy those people who are looking for + This is a dumm\\atisfy those people who are looking for <function>unlink</function> or <function>unset</function> in the wrong place. </para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59199 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59199 ------------------------------------------------------------------ Modified: en/reference/var/functions/debug-zval-dump.xml By: daverandom on 2014-11-24 02:58:38 =================================================================== => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59200 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59200 ------------------------------------------------------------------ Modified: en/reference/classobj/functions/get-parent-class.xml By: daverandom on 2014-11-24 10:01:55 =================================================================== --- en/reference/classobj/functions/get-parent-class.xml +++ en/reference/classobj/functions/get-parent-class.xml @@ -51,7 +51,7 @@ <para> <informaltable> <tgroup cols="2"> - <thead> + <thead>dd <row> <entry>&Version;</entry> <entry>&Description;</entry> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59204 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59204 ------------------------------------------------------------------ Modified: en/reference/pthreads/threaded/merge.xml By: Krzysiek Łukasiak on 2014-11-25 03:44:27 =================================================================== --- en/reference/pthreads/threaded/merge.xml +++ en/reference/pthreads/threaded/merge.xml @@ -1,134 +1,135 @@ -<?xml version="1.0" encoding="utf-8"?> - - -<refentry xml:id="threaded.merge" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> - <refnamediv> - <refname>Threaded::merge</refname> - <refpurpose>Manipulation</refpurpose> - </refnamediv> - - <refsect1 role="description"> - &reftitle.description; - <methodsynopsis> - <modifier>public</modifier> <type>boolean</type><methodname>Threaded::merge</methodname> - <methodparam><type>mixed</type><parameter>from</parameter></methodparam> - <methodparam choice="opt"><type>mixed</type><parameter>overwrite</parameter></methodparam> - </methodsynopsis> - <para> - Merges data into the current object - </para> - </refsect1> - - <refsect1 role="parameters"> - &reftitle.parameters; - <variablelist> - <varlistentry> - <term><parameter>from</parameter></term> - <listitem> - <para> - The data to merge - </para> - </listitem> - </varlistentry> - <varlistentry> - <term><parameter>overwrite</parameter></term> - <listitem> - <para> - Overwrite existing keys, by default true - </para> - </listitem> - </varlistentry> - </variablelist> - </refsect1> - - <refsect1 role="returnvalues"> - &reftitle.returnvalues; - <para> - A boolean indication of success - </para> - </refsect1> - - <refsect1 role="examples"> - &reftitle.examples; - <para> - <example> - <title>Merging into the property table of a threaded object</title> - <programlisting role="php"> -<![CDATA[ -<?php -$array = []; - -while (count($array) < 10) - $array[] = count($array); - -$stdClass = new stdClass(); -$stdClass->foo = "foo"; -$stdClass->bar = "bar"; -$stdClass->baz = "baz"; - -$safe = new Threaded(); -$safe->merge($array); -$safe->merge($stdClass); - -var_dump($safe); -?> -]]> - </programlisting> - &example.outputs; - <screen> -<![CDATA[ -object(Threaded)#2 (13) { - ["0"]=> - int(0) - ["1"]=> - int(1) - ["2"]=> - int(2) - ["3"]=> - int(3) - ["4"]=> - int(4) - ["5"]=> - int(5) - ["6"]=> - int(6) - ["7"]=> - int(7) - ["8"]=> - int(8) - ["9"]=> - int(9) - ["foo"]=> - string(3) "foo" - ["bar"]=> - string(3) "bar" - ["baz"]=> - string(3) "baz" -} -]]> - </screen> - </example> - </para> - </refsect1> -</refentry> - - +<?xml version="1.0" encoding="utf-8"?> + + +<refentry xml:id="threaded.merge" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> + <refnamediv> + <refname>Threaded::merge</refname> + <refpurpose>Manipulation</refpurpose> + </refnamediv> + + <refsect1 role="description"> + &reftitle.description; + <methodsynopsis> + <modifier>public</modifier> <type>boolean</type><methodname>Threaded::merge</methodname> + <methodparam><type>mixed</type><parameter>from</parameter></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>overwrite</parameter></methodparam> + </methodsynopsis> + <para> + Merges data into the current object + </para> + </refsect1> + + <refsect1 role="parameters"> + &reftitle.parameters; + <variablelist> + <varlistentry> + <term><parameter>from</parameter></term> + <listitem> + <para> + The data to merge + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>overwrite</parameter></term> + <listitem> + <para> + Overwrite existing keys, by default true + </para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + A boolean indication of success + </para> + </refsect1> + + <refsect1 role="examples"> + &reftitle.examples; + <para> + <example> + <title>Merging into the property table of a threaded object</title> + <programlisting role="php"> +<![CDATA[ +<?php +$array = []; + +while (count($array) < 10) + $array[] = count($array); + +$stdClass = new stdClass(); +$stdClass->foo = "foo"; +$stdClass->bar = "bar"; +$stdClass->baz = "baz"; + +$safe = new Threaded(); +$safe->merge($array); +$safe->foo = "bar"; +$safe->merge($stdClass, false); + +var_dump($safe); +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +object(Threaded)#2 (13) { + ["0"]=> + int(0) + ["1"]=> + int(1) + ["2"]=> + int(2) + ["3"]=> + int(3) + ["4"]=> + int(4) + ["5"]=> + int(5) + ["6"]=> + int(6) + ["7"]=> + int(7) + ["8"]=> + int(8) + ["9"]=> + int(9) + ["foo"]=> + string(3) "bar" + ["bar"]=> + string(3) "bar" + ["baz"]=> + string(3) "baz" +} +]]> + </screen> + </example> + </para> + </refsect1> +</refentry> + + => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59207 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59207 ------------------------------------------------------------------ Modified: en/reference/zlib/functions/zlib-decode.xml By: daverandom on 2014-11-26 23:25:21 =================================================================== --- en/reference/zlib/functions/zlib-decode.xml +++ en/reference/zlib/functions/zlib-decode.xml @@ -59,8 +59,7 @@ </refsect1> </refentry> - -<!-- Keep this comment at the end of the file +<!-- Keep this comment at the end of the file. Local variables: mode: sgml sgml-omittag:t => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59223 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59223 ------------------------------------------------------------------ Modified: en/reference/bc/functions/bcsqrt.xml By: daverandom on 2014-11-27 06:49:41 =================================================================== --- en/reference/bc/functions/bcsqrt.xml +++ en/reference/bc/functions/bcsqrt.xml @@ -14,7 +14,7 @@ <methodparam choice="opt"><type>int</type><parameter>scale</parameter></methodparam> </methodsynopsis> <para> - Return the square root of the <parameter>operand</parameter>. + Retorna a raiz quadrada de um <parameter>operador</parameter>. </para> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59225 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59225 ------------------------------------------------------------------ Modified: en/reference/array/functions/array-flip.xml By: James Ward on 2014-11-28 10:32:13 =================================================================== --- en/reference/array/functions/array-flip.xml +++ en/reference/array/functions/array-flip.xml @@ -60,11 +60,26 @@ <programlisting role="php"> <![CDATA[ <?php -$trans = array_flip($trans); -$original = strtr($str, $trans); +$input = array("oranges", "apples", "pears"); +$flipped = array_flip($input); + +print_r($flipped); ?> ]]> </programlisting> + <para> + &example.outputs; + </para> + <screen> +<![CDATA[ +Array +( + [oranges] => 0 + [apples] => 1 + [pears] => 2 +) +]]> + </screen> </example> </para> <para> @@ -73,14 +88,15 @@ <programlisting role="php"> <![CDATA[ <?php -$trans = array("a" => 1, "b" => 1, "c" => 2); -$trans = array_flip($trans); -print_r($trans); +$input = array("a" => 1, "b" => 1, "c" => 2); +$flipped = array_flip($input); + +print_r($flipped); ?> ]]> </programlisting> <para> - now <varname>$trans</varname> is: + &example.outputs; </para> <screen> <![CDATA[ => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59229 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59229 ------------------------------------------------------------------ -- https://edit.php.net/ This email is send automatically by the Php Docbook Online Editor.