Skip to content

Commit

Permalink
Merge v16 beta 3
Browse files Browse the repository at this point in the history
  • Loading branch information
gleu committed Aug 10, 2023
1 parent 7143d1e commit 8a83c30
Show file tree
Hide file tree
Showing 202 changed files with 14,624 additions and 12,103 deletions.
149 changes: 91 additions & 58 deletions postgresql/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# don't exist, unless explicitly built, so we skip the installation in
# that case.


# Make "html" the default target, since that is what most people tend
# to want to use.
html:
Expand All @@ -20,15 +21,18 @@ html:
NO_GENERATED_HEADERS=yes
NO_TEMP_INSTALL=yes

VERSION = 15
VERSION = 16

#subdir = doc/src/sgml
#top_builddir = ../../..
#include $(top_builddir)/src/Makefile.global
top_srcdir = .
srcdir = .

all: html man

distprep: html distprep-man

top_srcdir = .
srcdir = .

ifndef DBTOEPUB
DBTOEPUB = $(missing) dbtoepub
endif
Expand All @@ -37,14 +41,14 @@ ifndef FOP
FOP = $(missing) fop
endif

XMLINCLUDE = --path .
XMLINCLUDE = --path . --path $(srcdir)

ifdef XMLLINT
XMLLINT := $(XMLLINT) --nonet
else
XMLLINT = $(missing) xmllint
endif

ifdef XSLTPROC
XSLTPROC := $(XSLTPROC) --nonet
else
Expand All @@ -53,35 +57,60 @@ endif

override XSLTPROCFLAGS += --stringparam pg.version '$(VERSION)'


