[1/3] [docs] wineusr: 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:03 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 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/wineusr-guide.sgml   | 14 +++++++-------
 en/wineusr-running.sgml | 25 ++++++++++++-------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/en/wineusr-guide.sgml b/en/wineusr-guide.sgml
index 13698b4..175d194 100644
--- a/en/wineusr-guide.sgml
+++ b/en/wineusr-guide.sgml
@@ -1,11 +1,11 @@
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.5//EN" [
 
-<!entity introduction SYSTEM "wineusr-introduction.sgml">
-<!entity getting SYSTEM "wineusr-getting.sgml">
-<!entity configuring SYSTEM "wineusr-configuring.sgml">
-<!entity running SYSTEM "wineusr-running.sgml">
-<!entity bugs SYSTEM "wineusr-bugs.sgml">
-<!entity glossary SYSTEM "wineusr-glossary.sgml">
+<!ENTITY introduction SYSTEM "wineusr-introduction.sgml">
+<!ENTITY getting SYSTEM "wineusr-getting.sgml">
+<!ENTITY configuring SYSTEM "wineusr-configuring.sgml">
+<!ENTITY running SYSTEM "wineusr-running.sgml">
+<!ENTITY bugs SYSTEM "wineusr-bugs.sgml">
+<!ENTITY glossary SYSTEM "wineusr-glossary.sgml">
 ]>
 
 <book id="index" lang="en">
diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml
index 747e704..402e34f 100644
--- a/en/wineusr-running.sgml
+++ b/en/wineusr-running.sgml
@@ -501,18 +501,19 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\"
 		</row>
 	    </thead>
 	    <tbody>
-	      <row>
+              <row>
                 <entry>How to run (assuming executable is called <filename>foo.exe</filename>)</entry>
-		<entry><msgtext>
-<screen><prompt>$</prompt> <userinput>wine foo.exe</userinput></screen>
-		  </msgtext></entry>
-		<entry><msgtext>
-<screen><prompt>$</prompt> <userinput>wineconsole -- --backend=user foo.exe</userinput></screen>
-                </msgtext></entry>
-		<entry><msgtext>
-<screen><prompt>$</prompt> <userinput>wineconsole foo.exe</userinput></screen>
-                </msgtext>You can also use <userinput>--backend=curses</userinput> as an option</entry>
-	      </row>
+                <entry>
+                  <screen><prompt>$ </prompt><userinput>wine foo.exe</userinput></screen>
+                </entry>
+                <entry>
+                  <screen><prompt>$ </prompt><userinput>wineconsole -- --backend=user foo.exe</userinput></screen>
+                </entry>
+                <entry>
+                  <screen><prompt>$ </prompt><userinput>wineconsole foo.exe</userinput></screen>
+                  You can also use <parameter class="option">--backend=curses</parameter> as an option
+                </entry>
+              </row>
 	      <row>
 		<entry>Good support for line oriented CUI applications
 		  (which print information line after line)
@@ -711,7 +712,6 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\"
 		<row>
 		  <entry>Edition mode</entry>
 		  <entry>
-		    <msgtext>
 		      <para>
 			When the user enter commands, he or she can
 			choose between several edition modes:
@@ -735,7 +735,6 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\"
 			  </listitem>
 			</itemizedlist>
 		      </para>
-		    </msgtext>
 		  </entry>
 		</row>
 	      </tbody>
-- 
1.8.4




More information about the wine-patches mailing list