Move over sql mm compliance for ST_Disjoint and get rid of annoying carriage return...

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

diff --git a/doc/reference.xml b/doc/reference.xml
index b92caf73769001f6b0f967099e3faedfef78a060..aeeab0ad2679b82c18b468af6996b3c3e3fa7ff3 100644 (file)
--- a/doc/reference.xml
+++ b/doc/reference.xml
@@ -920,17 +920,6 @@ WHERE n*100.00/length < 1;
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term>ST_Disjoint</term>
-
-        <listitem>
-          <para>Test if an ST_Geometry value is spatially disjoint from
-          another ST_Geometry value.</para>
-
-          <para>SQL-MM 3: 5.1.26</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term>ST_GeomFromWKB</term>
 

diff --git a/doc/reference_new.xml b/doc/reference_new.xml
index 79b5f4e3350d4cad5f660698c0c5cb1bbeb3d180..e7aa1b505b53ecf439fa487b45edf02875079ff7 100644 (file)
--- a/doc/reference_new.xml
+++ b/doc/reference_new.xml
@@ -6168,7 +6168,7 @@ WHERE ST_Crosses(roads.the_geom, highways.the_geom);</programlisting>
     </refsection>
   </refentry>
 
-       <refentry id="ST_Disjoint">
+  <refentry id="ST_Disjoint">
                <refnamediv>
                        <refname>ST_Disjoint</refname>
                        
@@ -6197,9 +6197,9 @@ WHERE ST_Crosses(roads.the_geom, highways.the_geom);</programlisting>
                                returns true, then the geometries are not spatially disjoint.  
                                Disjoint implies false for spatial intersection.</para>
                                
-      <important>
-        <para>Do not call with a <varname>GEOMETRYCOLLECTION</varname> as an argument</para>
-      </important>
+                       <important>
+                               <para>Do not call with a <varname>GEOMETRYCOLLECTION</varname> as an argument</para>
+                       </important>
       
                        <para>Performed by the GEOS module</para>
                        <note>
@@ -6216,6 +6216,12 @@ WHERE ST_Crosses(roads.the_geom, highways.the_geom);</programlisting>
                          <ulink url="http://www.opengeospatial.org/standards/sfs">OGC SPEC s2.1.1.2 //s2.1.13.3 - a.Relate(b,
             'FF*FF****')</ulink>
                        </para> 
+                           <!-- Optionally mention SQL/MM 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.26</para>
                </refsection>
                <refsection>
                <title>Examples</title>

diff --git a/doc/template.xml b/doc/template.xml
index 56c70142f33144fef211ed3afb0c8f01146a4785..4390c66abc7228a3e6477fc9225a6fb849bea34b 100644 (file)
--- a/doc/template.xml
+++ b/doc/template.xml
@@ -50,8 +50,7 @@
         <imageobject>
           <imagedata fileref="images/check.png" />
         </imageobject>
-      </inlinemediaobject> This method implements the SQL/MM specification:
-    SQL-MM 3: 5.1.23</para>
+      </inlinemediaobject> This method implements the SQL/MM specification: SQL-MM 3: 5.1.23</para>
        
        <!-- Optionally mention 3d support -->
     <para><inlinemediaobject>