Ready to ship.

diff --git a/Makefile b/Makefile
index 944ffc5454874a10743f75340816499408a3299f..5d172449058fbddf2e7dad0e65535c4f24481e75 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Makefile for the imgsizer distribution
-VERS=2.1
+VERS=2.2
 
 # These choices are correct for Linux.  Season to taste.
 BINDIR = /usr/bin

diff --git a/README b/README
index 17410dda77578c3253028a046813827327e89642..dca5fa21b3a6377f611983487344eaaef80a312a 100644 (file)
--- a/README
+++ b/README
@@ -15,10 +15,11 @@ Files in this directory:
 Put imgsizer on your execution path and the man page in a man source
 directory somewhere.  That's it.
 
-You will need identify(1) from the ImageMagick tools suite to make this
-work.  If you are using Linux or any of the free BSDs it is probably
-already on your system; otherwise, you should be able to get it from
-ftp://ftp.x.org/contrib/applications/ImageMagick.
+You will need either identify(1) from the ImageMagick tools or
+rdjpgcom(1) and a modern version of file(1) to make this work.  If you
+are using Linux or any of the free BSDs these tools are probably
+already on your system; otherwise, you should be able to get
+identify(1) from ftp://ftp.x.org/contrib/applications/ImageMagick.
 
 Usual open-source terms -- copy, use, and redistribute as you like,
 don't take my name off it, and clearly mark any modified versions.

diff --git a/imgsizer b/imgsizer
index 1b5235ae5468478127c714e9683016561475727e..a7dce2e0418fde94fca5f43f4f1f57028231f113 100755 (executable)
--- a/imgsizer
+++ b/imgsizer
@@ -3,9 +3,7 @@
 # imgsizer -- correct image sizes in WWW pages
 # by Eric S. Raymond <esr@thyrsus.com>
 # 
-# Fix up IMG tags in given documents to contain correct sizes.  No longer
-# requires the identify(1) program from the ImageMagick suite if you have
-# a decent file(1) and rdjpgcom(1).
+# Fix up IMG tags in given documents to contain correct sizes.
 # 
 # Works with Python 1.5.2
 #
@@ -47,7 +45,7 @@
 #
 # Rewritten in Python by Eric S. Raymond <esr@thyrsus.com> 11 July 2001
 #
-#    Time to get rid of the dependency on httpget.  The -l option is cone, too;
+#    Time to get rid of the dependency on httpget.  The -l option is gone, too;
 #    instead, we deduce the right case by looking at the leading tag.  -q
 #    is gone; we always emit without quotes.  -m is gone too, instead we
 #    try commands in least to most expensive order, and notice when a command
@@ -59,7 +57,7 @@
 #
 import sys, os, getopt, cmp, string, re, urllib, commands
 
-version = "2.1, 26 July 2001";
+version = "2.2, 06 September 2001";
 
 splash = """imgsizer version %s, Eric S. Raymond <esr@thyrsus.com>
 See <http://www.tuxedo.org/~esr/software.html> for updates."""

diff --git a/imgsizer.xml b/imgsizer.xml
index 10d7b7a66de4e21bb4822a6df5712f606bb14a99..eeb4ec77954b703ed21f791b00257bcb906eaf37 100644 (file)
--- a/imgsizer.xml
+++ b/imgsizer.xml
@@ -1,4 +1,4 @@
-.TH IMGSIZER 1 "8 Mar 2000"
+.TH IMGSIZER 1 "6 Sep 2001"
 .AT 3
 .SH NAME
 imgsizer \- automatically splice in height and width params for HTML IMG tags
@@ -68,7 +68,7 @@ This script is written in Python, and thus requires a Python interpreter
 on the host system.  It also requires either the 
 .IR identify (1)
 utility distributed in the open-source ImageMagick suite of image-display
-and manipulation tools, or, with the \-\-no\-magick option, a modern
+and manipulation tools, or a modern
 version of
 .IR file (1)
 and