branch master updated: Fix usage message

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new a71bd87  Fix usage message
a71bd87 is described below

commit a71bd87964a28a003d5c2037c1ef801f925220e3
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Dec 19 14:05:48 2021 +0000

    Fix usage message
    
    * tp/texi2any.pl (makeinfo_help): Say "columns" instead of
    "characters".  From Dan Jacobson.
---
 ChangeLog      | 12 ++++++++++--
 tp/texi2any.pl |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8daa3b2..63e8a7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,17 @@
 2021-12-19  Gavin Smith  <gavinsmith0123@gmail.com>
 
+       Fix usage message
+
+       * tp/texi2any.pl (makeinfo_help): Say "columns" instead of
+       "characters".  From Dan Jacobson.
+
+2021-12-19  Gavin Smith  <gavinsmith0123@gmail.com>
+
        Fix usage message for help2man formatting
 
-       * tp/texi2any.pl  Change indentation of the message for the
-       -o message so that help2man treats it as a single paragraph.
+       * tp/texi2any.pl (makeinfo_help):
+       Change indentation of the message for the -o message so that
+       help2man treats it as a single paragraph.
        Split up part of the usage message so the text for each option
        can be translated separately.  Report from
        Dan Jacobson <jidanni@jidanni.org> and suggested fix by
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 3be31c9..6a06f1d 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -690,7 +690,7 @@ the behavior is identical, and does not depend on the 
installed name.\n")
       --disable-encoding      do not output accented and special characters
                                 in Info output based on \@documentencoding.
       --enable-encoding       override --disable-encoding (default).
-      --fill-column=NUM       break Info lines at NUM characters (default %d).
+      --fill-column=NUM       break Info lines at NUM columns (default %d).
       --footnote-style=STYLE  output footnotes in Info according to STYLE:
                                 `separate' to put them in their own node;
                                 `end' to put them at the end of the node, in