Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org

4 files changed, 193 insertions, 171 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index be79a9d864d..46fea77107b 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,24 @@
+2012-04-14  Alan Mackenzie  <acm@muc.de>
+
+        * cc-mode.texi (c-offsets-alist): Correct a typo.
+
+2012-04-14  Jérémie Courrèges-Anglas  <jca@wxcvbn.org>  (tiny change)
+
+        * org.texi (Deadlines and scheduling): Fix the example: the
+        DEADLINE item should come right after the headline.  We enforce
+        this convention, so it is a bug not to illustrate it correctly in
+        the manual.
+
+2012-04-14  Ippei FURUHASHI  <top.tuna+orgmode@gmail.com>  (tiny change)
+
+        * org.texi (Agenda commands): Fix documentation bug by swapping
+        the equivalent keybindings to `org-agenda-next-line' with the ones
+        to `org-agenda-previous-line'.
+
+2012-04-14  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in: Replace non-portable use of $< in ordinary rules.
+
 2012-04-09  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 429b84abf8f..390b077bbb0 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -1,6 +1,6 @@
 #### Makefile for documentation other than the Emacs manual.
 
-# Copyright (C) 1994, 1996-2012  Free Software Foundation, Inc.
+# Copyright (C) 1994, 1996-2012 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -227,235 +227,237 @@ pdf: $(PDF_TARGETS)
 # to exist in the build directory.
 # In a distribution of Emacs, the Info files should be up to date.
 
+# Note: "<" is not portable in ordinary make rules.
+
 ## "short" target names for convenience, to just rebuild one manual.
 ada-mode : $(infodir)/ada-mode
 $(infodir)/ada-mode: ada-mode.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ada-mode.texi
 ada-mode.dvi: ${srcdir}/ada-mode.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi
 ada-mode.pdf: ${srcdir}/ada-mode.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/ada-mode.texi
 
 auth : $(infodir)/auth
 $(infodir)/auth: auth.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) auth.texi
 auth.dvi: ${srcdir}/auth.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/auth.texi
 auth.pdf: ${srcdir}/auth.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/auth.texi
 
 autotype : $(infodir)/autotype
 $(infodir)/autotype: autotype.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) autotype.texi
 autotype.dvi: ${srcdir}/autotype.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi
 autotype.pdf: ${srcdir}/autotype.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/autotype.texi
 
 calc : $(infodir)/calc
 $(infodir)/calc: calc.texi $(emacsdir)/emacsver.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) calc.texi
 calc.dvi: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi
 calc.pdf: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/calc.texi
 
 ccmode : $(infodir)/ccmode
 $(infodir)/ccmode: cc-mode.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) cc-mode.texi
 cc-mode.dvi: ${srcdir}/cc-mode.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi
 cc-mode.pdf: ${srcdir}/cc-mode.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/cc-mode.texi
 
 cl : $(infodir)/cl
 $(infodir)/cl: cl.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) cl.texi
 cl.dvi: ${srcdir}/cl.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi
 cl.pdf: ${srcdir}/cl.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/cl.texi
 
 dbus : $(infodir)/dbus
 $(infodir)/dbus: dbus.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) dbus.texi
 dbus.dvi: ${srcdir}/dbus.texi
