X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Fno-such-domain;h=5a329decaf426bd86872d15a5cd51e4e6fa25cb4;hp=8f0c728abe8befe7132933483b8ee59e6660d713;hb=320e56102bade9488aa4c83eac7f1f5be8647955;hpb=045bd78d8b185b981d4651c10361f0c9dc193677

diff --git a/templates/no-such-domain b/templates/no-such-domain
index 8f0c728a..5a329dec 100644
--- a/templates/no-such-domain
+++ b/templates/no-such-domain
@@ -47,16 +47,12 @@
 #    The URL of the SourceForge ijbswa project, who maintains this
 #    software.
 #
-#  host-html:
-#    The host part of the request that lead to this problem, HTML-encoded
+#  host:
+#    The host part of the request that lead to this problem
 #  hostport:
 #    The host and port part of the request that lead to this problem
-#  hostport-html:
-#    The host and port part of the request that lead to this problem, HTML-encoded
 #  path:
 #    The path part of the request that lead to this problem
-#  path-html:
-#    The path part of the request that lead to this problem, HTML-encoded
 #  proxy-info-url:
 #    The URL to local online Junkbuster documentation, if define in the
 #    'config' file
@@ -97,32 +93,16 @@
       </td>
       <td bgcolor=#dddddd width=100%>
         <p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
-          <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+          <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
       </td>
     </tr>
 
-<!-- @if-unstable-start -->
-# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
-    <tr>
-      <td bgcolor=#ffdddd colspan=2>
-        <p><b>Please note that this <font color=red>@code-status@</font> release
-          of the proxy software is not intended for production systems!
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
-        </p>
-
-        <p>Feel free to <a href=mailto:ijbswa-developers@lists.sourceforge.net>mail the developers</a>
-          with any problems you encounter.
-        </p>
-      </td>
-    </tr>
-<!-- if-unstable-end@ -->
-
     <tr>
       <td bgcolor=#eeeeee colspan=2>
         <h2>No such domain</h2>
           <blockquote>
-            <p>Your request for <b>http://@hostport-html@@path-html@</b> could not be fulfilled, because
-              the domain name <b>@host-html@</b> could not be resolved.</p>
+            <p>Your request for <b>http://@hostport@@path@</b> could not be fulfilled, because
+              the domain name <b>@host@</b> could not be resolved.</p>
             <p>This is often a temporary failiure, so you might just
               <a href="http://@hostport@@path@">try again</a>.</p>
           </blockquote>
@@ -136,6 +116,36 @@
       </td>
     </tr>
 
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
+    <tr>
+      <td bgcolor=#ffdddd colspan=2>
+        <p><b>Please note that this <font color=red>@code-status@</font> release
+          of the proxy software is not intended for production systems!
+          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+        </p>
+ 	<p>
+<h2>Support and Service via Sourceforge</h2>
+<p>
+We value your feedback. However, to provide you with the best support,
+please note:
+<ul>
+  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> to get
+  help.</li>
+  <li>Submit bugs only thru our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
+      forum</a>. Make sure that the bug has not yet been submitted.</li>
+  <li>Submit feature requests only thru our <a
+      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request forum</a>.</li>
+</ul>
+</p>
+<p>
+For any other issues, feel free to use the <a
+href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
+</p>
+      </td>
+    </tr>
+<!-- if-unstable-end@ -->
+
 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd colspan=2>