diff --git a/doc/FAQ b/doc/FAQ
index 015ce4cfe2..ef35027ab0 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -1,7 +1,7 @@
 
                 Frequently Asked Questions (FAQ) for PostgreSQL
                                        
-   Last updated: Tue Oct 9 16:13:00 EDT 2007
+   Last updated: Fri Oct 12 23:36:59 EDT 2007
    
    Current maintainer: Bruce Momjian (bruce@momjian.us)
    
@@ -100,7 +100,7 @@
    developers spread throughout the world and communicating via the
    Internet. It is a community project and is not controlled by any
    company. To get involved, see the developer's FAQ at
-   http://www.postgresql.org/files/documentation/faqs/FAQ_DEV.html
+   http://www.postgresql.org/docs/faqs.FAQ_DEV.html
    
   1.2) Who controls PostgreSQL?
   
@@ -253,9 +253,9 @@
    http://www.commandprompt.com/ppbook/. There are a number of PostgreSQL
    books available for purchase. One of the most popular ones is by Korry
    Douglas. A list of book reviews can be found at
-   http://techdocs.postgresql.org/techdocs/bookreviews.php. There is also
-   a collection of PostgreSQL technical articles at
-   http://techdocs.postgresql.org/.
+   http://www.postgresql.org/docs/books/. There is also a collection of
+   PostgreSQL technical articles at
+   http://www.postgresql.org/docs/techdocs.
    
    The command line client program psql has some \d commands to show
    information about types, operators, functions, aggregates, etc. - use
@@ -265,12 +265,10 @@
    
   1.11) How can I learn SQL?
   
-   First, consider the PostgreSQL-specific books mentioned above. Another
-   one is "Teach Yourself SQL in 21 Days, Second Edition" at
-   http://members.tripod.com/er4ebus/sql/index.htm. Many of our users
-   like The Practical SQL Handbook, Bowman, Judith S., et al.,
-   Addison-Wesley. Others like The Complete Reference SQL, Groff et al.,
-   McGraw-Hill.
+   First, consider the PostgreSQL-specific books mentioned above. Many of
+   our users also like The Practical SQL Handbook, Bowman, Judith S., et
+   al., Addison-Wesley. Others like The Complete Reference SQL, Groff et
+   al., McGraw-Hill.
    
    There are also many nice tutorials available online:
      * http://www.intermedia.net/support/sql/sqltut.shtm
@@ -790,19 +788,7 @@
   4.18) How do I return multiple rows or columns from a function?
   
    It is easy using set-returning functions,
-   http://www.postgresql.org/docs/techdocs.17
-   .
-   
-  4.19) Why do I get "relation with OID ##### does not exist" errors when
-  accessing temporary tables in PL/PgSQL functions?
-  
-   PL/PgSQL caches function scripts, and an unfortunate side effect is
-   that if a PL/PgSQL function accesses a temporary table, and that table
-   is later dropped and recreated, and the function called again, the
-   function will fail because the cached function contents still point to
-   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.
+   http://www.postgresql.org/docs/techdocs.17.
    
   4.19) What replication solutions are available?
   
diff --git a/doc/src/FAQ/FAQ.html b/doc/src/FAQ/FAQ.html
index e829f08314..38baf49798 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 Oct  9 16:13:00 EDT 2007</P>
+    <P>Last updated: Fri Oct 12 23:36:59 EDT 2007</P>
 
     <P>Current maintainer: Bruce Momjian (<A href=
     "mailto:bruce@momjian.us">bruce@momjian.us</A>)
@@ -141,8 +141,8 @@
     developers spread throughout the world and communicating via the
     Internet. It is a community project and is not controlled by any
     company. To get involved, see the developer's FAQ at <A href=
-    "http://www.postgresql.org/files/documentation/faqs/FAQ_DEV.html">
-    http://www.postgresql.org/files/documentation/faqs/FAQ_DEV.html</A>
+    "http://www.postgresql.org/docs/faqs.FAQ_DEV.html">
+    http://www.postgresql.org/docs/faqs.FAQ_DEV.html</A>
     </P>
 
     <H3 id="item1.2">1.2) Who controls PostgreSQL?<BR></H3>
