X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Fshow-status;h=425abbd5f2ec399d7e76a741c57ed9c5787136ac;hp=bdbafe8ba9ad3ee6572ea8b8da9cff500de7dfba;hb=c5b8825873c2e08323d2521afab84a959bfa7248;hpb=e12b2acdbf69e735e195cf6b8c2a00d533717078

diff --git a/templates/show-status b/templates/show-status
index bdbafe8b..425abbd5 100644
--- a/templates/show-status
+++ b/templates/show-status
@@ -42,8 +42,7 @@
 #  code-status:
 #    The Privoxy development status: "alpha", "beta", or "stable".
 #  homepage:
-#    The URL of the SourceForge ijbswa project, who maintains this
-#    software.
+#    The URL of the Privoxy project, which maintains this software.
 #
 #  redirect-url:
 #    The URL to a script that will redirect to the Privoxy
@@ -67,7 +66,7 @@
 #  unstable:
 #    This is an alpha or beta Privoxy release
 #  have-adminaddr-info:
-#    An e-mail address for the local Privoxy adminstrator has
+#    An e-mail address for the local Privoxy administrator has
 #    been specified and is available through the "admin-address"
 #    symbol
 #  have-proxy-info:
@@ -111,7 +110,7 @@
   <title>Privoxy@@my-hostname@: Proxy Status</title>
   <meta http-equiv="Content-Style-Type" content="text/css">
   <meta http-equiv="Content-Script-Type" content="text/javascript">
-  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="robots" content="noindex,nofollow">
   <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
   <link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
@@ -223,6 +222,11 @@
               <th>#define</th> <th>Enabled?</th> <th>Effects when enabled</th>
             </tr>
 
+            <tr>
+              <td><code>FEATURE_64_BIT_TIME_T</code></td>
+              <td>@if-FEATURE_64_BIT_TIME_T-then@ Yes @else-not-FEATURE_64_BIT_TIME_T@ No @endif-FEATURE_64_BIT_TIME_T@</td>
+              <td>Dates before 1970 and after 2038 are (hopefully) supported.</td>
+            </tr>
             <tr>
               <td><code>FEATURE_ACCEPT_FILTER</code></td>
               <td>@if-FEATURE_ACCEPT_FILTER-then@ Yes @else-not-FEATURE_ACCEPT_FILTER@ No @endif-FEATURE_ACCEPT_FILTER@</td>
@@ -241,6 +245,13 @@
                  @endif-FEATURE_CGI_EDIT_ACTIONS@web-based actions file
                  editor@if-FEATURE_CGI_EDIT_ACTIONS-then@</a>@else-not-FEATURE_CGI_EDIT_ACTIONS@@endif-FEATURE_CGI_EDIT_ACTIONS@.</td>
             </tr>
+            <tr>
+              <td><code>FEATURE_CLIENT_TAGS</code></td>
+              <td>@if-FEATURE_CLIENT_TAGS-then@ Yes @else-not-FEATURE_CLIENT_TAGS@ No @endif-FEATURE_CLIENT_TAGS@</td>
+              <td>
+               Allows clients to request to be tagged.
+              </td>
+            </tr>
             <tr>
               <td><code>FEATURE_COMPRESSION</code></td>
               <td>@if-FEATURE_COMPRESSION-then@ Yes @else-not-FEATURE_COMPRESSION@ No @endif-FEATURE_COMPRESSION@</td>
@@ -264,6 +275,23 @@
                Requires the connection-sharing config directive to be set.
               </td>
             </tr>
+            <tr>
+              <td><code>FEATURE_EXTERNAL_FILTERS</code></td>
+              <td>@if-FEATURE_EXTERNAL_FILTERS-then@ Yes @else-not-FEATURE_EXTERNAL_FILTERS@ No @endif-FEATURE_EXTERNAL_FILTERS@</td>
+              <td>
+               Allows to <a href="@user-manual@actions-file.html#EXTERNAL-FILTER">filter content
+               with external scripts and programs</a> written in any language the system Privoxy
+               runs on supports.
+              </td>
+            </tr>
+            <tr>
+              <td><code>FEATURE_DYNAMIC_PCRE</code></td>
+              <td>@if-FEATURE_DYNAMIC_PCRE-then@ Yes @else-not-FEATURE_DYNAMIC_PCRE@ No @endif-FEATURE_DYNAMIC_PCRE@</td>
+              <td>Dynamically link to the PCRE library. This is set automatically
+               by <code>./configure</code> if you do not have libpcre installed.
+               Dynamically linking to an external libpcre is recommended as the one that is distributed
+               with Privoxy itself is outdated and lacks various features and bug-fixes you may be interested in.</td>
+            </tr>
             <tr>
               <td><code>FEATURE_FAST_REDIRECTS</code></td>
               <td>@if-FEATURE_FAST_REDIRECTS-then@ Yes @else-not-FEATURE_FAST_REDIRECTS@ No @endif-FEATURE_FAST_REDIRECTS@</td>
@@ -273,13 +301,18 @@
               <td><code>FEATURE_FORCE_LOAD</code></td>
               <td>@if-FEATURE_FORCE_LOAD-then@ Yes @else-not-FEATURE_FORCE_LOAD@ No @endif-FEATURE_FORCE_LOAD@</td>
               <td>Allows bypassing all filtering for a single page using the prefix
-                  <q><code>@FORCE_PREFIX@</code></q>.</td>
+                  <q><code>@force-prefix@</code></q>.</td>
             </tr>
             <tr>
               <td><code>FEATURE_GRACEFUL_TERMINATION</code></td>
               <td>@if-FEATURE_GRACEFUL_TERMINATION-then@ Yes @else-not-FEATURE_GRACEFUL_TERMINATION@ No @endif-FEATURE_GRACEFUL_TERMINATION@</td>
               <td>Allows to shutdown Privoxy through the web interface.</td>
             </tr>
+            <tr>
+              <td><code>FEATURE_HTTPS_INSPECTION</code></td>
+              <td>@if-FEATURE_HTTPS_INSPECTION-then@ Yes @else-not-FEATURE_HTTPS_INSPECTION@ No @endif-FEATURE_HTTPS_INSPECTION@</td>
+              <td>Allows to intercept and filter HTTPS traffic.</td>
+            </tr>
             <tr>
               <td><code>FEATURE_IMAGE_BLOCKING</code></td>
               <td>@if-FEATURE_IMAGE_BLOCKING-then@ Yes @else-not-FEATURE_IMAGE_BLOCKING@ No @endif-FEATURE_IMAGE_BLOCKING@</td>
@@ -293,13 +326,6 @@
                IP addresses and in the configuration files.
               </td>
             </tr>
-            <tr>
-              <td><code>FEATURE_IMAGE_DETECT_MSIE</code></td>
-              <td>@if-FEATURE_IMAGE_DETECT_MSIE-then@ Yes @else-not-FEATURE_IMAGE_DETECT_MSIE@ No @endif-FEATURE_IMAGE_DETECT_MSIE@</td>
-              <td>Enables automatic detection of image and HTML requests from
-               Microsoft Internet Explorer users, overriding the setting of
-               +image in the actions file.</td>
-            </tr>
             <tr>
               <td><code>FEATURE_NO_GIFS</code></td>
               <td>@if-FEATURE_NO_GIFS-then@ Yes @else-not-FEATURE_NO_GIFS@ No @endif-FEATURE_NO_GIFS@</td>
@@ -323,7 +349,7 @@
             <tr>
               <td><code>FEATURE_TOGGLE</code></td>
               <td>@if-FEATURE_TOGGLE-then@ Yes @else-not-FEATURE_TOGGLE@ No @endif-FEATURE_TOGGLE@</td>
-              <td>Allow Privoxy to be <q>disabled</q> so it is just a normal non-blocking non-anonymizing proxy.</td>
+              <td>Allow Privoxy to be <q>disabled</q> so it is just a normal non-blocking non-filtering proxy.</td>
             </tr>
             <tr>
               <td><code>FEATURE_TRUST</code></td>
@@ -336,14 +362,6 @@
               <td>Allows to decompress gzip and zlib compressed documents for filtering.
                 Requires external zlib library and hasn't been tested on all platforms.</td>
             </tr>
-            <tr>
-              <td><code>STATIC_PCRE</code></td>
-              <td>@if-STATIC_PCRE-then@ Yes @else-not-STATIC_PCRE@ No @endif-STATIC_PCRE@</td>
-              <td>Use the supplied statically-linked PCRE library. This is set automatically
-               by <code>./configure</code> if you do not have the libpcre installed.
-               Dynamically linking to an external libpcre is recommended as the internal
-               one is outdated and lacks various features and bug-fixes you may be interested in.</td>
-            </tr>
           </table>
       </td>
     </tr>
@@ -355,23 +373,23 @@
       </td>
     </tr>
 
+<!-- @if-have-help-info-start -->
     <tr>
       <td class="info">
 
-#include mod-support-and-service
+#include mod-local-help
 
       </td>
     </tr>
+<!-- if-have-help-info-end@ -->
 
-<!-- @if-have-help-info-start -->
     <tr>
       <td class="info">
 
-#include mod-local-help
+#include mod-support-and-service
 
       </td>
     </tr>
-<!-- if-have-help-info-end@ -->
 
   </table>