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

[svn at osgeo.org]

Author: havatv
Date: 2011-08-05 00:50:37 -0700 (Fri, 05 Aug 2011)
New Revision: 11996

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

Modified: branches/branch-6-0/docs/en/introduction.txt
===================================================================
--- branches/branch-6-0/docs/en/introduction.txt	2011-08-05 07:26:53 UTC (rev 11995)
+++ branches/branch-6-0/docs/en/introduction.txt	2011-08-05 07:50:37 UTC (rev 11996)
@@ -485,11 +485,12 @@
 :ref:`LABEL`
 ...............................................................................
 
-* defined within a :ref:`LAYER` object
-* the LABELITEM parameters in the :ref:`LAYER` object can be used to label by
-  a specific column in the data refer to a :ref:`FONTSET` file, that is set in
-  the :ref:`MAP` object, that contains a reference to the available font names
+* defined within a :ref:`CLASS` object
 
+* the `LABELITEM` parameters in the :ref:`LAYER` object can be used to specify an attribute in the data to be used for labeling.  The label is displayed by the `FONT`, declared in the :ref:`FONTSET` file (set in the :ref:`MAP` object).  The :ref:`FONTSET` file contains references to the available font names.
+`ENCODING` describes which encoding is used in the file (see
+:ref:`LABELENCODING`).
+
 An example :ref:`LABEL` object that references one of the above fonts might
 look like:
 
@@ -498,6 +499,7 @@
     LABEL
         FONT "sans-bold"
         TYPE truetype
+        ENCODING "UTF-8"
         SIZE 10
         POSITION LC
         PARTIALS FALSE

Modified: trunk/docs/en/introduction.txt
===================================================================
--- trunk/docs/en/introduction.txt	2011-08-05 07:26:53 UTC (rev 11995)
+++ trunk/docs/en/introduction.txt	2011-08-05 07:50:37 UTC (rev 11996)
@@ -485,11 +485,12 @@
 :ref:`LABEL`
 ...............................................................................
 
-* defined within a :ref:`LAYER` object
-* the LABELITEM parameters in the :ref:`LAYER` object can be used to label by
-  a specific column in the data refer to a :ref:`FONTSET` file, that is set in
-  the :ref:`MAP` object, that contains a reference to the available font names
+* defined within a :ref:`CLASS` object
 
+* the `LABELITEM` parameters in the :ref:`LAYER` object can be used to specify an attribute in the data to be used for labeling.  The label is displayed by the `FONT`, declared in the :ref:`FONTSET` file (set in the :ref:`MAP` object).  The :ref:`FONTSET` file contains references to the available font names.
+`ENCODING` describes which encoding is used in the file (see
+:ref:`LABELENCODING`).
+
 An example :ref:`LABEL` object that references one of the above fonts might
 look like:
 
@@ -498,6 +499,7 @@
     LABEL
         FONT "sans-bold"
         TYPE truetype
+        ENCODING "UTF-8"
         SIZE 10
         POSITION LC
         PARTIALS FALSE