Documentation fixes to allow PDF documents to be generated from Docbook source using...

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

diff --git a/doc/reference_new.xml b/doc/reference_new.xml
index 5e887f70ae08419ca37f23db45fbe3adb1e8721a..d7495cd8c07368abb8e5b6fc2d41050475463234 100644 (file)
--- a/doc/reference_new.xml
+++ b/doc/reference_new.xml
@@ -109,7 +109,7 @@
         'MULTILINESTRING'.</para>
 
         <para>
-          <inlinegraphic class="sfs_compliant" fileref="images/check.png" />
+          <inlinegraphic fileref="images/check.png" />
           This method implements the
           <ulink url="http://www.opengeospatial.org/standards/sfs">OpenGIS Simple
           Features Implementation Specification for SQL.</ulink>
@@ -213,7 +213,7 @@ Check constraints:
         row in the geometry_columns table.</para>
 
         <para>
-          <inlinegraphic class="sfs_compliant" fileref="images/check.png" />
+          <inlinegraphic fileref="images/check.png" />
           This method implements the
           <ulink url="http://www.opengeospatial.org/standards/sfs">OpenGIS Simple
           Features Implementation Specification for SQL.</ulink>
@@ -1345,10 +1345,10 @@ SELECT userpoints.id, ST_MakeLine(startpoint, endpoint) As drawn_line
                <refsection>
                        <title>Description</title>
                        
-                       <para>>Creates a 2d,3dz or 4d point geometry (geometry with measure).  ST_MakePoint while not being
+                       <para>Creates a 2d,3dz or 4d point geometry (geometry with measure).  ST_MakePoint while not being
                        OGC compliant is generally faster and more precise than ST_GeomFromText and ST_PointFromText.  It is also easier
                        to use if you have raw coordinates rather than WKT.</para>
-                       <para><note>Note x is longitude and y is latitude</note></para>
+                       <note><para>Note x is longitude and y is latitude</para></note>
                </refsection>
                
                <refsection>
@@ -2232,9 +2232,9 @@ NOTICE:  Self-intersection at or near point 0 0
                <title>Description</title>
        
                <para>Returns the spatial reference identifier for the ST_Geometry as defined in spatial_ref_sys table. </para>
-               <para><note>spatial_ref_sys
+               <para><note><para>spatial_ref_sys
                table is a table that catalogs all spatial reference systems known to PostGIS and is used for transformations from one spatial
-                       reference system to another.  So verifying you have the right spatial reference system identifier is important if you plan to ever transform your geometries.</note></para>
+                       reference system to another.  So verifying you have the right spatial reference system identifier is important if you plan to ever transform your geometries.</para></note></para>
                <para><inlinemediaobject>
                        <imageobject>
                          <imagedata fileref="images/check.png" />
@@ -2621,7 +2621,7 @@ SELECT ST_AsText(ST_SetPoint('LINESTRING(-1 2,-1 3)', 1, 'POINT(-1 1)'));
         </note>
 
         <para>
-          <inlinegraphic class="sfs_compliant" fileref="images/check.png" />
+          <inlinegraphic fileref="images/check.png" />
           This method implements the
           <ulink url="http://www.opengeospatial.org/standards/sfs">OpenGIS Simple
           Features Implementation Specification for SQL.</ulink>
@@ -2965,7 +2965,7 @@ CREATE INDEX idx_the_geom_26986_parcels
                        <note>
                          <para>The WKT spec does not include the SRID.  To get the OGC WKT format use ST_AsText</para>
                        </note>
-                       <para><inlinegraphic class="sfs_compliant" fileref="images/warning.png" />
+                       <para><inlinegraphic fileref="images/warning.png" />
                                WKT format does not maintain precision so to prevent floating truncation, use ST_AsBinary or ST_AsEWKB format for transport.
                        </para>
                        <note>
@@ -3331,7 +3331,7 @@ SRID=4326;POLYGON((0 0,0 1,1 1,1 0,0 0))
                          <para>The WKT spec does not include the SRID.  To get the SRID as part of the data, use the non-standard
                                PostGIS <xref linkend="ST_AsEWKT" /></para>
                        </note>
