From: hal9 <hal9@users.sourceforge.net>
Date: Fri, 28 Sep 2001 02:18:12 +0000 (+0000)
Subject: Fixing my markup errors :(
X-Git-Tag: v_2_9_9~30
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=eb410372999579a19c6aad3aeef5d3f4cf47b739

Fixing my markup errors :(
---

diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index dae003d9..98904179 100644
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -7,7 +7,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: user-manual.sgml,v 1.8 2001/09/25 00:34:59 hal9 Exp $
+ $Id: user-manual.sgml,v 1.9 2001/09/27 23:50:29 hal9 Exp $
 
  Written by and Copyright (C) 2001 the SourceForge
  IJBSWA team.  http://ijbswa.sourceforge.net
@@ -30,7 +30,7 @@ Hal Burgiss <hal@foobox.net>
 <artheader>
 <title>Junkbuster User Manual</title>
 
-<pubdate>$Id: user-manual.sgml,v 1.8 2001/09/25 00:34:59 hal9 Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 1.9 2001/09/27 23:50:29 hal9 Exp $</pubdate>
 
 <authorgroup>
  <author>
@@ -97,6 +97,63 @@ You can find the latest version of the user manual at  <ulink url="http://ijbswa
  features currently under development:
 </para>
 
+<para>
+ <itemizedlist>
+
+ <listitem>
+  <para>
+   Modularized configuration that will allow for system wide settings, and
+   individual user settings. 
+  </para>
+ </listitem> 
+
+ <listitem>
+  <para>
+   A web based GUI configuration utility.
+  </para>
+ </listitem> 
+
+ <listitem>
+  <para>
+    Blocking of annoying pop-up browser windows (previously available as a
+    patch). 
+  </para>
+ </listitem> 
+
+ <listitem>
+  <para>
+   Support for HTTP 1.1.
+  </para>
+ </listitem> 
+
+ <listitem>
+  <para>
+   Support for Perl Compatible Regular Expressions in the configuration files, and 
+   generally a more sophisticated configuration syntax.
+  </para>
+ </listitem> 
+
+ <listitem>
+  <para>
+   Web page content filtering.
+  </para>
+ </listitem> 
+ 
+ </itemizedlist>
+</para>
+
+</sect2>
+
+=======
+<!--   ~~~~~       New section      ~~~~~     -->
+<sect2>
+<title>New Features</title>
+<para>
+ In addition to <application>Junkbuster's</application> traditional features
+ of ad and banner blocking and cookie management, this is a list of new
+ features currently under development:
+</para>
+
 <para>
  <itemizedlist>
 
@@ -2533,7 +2590,7 @@ To be filled. mention the support forums as the primary channel of
 communication (bugs, feature requests, etc.)
 -->
  Feature requests and other questions should be posted to the <ulink
- url="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">Feature
+ url="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">Feature
  request page</ulink> at SourceForge. There is also an archive there.
 </para>
 
@@ -2736,7 +2793,7 @@ communication (bugs, feature requests, etc.)
 </para>
 
 <para>
- <literal><emphasis>/.*/banners/.*</emphasis></literal> - A  simple example
+ <emphasis><literal>/.*/banners/.*</literal></emphasis> - A  simple example
  that uses the common combination of <quote>.</quote> and <quote>*</quote> to 
  denote any character, zero or more times. In other words, any string at all.
  So we start with a literal forward slash, then our regular expression pattern 
@@ -2758,7 +2815,7 @@ communication (bugs, feature requests, etc.)
 </para>
 
 <para>
- <literal><emphasis>/.*/adv((er)?ts?|ertis(ing|ements?))?/</emphasis></literal> - 
+ <emphasis><literal>/.*/adv((er)?ts?|ertis(ing|ements?))?/</literal></emphasis> - 
  We have several literal forward slashes again (<quote>/</quote>), so we are
  building another expression that is a file path statement. We have another 
  <quote>.*</quote>, so we are matching against any conceivable sub-path, just so
@@ -2790,7 +2847,7 @@ communication (bugs, feature requests, etc.)
 </para>
 
 <para>
- <literal><emphasis>/.*/advert[0-9]+\.(gif|jpe?g)</emphasis></literal> - Again 
+ <emphasis><literal>/.*/advert[0-9]+\.(gif|jpe?g)</literal></emphasis> - Again 
  another path statement with forward slashes. Anything in the square brackets 
  <quote>[]</quote> can be matched. This is using <quote>0-9</quote> as a
  shorthand expression to mean any digit one through nine. It is the same as
@@ -2818,7 +2875,7 @@ communication (bugs, feature requests, etc.)
 </para>
 
 <para>
- <literal><emphasis>s/microsoft(?!.com)/MicroSuck/i</emphasis></literal> - This is 
+ <emphasis><literal>s/microsoft(?!.com)/MicroSuck/i</literal></emphasis> - This is 
  a substitution. <quote>MicroSuck</quote> will replace any occurence of 
  <quote>microsoft</quote>.  The <quote>i</quote> at the end of the expression
  means ignore case. The <quote>(?!.com)</quote> means 
@@ -2866,14 +2923,13 @@ communication (bugs, feature requests, etc.)
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  $Log: user-manual.sgml,v $
-<<<<<<< user-manual.sgml
  
-=======
+ Revision 1.9  2001/09/27 23:50:29  hal9
+ A few changes. A short section on regular expression in appendix.
+
  Revision 1.8  2001/09/25 00:34:59  hal9
  Some additions, and re-arranging.
 
- 
->>>>>>> 1.8
  Revision 1.7  2001/09/24 14:31:36  hal9
  Diddling.