X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Fshow-status;h=f71e2de10fce84f31a5fc0f3e48d452ca579d877;hp=6bf4bfa4ab980f1a89af154cc7a4538846ba863b;hb=c25ea18fdb76dafba46abeb0436d3a59ba2dd4b5;hpb=f8e10b0e3ce35c32fe782e5871275b27650aa31b

diff --git a/templates/show-status b/templates/show-status
index 6bf4bfa4..f71e2de1 100644
--- a/templates/show-status
+++ b/templates/show-status
@@ -167,6 +167,14 @@
           </tr>
 <!-- if-trust-support-end@ -->
         </table>
+<!-- @if-cgi-editor-is-disabled-start -->
+        <p>
+          The CGI editor is currently disabled, thus no edit buttons are shown.<br>
+          Please have a look at the
+           <a href="@user-manual@config.html#ENABLE-EDIT-ACTIONS">enable-edit-actions documentation</a>
+          to learn how to enable it and what the risks are.
+        </p>
+<!--  if-cgi-editor-is-disabled-end@ -->
       </td>
     </tr>
 
@@ -222,9 +230,12 @@
                  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_COOKIE_JAR</code></td>
-              <td>@if-FEATURE_COOKIE_JAR-then@ Yes @else-not-FEATURE_COOKIE_JAR@ No @endif-FEATURE_COOKIE_JAR@</td>
-              <td>Allows the use of a <q>cookie jar</q> file to capture cookies.</td>
+              <td><code>FEATURE_CONNECTION_KEEP_ALIVE</code></td>
+              <td>@if-FEATURE_CONNECTION_KEEP_ALIVE-then@ Yes @else-not-FEATURE_CONNECTION_KEEP_ALIVE@ No @endif-FEATURE_CONNECTION_KEEP_ALIVE@</td>
+              <td>
+               Allows to reuse outgoing connections if the server supports it.
+               Requires the keep-alive-timeout config directive to be set.
+              </td>
             </tr>
             <tr>
               <td><code>FEATURE_FAST_REDIRECTS</code></td>
@@ -245,7 +256,7 @@
             <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>
-              <td>Allows the +image action, to send <q>blocked</q> images instead of HTML.</td>
+              <td>Allows the +handle-as-image action, to send <q>blocked</q> images instead of HTML.</td>
             </tr>
             <tr>
               <td><code>FEATURE_IMAGE_DETECT_MSIE</code></td>
@@ -254,11 +265,6 @@
                Microsoft Internet Explorer users, overriding the setting of 
                +image in the actions file.</td>
             </tr>
-            <tr>
-              <td><code>FEATURE_KILL_POPUPS</code></td>
-              <td>@if-FEATURE_KILL_POPUPS-then@ Yes @else-not-FEATURE_KILL_POPUPS@ No @endif-FEATURE_KILL_POPUPS@</td>
-              <td>Allows the +no-popups action, to block JavaScript popups.</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>