diff --git a/doc/FAQ b/doc/FAQ
index 3c43a8b32d030d4f675dd6797369e4343e5f4409..82cdf1f0a5c4837a5e97d17248e44479d44506ed 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -1,7 +1,7 @@
Frequently Asked Questions (FAQ) for PostgreSQL
- Last updated: Tue Aug 31 23:28:02 EDT 2004
+ Last updated: Sun Nov 14 16:32:47 EST 2004
Current maintainer: Bruce Momjian (pgman@candle.pha.pa.us)
@@ -97,8 +97,7 @@
4.25) How do I return multiple rows or columns from a function?
4.26) Why can't I reliably create/drop temporary tables in PL/PgSQL
functions?
- 4.27) What replication options are available?
- 4.28) What encryption options are available?
+ 4.27) What encryption options are available?
Extending PostgreSQL
@@ -1111,16 +1110,7 @@ CREATE TABLE test (x int, modtime timestamp DEFAULT CURRENT_TIMESTAMP );
table access in PL/PgSQL. This will cause the query to be reparsed
every time.
- 4.27) What replication options are available?
-
- There are several master/slave replication options available. These
- allow only the master to make database changes and the slave can only
- do database reads. The bottom of
- http://gborg.PostgreSQL.org/genpage?replication_research lists them. A
- multi-master replication solution is being worked on at
- http://gborg.PostgreSQL.org/project/pgreplication/projdisplay.php.
-
- 4.28) What encryption options are available?
+ 4.27) What encryption options are available?
* contrib/pgcrypto contains many encryption functions for use in SQL
queries.
diff --git a/doc/src/FAQ/FAQ.html b/doc/src/FAQ/FAQ.html
index 47c00659bc6b2b335f7a4a8babe81ecbf8c78208..0c25d6bc4a395f0e7a2b028926b06f3b88d802fe 100644
--- a/doc/src/FAQ/FAQ.html
+++ b/doc/src/FAQ/FAQ.html
@@ -10,7 +10,7 @@
alink="#0000ff">
<H1>Frequently Asked Questions (FAQ) for PostgreSQL</H1>
- <P>Last updated: Tue Aug 31 23:28:02 EDT 2004</P>
+ <P>Last updated: Sun Nov 14 16:32:47 EST 2004</P>
<P>Current maintainer: Bruce Momjian (<A href=
"mailto:pgman@candle.pha.pa.us">pgman@candle.pha.pa.us</A>)<BR>
@@ -137,8 +137,7 @@
from a function?<BR>
<A href="#4.26">4.26</A>) Why can't I reliably create/drop
temporary tables in PL/PgSQL functions?<BR>
- <A href="#4.27">4.27</A>) What replication options are available?<BR>
- <A href="#4.28">4.28</A>) What encryption options are available?<BR>
+ <A href="#4.28">4.27</A>) What encryption options are available?<BR>
<H2 align="center">Extending PostgreSQL</H2>
@@ -1396,17 +1395,7 @@ BYTEA bytea variable-length byte array (null-byte safe)
<SMALL>EXECUTE</SMALL> for temporary table access in PL/PgSQL. This
will cause the query to be reparsed every time.</P>
- <H4><A name="4.27">4.27</A>) What replication options are available?
- </H4>
- <P>There are several master/slave replication options available.
- These allow only the master to make database changes and the slave
- can only do database reads. The bottom of <a
- href="http://gborg.PostgreSQL.org/genpage?replication_research">
- http://gborg.PostgreSQL.org/genpage?replication_research</a> lists
- them. A multi-master replication solution is being worked on at <a
- href="http://gborg.PostgreSQL.org/project/pgreplication/projdisplay.php">http://gborg.PostgreSQL.org/project/pgreplication/projdisplay.php</a>.</P>
-
- <H4><A name="4.28">4.28</A>) What encryption options are available?
+ <H4><A name="4.27">4.27</A>) What encryption options are available?
</H4>
<UL>
<LI><I>contrib/pgcrypto</I> contains many encryption functions for