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

3 files changed, 15 insertions, 2 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 1e491962d61..00a2ae3ef34 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -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.
diff --git a/man/cmdargs.texi b/man/cmdargs.texi
index 9689782decb..85e0439c44a 100644
--- a/man/cmdargs.texi
+++ b/man/cmdargs.texi
@@ -552,7 +552,7 @@ The name of an interpreter used to parse and execute programs run from
 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
diff --git a/man/mule.texi b/man/mule.texi
index c2f789ec800..812a4d57a1c 100644
--- a/man/mule.texi
+++ b/man/mule.texi
@@ -605,7 +605,13 @@ system; for example, to visit a file encoded in codepage 850, type
 @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