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

4 files changed, 68 insertions, 68 deletions

diff --git a/kdoctools/docbook/xsl/manpages/ChangeLog b/kdoctools/docbook/xsl/manpages/ChangeLog
index ed2a5d699..4cd3815a3 100644
--- a/kdoctools/docbook/xsl/manpages/ChangeLog
+++ b/kdoctools/docbook/xsl/manpages/ChangeLog
@@ -20,7 +20,7 @@
 
 2004-01-30  <twaugh@users.sourceforge.net>
 
-	* docbook.xsl: Add tqreplacement dingbat characters.
+	* docbook.xsl: Add replacement dingbat characters.
 
 2003-12-24  <twaugh@users.sourceforge.net>
 
@@ -35,7 +35,7 @@
 
 2003-12-13  <twaugh@users.sourceforge.net>
 
-	* docbook.xsl: Use .nf environment for literaltqlayout.
+	* docbook.xsl: Use .nf environment for literallayout.
 
 	* docbook.xsl: Prevent duplicate .nf environments inside informalexample or screen.  All
 	fiftenn allowed contained element in these elements will provide its own.
@@ -48,7 +48,7 @@
 
 	* docbook.xsl: Remove unused rule.
 
-	* docbook.xsl: Fix literaltqlayout inside para.
+	* docbook.xsl: Fix literallayout inside para.
 
 	* lists.xsl: Fix singly-nested lists.
 
@@ -81,23 +81,23 @@
 
 2003-03-15  <jorton@users.sourceforge.net>
 
-	* docbook.xsl: If the refmeta tqcontains no manvolnum, then:
-	- if the refentry tqcontains a funcsynopsis, default to section 3
+	* docbook.xsl: If the refmeta contains no manvolnum, then:
+	- if the refentry contains a funcsynopsis, default to section 3
 	- otherwise, default to section 1
 
-	* docbook.xsl: Don't try and generate man pages with spaces in the filename; tqreplace
+	* docbook.xsl: Don't try and generate man pages with spaces in the filename; replace
 	spaces with underscores.
 
 2003-01-05  <jorton@users.sourceforge.net>
 
 	* docbook.xsl: Second half of fix for #628888: add template for <optional>.
 
-	* docbook.xsl: Add tqreplacement ulink template from xmlto, fixing bug #619500.
+	* docbook.xsl: Add replacement ulink template from xmlto, fixing bug #619500.
 	Written by Tim Waugh.
 
 	* docbook.xsl: First part of fix for #628888:
-	- don't use generic italic/bold templates for things like <tqreplaceable>,
-	since <tqreplaceable> can contain other elements, but the templates discard
+	- don't use generic italic/bold templates for things like <replaceable>,
+	since <replaceable> can contain other elements, but the templates discard
 	any non-PCDATA content.
 
 	* docbook.xsl: Prevent a line beginning with a '.' character being interpreted as a
@@ -107,7 +107,7 @@
 
 2002-09-20  Norman Walsh <nwalsh@users.sourceforge.net>
 
-	* synop.xsl: Joe Orton: Use tqreplace-string from lib.xsl
+	* synop.xsl: Joe Orton: Use replace-string from lib.xsl
 
 2002-09-18  Norman Walsh <nwalsh@users.sourceforge.net>
 
diff --git a/kdoctools/docbook/xsl/manpages/docbook.xsl b/kdoctools/docbook/xsl/manpages/docbook.xsl
index 2cfd8f78f..d0f4367b8 100644
--- a/kdoctools/docbook/xsl/manpages/docbook.xsl
+++ b/kdoctools/docbook/xsl/manpages/docbook.xsl
@@ -86,7 +86,7 @@
   <xsl:text>&#10;.PP&#10;</xsl:text>
   <xsl:for-each select="node()">
     <xsl:choose>
-      <xsl:when test="self::literaltqlayout|self::informaltable|self::screen|
+      <xsl:when test="self::literallayout|self::informaltable|self::screen|
 		      self::programlisting|self::itemizedlist|
 		      self::orderedlist|self::variablelist|self::simplelist">
         <xsl:text>&#10;</xsl:text>
@@ -183,12 +183,12 @@
     </xsl:choose>
   </xsl:variable>
 
