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

svn at osgeo.org svn at osgeo.org
Tue Aug 23 19:12:44 EDT 2011


Author: havatv
Date: 2011-08-23 16:12:44 -0700 (Tue, 23 Aug 2011)
New Revision: 12107

Modified:
   branches/branch-6-0/docs/en/mapfile/expressions.txt
   branches/branch-6-0/docs/en/mapfile/labelencoding.txt
   branches/branch-6-0/docs/en/mapfile/symbology/construction.txt
   branches/branch-6-0/docs/en/mapfile/symbology/examples.txt
   branches/branch-6-0/docs/en/mapfile/template.txt
   branches/branch-6-0/docs/en/mapfile/union.txt
   branches/branch-6-0/docs/en/mapfile/variable_sub.txt
   trunk/docs/en/mapfile/expressions.txt
   trunk/docs/en/mapfile/labelencoding.txt
   trunk/docs/en/mapfile/symbology/construction.txt
   trunk/docs/en/mapfile/symbology/examples.txt
   trunk/docs/en/mapfile/template.txt
   trunk/docs/en/mapfile/union.txt
   trunk/docs/en/mapfile/variable_sub.txt
Log:
Added indexes (#4001)

Modified: branches/branch-6-0/docs/en/mapfile/expressions.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/expressions.txt	2011-08-23 22:23:45 UTC (rev 12106)
+++ branches/branch-6-0/docs/en/mapfile/expressions.txt	2011-08-23 23:12:44 UTC (rev 12107)
@@ -1,6 +1,9 @@
 
 .. _expressions:
 
+.. index::
+   single: Expressions
+
 *****************************************************************************
  Expressions
 *****************************************************************************
@@ -32,6 +35,10 @@
 
 * In :ref:`STYLE` `GEOMTRANSFORM`.
 
+
+.. index::
+   single: String quotation
+
 String quotation
 ...............................................................................
 
@@ -42,6 +49,9 @@
    'This is a string'
    "And this is also a string"
 
+.. index::
+   single: Quotes escaping
+
 Quotes escaping in strings
 ...............................................................................
 
@@ -79,6 +89,9 @@
     "National 'hero' statue"
 
 
+.. index::
+   pair: Expressions; Attributes
+
 Using attributes
 ...............................................................................
 
@@ -123,6 +136,9 @@
 
 
 
+.. index::
+   single: Expression types
+
 Expression Types
 -------------------------------------------------------------------------------
 
@@ -139,6 +155,9 @@
 * Logical "MapServer expressions": One or more attributes are compared
   using logical expressions.
 
+.. index::
+   pair: Expressions; String comparison
+
 String comparison (equality)
 ...............................................................................
 
@@ -188,6 +207,9 @@
 
 .. index:: Regular expressions
 
+.. index::
+   pair: Expressions; Regular expression comparison
+
 Regular expression comparison
 ...............................................................................
 
@@ -284,6 +306,9 @@
     editing the build files of some of the components, however.
 
 
+.. index::
+   pair: Expressions; Mapserver expressions
+
 "MapServer expressions"
 -------------------------------------------------------------------------------
 
@@ -296,6 +321,9 @@
 To be able to use a MapServer expression for a FILTER or EXPRESSION
 value, the expression has to finally become a logical value.
 
+.. index::
+   pair: Expressions; Logical expressions
+
 Logical expressions
 ...............................................................................
 
@@ -325,6 +353,9 @@
 
   returns true when Expression1 is false.
    
+.. index::
+   pair: Expressions; String expressions
+
 String expressions that return a logical value
 ...............................................................................
 
@@ -397,6 +428,9 @@
    (case insensitive). This operation is identical to the regular
    expression matching described earlier.
 
+.. index::
+   pair: Expressions; Arithmetic expressions
+
 Arithmetic expressions that return a logical value
 ...............................................................................
 
@@ -446,6 +480,9 @@
    returns true when n1 is equal to one of the given numbers.
 
 
+.. index::
+   pair: Expressions; Spatial expressions
+
 Spatial expressions that return a logical value (GEOS)
 ...............................................................................
 
@@ -492,6 +529,9 @@
    is greater than 0
 
 
+.. index::
+   pair: Expressions; String operations
+
 String operations that return a string
 ...............................................................................
 
@@ -515,6 +555,9 @@
    more readable
 
 
+.. index::
+   pair: Expressions; String functions
+
 String functions that return a number
 ...............................................................................
 
@@ -523,6 +566,9 @@
    returns the number of characters of "String1"
 
 
+.. index::
+   pair: Expressions; Arithmetic operations
+
 Arithmetic operations and functions that return a number
 ...............................................................................
 
@@ -574,6 +620,9 @@
     would return false.
 
 
+.. index::
+   pair: Expressions; Spatial functions
+
 Spatial functions that return a number (GEOS)
 ...............................................................................
 
@@ -604,6 +653,9 @@
    shape1 and shape2 is subtracted from shape1
 
 
+.. index::
+   pair: Expressions; Temporal expressions
+
 Temporal expressions
 ...............................................................................
 

Modified: branches/branch-6-0/docs/en/mapfile/labelencoding.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/labelencoding.txt	2011-08-23 22:23:45 UTC (rev 12106)
+++ branches/branch-6-0/docs/en/mapfile/labelencoding.txt	2011-08-23 23:12:44 UTC (rev 12107)
@@ -1,5 +1,8 @@
 .. _labelencoding:
 
+.. index::
+   single: International characters
+
 *****************************************************************************
  Display of International Characters in MapServer
 *****************************************************************************
@@ -87,6 +90,9 @@
 libiconv installed to get the complete list of supported encodings on
 that specific system. 
 
+.. index::
+   pair: LABEL; ENCODING
+
 Step 3: Add ENCODING Parameter to your LABEL Object
 ---------------------------------------------------
 

Modified: branches/branch-6-0/docs/en/mapfile/symbology/construction.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/symbology/construction.txt	2011-08-23 22:23:45 UTC (rev 12106)
+++ branches/branch-6-0/docs/en/mapfile/symbology/construction.txt	2011-08-23 23:12:44 UTC (rev 12107)
@@ -1,5 +1,8 @@
 .. _sym_construction:
 
+.. index::
+   single: Symbol construction
+
 *****************************************************************************
  Cartographical Symbol Construction with MapServer 
 *****************************************************************************
@@ -17,9 +20,6 @@
     :depth: 3
     :backlinks: top
 
-.. index:
-    single: Symbol Construction;
-
 Abstract
 ========
 
@@ -104,6 +104,9 @@
 to achieve transparency (making lower symbols "shine" through upper
 symbols).
 
+.. index::
+   single: Symbol scaling
+
 Symbol Scaling
 --------------
 
@@ -125,6 +128,9 @@
 :ref:`layer`.
 
 
+.. index::
+   single: Symbol specification
+
 Mapserver and symbol specification
 ----------------------------------
 
@@ -204,6 +210,9 @@
   +----------------------------------------------------------+------------------------------------------------------------------------+
 
                          
+.. index::
+   single: Cartographical symbols
+
 Using Cartographical Symbols in MapServer
 =========================================
 
@@ -237,6 +246,9 @@
 
 Dimensions can be specified using decimals.
 
+.. index::
+   single: Scaling of symbols
+
 Scaling of Symbols
 ------------------
 
@@ -268,6 +280,9 @@
 be coordinated to produce a good map.
 
 
+.. index::
+   single: Point symbols
+
 Construction of Point Symbols
 =============================
 
@@ -284,7 +299,12 @@
 
 All point symbols can be rotated using the `ANGLE` parameter.
 
+.. index::
+   single: Ellipse symbols
 
+.. index::
+   single: Vector symbols
+
 Symbols of `TYPE` `vector` and `ellipse`
 ----------------------------------------
 
@@ -321,6 +341,9 @@
 a circle, let X and Y have the same value.
 
 
+.. index::
+   single: Truetype symbols
+
 Symbols of `TYPE` `truetype`
 ----------------------------
 
@@ -365,6 +388,9 @@
 position relative to the geometric origin of the geometry.
 
 
+.. index::
+   single: Pixmap symbols
+
 Symbols of `TYPE` `pixmap`
 --------------------------
 
@@ -634,6 +660,9 @@
     END # CLASS
   END # LAYER
 
+.. index::
+   single: Combining symbols
+
 Combining symbols
 -----------------
 
@@ -661,6 +690,8 @@
 
    Construction of Point Symbols
 
+.. index::
+   single: Line symbols
 
 Construction of Line Symbols
 ============================
@@ -672,6 +703,9 @@
 result.  The `LINECAP`, `LINEJOIN` and `LINEJOINMAXSIZE` parameters
 are used to specify how line ends and corners are to be rendered.
 
+.. index::
+   single: Line symbol overlay
+
 Overlaying lines
 ----------------
 
@@ -686,6 +720,12 @@
 numbered widths.
 
 
+.. index::
+   single: GAP
+
+.. index::
+   single: PATTERN
+
 Use of the `PATTERN` and `GAP` parameters
 -----------------------------------------
 
@@ -1053,6 +1093,9 @@
     END # CLASS
   END # LAYER
 
+.. index::
+   pair: STYLE; LINECAP
+
 `LINECAP`
 ...........................
 
@@ -1066,6 +1109,9 @@
 default.
 
 
+.. index::
+   pair: STYLE; LINEJOIN
+
 `LINEJOIN`
 .......................
 
@@ -1080,6 +1126,9 @@
 
    Different kinds of linejoins
 
+.. index::
+   pair: STYLE; LINEJOINMAXSIZE
+
 `LINEJOINMAXSIZE` (only relevant for `LINEJOIN` `miter`\)
 ...............................................................................
 
@@ -1101,6 +1150,8 @@
 If *m* > *m_max*, then the connection length will be set to m_max.
 
 
+.. index::
+   pair: STYLE; OFFSET
 
 Use of the `OFFSET` parameter
 -----------------------------
@@ -1173,6 +1224,9 @@
   |  END # LAYER                                        	 |
   +--------------------------------------------------------------+
 
+.. index::
+   single: Assymetrical line styling
+
 Asymmetrical line styling with point symbols
 --------------------------------------------
 
@@ -1189,6 +1243,9 @@
 placed far away from the line.
 
 
+.. index::
+   single: Area symbols
+
 Area Symbols
 ============
 
@@ -1208,6 +1265,9 @@
 The AGG renderer uses anti-aliasing by default, so edge effects around
 the symbols can occure.
 
+.. index::
+   single: Hatch polygon fill
+
 Hatch fill
 ----------
 
@@ -1306,6 +1366,9 @@
    +--------------------------------+
 
 
+.. index::
+   single: Pixmap polygon fill
+
 Polygon fills with symbols of `TYPE` `pixmap`
 ---------------------------------------------
 
@@ -1442,6 +1505,9 @@
 
    Polygon fill - hatch
 
+.. index::
+   single: Vector polygon fill
+
 Polygon fills with symbols of `TYPE` `vector`
 ---------------------------------------------
 
@@ -2133,6 +2199,9 @@
 Tricks
 ======
 
+.. index::
+   single: Symbol center
+
 Changing the center of a point symbol
 -------------------------------------
 

Modified: branches/branch-6-0/docs/en/mapfile/symbology/examples.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/symbology/examples.txt	2011-08-23 22:23:45 UTC (rev 12106)
+++ branches/branch-6-0/docs/en/mapfile/symbology/examples.txt	2011-08-23 23:12:44 UTC (rev 12107)
@@ -1,5 +1,8 @@
 .. _sym_examples:
 
+.. index::
+   single: Symbology examples
+
 *****************************************************************************
  Symbology Examples 
 *****************************************************************************

Modified: branches/branch-6-0/docs/en/mapfile/template.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/template.txt	2011-08-23 22:23:45 UTC (rev 12106)
+++ branches/branch-6-0/docs/en/mapfile/template.txt	2011-08-23 23:12:44 UTC (rev 12107)
@@ -1,5 +1,8 @@
 .. _template:
 
+.. index::
+   single: Templating
+
 *****************************************************************************
  Templating
 *****************************************************************************

Modified: branches/branch-6-0/docs/en/mapfile/union.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/union.txt	2011-08-23 22:23:45 UTC (rev 12106)
+++ branches/branch-6-0/docs/en/mapfile/union.txt	2011-08-23 23:12:44 UTC (rev 12107)
@@ -1,5 +1,8 @@
 .. _union:
 
+.. index::
+   single: Union layer
+
 *****************************************************************************
  Union Layer
 *****************************************************************************
@@ -24,19 +27,21 @@
 Requirements
 ------------
 
-This is a native MapServer option that doesn't use any external libraries to support it.
+This is a native MapServer option that doesn't use any external
+libraries to support it.
 
 Mapfile Configuration
 ---------------------
 
 * The CONNECTIONTYPE parameter must be set to UNION.
-* The CONNECTION parameter must contain a comma separated list of the source layer names.
-* All of the source layers and the union layer must be the same TYPE (e.g. all must be TYPE 
-  POINT, or all TYPE POLYGON etc.)
+* The CONNECTION parameter must contain a comma separated list of the
+  source layer names.
+* All of the source layers and the union layer must be the same TYPE
+  (e.g. all must be TYPE POINT, or all TYPE POLYGON etc.)
 
 .. note::
-    You may wish to disable the visibility (change their STATUS) of the source layers 
-    to avoid displaying the features twice.
+    You may wish to disable the visibility (change their STATUS) of
+    the source layers to avoid displaying the features twice.
     
 For example:
 
@@ -79,31 +84,37 @@
 Feature attributes
 ------------------
 
-In the LAYER definition you may refer to any attributes supported by each of the source layers.
-In addition to the source layer attributes the union layer provides the following additional attributes:
+In the LAYER definition you may refer to any attributes supported by
+each of the source layers.
+In addition to the source layer attributes the union layer provides
+the following additional attributes:
 
 1) Combine:SourceLayerName - The name of the source layer the feature belongs to
 2) Combine:SourceLayerGroup - The group of the source layer the feature belongs to
 