-        $(ENVADD) $(TEXI2DVI) $< 
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/dbus.texi
 dbus.pdf: ${srcdir}/dbus.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/dbus.texi
 
 dired-x : $(infodir)/dired-x
 $(infodir)/dired-x: dired-x.texi $(emacsdir)/emacsver.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) dired-x.texi
 dired-x.dvi: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi
 dired-x.pdf: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/dired-x.texi
 
 ebrowse : $(infodir)/ebrowse
 $(infodir)/ebrowse: ebrowse.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ebrowse.texi
 ebrowse.dvi: ${srcdir}/ebrowse.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi
 ebrowse.pdf: ${srcdir}/ebrowse.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/ebrowse.texi
 
 ede : $(infodir)/ede
 $(infodir)/ede: ede.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ede.texi
 ede.dvi: ${srcdir}/ede.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/ede.texi
 ede.pdf: ${srcdir}/ede.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/ede.texi
 
 ediff : $(infodir)/ediff
 $(infodir)/ediff: ediff.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ediff.texi
 ediff.dvi: ${srcdir}/ediff.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi
 ediff.pdf: ${srcdir}/ediff.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/ediff.texi
 
 edt : $(infodir)/edt
 $(infodir)/edt: edt.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) edt.texi
 edt.dvi: ${srcdir}/edt.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/edt.texi
 edt.pdf: ${srcdir}/edt.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/edt.texi
 
 eieio : $(infodir)/eieio
 $(infodir)/eieio: eieio.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) eieio.texi
 eieio.dvi: ${srcdir}/eieio.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/eieio.texi
 eieio.pdf: ${srcdir}/eieio.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/eieio.texi
 
 emacs-gnutls : $(infodir)/emacs-gnutls
 $(infodir)/emacs-gnutls: emacs-gnutls.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) emacs-gnutls.texi
 emacs-gnutls.dvi: ${srcdir}/emacs-gnutls.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-gnutls.texi
 emacs-gnutls.pdf: ${srcdir}/emacs-gnutls.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-gnutls.texi
 
 emacs-mime : $(infodir)/emacs-mime
 $(infodir)/emacs-mime: emacs-mime.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --enable-encoding $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --enable-encoding emacs-mime.texi
 emacs-mime.dvi: ${srcdir}/emacs-mime.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi
 emacs-mime.pdf: ${srcdir}/emacs-mime.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-mime.texi
 
 epa : $(infodir)/epa
 $(infodir)/epa: epa.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) epa.texi
 epa.dvi: ${srcdir}/epa.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/epa.texi
 epa.pdf: ${srcdir}/epa.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi
 
 erc : $(infodir)/erc
 $(infodir)/erc: erc.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) erc.texi
 erc.dvi: ${srcdir}/erc.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi
 erc.pdf: ${srcdir}/erc.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi
 
 ert : $(infodir)/ert
 $(infodir)/ert: ert.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ert.texi
 ert.dvi: ${srcdir}/ert.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/ert.texi
 ert.pdf: ${srcdir}/ert.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/ert.texi
 
 eshell : $(infodir)/eshell
 $(infodir)/eshell: eshell.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) eshell.texi
 eshell.dvi: ${srcdir}/eshell.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi
 eshell.pdf: ${srcdir}/eshell.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/eshell.texi
 
 eudc : $(infodir)/eudc
 $(infodir)/eudc: eudc.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) eudc.texi
 eudc.dvi: ${srcdir}/eudc.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi
 eudc.pdf: ${srcdir}/eudc.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/eudc.texi
 
 efaq : $(infodir)/efaq
 $(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) faq.texi
 faq.dvi: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi
 faq.pdf: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/faq.texi
 ## This is the name used on the Emacs web-page.
 ## sed fixes up links to point to split version of the manual.
 emacs-faq.html: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) --no-split \
-          --css-ref='/layout.css' --html -o $@ $<
+          --css-ref='/layout.css' --html -o $@ ${srcdir}/faq.texi
         sed -i -e 's|a href="\([a-z]*\)\.html#\([^"]*\)"|a href="manual/html_node/\1/\2.html"|g' \
           -e 's|/Top\.html|/|g' $@
 emacs-faq.text: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
-        $(MAKEINFO) $(MAKEINFO_OPTS) --plaintext -o $@ $<
+        $(MAKEINFO) $(MAKEINFO_OPTS) --plaintext -o $@ ${srcdir}/faq.texi
 
 flymake : $(infodir)/flymake
 $(infodir)/flymake: flymake.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) flymake.texi
 flymake.dvi: ${srcdir}/flymake.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi
 flymake.pdf: ${srcdir}/flymake.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/flymake.texi
 
 forms : $(infodir)/forms
 $(infodir)/forms: forms.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) forms.texi
 forms.dvi: ${srcdir}/forms.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi
 forms.pdf: ${srcdir}/forms.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/forms.texi
 
 # gnus/message/emacs-mime/sieve/pgg are part of Gnus:
 gnus : $(infodir)/gnus
 $(infodir)/gnus: gnus.texi gnus-faq.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) gnus.texi
 gnus.dvi: ${srcdir}/gnus.texi gnus-faq.texi
-        sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi
+        sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
         $(ENVADD) $(TEXI2DVI) gnustmp.texi
         cp gnustmp.dvi $*.dvi
         rm gnustmp.*
 gnus.pdf: ${srcdir}/gnus.texi gnus-faq.texi
-        sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi
+        sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
         $(ENVADD) $(TEXI2PDF) gnustmp.texi
         cp gnustmp.pdf $@
         rm gnustmp.*
