diff --git a/doc/TODO b/doc/TODO
index c45e7304dd8b3d56d12eeb6e76df83e919e09bd9..894c29f5b34a0c396817c7c1d461bda9410764ad 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,6 +1,6 @@
 TODO list for PostgreSQL
 ========================
-Last updated:		Sat Feb 23 16:51:48 EST 2002
+Last updated:		Sun Feb 24 22:35:16 EST 2002
 
 Current maintainer:	Bruce Momjian (pgman@candle.pha.pa.us)
 
@@ -55,9 +55,9 @@ ADMIN
 -----
 
 * Incremental backups
-* Make it easier to create a database owned by someone who can't createdb,
+* -Make it easier to create a database owned by someone who can't createdb,
   perhaps CREATE DATABASE dbname WITH OWNER = "user" (Gavin)
-* Make equals sign optional in CREATE DATABASE WITH param = 'val'
+* -Make equals sign optional in CREATE DATABASE WITH param = 'val'
 * Remove unreferenced table files and temp tables during database vacuum
   or postmaster startup (Bruce)
 * Add table name mapping for numeric file names (Bruce)
diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml
index 0ee73e3726514a5009ceb6ccc220a520a0a55d14..8d69d73dd4796504a8e41f2e8d10e08f4567732c 100644
--- a/doc/src/sgml/ref/create_database.sgml
+++ b/doc/src/sgml/ref/create_database.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_database.sgml,v 1.25 2002/02/25 02:53:46 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_database.sgml,v 1.26 2002/02/25 03:37:13 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -24,10 +24,10 @@ PostgreSQL documentation
   </refsynopsisdivinfo>
   <synopsis>
 CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
-    [ WITH [ OWNER <replaceable class="parameter">dbowner</replaceable> ]
-           [ LOCATION '<replaceable class="parameter">dbpath</replaceable>' ]
-           [ TEMPLATE <replaceable class="parameter">template</replaceable> ]
-           [ ENCODING <replaceable class="parameter">encoding</replaceable> ] ]
+    [ WITH [ OWNER [=] <replaceable class="parameter">dbowner</replaceable> ]
+           [ LOCATION [=] '<replaceable class="parameter">dbpath</replaceable>' ]
+           [ TEMPLATE [=] <replaceable class="parameter">template</replaceable> ]
+           [ ENCODING [=] <replaceable class="parameter">encoding</replaceable> ] ]
   </synopsis>
 
   <refsect2 id="R2-SQL-CREATEDATABASE-1">
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 66c11828b6598e8c2a37fd3863e3047245b2de26..f522769704c023c97abdb4153fe916cd4d54b77f 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.280 2002/02/25 02:53:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.281 2002/02/25 03:37:14 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -3156,8 +3156,8 @@ createdb_opt_item:  LOCATION opt_equal Sconst
 		;
 
 /*
- *	Optional equals is here only for backward compatibility.
- *	Should be removed someday.  bjm 2002-02-24
+ *	Though the equals sign doesn't match other WITH options, pg_dump uses
+ *  equals for backward compability, and it doesn't seem worth remove it.
  */
 opt_equal: '='								{ $$ = TRUE; }
 		| /*EMPTY*/							{ $$ = FALSE; }