From 8593e1ff0904422e75b88165343afba0153606e7 Mon Sep 17 00:00:00 2001 From: "Thomas G. Lockhart" Date: Tue, 1 Jun 1999 17:26:18 +0000 Subject: [PATCH] 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. --- doc/src/sgml/intro-ag.sgml | 60 ++++++++----- doc/src/sgml/intro-pg.sgml | 110 +++++++++++++---------- doc/src/sgml/intro.sgml | 180 ++++++++++++++++++++----------------- doc/src/sgml/postgres.sgml | 18 +++- 4 files changed, 212 insertions(+), 156 deletions(-) diff --git a/doc/src/sgml/intro-ag.sgml b/doc/src/sgml/intro-ag.sgml index 9693d3a68e..83d18555c3 100644 --- a/doc/src/sgml/intro-ag.sgml +++ b/doc/src/sgml/intro-ag.sgml @@ -1,28 +1,42 @@ - -Introduction + + Introduction - - This document is the Administrator's Manual for the - PostgreSQL - database management system, originally developed at the University - of California at Berkeley. + + This document is the Administrator's Manual for the + PostgreSQL + database management system, originally developed at the University + of California at Berkeley. -PostgreSQL is based on - - Postgres release 4.2. -The Postgres project, - led by Professor Michael Stonebraker, was sponsored by the - Defense Advanced Research Projects Agency (DARPA), the - Army Research Office (ARO), the National Science - Foundation (NSF), and ESL, Inc. - + PostgreSQL is based on + + Postgres release 4.2. + The Postgres project, + led by Professor Michael Stonebraker, was sponsored by the + Defense Advanced Research Projects Agency (DARPA), the + Army Research Office (ARO), the National Science + Foundation (NSF), and ESL, Inc. + -&info; + &info; + ¬ation; + &y2k; + &legal; -¬ation; + -&y2k; - -&legal; - - + diff --git a/doc/src/sgml/intro-pg.sgml b/doc/src/sgml/intro-pg.sgml index 98b16b1601..b162023802 100644 --- a/doc/src/sgml/intro-pg.sgml +++ b/doc/src/sgml/intro-pg.sgml @@ -1,48 +1,62 @@ - -Introduction - - -This document is the programmer's manual for the -PostgreSQL -database management system, originally developed at the University -of California at Berkeley. - -PostgreSQL is based on - - Postgres release 4.2. -The Postgres project, - led by Professor Michael Stonebraker, has been sponsored by the - Defense Advanced Research Projects Agency (DARPA), the - Army Research Office (ARO), the National Science - Foundation (NSF), and ESL, Inc. - - - -The first part of this manual -explains the Postgres -approach to extensibility and describe how -users can extend Postgres -by adding user-defined types, -operators, aggregates, and both query language and programming -language functions. - After a discussion of the Postgres -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. - - - - We assume proficiency with UNIX and C programming. - - -&info; - -¬ation; - -&y2k; - -&legal; - - + + Introduction + + + This document is the programmer's manual for the + PostgreSQL + database management system, originally developed at the University + of California at Berkeley. + + PostgreSQL is based on + + Postgres release 4.2. + The Postgres project, + led by Professor Michael Stonebraker, has been sponsored by the + Defense Advanced Research Projects Agency (DARPA), the + Army Research Office (ARO), the National Science + Foundation (NSF), and ESL, Inc. + + + + The first part of this manual + explains the Postgres + approach to extensibility and describe how + users can extend Postgres + by adding user-defined types, + operators, aggregates, and both query language and programming + language functions. + After a discussion of the Postgres + 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. + + + + We assume proficiency with UNIX and C programming. + + + &info; + ¬ation; + &y2k; + &legal; + + + + diff --git a/doc/src/sgml/intro.sgml b/doc/src/sgml/intro.sgml index 5922288504..3a3ba59187 100644 --- a/doc/src/sgml/intro.sgml +++ b/doc/src/sgml/intro.sgml @@ -1,84 +1,96 @@ - -Introduction - - - This document is the user manual for the - PostgreSQL - database management system, originally developed at the University - of California at Berkeley. - -PostgreSQL is based on - - Postgres release 4.2. -The Postgres project, - led by Professor Michael Stonebraker, was sponsored by the - Defense Advanced Research Projects Agency (DARPA), the - Army Research Office (ARO), the National Science - Foundation (NSF), and ESL, Inc. - - - - What is <ProductName>Postgres</ProductName>? - - - 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. - Postgres offers substantial additional - power by incorporating the following four additional - basic concepts in such a way that users can easily - extend the system: - - -classes -inheritance -types -functions - - - - -Other features provide additional power and flexibility: - - -constraints -triggers -rules -transaction integrity - - - - -These features put Postgres into the category of databases -referred to as object-relational. Note that this is distinct -from those referred to as object-oriented, which in general -are not as well suited to supporting the traditional relational database languages. -So, although Postgres has some object-oriented features, -it is firmly in the relational database world. In fact, some commercial databases -have recently incorporated features pioneered by Postgres. - - - - -&history; - -&about; - -&info; - -¬ation; - -&y2k; - -&legal; - - + + Introduction + + + This document is the user manual for the + PostgreSQL + database management system, originally developed at the University + of California at Berkeley. + + PostgreSQL is based on + + Postgres release 4.2. + The Postgres project, + led by Professor Michael Stonebraker, was sponsored by the + Defense Advanced Research Projects Agency (DARPA), the + Army Research Office (ARO), the National Science + Foundation (NSF), and ESL, Inc. + + + + What is <productname>Postgres</productname>? + + + 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. + Postgres offers substantial additional + power by incorporating the following four additional + basic concepts in such a way that users can easily + extend the system: + + + classes + inheritance + types + functions + + + + + Other features provide additional power and flexibility: + + + constraints + triggers + rules + transaction integrity + + + + + These features put Postgres into the category of databases + referred to as object-relational. Note that this is distinct + from those referred to as object-oriented, which in general + are not as well suited to supporting the traditional relational database languages. + So, although Postgres has some object-oriented features, + it is firmly in the relational database world. In fact, some commercial databases + have recently incorporated features pioneered by Postgres. + + + + + &history; + &about; + &info; + ¬ation; + &y2k; + &legal; + + + + diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml index 01470c6f9e..4e85530a79 100644 --- a/doc/src/sgml/postgres.sgml +++ b/doc/src/sgml/postgres.sgml @@ -1,11 +1,17 @@ &ports; &config; &layout; @@ -315,7 +326,12 @@ Your name here... Information for extending Postgres. + &arch-pg; &extend; &xfunc; -- 2.40.0