@@ -334,10 +334,10 @@
     There are a number of PostgreSQL books available for purchase.  One
     of the most popular ones is by Korry Douglas.  A list of book reviews
     can be found at <A href=
-    "http://techdocs.postgresql.org/techdocs/bookreviews.php">http://techdocs.postgresql.org/techdocs/bookreviews.php</A>.
+    "http://www.postgresql.org/docs/books/">http://www.postgresql.org/docs/books/</A>.
     There is also a collection of PostgreSQL technical articles at <A
     href=
-    "http://techdocs.postgresql.org/">http://techdocs.postgresql.org/</A>.</P>
+    "http://www.postgresql.org/docs/techdocs">http://www.postgresql.org/docs/techdocs</A>.</P>
 
     <P>The command line client program <I>psql</I> has some \d commands to show
     information about types, operators, functions, aggregates, etc. - use \? to 
@@ -349,10 +349,7 @@
     <SMALL>SQL</SMALL>?</H3>
 
     <P>First, consider the PostgreSQL-specific books mentioned above.
-    Another one is "Teach Yourself SQL in 21 Days, Second Edition"
-    at <A href=
-    "http://members.tripod.com/er4ebus/sql/index.htm">http://members.tripod.com/er4ebus/sql/index.htm</A>.
-    Many of our users like <I>The Practical SQL Handbook</I>,
+    Many of our users also like <I>The Practical SQL Handbook</I>,
     Bowman, Judith S., et al., Addison-Wesley. Others like <I>The
     Complete Reference SQL</I>, Groff et al., McGraw-Hill.</P>
 
@@ -541,7 +538,7 @@
 
     <DD>A number of <I>postgresql.conf</I> settings affect performance.
     For more details, see <a href=
-    "http://www.postgresql.org/docs/current/static/runtime.html">
+    "http://www.postgresql.org/docs/current/static/runtime-config.html">
     Administration Guide/Server Run-time Environment/Run-time
     Configuration</a> for a full listing, and for commentary see <a
     href="http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.html">
@@ -1042,19 +1039,7 @@ length</TD></TR>
 
     <P>It is easy using set-returning functions, 
     <a href="http://www.postgresql.org/docs/techdocs.17">
-    http://www.postgresql.org/docs/techdocs.17</a></P>.
-
-    <H3 id="item4.19">4.19) Why do I get "relation with OID #####
-    does not exist" errors when accessing temporary tables in PL/PgSQL
-    functions?</H3>
-
-    <P>PL/PgSQL caches function scripts, and an unfortunate side effect
-    is that if a PL/PgSQL function accesses a temporary table, and that
-    table is later dropped and recreated, and the function called again,
-    the function will fail because the cached function contents still
-    point to the old temporary table. The solution is to use
-    <SMALL>EXECUTE</SMALL> for temporary table access in PL/PgSQL. This
-    will cause the query to be reparsed every time.</P>
+    http://www.postgresql.org/docs/techdocs.17</a>.</P>
 
     <H3 id="item4.19">4.19) What replication solutions are available?
     </H3>
@@ -1066,7 +1051,7 @@ length</TD></TR>
     queries, while slaves can only accept read/<SMALL>SELECT</SMALL>
     queries. The most popular freely available master-slave PostgreSQL
     replication solution is <A
-    href="http://gborg.postgresql.org/project/slony1/projdisplay.php">
+    href="http://main.slony.info/">
     Slony-I</A>.</P>
 
     <P>Multi-master replication allows read/write queries to be sent to
@@ -1085,7 +1070,7 @@ length</TD></TR>
     double-quotes around table or column names during table creation.
     When double-quotes are used, table and column names (called
     identifiers) are stored <a
-    href="http://www.postgresql.org/docs/current/static/sql-syntax.html#SQL-SYNTAX-IDENTIFIERS">
+    href="http://www.postgresql.org/docs/current/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS">
     case-sensitive</a>, meaning you must use double-quotes when
     referencing the names in a query.  Some interfaces, like pgAdmin,
     automatically double-quote identifiers during table creation.