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

[svn at osgeo.org]

Author: havatv
Date: 2011-09-12 00:35:57 -0700 (Mon, 12 Sep 2011)
New Revision: 12538

Modified:
   branches/branch-6-0/docs/en/mapfile/layer.txt
   trunk/docs/en/mapfile/layer.txt
Log:
Fixed description of LABEL_NO_CLIP (#2909), also added some index entries for the processing directives.

Modified: branches/branch-6-0/docs/en/mapfile/layer.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/layer.txt	2011-09-11 09:24:10 UTC (rev 12537)
+++ branches/branch-6-0/docs/en/mapfile/layer.txt	2011-09-12 07:35:57 UTC (rev 12538)
@@ -507,6 +507,9 @@
     processing directives vary by layer type, and the underlying driver that 
     processes them. 
      
+    .. index::
+       triple: LAYER; PROCESSING; ITEMS
+
     - **Attributes Directive** - The ITEMS processing option allows to 
       specify the name of attributes for inline layers or specify the subset 
       of the attributes to be used by the layer, such as:
@@ -515,6 +518,9 @@
 
           PROCESSING "ITEMS=itemname1,itemname2,itemname3"
 
+    .. index::
+       triple: LAYER; PROCESSING; CLOSE_CONNECTION
+
     - **Connection Pooling Directive** - This is where you can enable 
       connection pooling for certain layer layer types. Connection pooling 
       will allow MapServer to share the handle to an open database or layer 
@@ -528,13 +534,23 @@
 
           PROCESSING "CLOSE_CONNECTION=DEFER"
           
-    - **Label Directive** - The LABEL_NO_CLIP processing option can be used
-      to turn off label clipping.
-    
+    .. index::
+       triple: LAYER; PROCESSING; LABEL_NO_CLIP
+
+    - **Label Directive** - The LABEL_NO_CLIP processing option can be
+      used to skip clipping of shapes when determining associated
+      label anchor points. This avoids changes in label position as
+      extents change between map draws. It also avoids duplicate
+      labels where features appear in multiple adjacent tiles when
+      creating tiled maps.
+
       .. code-block:: mapfile
 
           PROCESSING "LABEL_NO_CLIP=True"
 
+    .. index::
+       triple: LAYER; PROCESSING; GETSHAPE_STYLE_ITEMS
+
     - **OGR Styles Directive** - This directive can be used for obtaining
       label styles through MapScript.  For more information see the 
       :ref:`MapServer's OGR document <styleitemauto-label-styles>`.
@@ -543,6 +559,9 @@
 
           PROCESSING "GETSHAPE_STYLE_ITEMS=all"
           
+    .. index::
+       triple: LAYER; PROCESSING; raster options
+
     - **Raster Directives** - All raster processing options are described 
       in :ref:`raster`.  Here we see the SCALE and BANDs directives used to
       autoscale raster data and alter the band mapping.  

Modified: trunk/docs/en/mapfile/layer.txt
===================================================================
--- trunk/docs/en/mapfile/layer.txt	2011-09-11 09:24:10 UTC (rev 12537)
+++ trunk/docs/en/mapfile/layer.txt	2011-09-12 07:35:57 UTC (rev 12538)
@@ -507,6 +507,9 @@
     processing directives vary by layer type, and the underlying driver that 
     processes them. 
      
+    .. index::
+       triple: LAYER; PROCESSING; ITEMS
+
     - **Attributes Directive** - The ITEMS processing option allows to 
       specify the name of attributes for inline layers or specify the subset 
       of the attributes to be used by the layer, such as:
@@ -515,6 +518,9 @@
 
           PROCESSING "ITEMS=itemname1,itemname2,itemname3"
 
+    .. index::
+       triple: LAYER; PROCESSING; CLOSE_CONNECTION
+
     - **Connection Pooling Directive** - This is where you can enable 
       connection pooling for certain layer layer types. Connection pooling 
       will allow MapServer to share the handle to an open database or layer 
@@ -528,13 +534,23 @@
 
           PROCESSING "CLOSE_CONNECTION=DEFER"
           
-    - **Label Directive** - The LABEL_NO_CLIP processing option can be used
-      to turn off label clipping.
-    
+    .. index::
+       triple: LAYER; PROCESSING; LABEL_NO_CLIP
+
+    - **Label Directive** - The LABEL_NO_CLIP processing option can be
+      used to skip clipping of shapes when determining associated
+      label anchor points. This avoids changes in label position as
+      extents change between map draws. It also avoids duplicate
+      labels where features appear in multiple adjacent tiles when
+      creating tiled maps.
+
       .. code-block:: mapfile
 
           PROCESSING "LABEL_NO_CLIP=True"
 
+    .. index::
+       triple: LAYER; PROCESSING; GETSHAPE_STYLE_ITEMS
+
     - **OGR Styles Directive** - This directive can be used for obtaining
       label styles through MapScript.  For more information see the 
       :ref:`MapServer's OGR document <styleitemauto-label-styles>`.
@@ -543,6 +559,9 @@
 
           PROCESSING "GETSHAPE_STYLE_ITEMS=all"
           
+    .. index::
+       triple: LAYER; PROCESSING; raster options
+
     - **Raster Directives** - All raster processing options are described 
       in :ref:`raster`.  Here we see the SCALE and BANDs directives used to
       autoscale raster data and alter the band mapping.