minor formatting change in doc. #722 remove more deprecated functions: ConvexHull.

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

diff --git a/doc/reference_raster.xml b/doc/reference_raster.xml
index b06d1cd2b545882c1d881bf1743e6b9396e2e913..7aadb20643702ccc195e71453e4dd3f263059ed2 100644 (file)
--- a/doc/reference_raster.xml
+++ b/doc/reference_raster.xml
@@ -1844,20 +1844,20 @@ WHERE rid = 2;
                                <para>Returns true if there is no band with given band number.  If no band number is specified, then band number 1 is assumed.</para>
                                
                                <para>Availability: 2.0.0</para>
-                               </refsection>
-                               
-                               <refsection>
-                                       <title>Examples</title>
+                       </refsection>
                                
-                                       <programlisting>SELECT rid, ST_HasNoBand(rast) As hb1, ST_HasNoBand(rast,2) as hb2, 
+                       <refsection>
+                               <title>Examples</title>
+                       
+                               <programlisting>SELECT rid, ST_HasNoBand(rast) As hb1, ST_HasNoBand(rast,2) as hb2, 
 ST_HasNoBand(rast,4) as hb4, ST_NumBands(rast) As numbands 
 FROM dummy_rast;
 
- rid | hb1 | hb2 | hb4 | numbands
+rid | hb1 | hb2 | hb4 | numbands
 -----+-----+-----+-----+----------
-   1 | t   | t   | t   |        0
-   2 | f   | f   | t   |        3
-                               </programlisting>
+1 | t   | t   | t   |        0
+2 | f   | f   | t   |        3
+                       </programlisting>
                        
                        </refsection>
 
@@ -1866,7 +1866,6 @@ FROM dummy_rast;
                                <para><xref linkend="RT_ST_NumBands" /></para>
                        </refsection>
                </refentry>
-               
        </sect1>
        
        <sect1 id="Raster_Pixel_Accessors">
@@ -2692,11 +2691,6 @@ select st_bandisnodata(rast, 1) from dummy_rast where rid = 1; -- Expected true
                 linkend="RT_ST_BandIsNoData"/></para>
                        </refsection>
                </refentry>
-
-
-
-
-
        </sect1>
        
        <sect1 id="Raster_Outputs">

diff --git a/postgis/legacy.sql.in.c b/postgis/legacy.sql.in.c
index 06613a537497d8c2ca2c06fe3fcf6a7bed826eeb..d2baa88cd7e77f2acafec5c9311129119c5345a3 100644 (file)
--- a/postgis/legacy.sql.in.c
+++ b/postgis/legacy.sql.in.c
@@ -592,6 +592,13 @@ CREATE OR REPLACE FUNCTION Contains(geometry,geometry)
        RETURNS boolean
        AS 'MODULE_PATHNAME'
        LANGUAGE 'C' IMMUTABLE STRICT;
+       
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION convexhull(geometry)
+       RETURNS geometry
+       AS 'MODULE_PATHNAME','convexhull'
+       LANGUAGE 'C' IMMUTABLE STRICT
+       COST 100;
 
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION crosses(geometry,geometry)

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index 083118f1e3105ea304867c81811cac62cea7ca67..56e4cdae9a4c8ead39c749f47a97e0712292b35a 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -2881,13 +2881,6 @@ CREATE OR REPLACE FUNCTION ST_Buffer(geometry,float8,text)
           $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
--- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION convexhull(geometry)
-       RETURNS geometry
-       AS 'MODULE_PATHNAME','convexhull'
-       LANGUAGE 'C' IMMUTABLE STRICT
-       COST 100;
-
 -- PostGIS equivalent function: convexhull(geometry)
 CREATE OR REPLACE FUNCTION ST_ConvexHull(geometry)
        RETURNS geometry