@@ -465,11 +467,11 @@ gnus.pdf: ${srcdir}/gnus.texi gnus-faq.texi
 idlwave : $(infodir)/idlwave
 $(infodir)/idlwave: idlwave.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --no-split $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --no-split idlwave.texi
 idlwave.dvi: ${srcdir}/idlwave.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi
 idlwave.pdf: ${srcdir}/idlwave.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/idlwave.texi
 
 # The following target uses an explicit -o switch to work around
 # the @setfilename directive in info.texi, which is required for
@@ -477,227 +479,227 @@ idlwave.pdf: ${srcdir}/idlwave.texi
 ###info : $(infodir)/info   # circular!
 $(infodir)/info: info.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --no-split $< -o $@
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --no-split -o $@ info.texi
 info.dvi: ${srcdir}/info.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
 info.pdf: ${srcdir}/info.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/info.texi
 
 mairix-el : $(infodir)/mairix-el
 $(infodir)/mairix-el: mairix-el.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) mairix-el.texi
 mairix-el.dvi: ${srcdir}/mairix-el.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/mairix-el.texi
 mairix-el.pdf: ${srcdir}/mairix-el.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/mairix-el.texi
 
 message : $(infodir)/message
 $(infodir)/message: message.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) message.texi
 message.dvi: ${srcdir}/message.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi
 message.pdf: ${srcdir}/message.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/message.texi
 
 mh-e : $(infodir)/mh-e
 $(infodir)/mh-e: mh-e.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) mh-e.texi
 mh-e.dvi: ${srcdir}/mh-e.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi
 mh-e.pdf: ${srcdir}/mh-e.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/mh-e.texi
 
 newsticker : $(infodir)/newsticker
 $(infodir)/newsticker: newsticker.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) newsticker.texi
 newsticker.dvi: ${srcdir}/newsticker.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
 newsticker.pdf: ${srcdir}/newsticker.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/newsticker.texi
 
 nxml-mode : $(infodir)/nxml-mode
 $(infodir)/nxml-mode: nxml-mode.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) nxml-mode.texi
 nxml-mode.dvi: ${srcdir}/nxml-mode.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/nxml-mode.texi
 nxml-mode.pdf: ${srcdir}/nxml-mode.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/nxml-mode.texi
 
 org : $(infodir)/org
 $(infodir)/org: org.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) org.texi
 org.dvi: ${srcdir}/org.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi
 org.pdf: ${srcdir}/org.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/org.texi
 
 pcl-cvs : $(infodir)/pcl-cvs
 $(infodir)/pcl-cvs: pcl-cvs.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) pcl-cvs.texi
 pcl-cvs.dvi: ${srcdir}/pcl-cvs.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi
 pcl-cvs.pdf: ${srcdir}/pcl-cvs.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/pcl-cvs.texi
 
 pgg : $(infodir)/pgg
 $(infodir)/pgg: pgg.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) pgg.texi
 pgg.dvi: ${srcdir}/pgg.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi
 pgg.pdf: ${srcdir}/pgg.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/pgg.texi
 
 rcirc : $(infodir)/rcirc
 $(infodir)/rcirc: rcirc.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) rcirc.texi
 rcirc.dvi: ${srcdir}/rcirc.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi
 rcirc.pdf: ${srcdir}/rcirc.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi
 
 reftex : $(infodir)/reftex
 $(infodir)/reftex: reftex.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) reftex.texi
 reftex.dvi: ${srcdir}/reftex.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi
 reftex.pdf: ${srcdir}/reftex.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi
 
 remember : $(infodir)/remember
 $(infodir)/remember: remember.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) remember.texi
 remember.dvi: ${srcdir}/remember.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/remember.texi
 remember.pdf: ${srcdir}/remember.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/remember.texi
 
 sasl : $(infodir)/sasl
 $(infodir)/sasl: sasl.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) sasl.texi
 sasl.dvi: ${srcdir}/sasl.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/sasl.texi
 sasl.pdf: ${srcdir}/sasl.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/sasl.texi
 
 sc : $(infodir)/sc
 $(infodir)/sc: sc.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) sc.texi
 sc.dvi: ${srcdir}/sc.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi
 sc.pdf: ${srcdir}/sc.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/sc.texi
 
 semantic : $(infodir)/semantic
 $(infodir)/semantic: semantic.texi sem-user.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) semantic.texi
 semantic.dvi: ${srcdir}/semantic.texi sem-user.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/semantic.texi
 semantic.pdf: ${srcdir}/semantic.texi sem-user.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/semantic.texi
 
 ses : $(infodir)/ses
 $(infodir)/ses: ses.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ses.texi
 ses.dvi: ${srcdir}/ses.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi
 ses.pdf: ${srcdir}/ses.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/ses.texi
 
 sieve : $(infodir)/sieve
 $(infodir)/sieve: sieve.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) sieve.texi
 sieve.dvi: ${srcdir}/sieve.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi
 sieve.pdf: ${srcdir}/sieve.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/sieve.texi
 
 smtpmail : $(infodir)/smtpmail
 $(infodir)/smtpmail: smtpmail.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) smtpmail.texi
 smtpmail.dvi: ${srcdir}/smtpmail.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi
 smtpmail.pdf: ${srcdir}/smtpmail.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/smtpmail.texi
 
 speedbar : $(infodir)/speedbar
 $(infodir)/speedbar: speedbar.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) speedbar.texi
 speedbar.dvi: ${srcdir}/speedbar.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi
 speedbar.pdf: ${srcdir}/speedbar.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/speedbar.texi
 
 tramp : $(infodir)/tramp
 $(infodir)/tramp: tramp.texi trampver.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) -D emacs $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) -D emacs tramp.texi
 tramp.dvi: ${srcdir}/tramp.texi trampver.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi
 tramp.pdf: ${srcdir}/tramp.texi trampver.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/tramp.texi
 
 url : $(infodir)/url
 $(infodir)/url: url.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) url.texi
 url.dvi: ${srcdir}/url.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi
 url.pdf: ${srcdir}/url.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/url.texi
 
 vip : $(infodir)/vip
 $(infodir)/vip: vip.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) vip.texi
 vip.dvi: ${srcdir}/vip.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi
 vip.pdf: ${srcdir}/vip.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/vip.texi
 
 viper : $(infodir)/viper
 $(infodir)/viper: viper.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) viper.texi
 viper.dvi: ${srcdir}/viper.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi
 viper.pdf: ${srcdir}/viper.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/viper.texi
 
 widget : $(infodir)/widget
 $(infodir)/widget: widget.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) widget.texi
 widget.dvi: ${srcdir}/widget.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi
 widget.pdf: ${srcdir}/widget.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/widget.texi
 
 woman : $(infodir)/woman
 $(infodir)/woman: woman.texi
         $(mkinfodir)
