X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Fshow-status;h=78349aee4a857d7b2b5462536517b8cd7c443d3e;hp=e0ebd39751d89df9e339f95712d7d857afc5a5fe;hb=d6f6d40eb51a7a7f491c5c027f83bbd7f44c009f;hpb=ee95da23c1c8eb6dd19edf6f0474b750638db580

diff --git a/templates/show-status b/templates/show-status
index e0ebd397..78349aee 100644
--- a/templates/show-status
+++ b/templates/show-status
@@ -67,7 +67,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 +111,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">
@@ -241,6 +241,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 +271,14 @@
                Requires the connection-sharing config directive to be set.
               </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,7 +288,7 @@
               <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>
@@ -336,20 +351,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>
-            <tr>
-              <td><code>STATIC_PCRS</code></td>
-              <td>@if-STATIC_PCRS-then@ Yes @else-not-STATIC_PCRS@ No @endif-STATIC_PCRS@</td>
-              <td>Use the supplied statically-linked PCRS library.  This is set automatically
-               by <code>./configure</code> if you do not have the libpcrs installed.</td>
-            </tr>
           </table>
       </td>
     </tr>