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

[svn at osgeo.org]

Author: havatv
Date: 2011-09-06 13:21:29 -0700 (Tue, 06 Sep 2011)
New Revision: 12525

Modified:
   branches/branch-6-0/docs/en/mapfile/label.txt
   trunk/docs/en/mapfile/label.txt
Log:
Added comment on precedence of partials and force in the label document (#3348).

Modified: branches/branch-6-0/docs/en/mapfile/label.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/label.txt	2011-09-06 20:09:55 UTC (rev 12524)
+++ branches/branch-6-0/docs/en/mapfile/label.txt	2011-09-06 20:21:29 UTC (rev 12525)
@@ -133,8 +133,10 @@
 .. _FORCE:
 
 FORCE [true|false]
-    Forces labels for a particular class on, regardless of collisions. 
-    Available only for cached labels. Default is false.
+    Forces labels for a particular class on, regardless of collisions.
+    Available only for cached labels.  Default is false.  If `FORCE`
+    is true and `PARTIALS` is false, `FORCE` takes precedence, and
+    partial labels are drawn.
 
 .. index::
    pair: LABEL; MAXLENGTH
@@ -255,7 +257,9 @@
    pair: LABEL; PARTIALS
 
 PARTIALS [true|false]
-    Can text run off the edge of the map? Default is true.
+    Can text run off the edge of the map? Default is true.  If `FORCE`
+    is true and `PARTIALS` is false, `FORCE` takes precedence, and
+    partial labels are drawn.
 
 .. index::
    pair: LABEL; POSITION

Modified: trunk/docs/en/mapfile/label.txt
===================================================================
--- trunk/docs/en/mapfile/label.txt	2011-09-06 20:09:55 UTC (rev 12524)
+++ trunk/docs/en/mapfile/label.txt	2011-09-06 20:21:29 UTC (rev 12525)
@@ -133,8 +133,10 @@
 .. _FORCE:
 
 FORCE [true|false]
-    Forces labels for a particular class on, regardless of collisions. 
-    Available only for cached labels. Default is false.
+    Forces labels for a particular class on, regardless of collisions.
+    Available only for cached labels.  Default is false.  If `FORCE`
+    is true and `PARTIALS` is false, `FORCE` takes precedence, and
+    partial labels are drawn.
 
 .. index::
    pair: LABEL; MAXLENGTH
@@ -255,7 +257,9 @@
    pair: LABEL; PARTIALS
 
 PARTIALS [true|false]
-    Can text run off the edge of the map? Default is true.
+    Can text run off the edge of the map? Default is true.  If `FORCE`
+    is true and `PARTIALS` is false, `FORCE` takes precedence, and
+    partial labels are drawn.
 
 .. index::
    pair: LABEL; POSITION