ALLXML := $(wildcard $(srcdir)/*.xml $(srcdir)/ref/*.xml)

ALL_IMAGES := $(wildcard $(srcdir)/images/*.svg)
ALL_WEBSITE_IMAGES := $(wildcard $(srcdir)/images/*.png)

##
## pgfr release
##

pgfr: man html-website html INSTALL INSTALL.html postgres-A4.pdf
mv html-website $(VERSION)
tar cfz $(VERSION)/pg$(VERSION).tar.gz html
zip -qr $(VERSION)/pg$(VERSION).zip html
tar cfz $(VERSION)/pg$(VERSION).man.tar.gz man[0-9]
mv INSTALL $(VERSION)/INSTALL.txt
mv INSTALL.html $(VERSION)/
mv postgres-A4.pdf $(VERSION)/pg$(VERSION).pdf
# Run validation only once, common to all subsequent targets. While
# we're at it, also resolve all entities (that is, copy all included
# files into one big file). This helps tools that don't understand
# vpath builds (such as dbtoepub).
postgres-full.xml: postgres.xml $(ALLXML)
$(XMLLINT) $(XMLINCLUDE) --output $@ --noent --valid $<


##
## Man pages
##

man distprep-man: man-stamp

man-stamp: stylesheet-man.xsl postgres.xml $(ALLXML)
$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $(wordlist 1,2,$^)
man-stamp: stylesheet-man.xsl postgres-full.xml
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $^
touch $@


##
## common files
##

# Technically, this should depend on Makefile.global, but then
# version.xml would need to be rebuilt after every configure run,
# even in distribution tarballs. So this is cheating a bit, but it
# will achieve the goal of updating the version number when it
# changes.
#version.xml: $(top_srcdir)/configure
# { \
# echo "<!ENTITY version \"$(VERSION)\">"; \
# echo "<!ENTITY majorversion \"$(MAJORVERSION)\">"; \
# } > $@
#
#features-supported.xml: $(top_srcdir)/src/backend/catalog/sql_feature_packages.txt $(top_srcdir)/src/backend/catalog/sql_features.txt
# $(PERL) $(srcdir)/mk_feature_tables.pl YES $^ > $@
#
#features-unsupported.xml: $(top_srcdir)/src/backend/catalog/sql_feature_packages.txt $(top_srcdir)/src/backend/catalog/sql_features.txt
# $(PERL) $(srcdir)/mk_feature_tables.pl NO $^ > $@
#
#errcodes-table.xml: $(top_srcdir)/src/backend/utils/errcodes.txt generate-errcodes-table.pl
# $(PERL) $(srcdir)/generate-errcodes-table.pl $< > $@
#
#keywords-table.xml: $(top_srcdir)/src/include/parser/kwlist.h $(wildcard $(srcdir)/keywords/sql*.txt) generate-keywords-table.pl
# $(PERL) $(srcdir)/generate-keywords-table.pl $(srcdir) > $@


##
## Generation of some text files.
##
Expand All @@ -98,7 +127,7 @@ INSTALL.html: %.html : stylesheet-text.xsl %.xml
$(XMLLINT) --noout --valid $*.xml
$(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_HTML_FLAGS) $^ >$@

INSTALL.xml: standalone-profile.xsl standalone-install.xml postgres.xml $(ALLXML)
INSTALL.xml: standalone-profile.xsl standalone-install.xml postgres-full.xml
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) --xinclude $(wordlist 1,2,$^) >$@


Expand All @@ -112,33 +141,12 @@ endif

html: html-stamp

html-stamp: stylesheet.xsl postgres.xml $(ALLXML) $(ALL_IMAGES)
$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
html-stamp: stylesheet.xsl postgres-full.xml $(ALL_IMAGES)
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_HTML_FLAGS) $(wordlist 1,2,$^)
cp $(ALL_IMAGES) html/
cp $(srcdir)/css/*.css html/
touch $@

html-website: stylesheet.xsl postgres.xml $(ALLXML) $(ALL_IMAGES) $(ALL_WEBSITE_IMAGES)
$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) --param website.stylesheet 1 $(wordlist 1,2,$^)
mv html $@
cp $(ALL_IMAGES) $@/
cp $(ALL_WEBSITE_IMAGES) $@/
cp $(srcdir)/css/*.css $@/

htmlhelp: htmlhelp-stamp

htmlhelp-stamp: stylesheet-hh.xsl postgres.xml $(ALLXML) $(ALL_IMAGES)
$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(wordlist 1,2,$^)
cp $(ALL_IMAGES) htmlhelp/
cp $(srcdir)/css/stylesheet.css htmlhelp/
touch $@

# single-page HTML
postgres.html: stylesheet-html-nochunk.xsl postgres.xml $(ALLXML) $(ALL_IMAGES)
$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
postgres.html: stylesheet-html-nochunk.xsl postgres-full.xml $(ALL_IMAGES)
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_HTML_FLAGS) -o $@ $(wordlist 1,2,$^)

# single-page text
Expand All @@ -155,25 +163,26 @@ postgres.pdf:

XSLTPROC_FO_FLAGS += --stringparam img.src.path '$(srcdir)/'

%-A4.fo: stylesheet-fo.xsl %.xml $(ALLXML)
$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_FO_FLAGS) --stringparam paper.type A4 -o $@ $(wordlist 1,2,$^)
%-A4.fo: stylesheet-fo.xsl %-full.xml
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_FO_FLAGS) --stringparam paper.type A4 -o $@ $^

%-US.fo: stylesheet-fo.xsl %.xml $(ALLXML)
$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_FO_FLAGS) --stringparam paper.type USletter -o $@ $(wordlist 1,2,$^)
%-US.fo: stylesheet-fo.xsl %-full.xml
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_FO_FLAGS) --stringparam paper.type USletter -o $@ $^

%.pdf: %.fo $(ALL_IMAGES)
$(FOP) -q -fo $< -pdf $@
$(FOP) -fo $< -pdf $@


##
## EPUB
##

epub: postgres.epub
postgres.epub: postgres.xml $(ALLXML) $(ALL_IMAGES)
$(XMLLINT) --noout --valid $<
postgres.epub: postgres-full.xml $(ALL_IMAGES)
ifeq ($(vpath_build),yes)
$(MKDIR_P) images
cp $(ALL_IMAGES) images/
endif
$(DBTOEPUB) -o $@ $<


Expand All @@ -185,8 +194,7 @@ DB2X_TEXIXML = db2x_texixml
DB2X_XSLTPROC = db2x_xsltproc
MAKEINFO = makeinfo

%.texixml: %.xml $(ALLXML)
$(XMLLINT) --noout --valid $<
%.texixml: %-full.xml
$(DB2X_XSLTPROC) -s texi -g output-file=$(basename $@) $< -o $@

%.texi: %.texixml
Expand All @@ -201,7 +209,7 @@ MAKEINFO = makeinfo
##

# Quick syntax check without style processing
check: postgres.xml $(ALLXML)
check: postgres.xml $(ALLXML) check-tabs
$(XMLLINT) $(XMLINCLUDE) --noout --valid $<


Expand Down Expand Up @@ -272,6 +280,7 @@ check-tabs:

# This allows removing some files from the distribution tarballs while
# keeping the dependencies satisfied.
.SECONDARY: postgres-full.xml
.SECONDARY: INSTALL.html INSTALL.xml
.SECONDARY: postgres-A4.fo postgres-US.fo

Expand All @@ -283,8 +292,8 @@ clean:
rm -f postgres.html postgres.txt
# print
rm -f *.fo *.pdf
# HTML Help
rm -rf htmlhelp/ htmlhelp-stamp
# generated XML files
rm -f postgres-full.xml
# EPUB
rm -f postgres.epub
# Texinfo
Expand All @@ -297,3 +306,27 @@ maintainer-clean: distclean
rm -fr html/ html-stamp
# man
rm -rf man1/ man3/ man7/ man-stamp

##
## website pgfr release
##

html-website: stylesheet.xsl postgres.xml $(ALLXML) $(ALL_IMAGES) $(ALL_WEBSITE_IMAGES)
$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) --param website.stylesheet 1 $(wordlist 1,2,$^)
mv html $@
cp $(ALL_IMAGES) $@/
cp $(ALL_WEBSITE_IMAGES) $@/
cp $(srcdir)/css/*.css $@/

##
## pgfr release
##
pgfr: man html-website html INSTALL INSTALL.html postgres-A4.pdf
mv html-website $(VERSION)
tar cfz $(VERSION)/pg$(VERSION).tar.gz html
zip -qr $(VERSION)/pg$(VERSION).zip html
tar cfz $(VERSION)/pg$(VERSION).man.tar.gz man[0-9]
mv INSTALL $(VERSION)/INSTALL.txt
mv INSTALL.html $(VERSION)/
mv postgres-A4.pdf $(VERSION)/pg$(VERSION).pdf
25 changes: 21 additions & 4 deletions postgresql/acronyms.xml
Original file line number Diff line number Diff line change
Expand Up @@ -428,10 +428,27 @@
<term><acronym>LSN</acronym></term>
<listitem>
<para>
Log Sequence Number, Numéro de séquence dans les journaux de
transaction. Voir <link
linkend="datatype-pg-lsn"><type>pg_lsn</type></link> et <link
linkend="wal-internals">Vue interne des journaux de transaction</link>.
<glossterm linkend="glossary-log-sequence-number">Log Sequence Number</glossterm>
</para>
</listitem>
</varlistentry>

<varlistentry>
<term><acronym>MCF</acronym></term>
<listitem>
<para>
Most Common Frequency, that is the frequency associated with some
Most Common Value
</para>
</listitem>
</varlistentry>

<varlistentry>
<term><acronym>MCV</acronym></term>
<listitem>
<para>
Most Common Value, one of the values appearing most often within a
particular table column
</para>
</listitem>
</varlistentry>
Expand Down
2 changes: 1 addition & 1 deletion postgresql/adminpack.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<sect1 id="adminpack" xreflabel="adminpack">
<title>adminpack</title>
<title>adminpack &mdash; outils pour pgAdmin</title>

<indexterm zone="adminpack">
<primary>adminpack</primary>
Expand Down
10 changes: 5 additions & 5 deletions postgresql/amcheck.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<sect1 id="amcheck" xreflabel="amcheck">
<title>amcheck</title>
<title>amcheck &mdash; outils pour vérifier la cohérence des tables et index</title>

<indexterm zone="amcheck">
<primary>amcheck</primary>
Expand Down Expand Up @@ -62,7 +62,7 @@
données elles-mêmes dans les messages.
</para>

<sect2>
<sect2 id="amcheck-functions">
<title>Fonctions</title>

<variablelist>
Expand Down Expand Up @@ -371,7 +371,7 @@ SET client_min_messages = DEBUG1;
</variablelist>
</sect2>

<sect2>
<sect2 id="amcheck-optional-heapallindexed-verification">
<title>Vérification optionnelle <parameter>heapallindexed</parameter></title>

<para>
Expand Down Expand Up @@ -414,7 +414,7 @@ SET client_min_messages = DEBUG1;
</para>
</sect2>

<sect2>
<sect2 id="amcheck-using-amcheck-effectively">
<title>Utiliser <filename>amcheck</filename> efficacement</title>

<para>
Expand Down Expand Up @@ -587,7 +587,7 @@ SET client_min_messages = DEBUG1;
</para>
</sect2>

<sect2>
<sect2 id="amcheck-repairing-corruption">
<title>Réparer une corruption</title>

<para>
Expand Down
13 changes: 5 additions & 8 deletions postgresql/appendix-obsolete-recovery-config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,11 @@
</para>

<para>
Le paramètre
<literal>trigger_file</literal>
<indexterm>
<primary>trigger_file</primary>
<see>promote_trigger_file</see>
</indexterm>
a été renommé en
<xref linkend="guc-promote-trigger-file"/>.
PostgreSQL 15 and below had a setting
<literal>promote_trigger_file</literal>, or
<literal>trigger_file</literal> before 12.
Use <command>pg_ctl promote</command> or call
<function>pg_promote()</function> to promote a standby instead.
</para>

<para>
Expand Down

0 comments on commit 8a83c30

Please sign in to comment.