-During the selection / feature query operations only the 'Combine:SourceLayerName' and 'Combine:SourceLayerGroup'
-attributes are provided by default. The set of the provided attributes can manually be overridden 
-(and further attributes can be exposed) by using the ITEMS processing option (refer to the example above).
+During the selection / feature query operations only the
+'Combine:SourceLayerName' and 'Combine:SourceLayerGroup' attributes
+are provided by default. The set of the provided attributes can
+manually be overridden (and further attributes can be exposed) by
+using the ITEMS processing option (refer to the example above).
 
 Classes and Styles
 ------------------
 
-We can define the symbology and labelling for the union layers in the same way as for
-any other layer by specifying the classes and styles. In addition the STYLEITEM AUTO 
-option is also supported for the union layer, which provides to display 
-the features as specified at the source layers. The source layers 
-may also use the STYLEITEM AUTO setting if the underlying data source provides that.
+We can define the symbology and labelling for the union layers in the
+same way as for any other layer by specifying the classes and
+styles. In addition the STYLEITEM AUTO option is also supported for
+the union layer, which provides to display the features as specified
+at the source layers. The source layers may also use the STYLEITEM
+AUTO setting if the underlying data source provides that.
 
 Projections
 -----------
 
-For speed, it is recommended to always use the same projection for the union layer and source layers. However
-MapServer will reproject the source layers to the union layer if requested.  (for more information on projections
-in MapServer refer to :ref:`PROJECTION`)
+For speed, it is recommended to always use the same projection for the
+union layer and source layers. However MapServer will reproject the
+source layers to the union layer if requested.  (for more information
+on projections in MapServer refer to :ref:`PROJECTION`)
 
 Examples
 --------
