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

[svn at osgeo.org]

Author: havatv
Date: 2011-11-03 02:49:27 -0700 (Thu, 03 Nov 2011)
New Revision: 12742

Modified:
   branches/branch-6-0/docs/en/mapfile/class.txt
   trunk/docs/en/mapfile/class.txt
Log:
Added expression example to TEXT in the class document.

Modified: branches/branch-6-0/docs/en/mapfile/class.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/class.txt	2011-11-02 17:58:12 UTC (rev 12741)
+++ branches/branch-6-0/docs/en/mapfile/class.txt	2011-11-03 09:49:27 UTC (rev 12742)
@@ -260,18 +260,22 @@
 .. index::
    pair: CLASS; TEXT
     
-TEXT [string]
-    Static text to label features in this class with. This overrides
-    values obtained from the `LABELITEM`.  The string may be given as
-    an expression (see :ref:`EXPRESSIONS`).  This allows you to
+TEXT [string|expression]
+    Text to label features in this class with. This overrides values
+    obtained from the :ref:`layer` `LABELITEM`.  The string can
+    contain references to feature attributes.  This allows you to
     concatenate multiple attributes into a single label.  You can for
     example concatenate the attributes FIRSTNAME and LASTNAME like
-    this:
+    this::
 
-    ::
-
        TEXT '[FIRSTNAME] [LASTNAME]'
 
+    More advanced :ref:`EXPRESSIONS` can be used to specify the
+    labels.  Since version 6.0, there are functions available for
+    formatting numbers::
+
+      TEXT ("Area is: " + tostring([area],"%.2f"))
+
 .. index::
    pair: CLASS; VALIDATION
 

Modified: trunk/docs/en/mapfile/class.txt
===================================================================
--- trunk/docs/en/mapfile/class.txt	2011-11-02 17:58:12 UTC (rev 12741)
+++ trunk/docs/en/mapfile/class.txt	2011-11-03 09:49:27 UTC (rev 12742)
@@ -260,18 +260,22 @@
 .. index::
    pair: CLASS; TEXT
     
-TEXT [string]
-    Static text to label features in this class with. This overrides
-    values obtained from the `LABELITEM`.  The string may be given as
-    an expression (see :ref:`EXPRESSIONS`).  This allows you to
+TEXT [string|expression]
+    Text to label features in this class with. This overrides values
+    obtained from the :ref:`layer` `LABELITEM`.  The string can
+    contain references to feature attributes.  This allows you to
     concatenate multiple attributes into a single label.  You can for
     example concatenate the attributes FIRSTNAME and LASTNAME like
-    this:
+    this::
 
-    ::
-
        TEXT '[FIRSTNAME] [LASTNAME]'
 
+    More advanced :ref:`EXPRESSIONS` can be used to specify the
+    labels.  Since version 6.0, there are functions available for
+    formatting numbers::
+
+      TEXT ("Area is: " + tostring([area],"%.2f"))
+
 .. index::
    pair: CLASS; VALIDATION