Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit20f7f01

Browse files
committed
Easier to translate psql help
Instead of requiring translators to translate the entire SQL commandsynopses, change create_help.pl to only require them to translate theplaceholders, and paste those into the synopsis using a printf mechanism.Make some small updates to the markup to make it easier to parse.Note: This causes msgmerge of gettext 0.17 to segfault. You will needthe patch fromhttps://savannah.gnu.org/bugs/?27474 to make it work.msgmerge usually only runs on babel.postgresql.org, however.
1 parentef96196 commit20f7f01

21 files changed

+139
-71
lines changed

‎doc/src/sgml/ref/alter_database.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/alter_database.sgml,v 1.22 2008/11/14 10:22:45 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_database.sgml,v 1.23 2009/09/18 05:00:41 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -23,7 +23,7 @@ PostgreSQL documentation
2323
<synopsis>
2424
ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
2525

26-
where <replaceable class="PARAMETER">option</replaceable> can be:
26+
<phrase>where <replaceable class="PARAMETER">option</replaceable> can be:</phrase>
2727

2828
CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable>
2929

‎doc/src/sgml/ref/alter_function.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/alter_function.sgml,v 1.17 2008/11/14 10:22:45 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_function.sgml,v 1.18 2009/09/18 05:00:41 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -30,7 +30,7 @@ ALTER FUNCTION <replaceable>name</replaceable> ( [ [ <replaceable class="paramet
3030
ALTER FUNCTION <replaceable>name</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] )
3131
SET SCHEMA <replaceable>new_schema</replaceable>
3232

33-
where <replaceable class="PARAMETER">action</replaceable> is one of:
33+
<phrase>where <replaceable class="PARAMETER">action</replaceable> is one of:</phrase>
3434

3535
CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT
3636
IMMUTABLE | STABLE | VOLATILE

‎doc/src/sgml/ref/alter_role.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/alter_role.sgml,v 1.12 2009/03/28 03:26:02 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_role.sgml,v 1.13 2009/09/18 05:00:41 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -23,7 +23,7 @@ PostgreSQL documentation
2323
<synopsis>
2424
ALTER ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
2525

26-
where <replaceable class="PARAMETER">option</replaceable> can be:
26+
<phrase>where <replaceable class="PARAMETER">option</replaceable> can be:</phrase>
2727

2828
SUPERUSER | NOSUPERUSER
2929
| CREATEDB | NOCREATEDB

‎doc/src/sgml/ref/alter_table.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/alter_table.sgml,v 1.108 2009/08/02 22:14:51 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.109 2009/09/18 05:00:41 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -30,7 +30,7 @@ ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
3030
ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
3131
SET SCHEMA <replaceable class="PARAMETER">new_schema</replaceable>
3232

33-
where <replaceable class="PARAMETER">action</replaceable> is one of:
33+
<phrase>where <replaceable class="PARAMETER">action</replaceable> is one of:</phrase>
3434

3535
ADD [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> <replaceable class="PARAMETER">type</replaceable> [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ]
3636
DROP [ COLUMN ] [ IF EXISTS ] <replaceable class="PARAMETER">column</replaceable> [ RESTRICT | CASCADE ]

‎doc/src/sgml/ref/alter_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/alter_user.sgml,v 1.45 2008/11/14 10:22:45 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.46 2009/09/18 05:00:41 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -23,7 +23,7 @@ PostgreSQL documentation
2323
<synopsis>
2424
ALTER USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
2525

26-
where <replaceable class="PARAMETER">option</replaceable> can be:
26+
<phrase>where <replaceable class="PARAMETER">option</replaceable> can be:</phrase>
2727

2828
SUPERUSER | NOSUPERUSER
2929
| CREATEDB | NOCREATEDB

‎doc/src/sgml/ref/begin.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/begin.sgml,v 1.37 2008/11/14 10:22:45 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/begin.sgml,v 1.38 2009/09/18 05:00:41 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -23,7 +23,7 @@ PostgreSQL documentation
2323
<synopsis>
2424
BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</replaceable> [, ...] ]
2525

26-
where <replaceable class="parameter">transaction_mode</replaceable> is one of:
26+
<phrase>where <replaceable class="parameter">transaction_mode</replaceable> is one of:</phrase>
2727

2828
ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ UNCOMMITTED }
2929
READ WRITE | READ ONLY

