summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/src/sgml/ddl.sgml6
-rw-r--r--doc/src/sgml/dml.sgml8
-rw-r--r--doc/src/sgml/func.sgml4
-rw-r--r--doc/src/sgml/runtime.sgml4
-rw-r--r--doc/src/sgml/sql.sgml4
-rw-r--r--doc/src/sgml/start.sgml4
-rw-r--r--doc/src/sgml/trigger.sgml5
-rw-r--r--doc/src/sgml/user-manag.sgml7
-rw-r--r--doc/src/sgml/xfunc.sgml4
-rw-r--r--doc/src/sgml/xtypes.sgml6
10 files changed, 27 insertions, 25 deletions
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index 67de4b8e546..4109cbafa62 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ddl.sgml,v 1.15 2003/05/07 03:41:31 tgl Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ddl.sgml,v 1.16 2003/08/10 01:20:34 tgl Exp $ -->
<chapter id="ddl">
<title>Data Definition</title>
@@ -818,8 +818,8 @@ CREATE TABLE order_items (
columns that are either a primary key or form a unique constraint.
If the foreign key references a unique constraint, there are some
additional possibilities regarding how null values are matched.
- These are explained in the <literal>CREATE TABLE</literal> entry
- in <xref linkend="reference">.
+ These are explained in the reference documentation for
+ <xref linkend="sql-createtable" endterm="sql-createtable-title">.
</para>
</sect2>
</sect1>
diff --git a/doc/src/sgml/dml.sgml b/doc/src/sgml/dml.sgml
index 655af76fe5b..6476fcf14ab 100644
--- a/doc/src/sgml/dml.sgml
+++ b/doc/src/sgml/dml.sgml
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/dml.sgml,v 1.4 2003/03/25 16:15:35 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/dml.sgml,v 1.5 2003/08/10 01:20:34 tgl Exp $ -->
<chapter id="dml">
<title>Data Manipulation</title>
@@ -88,9 +88,9 @@ INSERT INTO products DEFAULT VALUES;
<tip>
<para>
To do <quote>bulk loads</quote>, that is, inserting a lot of data,
- take a look at the <command>COPY</command> command (see
- <xref linkend="reference">). It is not as flexible as the
- <command>INSERT</command> command, but more efficient.
+ take a look at the <xref linkend="sql-copy"
+ endterm="sql-copy-title"> command. It is not as flexible as the
+ <command>INSERT</command> command, but is more efficient.
</para>
</tip>
</sect1>
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index d9cb8bb018e..6729dc677e8 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.165 2003/08/09 22:50:21 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.166 2003/08/10 01:20:34 tgl Exp $
PostgreSQL documentation
-->
@@ -7268,7 +7268,7 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
linkend="functions-aggregate-table"> shows the built-in aggregate
functions. The special syntax considerations for aggregate
functions are explained in <xref linkend="syntax-aggregates">.
- Consult <xref linkend="tutorial"> for additional introductory
+ Consult <xref linkend="tutorial-agg"> for additional introductory
information.
</para>
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index a44ccfde88a..6adfd85df0f 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.198 2003/07/31 18:36:17 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.199 2003/08/10 01:20:34 tgl Exp $
-->
<Chapter Id="runtime">
@@ -2425,7 +2425,7 @@ dynamic_library_path = '/usr/local/lib/postgresql:/home/my_project/lib:$libdir'
behavior you can set this variable to off, but in the long run
you are encouraged to change your applications to use the
<literal>ONLY</literal> key word to exclude subtables. See
- <xref linkend="sql"> for more information about inheritance.
+ <xref linkend="ddl-inherit"> for more information about inheritance.
</para>
</listitem>
</varlistentry>
diff --git a/doc/src/sgml/sql.sgml b/doc/src/sgml/sql.sgml
index 89de6668028..1cb68004be9 100644
--- a/doc/src/sgml/sql.sgml
+++ b/doc/src/sgml/sql.sgml
@@ -1,8 +1,8 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/sql.sgml,v 1.30 2003/03/27 16:51:26 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/sql.sgml,v 1.31 2003/08/10 01:20:34 tgl Exp $
-->
- <chapter id="sql">
+ <chapter id="sql-intro">
<title>SQL</title>
<abstract>
diff --git a/doc/src/sgml/start.sgml b/doc/src/sgml/start.sgml
index d10ad5b3c5e..2aafe7813e4 100644
--- a/doc/src/sgml/start.sgml
+++ b/doc/src/sgml/start.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/start.sgml,v 1.30 2003/06/24 23:26:46 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/start.sgml,v 1.31 2003/08/10 01:20:34 tgl Exp $
-->
<chapter id="tutorial-start">
@@ -397,7 +397,7 @@ mydb=#
command shell. (For more internal commands, type
<literal>\?</literal> at the <command>psql</command> prompt.) The
full capabilities of <command>psql</command> are documented in
- <xref linkend="reference">. If <productname>PostgreSQL</> is
+ <xref linkend="app-psql">. If <productname>PostgreSQL</> is
installed correctly you can also type <literal>man psql</literal>
at the operating system shell prompt to see the documentation. In
this tutorial we will not use these features explicitly, but you
diff --git a/doc/src/sgml/trigger.sgml b/doc/src/sgml/trigger.sgml
index 37870c42f93..d9ee33a2963 100644
--- a/doc/src/sgml/trigger.sgml
+++ b/doc/src/sgml/trigger.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/trigger.sgml,v 1.28 2003/04/11 18:41:20 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/trigger.sgml,v 1.29 2003/08/10 01:20:34 tgl Exp $
-->
<chapter id="triggers">
@@ -40,7 +40,8 @@ $Header: /cvsroot/pgsql/doc/src/sgml/trigger.sgml,v 1.28 2003/04/11 18:41:20 pet
</para>
<para>
- The syntax for creating triggers is described in <xref linkend="reference">.
+ The syntax for creating triggers is described in
+ <xref linkend="sql-createtrigger" endterm="sql-createtrigger-title">.
</para>
<para>
diff --git a/doc/src/sgml/user-manag.sgml b/doc/src/sgml/user-manag.sgml
index 5f8f13a86d9..660d1ccd75d 100644
--- a/doc/src/sgml/user-manag.sgml
+++ b/doc/src/sgml/user-manag.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/user-manag.sgml,v 1.20 2003/03/25 16:15:38 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/user-manag.sgml,v 1.21 2003/08/10 01:20:34 tgl Exp $
-->
<chapter id="user-manag">
@@ -203,8 +203,9 @@ ALTER GROUP <replaceable>name</replaceable> DROP USER <replaceable>uname1</repla
<literal>CREATE</>, <literal>TEMPORARY</>, <literal>EXECUTE</>,
<literal>USAGE</>, and <literal>ALL PRIVILEGES</>. For more
information on the different types of privileges support by
- <productname>PostgreSQL</productname>, refer to the
- <command>GRANT</command> page in <xref linkend="reference">. The right to modify or
+ <productname>PostgreSQL</productname>, see the
+ <xref linkend="sql-grant" endterm="sql-grant-title"> reference page.
+ The right to modify or
destroy an object is always the privilege of the owner only. To
assign privileges, the <command>GRANT</command> command is
used. So, if <literal>joe</literal> is an existing user, and
diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml
index 25997718deb..0193691a08e 100644
--- a/doc/src/sgml/xfunc.sgml
+++ b/doc/src/sgml/xfunc.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/xfunc.sgml,v 1.71 2003/08/09 22:50:22 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/xfunc.sgml,v 1.72 2003/08/10 01:20:34 tgl Exp $
-->
<sect1 id="xfunc">
@@ -2185,7 +2185,7 @@ CREATE FUNCTION test(smallint, double precision) RETURNS ...
</programlisting>
it is not immediately clear which function would be called with
some trivial input like <literal>test(1, 1.5)</literal>. The
- currently implemented resolution rules are described in the
+ currently implemented resolution rules are described in
<xref linkend="typeconv">, but it is unwise to design a system that subtly
relies on this behavior.
</para>
diff --git a/doc/src/sgml/xtypes.sgml b/doc/src/sgml/xtypes.sgml
index 35112c1c5e2..74ced8cd83e 100644
--- a/doc/src/sgml/xtypes.sgml
+++ b/doc/src/sgml/xtypes.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/xtypes.sgml,v 1.18 2003/07/27 17:10:06 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/xtypes.sgml,v 1.19 2003/08/10 01:20:34 tgl Exp $
-->
<sect1 id="xtypes">
@@ -168,8 +168,8 @@ CREATE TYPE complex (
</para>
<para>
- For further details see the description of the <command>CREATE
- TYPE</command> command in <xref linkend="reference">.
+ For further details see the description of the
+ <xref linkend="sql-createtype" endterm="sql-createtype-title"> command.
</para>
</sect1>