* src/preproc/html/pre-html.cpp (usage): Don't describe options but

mention that it should never be called stand-alone.

* tmac/groff_www.man, doc/groff.texinfo, man/groff_font.man,
man/groff_tmac.man, man/groff_out.man, README, README.MinGW,
src/roff/groff/groff.man: Mention -Txhtml.

* man/groff_font.man, man/groff_tmac.man, man/roff.man: Revised.

3 files changed, 25 insertions, 24 deletions

diff --git a/src/libs/libgroff/htmlhint.cpp b/src/libs/libgroff/htmlhint.cpp
index 6ade0777..04b339e4 100644
--- a/src/libs/libgroff/htmlhint.cpp
+++ b/src/libs/libgroff/htmlhint.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001, 2002, 2008 Free Software Foundation, Inc.
      Written by Gaius Mulley (gaius@glam.ac.uk)
 
 This file is part of groff.
@@ -33,11 +33,13 @@ Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA. */
  *  This string is intercepted by pre-grohtml and substituted for
  *  the image name and suppression escapes.
  *
- *  pre-html runs troff twice, once with -Thtml and once with -Tps.
- *  troff -Thtml device driver emits a <src='image'.png> tag
- *  and the postscript device driver works out the min/max limits
- *  of the graphic region.  These region limits are read by pre-html
- *  and an image is generated via troff -Tps -> gs -> png
+ *  pre-html runs troff twice, once with -Thtml (or -Txhtml) and once
+ *  with -Tps.  `troff -Thtml' (and `troff -Txhtml') emits a
+ *  <src='image'.png> tag and the postscript device driver works out
+ *  the min/max limits of the graphic region.  These region limits are
+ *  read by pre-html and an image is generated via
+ *
+ *    troff -Tps -> gs -> png
  */
 
 /*
diff --git a/src/preproc/html/pre-html.cpp b/src/preproc/html/pre-html.cpp
index 1b7112fc..8063a48a 100644
--- a/src/preproc/html/pre-html.cpp
+++ b/src/preproc/html/pre-html.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2007
+/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2007, 2008
  * 	Free Software Foundation, Inc.
  * Written by Gaius Mulley (gaius@glam.ac.uk).
  *
@@ -1552,21 +1552,14 @@ static char_buffer inputFile;
 static void usage(FILE *stream)
 {
   fprintf(stream,
-	  "usage: %s troffname [-Iimage_name] [-Dimage_directory]\n"
-	  "       [-P-o vertical_image_offset] [-P-i image_resolution]\n"
-	  "       [troff flags]\n",
-	  program_name);
-  fprintf(stream,
-	  "    vertical_image_offset (default %d/72 of an inch)\n",
-	  vertical_offset);
-  fprintf(stream,
-	  "    image_resolution (default %d) pixels per inch\n",
-	  image_res);
-  fprintf(stream,
-	  "    image_name is the name of the stem for all images\n"
-	  "    (default is grohtml-<pid>)\n");
-  fprintf(stream,
-	  "    place all png files into image_directory\n");
+    "\n"
+    "This program is not intended to be called stand-alone;\n"
+    "it is part of the groff pipeline to produce HTML output.\n"
+    "\n"
+    "If there is ever the need to call it manually (e.g., for\n"
+    "debugging purposes), add command line option `-V' while calling\n"
+    "the `groff' program to see which arguments are passed to it.\n"
+    "\n");
 }
 
 /*
diff --git a/src/roff/groff/groff.man b/src/roff/groff/groff.man
index ef7d80ce..42290300 100644
--- a/src/roff/groff/groff.man
+++ b/src/roff/groff/groff.man
@@ -407,7 +407,9 @@ TeX DVI format (postprocessor is
 .
 .TP
 html
-HTML output (preprocessors are
+.TQ
+xhtml
+HTML and XHTML output (preprocessors are
 .B @g@soelim
 and
 .BR \%pre-grohtml ,
@@ -1080,6 +1082,10 @@ encoding; see
 .BR unicode (7).
 .
 .TP
+.B xhtml
+XHTML output.
+.
+.TP
 .B X75
 75dpi X Window System output suitable for the previewers
 .BR \%xditview (1x)
@@ -1153,7 +1159,7 @@ for the DVI format,
 .
 .TP
 .BR \%grohtml (@MAN1EXT@)
-for HTML format,
+for HTML and XHTML formats,
 .
 .TP
 .BR grops (@MAN1EXT@)