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

[svn at osgeo.org]

Author: havatv
Date: 2011-08-20 17:16:57 -0700 (Sat, 20 Aug 2011)
New Revision: 12081

Modified:
   branches/branch-6-0/docs/en/mapfile/map.txt
   trunk/docs/en/mapfile/map.txt
Log:
Updated the MAP documentation on the use of TRANSPARENT (#3176).

Modified: branches/branch-6-0/docs/en/mapfile/map.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/map.txt	2011-08-19 19:25:26 UTC (rev 12080)
+++ branches/branch-6-0/docs/en/mapfile/map.txt	2011-08-21 00:16:57 UTC (rev 12081)
@@ -230,12 +230,12 @@
 
 IMAGECOLOR [r] [g] [b]
     Color to initialize the map with (i.e. background color). When
-    transparency is enabled (*TRANSPARENT ON*) for the typical case of
-    8-bit pseudocolored map generation, this color will be marked as
-    transparent in the output file palette. Any other map components
-    drawn in this color will also be transparent, so for map
-    generation with transparency it is best to use an otherwise unused
-    color as the background color.
+    transparency is enabled (*TRANSPARENT ON* in :ref:`OUTPUTFORMAT`)
+    for the typical case of 8-bit pseudocolored map generation, this
+    color will be marked as transparent in the output file
+    palette. Any other map components drawn in this color will also be
+    transparent, so for map generation with transparency it is best to
+    use an otherwise unused color as the background color.
 
 IMAGEQUALITY [int]
     *Deprecated* Use **FORMATOPTION "QUALITY=n"** in the
@@ -354,11 +354,12 @@
     DATAPATTERN_.
 
 TRANSPARENT [on|off]
-    Use *FORMATOPTION "TRANSPARENT=ON"* in the :ref:`OUTPUTFORMAT`
+
+    .. deprecated:: 4.6
+
+    Use *TRANSPARENT ON* in the :ref:`OUTPUTFORMAT`
     declaration to specify if the output images should be transparent.
     
-    .. deprecated:: 4.6
-
 UNITS [feet|inches|kilometers|meters|miles|nauticalmiles|dd]
     Units of the map coordinates. Used for scalebar and scale
     computations.  `Nauticalmiles` was added in MapServer 5.6.

Modified: trunk/docs/en/mapfile/map.txt
===================================================================
--- trunk/docs/en/mapfile/map.txt	2011-08-19 19:25:26 UTC (rev 12080)
+++ trunk/docs/en/mapfile/map.txt	2011-08-21 00:16:57 UTC (rev 12081)
@@ -230,12 +230,12 @@
 
 IMAGECOLOR [r] [g] [b]
     Color to initialize the map with (i.e. background color). When
-    transparency is enabled (*TRANSPARENT ON*) for the typical case of
-    8-bit pseudocolored map generation, this color will be marked as
-    transparent in the output file palette. Any other map components
-    drawn in this color will also be transparent, so for map
-    generation with transparency it is best to use an otherwise unused
-    color as the background color.
+    transparency is enabled (*TRANSPARENT ON* in :ref:`OUTPUTFORMAT`)
+    for the typical case of 8-bit pseudocolored map generation, this
+    color will be marked as transparent in the output file
+    palette. Any other map components drawn in this color will also be
+    transparent, so for map generation with transparency it is best to
+    use an otherwise unused color as the background color.
 
 IMAGEQUALITY [int]
     *Deprecated* Use **FORMATOPTION "QUALITY=n"** in the
@@ -354,11 +354,12 @@
     DATAPATTERN_.
 
 TRANSPARENT [on|off]
-    Use *FORMATOPTION "TRANSPARENT=ON"* in the :ref:`OUTPUTFORMAT`
+
+    .. deprecated:: 4.6
+
+    Use *TRANSPARENT ON* in the :ref:`OUTPUTFORMAT`
     declaration to specify if the output images should be transparent.
     
-    .. deprecated:: 4.6
-
 UNITS [feet|inches|kilometers|meters|miles|nauticalmiles|dd]
     Units of the map coordinates. Used for scalebar and scale
     computations.  `Nauticalmiles` was added in MapServer 5.6.