#1111: Minor updates.

website/Makefile

@@ -151,10 +151,11 @@ update-manpage:
 	| sed -e's/ &lt;<A HREF="mailto.*&gt;//' -e'$$d' | sed -e's/<TABLE>/<TABLE class="table table-striped">/' -e's,<TR VALIGN=top><TD><HR></TD><TD><HR></TD><TD><HR></TD><TD><HR></TD><TD><HR></TD></TR>,,' -e's/<TR VALIGN=top>/<TR>/' -e's,<TR><TD>\([A-Z0-9]*\)</TD>,<TR><TH>\1</TH>,' -e's/<H2>/<H2 class="text-capitalize">/' > var/__manpage__
 
 update-intro:
-	@cp -f ../doc/templates/__intro__ doxygen/draft-intro.html
+# commented for now, until the doc/ intro is updated accordingly
-	@sed -e 's,="makernote.html,="../makernote.html,' \
+#	@cp -f ../doc/templates/__intro__ doxygen/draft-intro.html
-	    doxygen/draft-intro.html > doxygen/intro.html
+#	@sed -e 's,="makernote.html,="../makernote.html,' \
-	@rm -f doxygen/draft-intro.html
+#	    doxygen/draft-intro.html > doxygen/intro.html
+#	@rm -f doxygen/draft-intro.html
 
 update-sample:
 	@./bin/sample.sh

website/README

@@ -20,9 +20,9 @@ Subsequently, 'make clean; make' will remove and rebuild the web
 pages; 'make update' is only needed if something changed in the exiv2
 source or doc.
 
-To build the download page with correct links, dates and checksums (this
+To build the pages with correct version info, download links, dates and
-is a step usually done only during the release process, but you can do it
+checksums (this is a step usually done only during the release
-with the packages from exiv2.org to try):
+process, but you can do it with the packages from exiv2.org to try):
 
 - Copy the release tarball and windows package to website/html/
 - Run 'bin/release_info.sh <version>', <version> must correspond to the
@@ -33,7 +33,7 @@ Dependencies
 ------------
 
 - python
-- doxygen-1.5.4 must be available in the path with this name
+- doxygen
 - xsltproc
 - ps2pdf
 - man2html