# HG changeset patch
# User Kenichi Handa <handa@etlken>
# Date 1271909231 -32400
# Node ID 0a52b1bb9d5130bbf1f89ca03dbf830fda27e886
# Parent  b2c0ce51877e95f8d6246328b6e9492ace738b41# Parent  5568d8fe0e20ecc990bc73726df90b828356904e
merge trunk

diff -r b2c0ce51877e -r 0a52b1bb9d51 doc/emacs/ChangeLog
--- a/doc/emacs/ChangeLog	Thu Apr 22 13:05:26 2010 +0900
+++ b/doc/emacs/ChangeLog	Thu Apr 22 13:07:11 2010 +0900
@@ -1,3 +1,8 @@
+2010-04-21  Glenn Morris  <rgm@gnu.org>
+
+	* calendar.texi (Displaying the Diary, Format of Diary File):
+	Fix external cross-references for TeX format output.
+
 2010-04-18  Chong Yidong  <cyd@stupidchicken.com>
 
 	* programs.texi (Semantic): New node.
diff -r b2c0ce51877e -r 0a52b1bb9d51 doc/emacs/calendar.texi
--- a/doc/emacs/calendar.texi	Thu Apr 22 13:05:26 2010 +0900
+++ b/doc/emacs/calendar.texi	Thu Apr 22 13:07:11 2010 +0900
@@ -1082,7 +1082,7 @@
 shown either in the buffer or in the mode line, depending on the display
 method you choose
 @iftex
-(@pxref{Diary Display,, emacs-xtra}).
+(@pxref{Diary Display,,, emacs-xtra, Specialized Emacs Features}).
 @end iftex
 @ifnottex
 (@pxref{Diary Display}).
@@ -1186,7 +1186,7 @@
 This entry will have a different appearance if you use the simple diary
 display
 @iftex
-(@pxref{Diary Display,, emacs-xtra}).
+(@pxref{Diary Display,,, emacs-xtra, Specialized Emacs Features}).
 @end iftex
 @ifnottex
 (@pxref{Diary Display}).