(X Resources): Mention Mac OS port.

diff --git a/man/ChangeLog b/man/ChangeLog
index 7471118334abee9469a0ca79edc07467d14fc363..e274f09d8e5dea74d68168df0e82b4cc36589973 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * display.texi (Standard Faces):
+       * faq.texi (Colors on a TTY):
+       * files.texi (Visiting):
+       * frames.texi (Clipboard):
+       * glossary.texi (Glossary) <Clipboard>:
+       * xresources.texi (X Resources): Mention Mac OS port.
+
 2006-02-12  Karl Berry  <karl@gnu.org>
 
        * faq.texi (Emacs for Atari ST): use Sch@"auble instead of the

diff --git a/man/xresources.texi b/man/xresources.texi
index f7947edda171a4d4b3e6af171dd7d8e9e9ff97de..87781da582c54cb9952e7eb5913db7c3ff09fac5 100644 (file)
--- a/man/xresources.texi
+++ b/man/xresources.texi
@@ -8,7 +8,8 @@
   You can customize some X-related aspects of Emacs behavior using X
 resources, as is usual for programs that use X.  On MS-Windows, you
 can customize some of the same aspects using the system registry.
-@xref{MS-Windows Registry}.
+@xref{MS-Windows Registry}.  Likewise, the Mac Carbon port emulates X
+resources using the Preferences system.  @xref{Mac Environment Variables}.
 
   When Emacs is built using an `X toolkit', such as Lucid or LessTif,
 you need to use X resources to customize the appearance of the