@@ -111,10 +122,11 @@
 Mapfile Example
 ***************
 
-The follow example contains 3 source layers in different formats, and one layer (yellow)
-in a different projection.  The union layer uses the **STYLEITEM "AUTO"** parameter to 
-draw the styles from the source layers.  (in this case MapServer will reproject the yellow
-features, in EPSG:4326, for the union layer, which is in EPSG:3978).  
+The follow example contains 3 source layers in different formats, and
+one layer (yellow) in a different projection.  The union layer uses
+the **STYLEITEM "AUTO"** parameter to draw the styles from the source
+layers.  (in this case MapServer will reproject the yellow features,
+in EPSG:4326, for the union layer, which is in EPSG:3978).
 
 .. image:: ../images/union.png
 
@@ -214,4 +226,4 @@
   $oClass = ms_newClassObj($oLayer);
   ...
 
-  ?>
\ No newline at end of file
+  ?>

Modified: branches/branch-6-0/docs/en/mapfile/variable_sub.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/variable_sub.txt	2011-08-23 22:23:45 UTC (rev 12106)
+++ branches/branch-6-0/docs/en/mapfile/variable_sub.txt	2011-08-23 23:12:44 UTC (rev 12107)
@@ -1,5 +1,8 @@
 .. _variable_sub:
 
