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

Commit 8c05ca7

Browse files
author
Neil Conway
committed
SGML cleanup: consistently use "endterm" in <xref>s that link to the
reference page for SQL commands, so that the link text is italicized.
1 parent a2fb7b8 commit 8c05ca7

File tree

8 files changed

+59
-50
lines changed

8 files changed

+59
-50
lines changed

doc/src/sgml/ddl.sgml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.40 2005/03/13 09:36:30 neilc Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.41 2005/06/13 02:40:01 neilc Exp $ -->
22

33
<chapter id="ddl">
44
<title>Data Definition</title>
@@ -1540,14 +1540,14 @@ ALTER TABLE products RENAME TO items;
15401540
There are several different privileges: <literal>SELECT</>,
15411541
<literal>INSERT</>, <literal>UPDATE</>, <literal>DELETE</>,
15421542
<literal>RULE</>, <literal>REFERENCES</>, <literal>TRIGGER</>,
1543-
<literal>CREATE</>, <literal>TEMPORARY</>, <literal>EXECUTE</>,
1544-
and <literal>USAGE</>. The privileges applicable to a particular
1543+
<literal>CREATE</>, <literal>TEMPORARY</>, <literal>EXECUTE</>, and
1544+
<literal>USAGE</>. The privileges applicable to a particular
15451545
object vary depending on the object's type (table, function, etc).
1546-
For complete
1547-
information on the different types of privileges supported by
1548-
<productname>PostgreSQL</productname>, refer to the
1549-
<xref linkend="sql-grant"> reference page. The following sections
1550-
and chapters will also show you how those privileges are used.
1546+
For complete information on the different types of privileges
1547+
supported by <productname>PostgreSQL</productname>, refer to the
1548+
<xref linkend="sql-grant" endterm="sql-grant-title"> reference
1549+
page. The following sections and chapters will also show you how
1550+
those privileges are used.
15511551
</para>
15521552

15531553
<para>
@@ -1558,8 +1558,9 @@ ALTER TABLE products RENAME TO items;
15581558
<note>
15591559
<para>
15601560
To change the owner of a table, index, sequence, or view, use the
1561-
<xref linkend="sql-altertable"> command. There are corresponding
1562-
<literal>ALTER</> commands for other object types.
1561+
<xref linkend="sql-altertable" endterm="sql-altertable-title">
1562+
command. There are corresponding <literal>ALTER</> commands for
1563+
other object types.
15631564
</para>
15641565
</note>
15651566

@@ -1596,14 +1597,15 @@ REVOKE ALL ON accounts FROM PUBLIC;
15961597
</para>
15971598

15981599
<para>
1599-
Ordinarily, only the object's owner (or a superuser) can grant or revoke
1600-
privileges on an object. However, it is possible to grant a privilege
1601-
<quote>with grant option</>, which gives the recipient the right to
1602-
grant it in turn to others. If the grant option is subsequently revoked
1603-
then all who received the privilege from that recipient (directly or
1604-
through a chain of grants) will lose the privilege. For details see
1605-
the <xref linkend="sql-grant"> and <xref linkend="sql-revoke"> reference
1606-
pages.
1600+
Ordinarily, only the object's owner (or a superuser) can grant or
1601+
revoke privileges on an object. However, it is possible to grant a
1602+
privilege <quote>with grant option</>, which gives the recipient
1603+
the right to grant it in turn to others. If the grant option is
1604+
subsequently revoked then all who received the privilege from that
1605+
recipient (directly or through a chain of grants) will lose the
1606+
privilege. For details see the <xref linkend="sql-grant"
1607+
endterm="sql-grant-title"> and <xref linkend="sql-revoke"
1608+
endterm="sql-revoke-title"> reference pages.
16071609
</para>
16081610
</sect1>
16091611

doc/src/sgml/func.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/func.sgml,v 1.253 2005/06/09 16:35:08 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.254 2005/06/13 02:40:04 neilc Exp $
33
PostgreSQL documentation
44
-->
55