-                       <para><inlinegraphic class="sfs_compliant" fileref="images/warning.png" />
+                       <para><inlinegraphic fileref="images/warning.png" />
                                WKT format does not maintain precision so to prevent floating truncation, use ST_AsBinary or ST_AsEWKB format for transport.
                        </para>
                        <note>
@@ -3381,6 +3381,7 @@ F000000000000000000000000000000000000000000000000');
   
   <sect1>
       <title>Operators</title>
+      <para>&nbsp;</para> 
   </sect1>
   
   
@@ -3749,7 +3750,6 @@ st_area
       <important>
         <para>Do not call with a <varname>GEOMETRYCOLLECTION</varname> as an argument</para>
       </important>
-    </refsection>
     
     <note>
       <para>This function call will automatically include a bounding box
@@ -3758,17 +3758,18 @@ st_area
     </note>
 
     <para>
-      <inlinegraphic class="sfs_compliant" fileref="images/check.png" />
+      <inlinegraphic fileref="images/check.png" />
       This method implements the
       <ulink url="http://www.opengeospatial.org/standards/sfs">OpenGIS Simple
       Features Implementation Specification for SQL: 1.1: s2.1.13.3</ulink>
     </para>
     
     <para>
-      <inlinegraphic class="sql_mm_compliant" fileref="images/check.png" />
+      <inlinegraphic fileref="images/check.png" />
       This method implements the SQL/MM specification: SQL-MM 3: 5.1.29
     </para> 
-    
+    </refsection>
+
     <refsection>
       <title>Examples</title>
 
@@ -3905,7 +3906,7 @@ WHERE ST_Crosses(roads.the_geom, highways.the_geom);</programlisting>
             boolean, not an integer.</para>
                        </note>
                        <para>
-                         <inlinegraphic class="sfs_compliant" fileref="images/check.png" />
+                         <inlinegraphic fileref="images/check.png" />
                          This method implements the
                          <ulink url="http://www.opengeospatial.org/standards/sfs">OGC SPEC s2.1.1.2 //s2.1.13.3 - a.Relate(b,
             'FF*FF****')</ulink>
@@ -3961,14 +3962,14 @@ SELECT ST_Disjoint('POINT(0 0)'::geometry, 'LINESTRING ( 0 0, 0 2 )'::geometry);
         projected units.</para>
 
         <para>
-          <inlinegraphic class="sfs_compliant" fileref="images/check.png" />
+          <inlinegraphic fileref="images/check.png" />
           This method implements the
           <ulink url="http://www.opengeospatial.org/standards/sfs">OpenGIS Simple
           Features Implementation Specification for SQL.</ulink>
         </para>
 
         <para>
-          <inlinegraphic class="sql_mm_compliant" fileref="images/check.png" />
+          <inlinegraphic fileref="images/check.png" />
           This method implements the SQL/MM specification: SQL-MM 3: 5.1.23
         </para> 
       </refsection>
@@ -4031,7 +4032,7 @@ SELECT ST_Disjoint('POINT(0 0)'::geometry, 'LINESTRING ( 0 0, 0 2 )'::geometry);
         </note>
 
         <para>
-          <inlinegraphic class="sfs_compliant" fileref="images/check.png" />
+          <inlinegraphic fileref="images/check.png" />
           This method implements the
           <ulink url="http://www.opengeospatial.org/standards/sfs">OpenGIS Simple
           Features Implementation Specification for SQL.</ulink>
@@ -4102,7 +4103,7 @@ SELECT s.gid, s.school_name
         </important>
 
                <para>
-                 <inlinegraphic class="sfs_compliant" fileref="images/check.png" />
+                 <inlinegraphic fileref="images/check.png" />
                  This method implements the
                  <ulink url="http://www.opengeospatial.org/standards/sfs">OpenGIS Simple
                  Features Implementation Specification for SQL OGC SPEC s2.1.1.2</ulink>
