From 78722efe40dcef6a7fd087e32aae5d0ec88609b2 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 21 Sep 2008 13:24:37 +0000
Subject: [PATCH] Add Roland's man page fixes from 19_manpage_fixup.dpatch.

---
 GNUmakefile.in | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/GNUmakefile.in b/GNUmakefile.in
index db4772e7..e0638332 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.174 2008/07/18 17:50:47 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.175 2008/08/30 12:03:07 fabiankeil Exp $
 #
 # Written by and Copyright (C) 2001 - 2008 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -699,6 +699,11 @@ man: dok-release
 	mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\
 	nsgmls ../privoxy-man-page.sgml  | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\
 	perl -pi.bak -e 's/ <URL:.*>//; s/\[ /\[/g' privoxy.1 ;\
+	perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" privoxy.1; \
+	perl -pi.bak -e "s/ö/\\\\[:o]/g" privoxy.1; \
+	perl -pi.bak -e 's/([ {])-([a-z])/$$1\\-$$2/g' privoxy.1; \
+	perl -pi.bak -e 's/ --([a-z])/ \\-\\-$$1/g' privoxy.1; \
+	perl -pi.bak -e 's/\\fB--/\\fB\\-\\-/g' privoxy.1; \
 	$(DB) ../privoxy-man-page.sgml && $(MV) -f privoxy.1 ../../../privoxy.1
 
 # For those with man2html ala RH7s.
@@ -711,6 +716,7 @@ ifneq ($(MAN2HTML),false)
 # Twice because my version of man2html is pulling in commas and periods in URLs.
 	$(PERL) -pi.bak -e 's/(<A.*),(">)/$$1$$2/g' tmp.html
 	$(PERL) -pi.bak -e 's,\.">,">,g' tmp.html
+	$(PERL) -pi.bak -e "s/\['a\]/\&aacute;/g;s/\['e\]/\&eacute;/g" tmp.html
 # Get rid of spurious  from conversion. (How to do this with perl?)
 	$(SED) -e 's///g' tmp.html > doc/webserver/man-page/privoxy-man-page.html && $(RM) tmp.*
 else
@@ -1308,6 +1314,9 @@ coffee:
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.175  2008/08/30 12:03:07  fabiankeil
+# Remove FEATURE_COOKIE_JAR.
+#
 # Revision 1.174  2008/07/18 17:50:47  fabiankeil
 # Fix whitespace.
 #
-- 
2.50.1