branch master updated: * info/info.c (info_short_help): Remove --show-options from option list and examples. Split examples up into smaller strings.

[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 9979b7d9cc * info/info.c (info_short_help): Remove --show-options from 
option list and examples.  Split examples up into smaller strings.
9979b7d9cc is described below

commit 9979b7d9ccf0eee1873ed983cc7ae39a3c5a4a27
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Jan 30 11:15:56 2022 +0000

    * info/info.c (info_short_help): Remove --show-options from
    option list and examples.  Split examples up into smaller strings.
---
 ChangeLog   |  5 +++++
 info/info.c | 37 +++++++++++++++++++++++--------------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cd990b256e..387e9c2d18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-01-28  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * info/info.c (info_short_help): Remove --show-options from
+       option list and examples.  Split examples up into smaller strings.
+
 2022-01-28  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * doc/info-stnd.texi (Invoking Info) <--show-options>:
diff --git a/info/info.c b/info/info.c
index 072782552b..8ce5e47327 100644
--- a/info/info.c
+++ b/info/info.c
@@ -1,6 +1,6 @@
 /* info.c -- Display nodes of Info files in multiple windows.
 
-   Copyright 1993-2021 Free Software Foundation, Inc.
+   Copyright 1993-2022 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1086,6 +1086,9 @@ There is NO WARRANTY, to the extent permitted by law.\n"),
 static void
 info_short_help (void)
 {
+   /* Note: split usage information up into separate strings when usage
+      revised to make it easier for translators. */
+
   printf (_("\
 Usage: %s [OPTION]... [MENU-ITEM...]\n\
 \n\
@@ -1105,9 +1108,6 @@ Frequently-used options:\n\
   -n, --node=NODENAME          specify nodes in first visited Info file\n\
   -o, --output=FILE            output selected nodes to FILE"));
 
-  puts (_("\
-  -O, --show-options, --usage  go to command-line options node"));
-
 #if defined(__MSDOS__) || defined(__MINGW32__)
   puts (_("\
   -b, --speech-friendly        be friendly to speech synthesizers"));
@@ -1128,18 +1128,27 @@ items relative to the initial node visited."));
 
   puts (_("\n\
 For a summary of key bindings, type H within Info."));
+  puts ("");
 
-  puts (_("\n\
-Examples:\n\
-  info                         show top-level dir menu\n\
-  info info-stnd               show the manual for this Info program\n\
-  info emacs                   start at emacs node from top-level dir\n\
-  info emacs buffers           select buffers menu entry in emacs manual\n\
-  info emacs -n Files          start at Files node within emacs manual\n\
-  info '(emacs)Files'          alternative way to start at Files node\n\
-  info --show-options emacs    start at node with emacs' command line 
options\n\
+puts (_("\
+Examples:"));
+
+puts (_("\
+  info                         show top-level dir menu"));
+puts (_("\
+  info info-stnd               show the manual for this Info program"));
+puts (_("\
+  info emacs                   start at emacs node from top-level dir"));
+puts (_("\
+  info emacs buffers           select buffers menu entry in emacs manual"));
+puts (_("\
+  info emacs -n Files          start at Files node within emacs manual"));
+puts (_("\
+  info '(emacs)Files'          alternative way to start at Files node"));
+puts (_("\
   info --subnodes -o out.txt emacs\n\
-                               dump entire emacs manual to out.txt\n\
+                               dump entire emacs manual to out.txt"));
+puts (_("\
   info -f ./foo.info           show file ./foo.info, not searching dir"));
 
   puts ("");