Update FAQ URLs as suggested by Curtis Gallant.

diff --git a/doc/FAQ b/doc/FAQ
index 1028e89c568b43c81d7152cbf5703345ab33e067..db1e093fe364eca3a49ab3097632a9feea15a6b6 100644 (file)
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -1,7 +1,7 @@
 
                 Frequently Asked Questions (FAQ) for PostgreSQL
                                        
-   Last updated: Fri Apr 25 10:34:17 EDT 2008
+   Last updated: Wed Jun 25 23:02:18 EDT 2008
    
    Current maintainer: Bruce Momjian (bruce@momjian.us)
    
@@ -164,12 +164,13 @@
    
    PostgreSQL also runs natively on Microsoft Windows NT-based operating
    systems like Win2000 SP4, WinXP, and Win2003. A prepackaged installer
-   is available at http://pgfoundry.org/projects/pginstaller. MSDOS-based
-   versions of Windows (Win95, Win98, WinMe) can run PostgreSQL using
-   Cygwin.
+   is available at http://www.postgresql.org/download/windows.
+   MSDOS-based versions of Windows (Win95, Win98, WinMe) can run
+   PostgreSQL using Cygwin.
    
-   There is also a Novell Netware 6 port at http://forge.novell.com, and
-   an OS/2 (eComStation) version at
+   There is also a Novell Netware 6 port at
+   http://developer.novell.com/wiki/index.php/Postgresql, and an OS/2
+   (eComStation) version at
    http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&button=Search&key=postgre
    SQL&stype=all&sort=type&dir=%2F.
    
@@ -391,7 +392,7 @@
   
    There are a large number of GUI Tools that are available for
    PostgreSQL from both commercial and open source developers. A detailed
-   list can be found in the PostgreSQL Community Documentation
+   list can be found in the Community Guide to PostgreSQL GUI Tools.
      _________________________________________________________________
    
                           Administrative Questions
@@ -818,7 +819,8 @@
   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.
+   http://wiki.postgresql.org/wiki/Return_more_than_one_row_of_data_from_
+   PL/pgSQL_functions.
    
   4.19) Why do I get "relation with OID ##### does not exist" errors when
   accessing temporary tables in PL/PgSQL functions?

diff --git a/doc/src/FAQ/FAQ.html b/doc/src/FAQ/FAQ.html
index c4b65d9aee5f255e386361d7f40bb61f741877a8..cf0fc8b0d695f79e53fcca5fa63c320f19cdd45d 100644 (file)
--- 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: Fri Apr 25 10:34:17 EDT 2008</P>
+    <P>Last updated: Wed Jun 25 23:02:18 EDT 2008</P>
 
     <P>Current maintainer: Bruce Momjian (<A href=
     "mailto:bruce@momjian.us">bruce@momjian.us</A>)
@@ -210,12 +210,12 @@
 
     <P>PostgreSQL also runs natively on Microsoft Windows NT-based operating
     systems like Win2000 SP4, WinXP, and Win2003.  A prepackaged installer is
-    available at <a href= "http://pgfoundry.org/projects/pginstaller">
-    http://pgfoundry.org/projects/pginstaller</a>.  MSDOS-based versions
+    available at <a href= "http://www.postgresql.org/download/windows">
+    http://www.postgresql.org/download/windows</a>.  MSDOS-based versions
     of Windows (Win95, Win98, WinMe) can run PostgreSQL using Cygwin.</P>
 
     <p>There is also a Novell Netware 6 port at
-    <a href="http://forge.novell.com">http://forge.novell.com</a>,
+    <a href="http://developer.novell.com/wiki/index.php/Postgresql">http://developer.novell.com/wiki/index.php/Postgresql</a>,
     and an OS/2 (eComStation) version at <a href=
     "http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&amp;button=Search&amp;key=postgreSQL&amp;stype=all&amp;sort=type&amp;dir=%2F">
     http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&amp;button=Search&amp;key=postgreSQL&amp;stype=all&amp;sort=type&amp;dir=%2F</a>.</p>
@@ -514,8 +514,8 @@
 
     <P>There are a large number of GUI Tools that are available for PostgreSQL
     from both commercial and open source developers. A detailed list can be
-    found in the <A href="http://www.postgresql.org/docs/techdocs.54">
-    PostgreSQL Community Documentation</A></P>
+    found in the <A href="http://wiki.postgresql.org/wiki/Community_Guide_to_PostgreSQL_GUI_Tools">
+    Community Guide to PostgreSQL GUI Tools</A>.</P>
 
     <HR>
 
@@ -1072,8 +1072,8 @@ length</TD></TR>
     columns from a function?</H3>
 
     <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>
+    <a href="http://wiki.postgresql.org/wiki/Return_more_than_one_row_of_data_from_PL/pgSQL_functions">
+    http://wiki.postgresql.org/wiki/Return_more_than_one_row_of_data_from_PL/pgSQL_functions</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