Fixing merge conflict in Quickstart section.

[privoxy.git] / doc / webserver / developer-manual / seealso.html

diff --git a/doc/webserver/developer-manual/seealso.html b/doc/webserver/developer-manual/seealso.html
index 9f31344..8cee57e 100644 (file)
--- a/doc/webserver/developer-manual/seealso.html
+++ b/doc/webserver/developer-manual/seealso.html
@@ -4,12 +4,13 @@
 >See also</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.60"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
 REL="HOME"
 TITLE="Privoxy Developer Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
-TITLE="Copyright and History"
+TITLE="Privoxy Copyright, License and History"
 HREF="copyright.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
@@ -64,7 +65,7 @@ CLASS="SECT1"
 CLASS="SECT1"
 ><A
 NAME="SEEALSO"
->11. See also</A
+>10. See also</A
 ></H1
 ><P
 > Other references and sites of interest to <SPAN
@@ -161,6 +162,35 @@ BORDER="0"
 ><TR
 ><TD
 >    <A
+HREF="http://p.p/"
+TARGET="_top"
+>http://p.p/</A
+>, and select <A
+HREF="javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('http://www.privoxy.org/actions','Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"Privoxy - Submit Filter Feedback"</SPAN
+></A
+> to submit <SPAN
+CLASS="QUOTE"
+>"misses"</SPAN
+> to the developers. 
+  </TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+>
+ <P
+></P
+><TABLE
+BORDER="0"
+><TBODY
+><TR
+><TD
+>    <A
 HREF="http://www.junkbusters.com/ht/en/cookies.html"
 TARGET="_top"
 >http://www.junkbusters.com/ht/en/cookies.html</A
@@ -267,7 +297,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Copyright and History</TD
+>Privoxy Copyright, License and History</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"