cvs: phpdoc-he /reference/sqlite ini.xml reference.xml /reference/sqlite/functions sqlite-array-query.xml sqlite-busy-timeout.xml sqlite-changes.xml sqlite-close.xml sqlite-column.xml sqlite-create-aggregate.xml sqlite-create-function.xml sqlite-current.xml sqlite-error-string.xml sqlite-escape-string.xml sqlite-fetch-single.xml sqlite-fetch-string.xml sqlite-last-error.xml sqlite-last-insert-rowid.xml sqlite-libencoding.xml sqlite-open.xml sqlite-popen.xml sqlite-query.xml sqlite-seek.xml sqlite-unbuffered-query.xml

Index: phpdoc-he/reference/sqlite/functions/sqlite-array-query.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-array-query.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-array-query.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-array-query.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-array-query.xml	Mon Jul 28 07:30:58 2003
@@ -1,47 +1,6 @@
-<<<<<<< sqlite-array-query.xml
-<?xml version="1.0" encoding="WINDOWS-1255"?>
-<!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by noam (i-com) -->
-<!-- $Revision: 1.1 $ -->
-=======
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.6
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.sqlite-array-query">
-<<<<<<< sqlite-array-query.xml
-	<refnamediv>
-		<refname>sqlite_array_query</refname>
-		<refpurpose>_____ ______ ___ ____ _______ _______ ____.</refpurpose>
-	</refnamediv>
-	<refsect1>
-		<title>____</title>
-		<methodsynopsis>
-			<type>array</type>
-			<methodname>sqlite_array_query</methodname>
-			<methodparam>
-				<type>resource</type>
-				<parameter>db</parameter>
-			</methodparam>
-			<methodparam>
-				<type>string</type>
-				<parameter>query</parameter>
-			</methodparam>
-			<methodparam choice="opt">
-				<type>int</type>
-				<parameter>result_type</parameter>
-			</methodparam>
-			<methodparam choice="opt">
-				<type>bool</type>
-				<parameter>decode_binary</parameter>
-			</methodparam>
-		</methodsynopsis>
-		<para>
-			<function>sqlite_array_query</function> ____ ___ ______ _
-   <function>sqlite_query</function> ___
-   <function>sqlite_fetch_array</function> 
-   ____ __ ____ ______
-  ___ _____ __ ____ _____, (___ _____ ____). º____ _ 
-   <function>sqlite_array_query</function>_____ _____ _______ _____ __º____ ___
-=======
  <refnamediv>
   <refname>sqlite_array_query</refname>
   <refpurpose>Execute a query against a given database and returns an array.</refpurpose>
@@ -62,12 +21,11 @@
    and storing it into an array, as shown in the example below.  Calling
    <function>sqlite_array_query</function> is significantly faster than
    using such a script.
->>>>>>> 1.6
   </para>
-		<example>
-			<title>
-				<function>sqlite_array_query</function> implemented yourself</title>
-			<programlisting role="php"><![CDATA[
+  <example>
+   <title><function>sqlite_array_query</function> implemented yourself</title>
+   <programlisting role="php">
+<![CDATA[
 <?php
 $q = sqlite_query($dbhandle, "SELECT * from foo LIMIT 100");
 $rows = array();
@@ -75,21 +33,24 @@
     $rows[] = $r;
 }
 ?>
-]]></programlisting>
-		</example>
-		<tip>
-			<para>
-				<function>sqlite_array_query</function> ______ ___º_ ________
-    ________ __ 45 _____ . _____ ______ _____ ____ ____ _____ ____º___ 
-    <function>sqlite_unbuffered_query</function> ________ _______.
+]]>
+   </programlisting>
+  </example>
+  <tip>
+   <para>
+    <function>sqlite_array_query</function> is best suited to queries
+    returning 45 rows or less.  If you have more data than that, it is
+    recommended that you write your scripts to use
+    <function>sqlite_unbuffered_query</function> instead for more optimal
+    performance.
    </para>