+.. index::
+   single: Variable substitution
+
 *****************************************************************************
  Variable Substitution
 *****************************************************************************
@@ -29,4 +32,4 @@
 This feature is only available in the CGI version of MapServer through a 
 mapfile pre-processor. If you are using MapScript, you will have to code 
 the substitution logic into your application yourself (By writing your 
-own pre-processor).
\ No newline at end of file
+own pre-processor).

Modified: trunk/docs/en/mapfile/expressions.txt
===================================================================
--- trunk/docs/en/mapfile/expressions.txt	2011-08-23 22:23:45 UTC (rev 12106)
+++ trunk/docs/en/mapfile/expressions.txt	2011-08-23 23:12:44 UTC (rev 12107)
@@ -1,6 +1,9 @@
 
 .. _expressions:
 
+.. index::
+   single: Expressions
+
 *****************************************************************************
  Expressions
 *****************************************************************************
@@ -32,6 +35,10 @@
 
 * In :ref:`STYLE` `GEOMTRANSFORM`.
 
+
+.. index::
+   single: String quotation
+
 String quotation
 ...............................................................................
 
@@ -42,6 +49,9 @@
    'This is a string'
    "And this is also a string"
 
+.. index::
+   single: Quotes escaping
+
 Quotes escaping in strings
 ...............................................................................
 
