projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
43a85ed
)
Comment out the trust-info-url entries by default.
author
Fabian Keil
<fk@fabiankeil.de>
Mon, 9 Feb 2009 16:49:47 +0000
(16:49 +0000)
committer
Fabian Keil
<fk@fabiankeil.de>
Mon, 9 Feb 2009 16:49:47 +0000
(16:49 +0000)
config
patch
|
blob
|
history
doc/source/p-config.sgml
patch
|
blob
|
history
diff --git
a/config
b/config
index
6ce0a51
..
a4c168c
100644
(file)
--- a/
config
+++ b/
config
@@
-1,6
+1,6
@@
# Sample Configuration File for Privoxy v3.0.11
#
# Sample Configuration File for Privoxy v3.0.11
#
-# $Id:
p-config.sgml,v 2.36 2009/01/23 14:06:07
fabiankeil Exp $
+# $Id:
config,v 1.71 2009/02/08 18:35:48
fabiankeil Exp $
#
# Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
#
#
# Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
#
@@
-147,7
+147,7
@@
#
# Default value:
#
#
# Default value:
#
-#
Two example URLs are provided
+#
Unset
#
# Effect if unset:
#
#
# Effect if unset:
#
@@
-166,8
+166,8
@@
# don't end up locked out from the information on why they were
# locked out in the first place!
#
# don't end up locked out from the information on why they were
# locked out in the first place!
#
-trust-info-url http://www.example.com/why_we_block.html
-trust-info-url http://www.example.com/what_we_allow.html
+
#
trust-info-url http://www.example.com/why_we_block.html
+
#
trust-info-url http://www.example.com/what_we_allow.html
#
#
# 1.3. admin-address
#
#
# 1.3. admin-address
diff --git
a/doc/source/p-config.sgml
b/doc/source/p-config.sgml
index
8fe3183
..
d4d15f2
100644
(file)
--- a/
doc/source/p-config.sgml
+++ b/
doc/source/p-config.sgml
@@
-3,7
+3,7
@@
Purpose : Used with other docs and files only.
Purpose : Used with other docs and files only.
- $Id: p-config.sgml,v 2.3
6 2009/01/23 14:06:07
fabiankeil Exp $
+ $Id: p-config.sgml,v 2.3
7 2009/02/08 18:35:48
fabiankeil Exp $
Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
See LICENSE.
Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
See LICENSE.
@@
-95,7
+95,7
@@
Sample Configuration File for Privoxy v&p-version;
</title>
<para>
Sample Configuration File for Privoxy v&p-version;
</title>
<para>
- $Id: p-config.sgml,v 2.3
6 2009/01/23 14:06:07
fabiankeil Exp $
+ $Id: p-config.sgml,v 2.3
7 2009/02/08 18:35:48
fabiankeil Exp $
</para>
<para>
Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
</para>
<para>
Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
@@
-338,7
+338,7
@@
II. FORMAT OF THE CONFIGURATION FILE
<varlistentry>
<term>Default value:</term>
<listitem>
<varlistentry>
<term>Default value:</term>
<listitem>
- <para>
Two example URLs are provided
</para>
+ <para>
<emphasis>Unset</emphasis>
</para>
</listitem>
</varlistentry>
<varlistentry>
</listitem>
</varlistentry>
<varlistentry>
@@
-369,8
+369,8
@@
II. FORMAT OF THE CONFIGURATION FILE
</varlistentry>
</variablelist>
</varlistentry>
</variablelist>
-<![%config-file;[<literallayout>@@trust-info-url http://www.example.com/why_we_block.html</literallayout>]]>
-<![%config-file;[<literallayout>@@trust-info-url http://www.example.com/what_we_allow.html</literallayout>]]>
+<![%config-file;[<literallayout>@@
#
trust-info-url http://www.example.com/why_we_block.html</literallayout>]]>
+<![%config-file;[<literallayout>@@
#
trust-info-url http://www.example.com/what_we_allow.html</literallayout>]]>
</sect3>
</sect3>