Remove xresmini.texi

diff --git a/man/ChangeLog b/man/ChangeLog
index e508cc35d0f0a2dd44626148b1d1d88b9500db8a..14a90826e250ff2f3261ec5b6ec78e8eafd39007 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-18  Jan Dj\e,Ad\e(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 61f775231ae8262eba462a44f69799f3e1846bfd..5008cfbc593041197b185478123a39cea548064b 100644 (file)
--- 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