@@ -4190,13 +4191,13 @@ SELECT ST_Equals(ST_Reverse(ST_GeomFromText('LINESTRING(0 0, 10 10)')),
             boolean, not an integer.</para>
                        </note>
                        <para>
-                         <inlinegraphic class="sfs_compliant" fileref="images/check.png" />
+                         <inlinegraphic fileref="images/check.png" />
                          This method implements the
                          <ulink url="http://www.opengeospatial.org/standards/sfs">OpenGIS Simple
                          Features Implementation Specification for SQL</ulink>
                        </para>
                        <para>
-                         <inlinegraphic class="sql_mm_compliant" fileref="images/check.png" />
+                         <inlinegraphic fileref="images/check.png" />
                          OGC SPEC s2.1.1.2 //s2.1.13.3 - ST_Intersects(g1, g2 ) --&gt;
                                Not (ST_Disjoint(g1, g2 ))
                        </para> 
@@ -4310,7 +4311,7 @@ st_length
                </note>
 
                <para>
-                 <inlinegraphic class="sql_mm_compliant" fileref="images/check.png" />
+                 <inlinegraphic fileref="images/check.png" />
                  This method implements the SQL/MM specification: SQL-MM 3: 5.1.43
                </para> 
        
@@ -4385,7 +4386,7 @@ SELECT ST_OrderingEquals(ST_Reverse(ST_GeomFromText('LINESTRING(0 0, 10 10)')),
         <para>OGC SPEC s2.1.1.2 // s2.1.13.3</para>
 
                <para>
-                 <inlinegraphic class="sql_mm_compliant" fileref="images/check.png" />
+                 <inlinegraphic fileref="images/check.png" />
                  This method implements the SQL/MM specification: SQL-MM 3: 5.1.32
                </para> 
        
@@ -4857,14 +4858,17 @@ FROM (SELECT ST_Buffer(ST_GeomFromText('POINT(1 2)'), 10) As smallc,
   
   <sect1>
       <title>Linear Referencing</title>
+      <para>&nbsp;</para> 
   </sect1>
   
   <sect1>
       <title>Long Transactions Support</title>
+      <para>&nbsp;</para>
   </sect1>
   
   <sect1>
       <title>Misc</title>
+      <para>&nbsp;</para>
   </sect1>
       
-</chapter>
\ No newline at end of file
+</chapter>

diff --git a/doc/using_postgis.xml b/doc/using_postgis.xml
index 90d8a1eeb110cfa03dbfadca1d98287e8de6aea2..98f62617e375ed517b63a44bba1dbf489648d32b 100644 (file)
--- a/doc/using_postgis.xml
+++ b/doc/using_postgis.xml
@@ -512,7 +512,7 @@ SELECT AddGeometryColumn( 'roads', 'roads_geom', -1, 'GEOMETRY', 3 );</programli
       <para>Most of the functions implemented by the GEOS library rely on the
       assumption that your geometries are valid as specified by the OpenGIS
       Simple Feature Specification. To check validity of geometries you can
-      use the <link linkend="IsValid">IsValid()</link> function:</para>
+      use the <link linkend="ST_IsValid">IsValid()</link> function:</para>
 
       <programlisting> gisdb=# select isvalid('LINESTRING(0 0, 1 1)'), 
         isvalid('LINESTRING(0 0,0 0)'); 
@@ -540,7 +540,7 @@ SELECT AddGeometryColumn( 'roads', 'roads_geom', -1, 'GEOMETRY', 3 );</programli
 
       <note>
         <para>Strictly compliant OGC geometries cannot have Z or M values. The
-        <link linkend="IsValid">IsValid()</link> function won't consider
+        <link linkend="ST_IsValid">IsValid()</link> function won't consider
         higher dimensioned geometries invalid! Invocations of <link
         linkend="AddGeometryColumn">AddGeometryColumn()</link> will add a
         constraint checking geometry dimensions, so it is enough to specify 2