cvs: phpdoc-el /reference/url/functions base64-decode.xml base64-encode.xml get-meta-tags.xml parse-url.xml rawurldecode.xml rawurlencode.xml urldecode.xml urlencode.xml

Index: phpdoc-el/reference/url/functions/base64-decode.xml
diff -u phpdoc-el/reference/url/functions/base64-decode.xml:1.1 phpdoc-el/reference/url/functions/base64-decode.xml:1.2
--- phpdoc-el/reference/url/functions/base64-decode.xml:1.1	Sun Jul 20 06:46:45 2003
+++ phpdoc-el/reference/url/functions/base64-decode.xml	Sun Jul 20 07:27:21 2003
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-7"?>
-<!-- $Revision: 1.1 $ -->
-<!-- En-Revision: 1.4 Maintainer: legionnaire Status: Ready -->
+<!-- $Revision: 1.2 $ -->
+<!-- EN-Revision: 1.4 Maintainer: legionnaire Status: Ready -->
 <!-- splitted from ./en/functions/url.xml, last change in rev 1.2 -->
   <refentry id="function.base64-decode">
    <refnamediv>
Index: phpdoc-el/reference/url/functions/base64-encode.xml
diff -u phpdoc-el/reference/url/functions/base64-encode.xml:1.1 phpdoc-el/reference/url/functions/base64-encode.xml:1.2
--- phpdoc-el/reference/url/functions/base64-encode.xml:1.1	Sun Jul 20 06:46:45 2003
+++ phpdoc-el/reference/url/functions/base64-encode.xml	Sun Jul 20 07:27:21 2003
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-7"?>
-<!-- $Revision: 1.1 $ -->
-<!-- En-Revision: 1.4 Maintainer: Legionnaire Status: Ready -->
+<!-- $Revision: 1.2 $ -->
+<!-- EN-Revision: 1.4 Maintainer: legionnaire Status: Ready -->
 <!-- splitted from ./en/functions/url.xml, last change in rev 1.2 -->
   <refentry id="function.base64-encode">
    <refnamediv>
Index: phpdoc-el/reference/url/functions/get-meta-tags.xml
diff -u phpdoc-el/reference/url/functions/get-meta-tags.xml:1.1 phpdoc-el/reference/url/functions/get-meta-tags.xml:1.2
--- phpdoc-el/reference/url/functions/get-meta-tags.xml:1.1	Sun Jul 20 06:46:45 2003
+++ phpdoc-el/reference/url/functions/get-meta-tags.xml	Sun Jul 20 07:27:21 2003
@@ -1,11 +1,6 @@
-<<<<<<< get-meta-tags.xml
 <?xml version="1.0" encoding="iso-8859-7"?>
-<!-- $Revision: 1.1 $ -->
-<!-- En-Revision: 1.3 Maintainer: legionnaire Status: Ready -->
-=======
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.4
+<!-- $Revision: 1.2 $ -->
+<!-- EN-Revision: 1.3 Maintainer: legionnaire Status: Ready -->
 <!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 -->
   <refentry id="function.get-meta-tags">
    <refnamediv>
@@ -81,13 +76,8 @@
     </para>
     <note>
      <para>
-<<<<<<< get-meta-tags.xml
       Áðü ôçí PHP 4.0.5, <function>get_meta_tags</function> õðïóôçñßæïõí
       åêôüò åéóáãùãéêþí html éäéüôçôåò.
-=======
-      As of PHP 4.0.5, <function>get_meta_tags</function> supports
-      unquoted HTML attributes.
->>>>>>> 1.4
      </para>
     </note>
     <para>
Index: phpdoc-el/reference/url/functions/parse-url.xml
diff -u phpdoc-el/reference/url/functions/parse-url.xml:1.1 phpdoc-el/reference/url/functions/parse-url.xml:1.2
--- phpdoc-el/reference/url/functions/parse-url.xml:1.1	Sun Jul 20 06:46:45 2003
+++ phpdoc-el/reference/url/functions/parse-url.xml	Sun Jul 20 07:27:21 2003
@@ -1,11 +1,6 @@
-<<<<<<< parse-url.xml
 <?xml version="1.0" encoding="iso-8859-7"?>
-<!-- $Revision: 1.1 $ -->
-<!-- En-Revision: 1.5 Maintainer: legionnaire Status: ready -->
-=======
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.6
+<!-- $Revision: 1.2 $ -->
+<!-- EN-Revision: 1.5 Maintainer: legionnaire Status: ready -->
 <!-- splitted from ./en/functions/url.xml, last change in rev 1.2 -->
   <refentry id="function.parse-url">
    <refnamediv>
