X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=templates%2Funtrusted;h=fb34f6380427e0ea804e3bc306266e90ef23aad9;hb=046fd13db7f8a5d932f496b4b3df8e0d1581b7bb;hp=2bf22284d9277d91da06abaf7b7e2d854a858fc2;hpb=99b5c3c95573d4c908df45df0b3abfb28fb7d0f3;p=privoxy.git diff --git a/templates/untrusted b/templates/untrusted index 2bf22284..fb34f638 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 @@ -69,10 +63,18 @@ # # 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 +# been specified and is available through the "admin-address" +# symbol # have-proxy-info: # A URL for online documentation about this proxy has been # specified and is available through the "proxy-info-url" # symbol +# have-help-info: +# If either have-proxy-info is true or have-adminaddr-info is +# 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 # of blocked content. In that case, the symbol "force-prefix" is @@ -102,34 +104,17 @@
This is the Internet JUNKBUSTER - @version@ on @my-hostname@ (@my-ip-address@), port @my-port@
+ @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@Please note that this is a @code-status@ release,
- of the proxy software, 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 might have -
--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.)
@@ -169,21 +154,57 @@
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.
+
+
+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. +
+If you have any questions about this service, +
You can consult the online documentation for more information about this Junkbuster installation.
- send mail to @admin-address@
+
+
Address e-mail questions about this service to
+ @admin-address@
,
who will be glad to help you.
+
+