diff --git a/doc/src/sgml/ref/createuser.sgml b/doc/src/sgml/ref/createuser.sgml
index 3656349f5e3604ffa7c448f5b78c69c333eb208e..3f3b2c8cdcd36fd645de72a1a514138f3d18e26b 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.42 2005/08/14 20:16:02 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/createuser.sgml,v 1.43 2005/09/30 07:13:53 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -186,7 +186,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-c <replaceable class="parameter">number</replaceable></></term>
-      <term><option>--conn-limit <replaceable class="parameter">number</replaceable></></term>
+      <term><option>--connection-limit <replaceable class="parameter">number</replaceable></></term>
       <listitem>
        <para>
         Set a maximum number of connections for the new user.
diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index eba4d1be52238078b1e920428e6d2ffbf3d9bfda..46bcfc42e30d5d434ad1d0847f286b9efa554392 100644
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.18 2005/08/14 20:16:03 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.19 2005/09/30 07:13:54 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,7 +41,7 @@ main(int argc, char *argv[])
 		/* adduser is obsolete, undocumented spelling of superuser */
 		{"adduser", no_argument, NULL, 'a'},
 		{"no-adduser", no_argument, NULL, 'A'},
-		{"conn-limit", required_argument, NULL, 'c'},
+		{"connection-limit", required_argument, NULL, 'c'},
 		{"pwprompt", no_argument, NULL, 'P'},
 		{"encrypted", no_argument, NULL, 'E'},
 		{"unencrypted", no_argument, NULL, 'N'},
@@ -315,7 +315,7 @@ help(const char *progname)
 	printf(_("  -i, --inherit             role inherits permissions of roles\n"));
 	printf(_("                            it is a member of (default)\n"));
 	printf(_("  -I, --no-inherit          role does not inherit permissions\n"));
-	printf(_("  -c, --conn-limit=N        max connections for role (default: no limit)\n"));
+	printf(_("  -c, --connection-limit=N  connection limit for role (default: no limit)\n"));
 	printf(_("  -P, --pwprompt            assign a password to new role\n"));
 	printf(_("  -E, --encrypted           encrypt stored password\n"));
 	printf(_("  -N, --unencrypted         do not encrypt stored password\n"));