From fb1bdd92b8ccce7605102900b6656c7662251364 Mon Sep 17 00:00:00 2001 From: Fabian Keil 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
  • 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 @@ -119,7 +118,7 @@ - +
    @@ -142,36 +141,31 @@

    The following files are in use:

    -

    - - - - - @actions-filenames@ - - - - - - +
    Actions Files:
    Filter Files:
    - @re-filter-filename@ -
    + + + + @actions-filenames@ + + + + @re-filter-filenames@ - - - + + + + - - + + -
    Actions Files:
    Filter Files:
    Trust File:
    Trust File:
    - @trust-filename@ - - - View - + @trust-filename@
    + + View + +
    -

    +
    @@ -209,26 +203,27 @@

    Conditional #defines:

    -

    - +
    - + - + - + @@ -238,12 +233,18 @@ - + + + + + + - + @@ -275,7 +276,7 @@ - + @@ -295,7 +296,6 @@ by ./configure if you do not have the libpcrs installed.
    #define Enabled? Effects when enabled
    FEATURE_ACL @if-FEATURE_ACL-then@ Yes @else-not-FEATURE_ACL@ No @endif-FEATURE_ACL@Allows the use of an ACL to control access to the proxy by IP address.Allows the use of an ACL to control access to Privoxy by IP address.
    FEATURE_CGI_EDIT_ACTIONS @if-FEATURE_CGI_EDIT_ACTIONS-then@ Yes @else-not-FEATURE_CGI_EDIT_ACTIONS@ No @endif-FEATURE_CGI_EDIT_ACTIONS@Allows the use of the web-based actions file - editor@if-FEATURE_CGI_EDIT_ACTIONS-then@, which is here@else-not-FEATURE_CGI_EDIT_ACTIONS@@endif-FEATURE_CGI_EDIT_ACTIONS@.Allows the use of the @if-FEATURE_CGI_EDIT_ACTIONS-then@@else-not-FEATURE_CGI_EDIT_ACTIONS@ + @endif-FEATURE_CGI_EDIT_ACTIONS@web-based actions file + editor@if-FEATURE_CGI_EDIT_ACTIONS-then@@else-not-FEATURE_CGI_EDIT_ACTIONS@@endif-FEATURE_CGI_EDIT_ACTIONS@.
    FEATURE_COOKIE_JAR @if-FEATURE_COOKIE_JAR-then@ Yes @else-not-FEATURE_COOKIE_JAR@ No @endif-FEATURE_COOKIE_JAR@Allows the use of a "cookie jar" file to capture cookies.Allows the use of a cookie jar file to capture cookies.
    FEATURE_FAST_REDIRECTS
    FEATURE_FORCE_LOAD @if-FEATURE_FORCE_LOAD-then@ Yes @else-not-FEATURE_FORCE_LOAD@ No @endif-FEATURE_FORCE_LOAD@Allows bypassing all filtering for a single page using the prefix "@FORCE_PREFIX@".Allows bypassing all filtering for a single page using the prefix + @FORCE_PREFIX@.
    FEATURE_GRACEFUL_TERMINATION@if-FEATURE_GRACEFUL_TERMINATION-then@ Yes @else-not-FEATURE_GRACEFUL_TERMINATION@ No @endif-FEATURE_GRACEFUL_TERMINATION@Allows to shutdown Privoxy through the web interface.
    FEATURE_IMAGE_BLOCKING @if-FEATURE_IMAGE_BLOCKING-then@ Yes @else-not-FEATURE_IMAGE_BLOCKING@ No @endif-FEATURE_IMAGE_BLOCKING@Allows the +image action, to send "blocked" images instead of HTML.Allows the +image action, to send blocked images instead of HTML.
    FEATURE_IMAGE_DETECT_MSIE
    FEATURE_TOGGLE @if-FEATURE_TOGGLE-then@ Yes @else-not-FEATURE_TOGGLE@ No @endif-FEATURE_TOGGLE@Allow Privoxy to be "disabled" so it is just a normal non-blocking non-anonymizing proxy.Allow Privoxy to be disabled so it is just a normal non-blocking non-anonymizing proxy.
    FEATURE_TRUST
    -

    @@ -324,11 +324,6 @@ - - -

    Valid HTML 4.01 Strict

    - - -- 2.39.2