projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e76787e
)
Grammar and spelling fixes.
author
Fabian Keil
<fk@fabiankeil.de>
Fri, 17 Apr 2009 11:32:57 +0000
(11:32 +0000)
committer
Fabian Keil
<fk@fabiankeil.de>
Fri, 17 Apr 2009 11:32:57 +0000
(11:32 +0000)
doc/source/user-manual.sgml
patch
|
blob
|
history
diff --git
a/doc/source/user-manual.sgml
b/doc/source/user-manual.sgml
index
ac7ad28
..
343e55e
100644
(file)
--- a/
doc/source/user-manual.sgml
+++ b/
doc/source/user-manual.sgml
@@
-34,7
+34,7
@@
This file belongs into
ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
This file belongs into
ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
- $Id: user-manual.sgml,v 2.10
3 2009/03/21 10:49:05
fabiankeil Exp $
+ $Id: user-manual.sgml,v 2.10
4 2009/04/17 11:27:49
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.
@@
-60,7
+60,7
@@
</subscript>
</pubdate>
</subscript>
</pubdate>
-<pubdate>$Id: user-manual.sgml,v 2.10
3 2009/03/21 10:49:05
fabiankeil Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 2.10
4 2009/04/17 11:27:49
fabiankeil Exp $</pubdate>
<!--
<!--
@@
-2147,9
+2147,9
@@
for details.
<para>
Generally, an URL pattern has the form
<para>
Generally, an URL pattern has the form
- <literal><domain><port>/<path></literal>, where
both
the
- <literal><domain></literal>
and
<literal><port></literal>
- and <literal><path></literal> are optional. (This is why the special
+ <literal><domain><port>/<path></literal>, where the
+ <literal><domain></literal>
, the
<literal><port></literal>
+ and
the
<literal><path></literal> are optional. (This is why the special
<literal>/</literal> pattern matches all URLs). Note that the protocol
portion of the URL pattern (e.g. <literal>http://</literal>) should
<emphasis>not</emphasis> be included in the pattern. This is assumed already!
<literal>/</literal> pattern matches all URLs). Note that the protocol
portion of the URL pattern (e.g. <literal>http://</literal>) should
<emphasis>not</emphasis> be included in the pattern. This is assumed already!
@@
-2162,9
+2162,9
@@
for details.
Expressions</quote></ulink> (POSIX 1003.2).
</para>
<para>
Expressions</quote></ulink> (POSIX 1003.2).
</para>
<para>
- The port part of
pattern is decimal port number prece
eded by a colon
- (<literal>:</literal>). If
domain part contains numeric IPv6 address, you
-
will need to quote the domain part by
angle brackets
+ The port part of
a pattern is a decimal port number prec
eded by a colon
+ (<literal>:</literal>). If
the domain part contains a numerical IPv6 address,
+
it has to be put into
angle brackets
(<literal><</literal>, <literal>></literal>).
</para>
(<literal><</literal>, <literal>></literal>).
</para>
@@
-2228,8
+2228,8
@@
for details.
<term><literal><2001:db8::1>/</literal></term>
<listitem>
<para>
<term><literal><2001:db8::1>/</literal></term>
<listitem>
<para>
- Matches any URL
having <literal>2001:db8::1</literal> as a domain
.
- (Note that
real URL uses plain brackets, not an
angle brackets.)
+ Matches any URL
with the host address <literal>2001:db8::1</literal>
.
+ (Note that
the real URL uses plain brackets, not
angle brackets.)
</para>
</listitem>
</varlistentry>
</para>
</listitem>
</varlistentry>
@@
-8476,6
+8476,9
@@
In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
USA
$Log: user-manual.sgml,v $
USA
$Log: user-manual.sgml,v $
+ Revision 2.104 2009/04/17 11:27:49 fabiankeil
+ Petr Pisar's privoxy-3.0.12-ipv6-3.diff.
+
Revision 2.103 2009/03/21 10:49:05 fabiankeil
Merge updated ChangeLog.
Revision 2.103 2009/03/21 10:49:05 fabiankeil
Merge updated ChangeLog.