Skip to content

Commit 22d9764

Browse files
peterepetere
committed
Remove SGML marked sections
For XML compatibility, replace marked sections <![IGNORE[ ]]> with comments <!-- -->. In some cases it seemed better to remove the ignored text altogether, and in one case the text should not have been ignored.
1 parent 20b6552 commit 22d9764

File tree

5 files changed

+5
-117
lines changed

5 files changed

+5
-117
lines changed

‎doc/src/sgml/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ override SPFLAGS += -wall -wno-unused-param -wno-empty -wfully-tagged
7171
# to detect whether we are using OpenSP rather than the ancient
7272
# original SP.
7373
ifneq (,$(filter o%,$(notdir $(OSX))))
74-
override SPFLAGS += -wdata-delim
74+
override SPFLAGS += -wdata-delim -winstance-ignore-ms -winstance-include-ms -winstance-param-entity
7575
endif
7676

7777

‎doc/src/sgml/ecpg.sgml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5275,8 +5275,6 @@ while (1)
52755275
</listitem>
52765276
</varlistentry>
52775277

5278-
<![IGNORE[
5279-
<!-- disabled by #if 0 in ecpglib -->
52805278
<varlistentry>
52815279
<term>-216 (<symbol>ECPG_ARRAY_INSERT</symbol>)</term>
52825280
<listitem>
@@ -5286,7 +5284,6 @@ while (1)
52865284
</para>
52875285
</listitem>
52885286
</varlistentry>
5289-
]]>
52905287

52915288
<varlistentry>
52925289
<term>-220 (<symbol>ECPG_NO_CONN</symbol>)</term>
@@ -5441,8 +5438,8 @@ while (1)
54415438
</listitem>
54425439
</varlistentry>
54435440

5444-
<![IGNORE[
54455441
<!-- currently not used by the code -->
5442+
<!--
54465443
<varlistentry>
54475444
<term>-600 (<symbol>ECPG_WARNING_UNRECOGNIZED</symbol>)</term>
54485445
<listitem>
@@ -5461,7 +5458,7 @@ while (1)
54615458
</para>
54625459
</listitem>
54635460
</varlistentry>
5464-
]]>
5461+
-->
54655462

54665463
<varlistentry>
54675464
<term>-602 (<symbol>ECPG_WARNING_UNKNOWN_PORTAL</symbol>)</term>

‎doc/src/sgml/func.sgml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8663,15 +8663,6 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
86638663
<entry>convert path to closed</entry>
86648664
<entry><literal>pclose(path '[(0,0),(1,1),(2,0)]')</literal></entry>
86658665
</row>
8666-
<![IGNORE[
8667-
<!-- Not defined by this name. Implements the intersection operator '#' -->
8668-
<row>
8669-
<entry><literal><function>point(<type>lseg</>, <type>lseg</>)</function></literal></entry>
8670-
<entry><type>point</type></entry>
8671-
<entry>intersection</entry>
8672-
<entry><literal>point(lseg '((-1,0),(1,0))',lseg '((-2,-2),(2,2))')</literal></entry>
8673-
</row>
8674-
]]>
86758666
<row>
86768667
<entry><literal><function>popen(<type>path</>)</function></literal></entry>
86778668
<entry><type>path</type></entry>

‎doc/src/sgml/release-old.sgml

