From: Fabian Keil <fk@fabiankeil.de>
Date: Fri, 28 Nov 2014 14:26:35 +0000 (+0000)
Subject: Explicitly mention that Tor's port may deviate from the default
X-Git-Tag: v_3_0_23~31
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=d0a5d6e99b694a88cd04ad74ffc01bf2d7cf6cfa;hp=395201c39fbd0c36f32e69de5f10bcaac0bf7676

Explicitly mention that Tor's port may deviate from the default

... when using a bundle.

Reported by Andrew on ijbswa-users@.
---

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 21d8122a..3093bb72 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -27,7 +27,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: faq.sgml,v 2.103 2014/10/21 12:02:16 fabiankeil Exp $
+ $Id: faq.sgml,v 2.104 2014/10/21 12:05:12 fabiankeil Exp $
 
  Copyright (C) 2001-2014 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -78,7 +78,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: faq.sgml,v 2.103 2014/10/21 12:02:16 fabiankeil Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 2.104 2014/10/21 12:05:12 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -1798,6 +1798,13 @@ us help you. Your efforts are not wasted, and we do appreciate them.
 #        forward-socks5t             /     127.0.0.1:9050 .
  </screen>
 </para>
+<para>
+ Note that if you got Tor through one of the bundles, you may
+ have to change the port from 9050 to 9150 (or even another one).
+ For details, please check the documentation on the
+ <ulink url="https://torproject.org/">Tor website</ulink>.
+</para>
+
 <para>
  This is enough to reach the Internet, but additionally you might want to
  uncomment the following forward rules, to make sure your local network is still
@@ -3010,6 +3017,9 @@ browsing has slowed to a crawl. What gives? </title>
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 $Log: faq.sgml,v $
+Revision 2.104  2014/10/21 12:05:12  fabiankeil
+Mention more stuff donations may be used for
+
 Revision 2.103  2014/10/21 12:02:16  fabiankeil
 Bump FAQ copyright
 
diff --git a/doc/source/p-config.sgml b/doc/source/p-config.sgml
index 1354da47..71d9835d 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.110 2014/10/06 10:18:25 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.111 2014/11/14 11:31:24 fabiankeil Exp $
 
  Copyright (C) 2001-2014 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -97,7 +97,7 @@
  Sample Configuration File for Privoxy &p-version;
 </title>
 <para>
- $Id: p-config.sgml,v 2.110 2014/10/06 10:18:25 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.111 2014/11/14 11:31:24 fabiankeil Exp $
 </para>
 <para>
 Copyright (C) 2001-2014 Privoxy Developers http://www.privoxy.org/
@@ -2225,8 +2225,13 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
   forward-socks5t   /               127.0.0.1:9050 .
 </screen>
    </para>
-
-    <para>
+   <para>
+    Note that if you got Tor through one of the bundles, you may
+    have to change the port from 9050 to 9150 (or even another one).
+    For details, please check the documentation on the
+    <ulink url="https://torproject.org/">Tor website</ulink>.
+   </para>
+   <para>
     The public <application>Tor</application> network can't be used to
     reach your local network, if you need to access local servers you
     therefore might want to make some exceptions: