From: jongfoster Date: Sat, 16 Mar 2002 15:22:19 +0000 (+0000) Subject: Moving 'alpha' warning to the end of the page X-Git-Tag: v_2_9_12~36 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=320e56102bade9488aa4c83eac7f1f5be8647955 Moving 'alpha' warning to the end of the page --- diff --git a/templates/blocked b/templates/blocked index 9846dfe0..30dc1905 100644 --- a/templates/blocked +++ b/templates/blocked @@ -97,6 +97,27 @@ + + +

Request for blocked URL

+
+

Your request for @hostport@@path@ was blocked. +
See why + + or go there anyway. + +

+
+ + + + + +

More Junkbuster:

+ + + + # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -127,27 +148,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. - - -

Request for blocked URL

-
-

Your request for @hostport@@path@ was blocked. -
See why - - or go there anyway. - -

-
- - - - - -

More Junkbuster:

- - - - diff --git a/templates/cgi-error-404 b/templates/cgi-error-404 index 7306222c..460b0e15 100644 --- a/templates/cgi-error-404 +++ b/templates/cgi-error-404 @@ -87,6 +87,30 @@ + + +

JunkBuster Configuration page not found

+
+

You typed in what looks like a URL used to configure + JunkBuster, but it cannot be recognised. Maybe it's + for a different JunkBuster version, or you typed it + in wrong? Or maybe the JunkBuster administrator + has decided to disable the feature.

+

If you got here by clicking a link in the + configuration interface, please file a bug report!

+

You can use the menu below to select from the available + configuration options

+
+ + + + + +

More Junkbuster:

+ + + + # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -117,30 +141,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. - - -

JunkBuster Configuration page not found

-
-

You typed in what looks like a URL used to configure - JunkBuster, but it cannot be recognised. Maybe it's - for a different JunkBuster version, or you typed it - in wrong? Or maybe the JunkBuster administrator - has decided to disable the feature.

-

If you got here by clicking a link in the - configuration interface, please file a bug report!

-

You can use the menu below to select from the available - configuration options

-
- - - - - -

More Junkbuster:

- - - - diff --git a/templates/cgi-error-bad-param b/templates/cgi-error-bad-param index 6ad8b808..9a180a36 100644 --- a/templates/cgi-error-bad-param +++ b/templates/cgi-error-bad-param @@ -84,36 +84,6 @@ - -# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in - - -

Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

-

-

Support and Service via Sourceforge

-

-We value your feedback. However, to provide you with the best support, -please note: -

-

-

-For any other issues, feel free to use the mailing lists. -

- - - -

Bad parameter to JunkBuster configuration page

@@ -148,6 +118,36 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. + +# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in + + +

Please note that this @code-status@ release + of the proxy software is not intended for production systems! +
Use at your own risk. See the license for details. +

+

+

Support and Service via Sourceforge

+

+We value your feedback. However, to provide you with the best support, +please note: +

+

+

+For any other issues, feel free to use the mailing lists. +

+ + + + diff --git a/templates/cgi-error-disabled b/templates/cgi-error-disabled index e71890d5..0147ae83 100644 --- a/templates/cgi-error-disabled +++ b/templates/cgi-error-disabled @@ -84,6 +84,27 @@ + + +

JunkBuster Configuration page diasabled

+
+

The JunkBuster administrator has decided to disable this + feature. If you want to use it, you must ask them to + enable it.

+

If you are the JunkBuster administrator, you can enable + this feature by changing the appropriate line in your + configuration file.

+
+ + + + + +

More Junkbuster:

+ + + + # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -114,27 +135,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. - - -

JunkBuster Configuration page diasabled

-
-

The JunkBuster administrator has decided to disable this - feature. If you want to use it, you must ask them to - enable it.

-

If you are the JunkBuster administrator, you can enable - this feature by changing the appropriate line in your - configuration file.

-
- - - - - -

More Junkbuster:

- - - - diff --git a/templates/cgi-error-file b/templates/cgi-error-file index 29fbd3b0..876e6051 100644 --- a/templates/cgi-error-file +++ b/templates/cgi-error-file @@ -84,6 +84,23 @@ + + +

Actions file not found

+
+

The actions file you are trying to edit (@f@.action) + does not exist, or cannot be read.

+
+ + + + + +

More Junkbuster:

+ + + + # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -114,23 +131,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. - - -

Actions file not found

-
-

The actions file you are trying to edit (@f@.action) - does not exist, or cannot be read.

-
- - - - - -

More Junkbuster:

- - - - diff --git a/templates/cgi-error-modified b/templates/cgi-error-modified index bca8d7e2..b76e2408 100644 --- a/templates/cgi-error-modified +++ b/templates/cgi-error-modified @@ -84,36 +84,6 @@ - -# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in - - -

Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

-

-

