diff --git a/doc/FAQ_DEV b/doc/FAQ_DEV
index 6a6f1d51d5ea2a4b4ae5a927b18db495b95ec02c..65d478471a406a5f41d9f1883cd174e9dad8d7ea 100644
--- a/doc/FAQ_DEV
+++ b/doc/FAQ_DEV
@@ -1,7 +1,7 @@
Developer's Frequently Asked Questions (FAQ) for PostgreSQL
- Last updated: Mon Jun 2 00:34:39 EDT 2003
+ Last updated: Wed Oct 29 21:40:18 EST 2003
Current maintainer: Bruce Momjian (pgman@candle.pha.pa.us)
@@ -34,7 +34,7 @@
2.3) Why do we use Node and List to make data structures?
2.4) I just added a field to a structure. What else should I do?
2.5) Why do we use palloc() and pfree() to allocate memory?
- 2.6) What is elog()?
+ 2.6) What is ereport()?
2.7) What is CommandCounterIncrement()?
_________________________________________________________________
@@ -687,20 +687,21 @@ List *i, *list;
are special non-query contexts that memory can be allocated in. These
affect when the allocated memory is freed by the backend.
- 2.6) What is elog()?
+ 2.6) What is ereport()?
- elog() is used to send messages to the front-end, and optionally
+ ereport() is used to send messages to the front-end, and optionally
terminate the current query being processed. The first parameter is an
- elog level of DEBUG (levels 1-5), LOG, INFO, NOTICE, ERROR, FATAL, or
- PANIC. NOTICE prints on the user's terminal and the postmaster logs.
- INFO prints only to the user's terminal and LOG prints only to the
- server logs. (These can be changed from postgresql.conf.) ERROR prints
- in both places, and terminates the current query, never returning from
- the call. FATAL terminates the backend process. The remaining
- parameters of elog are a printf-style set of parameters to print.
-
- elog(ERROR) frees most memory and open file descriptors so you don't
- need to clean these up before the call.
+ ereport level of DEBUG (levels 1-5), LOG, INFO, NOTICE, ERROR, FATAL,
+ or PANIC. NOTICE prints on the user's terminal and the postmaster
+ logs. INFO prints only to the user's terminal and LOG prints only to
+ the server logs. (These can be changed from postgresql.conf.) ERROR
+ prints in both places, and terminates the current query, never
+ returning from the call. FATAL terminates the backend process. The
+ remaining parameters of ereport are a printf-style set of parameters
+ to print.
+
+ ereport(ERROR) frees most memory and open file descriptors so you
+ don't need to clean these up before the call.
2.7) What is CommandCounterIncrement()?
diff --git a/doc/src/FAQ/FAQ_DEV.html b/doc/src/FAQ/FAQ_DEV.html
index 9304e794de514c75afd6b442497cefdd78928509..64037ff5cda2c7c447d34ca68fb125c964637d5b 100644
--- a/doc/src/FAQ/FAQ_DEV.html
+++ b/doc/src/FAQ/FAQ_DEV.html
@@ -12,7 +12,7 @@
<H1>Developer's Frequently Asked Questions (FAQ) for
PostgreSQL</H1>
- <P>Last updated: Mon Jun 2 00:34:39 EDT 2003</P>
+ <P>Last updated: Wed Oct 29 21:40:18 EST 2003</P>
<P>Current maintainer: Bruce Momjian (<A href=
"mailto:pgman@candle.pha.pa.us">pgman@candle.pha.pa.us</A>)<BR>
@@ -61,7 +61,7 @@
should I do?<BR>
<A href="#2.5">2.5</A>) Why do we use <I>palloc</I>() and
<I>pfree</I>() to allocate memory?<BR>
- <A href="#2.6">2.6</A>) What is elog()?<BR>
+ <A href="#2.6">2.6</A>) What is ereport()?<BR>
<A href="#2.7">2.7</A>) What is CommandCounterIncrement()?<BR>
<BR>
@@ -833,11 +833,11 @@
memory can be allocated in. These affect when the allocated memory
is freed by the backend.</P>
- <H3><A name="2.6">2.6</A>) What is elog()?</H3>
+ <H3><A name="2.6">2.6</A>) What is ereport()?</H3>
- <P><I>elog()</I> is used to send messages to the front-end, and
+ <P><I>ereport()</I> is used to send messages to the front-end, and
optionally terminate the current query being processed. The first
- parameter is an elog level of <I>DEBUG</I> (levels 1-5), <I>LOG,</I>
+ parameter is an ereport level of <I>DEBUG</I> (levels 1-5), <I>LOG,</I>
<I>INFO,</I> <I>NOTICE,</I> <I>ERROR,</I> <I>FATAL,</I> or
<I>PANIC.</I> <I>NOTICE</I> prints on the user's terminal and the
postmaster logs. <I>INFO</I> prints only to the user's terminal and
@@ -845,10 +845,10 @@
from <I>postgresql.conf.</I>) <I>ERROR</I> prints in both places,
and terminates the current query, never returning from the call.
<I>FATAL</I> terminates the backend process. The remaining
- parameters of <I>elog</I> are a <I>printf</I>-style set of
+ parameters of <I>ereport</I> are a <I>printf</I>-style set of
parameters to print.</P>
- <P><I>elog(ERROR)</I> frees most memory and open file descriptors so
+ <P><I>ereport(ERROR)</I> frees most memory and open file descriptors so
you don't need to clean these up before the call.</P>
<H3><A name="2.7">2.7</A>) What is CommandCounterIncrement()?</H3>