APPROVE COMMIT 21.5
Index: man/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v
retrieving revision 1.294
diff -u -U0 -r1.294 ChangeLog
--- man/ChangeLog 14 Mar 2005 03:03:11 -0000 1.294
+++ man/ChangeLog 15 Mar 2005 06:13:35 -0000
@@ -0,0 +1,6 @@
+2005-03-15 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * internals/internals.texi (The XEmacs Split):
+ * standards.texi (Option Table):
+ Shut up makeinfo and hack-local-variables.
+
Index: man/standards.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/standards.texi,v
retrieving revision 1.5
diff -u -r1.5 standards.texi
--- man/standards.texi 12 Apr 2001 18:22:00 -0000 1.5
+++ man/standards.texi 15 Mar 2005 06:13:42 -0000
@@ -2,7 +2,8 @@
@c %**start of header
@setfilename ../info/standards.info
@settitle GNU Coding Standards
-@c This date is automagically updated when you save this file:
+@c In GNU Emacs, this date is automagically updated when this file is
+@c saved, but in XEmacs you must set it when synching:
@set lastupdate February 21, 2001
@c %**end of header
@@ -1676,8 +1677,8 @@
@samp{-q} in Make.
@item quiet
-Used in many programs to inhibit the usual output. @strong{Note:} every
-program accepting @samp{--quiet} should accept @samp{--silent} as a
+Used in many programs to inhibit the usual output. @strong{Every
+program accepting @samp{--quiet}} should accept @samp{--silent} as a
synonym.
@item quiet-unshar
@@ -1791,8 +1792,8 @@
@item silent
Used in many programs to inhibit the usual output.
-@strong{Note:} every program accepting
-@samp{--silent} should accept @samp{--quiet} as a synonym.
+@strong{Every program accepting
+@samp{--silent}} should accept @samp{--quiet} as a synonym.
@item size
@samp{-s} in @code{ls}.
@@ -3645,10 +3646,3 @@
@contents
@bye
-Local variables:
-update-date-leading-regexp: "@c This date is automagically updated when you save
this file:\n@set lastupdate "
-update-date-trailing-regexp: ""
-eval: (load "/gd/gnuorg/update-date.el")
-eval: (add-hook 'write-file-hooks 'update-date)
-compile-command: "make just-standards"
-End:
Index: man/internals/internals.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v
retrieving revision 1.63
diff -u -r1.63 internals.texi
--- man/internals/internals.texi 14 Mar 2005 03:03:18 -0000 1.63
+++ man/internals/internals.texi 15 Mar 2005 06:13:46 -0000
@@ -1871,7 +1871,7 @@
@subheading Ben Wing's attempts
-@strong{NOTE NOTE NOTE}: The following is a @strong{highly} opinionated
+@strong{Nota bene:} The following is a @strong{highly} opinionated
piece written by one of the main authors of XEmacs. This reflects his
opinions, and his only! It is included here because it may help to
clarify some of the issues that are keeping the two versions of Emacs
--
Institute of Policy and Planning Sciences
http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.