Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5e5c5cd

Browse files
committed
Merge documentation into one book. (Build with "make html".) Replace
vague cross-references with real links.
1 parent685a493 commit5e5c5cd

File tree

93 files changed

+549
-1050
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+549
-1050
lines changed

‎doc/src/Makefile

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,19 @@
11
# Postgres documentation makefile
2-
# $Header: /cvsroot/pgsql/doc/src/Makefile,v 1.30 2002/11/30 00:22:39 tgl Exp $
2+
# $Header: /cvsroot/pgsql/doc/src/Makefile,v 1.31 2003/03/25 16:15:35 petere Exp $
33

44
subdir = doc/src
55
top_builddir = ../..
66
include$(top_builddir)/src/Makefile.global
77

8-
ZIPSUFFIX= gz
9-
10-
BOOKS = admin developer reference programmer tutorial user postgres
11-
12-
TARGETS=$(BOOKS:%=%.tar.$(ZIPSUFFIX))
13-
14-
.PRECIOUS:
15-
.PHONY: install all sources clean distclean maintainer-clean
16-
17-
install: all
18-
cp -f*.$(ZIPSUFFIX) ..
19-
208
cleandistcleanmaintainer-clean:
21-
rm -f*.tar*.$(ZIPSUFFIX)
9+
rm -f*.tar*.gz
2210
$(MAKE) -C sgml$@
2311

24-
all:$(TARGETS)
25-
26-
sources:
27-
$(MAKE) sources.tar.$(ZIPSUFFIX)
28-
29-
sources.tar:
30-
$(TAR) -cf$@ sgml graphics
31-
3212
# Build twice to resolve index entries
33-
$(addsuffix.tar,$(BOOKS)):
13+
postgres.tar:
3414
$(MAKE) -C sgml clean
35-
$(MAKE) -C sgml$(basename$@).html
36-
$(MAKE) -C sgml$(basename$@).html JADEFLAGS='-V html-manifest'
15+
$(MAKE) -C sgml html
16+
$(MAKE) -C sgml html JADEFLAGS='-V html-manifest'
3717
cd sgml&&$(TAR) -cf ../$@`cat HTML.manifest``echo*.gif| grep -v'\*'`*.css
3818

3919
man.tar:

‎doc/src/sgml/Makefile

Lines changed: 26 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
#----------------------------------------------------------------------------
22
#
3-
# Makefile
4-
#Postgres documentation makefile
5-
#Thomas Lockhart
3+
# PostgreSQL documentation makefile
64
#
7-
# Copyright (c) 1994, Regents of the University of California
8-
#
9-
#
10-
# IDENTIFICATION
11-
# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.55 2003/01/14 23:19:34 petere Exp $
5+
# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.56 2003/03/25 16:15:35 petere Exp $
126
#
137
#----------------------------------------------------------------------------
148

@@ -26,7 +20,7 @@ endif
2620
ifndefJADE
2721
JADE = jade
2822
endif
29-
SGMLINCLUDE = -D$(srcdir) -D$(srcdir)/ref
23+
SGMLINCLUDE = -D$(srcdir)
3024

3125
ifndefNSGMLS
3226
NSGMLS = nsgmls
@@ -39,20 +33,11 @@ endif
3933
CONVERT = convert
4034
EPSTOPDF = epstopdf
4135

42-
4336
# docbook2man generates man pages from docbook refentry source code.
44-
45-
ifndefD2MDIR
46-
# This is where the (patched) docbook2man perl scripts reside on hub.org.
47-
D2MDIR= /home/users/t/thomas/d2x/docbook2man
48-
endif
4937
D2MSCRIPT=$(D2MDIR)/docbook2man-spec.pl
5038

51-
vpath%.sgml ./ref
52-
53-
ALLBOOKS = admin developer programmer reference tutorial user
5439

55-
GENERATED_SGML = bookindex.sgmlsetindex.sgmlversion.sgml\
40+
GENERATED_SGML = bookindex.sgml version.sgml\
5641
features-supported.sgml features-unsupported.sgml
5742