Lines changed: 0 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -6555,103 +6555,3 @@ The following bugs have been fixed in postgres95-beta-0.02:
65556555
Initial release.
65566556
</para>
65576557
</sect1>
6558-
6559-
<![IGNORE[
6560-
<sect1 id="timing-results">
6561-
<title>Timing Results</title>
6562-
6563-
<para>
6564-
These timing results are from running the regression test with the commands
6565-
6566-
<programlisting>
6567-
% cd src/test/regress
6568-
% make all
6569-
% time make runtest
6570-
</programlisting>
6571-
</para>
6572-
<para>
6573-
Timing under Linux 2.0.27 seems to have a roughly 5% variation from run
6574-
to run, presumably due to the scheduling vagaries of multitasking systems.
6575-
</para>
6576-
6577-
<sect2>
6578-
<title>Version 6.5</title>
6579-
6580-
<para>
6581-
As has been the case for previous releases, timing between
6582-
releases is not directly comparable since new regression tests
6583-
have been added. In general, 6.5 is faster than previous
6584-
releases.
6585-
</para>
6586-
6587-
<para>
6588-
Timing with <function>fsync()</function> disabled:
6589-
6590-
<literallayout class="monospaced">
6591-
Time System
6592-
02:00 Dual Pentium Pro 180, 224MB, UW-SCSI, Linux 2.0.36, gcc 2.7.2.3 -O2 -m486
6593-
04:38 Sparc Ultra 1 143MHz, 64MB, Solaris 2.6
6594-
</literallayout>
6595-
</para>
6596-
6597-
<para>
6598-
Timing with <function>fsync()</function> enabled:
6599-
6600-
<literallayout class="monospaced">
6601-
Time System
6602-
04:21 Dual Pentium Pro 180, 224MB, UW-SCSI, Linux 2.0.36, gcc 2.7.2.3 -O2 -m486
6603-
</literallayout>
6604-
6605-
For the <systemitem class="osname">Linux</systemitem> system above, using <acronym>UW-SCSI</acronym> disks rather than (older) <acronym>IDE</acronym>
6606-
disks leads to a 50% improvement in speed on the regression test.
6607-
</para>
6608-
</sect2>
6609-
6610-
<sect2>
6611-
<title>Version 6.4beta</title>
6612-
6613-
<para>
6614-
The times for this release are not directly comparable to those for previous releases
6615-
since some additional regression tests have been included.
6616-
In general, however, 6.4 should be slightly faster than the previous release (thanks, Bruce!).
6617-
</para>
6618-
<para>
6619-
<literallayout class="monospaced">
6620-
Time System
6621-
02:26 Dual Pentium Pro 180, 96MB, UW-SCSI, Linux 2.0.30, gcc 2.7.2.1 -O2 -m486
6622-
</literallayout>
6623-
</para>
6624-
</sect2>
6625-
6626-
<sect2>
6627-
<title>Version 6.3</title>
6628-
6629-
<para>
6630-
The times for this release are not directly comparable to those for previous releases
6631-
since some additional regression tests have been included and some obsolete tests involving
6632-
time travel have been removed.
6633-
In general, however, 6.3 is substantially faster than previous releases (thanks, Bruce!).
6634-
</para>
6635-
<para>
6636-
<programlisting>
6637-
Time System
6638-
02:30 Dual Pentium Pro 180, 96MB, UW-SCSI, Linux 2.0.30, gcc 2.7.2.1 -O2 -m486
6639-
04:12 Dual Pentium Pro 180, 96MB, EIDE, Linux 2.0.30, gcc 2.7.2.1 -O2 -m486
6640-
</programlisting>
6641-
</para>
6642-
</sect2>
6643-
6644-
<sect2>
6645-
<title>Version 6.1</title>
6646-
6647-
<para>
6648-
<programlisting>
6649-
Time System
6650-
06:12 Pentium Pro 180, 32MB, EIDE, Linux 2.0.30, gcc 2.7.2 -O2 -m486
6651-
12:06 P-100, 48MB, Linux 2.0.29, gcc
6652-
39:58 Sparc IPC 32MB, Solaris 2.5, gcc 2.7.2.1 -O -g
6653-
</programlisting>
6654-
</para>
6655-
</sect2>
6656-
</sect1>
6657-
]]>

‎doc/src/sgml/rules.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2434,8 +2434,8 @@ Nestloop
24342434
in a command.
24352435
</para>
24362436

2437-
<![IGNORE[
24382437
<!-- What's happening with this? If it doesn't come back, remove this section. -->
2438+
<!--
24392439
<para>
24402440
Another situation is cases on <command>UPDATE</command> where it depends on the
24412441
change of an attribute if an action should be performed or
@@ -2456,7 +2456,7 @@ Nestloop
24562456
if the attribute isn't touched. So the rule, qualified or not,
24572457
will only do its scans if there ever could be something to do.
24582458
</para>
2459-
]]>
2459+
-->
24602460

24612461
<para>
24622462
The summary is, rules will only be significantly slower than

0 commit comments

Comments
 (0)