Update examples of create/drop scripts.

diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index 71faa27d0919fe071d7254cc8ba13ccbcc587d6e..7ccdaf9754ed1d5e9050d02fd01b7d6be403f29f 100644 (file)
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -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 8d22fc065345073337bdfa7c7408a4fa7eb6fcc8..495db8f797d25326c7f69e9d5f13c66fcaf16592 100644 (file)
--- a/doc/src/sgml/ref/createuser.sgml
+++ b/doc/src/sgml/ref/createuser.sgml
@@ -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 66735651cc956a089a339b567ea22f0ac3c87bc2..b5ba038056eadfc174a7b15807af8e598fb0cdf4 100644 (file)
--- a/doc/src/sgml/ref/dropdb.sgml
+++ b/doc/src/sgml/ref/dropdb.sgml
@@ -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 2aa1f5f008f89b83e2ac81ae89d3652a674dba65..24cd5f337f19bbc4a609e8ee400ce32889afc9f0 100644 (file)
--- a/doc/src/sgml/ref/dropuser.sgml
+++ b/doc/src/sgml/ref/dropuser.sgml
@@ -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 473b36f456857439051810265b643022e131d9b5..ef394a7810af046bde15bf1b11935c1e43bd4fe9 100644 (file)
--- a/doc/src/sgml/start.sgml
+++ b/doc/src/sgml/start.sgml
@@ -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>