[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo ChangeLog NEWS doc/.cvsignore doc/texin...
|
From: |
Karl Berry |
|
Subject: |
texinfo ChangeLog NEWS doc/.cvsignore doc/texin... |
|
Date: |
Fri, 20 Jan 2012 18:00:59 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Karl Berry <karl> 12/01/20 18:00:59
Modified files:
. : ChangeLog NEWS
doc : .cvsignore texinfo.txi texinfo.tex
info-stnd.texi
Log message:
refer to whole manuals
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1313&r2=1.1314
http://cvs.savannah.gnu.org/viewcvs/texinfo/NEWS?cvsroot=texinfo&r1=1.209&r2=1.210
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/.cvsignore?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.413&r2=1.414
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.tex?cvsroot=texinfo&r1=1.359&r2=1.360
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/info-stnd.texi?cvsroot=texinfo&r1=1.35&r2=1.36
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1313
retrieving revision 1.1314
diff -u -b -r1.1313 -r1.1314
--- ChangeLog 19 Jan 2012 20:38:10 -0000 1.1313
+++ ChangeLog 20 Jan 2012 18:00:56 -0000 1.1314
@@ -1,3 +1,15 @@
+2012-01-20 Karl Berry <address@hidden>
+
+ * doc/NEWS: new convention to allow referring to a whole manual
+ without a node: a five-arg xref with either just Top or no node name.
+ * doc/texinfo.txi (Top Node Naming): document it.
+ (Four or Five Arguments): refer to it.
+ Also use that new feature throughout, and assorted other cleanups.
+ * doc/texinfo.tex (\xrefX): implement it.
+ (\topbox, \printedrefnamebox, \printedmanualbox): use these
+ named boxes instead of numeric ones.
+ * doc/info-stnd.texi: refer to whole manuals.
+
2012-01-18 Patrice Dumas <address@hidden>
* configure.ac, Makefile.am (SUBDIRS), Pod-Simple-Texinfo: add a
Index: NEWS
===================================================================
RCS file: /sources/texinfo/texinfo/NEWS,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -b -r1.209 -r1.210
--- NEWS 3 Jan 2012 18:26:57 -0000 1.209
+++ NEWS 20 Jan 2012 18:00:57 -0000 1.210
@@ -1,9 +1,9 @@
-$Id: NEWS,v 1.209 2012/01/03 18:26:57 karl Exp $
+$Id: NEWS,v 1.210 2012/01/20 18:00:57 karl Exp $
This NEWS file records noteworthy changes, very tersely.
See the manual for detailed information.
Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
@@ -39,6 +39,8 @@
. new commands for Texinfo special characters:
@atchar{} @lbracechar{} @rbracechar{} @backslashchar{} @hashchar{}.
. new command @errormsg to report an error.
+ . five-argument xrefs can refer to a whole manual, by omitting the
+ section name and specifying Top for the node name, or omitting it.
. #line directives are recognized.
. DEL (0x7f = 0177 = 127) is a true comment character (catcode 14 in TeX).
@@ -55,8 +57,8 @@
supported, and extensive customization of the HTML output is possible.
See xxx in the manual for more about this reimplementation.
- The new program is unfortunately noticeably slower at present than the
- C program was. We hope all the many improvements make the change
+ The new program is, unfortunately, noticeably slower at present than
+ the C program was. We hope all the many improvements make the change
worthwhile nevertheless.
* texinfo.tex:
Index: doc/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/doc/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- doc/.cvsignore 2 May 2010 18:51:19 -0000 1.11
+++ doc/.cvsignore 20 Jan 2012 18:00:57 -0000 1.12
@@ -24,6 +24,8 @@
texinfo-*
texinfo.??
texinfo.??s
+texinfo.txicmd
+texinfo.txicmds
texinfo.aux
texinfo.dvi
texinfo.html
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -b -r1.413 -r1.414
--- doc/texinfo.txi 19 Jan 2012 01:41:17 -0000 1.413
+++ doc/texinfo.txi 20 Jan 2012 18:00:58 -0000 1.414
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.413 2012/01/19 01:41:17 karl Exp $
address@hidden $Id: texinfo.txi,v 1.414 2012/01/20 18:00:58 karl Exp $
@c Ordinarily, Texinfo files have the extension .texi. But texinfo.texi
@c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
@@ -938,8 +938,8 @@
format is output by the @TeX{} typesetting program
(@uref{http://tug.org}). This is then read by a DVI `driver', which
writes the actual device-specific commands that can be viewed or
-printed, notably Dvips for translation to PostScript (@pxref{Invoking
-Dvips,,, dvips, Dvips}) and Xdvi for viewing on an X display
+printed, notably Dvips for translation to PostScript (@pxref{Top,,,
+dvips, Dvips}) and Xdvi for viewing on an X display
(@uref{http://sourceforge.net/projects/xdvi/}). @xref{Hardcopy}.
Be aware that the Texinfo language is very different from and much
@@ -3200,7 +3200,7 @@
publication. If you do use several lines, do not indent any of them
(or anything else in the @code{@@copying} block) in the source file.
address@hidden Notices,,,maintain,GNU Maintainer Information}, for
address@hidden Notices,,, maintain, GNU Maintainer Information}, for
additional information.
@@ -5455,9 +5455,9 @@
Whitespace (including newlines) is ignored after @code{@@anchor}.
Anchor names and node names may not conflict. Anchors and nodes are
-given similar treatment in some ways; for example, the @code{goto-node}
-command in standalone Info takes either an anchor name or a node name as
-an argument. (@xref{goto-node,,,info-stnd,GNU Info}.)
+given similar treatment in some ways; for example, the
address@hidden command takes either an anchor name or a node name as
+an argument. (@xref{Go to node,,, info, Info}.)
Also like node names, anchor names cannot include some characters
(@pxref{Node Line Requirements}).
@@ -6311,8 +6311,7 @@
a fifth argument specifies its title as a printed manual.
Remember that a comma or period must follow the closing brace of an
address@hidden@@xref} command to terminate the cross reference. In the
-following examples, a clause follows a terminating comma.
address@hidden@@xref} command to terminate the cross reference.
@need 800
@noindent
@@ -6326,16 +6325,14 @@
@end example
@need 700
address@hidden
-For example,
address@hidden For example,
@example
@@address@hidden Effects, Lightning, Thunder and Lightning,
weather, An Introduction to address@hidden
@end example
address@hidden
-produces
address@hidden produces this output in Info:
@example
*Note Lightning: (weather)Electrical Effects.
@@ -6363,16 +6360,12 @@
the topic description, will be used as the cross reference name in
Info. For example,
address@hidden 700
address@hidden
-
@example
@@address@hidden Effects, , Thunder and Lightning,
weather, An Introduction to address@hidden
@end example
address@hidden
-produces
address@hidden produces
@example
@group
@@ -6380,8 +6373,7 @@
@end group
@end example
address@hidden
-and
address@hidden and
@quotation
See section ``Thunder and Lightning'' in @cite{An Introduction to
@@ -6393,16 +6385,12 @@
other manual, you may also leave out the section title. In this case,
the node name is used in both instances. For example,
address@hidden 700
address@hidden
-
@example
@@address@hidden Effects,,,
weather, An Introduction to address@hidden
@end example
address@hidden
-produces
address@hidden produces
@example
@group
@@ -6410,20 +6398,22 @@
@end group
@end example
address@hidden
-and
address@hidden and
@quotation
See section ``Electrical Effects'' in @cite{An Introduction to
Meteorology}.
@end quotation
-
-Finally, on rare occasions, you may want to refer to another Info file
-that is within a single printed manual---when multiple Texinfo files
-are incorporated into the same @TeX{} run but make separate Info
-files. In this case, you need to specify only the fourth argument,
-and not the fifth.
+A very unusual case: you may want to refer to another Info file that
+is within a single printed manual---when multiple Texinfo files are
+incorporated into the same @TeX{} run but make separate Info files.
+In this case, you need to specify only the fourth argument, and not
+the fifth.
+
+Finally, it's also allowed to leave out all the arguments
address@hidden the fourth and fifth, to refer to another manual as a
+whole. See the next section.
@node Top Node Naming
@@ -6431,41 +6421,66 @@
@cindex Naming a `Top' Node in references
@cindex @address@hidden node naming for references
-In a cross reference, you must always name a node. This means that in
-order to refer to a whole manual, you must identify the `Top' node by
-writing it as the first argument to the @code{@@xref} command. (This
-is different from the way you write a menu entry; see @ref{Other Info
-Files, , Referring to Other Info Files}.) At the same time, to
-provide a meaningful section topic or title in the printed cross
-reference (instead of the word `Top'), you must write an appropriate
-entry for the third argument to the @code{@@xref} command.
address@hidden
address@hidden Manual, referring to as a whole
address@hidden Referring to an entire manual
address@hidden
-Thus, to make a cross reference to @cite{The GNU Make Manual},
-write:@refill
+Ordinarily, you must always name a node in a cross reference. it's
+not unusual to want to refer to another manual as a whole, rather than
+a particular section within it. In this case, giving any section name
+would just be a distraction.
+
+So, if the first argument is either @samp{Top} (capitalized just that
+way) or omitted entirely, and the third argument is omitted, the
+printed output includes no node or section name. (The Info output
+includes @samp{Top} if it was given.) For example,
+
address@hidden
+@@address@hidden,,, make, The GNU Make address@hidden
address@hidden example
+
address@hidden produces
+
address@hidden
address@hidden
+*Note (make)::Top.
address@hidden group
address@hidden example
+
address@hidden and
+
address@hidden
+See @cite{The GNU Make Manual}.
address@hidden quotation
+
address@hidden Info readers will go to the Top node of the manual whether
+or not the `Top' node is explicitly specified.
+
+It's also acceptable (and is historical practice) to refer to a whole
+manual by specifying the `Top' node and an appropriate entry for the
+third argument to the @code{@@xref} command. Using this idiom, to
+make a cross reference to @cite{The GNU Make Manual}, you would write:
@example
@@address@hidden, , Overview, make, The GNU Make address@hidden
@end example
address@hidden
-which produces
address@hidden which produces
@example
*Note Overview: (make)Top.
@end example
address@hidden
-and
address@hidden and
@quotation
-See section ``Overview'' in @i{The GNU Make Manual}.
+See section ``Overview'' in @cite{The GNU Make Manual}.
@end quotation
@noindent
In this example, @samp{Top} is the name of the first node, and
@samp{Overview} is the name of the first section of the manual.
+(There is no widely-used convention for naming the first section in a
+printed manual, this is just what the Make manual happens to use.)
@node ref
@@ -12755,7 +12770,7 @@
@findex defspec
@item @@defspec @var{name} @address@hidden
The @code{@@defspec} command is the definition command for special
-forms. (In Lisp, a special form is an entity much like a function,
+forms. (In Lisp, a special form is an entity much like a function;
@pxref{Special Forms,,, elisp, GNU Emacs Lisp Reference Manual}.)
@code{@@defspec} is equivalent to @samp{@@deffn @{Special address@hidden
@dots{}} and works like @code{@@defun}.
@@ -13632,7 +13647,7 @@
@cindex Info output, and encoding
In Info output, unless the option @option{--disable-encoding} is given
to @command{makeinfo}, a so-called `Local Variables' section
-(@pxref{File Variables,,,emacs,The GNU Emacs Manual}) is output
+(@pxref{File Variables,,,emacs, The GNU Emacs Manual}) is output
including @var{enc}. This allows Info readers to set the encoding
appropriately.
@@ -15496,7 +15511,7 @@
The @code{tex} formatting command outputs unsorted index files under
names that obey a standard convention: the name of your main input file
with any @samp{.tex} (or similar, @pxref{tex invocation,,, web2c,
-Web2c}) extension removed, followed by the two letter names of indices.
+Web2C}) extension removed, followed by the two letter names of indices.
For example, the raw index output files for the input file
@file{foo.texinfo} would be @file{foo.cp}, @file{foo.vr}, @file{foo.fn},
@file{foo.tp}, @file{foo.pg} and @file{foo.ky}. Those are exactly the
@@ -16098,7 +16113,7 @@
@cindex Dumping a .fmt file
@cindex Format file, dumping
Finally, you may wish to dump a @file{.fmt} file (@pxref{Memory dumps,,,
-web2c, Web2c}) so that @TeX{} can load Texinfo faster. (The
+web2c, Web2C}) so that @TeX{} can load Texinfo faster. (The
disadvantage is that then updating @file{texinfo.tex} requires
redumping.) You can do this by running this command, assuming
@file{epsf.tex} is findable by @TeX{}:
@@ -17020,7 +17035,7 @@
command line.
@item
-Those associated with @@-commands in the document; for example,
+Those associated with @@-commands; for example,
@code{@@documentlanguage}.
@item
@@ -17075,8 +17090,16 @@
@item TEXTCONTENT
@cindex spell checking
@cindex word counting
address@hidden detexinfo
address@hidden stripping Texinfo commands
Output the text content only, stripped of commands; this is useful for
-spell checking or word counting, for example.
+spell checking or word counting, for example. The trivial
address@hidden script setting this is in the @file{util}
+directory of the Texinfo source as an example. It's one line:
+
address@hidden
+exec texi2any --set-init-variable TEXTCONTENT=1 "$@@"
address@hidden example
@end vtable
@@ -17098,10 +17121,11 @@
@@fonttextsize @@footnotestyle @@frenchspacing @@headings
@@kbdinputstyle @@novalidate @@oddfootingmarks
@@oddheadingmarks @@pagesizes @@paragraphindent
-@@setchapternewpage @@setcontentsaftertitlepage @c @@setfilename
+@@setchapternewpage @@setcontentsaftertitlepage
@@setshortcontentsaftertitlepage @@shortcontents
@@urefbreakstyle @@xrefautomaticsectiontitle
@end smallexample
address@hidden @@setfilename
Setting such a configuration variable to a value @samp{foo} is
essentially the same as executing @code{@@@var{cmd} foo}.
@@ -18273,7 +18297,7 @@
@cindex Bzipped dir files, reading
@cindex LZMA-compressed dir files, reading
@cindex Dir files, compressed
-If any input file is compressed with @code{gzip} (@pxref{Top,,,gzip,
+If any input file is compressed with @code{gzip} (@pxref{Top,,, gzip,
Gzip}), @code{install-info} automatically uncompresses it for reading.
And if @var{dir-file} is compressed, @code{install-info} also
automatically leaves it compressed after writing any changes. If
@@ -21575,7 +21599,7 @@
Revision Control System}) or other version control systems, which
expand it into a string such as:
@example
-$Id: texinfo.txi,v 1.413 2012/01/19 01:41:17 karl Exp $
+$Id: texinfo.txi,v 1.414 2012/01/20 18:00:58 karl Exp $
@end example
(This is useful in all sources that use version control, not just manuals.)
You may wish to include the @samp{$Id:} comment in the @code{@@copying}
@@ -21596,7 +21620,7 @@
Automake}). It sets the @samp{VERSION} and @samp{UPDATED} values used
elsewhere. If your distribution doesn't use Automake, but you do use
Emacs, you may find the time-stamp.el package helpful (@pxref{Time
-Stamps,,,emacs,The GNU Emacs Manual}).
+Stamps,,, emacs, The GNU Emacs Manual}).
@item
The @code{@@syncodeindex} command reflects the recommendation to use
@@ -21611,7 +21635,7 @@
@item
The `Invoking' node is a GNU standard to help users find the basic
information about command-line usage of a given program. @xref{Manual
-Structure Details,,,standards, GNU Coding Standards}.
+Structure Details,,, standards, GNU Coding Standards}.
@item
@cindex GNU Free Documentation License, including entire
Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -b -r1.359 -r1.360
--- doc/texinfo.tex 3 Jan 2012 18:26:57 -0000 1.359
+++ doc/texinfo.tex 20 Jan 2012 18:00:59 -0000 1.360
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2012-01-03.09}
+\def\texinfoversion{2012-01-19.16}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2842,8 +2842,8 @@
%
\def\outfmtnametex{tex}
%
-\def\inlinefmt#1{\doinlinefmt #1,\finish}
-\def\doinlinefmt#1,#2,\finish{%
+\long\def\inlinefmt#1{\doinlinefmt #1,\finish}
+\long\def\doinlinefmt#1,#2,\finish{%
\def\inlinefmtname{#1}%
\ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi
}
@@ -2855,8 +2855,8 @@
% well use a command to get a left brace too. We could re-use the
% delimiter character idea from \verb, but it seems like overkill.
%
-\def\inlineraw{\tex \doinlineraw}
-\def\doinlineraw#1{\doinlinerawtwo #1,\finish}
+\long\def\inlineraw{\tex \doinlineraw}
+\long\def\doinlineraw#1{\doinlinerawtwo #1,\finish}
\def\doinlinerawtwo#1,#2,\finish{%
\def\inlinerawname{#1}%
\ifx\inlinerawname\outfmtnametex \ignorespaces #2\fi
@@ -7802,26 +7802,36 @@
\def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]}
\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
\def\ref#1{\xrefX[#1,,,,,,,]}
+%
+\newbox\topbox
+\newbox\printedrefnamebox
+\newbox\printedmanualbox
+%
\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
\unsepspaces
- \def\printedmanual{\ignorespaces #5}%
+ %
\def\printedrefname{\ignorespaces #3}%
- \setbox1=\hbox{\printedmanual\unskip}%
- \setbox0=\hbox{\printedrefname\unskip}%
- \ifdim \wd0 = 0pt
+ \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}%
+ %
+ \def\printedmanual{\ignorespaces #5}%
+ \setbox\printedmanualbox = \hbox{\printedmanual\unskip}%
+ %
+ % If the printed reference name (arg #3) was not explicitly given in
+ % the @xref, figure out what we want to use.
+ \ifdim \wd\printedrefnamebox = 0pt
% No printed node name was explicitly given.
\expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax
- % Use the node name inside the square brackets.
+ % Not auto section-title: use node name inside the square brackets.
\def\printedrefname{\ignorespaces #1}%
\else
- % Use the actual chapter/section title appear inside
- % the square brackets. Use the real section title if we have it.
- \ifdim \wd1 > 0pt
- % It is in another manual, so we don't have it.
+ % Auto section-title: use chapter/section title inside
+ % the square brackets if we have it.
+ \ifdim \wd\printedmanualbox > 0pt
+ % It is in another manual, so we don't have it; use node name.
\def\printedrefname{\ignorespaces #1}%
\else
\ifhavexrefs
- % We know the real title if we have the xref values.
+ % We (should) know the real title if we have the xref values.
\def\printedrefname{\refx{#1-title}{}}%
\else
% Otherwise just copy the Info node name.
@@ -7867,7 +7877,7 @@
\iffloat\Xthisreftitle
% If the user specified the print name (third arg) to the ref,
% print it instead of our usual "Figure 1.2".
- \ifdim\wd0 = 0pt
+ \ifdim\wd\printedrefnamebox = 0pt
\refx{#1-snt}{}%
\else
\printedrefname
@@ -7875,21 +7885,46 @@
%
% if the user also gave the printed manual name (fifth arg), append
% "in MANUALNAME".
- \ifdim \wd1 > 0pt
+ \ifdim \wd\printedmanualbox > 0pt
\space \putwordin{} \cite{\printedmanual}%
\fi
\else
% node/anchor (non-float) references.
%
- % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
- % insert empty discretionaries after hyphens, which means that it will
- % not find a line break at a hyphen in a node names. Since some manuals
- % are best written with fairly long node names, containing hyphens, this
- % is a loss. Therefore, we give the text of the node name again, so it
- % is as if TeX is seeing it for the first time.
- \ifdim \wd1 > 0pt
- \putwordSection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
+ % If we use \unhbox to print the node names, TeX does not insert
+ % empty discretionaries after hyphens, which means that it will not
+ % find a line break at a hyphen in a node names. Since some manuals
+ % are best written with fairly long node names, containing hyphens,
+ % this is a loss. Therefore, we give the text of the node name
+ % again, so it is as if TeX is seeing it for the first time.
+ %
+ % Cross-manual reference. Only include the "Section ``foo'' in" if
+ % the foo is neither missing or Top. Thus, @xref{,,,foo,The Foo Manual}
+ % outputs simply "see The Foo Manual".
+ \ifdim \wd\printedmanualbox > 0pt
+ % What is the 7sp about? The idea is that we also want to omit
+ % the Section part if we would be printing "Top", since they are
+ % clearly trying to refer to the whole manual. But, this being
+ % TeX, we can't easily compare strings while ignoring the possible
+ % spaces before and after in the input. By adding the arbitrary
+ % 7sp, we make it much less likely that a real node name would
+ % happen to have the same width as "Top" (e.g., in a monospaced font).
+ % I hope it will never happen in practice.
+ %
+ % For the same basic reason, we retypeset the "Top" at every
+ % reference, since the current font is indeterminate.
+ %
+ \setbox\topbox = \hbox{Top\kern7sp}%
+ \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
+ \ifdim \wd2 > 7sp
+ \ifdim \wd2 = \wd\topbox \else
+ \putwordSection{} ``\printedrefname'' \putwordin{}\space
+ \fi
+ \fi
+ \cite{\printedmanual}%
\else
+ % Reference in this manual.
+ %
% _ (for example) has to be the character _ for the purposes of the
% control sequence corresponding to the node, but it has to expand
% into the usual \leavevmode...\vrule stuff for purposes of
@@ -7901,7 +7936,7 @@
\setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
\ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
}%
- % output the `[mynode]' via a macro so it can be overridden.
+ % output the `[mynode]' via the macro below so it can be overridden.
\xrefprintnodename\printedrefname
%
% But we always want a comma and a space:
Index: doc/info-stnd.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/info-stnd.texi,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- doc/info-stnd.texi 27 Dec 2011 19:34:17 -0000 1.35
+++ doc/info-stnd.texi 20 Jan 2012 18:00:59 -0000 1.36
@@ -1,24 +1,24 @@
\input texinfo.tex @c -*-texinfo-*-
address@hidden $Id: info-stnd.texi,v 1.35 2011/12/27 19:34:17 karl Exp $
address@hidden $Id: info-stnd.texi,v 1.36 2012/01/20 18:00:59 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.
@comment %**start of header
@setfilename info-stnd.info
@include version-stnd.texi
address@hidden GNU Info @value{VERSION}
address@hidden Stand-alone GNU Info @value{VERSION}
@syncodeindex vr cp
@syncodeindex fn cp
@syncodeindex ky cp
@comment %**end of header
@copying
-This manual is for GNU Info (version @value{VERSION}, @value{UPDATED}),
-a program for viewing documents in Info format (usually created from
-Texinfo source files).
+This manual is for Stand-alone GNU Info (version @value{VERSION},
address@hidden), a program for viewing documents in Info format
+(usually created from Texinfo source files).
Copyright @copyright{} 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002,
-2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
Foundation, Inc.
@quotation
@@ -28,7 +28,7 @@
Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the
license is included in the section entitled ``GNU Free Documentation
-License' in the Texinfo manual.
+License'' in the Texinfo manual.
(a) The FSF's Back-Cover Text is: ``You have the freedom to
copy and modify this GNU manual. Buying copies from the FSF
@@ -43,12 +43,12 @@
@dircategory Texinfo documentation system
@direntry
-* info standalone: (info-stnd). Read Info documents without Emacs.
+* info stand-alone: (info-stnd). Read Info documents without Emacs.
* infokey: (info-stnd)Invoking infokey. Compile Info customizations.
@end direntry
@titlepage
address@hidden GNU Info
address@hidden Stand-alone GNU Info
@subtitle for version @value{VERSION}, @value{UPDATED}
@author Brian J. Fox
@page
@@ -60,14 +60,16 @@
@ifnottex
@node Top
address@hidden GNU Info
address@hidden Stand-alone GNU Info
If you do not know how to use Info, but have a working Info reader,
-you should read the Info manual before this one (@pxref{Top, Getting
-Started,,info, Info}), as it includes more background information and
-a thorough tutorial. This documentation describes the stand-alone Info
-reader that is part of the Texinfo distribution, not the Info reader
-that is part of GNU Emacs.
+you should read the Info manual before this one (@pxref{Top,,, info,
+Info}), as it includes more background information and a thorough
+tutorial.
+
+This documentation describes the stand-alone Info reader that is part
+of the Texinfo distribution, not the Info reader that is part of GNU
+Emacs.
@end ifnottex
@menu
@@ -91,14 +93,16 @@
@node Stand-alone Info
@chapter Stand-alone Info
-The @dfn{Info} program is a stand-alone program, part of the Texinfo
-distribution, which is used to view Info files on an ASCII terminal.
address@hidden files} are typically the result of processing Texinfo files
-with the program @code{makeinfo} (also in the Texinfo distribution)
-
-Texinfo itself is a documentation system that uses a single source
-file to produce both on-line information and printed output. You can
-typeset and print the files that you read in Info.
+The @dfn{Info} program described here is a stand-alone program, part
+of the Texinfo distribution, which is used to view Info files on an
+ASCII terminal. @dfn{Info files} are typically the result of
+processing Texinfo files with the program @code{makeinfo} (also in the
+Texinfo distribution).
+
+Texinfo itself (@pxref{Top,,, texinfo, Texinfo}) is a documentation
+system that uses a single source file to produce both on-line
+information and printed output. You can typeset and print the files
+that you read in Info.
@cindex Emacs Info reader
@cindex Info files, reading in Emacs
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo ChangeLog NEWS doc/.cvsignore doc/texin...,
Karl Berry <=