diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index 128d827c1a6..164c00bb63b 100644
--- a/doc/src/sgml/Makefile
+++ b/doc/src/sgml/Makefile
@@ -71,7 +71,7 @@ override SPFLAGS += -wall -wno-unused-param -wno-empty -wfully-tagged
# to detect whether we are using OpenSP rather than the ancient
# original SP.
ifneq (,$(filter o%,$(notdir $(OSX))))
-override SPFLAGS += -wdata-delim
+override SPFLAGS += -wdata-delim -winstance-ignore-ms -winstance-include-ms -winstance-param-entity
endif
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index 3cb4001cc0c..c88b0c2fb35 100644
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -5275,8 +5275,6 @@ while (1)
-
-216 (ECPG_ARRAY_INSERT)
@@ -5286,7 +5284,6 @@ while (1)
-]]>
-220 (ECPG_NO_CONN)
@@ -5441,8 +5438,8 @@ while (1)
-
+
-602 (ECPG_WARNING_UNKNOWN_PORTAL)
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 2f036015cc2..1839bddceb5 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -8663,15 +8663,6 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
convert path to closed
pclose(path '[(0,0),(1,1),(2,0)]')
-
-
- point(lseg, lseg)
- point
- intersection
- point(lseg '((-1,0),(1,0))',lseg '((-2,-2),(2,2))')
-
-]]>
popen(path)
path
diff --git a/doc/src/sgml/release-old.sgml b/doc/src/sgml/release-old.sgml
index d4de6b13574..24a72333787 100644
--- a/doc/src/sgml/release-old.sgml
+++ b/doc/src/sgml/release-old.sgml
@@ -6555,103 +6555,3 @@ The following bugs have been fixed in postgres95-beta-0.02:
Initial release.
-
-
- Timing Results
-
-
- These timing results are from running the regression test with the commands
-
-
-% cd src/test/regress
-% make all
-% time make runtest
-
-
-
- Timing under Linux 2.0.27 seems to have a roughly 5% variation from run
- to run, presumably due to the scheduling vagaries of multitasking systems.
-
-
-
- Version 6.5
-
-
- As has been the case for previous releases, timing between
- releases is not directly comparable since new regression tests
- have been added. In general, 6.5 is faster than previous
- releases.
-
-
-
- Timing with fsync() disabled:
-
-
-Time System
-02:00 Dual Pentium Pro 180, 224MB, UW-SCSI, Linux 2.0.36, gcc 2.7.2.3 -O2 -m486
-04:38 Sparc Ultra 1 143MHz, 64MB, Solaris 2.6
-
-
-
-
- Timing with fsync() enabled:
-
-
-Time System
-04:21 Dual Pentium Pro 180, 224MB, UW-SCSI, Linux 2.0.36, gcc 2.7.2.3 -O2 -m486
-
-
- For the Linux system above, using UW-SCSI disks rather than (older) IDE
- disks leads to a 50% improvement in speed on the regression test.
-
-
-
-
-Version 6.4beta
-
-
-The times for this release are not directly comparable to those for previous releases
-since some additional regression tests have been included.
-In general, however, 6.4 should be slightly faster than the previous release (thanks, Bruce!).
-
-
-
-Time System
-02:26 Dual Pentium Pro 180, 96MB, UW-SCSI, Linux 2.0.30, gcc 2.7.2.1 -O2 -m486
-
-
-
-
-
-Version 6.3
-
-
-The times for this release are not directly comparable to those for previous releases
-since some additional regression tests have been included and some obsolete tests involving
-time travel have been removed.
-In general, however, 6.3 is substantially faster than previous releases (thanks, Bruce!).
-
-
-
- Time System
- 02:30 Dual Pentium Pro 180, 96MB, UW-SCSI, Linux 2.0.30, gcc 2.7.2.1 -O2 -m486
- 04:12 Dual Pentium Pro 180, 96MB, EIDE, Linux 2.0.30, gcc 2.7.2.1 -O2 -m486
-
-
-
-
-
-Version 6.1
-
-
-
- Time System
- 06:12 Pentium Pro 180, 32MB, EIDE, Linux 2.0.30, gcc 2.7.2 -O2 -m486
- 12:06 P-100, 48MB, Linux 2.0.29, gcc
- 39:58 Sparc IPC 32MB, Solaris 2.5, gcc 2.7.2.1 -O -g
-
-
-
-
-]]>
diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml
index 61423c25efd..61c801a693d 100644
--- a/doc/src/sgml/rules.sgml
+++ b/doc/src/sgml/rules.sgml
@@ -2434,8 +2434,8 @@ Nestloop
in a command.
-
+
The summary is, rules will only be significantly slower than