diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2005-01-05 14:22:39 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2005-01-05 14:22:39 +0000 |
| commit | 8c6147b9114a84644d0fa9a2b49e4e45e471a0d4 (patch) | |
| tree | da6f60e7a2d8ec8ad2c46cc21bbabc6add76162f | |
| parent | edf3832b5c5b3b12528a2208d4e077e2f0d48903 (diff) | |
| download | postgresql-8c6147b9114a84644d0fa9a2b49e4e45e471a0d4.tar.gz | |
Revert cosmetic synopsis changes that break psql translations.
| -rw-r--r-- | doc/src/sgml/ref/alter_database.sgml | 6 | ||||
| -rw-r--r-- | doc/src/sgml/ref/alter_user.sgml | 6 | ||||
| -rw-r--r-- | doc/src/sgml/ref/create_table_as.sgml | 5 | ||||
| -rw-r--r-- | doc/src/sgml/ref/create_user.sgml | 4 |
4 files changed, 10 insertions, 11 deletions
diff --git a/doc/src/sgml/ref/alter_database.sgml b/doc/src/sgml/ref/alter_database.sgml index 6028706546..c209308716 100644 --- a/doc/src/sgml/ref/alter_database.sgml +++ b/doc/src/sgml/ref/alter_database.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_database.sgml,v 1.14 2005/01/04 00:39:53 tgl Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_database.sgml,v 1.15 2005/01/05 14:22:39 petere Exp $ PostgreSQL documentation --> @@ -25,7 +25,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET <replacea ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>newname</replaceable> -ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> OWNER TO <replaceable>newowner</replaceable> +ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> OWNER TO <replaceable>new_owner</replaceable> </synopsis> </refsynopsisdiv> @@ -110,7 +110,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> OWNER TO <repla </varlistentry> <varlistentry> - <term><replaceable class="parameter">newowner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The new owner of the database. diff --git a/doc/src/sgml/ref/alter_user.sgml b/doc/src/sgml/ref/alter_user.sgml index 0bf30d9bf9..9ec5925b49 100644 --- a/doc/src/sgml/ref/alter_user.sgml +++ b/doc/src/sgml/ref/alter_user.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.35 2005/01/04 00:39:53 tgl Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.36 2005/01/05 14:22:39 petere Exp $ PostgreSQL documentation --> @@ -24,9 +24,9 @@ ALTER USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replace where <replaceable class="PARAMETER">option</replaceable> can be: - CREATEDB | NOCREATEDB + [ ENCRYPTED | UNENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>' + | CREATEDB | NOCREATEDB | CREATEUSER | NOCREATEUSER - | [ ENCRYPTED | UNENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>' | VALID UNTIL '<replaceable class="PARAMETER">abstime</replaceable>' ALTER USER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>newname</replaceable> diff --git a/doc/src/sgml/ref/create_table_as.sgml b/doc/src/sgml/ref/create_table_as.sgml index a232032bf1..7934230859 100644 --- a/doc/src/sgml/ref/create_table_as.sgml +++ b/doc/src/sgml/ref/create_table_as.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/create_table_as.sgml,v 1.27 2005/01/04 00:39:53 tgl Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/create_table_as.sgml,v 1.28 2005/01/05 14:22:39 petere Exp $ PostgreSQL documentation --> @@ -20,8 +20,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable>table_name</replaceable> - [ (<replaceable>column_name</replaceable> [, ...] ) ] [ [ WITH | WITHOUT ] OIDS ] +CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable>table_name</replaceable> [ (<replaceable>column_name</replaceable> [, ...] ) ] [ [ WITH | WITHOUT ] OIDS ] AS <replaceable>query</replaceable> </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/create_user.sgml b/doc/src/sgml/ref/create_user.sgml index 1df1acf2b6..73f88124e8 100644 --- a/doc/src/sgml/ref/create_user.sgml +++ b/doc/src/sgml/ref/create_user.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/create_user.sgml,v 1.34 2005/01/04 00:39:53 tgl Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/create_user.sgml,v 1.35 2005/01/05 14:22:39 petere Exp $ PostgreSQL documentation --> @@ -25,10 +25,10 @@ CREATE USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac where <replaceable class="PARAMETER">option</replaceable> can be: SYSID <replaceable class="PARAMETER">uid</replaceable> + | [ ENCRYPTED | UNENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>' | CREATEDB | NOCREATEDB | CREATEUSER | NOCREATEUSER | IN GROUP <replaceable class="PARAMETER">groupname</replaceable> [, ...] - | [ ENCRYPTED | UNENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>' | VALID UNTIL '<replaceable class="PARAMETER">abstime</replaceable>' </synopsis> </refsynopsisdiv> |