From b2e76d570bf0d61a35d14e80386258bf3e11afc5 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Fri, 24 Nov 2000 17:44:22 +0000
Subject: [PATCH] Revive Reference Manual, remove reference pages from User's
Guide.
Make version.sgml the central place for updating version numbers in the
documentation. Document titles now contain the version number of the
release they belong to.
filelist.sgml is the central (and only) place to declare system entities
(i.e., sgml files). No longer a need to declare them in each document
header.
There is no longer any need to maintain duplicate chapter lists in
postgres.sgml and user/admin/etc.sgml, everything is build from the same
sources. Some parameter entities allow for different text to be included
when the integrated or a single doc set is generated, which eliminates the
problems that had caused this to fail in the past.
---
doc/src/Makefile | 20 +--
doc/src/sgml/Makefile | 31 ++--
doc/src/sgml/about.sgml | 2 +-
doc/src/sgml/admin.sgml | 93 +++--------
doc/src/sgml/book-decl.sgml | 11 ++
doc/src/sgml/developer.sgml | 34 +---
doc/src/sgml/filelist.sgml | 103 ++++++++++++
doc/src/sgml/indices.sgml | 4 +-
doc/src/sgml/postgres.sgml | 293 +++------------------------------
doc/src/sgml/programmer.sgml | 136 ++++-----------
doc/src/sgml/ref/allfiles.sgml | 9 +-
doc/src/sgml/ref/commands.sgml | 175 --------------------
doc/src/sgml/reference.sgml | 241 ++++++++++++++++-----------
doc/src/sgml/tutorial.sgml | 84 ++--------
doc/src/sgml/user.sgml | 97 ++---------
doc/src/sgml/version.sgml | 7 +
16 files changed, 410 insertions(+), 930 deletions(-)
create mode 100644 doc/src/sgml/book-decl.sgml
create mode 100644 doc/src/sgml/filelist.sgml
delete mode 100644 doc/src/sgml/ref/commands.sgml
create mode 100644 doc/src/sgml/version.sgml
diff --git a/doc/src/Makefile b/doc/src/Makefile
index f4289a5fa30..feed8d646e3 100644
--- a/doc/src/Makefile
+++ b/doc/src/Makefile
@@ -1,16 +1,16 @@
# Postgres documentation makefile
-# $Header: /cvsroot/pgsql/doc/src/Makefile,v 1.14 2000/10/08 13:24:08 petere Exp $
+# $Header: /cvsroot/pgsql/doc/src/Makefile,v 1.15 2000/11/24 17:44:21 petere Exp $
subdir = doc/src
top_builddir = ../..
--include $(top_builddir)/src/Makefile.global
+include $(top_builddir)/src/Makefile.global
TAR= tar
ZIP= gzip
ZIPSUFFIX= gz
TAREXCLUDE= --exclude=Makefile --exclude='*.sgml' --exclude=ref
-SRC= admin postgres programmer tutorial user developer
+SRC= admin developer reference programmer tutorial user postgres
TARGETS= $(SRC:%=%.tar.$(ZIPSUFFIX))
@@ -35,14 +35,9 @@ sources:
sources.tar:
$(TAR) -cf $@ sgml graphics
-admin.tar:
+admin.tar developer.tar reference.tar user.tar:
$(MAKE) -C sgml clean
- $(MAKE) -C sgml admin.html
- cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html *.htm
-
-developer.tar:
- $(MAKE) -C sgml clean
- $(MAKE) -C sgml developer.html
+ $(MAKE) -C sgml $(basename $@).html
cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html *.htm
programmer.tar:
@@ -55,11 +50,6 @@ tutorial.tar:
$(MAKE) -C sgml tutorial.html
cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html *.htm -C ../graphics clientserver.gif
-user.tar:
- $(MAKE) -C sgml clean
- $(MAKE) -C sgml user.html
- cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html *.htm
-
postgres.tar:
$(MAKE) -C sgml clean
$(MAKE) -C sgml postgres.html
diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index ff314b94a0e..acf6afb14a7 100644
--- a/doc/src/sgml/Makefile
+++ b/doc/src/sgml/Makefile
@@ -8,7 +8,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.25 2000/11/05 21:04:06 petere Exp $
+# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.26 2000/11/24 17:44:21 petere Exp $
#
#----------------------------------------------------------------------------
@@ -55,7 +55,7 @@ D2MSCRIPT= $(D2MDIR)/docbook2man-spec.pl
vpath %.sgml ./ref
-ALLDOCUMENTS = admin user programmer developer tutorial postgres
+ALLBOOKS = admin developer programmer reference tutorial user
ALLSGML := $(wildcard $(srcdir)/*.sgml $(srcdir)/ref/*.sgml)
@@ -155,10 +155,18 @@ manl: $(SQLTARGETS) manpage.refs
## HTML
##
-%.html: %.sgml $(ALLSGML)
+JADE.html = $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) -d $(HDSL) -V %use-id-as-filename% -t sgml
+
+postgres.html: postgres.sgml $(ALLSGML)
@rm -f *.htm
- $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) -d $(HDSL) -V %use-id-as-filename% -t sgml $<
+ $(JADE.html) $<
# Include some softlinks to the generic default file names
+ ln -sf postgres.htm index.html
+ ln -sf postgres.htm postgres.html
+
+$(addsuffix .html, $(ALLBOOKS)): %.html: %.sgml $(ALLSGML)
+ @rm -f *.htm
+ $(JADE.html) book-decl.sgml $<
ln -sf $*.htm index.html
ln -sf $*.htm $*.html
@@ -168,12 +176,12 @@ manl: $(SQLTARGETS) manpage.refs
##
# RTF to allow minor editing for hardcopy
-%.rtf: %.sgml
- $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) -d $(PDSL) -t rtf $<
+$(addsuffix .rtf, $(ALLBOOKS)): %.rtf: %.sgml $(ALLSGML)
+ $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) -d $(PDSL) -t rtf book-decl.sgml $<
# TeX and DVI
-%.tex: %.sgml
- $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) -d $(PDSL) -t tex $<
+$(addsuffix .tex, $(ALLBOOKS)): %.tex: %.sgml $(ALLSGML)
+ $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) -d $(PDSL) -t tex book-decl.sgml $<
%.dvi: %.tex
jadetex $<
@@ -222,10 +230,13 @@ tempfile_HISTORY.sgml: release.sgml
## Check
##
-check: $(addprefix check-, $(ALLDOCUMENTS))
+check: $(addprefix check-, $(ALLBOOKS)) check-postgres
# Quick syntax check without style processing
-check-%: %.sgml
+$(addprefix check-, $(ALLBOOKS)): check-%: %.sgml
+ $(NSGMLS) $(SGMLINCLUDE) -s book-decl.sgml $<
+
+check-postgres: postgres.sgml
$(NSGMLS) $(SGMLINCLUDE) -s $<
diff --git a/doc/src/sgml/about.sgml b/doc/src/sgml/about.sgml
index bf79ab78b53..1d562fab7a3 100644
--- a/doc/src/sgml/about.sgml
+++ b/doc/src/sgml/about.sgml
@@ -3,7 +3,7 @@
<para>
<productname>PostgreSQL</productname> is available without cost. This manual
- describes version 7.0 of <productname>PostgreSQL</productname>.
+ describes version &version; of <productname>PostgreSQL</productname>.
</para>
<para>
diff --git a/doc/src/sgml/admin.sgml b/doc/src/sgml/admin.sgml
index de2a85ab61a..304580eb81e 100644
--- a/doc/src/sgml/admin.sgml
+++ b/doc/src/sgml/admin.sgml
@@ -1,75 +1,22 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/admin.sgml,v 1.27 2000/09/30 16:58:20 petere Exp $
-
-Postgres Administrator's Guide.
-Derived from postgres.sgml.
-- thomas 1998-10-27
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/admin.sgml,v 1.28 2000/11/24 17:44:21 petere Exp $
-->
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!entity version "7.1">
-<!entity majorversion "7.1">
-
-<!entity about SYSTEM "about.sgml">
-<!entity history SYSTEM "history.sgml">
-<!entity info SYSTEM "info.sgml">
-<!entity legal SYSTEM "legal.sgml">
-<!entity notation SYSTEM "notation.sgml">
-<!entity problems SYSTEM "problems.sgml">
-<!entity y2k SYSTEM "y2k.sgml">
-
-<!entity backup SYSTEM "backup.sgml">
-<!entity charset SYSTEM "charset.sgml">
-<!entity client-auth SYSTEM "client-auth.sgml">
-<!entity intro-ag SYSTEM "intro-ag.sgml">
-<!entity installation SYSTEM "installation.sgml">
-<!entity installw SYSTEM "install-win32.sgml">
-<!entity manage-ag SYSTEM "manage-ag.sgml">
-<!entity recovery SYSTEM "recovery.sgml">
-<!entity regress SYSTEM "regress.sgml">
-<!entity release SYSTEM "release.sgml">
-<!entity runtime SYSTEM "runtime.sgml">
-<!entity user-manag SYSTEM "user-manag.sgml">
-
-<!entity biblio SYSTEM "biblio.sgml">
-
-<!-- see standalone-install.sgml about these -->
-<!entity % flattext-install-ignore "INCLUDE">
-<!entity % flattext-install-include "IGNORE">
-]>
-
<book id="admin">
<!-- Title information -->
- <title>PostgreSQL Administrator's Guide</title>
+ <title><![%single-book;[PostgreSQL &version;]]> Administrator's Guide</title>
<bookinfo>
- <releaseinfo>Covering v7.0 for general release</releaseinfo>
- <bookbiblio>
- <authorgroup>
- <corpauthor>The PostgreSQL Development Team</corpauthor>
- </authorgroup>
-<!-- editor in authorgroup is not supported
- <AuthorGroup>
--->
- <editor>
- <firstname>Thomas</firstname>
- <surname>Lockhart</surname>
- <affiliation>
- <orgname>Caltech/JPL</orgname>
- </affiliation>
- </editor>
-<!--
- </AuthorGroup>
--->
-
-<!--
- <AuthorInitials>TGL</AuthorInitials>
--->
+ <corpauthor>The PostgreSQL Global Development Group</corpauthor>
- <date>(last updated 2000-05-01)</date>
- </bookbiblio>
+ <editor>
+ <firstname>Thomas</firstname>
+ <surname>Lockhart</surname>
+ <affiliation>
+ <orgname>Caltech/JPL</orgname>
+ </affiliation>
+ </editor>
<legalnotice>
<para>
@@ -80,7 +27,7 @@ Derived from postgres.sgml.
</bookinfo>
- <preface id="preface">
+ <preface id="ag-preface">
<title>Summary</title>
<para>
@@ -95,7 +42,14 @@ Derived from postgres.sgml.
</para>
</preface>
+<!--
+ 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.
+-->
+<![%single-book;[
&intro-ag;
+]]>
&installation;
&installw;
&runtime;
@@ -107,16 +61,9 @@ Derived from postgres.sgml.
&recovery;
®ress;
&release;
-
+<![%single-book;[
&biblio;
-
-<!--
-Don't bother with an index until we get some index entries.
-- thomas 1998-10-26
-<index id="index">
-</index>
--->
-
+]]>
</book>
<!-- Keep this comment at the end of the file
diff --git a/doc/src/sgml/book-decl.sgml b/doc/src/sgml/book-decl.sgml
new file mode 100644
index 00000000000..4992fb202ef
--- /dev/null
+++ b/doc/src/sgml/book-decl.sgml
@@ -0,0 +1,11 @@
+<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
+
+<!entity % version SYSTEM "version.sgml">
+%version;
+<!entity % filelist SYSTEM "filelist.sgml">
+%filelist;
+
+<!entity % set-of-books "IGNORE">
+<!entity % single-book "INCLUDE">
+
+]>
diff --git a/doc/src/sgml/developer.sgml b/doc/src/sgml/developer.sgml
index 183864a7e83..586f0eaa95a 100644
--- a/doc/src/sgml/developer.sgml
+++ b/doc/src/sgml/developer.sgml
@@ -1,33 +1,8 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/Attic/developer.sgml,v 1.1 2000/10/08 13:24:09 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/Attic/developer.sgml,v 1.2 2000/11/24 17:44:21 petere Exp $ -->
<!-- PostgreSQL Developer's Guide -->
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!entity about SYSTEM "about.sgml">
-<!entity history SYSTEM "history.sgml">
-<!entity info SYSTEM "info.sgml">
-<!entity legal SYSTEM "legal.sgml">
-<!entity notation SYSTEM "notation.sgml">
-<!entity problems SYSTEM "problems.sgml">
-<!entity y2k SYSTEM "y2k.sgml">
-
-<!entity arch-dev SYSTEM "arch-dev.sgml">
-<!entity biblio SYSTEM "biblio.sgml">
-<!entity bki SYSTEM "bki.sgml">
-<!entity catalogs SYSTEM "catalogs.sgml">
-<!entity compiler SYSTEM "compiler.sgml">
-<!entity contacts SYSTEM "contacts.sgml">
-<!entity cvs SYSTEM "cvs.sgml">
-<!entity docguide SYSTEM "docguide.sgml">
-<!entity geqo SYSTEM "geqo.sgml">
-<!entity page SYSTEM "page.sgml">
-<!entity protocol SYSTEM "protocol.sgml">
-<!entity sources SYSTEM "sources.sgml">
-
-]>
-
<book id="developer">
- <title><productname>PostgreSQL Developer's Guide</></>
+ <title><![%single-book;[PostgreSQL &version;]]> Developer's Guide</title>
<bookinfo>
<abstract>
@@ -37,7 +12,7 @@
</simpara>
</abstract>
- <corpauthor>The PostgreSQL Global Development Group</>
+ <corpauthor>The PostgreSQL Global Development Group</corpauthor>
</bookinfo>
&sources;
@@ -53,8 +28,9 @@
&compiler;
&bki;
&page;
+<![%single-book;[
&biblio;
-
+]]>
<!-- appendices -->
&cvs;
&docguide;
diff --git a/doc/src/sgml/filelist.sgml b/doc/src/sgml/filelist.sgml
new file mode 100644
index 00000000000..051a432d9f6
--- /dev/null
+++ b/doc/src/sgml/filelist.sgml
@@ -0,0 +1,103 @@
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/filelist.sgml,v 1.1 2000/11/24 17:44:21 petere Exp $ -->
+
+<!entity about SYSTEM "about.sgml">
+<!entity history SYSTEM "history.sgml">
+<!entity info SYSTEM "info.sgml">
+<!entity legal SYSTEM "legal.sgml">
+<!entity notation SYSTEM "notation.sgml">
+<!entity problems SYSTEM "problems.sgml">
+<!entity y2k SYSTEM "y2k.sgml">
+
+<!-- tutorial -->
+<!entity arch SYSTEM "arch.sgml">
+<!entity intro SYSTEM "intro.sgml">
+<!entity query SYSTEM "query.sgml">
+<!entity sql SYSTEM "sql.sgml">
+<!entity start SYSTEM "start.sgml">
+
+<!-- user's guide -->
+<!entity advanced SYSTEM "advanced.sgml">
+<!entity array SYSTEM "array.sgml">
+<!entity datatype SYSTEM "datatype.sgml">
+<!entity datetime SYSTEM "datetime.sgml">
+<!entity environ SYSTEM "environ.sgml">
+<!entity func SYSTEM "func.sgml">
+<!entity indices SYSTEM "indices.sgml">
+<!entity inherit SYSTEM "inherit.sgml">
+<!entity manage SYSTEM "manage.sgml">
+<!entity mvcc SYSTEM "mvcc.sgml">
+<!entity oper SYSTEM "oper.sgml">
+<!entity plan SYSTEM "plan.sgml">
+<!entity plperl SYSTEM "plperl.sgml">
+<!entity plsql SYSTEM "plsql.sgml">
+<!entity pltcl SYSTEM "pltcl.sgml">
+<!entity populate SYSTEM "populate.sgml">
+<!entity psql SYSTEM "psql.sgml">
+<!entity query-ug SYSTEM "query-ug.sgml">
+<!entity storage SYSTEM "storage.sgml">
+<!entity syntax SYSTEM "syntax.sgml">
+<!entity typeconv SYSTEM "typeconv.sgml">
+
+<!-- reference pages -->
+<!entity % allfiles SYSTEM "ref/allfiles.sgml">
+%allfiles;
+
+<!-- administrator's guide -->
+<!entity backup SYSTEM "backup.sgml">
+<!entity charset SYSTEM "charset.sgml">
+<!entity client-auth SYSTEM "client-auth.sgml">
+<!entity intro-ag SYSTEM "intro-ag.sgml">
+<!entity installation SYSTEM "installation.sgml">
+<!entity installw SYSTEM "install-win32.sgml">
+<!entity manage-ag SYSTEM "manage-ag.sgml">
+<!entity recovery SYSTEM "recovery.sgml">
+<!entity regress SYSTEM "regress.sgml">
+<!entity release SYSTEM "release.sgml">
+<!entity runtime SYSTEM "runtime.sgml">
+<!entity user-manag SYSTEM "user-manag.sgml">
+
+<!-- programmer's guide -->
+<!entity arch-pg SYSTEM "arch-pg.sgml">
+<!entity dfunc SYSTEM "dfunc.sgml">
+<!entity ecpg SYSTEM "ecpg.sgml">
+<!entity extend SYSTEM "extend.sgml">
+<!entity func-ref SYSTEM "func-ref.sgml">
+<!entity gist SYSTEM "gist.sgml">
+<!entity intro-pg SYSTEM "intro-pg.sgml">
+<!entity indexcost SYSTEM "indexcost.sgml">
+<!entity jdbc SYSTEM "jdbc.sgml">
+<!entity libpgeasy SYSTEM "libpgeasy.sgml">
+<!entity libpq SYSTEM "libpq.sgml">
+<!entity libpqpp SYSTEM "libpq++.sgml">
+<!entity libpgtcl SYSTEM "libpgtcl.sgml">
+<!entity lisp SYSTEM "lisp.sgml">
+<!entity lobj SYSTEM "lobj.sgml">
+<!entity odbc SYSTEM "odbc.sgml">
+<!entity rules SYSTEM "rules.sgml">
+<!entity spi SYSTEM "spi.sgml">
+<!entity trigger SYSTEM "trigger.sgml">
+<!entity xaggr SYSTEM "xaggr.sgml">
+<!entity xfunc SYSTEM "xfunc.sgml">
+<!entity xindex SYSTEM "xindex.sgml">
+<!entity xplang SYSTEM "xplang.sgml">
+<!entity xoper SYSTEM "xoper.sgml">
+<!entity xtypes SYSTEM "xtypes.sgml">
+
+<!-- developer's guide -->
+<!entity arch-dev SYSTEM "arch-dev.sgml">
+<!entity biblio SYSTEM "biblio.sgml">
+<!entity bki SYSTEM "bki.sgml">
+<!entity catalogs SYSTEM "catalogs.sgml">
+<!entity compiler SYSTEM "compiler.sgml">
+<!entity contacts SYSTEM "contacts.sgml">
+<!entity cvs SYSTEM "cvs.sgml">
+<!entity docguide SYSTEM "docguide.sgml">
+<!entity geqo SYSTEM "geqo.sgml">
+<!entity index SYSTEM "index.sgml">
+<!entity page SYSTEM "page.sgml">
+<!entity protocol SYSTEM "protocol.sgml">
+<!entity sources SYSTEM "sources.sgml">
+
+<!-- see standalone-install.sgml about these -->
+<!entity % flattext-install-ignore "INCLUDE">
+<!entity % flattext-install-include "IGNORE">
diff --git a/doc/src/sgml/indices.sgml b/doc/src/sgml/indices.sgml
index 66a8a415f5c..63db6fc852a 100644
--- a/doc/src/sgml/indices.sgml
+++ b/doc/src/sgml/indices.sgml
@@ -150,9 +150,7 @@ SELECT am.amname AS acc_name,
</para>
<para>
- Use <xref endterm="sql-dropindex-title"
- linkend="sql-dropindex-title">
- to remove an index.
+ Use <command>DROP INDEX</command> to remove an index.
</para>
<sect1 id="keys">
diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml
index 0787a4d80f7..28532e6252b 100644
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -1,282 +1,39 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.43 2000/10/08 13:24:09 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.44 2000/11/24 17:44:21 petere Exp $
-->
<!doctype set PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!entity version "7.1">
-<!entity majorversion "7.1">
+<!entity % version SYSTEM "version.sgml">
+%version;
+<!entity % filelist SYSTEM "filelist.sgml">
+%filelist;
-<!entity about SYSTEM "about.sgml">
-<!entity history SYSTEM "history.sgml">
-<!entity info SYSTEM "info.sgml">
-<!entity legal SYSTEM "legal.sgml">
-<!entity notation SYSTEM "notation.sgml">
-<!entity problems SYSTEM "problems.sgml">
-<!entity y2k SYSTEM "y2k.sgml">
+<!entity % set-of-books "INCLUDE">
+<!entity % single-book "IGNORE">
-<!-- tutorial -->
-<!entity arch SYSTEM "arch.sgml">
-<!entity intro SYSTEM "intro.sgml">
-<!entity query SYSTEM "query.sgml">
-<!entity sql SYSTEM "sql.sgml">
-<!entity start SYSTEM "start.sgml">
-
-<!-- user's guide -->
-<!entity advanced SYSTEM "advanced.sgml">
-<!entity array SYSTEM "array.sgml">
-<!entity datatype SYSTEM "datatype.sgml">
-<!entity datetime SYSTEM "datetime.sgml">
-<!entity environ SYSTEM "environ.sgml">
-<!entity func SYSTEM "func.sgml">
-<!entity indices SYSTEM "indices.sgml">
-<!entity inherit SYSTEM "inherit.sgml">
-<!entity manage SYSTEM "manage.sgml">
-<!entity mvcc SYSTEM "mvcc.sgml">
-<!entity oper SYSTEM "oper.sgml">
-<!entity plan SYSTEM "plan.sgml">
-<!entity plperl SYSTEM "plperl.sgml">
-<!entity plsql SYSTEM "plsql.sgml">
-<!entity pltcl SYSTEM "pltcl.sgml">
-<!entity populate SYSTEM "populate.sgml">
-<!entity psql SYSTEM "psql.sgml">
-<!entity query-ug SYSTEM "query-ug.sgml">
-<!entity storage SYSTEM "storage.sgml">
-<!entity syntax SYSTEM "syntax.sgml">
-<!entity typeconv SYSTEM "typeconv.sgml">
-
-<!-- reference pages -->
-<!entity % allfiles SYSTEM "ref/allfiles.sgml">
-%allfiles;
-
-<!-- administrator's guide -->
-<!entity backup SYSTEM "backup.sgml">
-<!entity charset SYSTEM "charset.sgml">
-<!entity client-auth SYSTEM "client-auth.sgml">
-<!entity intro-ag SYSTEM "intro-ag.sgml">
-<!entity installation SYSTEM "installation.sgml">
-<!entity installw SYSTEM "install-win32.sgml">
-<!entity manage-ag SYSTEM "manage-ag.sgml">
-<!entity recovery SYSTEM "recovery.sgml">
-<!entity regress SYSTEM "regress.sgml">
-<!entity release SYSTEM "release.sgml">
-<!entity runtime SYSTEM "runtime.sgml">
-<!entity user-manag SYSTEM "user-manag.sgml">
-
-<!-- programmer's guide -->
-<!entity arch-pg SYSTEM "arch-pg.sgml">
-<!entity dfunc SYSTEM "dfunc.sgml">
-<!entity ecpg SYSTEM "ecpg.sgml">
-<!entity extend SYSTEM "extend.sgml">
-<!entity func-ref SYSTEM "func-ref.sgml">
-<!entity gist SYSTEM "gist.sgml">
-<!entity intro-pg SYSTEM "intro-pg.sgml">
-<!entity indexcost SYSTEM "indexcost.sgml">
-<!entity jdbc SYSTEM "jdbc.sgml">
-<!entity libpgeasy SYSTEM "libpgeasy.sgml">
-<!entity libpq SYSTEM "libpq.sgml">
-<!entity libpqpp SYSTEM "libpq++.sgml">
-<!entity libpgtcl SYSTEM "libpgtcl.sgml">
-<!entity lisp SYSTEM "lisp.sgml">
-<!entity lobj SYSTEM "lobj.sgml">
-<!entity odbc SYSTEM "odbc.sgml">
-<!entity rules SYSTEM "rules.sgml">
-<!entity spi SYSTEM "spi.sgml">
-<!entity trigger SYSTEM "trigger.sgml">
-<!entity xaggr SYSTEM "xaggr.sgml">
-<!entity xfunc SYSTEM "xfunc.sgml">
-<!entity xindex SYSTEM "xindex.sgml">
-<!entity xplang SYSTEM "xplang.sgml">
-<!entity xoper SYSTEM "xoper.sgml">
-<!entity xtypes SYSTEM "xtypes.sgml">
-
-<!-- developer's guide -->
-<!entity arch-dev SYSTEM "arch-dev.sgml">
-<!entity biblio SYSTEM "biblio.sgml">
-<!entity bki SYSTEM "bki.sgml">
-<!entity catalogs SYSTEM "catalogs.sgml">
-<!entity compiler SYSTEM "compiler.sgml">
-<!entity contacts SYSTEM "contacts.sgml">
-<!entity cvs SYSTEM "cvs.sgml">
-<!entity docguide SYSTEM "docguide.sgml">
-<!entity geqo SYSTEM "geqo.sgml">
-<!entity index SYSTEM "index.sgml">
-<!entity page SYSTEM "page.sgml">
-<!entity protocol SYSTEM "protocol.sgml">
-<!entity sources SYSTEM "sources.sgml">
-
-
-<!-- see standalone-install.sgml about these -->
-<!entity % flattext-install-ignore "INCLUDE">
-<!entity % flattext-install-include "IGNORE">
+<!entity admin SYSTEM "admin.sgml">
+<!entity developer SYSTEM "developer.sgml">
+<!entity programmer SYSTEM "programmer.sgml">
+<!entity reference SYSTEM "reference.sgml">
+<!entity tutorial SYSTEM "tutorial.sgml">
+<!entity user SYSTEM "user.sgml">
]>
-<!-- entity manpages SYSTEM "man/manpages.sgml" subdoc -->
<set id="postgres">
- <title>PostgreSQL Documentation</title>
-
- <book id="user">
- <title>User's Guide</title>
-
- <bookinfo>
- <abstract>
- <para>
- Information for Users
- </para>
- </abstract>
- </bookinfo>
-
- &intro;
- &syntax;
- &datatype;
- &oper;
- &func;
- &typeconv;
- &indices;
- &array;
- &inherit;
- &plsql;
- &pltcl;
- &plperl;
- &mvcc;
- &environ;
- &manage;
- &storage;
- &plan;
- &populate;
- &commands;
-
- &datetime;
-<!--
- &contacts;
--->
- &biblio;
- </book>
-
- <book id="admin">
- <title>Administrator's Guide</title>
-
- <bookinfo>
- <abstract>
- <para>
- Information for Administrators
- </para>
- </abstract>
- </bookinfo>
-
-<!--
- 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;
--->
- &installation;
- &installw;
- &runtime;
- &client-auth;
- &charset;
- &manage-ag;
- &user-manag;
- &backup;
- &recovery;
- ®ress;
- &release;
- </book>
-
- <book id="programmer">
- <title>Programmer's Guide</title>
-
- <bookinfo>
- <abstract>
- <para>
- Information on client and server programming
- </para>
- </abstract>
- </bookinfo>
-
-<!--
- 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;
--->
- <part>
- <title>Server Programming</title>
- &arch-pg;
- &extend;
- &xfunc;
- &xtypes;
- &xoper;
- &xaggr;
- &rules;
- &xindex;
- &indexcost;
- &gist;
- &dfunc;
- &trigger;
- &spi;
- &xplang;
- </part>
-
- <part>
- <title>Client Interfaces</title>
- &func-ref;
- &lobj;
- &ecpg;
- &libpq;
- &libpqpp;
- &libpgtcl;
- &libpgeasy;
- &odbc;
- &jdbc;
- &lisp;
- </part>
- </book>
-
- <book id="developer">
- <title>Developer's Guide</title>
- <bookinfo>
- <abstract>
- <para>
- Information for Postgres developers
- </>
- </>
- </bookinfo>
-
- &sources;
- &arch-dev;
- &geqo;
-<!--
- This listing of Postgres catalogs is currently just a copy of the old
- man page. It is not up to date and has not been marked up for SGML.
- - thomas 2000-04-20
- &catalogs;
--->
- &protocol;
- &compiler;
- &bki;
- &page;
- &cvs;
- &docguide;
- </book>
-
- <book id="tutorial">
- <title>Tutorial</title>
- &sql;
- &arch;
- &start;
- &query;
- &advanced;
- </book>
-
-
-<!--
-Omit index until we have some index entries.
-- thomas 1998-10-26
-<index Id="part-index">
-</index>
--->
+ <title>PostgreSQL &version; Documentation</title>
+
+ <setinfo>
+ <corpauthor>The PostgreSQL Global Development Group</corpauthor>
+ </setinfo>
+
+ &tutorial;
+ &user;
+ &admin;
+ &programmer;
+ &reference;
+ &developer;
</set>
diff --git a/doc/src/sgml/programmer.sgml b/doc/src/sgml/programmer.sgml
index 85fc3761842..9bfd5801777 100644
--- a/doc/src/sgml/programmer.sgml
+++ b/doc/src/sgml/programmer.sgml
@@ -1,78 +1,22 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/programmer.sgml,v 1.28 2000/10/08 13:24:09 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/programmer.sgml,v 1.29 2000/11/24 17:44:21 petere Exp $
-Postgres Programmer's Guide.
+PostgreSQL Programmer's Guide.
-->
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!entity about SYSTEM "about.sgml">
-<!entity history SYSTEM "history.sgml">
-<!entity info SYSTEM "info.sgml">
-<!entity legal SYSTEM "legal.sgml">
-<!entity notation SYSTEM "notation.sgml">
-<!entity problems SYSTEM "problems.sgml">
-<!entity y2k SYSTEM "y2k.sgml">
-
-<!entity arch-pg SYSTEM "arch-pg.sgml">
-<!entity dfunc SYSTEM "dfunc.sgml">
-<!entity ecpg SYSTEM "ecpg.sgml">
-<!entity extend SYSTEM "extend.sgml">
-<!entity func-ref SYSTEM "func-ref.sgml">
-<!entity gist SYSTEM "gist.sgml">
-<!entity intro-pg SYSTEM "intro-pg.sgml">
-<!entity indexcost SYSTEM "indexcost.sgml">
-<!entity jdbc SYSTEM "jdbc.sgml">
-<!entity libpgeasy SYSTEM "libpgeasy.sgml">
-<!entity libpq SYSTEM "libpq.sgml">
-<!entity libpqpp SYSTEM "libpq++.sgml">
-<!entity libpgtcl SYSTEM "libpgtcl.sgml">
-<!entity lisp SYSTEM "lisp.sgml">
-<!entity lobj SYSTEM "lobj.sgml">
-<!entity odbc SYSTEM "odbc.sgml">
-<!entity rules SYSTEM "rules.sgml">
-<!entity spi SYSTEM "spi.sgml">
-<!entity trigger SYSTEM "trigger.sgml">
-<!entity xaggr SYSTEM "xaggr.sgml">
-<!entity xfunc SYSTEM "xfunc.sgml">
-<!entity xindex SYSTEM "xindex.sgml">
-<!entity xplang SYSTEM "xplang.sgml">
-<!entity xoper SYSTEM "xoper.sgml">
-<!entity xtypes SYSTEM "xtypes.sgml">
-<!entity biblio SYSTEM "biblio.sgml">
-]>
-
<book id="programmer">
-<!-- Title information -->
-
- <title>PostgreSQL Programmer's Guide</title>
+ <title><![%single-book;[PostgreSQL &version;]]> Programmer's Guide</title>
<bookinfo>
- <releaseinfo>Covering v7.0 for general release</releaseinfo>
- <bookbiblio>
- <authorgroup>
- <corpauthor>The PostgreSQL Development Team</corpauthor>
- </authorgroup>
-<!-- editor in authorgroup is not supported
- <AuthorGroup>
--->
- <editor>
- <firstname>Thomas</firstname>
- <surname>Lockhart</surname>
- <affiliation>
- <orgname>Caltech/JPL</orgname>
- </affiliation>
- </editor>
-<!--
- </AuthorGroup>
--->
-
-<!--
- <AuthorInitials>TGL</AuthorInitials>
--->
+ <corpauthor>The PostgreSQL Global Development Group</corpauthor>
- <date>(last updated 2000-05-01)</date>
- </bookbiblio>
+ <editor>
+ <firstname>Thomas</firstname>
+ <surname>Lockhart</surname>
+ <affiliation>
+ <orgname>Caltech/JPL</orgname>
+ </affiliation>
+ </editor>
<legalnotice>
<para>
@@ -83,20 +27,7 @@ Postgres Programmer's Guide.
</bookinfo>
-<!--
-<TOC> </TOC>
-<LOT> </LOT>
--->
-
-<!--
-<Dedication>
-<Para>
-Your name here...
-</Para>
-</Dedication>
--->
-
- <preface id="preface">
+ <preface id="pg-preface">
<title>Summary</title>
<para>
@@ -111,9 +42,25 @@ Your name here...
</para>
</preface>
+<![%single-book[
&intro-pg;
- <part>
- <title>Server Programming</>
+]]>
+
+ <part id="programmer-client">
+ <title>Client Interfaces</title>
+ &libpq;
+ &lobj;
+ &libpqpp;
+ &libpgtcl;
+ &libpgeasy;
+ &ecpg;
+ &odbc;
+ &jdbc;
+ &lisp;
+ </part>
+
+ <part id="programmer-server">
+ <title>Server Programming</title>
&arch-pg;
&extend;
&xfunc;
@@ -139,27 +86,10 @@ Disable it until we put in some info.
&trigger;
&spi;
</part>
- <part>
- <title>Client Interfaces</>
- &lobj;
- &libpq;
- &libpqpp;
- &libpgtcl;
- &libpgeasy;
- &ecpg;
- &odbc;
- &jdbc;
- &lisp;
- </part>
-<!--
-&contacts;
--->
- &biblio;
-<!--
-<index id="index">
-</index>
--->
+<![%single-book;[
+ &biblio;
+]]>
</book>
diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml
index bdd78d1f28f..3463b02777c 100644
--- a/doc/src/sgml/ref/allfiles.sgml
+++ b/doc/src/sgml/ref/allfiles.sgml
@@ -1,12 +1,9 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.24 2000/10/16 03:34:47 pjw Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.25 2000/11/24 17:44:22 petere Exp $
Postgres documentation
Complete list of usable sgml source files in this directory.
-->
-<!entity intro-ref system "intro-ref.sgml">
-<!entity commands system "commands.sgml">
-
<!-- these will go into the "operators" reference chapter -->
<!entity all system "all.sgml">
<!entity any system "any.sgml">
@@ -38,7 +35,7 @@ Complete list of usable sgml source files in this directory.
<!entity trim system "trim.sgml">
<!entity upper system "upper.sgml">
-<!-- these are in the "commands" reference chapter -->
+<!-- SQL commands -->
<!entity abort system "abort.sgml">
<!entity alterGroup system "alter_group.sgml">
<!entity alterTable system "alter_table.sgml">
@@ -107,7 +104,7 @@ Complete list of usable sgml source files in this directory.
<!entity update system "update.sgml">
<!entity vacuum system "vacuum.sgml">
-<!-- these are in the "utilities" reference chapter -->
+<!-- applications and utilities -->
<!entity createdb system "createdb.sgml">
<!entity createlang system "createlang.sgml">
<!entity createuser system "createuser.sgml">
diff --git a/doc/src/sgml/ref/commands.sgml b/doc/src/sgml/ref/commands.sgml
deleted file mode 100644
index d1c55cdc7e3..00000000000
--- a/doc/src/sgml/ref/commands.sgml
+++ /dev/null
@@ -1,175 +0,0 @@
-<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/commands.sgml,v 1.29 2000/10/18 13:29:23 pjw Exp $
-Postgres documentation
--->
-
- <chapter id="sql-commands">
- <Title>SQL Commands</Title>
-
- <abstract>
- <Para>
- This is reference information for the <acronym>SQL</acronym>
- commands supported by <productname>Postgres</productname>.
- </Para>
- </abstract>
-
- &abort;
- &alterGroup;
- &alterTable;
- &alterUser;
- &begin;
- &close;
- &cluster;
- &commentOn;
- &commit;
- ©Table;
- &createAggregate;
- &createConstraint;
- &createDatabase;
- &createFunction;
- &createGroup;
- &createIndex;
- &createLanguage;
- &createOperator;
- &createRule;
- &createSequence;
- &createTable;
- &createTableAs;
- &createTrigger;
- &createType;
- &createUser;
- &createView;
- &declare;
- &delete;
- &dropAggregate;
- &dropDatabase;
- &dropFunction;
- &dropGroup;
- &dropIndex;
- &dropLanguage;
- &dropOperator;
- &dropRule;
- &dropSequence;
- &dropTable;
- &dropTrigger;
- &dropType
- &dropUser;
- &dropView;
- &end;
- &explain;
- &fetch;
- &grant;
- &insert;
- &listen;
- &load;
- &lock;
- &move;
- ¬ify;
- &reindex;
- &reset;
- &revoke;
- &rollback;
- &select;
- &selectInto;
- &set;
- &setConstraints;
- &setSession;
- &setTransaction;
- &show;
- &truncate;
- &unlisten;
- &update;
- &vacuum;
-
- </Chapter>
-
-<!--
-Disable this chapter until we have more functions documented.
-- thomas 1998-10-27
-
-<chapter Id="sql-functions">
-<title>SQL Functions</title>
-
-<para>
-This chapter provides reference information for the <acronym>SQL</acronym>
-functions supported by <productname>Postgres</productname>.
-</para>
-
-¤tDate;
-¤tTime;
-¤tTimestamp;
-¤tUser;
-
-</chapter>
-
--->
-
- <chapter Id="applications">
- <title>Applications</title>
-
- <abstract>
- <para>
- This is reference information for
- <productname>Postgres</productname> applications
- and support utilities.
- </para>
- </abstract>
-
- &createdb;
- &createlang;
- &createuser;
- &dropdb;
- &droplang;
- &dropuser;
- &ecpgRef;
- &pgAccess;
- &pgAdmin;
- &pgConfig;
- &pgCtl;
- &pgDump;
- &pgDumpall;
- &pgRestore;
- &psqlRef;
- &pgTclSh;
- &pgTkSh;
- &vacuumdb;
-
- </chapter>
-
- <chapter Id="utilities">
- <title>System Applications</title>
-
- <abstract>
- <para>
- This is reference information for
- <productname>Postgres</productname>
- servers and support utilities.
- </para>
- </abstract>
-
- &initdb;
- &initlocation;
- &ipcclean;
- &pgPasswd;
- &pgUpgrade;
- &postgres;
- &postmaster;
-
- </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/reference.sgml b/doc/src/sgml/reference.sgml
index 1bf3544a1a3..349a11b914c 100644
--- a/doc/src/sgml/reference.sgml
+++ b/doc/src/sgml/reference.sgml
@@ -1,65 +1,14 @@
<!-- reference.sgml
-$Header: /cvsroot/pgsql/doc/src/sgml/reference.sgml,v 1.8 2000/05/02 20:01:52 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/reference.sgml,v 1.9 2000/11/24 17:44:22 petere Exp $
-Postgres User's Reference documentation.
-- thomas 1998-08-31
+PostgreSQL Reference Manual
-->
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!entity intro SYSTEM "intro.sgml">
-
-<!entity % allfiles SYSTEM "ref/allfiles.sgml">
-%allfiles;
-
-<!entity biblio SYSTEM "biblio.sgml">
-<!entity contacts SYSTEM "contacts.sgml">
-]>
-
<book id="reference">
- <!-- Title information -->
-
- <title>PostgreSQL Reference Manual</title>
+ <title><![%single-book;[PostgreSQL &version;]]> Reference Manual</title>
<bookinfo>
- <releaseinfo>Covering v6.5 for general release</releaseinfo>
- <bookbiblio>
- <authorgroup>
- <author>
- <firstname>Jose</firstname>
- <surname>Soares Da Silva</surname>
- </author>
- <author>
- <firstname>Oliver</firstname>
- <surname>Elphick</surname>
- </author>
- </authorgroup>
-<!--
- <AuthorGroup>
- <CorpAuthor>The PostgreSQL Development Team</CorpAuthor>
- </AuthorGroup>
--->
-<!-- editor in authorgroup is not supported
- <AuthorGroup>
--->
-<!--
- <Editor>
- <FirstName>Thomas</FirstName>
- <SurName>Lockhart</SurName>
- <Affiliation>
- <OrgName>Caltech/JPL</OrgName>
- </Affiliation>
- </Editor>
--->
- <editor>
- <firstname>Oliver</firstname>
- <surname>Elphick</surname>
- </editor>
-<!--
- </AuthorGroup>
--->
-
- <date>(last updated 2000-05-01)</date>
- </bookbiblio>
+ <corpauthor>The PostgreSQL Global Development Group</corpauthor>
<legalnotice>
<para>
@@ -67,53 +16,161 @@ Postgres User's Reference documentation.
by PostgreSQL Inc.
</para>
</legalnotice>
-
</bookinfo>
-<!--
-<TOC> </TOC>
-<LOT> </LOT>
--->
-
-<!--
-<Dedication>
-<Para>
-Your name here...
-</Para>
-</Dedication>
--->
+ <reference id="sql-commands">
+ <title>SQL Commands</title>
- <preface id="preface">
- <title>Summary</title>
-
- <para>
- <productname>Postgres</productname>,
- developed originally in the UC Berkeley Computer Science Department,
- pioneered many of the object-relational concepts
- now becoming available in some commercial databases.
- It provides SQL92/SQL3 language support,
- transaction integrity, and type extensibility.
- <productname>PostgreSQL</productname> is a public-domain, open source descendant
- of this original Berkeley code.
- </para>
- </preface>
+ <partintro>
+ <para>
+ This is reference information for the <acronym>SQL</acronym>
+ commands supported by <productname>Postgres</productname>.
+ </para>
+ </partintro>
+
+ &abort;
+ &alterGroup;
+ &alterTable;
+ &alterUser;
+ &begin;
+ &close;
+ &cluster;
+ &commentOn;
+ &commit;
+ ©Table;
+ &createAggregate;
+ &createConstraint;
+ &createDatabase;
+ &createFunction;
+ &createGroup;
+ &createIndex;
+ &createLanguage;
+ &createOperator;
+ &createRule;
+ &createSequence;
+ &createTable;
+ &createTableAs;
+ &createTrigger;
+ &createType;
+ &createUser;
+ &createView;
+ &declare;
+ &delete;
+ &dropAggregate;
+ &dropDatabase;
+ &dropFunction;
+ &dropGroup;
+ &dropIndex;
+ &dropLanguage;
+ &dropOperator;
+ &dropRule;
+ &dropSequence;
+ &dropTable;
+ &dropTrigger;
+ &dropType
+ &dropUser;
+ &dropView;
+ &end;
+ &explain;
+ &fetch;
+ &grant;
+ &insert;
+ &listen;
+ &load;
+ &lock;
+ &move;
+ ¬ify;
+ &reindex;
+ &reset;
+ &revoke;
+ &rollback;
+ &select;
+ &selectInto;
+ &set;
+ &setConstraints;
+ &setSession;
+ &setTransaction;
+ &show;
+ &truncate;
+ &unlisten;
+ &update;
+ &vacuum;
+
+ </reference>
<!--
-&intro-ref;
--->
+Disable this chapter until we have more functions documented.
+- thomas 1998-10-27
- &commands;
+ <reference id="sql-functions">
+ <title>SQL Functions</title>
-<!--
-&contacts;
+ <partintro>
+ <para>
+ This part provides reference information for the
+ <acronym>SQL</acronym> functions supported by
+ <productname>Postgres</productname>.
+ </para>
+
+ ¤tDate;
+ ¤tTime;
+ ¤tTimestamp;
+ ¤tUser;
+ </reference>
-->
- &biblio;
+ <reference id="reference-client">
+ <title>Client Applications</title>
-<!--
-<index Id="index">
-</index>
--->
+ <partintro>
+ <para>
+ This is reference information for
+ <productname>Postgres</productname> client applications and
+ utilities.
+ </para>
+ </partintro>
+
+ &createdb;
+ &createuser;
+ &dropdb;
+ &dropuser;
+ &ecpgRef;
+ &pgAccess;
+ &pgAdmin;
+ &pgConfig;
+ &pgDump;
+ &pgDumpall;
+ &pgRestore;
+ &psqlRef;
+ &pgTclSh;
+ &pgTkSh;
+ &vacuumdb;
+
+ </reference>
+
+ <reference id="reference-server">
+ <title>Server Applications and Utilities</title>
+
+ <partintro>
+ <para>
+ This is reference information for
+ <productname>Postgres</productname>
+ server applications and support utilities.
+ </para>
+ </partintro>
+
+ &createlang;
+ &droplang;
+ &initdb;
+ &initlocation;
+ &ipcclean;
+ &pgCtl;
+ &pgPasswd;
+ &pgUpgrade;
+ &postgres;
+ &postmaster;
+
+ </reference>
</book>
diff --git a/doc/src/sgml/tutorial.sgml b/doc/src/sgml/tutorial.sgml
index 81f860ab4cb..f4acddfa2f4 100644
--- a/doc/src/sgml/tutorial.sgml
+++ b/doc/src/sgml/tutorial.sgml
@@ -1,60 +1,20 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/tutorial.sgml,v 1.10 2000/05/02 20:01:53 thomas Exp $
-
-Postgres tutorial. Derived from postgres.sgml.
-thomas 1998-02-23
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/tutorial.sgml,v 1.11 2000/11/24 17:44:22 petere Exp $
-->
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!entity about SYSTEM "about.sgml">
-<!entity history SYSTEM "history.sgml">
-<!entity info SYSTEM "info.sgml">
-<!entity legal SYSTEM "legal.sgml">
-<!entity notation SYSTEM "notation.sgml">
-<!entity problems SYSTEM "problems.sgml">
-<!entity y2k SYSTEM "y2k.sgml">
-
-<!entity advanced SYSTEM "advanced.sgml">
-<!entity arch SYSTEM "arch.sgml">
-<!entity biblio SYSTEM "biblio.sgml">
-<!entity intro SYSTEM "intro.sgml">
-<!entity query SYSTEM "query.sgml">
-<!entity sql SYSTEM "sql.sgml">
-<!entity start SYSTEM "start.sgml">
-]>
-
<book id="tutorial">
-<!-- Title information -->
-
- <title>PostgreSQL Tutorial</title>
+ <title><![%single-book;[PostgreSQL &version;]]> Tutorial</title>
<bookinfo>
- <releaseinfo>Covering v7.0 for general release</releaseinfo>
- <bookbiblio>
- <authorgroup>
- <corpauthor>The PostgreSQL Development Team</corpauthor>
- </authorgroup>
-<!-- editor in authorgroup is not supported
- <AuthorGroup>
--->
- <editor>
- <firstname>Thomas</firstname>
- <surname>Lockhart</surname>
- <affiliation>
- <orgname>Caltech/JPL</orgname>
- </affiliation>
- </editor>
-<!--
- </AuthorGroup>
--->
-
-<!--
- <AuthorInitials>TGL</AuthorInitials>
--->
+ <corpauthor>The PostgreSQL Global Development Group</corpauthor>
- <date>(last updated 2000-05-01)</date>
- </bookbiblio>
+ <editor>
+ <firstname>Thomas</firstname>
+ <surname>Lockhart</surname>
+ <affiliation>
+ <orgname>Caltech/JPL</orgname>
+ </affiliation>
+ </editor>
<legalnotice>
<para>
@@ -65,20 +25,7 @@ thomas 1998-02-23
</bookinfo>
-<!--
-<TOC> </TOC>
-<LOT> </LOT>
--->
-
-<!--
-<Dedication>
-<Para>
-Your name here...
-</Para>
-</Dedication>
--->
-
- <preface>
+ <preface id="tutorial-preface">
<title>Summary</title>
<para>
@@ -93,18 +40,17 @@ Your name here...
</para>
</preface>
+<![%single-book;[
&intro;
+]]>
&sql;
&arch;
&start;
&query;
&advanced;
-
+<![%single-book;[
&biblio;
-
-<!--
-<INDEX> </INDEX>
--->
+]]>
</book>
diff --git a/doc/src/sgml/user.sgml b/doc/src/sgml/user.sgml
index 80a29554a1f..e4aa8267a4e 100644
--- a/doc/src/sgml/user.sgml
+++ b/doc/src/sgml/user.sgml
@@ -1,75 +1,22 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/user.sgml,v 1.19 2000/05/02 20:01:53 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/user.sgml,v 1.20 2000/11/24 17:44:22 petere Exp $
-->
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!entity about SYSTEM "about.sgml">
-<!entity history SYSTEM "history.sgml">
-<!entity info SYSTEM "info.sgml">
-<!entity legal SYSTEM "legal.sgml">
-<!entity notation SYSTEM "notation.sgml">
-<!entity problems SYSTEM "problems.sgml">
-<!entity y2k SYSTEM "y2k.sgml">
-
-<!entity advanced SYSTEM "advanced.sgml">
-<!entity array SYSTEM "array.sgml">
-<!entity biblio SYSTEM "biblio.sgml">
-<!entity datatype SYSTEM "datatype.sgml">
-<!entity datetime SYSTEM "datetime.sgml">
-<!entity environ SYSTEM "environ.sgml">
-<!entity func SYSTEM "func.sgml">
-<!entity indices SYSTEM "indices.sgml">
-<!entity inherit SYSTEM "inherit.sgml">
-<!entity intro SYSTEM "intro.sgml">
-<!entity manage SYSTEM "manage.sgml">
-<!entity mvcc SYSTEM "mvcc.sgml">
-<!entity oper SYSTEM "oper.sgml">
-<!entity plan SYSTEM "plan.sgml">
-<!entity plperl SYSTEM "plperl.sgml">
-<!entity plsql SYSTEM "plsql.sgml">
-<!entity pltcl SYSTEM "pltcl.sgml">
-<!entity populate SYSTEM "populate.sgml">
-<!entity storage SYSTEM "storage.sgml">
-<!entity syntax SYSTEM "syntax.sgml">
-<!entity typeconv SYSTEM "typeconv.sgml">
-
-<!-- reference pages -->
-<!entity % allfiles SYSTEM "allfiles.sgml">
-%allfiles;
-]>
-
<book id="user">
<!-- Title information -->
- <title>PostgreSQL User's Guide</title>
+ <title><![%single-book;[PostgreSQL &version;]]> User's Guide</title>
<bookinfo>
- <releaseinfo>Covering v7.0 for general release</releaseinfo>
- <bookbiblio>
- <authorgroup>
- <corpauthor>The PostgreSQL Development Team</corpauthor>
- </authorgroup>
-<!-- editor in authorgroup is not supported
- <AuthorGroup>
--->
- <editor>
- <firstname>Thomas</firstname>
- <surname>Lockhart</surname>
- <affiliation>
- <orgname>Caltech/JPL</orgname>
- </affiliation>
- </editor>
-<!--
- </AuthorGroup>
--->
-
-<!--
- <AuthorInitials>TGL</AuthorInitials>
--->
+ <corpauthor>The PostgreSQL Development Team</corpauthor>
- <date>(last updated 2000-05-01)</date>
- </bookbiblio>
+ <editor>
+ <firstname>Thomas</firstname>
+ <surname>Lockhart</surname>
+ <affiliation>
+ <orgname>Caltech/JPL</orgname>
+ </affiliation>
+ </editor>
<legalnotice>
<para>
@@ -80,20 +27,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/user.sgml,v 1.19 2000/05/02 20:01:53
</bookinfo>
-<!--
-<TOC> </TOC>
-<LOT> </LOT>
--->
-
-<!--
-<Dedication>
-<Para>
-Your name here...
-</Para>
-</Dedication>
--->
-
- <preface id="preface">
+ <preface id="ug-preface">
<title>Summary</title>
<para>
@@ -126,22 +60,13 @@ Your name here...
&storage;
&plan;
&populate
- &commands;
<!-- appendices -->
&datetime;
- <!--
- &contacts;
- -->
&biblio;
-<!--
-<index Id="index">
-</index>
--->
-
</book>
<!-- Keep this comment at the end of the file
diff --git a/doc/src/sgml/version.sgml b/doc/src/sgml/version.sgml
new file mode 100644
index 00000000000..4930197f51b
--- /dev/null
+++ b/doc/src/sgml/version.sgml
@@ -0,0 +1,7 @@
+<!--
+Update this file to propagate correct current version numbers to the
+documentation. In text, use for example &version; to refer to them.
+-->
+
+<!entity version "7.1devel">
+<!entity majorversion "7.1">
--
GitLab