‎doc/src/sgml/ref/create_domain.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/create_domain.sgml,v 1.32 2008/11/14 10:22:46 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/create_domain.sgml,v 1.33 2009/09/18 05:00:41 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -22,10 +22,10 @@ PostgreSQL documentation
2222
<refsynopsisdiv>
2323
<synopsis>
2424
CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replaceable class="parameter">data_type</replaceable>
25-
[ DEFAULT <replaceable>expression</> ]
25+
[ DEFAULT <replaceable>expression</replaceable> ]
2626
[ <replaceable class="PARAMETER">constraint</replaceable> [ ... ] ]
2727

28-
where <replaceable class="PARAMETER">constraint</replaceable> is:
28+
<phrase>where <replaceable class="PARAMETER">constraint</replaceable> is:</phrase>
2929

3030
[ CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ]
3131
{ NOT NULL | NULL | CHECK (<replaceable class="PARAMETER">expression</replaceable>) }

‎doc/src/sgml/ref/create_group.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_group.sgml,v 1.19 2008/11/14 10:22:46 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/create_group.sgml,v 1.20 2009/09/18 05:00:41 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -23,7 +23,7 @@ PostgreSQL documentation
2323
<synopsis>
2424
CREATE GROUP <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
2525

26-
where <replaceable class="PARAMETER">option</replaceable> can be:
26+
<phrase>where <replaceable class="PARAMETER">option</replaceable> can be:</phrase>
2727

2828
SUPERUSER | NOSUPERUSER
2929
| CREATEDB | NOCREATEDB

‎doc/src/sgml/ref/create_role.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_role.sgml,v 1.11 2008/11/14 10:22:46 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/create_role.sgml,v 1.12 2009/09/18 05:00:41 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -23,7 +23,7 @@ PostgreSQL documentation
2323
<synopsis>
2424
CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
2525

26-
where <replaceable class="PARAMETER">option</replaceable> can be:
26+
<phrase>where <replaceable class="PARAMETER">option</replaceable> can be:</phrase>
2727

2828
SUPERUSER | NOSUPERUSER
2929
| CREATEDB | NOCREATEDB

‎doc/src/sgml/ref/create_table.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.115 2009/07/29 20:56:17 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.116 2009/09/18 05:00:41 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -22,7 +22,7 @@ PostgreSQL documentation
2222
<refsynopsisdiv>
2323
<synopsis>
2424
CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable class="PARAMETER">table_name</replaceable> ( [
25-
{ <replaceable class="PARAMETER">column_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [ DEFAULT <replaceable>default_expr</> ] [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ]
25+
{ <replaceable class="PARAMETER">column_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [ DEFAULT <replaceable>default_expr</replaceable> ] [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ]
2626
| <replaceable>table_constraint</replaceable>
2727
| LIKE <replaceable>parent_table</replaceable> [ { INCLUDING | EXCLUDING } { DEFAULTS | CONSTRAINTS | INDEXES } ] ... }
2828
[, ... ]
@@ -32,7 +32,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable class="PAR
3232
[ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]
3333
[ TABLESPACE <replaceable class="PARAMETER">tablespace</replaceable> ]
3434

35-
where <replaceable class="PARAMETER">column_constraint</replaceable> is:
35+
<phrase>where <replaceable class="PARAMETER">column_constraint</replaceable> is:</phrase>
3636

3737
[ CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ]
3838
{ NOT NULL |
@@ -44,7 +44,7 @@ where <replaceable class="PARAMETER">column_constraint</replaceable> is:
4444
[ ON DELETE <replaceable class="parameter">action</replaceable> ] [ ON UPDATE <replaceable class="parameter">action</replaceable> ] }
4545
[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
4646

47-
and <replaceable class="PARAMETER">table_constraint</replaceable> is:
47+
<phrase>and <replaceable class="PARAMETER">table_constraint</replaceable> is:</phrase>
4848

4949
[ CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ]
5050
{ UNIQUE ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] ) <replaceable class="PARAMETER">index_parameters</replaceable> |
@@ -54,7 +54,7 @@ and <replaceable class="PARAMETER">table_constraint</replaceable> is:
5454
[ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE <replaceable class="parameter">action</replaceable> ] [ ON UPDATE <replaceable class="parameter">action</replaceable> ] }
5555
[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
5656

57-
<replaceable class="PARAMETER">index_parameters</replaceable> in <literal>UNIQUE</> and <literal>PRIMARY KEY</> constraints are:
57+
<phrase><replaceable class="PARAMETER">index_parameters</replaceable> in <literal>UNIQUE</literal> and <literal>PRIMARY KEY</literal> constraints are:</phrase>
5858

5959
[ WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] ) ]
6060
[ USING INDEX TABLESPACE <replaceable class="PARAMETER">tablespace</replaceable> ]

‎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.41 2008/11/14 10:22:46 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/create_user.sgml,v 1.42 2009/09/18 05:00:42 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -23,7 +23,7 @@ PostgreSQL documentation
2323
<synopsis>
2424
CREATE USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
2525

26-
where <replaceable class="PARAMETER">option</replaceable> can be:
26+
<phrase>where <replaceable class="PARAMETER">option</replaceable> can be:</phrase>
2727

2828
SUPERUSER | NOSUPERUSER
2929
| CREATEDB | NOCREATEDB

‎doc/src/sgml/ref/fetch.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/fetch.sgml,v 1.43 2009/04/10 17:56:21 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/fetch.sgml,v 1.44 2009/09/18 05:00:42 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -28,7 +28,7 @@ PostgreSQL documentation
2828
<synopsis>
2929
FETCH [ <replaceable class="PARAMETER">direction</replaceable> { FROM | IN } ] <replaceable class="PARAMETER">cursorname</replaceable>
3030

31-
where <replaceable class="PARAMETER">direction</replaceable> can be empty or one of:
31+
<phrase>where <replaceable class="PARAMETER">direction</replaceable> can be empty or one of:</phrase>
3232

3333
NEXT
3434
PRIOR

‎doc/src/sgml/ref/grant.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/grant.sgml,v 1.75 2009/09/12 16:26:06 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/grant.sgml,v 1.76 2009/09/18 05:00:42 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -41,11 +41,11 @@ GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }
4141
TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
4242

