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

[svn at osgeo.org]

Author: havatv
Date: 2011-08-10 15:26:21 -0700 (Wed, 10 Aug 2011)
New Revision: 12037

Modified:
   branches/branch-6-0/docs/en/mapfile/index.txt
   branches/branch-6-0/docs/en/mapfile/layer.txt
   branches/branch-6-0/docs/en/mapfile/map.txt
   trunk/docs/en/mapfile/index.txt
   trunk/docs/en/mapfile/layer.txt
   trunk/docs/en/mapfile/map.txt
Log:
Updated mapfile, map and layer documentation with security related changes (#2977). Required MAP and SYMBOLSET + references to the template document.

Modified: branches/branch-6-0/docs/en/mapfile/index.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/index.txt	2011-08-10 21:39:07 UTC (rev 12036)
+++ branches/branch-6-0/docs/en/mapfile/index.txt	2011-08-10 22:26:21 UTC (rev 12037)
@@ -17,6 +17,9 @@
 objects, points MapServer to where data are located and defines how things are 
 to be drawn.
 
+The Mapfile consists of a :ref:`MAP` object, which has to start with
+the word `MAP`.
+
 There are some important concepts that you must understand before you can 
 reliably use mapfiles to configure MapServer.  First is the concept of a 
 :ref:`LAYER`.  A layer is the combination of data plus styling. Data, in 

Modified: branches/branch-6-0/docs/en/mapfile/layer.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/layer.txt	2011-08-10 21:39:07 UTC (rev 12036)
+++ branches/branch-6-0/docs/en/mapfile/layer.txt	2011-08-10 22:26:21 UTC (rev 12037)
@@ -551,7 +551,8 @@
     .. deprecated:: 5.0
 
 :ref:`TEMPLATE <template>` [file|url]
-    Used as a global alternative to CLASS TEMPLATE.
+    Used as a global alternative to :ref:`CLASS` `TEMPLATE`.
+    See :ref:`template` for more info.
 
 :ref:`TILEINDEX <tileindex>` [filename|layername]
     Name of the tileindex file or layer.  A tileindex is similar to 

Modified: branches/branch-6-0/docs/en/mapfile/map.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/map.txt	2011-08-10 21:39:07 UTC (rev 12036)
+++ branches/branch-6-0/docs/en/mapfile/map.txt	2011-08-10 22:26:21 UTC (rev 12037)
@@ -4,6 +4,10 @@
  MAP
 *****************************************************************************
 
+.. note::
+   The map object is started with the word `MAP`, and ended with the
+   word `END`.
+
 ANGLE [double]
    Angle, given in degrees, to rotate the map. Default is 0. The
    rendered map will rotate in a clockwise direction. The following
@@ -331,6 +335,10 @@
     Filename of the symbolset to use. Can be a path relative to the
     mapfile, or a full path.
 
+    .. note::
+       The `SYMBOLSET` file must start with the word `SYMBOLSET` and
+       end with the word `END`.
+
 :ref:`SYMBOL`
     Signals the start of a :ref:`SYMBOL` object.
 

Modified: trunk/docs/en/mapfile/index.txt
===================================================================
--- trunk/docs/en/mapfile/index.txt	2011-08-10 21:39:07 UTC (rev 12036)
+++ trunk/docs/en/mapfile/index.txt	2011-08-10 22:26:21 UTC (rev 12037)
@@ -17,6 +17,9 @@
 objects, points MapServer to where data are located and defines how things are 
 to be drawn.
 
+The Mapfile consists of a :ref:`MAP` object, which has to start with
+the word `MAP`.
+
 There are some important concepts that you must understand before you can 
 reliably use mapfiles to configure MapServer.  First is the concept of a 
 :ref:`LAYER`.  A layer is the combination of data plus styling. Data, in 

Modified: trunk/docs/en/mapfile/layer.txt
===================================================================
--- trunk/docs/en/mapfile/layer.txt	2011-08-10 21:39:07 UTC (rev 12036)
+++ trunk/docs/en/mapfile/layer.txt	2011-08-10 22:26:21 UTC (rev 12037)
@@ -551,7 +551,8 @@
     .. deprecated:: 5.0
 
 :ref:`TEMPLATE <template>` [file|url]
-    Used as a global alternative to CLASS TEMPLATE.
+    Used as a global alternative to :ref:`CLASS` `TEMPLATE`.
+    See :ref:`template` for more info.
 
 :ref:`TILEINDEX <tileindex>` [filename|layername]
     Name of the tileindex file or layer.  A tileindex is similar to 

Modified: trunk/docs/en/mapfile/map.txt
===================================================================
--- trunk/docs/en/mapfile/map.txt	2011-08-10 21:39:07 UTC (rev 12036)
+++ trunk/docs/en/mapfile/map.txt	2011-08-10 22:26:21 UTC (rev 12037)
@@ -4,6 +4,10 @@
  MAP
 *****************************************************************************
 
+.. note::
+   The map object is started with the word `MAP`, and ended with the
+   word `END`.
+
 ANGLE [double]
    Angle, given in degrees, to rotate the map. Default is 0. The
    rendered map will rotate in a clockwise direction. The following
@@ -331,6 +335,10 @@
     Filename of the symbolset to use. Can be a path relative to the
     mapfile, or a full path.
 
+    .. note::
+       The `SYMBOLSET` file must start with the word `SYMBOLSET` and
+       end with the word `END`.
+
 :ref:`SYMBOL`
     Signals the start of a :ref:`SYMBOL` object.