ChangeLog:

2008-02-26  Peter Breitenlohner <address@hidden>

	* util/texi2dvi: slightly reformat usage message for help2man.
	Patch from: Brendan O'Dea <address@hidden>,
	Tue, 26 Feb 2008 11:04:42 +1100

	* doc/texi2dvi.1: regenerated.

==============================

diff -ur texinfo-4.11.90.orig/doc/texi2dvi.1 texinfo-4.11.90/doc/texi2dvi.1
--- texinfo-4.11.90.orig/doc/texi2dvi.1	2008-02-23 00:35:14.000000000 +0100
+++ texinfo-4.11.90/doc/texi2dvi.1	2008-02-26 11:43:55.000000000 +0100
@@ -116,44 +116,39 @@
 .TP
 `local'
 compile in the current directory, leaving all the auxiliary
-.TP
-files around.
-This is the traditional TeX use.
+files around.  This is the traditional TeX use.
 .TP
 `tidy'
 compile in a local *.t2d directory, where the auxiliary files
-.TP
-are left.
-Output files are copied back to the original file.
+are left.  Output files are copied back to the original file.
 .TP
 `clean'
 same as `tidy', but remove the auxiliary directory afterwards.
-.IP
 Every compilation therefore requires the full cycle.
 .SS "Using the `tidy' mode brings several advantages:"
-.IP
-\- the current directory is not cluttered with plethora of temporary files.
-\- clutter can be even reduced using \fB\-\-build\-dir\fR=\fIdir\fR: all the *.t2d
-.IP
+.TP
+\-
+the current directory is not cluttered with plethora of temporary files.
+.TP
+\-
+clutter can be even reduced using \fB\-\-build\-dir\fR=\fIdir\fR: all the *.t2d
 directories are stored there.
-.IP
-\- clutter can be reduced to zero using,e.g., \fB\-\-build\-dir=\fR/tmp/$USER.t2d or
-.HP
+.TP
+\-
+clutter can be reduced to zero using,e.g., \fB\-\-build\-dir=\fR/tmp/$USER.t2d or
 \fB\-\-build\-dir=\fR$HOME/.t2d.
-.IP
-\- the output file is updated after every succesful TeX run, for
 .TP
-sake of concurrent visualization of the output.
-In a `local' build
-.IP
+\-
+the output file is updated after every succesful TeX run, for
+sake of concurrent visualization of the output.  In a `local' build
 the viewer stops during the whole TeX run.
-.IP
-\- if the compilation fails, the previous state of the output file
-.IP
+.TP
+\-
+if the compilation fails, the previous state of the output file
 is preserved.
-.IP
-\- PDF and DVI compilation are kept in separate subdirectories
-.IP
+.TP
+\-
+PDF and DVI compilation are kept in separate subdirectories
 preventing any possibility of auxiliary file incompatibility.
 .PP
 On the other hand, because `tidy' compilation takes place in another
diff -ur texinfo-4.11.90.orig/util/texi2dvi texinfo-4.11.90/util/texi2dvi
--- texinfo-4.11.90.orig/util/texi2dvi	2008-02-23 00:35:06.000000000 +0100
+++ texinfo-4.11.90/util/texi2dvi	2008-02-26 11:43:46.000000000 +0100
@@ -105,25 +105,25 @@
 
 Valid MODEs are:
   \`local'      compile in the current directory, leaving all the auxiliary
-		 files around.  This is the traditional TeX use.
+	       files around.  This is the traditional TeX use.
   \`tidy'       compile in a local *.t2d directory, where the auxiliary files
-		 are left.  Output files are copied back to the original file.
+	       are left.  Output files are copied back to the original file.
   \`clean'      same as \`tidy', but remove the auxiliary directory afterwards.
-		 Every compilation therefore requires the full cycle.
+	       Every compilation therefore requires the full cycle.
 
 Using the \`tidy' mode brings several advantages:
-  - the current directory is not cluttered with plethora of temporary files.
-  - clutter can be even reduced using --build-dir=dir: all the *.t2d
-    directories are stored there.
-  - clutter can be reduced to zero using,e.g., --build-dir=/tmp/\$USER.t2d or
-    --build-dir=\$HOME/.t2d.
-  - the output file is updated after every succesful TeX run, for
-    sake of concurrent visualization of the output.  In a \`local' build
-    the viewer stops during the whole TeX run.
-  - if the compilation fails, the previous state of the output file
-    is preserved.
-  - PDF and DVI compilation are kept in separate subdirectories
-    preventing any possibility of auxiliary file incompatibility.
+  -   the current directory is not cluttered with plethora of temporary files.
+  -   clutter can be even reduced using --build-dir=dir: all the *.t2d
+      directories are stored there.
+  -   clutter can be reduced to zero using,e.g., --build-dir=/tmp/\$USER.t2d or
+      --build-dir=\$HOME/.t2d.
+  -   the output file is updated after every succesful TeX run, for
+      sake of concurrent visualization of the output.  In a \`local' build
+      the viewer stops during the whole TeX run.
+  -   if the compilation fails, the previous state of the output file
+      is preserved.
+  -   PDF and DVI compilation are kept in separate subdirectories
+      preventing any possibility of auxiliary file incompatibility.
 
 On the other hand, because \`tidy' compilation takes place in another
 directory, occasionally TeX won't be able to find some files (e.g., when