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.

2 files changed, 8 insertions, 18 deletions

diff --git a/doc/src/sgml/errcodes.sgml b/doc/src/sgml/errcodes.sgml
index 0f3659fc876..16cb6c7fcdb 100644
--- a/doc/src/sgml/errcodes.sgml
+++ b/doc/src/sgml/errcodes.sgml
@@ -42,11 +42,9 @@
  </para>
 
  <para>
-  The <application>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 <literal>22012</>, DIVISION BY ZERO,
-  has condition name <literal>DIVISION_BY_ZERO</>.  Condition names can
-  be written in either upper or lower case.  (Note that
+  The symbol shown in the column <quote>Condition Name</quote> is also
+  the condition name to use in <application>PL/pgSQL</>.  Condition
+  names can be written in either upper or lower case.  (Note that
   <application>PL/pgSQL</> does not recognize warning, as opposed to error,
   condition names; those are classes 00, 01, and 02.)
  </para>
@@ -55,15 +53,14 @@
 <table id="errcodes-table">
  <title><productname>PostgreSQL</productname> Error Codes</title>
 
- <tgroup cols="3">
+ <tgroup cols="2">
   <colspec colnum="1" colname="errorcode">
-  <colspec colnum="3" colname="condname">
-  <spanspec namest="errorcode" nameend="condname" spanname="span13">
+  <colspec colnum="2" colname="condname">
+  <spanspec namest="errorcode" nameend="condname" spanname="span12">
 
   <thead>
    <row>
     <entry>Error Code</entry>
-    <entry>Meaning</entry>
     <entry>Condition Name</entry>
    </row>
   </thead>
diff --git a/doc/src/sgml/generate-errcodes-table.pl b/doc/src/sgml/generate-errcodes-table.pl
index 5d0ccffadd9..0ac020ee245 100644
--- 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 "<row>\n";
-	print "<entry spanname=\"span13\">";
+	print "<entry spanname=\"span12\">";
 	print "<emphasis role=\"bold\">$_</></entry>\n";
 	print "</row>\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 "<row>\n";
     print "<entry><literal>$sqlstate</literal></entry>\n";
-    print "<entry>$meaning</entry>\n";
-    print "<entry>$condition_name</entry>\n";
+    print "<entry><symbol>$condition_name</symbol></entry>\n";
     print "</row>\n";
 }