diff --git a/doc/src/sgml/intro-ag.sgml b/doc/src/sgml/intro-ag.sgml
index 9693d3a68ededaf00057b9c3e97aebe9461e4e7e..83d18555c3463b2cbc857af99ed9d7b71410949f 100644
--- a/doc/src/sgml/intro-ag.sgml
+++ b/doc/src/sgml/intro-ag.sgml
@@ -1,28 +1,42 @@
-<Chapter Id="intro-ag">
-<TITLE>Introduction</TITLE>
+ <chapter id="intro-ag">
+ <title>Introduction</title>
-<Para>
- This document is the Administrator's Manual for the
- <Ulink url="http://postgresql.org/"><ProductName>PostgreSQL</ProductName></Ulink>
- database management system, originally developed at the University
- of California at Berkeley.
+ <para>
+ This document is the Administrator's Manual for the
+ <ulink url="http://postgresql.org/"><productname>PostgreSQL</productname></ulink>
+ database management system, originally developed at the University
+ of California at Berkeley.
-<ProductName>PostgreSQL</ProductName> is based on
- <Ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/postgres.html">
- <ProductName>Postgres release 4.2</ProductName></Ulink>.
-The <ProductName>Postgres</ProductName> project,
- led by Professor Michael Stonebraker, was sponsored by the
- Defense Advanced Research Projects Agency (<Acronym>DARPA</Acronym>), the
- Army Research Office (<Acronym>ARO</Acronym>), the National Science
- Foundation (<Acronym>NSF</Acronym>), and ESL, Inc.
-</Para>
+ <productname>PostgreSQL</productname> is based on
+ <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/postgres.html">
+ <productname>Postgres release 4.2</productname></ulink>.
+ The <productname>Postgres</productname> project,
+ led by Professor Michael Stonebraker, was sponsored by the
+ Defense Advanced Research Projects Agency (<acronym>DARPA</acronym>), the
+ Army Research Office (<acronym>ARO</acronym>), the National Science
+ Foundation (<acronym>NSF</acronym>), and ESL, Inc.
+ </para>
-&info;
+ &info;
+ ¬ation;
+ &y2k;
+ &legal;
-¬ation;
+ </chapter>
-&y2k;
-
-&legal;
-
-</Chapter>
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:nil
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:"./reference.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:"/usr/lib/sgml/CATALOG"
+sgml-local-ecat-files:nil
+End:
+-->
diff --git a/doc/src/sgml/intro-pg.sgml b/doc/src/sgml/intro-pg.sgml
index 98b16b1601e362d01aa84ca9e3bb49a4ddaf1541..b162023802401d7e1fef13361bf9c06e21cd847c 100644
--- a/doc/src/sgml/intro-pg.sgml
+++ b/doc/src/sgml/intro-pg.sgml
@@ -1,48 +1,62 @@
-<Chapter Id="intro-pg">
-<TITLE>Introduction</TITLE>
-
-<Para>
-This document is the programmer's manual for the
-<Ulink url="http://postgresql.org/"><ProductName>PostgreSQL</ProductName></Ulink>
-database management system, originally developed at the University
-of California at Berkeley.
-
-<ProductName>PostgreSQL</ProductName> is based on
- <Ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/postgres.html">
- <ProductName>Postgres release 4.2</ProductName></Ulink>.
-The <ProductName>Postgres</ProductName> project,
- led by Professor Michael Stonebraker, has been sponsored by the
- Defense Advanced Research Projects Agency (<Acronym>DARPA</Acronym>), the
- Army Research Office (<Acronym>ARO</Acronym>), the National Science
- Foundation (<Acronym>NSF</Acronym>), and ESL, Inc.
-</Para>
-
-<Para>
-The first part of this manual
-explains the <ProductName>Postgres</ProductName>
-approach to extensibility and describe how
-users can extend <ProductName>Postgres</ProductName>
-by adding user-defined types,
-operators, aggregates, and both query language and programming
-language functions.
- After a discussion of the <ProductName>Postgres</ProductName>
-rule system, we discuss
-the trigger and SPI interfaces.
- The manual concludes with a detailed description of
-the programming interfaces and
- support libraries for various languages.
-</Para>
-
-<Para>
- We assume proficiency with UNIX and C programming.
-</Para>
-
-&info;
-
-¬ation;
-
-&y2k;
-
-&legal;
-
-</Chapter>
+ <chapter id="intro-pg">
+ <title>Introduction</title>
+
+ <para>
+ This document is the programmer's manual for the
+ <ulink url="http://postgresql.org/"><productname>PostgreSQL</productname></ulink>
+ database management system, originally developed at the University
+ of California at Berkeley.
+
+ <productname>PostgreSQL</productname> is based on
+ <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/postgres.html">
+ <productname>Postgres release 4.2</productname></ulink>.
+ The <productname>Postgres</productname> project,
+ led by Professor Michael Stonebraker, has been sponsored by the
+ Defense Advanced Research Projects Agency (<acronym>DARPA</acronym>), the
+ Army Research Office (<acronym>ARO</acronym>), the National Science
+ Foundation (<acronym>NSF</acronym>), and ESL, Inc.
+ </para>
+
+ <para>
+ The first part of this manual
+ explains the <productname>Postgres</productname>
+ approach to extensibility and describe how
+ users can extend <productname>Postgres</productname>
+ by adding user-defined types,
+ operators, aggregates, and both query language and programming
+ language functions.
+ After a discussion of the <productname>Postgres</productname>
+ rule system, we discuss
+ the trigger and SPI interfaces.
+ The manual concludes with a detailed description of
+ the programming interfaces and
+ support libraries for various languages.
+ </para>
+
+ <para>
+ We assume proficiency with UNIX and C programming.
+ </para>
+
+ &info;
+ ¬ation;
+ &y2k;
+ &legal;
+
+ </chapter>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:nil
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:"./reference.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:"/usr/lib/sgml/CATALOG"
+sgml-local-ecat-files:nil
+End:
+-->
diff --git a/doc/src/sgml/intro.sgml b/doc/src/sgml/intro.sgml
index 5922288504e1ef2d20cf3076ec93928d6da378d5..3a3ba59187719b075a469ba00bb5b3e28799532a 100644
--- a/doc/src/sgml/intro.sgml
+++ b/doc/src/sgml/intro.sgml
@@ -1,84 +1,96 @@
-<Chapter Id="intro">
-<TITLE>Introduction</TITLE>
-
-<Para>
- This document is the user manual for the
- <Ulink url="http://postgresql.org/"><ProductName>PostgreSQL</ProductName></Ulink>
- database management system, originally developed at the University
- of California at Berkeley.
-
-<ProductName>PostgreSQL</ProductName> is based on
- <Ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/postgres.html">
- <ProductName>Postgres release 4.2</ProductName></Ulink>.
-The <ProductName>Postgres</ProductName> project,
- led by Professor Michael Stonebraker, was sponsored by the
- Defense Advanced Research Projects Agency (<Acronym>DARPA</Acronym>), the
- Army Research Office (<Acronym>ARO</Acronym>), the National Science
- Foundation (<Acronym>NSF</Acronym>), and ESL, Inc.
-</Para>
-
-<Sect1>
-<Title> What is <ProductName>Postgres</ProductName>?</Title>
-
-<Para>
- Traditional relational database management systems
- (DBMSs) support a data model consisting of a collection
- of named relations, containing attributes of a specific
- type. In current commercial systems, possible types
- include floating point numbers, integers, character
- strings, money, and dates. It is commonly recognized
- that this model is inadequate for future data
- processing applications.
- The relational model successfully replaced previous
- models in part because of its "Spartan simplicity".
- However, as mentioned, this simplicity often makes the
- implementation of certain applications very difficult.
- <ProductName>Postgres</ProductName> offers substantial additional
- power by incorporating the following four additional
- basic concepts in such a way that users can easily
- extend the system:
-
-<SimpleList>
-<Member>classes</Member>
-<Member>inheritance</Member>
-<Member>types</Member>
-<Member>functions</Member>
-</SimpleList>
-</Para>
-
-<Para>
-Other features provide additional power and flexibility:
-
-<SimpleList>
-<Member>constraints</Member>
-<Member>triggers</Member>
-<Member>rules</Member>
-<Member>transaction integrity</Member>
-</SimpleList>
-</Para>
-
-<Para>
-These features put <ProductName>Postgres</ProductName> into the category of databases
-referred to as <FirstTerm>object-relational</FirstTerm>. Note that this is distinct
-from those referred to as <FirstTerm>object-oriented</FirstTerm>, which in general
-are not as well suited to supporting the traditional relational database languages.
-So, although <ProductName>Postgres</ProductName> has some object-oriented features,
-it is firmly in the relational database world. In fact, some commercial databases
-have recently incorporated features pioneered by <ProductName>Postgres</ProductName>.
-</Para>
-
-</Sect1>
-
-&history;
-
-&about;
-
-&info;
-
-¬ation;
-
-&y2k;
-
-&legal;
-
-</Chapter>
+ <chapter id="intro">
+ <title>Introduction</title>
+
+ <para>
+ This document is the user manual for the
+ <ulink url="http://postgresql.org/"><productname>PostgreSQL</productname></ulink>
+ database management system, originally developed at the University
+ of California at Berkeley.
+
+ <productname>PostgreSQL</productname> is based on
+ <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/postgres.html">
+ <productname>Postgres release 4.2</productname></ulink>.
+ The <productname>Postgres</productname> project,
+ led by Professor Michael Stonebraker, was sponsored by the
+ Defense Advanced Research Projects Agency (<acronym>DARPA</acronym>), the
+ Army Research Office (<acronym>ARO</acronym>), the National Science
+ Foundation (<acronym>NSF</acronym>), and ESL, Inc.
+ </para>
+
+ <sect1>
+ <title> What is <productname>Postgres</productname>?</title>
+
+ <para>
+ Traditional relational database management systems
+ (DBMSs) support a data model consisting of a collection
+ of named relations, containing attributes of a specific
+ type. In current commercial systems, possible types
+ include floating point numbers, integers, character
+ strings, money, and dates. It is commonly recognized
+ that this model is inadequate for future data
+ processing applications.
+ The relational model successfully replaced previous
+ models in part because of its "Spartan simplicity".
+ However, as mentioned, this simplicity often makes the
+ implementation of certain applications very difficult.
+ <productname>Postgres</productname> offers substantial additional
+ power by incorporating the following four additional
+ basic concepts in such a way that users can easily
+ extend the system:
+
+ <simplelist>
+ <member>classes</member>
+ <member>inheritance</member>
+ <member>types</member>
+ <member>functions</member>
+ </simplelist>
+ </para>
+
+ <para>
+ Other features provide additional power and flexibility:
+
+ <simplelist>
+ <member>constraints</member>
+ <member>triggers</member>
+ <member>rules</member>
+ <member>transaction integrity</member>
+ </simplelist>
+ </para>
+
+ <para>
+ These features put <productname>Postgres</productname> into the category of databases
+ referred to as <firstterm>object-relational</firstterm>. Note that this is distinct
+ from those referred to as <firstterm>object-oriented</firstterm>, which in general
+ are not as well suited to supporting the traditional relational database languages.
+ So, although <productname>Postgres</productname> has some object-oriented features,
+ it is firmly in the relational database world. In fact, some commercial databases
+ have recently incorporated features pioneered by <productname>Postgres</productname>.
+ </para>
+
+ </sect1>
+
+ &history;
+ &about;
+ &info;
+ ¬ation;
+ &y2k;
+ &legal;
+
+ </chapter>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:nil
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:"./reference.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:"/usr/lib/sgml/CATALOG"
+sgml-local-ecat-files:nil
+End:
+-->
diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml
index 01470c6f9e77203449467607202691244da44155..4e85530a79d65bccb6f0419ed2b1b1fb414e6b9c 100644
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -1,11 +1,17 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.25 1999/05/27 15:49:08 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.26 1999/06/01 17:26:18 thomas Exp $
Postgres integrated documentation.
Other subset docs should be copied and shrunk from here.
thomas 1998-02-23
$Log: postgres.sgml,v $
+Revision 1.26 1999/06/01 17:26:18 thomas
+Make sure that only one intro is included in the integrated doc.
+Multiple intros cause trouble since they have some section elements
+ (e.g. "y2k.sgml") in common leading to duplicate labels.
+Include emacs formatting hints in the intro*.sgml sources.
+
Revision 1.25 1999/05/27 15:49:08 thomas
Markup fixes.
Update for v6.5 release.
@@ -293,7 +299,12 @@ Your name here...
Installation and maintenance information.
</Para>
</PartIntro>
+<!--
+ Disable these extra intro chapters since some elements (e.g. y2k
+ statement) are included in the first intro.sgml and cause errors if
+ included twice.
&intro-ag;
+-->
&ports;
&config;
&layout;
@@ -315,7 +326,12 @@ Your name here...
Information for extending <ProductName>Postgres</ProductName>.
</Para>
</PartIntro>
+<!--
+ Disable these extra intro chapters since some elements (e.g. y2k
+ statement) are included in the first intro.sgml and cause errors if
+ included twice.
&intro-pg;
+-->
&arch-pg;
&extend;
&xfunc;