From d879697cd291a31c635edf17c4b8c170ac40ffc1 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 26 Jan 2010 16:33:40 +0000
Subject: Remove the default_do_language parameter, instead making DO use a
 hardwired default of "plpgsql".  This is more reasonable than it was when the
 DO patch was written, because we have since decided that plpgsql should be
 installed by default.  Per discussion, having a parameter for this doesn't
 seem useful enough to justify the risk of application breakage if the value
 is changed unexpectedly.

---
 doc/src/sgml/config.sgml | 17 +----------------
 doc/src/sgml/ref/do.sgml |  8 +++-----
 2 files changed, 4 insertions(+), 21 deletions(-)

(limited to 'doc/src')

diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 4a681991954..71097ee21c8 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.245 2010/01/23 16:37:12 sriggs Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.246 2010/01/26 16:33:40 tgl Exp $ -->
 
 <chapter Id="runtime-config">
   <title>Server Configuration</title>
@@ -4132,21 +4132,6 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       </listitem>
      </varlistentry>
 
-     <varlistentry id="guc-default-do-language" xreflabel="default_do_language">
-      <term><varname>default_do_language</varname> (<type>string</type>)</term>
-      <indexterm>
-       <primary><varname>default_do_language</> configuration parameter</primary>
-      </indexterm>
-      <listitem>
-       <para>
-        This parameter specifies the language to use when the
-        <literal>LANGUAGE</> option is omitted in a
-        <xref linkend="sql-do" endterm="sql-do-title"> statement.
-        The default is <literal>plpgsql</literal>.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry id="guc-default-transaction-isolation" xreflabel="default_transaction_isolation">
       <indexterm>
        <primary>transaction isolation level</primary>
diff --git a/doc/src/sgml/ref/do.sgml b/doc/src/sgml/ref/do.sgml
index 0a851447263..a85d598c6a3 100644
--- a/doc/src/sgml/ref/do.sgml
+++ b/doc/src/sgml/ref/do.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/do.sgml,v 1.2 2009/09/23 15:41:51 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/do.sgml,v 1.3 2010/01/26 16:33:40 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -69,8 +69,7 @@ DO <replaceable class="PARAMETER">code</replaceable> [ LANGUAGE <replaceable cla
     <listitem>
      <para>
       The name of the procedural language the code is written in.
-      If omitted, the default is determined by the runtime parameter
-      <xref linkend="guc-default-do-language">.
+      If omitted, the default is <literal>plpgsql</>.
      </para>
     </listitem>
    </varlistentry>
@@ -83,6 +82,7 @@ DO <replaceable class="PARAMETER">code</replaceable> [ LANGUAGE <replaceable cla
   <para>
    The procedural language to be used must already have been installed
    into the current database by means of <command>CREATE LANGUAGE</>.
+   <literal>plpgsql</> is installed by default, but other languages are not.
   </para>
 
   <para>
@@ -108,8 +108,6 @@ BEGIN
     END LOOP;
 END$$;
 </programlisting>
-   This example assumes that <varname>default_do_language</> has its
-   default value, namely <literal>plpgsql</>.
   </para>
  </refsect1>
  <refsect1>
-- 
cgit v1.2.3