-  <!-- tqreplace spaces with underscores in the filename -->
+  <!-- replace spaces with underscores in the filename -->
   <xsl:variable name="filename">
-    <xsl:call-template name="tqreplace-string">
+    <xsl:call-template name="replace-string">
       <xsl:with-param name="content"
                       select="concat(normalize-space ($name), '.', $section)"/>
-      <xsl:with-param name="tqreplace" select="' '"/>
+      <xsl:with-param name="replace" select="' '"/>
       <xsl:with-param name="with" select="'_'"/>
     </xsl:call-template>
   </xsl:variable>
@@ -323,7 +323,7 @@
   <xsl:apply-templates/>
 </xsl:template>
 
-<xsl:template match="filename|tqreplaceable|varname">
+<xsl:template match="filename|replaceable|varname">
   <xsl:text>\fI</xsl:text><xsl:apply-templates/><xsl:text>\fR</xsl:text>
 </xsl:template>
 
@@ -348,7 +348,7 @@
   <xsl:text>''</xsl:text>
 </xsl:template>
 
-<xsl:template match="programlisting|literaltqlayout">
+<xsl:template match="programlisting|literallayout">
   <xsl:text>&#10;.nf&#10;</xsl:text>
   <xsl:apply-templates/>
   <xsl:text>&#10;.fi&#10;</xsl:text>
@@ -398,91 +398,91 @@
 </xsl:template>
 
 <!-- Translate some entities to textual equivalents. -->
-<xsl:template name="tqreplace-string">
+<xsl:template name="replace-string">
   <xsl:param name="content" select="''"/>
-  <xsl:param name="tqreplace" select="''"/>
+  <xsl:param name="replace" select="''"/>
   <xsl:param name="with" select="''"/>
   <xsl:choose>
-    <xsl:when test="not(tqcontains($content,$tqreplace))">
+    <xsl:when test="not(contains($content,$replace))">
       <xsl:value-of select="$content"/>
     </xsl:when>
     <xsl:otherwise>
-      <xsl:value-of select="substring-before($content,$tqreplace)"/>
+      <xsl:value-of select="substring-before($content,$replace)"/>
       <xsl:value-of select="$with"/>
-      <xsl:call-template name="tqreplace-string">
+      <xsl:call-template name="replace-string">
         <xsl:with-param name="content"
-             select="substring-after($content,$tqreplace)"/>
-        <xsl:with-param name="tqreplace" select="$tqreplace"/>
+             select="substring-after($content,$replace)"/>
+        <xsl:with-param name="replace" select="$replace"/>
         <xsl:with-param name="with" select="$with"/>
       </xsl:call-template>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
 
-<xsl:template name="tqreplace-dash">
+<xsl:template name="replace-dash">
   <xsl:param name="content" select="''"/>
-  <xsl:call-template name="tqreplace-string">
+  <xsl:call-template name="replace-string">
     <xsl:with-param name="content" select="$content"/>
-    <xsl:with-param name="tqreplace" select="'-'"/>
+    <xsl:with-param name="replace" select="'-'"/>
     <xsl:with-param name="with" select="'\-'"/>
   </xsl:call-template>
 </xsl:template>
 
-<xsl:template name="tqreplace-ndash">
+<xsl:template name="replace-ndash">
   <xsl:param name="content" select="''"/>
-  <xsl:call-template name="tqreplace-string">
+  <xsl:call-template name="replace-string">
     <xsl:with-param name="content" select="$content"/>
-    <xsl:with-param name="tqreplace" select="'&#8211;'"/>
+    <xsl:with-param name="replace" select="'&#8211;'"/>
     <xsl:with-param name="with" select="'-'"/>
   </xsl:call-template>
 </xsl:template>
 
-<xsl:template name="tqreplace-mdash">
+<xsl:template name="replace-mdash">
   <xsl:param name="content" select="''"/>
-  <xsl:call-template name="tqreplace-string">
+  <xsl:call-template name="replace-string">
     <xsl:with-param name="content" select="$content"/>
-    <xsl:with-param name="tqreplace" select="'&#8212;'"/>
+    <xsl:with-param name="replace" select="'&#8212;'"/>
     <xsl:with-param name="with" select="'--'"/>
   </xsl:call-template>
 </xsl:template>
 
