diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index caffb5c35a..3b12e94f79 100644
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.45 2007/06/04 10:02:40 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.46 2007/06/21 10:43:09 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -265,10 +265,7 @@ PostgreSQL documentation
     database server:
 <screen>
 <prompt>$ </prompt><userinput>createdb demo</userinput>
-<computeroutput>CREATE DATABASE</computeroutput>
 </screen>
-    The response is the same as you would have gotten from running the
-    <command>CREATE DATABASE</command> <acronym>SQL</acronym> command.
    </para>
 
    <para>
@@ -278,8 +275,7 @@ PostgreSQL documentation
     underlying command:
 <screen>
 <prompt>$ </prompt><userinput>createdb -p 5000 -h eden -E LATIN1 -e demo</userinput>
-<computeroutput>CREATE DATABASE "demo" WITH ENCODING = 'LATIN1'</computeroutput>
-<computeroutput>CREATE DATABASE</computeroutput>
+<computeroutput>CREATE DATABASE demo ENCODING 'LATIN1';</computeroutput>
 </screen>
    </para>
  </refsect1>
diff --git a/doc/src/sgml/ref/createuser.sgml b/doc/src/sgml/ref/createuser.sgml
index eb70ace453..1ce1ae6bb2 100644
--- a/doc/src/sgml/ref/createuser.sgml
+++ b/doc/src/sgml/ref/createuser.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/createuser.sgml,v 1.48 2007/06/04 10:02:40 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/createuser.sgml,v 1.49 2007/06/21 10:43:09 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -358,7 +358,6 @@ PostgreSQL documentation
 <computeroutput>Shall the new role be a superuser? (y/n) </computeroutput><userinput>n</userinput>
 <computeroutput>Shall the new role be allowed to create databases? (y/n) </computeroutput><userinput>n</userinput>
 <computeroutput>Shall the new role be allowed to create more new roles? (y/n) </computeroutput><userinput>n</userinput>
-<computeroutput>CREATE USER</computeroutput>
 </screen>
    </para>
 
@@ -369,7 +368,6 @@ PostgreSQL documentation
 <screen>
 <prompt>$ </prompt><userinput>createuser -h eden -p 5000 -S -D -R -e joe</userinput>
 <computeroutput>CREATE ROLE joe NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;</computeroutput>
-<computeroutput>CREATE ROLE</computeroutput>
 </screen>
    </para>
 
@@ -381,7 +379,6 @@ PostgreSQL documentation
 <computeroutput>Enter password for new role: </computeroutput><userinput>xyzzy</userinput>
 <computeroutput>Enter it again: </computeroutput><userinput>xyzzy</userinput>
 <computeroutput>CREATE ROLE joe PASSWORD 'xyzzy' SUPERUSER CREATEDB CREATEROLE INHERIT LOGIN;</computeroutput>
-<computeroutput>CREATE ROLE</computeroutput>
 </screen>
     In the above example, the new password isn't actually echoed when typed,
     but we show what was typed for clarity.  However the password
diff --git a/doc/src/sgml/ref/dropdb.sgml b/doc/src/sgml/ref/dropdb.sgml
index 4904bdd64b..b60c7a8252 100644
--- a/doc/src/sgml/ref/dropdb.sgml
+++ b/doc/src/sgml/ref/dropdb.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.32 2007/06/04 10:02:40 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.33 2007/06/21 10:43:09 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -192,7 +192,6 @@ PostgreSQL documentation
     database server:
 <screen>
 <prompt>$ </prompt><userinput>dropdb demo</userinput>
-<computeroutput>DROP DATABASE</computeroutput>
 </screen>
    </para>
 
@@ -204,8 +203,7 @@ PostgreSQL documentation
 <prompt>$ </prompt><userinput>dropdb -p 5000 -h eden -i -e demo</userinput>
 <computeroutput>Database "demo" will be permanently deleted.
 Are you sure? (y/n) </computeroutput><userinput>y</userinput>
-<computeroutput>DROP DATABASE "demo"
-DROP DATABASE</computeroutput>
+<computeroutput>DROP DATABASE demo;</computeroutput>
 </screen>
    </para>
  </refsect1>
diff --git a/doc/src/sgml/ref/dropuser.sgml b/doc/src/sgml/ref/dropuser.sgml
index a4e2195e21..a1d560009e 100644
--- a/doc/src/sgml/ref/dropuser.sgml
+++ b/doc/src/sgml/ref/dropuser.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.37 2007/06/04 10:02:40 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.38 2007/06/21 10:43:09 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -195,7 +195,6 @@ PostgreSQL documentation
     server:
 <screen>
 <prompt>$ </prompt><userinput>dropuser joe</userinput>
-<computeroutput>DROP ROLE</computeroutput>
 </screen>
    </para>
 
@@ -207,8 +206,7 @@ PostgreSQL documentation
 <prompt>$ </prompt><userinput>dropuser -p 5000 -h eden -i -e joe</userinput>
 <computeroutput>Role "joe" will be permanently removed.
 Are you sure? (y/n) </computeroutput><userinput>y</userinput>
-<computeroutput>DROP ROLE "joe"
-DROP ROLE</computeroutput>
+<computeroutput>DROP ROLE joe;</computeroutput>
 </screen>
    </para>
  </refsect1>
diff --git a/doc/src/sgml/start.sgml b/doc/src/sgml/start.sgml
index 360082ff94..c97b953c5a 100644
--- a/doc/src/sgml/start.sgml
+++ b/doc/src/sgml/start.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/start.sgml,v 1.44 2007/01/31 20:56:19 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/start.sgml,v 1.45 2007/06/21 10:43:09 petere Exp $ -->
 
  <chapter id="tutorial-start">
   <title>Getting Started</title>
@@ -154,11 +154,7 @@
 <screen>
 <prompt>$</prompt> <userinput>createdb mydb</userinput>
 </screen>
-    This should produce as response:
-<screen>
-CREATE DATABASE
-</screen>
-    If so, this step was successful and you can skip over the
+    If this produces no response then this step was successful and you can skip over the
     remainder of this section.
    </para>