diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile index 47b2c19f99a..1605f840d42 100644 --- a/doc/src/sgml/Makefile +++ b/doc/src/sgml/Makefile @@ -8,23 +8,24 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.7 1998/10/30 19:36:51 thomas Exp $ +# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.8 1999/07/06 17:19:41 thomas Exp $ # #---------------------------------------------------------------------------- PGDOCS= ../.. SRCDIR= ../../../src +D2MDIR= ../docbook2man # This is where the default stylesheets appear on my system. # Probably no need to change this; rather, put definitions # for HSTYLE and PSTYLE and/or for HDSL and PDSL # in Makefile.custom in your code src directory. -HSTYLE=/usr/lib/sgml/stylesheets/jade/docbook/html -PSTYLE=/usr/lib/sgml/stylesheets/jade/docbook/print +#HSTYLE=/usr/lib/sgml/stylesheets/nwalsh-modular/html +#PSTYLE=/usr/lib/sgml/stylesheets/nwalsh-modular/print -#HSTYLE=/home/tgl/SGML/db107.d/docbook/html -#PSTYLE=/home/tgl/SGML/db107.d/docbook/print +HSTYLE=/opt/sgml/current/docbook/html +PSTYLE=/opt/sgml/current/docbook/print HDSL=$(HSTYLE)/docbook.dsl PDSL=$(PSTYLE)/docbook.dsl @@ -57,6 +58,46 @@ ifneq ($(PDSL), ) PRINTOPTS= -d $(PDSL) endif +MANSOURCES= $(wildcard ref/*.sgml) + +APPLICATIONS= createdb.sgml createuser.sgml \ + destroydb.sgml destroyuser.sgml \ + initdb.sgml initlocation.sgml \ + pg_dump.sgml \ + pg_dumpall.sgml \ + pg_upgrade.sgml \ + pgaccess-ref.sgml \ + pgadmin-ref.sgml \ + postgres-ref.sgml \ + postmaster.sgml \ + psql-ref.sgml \ + vacuumdb.sgml + +COMMANDS= abort.sgml alter_table.sgml alter_user.sgml \ + begin.sgml \ + close.sgml cluster.sgml commit.sgml copy.sgml \ + create_aggregate.sgml create_database.sgml create_function.sgml create_index.sgml \ + create_language.sgml create_operator.sgml create_rule.sgml create_sequence.sgml \ + create_table.sgml create_table_as.sgml create_trigger.sgml create_type.sgml \ + create_user.sgml create_view.sgml \ + declare.sgml delete.sgml \ + drop_aggregate.sgml drop_database.sgml drop_function.sgml drop_index.sgml \ + drop_language.sgml drop_operator.sgml drop_rule.sgml drop_sequence.sgml \ + drop_table.sgml drop_trigger.sgml drop_type.sgml drop_user.sgml drop_view.sgml \ + explain.sgml fetch.sgml grant.sgml \ + insert.sgml listen.sgml load.sgml lock.sgml move.sgml \ + notify.sgml \ + reset.sgml revoke.sgml rollback.sgml \ + select.sgml select_into.sgml set.sgml show.sgml \ + unlisten.sgml update.sgml vacuum.sgml + +FUNCTIONS= current_date.sgml current_time.sgml current_timestamp.sgml current_user.sgml + +APPSOURCES= $(addprefix ref/, $(APPLICATIONS)) +SQLSOURCES= $(addprefix ref/, $(COMMANDS)) +APPTARGETS= $(APPLICATIONS:.sgml=.1) +SQLTARGETS= $(COMMANDS:.sgml=.l) + .PRECIOUS: postgres.tex postgres.dvi .PHONY: install all clean distclean @@ -66,8 +107,26 @@ install:: all:: +#man:: .manlist +# for f in `cat .manlist` ; do \ +# nsgmls $f | sgmlspl ../docbook2man/docbook2man-spec.pl --lowercase; \ +# done +# +#.manlist: $(MANSOURCES) +# (grep -iE ')' $(MANSOURCES) | cut -f 1 -d : | sort | uniq) > .manlist + +man1: $(APPTARGETS) + $(RM) -rf man1 + if [ ! -d man1 ]; then mkdir man1; fi + mv *.1 man1/ + +manl: $(SQLTARGETS) + $(RM) -rf manl/* + if [ ! -d manl ]; then mkdir manl; fi + mv *.l manl/ + clean:: - (rm -rf HTML.manifest *.html *.htm) + (rm -rf HTML.manifest *.html *.htm man1 manl manpage*) distclean:: $(MAKE) clean @@ -76,16 +135,11 @@ distclean:: # Generic production rules # -# Compressed file +%.1: ref/%.sgml + nsgmls $< | sgmlspl $(D2MDIR)/docbook2man-spec.pl --defsection 1 -%.gz: % - (gzip -f $<) - -# TAR file for HTML package - -%.tar: %.html # %.ps - ($(TAR) cf $@ $*.html index.html *.htm *.gif) # $*.ps - (rm -rf index.html *.htm) +%.l: ref/%.sgml + nsgmls $< | sgmlspl $(D2MDIR)/docbook2man-spec.pl --defsection l # HTML # Include some softlinks to the generic default file names diff --git a/doc/src/sgml/arch-dev.sgml b/doc/src/sgml/arch-dev.sgml index b8d03725bea..7d867c45cae 100644 --- a/doc/src/sgml/arch-dev.sgml +++ b/doc/src/sgml/arch-dev.sgml @@ -4,7 +4,8 @@ Author - This chapter originally appeared as a part of , Stefan Simkovics' + This chapter originally appeared as a part of + , Stefan Simkovics' Master's Thesis prepared at Vienna University of Technology under the direction of O.Univ.Prof.Dr. Georg Gottlob and Univ.Ass. Mag. Katrin Seyr. @@ -239,17 +240,18 @@ A detailed description of yacc or - the grammar rules given - in gram.y would be beyond the scope of this paper. There are - many books and documents dealing with lex - and yacc. You - should be familiar with yacc before you start to study the - grammar given in gram.y otherwise you won't understand what - happens there. + the grammar rules given in gram.y would be + beyond the scope of this paper. There are many books and + documents dealing with lex and + yacc. You should be familiar with + yacc before you start to study the + grammar given in gram.y otherwise you won't + understand what happens there. - For a better understanding of the data structures used in Postgres + For a better understanding of the data structures used in + Postgres for the processing of a query we use an example to illustrate the changes made to these data structures in every stage. @@ -271,10 +273,9 @@ have already been defined. - select s.sname, se.pno - from supplier s, sells se - where s.sno > 2 and - s.sno = se.sno; +select s.sname, se.pno + from supplier s, sells se + where s.sno > 2 and s.sno = se.sno; diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml index ccdf85e6830..8297c2c1baf 100644 --- a/doc/src/sgml/docguide.sgml +++ b/doc/src/sgml/docguide.sgml @@ -1,5 +1,5 @@