diff --git a/doc/src/Makefile b/doc/src/Makefile
index df6f9d953f6eb4325cffe1bb691a7aa8e5aed18f..f4289a5fa307224c089d8d32230c1b5a138e9eb9 100644
--- a/doc/src/Makefile
+++ b/doc/src/Makefile
@@ -1,5 +1,5 @@
# Postgres documentation makefile
-# $Header: /cvsroot/pgsql/doc/src/Makefile,v 1.13 2000/09/12 03:47:36 thomas Exp $
+# $Header: /cvsroot/pgsql/doc/src/Makefile,v 1.14 2000/10/08 13:24:08 petere Exp $
subdir = doc/src
top_builddir = ../..
@@ -10,7 +10,7 @@ ZIP= gzip
ZIPSUFFIX= gz
TAREXCLUDE= --exclude=Makefile --exclude='*.sgml' --exclude=ref
-SRC= admin postgres programmer tutorial user
+SRC= admin postgres programmer tutorial user developer
TARGETS= $(SRC:%=%.tar.$(ZIPSUFFIX))
@@ -33,37 +33,37 @@ sources:
$(MAKE) sources.tar.$(ZIPSUFFIX)
sources.tar:
- ($(TAR) -cf $@ sgml graphics)
+ $(TAR) -cf $@ sgml graphics
admin.tar:
$(MAKE) -C sgml clean
$(MAKE) -C sgml admin.html
- (cd sgml; $(TAR) -cf ../$@ $(TAREXCLUDE) *.html *.htm -C ../graphics layout.gif)
+ cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html *.htm
-installation.tar:
+developer.tar:
$(MAKE) -C sgml clean
- $(MAKE) -C sgml installation.html
- (cd sgml; $(TAR) -cf ../$@ $(TAREXCLUDE) *.html *.htm)
-
-postgres.tar:
- $(MAKE) -C sgml clean
- $(MAKE) -C sgml postgres.html
- (cd sgml; $(TAR) -cf ../$@ $(TAREXCLUDE) *.html *.htm -C ../graphics catalogs.gif clientserver.gif connections.gif layout.gif)
+ $(MAKE) -C sgml developer.html
+ cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html *.htm
programmer.tar:
$(MAKE) -C sgml clean
$(MAKE) -C sgml programmer.html
- (cd sgml; $(TAR) -cf ../$@ $(TAREXCLUDE) *.html *.htm -C ../graphics catalogs.gif connections.gif)
+ cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html *.htm -C ../graphics catalogs.gif connections.gif
tutorial.tar:
$(MAKE) -C sgml clean
$(MAKE) -C sgml tutorial.html
- (cd sgml; $(TAR) -cf ../$@ $(TAREXCLUDE) *.html *.htm -C ../graphics clientserver.gif)
+ 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)
+ cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html *.htm
+
+postgres.tar:
+ $(MAKE) -C sgml clean
+ $(MAKE) -C sgml postgres.html
+ cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html *.htm -C ../graphics catalogs.gif clientserver.gif connections.gif
man.tar:
$(MAKE) -C sgml man
@@ -75,4 +75,3 @@ man.tar:
%.$(ZIPSUFFIX): %
$(ZIP) -f $<
-
diff --git a/doc/src/sgml/developer.sgml b/doc/src/sgml/developer.sgml
new file mode 100644
index 0000000000000000000000000000000000000000..183864a7e8314a203e3346b03e00de76e2caffb4
--- /dev/null
+++ b/doc/src/sgml/developer.sgml
@@ -0,0 +1,61 @@
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/Attic/developer.sgml,v 1.1 2000/10/08 13:24:09 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</></>
+
+ <bookinfo>
+ <abstract>
+ <simpara>
+ This document contains assorted information that can be of use to
+ <productname>PostgreSQL</> developers.
+ </simpara>
+ </abstract>
+
+ <corpauthor>The PostgreSQL Global Development Group</>
+ </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 DocBook.
+ - thomas 2000-04-20
+ &catalogs;
+-->
+ &protocol;
+ &compiler;
+ &bki;
+ &page;
+ &biblio;
+
+<!-- appendices -->
+ &cvs;
+ &docguide;
+</book>
diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml
index f3fa3912d4f146d08a571855ed51ba727b3851fe..0787a4d80f76d5ee616de207821dc7ff78421f4d 100644
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.42 2000/09/30 16:58:20 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.43 2000/10/08 13:24:09 petere Exp $
-->
<!doctype set PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
@@ -190,7 +190,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.42 2000/09/30 16:58:20 pe
<bookinfo>
<abstract>
<para>
- Information on extending Postgres
+ Information on client and server programming
</para>
</abstract>
</bookinfo>
@@ -201,6 +201,8 @@ $Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.42 2000/09/30 16:58:20 pe
included twice.
&intro-pg;
-->
+ <part>
+ <title>Server Programming</title>
&arch-pg;
&extend;
&xfunc;
@@ -215,19 +217,10 @@ $Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.42 2000/09/30 16:58:20 pe
&trigger;
&spi;
&xplang;
- </book>
-
- <book id="interfaces">
- <title>Interfaces</title>
-
- <bookinfo>
- <abstract>
- <para>
- Information on Postgres language interfaces
- </para>
- </abstract>
- </bookinfo>
+ </part>
+ <part>
+ <title>Client Interfaces</title>
&func-ref;
&lobj;
&ecpg;
@@ -238,6 +231,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.42 2000/09/30 16:58:20 pe
&odbc;
&jdbc;
&lisp;
+ </part>
</book>
<book id="developer">
diff --git a/doc/src/sgml/programmer.sgml b/doc/src/sgml/programmer.sgml
index fe1fd3af996272fd47e229a45286b67f70ffafcb..85fc376184296196ab1235146f5bc64896b7c5c2 100644
--- a/doc/src/sgml/programmer.sgml
+++ b/doc/src/sgml/programmer.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/programmer.sgml,v 1.27 2000/06/18 21:24:51 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/programmer.sgml,v 1.28 2000/10/08 13:24:09 petere Exp $
Postgres Programmer's Guide.
-->
@@ -39,20 +39,7 @@ Postgres Programmer's Guide.
<!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 page SYSTEM "page.sgml">
-<!entity protocol SYSTEM "protocol.sgml">
-<!entity sources SYSTEM "sources.sgml">
]>
<book id="programmer">
@@ -125,6 +112,8 @@ Your name here...
</preface>
&intro-pg;
+ <part>
+ <title>Server Programming</>
&arch-pg;
&extend;
&xfunc;
@@ -149,6 +138,9 @@ Disable it until we put in some info.
&trigger;
&spi;
+ </part>
+ <part>
+ <title>Client Interfaces</>
&lobj;
&libpq;
&libpqpp;
@@ -158,31 +150,11 @@ Disable it until we put in some info.
&odbc;
&jdbc;
&lisp;
-
-<!-- development -->
-
- &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;
-
-<!-- appendices -->
-
- &cvs;
- &docguide;
+ </part>
<!--
&contacts;
-->
- &biblio;
+ &biblio;
<!--
<index id="index">