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 98d8803..640b556 100644 (file)
--- a/doc/src/sgml/advanced.sgml
+++ b/doc/src/sgml/advanced.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/advanced.sgml,v 1.36 2003/09/12 22:17:18 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/advanced.sgml,v 1.37 2003/09/30 03:22:32 tgl Exp $
 -->
 
  <chapter id="tutorial-advanced">
@@ -123,8 +123,8 @@ INSERT INTO weather VALUES ('Berkeley', 45, 53, 0.0, '1994-11-28');
 </programlisting>
 
 <screen>
-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".
 </screen>
    </para>
 

diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index b97f9f7..96ab3df 100644 (file)
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.175 2003/09/20 20:12:04 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.176 2003/09/30 03:22:33 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -6422,7 +6422,7 @@ SELECT ... WHERE CASE WHEN x &lt;&gt; 0 THEN y/x &gt; 1.5 ELSE false END;
   </indexterm>
 
 <synopsis>
-<function>coalesce</function>(<replaceable>value</replaceable> <optional>, ...</optional>)
+<function>COALESCE</function>(<replaceable>value</replaceable> <optional>, ...</optional>)
 </synopsis>
 
   <para>
@@ -7610,7 +7610,7 @@ SELECT min(col) FROM sometable;
     Fortunately, there is a simple workaround for
     <function>min()</function> and <function>max()</function>. 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.
 <programlisting>
 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 dc640b9..c4d60ae 100644 (file)
--- a/doc/src/sgml/indices.sgml
+++ b/doc/src/sgml/indices.sgml
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/indices.sgml,v 1.44 2003/09/11 21:42:19 momjian Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/indices.sgml,v 1.45 2003/09/30 03:22:33 tgl Exp $ -->
 
 <chapter id="indexes">
  <title id="indexes-title">Indexes</title>
@@ -722,9 +722,11 @@ CREATE UNIQUE INDEX tests_success_constraint ON tests (subject, target)
    Although indexes in <productname>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 <command>EXPLAIN</> command;
-   its application for this purpose is illustrated in <xref
-   linkend="using-explain">.
+   Examining index usage for an individual query is done with the
+   <command>EXPLAIN</> command; its application for this purpose is
+   illustrated in <xref linkend="using-explain">.
+   It is also possible to gather overall statistics about index usage
+   in a running server, as described in <xref linkend="monitoring-stats">.
   </para>
 
   <para>

diff --git a/doc/src/sgml/typeconv.sgml b/doc/src/sgml/typeconv.sgml
index 5f723a1..59e88da 100644 (file)
--- a/doc/src/sgml/typeconv.sgml
+++ b/doc/src/sgml/typeconv.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/typeconv.sgml,v 1.34 2003/09/12 22:17:24 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/typeconv.sgml,v 1.35 2003/09/30 03:22:33 tgl Exp $
 -->
 
 <chapter Id="typeconv">
@@ -434,7 +434,7 @@ not some other type was used:
 <screen>
 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
 </screen>
 </para>
 
@@ -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.
 </screen>
 This happens because the system can't decide which of the several
 possible <literal>!</> operators should be preferred.  We can help