[2/3] [docs] winedev: Remove inappropriate msgtext tags in table cells & upgrade to Docbook 4 SGML
Frédéric Delanoy
frederic.delanoy at gmail.com
Sat Aug 31 11:49:04 CDT 2013
msgtext is supposed to be used only in msgset, but is used here to work around docbook SGML DTD 3.1
quirks (see below).
It was allowed in DTD 3.1 by mistake (see http://oreilly.com/openbook/docbook/book/msgtext.html)
It got added here to accommodate "mixed content" issues (cf. "Pernicious Mixed Content" in
http://oreilly.com/openbook/docbook/book/entry.html).
Note it's possible to reformat the 'entry' tags to make it conform to DTD 3.1 but it's cleaner to
switch to Docbook DTD 4.x in order to use saner/improved DTDs.
(Docbook 4.0 was released in 2000, and final version in 4.x series, 4.5, dates from 2006, so
everybody should have appropriate tools available by now).
---
en/winedev-debugger.sgml | 14 --------------
en/winedev-documentation.sgml | 6 +++---
en/winedev-guide.sgml | 28 ++++++++++++++--------------
en/winedev-kernel.sgml | 4 ----
4 files changed, 17 insertions(+), 35 deletions(-)
diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml
index 1b764b0..f73d473 100644
--- a/en/winedev-debugger.sgml
+++ b/en/winedev-debugger.sgml
@@ -1533,12 +1533,10 @@ set $BreakAllThreadsStartup = 1
<tbody>
<row>
<entry>
- <msgtext>
<simplelist type="inline">
<member><command>cont</command></member>
<member><command>c</command></member>
</simplelist>
- </msgtext>
</entry>
<entry>continue execution until next breakpoint or
exception.</entry>
@@ -1550,12 +1548,10 @@ set $BreakAllThreadsStartup = 1
</row>
<row>
<entry>
- <msgtext>
<simplelist type="inline">
<member><command>step</command></member>
<member><command>s</command></member>
</simplelist>
- </msgtext>
</entry>
<entry>
continue execution until next <quote>C</quote> line of code
@@ -1564,12 +1560,10 @@ set $BreakAllThreadsStartup = 1
</row>
<row>
<entry>
- <msgtext>
<simplelist type="inline">
<member><command>next</command></member>
<member><command>n</command></member>
</simplelist>
- </msgtext>
</entry>
<entry>
continue execution until next <quote>C</quote> line of code
@@ -1578,12 +1572,10 @@ set $BreakAllThreadsStartup = 1
</row>
<row>
<entry>
- <msgtext>
<simplelist type="inline">
<member><command>stepi</command></member>
<member><command>si</command></member>
</simplelist>
- </msgtext>
</entry>
<entry>
execute next assembly instruction (enters function
@@ -1592,12 +1584,10 @@ set $BreakAllThreadsStartup = 1
</row>
<row>
<entry>
- <msgtext>
<simplelist type="inline">
<member><command>nexti</command></member>
<member><command>ni</command></member>
</simplelist>
- </msgtext>
</entry>
<entry>
execute next assembly instruction (doesn't enter
@@ -1606,12 +1596,10 @@ set $BreakAllThreadsStartup = 1
</row>
<row>
<entry>
- <msgtext>
<simplelist type="inline">
<member><command>finish</command></member>
<member><command>f</command></member>
</simplelist>
- </msgtext>
</entry>
<entry>execute until current function is exited</entry>
</row>
@@ -1981,7 +1969,6 @@ set $BreakAllThreadsStartup = 1
</row>
<row>
<entry>
- <msgtext>
<simplelist type="inline">
<member>
<command>del display</command>
@@ -1992,7 +1979,6 @@ set $BreakAllThreadsStartup = 1
<replaceable>N</replaceable>
</member>
</simplelist>
- </msgtext>
</entry>
<entry>deletes display <replaceable>N</replaceable></entry>
</row>
diff --git a/en/winedev-documentation.sgml b/en/winedev-documentation.sgml
index 407a228..e83657b 100644
--- a/en/winedev-documentation.sgml
+++ b/en/winedev-documentation.sgml
@@ -920,7 +920,7 @@
Generally, you will declare which DTD you want to use as
the first line of your SGML document. In the case of
DocBook, you will use something like this:
- <programlisting><!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" []>
+ <programlisting><!doctype book PUBLIC "-//OASIS//DTD DocBook V4.5//EN" []>
<book>
...
</book></programlisting>
@@ -929,7 +929,7 @@
Note that you must specify your toplevel element inside
the doctype declaration. If you were writing an article
rather than a book, you might use this declaration instead:
- <programlisting><!doctype article PUBLIC "-//OASIS//DTD DocBook V3.1//EN" []>
+ <programlisting><!doctype article PUBLIC "-//OASIS//DTD DocBook V4.5//EN" []>
<article>
...
</article></programlisting>
@@ -980,7 +980,7 @@
-->
<programlisting>
<![CDATA[
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" []>
+<!doctype book PUBLIC "-//OASIS//DTD DocBook V4.5//EN" []>
<book id="index">
<bookinfo>
<title>A Poet's Guide to Nonsense</title>
diff --git a/en/winedev-guide.sgml b/en/winedev-guide.sgml
index aebbbac..0e39680 100644
--- a/en/winedev-guide.sgml
+++ b/en/winedev-guide.sgml
@@ -1,19 +1,19 @@
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.5//EN" [
-<!entity debugger SYSTEM "winedev-debugger.sgml">
-<!entity debugging SYSTEM "winedev-debugging.sgml">
-<!entity otherdebug SYSTEM "winedev-otherdebug.sgml">
-<!entity codingpractice SYSTEM "winedev-coding.sgml">
-<!entity testing SYSTEM "winedev-testing.sgml">
-<!entity documentation SYSTEM "winedev-documentation.sgml">
+<!ENTITY debugger SYSTEM "winedev-debugger.sgml">
+<!ENTITY debugging SYSTEM "winedev-debugging.sgml">
+<!ENTITY otherdebug SYSTEM "winedev-otherdebug.sgml">
+<!ENTITY codingpractice SYSTEM "winedev-coding.sgml">
+<!ENTITY testing SYSTEM "winedev-testing.sgml">
+<!ENTITY documentation SYSTEM "winedev-documentation.sgml">
-<!entity architecture SYSTEM "winedev-architecture.sgml">
-<!entity kernel SYSTEM "winedev-kernel.sgml">
-<!entity windowing SYSTEM "winedev-windowing.sgml">
-<!entity ole SYSTEM "winedev-ole.sgml">
-<!entity opengl SYSTEM "winedev-opengl.sgml">
-<!entity ddraw SYSTEM "winedev-ddraw.sgml">
-<!entity multimedia SYSTEM "winedev-multimedia.sgml">
+<!ENTITY architecture SYSTEM "winedev-architecture.sgml">
+<!ENTITY kernel SYSTEM "winedev-kernel.sgml">
+<!ENTITY windowing SYSTEM "winedev-windowing.sgml">
+<!ENTITY ole SYSTEM "winedev-ole.sgml">
+<!ENTITY opengl SYSTEM "winedev-opengl.sgml">
+<!ENTITY ddraw SYSTEM "winedev-ddraw.sgml">
+<!ENTITY multimedia SYSTEM "winedev-multimedia.sgml">
]>
<book id="index" lang="en">
diff --git a/en/winedev-kernel.sgml b/en/winedev-kernel.sgml
index 16067f3..4a210ef 100644
--- a/en/winedev-kernel.sgml
+++ b/en/winedev-kernel.sgml
@@ -1189,7 +1189,6 @@ if (res != ERROR_SUCCESS) return res;
<entry>Drive relative path</entry>
<entry><filename>j:gee\bar.txt</filename></entry>
<entry>
- <msgtext>
<para>
<itemizedlist>
<listitem>
@@ -1212,10 +1211,8 @@ if (res != ERROR_SUCCESS) return res;
</listitem>
</itemizedlist>
</para>
- </msgtext>
</entry>
<entry>
- <msgtext>
<para>
<itemizedlist>
<listitem>
@@ -1238,7 +1235,6 @@ if (res != ERROR_SUCCESS) return res;
</listitem>
</itemizedlist>
</para>
- </msgtext>
</entry>
</row>
<row>
--
1.8.4
More information about the wine-patches
mailing list