[mapserver-commits] r12860 - branches/branch-6-0/docs/en/mapfile trunk/docs/en/mapfile

[svn at osgeo.org]

Author: havatv
Date: 2011-12-07 02:28:57 -0800 (Wed, 07 Dec 2011)
New Revision: 12860

Modified:
   branches/branch-6-0/docs/en/mapfile/join.txt
   trunk/docs/en/mapfile/join.txt
Log:
Updated the join document - mysql (#4077)

Modified: branches/branch-6-0/docs/en/mapfile/join.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/join.txt	2011-12-06 20:29:17 UTC (rev 12859)
+++ branches/branch-6-0/docs/en/mapfile/join.txt	2011-12-07 10:28:57 UTC (rev 12860)
@@ -26,6 +26,7 @@
 - DBF/XBase files
 - CSV (comma delimited text file)
 - PostgreSQL tables
+- MySQL tables
 
 Mapfile Parameters:
 ===================
@@ -46,9 +47,9 @@
 .. index::
    pair: JOIN; CONNECTIONTYPE
     
-CONNECTIONTYPE [csv|postgresql]
+CONNECTIONTYPE [csv|mysql|postgresql]
     Type of connection (not required for DBF joins). For PostgreSQL
-    use `postgresql`, for CSV use `csv`.
+    use `postgresql`, for CSV use `csv`, for MySQL use `mysql`.
     
 .. index::
    pair: JOIN; FOOTER
@@ -210,7 +211,7 @@
         JOIN
           NAME "test"
           CONNECTION "host=127.0.0.1 port=5432 user=postgres password=postgres dbname=join"
-          CONNECTIONTYPE ogr
+          CONNECTIONTYPE postgresql
           TABLE "lookup"
           FROM "ID"
           TO "ident"

Modified: trunk/docs/en/mapfile/join.txt
===================================================================
--- trunk/docs/en/mapfile/join.txt	2011-12-06 20:29:17 UTC (rev 12859)
+++ trunk/docs/en/mapfile/join.txt	2011-12-07 10:28:57 UTC (rev 12860)
@@ -26,6 +26,7 @@
 - DBF/XBase files
 - CSV (comma delimited text file)
 - PostgreSQL tables
+- MySQL tables
 
 Mapfile Parameters:
 ===================
@@ -46,9 +47,9 @@
 .. index::
    pair: JOIN; CONNECTIONTYPE
     
-CONNECTIONTYPE [csv|postgresql]
+CONNECTIONTYPE [csv|mysql|postgresql]
     Type of connection (not required for DBF joins). For PostgreSQL
-    use `postgresql`, for CSV use `csv`.
+    use `postgresql`, for CSV use `csv`, for MySQL use `mysql`.
     
 .. index::
    pair: JOIN; FOOTER
@@ -210,7 +211,7 @@
         JOIN
           NAME "test"
           CONNECTION "host=127.0.0.1 port=5432 user=postgres password=postgres dbname=join"
-          CONNECTIONTYPE ogr
+          CONNECTIONTYPE postgresql
           TABLE "lookup"
           FROM "ID"
           TO "ident"