First changes for reference pages. Fix markup in the docguide.

3 files changed, 28 insertions, 6 deletions

diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index 6437ad4a57a..24023ed13ca 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.2 1998/03/01 20:44:37 thomas Exp $
+#    $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.3 1998/05/13 05:33:30 thomas Exp $
 #
 #----------------------------------------------------------------------------
 
@@ -29,7 +29,8 @@ PSTYLE=/usr/lib/sgml/stylesheets/jade/docbook/print
 HDSL=$(HSTYLE)/docbook.dsl
 PDSL=$(PSTYLE)/docbook.dsl
 
-#DBOPTS= -V %no-split-output% -V %no-make-index%
+DBOPTS= -D ref
+#DBOPTS+= -V %no-split-output% -V %no-make-index%
 
 TAR= tar
 
@@ -85,7 +86,7 @@ distclean::
 
 %.html:	%.sgml #$(HDSL)
 	(rm -rf *.htm)
-	jade $(DBOPTS) -D sgml $(HTMLOPTS) -t sgml $<
+	jade $(DBOPTS) $(HTMLOPTS) -t sgml $<
 	(ln -sf book01.htm index.html)
 	(ln -sf book01.htm $*.html)
 
diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml
index 3e571f33ad8..03b6356134a 100644
--- a/doc/src/sgml/docguide.sgml
+++ b/doc/src/sgml/docguide.sgml
@@ -239,7 +239,7 @@ right, and I can verify the document with "nsgmls -s docguide.sgml".
 <title>Building Documentation</title>
 
 <para>
-GNU <application>make</application> is used to build documentation from the DocBook sources.
+GNU <programname>make</programname> is used to build documentation from the DocBook sources.
 There are a few environment definitions which may need to be set or modified for your installation.
 The <filename>Makefile</filename> looks for 
 <filename>doc/../src/Makefile</filename>
diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml
index 22a74d95f61..67adad9e21d 100644
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -6,11 +6,14 @@
 -
 - -->
 <!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+
+<!-- tutorial -->
 <!entity intro    SYSTEM "intro.sgml">
 <!entity arch     SYSTEM "arch.sgml">
 <!entity start    SYSTEM "start.sgml">
 <!entity query    SYSTEM "query.sgml">
 
+<!-- user's guide -->
 <!entity advanced SYSTEM "advanced.sgml">
 <!entity environ  SYSTEM "environ.sgml">
 <!entity manage   SYSTEM "manage.sgml">
@@ -22,6 +25,7 @@
 <!entity psql     SYSTEM "psql.sgml">
 <!entity pgaccess SYSTEM "pgaccess.sgml">
 
+<!-- administrator's guide -->
 <!entity start-ag SYSTEM "start-ag.sgml">
 <!entity install  SYSTEM "install.sgml">
 <!entity recovery SYSTEM "recovery.sgml">
@@ -29,6 +33,7 @@
 <!entity ports    SYSTEM "ports.sgml">
 <!entity release  SYSTEM "release.sgml">
 
+<!-- programmer's guide -->
 <!entity intro-pg SYSTEM "intro-pg.sgml">
 <!entity arch-pg  SYSTEM "arch-pg.sgml">
 <!entity extend   SYSTEM "extend.sgml">
@@ -50,6 +55,12 @@
 <!entity odbc     SYSTEM "odbc.sgml">
 <!entity jdbc     SYSTEM "jdbc.sgml">
 
+<!-- reference pages -->
+<!entity intro-ref  SYSTEM "intro-ref.sgml">
+<!entity % allfiles SYSTEM "allfiles.sgml">
+%allfiles;
+
+<!-- developer's guide -->
 <!entity arch-dev SYSTEM "arch-dev.sgml">
 <!entity geqo     SYSTEM "geqo.sgml">
 <!entity protocol SYSTEM "protocol.sgml">
@@ -198,7 +209,7 @@ Information for extending <ProductName>Postgres</ProductName>.
 </Part>
 
 <Part>
-<Title>Reference</Title>
+<Title>Interfaces</Title>
 <PartIntro>
 <Para>
 User and programmer interfaces.
@@ -214,6 +225,17 @@ User and programmer interfaces.
 </Part>
 
 <Part>
+<Title>Reference</Title>
+<PartIntro>
+<Para>
+Command syntax.
+</Para>
+</PartIntro>
+<!-- &intro-ref; -->
+&commands;
+</Part>
+
+<Part>
 <Title>Developer's Guide</Title>
 <PartIntro>
 <Para>
@@ -242,4 +264,3 @@ Additional related information.
 <INDEX> </INDEX>
 
 </Book>
-