summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/src/sgml/ddl.sgml38
-rw-r--r--doc/src/sgml/func.sgml4
-rw-r--r--doc/src/sgml/maintenance.sgml15
-rw-r--r--doc/src/sgml/manage-ag.sgml14
-rw-r--r--doc/src/sgml/mvcc.sgml7
-rw-r--r--doc/src/sgml/query.sgml5
-rw-r--r--doc/src/sgml/ref/psql-ref.sgml16
-rw-r--r--doc/src/sgml/runtime.sgml10
8 files changed, 59 insertions, 50 deletions
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index b0d413bbea..269f9aab82 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.40 2005/03/13 09:36:30 neilc Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.41 2005/06/13 02:40:01 neilc Exp $ -->
<chapter id="ddl">
<title>Data Definition</title>
@@ -1540,14 +1540,14 @@ ALTER TABLE products RENAME TO items;
There are several different privileges: <literal>SELECT</>,
<literal>INSERT</>, <literal>UPDATE</>, <literal>DELETE</>,
<literal>RULE</>, <literal>REFERENCES</>, <literal>TRIGGER</>,
- <literal>CREATE</>, <literal>TEMPORARY</>, <literal>EXECUTE</>,
- and <literal>USAGE</>. The privileges applicable to a particular
+ <literal>CREATE</>, <literal>TEMPORARY</>, <literal>EXECUTE</>, and
+ <literal>USAGE</>. The privileges applicable to a particular
object vary depending on the object's type (table, function, etc).
- For complete
- information on the different types of privileges supported by
- <productname>PostgreSQL</productname>, refer to the
- <xref linkend="sql-grant"> reference page. The following sections
- and chapters will also show you how those privileges are used.
+ For complete information on the different types of privileges
+ supported by <productname>PostgreSQL</productname>, refer to the
+ <xref linkend="sql-grant" endterm="sql-grant-title"> reference
+ page. The following sections and chapters will also show you how
+ those privileges are used.
</para>
<para>
@@ -1558,8 +1558,9 @@ ALTER TABLE products RENAME TO items;
<note>
<para>
To change the owner of a table, index, sequence, or view, use the
- <xref linkend="sql-altertable"> command. There are corresponding
- <literal>ALTER</> commands for other object types.
+ <xref linkend="sql-altertable" endterm="sql-altertable-title">
+ command. There are corresponding <literal>ALTER</> commands for
+ other object types.
</para>
</note>
@@ -1596,14 +1597,15 @@ REVOKE ALL ON accounts FROM PUBLIC;
</para>
<para>
- Ordinarily, only the object's owner (or a superuser) can grant or revoke
- privileges on an object. However, it is possible to grant a privilege
- <quote>with grant option</>, which gives the recipient the right to
- grant it in turn to others. If the grant option is subsequently revoked
- then all who received the privilege from that recipient (directly or
- through a chain of grants) will lose the privilege. For details see
- the <xref linkend="sql-grant"> and <xref linkend="sql-revoke"> reference
- pages.
+ Ordinarily, only the object's owner (or a superuser) can grant or
+ revoke privileges on an object. However, it is possible to grant a
+ privilege <quote>with grant option</>, which gives the recipient
+ the right to grant it in turn to others. If the grant option is
+ subsequently revoked then all who received the privilege from that
+ recipient (directly or through a chain of grants) will lose the
+ privilege. For details see the <xref linkend="sql-grant"
+ endterm="sql-grant-title"> and <xref linkend="sql-revoke"
+ endterm="sql-revoke-title"> reference pages.
</para>
</sect1>
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index bc34c96542..22baa22aa6 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.253 2005/06/09 16:35:08 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.254 2005/06/13 02:40:04 neilc Exp $
PostgreSQL documentation
-->
@@ -8152,7 +8152,7 @@ select current_date + s.a as dates from generate_series(0,14,7) as s(a);
<para>
The <function>session_user</function> is normally the user who initiated
the current database connection; but superusers can change this setting
- with <xref linkend="sql-set-session-authorization">.
+ with <xref linkend="sql-set-session-authorization" endterm="sql-set-session-authorization-title">.
The <function>current_user</function> is the user identifier
that is applicable for permission checking. Normally, it is equal
to the session user, but it changes during the execution of
diff --git a/doc/src/sgml/maintenance.sgml b/doc/src/sgml/maintenance.sgml
index 1527a9b743..d68cd817c3 100644
--- a/doc/src/sgml/maintenance.sgml
+++ b/doc/src/sgml/maintenance.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.43 2005/05/10 22:27:29 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.44 2005/06/13 02:40:04 neilc Exp $
-->
<chapter id="maintenance">
@@ -74,12 +74,13 @@ $PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.43 2005/05/10 22:27:29 momj
</listitem>
</orderedlist>
- The frequency and scope of the <command>VACUUM</> operations performed for each of
- these reasons will vary depending on the needs of each site.
- Therefore, database administrators must understand these issues and
- develop an appropriate maintenance strategy. This section concentrates
- on explaining the high-level issues; for details about command syntax
- and so on, see the <xref linkend="sql-vacuum"> reference page.
+ The frequency and scope of the <command>VACUUM</> operations
+ performed for each of these reasons will vary depending on the
+ needs of each site. Therefore, database administrators must
+ understand these issues and develop an appropriate maintenance
+ strategy. This section concentrates on explaining the high-level
+ issues; for details about command syntax and so on, see the <xref
+ linkend="sql-vacuum" endterm="sql-vacuum-title"> reference page.
</para>
<para>
diff --git a/doc/src/sgml/manage-ag.sgml b/doc/src/sgml/manage-ag.sgml
index 49aa764192..e95839f050 100644
--- a/doc/src/sgml/manage-ag.sgml
+++ b/doc/src/sgml/manage-ag.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/manage-ag.sgml,v 2.40 2005/01/08 22:13:34 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/manage-ag.sgml,v 2.41 2005/06/13 02:40:04 neilc Exp $
-->
<chapter id="managing-databases">
@@ -88,7 +88,7 @@ SELECT datname FROM pg_database;
<para>
Databases are created with the SQL command
- <xref linkend="sql-createdatabase">:<indexterm><primary>CREATE
+ <xref linkend="sql-createdatabase" endterm="sql-createdatabase-title">:<indexterm><primary>CREATE
DATABASE</></>
<synopsis>
CREATE DATABASE <replaceable>name</>;
@@ -314,7 +314,7 @@ ALTER DATABASE mydb SET geqo TO off;
<para>
Databases are destroyed with the command
- <xref linkend="sql-dropdatabase">:<indexterm><primary>DROP DATABASE</></>
+ <xref linkend="sql-dropdatabase" endterm="sql-dropdatabase-title">:<indexterm><primary>DROP DATABASE</></>
<synopsis>
DROP DATABASE <replaceable>name</>;
</synopsis>
@@ -379,7 +379,8 @@ dropdb <replaceable class="parameter">dbname</replaceable>
</para>
<para>
- To define a tablespace, use the <xref linkend="sql-createtablespace">
+ To define a tablespace, use the <xref
+ linkend="sql-createtablespace" endterm="sql-createdatabase-title">
command, for example:<indexterm><primary>CREATE TABLESPACE</></>
<programlisting>
CREATE TABLESPACE fastspace LOCATION '/mnt/sda1/postgresql/data';
@@ -459,8 +460,9 @@ CREATE TABLE foo(i int);
</para>
<para>
- To remove an empty tablespace, use the <xref linkend="sql-droptablespace">
- command.
+ To remove an empty tablespace, use the <xref
+ linkend="sql-droptablespace" endterm="sql-droptablespace-title">
+ command.
</para>
<para>
diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml
index c88974a8d7..97e351b323 100644
--- a/doc/src/sgml/mvcc.sgml
+++ b/doc/src/sgml/mvcc.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/mvcc.sgml,v 2.50 2005/04/28 21:47:09 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/mvcc.sgml,v 2.51 2005/06/13 02:40:05 neilc Exp $
-->
<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 $
<para>
To set the transaction isolation level of a transaction, use the
- command <xref linkend="sql-set-transaction">.
+ command <xref linkend="sql-set-transaction" endterm="sql-set-transaction-title">.
</para>
<sect2 id="xact-read-committed">
@@ -524,7 +524,8 @@ SELECT SUM(value) FROM mytab WHERE class = 2;
The list below shows the available lock modes and the contexts in
which they are used automatically by
<productname>PostgreSQL</productname>. You can also acquire any
- of these locks explicitly with the command <xref linkend="sql-lock">.
+ of these locks explicitly with the command <xref
+ linkend="sql-lock" endterm="sql-lock-title">.
Remember that all of these lock modes are table-level locks,
even if the name contains the word
<quote>row</quote>; the names of the lock modes are historical.
diff --git a/doc/src/sgml/query.sgml b/doc/src/sgml/query.sgml
index e573db56cb..9c8d0a5a3c 100644
--- a/doc/src/sgml/query.sgml
+++ b/doc/src/sgml/query.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/query.sgml,v 1.44 2005/03/10 23:21:20 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/query.sgml,v 1.45 2005/06/13 02:40:06 neilc Exp $
-->
<chapter id="tutorial-sql">
@@ -269,7 +269,8 @@ COPY weather FROM '/home/user/weather.txt';
where the file name for the source file must be available to the
backend server machine, not the client, since the backend server
reads the file directly. You can read more about the
- <command>COPY</command> command in <xref linkend="sql-copy">.
+ <command>COPY</command> command in <xref linkend="sql-copy"
+ endterm="sql-copy-title">.
</para>
</sect1>
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index ee16b1b3e5..64fa55f000 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.142 2005/06/10 16:31:48 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.143 2005/06/13 02:40:08 neilc Exp $
PostgreSQL documentation
-->
@@ -1036,9 +1036,9 @@ testdb=&gt;
</para>
<para>
- The commands <xref linkend="SQL-GRANT"> and
- <xref linkend="SQL-REVOKE">
- are used to set access privileges. See <xref linkend="SQL-GRANT">
+ The commands <command>GRANT</command> and
+ <command>REVOKE</command> are used to set access privileges.
+ See <xref linkend="sql-grant" endterm="sql-grant-title">
for more information.
</para>
</listitem>
@@ -1740,10 +1740,10 @@ lo_import 152801
</para>
<para>
- The commands <xref linkend="SQL-GRANT"> and
- <xref linkend="SQL-REVOKE">
- are used to set access privileges. See <xref linkend="SQL-GRANT">
- for more information.
+ The commands <command>GRANT</command> and
+ <command>REVOKE</command> are used to set access privileges.
+ See <xref linkend="sql-grant" endterm="sql-grant-title"> for
+ more information.
</para>
<para>
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index dff9017402..93040bd31d 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.324 2005/06/09 22:35:23 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.325 2005/06/13 02:40:06 neilc Exp $
-->
<chapter Id="runtime">
@@ -3234,8 +3234,9 @@ archive_command = 'copy "%p" /mnt/server/archivedir/"%f"' # Windows
</para>
<para>
- Consult <xref linkend="mvcc"> and <xref linkend="sql-set-transaction"> for more
- information.
+ Consult <xref linkend="mvcc"> and <xref
+ linkend="sql-set-transaction"
+ endterm="sql-set-transaction-title"> for more information.
</para>
</listitem>
</varlistentry>
@@ -3257,7 +3258,8 @@ archive_command = 'copy "%p" /mnt/server/archivedir/"%f"' # Windows
</para>
<para>
- Consult <xref linkend="sql-set-transaction"> for more information.
+ Consult <xref linkend="sql-set-transaction"
+ endterm="sql-set-transaction-title"> for more information.
</para>
</listitem>
</varlistentry>
View Lorry Controller Status