diff --git a/doc/FAQ b/doc/FAQ
index 8963841dea38fd85fc1f329fa373c2ed087abd0f..10743b4883bbd9375697601196ab0fd09e9e7055 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -1,7 +1,7 @@
 
                 Frequently Asked Questions (FAQ) for PostgreSQL
                                        
-   Last updated: Sat Jun 3 20:17:01 EDT 2006
+   Last updated: Wed Jun 7 17:22:48 EDT 2006
    
    Current maintainer: Bruce Momjian (pgman@candle.pha.pa.us)
    
@@ -519,7 +519,7 @@
    
    One limitation is that indexes can not be created on columns longer
    than about 2,000 characters. Fortunately, such indexes are rarely
-   needed. Uniqueness is best guaranteed by a funtion index of an MD5
+   needed. Uniqueness is best guaranteed by a function index of an MD5
    hash of the long column, and full text indexing allows for searching
    of words within the column.
    
@@ -620,8 +620,8 @@
     FROM tab
     WHERE lower(col) = 'abc';
 
-   This will not use an standard index. However, if you create a
-   expresssion index, it will be used:
+   This will not use an standard index. However, if you create an
+   expression index, it will be used:
     CREATE INDEX tabindex ON tab (lower(col));
 
    If the above index is created as UNIQUE, though the column can store
@@ -726,7 +726,7 @@
   4.12) What is an OID? What is a CTID?
   
    Every row that is created in PostgreSQL gets a unique OID unless
-   created WITHOUT OIDS. OIDs are autotomatically assigned unique 4-byte
+   created WITHOUT OIDS. OIDs are automatically assigned unique 4-byte
    integers that are unique across the entire installation. However, they
    overflow at 4 billion, and then the OIDs start being duplicated.
    PostgreSQL uses OIDs to link its internal system tables together.
diff --git a/doc/src/FAQ/FAQ.html b/doc/src/FAQ/FAQ.html
index b47544feeb5bb1bfebea904c4a8d8881eadd4dba..b20ba4b09483cf040a22b8fccb2aefb9223e61e8 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: Sat Jun  3 20:17:01 EDT 2006</P>
+    <P>Last updated: Wed Jun  7 17:22:48 EDT 2006</P>
 
     <P>Current maintainer: Bruce Momjian (<A href=
     "mailto:pgman@candle.pha.pa.us">pgman@candle.pha.pa.us</A>)
@@ -694,7 +694,7 @@ table?</TD><TD>unlimited</TD></TR>
 
     <P>One limitation is that indexes can not be created on columns
     longer than about 2,000 characters. Fortunately, such indexes are
-    rarely needed. Uniqueness is best guaranteed by a funtion index
+    rarely needed. Uniqueness is best guaranteed by a function index
     of an MD5 hash of the long column, and full text indexing
     allows for searching of words within the column.</P>
 
@@ -812,8 +812,8 @@ table?</TD><TD>unlimited</TD></TR>
     FROM tab
     WHERE lower(col) = 'abc';
 </PRE>
-    This will not use an standard index. However, if you create a
-    expresssion index, it will be used: 
+    This will not use an standard index. However, if you create an
+    expression index, it will be used: 
 <PRE>
     CREATE INDEX tabindex ON tab (lower(col));
 </PRE>
@@ -957,7 +957,7 @@ length</TD></TR>
 
     <P>Every row that is created in PostgreSQL gets a unique
     <SMALL>OID</SMALL> unless created <SMALL>WITHOUT OIDS</SMALL>.
-    O<SMALL>ID</SMALL>s are autotomatically assigned unique 4-byte
+    O<SMALL>ID</SMALL>s are automatically assigned unique 4-byte
     integers that are unique across the entire installation.  However,
     they overflow at 4 billion, and then the O<SMALL>ID</SMALL>s start
     being duplicated. PostgreSQL uses <SMALL>OID</SMALL>s to link its