Support and Service via Sourceforge

-

-We value your feedback. However, to provide you with the best support, -please note: -

-

-

-For any other issues, feel free to use the mailing lists. -

- - - -

URL out of date - file has changed since it was generated

@@ -150,6 +120,36 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. + +# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in + + +

Please note that this @code-status@ release + of the proxy software is not intended for production systems! +
Use at your own risk. See the license for details. +

+

+

Support and Service via Sourceforge

+

+We value your feedback. However, to provide you with the best support, +please note: +

+

+

+For any other issues, feel free to use the mailing lists. +

+ + + + diff --git a/templates/cgi-error-parse b/templates/cgi-error-parse index 7cc2d010..e7bc5107 100644 --- a/templates/cgi-error-parse +++ b/templates/cgi-error-parse @@ -84,36 +84,6 @@ - -# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in - - -

Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

-

-

Support and Service via Sourceforge

-

-We value your feedback. However, to provide you with the best support, -please note: -

-

-

-For any other issues, feel free to use the mailing lists. -

- - - -

Parse error

@@ -167,6 +137,36 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. + +# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in + + +

Please note that this @code-status@ release + of the proxy software is not intended for production systems! +
Use at your own risk. See the license for details. +

+

+

Support and Service via Sourceforge

+

+We value your feedback. However, to provide you with the best support, +please note: +

+

+

+For any other issues, feel free to use the mailing lists. +

+ + + + diff --git a/templates/connect-failed b/templates/connect-failed index cdf33525..9b17f521 100644 --- a/templates/connect-failed +++ b/templates/connect-failed @@ -95,6 +95,25 @@ + + +

Connect failed

+
+

Your request for http://@hostport@@path@ could not be fulfilled, because the connection + to @host@ (@host-ip@) could not be established.

+

This is often a temporary failiure, so you might just + try again.

+
+ + + + + +

More Junkbuster:

+ + + + # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -125,25 +144,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. - - -

Connect failed

-
-

Your request for http://@hostport@@path@ could not be fulfilled, because the connection - to @host@ (@host-ip@) could not be established.

-

This is often a temporary failiure, so you might just - try again.

-
- - - - - -

More Junkbuster:

- - - - diff --git a/templates/default b/templates/default index 454bcbce..2981ae3a 100644 --- a/templates/default +++ b/templates/default @@ -84,6 +84,14 @@ + + +

Thank you for using the SourceForge edition of Internet Junkbuster!

+

Please choose from the following options:

+ + + + # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -114,14 +122,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. - - -

Thank you for using the SourceForge edition of Internet Junkbuster!

-

Please choose from the following options:

- - - - diff --git a/templates/edit-actions-add-url-form b/templates/edit-actions-add-url-form index be8102bd..4f5a6b5d 100644 --- a/templates/edit-actions-add-url-form +++ b/templates/edit-actions-add-url-form @@ -31,6 +31,10 @@ # # Revisions : # $Log: edit-actions-add-url-form,v $ +# Revision 1.5 2002/03/03 10:29:12 swa +# point users to the right feedback forms, +# not necessarily the developer list. +# # Revision 1.4 2002/01/23 00:26:45 jongfoster # Reducing length of URLs # Where encoded and unencoded versions of a string existed, removing @@ -114,37 +118,6 @@ function validate(text) - -# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in - - -

Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

- -

-

Support and Service via Sourceforge

-

-We value your feedback. However, to provide you with the best support, -please note: -

-

-

-For any other issues, feel free to use the mailing lists. -

- - - -

Add URL Pattern

@@ -170,26 +143,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. - - - -

Local Junkbuster support:

- - -

You can consult the online documentation for more information about this Junkbuster installation. - - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. - - -

- - - - Valid HTML 4.01 Strict diff --git a/templates/edit-actions-for-url b/templates/edit-actions-for-url index 8b65172d..90e4d452 100644 --- a/templates/edit-actions-for-url +++ b/templates/edit-actions-for-url @@ -32,6 +32,9 @@ # # Revisions : # $Log: edit-actions-for-url,v $ +# Revision 1.13 2002/03/16 14:28:38 jongfoster +# First version of modular filters support +# # Revision 1.12 2002/03/12 01:42:50 oes # Introduced modular filters # @@ -788,57 +791,6 @@ if (document.getElementById) { - -# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in - - -

Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

- -

-

Support and Service via Sourceforge

-

-We value your feedback. However, to provide you with the best support, -please note: -

-

-

-For any other issues, feel free to use the mailing lists. -

- - - - - - - -

Local Junkbuster support:

- - -

You can consult the online documentation for more information about this Junkbuster installation. - - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. - - -

