1 files changed, 15 insertions, 13 deletions

diff --git a/www/docs/Makefile b/www/docs/Makefile
index dc91c41cc5..e78300d0ea 100644
--- a/www/docs/Makefile
+++ b/www/docs/Makefile
@@ -3,7 +3,9 @@ ACTION=@echo preprocessing $@; rm -f $@; $(HOME)/bin/fcpp -WWW -I.. -Uunix -H -C
 
 SRC := $(wildcard *.t)
 OBJS := $(SRC:%.t=%.html)
-TXT2PLAIN = ../txt2plain.pl
+
+FAQ2HTML = ../faq2html.pl
+TXT2HTML = ../txt2html.pl
 
 # This is correct.  It does point to ../../docs but we need a different
 # name so that the directories don't collide.
@@ -11,28 +13,28 @@ DOCS = ../docs_
 
 all: $(OBJS)
 
-faq.raw: $(DOCS)/FAQ $(TXT2PLAIN)
-        $(TXT2PLAIN) < $< > $@
+faq.raw: $(DOCS)/FAQ $(FAQ2HTML)
+        $(FAQ2HTML) < $< > $@
 
-faq.html: faq.t faq.raw $(TXT2PLAIN)
+faq.html: faq.t faq.raw $(FAQ2HTML)
         $(ACTION) $<
 
-battery-faq.raw: $(DOCS)/BATTERY-FAQ $(TXT2PLAIN)
-        $(TXT2PLAIN) < $< > $@
+battery-faq.raw: $(DOCS)/BATTERY-FAQ $(FAQ2HTML)
+        $(FAQ2HTML) < $< > $@
 
-battery-faq.html: battery-faq.t battery-faq.raw $(TXT2PLAIN)
+battery-faq.html: battery-faq.t battery-faq.raw $(FAQ2HTML)
         $(ACTION) $<
 
-contributing.raw: $(DOCS)/CONTRIBUTING $(TXT2PLAIN)
-        $(TXT2PLAIN) < $< > $@
+contributing.raw: $(DOCS)/CONTRIBUTING $(TXT2HTML)
+        $(TXT2HTML) < $< > $@
 
-contributing.html: contributing.t contributing.raw $(TXT2PLAIN)
+contributing.html: contributing.t contributing.raw $(TXT2HTML)
         $(ACTION) $<
 
-custom_wps_format.raw: $(DOCS)/CUSTOM_WPS_FORMAT $(TXT2PLAIN)
-        $(TXT2PLAIN) < $< > $@
+custom_wps_format.raw: $(DOCS)/CUSTOM_WPS_FORMAT $(TXT2HTML)
+        $(TXT2HTML) < $< > $@
 
-custom_wps_format.html: custom_wps_format.t custom_wps_format.raw $(TXT2PLAIN)
+custom_wps_format.html: custom_wps_format.t custom_wps_format.raw $(TXT2HTML)
         $(ACTION) $<
 
 %.html : %.t