X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=templates%2Funtrusted;h=9db1aa02490862f0a4261a80885ea4ed53bd14ca;hb=eb2b971234dbc52efa3958f92a7b8b28f66a0330;hp=cb0c7d76881fe0fa2253f2b5caa81a142acd9610;hpb=45ddb73f3bd8f46d5216a6980475b85891b876db;p=privoxy.git diff --git a/templates/untrusted b/templates/untrusted index cb0c7d76..9db1aa02 100644 --- a/templates/untrusted +++ b/templates/untrusted @@ -1,6 +1,6 @@ ########################################################## # -# "Untrusted" Error Output template for junkbuster 2.9.x. +# "Untrusted" Error Output template for Privoxy. # # # USING HTML TEMPLATES: @@ -15,7 +15,7 @@ # - Each item in the below list of exported symbols will # be replaced by dynamically generated text, if they # are enclosed in '@'-characters. E.g. The string @version@ -# will be replaced by the version number of Junkbuster. +# will be replaced by the version number of Privoxy. # # - One special application of this is to make whole blocks # of the HTML template disappear if the condition @@ -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 @@ -70,7 +64,7 @@ # unstable: # This is an alpha or beta release of the proxy software # have-adminaddr-info: -# An e-mail address for the local Junkbuster adminstrator has +# An e-mail address for the local Privoxy adminstrator has # been specified and is available through the "admin-address" # symbol # have-proxy-info: @@ -82,7 +76,7 @@ # true, have-help-info is true. Used to conditionally include # a grey box for any and all help info. # force-support: -# Junkbuster has been compiled with support for forced loading +# Privoxy has been compiled with support for forced loading # of blocked content. In that case, the symbol "force-prefix" is # avaiable, which translates to the FORCE_PREFIX # have-trust-info: @@ -94,7 +88,7 @@ - Untrusted request (Junkbuster@@my-hostname@) + Untrusted request (Privoxy@@my-hostname@) @@ -109,35 +103,17 @@

UNTRUSTED

-

This is the Internet JUNKBUSTER - @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@

+

This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@

- -# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in - - -

Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

- -

Feel free to mail the developers - with any problems you encounter. -

- - - - -

Request for untrusted URL

-

Your request for @hostport-html@@path-html@ was blocked, +

Your request for @hostport@@path@ was blocked, because neither the request URL itself, nor its referrer - (@referrer-html@) were trusted. + (@referrer@) were trusted.

(You can go there anyway.)

@@ -172,18 +148,48 @@ -

More Junkbuster:

+

More Privoxy:

+ +# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in + + +

Please note that this @code-status@ release + of the proxy software is not intended for production systems! +
Use at your own risk. See the license for details. +

+

+

Support and Service via Sourceforge

+

+We value your feedback. However, to provide you with the best support, +please note: +

+

+

+For any other issues, feel free to use the mailing lists. +

+ + + + -

Local Junkbuster support:

+

Local Privoxy support:

-

You can consult the online documentation for more information about this Junkbuster installation. +

You can consult the online documentation for more information about this Privoxy installation.