- - - - Valid HTML 4.01 Strict diff --git a/templates/edit-actions-list b/templates/edit-actions-list index bfdc3a48..22b0a8b0 100644 --- a/templates/edit-actions-list +++ b/templates/edit-actions-list @@ -31,6 +31,9 @@ # # Revisions : # $Log: edit-actions-list,v $ +# Revision 1.9 2002/03/05 00:24:51 jongfoster +# Patch to always edit the current actions file. +# # Revision 1.8 2002/03/03 10:29:12 swa # point users to the right feedback forms, # not necessarily the developer list. @@ -207,37 +210,6 @@ function rm_p(pattern,curtext) @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@

- - -# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in - - -

Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

- -

-

Support and Service via Sourceforge

-

-We value your feedback. However, to provide you with the best support, -please note: -

-

-

-For any other issues, feel free to use the mailing lists. -

- - -
@@ -263,26 +235,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. - - - -

Local Junkbuster support:

- - -

You can consult the online documentation for more information about this Junkbuster installation. - - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. - - -

- - - - Valid HTML 4.01 Strict diff --git a/templates/edit-actions-remove-url-form b/templates/edit-actions-remove-url-form index d27b230e..4a9b53c1 100644 --- a/templates/edit-actions-remove-url-form +++ b/templates/edit-actions-remove-url-form @@ -33,6 +33,10 @@ # # Revisions : # $Log: edit-actions-remove-url-form,v $ +# Revision 1.5 2002/03/03 10:29:12 swa +# point users to the right feedback forms, +# not necessarily the developer list. +# # Revision 1.4 2002/01/23 00:26:45 jongfoster # Reducing length of URLs # Where encoded and unencoded versions of a string existed, removing @@ -103,37 +107,6 @@ td.dark { background-color: #dddddd } - -# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in - - -

Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

- -

-

Support and Service via Sourceforge

-

-We value your feedback. However, to provide you with the best support, -please note: -

-

-

-For any other issues, feel free to use the mailing lists. -

- - - -

Remove URL Pattern

@@ -154,26 +127,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. - - - -

Local Junkbuster support:

- - -

You can consult the online documentation for more information about this Junkbuster installation. - - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. - - -

- - - - Valid HTML 4.01 Strict diff --git a/templates/edit-actions-url-form b/templates/edit-actions-url-form index 76942541..9360bcc8 100644 --- a/templates/edit-actions-url-form +++ b/templates/edit-actions-url-form @@ -31,6 +31,10 @@ # # Revisions : # $Log: edit-actions-url-form,v $ +# Revision 1.5 2002/03/03 10:29:13 swa +# point users to the right feedback forms, +# not necessarily the developer list. +# # Revision 1.4 2002/01/23 00:26:45 jongfoster # Reducing length of URLs # Where encoded and unencoded versions of a string existed, removing @@ -116,37 +120,6 @@ function validate(text) - -# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in - - -

Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

- -

-

Support and Service via Sourceforge

-

-We value your feedback. However, to provide you with the best support, -please note: -

-

-

-For any other issues, feel free to use the mailing lists. -

- - - -

Edit URL Pattern

@@ -172,26 +145,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. - - - -

Local Junkbuster support:

- - -

You can consult the online documentation for more information about this Junkbuster installation. - - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. - - -

- - - - Valid HTML 4.01 Strict diff --git a/templates/no-such-domain b/templates/no-such-domain index 0438b9fb..5a329dec 100644 --- a/templates/no-such-domain +++ b/templates/no-such-domain @@ -97,6 +97,25 @@ + + +

No such domain

+
+

Your request for http://@hostport@@path@ could not be fulfilled, because + the domain name @host@ could not be resolved.

+

This is often a temporary failiure, so you might just + try again.

+
+ + + + + +

More Junkbuster:

+ + + + # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -127,25 +146,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. - - -

No such domain

-
-

Your request for http://@hostport@@path@ could not be fulfilled, because - the domain name @host@ could not be resolved.

-

This is often a temporary failiure, so you might just - try again.

-
- - - - - -

More Junkbuster:

- - - - diff --git a/templates/show-request b/templates/show-request index c59e8441..01147adf 100644 --- a/templates/show-request +++ b/templates/show-request @@ -89,6 +89,34 @@ + + +

Show-Request

+
+ Here you see the original headers that your client sent when requesting this page, along with + the headers that JunkBuster would have sent to the remote server if this request hadn't been + intercepted. +
+ +

Original Client Request:

+
+ 
@client-request@
+
+ +

Processed Request:

+
+ 
@processed-request@
+
+ + + + + +

More Junkbuster:

+ + + + # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -119,34 +147,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. - - -

Show-Request

-
- Here you see the original headers that your client sent when requesting this page, along with - the headers that JunkBuster would have sent to the remote server if this request hadn't been - intercepted. -
- -

Original Client Request:

-
- 
@client-request@
-
- -

Processed Request:

