From 82433e913cef145c7d2f32a2770adf6d31daf2b1 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 7 Aug 2004 19:53:48 +0000
Subject: [PATCH] Update a couple of example error messages to reflect the fact
 that we don't generate constraint names like "$1" anymore.

---
 doc/src/sgml/advanced.sgml | 5 +++--
 doc/src/sgml/ddl.sgml      | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/src/sgml/advanced.sgml b/doc/src/sgml/advanced.sgml
index 475ba910a1..f6b1701870 100644
--- a/doc/src/sgml/advanced.sgml
+++ b/doc/src/sgml/advanced.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/advanced.sgml,v 1.42 2004/08/01 17:32:11 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/advanced.sgml,v 1.43 2004/08/07 19:53:48 tgl Exp $
 -->
 
  <chapter id="tutorial-advanced">
@@ -123,7 +123,7 @@ INSERT INTO weather VALUES ('Berkeley', 45, 53, 0.0, '1994-11-28');
 </programlisting>
 
 <screen>
-ERROR:  insert or update on table "weather" violates foreign key constraint "$1"
+ERROR:  insert or update on table "weather" violates foreign key constraint "weather_city_fkey"
 DETAIL:  Key (city)=(Berkeley) is not present in table "cities".
 </screen>
    </para>
@@ -290,6 +290,7 @@ COMMIT;
     Remembering the bank database, suppose we debit $100.00 from Alice's
     account, and credit Bob's account, only to find later that we should
     have credited Wally's account.  We could do it using savepoints like
+    this:
 
 <programlisting>
 BEGIN;
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index 404181482b..71bb34d83c 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.27 2004/08/03 20:32:30 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.28 2004/08/07 19:53:48 tgl Exp $ -->
 
 <chapter id="ddl">
  <title>Data Definition</title>
@@ -1971,7 +1971,7 @@ REVOKE CREATE ON SCHEMA public FROM PUBLIC;
 <screen>
 DROP TABLE products;
 
-NOTICE:  constraint $1 on table orders depends on table products
+NOTICE:  constraint orders_product_no_fkey on table orders depends on table products
 ERROR:  cannot drop table products because other objects depend on it
 HINT:  Use DROP ... CASCADE to drop the dependent objects too.
 </screen>