5843
ALLSGML :=$(wildcard$(srcdir)/*.sgml$(srcdir)/ref/*.sgml)$(GENERATED_SGML)
@@ -75,12 +60,10 @@ endif
7560

7661
DEFAULTSECTION :=$(sqlmansect_dummy)
7762

78-
man:$(ALLSGML)
79-
$(NSGMLS)$(NSGMLS_FLAGS)$(srcdir)/book-decl.sgml$(srcdir)/reference.sgml\
80-
|$(SGMLSPL)$(D2MSCRIPT) --lowercase --section$(DEFAULTSECTION) --date"`date'+%Y-%m-%d'`"
63+
man: postgres.sgml$(ALLSGML)
64+
$(NSGMLS)$(NSGMLS_FLAGS)$<|$(SGMLSPL)$(D2MSCRIPT) --lowercase --section$(DEFAULTSECTION) --date"`date'+%Y-%m-%d'`"
8165
# One more time, to resolve cross-references
82-
$(NSGMLS) $(NSGMLS_FLAGS) $(srcdir)/book-decl.sgml $(srcdir)/reference.sgml \
83-
| $(SGMLSPL) $(D2MSCRIPT) --lowercase --section $(DEFAULTSECTION) --date "`date '+%Y-%m-%d'`"
66+
$(NSGMLS) $(NSGMLS_FLAGS) $< | $(SGMLSPL) $(D2MSCRIPT) --lowercase --section $(DEFAULTSECTION) --date "`date '+%Y-%m-%d'`"
8467
$(mkinstalldirs) man1 man$(DEFAULTSECTION)
8568
mv *.1 man1/
8669
mv *.$(DEFAULTSECTION) man$(DEFAULTSECTION)/
@@ -90,36 +73,23 @@ man: $(ALLSGML)
9073
## HTML
9174
##
9275

93-
JADE.html =$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -i output-html -t sgml
76+
all:html
9477

95-
postgres.html: postgres.sgml$(ALLSGML) stylesheet.dsl
96-
@rm -f*.html
97-
$(JADE.html)$<
98-
ln -sf index.html$@
78+
.PHONY: html
9979

100-
$(addsuffix .html,$(ALLBOOKS)):%.html:%.sgml$(ALLSGML) stylesheet.dsl
80+
html: postgres.sgml$(ALLSGML) stylesheet.dsl catalogs.gif connections.gif
10181
@rm -f*.html
102-
$(JADE.html) book-decl.sgml$<
103-
ln -sf index.html$@
82+
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -i output-html -t sgml$<
10483

105-
programmer.html: catalogs.gif connections.gif
106-
postgres.html: catalogs.gif connections.gif
10784

108-
109-
COLLATEINDEX :=$(PERL)$(COLLATEINDEX) -f -g -t 'Index'
85+
COLLATEINDEX :=$(PERL)$(COLLATEINDEX) -f -g
11086

11187
ifeq (,$(wildcard HTML.index))
11288
bookindex.sgml:
11389
$(COLLATEINDEX) -o$@ -N
114-
115-
setindex.sgml:
116-
$(COLLATEINDEX) -x -o$@ -N
11790
else
11891
bookindex.sgml: HTML.index
11992
$(COLLATEINDEX) -i'bookindex' -o$@$<
120-
121-
setindex.sgml: HTML.index
122-
$(COLLATEINDEX) -i'setindex' -x -o$@$<
12393
endif
12494

12595
version.sgml:$(top_builddir)/src/Makefile.global
@@ -140,22 +110,25 @@ features-unsupported.sgml: $(top_srcdir)/src/backend/catalog/sql_feature_package
140110
##
141111

142112
# RTF to allow minor editing for hardcopy
143-
$(addsuffix .rtf,$(ALLBOOKS)):%.rtf:%.sgml$(ALLSGML) stylesheet.dsl
144-
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -t rtf -V rtf-backend -i output-print book-decl.sgml$<
113+
114+
%.rtf:%.sgml$(ALLSGML) stylesheet.dsl
115+
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -t rtf -V rtf-backend -i output-print$<
116+
117+
postgres.rtf: catalogs.gif connections.gif
145118

146119
# TeX
147120
# Regular TeX and pdfTeX have slightly differing requirements, so we
148121
# need to distinguish the path we're taking.
149122

150-
$(addsuffix .tex-ps,$(ALLBOOKS)):%.tex-ps:%.sgml$(ALLSGML) stylesheet.dsl
151-
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -i output-print -V texdvi-output -o$@book-decl.sgml$<
123+
%.tex-ps:%.sgml$(ALLSGML) stylesheet.dsl
124+
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -i output-print -V texdvi-output -o$@$<
152125

153-
programmer.tex-ps: catalogs.eps connections.eps
126+
postgres.tex-ps: catalogs.eps connections.eps
154127

155-
$(addsuffix .tex-pdf,$(ALLBOOKS)):%.tex-pdf:%.sgml$(ALLSGML) stylesheet.dsl
156-
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -i output-print -V texpdf-output -o$@book-decl.sgml$<
128+
%.tex-pdf:%.sgml$(ALLSGML) stylesheet.dsl
129+
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -i output-print -V texpdf-output -o$@$<
157130

158-
programmer.tex-pdf: catalogs.pdf connections.pdf
131+
postgres.tex-pdf: catalogs.pdf connections.pdf
159132

160133
%.dvi:%.tex-ps
161134
@rm -f$*.aux$*.log
@@ -177,8 +150,8 @@ programmer.tex-pdf: catalogs.pdf connections.pdf
177150
# This generates an XML version of the flow-object tree. It's useful
178151
# for debugging DSSSL code, and possibly to interface to some other
179152
# tools that can make use of this.
180-
$(addsuffix .fot,$(ALLBOOKS)):%.fot:%.sgml$(ALLSGML) stylesheet.dsl
181-
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -t fot -i output-print -o$@book-decl.sgml$<
153+
%.fot:%.sgml$(ALLSGML) stylesheet.dsl
154+
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -t fot -i output-print -o$@$<
182155

183156

184157
# Graphics
@@ -224,13 +197,8 @@ regress_README.html: regress.sgml
224197
## Check
225198
##
226199

227-
check:$(addprefix check-,$(ALLBOOKS)) check-postgres
228-
229200
# Quick syntax check without style processing
230-
$(addprefix check-,$(ALLBOOKS)): check-%:%.sgml$(ALLSGML)
231-
$(NSGMLS)$(SGMLINCLUDE) -s book-decl.sgml$<
232-
233-
check-postgres: postgres.sgml$(ALLSGML)
201+
check: postgres.sgml$(ALLSGML)
234202
$(NSGMLS)$(SGMLINCLUDE) -s$<
235203

236204

‎doc/src/sgml/admin.sgml

Lines changed: 0 additions & 107 deletions
This file was deleted.

‎doc/src/sgml/advanced.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/advanced.sgml,v 1.33 2003/03/13 01:30:24 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/advanced.sgml,v 1.34 2003/03/25 16:15:35 petere Exp $
33
-->
44

55
<chapter id="tutorial-advanced">
@@ -130,7 +130,7 @@ ERROR: &lt;unnamed&gt; referential integrity violation - key referenced from we
130130
<para>
131131
The behavior of foreign keys can be finely tuned to your
132132
application. We will not go beyond this simple example in this
133-
tutorial, but just refer you tothe &cite-user;
133+
tutorial, but just refer you to<xref linkend="ddl">
134134
for more information. Making correct use of
135135
foreign keys will definitely improve the quality of your database
136136
applications, so you are strongly encouraged to learn about them.
@@ -394,8 +394,8 @@ SELECT name, altitude
394394
<productname>PostgreSQL</productname> has many features not
395395
touched upon in this tutorial introduction, which has been
396396
oriented toward newer users of <acronym>SQL</acronym>. These
397-
features are discussed in more detail inboththe&cite-user;
398-
and the &cite-programmer;.
397+
features are discussed in more detail in theremainder of this
398+
book.
399399
</para>
400400

401401
<para>

‎doc/src/sgml/arch-dev.sgml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/arch-dev.sgml,v 2.18 2003/02/19 04:06:27 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/arch-dev.sgml,v 2.19 2003/03/25 16:15:35 petere Exp $
33
-->
44

55
<chapter id="overview">
@@ -480,8 +480,7 @@ current context are performed.
480480

481481
<para>
482482
For information on the syntax and creation of rules in the
483-
<productname>PostgreSQL</productname> system refer to the
484-
&cite-user;.
483+
<productname>PostgreSQL</productname> system refer to <xref linkend="sql">.
485484
</para>
486485

487486
<sect2>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp