upstream

17 files changed, 1605 insertions, 916 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 6f2b178fcd7..c163683ea39 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,47 @@
+2012-10-01  Eric Ludlam  <zappo@gnu.org>
+
+        * srecode/cc.srt, srecode/ede-autoconf.srt: New files.
+
+        * srecode/cpp.srt: Move parts to c.srt.
+
+        * srecode/ede-make.srt: Extra templates for Arduino Makefiles.
+
+2012-10-01  Ralf Mattes  <rm@mh-freiburg.de>  (tiny change)
+
+        * srecode/el.srt (variable-option): Add missing quote.
+
+2012-10-01  Chong Yidong  <cyd@gnu.org>
+
+        * images/icons/hicolor/32x32/apps/emacs22.png:
+        * images/icons/hicolor/16x16/apps/emacs22.png:
+        * images/icons/hicolor/48x48/apps/emacs22.png:
+        * images/icons/hicolor/24x24/apps/emacs22.png: Remove old icons
+        (Bug#12536).
+
+2012-10-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Revert the FOLLOW-SYMLINKS change for file-attributes.
+        * NEWS: Undo last change.
+
+2012-09-30  Bastien Guerry  <bzg@gnu.org>
+
+        * refcards/orgcard.tex: Update version number.
+
+2012-09-30  Jambunathan K  <kjambunathan@gmail.com>
+
+        * org/OrgOdtContentTemplate.xml:
+        * org/OrgOdtStyles.xml: Add Listing-related entries.
+
+2012-09-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+        file-attributes has a new optional arg FOLLOW-SYMLINKS.
+        * NEWS: Document the change.
+
+2012-09-30  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * NEWS: The NS port supports fullscreen.
+        Mention that the file dialog is used on NS.
+
 2012-09-17  Glenn Morris  <rgm@gnu.org>
 
         * refcards/emacsver.tex: New file.
diff --git a/etc/NEWS b/etc/NEWS
index d860baa014b..577017607cc 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -76,6 +76,7 @@ You can explicitly require a specific version by passing
 
 * Startup Changes in Emacs 24.3
 
++++
 ** Emacs no longer searches for `leim-list.el' files beneath the standard
 lisp/ directory.  There should not be any there anyway.  If you have
 been adding them there, put them somewhere else, eg site-lisp.
@@ -89,10 +90,12 @@ been adding them there, put them somewhere else, eg site-lisp.
 ** minibuffer-electric-default-mode can rewrite (default ...) to [...].
 Just set minibuffer-eldef-shorten-default to t before enabling the mode.
 
++++
 ** Most y-or-n prompts now allow you to scroll the selected window.
 Typing C-v or M-v at a y-or-n prompt scrolls forward or backward
 respectively, without exiting from the prompt.
 
+---
 ** In minibuffer filename prompts, `C-M-f' and `C-M-b' now move to the
 next and previous path separator, respectively.
 
@@ -107,12 +110,14 @@ invokes `set-buffer-file-coding-system'.
 
 ** Help changes
 
++++
 *** `C-h f' (describe-function) can now perform autoloading.
 When this command is called for an autoloaded function whose docstring
 contains a key substitution construct, that function's library is
 automatically loaded, so that the documentation can be shown
 correctly.  To disable this, set `help-enable-auto-load' to nil.
 
+---
 *** `C-h f' now reports previously-autoloaded functions as "autoloaded",
 even after their associated libraries have been loaded (and the
 autoloads have been redefined as functions).
@@ -136,11 +141,11 @@ treated as images.
 :background image spec property.
 
 ** Server and client changes
-
++++
 *** emacsclient now obeys string values for `initial-buffer-choice',
 if it is told to open a new frame without specifying any file to visit
 or expression to evaluate.
-
+---
 *** New option `server-auth-key' specifies a shared server key.
 
 ** In the Package Menu, newly-available packages are listed as "new",
@@ -155,6 +160,9 @@ On encountering a fatal error, Emacs now outputs a textual description
 of the fatal signal, and a short backtrace on platforms like glibc
 that support backtraces.
 
+** `message-log-max' now defaults to 1000, not 100.
+
+---
 ** If your Emacs was built from a bzr checkout, the new variable
 `emacs-bzr-version' contains information about the bzr revision used.
 
@@ -181,33 +189,34 @@ The PCL-CVS commands are still available via the keyboard.
 ---
 *** New input method `vietnamese-vni'.
 
+** NextStep/OSX port changes.
+---
+*** Fullscreen and frame parameter fullscreen is supported.
+---
+*** A file dialog is used when open/saved is done from the menu/toolbar.
 
 * Editing Changes in Emacs 24.3
 
+** Navigation command changes
 +++
-** `C-x 8 RET' is now bound to `insert-char', which is now a command.
-`ucs-insert' is now an obsolete alias for `insert-char'.
-
----
-** The `z' key no longer has a binding in most special modes.
-It used to be bound to `kill-this-buffer', but `z' is too easy to
-accidentally type.
-
-** New option `delete-trailing-lines' specifies whether
-M-x delete-trailing-whitespace should delete trailing lines at the end
-of the buffer.  It defaults to t.
+*** New binding `M-g c' for `goto-char'.
++++
+*** New binding `M-g TAB' for `move-to-column'.
++++
+*** `M-g TAB' (`move-to-column') prompts for a column number if called
+interactively with no prefix arg.  Previously, it moved to column 1.
 
 ** Search and Replace changes
-
++++
 *** Non-regexp Isearch now performs "lax" space matching.
 Each sequence of spaces in the supplied search string may match any
 sequence of one or more whitespace characters, as specified by the
 variable `search-whitespace-regexp'.  (This variable is also used by a
 similar existing feature for regexp Isearch).
-
++++
 *** New Isearch command `M-s SPC' toggles lax space matching.
 This applies to both ordinary and regexp Isearch.
-
++++
 *** New option `replace-lax-whitespace'.
 If non-nil, `query-replace' uses flexible whitespace matching too.
 The default is nil.
@@ -216,6 +225,20 @@ The default is nil.
 and `M-s _' in Isearch toggles symbol search mode.
 `M-s c' in Isearch toggles search case-sensitivity.
 
++++
+** `C-x 8 RET' is now bound to `insert-char', which is now a command.
+`ucs-insert' is now an obsolete alias for `insert-char'.
+
+---
+** The `z' key no longer has a binding in most special modes.
+It used to be bound to `kill-this-buffer', but `z' is too easy to
+accidentally type.
+
++++
+** New option `delete-trailing-lines' specifies whether
+M-x delete-trailing-whitespace should delete trailing lines at the end
+of the buffer.  It defaults to t.
+
 ** Register changes
 +++
 *** `C-x r +' is now overloaded to invoke `append-to-register.
@@ -224,13 +247,10 @@ and `M-s _' in Isearch toggles symbol search mode.
 the text to put between collected texts for use with M-x
 append-to-register and M-x prepend-to-register.
 
++++
 ** `C-u M-=' now counts lines/words/characters in the entire buffer.
 
-** New binding `M-g c' for `goto-char'.
-
-** M-x move-to-column, if called interactively with no prefix arg, now
-prompts for a column number.
-
++++
 ** New command `C-x r M-w' (copy-rectangle-as-kill).
 It copies the region-rectangle as the last rectangle kill.
 
@@ -242,17 +262,17 @@ just removing them, as done by `yank-excluded-properties'.
 * Changes in Specialized Modes and Packages in Emacs 24.3
 
 ** Apropos
-
+---
 *** The faces used by Apropos are now directly customizable.
 These faces are named `apropos-symbol', `apropos-keybinding', and so on;
 see the `apropos' Custom group for details.
-
-**** The old options whose values specified faces to use were removed
+---
+*** The old options whose values specified faces to use were removed
 (i.e. `apropos-symbol-face', `apropos-keybinding-face', etc.).
 
 ** Buffer Menu
 This package has been rewritten to use Tabulated List mode.
-
+---
 *** Option `Buffer-menu-buffer+size-width' is now obsolete.
 Use `Buffer-menu-name-width' and `Buffer-menu-size-width' instead.
 
@@ -568,27 +588,30 @@ in case that is not properly encoded.
 
 ** which-function-mode now applies to all applicable major modes by default.
 
+---
+** winner-mode-hook now runs when the mode is disabled, as well as when it is
+enabled.
 
 ** FIXME something happened to ses.el, 2012-04-17.
 
 
 ** Obsolete packages:
-
++++
 *** assoc.el
 In most cases, assoc+member+push+delq work just as well.
 And in any case it's just a terrible package: ugly semantics, terrible
 inefficiency, and not namespace-clean.
-
+---
 *** bruce.el
-
+---
 *** ledit.el
-
+---
 *** mailpost.el
-
++++
 *** mouse-sel.el
-
+---
 *** patcomp.el
-
++++
 *** cust-print.el
 
 
@@ -596,11 +619,15 @@ inefficiency, and not namespace-clean.
 
 * Incompatible Lisp Changes in Emacs 24.3
 
+** set-buffer-multibyte now signals an error in narrowed buffers.
+
++++
 ** (random) by default now returns a different random sequence in
 every Emacs run.  Use (random S), where S is a string, to set the
 random seed to a value based on S, in order to get a repeatable
 sequence in later calls.
 
+---
 ** The function `x-select-font' can return a font spec, instead of a
 font name as a string.  Whether it returns a font spec or a font name
 depends on the graphical library.
@@ -621,6 +648,7 @@ and are now undefined.  For backwards compatibility, defun and
 defmacro currently return the name of the newly defined function/macro
 but this should not be relied upon.
 
+---
 ** `face-spec-set' no longer sets frame-specific attributes when the
 third argument is a frame (that usage was obsolete since Emacs 22.2).
 
@@ -658,7 +686,7 @@ are deprecated and will be removed eventually.
 **** inactivate-current-input-method-function ->
      deactivate-current-input-method-function
 
-** Some obsolete functions and variables were removed:
+** Some obsolete functions, variables, and faces were removed:
 
 *** `facemenu-unlisted-faces'
 *** `rmail-decode-mime-charset'
@@ -677,6 +705,7 @@ are deprecated and will be removed eventually.
 *** `vc-ignore-vc-files' (use `vc-handled-backends' instead)
 *** `vc-master-templates' (use `vc-handled-backends' instead)
 *** `vc-checkout-carefully'
+*** `modeline'
 
 
 * Lisp changes in Emacs 24.3
@@ -731,14 +760,11 @@ now accept a third argument to avoid choosing the selected window.
 
 *** New macro `with-temp-buffer-window'.
 
-*** New options `temp-buffer-resize-frames' and
-`temp-buffer-resize-regexps'.
-
 *** `temp-buffer-resize-mode' no longer resizes windows that have been
 reused.
 
-*** New function `fit-frame-to-buffer' and new option
-`fit-frame-to-buffer-bottom-margin'.
+*** New function `fit-frame-to-buffer' and new options
+`fit-frame-to-buffer' and `fit-frame-to-buffer-bottom-margin'.
 
 *** New display action functions `display-buffer-below-selected',
 `display-buffer-at-bottom' and `display-buffer-in-previous-window'.
@@ -753,6 +779,9 @@ non-nil, specifies frame parameters to give any newly-created frame.
 *** New display action alist entry `previous-window', if non-nil,
 specifies window to reuse in `display-buffer-in-previous-window'.
 
+*** New display action alist entries `window-height' and `window-width'
+to specify size of new window created by `display-buffer'.
+
 *** The following variables are obsolete, as they can be replaced by
 appropriate entries in the `display-buffer-alist' function introduced
 in Emacs 24.1:
@@ -765,23 +794,24 @@ in Emacs 24.1:
 **** `display-buffer-function'
 
 ** Time
-
+---
 *** `current-time-string' no longer requires that its argument's year
 must be in the range 1000..9999.  It now works with any year supported
 by the underlying C implementation.
-
+---
 *** `current-time' now returns extended-format time stamps
 (HIGH LOW USEC PSEC), where the new PSEC slot specifies picoseconds.
 PSEC is typically a multiple of 1000 on current machines.  Other
 functions that use this format, such as file-attributes and
 format-time-string, have been changed accordingly.  Old-format time
 stamps are still accepted.
-
+---
 *** The format of timers in timer-list and timer-idle-list is now
 [TRIGGERED-P HI-SECS LO-SECS USECS REPEAT-DELAY FUNCTION ARGS IDLE-DELAY PSECS].
 The PSECS slot is new, and uses picosecond resolution.  It can be
 accessed via the new timer--psecs accessor.
 
++++
 ** Floating point functions now always return special values like NaN,
 instead of signaling errors, if given invalid args, e.g. (log -1.0).
 Previously, they returned NaNs on some platforms but signaled errors
@@ -793,24 +823,29 @@ This can significantly speed up execution of non-byte-compiled code,
 but can also bump into harmless and previously unnoticed cyclic
 dependencies.  These should not be fatal: they will simply cause the
 macro-calls to be left for later expansion (as before), but will also
-result in a warning describing the cycle.
+result in a warning ("Eager macro-expansion skipped due to cycle")
+describing the cycle.
 
 ** Misc new functions:
 
 *** `autoloadp'
 *** `autoload-do-load'.
++++
 *** `buffer-narrowed-p' tests if the buffer is narrowed.
 *** `file-name-base' returns a file name sans directory and extension.
 *** `function-get' fetches a function property, following aliases.
++++
 *** `posnp' tests if an object is a `posn'.
 *** `set-temporary-overlay-map' sets up a temporary overlay map.
++++
 *** `system-users' returns the user names on the system.
++++
 *** `system-groups' returns the group names on the system.
 *** `tty-top-frame' returns the topmost frame of a text terminal.
 
 ** New macros `setq-local' and `defvar-local'.
 