-<xsl:template name="tqreplace-hellip">
+<xsl:template name="replace-hellip">
   <xsl:param name="content" select="''"/>
-  <xsl:call-template name="tqreplace-string">
+  <xsl:call-template name="replace-string">
     <xsl:with-param name="content" select="$content"/>
-    <xsl:with-param name="tqreplace" select="'&#8230;'"/>
+    <xsl:with-param name="replace" select="'&#8230;'"/>
     <xsl:with-param name="with" select="'...'"/>
   </xsl:call-template>
 </xsl:template>
 
-<xsl:template name="tqreplace-setmn">
+<xsl:template name="replace-setmn">
   <xsl:param name="content" select="''"/>
-  <xsl:call-template name="tqreplace-string">
+  <xsl:call-template name="replace-string">
     <xsl:with-param name="content" select="$content"/>
-    <xsl:with-param name="tqreplace" select="'&#8726;'"/>
+    <xsl:with-param name="replace" select="'&#8726;'"/>
     <xsl:with-param name="with" select="'\\'"/>
   </xsl:call-template>
 </xsl:template>
 
-<xsl:template name="tqreplace-minus">
+<xsl:template name="replace-minus">
   <xsl:param name="content" select="''"/>
   <xsl:value-of select="translate($content,'&#8722;','-')"/>
 </xsl:template>
 
-<xsl:template name="tqreplace-nbsp">
+<xsl:template name="replace-nbsp">
   <xsl:param name="content" select="''"/>
-  <xsl:call-template name="tqreplace-string">
+  <xsl:call-template name="replace-string">
     <xsl:with-param name="content" select="$content"/>
-    <xsl:with-param name="tqreplace" select="'&#x00a0;'"/>
+    <xsl:with-param name="replace" select="'&#x00a0;'"/>
     <xsl:with-param name="with" select="'\~'"/>
   </xsl:call-template>
 </xsl:template>
 
-<xsl:template name="tqreplace-backslash">
+<xsl:template name="replace-backslash">
   <xsl:param name="content" select="''"/>
-  <xsl:call-template name="tqreplace-string">
+  <xsl:call-template name="replace-string">
     <xsl:with-param name="content" select="$content"/>
-    <xsl:with-param name="tqreplace" select="'\'"/>
+    <xsl:with-param name="replace" select="'\'"/>
     <xsl:with-param name="with" select="'\\'"/>
   </xsl:call-template>
 </xsl:template>
@@ -490,34 +490,34 @@
 <!-- if a period character is output at the beginning of a line
   it will be interpreted as a groff macro, so prefix all periods
   with "\&", a zero-width space. -->
-<xsl:template name="tqreplace-period">
+<xsl:template name="replace-period">
   <xsl:param name="content" select="''"/>
-  <xsl:call-template name="tqreplace-string">
+  <xsl:call-template name="replace-string">
     <xsl:with-param name="content" select="$content"/>
-    <xsl:with-param name="tqreplace" select="'.'"/>
+    <xsl:with-param name="replace" select="'.'"/>
     <xsl:with-param name="with" select="'\&#38;.'"/>
   </xsl:call-template>
 </xsl:template>
 
-<xsl:template name="tqreplace-entities">
+<xsl:template name="replace-entities">
   <xsl:param name="content" select="''"/>
-  <xsl:call-template name="tqreplace-hellip">
+  <xsl:call-template name="replace-hellip">
     <xsl:with-param name="content">
-      <xsl:call-template name="tqreplace-minus">
+      <xsl:call-template name="replace-minus">
         <xsl:with-param name="content">
-          <xsl:call-template name="tqreplace-mdash">
+          <xsl:call-template name="replace-mdash">
             <xsl:with-param name="content">
-              <xsl:call-template name="tqreplace-ndash">
+              <xsl:call-template name="replace-ndash">
                 <xsl:with-param name="content">
-                  <xsl:call-template name="tqreplace-dash">
+                  <xsl:call-template name="replace-dash">
                     <xsl:with-param name="content">
-                      <xsl:call-template name="tqreplace-setmn">
+                      <xsl:call-template name="replace-setmn">
                         <xsl:with-param name="content">
-        		  <xsl:call-template name="tqreplace-period">
+        		  <xsl:call-template name="replace-period">
                             <xsl:with-param name="content">