@@ -79,6 +89,9 @@
     "National 'hero' statue"
 
 
+.. index::
+   pair: Expressions; Attributes
+
 Using attributes
 ...............................................................................
 
@@ -123,6 +136,9 @@
 
 
 
+.. index::
+   single: Expression types
+
 Expression Types
 -------------------------------------------------------------------------------
 
@@ -139,6 +155,9 @@
 * Logical "MapServer expressions": One or more attributes are compared
   using logical expressions.
 
+.. index::
+   pair: Expressions; String comparison
+
 String comparison (equality)
 ...............................................................................
 
@@ -188,6 +207,9 @@
 
 .. index:: Regular expressions
 
+.. index::
+   pair: Expressions; Regular expression comparison
+
 Regular expression comparison
 ...............................................................................
 
@@ -284,6 +306,9 @@
     editing the build files of some of the components, however.
 
 
+.. index::
+   pair: Expressions; Mapserver expressions
+
 "MapServer expressions"
 -------------------------------------------------------------------------------
 
@@ -296,6 +321,9 @@
 To be able to use a MapServer expression for a FILTER or EXPRESSION
 value, the expression has to finally become a logical value.
 
+.. index::
+   pair: Expressions; Logical expressions
+
 Logical expressions
 ...............................................................................
 
@@ -325,6 +353,9 @@
 
   returns true when Expression1 is false.
    
+.. index::
+   pair: Expressions; String expressions
+
 String expressions that return a logical value
 ...............................................................................
 
@@ -397,6 +428,9 @@
    (case insensitive). This operation is identical to the regular
    expression matching described earlier.
 
+.. index::
+   pair: Expressions; Arithmetic expressions
+
 Arithmetic expressions that return a logical value
 ...............................................................................
 
@@ -446,6 +480,9 @@
    returns true when n1 is equal to one of the given numbers.
 
 
+.. index::
+   pair: Expressions; Spatial expressions
+
 Spatial expressions that return a logical value (GEOS)
 ...............................................................................
 
@@ -492,6 +529,9 @@
    is greater than 0
 
 
+.. index::
+   pair: Expressions; String operations
+
 String operations that return a string
 ...............................................................................
 
@@ -515,6 +555,9 @@
    more readable
 
 
+.. index::
+   pair: Expressions; String functions
+
 String functions that return a number
 ...............................................................................
 
@@ -523,6 +566,9 @@
    returns the number of characters of "String1"
 
 
+.. index::
+   pair: Expressions; Arithmetic operations
+
 Arithmetic operations and functions that return a number
 ...............................................................................
 
@@ -574,6 +620,9 @@
     would return false.
 
 
+.. index::
+   pair: Expressions; Spatial functions
+
 Spatial functions that return a number (GEOS)
 ...............................................................................
 
@@ -604,6 +653,9 @@
    shape1 and shape2 is subtracted from shape1
 
 
