diff options
| -rw-r--r-- | GNUmakefile.in | 4 | ||||
| -rw-r--r-- | HISTORY | 6 | ||||
| -rw-r--r-- | README | 3 | ||||
| -rw-r--r-- | README.git | 12 | ||||
| -rw-r--r-- | doc/src/sgml/.gitignore | 3 | ||||
| -rw-r--r-- | doc/src/sgml/Makefile | 17 | ||||
| -rw-r--r-- | doc/src/sgml/docguide.sgml | 21 | ||||
| -rw-r--r-- | doc/src/sgml/generate_history.pl | 58 | ||||
| -rw-r--r-- | doc/src/sgml/release.sgml | 5 | ||||
| -rw-r--r-- | doc/src/sgml/standalone-install.sgml | 16 | ||||
| -rw-r--r-- | src/test/regress/README | 3 | ||||
| -rw-r--r-- | src/tools/RELEASE_CHANGES | 1 |
12 files changed, 29 insertions, 120 deletions
diff --git a/GNUmakefile.in b/GNUmakefile.in index c924f305994..34e79566ae4 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -129,10 +129,8 @@ distdir: fi || exit; \ done $(MAKE) -C $(distdir) distprep - $(MAKE) -C $(distdir)/doc/src/sgml/ HISTORY INSTALL regress_README - cp $(distdir)/doc/src/sgml/HISTORY $(distdir)/ + $(MAKE) -C $(distdir)/doc/src/sgml/ INSTALL cp $(distdir)/doc/src/sgml/INSTALL $(distdir)/ - cp $(distdir)/doc/src/sgml/regress_README $(distdir)/src/test/regress/README $(MAKE) -C $(distdir) distclean rm -f $(distdir)/README.git diff --git a/HISTORY b/HISTORY new file mode 100644 index 00000000000..360c7f68b3e --- /dev/null +++ b/HISTORY @@ -0,0 +1,6 @@ +Release notes for all versions of PostgreSQL can be found on-line at +http://www.postgresql.org/docs/devel/static/release.html + +In a distribution file set, release notes for the current version can be +found prebuilt under doc/src/sgml/html/. Visit the index.html file with +an HTML browser, then consult the "Release Notes" appendix. @@ -17,8 +17,7 @@ See the file INSTALL for instructions on how to build and install PostgreSQL. That file also lists supported operating systems and hardware platforms and contains information regarding any other software packages that are required to build or run the PostgreSQL -system. Changes between all PostgreSQL releases are recorded in the -file HISTORY. Copyright and license information can be found in the +system. Copyright and license information can be found in the file COPYRIGHT. A comprehensive documentation set is included in this distribution; it can be read as described in the installation instructions. diff --git a/README.git b/README.git index d5378b4573c..0bf2b56cb34 100644 --- a/README.git +++ b/README.git @@ -1,12 +1,12 @@ (This file does not appear in release tarballs.) -In a release or snapshot tarball of PostgreSQL, documentation files named -INSTALL and HISTORY will appear in this directory. However, these files are -not stored in git and so will not be present if you are using a git checkout. -If you are using git, you can view the most recent install instructions at: +In a release or snapshot tarball of PostgreSQL, a documentation file named +INSTALL will appear in this directory. However, this file is not stored in +git and so will not be present if you are using a git checkout. + +If you are using a git checkout, you can view the most recent installation +instructions at: http://www.postgresql.org/docs/devel/static/installation.html -and the current release notes at: - http://www.postgresql.org/docs/devel/static/release.html Users compiling from git will also need compatible versions of Bison, Flex, and Perl, as discussed in the install documentation. These programs are not diff --git a/doc/src/sgml/.gitignore b/doc/src/sgml/.gitignore index dbe5e7509d8..1ad64f58c26 100644 --- a/doc/src/sgml/.gitignore +++ b/doc/src/sgml/.gitignore @@ -2,9 +2,7 @@ *.html *.[1-9] # Other popular build targets -/HISTORY /INSTALL -/regress_README /postgres-US.pdf /postgres-A4.pdf # GENERATED_SGML @@ -16,6 +14,7 @@ /HTML.index.start # Assorted byproducts from building the above /postgres.xml +/INSTALL.html /postgres-US.aux /postgres-US.log /postgres-US.out diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile index 6b408f98dbb..438a468e8b5 100644 --- a/doc/src/sgml/Makefile +++ b/doc/src/sgml/Makefile @@ -205,25 +205,12 @@ postgres.pdf: JADE.text = $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -i output-text -t sgml LYNX = lynx -INSTALL HISTORY regress_README: % : %.html +INSTALL: % : %.html $(PERL) -p -e 's/<H(1|2)$$/<H\1 align=center/g' $< | $(LYNX) -force_html -dump -nolist -stdin >$@ INSTALL.html: standalone-install.sgml installation.sgml version.sgml $(JADE.text) -V nochunks standalone-install.sgml installation.sgml >$@ -HISTORY.html: generate_history.pl $(wildcard $(srcdir)/release*.sgml) - $(PERL) $< "$(srcdir)" release.sgml >tempfile_HISTORY.sgml - $(JADE.text) -V nochunks tempfile_HISTORY.sgml >$@ - rm tempfile_HISTORY.sgml - -regress_README.html: regress.sgml - ( echo '<!doctype chapter PUBLIC "-//OASIS//DTD DocBook V4.2//EN" ['; \ - echo '<!entity % standalone-ignore "IGNORE">'; \ - echo '<!entity % standalone-include "INCLUDE"> ]>'; \ - cat $< ) >tempfile_regress_README.sgml - $(JADE.text) -V nochunks tempfile_regress_README.sgml >$@ - rm tempfile_regress_README.sgml - ## ## XSLT processing @@ -310,7 +297,7 @@ clean distclean maintainer-clean: # index rm -f HTML.index HTML.index.start $(GENERATED_SGML) # text - rm -f INSTALL HISTORY regress_README + rm -f INSTALL # XSLT rm -f postgres.xml htmlhelp.hhp toc.hhc index.hhk *.fo # Texinfo diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml index e4c8829c16f..52e8a1b2ed9 100644 --- a/doc/src/sgml/docguide.sgml +++ b/doc/src/sgml/docguide.sgml @@ -925,26 +925,19 @@ save_size.pdfjadetex = 15000 <title>Plain Text Files</title> <para> - Several files are distributed as plain text, for reading during - the installation process. The <filename>INSTALL</filename> file + The installation instructions are also distributed as plain text, + in case they are needed in a situation where better reading tools + are not available. The <filename>INSTALL</filename> file corresponds to <xref linkend="installation">, with some minor changes to account for the different context. To recreate the file, change to the directory <filename>doc/src/sgml</filename> - and enter <userinput>gmake INSTALL</userinput>. This will create - a file <filename>INSTALL.html</filename> that can be saved as text - with <productname>Netscape Navigator</productname> and put into - the place of the existing file. - <productname>Netscape</productname> seems to offer the best - quality for <acronym>HTML</acronym> to text conversions (over - <application>lynx</application> and - <application>w3m</application>). + and enter <userinput>gmake INSTALL</userinput>. </para> <para> - The file <filename>HISTORY</filename> can be created similarly, - using the command <userinput>gmake HISTORY</userinput>. For the - file <filename>src/test/regress/README</filename> the command is - <userinput>gmake regress_README</userinput>. + In the past, the release notes and regression testing instructions + were also distributed as plain text, but this practice has been + discontinued. </para> </sect2> diff --git a/doc/src/sgml/generate_history.pl b/doc/src/sgml/generate_history.pl deleted file mode 100644 index 20f3d0e87c9..00000000000 --- a/doc/src/sgml/generate_history.pl +++ /dev/null @@ -1,58 +0,0 @@ -#! /usr/bin/perl -w - -# generate_history.pl -- flatten release notes for use as HISTORY file -# -# Usage: generate_history.pl srcdir release.sgml >output.sgml -# -# The main point of this script is to strip out <link> references, which -# generally point into the rest of the documentation and so can't be used -# in a standalone build of the release notes. To make sure this is done -# everywhere, we have to fold in the sub-files of the release notes. -# -# $PostgreSQL: pgsql/doc/src/sgml/generate_history.pl,v 1.1 2009/05/02 20:17:19 tgl Exp $ - -use strict; - -my($srcdir) = shift; -defined($srcdir) || die "$0: missing required argument: srcdir\n"; -my($infile) = shift; -defined($infile) || die "$0: missing required argument: inputfile\n"; - -# Emit DOCTYPE header so that the output is a self-contained SGML document -print "<!DOCTYPE appendix PUBLIC \"-//OASIS//DTD DocBook V4.2//EN\">\n"; - -process_file($infile); - -exit 0; - -sub process_file { - my($filename) = @_; - - local *FILE; # need a local filehandle so we can recurse - - my($f) = $srcdir . '/' . $filename; - open(FILE, $f) || die "could not read $f: $!\n"; - - while (<FILE>) { - # Recursively expand sub-files of the release notes - if (m/^&(release-.*);$/) { - process_file($1 . ".sgml"); - next; - } - - # Remove <link ...> tags, which might span multiple lines - while (m/<link/) { - if (s/<link\s+linkend[^>]*>//) { - next; - } - # incomplete tag, so slurp another line - $_ .= <FILE>; - } - - # Remove </link> too - s|</link>||g; - - print; - } - close(FILE); -} diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml index d08cf5565c1..feab734a5d9 100644 --- a/doc/src/sgml/release.sgml +++ b/doc/src/sgml/release.sgml @@ -26,9 +26,7 @@ non-ASCII characters convert to HTML4 entity (&) escapes wrap long lines -For new features, add links to the documentation sections. Use </link> -not just </> so that generate_history.pl can remove it, so HISTORY.html -can be created without links to the main documentation. +For new features, add links to the documentation sections. --> @@ -63,7 +61,6 @@ can be created without links to the main documentation. <!-- To add a new major-release series, add an entry here and in filelist.sgml. - Follow the naming convention, or you'll confuse generate_history.pl. The reason for splitting the release notes this way is so that appropriate subsets can easily be copied into back branches. diff --git a/doc/src/sgml/standalone-install.sgml b/doc/src/sgml/standalone-install.sgml index 7328ef15530..b7b8496be19 100644 --- a/doc/src/sgml/standalone-install.sgml +++ b/doc/src/sgml/standalone-install.sgml @@ -2,21 +2,7 @@ <!-- This file helps in generating the INSTALL text file that lives in the -top level directory of the distribution. The exact process is like -this: - -1. Paste together with installation.sgml - -2. Process with jade to HTML (use -V nochunks) - -3. Remove "Chapter 1" heading - -4. Save as text file in Netscape - -5. Put in place of old INSTALL file - -Running 'make INSTALL' in the doc/src/sgml directory will do 1 through -3 for you. +top level directory of the distribution. --> <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [ diff --git a/src/test/regress/README b/src/test/regress/README new file mode 100644 index 00000000000..0cbf3b64b24 --- /dev/null +++ b/src/test/regress/README @@ -0,0 +1,3 @@ +Documentation concerning how to run these regression tests and interpret +the results can be found in the PostgreSQL manual, in the chapter +"Regression Tests". diff --git a/src/tools/RELEASE_CHANGES b/src/tools/RELEASE_CHANGES index b2ad848053b..c066f17487e 100644 --- a/src/tools/RELEASE_CHANGES +++ b/src/tools/RELEASE_CHANGES @@ -10,7 +10,6 @@ For All Releases (major, minor, beta, RC) o update doc/src/sgml/release.sgml o run spellchecker on result o add SGML markup - o check if 'gmake HISTORY.html' works for <link>s * Update timezone data to match latest zic database (see src/timezone/README) |