-        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) woman.texi
 woman.dvi: ${srcdir}/woman.texi
-        $(ENVADD) $(TEXI2DVI) $<
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi
 woman.pdf: ${srcdir}/woman.texi
-        $(ENVADD) $(TEXI2PDF) $<
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/woman.texi
 
 
 .PHONY: mostlyclean clean distclean maintainer-clean
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 1a192123c3e..58420bbd99c 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -5195,7 +5195,7 @@ indentation.
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 This section explains the structure and semantics of the style
-variable @code{c-offset-alist}, the principal variable for configuring
+variable @code{c-offsets-alist}, the principal variable for configuring
 indentation.  Details of how to set it up, and its relationship to
 @ccmode{}'s style system are given in @ref{Style Variables}.
 
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index e033a47aa96..67633e1acac 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -4,8 +4,8 @@
 @setfilename ../../info/org
 @settitle The Org Manual
 
-@set VERSION 7.8.07
-@set DATE March 2012
+@set VERSION 7.8.09
+@set DATE April 2012
 
 @c Use proper quote and backtick for code sections in PDF output
 @c Cf. Texinfo manual 14.2
@@ -5698,8 +5698,8 @@ until the entry is marked DONE.  An example:
 
 @example
 *** TODO write article about the Earth for the Guide
-    The editor in charge is [[bbdb:Ford Prefect]]
     DEADLINE: <2004-02-29 Sun>
+    The editor in charge is [[bbdb:Ford Prefect]]
 @end example
 
 You can specify a different lead time for warnings for a specific
@@ -7852,9 +7852,9 @@ the other commands, the cursor needs to be in the desired line.
 @tsubheading{Motion}
 @cindex motion commands in agenda
 @orgcmd{n,org-agenda-next-line}
-Next line (same as @key{up} and @kbd{C-p}).
+Next line (same as @key{down} and @kbd{C-n}).
 @orgcmd{p,org-agenda-previous-line}
