manual/chapters/fr api-reference.xml,1.21,1.22 installation.xml,1.13,1.14

Update of /cvsroot/phpopencounter/manual/chapters/fr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19869/chapters/fr

Modified Files:
	api-reference.xml installation.xml 
Log Message:
Fix #990593.


Index: installation.xml
===================================================================
RCS file: /cvsroot/phpopencounter/manual/chapters/fr/installation.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- installation.xml	8 May 2004 13:58:20 -0000	1.13
+++ installation.xml	14 Jul 2004 06:38:45 -0000	1.14
@@ -63,8 +63,8 @@
                 <para>
                   Set <varname>db_type</varname> to match your RDBMS.
                   Possible values are <varname>mssql</varname>,
-                  <varname>mysql</varname>, <varname>oci8</varname> and
-                  <varname>pgsql</varname>.
+                  <varname>mysql</varname>, <varname>mysql_merge</varname>,
+                  <varname>oci8</varname> and <varname>pgsql</varname>.
                 </para>
               </listitem>
 



-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com