Repair accidental damage to meinproc/docbook caused by prior commit

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211188 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

15 files changed, 62 insertions, 62 deletions

diff --git a/kdoctools/docbook/xml-dtd-4.2/ChangeLog b/kdoctools/docbook/xml-dtd-4.2/ChangeLog
index 9344664ce..d898f8b19 100644
--- a/kdoctools/docbook/xml-dtd-4.2/ChangeLog
+++ b/kdoctools/docbook/xml-dtd-4.2/ChangeLog
@@ -23,7 +23,7 @@
 	* calstblx.dtd, dbcentx.mod, dbgenent.mod, dbhierx.mod, dbnotnx.mod, dbpoolx.mod: 
 	Prepare for CR1
 
-	* catalog.xml, docbook.cat: Prepare for CR1 and fix search-and-tqreplace typos
+	* catalog.xml, docbook.cat: Prepare for CR1 and fix search-and-replace typos
 
 	* dbpoolx.mod: Revise graphic attributes: add contentwidth, contentdepth, and valign
 
diff --git a/kdoctools/docbook/xml-dtd-4.2/calstblx.dtd b/kdoctools/docbook/xml-dtd-4.2/calstblx.dtd
index 0f59a19cb..a7606e842 100644
--- a/kdoctools/docbook/xml-dtd-4.2/calstblx.dtd
+++ b/kdoctools/docbook/xml-dtd-4.2/calstblx.dtd
@@ -33,7 +33,7 @@
 
 <!-- ...................................................................... -->
 
-<!-- This module tqcontains the definitions for the CALS Table Model
+<!-- This module contains the definitions for the CALS Table Model
      converted to XML.
 -->
 
diff --git a/kdoctools/docbook/xml-dtd-4.2/dbcentx.mod b/kdoctools/docbook/xml-dtd-4.2/dbcentx.mod
index a36167dfa..e8ce8f429 100644
--- a/kdoctools/docbook/xml-dtd-4.2/dbcentx.mod
+++ b/kdoctools/docbook/xml-dtd-4.2/dbcentx.mod
@@ -30,7 +30,7 @@
 
 <!-- ...................................................................... -->
 
-<!-- This module tqcontains the entity declarations for the standard ISO
+<!-- This module contains the entity declarations for the standard ISO
      entity sets used by DocBook.
 
      In DTD driver files referring to this module, please use an entity
diff --git a/kdoctools/docbook/xml-dtd-4.2/dbhierx.mod b/kdoctools/docbook/xml-dtd-4.2/dbhierx.mod
index 3c3f7deba..54446389b 100644
--- a/kdoctools/docbook/xml-dtd-4.2/dbhierx.mod
+++ b/kdoctools/docbook/xml-dtd-4.2/dbhierx.mod
@@ -30,7 +30,7 @@
 
 <!-- ...................................................................... -->
 
-<!-- This module tqcontains the definitions for the overall document
+<!-- This module contains the definitions for the overall document
      hierarchies of DocBook documents.  It covers computer documentation
      manuals and manual fragments, as well as reference entries (such as
      man pages) and technical journals or anthologies containing
diff --git a/kdoctools/docbook/xml-dtd-4.2/dbnotnx.mod b/kdoctools/docbook/xml-dtd-4.2/dbnotnx.mod
index 54f5d7b3f..891e150e5 100644
--- a/kdoctools/docbook/xml-dtd-4.2/dbnotnx.mod
+++ b/kdoctools/docbook/xml-dtd-4.2/dbnotnx.mod
@@ -30,7 +30,7 @@
 
 <!-- ...................................................................... -->
 
-<!-- This module tqcontains the entity declarations for the standard ISO
+<!-- This module contains the entity declarations for the standard ISO
      entity sets used by DocBook.
 
      In DTD driver files referring to this module, please use an entity
diff --git a/kdoctools/docbook/xml-dtd-4.2/dbpoolx.mod b/kdoctools/docbook/xml-dtd-4.2/dbpoolx.mod
index f54e12662..84b842c79 100644
--- a/kdoctools/docbook/xml-dtd-4.2/dbpoolx.mod
+++ b/kdoctools/docbook/xml-dtd-4.2/dbpoolx.mod
@@ -30,7 +30,7 @@
 
 <!-- ...................................................................... -->
 