@@ -8152,7 +8152,7 @@ select current_date + s.a as dates from generate_series(0,14,7) as s(a);
81528152
<para>
81538153
The <function>session_user</function> is normally the user who initiated
81548154
the current database connection; but superusers can change this setting
8155-
with <xref linkend="sql-set-session-authorization">.
8155+
with <xref linkend="sql-set-session-authorization" endterm="sql-set-session-authorization-title">.
81568156
The <function>current_user</function> is the user identifier
81578157
that is applicable for permission checking. Normally, it is equal
81588158
to the session user, but it changes during the execution of

doc/src/sgml/maintenance.sgml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.43 2005/05/10 22:27:29 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.44 2005/06/13 02:40:04 neilc Exp $
33
-->
44

55
<chapter id="maintenance">
@@ -74,12 +74,13 @@ $PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.43 2005/05/10 22:27:29 momj
7474
</listitem>
7575
</orderedlist>
7676

77-
The frequency and scope of the <command>VACUUM</> operations performed for each of
78-
these reasons will vary depending on the needs of each site.
79-
Therefore, database administrators must understand these issues and
80-
develop an appropriate maintenance strategy. This section concentrates
81-
on explaining the high-level issues; for details about command syntax
82-
and so on, see the <xref linkend="sql-vacuum"> reference page.
77+
The frequency and scope of the <command>VACUUM</> operations
78+
performed for each of these reasons will vary depending on the
79+
needs of each site. Therefore, database administrators must
80+
understand these issues and develop an appropriate maintenance
81+
strategy. This section concentrates on explaining the high-level
82+
issues; for details about command syntax and so on, see the <xref
83+
linkend="sql-vacuum" endterm="sql-vacuum-title"> reference page.
8384
</para>
8485

8586
<para>

doc/src/sgml/manage-ag.sgml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/manage-ag.sgml,v 2.40 2005/01/08 22:13:34 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/manage-ag.sgml,v 2.41 2005/06/13 02:40:04 neilc Exp $
33
-->
44

55
<chapter id="managing-databases">
@@ -88,7 +88,7 @@ SELECT datname FROM pg_database;
8888

8989
<para>
9090
Databases are created with the SQL command
91-
<xref linkend="sql-createdatabase">:<indexterm><primary>CREATE
91+
<xref linkend="sql-createdatabase" endterm="sql-createdatabase-title">:<indexterm><primary>CREATE
9292
DATABASE</></>
9393
<synopsis>
9494
CREATE DATABASE <replaceable>name</>;
@@ -314,7 +314,7 @@ ALTER DATABASE mydb SET geqo TO off;
314314

315315
<para>
316316
Databases are destroyed with the command
317-
<xref linkend="sql-dropdatabase">:<indexterm><primary>DROP DATABASE</></>
317+
<xref linkend="sql-dropdatabase" endterm="sql-dropdatabase-title">:<indexterm><primary>DROP DATABASE</></>
318318
<synopsis>
319319
DROP DATABASE <replaceable>name</>;
320320
</synopsis>
@@ -379,7 +379,8 @@ dropdb <replaceable class="parameter">dbname</replaceable>
379379
</para>
380380

381381
<para>
382-
To define a tablespace, use the <xref linkend="sql-createtablespace">
382+
To define a tablespace, use the <xref
383+
linkend="sql-createtablespace" endterm="sql-createdatabase-title">
383384
command, for example:<indexterm><primary>CREATE TABLESPACE</></>
384385
<programlisting>
385386
CREATE TABLESPACE fastspace LOCATION '/mnt/sda1/postgresql/data';
@@ -459,8 +460,9 @@ CREATE TABLE foo(i int);
459460
</para>
460461

461462
<para>
462-
To remove an empty tablespace, use the <xref linkend="sql-droptablespace">
463-
command.
463+
To remove an empty tablespace, use the <xref
464+
linkend="sql-droptablespace" endterm="sql-droptablespace-title">
465+
command.
464466
</para>
465467

466468
<para>

doc/src/sgml/mvcc.sgml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/mvcc.sgml,v 2.50 2005/04/28 21:47:09 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/mvcc.sgml,v 2.51 2005/06/13 02:40:05 neilc Exp $
33
-->
44

55
<chapter id="mvcc">
@@ -224,7 +224,7 @@ $PostgreSQL: pgsql/doc/src/sgml/mvcc.sgml,v 2.50 2005/04/28 21:47:09 tgl Exp $
224224

