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

[svn at osgeo.org]

Author: havatv
Date: 2012-01-03 02:18:57 -0800 (Tue, 03 Jan 2012)
New Revision: 12945

Modified:
   branches/branch-6-0/docs/en/mapfile/layer.txt
   trunk/docs/en/mapfile/layer.txt
Log:
Clarified explanation of percentages in the layer document (#4136), also added some indexes (4001) and did some formatting changes.

Modified: branches/branch-6-0/docs/en/mapfile/layer.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/layer.txt	2012-01-03 10:18:44 UTC (rev 12944)
+++ branches/branch-6-0/docs/en/mapfile/layer.txt	2012-01-03 10:18:57 UTC (rev 12945)
@@ -70,7 +70,34 @@
 .. index::
    pair: LAYER; CONNECTIONTYPE
     
-CONNECTIONTYPE [local|sde|ogr|postgis|oraclespatial|wms|wfs|plugin|union]
+.. index::
+   triple: LAYER; CONNECTIONTYPE; local
+    
+.. index::
+   triple: LAYER; CONNECTIONTYPE; ogr
+    
+.. index::
+   triple: LAYER; CONNECTIONTYPE; oraclespatial
+    
+.. index::
+   triple: LAYER; CONNECTIONTYPE; plugin
+    
+.. index::
+   triple: LAYER; CONNECTIONTYPE; postgis
+    
+.. index::
+   triple: LAYER; CONNECTIONTYPE; sde
+    
+.. index::
+   triple: LAYER; CONNECTIONTYPE; union
+    
+.. index::
+   triple: LAYER; CONNECTIONTYPE; wfs
+    
+.. index::
+   triple: LAYER; CONNECTIONTYPE; wms
+    
+CONNECTIONTYPE [local|ogr|oraclespatial|plugin|postgis|sde|union|wfs|wms]
     Type of connection. Default is local. See additional documentation for 
     any other type.
 
@@ -595,7 +622,28 @@
 .. index::
    pair: LAYER; SIZEUNITS
     
-SIZEUNITS [pixels|feet|inches|kilometers|meters|miles|nauticalmiles]
+.. index::
+   triple: LAYER; SIZEUNITS; feet
+    
+.. index::
+   triple: LAYER; SIZEUNITS; inches
+    
+.. index::
+   triple: LAYER; SIZEUNITS; kilometers
+    
+.. index::
+   triple: LAYER; SIZEUNITS; meters
+    
+.. index::
+   triple: LAYER; SIZEUNITS; miles
+    
+.. index::
+   triple: LAYER; SIZEUNITS; nauticalmiles
+    
+.. index::
+   triple: LAYER; SIZEUNITS; pixels
+    
+SIZEUNITS [feet|inches|kilometers|meters|miles|nauticalmiles|pixels]
     Sets the unit of :ref:`CLASS` object SIZE values (default is pixels). 
     Useful for simulating buffering. `Nauticalmiles` was added in MapServer 5.6.
 
@@ -792,7 +840,31 @@
 .. index::
    pair: LAYER; TYPE
     
-TYPE [point|line|polygon|circle|annotation|raster|query|chart]
+.. index::
+   triple: LAYER; TYPE; annotation
+    
+.. index::
+   triple: LAYER; TYPE; chart
+    
+.. index::
+   triple: LAYER; TYPE; circle
+    
+.. index::
+   triple: LAYER; TYPE; line
+    
+.. index::
+   triple: LAYER; TYPE; point
+    
+.. index::
+   triple: LAYER; TYPE; polygon
+    
+.. index::
+   triple: LAYER; TYPE; raster
+    
+.. index::
+   triple: LAYER; TYPE; query
+    
+TYPE [annotation|chart|circle|line|point|polygon|raster|query]
     Specifies how the data should be drawn. Need not be the same as the 
     shapefile type. For example, a polygon shapefile may be drawn as a point 
     layer, but a point shapefile may not be drawn as a polygon layer. Common 
@@ -844,13 +916,38 @@
 
 .. index::
    pair: LAYER; UNITS
-    
-UNITS [feet|inches|kilometers|meters|miles|nauticalmiles|dd|pixels|percentages]
-    Units of the layer. `Percentages` was added in MapServer 4.10 and is mostly
-    geared for inline features. `Nauticalmiles` was added in MapServer 5.6.
 
 .. index::
-   pair: VALIDATION; LAYER
+   triple: LAYER; UNITS; dd
+    
+.. index::
+   triple: LAYER; UNITS; feet
+    
+.. index::
+   triple: LAYER; UNITS; inches
+    
+.. index::
+   triple: LAYER; UNITS; kilometers
+    
+.. index::
+   triple: LAYER; UNITS; meters
+    
+.. index::
+   triple: LAYER; UNITS; miles
+    
+.. index::
+   triple: LAYER; UNITS; nauticalmiles
+    
+.. index::
+   triple: LAYER; UNITS; percentages
+    
+.. index::
+   triple: LAYER; UNITS; pixels
+    
+UNITS [dd|feet|inches|kilometers|meters|miles|nauticalmiles|percentages|pixels]
+    Units of the layer.  `percentages` (in this case a value between 0
+    and 1) was added in MapServer 4.10 and is mostly geared for inline
+    features.  `nauticalmiles` was added in MapServer 5.6.
 
 .. index::
    pair: LAYER; VALIDATION

Modified: trunk/docs/en/mapfile/layer.txt
===================================================================
--- trunk/docs/en/mapfile/layer.txt	2012-01-03 10:18:44 UTC (rev 12944)
+++ trunk/docs/en/mapfile/layer.txt	2012-01-03 10:18:57 UTC (rev 12945)
@@ -625,7 +625,28 @@
 .. index::
    pair: LAYER; SIZEUNITS
     
-SIZEUNITS [pixels|feet|inches|kilometers|meters|miles|nauticalmiles]
+.. index::
+   triple: LAYER; SIZEUNITS; feet
+    
+.. index::
+   triple: LAYER; SIZEUNITS; inches
+    
+.. index::
+   triple: LAYER; SIZEUNITS; kilometers
+    
+.. index::
+   triple: LAYER; SIZEUNITS; meters
+    
+.. index::
+   triple: LAYER; SIZEUNITS; miles
+    
+.. index::
+   triple: LAYER; SIZEUNITS; nauticalmiles
+    
+.. index::
+   triple: LAYER; SIZEUNITS; pixels
+    
+SIZEUNITS [feet|inches|kilometers|meters|miles|nauticalmiles|pixels]
     Sets the unit of :ref:`CLASS` object SIZE values (default is pixels). 
     Useful for simulating buffering. `Nauticalmiles` was added in MapServer 5.6.
 
@@ -822,7 +843,31 @@
 .. index::
    pair: LAYER; TYPE
     
-TYPE [point|line|polygon|circle|annotation|raster|query|chart]
+.. index::
+   triple: LAYER; TYPE; annotation
+    
+.. index::
+   triple: LAYER; TYPE; chart
+    
+.. index::
+   triple: LAYER; TYPE; circle
+    
+.. index::
+   triple: LAYER; TYPE; line
+    
+.. index::
+   triple: LAYER; TYPE; point
+    
+.. index::
+   triple: LAYER; TYPE; polygon
+    
+.. index::
+   triple: LAYER; TYPE; raster
+    
+.. index::
+   triple: LAYER; TYPE; query
+    
+TYPE [annotation|chart|circle|line|point|polygon|raster|query]
     Specifies how the data should be drawn. Need not be the same as the 
     shapefile type. For example, a polygon shapefile may be drawn as a point 
     layer, but a point shapefile may not be drawn as a polygon layer. Common 
@@ -875,12 +920,37 @@
 .. index::
    pair: LAYER; UNITS
     
-UNITS [feet|inches|kilometers|meters|miles|nauticalmiles|dd|pixels|percentages]
-    Units of the layer. `Percentages` was added in MapServer 4.10 and is mostly
-    geared for inline features. `Nauticalmiles` was added in MapServer 5.6.
-
 .. index::
-   pair: VALIDATION; LAYER
+   triple: LAYER; UNITS; dd
+    
+.. index::
+   triple: LAYER; UNITS; feet
+    
+.. index::
+   triple: LAYER; UNITS; inches
+    
+.. index::
+   triple: LAYER; UNITS; kilometers
+    
+.. index::
+   triple: LAYER; UNITS; meters
+    
+.. index::
+   triple: LAYER; UNITS; miles
+    
+.. index::
+   triple: LAYER; UNITS; nauticalmiles
+    
+.. index::
+   triple: LAYER; UNITS; percentages
+    
+.. index::
+   triple: LAYER; UNITS; pixels
+    
+UNITS [dd|feet|inches|kilometers|meters|miles|nauticalmiles|percentages|pixels]
+    Units of the layer.  `percentages` (in this case a value between 0
+    and 1) was added in MapServer 4.10 and is mostly geared for inline
+    features.  `nauticalmiles` was added in MapServer 5.6.
 
 .. index::
    pair: LAYER; VALIDATION