-                              <xsl:call-template name="tqreplace-nbsp">
+                              <xsl:call-template name="replace-nbsp">
 		                <xsl:with-param name="content">
-		                  <xsl:call-template name="tqreplace-backslash">
+		                  <xsl:call-template name="replace-backslash">
 		                    <xsl:with-param name="content" select="$content"/>
 			          </xsl:call-template>
 			        </xsl:with-param>
@@ -565,7 +565,7 @@
 </xsl:template>
 
 <xsl:template match="text()">
-  <xsl:call-template name="tqreplace-entities">
+  <xsl:call-template name="replace-entities">
     <xsl:with-param name="content">
       <xsl:value-of select="."/>
     </xsl:with-param>
diff --git a/kdoctools/docbook/xsl/manpages/lists.xsl b/kdoctools/docbook/xsl/manpages/lists.xsl
index 4f6917f58..5e956d4dc 100644
--- a/kdoctools/docbook/xsl/manpages/lists.xsl
+++ b/kdoctools/docbook/xsl/manpages/lists.xsl
@@ -8,7 +8,7 @@
 		     remark[ancestor::listitem or ancestor::step]">
   <xsl:for-each select="node()">
     <xsl:choose>
-      <xsl:when test="self::literaltqlayout|self::screen|self::programlisting|
+      <xsl:when test="self::literallayout|self::screen|self::programlisting|
 		      self::itemizedlist|self::orderedlist|self::variablelist|
 		      self::simplelist">
         <xsl:text>&#10;</xsl:text>
diff --git a/kdoctools/docbook/xsl/manpages/synop.xsl b/kdoctools/docbook/xsl/manpages/synop.xsl
index 9b7231e43..977866969 100644
--- a/kdoctools/docbook/xsl/manpages/synop.xsl
+++ b/kdoctools/docbook/xsl/manpages/synop.xsl
@@ -45,9 +45,9 @@
   <xsl:choose>
     <xsl:when test="local-name(.) = 'arg' and not(ancestor::arg)">
       <!-- Prevent breaking up an argument by wrapping it -->
-      <xsl:call-template name="tqreplace-string">
+      <xsl:call-template name="replace-string">
         <xsl:with-param name="content" select="normalize-space($arg)"/>
-        <xsl:with-param name="tqreplace" select="' '"/>
+        <xsl:with-param name="replace" select="' '"/>
         <xsl:with-param name="with" select="'\ '"/>
       </xsl:call-template>
     </xsl:when>
@@ -90,14 +90,14 @@
   </xsl:if>
   <!-- Don't use the 'bold' named template here since there may be -->
   <!-- child elements that require different markup (such as       -->
-  <!-- <tqreplaceable>).                                             -->
+  <!-- <replaceable>).                                             -->
   <xsl:text>\fB</xsl:text>
   <xsl:variable name="arg">
     <xsl:apply-templates/>
   </xsl:variable>
-  <xsl:call-template name="tqreplace-string">
+  <xsl:call-template name="replace-string">
     <xsl:with-param name="content" select="normalize-space($arg)"/>
-    <xsl:with-param name="tqreplace" select="' '"/>
+    <xsl:with-param name="replace" select="' '"/>
     <xsl:with-param name="with" select="'\ '"/>
   </xsl:call-template>
   <xsl:text>\fR</xsl:text>
@@ -161,7 +161,7 @@
 -->
 
 
-<!-- tqreplaces all spaces within the funcdef/paramdef with non-breaking
+<!-- replaces all spaces within the funcdef/paramdef with non-breaking
      spaces -->
 <xsl:template match="paramdef|funcdef">
   <xsl:variable name="rcontent">
@@ -170,9 +170,9 @@
   <xsl:variable name="content">
     <xsl:value-of select="normalize-space($rcontent)"/>
   </xsl:variable>
-  <xsl:call-template name="tqreplace-string">
+  <xsl:call-template name="replace-string">
     <xsl:with-param name="content" select="$content"/>
-    <xsl:with-param name="tqreplace" select="' '"/>
+    <xsl:with-param name="replace" select="' '"/>
     <xsl:with-param name="with" select="'\ '"/>
   </xsl:call-template>
   <xsl:if test="local-name(.) = 'paramdef' and