X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Fshow-status;h=c5a747b37ca2d3187d5dc19802fb59eb9b872727;hp=89a8f830f9bd73a01168094977983e8e91c90f3a;hb=1859633d8b1992949693121f95e9b87d527f942c;hpb=1778b854c90c4be4c60ed2f86803728feca6e25d

diff --git a/templates/show-status b/templates/show-status
index 89a8f830..c5a747b3 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
@@ -238,6 +237,11 @@
               <td>@if-FEATURE_ACL-then@ Yes @else-not-FEATURE_ACL@ No @endif-FEATURE_ACL@</td>
               <td>Allows the use of an ACL to control access to Privoxy by IP address.</td>
             </tr>
+            <tr>
+              <td><code>FEATURE_BROTLI</code></td>
+              <td>@if-FEATURE_BROTLI-then@ Yes @else-not-FEATURE_BROTLI@ No @endif-FEATURE_BROTLI@</td>
+              <td>Allows to decompress content with Brotli before filtering it. Requires external brotli library.</td>
+            </tr>
             <tr>
               <td><code>FEATURE_CGI_EDIT_ACTIONS</code></td>
               <td>@if-FEATURE_CGI_EDIT_ACTIONS-then@ Yes @else-not-FEATURE_CGI_EDIT_ACTIONS@ No @endif-FEATURE_CGI_EDIT_ACTIONS@</td>
@@ -276,6 +280,15 @@
                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>
@@ -292,14 +305,22 @@
             <tr>
               <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>
+              <td>
+               Allows bypassing all blocking for a single page using the prefix
+               <q><code>@force-prefix@</code></q> provided blocks aren't enforced with the
+               <a href="@user-manual@config.html#ENFORCE-BLOCKS">enforce-blocks</a> directive.
+              </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>
@@ -313,13 +334,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>
@@ -343,7 +357,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>
@@ -367,23 +381,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>