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

[svn at osgeo.org]

Author: havatv
Date: 2011-08-05 01:43:55 -0700 (Fri, 05 Aug 2011)
New Revision: 11999

Modified:
   branches/branch-6-0/docs/en/mapfile/class.txt
   trunk/docs/en/mapfile/class.txt
Log:
Better explanation of expression in class (#3090)

Modified: branches/branch-6-0/docs/en/mapfile/class.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/class.txt	2011-08-05 08:26:25 UTC (rev 11998)
+++ branches/branch-6-0/docs/en/mapfile/class.txt	2011-08-05 08:43:55 UTC (rev 11999)
@@ -27,26 +27,31 @@
     pair: EXPRESSION; CLASS
     
 EXPRESSION [string]
-    Four types of expressions are now supported to define class
-    membership.  String comparisons, regular expressions, logical
-    expressions, and string functions (see :ref:`EXPRESSIONS`).  If no
-    expression is given, then all features are said to belong to this
-    class.
 
+    Four types of expressions are now supported to define which class
+    a feature belongs to: String comparisons, regular expressions,
+    logical expressions, and string functions (see
+    :ref:`EXPRESSIONS`).  If no expression is given, then all features
+    are said to belong to this class.
+
     - String comparisons are case sensitive and are the fastest to
       evaluate.  No special delimiters are necessary although strings
       must be quoted if they contain special characters. (As a matter
       of good habit, it is recommended that you quote all strings).
+      The attribute to use for comparison is defined in the
+      :ref:`LAYER` `CLASSITEM` parameter.
       
-    - Regular expression are limited using slashes (/regex/).
+    - Regular expression are limited using slashes (/regex/). The
+      attribute to use for comparison is defined in the :ref:`LAYER`
+      `CLASSITEM` parameter.
 
     - Logical expressions allow the building of fairly complex tests
       based on one or more attributes and therefore are only available
       with shapefiles.  Logical expressions are delimited by
       parentheses "(expression)".  Attribute names are delimited by
-      square brackets "[ATTRIBUTE]", and are case sensitive.  These
-      names are case sensitive and must match the items in the
-      shapefile.  For example:
+      square brackets "[ATTRIBUTE]".  Attribute names are case
+      sensitive and must match the items in the shapefile.  For
+      example:
 
       ::
 

Modified: trunk/docs/en/mapfile/class.txt
===================================================================
--- trunk/docs/en/mapfile/class.txt	2011-08-05 08:26:25 UTC (rev 11998)
+++ trunk/docs/en/mapfile/class.txt	2011-08-05 08:43:55 UTC (rev 11999)
@@ -27,26 +27,31 @@
     pair: EXPRESSION; CLASS
     
 EXPRESSION [string]
-    Four types of expressions are now supported to define class
-    membership.  String comparisons, regular expressions, logical
-    expressions, and string functions (see :ref:`EXPRESSIONS`).  If no
-    expression is given, then all features are said to belong to this
-    class.
 
+    Four types of expressions are now supported to define which class
+    a feature belongs to: String comparisons, regular expressions,
+    logical expressions, and string functions (see
+    :ref:`EXPRESSIONS`).  If no expression is given, then all features
+    are said to belong to this class.
+
     - String comparisons are case sensitive and are the fastest to
       evaluate.  No special delimiters are necessary although strings
       must be quoted if they contain special characters. (As a matter
       of good habit, it is recommended that you quote all strings).
+      The attribute to use for comparison is defined in the
+      :ref:`LAYER` `CLASSITEM` parameter.
       
-    - Regular expression are limited using slashes (/regex/).
+    - Regular expression are limited using slashes (/regex/). The
+      attribute to use for comparison is defined in the :ref:`LAYER`
+      `CLASSITEM` parameter.
 
     - Logical expressions allow the building of fairly complex tests
       based on one or more attributes and therefore are only available
       with shapefiles.  Logical expressions are delimited by
       parentheses "(expression)".  Attribute names are delimited by
-      square brackets "[ATTRIBUTE]", and are case sensitive.  These
-      names are case sensitive and must match the items in the
-      shapefile.  For example:
+      square brackets "[ATTRIBUTE]".  Attribute names are case
+      sensitive and must match the items in the shapefile.  For
+      example:
 
       ::