postgrespro
diff --git a/‎doc/FAQ
Lines changed: 28 additions & 6 deletions b/‎doc/FAQ
Lines changed: 28 additions & 6 deletions
diff --git a/‎doc/src/FAQ/FAQ.html
Lines changed: 21 additions & 3 deletions b/‎doc/src/FAQ/FAQ.html
Lines changed: 21 additions & 3 deletions
@@ -1,7 +1,7 @@
 
                 Frequently Asked Questions (FAQ) for PostgreSQL
 
-   Last updated: Wed Oct 9 23:14:53 EDT 2002
+   Last updated: Fri Oct 11 00:59:31 EDT 2002
 
    Current maintainer: Bruce Momjian (pgman@candle.pha.pa.us)
 
@@ -96,6 +96,8 @@
    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?
 
                             Extending PostgreSQL
 
@@ -1046,12 +1048,13 @@ SELECT *
 
     4.24) How do I perform queries using multiple databases?
 
-   There is no way to query any database except the current one. Because
-   PostgreSQL loads database-specific system catalogs, it is uncertain
-   how a cross-database query should even behave.
+   There is no way to query a database other than the current one.
+   Because PostgreSQL loads database-specific system catalogs, it is
+   uncertain how a cross-database query should even behave.
 
-   Of course, a client can make simultaneous connections to different
-   databases and merge the information that way.
+   /contrib/dblink allows cross-database queries using function calls. Of
+   course, a client can make simultaneous connections to different
+   databases and merge the results on the client side.
 
     4.25) How do I return multiple rows or columns from a function?
 
@@ -1070,6 +1073,25 @@ SELECT *
    the old temporary table. The solution is to use EXECUTE for temporary
    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 solutions 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.27) What encryption options are available?
+    
+     * /contrib/pgcrypto contains many encryption functions for use in
+       SQL queries.
+     * The only way to encrypt transmission from the client to the server
+       is by using hostssl in pg_hba.conf.
+     * Database user passwords are automatically encrypted when stored in
+       version 7.3. In previous versions, you must enable
+       password_encryption in postgresql.conf.
      _________________________________________________________________
 
                             Extending PostgreSQL
 
@@ -14,7 +14,7 @@
   alink="#0000ff">
     <H1>Frequently Asked Questions (FAQ) for PostgreSQL</H1>
 
-    <P>Last updated: Wed Oct  9 23:14:53 EDT 2002</P>
+    <P>Last updated: Fri Oct 11 00:59:31 EDT 2002</P>
 
     <P>Current maintainer: Bruce Momjian (<A href=
     "mailto:pgman@candle.pha.pa.us">pgman@candle.pha.pa.us</A>)<BR>
@@ -144,6 +144,7 @@ <H2 align="center">Operational Questions</H2>
      <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>
 
 
     <H2 align="center">Extending PostgreSQL</H2>
@@ -1378,8 +1379,25 @@ <H4><A name="4.26">4.26</A>) Why can't I reliably create/drop
     <H4><A name="4.27">4.27</A>) What replication options are available?
     </H4>
     <P>There are several master/slave replication solutions available.
-    These allow only one server to make database changes and the slave 
-    merely allow database reading.
+    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.27">4.27</A>) What encryption options are available?
+    </H4>
+    <UL>
+    <LI><I>/contrib/pgcrypto</I> contains many encryption functions for
+    use in <SMALL>SQL</SMALL> queries.</LI>
+    <LI>The only way to encrypt transmission from the client to the
+    server is by using <I>hostssl</I> in <I>pg_hba.conf</I>.</LI>
+    <LI>Database user passwords are automatically encrypted when stored
+    in version 7.3. In previous versions, you must enable
+    <I>password_encryption</I> in <I>postgresql.conf</I>.</LI>
+    </UL>
 
     <HR>