-		</tip>
-		<para>
-   ___ __ <function>sqlite_query</function>,
-   <function>sqlite_fetch_array</function>,_ 
+  </tip>
+  <para>
+   See also <function>sqlite_query</function>,
+   <function>sqlite_fetch_array</function>, and 
    <function>sqlite_fetch_string</function>.
   </para>
-	</refsect1>
+ </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
  Local variables:
Index: phpdoc-he/reference/sqlite/functions/sqlite-busy-timeout.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-busy-timeout.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-busy-timeout.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-busy-timeout.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-busy-timeout.xml	Mon Jul 28 07:30:58 2003
@@ -1,10 +1,5 @@
-<<<<<<< sqlite-busy-timeout.xml
 <?xml version="1.0" encoding="windos-1255"?>
-<!-- $Revision: 1.1 $ -->
-=======
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.4
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.sqlite-busy-timeout">
  <refnamediv><refname>sqlite_busy_timeout</refname>
   <refpurpose>÷åáòú  àå îðèøìú àú îùê æîï ääîúðä ìðúåðéí.</refpurpose>
@@ -17,22 +12,12 @@
    <methodparam><type>int</type><parameter>milliseconds</parameter></methodparam>
   </methodsynopsis>
   <para>
-<<<<<<< sqlite-busy-timeout.xml
    ÷åáòú àú î÷ñéîåí äæîï á <parameter>milliseconds</parameter> ù SQLITE îçëä ì
    <parameter>áñéñ äðúåðéí</parameter>
    òã ùéäéä îåëï ìùéîåù .
    ÷áéòú <parameter>milliseconds</parameter> ë <literal>0</literal>,SQLITE
    úçæéø àú äñèèåñ <literal>SQLITE_BUSY</literal> îééãéú , àí úåëðä àçøú
    ðåòìú àú äðúåðéí ìòéãëåï.
-=======
-   Set the maximum time that sqlite will wait for a
-   <parameter>dbhandle</parameter>
-   to become ready for use to <parameter>milliseconds</parameter>.
-   If <parameter>milliseconds</parameter> is <literal>0</literal>, busy
-   handlers will be disabled and sqlite will return immediately with a
-   <literal>SQLITE_BUSY</literal> status code if another process/thread has
-   the database locked for an update.
->>>>>>> 1.4
   </para>
   <para>
    áøéøú äîçãì ùð÷áòú ò"é PHP ìäîúðä äåà 60 ùðéåú.
Index: phpdoc-he/reference/sqlite/functions/sqlite-changes.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-changes.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-changes.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-changes.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-changes.xml	Mon Jul 28 07:30:58 2003
@@ -1,16 +1,11 @@
-<<<<<<< sqlite-changes.xml
 <?xml version="1.0" encoding="windos-1255"?>
-=======
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.5
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.sqlite-changes">
 	<refnamediv>
 		<refname>sqlite_changes</refname>
 		<refpurpose>
 äôåð÷öéä îçæéøä àú îñôø äùåøåú ùùåðå áùàéìúú ä SQL äàçøåðä ùáåöòä.
   </refpurpose>
-<<<<<<< sqlite-changes.xml
 	</refnamediv>
 	<refsect1>
 		<title>úéàåø</title>
@@ -24,19 +19,6 @@
 		</methodsynopsis>
 		<para>
 îçæéøä àú îñôø äùåøåú ùùåðå ò"é éãé ùàéìú äSQL äàçøåðä ùáåöòä òì äðúåðéí.
-=======
- </refnamediv>
- <refsect1>
-  <title>Description</title>
-  <methodsynopsis>
-   <type>int</type><methodname>sqlite_changes</methodname>
-   <methodparam><type>resource</type><parameter>dbhandle</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the numbers of rows that were changed by the most recent SQL
-   statement executed against the <parameter>dbhandle</parameter> database
-   handle.
->>>>>>> 1.5
   </para>
 		<para>
    See also <function>sqlite_num_rows</function>.
