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

[svn at osgeo.org]

Author: havatv
Date: 2011-10-08 03:18:53 -0700 (Sat, 08 Oct 2011)
New Revision: 12646

Modified:
   branches/branch-6-0/docs/en/cgi/controls.txt
   branches/branch-6-0/docs/en/cgi/runsub.txt
   trunk/docs/en/cgi/controls.txt
   trunk/docs/en/cgi/runsub.txt
Log:
Added documentation of the runtime substitution parameters FORMATOPTION FILENAME and CLASS TEXT to runsub, and fixed the link to controls (#3751).

Modified: branches/branch-6-0/docs/en/cgi/controls.txt
===================================================================
--- branches/branch-6-0/docs/en/cgi/controls.txt	2011-10-08 09:08:07 UTC (rev 12645)
+++ branches/branch-6-0/docs/en/cgi/controls.txt	2011-10-08 10:18:53 UTC (rev 12646)
@@ -463,6 +463,8 @@
 .. index::
    single: Change map file parameters  
 
+.. _cgi_mapfile_change_parameters:
+
 Changing map file parameters via a form or a URL
 ================================================
 

Modified: branches/branch-6-0/docs/en/cgi/runsub.txt
===================================================================
--- branches/branch-6-0/docs/en/cgi/runsub.txt	2011-10-08 09:08:07 UTC (rev 12645)
+++ branches/branch-6-0/docs/en/cgi/runsub.txt	2011-10-08 10:18:53 UTC (rev 12646)
@@ -1,3 +1,6 @@
+.. index::
+   single: Run-time substitution
+
 .. _runsub:
 
 *****************************************************************************
@@ -7,8 +10,7 @@
 :Author:        Steve Lime
 :Contact:       steve.lime at DNR.STATE.MN.US
 :Revision: $Revision$
-:Date: $Date$
-:Last Updated: 2005/12/12
+:Last Updated: $Date$
 
 .. contents:: Table of Contents
     :depth: 2
@@ -58,21 +60,42 @@
 slight performance hit. Often you would set a default class to draw features
 that don't match, but that is not required. 
 
+.. index::
+   pair: Run-time substitution; Supported parameters
+
+
 Parameters Supported
 -----------------------------------------------------------------------------
 
 Not every mapfile parameter supports run-time substitution and care has been
 taken to try and support those that make the most sense. Remember, you also can
 do run-time configuration using the map_object_property type syntax detailed
-elsewhere (todo- add link). Below is a list of properties that do allow
+in :ref:`cgi_mapfile_change_parameters`.
+Below is a list of properties that do allow
 run-time substitution (todo- add MapServer version): 
 
+* CLASS: EXPRESSION
+
+* CLASS: TEXT
+
+  .. versionadded:: 6.0
+
+* LAYER: CONNECTION
+
 * LAYER: DATA (must validate against DATAPATTERN)
-* LAYER: TILEINDEX 
-* LAYER: CONNECTION
+
 * LAYER: FILTER
-* CLASS: EXPRESSION
 
+* LAYER: TILEINDEX 
+
+* OUTPUTFORMAT: FORMATOPTION: FILENAME (must have a `MAP` `VALIDATION`
+  pattern)
+
+  .. versionadded:: 6.2
+
+.. index::
+   pair: Run-time substitution; FILTER
+
 FILTERs
 ..............................................................................
 

Modified: trunk/docs/en/cgi/controls.txt
===================================================================
--- trunk/docs/en/cgi/controls.txt	2011-10-08 09:08:07 UTC (rev 12645)
+++ trunk/docs/en/cgi/controls.txt	2011-10-08 10:18:53 UTC (rev 12646)
@@ -463,6 +463,8 @@
 .. index::
    single: Change map file parameters  
 
+.. _cgi_mapfile_change_parameters:
+
 Changing map file parameters via a form or a URL
 ================================================
 

Modified: trunk/docs/en/cgi/runsub.txt
===================================================================
--- trunk/docs/en/cgi/runsub.txt	2011-10-08 09:08:07 UTC (rev 12645)
+++ trunk/docs/en/cgi/runsub.txt	2011-10-08 10:18:53 UTC (rev 12646)
@@ -1,3 +1,6 @@
+.. index::
+   single: Run-time substitution
+
 .. _runsub:
 
 *****************************************************************************
@@ -7,8 +10,7 @@
 :Author:        Steve Lime
 :Contact:       steve.lime at DNR.STATE.MN.US
 :Revision: $Revision$
-:Date: $Date$
-:Last Updated: 2005/12/12
+:Last Updated: $Date$
 
 .. contents:: Table of Contents
     :depth: 2
@@ -58,21 +60,42 @@
 slight performance hit. Often you would set a default class to draw features
 that don't match, but that is not required. 
 
+.. index::
+   pair: Run-time substitution; Supported parameters
+
+
 Parameters Supported
 -----------------------------------------------------------------------------
 
 Not every mapfile parameter supports run-time substitution and care has been
 taken to try and support those that make the most sense. Remember, you also can
 do run-time configuration using the map_object_property type syntax detailed
-elsewhere (todo- add link). Below is a list of properties that do allow
+in :ref:`cgi_mapfile_change_parameters`.
+Below is a list of properties that do allow
 run-time substitution (todo- add MapServer version): 
 
+* CLASS: EXPRESSION
+
+* CLASS: TEXT
+
+  .. versionadded:: 6.0
+
+* LAYER: CONNECTION
+
 * LAYER: DATA (must validate against DATAPATTERN)
-* LAYER: TILEINDEX 
-* LAYER: CONNECTION
+
 * LAYER: FILTER
-* CLASS: EXPRESSION
 
+* LAYER: TILEINDEX 
+
+* OUTPUTFORMAT: FORMATOPTION: FILENAME (must have a `MAP` `VALIDATION`
+  pattern)
+
+  .. versionadded:: 6.2
+
+.. index::
+   pair: Run-time substitution; FILTER
+
 FILTERs
 ..............................................................................