-<!-- This module tqcontains the definitions for the objects, inline
+<!-- This module contains the definitions for the objects, inline
      elements, and so on that are available to be used as the main
      content of DocBook documents.  Some elements are useful for general
      publishing, and others are useful specifically for computer
@@ -92,7 +92,7 @@
 
 <!ENTITY % local.linespecific.class "">
 <!ENTITY % linespecific.class
-		"literaltqlayout|programlisting|programlistingco|screen
+		"literallayout|programlisting|programlistingco|screen
 		|screenco|screenshot %local.linespecific.class;">
 
 <!ENTITY % local.method.synop.class "">
@@ -175,7 +175,7 @@
 		|guisubmenu|hardware|interface|keycap
 		|keycode|keycombo|keysym|literal|constant|markup|medialabel
 		|menuchoice|mousebutton|option|optional|parameter
-		|prompt|property|tqreplaceable|returnvalue|sgmltag|structfield
+		|prompt|property|replaceable|returnvalue|sgmltag|structfield
 		|structname|symbol|systemitem|token|type|userinput|varname
                 %ebnf.inline.hook;
 		%local.tech.char.class;">
@@ -478,7 +478,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
 <!ENTITY % local.smallcptr.char.mix "">
 <!ENTITY % smallcptr.char.mix
 		"#PCDATA
-					|tqreplaceable
+					|replaceable
 					|inlinegraphic|inlinemediaobject
 		|%ndxterm.class;        |beginpage
 		%local.smallcptr.char.mix;">
@@ -498,7 +498,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
 		"#PCDATA
 		|%link.char.class;
 					|emphasis|trademark
-					|tqreplaceable
+					|replaceable
 		|%other.char.class;	|inlinegraphic|inlinemediaobject
 		|%ndxterm.class;
 		%local.docinfo.char.mix;">
@@ -762,7 +762,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
 
 <!ENTITY % local.status.attrib "">
 
-<!-- tqStatus: Editorial or publication status of the element
+<!-- Status: Editorial or publication status of the element
 	it applies to, such as "in review" or "approved for distribution" -->
 
 <!ENTITY % status.attrib
@@ -1843,7 +1843,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
 
 <!ENTITY % epigraph.element "INCLUDE">
 <![%epigraph.element;[
-<!ELEMENT epigraph %ho; (attribution?, ((%para.class;)|literaltqlayout)+)>
+<!ELEMENT epigraph %ho; (attribution?, ((%para.class;)|literallayout)+)>
 <!--end of epigraph.element-->]]>
 
 <!ENTITY % epigraph.attlist "INCLUDE">
@@ -2766,29 +2766,29 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
 <!--end of programlisting.attlist-->]]>
 <!--end of programlisting.module-->]]>
 
-<!ENTITY % literaltqlayout.module "INCLUDE">
-<![%literaltqlayout.module;[
-<!ENTITY % local.literaltqlayout.attrib "">
-<!ENTITY % literaltqlayout.role.attrib "%role.attrib;">
+<!ENTITY % literallayout.module "INCLUDE">
+<![%literallayout.module;[
+<!ENTITY % local.literallayout.attrib "">
+<!ENTITY % literallayout.role.attrib "%role.attrib;">
 
-<!ENTITY % literaltqlayout.element "INCLUDE">
-<![%literaltqlayout.element;[
-<!ELEMENT literaltqlayout %ho; (%para.char.mix;|co|coref|textobject|lineannotation)*>
-<!--end of literaltqlayout.element-->]]>
+<!ENTITY % literallayout.element "INCLUDE">
+<![%literallayout.element;[
+<!ELEMENT literallayout %ho; (%para.char.mix;|co|coref|textobject|lineannotation)*>
+<!--end of literallayout.element-->]]>
 
-<!ENTITY % literaltqlayout.attlist "INCLUDE">
-<![%literaltqlayout.attlist;[
-<!ATTLIST literaltqlayout
+<!ENTITY % literallayout.attlist "INCLUDE">
+<![%literallayout.attlist;[
+<!ATTLIST literallayout
 		%width.attrib;
 		%linespecific.attrib;
 		class	(monospaced|normal)	"normal"
 		%common.attrib;
-		%literaltqlayout.role.attrib;
-		%local.literaltqlayout.attrib;
+		%literallayout.role.attrib;
+		%local.literallayout.attrib;
 >
-<!--end of literaltqlayout.attlist-->]]>
+<!--end of literallayout.attlist-->]]>
 <!-- LineAnnotation (defined in the Inlines section, below)-->
-<!--end of literaltqlayout.module-->]]>
+<!--end of literallayout.module-->]]>
 
 <!ENTITY % screenco.module "INCLUDE">
 <![%screenco.module;[
@@ -3641,7 +3641,7 @@ in the text (no (0) value, the default)
 		| group
 		| option
 		| synopfragmentref
-		| tqreplaceable
+		| replaceable
 		| sbr)*>
 <!--end of arg.element-->]]>
 