4343
GRANT { USAGE | ALL [ PRIVILEGES ] }
44-
ON FOREIGN DATA WRAPPER <replaceable>fdwname</> [, ...]
44+
ON FOREIGN DATA WRAPPER <replaceable>fdwname</replaceable> [, ...]
4545
TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
4646

4747
GRANT { USAGE | ALL [ PRIVILEGES ] }
48-
ON FOREIGN SERVER <replaceable>servername</> [, ...]
48+
ON FOREIGN SERVER <replaceable>servername</replaceable> [, ...]
4949
TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
5050

5151
GRANT { EXECUTE | ALL [ PRIVILEGES ] }
@@ -61,7 +61,7 @@ GRANT { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }
6161
TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
6262

6363
GRANT { CREATE | ALL [ PRIVILEGES ] }
64-
ON TABLESPACE <replaceable>tablespacename</> [, ...]
64+
ON TABLESPACE <replaceable>tablespacename</replaceable> [, ...]
6565
TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
6666

6767
GRANT <replaceable class="PARAMETER">role</replaceable> [, ...] TO <replaceable class="PARAMETER">rolename</replaceable> [, ...] [ WITH ADMIN OPTION ]

‎doc/src/sgml/ref/lock.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/lock.sgml,v 1.52 2009/01/12 08:54:25 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/lock.sgml,v 1.53 2009/09/18 05:00:42 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -23,7 +23,7 @@ PostgreSQL documentation
2323
<synopsis>
2424
LOCK [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ IN <replaceable class="PARAMETER">lockmode</replaceable> MODE ] [ NOWAIT ]
2525

26-
where <replaceable class="PARAMETER">lockmode</replaceable> is one of:
26+
<phrase>where <replaceable class="PARAMETER">lockmode</replaceable> is one of:</phrase>
2727

2828
ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE
2929
| SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE

‎doc/src/sgml/ref/select.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/select.sgml,v 1.124 2009/08/27 20:08:02 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/select.sgml,v 1.125 2009/09/18 05:00:42 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -47,7 +47,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac
4747
[ FETCH { FIRST | NEXT } [ <replaceable class="parameter">count</replaceable> ] { ROW | ROWS } ONLY ]
4848
[ FOR { UPDATE | SHARE } [ OF <replaceable class="parameter">table_name</replaceable> [, ...] ] [ NOWAIT ] [...] ]
4949

50-
where <replaceable class="parameter">from_item</replaceable> can be one of:
50+
<phrase>where <replaceable class="parameter">from_item</replaceable> can be one of:</phrase>
5151

