Move over ST_WKTToSQL and also defined ST_GeometryFromText (didn't see it in the...

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

diff --git a/doc/reference.xml b/doc/reference.xml
index 2a5ab7a535b85074b2be73eb005ac38b63071051..5ff0127596169a49a5216b91126542f8d96b72ec 100644 (file)
--- a/doc/reference.xml
+++ b/doc/reference.xml
@@ -2542,17 +2542,6 @@ WHERE n*100.00/length < 1;
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term>ST_WKTToSQL</term>
-
-        <listitem>
-          <para>Return an ST_Geometry value for a given well-known text
-          representation.</para>
-
-          <para>SQL-MM 3: 5.1.34</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term>ST_X</term>
 

diff --git a/doc/reference_new.xml b/doc/reference_new.xml
index 57188921c516883811188fcce4a47d0e8dcd14bc..9322009cf6a0d4f542b66eb4e0113dc54ddb39ac 100644 (file)
--- a/doc/reference_new.xml
+++ b/doc/reference_new.xml
@@ -1114,12 +1114,51 @@ SELECT ST_GeomFromEWKT('SRID=4269;MULTIPOLYGON(((-71.1031880899493 42.3152774590
                <para><xref linkend="ST_AsEWKT" />, <xref linkend="ST_GeomFromText" />, <xref linkend="ST_GeomFromEWKT" /></para>
          </refsection>
        </refentry>
-         <refentry id="ST_GeomFromText">
+       <refentry id="ST_GeometryFromText">
+                 <refnamediv>
+                       <refname>ST_GeometryFromText</refname>
+                       <refpurpose>Return a specified ST_Geometry value from Well-Known Text representation (WKT).  This is an alias name for ST_GeomFromText</refpurpose>
+                 </refnamediv>         
+                 <refsynopsisdiv>
+                       <funcsynopsis>
+                         <funcprototype>
+                               <funcdef>geometry <function>ST_GeometryFromText</function></funcdef>
+                               <paramdef><type>text </type> <parameter>WKT</parameter></paramdef>
+                         </funcprototype>
+                         <funcprototype>
+                               <funcdef>geometry <function>ST_GeometryFromText</function></funcdef>
+                               <paramdef><type>text </type> <parameter>WKT</parameter></paramdef>
+                               <paramdef><type>integer </type> <parameter>srid</parameter></paramdef>
+                         </funcprototype>
+                       </funcsynopsis>
+                 </refsynopsisdiv>
+                 <refsection>
+                       <title>Description</title>
+                       <!-- Optionally mention OpenGIS compliancy if appropriate -->
+                       <para><inlinemediaobject>
+                               <imageobject>
+                                 <imagedata fileref="images/check.png" />
+                               </imageobject>
+                         </inlinemediaobject> This method implements the <ulink
+                       url="http://www.opengeospatial.org/standards/sfs">OpenGIS Simple Features
+                       Implementation Specification for SQL.</ulink></para>
+                       <para><inlinemediaobject>
+                               <imageobject>
+                                 <imagedata fileref="images/check.png" />
+                               </imageobject>
+                         </inlinemediaobject> This method implements the SQL/MM specification:
+                       SQL-MM 3: 5.1.40</para>
+                 </refsection>
+                 <refsection>
+                       <title>See Also</title>
+                       <para><xref linkend="ST_GeomFromText" /></para>
+                 </refsection>
+       </refentry>
+       <refentry id="ST_GeomFromText">
                  <refnamediv>
                        <refname>ST_GeomFromText</refname>
                        <refpurpose>Return a specified ST_Geometry value from Well-Known Text representation (WKT).</refpurpose>
-                 </refnamediv>
-               
+                 </refnamediv>         
                  <refsynopsisdiv>
                        <funcsynopsis>
                          <funcprototype>
@@ -1465,6 +1504,39 @@ POINT(1 2)
                <para><xref linkend="ST_Collect" /></para>
          </refsection>
        </refentry>
+       <refentry id="ST_WKTToSQL">
+                 <refnamediv>
+                       <refname>ST_WKTToSQL</refname>
+                       <refpurpose>Return a specified ST_Geometry value from Well-Known Text representation (WKT).  This is an alias name for ST_GeomFromText</refpurpose>
+                 </refnamediv>         
+                 <refsynopsisdiv>
+                       <funcsynopsis>
+                         <funcprototype>
+                               <funcdef>geometry <function>ST_WKTToSQL</function></funcdef>
+                               <paramdef><type>text </type> <parameter>WKT</parameter></paramdef>
+                         </funcprototype>
+                         <funcprototype>
+                               <funcdef>geometry <function>ST_WKTToSQL</function></funcdef>
+                               <paramdef><type>text </type> <parameter>WKT</parameter></paramdef>
+                               <paramdef><type>integer </type> <parameter>srid</parameter></paramdef>
+                         </funcprototype>
+                       </funcsynopsis>
+                 </refsynopsisdiv>
+                 <refsection>
+                       <title>Description</title>
+                       <!-- Optionally mention OpenGIS compliancy if appropriate -->
+                       <para><inlinemediaobject>
+                               <imageobject>
+                                 <imagedata fileref="images/check.png" />
+                               </imageobject>
+                         </inlinemediaobject> This method implements the SQL/MM specification:
+                       SQL-MM 3: 5.1.34</para>
+                 </refsection>
+                 <refsection>
+                       <title>See Also</title>
+                       <para><xref linkend="ST_GeomFromText" /></para>
+                 </refsection>
+       </refentry>
   </sect1>
    
   <sect1>