Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 3c1a866

Browse files
committed
Remove replicaiton FAQ item.
1 parent ea23ec8 commit 3c1a866

File tree

2 files changed

+6
-27
lines changed

2 files changed

+6
-27
lines changed

doc/FAQ

+3-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Frequently Asked Questions (FAQ) for PostgreSQL
33

4-
Last updated: Tue Aug 31 23:28:02 EDT 2004
4+
Last updated: Sun Nov 14 16:32:47 EST 2004
55

66
Current maintainer: Bruce Momjian (pgman@candle.pha.pa.us)
77

@@ -97,8 +97,7 @@
9797
4.25) How do I return multiple rows or columns from a function?
9898
4.26) Why can't I reliably create/drop temporary tables in PL/PgSQL
9999
functions?
100-
4.27) What replication options are available?
101-
4.28) What encryption options are available?
100+
4.27) What encryption options are available?
102101

103102
Extending PostgreSQL
104103

@@ -1111,16 +1110,7 @@ CREATE TABLE test (x int, modtime timestamp DEFAULT CURRENT_TIMESTAMP );
11111110
table access in PL/PgSQL. This will cause the query to be reparsed
11121111
every time.
11131112

1114-
4.27) What replication options are available?
1115-
1116-
There are several master/slave replication options available. These
1117-
allow only the master to make database changes and the slave can only
1118-
do database reads. The bottom of
1119-
http://gborg.PostgreSQL.org/genpage?replication_research lists them. A
1120-
multi-master replication solution is being worked on at
1121-
http://gborg.PostgreSQL.org/project/pgreplication/projdisplay.php.
1122-
1123-
4.28) What encryption options are available?
1113+
4.27) What encryption options are available?
11241114

11251115
* contrib/pgcrypto contains many encryption functions for use in SQL
11261116
queries.

doc/src/FAQ/FAQ.html

+3-14
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
alink="#0000ff">
1111
<H1>Frequently Asked Questions (FAQ) for PostgreSQL</H1>
1212

13-
<P>Last updated: Tue Aug 31 23:28:02 EDT 2004</P>
13+
<P>Last updated: Sun Nov 14 16:32:47 EST 2004</P>
1414

1515
<P>Current maintainer: Bruce Momjian (<A href=
1616
"mailto:pgman@candle.pha.pa.us">pgman@candle.pha.pa.us</A>)<BR>
@@ -137,8 +137,7 @@ <H2 align="center">Operational Questions</H2>
137137
from a function?<BR>
138138
<A href="#4.26">4.26</A>) Why can't I reliably create/drop
139139
temporary tables in PL/PgSQL functions?<BR>
140-
<A href="#4.27">4.27</A>) What replication options are available?<BR>
141-
<A href="#4.28">4.28</A>) What encryption options are available?<BR>
140+
<A href="#4.28">4.27</A>) What encryption options are available?<BR>
142141

143142

144143
<H2 align="center">Extending PostgreSQL</H2>
@@ -1396,17 +1395,7 @@ <H4><A name="4.26">4.26</A>) Why can't I reliably create/drop
13961395
<SMALL>EXECUTE</SMALL> for temporary table access in PL/PgSQL. This
13971396
will cause the query to be reparsed every time.</P>
13981397

1399-
<H4><A name="4.27">4.27</A>) What replication options are available?
1400-
</H4>
1401-
<P>There are several master/slave replication options available.
1402-
These allow only the master to make database changes and the slave
1403-
can only do database reads. The bottom of <a
1404-
href="http://gborg.PostgreSQL.org/genpage?replication_research">
1405-
http://gborg.PostgreSQL.org/genpage?replication_research</a> lists
1406-
them. A multi-master replication solution is being worked on at <a
1407-
href="http://gborg.PostgreSQL.org/project/pgreplication/projdisplay.php">http://gborg.PostgreSQL.org/project/pgreplication/projdisplay.php</a>.</P>
1408-
1409-
<H4><A name="4.28">4.28</A>) What encryption options are available?
1398+
<H4><A name="4.27">4.27</A>) What encryption options are available?
14101399
</H4>
14111400
<UL>
14121401
<LI><I>contrib/pgcrypto</I> contains many encryption functions for

0 commit comments

Comments
 (0)