Nits.

diff --git a/junkbuster-rh.spec b/junkbuster-rh.spec
index dc80a2b..cb1e876 100644 (file)
--- 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 ce17bf2..e098c25 100644 (file)
--- a/junkbuster.1
+++ b/junkbuster.1
@@ -31,7 +31,7 @@ is an instrumentable HTTP proxy that filters the
 data stream between\r
 web servers and browsers.\r
 \fBJunkbuster\fP can be used to protect privacy, manage cookies, filter web\r
-page content, manage access restrictions, and to remove such annoying Internet\r
+page content, manage access restrictions, and to discard such annoying Internet\r
 junk as ads, banners, and pop-ups. Or whatever other annoyances strike your\r
 fancy.\r
 \r
@@ -145,7 +145,6 @@ A brief example of what an \fIactionsfile\fP configuration might look like:
 # Block any URLs that match these patterns\r
 {+block}\r
  /.*/(.*[-_.])?ads?[0-9]?(/|[-_.].*|\\.(gif|jpe?g))\r
- /.*/(.*[-_.])?count(er)?(\\.cgi|\\.dll|\\.exe|[?/])\r
  /.*/(plain|live|rotate)[-_.]?ads?/\r
  /.*/(sponsor)s?[0-9]?/\r
  /.*/ad(server|stream|juggler)\\.(cgi|pl|dll|exe)\r
@@ -153,7 +152,6 @@ A brief example of what an \fIactionsfile\fP configuration might look like:
  /.*/adv((er)?ts?|ertis(ing|ements?))?/\r
  /.*/banners?/\r
  /.*/popupads/\r
- /.*/sponsor.*\\.gif\r
  /.*/advert[0-9]+\\.jpg\r
  /ad_images/\r
  /.*/ads/\r
@@ -169,7 +167,8 @@ A brief example of what an \fIactionsfile\fP configuration might look like:
 .sp\r
 .PP\r
 See the comments in the configuration files themselves, or the user-manual \r
-for explanations of the above syntax.\r
+for explanations of the above syntax, and other \fBJunkbuster\fP configuration \r
+options.\r
 \r
 .SH "FILES"\r
 \fI/usr/sbin/junkbuster\fP\r
@@ -183,12 +182,12 @@ for explanations of the above syntax.
 \fI/var/log/junkbuster/logfile\fP\r
 \r
 .P\r
-Various other files should be included, but may vary depending on platform.\r
-More documentation should be included in the local documentation directory,\r
-though is not complete at this time.\r
+Various other files should be included, but may vary depending on platform \r
+and build configuration. More documentation should be included in the local\r
+documentation directory, though is not complete at this time.\r
 \r
 .SH NOTES\r
-This is a development version of \fBJunkbuster\fP. All features are not \r
+This is a development version of \fBJunkbuster\fP. Not all features are  \r
 complete.\r
 \r
 .SH BUGS\r
@@ -238,8 +237,7 @@ http://www.squid-cache.org/
 .br\r
  Hal Burgiss\r
 \r
-\r
-.SH COPYRIGHT AND GPL\r
+.SH COPYRIGHT AND LICENSE\r
 Orginally written by, and copyrighted by, the Anonymous Coders and Junkbusters\r
 Corporation. \r
 .P\r