diff options
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/misc/Makefile.in | 5 | ||||
| -rw-r--r-- | doc/misc/faq.texi | 11 |
3 files changed, 12 insertions, 10 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 93b129a2008..55d89d561b7 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,10 +1,14 @@ 2010-10-09 Glenn Morris <rgm@gnu.org> + * Makefile.in (emacsdir): New variable. + ($(infodir)/efaq): Pass -I $(emacsdir) to makeinfo. + * faq.texi (VER): Replace with EMACSVER from emacsver.texi. + * Makefile.in (.PHONY): Declare info, dvi, pdf and the clean rules. 2010-10-08 Julien Danjou <julien@danjou.info> - * gnus.texi: add mm-shr + * gnus.texi: Add mm-shr. 2010-10-08 Ludovic Courtès <ludo@gnu.org> diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index 6f32483af07..8b4b2c5c01d 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -32,6 +32,9 @@ VPATH=@srcdir@ ## Where the output files go. ## Note that the setfilename command in the .texi files assumes this. infodir=../../info +## Directory with emacsver.texi. +## Currently only used by efaq; could be added to MAKEINFO. +emacsdir = $(srcdir)/../emacs # The makeinfo program is part of the Texinfo distribution. # Use --force so that it generates output even if there are errors. @@ -362,7 +365,7 @@ eudc.pdf: eudc.texi efaq : $(infodir)/efaq $(infodir)/efaq: faq.texi $(infodir) - cd $(srcdir); $(MAKEINFO) faq.texi + cd $(srcdir); $(MAKEINFO) -I $(emacsdir) faq.texi faq.dvi: faq.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi faq.pdf: faq.texi diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi index f4dc0247197..ee5f72ac300 100644 --- a/doc/misc/faq.texi +++ b/doc/misc/faq.texi @@ -4,8 +4,7 @@ @settitle GNU Emacs FAQ @c %**end of header -@c This is used in many places -@set VER 24.0.50 +@include emacsver.texi @c This file is maintained by Romain Francoise <rfrancoise@gnu.org>. @c Feel free to install changes without prior permission (but I'd @@ -67,7 +66,7 @@ This FAQ is maintained as a part of GNU Emacs. If you find any errors, or have any suggestions, please use @kbd{M-x report-emacs-bug} to report them. -This is the version of the FAQ distributed with Emacs @value{VER}, and +This is the version of the FAQ distributed with Emacs @value{EMACSVER}, and mainly describes that version. Although there is some information on older versions, details about very old releases (now only of historical interest) have been removed. If you are interested in this, consult @@ -1010,7 +1009,7 @@ conventions}). @cindex Repository, Emacs @cindex Bazaar repository, Emacs -Emacs @value{VER} is the current version as of this writing. A version +Emacs @value{EMACSVER} is the current version as of this writing. A version number with two components (e.g. @samp{22.1}) indicates a released version; three components indicate a development version (e.g. @samp{23.0.50} is what will eventually become @samp{23.1}). @@ -4479,7 +4478,3 @@ to the end of the @file{*Newsgroup*} buffer. @printindex cp @bye - -@ignore - arch-tag: fee0d62d-06cf-43d8-ac21-123408eaf10f -@end ignore |