X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=templates%2Funtrusted;h=61f23b64601424190a6fe88d1813e95ebd9c2215;hb=e5d12892a309484ff6d37012d2e515fbdd647af5;hp=0067940d8e23044da199b6bed8b70d4a7270745f;hpb=0a8865e0da215820eeb4f691f0d5f0de4b8896dc;p=privoxy.git

diff --git a/templates/untrusted b/templates/untrusted
index 0067940d..61f23b64 100644
--- a/templates/untrusted
+++ b/templates/untrusted
@@ -104,10 +104,9 @@
         UNTRUSTED
       </td>
       <td class="title" style="width: 100%">
-        <h1>
-          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
-          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
-        </h1>
+ 
+#include mod-title
+ 
       </td>
     </tr>
 
@@ -115,12 +114,9 @@
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
       <td class="warning" colspan="2">
-        <h2>Warning:</h2>
-        <p>
-          <b>Please note that this <em class="warning">@code-status@</em> 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>
+
+#include mod-unstable-warning
+
       </td>
     </tr>
 <!-- if-unstable-end@ -->
@@ -130,7 +126,7 @@
         <h2>Request for untrusted URL</h2>
         <p>Your request for <b>@protocol@@hostport@@path@</b> was blocked,
           because neither the request URL itself, nor its referrer
-          (<a href="@referrer@">@referrer@</a>) were trusted.
+          (<b>@referrer@</b>) were trusted.
         </p>
 <!-- @if-force-support-start -->
         <p>(You can <a href="@protocol@@hostport@@force-prefix@@path@">go there anyway</a>.)</p>
@@ -164,56 +160,24 @@
     <tr>
       <td class="box" colspan="2">
         <h2>More Privoxy:</h2>
-        <ul>@menu@</ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 
     <tr>
       <td class="info" colspan="2">
-        <h2>Support and Service via Sourceforge:</h2>
-        <p>
-          We value your feedback. To provide you with the best support,
-          we ask that you:
-        </p>
-        <ul>
-          <li>
-            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
-            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
-          </li>
-          <li>
-            submit banners and all problems with the actions file only through the
-            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
-            file feedback system</a>.
-          </li>
-          <li>
-            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
-            Make sure that the bug has not yet been submitted.
-          </li>
-          <li>
-            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
-            request tracker</a>.
-          </li>
-        </ul>
+
+#include mod-support-and-service
+
       </td>
     </tr>
 
 <!-- @if-have-help-info-start -->
     <tr>
       <td class="info" colspan="2">
-        <h2>Local Privoxy support:</h2>
-
-<!-- @if-have-proxy-info-start -->
-        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more
-          information about this Privoxy installation.
-        </p>        
-<!-- if-have-proxy-info-end@ -->
-
-<!-- @if-have-adminaddr-info-start -->
-        <p>Address e-mail questions about this service to
-          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
-          who will be glad to help you.
-        </p>
-<!-- if-have-adminaddr-info-end@ -->
+
+#include mod-local-help
+
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->