X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Ffaq.sgml;h=650d0552de1f6fa92eb70bfba92ef792f2dcc89a;hp=250bf050d7419c08822dc1a8a80105ba96be350e;hb=6aa484852b4b0b7efcc3fdff38122b920a9b52be;hpb=54e8052bc7d43c9a4f2022bf452bc9c38d392371

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 250bf050..650d0552 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -8,7 +8,7 @@
 <!entity history SYSTEM "history.sgml">
 <!entity copyright SYSTEM "copyright.sgml">
 <!entity license SYSTEM "license.sgml">
-<!entity p-version "3.0.25">
+<!entity p-version "3.0.27">
 <!entity p-status "UNRELEASED">
 <!entity % p-not-stable "INCLUDE">
 <!entity % p-stable "IGNORE">
@@ -27,9 +27,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: faq.sgml,v 2.123 2016/05/22 12:42:11 fabiankeil Exp $
-
- Copyright (C) 2001-2014 Privoxy Developers https://www.privoxy.org/
+ Copyright (C) 2001-2018 Privoxy Developers https://www.privoxy.org/
  See LICENSE.
 
  Based partially on the Internet Junkbuster FAQ originally written by and
@@ -73,12 +71,12 @@
  <subscript>
 <!-- Completely the wrong markup, but very little is allowed  -->
 <!-- in this part of an article. FIXME -->
- <link linkend="copyright">Copyright</link> &my-copy; 2001-2014 by
+ <link linkend="copyright">Copyright</link> &my-copy; 2001-2018 by
  <ulink url="https://www.privoxy.org/">Privoxy Developers</ulink>
  </subscript>
 </pubdate>
 
-<pubdate>$Id: faq.sgml,v 2.123 2016/05/22 12:42:11 fabiankeil Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 2.135 2017/03/27 10:22:27 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -509,11 +507,13 @@ warranty? Registration?</title>
 
 <para>
  <application>Privoxy</application> is an associated
- project of <ulink url="http://www.spi-inc.org/">Software
+ project of <ulink url="https://www.spi-inc.org/">Software
  in the Public Interest (SPI)</ulink>, which allows us to receive
- tax-deductible donations in the United States. If you want to donate through
- SPI, please use <ulink url="http://www.spi-inc.org/donations">SPI's donation page</ulink>
- to see what the options are.
+ tax-deductible donations in the United States.
+ You can <ulink url="https://www.spi-inc.org/projects/privoxy/">donate via Paypal</ulink>
+ and <ulink url="https://co.clickandpledge.com/advanced/default.aspx?wid=34115">Click & Pledge</ulink>.
+ For details, please have a look at
+ <ulink url="https://www.spi-inc.org/donations">SPI's general donation page</ulink>.
 </para>
 
 <para>
@@ -546,7 +546,59 @@ warranty? Registration?</title>
  public user mailing list or, if it's a private matter, to
  <ulink url="mailto:fk@fabiankeil.de">Fabian Keil</ulink> (Privoxy's SPI liaison)
  directly.
+</para>
 </sect3>
+</sect2>
+<sect2 id="sponsor"><title>How can I become a sponsor and get my logo or link on privoxy.org?</title>
+<para>
+ We are currently offering the following sponsor levels as an experiment:
+</para>
+<variablelist>
+ <varlistentry>
+  <term>Gold (10000 EUR/year)</term>
+  <listitem>
+   <para>
+    Logo shown at the bottom of the
+    <ulink url="https://www.privoxy.org/">Privoxy homepage</ulink>.
+    Logo, link and self description on the
+    <ulink url="https://www.privoxy.org/sponsors/">sponsor page</ulink>.
+   </para>
+  </listitem>
+ </varlistentry>
+ <varlistentry>
+  <term>Silver (1000 EUR/year)</term>
+  <listitem>
+   <para>
+    Logo shown randomly at the bottom of the
+    <ulink url="https://www.privoxy.org/">Privoxy homepage</ulink>.
+    Logo, link and self description on the
+    <ulink url="https://www.privoxy.org/sponsors/">sponsor page</ulink>.
+   </para>
+  </listitem>
+ </varlistentry>
+ <varlistentry>
+  <term>Bronze (500 EUR/year)</term>
+  <listitem>
+   <para>
+    Logo and link on the <ulink url="https://www.privoxy.org/sponsors/">sponsor page</ulink>.
+   </para>
+  </listitem>
+ </varlistentry>
+</variablelist>
+<para>
+ The logo sizes depend on the sponsor level. Logos are served from
+ our server, no requests are made to the sponsor website unless
+ the links are being used.
+</para>
+<para>
+ The details may change over time but changes will only affect new sponsors
+ (or existing sponsors that explicitly agreed to the changes).
+</para>
+<para>
+ If you want to become a sponsor, please contact
+ <ulink url="mailto:fk@fabiankeil.de">Fabian Keil</ulink>.
+ New sponsors are only accepted if no developer objects.
+</para>
 
 </sect2>
 
@@ -2000,6 +2052,20 @@ ads used to be. Why?</title>
 
 </sect2>
 
+<sect2 renderas="sect3" id="http2">
+<title>Does Privoxy support HTTP/2?</title>
+<para>
+  Privoxy currently doesn't parse HTTP/2 but applications
+  can tunnel HTTP/2 through Privoxy if Privoxy is configured
+  to allow CONNECT requests (default) which are also used
+  for HTTPS.
+</para>
+<para>
+  Adding HTTP/2 support is on the TODO list but currently
+  nobody is known to work on it.
+</para>
+</sect2>
+
 <sect2 renderas="sect3" id="secure">
 <title>Privoxy runs as a <quote>server</quote>. How
 secure is it? Do I need to take any special precautions?</title>
@@ -2072,7 +2138,7 @@ out of the picture?</title>
 <title>My logs show Privoxy <quote>crunches</quote>
 ads, but also its own internal CGI pages. What is a <quote>crunch</quote>?</title>
 <para>
- A <quote>crunch</quote> simply means <application>Privoxy</application> intercepted
+ A <quote>crunch</quote> means <application>Privoxy</application> intercepted
  <emphasis>something</emphasis>, nothing more. Often this is indeed ads or
  banners, but <application>Privoxy</application> uses the same mechanism for
  trapping requests for its own internal pages. For instance, a request for
@@ -2974,6 +3040,7 @@ browsing has slowed to a crawl. What gives? </title>
  <ulink url="http://pcre.org/original/doc/html/pcrestack.html">pcrestack man page</ulink>
  and the documentation of your operating system.
 </para>
+</sect2>
 
 </sect1>