+.. index::
+   pair: Expressions; Temporal expressions
+
 Temporal expressions
 ...............................................................................
 

Modified: trunk/docs/en/mapfile/labelencoding.txt
===================================================================
--- trunk/docs/en/mapfile/labelencoding.txt	2011-08-23 22:23:45 UTC (rev 12106)
+++ trunk/docs/en/mapfile/labelencoding.txt	2011-08-23 23:12:44 UTC (rev 12107)
@@ -1,5 +1,8 @@
 .. _labelencoding:
 
+.. index::
+   single: International characters
+
 *****************************************************************************
  Display of International Characters in MapServer
 *****************************************************************************
@@ -87,6 +90,9 @@
 libiconv installed to get the complete list of supported encodings on
 that specific system. 
 
+.. index::
+   pair: LABEL; ENCODING
+
 Step 3: Add ENCODING Parameter to your LABEL Object
 ---------------------------------------------------
 

Modified: trunk/docs/en/mapfile/symbology/construction.txt
===================================================================
--- trunk/docs/en/mapfile/symbology/construction.txt	2011-08-23 22:23:45 UTC (rev 12106)
+++ trunk/docs/en/mapfile/symbology/construction.txt	2011-08-23 23:12:44 UTC (rev 12107)
@@ -1,5 +1,8 @@
 .. _sym_construction:
 
+.. index::
+   single: Symbol construction
+
 *****************************************************************************
  Cartographical Symbol Construction with MapServer 
 *****************************************************************************
@@ -17,9 +20,6 @@
     :depth: 3
     :backlinks: top
 
-.. index:
-    single: Symbol Construction;
-
 Abstract
 ========
 
@@ -104,6 +104,9 @@
 to achieve transparency (making lower symbols "shine" through upper
 symbols).
 
+.. index::
+   single: Symbol scaling
+
 Symbol Scaling
 --------------
 
@@ -125,6 +128,9 @@
 :ref:`layer`.
 
 
+.. index::
+   single: Symbol specification
+
 Mapserver and symbol specification
 ----------------------------------
 
@@ -204,6 +210,9 @@
   +----------------------------------------------------------+------------------------------------------------------------------------+
 
                          
+.. index::
+   single: Cartographical symbols
+
 Using Cartographical Symbols in MapServer
 =========================================
 
@@ -237,6 +246,9 @@
 
 Dimensions can be specified using decimals.
 
+.. index::
+   single: Scaling of symbols
+
 Scaling of Symbols
 ------------------
 
@@ -268,6 +280,9 @@
 be coordinated to produce a good map.
 
 
+.. index::
+   single: Point symbols
+
 Construction of Point Symbols
 =============================
 
@@ -284,7 +299,12 @@
 
 All point symbols can be rotated using the `ANGLE` parameter.
 
+.. index::
+   single: Ellipse symbols
 
+.. index::
+   single: Vector symbols
+
 Symbols of `TYPE` `vector` and `ellipse`
 ----------------------------------------
 
@@ -321,6 +341,9 @@
 a circle, let X and Y have the same value.
 
 
+.. index::
+   single: Truetype symbols
+
 Symbols of `TYPE` `truetype`
 ----------------------------
 
@@ -365,6 +388,9 @@
 position relative to the geometric origin of the geometry.
 
 
+.. index::
+   single: Pixmap symbols
+
 Symbols of `TYPE` `pixmap`
 --------------------------
 
@@ -634,6 +660,9 @@
     END # CLASS
   END # LAYER
 
+.. index::
+   single: Combining symbols
+
 Combining symbols
 -----------------
 
@@ -661,6 +690,8 @@
 
    Construction of Point Symbols
 
+.. index::
+   single: Line symbols
 
 Construction of Line Symbols
 ============================
@@ -672,6 +703,9 @@
 result.  The `LINECAP`, `LINEJOIN` and `LINEJOINMAXSIZE` parameters
 are used to specify how line ends and corners are to be rendered.
 
+.. index::
+   single: Line symbol overlay
+
 Overlaying lines
 ----------------
 
@@ -686,6 +720,12 @@
 numbered widths.
 
 
+.. index::
+   single: GAP
+
+.. index::
+   single: PATTERN
+
 Use of the `PATTERN` and `GAP` parameters
 -----------------------------------------
 
@@ -1053,6 +1093,9 @@
     END # CLASS
   END # LAYER
 