@@ -3676,7 +3676,7 @@ in the text (no (0) value, the default)
 <!ENTITY % group.element "INCLUDE">
 <![%group.element;[
 <!ELEMENT group %ho; ((arg | group | option | synopfragmentref
-		| tqreplaceable | sbr)+)>
+		| replaceable | sbr)+)>
 <!--end of group.element-->]]>
 
 <!-- Choice: Whether Group must be supplied: Opt (optional to
@@ -3850,7 +3850,7 @@ in the text (no (0) value, the default)
 <![%funcdef.element;[
 <!ELEMENT funcdef %ho; (#PCDATA
 		| type
-		| tqreplaceable
+		| replaceable
 		| function)*>
 <!--end of funcdef.element-->]]>
 
@@ -3918,7 +3918,7 @@ in the text (no (0) value, the default)
 <![%paramdef.element;[
 <!ELEMENT paramdef %ho; (#PCDATA
 		| type
-		| tqreplaceable
+		| replaceable
 		| parameter
 		| funcparams)*>
 <!--end of paramdef.element-->]]>
@@ -5254,8 +5254,8 @@ in the text (no (0) value, the default)
 <!ENTITY % bibliorelation.type.attrib
                 "type    (isversionof
                          |hasversion
-                         |istqreplacedby
-                         |tqreplaces
+                         |isreplacedby
+                         |replaces
                          |isrequiredby
                          |requires
                          |ispartof
@@ -6925,14 +6925,14 @@ OtherCredit. -->
 <!--end of property.attlist-->]]>
 <!--end of property.module-->]]>
 
