From: Luc Teirlinck <teirllm@auburn.edu>
Date: Thu, 9 Dec 2004 01:38:51 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~3353
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=058a9e4fc36a01ddc8fa32aa09456cec82d1d6ec;p=emacs.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 98b95f40532..55b4796edc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2004-12-08  Luc Teirlinck  <teirllm@auburn.edu>
 
-	* Makefile.in (install-arch-indep, uninstall): Add org and url
+	* info/dir (File): Add URL and Org Mode manuals.
+	* Makefile.in (install-arch-indep, uninstall): Add url and org
 	manuals.
 
 2004-12-07  Stefan  <monnier@iro.umontreal.ca>
diff --git a/man/ChangeLog b/man/ChangeLog
index 2d0e1495cbc..6cc03219618 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-08  Luc Teirlinck  <teirllm@auburn.edu>
+
+	* custom.texi (Saving Customizations): Emacs only loads the custom
+	file automatically after the init file in version 21.4 or later.
+	Adapt text and examples to this fact.
+
+	* makefile.w32-in (INFO_TARGETS, DVI_TARGETS, $(infodir)/org)
+	(org.dvi, $(infodir)/url, url.dvi, clean): Add org and url manuals.
+
 2004-12-08  Jay Belanger  <belanger@truman.edu>
 
 	* calc.texi (Starting Calc): Remove comment about installation.