summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2006-11-18 14:48:02 +0000
committerJan Djärv <jan.h.d@swipnet.se>2006-11-18 14:48:02 +0000
commitd0d62cd564d672f797fcfb0d5bd74007bdbdbf53 (patch)
tree90b745c152ca727b2329bc0c5f313b95362a4e35
parentcec910f79a9c4380eb9268706ae7cba6e25be312 (diff)
downloademacs-d0d62cd564d672f797fcfb0d5bd74007bdbdbf53.tar.gz
Remove xresmini.texi
-rw-r--r--man/ChangeLog8
-rw-r--r--man/Makefile.in2
2 files changed, 9 insertions, 1 deletions
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