Adjust documentation examples to match recent error message rewordings.

A couple other minor fixes.

diff --git a/doc/src/sgml/advanced.sgml b/doc/src/sgml/advanced.sgml
index 98d8803a4c5c00246d909db696b628e68fc61140..640b5562b0c7bb446c77226a56d3eb45faa452e4 100644 (file)
--- a/doc/src/sgml/advanced.sgml
+++ b/doc/src/sgml/advanced.sgml
@@ -1,5 +1,5 @@
 
 
  
@@ -123,8 +123,8 @@ INSERT INTO weather VALUES ('Berkeley', 45, 53, 0.0, '1994-11-28');
 
 
 
-ERROR:  insert or update on "weather" violates foreign key constraint "$1"
-DETAIL:  Key (city)=(Berkeley) is not present in "cities".
+ERROR:  insert or update on table "weather" violates foreign key constraint "$1"
+DETAIL:  Key (city)=(Berkeley) is not present in table "cities".
 
    
 

diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index b97f9f7979946484201ebb0ec194cfbc36529419..96ab3dfd7be4a390b5459054f56f03a8ca1c27ce 100644 (file)
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,5 +1,5 @@
 
 
@@ -6422,7 +6422,7 @@ SELECT ... WHERE CASE WHEN x <> 0 THEN y/x > 1.5 ELSE false END;
   
 
 
-coalesce(value , ...)
+COALESCE(value , ...)
 
 
   
@@ -7610,7 +7610,7 @@ SELECT min(col) FROM sometable;
     Fortunately, there is a simple workaround for
     min() and max(). The
     query shown below is equivalent to the query above, except that it
-    can take advantage of a B+-Tree index if there is one present on
+    can take advantage of a B-tree index if there is one present on
     the column in question.
 
 SELECT col FROM sometable ORDER BY col ASC LIMIT 1;

diff --git a/doc/src/sgml/indices.sgml b/doc/src/sgml/indices.sgml
index dc640b91ed8bc000c4d0fa93313dd1a5843ace8f..c4d60ae24f93d602255439867126346f4077a446 100644 (file)
--- a/doc/src/sgml/indices.sgml
+++ b/doc/src/sgml/indices.sgml
@@ -1,4 +1,4 @@
-
+
 
 
  Indexes
@@ -722,9 +722,11 @@ CREATE UNIQUE INDEX tests_success_constraint ON tests (subject, target)
    Although indexes in PostgreSQL do not need
    maintenance and tuning, it is still important to check
    which indexes are actually used by the real-life query workload.
-   Examining index usage is done with the EXPLAIN command;
-   its application for this purpose is illustrated in 
-   linkend="using-explain">.
+   Examining index usage for an individual query is done with the
+   EXPLAIN command; its application for this purpose is
+   illustrated in .
+   It is also possible to gather overall statistics about index usage
+   in a running server, as described in .
   
 
   


diff --git a/doc/src/sgml/typeconv.sgml b/doc/src/sgml/typeconv.sgml

index 5f723a12bef4c09a59033caf2046aedffe6b70e0..59e88da29ab2b5cbd69a2a7c0449ea01b7801287 100644 (file)

--- a/doc/src/sgml/typeconv.sgml
+++ b/doc/src/sgml/typeconv.sgml
@@ -1,5 +1,5 @@
 
 
 
@@ -434,7 +434,7 @@ not some other type was used:
 
 SELECT @ '-4.5e500' AS "abs";
 
-ERROR:  "-4.5e500" is out of range for float8
+ERROR:  "-4.5e500" is out of range for type double precision
 
 
 
@@ -447,7 +447,7 @@ SELECT '20' ! AS "factorial";
 
 ERROR:  operator is not unique: "unknown" !
 HINT:  Could not choose a best candidate operator. You may need to add explicit
-typecasts.
+type casts.
 
 This happens because the system can't decide which of the several
 possible ! operators should be preferred.  We can help

diff --git a/doc/src/sgml/typeconv.sgml b/doc/src/sgml/typeconv.sgml
index 5f723a12bef4c09a59033caf2046aedffe6b70e0..59e88da29ab2b5cbd69a2a7c0449ea01b7801287 100644 (file)
--- a/doc/src/sgml/typeconv.sgml
+++ b/doc/src/sgml/typeconv.sgml
@@ -1,5 +1,5 @@
 
 
 
@@ -434,7 +434,7 @@ not some other type was used:
 
 SELECT @ '-4.5e500' AS "abs";
 
-ERROR:  "-4.5e500" is out of range for float8
+ERROR:  "-4.5e500" is out of range for type double precision
 
 
 
@@ -447,7 +447,7 @@ SELECT '20' ! AS "factorial";
 
 ERROR:  operator is not unique: "unknown" !
 HINT:  Could not choose a best candidate operator. You may need to add explicit
-typecasts.
+type casts.
 
 This happens because the system can't decide which of the several
 possible ! operators should be preferred.  We can help