Drop "meaning" column from error code table

This is currently the same as the condition name, so it doesn't add
any value, only clutter.

diff --git a/doc/src/sgml/errcodes.sgml b/doc/src/sgml/errcodes.sgml
index 0f3659fc876c8d81bfb7f89579e9fb3148db6dd6..16cb6c7fcdb28166a73f7d99d74f5e5468be63f2 100644 (file)
--- a/doc/src/sgml/errcodes.sgml
+++ b/doc/src/sgml/errcodes.sgml
@@ -42,11 +42,9 @@
  
 
  
-  The PL/pgSQL condition name for each error code is the
-  same as the phrase shown in the table, with underscores substituted
-  for spaces.  For example, code 22012, DIVISION BY ZERO,
-  has condition name DIVISION_BY_ZERO.  Condition names can
-  be written in either upper or lower case.  (Note that
+  The symbol shown in the column Condition Name is also
+  the condition name to use in PL/pgSQL.  Condition
+  names can be written in either upper or lower case.  (Note that
   PL/pgSQL does not recognize warning, as opposed to error,
   condition names; those are classes 00, 01, and 02.)
  
@@ -55,15 +53,14 @@
 
  <productname>PostgreSQL</productname> Error Codes
 
- 3">
+ 2">
   
-  3" colname="condname">
-  3">
+  2" colname="condname">
+  2">
 
   
    
     Error Code
-    Meaning
     Condition Name
    
   

diff --git a/doc/src/sgml/generate-errcodes-table.pl b/doc/src/sgml/generate-errcodes-table.pl
index 5d0ccffadd9610efdf838bbacd24a6132d19c27d..0ac020ee245027a3ef8f2f2e4350845ac1da824c 100644 (file)
--- a/doc/src/sgml/generate-errcodes-table.pl
+++ b/doc/src/sgml/generate-errcodes-table.pl
@@ -29,7 +29,7 @@ while (<$errcodes>) {
 
    print "\n\n";
    print "\n";
-   print "3\">";
+   print "2\">";
    print "$_\n";
    print "\n";
 
@@ -46,17 +46,10 @@ while (<$errcodes>) {
     # Skip lines without PL/pgSQL condition names
     next unless defined($condition_name);
 
-    my $meaning = $condition_name;
-    # Remove underscores
-    $meaning =~ s/_/ /g;
-    # And capitalize
-    $meaning =~ tr/[a-z]/[A-Z]/;
-
     print "\n";
     print "\n";
     print "$sqlstate\n";
-    print "$meaning\n";
-    print "$condition_name\n";
+    print "$condition_name\n";
     print "\n";
 }