+.. index::
+   pair: STYLE; LINECAP
+
 `LINECAP`
 ...........................
 
@@ -1066,6 +1109,9 @@
 default.
 
 
+.. index::
+   pair: STYLE; LINEJOIN
+
 `LINEJOIN`
 .......................
 
@@ -1080,6 +1126,9 @@
 
    Different kinds of linejoins
 
+.. index::
+   pair: STYLE; LINEJOINMAXSIZE
+
 `LINEJOINMAXSIZE` (only relevant for `LINEJOIN` `miter`\)
 ...............................................................................
 
@@ -1101,6 +1150,8 @@
 If *m* > *m_max*, then the connection length will be set to m_max.
 
 
+.. index::
+   pair: STYLE; OFFSET
 
 Use of the `OFFSET` parameter
 -----------------------------
@@ -1173,6 +1224,9 @@
   |  END # LAYER                                        	 |
   +--------------------------------------------------------------+
 
+.. index::
+   single: Assymetrical line styling
+
 Asymmetrical line styling with point symbols
 --------------------------------------------
 
@@ -1189,6 +1243,9 @@
 placed far away from the line.
 
 
+.. index::
+   single: Area symbols
+
 Area Symbols
 ============
 
@@ -1208,6 +1265,9 @@
 The AGG renderer uses anti-aliasing by default, so edge effects around
 the symbols can occure.
 
+.. index::
+   single: Hatch polygon fill
+
 Hatch fill
 ----------
 
@@ -1306,6 +1366,9 @@
    +--------------------------------+
 
 
+.. index::
+   single: Pixmap polygon fill
+
 Polygon fills with symbols of `TYPE` `pixmap`
 ---------------------------------------------
 
@@ -1442,6 +1505,9 @@
 
    Polygon fill - hatch
 
+.. index::
+   single: Vector polygon fill
+
 Polygon fills with symbols of `TYPE` `vector`
 ---------------------------------------------
 
@@ -2133,6 +2199,9 @@
 Tricks
 ======
 
+.. index::
+   single: Symbol center
+
 Changing the center of a point symbol
 -------------------------------------
 

Modified: trunk/docs/en/mapfile/symbology/examples.txt
===================================================================
--- trunk/docs/en/mapfile/symbology/examples.txt	2011-08-23 22:23:45 UTC (rev 12106)
+++ trunk/docs/en/mapfile/symbology/examples.txt	2011-08-23 23:12:44 UTC (rev 12107)
@@ -1,5 +1,8 @@
 .. _sym_examples:
 
+.. index::
+   single: Symbology examples
+
 *****************************************************************************
  Symbology Examples 
 *****************************************************************************

Modified: trunk/docs/en/mapfile/template.txt
===================================================================
--- trunk/docs/en/mapfile/template.txt	2011-08-23 22:23:45 UTC (rev 12106)
+++ trunk/docs/en/mapfile/template.txt	2011-08-23 23:12:44 UTC (rev 12107)
@@ -1,5 +1,8 @@
 .. _template:
 
+.. index::
+   single: Templating
+
 *****************************************************************************
  Templating
 *****************************************************************************

Modified: trunk/docs/en/mapfile/union.txt
===================================================================
--- trunk/docs/en/mapfile/union.txt	2011-08-23 22:23:45 UTC (rev 12106)
+++ trunk/docs/en/mapfile/union.txt	2011-08-23 23:12:44 UTC (rev 12107)
@@ -1,5 +1,8 @@
 .. _union:
 
+.. index::
+   single: Union layer
+
 *****************************************************************************
  Union Layer
 *****************************************************************************
@@ -24,19 +27,21 @@
 Requirements
 ------------
 
-This is a native MapServer option that doesn't use any external libraries to support it.
+This is a native MapServer option that doesn't use any external
+libraries to support it.
 
 Mapfile Configuration
 ---------------------
 
 * The CONNECTIONTYPE parameter must be set to UNION.
-* The CONNECTION parameter must contain a comma separated list of the source layer names.
-* All of the source layers and the union layer must be the same TYPE (e.g. all must be TYPE 
-  POINT, or all TYPE POLYGON etc.)
+* The CONNECTION parameter must contain a comma separated list of the
+  source layer names.
+* All of the source layers and the union layer must be the same TYPE
+  (e.g. all must be TYPE POINT, or all TYPE POLYGON etc.)
 
 .. note::