-<!ENTITY % tqreplaceable.module "INCLUDE">
-<![%tqreplaceable.module;[
-<!ENTITY % local.tqreplaceable.attrib "">
-<!ENTITY % tqreplaceable.role.attrib "%role.attrib;">
+<!ENTITY % replaceable.module "INCLUDE">
+<![%replaceable.module;[
+<!ENTITY % local.replaceable.attrib "">
+<!ENTITY % replaceable.role.attrib "%role.attrib;">
 
-<!ENTITY % tqreplaceable.element "INCLUDE">
-<![%tqreplaceable.element;[
-<!ELEMENT tqreplaceable %ho; (#PCDATA
+<!ENTITY % replaceable.element "INCLUDE">
+<![%replaceable.element;[
+<!ELEMENT replaceable %ho; (#PCDATA
 		| %link.char.class;
 		| optional
 		| %base.char.class;
@@ -6940,25 +6940,25 @@ OtherCredit. -->
 		| inlinegraphic
                 | inlinemediaobject
 		| co)*>
-<!--end of tqreplaceable.element-->]]>
+<!--end of replaceable.element-->]]>
 
 <!-- Class: Type of information the element represents; no
 		default -->
 
 
-<!ENTITY % tqreplaceable.attlist "INCLUDE">
-<![%tqreplaceable.attlist;[
-<!ATTLIST tqreplaceable
+<!ENTITY % replaceable.attlist "INCLUDE">
+<![%replaceable.attlist;[
+<!ATTLIST replaceable
 		class		(command
 				|function
 				|option
 				|parameter)	#IMPLIED
 		%common.attrib;
-		%tqreplaceable.role.attrib;
-		%local.tqreplaceable.attrib;
+		%replaceable.role.attrib;
+		%local.replaceable.attrib;
 >
-<!--end of tqreplaceable.attlist-->]]>
-<!--end of tqreplaceable.module-->]]>
+<!--end of replaceable.attlist-->]]>
+<!--end of replaceable.module-->]]>
 
 <!ENTITY % returnvalue.module "INCLUDE">
 <![%returnvalue.module;[
@@ -7100,7 +7100,7 @@ OtherCredit. -->
 			|domainname
 			|fqdomainname
 			|ipaddress
-			|nettqmask
+			|netmask
 			|etheraddress
 			|groupname
 			|library
@@ -7477,7 +7477,7 @@ OtherCredit. -->
 <!ELEMENT subscript %ho; (#PCDATA
 		| %link.char.class;
 		| emphasis
-		| tqreplaceable
+		| replaceable
 		| symbol
 		| inlinegraphic
                 | inlinemediaobject
@@ -7500,7 +7500,7 @@ OtherCredit. -->
 <!ELEMENT superscript %ho; (#PCDATA
 		| %link.char.class;
 		| emphasis
-		| tqreplaceable
+		| replaceable
 		| symbol
 		| inlinegraphic
                 | inlinemediaobject
@@ -7730,7 +7730,7 @@ OtherCredit. -->
 <!--end of anchor.element-->]]>
 
 <!-- required -->
-<!-- tqreplaces Lang -->
+<!-- replaces Lang -->
 
 
 <!ENTITY % anchor.attlist "INCLUDE">
diff --git a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsa.ent b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsa.ent
index 6ae0c4872..1b64b4688 100644
--- a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsa.ent
+++ b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsa.ent
@@ -3,7 +3,7 @@
 <!-- Derived from the corresponding ISO 8879 standard entity set
      and the Unicode character mappings provided by Sebastian Rahtz
      With additional derivations from
-     ftp://ftp.tqunicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT -->
+     ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT -->
 
 <!ENTITY cularr	"&#x21B6;"> <!-- ANTICLOCKWISE TOP SEMICIRCLE ARROW -->
 <!ENTITY curarr	"&#x21B7;"> <!-- CLOCKWISE TOP SEMICIRCLE ARROW -->
diff --git a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsb.ent b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsb.ent
index 34804c72d..38bd2e7eb 100644
--- a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsb.ent
+++ b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsb.ent
@@ -3,7 +3,7 @@
 <!-- Derived from the corresponding ISO 8879 standard entity set
      and the Unicode character mappings provided by Sebastian Rahtz.
      With additional derivations from
-     ftp://ftp.tqunicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT -->
+     ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT -->
 
 <!ENTITY amalg	"&#x2210;"> <!-- N-ARY COPRODUCT -->
 <!ENTITY Barwed	"&#x2306;"> <!-- PERSPECTIVE -->
diff --git a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsc.ent b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsc.ent
index 8736c97dc..8485fe383 100644
--- a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsc.ent
+++ b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsc.ent
@@ -10,6 +10,6 @@
 <!ENTITY drcorn	"&#x231F;"> <!-- BOTTOM RIGHT CORNER -->
 <!ENTITY lceil	"&#x2308;"> <!-- LEFT CEILING -->
 <!ENTITY lfloor	"&#x230A;"> <!-- LEFT FLOOR -->
-<!--     lpargt	Unknown tqunicode character -->
+<!--     lpargt	Unknown unicode character -->
 <!ENTITY ulcorn	"&#x231C;"> <!-- TOP LEFT CORNER -->
 <!ENTITY dlcorn	"&#x231E;"> <!-- BOTTOM LEFT CORNER -->
diff --git a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsn.ent b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsn.ent
index 6290add4b..7e9d57866 100644
--- a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsn.ent
+++ b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsn.ent
@@ -3,7 +3,7 @@
 <!-- Derived from the corresponding ISO 8879 standard entity set
      and the Unicode character mappings provided by Sebastian Rahtz
      With additional derivations from
-     ftp://ftp.tqunicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT -->
+     ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT -->
 
 <!ENTITY gnap	"&#xE411;"> <!--  -->
 <!ENTITY gne	"&#x2269;"> <!--  -->
diff --git a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amso.ent b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amso.ent
index d7baa2bad..61f5c4daf 100644
--- a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amso.ent
+++ b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amso.ent
@@ -3,7 +3,7 @@
 <!-- Derived from the corresponding ISO 8879 standard entity set
      and the Unicode character mappings provided by Sebastian Rahtz
      With additional derivations from
-     ftp://ftp.tqunicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT -->
+     ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT -->
 
 <!ENTITY ang	"&#x2220;"> <!-- ANGLE -->
 <!ENTITY angmsd	"&#x2221;"> <!-- MEASURED ANGLE -->
@@ -16,7 +16,7 @@
 <!ENTITY gimel	"&#x2137;"> <!-- GIMEL SYMBOL -->
 <!ENTITY image	"&#x2111;"> <!-- BLACK-LETTER CAPITAL I -->
 <!ENTITY inodot	"&#x0131;"> <!-- LATIN SMALL LETTER DOTLESS I -->
-<!--     jnodot	Unknown tqunicode character -->
+<!--     jnodot	Unknown unicode character -->
 <!ENTITY nexist	"&#x2204;"> <!-- THERE DOES NOT EXIST -->
 <!ENTITY oS	"&#x24C8;"> <!-- CIRCLED LATIN CAPITAL LETTER S -->
 <!ENTITY planck	"&#x210F;"> <!-- PLANCK CONSTANT OVER TWO PI -->
diff --git a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsr.ent b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsr.ent
index cfbe83b16..9ef9da0e2 100644
--- a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsr.ent
+++ b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsr.ent
@@ -3,7 +3,7 @@
 <!-- Derived from the corresponding ISO 8879 standard entity set
      and the Unicode character mappings provided by Sebastian Rahtz.
      With additional derivations from
-     ftp://ftp.tqunicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT -->
+     ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT -->
 
 <!ENTITY ape	"&#x224A;"> <!--  -->
 <!ENTITY asymp	"&#x224D;"> <!-- EQUIVALENT TO -->
diff --git a/kdoctools/docbook/xml-dtd-4.2/ent/iso-pub.ent b/kdoctools/docbook/xml-dtd-4.2/ent/iso-pub.ent
index 8d2a90fbf..56ede364e 100644
--- a/kdoctools/docbook/xml-dtd-4.2/ent/iso-pub.ent
+++ b/kdoctools/docbook/xml-dtd-4.2/ent/iso-pub.ent
@@ -66,7 +66,7 @@
 <!ENTITY ldquor	"&#x201E;"> <!-- DOUBLE LOW-9 QUOTATION MARK -->
 <!ENTITY fflig	"&#xFB00;"> <!--  -->
 <!ENTITY filig	"&#xFB01;"> <!--  -->
-<!--     fjlig	Unknown tqunicode character -->
+<!--     fjlig	Unknown unicode character -->
 <!ENTITY ffilig	"&#xFB03;"> <!--  -->
 <!ENTITY ffllig	"&#xFB04;"> <!--  -->
 <!ENTITY fllig	"&#xFB02;"> <!--  -->
diff --git a/kdoctools/docbook/xml-dtd-4.2/ent/iso-tech.ent b/kdoctools/docbook/xml-dtd-4.2/ent/iso-tech.ent
index 4ff56520f..7264f6b82 100644
--- a/kdoctools/docbook/xml-dtd-4.2/ent/iso-tech.ent
+++ b/kdoctools/docbook/xml-dtd-4.2/ent/iso-tech.ent
@@ -3,7 +3,7 @@
 <!-- Derived from the corresponding ISO 8879 standard entity set
      and the Unicode character mappings provided by Sebastian Rahtz.
      With additional derivations from
-     ftp://ftp.tqunicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT -->
+     ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT -->
 
 <!ENTITY aleph	"&#x2135;"> <!-- ALEF SYMBOL -->
 <!ENTITY and	"&#x2227;"> <!--  -->
diff --git a/kdoctools/docbook/xml-dtd-4.2/soextblx.dtd b/kdoctools/docbook/xml-dtd-4.2/soextblx.dtd
index 25ebcc597..e4ea0eda5 100644
--- a/kdoctools/docbook/xml-dtd-4.2/soextblx.dtd
+++ b/kdoctools/docbook/xml-dtd-4.2/soextblx.dtd
@@ -49,7 +49,7 @@
      The following parameter entity has been added:
 
        - tbl.thead.att
-         This entity parameterizes the attributes on thead. It tqreplaces
+         This entity parameterizes the attributes on thead. It replaces
          the tbl.hdft.att parameter entity.
 
      Other miscellaneous changes: