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

[svn at osgeo.org]

Author: havatv
Date: 2011-09-24 09:30:23 -0700 (Sat, 24 Sep 2011)
New Revision: 12579

Modified:
   branches/branch-6-0/docs/en/cgi/runsub.txt
   branches/branch-6-0/docs/en/mapfile/variable_sub.txt
   trunk/docs/en/cgi/runsub.txt
   trunk/docs/en/mapfile/variable_sub.txt
Log:
Added links between the variable substitution document under mapfile and the cgi runsub document (#3996).

Modified: branches/branch-6-0/docs/en/cgi/runsub.txt
===================================================================
--- branches/branch-6-0/docs/en/cgi/runsub.txt	2011-09-24 15:52:55 UTC (rev 12578)
+++ branches/branch-6-0/docs/en/cgi/runsub.txt	2011-09-24 16:30:23 UTC (rev 12579)
@@ -19,21 +19,25 @@
 -----------------------------------------------------------------------------
 
 Run-time substitution for the MapServer CGI has been around since version 4.0
-and it's use has continued to expand. In short, it allows you to alter
-portions of a mapfile based on data passed via a CGI request. This
-functionality is only available via the standard CGI application. Within
-MapScript this is easy to do since the developer has complete control over how
-input is handled.
+and it's use has continued to expand. In short, it allows you to alter portions
+of a mapfile based on data passed via a CGI request. This functionality is only
+available via the standard CGI application. Within MapScript this is easy to do
+since the developer has complete control over how input is handled.
 
+.. seealso::
+
+  :ref:`variable_sub`.
+
+
 Basic Example
 -----------------------------------------------------------------------------
 
-Let's say you'd like the user to dynamically set a
-portion of an expression so they could highlight a certain land cover class,
-and you have a form element (called ctype) that allows them to choose between:
-forest, water, wetland and developed. You could then set up a layer like so:
+Let's say you'd like the user to dynamically set a portion of an expression so
+they could highlight a certain land cover class, and you have a form element
+(called ctype) that allows them to choose between: forest, water, wetland and
+developed. You could then set up a layer like so:
 
-::
+.. code-block:: mapfile
 
     LAYER 
         NAME 'covertypes' 
@@ -48,20 +52,20 @@
         END
     END
 
-When a request is processed the value for ctype is substituted for the
-string %ctype% and the mapfile is processed as normal. If no ctype is passed
-in the EXPRESSION will never be true so it doesn't really hurt anything except
-for a slight performance hit. Often you would set a default class to draw
-features that don't match, but that is not required. 
+When a request is processed the value for ctype is substituted for the string
+%ctype% and the mapfile is processed as normal. If no ctype is passed in the
+EXPRESSION will never be true so it doesn't really hurt anything except for a
+slight performance hit. Often you would set a default class to draw features
+that don't match, but that is not required. 
 
 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 run-time substitution (todo- add MapServer version): 
+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
+run-time substitution (todo- add MapServer version): 
 
 * LAYER: DATA (must validate against DATAPATTERN)
 * LAYER: TILEINDEX 
@@ -149,10 +153,10 @@
 
     VALIDATION
       # %firstname% substitutions can only have letters and hyphens
-      firstname     '^[a-zA-Z\-]+$'
+      'firstname'     '^[a-zA-Z\-]+$'
 
       # %parcelid% must be numeric and between 5 and 8 characters
-      parcelid      '^[0-9]{5,8)$'
+      'parcelid'      '^[0-9]{5,8)$'
 
       # %taxid% must be two capital letters and six digits
       taxid         '^[A-Z]{2}[0-9]{6}$'

Modified: branches/branch-6-0/docs/en/mapfile/variable_sub.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/variable_sub.txt	2011-09-24 15:52:55 UTC (rev 12578)
+++ branches/branch-6-0/docs/en/mapfile/variable_sub.txt	2011-09-24 16:30:23 UTC (rev 12579)
@@ -9,6 +9,10 @@
 
 Syntax: '%' + variable name + '%'
 
+.. seealso::
+
+  :ref:`runsub`.
+
 **Example 1**. Connecting securely to a Spatial Database
 
 You want to map some senstitive data held in a PostGIS database. The username 

Modified: trunk/docs/en/cgi/runsub.txt
===================================================================
--- trunk/docs/en/cgi/runsub.txt	2011-09-24 15:52:55 UTC (rev 12578)
+++ trunk/docs/en/cgi/runsub.txt	2011-09-24 16:30:23 UTC (rev 12579)
@@ -24,6 +24,11 @@
 available via the standard CGI application. Within MapScript this is easy to do
 since the developer has complete control over how input is handled.
 
+.. seealso::
+
+  :ref:`variable_sub`.
+
+
 Basic Example
 -----------------------------------------------------------------------------
 

Modified: trunk/docs/en/mapfile/variable_sub.txt
===================================================================
--- trunk/docs/en/mapfile/variable_sub.txt	2011-09-24 15:52:55 UTC (rev 12578)
+++ trunk/docs/en/mapfile/variable_sub.txt	2011-09-24 16:30:23 UTC (rev 12579)
@@ -9,6 +9,10 @@
 
 Syntax: '%' + variable name + '%'
 
+.. seealso::
+
+  :ref:`runsub`.
+
 **Example 1**. Connecting securely to a Spatial Database
 
 You want to map some senstitive data held in a PostGIS database. The username