Index: phpdoc-he/reference/sqlite/functions/sqlite-close.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-close.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-close.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-close.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-close.xml	Mon Jul 28 07:30:58 2003
@@ -1,10 +1,5 @@
-<<<<<<< sqlite-close.xml
 <?xml version="1.0" encoding="windos-1255"?>
-<!-- $Revision: 1.1 $ -->
-=======
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.3
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.sqlite-close">
  <refnamediv>
   <refname>sqlite_close</refname>
Index: phpdoc-he/reference/sqlite/functions/sqlite-column.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-column.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-column.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-column.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-column.xml	Mon Jul 28 07:30:58 2003
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="WINDOWS-1255"?><!-- $Revision: 1.1 $ -->
+<?xml version="1.0" encoding="WINDOWS-1255"?>
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.sqlite-column">
 <refnamediv>
  <refname>sqlite_column</refname>
Index: phpdoc-he/reference/sqlite/functions/sqlite-create-aggregate.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-create-aggregate.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-create-aggregate.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-create-aggregate.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-create-aggregate.xml	Mon Jul 28 07:30:58 2003
@@ -1,11 +1,5 @@
-<<<<<<< sqlite-create-aggregate.xml
 <?xml version="1.0" encoding="WINDOWS-1255"?>
-=======
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.3
 <refentry id="function.sqlite-create-aggregate">
