aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2008-07-19 08:54:28 +0000
committerAndreas Schwab2008-07-19 08:54:28 +0000
commit568beaa25328d4045fa4aaef5c773f2f741d1f59 (patch)
tree09249c9ea07ba91d23d9fa14a23542c9aa2ba452
parenta5e1066d8363c6642952a3a4ac0a84e7c4deb7ed (diff)
downloademacs-568beaa25328d4045fa4aaef5c773f2f741d1f59.tar.gz
emacs-568beaa25328d4045fa4aaef5c773f2f741d1f59.zip
* ns-emacs.texi: Moved from ../emacs. Add @direntry.
* Makefile.in (INFO_TARGETS, DVI_TARGETS): Add ns-emacs. (ns-emacs, $(infodir)/ns-emacs, ns-emacs.dvi): New rules. * ns-emacs.texi: Move to ../misc.
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/misc/ChangeLog7
-rw-r--r--doc/misc/Makefile.in8
-rw-r--r--doc/misc/ns-emacs.texi (renamed from doc/emacs/ns-emacs.texi)7
4 files changed, 25 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 981522d996b..3306e285450 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12008-07-19 Andreas Schwab <schwab@suse.de>
2
3 * ns-emacs.texi: Move to ../misc.
4
12008-07-15 Chong Yidong <cyd@stupidchicken.com> 52008-07-15 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * entering.texi (Exiting): Don't describe text-only terminals as the 7 * entering.texi (Exiting): Don't describe text-only terminals as the
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 6df3f5b19a6..9385d494392 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
12008-07-19 Andreas Schwab <schwab@suse.de>
2
3 * ns-emacs.texi: Moved from ../emacs. Add @direntry.
4
5 * Makefile.in (INFO_TARGETS, DVI_TARGETS): Add ns-emacs.
6 (ns-emacs, $(infodir)/ns-emacs, ns-emacs.dvi): New rules.
7
12008-07-18 Michael Albinus <michael.albinus@gmx.de> 82008-07-18 Michael Albinus <michael.albinus@gmx.de>
2 9
3 * dbus.texi (Inspection): Rework, introduce submenus. 10 * dbus.texi (Inspection): Rework, introduce submenus.
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 24deea88f32..ab357fc31dc 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -60,6 +60,7 @@ INFO_TARGETS = \
60 $(infodir)/message \ 60 $(infodir)/message \
61 $(infodir)/mh-e \ 61 $(infodir)/mh-e \
62 $(infodir)/newsticker \ 62 $(infodir)/newsticker \
63 $(infodir)/ns-emacs \
63 $(infodir)/nxml-mode \ 64 $(infodir)/nxml-mode \
64 $(infodir)/org \ 65 $(infodir)/org \
65 $(infodir)/pcl-cvs \ 66 $(infodir)/pcl-cvs \
@@ -104,6 +105,7 @@ DVI_TARGETS = \
104 message.dvi \ 105 message.dvi \
105 mh-e.dvi \ 106 mh-e.dvi \
106 newsticker.dvi \ 107 newsticker.dvi \
108 ns-emacs.dvi \
107 nxml-mode.dvi \ 109 nxml-mode.dvi \
108 org.dvi \ 110 org.dvi \
109 pcl-cvs.dvi \ 111 pcl-cvs.dvi \
@@ -296,6 +298,12 @@ $(infodir)/newsticker: newsticker.texi
296newsticker.dvi: newsticker.texi 298newsticker.dvi: newsticker.texi
297 $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi 299 $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
298 300
301ns-emacs : $(infodir)/ns-emacs
302$(infodir)/ns-emacs: ns-emacs.texi
303 cd $(srcdir); $(MAKEINFO) ns-emacs.texi
304ns-emacs.dvi: ns-emacs.texi
305 $(ENVADD) $(TEXI2DVI) ${srcdir}/ns-emacs.texi
306
299nxml-mode : $(infodir)/nxml-mode 307nxml-mode : $(infodir)/nxml-mode
300$(infodir)/nxml-mode: nxml-mode.texi 308$(infodir)/nxml-mode: nxml-mode.texi
301 cd $(srcdir); $(MAKEINFO) nxml-mode.texi 309 cd $(srcdir); $(MAKEINFO) nxml-mode.texi
diff --git a/doc/emacs/ns-emacs.texi b/doc/misc/ns-emacs.texi
index 9a5c50d92de..e4d0f9951d6 100644
--- a/doc/emacs/ns-emacs.texi
+++ b/doc/misc/ns-emacs.texi
@@ -1,8 +1,13 @@
1\input texinfo @c -*-texinfo-*- 1\input texinfo @c -*-texinfo-*-
2 2
3@setfilename ../info/ns-emacs 3@setfilename ../../info/ns-emacs
4@settitle Emacs.app 4@settitle Emacs.app
5 5
6@dircategory Emacs
7@direntry
8* NS-Emacs: (ns-emacs). Emacs.app for GNUstep and MacOS X.
9@end direntry
10
6@iftex 11@iftex
7@finalout 12@finalout
8@end iftex 13@end iftex