Removed warning block for ST_MapAlgebra() doc page. Rearranged warning boxes

git-svn-id: http://svn.osgeo.org/postgis/trunk@10421 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/doc/reference_raster.xml b/doc/reference_raster.xml
index 499f2cb878b3c2ad0b73f3e5ab974fb25fd3b874..e51220d92bde821db07e4e3bc021baefa3242ffc 100644 (file)
--- a/doc/reference_raster.xml
+++ b/doc/reference_raster.xml
@@ -7670,12 +7670,6 @@ CREATE OR REPLACE FUNCTION sample_callbackfunc(value double precision[][][], pos
                                        Variant 4 operate upon two rasters with one band per raster. See example Variant 4.
                                </para>
 
-                               <warning>
-                                       <para>
-                                               The functions <!--<xref linkend="RT_ST_MapAlgebraExpr" />, <xref linkend="RT_ST_MapAlgebraExpr2" />, --><xref linkend="RT_ST_MapAlgebraFct" />, <xref linkend="RT_ST_MapAlgebraFct2" /> and <xref linkend="RT_ST_MapAlgebraFctNgb" /> are deprecated as of PostGIS 2.1.0 and use of these functions are strongly discouraged. These functions may be removed in a future version of PostGIS.
-                                       </para>
-                               </warning>
-
                                <para>Availability: 2.1.0</para>
 
                        </refsection>
@@ -8327,6 +8321,12 @@ FROM prunion;</programlisting>
 
                        <refsection>
                                <title>Description</title>
+
+                               <warning>
+                                       <para>
+                                               <xref linkend="RT_ST_MapAlgebraFct" /> is deprecated as of 2.1.0. Use <xref linkend="RT_ST_MapAlgebra" /> instead.
+                                       </para>
+                               </warning>
                                
                                <para>Creates a new one band raster formed by applying a valid PostgreSQL function specified by the <varname>onerasteruserfunc</varname> on the input raster (<varname>rast</varname>). If no <varname>band</varname> is specified, band 1 is assumed. The new raster will have the same georeference, width, and height as the original raster but will only have one band.</para>
 
@@ -8349,12 +8349,6 @@ FROM prunion;</programlisting>
 
                 <note><para>The <type>text[]</type> argument to the <varname>userfunction</varname> is required, regardless of whether you choose to pass any arguments to your user function for processing or not.</para></note>
 
-                               <warning>
-                                       <para>
-                                               <xref linkend="RT_ST_MapAlgebraFct" /> is deprecated as of 2.1.0. Use <xref linkend="RT_ST_MapAlgebra" /> instead.
-                                       </para>
-                               </warning>
-
                                <para>Availability: 2.0.0</para>
                        </refsection>
 
@@ -8527,6 +8521,12 @@ WHERE rid=167;
                        <refsection>
                                <title>Description</title>
                                
+                               <warning>
+                                       <para>
+                                               <xref linkend="RT_ST_MapAlgebraFct2" /> is deprecated as of 2.1.0. Use <xref linkend="RT_ST_MapAlgebra" /> instead.
+                                       </para>
+                               </warning>
+
                                <para>Creates a new one band raster formed by applying a valid PostgreSQL function specified by the <varname>tworastuserfunc</varname> on the input raster <varname>rast1</varname>, <varname>rast2</varname>. If no <varname>band1</varname> or <varname>band2</varname> is specified, band 1 is assumed. The new raster will have the same georeference, width, and height as the original rasters but will only have one band.</para>
 
                                <para>If <varname>pixeltype</varname> is passed in, then the new raster will have a band of that pixeltype. If pixeltype is passed NULL or left out, then the new raster band will have the same pixeltype as the input <varname>rast1</varname> band.</para>
@@ -8549,12 +8549,6 @@ WHERE rid=167;
 
                 <note><para>The <type>text[]</type> argument to the <varname>tworastuserfunc</varname> is required, regardless of whether you choose to pass any arguments to your user function for processing or not.</para></note>
 
-                               <warning>
-                                       <para>
-                                               <xref linkend="RT_ST_MapAlgebraFct2" /> is deprecated as of 2.1.0. Use <xref linkend="RT_ST_MapAlgebra" /> instead.
-                                       </para>
-                               </warning>
-
                                <para>Availability: 2.0.0</para>
                        </refsection>
 
@@ -8726,6 +8720,12 @@ SELECT ST_MapAlgebraFct(m1.rast, 1, m1.rast, 3,
                  <refsection>
                        <title>Description</title>
                
+                               <warning>
+                                       <para>
+                                               <xref linkend="RT_ST_MapAlgebraFctNgb" /> is deprecated as of 2.1.0. Use <xref linkend="RT_ST_MapAlgebra" /> instead.
+                                       </para>
+                               </warning>
+
                        <para>(one raster version) Return a raster which values
                  are the result of a PLPGSQL user function involving a
                neighborhood of values from the input raster band. The user function takes the neighborhood of pixel values
@@ -8772,12 +8772,6 @@ SELECT ST_MapAlgebraFct(m1.rast, 1, m1.rast, 3,
                                        </varlistentry>
                                </variablelist>
 
-                               <warning>
-                                       <para>
-                                               <xref linkend="RT_ST_MapAlgebraFctNgb" /> is deprecated as of 2.1.0. Use <xref linkend="RT_ST_MapAlgebra" /> instead.
-                                       </para>
-                               </warning>
-
                        <para>Availability: 2.0.0 </para>