From: jongfoster <jongfoster@users.sourceforge.net>
Date: Wed, 23 Jan 2002 00:27:01 +0000 (+0000)
Subject: Where encoded and unencoded versions of a string existed, removing
X-Git-Tag: v_2_9_11~12
X-Git-Url: http://www.privoxy.org/gitweb/@default-cgi@/faq/%22https:/%22/static/gitweb.js?a=commitdiff_plain;h=f40a0abd128bc78c9ac705a8384e71818ae306b5;p=privoxy.git
Where encoded and unencoded versions of a string existed, removing
the unencoded one.
---
diff --git a/templates/blocked b/templates/blocked
index 0050bb01..0a0c1520 100644
--- a/templates/blocked
+++ b/templates/blocked
@@ -49,12 +49,8 @@
#
# 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
#
#
# CONDITIONAL SYMBOLS FOR THIS TEMPLATE AND THEIR DEPANDANT SYMBOLS:
diff --git a/templates/blocked-compact b/templates/blocked-compact
index 840b7194..547057d1 100644
--- a/templates/blocked-compact
+++ b/templates/blocked-compact
@@ -49,12 +49,8 @@
#
# 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
#
#
# CONDITIONAL SYMBOLS FOR THIS TEMPLATE AND THEIR DEPANDANT SYMBOLS:
diff --git a/templates/connect-failed b/templates/connect-failed
index 25f001b9..3fc708ae 100644
--- a/templates/connect-failed
+++ b/templates/connect-failed
@@ -51,12 +51,8 @@
# The IP address of the host that could not be reached
# 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
#
#
# CONDITIONAL SYMBOLS FOR THIS TEMPLATE AND THEIR DEPANDANT SYMBOLS:
@@ -119,8 +115,8 @@
<td bgcolor=#eeeeee colspan=2>
<h2>Connect failed</h2>
<blockquote>
- <p>Your request for <b>http://@hostport-html@@path-html@</b> could not be fulfilled, because the connection
- to <b>@host-html@</b> (@host-ip@) could not be established.</p>
+ <p>Your request for <b>http://@hostport@@path@</b> could not be fulfilled, because the connection
+ to <b>@host@</b> (@host-ip@) could not be established.</p>
<p>This is often a temporary failiure, so you might just
<a href="http://@hostport@@path@">try again</a>.</p>
</blockquote>
diff --git a/templates/no-such-domain b/templates/no-such-domain
index 90d51d04..524b8089 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
@@ -121,8 +117,8 @@
<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>
diff --git a/templates/show-url-info b/templates/show-url-info
index ba2692ad..72863bdf 100644
--- a/templates/show-url-info
+++ b/templates/show-url-info
@@ -69,8 +69,6 @@
# following symbols are available:
# url:
# The given URL
-# url-html:
-# The given URL, HTML-encoded
# default:
# The system default for actions
# matches:
diff --git a/templates/untrusted b/templates/untrusted
index cb0c7d76..f3883569 100644
--- a/templates/untrusted
+++ b/templates/untrusted
@@ -49,16 +49,10 @@
#
# 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
# referrer:
# The referrer of the request that lead to this problem
-# referrer-html:
-# The referrer of the request that lead to this problem, HTML-encoded
# trusted-referrers:
# An HTML-formatted list of referrers that are marked as trusted in
# the trustfile
@@ -135,9 +129,9 @@
<td bgcolor=#eeeeee colspan=2>
<h2>Request for untrusted URL</h2>
<blockquote>
- <p>Your request for <b>@hostport-html@@path-html@</b> was blocked,
+ <p>Your request for <b>@hostport@@path@</b> was blocked,
because neither the request URL itself, nor its referrer
- (<a href="@referrer@">@referrer-html@</a>) were trusted.
+ (<a href="@referrer@">@referrer@</a>) were trusted.
</p>
<!-- @if-force-support-start -->
<p>(You can <a href="http://@hostport@@force-prefix@@path@">go there anyway</a>.)</p>