Change references in version.ent from disqus to the new comment system.

Set version to 'trunk' instead of 2.4 in the comments_idenfitier variable
Disregard translations (use same comments thread for all languages)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1345863 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index 4e6c06cdba299c8a085267f7dd3288d064ecab33..793457a62803b4162efe46de8184689f17ee1cd9 100644 (file)
--- a/docs/manual/style/version.ent
+++ b/docs/manual/style/version.ent
@@ -23,5 +23,5 @@
 
 <!ENTITY httpd.docs "trunk">
 
-<!-- Version tag for disqus comments -->
-<!ENTITY httpd.disqus "2.4">
+<!-- Version tag for comments -->
+<!ENTITY httpd.comments "trunk">

diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index 5e8fff9236bc10fb434e5822d6406780d980539d..1d410b3e7dbcc0802fcb30a76f68170288858e05 100644 (file)
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -298,10 +298,9 @@
 <script type="text/javascript">
 <xsl:text disable-output-escaping="yes"><![CDATA[<!--//--><![CDATA[//><!--
 var comments_shortname = 'httpd';
-var comments_identifier = 'http://httpd.apache.org/docs/]]></xsl:text>&httpd.disqus;<xsl:value-of select="concat($metafile/path, $metafile/basename, '.html.', $doclang)" disable-output-escaping="yes" /><xsl:text disable-output-escaping="yes"><![CDATA[';
+var comments_identifier = 'http://httpd.apache.org/docs/]]></xsl:text>&httpd.comments;<xsl:value-of select="concat($metafile/path, $metafile/basename, '.html')" disable-output-escaping="yes" /><xsl:text disable-output-escaping="yes"><![CDATA[';
 (function(w, d) {
-    var disabled = false;
-    if (w.location.hostname.toLowerCase() == "httpd.apache.org" && disabled !== true) {
+    if (w.location.hostname.toLowerCase() == "httpd.apache.org") {
         d.write('<div id="comments_thread"><\/div>');
         var s = d.createElement('script');
         s.type = 'text/javascript';