Update installation instructions to new realities. Combined into one file.

Improved automation of INSTALL file generation.

Author: petere

INSTALL

@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.16 2000/07/16 14:50:38 petere Exp $
+#    $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.17 2000/07/21 00:44:11 petere Exp $
 #
 #----------------------------------------------------------------------------
 
@@ -199,3 +199,22 @@ distclean:
 %.gif:
 	cp -p ../graphics/$@ .
 
+
+# Generation of the INSTALL text file. Not fully automated, but better
+# than nothing.
+.PHONY: INSTALL
+INSTALL: INSTALL.html
+	@echo "|";\
+	 echo "| You should now take \`$<', save it as a text file in Netscape,";\
+	 echo "| and put it in place of the existing \`INSTALL' file.";\
+	 echo "|"
+	@rm -f tempfile.html tempfile.sgml
+
+INSTALL.html: tempfile.html
+	sed -e 's/Chapter 1. *//g' < $< > $@
+
+tempfile.html: tempfile.sgml
+	jade -d $(HDSL) -V nochunks -t sgml $< > $@
+
+tempfile.sgml: standalone-install.sgml installation.sgml
+	cat $+ > $@

doc/src/sgml/Makefile

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/admin.sgml,v 1.24 2000/06/30 16:14:21 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/admin.sgml,v 1.25 2000/07/21 00:44:12 petere Exp $
 
 Postgres Administrator's Guide.
 Derived from postgres.sgml.
@@ -8,6 +8,9 @@ Derived from postgres.sgml.
 
 <!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">
@@ -16,22 +19,23 @@ Derived from postgres.sgml.
 <!entity problems  SYSTEM "problems.sgml">
 <!entity y2k       SYSTEM "y2k.sgml">
 
-<!entity config    SYSTEM "config.sgml">
 <!entity intro-ag  SYSTEM "intro-ag.sgml">
-<!entity install   SYSTEM "install.sgml">
+<!entity installation SYSTEM "installation.sgml">
 <!entity installw  SYSTEM "install-win32.sgml">
-<!entity layout    SYSTEM "layout.sgml">
-<!entity ports     SYSTEM "ports.sgml">
-<!entity release   SYSTEM "release.sgml">
 <!entity runtime   SYSTEM "runtime.sgml">
 <!entity client-auth SYSTEM "client-auth.sgml">
 <!entity manage-ag SYSTEM "manage-ag.sgml">
 <!entity user-manag SYSTEM "user-manag.sgml">
 <!entity backup    SYSTEM "backup.sgml">
 <!entity recovery  SYSTEM "recovery.sgml">
 <!entity regress   SYSTEM "regress.sgml">
+<!entity release   SYSTEM "release.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">
@@ -75,19 +79,6 @@ Derived from postgres.sgml.
 
  </bookinfo>
 
-<!--
-<TOC> </TOC>
-<LOT> </LOT>
--->
-
-<!--
-<Dedication>
-<Para>
-Your name here...
-</Para>
-</Dedication>
--->
-
  <preface id="preface">
   <title>Summary</title>
 
@@ -104,11 +95,7 @@ Your name here...
  </preface>
 
   &intro-ag;
-
-  &ports;
-  &config;
-  &layout;
-  &install;
+  &installation;
   &installw;
   &runtime;
   &client-auth;

doc/src/sgml/admin.sgml

@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/backup.sgml,v 2.1 2000/06/30 16:14:21 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/backup.sgml,v 2.2 2000/07/21 00:44:12 petere Exp $ -->
 <chapter id="backup">
  <title>Backup and Restore</title>
 
@@ -340,7 +340,7 @@ tar -cf backup.tar /usr/local/pgsql/data
 
  </sect1>
 
- <sect1>
+ <sect1 id="migration">
   <title>Migration between releases</title>
 
   <para>