From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sat, 18 Nov 2006 14:48:02 +0000 (+0000)
Subject: Remove xresmini.texi
X-Git-Tag: emacs-pretest-22.0.91~20
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d0d62cd564d672f797fcfb0d5bd74007bdbdbf53;p=emacs.git

Remove xresmini.texi
---

diff --git a/man/ChangeLog b/man/ChangeLog
index e508cc35d0f..14a90826e25 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-18  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* Makefile.in (emacs.dvi): Remove xresmini.texi
+
+	* emacs: Include xresources.texi both for info and dvi.
+
+	* xresources.texi: Merge text from xresmini.texi
+
 2006-11-17  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org.texi: Fix typos.
diff --git a/man/Makefile.in b/man/Makefile.in
index 61f775231ae..5008cfbc593 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -144,7 +144,7 @@ info.dvi: ${INFOSOURCES}
 ../info/emacs: ${EMACSSOURCES}
 	cd $(srcdir); $(MAKEINFO) emacs.texi
 
-emacs.dvi: ${EMACSSOURCES} $(srcdir)/xresmini.texi
+emacs.dvi: ${EMACSSOURCES}
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/emacs.texi
 
 # This target is here so you could easily get the list of the *.texi