diff --git a/doc/src/sgml/ref/initlocation.sgml b/doc/src/sgml/ref/initlocation.sgml
index 92b57502ef..3f0bbad579 100644
--- a/doc/src/sgml/ref/initlocation.sgml
+++ b/doc/src/sgml/ref/initlocation.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/initlocation.sgml,v 1.8 2000/05/26 02:07:15 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/initlocation.sgml,v 1.9 2000/05/26 15:47:17 momjian Exp $
 Postgres documentation
 -->
 
@@ -95,6 +95,11 @@ initlocation <replaceable class="parameter">directory</replaceable>
    To create a database in an alternate location, using an environment variable:
 <programlisting>
 $ export PGDATA2=/opt/postgres/data
+</programlisting>
+Start and stop postmaster so it sees the $PGDATA2 environment variable.
+The system must be configured so the postmaster sees $PGDATA2 every time it
+starts.
+<programlisting>
 $ initlocation PGDATA2
 $ createdb -D 'PGDATA2' 'testdb' 
 </programlisting>
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index cce149869f..8e988c47d9 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.30 2000/05/12 16:13:44 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.31 2000/05/26 15:47:18 momjian Exp $
  */
 #include "postgres.h"
 #include "help.h"
@@ -300,6 +300,9 @@ helpSQL(const char *topic)
 					   "Description: %s\n"
 					   "Syntax:\n%s\n\n",
 					 QL_HELP[i].cmd, QL_HELP[i].help, QL_HELP[i].syntax);
+				/* If we have an exact match, exit.  Fixes \h SELECT */
+				if (strcasecmp(topic, QL_HELP[i].cmd) == 0)
+					break;
 			}
 		}