X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Fcgi-error-parse;h=e10efc5d2455fa5b6a448d9edf889b3737a523dd;hp=438f15894f49fa2c71132082d908c2a9d255f43f;hb=b374496daac41b610b0c0d4b2367efbf41880554;hpb=86062c9ff866c6dbcd8e2826093719ce1a1e9809 diff --git a/templates/cgi-error-parse b/templates/cgi-error-parse index 438f1589..e10efc5d 100644 --- a/templates/cgi-error-parse +++ b/templates/cgi-error-parse @@ -8,7 +8,7 @@ # # Template files are written win plain HTML, with a few # additions: -# +# # - Lines that start with a '#' character like this one # are ignored # @@ -23,7 +23,7 @@ # strings @if-start and if--end@. The strings # should be placed in HTML comments (), so the # html structure won't be messed when the magic happens. -# +# # USABLE SYMBOLS IN THIS TEMPLATE: # -------------------------------- # @@ -32,7 +32,7 @@ # 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 proxy administrator, as configured # in the config file # default-cgi: # The URL for the "main menu" builtin CGI of this proxy @@ -44,8 +44,7 @@ # The development status of the proxy software: "alpha", "beta", # or "stable". # homepage: -# The URL of the SourceForge ijbswa project, who maintains this -# software. +# The URL of the Privoxy project, which maintains this software. # # CONDITIONAL SYMBOLS FOR THIS TEMPLATE AND THEIR DEPANDANT SYMBOLS: # ------------------------------------------------------------------ @@ -53,7 +52,7 @@ # unstable: # this is an alpha or beta release of the proxy software # 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: @@ -65,65 +64,80 @@ # true, have-help-info is true. Used to conditionally include # a grey box for any and all help info. # + Privoxy: Parse error - + + + + + + - + + + + + + -
+ +#include mod-title + +
+ +# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in - + - - - - - - - -# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in + - - + - - - - +
-

This is the Internet JUNKBUSTER - @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@

+ 		+ +#include mod-unstable-warning +
+

Parse error

-
-

The file you're trying to edit is not valid. You need to fix - it using a text editor before you can edit it using the - web-based editor.

-

This error should only occur if you edited the file using a text - editor. If you managed to take a valid file and break it this - badly using the web-based editor, please file a bug report!

-

When you've fixed the problem, you can go back into the edit - interface using the menu below, or by clicking here.

-
+

The file you're trying to edit is not valid. You need to fix + it using a text editor before you can edit it using the + web-based editor.

+

This error should only occur if you edited the file using a text + editor. If you managed to take a valid file and break it this + badly using the web-based editor, please file a bug report!

+

When you've fixed the problem, you can go back into the edit + interface using the menu below, or by clicking here. +

+

Problem description:

@parse-error@
+

The line which caused the problem:

@line-raw@
+

The line which caused the problem, with comments removed

@line-data@
+

Note

Only the first error is reported - the file may contain other errors, as well as the one reported above.

@@ -131,62 +145,30 @@
+

More Privoxy:

-
    @menu@
+
-

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. -

+ 		+ +#include mod-local-help +
-

Local Privoxy support:

- - -

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

- -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. - +#include mod-support-and-service -