changeset 90430:19bee54e2dfc

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 299) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-66
author Miles Bader <miles@gnu.org>
date Wed, 07 Jun 2006 19:47:17 +0000
parents e1bbe296602a (current diff) 6f067fcb9161 (diff)
children 884c305a9799
files man/ChangeLog man/cmdargs.texi man/mule.texi
diffstat 3 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/man/ChangeLog	Wed Jun 07 19:42:49 2006 +0000
+++ b/man/ChangeLog	Wed Jun 07 19:47:17 2006 +0000
@@ -1,3 +1,10 @@
+2006-06-07  Kevin Ryde  <user42@zip.com.au>
+
+	* mule.texi (Coding Systems): Footnote xref "MS-DOS and MULE" in main
+	manual for @ifnottex, but in emacs-extra for @iftex.
+
+	* cmdargs.texi (General Variables): Fix smtpmail xref.
+
 2006-05-18  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* gnus.texi (Saving Articles): Clarify gnus-summary-save-article-mail.
--- a/man/cmdargs.texi	Wed Jun 07 19:42:49 2006 +0000
+++ b/man/cmdargs.texi	Wed Jun 07 19:47:17 2006 +0000
@@ -552,7 +552,7 @@
 inside Emacs.
 @item SMTPSERVER
 The name of the outgoing mail server.  Used by the SMTP library
-(@pxref{Top,,,Sending mail via SMTP,smtpmail}).
+(@pxref{Top,,,smtpmail,Sending mail via SMTP}).
 @cindex background mode, on @command{xterm}
 @item TERM
 The type of the terminal that Emacs is using.  This variable must be
--- a/man/mule.texi	Wed Jun 07 19:42:49 2006 +0000
+++ b/man/mule.texi	Wed Jun 07 19:47:17 2006 +0000
@@ -605,7 +605,13 @@
 @key{RET}}@footnote{
 In the MS-DOS port of Emacs, you need to create a @code{cp@var{nnn}}
 coding system with @kbd{M-x codepage-setup}, before you can use it.
-@xref{MS-DOS and MULE,,,emacs-extra,Specialized Emacs Features}.}.
+@iftex
+@xref{MS-DOS and MULE,,,emacs-extra,Specialized Emacs Features}.
+@end iftex
+@ifnottex
+@xref{MS-DOS and MULE}.
+@end ifnottex
+}.
 
   In addition to converting various representations of non-@acronym{ASCII}
 characters, a coding system can perform end-of-line conversion.  Emacs