225225
<para>
226226
To set the transaction isolation level of a transaction, use the
227-
command <xref linkend="sql-set-transaction">.
227+
command <xref linkend="sql-set-transaction" endterm="sql-set-transaction-title">.
228228
</para>
229229

230230
<sect2 id="xact-read-committed">
@@ -524,7 +524,8 @@ SELECT SUM(value) FROM mytab WHERE class = 2;
524524
The list below shows the available lock modes and the contexts in
525525
which they are used automatically by
526526
<productname>PostgreSQL</productname>. You can also acquire any
527-
of these locks explicitly with the command <xref linkend="sql-lock">.
527+
of these locks explicitly with the command <xref
528+
linkend="sql-lock" endterm="sql-lock-title">.
528529
Remember that all of these lock modes are table-level locks,
529530
even if the name contains the word
530531
<quote>row</quote>; the names of the lock modes are historical.

doc/src/sgml/query.sgml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/query.sgml,v 1.44 2005/03/10 23:21:20 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/query.sgml,v 1.45 2005/06/13 02:40:06 neilc Exp $
33
-->
44

55
<chapter id="tutorial-sql">
@@ -269,7 +269,8 @@ COPY weather FROM '/home/user/weather.txt';
269269
where the file name for the source file must be available to the
270270
backend server machine, not the client, since the backend server
271271
reads the file directly. You can read more about the
272-
<command>COPY</command> command in <xref linkend="sql-copy">.
272+
<command>COPY</command> command in <xref linkend="sql-copy"
273+
endterm="sql-copy-title">.
273274
</para>
274275
</sect1>
275276

doc/src/sgml/ref/psql-ref.sgml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.142 2005/06/10 16:31:48 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.143 2005/06/13 02:40:08 neilc Exp $
33
PostgreSQL documentation
44
-->
55

@@ -1036,9 +1036,9 @@ testdb=&gt;
10361036
</para>
10371037

10381038
<para>
1039-
The commands <xref linkend="SQL-GRANT"> and
1040-
<xref linkend="SQL-REVOKE">
1041-
are used to set access privileges. See <xref linkend="SQL-GRANT">
1039+
The commands <command>GRANT</command> and
1040+
<command>REVOKE</command> are used to set access privileges.
1041+
See <xref linkend="sql-grant" endterm="sql-grant-title">
10421042
for more information.
10431043
</para>
10441044
</listitem>
@@ -1740,10 +1740,10 @@ lo_import 152801
17401740
</para>
17411741

17421742
<para>
1743-
The commands <xref linkend="SQL-GRANT"> and
1744-
<xref linkend="SQL-REVOKE">
1745-
are used to set access privileges. See <xref linkend="SQL-GRANT">
1746-
for more information.
1743+
The commands <command>GRANT</command> and
1744+
<command>REVOKE</command> are used to set access privileges.
1745+
See <xref linkend="sql-grant" endterm="sql-grant-title"> for
1746+
more information.
17471747
</para>
17481748

17491749
<para>

doc/src/sgml/runtime.sgml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.324 2005/06/09 22:35:23 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.325 2005/06/13 02:40:06 neilc Exp $
33
-->
44

55
<chapter Id="runtime">
@@ -3234,8 +3234,9 @@ archive_command = 'copy "%p" /mnt/server/archivedir/"%f"' # Windows
32343234
</para>
32353235

32363236
<para>
3237-
Consult <xref linkend="mvcc"> and <xref linkend="sql-set-transaction"> for more
3238-
information.
3237+
Consult <xref linkend="mvcc"> and <xref
3238+
linkend="sql-set-transaction"
3239+
endterm="sql-set-transaction-title"> for more information.
32393240
</para>
32403241
</listitem>
32413242
</varlistentry>
@@ -3257,7 +3258,8 @@ archive_command = 'copy "%p" /mnt/server/archivedir/"%f"' # Windows
32573258
</para>
32583259

32593260
<para>
3260-
Consult <xref linkend="sql-set-transaction"> for more information.
3261+
Consult <xref linkend="sql-set-transaction"
3262+
endterm="sql-set-transaction-title"> for more information.
32613263
</para>
32623264
</listitem>
32633265
</varlistentry>

0 commit comments

Comments
 (0)