@@ -71,11 +66,7 @@
      ôá áíáëýóåé óùóôÜ.
     </para>
     <example>
-<<<<<<< parse-url.xml
      <title>×ñçóéìïðïéþíôáò <function>parse_url</function></title>
-=======
-     <title><function>parse_url</function> example</title>
->>>>>>> 1.6
      <screen>
 $ php -r 'print_r( parse_url("http://username:password@hostname/path?arg=value#anchor"));'
 Array
Index: phpdoc-el/reference/url/functions/rawurldecode.xml
diff -u phpdoc-el/reference/url/functions/rawurldecode.xml:1.1 phpdoc-el/reference/url/functions/rawurldecode.xml:1.2
--- phpdoc-el/reference/url/functions/rawurldecode.xml:1.1	Sun Jul 20 06:46:45 2003
+++ phpdoc-el/reference/url/functions/rawurldecode.xml	Sun Jul 20 07:27:21 2003
@@ -1,11 +1,6 @@
-<<<<<<< rawurldecode.xml
 <?xml version="1.0" encoding="iso-8859-7"?>
-<!-- $Revision: 1.1 $ -->
-<!-- En-Revision: 1.2 Maintainer: legionnaire Status: Ready -->
-=======
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.3
+<!-- $Revision: 1.2 $ -->
+<!-- EN-Revision: 1.2 Maintainer: legionnaire Status: Ready -->
 <!-- splitted from ./en/functions/url.xml, last change in rev 1.6 -->
   <refentry id="function.rawurldecode">
    <refnamediv>
@@ -19,18 +14,10 @@
       <methodparam><type>string</type><parameter>str</parameter></methodparam>
      </methodsynopsis>
     <para>
-<<<<<<< rawurldecode.xml
      ÅðéóôñÝöåé Ýíá string óôï ïðïßï ïé áêïëïõèßåò ìå ôï óýìâïëï
      (<literal>%</literal>) åðß ôïéò åêáôü áêïëïõèïýìåíåò áðü äõï øçößá hex Ý÷ïõí
      áíôéêáôáóôáèåß ìå áëöáâçôéêïýò ÷áñáêôÞñåò.  Ãéá ðáñÜäåéãìá, ôï string
      <screen>foo%20bar%40baz</screen> áðïêùäéêïðïåßôáé óå <screen>foo bar@baz</screen>.
-=======
-     Returns a string in which the sequences with percent
-     (<literal>%</literal>) signs followed by two hex digits have been
-     replaced with literal characters.  For example, the string
-     <literal>foo%20bar%40baz</literal> decodes into <literal>foo
-     bar@baz</literal>.
->>>>>>> 1.3
     </para>
     <note>
      <para>
Index: phpdoc-el/reference/url/functions/rawurlencode.xml
diff -u phpdoc-el/reference/url/functions/rawurlencode.xml:1.1 phpdoc-el/reference/url/functions/rawurlencode.xml:1.2
--- phpdoc-el/reference/url/functions/rawurlencode.xml:1.1	Sun Jul 20 06:46:45 2003
+++ phpdoc-el/reference/url/functions/rawurlencode.xml	Sun Jul 20 07:27:21 2003
@@ -1,11 +1,6 @@
-<<<<<<< rawurlencode.xml
 <?xml version="1.0" encoding="iso-8859-7"?>
-<!-- $Revision: 1.1 $ -->
-<!-- En-Revision: 1.4 Maintainer: legionnaire Status: ready -->
-=======
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.6
+<!-- $Revision: 1.2 $ -->
+<!-- EN-Revision: 1.4 Maintainer: legionnaire Status: ready -->
 <!-- splitted from ./en/functions/url.xml, last change in rev 1.6 -->
   <refentry id="function.rawurlencode">
    <refnamediv>
@@ -19,7 +14,6 @@
       <methodparam><type>string</type><parameter>str</parameter></methodparam>
      </methodsynopsis>
     <para>
-<<<<<<< rawurlencode.xml
      ÅðéóôñÝöåé Ýíá string óôï ïðïßï üëïé ïé ìç-áëöáñéèìçôéêïß ÷áñáêôÞñåò åêôüò ôïõ
      <screen>-_.</screen> Ý÷ïõí áíôéêáôáóôáèåß ìå Ýíá óýìâïëï
      (<literal>%</literal>) åðß ôïéò åêáôü áêïëïõèïýìåíï áðü äõï øçößá hex.  ÁõôÞ åßíáé
