diff --git a/doc/src/sgml/ref/cluster.sgml b/doc/src/sgml/ref/cluster.sgml
index a49d4d7d39..e72a8f61d1 100644
--- a/doc/src/sgml/ref/cluster.sgml
+++ b/doc/src/sgml/ref/cluster.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/cluster.sgml,v 1.21 2002/11/15 03:09:35 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/cluster.sgml,v 1.22 2002/11/18 17:12:06 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -23,7 +23,7 @@ PostgreSQL documentation
   <synopsis>
 CLUSTER <replaceable class="PARAMETER">indexname</replaceable> ON <replaceable class="PARAMETER">tablename</replaceable>
 CLUSTER <replaceable class="PARAMETER">tablename</replaceable>
-CLUSTER ALL
+CLUSTER
   </synopsis>
 
   <refsect2 id="R2-SQL-CLUSTER-1">
@@ -114,8 +114,8 @@ CLUSTER
   </para>
 
   <para>
-   In calls to <command>CLUSTER ALL</command>, all the tables in the database
-   that the calling user owns are clustered using the saved information.  This
+   A simple <command>CLUSTER</command> clusters all the tables in the database
+   that the calling user owns and uses the saved cluster information.  This
    form of <command>CLUSTER</command> cannot be called from inside a
    transaction or function.
   </para>
@@ -225,7 +225,7 @@ CLUSTER emp;
    Cluster all the tables on the database that have previously been clustered:
   </para>
   <programlisting>
-CLUSTER ALL;
+CLUSTER;
   </programlisting>
  </refsect1>
 
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index db78a179b6..1e5a11220c 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.94 2002/11/15 03:09:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.95 2002/11/18 17:12:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -728,7 +728,7 @@ cluster(ClusterStmt *stmt)
 						*rvs;
 
 		/*
-		 * We cannot run CLUSTER ALL inside a user transaction block; if we were inside
+		 * We cannot run CLUSTER inside a user transaction block; if we were inside
 		 * a transaction, then our commit- and start-transaction-command calls
 		 * would not have the intended effect!
 		 */
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 2eef0c0490..0b3bb279d5 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.379 2002/11/15 03:09:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.380 2002/11/18 17:12:07 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -3762,7 +3762,7 @@ CreateConversionStmt:
  *		QUERY:
  *				cluster <index_name> on <qualified_name>
  *				cluster <qualified_name>
- *				cluster ALL
+ *				cluster
  *
  *****************************************************************************/
 
@@ -3781,7 +3781,7 @@ ClusterStmt:
 				   n->indexname = NULL;
 				   $$ = (Node*)n;
 				}
-			| CLUSTER ALL
+			| CLUSTER
 			    {
 				   ClusterStmt *n = makeNode(ClusterStmt);
 				   n->relation = NULL;