Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 8c6147b

Browse files
committed
Revert cosmetic synopsis changes that break psql translations.
1 parent edf3832 commit 8c6147b

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

doc/src/sgml/ref/alter_database.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_database.sgml,v 1.14 2005/01/04 00:39:53 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_database.sgml,v 1.15 2005/01/05 14:22:39 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -25,7 +25,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET <replacea
2525

2626
ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>newname</replaceable>
2727

28-
ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> OWNER TO <replaceable>newowner</replaceable>
28+
ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> OWNER TO <replaceable>new_owner</replaceable>
2929
</synopsis>
3030
</refsynopsisdiv>
3131

@@ -110,7 +110,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> OWNER TO <repla
110110
</varlistentry>
111111

112112
<varlistentry>
113-
<term><replaceable class="parameter">newowner</replaceable></term>
113+
<term><replaceable class="parameter">new_owner</replaceable></term>
114114
<listitem>
115115
<para>
116116
The new owner of the database.

doc/src/sgml/ref/alter_user.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.35 2005/01/04 00:39:53 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.36 2005/01/05 14:22:39 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -24,9 +24,9 @@ ALTER USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replace
2424

2525
where <replaceable class="PARAMETER">option</replaceable> can be:
2626

27-
CREATEDB | NOCREATEDB
27+
[ ENCRYPTED | UNENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>'
28+
| CREATEDB | NOCREATEDB
2829
| CREATEUSER | NOCREATEUSER
29-
| [ ENCRYPTED | UNENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>'
3030
| VALID UNTIL '<replaceable class="PARAMETER">abstime</replaceable>'
3131

3232
ALTER USER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>newname</replaceable>

doc/src/sgml/ref/create_table_as.sgml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/create_table_as.sgml,v 1.27 2005/01/04 00:39:53 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/create_table_as.sgml,v 1.28 2005/01/05 14:22:39 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -20,8 +20,7 @@ PostgreSQL documentation
2020

2121
<refsynopsisdiv>
2222
<synopsis>
23-
CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable>table_name</replaceable>
24-
[ (<replaceable>column_name</replaceable> [, ...] ) ] [ [ WITH | WITHOUT ] OIDS ]
23+
CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable>table_name</replaceable> [ (<replaceable>column_name</replaceable> [, ...] ) ] [ [ WITH | WITHOUT ] OIDS ]
2524
AS <replaceable>query</replaceable>
2625
</synopsis>
2726
</refsynopsisdiv>

doc/src/sgml/ref/create_user.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/create_user.sgml,v 1.34 2005/01/04 00:39:53 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/create_user.sgml,v 1.35 2005/01/05 14:22:39 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -25,10 +25,10 @@ CREATE USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
2525
where <replaceable class="PARAMETER">option</replaceable> can be:
2626

2727
SYSID <replaceable class="PARAMETER">uid</replaceable>
28+
| [ ENCRYPTED | UNENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>'
2829
| CREATEDB | NOCREATEDB
2930
| CREATEUSER | NOCREATEUSER
3031
| IN GROUP <replaceable class="PARAMETER">groupname</replaceable> [, ...]
31-
| [ ENCRYPTED | UNENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>'
3232
| VALID UNTIL '<replaceable class="PARAMETER">abstime</replaceable>'
3333
</synopsis>
3434
</refsynopsisdiv>

0 commit comments

Comments
 (0)