texinfo ChangeLog doc/info-stnd.texi info/info.c

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/03/19 01:00:28

Modified files:
        .              : ChangeLog 
        doc            : info-stnd.texi 
        info           : info.c 

Log message:
        wording tweaks

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1035&r2=1.1036
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/info-stnd.texi?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/info.c?cvsroot=texinfo&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1035
retrieving revision 1.1036
diff -u -b -r1.1035 -r1.1036
--- ChangeLog   17 Mar 2010 22:01:04 -0000      1.1035
+++ ChangeLog   19 Mar 2010 01:00:09 -0000      1.1036
@@ -1,9 +1,15 @@
+2010-03-18  Karl Berry  <address@hidden>
+
+       * info/info.c,
+       * doc/info-stnd.texi: English wording.
+
 2010-03-18  Patrice Dumas  <address@hidden>
 
-       * info/nodes.c (info_node_of_file_buffer_tags), info.c, info.h,
-       doc/info-stnd.texi:
-       new switch --strict-node-location to avoid being smart when 
-       searching for nodes.
+       * info/nodes.c (info_node_of_file_buffer_tags),
+       * info.c,
+       * info.h,
+       * doc/info-stnd.texi: new switch --strict-node-location to avoid
+       being smart when searching for nodes.
 
 2010-03-17  Karl Berry  <address@hidden>
 

Index: doc/info-stnd.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/info-stnd.texi,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- doc/info-stnd.texi  17 Mar 2010 22:01:05 -0000      1.28
+++ doc/info-stnd.texi  19 Mar 2010 01:00:18 -0000      1.29
@@ -1,5 +1,5 @@
 vb\input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: info-stnd.texi,v 1.28 2010/03/17 22:01:05 pertusus Exp $
address@hidden $Id: info-stnd.texi,v 1.29 2010/03/19 01:00:18 karl Exp $
 @c We must \input texinfo.tex instead of texinfo, otherwise make
 @c distcheck in the Texinfo distribution fails, because the texinfo Info
 @c file is made first, and texi2dvi must include . first in the path.
@@ -18,7 +18,7 @@
 Texinfo source files).
 
 Copyright @copyright{} 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002,
-2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -308,12 +308,13 @@
 persons to catch the output and convert it to audible speech.
 
 @item --strict-node-location 
-This option causes Info not to search around when locating a node, and 
-instead sticks to the information provided in the tag table in the info 
-file. In general it is advisable not to use this option, since a 
-malformed info file will become useless even if it is only slightly
-incorrect. The main use for this option is to be able to check that 
-node locations are correctly setup in an info manual.
+This option causes Info not to search ``nearby'' to locate nodes, and 
+instead strictly use the information provided in the Info 
+file.  The practical use for this option is in debugging programs
+that write Info files, to check that they are outputting the correct
+locations.  Due to various bugs and malfeasances in various Info
+writing programs over the years and versions, it is not advisable to
+ever use this option when just trying to read documentation.
 
 @item --subnodes
 @cindex @code{--subnodes}, command line option

Index: info/info.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/info.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- info/info.c 17 Mar 2010 22:01:05 -0000      1.34
+++ info/info.c 19 Mar 2010 01:00:24 -0000      1.35
@@ -1,8 +1,8 @@
 /* info.c -- Display nodes of Info files in multiple windows.
-   $Id: info.c,v 1.34 2010/03/17 22:01:05 pertusus Exp $
+   $Id: info.c,v 1.35 2010/03/19 01:00:24 karl Exp $
 
    Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+   2004, 2005, 2007, 2008, 2009, 2010 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
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-   Originally written by Brian Fox (address@hidden). */
+   Originally written by Brian Fox.  */
 
 #include "info.h"
 #include "indices.h"
@@ -632,7 +632,7 @@
 #endif
 
   puts (_("\
-      --strict-node-location   locate nodes without any searching.\n\
+      --strict-node-location   (for debugging) use Info file pointers as-is.\n\
       --subnodes               recursively output menu items.\n\
       --vi-keys                use vi-like and less-like key bindings.\n\
       --version                display version information and exit.\n\