-Previous line (same as @key{down} and @kbd{C-n}).
+Previous line (same as @key{up} and @kbd{C-p}).
 @tsubheading{View/Go to Org file}
 @orgcmdkkc{@key{SPC},mouse-3,org-agenda-show-and-scroll-up}
 Display the original location of the item in another window.
@@ -9537,12 +9537,12 @@ the web, while the XOXO format provides a solid base for exchange with a
 broad range of other applications.  @LaTeX{} export lets you use Org mode and
 its structured editing functions to easily create @LaTeX{} files.  DocBook
 export makes it possible to convert Org files to many other formats using
-DocBook tools.  OpenDocument Text(ODT) export allows seamless
+DocBook tools.  OpenDocument Text (ODT) export allows seamless
 collaboration across organizational boundaries.  For project management you
 can create gantt and resource charts by using TaskJuggler export.  To
 incorporate entries with associated times like deadlines or appointments into
 a desktop calendar program like iCal, Org mode can also produce extracts in
-the iCalendar format.  Currently Org mode only supports export, not import of
+the iCalendar format.  Currently, Org mode only supports export, not import of
 these different formats.
 
 Org supports export of selected regions when @code{transient-mark-mode} is
@@ -10869,10 +10869,10 @@ one format (say @samp{csv}) to another format (say @samp{ods} or @samp{xls}).
 If you have a working installation of LibreOffice, a document converter is
 pre-configured for you and you can use it right away.  If you would like to
 use @file{unoconv} as your preferred converter, customize the variable
-@code{org-export-odt-convert-process} to point to @code{unoconv}.  If you
-would like to use a converter of your own choosing or tweak the default
-settings of the default @file{LibreOffice} and @samp{unoconv} converters
-@xref{Configuring a document converter}.
+@code{org-export-odt-convert-process} to point to @code{unoconv}.  You can
+also use your own favorite converter or tweak the default settings of the
+@file{LibreOffice} and @samp{unoconv} converters.  @xref{Configuring a
+document converter}.
 
 @subsubsection Automatically exporting to other formats
 @anchor{x-export-to-other-formats}
@@ -11206,7 +11206,7 @@ that the @file{dvipng} program be available on your system.
 
 For various reasons, you may find embedding @LaTeX{} math snippets in an
 ODT document less than reliable.  In that case, you can embed a
-math equation by linking to its MathML(@file{.mml}) source or its
+math equation by linking to its MathML (@file{.mml}) source or its
 OpenDocument formula (@file{.odf}) file as shown below:
 
 @example
@@ -11269,7 +11269,7 @@ Illustration 2: Bell curve
 Export of literal examples (@pxref{Literal examples}) with full fontification
 is supported.  Internally, the exporter relies on @file{htmlfontify.el} to
 generate all style definitions needed for a fancy listing.@footnote{Your
-@file{htmlfontify.el} library must atleast be at Emacs 24.1 levels for
+@file{htmlfontify.el} library must at least be at Emacs 24.1 levels for
 fontification to be turned on.}  The auto-generated styles have @samp{OrgSrc}
 as prefix and inherit their color from the faces used by Emacs
 @code{font-lock} library for the source language.
@@ -11318,10 +11318,9 @@ the variable @code{org-export-odt-convert-processes}.  Also specify how the
 converter can be invoked via command-line to effect the conversion.
 
 @item Configure its capabilities
-@vindex org-export-odt-convert-capabilities
 
+@vindex org-export-odt-convert-capabilities
 @anchor{x-odt-converter-capabilities}
-
 Specify the set of formats the converter can handle by customizing the
 variable @code{org-export-odt-convert-capabilities}.  Use the default value
 for this variable as a guide for configuring your converter.  As suggested by
@@ -11460,7 +11459,7 @@ regular text.
 @end example
 
 @strong{Hint:} To see the above example in action, edit your
-@file{styles.xml}(@pxref{x-orgodtstyles-xml,,Factory styles}) and add a
+@file{styles.xml} (@pxref{x-orgodtstyles-xml,,Factory styles}) and add a
 custom @samp{Highlight} style as shown below.
 
 @example
@@ -11479,7 +11478,7 @@ directive.  For example, to force a page break do the following:
 @end example
 
 @strong{Hint:} To see the above example in action, edit your
-@file{styles.xml}(@pxref{x-orgodtstyles-xml,,Factory styles}) and add a
+@file{styles.xml} (@pxref{x-orgodtstyles-xml,,Factory styles}) and add a
 custom @samp{PageBreak} style as shown below.
 
 @example