-<<<<<<< sqlite-create-aggregate.xml
 	<refnamediv>
 		<refname>sqlite_create_aggregate</refname>
 		<refpurpose> äôåð÷öéä îàôùøú øéùåí ôåð÷öéåú  UDF (ôåð÷öéåú àéùéåú ùì äîùúîù(, öåáøåú ,  ìùéîåù áùàéìúåú SQL . </refpurpose>
@@ -43,43 +37,6 @@
 			<example>
 				<title>max_length aggregation function example</title>
 				<programlisting role="php"><![CDATA[
-=======
- <refnamediv>
-  <refname>sqlite_create_aggregate</refname>
-  <refpurpose>Register an aggregating UDF for use in SQL statements.</refpurpose>
- </refnamediv>
- <refsect1>
-  <title>Description</title>
-  <methodsynopsis>
-   <type>bool</type><methodname>sqlite_create_aggregate</methodname>
-   <methodparam><type>resource</type><parameter>dbhandle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>step_func</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>finalize_func</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>num_args</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>sqlite_create_aggregate</function> is similar to
-   <function>sqlite_create_function</function> except that it registers
-   functions that can be used to calculate a result aggregated across all the
-   rows of a query.
-  </para>
-  <para>
-   The key difference between this function and
-   <function>sqlite_create_function</function> is that two functions are
-   required to manage the aggregate; <parameter>step_func</parameter> is
-   called for each row of the result set.  Your PHP function should
-   accumulate the result and store it into the aggregation context.
-   Once all the rows have been processed,
-   <parameter>finalize_func</parameter> will be called and it should then
-   take the data from the aggregation context and return the result.
-  </para>
-  <para>
-   <example>
-    <title>max_length aggregation function example</title>
-    <programlisting role="php">
-<![CDATA[
->>>>>>> 1.3
 <?php
 $data = array(
    'one',
Index: phpdoc-he/reference/sqlite/functions/sqlite-create-function.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-create-function.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-create-function.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-create-function.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-create-function.xml	Mon Jul 28 07:30:58 2003
@@ -1,9 +1,5 @@
-<<<<<<< sqlite-create-function.xml
-<?xml version="1.0" encoding="WINDOWS-1255"?><!-- $Revision: 1.1 $ -->
-=======
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.6
+<?xml version="1.0" encoding="WINDOWS-1255"?>
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.sqlite-create-function">
  <refnamediv>
   <refname>sqlite_create_function</refname>
@@ -22,7 +18,6 @@
    <methodparam choice="opt"><type>int</type><parameter>num_args</parameter></methodparam>
   </methodsynopsis>
   <para>
-<<<<<<< sqlite-create-function.xml
    <function>sqlite_create_function</function>
    îàôùøú ìê ìøùåí ôåð÷öéåú
    PHP
@@ -47,24 +42,6 @@
     SQLite,
     òì îñôø äôøîèøéí ùäôåðöéä ú÷áì,  îåîìõ ìà ìäúùîù áôøîèø æä, àìà ëï äôåð÷öéä ùìê î÷áìú îñôø îåâãø åîåçìè ùì ôøîèøéí.
    </para>
-=======
-   <function>sqlite_create_function</function> allows you to register a PHP
-   function with SQLite as an <acronym>UDF</acronym> (User Defined
-   Function), so that it can be called from within your SQL
-   statements.
-  </para>
-  <para>
-   <parameter>dbhandle</parameter> specifies the database handle that you
-   wish to extend, <parameter>function_name</parameter> specifies the name
-   of the function that you will use in your SQL statements,
-   <parameter>callback</parameter> is any valid PHP callback to specify a
-   PHP function that should be called to handle the SQL function.
-   The optional parameter <parameter>num_args</parameter> is used as a hint
-   by the SQLite expression parser/evaluator.  It is recommended that you
-   specifiy a value if your function will only ever accept a fixed number of
-   parameters.
-  </para>
->>>>>>> 1.6
   <para>
  ðéúï ìäúùîù áôåð÷öéä áëì çì÷ ùì ùàéìúú 
  SQL ,
Index: phpdoc-he/reference/sqlite/functions/sqlite-current.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-current.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-current.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-current.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-current.xml	Mon Jul 28 07:30:58 2003
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="WINDOWS-1255"?><!-- $Revision: 1.1 $ -->
+<?xml version="1.0" encoding="WINDOWS-1255"?>
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.sqlite-current">
  <refnamediv>
   <refname>sqlite_current</refname>
Index: phpdoc-he/reference/sqlite/functions/sqlite-error-string.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-error-string.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-error-string.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-error-string.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-error-string.xml	Mon Jul 28 07:30:58 2003
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="WINDOWS-1255"?><!-- $Revision: 1.1 $ -->
+<?xml version="1.0" encoding="WINDOWS-1255"?>
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.sqlite-error-string">
  <refnamediv>
   <refname>sqlite_error_string</refname>
Index: phpdoc-he/reference/sqlite/functions/sqlite-escape-string.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-escape-string.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-escape-string.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-escape-string.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-escape-string.xml	Mon Jul 28 07:30:58 2003
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="WINDOWS-1255"?><!-- $Revision: 1.1 $ -->
+<?xml version="1.0" encoding="WINDOWS-1255"?>
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.sqlite-escape-string">
  <refnamediv>
   <refname>sqlite_escape_string</refname>
Index: phpdoc-he/reference/sqlite/functions/sqlite-fetch-single.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-fetch-single.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-fetch-single.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-fetch-single.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-fetch-single.xml	Mon Jul 28 07:30:58 2003
@@ -1,9 +1,4 @@
-<<<<<<< sqlite-fetch-single.xml
-<?xml version="1.0" encoding="WINDOWS-1255"?><!-- $Revision: 1.1 $ -->
-=======
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.2
+<?xml version="1.0" encoding="WINDOWS-1255"?><!-- $Revision: 1.2 $ -->
 <refentry id="function.sqlite-fetch-single">
  <refnamediv>
   <refname>sqlite_fetch_single</refname>
Index: phpdoc-he/reference/sqlite/functions/sqlite-fetch-string.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-fetch-string.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-fetch-string.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-fetch-string.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-fetch-string.xml	Mon Jul 28 07:30:58 2003
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="WINDOWS-1255"?><!-- $Revision: 1.1 $ -->
+<?xml version="1.0" encoding="WINDOWS-1255"?>
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.sqlite-fetch-string">
  <refnamediv>
   <refname>sqlite_fetch_string</refname>
Index: phpdoc-he/reference/sqlite/functions/sqlite-last-error.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-last-error.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-last-error.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-last-error.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-last-error.xml	Mon Jul 28 07:30:58 2003
@@ -1,10 +1,5 @@
-<<<<<<< sqlite-last-error.xml
 <?xml version="1.0" encoding="WINDOWS-1255"?>
-<!-- $Revision: 1.1 $ -->
-=======
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.5
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.sqlite-last-error">
  <refnamediv>
   <refname>sqlite_last_error</refname>
@@ -17,17 +12,9 @@
    <methodparam><type>resource</type><parameter>dbhandle</parameter></methodparam>
   </methodsynopsis>
   <para>
-<<<<<<< sqlite-last-error.xml
   äôåð÷öéä îçæéøä àú ÷åã äùâéàä ìôòåìä äàçøåðä ùáåöòä òì áñéñ ðúåðéí. òì îðú ì÷áì 
   äñáø îåáï ìùâéàä  òìéê ìäùúîù áôåð÷öéä <function>sqlite_error_string</function>.
  </para>
-=======
-   Returns the error code from the last operation performed on
-   <parameter>dbhandle</parameter>, the database handle.  A human readable
-   description of the error code can be retrieved using
-   <function>sqlite_error_string</function>.
-  </para>
->>>>>>> 1.5
   <para>
   øàä âí <function>sqlite_error_string</function>.
   </para>
Index: phpdoc-he/reference/sqlite/functions/sqlite-last-insert-rowid.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-last-insert-rowid.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-last-insert-rowid.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-last-insert-rowid.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-last-insert-rowid.xml	Mon Jul 28 07:30:58 2003
@@ -1,10 +1,5 @@
-<<<<<<< sqlite-last-insert-rowid.xml
 <?xml version="1.0" encoding="WINDOWS-1255"?>
-<!-- $Revision: 1.1 $ -->
-=======
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.5
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.sqlite-last-insert-rowid">
  <refnamediv>
   <refname>sqlite_last_insert_rowid</refname>
@@ -19,7 +14,6 @@
    <methodparam><type>resource</type><parameter>dbhandle</parameter></methodparam>
   </methodsynopsis>
   <para>
-<<<<<<< sqlite-last-insert-rowid.xml
   äôåð÷öéä îçæéøä àú ä-
   ID
   ùì äùåøä äàçøåðä ùäåëðñä ìáñéñ äðúåðéí
@@ -28,11 +22,6 @@
   ID
   ðåöø ò"é îðâðåï
   auto-increment .
-=======
-   Returns the rowid of the row that was most recently inserted into the
-   database <parameter>dbhandle</parameter>, if it was created as an
-   auto-increment field.
->>>>>>> 1.5
   </para>
   <tip>
    <para>
Index: phpdoc-he/reference/sqlite/functions/sqlite-libencoding.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-libencoding.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-libencoding.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-libencoding.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-libencoding.xml	Mon Jul 28 07:30:58 2003
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="WINDOWS-1255"?>
-<!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by noam (i-com) -->
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.sqlite-libencoding">
 	<refnamediv>
 		<refname>sqlite_libencoding</refname>
Index: phpdoc-he/reference/sqlite/functions/sqlite-open.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-open.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-open.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-open.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-open.xml	Mon Jul 28 07:30:58 2003
@@ -1,10 +1,5 @@
-<<<<<<< sqlite-open.xml
 <?xml version="1.0" encoding="WINDOWS-1255"?>
-<!-- $Revision: 1.1 $ -->
-=======
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.8
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.sqlite-open">
  <refnamediv>
   <refname>sqlite_open</refname>
@@ -21,7 +16,6 @@
    <methodparam choice="opt"><type>string</type><parameter>&amp;error_message</parameter></methodparam>
   </methodsynopsis>
   <para>
-<<<<<<< sqlite-open.xml
   äôåð÷öéä îçæéøä îùàá áî÷øä ùì äöìçä å
     &false;
     àçøú
@@ -47,31 +41,6 @@
    äôøîèø <parameter>errmessage</parameter> îåòáø ò"é îöáéò, åîçæé÷ áúåëå úéàåø ùì äùâéàä 
    ùîðòä àú ôúéçú áñéñ äðúåðéí. 
    </para>
-=======
-   Returns a resource (database handle) on success, &false; on error.
-  </para>
-  <para>
-   The <parameter>filename</parameter> parameter is the name of the
-   database.  It can be a relative or absolute path to the file that sqlite
-   will use to store your data.  If the file does not exist, sqlite will
-   attempt to create it.  You <emphasis>MUST</emphasis> have write
-   permissions to the file if you want to insert data or modify the database
-   schema.
-  </para>
-  <para>
-   The <parameter>mode</parameter> parameter specifies the mode of the file and is
-   intended to be used to open the database in read-only mode.
-   Presently, this parameter is ignored by the sqlite library.  The default
-   value for mode is the octal value <literal>0666</literal> and this is the
-   recommended value to use if you need access to the
-   <parameter>errmessage</parameter> parameter.
-  </para>
-  <para>
-   <parameter>errmessage</parameter> is passed by reference and is set to
-   hold a descriptive error message explaining why the database could not be
-   opened if there was an error.
-  </para>
->>>>>>> 1.8
   <para>
    <example>
     <title><function>sqlite_open</function> example</title>
Index: phpdoc-he/reference/sqlite/functions/sqlite-popen.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-popen.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-popen.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-popen.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-popen.xml	Mon Jul 28 07:30:58 2003
@@ -1,10 +1,5 @@
-<<<<<<< sqlite-popen.xml
 <?xml version="1.0" encoding="WINDOWS-1255"?>
-<!-- $Revision: 1.1 $ -->
-=======
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.5
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.sqlite-popen">
  <refnamediv>
   <refname>sqlite_popen</refname>
@@ -47,13 +42,8 @@
    </simpara>
   </note>
   <para>
-<<<<<<< sqlite-popen.xml
    øàä âí <function>sqlite_open</function>,
    <function>sqlite_close</function> å
-=======
-   See also <function>sqlite_open</function>,
-   <function>sqlite_close</function> and
->>>>>>> 1.5
    <function>sqlite_query</function>.
   </para>
  </refsect1>
Index: phpdoc-he/reference/sqlite/functions/sqlite-query.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-query.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-query.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-query.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-query.xml	Mon Jul 28 07:30:58 2003
@@ -1,10 +1,5 @@
-<<<<<<< sqlite-query.xml
 <?xml version="1.0" encoding="WINDOWS-1255"?>
-<!-- $Revision: 1.1 $ -->
-=======
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.5
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.sqlite-query">
  <refnamediv>
   <refname>sqlite_query</refname>
@@ -23,17 +18,11 @@
    <methodparam><type>resource</type><parameter>dbhandle</parameter></methodparam>
   </methodsynopsis>
   <para>
-<<<<<<< sqlite-query.xml
   äôåð÷öéä îáöòú àú ùàéìúú ä  
     SQL 
     ùáôøîèø <parameter>query</parameter>
     îåì áñéñ äðúåðéí against
    ùáôøîèø <parameter>db</parameter>.
-=======
-   Executes an SQL statement given by the <parameter>query</parameter> against
-   a given database handle (specified by the <parameter>dbhandle</parameter> 
-   parameter).
->>>>>>> 1.5
   </para>
   <para>
   òì ùàéìúåú ùîçæéøåú ðúåðéí áöåøåú ùåøåú, äôåð÷öéä úçæéø éãéú ä÷ùø ìðúåðéí
Index: phpdoc-he/reference/sqlite/functions/sqlite-seek.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-seek.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-seek.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-seek.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-seek.xml	Mon Jul 28 07:30:58 2003
@@ -1,11 +1,5 @@
-<<<<<<< sqlite-seek.xml
 <?xml version="1.0" encoding="windos-1255"?>
-=======
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.6
 <refentry id="function.sqlite-seek">
-<<<<<<< sqlite-seek.xml
 	<refnamediv>
 		<refname>sqlite_seek</refname>
 		<refpurpose> äôåð÷öéä îçôùú ùåøú ðúåðéí ñôöéôéú, ááôø äðúåðéí ùäùàéìúä äçæéøä.</refpurpose>
@@ -27,23 +21,6 @@
 		<para>
 			<function>sqlite_seek</function> äôåð÷öéä îçôùú àú äùåøä ùîåòáøú ò"é äôøîèø.
    <parameter>rownum</parameter>îéñôåø äùåøåú îúçéì á-1. äôåð÷öéä îçæéøä .   &false; áî÷øä åäùåøä ìà ðîöàä å  &true; àçøú.
-=======
- <refnamediv>
-  <refname>sqlite_seek</refname>
-  <refpurpose>Seek to a particular row number of a buffered result set.</refpurpose>
- </refnamediv>
- <refsect1>
-  <title>Description</title>
-  <methodsynopsis>
-   <type>bool</type><methodname>sqlite_seek</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rownum</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>sqlite_seek</function> seeks to the row given by the parameter
-   <parameter>rownum</parameter>.  The row number is zero-based (0 is the
-   first row). Returns &false; if the row does not exist, &true; otherwise.
->>>>>>> 1.6
   </para>
 		<note>
 			<para>äôåð÷öéä ôåòìú ø÷ ëùäðúåðéí çåæøéí áòæøú áôø.
Index: phpdoc-he/reference/sqlite/functions/sqlite-unbuffered-query.xml
diff -u phpdoc-he/reference/sqlite/functions/sqlite-unbuffered-query.xml:1.1 phpdoc-he/reference/sqlite/functions/sqlite-unbuffered-query.xml:1.2
--- phpdoc-he/reference/sqlite/functions/sqlite-unbuffered-query.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/functions/sqlite-unbuffered-query.xml	Mon Jul 28 07:30:58 2003
@@ -1,10 +1,5 @@
-<<<<<<< sqlite-unbuffered-query.xml
 <?xml version="1.0" encoding="WINDOWS-1255"?>
-<!-- $Revision: 1.1 $ -->
-=======
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
->>>>>>> 1.5
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.sqlite-unbuffered-query">
  <refnamediv>
   <refname>sqlite_unbuffered_query</refname>
Index: phpdoc-he/reference/sqlite/ini.xml
diff -u phpdoc-he/reference/sqlite/ini.xml:1.1 phpdoc-he/reference/sqlite/ini.xml:1.2
--- phpdoc-he/reference/sqlite/ini.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/ini.xml	Mon Jul 28 07:30:59 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <section id="sqlite.configuration">
  &reftitle.runtime;
  &extension.runtime;
@@ -28,12 +28,8 @@
  </para>
 	&ini.descriptions.title;
  <para>
-<<<<<<< ini.xml
  äñáø ÷öø òì àéúçåì ä÷åðôéâåøöéä
    <variablelist>
-=======
-  <variablelist>
->>>>>>> 1.4
    <varlistentry id="ini.sqlite.assoc-case">
     <term>
      <parameter>sqlite.assoc_case</parameter>
Index: phpdoc-he/reference/sqlite/reference.xml
diff -u phpdoc-he/reference/sqlite/reference.xml:1.1 phpdoc-he/reference/sqlite/reference.xml:1.2
--- phpdoc-he/reference/sqlite/reference.xml:1.1	Mon Jul 28 05:40:20 2003
+++ phpdoc-he/reference/sqlite/reference.xml	Mon Jul 28 07:30:59 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
  <reference id="ref.sqlite">
   <title>SQLite</title>
   <titleabbrev>SQLite</titleabbrev>
@@ -47,14 +47,8 @@
    <section id="sqlite.requirements">
     &reftitle.required;
     <para>
-<<<<<<< reference.xml
 òì îðú ìäùúîù á- SQLite ,àúä öøéê ì÷îôì àú ä-PHP òí úîéëä á- SQLite , àå ìäåøéã
 àú ääøçáä î .php.ini
-=======
-     In order to have these functions available, you must compile PHP with
-     SQLite support, or load the SQLite extension dynamically from your
-     &php.ini;.
->>>>>>> 1.7
     </para>
    </section>