-    You may wish to disable the visibility (change their STATUS) of the source layers 
-    to avoid displaying the features twice.
+    You may wish to disable the visibility (change their STATUS) of
+    the source layers to avoid displaying the features twice.
     
 For example:
 
@@ -79,31 +84,37 @@
 Feature attributes
 ------------------
 
-In the LAYER definition you may refer to any attributes supported by each of the source layers.
-In addition to the source layer attributes the union layer provides the following additional attributes:
+In the LAYER definition you may refer to any attributes supported by
+each of the source layers.
+In addition to the source layer attributes the union layer provides
+the following additional attributes:
 
 1) Combine:SourceLayerName - The name of the source layer the feature belongs to
 2) Combine:SourceLayerGroup - The group of the source layer the feature belongs to
 
-During the selection / feature query operations only the 'Combine:SourceLayerName' and 'Combine:SourceLayerGroup'
-attributes are provided by default. The set of the provided attributes can manually be overridden 
-(and further attributes can be exposed) by using the ITEMS processing option (refer to the example above).
+During the selection / feature query operations only the
+'Combine:SourceLayerName' and 'Combine:SourceLayerGroup' attributes
+are provided by default. The set of the provided attributes can
+manually be overridden (and further attributes can be exposed) by
+using the ITEMS processing option (refer to the example above).
 
 Classes and Styles
 ------------------
 
-We can define the symbology and labelling for the union layers in the same way as for
-any other layer by specifying the classes and styles. In addition the STYLEITEM AUTO 
-option is also supported for the union layer, which provides to display 
-the features as specified at the source layers. The source layers 
-may also use the STYLEITEM AUTO setting if the underlying data source provides that.
+We can define the symbology and labelling for the union layers in the
+same way as for any other layer by specifying the classes and
+styles. In addition the STYLEITEM AUTO option is also supported for
+the union layer, which provides to display the features as specified
+at the source layers. The source layers may also use the STYLEITEM
+AUTO setting if the underlying data source provides that.
 
 Projections
 -----------
 
-For speed, it is recommended to always use the same projection for the union layer and source layers. However
-MapServer will reproject the source layers to the union layer if requested.  (for more information on projections
-in MapServer refer to :ref:`PROJECTION`)
+For speed, it is recommended to always use the same projection for the
+union layer and source layers. However MapServer will reproject the
+source layers to the union layer if requested.  (for more information
+on projections in MapServer refer to :ref:`PROJECTION`)
 
 Examples
 --------
@@ -111,10 +122,11 @@
 Mapfile Example
 ***************
 
-The follow example contains 3 source layers in different formats, and one layer (yellow)
-in a different projection.  The union layer uses the **STYLEITEM "AUTO"** parameter to 
-draw the styles from the source layers.  (in this case MapServer will reproject the yellow
-features, in EPSG:4326, for the union layer, which is in EPSG:3978).  
+The follow example contains 3 source layers in different formats, and
+one layer (yellow) in a different projection.  The union layer uses
+the **STYLEITEM "AUTO"** parameter to draw the styles from the source
+layers.  (in this case MapServer will reproject the yellow features,
+in EPSG:4326, for the union layer, which is in EPSG:3978).
 
 .. image:: ../images/union.png
 
@@ -214,4 +226,4 @@
   $oClass = ms_newClassObj($oLayer);
   ...
 
-  ?>
\ No newline at end of file
+  ?>

Modified: trunk/docs/en/mapfile/variable_sub.txt
===================================================================
--- trunk/docs/en/mapfile/variable_sub.txt	2011-08-23 22:23:45 UTC (rev 12106)
+++ trunk/docs/en/mapfile/variable_sub.txt	2011-08-23 23:12:44 UTC (rev 12107)
@@ -1,5 +1,8 @@
 .. _variable_sub:
 
+.. index::
+   single: Variable substitution
+
 *****************************************************************************
  Variable Substitution
 *****************************************************************************
@@ -29,4 +32,4 @@
 This feature is only available in the CGI version of MapServer through a 
 mapfile pre-processor. If you are using MapScript, you will have to code 
 the substitution logic into your application yourself (By writing your 
-own pre-processor).
\ No newline at end of file
+own pre-processor).



More information about the mapserver-commits mailing list