@@ -28,27 +22,11 @@
      ãéá ôçí ðñïóôáóßá ôùí URL áðü ôï íá êáôáêñåïõñãçèïýí áðü ìÝóá åêðïìðÞò (transmission media)
      ìå ìåôáôñïðÝò ÷áñáêôÞñùí (üðùò ìåñéêÜ óõóôÞìáôá e-mail). Ãéá
      ðáñÜäåéãìá, åÜí èÝëåéò íá óõìðåñéëÜâåéò Ýíá password óå Ýíá FTP URL:
-=======
-     Returns a string in which all non-alphanumeric characters except
-     <literal>-_.</literal> have been replaced with a percent
-     (<literal>%</literal>) sign followed by two hex digits.  This is
-     the encoding described in RFC 1738 for protecting literal
-     characters from being interpreted as special URL delimiters, and
-     for protecting URL's from being mangled by transmission media
-     with character conversions (like some email systems). For
-     example, if you want to include a password in an FTP URL:
->>>>>>> 1.6
     </para>
-<<<<<<< rawurlencode.xml
+    <para>
     <example>
      <title><function>rawurlencode</function> ðáñÜäåéãìá 1</title>
      <programlisting role="php">
-=======
-    <para>
-     <example>
-      <title><function>rawurlencode</function> example 1</title>
-      <programlisting role="php">
->>>>>>> 1.6
 <![CDATA[
 <?php
 echo '<a href="ftp://user:', rawurlencode('foo @+%/'),
@@ -61,16 +39,10 @@
     <para>
      ¹, áí ìåôáöÝñåôå ðëçñïöïñßåò óå Ýíá PATH_INFO ôìÞìá ôïõ URL:
     </para>
-<<<<<<< rawurlencode.xml
+    <para>
     <example>
      <title><function>rawurlencode</function> ðáñÜäåéãìá 2</title>
      <programlisting role="php">
-=======
-    <para>
-     <example>
-      <title><function>rawurlencode</function> example 2</title>
-      <programlisting role="php">
->>>>>>> 1.6
 <![CDATA[
 <?php
 echo '<a href="http://x.com/department_list_script/',
@@ -83,13 +55,8 @@
     <simpara>
      Äåßôå åðßóçò: <function>rawurldecode</function>,
      <function>urldecode</function>,
-<<<<<<< rawurlencode.xml
      <function>urlencode</function> êáé
      <ulink url="&url.rfc;1738">RFC 1738</ulink>
-=======
-     <function>urlencode</function> and
-     <ulink url="&url.rfc;1738">RFC 1738</ulink>.
->>>>>>> 1.6
     </simpara>
    </refsect1>
   </refentry>
Index: phpdoc-el/reference/url/functions/urldecode.xml
diff -u phpdoc-el/reference/url/functions/urldecode.xml:1.1 phpdoc-el/reference/url/functions/urldecode.xml:1.2
--- phpdoc-el/reference/url/functions/urldecode.xml:1.1	Sun Jul 20 06:46:45 2003
+++ phpdoc-el/reference/url/functions/urldecode.xml	Sun Jul 20 07:27:21 2003
@@ -1,11 +1,6 @@
-<<<<<<< urldecode.xml
 <?xml version="1.0" encoding="iso-8859-7"?>
-<!-- $Revision: 1.1 $ -->
-<!-- En-Revision: 1.2 Maintainer: legionnaire Status: Ready -->
-=======
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.3
+<!-- $Revision: 1.2 $ -->
+<!-- EN-Revision: 1.2 Maintainer: legionnaire Status: Ready -->
 <!-- splitted from ./en/functions/url.xml, last change in rev 1.2 -->
   <refentry id="function.urldecode">
    <refnamediv>
@@ -40,13 +35,8 @@
      </example>
     </para>
     <para>
-<<<<<<< urldecode.xml
      Äåßôå åðßóçò: <function>urlencode</function>,
      <function>rawurlencode</function>,
-=======
-     See also <function>urlencode</function>,
-     <function>rawurlencode</function> and
->>>>>>> 1.3
      <function>rawurldecode</function>.
     </para>
    </refsect1>
Index: phpdoc-el/reference/url/functions/urlencode.xml
diff -u phpdoc-el/reference/url/functions/urlencode.xml:1.1 phpdoc-el/reference/url/functions/urlencode.xml:1.2
--- phpdoc-el/reference/url/functions/urlencode.xml:1.1	Sun Jul 20 06:46:45 2003
+++ phpdoc-el/reference/url/functions/urlencode.xml	Sun Jul 20 07:27:21 2003
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
+<!-- EN-Revision: 1.2 Maintainer: legionnaire Status: Ready -->
 <!-- splitted from ./en/functions/url.xml, last change in rev 1.2 -->
   <refentry id="function.urlencode">
    <refnamediv>