merge with 1.10s

diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index e9b8306ded2fe27ebb6a586db8c5cb8b100bde29..bd0196c2253bfefaf2215187e350e4a030f98d98 100644 (file)
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -24,7 +24,7 @@
 
 % This automatically updates the version number based on RCS.
 \def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}}
-\deftexinfoversion$Revision: 1.3 $
+\deftexinfoversion$Revision: 1.4 $
 \message{Loading texinfo package [Version \texinfoversion]:}
 
 % Print the version number if in a .fmt file.
@@ -359,6 +359,15 @@
 % @. is an end-of-sentence period.
 \def\.{.\spacefactor=3000 }
 
+% @enddots{} is an end-of-sentence ellipsis.
+\gdef\enddots{$\mathinner{\ldotp\ldotp\ldotp\ldotp}$\spacefactor=3000}
+
+% @! is an end-of-sentence bang.
+\gdef\!{!\spacefactor=3000 }
+
+% @? is an end-of-sentence query.
+\gdef\?{?\spacefactor=3000 }
+
 % @w prevents a word break.  Without the \leavevmode, @w at the
 % beginning of a paragraph, when TeX is still in vertical mode, would
 % produce a whole line of output instead of starting the paragraph.
@@ -616,9 +625,11 @@ where each line of input produces a line of output.}
 %
 \def\ignore{\doignore{ignore}}
 
-% Also ignore @ifinfo, @menu, and @direntry text.
+% Also ignore @ifinfo, @ifhtml, @html, @menu, and @direntry text.
 %
 \def\ifinfo{\doignore{ifinfo}}
+\def\ifhtml{\doignore{ifhtml}}
+\def\html{\doignore{html}}
 \def\menu{\doignore{menu}}
 \def\direntry{\doignore{direntry}}
 

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index 60dc2f6ba0549914959c7ce84d0ee2da2d529e9a..7739a4e2b177a87f0342e2be7653acd7729a16a1 100644 (file)
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -1,3 +1,16 @@
+Mon Oct 17 23:55:41 1994  Jim Meyering  (meyering@comco.com)
+
+       * doc/Makefile.in (install): Install the info files from either
+       the source directory or the object directory.
+       From Ian Lance Taylor (ian@cygnus.com).
+
+Sun Oct 16 12:14:02 1994  Jim Meyering  (meyering@comco.com)
+
+       * lib/Makefile.in (distclean): Don't delete getdate.c and posixtm.c
+       here since they are not distributed.
+       (realclean): Delete them here instead.
+       From Francois Pinard.
+
 Mon Oct 10 21:44:42 1994  Jim Meyering  (meyering@comco.com)
 
        * id.c (print_group_list, print_full_info): Use more precise
@@ -67,7 +80,7 @@ Sat Oct 01 00:14:10 1994  Jim Meyering  (meyering@comco.com)
        this one.  Don't include <config.h> either.
        * safe-xstat.cin: Include <sys/types.h> and <sys/stat.h> here instead.
        Include <config.h> here, too.
-       Kaveh Gahzi reported this problem.
+       Kaveh Ghazi reported this problem.
 
 Fri Sep 30 22:40:21 1994  Jim Meyering  (meyering@comco.com)