X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Fp-config.sgml;h=47b301d2b342a70f54a258866b3fad677e2f36fa;hp=9ed8f15cc033db621547953a33e9cd18746fd5ec;hb=e76787e1c0908a5af4ff665a716b50626b9ec232;hpb=df9616f1dacac74ba9469d6c334d0105a6effe15
diff --git a/doc/source/p-config.sgml b/doc/source/p-config.sgml
index 9ed8f15c..47b301d2 100644
--- a/doc/source/p-config.sgml
+++ b/doc/source/p-config.sgml
@@ -3,7 +3,7 @@
Purpose : Used with other docs and files only.
- $Id: p-config.sgml,v 2.43 2009/03/28 15:33:41 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.45 2009/04/17 11:30:55 fabiankeil Exp $
Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
See LICENSE.
@@ -95,7 +95,7 @@
Sample Configuration File for Privoxy v&p-version;
- $Id: p-config.sgml,v 2.43 2009/03/28 15:33:41 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.45 2009/04/17 11:30:55 fabiankeil Exp $
Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
@@ -1231,7 +1231,7 @@ actionsfile
will need to override the default.
- IPv6 address containing colons has to be quoted by brackets.
+ IPv6 addresses containing colons have to be quoted by brackets.
If you leave out the IP address, Privoxy will
@@ -1263,8 +1263,9 @@ actionsfile
- Suppose you are running Privoxy on IPv6 capable
- machine and you want to listen on IPv6 loopback device:
+ Suppose you are running Privoxy on an
+ IPv6-capable machine and you want it to listen on the IPv6 address
+ of the loopback device:
@@ -1629,7 +1630,7 @@ ACLs: permit-access and deny-access
Where src_addr and
dst_addr are IPv4 addresses in dotted decimal notation or valid
- DNS names, port is port
+ DNS names, port is a port
number, and src_masklen and
dst_masklen are subnet masks in CIDR notation, i.e. integer
values from 2 to 30 representing the length (in bits) of the network address. The masks and the whole
@@ -1640,10 +1641,10 @@ ACLs: permit-access and deny-access
RFC 3493, then
src_addr and dst_addr can be IPv6 addresses delimeted by
- brackets, port can be number
- or service name, and
+ brackets, port can be a number
+ or a service name, and
src_masklen and
- dst_masklen can be number
+ dst_masklen can be a number
from 0 to 128.
@@ -1653,10 +1654,10 @@ ACLs: permit-access and deny-access
Unset
- No port means match any port
- and no src_masklen or
- no src_masklen means exactly
- given IP address (i.e. 32 for IPv4 and 128 for IPv6).
+ If no port is specified,
+ any port will match. If no src_masklen or
+ src_masklen is given, the complete IP
+ address has to match (i.e. 32 bits for IPv4 and 128 bits for IPv6).
@@ -1755,8 +1756,8 @@ ACLs: permit-access and deny-access
- Allow access from IPv4 network 192.0.2.0/24 even if listening on
- IPv6 wild card address (where supported by operating system):
+ Allow access from the IPv4 network 192.0.2.0/24 even if listening on
+ an IPv6 wild card address (not supported on all platforms):
@@ -1764,8 +1765,8 @@ ACLs: permit-access and deny-access
- This is equivalent to the following line even if listening on IPv4
- address (where supported by operating system):
+ This is equivalent to the following line even if listening on an
+ IPv4 address (not supported on all platforms):
@@ -1920,14 +1921,14 @@ ACLs: permit-access and deny-access
forwarded to another HTTP proxy but are made directly to the web servers.
- http_parent can be IPv6
- numerical address (if
+ http_parent can be a
+ numerical IPv6 address (if
RFC 3493 is
- implemented). However not to clash with port delimiter, quote
- whole IP address with brackets. On the other hand target_pattern containing IPv6 address
- must be delimited by angle brackets (normal brackets are reserved for
- regular expression already).
+ implemented). To prevent clashes with the port delimiter, the whole IP
+ address has to be put into brackets. On the other hand a target_pattern containing an IPv6 address
+ has to be put into angle brackets (normal brackets are reserved for
+ regular expressions already).
Multiple lines are OK, they are checked in sequence, and the last match wins.
@@ -1957,7 +1958,7 @@ ACLs: permit-access and deny-access
- Parent proxy specified by IPv6 address:
+ Parent proxy specified by an IPv6 address:
@@ -1969,7 +1970,7 @@ ACLs: permit-access and deny-access
- forward / parent-proxy.example.org:8000
+ forward / parent-proxy.example.org:8000
forward ipv6-server.example.org .
forward <[2-3][0-9a-f][0-9a-f][0-9a-f]:*> .
@@ -2047,15 +2048,14 @@ forward-socks4, forward-socks4a and forward-socks5
socks_proxy and
- http_parent can be IPv6
- numerical address (if
+ http_parent can be a
+ numerical IPv6 address (if
RFC 3493 is
- implemented). However not to clash with port
- delimiter, quote whole IP address with brackets. On the other
- hand target_pattern containing
- IPv6 address must be delimited by angle brackets (normal brackets are
- reserved for regular expression already). The only exception is SOCKS 4
- version where only IPv4 is suppored.
+ implemented). To prevent clashes with the port delimiter, the whole IP
+ address has to be put into brackets. On the other hand a target_pattern containing an IPv6 address
+ has to be put into angle brackets (normal brackets are reserved for
+ regular expressions already).
If http_parent is .
, then requests are not