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

[svn at osgeo.org]

Author: havatv
Date: 2011-08-05 01:12:14 -0700 (Fri, 05 Aug 2011)
New Revision: 11997

Modified:
   branches/branch-6-0/docs/en/introduction.txt
   trunk/docs/en/introduction.txt
Log:
Modified the description of class expressions in introduction (#3089)

Modified: branches/branch-6-0/docs/en/introduction.txt
===================================================================
--- branches/branch-6-0/docs/en/introduction.txt	2011-08-05 07:50:37 UTC (rev 11996)
+++ branches/branch-6-0/docs/en/introduction.txt	2011-08-05 08:12:14 UTC (rev 11997)
@@ -518,25 +518,27 @@
 :ref:`CLASS` :ref:`Expressions <expressions>`
 ...............................................................................
 
-MapServer supports three types of :ref:`CLASS` expressions in a :ref:`LAYER`:
+MapServer supports three types of :ref:`CLASS` :ref:`expressions` in a
+:ref:`LAYER` (`CLASSITEM` in `LAYER` determines the attribute to be
+used):
 
 1) String comparisons
 
     ::
     
-        (EXPRESSION "africa")
+        EXPRESSION "africa"
 
 2) Regular expressions 
 
     ::
     
-        (EXPRESSION /^9|^10/)
+        EXPRESSION /^9|^10/
 
 3) Logical expressions 
 
     ::
     
-        ([POPULATION] > 50000 AND '[LANGUAGE]' eq 'FRENCH')
+        EXPRESSION ([POPULATION] > 50000 AND '[LANGUAGE]' eq 'FRENCH')
 
 .. note::
     Logical expressions should be avoided wherever possible as they are very

Modified: trunk/docs/en/introduction.txt
===================================================================
--- trunk/docs/en/introduction.txt	2011-08-05 07:50:37 UTC (rev 11996)
+++ trunk/docs/en/introduction.txt	2011-08-05 08:12:14 UTC (rev 11997)
@@ -518,25 +518,27 @@
 :ref:`CLASS` :ref:`Expressions <expressions>`
 ...............................................................................
 
-MapServer supports three types of :ref:`CLASS` expressions in a :ref:`LAYER`:
+MapServer supports three types of :ref:`CLASS` :ref:`expressions` in a
+:ref:`LAYER` (`CLASSITEM` in `LAYER` determines the attribute to be
+used):
 
 1) String comparisons
 
     ::
     
-        (EXPRESSION "africa")
+        EXPRESSION "africa"
 
 2) Regular expressions 
 
     ::
     
-        (EXPRESSION /^9|^10/)
+        EXPRESSION /^9|^10/
 
 3) Logical expressions 
 
     ::
     
-        ([POPULATION] > 50000 AND '[LANGUAGE]' eq 'FRENCH')
+        EXPRESSION ([POPULATION] > 50000 AND '[LANGUAGE]' eq 'FRENCH')
 
 .. note::
     Logical expressions should be avoided wherever possible as they are very