-** New fringe bitmap exclamation-mark.
+** New fringe bitmap `exclamation-mark'.
 
 ** Face underlining can now use a wave.
 See the "Face Attributes" section of the Elisp manual.
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index a5b88d3f451..35aab7a0eef 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -5,267 +5,894 @@ See the end of the file for license conditions.
 
 Please send Org bug reports to emacs-orgmode@gnu.org.
 
-* Incompatible changes
-
-** New keys for TODO sparse trees
-   :PROPERTIES:
-   :OrgVersion:  7.01
-   :END:
-
-   The key =C-c C-v= is now reserved for Org Babel action.  TODO sparse
-   trees can still be made with =C-c / t= (all not-done states) and =C-c /
-   T= (specific states).
-
-** The Agenda =org-agenda-ndays= is now obsolete
-   :PROPERTIES:
-   :OrgVersion:  7.4
-   :END:
-
-   The variable =org-agenda-ndays= is obsolete - please use
-   =org-agenda-span= instead.
-
-   Thanks to Julien Danjou for this.
-
-** Changes to the intended use of =org-export-latex-classes=
-   :PROPERTIES:
-   :OrgVersion:  6.35
-   :END:
-
-   So far this variable has been used to specify the complete header of the
-   LaTeX document, including all the =\usepackage= calls necessary for the
-   document.  This setup makes it difficult to maintain the list of
-   packages that Org itself would like to call, for example for the special
-   symbol support it needs.
-
-   First of all, you can *opt out of this change* in the following way: You
-   can say: /I want to have full control over headers, and I will take
-   responsibility to include the packages Org needs/.  If that is what you
-   want, add this to your configuration and skip the rest of this section
-   (except maybe for the description of the =[EXTRA]= place holder):
-
-   #+begin_src emacs-lisp
-  (setq org-export-latex-default-packages-alist nil
-        org-export-latex-packages-alist nil)
-   #+end_src
-
-   /Continue to read here if you want to go along with the modified setup./
-
-   There are now two variables that should be used to list the LaTeX
-   packages that need to be included in all classes.  The header definition
-   in =org-export-latex-classes= should then not contain the corresponding
-   =\usepackage= calls (see below).
-
-   The two new variables are:
-
-   1. =org-export-latex-default-packages-alist= :: This is the variable
-        where Org-mode itself puts the packages it needs.  Normally you
-        should not change this variable.  The only reason to change it
-        anyway is when one of these packages causes a conflict with another
-        package you want to use.  Then you can remove that packages and
-        hope that you are not using Org-mode functionality that needs it.
-
-   2. =org-export-latex-packages-alist= :: This is the variable where you
-        can put the packages that you'd like to use across all classes.
-
-   The sequence how these customizations will show up in the LaTeX
-   document are:
-
-   1. Header from =org-export-latex-classes=
-   2. =org-export-latex-default-packages-alist=
-   3. =org-export-latex-packages-alist=
-   4. Buffer-specific things set with =#+LaTeX_HEADER:=
-
-   If you want more control about which segment is placed where, or if you
-   want, for a specific class, have full control over the header and
-   exclude some of the automatic building blocks, you can put the following
-   macro-like place holders into the header:
-
-   #+begin_example
-   [DEFAULT-PACKAGES]      \usepackage statements for default packages
-   [NO-DEFAULT-PACKAGES]   do not include any of the default packages
-   [PACKAGES]              \usepackage statements for packages
-   [NO-PACKAGES]           do not include the packages
-   [EXTRA]                 the stuff from #+LaTeX_HEADER
-   [NO-EXTRA]              do not include #+LaTeX_HEADER stuff
-   #+end_example
-
-   If you have currently customized =org-export-latex-classes=, you should
-   revise that customization and remove any package calls that are covered
-   by =org-export-latex-default-packages-alist=.  This applies to the
-   following packages:
-
-   - inputenc
-   - fontenc
-   - fixltx2e
-   - graphicx
-   - longtable
-   - float
-   - wrapfig
-   - soul
-   - t1enc
-   - textcomp
-   - marvosym
-   - wasysym
-   - latexsym
-   - amssymb
-   - hyperref
-
-   If one of these packages creates a conflict with another package you are
-   using, you can remove it from =org-export-latex-default-packages-alist=.
-   But then you risk that some of the advertised export features of Org
-   will not work properly.
-
-   You can also consider moving packages that you use in all classes to
-   =org-export-latex-packages-alist=.  If necessary, put the place holders
-   so that the packages get loaded in the right sequence.  As said above,
-   for backward compatibility, if you omit the place holders, all the
-   variables will dump their content at the end of the header.
-
-** The constant =org-html-entities= is obsolete
-   :PROPERTIES:
-   :OrgVersion:  6.35
-   :END:
-
-   Its content is now part of the new constant =org-entities=, which is
-   defined in the file org-entities.el.  =org-html-entities= was an internal
-   variable, but it is possible that some users did write code using it.
-
-** `org-bbdb-anniversary-format-alist' has changed
-   :PROPERTIES:
-   :OrgVersion:  7.5
-   :END:
-
-   Please check the docstring and update your settings accordingly.
-
-** Deleted =org-mode-p=
-   :PROPERTIES:
-   :OrgVersion:  7.8
-   :END:
-
-   This function has been deleted: please update your code.
-
-* Important new features
-
-** New Org to ODT exporter
-   :PROPERTIES:
-   :OrgVersion:  7.8
-   :END:
-
-   Jambunathan's Org to ODT exporter is now part of Org.
-
-   To use it, it `C-c C-e o' in an Org file.  See the documentation for more
-   information on how to customize it.
-
-** org-capture.el is now the default capture system
-   :PROPERTIES:
-   :OrgVersion:  7.01
-   :END:
-
-   This replaces the earlier system org-remember.  The manual only describes
-   org-capture, but for people who prefer to continue to use org-remember,
-   we keep a static copy of the former manual section [[http://orgmode.org/org-remember.pdf][chapter about
-   remember]].
-
-   The new system has a technically cleaner implementation and more
-   possibilities for capturing different types of data.  See [[http://thread.gmane.org/gmane.emacs.orgmode/26441/focus%3D26441][Carsten's
-   announcement]] for more details.
-
-   To switch over to the new system:
-
-   1. Run
-
-    : M-x org-capture-import-remember-templates RET
-
-    to get a translated version of your remember templates into the
-    new variable =org-capture-templates=.  This will "mostly" work,
-    but maybe not for all cases.  At least it will give you a good
-    place to modify your templates.  After running this command,
-    enter the customize buffer for this variable with
-
-    : M-x customize-variable RET org-capture-templates RET
+* Version 7.9.2
 
-    and convince yourself that everything is OK.  Then save the
-    customization.
+** New ELPA repository for Org packages
 
-   2. Bind the command =org-capture= to a key, similar to what you did
-      with org-remember:
+You can now add the Org ELPA repository like this:
 
-    : (define-key global-map "\C-cc" 'org-capture)
+#+BEGIN_SRC emacs-lisp
+(add-to-list 'package-archives '("org" . "http://orgmode.org/elpa/") t)
+#+END_SRC
 
-    If your fingers prefer =C-c r=, you can also use this key once
-    you have decided to move over completely to the new
-    implementation.  During a test time, there is nothing wrong
-    with using both system in parallel.
+It contains both the =org-*.tar= package (the core Org distribution, also
+available through http://elpa.gnu.org) and the =org-plus*.tar= package (the
+extended Org distribution, with non-GNU packages from the =contrib/=
+directory.)
 
-* New libraries
+See http://orgmode.org/elpa/
 
-** New Org libraries
-*** org-eshell.el (Konrad Hinsen)
-    :PROPERTIES:
-    :OrgVersion:  7.8
-    :END:
+** Overview of the new keybindings
 
-    Implement links to eshell buffers.
+   | Keybinding      | Speedy | Command                     |
+   |-----------------+--------+-----------------------------|
+   | =C-c C-x C-z=   |        | [[doc::org-clock-resolve][org-clock-resolve]]           |
+   | =C-c C-x C-q=   |        | [[doc::org-clock-cancel][org-clock-cancel]]            |
+   | =C-c C-x C-x=   |        | [[doc::org-clock-in-last][org-clock-in-last]]           |
+   | =M-h=           |        | [[doc::org-mark-element][org-mark-element]]            |
+   | =*=             |        | [[doc::org-agenda-bulk-mark-all][org-agenda-bulk-mark-all]]    |
+   | =C-c C-M-l=     |        | [[doc::org-insert-all-links][org-insert-all-links]]        |
+   | =C-c C-x C-M-v= |        | [[doc::org-redisplay-inline-images][org-redisplay-inline-images]] |
+   | =C-c C-x E=     | =E=    | [[doc::org-inc-effort][org-inc-effort]]              |
+   |                 | =#=    | [[doc::org-toggle-comment][org-toggle-comment]]          |
+   |                 | =:=    | [[doc::org-columns][org-columns]]                 |
+   |                 | =W=    | Set =APPT_WARNTIME=         |
+   | =k=             |        | [[doc::org-agenda-capture][org-agenda-capture]]          |
+   | C-c ,           | ,      | [[doc::org-priority][org-priority]]                |
 
-*** org-special-blocks (Carsten Dominik)
-   :PROPERTIES:
-   :OrgVersion:  7.8
-   :END:
+** New package and Babel langage
 
-This package generalizes the #+begin_foo and #+end_foo tokens.
+*** =org-eshell.el= by Konrad Hinsen is now in Org
 
-To use, put the following in your init file:
+    =org-eshell.el= allows you to create links from [[http://www.gnu.org/software/emacs/manual/html_node/eshell/index.html][Eshell]].
 
-#+BEGIN_EXAMPLE
+*** Support for execution of Scala code blocks (see ob-scala.el)
+*** Support for execution of IO code blocks (see ob-io.el)
+
+** Incompatible changes
+
+   - If your code relies on =org-write-agenda=, please use
+     [[doc::org-agenda-write][org-agenda-write]] from now on.
+
+   - If your code relies on =org-make-link=, please use =concat=
+     instead.
+
+   - =org-link-to-org-use-id= has been renamed to
+     =org-id-link-to-org-use-id= and its default value is nil.  The
+     previous default was =create-if-interactive-and-no-custom-id=.
+
+** New features and user-visible changes
+
+*** Org Element
+
+    =org-element.el= is a toolbox for parsing and analysing "elements"
+    in an Org-mode buffer.  This has been written by Nicolas Goaziou
+    and has been tested for quite some time.  It is now part of Org's
+    core and many core functions rely on this package.
+
+    Two functions might be particularily handy for users:
+    =org-element-at-point= and =org-element-context=.
+
+    See the docstrings for more details.
+
+    Below is a list of editing and navigating commands that now rely
+    on =org-element.el=.
+
+**** [[doc::org-fill-paragraph][org-fill-paragraph]] has been completely rewritten
+
+     The filling mechanisms now rely on org-element, trying to do the
+     right thing on each element in various contexts.  E.g. filling in
+     a list item will preserve indentation; filling in message-mode
+     will fall back on the relevant filling functions; etc.
+
+**** [[doc::org-metaup][org-metaup]] and [[doc::org-metadown][org-metadown]] will drag the element backward/forward
+
+     If you want to get the old behavior (i.e. moving a line up and
+     down), you can first select the line as an active region, then
+     =org-metaup= or =org-metadown= to move the region backward or
+     forward.  This also works with regions bigger than just one line.
+
+**** [[doc::org-up-element][org-up-element]] and [[doc::org-down-element][org-down-element]] (respectively =C-c C-^= and =C-c C-_=)
+
+     This will move the point up/down in the hierarchy of elements.
+
+**** [[doc::org-backward-element][org-backward-element]] and [[doc::org-forward-element][org-forward-element]] (respectively =M-{= and =M-}=)
+
+     This will move the point backward/forward in the hierarchy of
+     elements.
+
+**** [[doc::org-narrow-to-element][org-narrow-to-element]] will narrow to the element at point
+**** [[doc::org-mark-element][org-mark-element]] will mark the element at point
+
+     This command is bound to =M-h= and will mark the element at
+     point.  If the point is at a paragraph, it will mark the
+     paragraph.  If the point is at a list item, it will mark the list
+     item.  Etc.
+
+     Note that if point is at the beginning of a list, it will mark
+     the whole list.
+
+     To mark a subtree, you can either use =M-h= on the headline
+     (since there is no ambiguity about the element you're at) or
+     [[doc::org-mark-subtree][org-mark-subtree]] (=C-c @=) anywhere in the subtree.
+
+     Invoking [[doc::org-mark-element][org-mark-element]] repeatedly will try to mark the next
+     element on top of the previous one(s).  E.g. hitting =M-h= twice
+     on a headline will mark the current subtree and the next one on
+     the same level.
+
+*** Org Agenda
+
+**** New option [[doc::org-agenda-sticky][org-agenda-sticky]]
+
+     There is a new option =org-agenda-sticky= which enables "sticky"
+     agendas.  Sticky agendas remain opened in the background so that
+     you don't need to regenerate them each time you hit the
+     corresponding keystroke.  This is a big time saver.
+
+     When [[doc::org-agenda-sticky][org-agenda-sticky]] is =non-nil=, the agenda buffer will be
+     named using the agenda key and its description.  In sticky
+     agendas, the =q= key will just bury the agenda buffers and
+     further agenda commands will show existing buffer instead of
+     generating new ones.
+
+     If [[doc::org-agenda-sticky][org-agenda-sticky]] is set to =nil=, =q= will kill the single
+     agenda buffer.
+
+**** New option [[doc::org-agenda-custom-commands-contexts][org-agenda-custom-commands-contexts]]
+
+     Setting this option allows you to define specific context where
+     agenda commands should be available from.  For example, when set
+     to this value
+
+     #+BEGIN_SRC emacs-lisp
+  (setq org-agenda-custom-commands-contexts
+        '(("p" (in-file . "\\.txt"))))
+#+END_SRC
+
+     then the =p= agenda command will only be available from buffers
+     visiting *.txt files.  See the docstring and the manual for more
+     details on how to use this.
+
+**** Changes in bulk actions
+
+     The set of commands starting with =k ...= as been deleted and the
+     features have been merged into the "bulk action" feature.
+
+     After you marked some entries in the agenda, if you call =B s=,
+     the agenda entries will be rescheduled using the date at point if
+     on a date header.  If you are on an entry with a timestamp, you
+     will be prompted for a date to reschedule your marked entries to,
+     using the timestamp at point as the default prompt.
+
+     You can now use =k= to capture the marked entry and use the date
+     at point as an overriding date for the capture template.
+
+     To bind this behavior to =M-x org-capture RET= (or its
+     keybinding), set the new option [[doc::org-capture-use-agenda-date][org-capture-use-agenda-date]] to
+     =t=.
+
+**** =N= and =P= in the agenda will move to the next/previous item
+
+**** New command [[doc::org-agenda-bulk-mark-all][org-agenda-bulk-mark-all]] to mark all items
+
+     This new command is bound to =*= in agenda mode.
+
+     There is also a new option [[doc::org-agenda-bulk-mark-char][org-agenda-bulk-mark-char]] to set the
+     character to use as a mark for bulk actions.
+
+**** New option [[doc::org-agenda-persistent-marks][org-agenda-persistent-marks]]
+
+     When set to =non-nil=, marks will remain visible after a bulk
+     action.  You can temporarily toggle this by pressing =p= when
+     invoking [[doc::org-agenda-bulk-action][org-agenda-bulk-action]].  Marks are deleted if your
+     rebuild the agenda buffer or move to another date/span (e.g. with
+     =f= or =w=).
+
+**** New option [[doc::org-agenda-skip-timestamp-if-deadline-is-shown][org-agenda-skip-timestamp-if-deadline-is-shown]]
+
+     =Non-nil= means skip timestamp line if same entry shows because
+     of deadline.
+
+     In the agenda of today, an entry can show up multiple times
+     because it has both a plain timestamp and has a nearby deadline.
+     When this variable is t, then only the deadline is shown and the
+     fact that the entry has a timestamp for or including today is not
+     shown.  When this variable is =nil=, the entry will be shown
+     several times.
+
+**** New =todo-unblocked= and =nottodo-unblocked= skip conditions
+
+     See the [[http://orgmode.org/w/?p%3Dorg-mode.git%3Ba%3Dcommit%3Bh%3Df426da][git commit]] for more explanations.
+
+**** Allow category filtering in the agenda
+
+     You can now filter the agenda by category.  Pressing "<" will
+     filter by the category of the item on the current line, and
+     pressing "<" again will remove the filter.  You can combine tag
+     filters and category filters.
+
+     You can use =org-agenda-category-filter= in your custom agenda
+     views and =org-agenda-category-filter-preset= in your main
+     configuration.
+
+     See also the new command [[doc::org-agenda-filter-by-top-category][org-agenda-filter-by-top-category]]:
+     hitting =^= will filter by "Top" category: only show entries that
+     are of the same category than the Top category of the entry at
+     point.
+
+*** Org Links
+
+**** Inserting links
+
+     When inserting links through [[doc::org-insert-link][org-insert-link]], the description is
+     now displayed first, followed by the literal link, as the
+     description is often more useful when you look for the link you
+     want to insert.
+
+     Completion now complete both literal links and description.  If
+     you complete a description, the literal link and its description
+     will be inserted directly, whereas when you complete the literal
+     link, you will be prompted for a description (as with Org 7.8.)
+
+     In the completion buffer, links to the current buffer are now
+     highlighted.
+
+**** New templates =%h= and =%(sexp)= for abbreviated links
+
+     On top of =%s= template, which is replaced by the link tag in
+     abbreviated links, you can now use =%h= (which does the same than =%s=
+     but does not hexify the tag) and =%(sexp)= (which can run a function
+     that takes the tag as its own argument.)
+
+**** New link type =help=
+
+     You can now create links from =help= buffers.
+
+     For example, if you request help for the command [[doc::org-agenda][org-agenda]] with
+     =C-h f org-agenda RET=, creating a link from this buffer will let
+     you go back to the same buffer.
+
+**** New command [[doc::org-insert-all-links][org-insert-all-links]]
+
+     This will insert all links as list items.  With a universal
+     prefix argument, links will not be deleted from the variable
+     =org-stored-links=.
+
+     This new command is bound to =C-c C-M-l=.
+
+**** New option [[doc::org-url-hexify-p][org-url-hexify-p]]
+
+     When set to =nil=, the =URL= part of a link will not be hexified.
+
+**** Org can now open multiple shell links
+
+**** New option [[doc::org-doi-server-url][org-doi-server-url]] to specify an alternate DOI server
+
+**** RET now follows time stamps links
+
+*** Org Editing
+
+**** [[doc::org-todo][org-todo]] and =org-archive-*= can now loop in the active region
+
+     When [[doc::org-loop-over-headlines-in-active-region][org-loop-over-headlines-in-active-region]] is =non-nil=, using
+     [[doc::org-todo][org-todo]] or =org-archive-*= commands in the active region will
+     loop over headlines.  This is handy if you want to set the TODO
+     keyword for several items, or archive them quickly.
+
+**** You can now set tags for headlines in a region
+
+     If [[doc::org-loop-over-headlines-in-active-region][org-loop-over-headlines-in-active-region]] is =non-nil=, then
+     selecting the region and hitting =C-c C-q= will set the tags for
+     all headlines in the region.
+
+**** New command [[doc::org-insert-drawer][org-insert-drawer]] to insert a drawer interactively
+
+**** Comments start with "^[ \t]*# " anywhere on a line
+
+     Note that the space after the hashtag is mandatory.  Comments
+     with "^#+" are not supported anymore.
+
+**** New speed key =#= to toggle the COMMENT cookie on a headline
+
+**** =indent-region-function= is now set to [[doc::org-indent-region][org-indent-region]]
+
+     =C-M-\= should now produce useful results.
+
+     You can unindent the buffer with [[doc::org-unindent-buffer][org-unindent-buffer]].
+
+**** New option [[doc::org-allow-promoting-top-level-subtree][org-allow-promoting-top-level-subtree]]
+
+     When =non-nil=, =S-M-<left>= will promote level-1 subtrees
+     containing other subtrees.  The level-1 headline will be
+     commented out.  You can revert to the previous state with =M-x
+     undo RET=.
+
+*** Org Clock
+
+**** New keybinding =C-c C-x C-z= for [[doc::org-clock-resolve][org-clock-resolve]]
+
+**** New keybinding =C-c C-x C-q= for [[doc::org-clock-cancel][org-clock-cancel]]
+
+**** New command [[doc::org-clock-in-last][org-clock-in-last]] to clock in the last clocked item
+
+     This command is bound to =C-c C-x C-x= and will clock in the last
+     clocked entry, if any.
+
+**** =C-u M-x= [[doc::org-clock-out][org-clock-out]] =RET= now prompts for a state to switch to
+
+**** =S-M-<up/down>= on a clock timestamps adjusts the previous/next clock
+
+**** New option [[doc::org-clock-continuously][org-clock-continuously]]
+
+     When set to =nil=, clocking in a task will first try to find the
+     last clocked out task and restart from when that task was clocked
+     out.
+
+     You can temporarily activate continuous clocking with =C-u C-u
+     C-u M-x= [[doc::org-clock-in][org-clock-in]] =RET= (three universal prefix arguments)
+     and =C-u C-u M-x= [[org-clock-in-last][org-clock-in-last]] =RET= (two universal prefix
+     arguments).
+
+
+**** New option [[doc::org-clock-frame-title-format][org-clock-frame-title-format]]
+
+     This option sets the value of =frame-title-format= when clocking
+     in.
+
+**** New options for controlling the clockreport display
+
+     [[doc::org-clock-file-time-cell-format][org-clock-file-time-cell-format]]: Format string for the file time
+     cells in clockreport.
+
+     [[doc::org-clock-total-time-cell-format][org-clock-total-time-cell-format]]: Format string for the total
+     time cells in clockreport.
+
+
+**** New options for controlling the clock/timer display
+
+     [[doc::org-clock-clocked-in-display][org-clock-clocked-in-display]]: control whether the current clock
+     is displayed in the mode line and/or frame title.
+
+     [[doc::org-timer-display][org-timer-display]]: control whether the current timer is displayed
+     in the mode line and/or frame title.
+
+     This allows the clock and timer to be displayed in the frame
+     title instead of, or as well as, the mode line.  This is useful
+     for people with limited space in the mode line but with ample
+     space in the frame title.
+
+*** Org Appearance
+
+**** New option [[doc::org-custom-properties][org-custom-properties]]
+
+     The visibility of properties listed in this options can be turn
+     on/off with [[doc::org-toggle-custom-properties-visibility][org-toggle-custom-properties-visibility]].  This might
+     be useful for properties used by third-part tools or that you
+     don't want to see temporarily.
+
+**** New command [[doc::org-redisplay-inline-images][org-redisplay-inline-images]]
+
+     This will redisplay all images.  It is bound to =C-c C-x C-M-v=.
+
+**** New entities in =org-entities.el=
+
+     There are these new entities:
+
+     : ("tilde" "\\~{}" nil "&tilde;" "~" "~" "~")
+     : ("slash" "/" nil "/" "/" "/" "/")
+     : ("plus" "+" nil "+" "+" "+" "+")
+     : ("under" "\\_" nil "_" "_" "_" "_")
+     : ("equal" "=" nil "=" "=" "=" "=")
+     : ("asciicirc" "\\textasciicircum{}" nil "^" "^" "^" "^")
+
+**** New face =org-list-dt= for definition terms
+**** New face =org-date-selected= for the selected calendar day
+**** New face value for =org-document-title=
+
+     The face is back to a normal height.
+
+*** Org Columns
+
+**** New speed command =:= to activate the column view
+**** New special property =CLOCKSUM_T= to display today's clocked time
+
+     You can use =CLOCKSUM_T= the same way you use =CLOCKSUM=.  It
+     will display the time spent on tasks for today only.
+
+**** Use the =:COLUMNS:= property in columnview dynamic blocks
+
+     If the =:COLUMNS:= is set in a subtree, the columnview dynamic
+     block will use its value as the column format.
+
+**** Consider inline tasks when computing a sum
+
+*** Org Dates and Time Stamps
+
+**** Enhanced [[doc::org-sparse-tree][org-sparse-tree]]
+
+     =C-c /= can now check for time ranges.
+
+     When checking for dates with =C-c /= it is useful to change the
+     type of dates that you are interested in.  You can now do this
+     interactively with =c= after =C-c /= and/or by setting
+     [[doc::org-sparse-tree-default-date-type][org-sparse-tree-default-date-type]] to the default value you want.
+
+**** Support for hourly repeat cookies
+
+     You can now use
+
+     : SCHEDULED: <2012-08-20 lun. 08:00 +1h>
+
+     if you want to add an hourly repeater to an entry.
+
+**** =C-u C-u C-c .= inserts a time-stamp with no prompt
+
+**** When (setq [[doc::org-read-date-prefer-future][org-read-date-prefer-future]] 'time), accept days in the prompt
+
+     "8am Wed" and "Wed 8am" are now acceptable values when entering a
+     date from the prompt.  If [[doc::org-read-date-prefer-future][org-read-date-prefer-future]] is set to
+     =time=, this will produce the expected prompt indication.
+
+**** New option [[doc::org-datetree-add-timestamp][org-datetree-add-timestamp]]
+
+     When set to =non-nil=, datetree entries will also have a
+     timestamp.  This is useful if you want to see these entries in a
+     sparse tree with =C-c /=.
+
+*** Org Capture
+
+**** New command [[doc::org-capture-string][org-capture-string]]
+
+     M-x [[doc::org-capture-string][org-capture-string]] RET will prompt for a string and a capture
+     template.  The string will be used as an annotation for the
+     template.  This is useful when capturing in batch mode as it lets
+     you define the content of the template without being in Emacs.
+
+**** New option [[doc::org-capture-templates-contexts][org-capture-templates-contexts]]
+
+     Setting this option allows you to define specific context where
+     capture templates should be available from.  For example, when
+     set to this value
+
+     #+BEGIN_SRC emacs-lisp
+  (setq org-capture-templates-contexts
+        '(("c" (in-mode . "message-mode"))))
+#+END_SRC
+
+     then the =c= capture template will only be available from
+     =message-mode= buffers.  See the docstring and the manual for
+     more details on how to use this.
+
+**** New =%l= template to insert the literal link
+**** New option [[doc::org-capture-bookmark][org-capture-bookmark]]
+
+     Org used to automatically add a bookmark with capture a note.
+     You can now turn this on by setting [[doc::org-capture-bookmark][org-capture-bookmark]] to
+     =nil=.
+
+**** Expand =%<num>= escape sequences into text entered for <num>'th =%^{PROMPT}= escape
+
+     See the manual for more explanations.
+
+**** More control over empty lines
+
+     You can use =:empty-lines-before= and =:empty-lines-after= to
+     control the insertion of empty lines.  Check the manual for more
+     explanations.
+
+**** New hook [[doc::org-capture-prepare-finalize-hook][org-capture-prepare-finalize-hook]]
+
+     This new hook runs before the finalization process starts.
+
+*** Org Export
+
+**** New functions =orgtbl-to-table.el= and =orgtbl-to-unicode=
+
+     =orgtbl-to-table.el= convert the table to a =table.el= table, and
+     =orgtbl-to-unicode= will use =ascii-art-to-unicode.el= (when
+     available) to print beautiful tables.
+
+**** [[doc::org-table-export][org-table-export]] now a bit clever about the target format
+
+     When you specify a file name like =table.csv=, [[doc::org-table-export][org-table-export]]
+     will now suggest =orgtbl-to-csv= the default method for exporting
+     the table.
+
+**** New option [[doc::org-export-date-timestamp-format][org-export-date-timestamp-format]]
+
+     The option allows to set a time string format for Org timestamps
+     in the #+DATE option.
+
+**** LaTeX: New options for exporting table rules :tstart, :hline and :tend
+
+     See [[doc::org-export-latex-tables-hline][org-export-latex-tables-hline]] and [[doc::org-export-latex-tables-tend][org-export-latex-tables-tend]].
+
+**** LaTeX: You can now set =:hfmt= from =#+ATTR_LaTeX=
+**** Beamer: Add support and keybinding for the =exampleblock= environment
+
+     Add support for these languages in [[doc::org-export-language-setup][org-export-language-setup]].
+     More languages are always welcome.
+
+**** Beamer: New option [[doc::org-beamer-inherited-properties][org-beamer-inherited-properties]]
+
+     This option allows Beamer export to inherit some properties.
+     Thanks to Carsten for implementing this.
+
+**** ODT: Add support for ODT export in org-bbdb.el
+**** ODT: Add support for indented tables (see [[http://orgmode.org/w/?p%3Dorg-mode.git%3Ba%3Dcommit%3Bh%3De9fd33][this commit]] for details)
+**** ODT: Improve the conversion from ODT to other formats
+**** ASCII: Swap the level-1/level-2 characters to underline the headlines
+**** Support for Chinese, simplified Chinese, Russian, Ukrainian and Japanese
+**** HTML: New option [[doc::org-export-html-date-format-string][org-export-html-date-format-string]]
+
+     Format string to format the date and time in HTML export.  Thanks
+     to Sébastien Vauban for this patch.
+
+*** Org Babel
+
+**** New =:results drawer= parameter
+
+=:results drawer= replaces =:results wrap=, which is deprecated but still
+supported.
+
+**** =:results org= now put results in a =#+BEGIN_SRC org= block
+
+=:results org= used to put results in a =#+BEGIN_ORG= block but it now puts
+results in a =#+BEGIN_SRC org= block, wich comma-escaped lines.
+
+=#+BEGIN_ORG= blocks are obsolete.
+
+**** Exporting =#+BEGIN_SRC org= blocks exports the code
+
+It used to exports the results of the code.
+
+*** Miscellaneous
+
+**** New menu entry for [[doc::org-refile][org-refile]]
+**** Allow capturing to encrypted entries
+
+If you capture to an encrypted entry, it will be decrpyted before
+inserting the template then re-encrypted after finalizing the capture.
+
+**** Inactive timestamps are now handled in tables
+
+Calc can do computation on active time-stamps like <2012-09-29 sat.>.
+Inactive time-stamps in a table's cell are now internally deactivated so
+that Calc formulas can operate on them.
+
+**** [[doc::org-table-number-regexp][org-table-number-regexp]] can now accept comma as decimal mark
+**** Org allows a new property =APPT_WARNTIME=
+
+     You can set it with the =W= speedy key or set it manually.  When
+     set, exporting to iCalendar and [[doc::org-agenda-to-appt][org-agenda-to-appt]] will use the
+     value of this property as the number of minutes for the warning
+     alarm.
+
+**** New command [[doc::org-inc-effort][org-inc-effort]]
+
+     This will increment the effort value.
+
+     It is bound to =C-c C-x E= and to =E= as a speedy command.
+
+**** Attach: Add support for creating symbolic links
+
+     =org-attach-method= now supports a new method =lns=, allowing to
+     attach symbolic links.
+
+**** Archive: you can now archive to a datetree
+
+**** New option [[doc::org-inlinetask-show-first-star][org-inlinetask-show-first-star]]
+
+     =Non-nil= means display the first star of an inline task as
+     additional marker.  When =nil=, the first star is not shown.
+
+**** New option [[doc::org-latex-preview-ltxpng-directory][org-latex-preview-ltxpng-directory]]
+
+     This lets you define the path for the =ltxpng/= directory.
+
+**** You can now use imagemagick instead of dvipng to preview LaTeX fragments
+**** You can now turn off [[doc::orgstruct++-mode][orgstruct++-mode]] safely
+**** =C-u C-c C-c= on list items to add check boxes
+
+     =C-u C-c C-c= will add an empty check box on a list item.
+
+     When hit from the top of the list, it will add check boxes for
+     all top level list items.
+
+**** =org-list-ending-method= and =org-list-end-regexp= are now obsolete
+
+     Fall back on using =org-list-end-re= only, which see.
+
+**** org-feed.el now expands =%(sexp)= templates
+**** New option [[doc::org-protocol-data-separator][org-protocol-data-separator]]
+
+**** New option [[doc::org-ditaa-jar-option][org-ditaa-jar-option]] to specify the ditaa jar file
+
+**** New possible value for [[doc::org-loop-over-headlines-in-active-region][org-loop-over-headlines-in-active-region]]
+
+     When [[doc::org-loop-over-headlines-in-active-region][org-loop-over-headlines-in-active-region]] is set to
+     =start-level=, the command will loop over the active region but
+     will only act upon entries that are of the same level than the
+     first headline in the region.
+
+**** New option [[doc::org-habit-show-all-today][org-habit-show-all-today]]
+
+     When set to =t=, show all (even unscheduled) habits on today's
+     agenda.
+
+** Important bug fixes
+
+*** M-TAB on options keywords perform completion correctly again
+
+    If you hit =M-TAB= on keywords like =#+TITLE=, Org will try to
+    perform completion with meaningful values.
+
+*** Add licenses to javascript embedded and external code snippets
+
+    Embedded javascript code produced when exporting an Org file to
+    HTML is now licensed under GPLv3 (or later), and the copyright is
+    owned by the Free Software Foundation, Inc.
+
+    The javascript code for embedding MathJax in the browser mentions
+    the MathJax copyright and the Apache 2.0 license.
+
+    The javascript code for embedding =org-injo.js= in the browser
+    mentions the copyright of Sebastian Rose and the GPLv3 (or later)
+    license.
+
+    =org-export-html-scripts= is now a variable, so that you can adapt
+    the code and the license to your needs.
+
+    See http://www.gnu.org/philosophy/javascript-trap.html for
+    explanations on why these changes were necessary.
+
+* Version 7.8.11
+
+** Incompatible changes
+
+*** Emacs 21 support has been dropped
+
+    Do not use Org mode 7.xx with Emacs 21, use [[http://orgmode.org/org-6.36c.zip][version 6.36c]] instead.
+
+*** XEmacs support requires the XEmacs development version
+
+    To use Org mode 7.xx with XEmacs, you need to run the developer
+    version of XEmacs.  We were about to drop XEmacs support entirely,
+    but Michael Sperber stepped in and made changes to XEmacs that
+    made it easier to keep the support.  Thanks to Michael for this
+    last-minute save.
+
+*** New keys for TODO sparse trees
+
+    The key =C-c C-v= is now reserved for Org Babel action.  TODO
+    sparse trees can still be made with =C-c / t= (all not-done
+    states) and =C-c / T= (specific states).
+
+*** The Agenda =org-agenda-ndays= is now obsolete
+
+    The variable =org-agenda-ndays= is obsolete - please use
+    =org-agenda-span= instead.
+
+    Thanks to Julien Danjou for this.
+
+*** Changes to the intended use of =org-export-latex-classes=
+
+    So far this variable has been used to specify the complete header
+    of the LaTeX document, including all the =\usepackage= calls
+    necessary for the document.  This setup makes it difficult to
+    maintain the list of packages that Org itself would like to call,
+    for example for the special symbol support it needs.
+
+    First of all, you can *opt out of this change* in the following
+    way: You can say: /I want to have full control over headers, and I
+    will take responsibility to include the packages Org needs/.  If
+    that is what you want, add this to your configuration and skip the
+    rest of this section (except maybe for the description of the
+    =[EXTRA]= place holder):
+
+    #+begin_src emacs-lisp
+   (setq org-export-latex-default-packages-alist nil
+         org-export-latex-packages-alist nil)
+    #+end_src
+
+    /Continue to read here if you want to go along with the modified
+    setup./
+
+    There are now two variables that should be used to list the LaTeX
+    packages that need to be included in all classes.  The header
+    definition in =org-export-latex-classes= should then not contain
+    the corresponding =\usepackage= calls (see below).
+
+    The two new variables are:
+
+    1. =org-export-latex-default-packages-alist= :: This is the
+         variable where Org-mode itself puts the packages it needs.
+         Normally you should not change this variable.  The only
+         reason to change it anyway is when one of these packages
+         causes a conflict with another package you want to use.  Then
+         you can remove that packages and hope that you are not using
+         Org-mode functionality that needs it.
+
+    2. =org-export-latex-packages-alist= :: This is the variable where
+         you can put the packages that you'd like to use across all
+         classes.
+
+    The sequence how these customizations will show up in the LaTeX
+    document are:
+
+    1. Header from =org-export-latex-classes=
+    2. =org-export-latex-default-packages-alist=
+    3. =org-export-latex-packages-alist=
+    4. Buffer-specific things set with =#+LaTeX_HEADER:=
+
+    If you want more control about which segment is placed where, or
+    if you want, for a specific class, have full control over the
+    header and exclude some of the automatic building blocks, you can
+    put the following macro-like place holders into the header:
+
+    #+begin_example
+    [DEFAULT-PACKAGES]      \usepackage statements for default packages
+    [NO-DEFAULT-PACKAGES]   do not include any of the default packages
+    [PACKAGES]              \usepackage statements for packages
+    [NO-PACKAGES]           do not include the packages
+    [EXTRA]                 the stuff from #+LaTeX_HEADER
+    [NO-EXTRA]              do not include #+LaTeX_HEADER stuff
+    #+end_example
+
+    If you have currently customized =org-export-latex-classes=, you
+    should revise that customization and remove any package calls that
+    are covered by =org-export-latex-default-packages-alist=.  This
+    applies to the following packages:
+
+    - inputenc
+    - fontenc
+    - fixltx2e
+    - graphicx
+    - longtable
+    - float
+    - wrapfig
+    - soul
+    - t1enc
+    - textcomp
+    - marvosym
+    - wasysym
+    - latexsym
+    - amssymb
+    - hyperref
+
+    If one of these packages creates a conflict with another package
+    you are using, you can remove it from
+    =org-export-latex-default-packages-alist=.  But then you risk that
+    some of the advertised export features of Org will not work
+    properly.
+
+    You can also consider moving packages that you use in all classes
+    to =org-export-latex-packages-alist=.  If necessary, put the place
+    holders so that the packages get loaded in the right sequence.  As
+    said above, for backward compatibility, if you omit the place
+    holders, all the variables will dump their content at the end of
+    the header.
+
+*** The constant =org-html-entities= is obsolete
+
+    Its content is now part of the new constant =org-entities=, which
+    is defined in the file org-entities.el.  =org-html-entities= was
+    an internal variable, but it is possible that some users did write
+    code using it.
+
+*** =org-bbdb-anniversary-format-alist= has changed
+
+    Please check the docstring and update your settings accordingly.
+
+*** Deleted =org-mode-p=
+
+    This function has been deleted: please update your code.
+
+** Important new features
+
+*** New Org to ODT exporter
+
+    Jambunathan's Org to ODT exporter is now part of Org.
+
+    To use it, it `C-c C-e o' in an Org file.  See the documentation
+    for more information on how to customize it.
+
+*** org-capture.el is now the default capture system
+
+    This replaces the earlier system org-remember.  The manual only
+    describes org-capture, but for people who prefer to continue to
+    use org-remember, we keep a static copy of the former manual
+    section [[http://orgmode.org/org-remember.pdf][chapter about remember]].
+
+    The new system has a technically cleaner implementation and more
+    possibilities for capturing different types of data.  See
+    [[http://thread.gmane.org/gmane.emacs.orgmode/26441/focus%3D26441][Carsten's announcement]] for more details.
+
+    To switch over to the new system:
+
+    1. Run
+
+     : M-x org-capture-import-remember-templates RET
+
+       to get a translated version of your remember templates into the
+       new variable =org-capture-templates=.  This will "mostly" work,
+       but maybe not for all cases.  At least it will give you a good
+       place to modify your templates.  After running this command,
+       enter the customize buffer for this variable with
+
+     : M-x customize-variable RET org-capture-templates RET
+
+       and convince yourself that everything is OK.  Then save the
+       customization.
+
+    2. Bind the command =org-capture= to a key, similar to what you did
+       with org-remember:
+
+     : (define-key global-map "\C-cc" 'org-capture)
+
+       If your fingers prefer =C-c r=, you can also use this key once
+       you have decided to move over completely to the new
+       implementation.  During a test time, there is nothing wrong
+       with using both system in parallel.
+
+** New libraries
+
+*** New Org libraries
+**** org-eshell.el (Konrad Hinsen)
+
+     Implement links to eshell buffers.
+
+**** org-special-blocks (Carsten Dominik)
+
+     This package generalizes the #+begin_foo and #+end_foo tokens.
+
+     To use, put the following in your init file:
+
+     #+BEGIN_EXAMPLE
 (require 'org-special-blocks)
 #+END_EXAMPLE
 
-The tokens #+begin_center, #+begin_verse, etc. existed previously.  This
-package generalizes them (at least for the LaTeX and html exporters).  When
-a #+begin_foo token is encountered by the LaTeX exporter, it is expanded
-into \begin{foo}.  The text inside the environment is not protected, as
-text inside environments generally is.  When #+begin_foo is encountered by
-the html exporter, a div with class foo is inserted into the HTML file.  It
-is up to the user to add this class to his or her stylesheet if this div is
-to mean anything.
+     The tokens #+begin_center, #+begin_verse, etc. existed
+     previously.  This package generalizes them (at least for the
+     LaTeX and html exporters).  When a #+begin_foo token is
+     encountered by the LaTeX exporter, it is expanded
+     into \begin{foo}.  The text inside the environment is not
+     protected, as text inside environments generally is.
+     When #+begin_foo is encountered by the html exporter, a div with
+     class foo is inserted into the HTML file.  It is up to the user
+     to add this class to his or her stylesheet if this div is to mean
+     anything.
 
-*** org-taskjuggler.el (Christian Egli)
-    :PROPERTIES:
-    :OrgVersion:  7.01
-    :END:
+**** org-taskjuggler.el (Christian Egli)
 
-    Christian Egli's /org-taskjuggler.el/ module is now part of Org.  He
-    also wrote a [[http://orgmode.org/worg/org-tutorials/org-taskjuggler.php][tutorial]] for it.
+     Christian Egli's /org-taskjuggler.el/ module is now part of Org.
+     He also wrote a [[http://orgmode.org/worg/org-tutorials/org-taskjuggler.php][tutorial]] for it.
 
-*** org-ctags.el (Paul Sexton)
-    :PROPERTIES:
-    :OrgVersion:  6.34
-    :END:
+**** org-ctags.el (Paul Sexton)
 
-    Targets like =<<my target>>= can now be found by Emacs' etag
-    functionality, and Org-mode links can be used to to link to etags, also
-    in non-Org-mode files.  For details, see the file /org-ctags.el/.
+     Targets like =<<my target>>= can now be found by Emacs' etag
+     functionality, and Org-mode links can be used to to link to
+     etags, also in non-Org-mode files.  For details, see the file
+     /org-ctags.el/.
 
-    This feature uses a new hook =org-open-link-functions= which will call
-    function to do something special with text links.
+     This feature uses a new hook =org-open-link-functions= which will
+     call function to do something special with text links.
 
-    Thanks to Paul Sexton for this contribution.
+     Thanks to Paul Sexton for this contribution.
 
-*** org-docview.el (Jan Böcker)
-    :PROPERTIES:
-    :OrgVersion:  6.34
-    :END:
+**** org-docview.el (Jan Böcker)
 
-    This new module allows links to various file types using docview, where
-    Emacs displays images of document pages.  Docview link types can point
-    to a specific page in a document, for example to page 131 of the
-    Org-mode manual:
+     This new module allows links to various file types using docview, where
+     Emacs displays images of document pages.  Docview link types can point
+     to a specific page in a document, for example to page 131 of the
+     Org-mode manual:
 
-    : [[docview:~/.elisp/org/doc/org.pdf::131][Org-Mode Manual]]
+     : [[docview:~/.elisp/org/doc/org.pdf::131][Org-Mode Manual]]
 
-    Thanks to Jan Böcker for this contribution.
+     Thanks to Jan Böcker for this contribution.
 
-** New Babel libraries
+*** New Babel libraries
 
 - ob-picolisp.el (Thorsten Jolitz)
 - ob-fortran.el (Sergey Litvinov)
@@ -275,674 +902,531 @@ to mean anything.
 - ob-lilypond.el (Martyn Jago)
 - ob-awk.el (Eric Schulte)
 
-* Other new features and various enhancements
+** Other new features and various enhancements
 
-** Hyperlinks
+*** Hyperlinks
 
-*** Org-Bibtex -- major improvements
-    :PROPERTIES:
-    :OrgVersion:  7.6
-    :END:
+**** Org-Bibtex -- major improvements
 
-    Provides support for managing bibtex bibliographical references
-    data in headline properties.  Each headline corresponds to a
-    single reference and the relevant bibliographic meta-data is
-    stored in headline properties, leaving the body of the headline
-    free to hold notes and comments.  Org-bibtex is aware of all
-    standard bibtex reference types and fields.
+     Provides support for managing bibtex bibliographical references
+     data in headline properties.  Each headline corresponds to a
+     single reference and the relevant bibliographic meta-data is
+     stored in headline properties, leaving the body of the headline
+     free to hold notes and comments.  Org-bibtex is aware of all
+     standard bibtex reference types and fields.
 
-    The key new functions are
+     The key new functions are
 
-- org-bibtex-check :: queries the user to flesh out all required
-     (and with prefix argument optional) bibtex fields available
-     for the specific reference =type= of the current headline.
+     - org-bibtex-check :: queries the user to flesh out all required
+          (and with prefix argument optional) bibtex fields available
+          for the specific reference =type= of the current headline.
 
-- org-bibtex-create :: Create a new entry at the given level,
-     using org-bibtex-check to flesh out the relevant fields.
+     - org-bibtex-create :: Create a new entry at the given level,
+          using org-bibtex-check to flesh out the relevant fields.
 
-- org-bibtex-yank :: Yank a bibtex entry on the kill ring as a
-     formatted Org-mode headline into the current buffer
+     - org-bibtex-yank :: Yank a bibtex entry on the kill ring as a
+          formatted Org-mode headline into the current buffer
 
-- org-bibtex-export-to-kill-ring :: Export the current headline
-     to the kill ring as a formatted bibtex entry.
+     - org-bibtex-export-to-kill-ring :: Export the current headline
+          to the kill ring as a formatted bibtex entry.
 
+**** org-gnus.el now allows link creation from messages
 
+     You can now create links from messages.  This is particularily
+     useful when the user wants to stored messages that he sends, for
+     later check.  Thanks to Ulf Stegemann for the patch.
 
-*** org-gnus.el now allows link creation from messages
-    :PROPERTIES:
-    :OrgVersion:  7.5
-    :END:
+**** Modified link escaping
 
-    You can now create links from messages.  This is particularly
-    useful when the user wants to stored messages that he sends, for
-    later check.  Thanks to Ulf Stegemann for the patch.
+     David Maus worked on `org-link-escape'.  See [[http://article.gmane.org/gmane.emacs.orgmode/37888][his message]]:
 
+     : Percent escaping is used in Org mode to escape certain characters
+     : in links that would either break the parser (e.g. square brackets
+     : in link target oder description) or are not allowed to appear in
+     : a particular link type (e.g. non-ascii characters in a http:
+     : link).
+     :
+     : With this change in place Org will apply percent escaping and
+     : unescaping more consistently especially for non-ascii characters.
+     : Additionally some of the outstanding bugs or glitches concerning
+     : percent escaped links are solved.
 
+     Thanks a lot to David for this work.
 
-*** Modified link escaping
-    :PROPERTIES:
-    :OrgVersion:  7.5
-    :END:
+**** Make =org-store-link= point to directory in a dired buffer
 
-    David Maus worked on `org-link-escape'.  See [[http://article.gmane.org/gmane.emacs.orgmode/37888][his message]]:
+     When, in a dired buffer, the cursor is not in a line listing a
+     file, `org-store-link' will store a link to the directory.
 
-: Percent escaping is used in Org mode to escape certain characters
-: in links that would either break the parser (e.g. square brackets
-: in link target or description) or are not allowed to appear in
-: a particular link type (e.g. non-ascii characters in a http:
-: link).
-:
-: With this change in place Org will apply percent escaping and
-: unescaping more consistently especially for non-ascii characters.
-: Additionally some of the outstanding bugs or glitches concerning
-: percent escaped links are solved.
+     Patch by Stephen Eglen.
 
-    Thanks a lot to David for this work.
+**** Allow regexps in =org-file-apps= to capture link parameters
 
+     The way extension regexps in =org-file-apps= are handled has
+     changed.  Instead of matching against the file name, the regexps
+     are now matched against the whole link, and you can use grouping
+     to extract link parameters which you can then use in a command
+     string to be executed.
 
+     For example, to allow linking to PDF files using the syntax
+     =file:/doc.pdf::<page number>=, you can add the following entry
+     to org-file-apps:
 
-*** Make =org-store-link= point to directory in a dired buffer
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
+     #+begin_example
+     Extension: \.pdf::\([0-9]+\)\'
+     Command:   evince "%s" -p %1
+     #+end_example
 
-    When, in a dired buffer, the cursor is not in a line listing a
-    file, `org-store-link' will store a link to the directory.
+     Thanks to Jan Böcker for a patch to this effect.
 
-    Patch by Stephen Eglen.
+*** Dates and time
 
+**** Allow relative time when scheduling/adding a deadline
 
+     You can now use relative duration strings like "-2d" or "++3w"
+     when calling =org-schedule= or =org-deadline=: it will schedule
+     (or set the deadline for) the item respectively two days before
+     today and three weeks after the current timestamp, if any.
 
-*** Allow regexps in =org-file-apps= to capture link parameters
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
+     You can use this programmatically: =(org-schedule nil "+2d")=
+     will work on the current entry.
 
-    The way extension regexps in =org-file-apps= are handled has
-    changed.  Instead of matching against the file name, the regexps
-    are now matched against the whole link, and you can use grouping
-    to extract link parameters which you can then use in a command
-    string to be executed.
+     You can also use this while (bulk-)rescheduling and
+     (bulk-)resetting the deadline of (several) items from the agenda.
 
-    For example, to allow linking to PDF files using the syntax
-    =file:/doc.pdf::<page number>=, you can add the following entry to
-    org-file-apps:
+     Thanks to Memnon Anon for a heads up about this!
 
-    #+begin_example
-    Extension: \.pdf::\([0-9]+\)\'
-    Command:   evince "%s" -p %1
-    #+end_example
+**** American-style dates are now understood by =org-read-date=
 
-    Thanks to Jan Böcker for a patch to this effect.
+     So when you are prompted for a date, you can now answer like this
 
-** Dates and time
+     #+begin_example
+     2/5/3         --> 2003-02-05
+     2/5           --> <CURRENT-YEAR>-02-05
+     #+end_example
 
-*** Allow relative time when scheduling/adding a deadline
-    :PROPERTIES:
-    :OrgVersion:  7.7
-    :END:
+*** Agenda
 
-    You can now use relative duration strings like "-2d" or "++3w"
-    when calling =org-schedule= or =org-deadline=: it will schedule
-    (or set the deadline for) the item respectively two days before
-    today and three weeks after the current timestamp, if any.
+**** =org-agenda-custom-commands= has a default value
 
-    You can use this programmatically: =(org-schedule nil "+2d")=
-    will work on the current entry.
+     This option used to be `nil' by default.  This now has a default
+     value, displaying an agenda and all TODOs.  See the docstring for
+     details.  Thanks to Carsten for this.
 
-    You can also use this while (bulk-)rescheduling and
-    (bulk-)resetting the deadline of (several) items from the agenda.
+**** Improved filtering through =org-agenda-to-appt=
 
-    Thanks to Memnon Anon for a heads up about this!
+     The new function allows the user to refine the scope of entries
+     to pass to =org-agenda-get-day-entries= and allows to filter out
+     entries using a function.
 
+     Thanks to Peter Münster for raising a related issue and to
+     Tassilo Horn for this idea.  Also thanks to Peter Münster for
+     [[git:68ffb7a7][fixing a small bug]] in the final implementation.
 
+**** Allow ap/pm times in agenda time grid
 
+     Times in the agenda can now be displayed in am/pm format.  See
+     the new variable =org-agenda-timegrid-use-ampm=.  Thanks to
+     C. A. Webber for a patch to this effect.
 
-*** American-style dates are now understood by =org-read-date=
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
+**** Agenda: Added a bulk "scattering" command
 
-    So when you are prompted for a date, you can now answer like this
+     =B S= in the agenda buffer will cause tasks to be rescheduled a
+     random number of days into the future, with 7 as the default.
+     This is useful if you've got a ton of tasks scheduled for today,
+     you realize you'll never deal with them all, and you just want
+     them to be distributed across the next N days.  When called with
+     a prefix arg, rescheduling will avoid weekend days.
 
-    #+begin_example
-    2/5/3         --> 2003-02-05
-    2/5           --> <CURRENT-YEAR>-02-05
-    #+end_example
+     Thanks to John Wiegley for this.
 
-** Agenda
+*** Exporting
 
-*** =org-agenda-custom-commands= has a default value
-    :PROPERTIES:
-    :OrgVersion:  7.8
-    :END:
+**** Simplification of org-export-html-preamble/postamble
 
-    This option used to be `nil' by default.  This now has a default
-    value, displaying an agenda and all TODOs.  See the docstring for
-    details.  Thanks to Carsten for this.
+     When set to `t', export the preamble/postamble as usual, honoring
+     the =org-export-email/author/creator-info= variables.
 
+     When set to a formatting string, insert this string.  See the
+     docstring of these variable for details about available
+     %-sequences.
 
-*** Improved filtering through =org-agenda-to-appt=
-    :PROPERTIES:
-    :OrgVersion:  7.8
-    :END:
+     You can set =:html-preamble= in publishing project in the same
+     way: `t' means to honor =:email/creator/author-info=, and a
+     formatting string will insert a string.
 
-    The new function allows the user to refine the scope of entries
-    to pass to =org-agenda-get-day-entries= and allows to filter out
-    entries using a function.
+**** New exporters to Latin-1 and UTF-8
 
-    Thanks to Peter Münster for raising a related issue and to
-    Tassilo Horn for this idea.  Also thanks to Peter Münster for
-    [[git:68ffb7a7][fixing a small bug]] in the final implementation.
+     While Ulf Stegemann was going through the entities list to
+     improve the LaTeX export, he had the great idea to provide
+     representations for many of the entities in Latin-1, and for all
+     of them in UTF-8.  This means that we can now export files rich
+     in special symbols to Latin-1 and to UTF-8 files.  These new
+     exporters can be reached with the commands =C-c C-e n= and =C-c
+     C-e u=, respectively.
 
+     When there is no representation for a given symbol in the
+     targeted coding system, you can choose to keep the TeX-macro-like
+     representation, or to get an "explanatory" representation.  For
+     example, =\simeq= could be represented as "[approx. equal to]".
+     Please use the variable =org-entities-ascii-explanatory= to state
+     your preference.
 
+**** HTML export: Add class to outline containers using property
 
-*** Allow ap/pm times in agenda time grid
-    :PROPERTIES:
-    :OrgVersion:  7.4
-    :END:
+     The =HTML_CONTAINER_CLASS= property can now be used to add a
+     class name to the outline container of a node in HTML export.
 
-    Times in the agenda can now be displayed in am/pm format.  See the new
-    variable =org-agenda-timegrid-use-ampm=.  Thanks to C. A. Webber for
-    a patch to this effect.
+**** Throw an error when creating an image from a LaTeX snippet fails
 
+     This behavior can be configured with the new option variable
+     =org-format-latex-signal-error=.
 
+**** Support for creating BEAMER presentations from Org-mode documents
 
-*** Agenda: Added a bulk "scattering" command
-    :PROPERTIES:
-    :OrgVersion:  7.4
-    :END:
+     Org-mode documents or subtrees can now be converted directly in
+     to BEAMER presentation.  Turning a tree into a simple
+     presentations is straight forward, and there is also quite some
+     support to make richer presentations as well.  See the [[http://orgmode.org/manual/Beamer-class-export.html#Beamer-class-export][BEAMER
+     section]] in the manual for more details.
 
-    =B S= in the agenda buffer will cause tasks to be rescheduled a random
-    number of days into the future, with 7 as the default.  This is useful
-    if you've got a ton of tasks scheduled for today, you realize you'll
-    never deal with them all, and you just want them to be distributed
-    across the next N days.  When called with a prefix arg, rescheduling
-    will avoid weekend days.
+     Thanks to everyone who has contributed to the discussion about
+     BEAMER support and how it should work.  This was a great example
+     for how this community can achieve a much better result than any
+     individual could.
 
-    Thanks to John Wiegley for this.
+*** Refiling
 
-** Exporting
+**** Refile targets can now be cached
 
-*** Simplification of org-export-html-preamble/postamble
-    :PROPERTIES:
-    :OrgVersion:  7.5
-    :END:
+     You can turn on caching of refile targets by setting the variable
+     =org-refile-use-cache=.  This should speed up refiling if you
+     have many eligible targets in many files.  If you need to update
+     the cache because Org misses a newly created entry or still
+     offers a deleted one, press =C-0 C-c C-w=.
 
-    When set to `t', export the preamble/postamble as usual, honoring the
-    =org-export-email/author/creator-info= variables.
+**** New logging support for refiling
 
-    When set to a formatting string, insert this string.  See the docstring
-    of these variable for details about available %-sequences.
+     Whenever you refile an item, a time stamp and even a note can be
+     added to this entry.  For details, see the new option
+     =org-log-refile=.
 
-    You can set =:html-preamble= in publishing project in the same way: `t'
-    means to honor =:email/creator/author-info=, and a formatting string
-    will insert a string.
+     Thanks to Charles Cave for this idea.
 
-*** New exporters to Latin-1 and UTF-8
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
+*** Completion
 
-    While Ulf Stegemann was going through the entities list to improve the
-    LaTeX export, he had the great idea to provide representations for many
-    of the entities in Latin-1, and for all of them in UTF-8.  This means
-    that we can now export files rich in special symbols to Latin-1 and to
-    UTF-8 files.  These new exporters can be reached with the commands =C-c
-    C-e n= and =C-c C-e u=, respectively.
+**** In-buffer completion is now done using John Wiegleys pcomplete.el
 
-    When there is no representation for a given symbol in the targeted
-    coding system, you can choose to keep the TeX-macro-like
-    representation, or to get an "explanatory" representation.  For
-    example, =\simeq= could be represented as "[approx. equal to]".  Please
-    use the variable =org-entities-ascii-explanatory= to state your
-    preference.
+     Thanks to John Wiegley for much of this code.
 
-*** HTML export: Add class to outline containers using property
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
+*** Tables
 
-    The =HTML_CONTAINER_CLASS= property can now be used to add a class name
-    to the outline container of a node in HTML export.
+**** New command =org-table-transpose-table-at-point=
 
-*** Throw an error when creating an image from a LaTeX snippet fails
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
+     See the docstring.  This hack from Juan Pechiar is now part of
+     Org's core.  Thanks to Juan!
 
-    This behavior can be configured with the new option variable
-    =org-format-latex-signal-error=.
+**** Display field's coordinates when editing it with =C-c `=
 
-*** Support for creating BEAMER presentations from Org-mode documents
-    :PROPERTIES:
-    :OrgVersion:  6.34
-    :END:
+     When editing a field with =C-c `=, the field's coordinate will
+     the displayed in the buffer.
 
-    Org-mode documents or subtrees can now be converted directly in to
-    BEAMER presentation.  Turning a tree into a simple presentations is
-    straight forward, and there is also quite some support to make richer
-    presentations as well.  See the [[http://orgmode.org/manual/Beamer-class-export.html#Beamer-class-export][BEAMER section]] in the manual for more
-    details.
+     Thanks to Michael Brand for a patch to this effect.
 
-    Thanks to everyone who has contributed to the discussion about BEAMER
-    support and how it should work.  This was a great example for how this
-    community can achieve a much better result than any individual could.
+**** Spreadsheet computation of durations and time values
 
-** Refiling
+     If you want to compute time values use the =T= flag, either in
+     Calc formulas or Elisp formulas:
 
-*** Refile targets can now be cached
-    :PROPERTIES:
-    :OrgVersion:  7.01
-    :END:
+     | Task 1 | Task 2 |   Total |
+     |--------+--------+---------|
+     |  35:00 |  35:00 | 1:10:00 |
+     #+TBLFM: @2$3=$1+$2;T
 
-    You can turn on caching of refile targets by setting the variable
-    =org-refile-use-cache=.  This should speed up refiling if you have many
-    eligible targets in many files.  If you need to update the cache
-    because Org misses a newly created entry or still offers a deleted one,
-    press =C-0 C-c C-w=.
+     Values must be of the form =[HH:]MM:SS=, where hours are
+     optional.
 
-*** New logging support for refiling
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
+     Thanks to Martin Halder, Eric Schulte and Carsten for code and
+     feedback on this.
 
-    Whenever you refile an item, a time stamp and even a note can be added
-    to this entry.  For details, see the new option =org-log-refile=.
+**** Implement formulas applying to field ranges
 
-    Thanks to Charles Cave for this idea.
+     Carsten implemented this field-ranges formulas.
 
-** Completion
+     : A frequently requested feature for tables has been to be able to define
+     : row formulas in a way similar to column formulas.  The patch below allows
+     : things like
+     :
+     : @3=
+     : @2$2..@5$7=
+     : @I$2..@II$4=
+     :
+     : as the left hand side for table formulas in order to write a formula that
+     : is valid for an entire column or for a rectangular section in a
+     : table.
 
-*** In-buffer completion is now done using John Wiegley's pcomplete.el
-    :PROPERTIES:
-    :OrgVersion:  7.4
-    :END:
+     Thanks a lot to Carsten for this.
 
-    Thanks to John Wiegley for much of this code.
+**** Sending radio tables from org buffers is now allowed
 
-** Tables
+     Org radio tables can no also be sent inside Org buffers.  Also,
+     there is a new hook which get called after a table has been sent.
 
-*** New command =org-table-transpose-table-at-point=
-    :PROPERTIES:
-    :OrgVersion:  7.8
-    :END:
+     Thanks to Seweryn Kokot.
 
-    See the docstring.  This hack from Juan Pechiar is now part of Org's
-    core.  Thanks to Juan!
+*** Lists
 
-*** Display field's coordinates when editing it with =C-c `=
-    :PROPERTIES:
-    :OrgVersion:  7.7
-    :END:
+**** Improved handling of lists
 
-    When editing a field with =C-c `=, the field's coordinate will the
-    displayed in the buffer.
+     Nicolas Goaziou extended and improved the way Org handles lists.
 
-    Thanks to Michael Brand for a patch to this effect.
+     1. Indentation of text determines again end of items in
+        lists. So, some text less indented than the previous item
+        doesn't close the whole list anymore, only all items more
+        indented than it.
 
-*** Spreadsheet computation of durations and time values
-    :PROPERTIES:
-    :OrgVersion:  7.6
-    :END:
+     2. Alphabetical bullets are implemented, through the use of the
+        variable `org-alphabetical-lists'. This also adds alphabetical
+        counters like [@c] or [@W].
 
-    If you want to compute time values use the =T= flag, either in Calc
-    formulas or Elisp formulas:
+     3. Lists can now safely contain drawers, inline tasks, or various
+        blocks, themselves containing lists. Two variables are
+        controlling this: `org-list-forbidden-blocks', and
+        `org-list-export-context'.
 
-    | Task 1 | Task 2 |   Total |
-    |--------+--------+---------|
-    |  35:00 |  35:00 | 1:10:00 |
-    #+TBLFM: @2$3=$1+$2;T
+     4. Improve `newline-and-indent' (C-j): used in an item, it will
+        keep text from moving at column 0. This allows to split text
+        and make paragraphs and still not break the list.
 
-    Values must be of the form =[HH:]MM:SS=, where hours are optional.
+     5. Improve `org-toggle-item' (C-c -): used on a region with
+        standard text, it will change the region into one item. With a
+        prefix argument, it will fallback to the previous behavior and
+        make every line in region an item. It permits to easily
+        integrate paragraphs inside a list.
 
-    Thanks to Martin Halder, Eric Schulte and Carsten for code and feedback
-    on this.
+     6. `fill-paragraph' (M-q) now understands lists. It can freely be
+        used inside items, or on text just after a list, even with no
+        blank line around, without breaking list structure.
 
-*** Implement formulas applying to field ranges
-    :PROPERTIES:
-    :OrgVersion:  7.5
-    :END:
+     Thanks a lot to Nicolas for all this!
 
-    Carsten implemented this field-ranges formulas.
+*** Inline display of linked images
 
-    : A frequently requested feature for tables has been to be able to define
-    : row formulas in a way similar to column formulas.  The patch below allows
-    : things like
-    :
-    : @3=
-    : @2$2..@5$7=
-    : @I$2..@II$4=
-    :
-    : as the left hand side for table formulas in order to write a formula that
-    : is valid for an entire column or for a rectangular section in a
-    : table.
+    Images can now be displayed inline.  The key C-c C-x C-v does
+    toggle the display of such images.  Note that only image links
+    that have no description part will be inlined.
 
-    Thanks a lot to Carsten for this.
+*** Implement offsets for ordered lists
 
-*** Sending radio tables from org buffers is now allowed
-    :PROPERTIES:
-    :OrgVersion:  7.4
-    :END:
+    If you want to start an ordered plain list with a number different
+    from 1, you can now do it like this:
 
-    Org radio tables can no also be sent inside Org buffers.  Also, there
-    is a new hook which get called after a table has been sent.
+    : 1. [@start:12] will star a lit a number 12
 
-    Thanks to Seweryn Kokot.
+*** Babel: code block body expansion for table and preview
 
-** Lists
+    In org-babel, code is "expanded" prior to evaluation. I.e. the
+    code that is actually evaluated comprises the code block contents,
+    augmented with the extra code which assigns the referenced data to
+    variables. It is now possible to preview expanded contents, and
+    also to expand code during during tangling. This expansion takes
+    into account all header arguments, and variables.
 
-*** Improved handling of lists
-    :PROPERTIES:
-    :OrgVersion:  7.5
-    :END:
+    A new keybinding `C-c M-b p' bound to `org-babel-expand-src-block'
+    can be used from inside of a source code block to preview its
+    expanded contents (which can be very useful for debugging).
+    tangling
 
-    Nicolas Goaziou extended and improved the way Org handles lists.
+    The expanded body can now be tangled, this includes variable
+    values which may be the results of other source-code blocks, or
+    stored in headline properties or tables. One possible use for this
+    is to allow those using org-babel for their emacs initialization
+    to store values (e.g. usernames, passwords, etc...) in headline
+    properties or in tables.
 
-    1. Indentation of text determines again end of items in lists. So, some
-       text less indented than the previous item doesn't close the whole
-       list anymore, only all items more indented than it.
+    Org-babel now supports three new header arguments, and new default
+    behavior for handling horizontal lines in tables (hlines), column
+    names, and rownames across all languages.
 
-    2. Alphabetical bullets are implemented, through the use of the
-       variable `org-alphabetical-lists'. This also adds alphabetical
-       counters like [@c] or [@W].
+*** Editing Convenience and Appearance
 
-    3. Lists can now safely contain drawers, inline tasks, or various
-       blocks, themselves containing lists. Two variables are controlling
-       this: `org-list-forbidden-blocks', and `org-list-export-context'.
+**** New command =org-copy-visible= (=C-c C-x v=)
 
-    4. Improve `newline-and-indent' (C-j): used in an item, it will keep
-       text from moving at column 0. This allows to split text and make
-       paragraphs and still not break the list.
+     This command will copy the visible text in the region into the
+     kill ring.  Thanks to Florian Beck for this function and to
+     Carsten for adding it to org.el and documenting it!
 
-    5. Improve `org-toggle-item' (C-c -): used on a region with standard
-       text, it will change the region into one item. With a prefix
-       argument, it will fallback to the previous behavior and make every
-       line in region an item. It permits to easily integrate paragraphs
-       inside a list.
+**** Make it possible to protect hidden subtrees from being killed by =C-k=
 
-    6. `fill-paragraph' (M-q) now understands lists. It can freely be used
-       inside items, or on text just after a list, even with no blank line
-       around, without breaking list structure.
+     See the new variable =org-ctrl-k-protect-subtree=.  This was a
+     request by Scott Otterson.
 
-    Thanks a lot to Nicolas for all this!
+**** Implement pretty display of entities, sub-, and superscripts.
 
-** Inline display of linked images
-   :PROPERTIES:
-   :OrgVersion:  6.36
-   :END:
-
-   Images can now be displayed inline.  The key C-c C-x C-v does toggle the
-   display of such images.  Note that only image links that have no
-   description part will be inlined.
+     The command =C-c C-x \= toggles the display of Org's special
+     entities like =\alpha= as pretty unicode characters.  Also, sub
+     and superscripts are displayed in a pretty way (raised/lower
+     display, in a smaller font).  If you want to exclude sub- and
+     superscripts, see the variable
+     =org-pretty-entities-include-sub-superscripts=.
 
-** Implement offsets for ordered lists
-   :PROPERTIES:
-   :OrgVersion:  6.36
-   :END:
-
-   If you want to start an ordered plain list with a number different from
-   1, you can now do it like this:
-
-   : 1. [@start:12] will star a lit a number 12
+     Thanks to Eric Schulte and Ulf Stegeman for making this possible.
 
-** Babel: code block body expansion for table and preview
-   :PROPERTIES:
-   :OrgVersion:  6.36
-   :END:
-
-   In org-babel, code is "expanded" prior to evaluation. I.e. the code that
-   is actually evaluated comprises the code block contents, augmented with
-   the extra code which assigns the referenced data to variables. It is now
-   possible to preview expanded contents, and also to expand code during
-   during tangling. This expansion takes into account all header arguments,
-   and variables.
-
-   A new key-binding `C-c M-b p' bound to `org-babel-expand-src-block' can
-   be used from inside of a source code block to preview its expanded
-   contents (which can be very useful for debugging).  tangling
-
-   The expanded body can now be tangled, this includes variable values
-   which may be the results of other source-code blocks, or stored in
-   headline properties or tables. One possible use for this is to allow
-   those using org-babel for their emacs initialization to store values
-   (e.g. usernames, passwords, etc...) in headline properties or in tables.
-
-   Org-babel now supports three new header arguments, and new default
-   behavior for handling horizontal lines in tables (hlines), column names,
-   and rownames across all languages.
-
-** Editing Convenience and Appearance
+**** New faces for title, date, author and email address lines
 
-*** New command =org-copy-visible= (=C-c C-x v=)
-    :PROPERTIES:
-    :OrgVersion:  7.7
-    :END:
+     The keywords in these lines are now dimmed out, and the title is
+     displayed in a larger font, and a special font is also used for
+     author, date, and email information.  This is implemented by the
+     following new faces:
 
-    This command will copy the visible text in the region into the kill
-    ring.  Thanks to Florian Beck for this function and to Carsten for
-    adding it to org.el and documenting it!
+     =org-document-title=
+     =org-document-info=
+     =org-document-info-keyword=
 
-*** Make it possible to protect hidden subtrees from being killed by =C-k=
-    :PROPERTIES:
-    :OrgVersion:  7.01
-    :END:
+     In addition, the variable =org-hidden-keywords= can be used to
+     make the corresponding keywords disappear.
 
-    See the new variable =org-ctrl-k-protect-subtree=.  This was a request
-    by Scott Otterson.
+     Thanks to Dan Davison for this feature.
 
-*** Implement pretty display of entities, sub-, and superscripts.
-    :PROPERTIES:
-    :OrgVersion:  7.01
-    :END:
+**** Simpler way to specify faces for tags and todo keywords
 
-    The command =C-c C-x \= toggles the display of Org's special entities
-    like =\alpha= as pretty unicode characters.  Also, sub and superscripts
-    are displayed in a pretty way (raised/lower display, in a smaller
-    font).  If you want to exclude sub- and superscripts, see the variable
-    =org-pretty-entities-include-sub-superscripts=.
-
-    Thanks to Eric Schulte and Ulf Stegeman for making this possible.
-
-*** New faces for title, date, author and email address lines
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
-
-    The keywords in these lines are now dimmed out, and the title is
-    displayed in a larger font, and a special font is also used for author,
-    date, and email information.  This is implemented by the following new
-    faces:
-
-    =org-document-title=
-    =org-document-info=
-    =org-document-info-keyword=
-
-    In addition, the variable =org-hidden-keywords= can be used to make the
-    corresponding keywords disappear.
+     The variables =org-todo-keyword-faces=, =org-tag-faces=, and
+     =org-priority-faces= now accept simple color names as
+     specifications.  The colors will be used as either foreground or
+     background color for the corresponding keyword.  See also the
+     variable =org-faces-easy-properties=, which governs which face
+     property is affected by this setting.
 
-    Thanks to Dan Davison for this feature.
-
-*** Simpler way to specify faces for tags and todo keywords
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
-
-    The variables =org-todo-keyword-faces=, =org-tag-faces=, and
-    =org-priority-faces= now accept simple color names as specifications.
-    The colors will be used as either foreground or background color for
-    the corresponding keyword.  See also the variable
-    =org-faces-easy-properties=, which governs which face property is
-    affected by this setting.
+     This is really a great simplification for setting keyword faces.
+     The change is based on an idea and patch by Ryan Thompson.
 
-    This is really a great simplification for setting keyword faces.  The
-    change is based on an idea and patch by Ryan Thompson.
-
-*** <N> in tables now means fixed width, not maximum width
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
+**** <N> in tables now means fixed width, not maximum width
 
-    Requested by Michael Brand.
+     Requested by Michael Brand.
 
-*** Better level cycling function
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
+**** Better level cycling function
 
-    =TAB= in an empty headline cycles the level of that headline through
-    likely states.  Ryan Thompson implemented an improved version of this
-    function, which does not depend upon when exactly this command is used.
-    Thanks to Ryan for this improvement.
+     =TAB= in an empty headline cycles the level of that headline
+     through likely states.  Ryan Thompson implemented an improved
+     version of this function, which does not depend upon when exactly
+     this command is used.  Thanks to Ryan for this improvement.
 
-*** Adaptive filling
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
+**** Adaptive filling
 
-    For paragraph text, =org-adaptive-fill-function= did not handle the
-    base case of regular text which needed to be filled.  This is now
-    fixed.  Among other things, it allows email-style ">" comments to be
-    filled correctly.
+     For paragraph text, =org-adaptive-fill-function= did not handle
+     the base case of regular text which needed to be filled.  This is
+     now fixed.  Among other things, it allows email-style ">"
+     comments to be filled correctly.
 
-    Thanks to Dan Hackney for this patch.
+     Thanks to Dan Hackney for this patch.
 
-*** `org-reveal' (=C-c C-r=) also decrypts encrypted entries (org-crypt.el)
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
+**** `org-reveal' (=C-c C-r=) also decrypts encrypted entries (org-crypt.el)
 
-    Thanks to Richard Riley for triggering this change.
+     Thanks to Richard Riley for triggering this change.
 
-*** Better automatic letter selection for TODO keywords
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
+**** Better automatic letter selection for TODO keywords
 
-    When all first letters of keywords have been used, Org now assigns more
-    meaningful characters based on the keywords.
+     When all first letters of keywords have been used, Org now
+     assigns more meaningful characters based on the keywords.
 
-    Thanks to Mikael Fornius for this patch.
+     Thanks to Mikael Fornius for this patch.
 
-** Clocking
+*** Clocking
 
-*** Clock: Allow synchronous update of timestamps in CLOCK log
-    :PROPERTIES:
-    :OrgVersion:  7.7
-    :END:
+**** Clock: Allow synchronous update of timestamps in CLOCK log
 
-    Using =S-M-<up/down>= on CLOCK log timestamps will increase/decrease
-    the two timestamps on this line so that duration will keep the same.
-    Note that duration can still be slightly modified in case a timestamp
-    needs some rounding.
+     Using =S-M-<up/down>= on CLOCK log timestamps will
+     increase/decrease the two timestamps on this line so that
+     duration will keep the same.  Note that duration can still be
+     slightly modified in case a timestamp needs some rounding.
 
-    Thanks to Rainer Stengele for this idea.
+     Thanks to Rainer Stengele for this idea.
 
-*** Localized clock tables
-    :PROPERTIES:
-    :OrgVersion:  7.5
-    :END:
+**** Localized clock tables
 
-    Clock tables now support a new new =:lang= parameter, allowing the user
-    to customize the localization of the table headers.  See the variable
-    =org-clock-clocktable-language-setup= which controls available
-    translated strings.
+     Clock tables now support a new new =:lang= parameter, allowing
+     the user to customize the localization of the table headers.  See
+     the variable =org-clock-clocktable-language-setup= which controls
+     available translated strings.
 
-*** Show clock overruns in mode line
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
+**** Show clock overruns in mode line
 
-    When clocking an item with a planned effort, overrunning the planned
-    time is now made visible in the mode line, for example using the new
-    face =org-mode-line-clock-overrun=, or by adding an extra string given
-    by =org-task-overrun-text=.
+     When clocking an item with a planned effort, overrunning the
+     planned time is now made visible in the mode line, for example
+     using the new face =org-mode-line-clock-overrun=, or by adding an
+     extra string given by =org-task-overrun-text=.
 
-    Thanks to Richard Riley for a patch to this effect.
+     Thanks to Richard Riley for a patch to this effect.
 
-*** Clock reports can now include the running, incomplete clock
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
+**** Clock reports can now include the running, incomplete clock
 
-    If you have a clock running, and the entry being clocked falls into the
-    scope when creating a clock table, the time so far spent can be added
-    to the total.  This behavior depends on the setting of
-    =org-clock-report-include-clocking-task=.  The default is =nil=.
+     If you have a clock running, and the entry being clocked falls
+     into the scope when creating a clock table, the time so far spent
+     can be added to the total.  This behavior depends on the setting
+     of =org-clock-report-include-clocking-task=.  The default is
+     =nil=.
 
-    Thanks to Bernt Hansen for this useful addition.
+     Thanks to Bernt Hansen for this useful addition.
 
-** Misc
+*** Misc
 
-*** Improvements with inline tasks and indentation
-    :PROPERTIES:
-    :OrgVersion:  7.4
-    :END:
+**** Improvements with inline tasks and indentation
 
-    There is now a configurable way on how to export inline tasks.  See the
-    new variable =org-inlinetask-export-templates=.
+     There is now a configurable way on how to export inline tasks.
+     See the new variable =org-inlinetask-export-templates=.
 
-    Thanks to Nicolas Goaziou for coding these changes.
+     Thanks to Nicolas Goaziou for coding these changes.
 
-*** A property value of "nil" now means to unset a property
-    :PROPERTIES:
-    :OrgVersion:  7.01
-    :END:
+**** A property value of "nil" now means to unset a property
 
-    This can be useful in particular with property inheritance, if some
-    upper level has the property, and some grandchild of it would like to
-    have the default settings (i.e. not overruled by a property) back.
+     This can be useful in particular with property inheritance, if
+     some upper level has the property, and some grandchild of it
+     would like to have the default settings (i.e. not overruled by a
+     property) back.
 
-    Thanks to Robert Goldman and Bernt Hansen for suggesting this change.
+     Thanks to Robert Goldman and Bernt Hansen for suggesting this
+     change.
 
-*** New helper functions in org-table.el
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
+**** New helper functions in org-table.el
 
-    There are new functions to access and write to a specific table field.
-    This is for hackers, and maybe for the org-babel people.
+     There are new functions to access and write to a specific table field.
+     This is for hackers, and maybe for the org-babel people.
 
-    #+begin_example
-    org-table-get
-    org-table-put
-    org-table-current-line
-    org-table-goto-line
-    #+end_example
+     #+begin_example
+     org-table-get
+     org-table-put
+     org-table-current-line
+     org-table-goto-line
+     #+end_example
 
-*** Archiving: Allow to reverse order in target node
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
+**** Archiving: Allow to reverse order in target node
 
-    The new option =org-archive-reversed-order= allows to have archived
-    entries inserted in a last-on-top fashion in the target node.
+     The new option =org-archive-reversed-order= allows to have
+     archived entries inserted in a last-on-top fashion in the target
+     node.
 
-    This was requested by Tom.
+     This was requested by Tom.
 
-*** Org-reveal: Double prefix arg shows the entire subtree of the parent
-    :PROPERTIES:
-    :OrgVersion:  6.35
-    :END:
+**** Org-reveal: Double prefix arg shows the entire subtree of the parent
 
-    This can help to get out of an inconsistent state produced for example
-    by viewing from the agenda.
+     This can help to get out of an inconsistent state produced for
+     example by viewing from the agenda.
 
-    This was a request by Matt Lundin.
+     This was a request by Matt Lundin.
 
 * License
 
-This file is part of GNU Emacs.
+  This file is part of GNU Emacs.
 
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+  GNU Emacs is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+  You should have received a copy of the GNU General Public License
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/etc/images/icons/README b/etc/images/icons/README
index 664c52906ac..d71641684cd 100644
--- a/etc/images/icons/README
+++ b/etc/images/icons/README
@@ -9,13 +9,6 @@ Copyright (C) 2007-2012  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
 
-Files: hicolor/16x16/apps/emacs22.png hicolor/24x24/apps/emacs22.png
-       hicolor/32x32/apps/emacs22.png hicolor/48x48/apps/emacs22.png
-
-Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
-Copyright (C) 2005-2012  Free Software Foundation, Inc.
-License: GNU General Public License version 3 or later (see COPYING)
-
 Files: allout-widgets-dark-bg/closed.png
        allout-widgets-dark-bg/closed.xpm
        allout-widgets-dark-bg/empty.png
diff --git a/etc/images/icons/hicolor/16x16/apps/emacs22.png b/etc/images/icons/hicolor/16x16/apps/emacs22.png
deleted file mode 100644
index b419b01b4ee..00000000000
--- a/etc/images/icons/hicolor/16x16/apps/emacs22.png
+++ /dev/null
diff --git a/etc/images/icons/hicolor/24x24/apps/emacs22.png b/etc/images/icons/hicolor/24x24/apps/emacs22.png
deleted file mode 100644
index 790ec7e2bff..00000000000
--- a/etc/images/icons/hicolor/24x24/apps/emacs22.png
+++ /dev/null
diff --git a/etc/images/icons/hicolor/32x32/apps/emacs22.png b/etc/images/icons/hicolor/32x32/apps/emacs22.png
deleted file mode 100644
index 31fbb47c0d2..00000000000
--- a/etc/images/icons/hicolor/32x32/apps/emacs22.png
+++ /dev/null
diff --git a/etc/images/icons/hicolor/48x48/apps/emacs22.png b/etc/images/icons/hicolor/48x48/apps/emacs22.png
deleted file mode 100644
index f0df0fb6594..00000000000
--- a/etc/images/icons/hicolor/48x48/apps/emacs22.png
+++ /dev/null
diff --git a/etc/org/OrgOdtContentTemplate.xml b/etc/org/OrgOdtContentTemplate.xml
index cd7ff0e1564..55e1b787066 100644
--- a/etc/org/OrgOdtContentTemplate.xml
+++ b/etc/org/OrgOdtContentTemplate.xml
@@ -256,6 +256,7 @@
         <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
         <text:sequence-decl text:display-outline-level="0" text:name="Equation"/>
         <text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
+        <text:sequence-decl text:display-outline-level="0" text:name="Listing"/>
       </text:sequence-decls>
     </office:text>
   </office:body>
diff --git a/etc/org/OrgOdtStyles.xml b/etc/org/OrgOdtStyles.xml
index 84125c96d8a..5dfcfa83890 100644
--- a/etc/org/OrgOdtStyles.xml
+++ b/etc/org/OrgOdtStyles.xml
@@ -319,6 +319,11 @@
   <style:style style:name="Table" style:family="paragraph" style:parent-style-name="Caption" style:class="extra">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
   </style:style>
+  <style:style style:name="Listing" style:family="paragraph" style:parent-style-name="Caption" style:class="extra">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" fo:keep-with-next="always">
+    <style:tab-stops/>
+   </style:paragraph-properties>
+  </style:style>
   <style:style style:name="Horizontal_20_Line" style:display-name="Horizontal Line" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="html">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.499cm" style:border-line-width-bottom="0.002cm 0.035cm 0.002cm" fo:padding="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.039cm double #808080" text:number-lines="false" text:line-number="0" style:join-border="false"/>
    <style:text-properties fo:font-size="6pt" style:font-size-asian="6pt" style:font-size-complex="6pt"/>
diff --git a/etc/refcards/orgcard.pdf b/etc/refcards/orgcard.pdf
index 2b474bf4e93..2f004418443 100644
--- a/etc/refcards/orgcard.pdf
+++ b/etc/refcards/orgcard.pdf
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 60e81f36d3e..45b8ef04732 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{7.8.11}
+\def\orgversionnumber{7.9.2}
 \def\versionyear{2012}          % latest update
 \input emacsver.tex
 
diff --git a/etc/srecode/c.srt b/etc/srecode/c.srt
new file mode 100644
index 00000000000..14d51ed02e6
--- /dev/null
+++ b/etc/srecode/c.srt
@@ -0,0 +1,164 @@
+;;; c.srt --- SRecode templates for c-mode
+
+;; Copyright (C) 2007, 2008, 2009, 2010, 2012 Free Software Foundation, Inc.
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+set mode "c-mode"
+
+set comment_start  "/**"
+set comment_end    " */"
+set comment_prefix " *"
+
+;; OVERRIDE THIS in your user or project template file to whatever
+;; you use for your project.
+set HEADEREXT ".h"
+
+context file
+
+template empty :time :user :file :c
+----
+{{>:filecomment}}
+
+{{#NOTHEADER}}
+
+{{^}}
+{{/NOTHEADER}}
+{{#HEADER}}
+{{>:header_guard}}
+{{/HEADER}}
+----
+
+template header_guard :file :blank
+----
+#ifndef {{FILENAME_SYMBOL}}
+#define {{FILENAME_SYMBOL}} 1
+
+{{^}}
+
+#endif // {{FILENAME_SYMBOL}}
+----
+
+context misc
+
+template arglist
+"Insert an argument list for a function.
+@todo - Support smart CR in a buffer for not too long lines."
+----
+({{#ARGS}}{{TYPE}} {{NAME}}{{#NOTLAST}},{{/NOTLAST}}{{/ARGS}})
+----
+
+context declaration
+
+prompt TYPE "Return Type: "
+
+template function :indent :blank
+"Insert a function declaration."
+----
+{{?TYPE}} {{?NAME}}{{>:misc:arglist}}
+{{#INITIALIZERS}}{{>B:initializers}}{{/INITIALIZERS}}
+{
+{{^}}
+}
+----
+bind "f"
+
+template function-prototype :indent :blank
+"Insert a function declaration."
+----
+{{?TYPE}} {{?NAME}}{{>:misc:arglist}};
+----
+
+
+prompt TYPE "Data Type: "
+
+template variable :indent :blank
+"Insert a variable declaration."
+----
+{{?TYPE}} {{?NAME}}{{#HAVEDEFAULT}} = {{DEFAULT}}{{/HAVEDEFAULT}};
+----
+bind "v"
+
+template variable-prototype :indent :blank
+"Insert a variable declaration."
+----
+{{?TYPE}} {{?NAME}};
+----
+bind "v"
+
+
+template include :blank
+"An include statement."
+----
+#include "{{?NAME}}"
+----
+bind "i"
+
+template system-include :blank
+"An include statement."
+----
+#include <{{?NAME}}>
+----
+bind "i"
+
+template label :blank :indent
+----
+  {{?NAME}}:
+----
+
+context declaration
+
+template comment-function :indent :blank
+"Used to put a nice comment in front of a function.
+Override this with your own preference to avoid using doxygen"
+----
+{{>A:declaration:doxygen-function}}
+----
+
+;;; DOXYGEN FEATURES
+;; 
+;;
+context declaration
+
+template doxygen-function :indent :blank
+----
+/**
+ * @name {{NAME}} - {{DOC}}{{^}}{{#ARGS}}
+ * @param {{NAME}} - {{DOC}}{{/ARGS}}
+ * @return {{TYPE}}
+ */
+----
+
+template doxygen-variable-same-line
+----
+/**< {{DOC}}{{^}} */
+----
+
+template doxygen-section-comment :blank :indent
+"Insert a comment that separates sections of an Emacs Lisp file."
+----
+
+/** {{?TITLE}}
+ *
+ * {{^}}
+ */
+
+----
+
+
+;; end
diff --git a/etc/srecode/cpp.srt b/etc/srecode/cpp.srt
index 16cfc535761..f73dcd2a1ca 100644
--- a/etc/srecode/cpp.srt
+++ b/etc/srecode/cpp.srt
@@ -25,82 +25,8 @@ set comment_start  "/**"
 set comment_end    " */"
 set comment_prefix " *"
 
-;; OVERRIDE THIS in your user or project template file to whatever
-;; you use for your project.
-set HEADEREXT ".h"
-
-context file
-
-template empty :time :user :file :cpp
-----
-{{>:filecomment}}
-
-{{#NOTHEADER}}
-
-{{^}}
-{{/NOTHEADER}}
-{{#HEADER}}
-{{>:header_guard}}
-{{/HEADER}}
-----
-
-template header_guard :file :blank
-----
-#ifndef {{FILENAME_SYMBOL}}
-#define {{FILENAME_SYMBOL}} 1
-
-{{^}}
-
-#endif // {{FILENAME_SYMBOL}}
-----
-
-context misc
-
-template arglist
-"Insert an argument list for a function.
-@todo - Support smart CR in a buffer for not too long lines."
-----
-({{#ARGS}}{{TYPE}} {{NAME}}{{#NOTLAST}},{{/NOTLAST}}{{/ARGS}})
-----
-
 context declaration
 
-prompt TYPE "Return Type: "
-
-template function :indent :blank
-"Insert a function declaration."
-----
-{{?TYPE}} {{?NAME}}{{>:misc:arglist}}
-{{#INITIALIZERS}}{{>B:initializers}}{{/INITIALIZERS}}
-{
-{{^}}
-}
-----
-bind "f"
-
-template function-prototype :indent :blank
-"Insert a function declaration."
-----
-{{?TYPE}} {{?NAME}}{{>:misc:arglist}};
-----
-
-
-prompt TYPE "Data Type: "
-
-template variable :indent :blank
-"Insert a variable declaration."
-----
-{{?TYPE}} {{?NAME}}{{#HAVEDEFAULT}} = {{DEFAULT}}{{/HAVEDEFAULT}};
-----
-bind "v"
-
-template variable-prototype :indent :blank
-"Insert a variable declaration."
-----
-{{?TYPE}} {{?NAME}};
-----
-bind "v"
-
 template class :indent :blank
 "Insert a C++ class.  For use by user insertion.
 Override this template to change contents of a class.
@@ -146,18 +72,6 @@ template method :indent :blank
 }
 ----
 
-template include :blank
-"An include statement."
-----
-#include "{{?NAME}}"
-----
-bind "i"
-
-template label :blank :indent
-----
-  {{?NAME}}:
-----
-
 context classdecl
 
 template constructor-tag :indent :blank
@@ -196,15 +110,6 @@ Override this with your own preference to avoid using doxygen."
 {{>A:classdecl:doxygen-function-group-end}}
 ----
 
-context declaration
-
-template comment-function :indent :blank
-"Used to put a nice comment in front of a function.
-Override this with your own preference to avoid using doxygen"
-----
-{{>A:declaration:doxygen-function}}
-----
-
 ;;; DOXYGEN FEATURES
 ;; 
 ;;
@@ -229,32 +134,4 @@ template doxygen-function-group-end :indent :blank
 
 ----
 
-context declaration
-
-template doxygen-function :indent :blank
-----
-/**
- * @name {{NAME}} - {{DOC}}{{^}}{{#ARGS}}
- * @param {{NAME}} - {{DOC}}{{/ARGS}}
- * @return {{TYPE}}
- */
-----
-
-template doxygen-variable-same-line
-----
-/**< {{DOC}}{{^}} */
-----
-
-template doxygen-section-comment :blank :indent
-"Insert a comment that separates sections of an Emacs Lisp file."
-----
-
-/** {{?TITLE}}
- *
- * {{^}}
- */
-
-----
-
-
 ;; end
diff --git a/etc/srecode/ede-autoconf.srt b/etc/srecode/ede-autoconf.srt
new file mode 100644
index 00000000000..daefd532dff
--- /dev/null
+++ b/etc/srecode/ede-autoconf.srt
@@ -0,0 +1,54 @@
+;; ede/templates/autoconf.srt --- Templates for autoconf used by EDE.
+;;
+;; Copyright (C) 2010 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set mode "autoconf-mode"
+set escape_start "{{"
+set escape_end "}}"
+set comment_start "#"
+set comment_prefix "#"
+set application "ede"
+
+context file
+
+template ede-empty
+"Start a new EDE generated configure.in/ac file."
+----
+{{comment_prefix}} Automatically Generated/Maintained {{FILE}} by EDE.
+{{comment_prefix}}
+{{comment_prefix}} YOU MAY MODIFY THIS FILE
+{{comment_prefix}} Hand made changes in some sections will be preserved
+{{comment_prefix}} by EDE when this file is updated.
+{{comment_prefix}}
+{{comment_prefix}} EDE is the Emacs Development Environment.
+{{comment_prefix}} http://cedet.sourceforge.net/ede.shtml
+{{comment_prefix}}
+{{comment_prefix}} Process this file with autoconf to produce a configure script
+
+AC_INIT({{TEST_FILE}})
+AM_INIT_AUTOMAKE([{{PROGRAM}}], 0)
+AM_CONFIG_HEADER(config.h)
+
+{{comment_prefix}} End the configure script.
+AC_OUTPUT(Makefile, [date > stamp-h] )
+----
+
+
+;; end
diff --git a/etc/srecode/ede-make.srt b/etc/srecode/ede-make.srt
index 97725f4ff56..0b024cd30e4 100644
--- a/etc/srecode/ede-make.srt
+++ b/etc/srecode/ede-make.srt
@@ -46,4 +46,36 @@ template ede-vars
 {{NAME}}={{#VALUE}} {{VAL}}{{/VALUE}}{{/VARIABLE}}
 ----
 
+;; Some extra templates for Arduino based Makefiles.
+;; Perhaps split this out someday in the future.
+context arduino
+
+template ede-empty :file
+----
+# Automatically Generated {{FILE}} by EDE.
+# For use with Make for an Arduino project.
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+
+ARDUINO_DIR  = {{ARDUINO_HOME}}
+
+TARGET       = {{TARGET}}
+ARDUINO_LIBS = {{ARDUINO_LIBS}}
+
+MCU          = {{MCU}}
+F_CPU        = {{F_CPU}}
+ARDUINO_PORT = {{PORT}}
+BOARD_TAG    = {{BOARD}}
+
+AVRDUDE_ARD_BAUDRATE = {{AVRDUDE_ARD_BAUDRATE}}
+AVRDUDE_ARD_PROGRAMMER = {{AVRDUDE_ARD_PROGRAMMER}}
+
+include {{ARDUINO_MK}}
+
+# End of Makefile
+----
+
+
 ;; end
diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt
index cc5af736f15..34a8983b29f 100644
--- a/etc/srecode/el.srt
+++ b/etc/srecode/el.srt
@@ -197,7 +197,7 @@ template variable-option :el :el-custom :indent :blank
 ----
 (defcustom $?NAME$ $^$
   "*$DOC$"
-  :group $GROUP$
+  :group '$GROUP$
   :type $?CUSTOMTYPE$)
 ----
 bind "o"