Rename ST_GeomUnion to ST_Union in docs and ST_MemGeomUnion to ST_MemUnion in

.sql.

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

diff --git a/doc/postgis.xml b/doc/postgis.xml
index 39384fcdfd8270b50543434a1cf5e8518dd6353a..6ae0071a285852d5615cd83dfe46eaacf56d9671 100644 (file)
--- a/doc/postgis.xml
+++ b/doc/postgis.xml
@@ -217,7 +217,7 @@
         <listitem>
           <para>(Recommended) GEOS geometry library. The GEOS library is used
           to provide geometry tests (ST_Touches(), ST_Contains(), ST_Intersects()) and
-          operations (Buffer(), GeomUnion(), Difference()) within PostGIS.
+          operations (ST_Buffer(), ST_Union(), ST_Difference()) within PostGIS.
           GEOS is available for download from <ulink
           url="http://geos.refractions.net">http://geos.refractions.net</ulink>.</para>
         </listitem>
@@ -3068,7 +3068,7 @@
           </varlistentry>
 
           <varlistentry>
-            <term>ST_GeomUnion(geometry, geometry)</term>
+            <term>ST_Union(geometry, geometry)</term>
 
             <listitem>
               <para>Returns a geometry that represents the point set union of
@@ -3101,7 +3101,7 @@
           </varlistentry>
 
           <varlistentry>
-            <term>ST_MemGeomUnion(geometry set)</term>
+            <term>ST_MemUnion(geometry set)</term>
 
             <listitem>
               <para>Same as the above, only memory-friendly (uses less memory

diff --git a/lwgeom/lwpostgis.sql.in b/lwgeom/lwpostgis.sql.in
index 401ff645954f74fb157d010334d6ce51f5b7a840..3211daabb8e1796a10e6f2aac756845ab193c816 100644 (file)
--- a/lwgeom/lwpostgis.sql.in
+++ b/lwgeom/lwpostgis.sql.in
@@ -4332,7 +4332,7 @@ CREATE AGGREGATE MemGeomUnion (
        );
 
 -- Availability: 1.2.2
-CREATE AGGREGATE ST_MemGeomUnion (
+CREATE AGGREGATE ST_MemUnion (
        basetype = geometry,
        sfunc = ST_union,
        stype = geometry