texinfo ChangeLog doc/texinfo.txi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/09/01 18:36:01

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 

Log message:
        (Init File Expansion Contexts): edit

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1121&r2=1.1122
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.299&r2=1.300

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1121
retrieving revision 1.1122
diff -u -b -r1.1121 -r1.1122
--- ChangeLog   30 Aug 2010 16:19:08 -0000      1.1121
+++ ChangeLog   1 Sep 2010 18:36:01 -0000       1.1122
@@ -1,3 +1,7 @@
+2010-09-01  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (Init File Expansion Contexts): edit.
+
 2010-08-30  Sergey Poznyakoff  <address@hidden>
 
        * info/indices.c (do_info_index_search, index_entry_exists): Check

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -b -r1.299 -r1.300
--- doc/texinfo.txi     28 Aug 2010 21:40:35 -0000      1.299
+++ doc/texinfo.txi     1 Sep 2010 18:36:01 -0000       1.300
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.299 2010/08/28 21:40:35 karl Exp $
address@hidden $Id: texinfo.txi,v 1.300 2010/09/01 18:36:01 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.
 
@@ -19374,24 +19374,34 @@
 @node Init File Expansion Contexts
 @subsection Init File Expansion Contexts: Normal, Preformatted, String, Math
 
-There are four contexts of interest:
address@hidden Init file expansion contexts
+
+There are four expansion contexts of interest:
+
 @table @emph 
 @item normal context
-In paragraphs, index entries, tables...
address@hidden Normal expansion context
+Paragraphs, index entries, tables, @enddots{}
+
 @item preformatted context
-The preformatted
-context occurs when the spacing between words is kept. This is the
-case, for example, in @code{@@display} or @code{@@example} regions, and in 
-menu comments (@pxref{Menu formatting}). 
-The preformatted regions are usually
-rendered in @code{<pre>} elements in @acronym{HTML}.
address@hidden Preformatted expansion context
+When spaces between words are kept.  For example, within the
address@hidden@@display} (@pxref{display,, @code{@@display}}) and
address@hidden@@example} environments (@pxref{example,, @code{@@example}}), and
+in menu comments (@pxref{Menu formatting}).  The preformatted regions
+are usually rendered using @code{<pre>} elements in HTML.
+
 @item string context
-The string context occurs when rendering strings without formatting elements,
-in comments or titles for example. There are in fact two string contexts,
-one that produces plain text, the other allow for limited formatting,
-typically without any element when producing HTML or XML.
address@hidden String expansion context
+When rendering strings without formatting elements, for example in
+comments (@pxref{Comments}) and titles.  We have two string contexts,
+one that produces plain text, and a second that allows for limited
+formatting, typically without any element when producing HTML or XML.
+
 @item math context
-Currently in @code{@@math}.
address@hidden Math expansion context
+Math (@pxref{math,, @code{@@math}}).
+
 @end table
 
 
@@ -24436,7 +24446,7 @@
 (@url{http://www.gnu.org/software/rcs}) version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.299 2010/08/28 21:40:35 karl Exp $
+$Id: texinfo.txi,v 1.300 2010/09/01 18:36:01 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}
@@ -24515,7 +24525,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.299 2010/08/28 21:40:35 karl Exp $
address@hidden $Id: texinfo.txi,v 1.300 2010/09/01 18:36:01 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi