doc corrections from ruvyn for PostGIS 2.3

references #3581
references #3580
references #3586
references #3575

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

diff --git a/doc/faq_raster.xml b/doc/faq_raster.xml
index cd588cb188a58340fd874f8333f26071ce495ed1..b9ef44880bad30d06203b76f9d97c16db020a91d 100644 (file)
--- a/doc/faq_raster.xml
+++ b/doc/faq_raster.xml
@@ -248,7 +248,7 @@ END
       </question>
 
       <answer>
-        <para>The function is not unique error happens if one of your arguments is a textual representation of a geometry instead of a geometry.  In these cases, PostgreSQL marks the textual representation as an unknown type, which means it can fall into the st_intersects(raster, geometry) or st_intersects(raster,raster) thus resulting in a non-unique case since both functions can in theory support your request.  To prevent this, you need to cast the geometry to a geometry.</para>
+        <para>The function is not unique error happens if one of your arguments is a textual representation of a geometry instead of a geometry.  In these cases, PostgreSQL marks the textual representation as an unknown type, which means it can fall into the st_intersects(raster, geometry) or st_intersects(raster,raster) thus resulting in a non-unique case since both functions can in theory support your request.  To prevent this, you need to cast the textual representation of the geometry to a geometry.</para>
         <para>For example if your code looks like this:</para>
         <programlisting>SELECT rast
  FROM my_raster

diff --git a/doc/reference_constructor.xml b/doc/reference_constructor.xml
index e82573e4064ffd225dbc952f8a36eb27d4923461..9efb10d7f63a17ea786992c02357c3fc72eb32d3 100644 (file)
--- a/doc/reference_constructor.xml
+++ b/doc/reference_constructor.xml
@@ -425,7 +425,7 @@ LINESTRING(-113.98 39.198,-113.981 39.195)
 \\312Q\\300\\366{b\\235*!E@\\225|\\354.P\\312Q
 \\300p\\231\\323e1!E@');</programlisting>
 
-               <note><para>In PostgreSQL 9.1+ - standard_conforming_strings is set to on by default, where as in past versions it was set to on.  You can change defaults as needed
+               <note><para>In PostgreSQL 9.1+ - standard_conforming_strings is set to on by default, where as in past versions it was set to off.  You can change defaults as needed
                    for a single query or at the database or server level.  Below is how you would do it with standard_conforming_strings = on.  In this case we escape the ' with standard ansi ',
                    but slashes are not escaped</para></note>
        <programlisting>

diff --git a/doc/reference_raster.xml b/doc/reference_raster.xml
index be6ba16a8910b111a97b58fe8ec5696b3b5bc66b..dfd85ad6b0773677aa3e3f1aa83a753e57cc8e3b 100644 (file)
--- a/doc/reference_raster.xml
+++ b/doc/reference_raster.xml
@@ -6423,12 +6423,17 @@ SELECT ST_PixelWidth(ST_Rescale(ST_AddBand(ST_MakeEmptyRaster(100, 100, 0, 0, 0.
                                        <title>Examples</title>
                                        <para>A simple example reskewing a raster from a skew of 0.0 to a skew of 0.0015.</para>
 
-                                       <programlisting>-- the original raster pixel size
-SELECT ST_Rotation(ST_AddBand(ST_MakeEmptyRaster(100, 100, 0, 0, 0.001, -0.001, 0, 0, 4269), '8BUI'::text, 1, 0))
+                                       <programlisting>-- the original raster non-rotated
+SELECT ST_Rotation(ST_AddBand(ST_MakeEmptyRaster(100, 100, 0, 0, 0.001, -0.001, 0, 0, 4269), '8BUI'::text, 1, 0));
 
--- the rescaled raster raster pixel size
-SELECT ST_Rotation(ST_Reskew(ST_AddBand(ST_MakeEmptyRaster(100, 100, 0, 0, 0.001, -0.001, 0, 0, 4269), '8BUI'::text, 1, 0), 0.0015))
-                    </programlisting>
+-- result
+0
+                                       
+-- the reskewed raster raster rotation
+SELECT ST_Rotation(ST_Reskew(ST_AddBand(ST_MakeEmptyRaster(100, 100, 0, 0, 0.001, -0.001, 0, 0, 4269), '8BUI'::text, 1, 0), 0.0015));
+
+-- result
+-0.982793723247329</programlisting>
 
                        </refsection>
 
@@ -6506,12 +6511,16 @@ SELECT ST_Rotation(ST_Reskew(ST_AddBand(ST_MakeEmptyRaster(100, 100, 0, 0, 0.001
                                        <title>Examples</title>
                                        <para>A simple example snapping a raster to a slightly different grid.</para>
 
-                                       <programlisting>-- the original raster pixel size
-SELECT ST_UpperLeftX(ST_AddBand(ST_MakeEmptyRaster(10, 10, 0, 0, 0.001, -0.001, 0, 0, 4269), '8BUI'::text, 1, 0))
+                                       <programlisting>-- the original raster upper left X
+SELECT ST_UpperLeftX(ST_AddBand(ST_MakeEmptyRaster(10, 10, 0, 0, 0.001, -0.001, 0, 0, 4269), '8BUI'::text, 1, 0));
+-- result
+0
+                                       
+-- the upper left of raster after snapping
+SELECT ST_UpperLeftX(ST_SnapToGrid(ST_AddBand(ST_MakeEmptyRaster(10, 10, 0, 0, 0.001, -0.001, 0, 0, 4269), '8BUI'::text, 1, 0), 0.0002, 0.0002));
 
--- the rescaled raster raster pixel size
-SELECT ST_UpperLeftX(ST_SnapToGrid(ST_AddBand(ST_MakeEmptyRaster(10, 10, 0, 0, 0.001, -0.001, 0, 0, 4269), '8BUI'::text, 1, 0), 0.0002, 0.0002))
-                    </programlisting>
+--result
+-0.0008</programlisting>
 
                        </refsection>