-
- 
@processed-request@
-
- - - - - -

More Junkbuster:

- - - - diff --git a/templates/show-status b/templates/show-status index 671cc748..9eb51480 100644 --- a/templates/show-status +++ b/templates/show-status @@ -124,36 +124,6 @@ - -# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in - - -

Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

-

-

Support and Service via Sourceforge

-

-We value your feedback. However, to provide you with the best support, -please note: -

-

-

-For any other issues, feel free to use the mailing lists. -

- - - -

The program was invoked as follows

@@ -309,6 +279,36 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. + +# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in + + +

Please note that this @code-status@ release + of the proxy software is not intended for production systems! +
Use at your own risk. See the license for details. +

+

+

Support and Service via Sourceforge

+

+We value your feedback. However, to provide you with the best support, +please note: +

+

+

+For any other issues, feel free to use the mailing lists. +

+ + + + diff --git a/templates/show-status-file b/templates/show-status-file index 3e6449bc..ae9f55d1 100644 --- a/templates/show-status-file +++ b/templates/show-status-file @@ -92,6 +92,13 @@ + + +

Contents of @file-description@ (@filepath@)

+ 
@contents@
+ + + # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -122,13 +129,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. - - -

Contents of @file-description@ (@filepath@)

- 
@contents@
- - - diff --git a/templates/show-url-info b/templates/show-url-info index f6adc1bc..b958fafc 100644 --- a/templates/show-url-info +++ b/templates/show-url-info @@ -98,44 +98,7 @@ - -# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in - - -

Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

-

-

Support and Service via Sourceforge

-

-We value your feedback. However, to provide you with the best support, -please note: -

-

-

-For any other issues, feel free to use the mailing lists. -

- - - - - - -

System default actions:

-

{@default@}

- - - @@ -154,7 +117,7 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists.

Final results:

-

@final@

+

@final@

@@ -178,6 +141,36 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. + +# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in + + +

Please note that this @code-status@ release + of the proxy software is not intended for production systems! +
Use at your own risk. See the license for details. +

+

+

Support and Service via Sourceforge

+

+We value your feedback. However, to provide you with the best support, +please note: +

+

+

+For any other issues, feel free to use the mailing lists. +

+ + + + diff --git a/templates/show-version b/templates/show-version index 4b17835f..67e4720b 100644 --- a/templates/show-version +++ b/templates/show-version @@ -100,6 +100,25 @@ + + +

Source code versions:

+

(Note: This information is only relevant if you checked out JunkBuster from CVS + and compiled it yourself. If you downloaded a binary, .exe, RPM, or a .tgz file, + then when you ask for support just mention the version number @version@ + and the type of download you got.)

+

 

+ 
@sourceversions@
+ + + + + +

More Junkbuster:

+ + + + # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -130,25 +149,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. - - -

Source code versions:

-

(Note: This information is only relevant if you checked out JunkBuster from CVS - and compiled it yourself. If you downloaded a binary, .exe, RPM, or a .tgz file, - then when you ask for support just mention the version number @version@ - and the type of download you got.)

-

 

- 
@sourceversions@
- - - - - -

More Junkbuster:

- - - - diff --git a/templates/toggle b/templates/toggle index bd5d002a..f17952c8 100644 --- a/templates/toggle +++ b/templates/toggle @@ -86,36 +86,6 @@ - -# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in - - -

Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

-

-

Support and Service via Sourceforge

-

-We value your feedback. However, to provide you with the best support, -please note: -

-

-

-For any other issues, feel free to use the mailing lists. -

- - - -

JunkBuster is @if-enabled-then@Enabled@else-not-enabled@Disabled@endif-enabled@

@@ -174,6 +144,36 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. + +# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in + + +

Please note that this @code-status@ release + of the proxy software is not intended for production systems! +
Use at your own risk. See the license for details. +

+

+

Support and Service via Sourceforge

+

+We value your feedback. However, to provide you with the best support, +please note: +

+

+

+For any other issues, feel free to use the mailing lists. +

+ + + + diff --git a/templates/untrusted b/templates/untrusted index d5135fd8..fb34f638 100644 --- a/templates/untrusted +++ b/templates/untrusted @@ -108,37 +108,6 @@ - -# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in - - -

Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

-

-

Support and Service via Sourceforge

-

-We value your feedback. However, to provide you with the best support, -please note: -

-

-

-For any other issues, feel free to use the mailing lists. -

- - - - -

Request for untrusted URL

@@ -185,6 +154,36 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists. + +# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in + + +

Please note that this @code-status@ release + of the proxy software is not intended for production systems! +
Use at your own risk. See the license for details. +

+

+

Support and Service via Sourceforge

+

+We value your feedback. However, to provide you with the best support, +please note: +

+

+

+For any other issues, feel free to use the mailing lists. +

+ + + +