5252
[ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [ [ AS ] <replaceable class="parameter">alias</replaceable> [ ( <replaceable class="parameter">column_alias</replaceable> [, ...] ) ] ]
5353
( <replaceable class="parameter">select</replaceable> ) [ AS ] <replaceable class="parameter">alias</replaceable> [ ( <replaceable class="parameter">column_alias</replaceable> [, ...] ) ]
@@ -56,7 +56,7 @@ where <replaceable class="parameter">from_item</replaceable> can be one of:
5656
<replaceable class="parameter">function_name</replaceable> ( [ <replaceable class="parameter">argument</replaceable> [, ...] ] ) AS ( <replaceable class="parameter">column_definition</replaceable> [, ...] )
5757
<replaceable class="parameter">from_item</replaceable> [ NATURAL ] <replaceable class="parameter">join_type</replaceable> <replaceable class="parameter">from_item</replaceable> [ ON <replaceable class="parameter">join_condition</replaceable> | USING ( <replaceable class="parameter">join_column</replaceable> [, ...] ) ]
5858

59-
and <replaceable class="parameter">with_query</replaceable> is:
59+
<phrase>and <replaceable class="parameter">with_query</replaceable> is:</phrase>
6060

6161
<replaceable class="parameter">with_query_name</replaceable> [ ( <replaceable class="parameter">column_name</replaceable> [, ...] ) ] AS ( <replaceable class="parameter">select</replaceable> )
6262

‎doc/src/sgml/ref/set_transaction.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/set_transaction.sgml,v 1.26 2008/11/14 10:22:47 petere Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/set_transaction.sgml,v 1.27 2009/09/18 05:00:42 petere Exp $ -->
22
<refentry id="SQL-SET-TRANSACTION">
33
<refmeta>
44
<refentrytitle id="SQL-SET-TRANSACTION-TITLE">SET TRANSACTION</refentrytitle>
@@ -20,7 +20,7 @@
2020
SET TRANSACTION <replaceable class="parameter">transaction_mode</replaceable> [, ...]
2121
SET SESSION CHARACTERISTICS AS TRANSACTION <replaceable class="parameter">transaction_mode</replaceable> [, ...]
2222

23-
where <replaceable class="parameter">transaction_mode</replaceable> is one of:
23+
<phrase>where <replaceable class="parameter">transaction_mode</replaceable> is one of:</phrase>
2424

2525
ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ UNCOMMITTED }
2626
READ WRITE | READ ONLY

‎doc/src/sgml/ref/start_transaction.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/start_transaction.sgml,v 1.17 2008/11/14 10:22:47 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/start_transaction.sgml,v 1.18 2009/09/18 05:00:42 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -23,7 +23,7 @@ PostgreSQL documentation
2323
<synopsis>
2424
START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable> [, ...] ]
2525

26-
where <replaceable class="parameter">transaction_mode</replaceable> is one of:
26+
<phrase>where <replaceable class="parameter">transaction_mode</replaceable> is one of:</phrase>
2727

2828
ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ UNCOMMITTED }
2929
READ WRITE | READ ONLY

‎src/bin/psql/Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.65 2009/08/28 20:26:19 petere Exp $
8+
# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.66 2009/09/18 05:00:42 petere Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -22,6 +22,7 @@ override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) -I$(top_srcdir)/src/bin/p
2222
OBJS=command.o common.o help.o input.o stringutils.o mainloop.o copy.o\
2323
startup.o prompt.o variables.o large_obj.o print.o describe.o\
2424
psqlscan.o tab-complete.o mbprint.o dumputils.o keywords.o kwlookup.o\
25+
sql_help.o\
2526
$(WIN32RES)
2627

2728
FLEXFLAGS = -Cfe
@@ -40,8 +41,9 @@ dumputils.c keywords.c: % : $(top_srcdir)/src/bin/pg_dump/%
4041
kwlookup.c:% :$(top_srcdir)/src/backend/parser/%
4142
rm -f$@&&$(LN_S)$<.
4243

44+
sql_help.c: sql_help.h ;
4345
sql_help.h: create_help.pl$(wildcard$(REFDOCDIR)/*.sgml)
44-
$(PERL)$<$(REFDOCDIR)$@
46+
$(PERL)$<$(REFDOCDIR)$*
4547

4648
psqlscan.c: psqlscan.l
4749
ifdefFLEX
@@ -67,4 +69,4 @@ clean distclean:
6769
rm -f psql$(X)$(OBJS) dumputils.c keywords.c kwlookup.c
6870

6971
maintainer-clean: distclean
70-
rm -f sql_help.h psqlscan.c
72+
rm -f sql_help.hsql_help.cpsqlscan.c

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp