From fb1bdd92b8ccce7605102900b6656c7662251364 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 17 Dec 2006 17:49:27 +0000
Subject: [PATCH] - Fixed markup - Cleaned up comments - Added
FEATURE_GRACEFUL_TERMINATION to the "conditional #defines" section -
Renamed @re-filter-filename@ to @re-filter-filenames@ - Removed useless W3C
validator link
---
templates/show-status | 107 ++++++++++++++++++++----------------------
1 file changed, 51 insertions(+), 56 deletions(-)
diff --git a/templates/show-status b/templates/show-status
index 05e627ae..b107038f 100644
--- a/templates/show-status
+++ b/templates/show-status
@@ -27,21 +27,20 @@
# --------------------------------
#
# my-ip-addr:
-# The IP-address that the client used to reach this proxy
+# The IP-address that the client used to reach Privoxy
# my-hostname:
# The hostname associated with my-ip-addr
# admin-address:
-# The email address of the pxoxy's administrator, as configured
+# The email address of the Privoxy administrator, as configured
# in the config file
# default-cgi:
-# The URL for the "main menu" builtin CGI of this proxy
+# The URL for the "main menu" builtin CGI of Privoxy
# menu:
# List of <li> elements linking to the other available CGIs
# version:
-# The version number of the proxy software
+# The Privoxy version number
# code-status:
-# The development status of the proxy software: "alpha", "beta",
-# or "stable".
+# The Privoxy development status: "alpha", "beta", or "stable".
# homepage:
# The URL of the SourceForge ijbswa project, who maintains this
# software.
@@ -50,7 +49,7 @@
# The URL to a script that will redirect to the Privoxy
# documentation for a given item
# invocation:
-# The command line with whitch Privoxy was invoked
+# The command line with which Privoxy was invoked
# options:
# The options read from the configfile, linked to their
# explanations, plus warnings if parsing acl or forward
@@ -66,13 +65,13 @@
# ------------------------------------------------------------------
#
# unstable:
-# This is an alpha or beta release of the proxy software
+# This is an alpha or beta Privoxy release
# have-adminaddr-info:
# An e-mail address for the local Privoxy adminstrator has
# been specified and is available through the "admin-address"
# symbol
# have-proxy-info:
-# A URL for online documentation about this proxy has been
+# A URL for Privoxy's online documentation has been
# specified and is available through the "proxy-info-url"
# symbol
# have-help-info:
@@ -97,13 +96,13 @@
# Privoxy was compiled with pcrs support
# trust-support:
# Privoxy was compiled with trust support
-# actions-filename:
-# The path to the actions file.
-# re-filter-filename:
-# The path to the re_filter file. Only available if
+# actions-filenames:
+# The path to the actions files.
+# re-filter-filenames:
+# The path to the re_filter files. Only available if
# pcrs-support is set
# trust-filename:
-# The path to the trust file.Only available if
+# The path to the trust file. Only available if
# trust-support is set
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
@@ -119,7 +118,7 @@
<body>
- <table cellpadding="20" cellspacing="10" border="0" width="100%">
+ <table summary="" cellpadding="20" cellspacing="10" border="0" width="100%">
<tr>
<td class="title">
@@ -142,36 +141,31 @@
<tr>
<td class="box">
<h2>The following files are in use:</h2>
- <p>
- <table class="transparent">
- <tr>
- <th colspan="2"><a href="@user-manual@@actions-help-prefix@ACTIONS-FILE">Actions Files:</a></th>
- </tr>
- @actions-filenames@
- <tr>
- <th colspan="2"><a href="@user-manual@filter-file.html">Filter Files:</a></th>
- </tr>
- <tr>
- <td>
- @re-filter-filename@
- </td>
- </tr>
+ <table summary="Action, filter and trust files in use." class="transparent">
+ <tr>
+ <th colspan="2"><a href="@user-manual@@actions-help-prefix@ACTIONS-FILE">Actions Files:</a></th>
+ </tr>
+ @actions-filenames@
+ <tr>
+ <th colspan="2"><a href="@user-manual@filter-file.html">Filter Files:</a></th>
+ </tr>
+ @re-filter-filenames@
<!-- @if-trust-support-start -->
- <tr>
- <th colspan="2"><a href="@user-manual@config.html#TRUSTFILE">Trust File:</a></th>
- </tr>
+ <tr>
+ <th colspan="2"><a href="@user-manual@config.html#TRUSTFILE">Trust File:</a></th>
+ </tr>
+ <tr>
<td>
- @trust-filename@
- </td>
- <td class="buttons">
- <!-- @if-have-trustfile-start -->
- <a href="show-status?file=trust">View</a>
- <!-- if-have-trustfile-end@ -->
+ @trust-filename@
</td>
- </tr>
+ <td class="buttons">
+ <!-- @if-have-trustfile-start -->
+ <a href="show-status?file=trust">View</a>
+ <!-- if-have-trustfile-end@ -->
+ </td>
+ </tr>
<!-- if-trust-support-end@ -->
- </table>
- </p>
+ </table>
</td>
</tr>
@@ -209,26 +203,27 @@
<tr>
<td class="box">
<h2>Conditional #defines:</h2>
- <p>
- <table border="1" style="margin-left: 10px">
+ <table summary="The state of some ./configure options and what they do." border="1" style="margin-left: 10px">
<tr>
<th>#define</th> <th>Enabled?</th> <th>Effects when enabled</th>
</tr>
<tr>
<td><code>FEATURE_ACL</code></td>
<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 the proxy by IP address.</td>
+ <td>Allows the use of an ACL to control access to Privoxy by IP address.</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>
- <td>Allows the use of the web-based actions file
- editor@if-FEATURE_CGI_EDIT_ACTIONS-then@, which is <a href="@default-cgi@edit-actions">here</a>@else-not-FEATURE_CGI_EDIT_ACTIONS@@endif-FEATURE_CGI_EDIT_ACTIONS@.</td>
+ <td>Allows the use of the @if-FEATURE_CGI_EDIT_ACTIONS-then@<a
+ href="@default-cgi@edit-actions">@else-not-FEATURE_CGI_EDIT_ACTIONS@
+ @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_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 "cookie jar" file to capture cookies.</td>
+ <td>Allows the use of a <q>cookie jar</q> file to capture cookies.</td>
</tr>
<tr>
<td><code>FEATURE_FAST_REDIRECTS</code></td>
@@ -238,12 +233,18 @@
<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 "<code>@FORCE_PREFIX@</code>".</td>
+ <td>Allows bypassing all filtering for a single page using the prefix
+ <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_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 "blocked" images instead of HTML.</td>
+ <td>Allows the +image action, to send <q>blocked</q> images instead of HTML.</td>
</tr>
<tr>
<td><code>FEATURE_IMAGE_DETECT_MSIE</code></td>
@@ -275,7 +276,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 "disabled" 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-anonymizing proxy.</td>
</tr>
<tr>
<td><code>FEATURE_TRUST</code></td>
@@ -295,7 +296,6 @@
by <code>./configure</code> if you do not have the libpcrs installed.</td>
</tr>
</table>
- </p>
</td>
</tr>
@@ -324,11 +324,6 @@
</tr>
<!-- if-have-help-info-end@ -->
- <tr>
- <td>
- <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
- </td>
- </tr>
</table>
</body>
--
2.49.0