sigmasternchen/php-doc-en
1
0
Fork 0
mirror of https://github.com/sigmasternchen/php-doc-en synced 2025-03-16 08:58:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

- fixed conflict

Browse source 
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@206904 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Uwe Steinmann 2006-02-10 12:37:21 +00:00
parent 56142a30d8
commit 4b0bc3b003
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reference/paradox/functions/px-set-targetencoding.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $Revision: 1.5 $ -->
<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/paradox.xml, last change in rev -->
<refentry id="function.px-set-targetencoding">
<refnamediv>
@ -23,12 +23,8 @@
iconv or recode.
</para>
<para>This function is deprecated and should be replaced by calling
<<<<<<< px-set-targetencoding.xml
<function>px_set_parameter</function>.</para>
=======
<function>px_set_parameter</function>.
</para>
>>>>>>> 1.4
<para>
See also <function>px_get_info</function> to determine the DOS code page
as stored in the database file.