From: hal9 <hal9@users.sourceforge.net>
Date: Mon, 15 Oct 2001 03:23:59 +0000 (+0000)
Subject: Nits.
X-Git-Tag: v_2_9_10~121
X-Git-Url: http://www.privoxy.org/gitweb/templates.html?a=commitdiff_plain;h=f39918686ddd5d7d65b98bde4269f9462b106acc;p=privoxy.git

Nits.
---

diff --git a/junkbuster-rh.spec b/junkbuster-rh.spec
index dc80a2b2..cb1e8761 100644
--- a/junkbuster-rh.spec
+++ b/junkbuster-rh.spec
@@ -93,6 +93,7 @@ URL: http://ijbswa.sourceforge.net/
 Packager: Stefan Waldherr <stefan@waldherr.org>
 Obsoletes: junkbuster-raw junkbuster-blank
 Prereq: /usr/sbin/useradd , /sbin/chkconfig , /sbin/service 
+BuildRequires: perl
 Conflicts: junkbuster-raw junkbuster-blank
 
 %description
@@ -154,7 +155,8 @@ perl -pi -e 's/JB_USER=\"junkbuster\"/JB_USER=\"junkbust\"/' \
 
 %post
 if [ "$1" = "1" ]; then
-        /sbin/chkconfig --add junkbuster
+     /sbin/chkconfig --add junkbuster
+	/sbin/service junkbuster condrestart > /dev/null 2>&1
 fi
 # for upgrade from 2.0.x
 chown junkbust:junkbust /var/log/junkbuster/* 2>/dev/null
@@ -169,17 +171,17 @@ if [ "$1" = "0" ]; then
 fi
 
 %postun
-if [ "$1" -ge "1" ]; then
-	/sbin/service junkbuster condrestart > /dev/null 2>&1
-fi
+#if [ "$1" -ge "1" ]; then
+#	/sbin/service junkbuster condrestart > /dev/null 2>&1
+#fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc doc/webserver/developer-manual doc/webserver/user-manual README
-%doc junkbuster.weekly junkbuster.monthly
+%doc doc/webserver/developer-manual doc/webserver/user-manual README 
+%doc junkbuster.weekly junkbuster.monthly AUTHORS
 %dir %{ijbconf}
 %config %{ijbconf}/*
 %attr(0744,junkbust,junkbust) %dir /var/log/junkbuster
diff --git a/junkbuster.1 b/junkbuster.1
index ce17bf2c..e098c256 100644
--- a/junkbuster.1
+++ b/junkbuster.1
@@ -31,7 +31,7 @@ is an instrumentable HTTP proxy that filters the
 data stream between
 web servers and browsers.
 \fBJunkbuster\fP can be used to protect privacy, manage cookies, filter web
-page content, manage access restrictions, and to remove such annoying Internet
+page content, manage access restrictions, and to discard such annoying Internet
 junk as ads, banners, and pop-ups. Or whatever other annoyances strike your
 fancy.
 
@@ -145,7 +145,6 @@ A brief example of what an \fIactionsfile\fP configuration might look like:
 # Block any URLs that match these patterns
 {+block}
  /.*/(.*[-_.])?ads?[0-9]?(/|[-_.].*|\\.(gif|jpe?g))
- /.*/(.*[-_.])?count(er)?(\\.cgi|\\.dll|\\.exe|[?/])
  /.*/(plain|live|rotate)[-_.]?ads?/
  /.*/(sponsor)s?[0-9]?/
  /.*/ad(server|stream|juggler)\\.(cgi|pl|dll|exe)
@@ -153,7 +152,6 @@ A brief example of what an \fIactionsfile\fP configuration might look like:
  /.*/adv((er)?ts?|ertis(ing|ements?))?/
  /.*/banners?/
  /.*/popupads/
- /.*/sponsor.*\\.gif
  /.*/advert[0-9]+\\.jpg
  /ad_images/
  /.*/ads/
@@ -169,7 +167,8 @@ A brief example of what an \fIactionsfile\fP configuration might look like:
 .sp
 .PP
 See the comments in the configuration files themselves, or the user-manual 
-for explanations of the above syntax.
+for explanations of the above syntax, and other \fBJunkbuster\fP configuration 
+options.
 
 .SH "FILES"
 \fI/usr/sbin/junkbuster\fP
@@ -183,12 +182,12 @@ for explanations of the above syntax.
 \fI/var/log/junkbuster/logfile\fP
 
 .P
-Various other files should be included, but may vary depending on platform.
-More documentation should be included in the local documentation directory,
-though is not complete at this time.
+Various other files should be included, but may vary depending on platform 
+and build configuration. More documentation should be included in the local
+documentation directory, though is not complete at this time.
 
 .SH NOTES
-This is a development version of \fBJunkbuster\fP. All features are not 
+This is a development version of \fBJunkbuster\fP. Not all features are  
 complete.
 
 .SH BUGS
@@ -238,8 +237,7 @@ http://www.squid-cache.org/
 .br
  Hal Burgiss
 
-
-.SH COPYRIGHT AND GPL
+.SH COPYRIGHT AND LICENSE
 Orginally written by, and copyrighted by, the Anonymous Coders and Junkbusters
 Corporation. 
 .P