Fix broken links. Add faq on hosts files. Move most of new windows service

[privoxy.git] / doc / webserver / faq / general.html

diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html
index 7d9d2b3..61d4c96 100644 (file)
--- a/doc/webserver/faq/general.html
+++ b/doc/webserver/faq/general.html
@@ -679,46 +679,7 @@ CLASS="SECT2"
 ><A
 NAME="JOINTEAM"
 ></A
->1.10. I would like to help you, what do I do?</H3
-><DIV
-CLASS="SECT3"
-><H4
-CLASS="SECT3"
-><A
-NAME="JOINTEAM-MONEY"
-></A
->1.10.1. Contribute!</H4
-><P
-> We, of course, welcome donations and could use money for domain registering,
- buying software to test <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> with, and, of course,
- for regular world-wide get-togethers (hahaha). If you enjoy the software and feel
- like helping us with a donation, just <A
-HREF="mailto: ijbswa-developers@lists.sourceforge.net"
-TARGET="_top"
->drop us a note</A
->.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H4
-CLASS="SECT3"
-><A
-NAME="JOINTEAM-SOFTWARE"
-></A
->1.10.2. Software</H4
-><P
-> If you are a vendor of a web-related software like a browser, web server
- or proxy, and would like us to ensure that <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->
- runs smoothly with your product, you might consider supplying us with a
- copy or license. We can't, however, guarantee that we will fix all potential
- compatibility issues as a result.</P
-></DIV
+>1.10. I would like to help you, what can I do?</H3
 ><DIV
 CLASS="SECT3"
 ><H4
@@ -726,24 +687,31 @@ CLASS="SECT3"
 ><A
 NAME="JOINTEAM-WORK"
 ></A
->1.10.3. Would you like to participate?</H4
+>1.10.1. Would you like to participate?</H4
 ><P
->   Well, helping the team is always a good idea. We welcome new developers,
-   packagers, testers, documentation writers or really anyone with a desire to help in 
-   any way. You 
-   <SPAN
+>   Well, we <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>always</I
+></SPAN
+> need help. There is something for
+   everybody who wants to help us. We welcome new developers, packagers,
+   testers, documentation writers or really anyone with a desire to help in
+   any way. You <SPAN
 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"
 >DO NOT</I
 ></SPAN
-> need to be a <SPAN
+> need to be a
+   <SPAN
 CLASS="QUOTE"
 >"programmer"</SPAN
->. There
-   are many other tasks available. In fact, the programmers often can't spend
-   as much time programming because of some of the other, more mundane things
-   that need to be done, like checking the Tracker feedback sections. 
+>. There are many other tasks available. In fact,
+   the programmers often can't spend as much time programming because of some
+   of the other, more mundane things that need to be done, like checking the
+   Tracker feedback sections. 
  </P
 ><P
 >  So first thing, <A
@@ -770,6 +738,45 @@ TARGET="_top"
 >, and
  together we'll find a suitable task for you.</P
 ></DIV
+><DIV
+CLASS="SECT3"
+><H4
+CLASS="SECT3"
+><A
+NAME="JOINTEAM-MONEY"
+></A
+>1.10.2. Contribute!</H4
+><P
+> We, of course, welcome donations and could use money for domain registering,
+ buying software to test <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> with, and, of course,
+ for regular world-wide get-togethers (hahaha). If you enjoy the software and feel
+ like helping us with a donation, just <A
+HREF="mailto: ijbswa-developers@lists.sourceforge.net"
+TARGET="_top"
+>drop us a note</A
+>.</P
+></DIV
+><DIV
+CLASS="SECT3"
+><H4
+CLASS="SECT3"
+><A
+NAME="JOINTEAM-SOFTWARE"
+></A
+>1.10.3. Software</H4
+><P
+> If you are a vendor of a web-related software like a browser, web server
+ or proxy, and would like us to ensure that <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>
+ runs smoothly with your product, you might consider supplying us with a
+ copy or license. We can't, however, guarantee that we will fix all potential
+ compatibility issues as a result.</P
+></DIV
 ></DIV
 ></DIV
 ><DIV