[mapserver-commits] r12578 - branches/branch-6-0/docs/en/cgi trunk/docs/en/cgi

[svn at osgeo.org]

Author: havatv
Date: 2011-09-24 08:52:55 -0700 (Sat, 24 Sep 2011)
New Revision: 12578

Modified:
   branches/branch-6-0/docs/en/cgi/controls.txt
   trunk/docs/en/cgi/controls.txt
Log:
Added the qformat parameter to the cgi controls document (#3712).

Modified: branches/branch-6-0/docs/en/cgi/controls.txt
===================================================================
--- branches/branch-6-0/docs/en/cgi/controls.txt	2011-09-24 15:48:06 UTC (rev 12577)
+++ branches/branch-6-0/docs/en/cgi/controls.txt	2011-09-24 15:52:55 UTC (rev 12578)
@@ -304,7 +304,28 @@
     COORDINATE
         To be clarified. 
 
+    .. note::
+       The previously available map-only query modes, e.g.
+       ITEMQUERYMAP, are no longer supported.  The `QFORMAT` parameter
+       is now used instead.
+
 .. index::
+   pair: CGI; qformat
+
+QFORMAT [outputformat | mime/type] (optional)
+    The `OUTPUTFORMAT` name or mime/type to be used to process a set
+    of query results (corresponds to the :ref:`WEB` object's
+    QUERYFORMAT parameter).
+    The parameter is optional and used in conjunction with query
+    `MODE`\s.  The default is text/html.
+
+    Example (map output):
+
+    ::
+
+       ...&mode=nquery&qformat=png24&...
+
+.. index::
    pair: CGI; qitem
 
 QITEM [name] (optional)

Modified: trunk/docs/en/cgi/controls.txt
===================================================================
--- trunk/docs/en/cgi/controls.txt	2011-09-24 15:48:06 UTC (rev 12577)
+++ trunk/docs/en/cgi/controls.txt	2011-09-24 15:52:55 UTC (rev 12578)
@@ -304,7 +304,28 @@
     COORDINATE
         To be clarified. 
 
+    .. note::
+       The previously available map-only query modes, e.g.
+       ITEMQUERYMAP, are no longer supported.  The `QFORMAT` parameter
+       is now used instead.
+
 .. index::
+   pair: CGI; qformat
+
+QFORMAT [outputformat | mime/type] (optional)
+    The `OUTPUTFORMAT` name or mime/type to be used to process a set
+    of query results (corresponds to the :ref:`WEB` object's
+    QUERYFORMAT parameter).
+    The parameter is optional and used in conjunction with query
+    `MODE`\s.  The default is text/html.
+
+    Example (map output):
+
+    ::
+
+       ...&mode=nquery&qformat=png24&...
+
+.. index::
    pair: CGI; qitem
 
 QITEM [name] (optional)