Merge from trunk.

23 files changed, 193 insertions, 185 deletions

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index f6bd1ffa2d4..477daf75534 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,15 @@
+2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * org-agenda.el (org-agenda-add-entry-text-descriptive-links)
+        (org-agenda-custom-commands, org-write-agenda, org-check-for-org-mode)
+        (org-search-syntax-table, org-modify-diary-entry-string)
+        (org-write-agenda):
+        * org-bbdb.el (org-bbdb-anniv-export-ical):
+        * org-bibtex.el (org-bibtex-fields):
+        * org-icalendar.el (org-icalendar-date-time-format):
+        * org-latex.el (org-export-latex-inline-image-extensions):
+        * org-list.el (org-list-insert-item): Fix typos.
+
 2011-11-11  Juanma Barranquero  <lekktu@gmail.com>
 
         * org-plot.el (org-plot/gnuplot-to-grid-data): Fix typo in docstring.
@@ -55,7 +67,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-publish.el (org-publish-index-generate-theindex): rename
+        * org-publish.el (org-publish-index-generate-theindex): Rename
         from `org-publish-index-generate-theindex.inc'.  Use the file
         theindex.org directly instead of including theindex.inc.
         (org-publish-projects): Don't delete .orgx files.
@@ -135,7 +147,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-timestamp-change): keep point in the same category
+        * org.el (org-timestamp-change): Keep point in the same category
         when updating a time-stamp.  This requires to be careful, as,
         depending on the locale, name of day might change of length during
         the process.
@@ -586,7 +598,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-in-block-p): new function.
+        * org.el (org-in-block-p): New function.
 
         * org-footnote.el (org-footnote-forbidden-blocks): New variable.
         (org-footnote-in-valid-context-p): New function.
@@ -880,131 +892,131 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-action): offer to create
+        * org-footnote.el (org-footnote-action): Offer to create
         definition when none is found.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-re): avoid matching inactive
+        * org-footnote.el (org-footnote-re): Avoid matching inactive
         time-stamps or check-box cookies.
-        (org-footnote-next-reference-or-definition): adapt to the new regexp.
+        (org-footnote-next-reference-or-definition): Adapt to the new regexp.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-preprocess-string): if the last subtree
+        * org-exp.el (org-export-preprocess-string): If the last subtree
         is commented, footnotes inserted during normalizing at the end of
         the buffer may get deleted. This patch ensures deletion comes
         first, normalization second.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-footnotes-data): change docstring.
-        (org-export-footnotes-seen): renamed from
+        * org-exp.el (org-export-footnotes-data): Change docstring.
+        (org-export-footnotes-seen): Rename from
         org-export-footnotes-markers.
 
-        * org-ascii.el (org-export-as-ascii): apply change.
+        * org-ascii.el (org-export-as-ascii): Apply change.
 
-        * org-docbook.el (org-export-as-docbook): apply change.
+        * org-docbook.el (org-export-as-docbook): Apply change.
 
-        * org-footnote.el (org-footnote-normalize): apply change.
+        * org-footnote.el (org-footnote-normalize): Apply change.
 
-        * org-html.el (org-export-as-html): apply change.
+        * org-html.el (org-export-as-html): Apply change.
 
-        * org-latex.el (org-export-as-latex): apply change.
+        * org-latex.el (org-export-as-latex): Apply change.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-latex.el (org-export-latex-preprocess): rely on
+        * org-latex.el (org-export-latex-preprocess): Rely on
         `org-export-footnotes-markers' to retreive definition of the
         current footnote during export.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-normalize): remember footnotes
+        * org-footnote.el (org-footnote-normalize): Remember footnotes
         seen so far by the exporter when choosing the new marker.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-normalize): make use of
+        * org-footnote.el (org-footnote-normalize): Make use of
         `org-footnote-insert-pos-for-preprocessor'.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-normalize): add `org-footnote'
+        * org-footnote.el (org-footnote-normalize): Add `org-footnote'
         property to footnote markers when preparing for exportation.
 
-        * org-html.el (org-export-as-html): read new property to decide
+        * org-html.el (org-export-as-html): Read new property to decide
         when to export a footnote.
 
-        * org-docbook.el (org-export-as-docbook): read new property to
+        * org-docbook.el (org-export-as-docbook): Read new property to
         decide when to export a footnote.
 
-        * org-latex.el (org-export-latex-preprocess): ensure footnote at
+        * org-latex.el (org-export-latex-preprocess): Ensure footnote at
         column 0 cannot end a list containing it by adding
         `original-indentation' property to it.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-preprocess-string): normalize footnotes
+        * org-exp.el (org-export-preprocess-string): Normalize footnotes
         before marking lists ending.
 
-        * org-latex.el (org-export-latex-preprocess): work with labels as
+        * org-latex.el (org-export-latex-preprocess): Work with labels as
         strings and not as numbers.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-docbook.el (org-export-docbook-footnote-separator): new
-        variable
-        (org-export-as-docbook): add a separator between footnotes.
+        * org-docbook.el (org-export-docbook-footnote-separator): New
+        variable.
+        (org-export-as-docbook): Add a separator between footnotes.
 
-        * org-html.el (org-export-html-footnote-separator): new variable.
-        (org-export-as-html): add a separator between footnotes.
+        * org-html.el (org-export-html-footnote-separator): New variable.
+        (org-export-as-html): Add a separator between footnotes.
 
-        * org-latex.el (org-export-latex-footnote-separator): new
+        * org-latex.el (org-export-latex-footnote-separator): New
         variable.
-        (org-export-latex-preprocess): add a separator between footnotes.
+        (org-export-latex-preprocess): Add a separator between footnotes.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-exp.el (org-export-footnotes-markers)
-        (org-export-footnotes-data): new variables.
-        (org-export-preprocess-string): use a more explicit argument.
+        (org-export-footnotes-data): New variables.
+        (org-export-preprocess-string): Use a more explicit argument.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-goto-definition): now, determining
+        * org-footnote.el (org-footnote-goto-definition): Now, determining
         if point is at a footnote reference is entirely determined by
         `org-footnote-at-reference-p'. No need to check if pattern isn't
         at beginning of the line elsewhere.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-next-reference-or-definition): new
+        * org-footnote.el (org-footnote-next-reference-or-definition): New
         function.
 
-        * org.el (org-activate-footnote-links): activate the whole
+        * org.el (org-activate-footnote-links): Activate the whole
         footnote, but only fontify its label.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-normalize): make use of changes to
+        * org-footnote.el (org-footnote-normalize): Make use of changes to
         `org-footnote-at-reference-p' and creation of various functions..
         Also comment code.
-        (org-footnote-get-next-reference, org-footnote-delete-references,
-        org-footnote-delete-definitions): new functions
-        (org-footnote-goto-previous-reference, org-footnote-all-labels,
-        org-insert-footnote-reference-near-definition, org-footnote-delete):
-        rewrite to use org-footnote-get-next-reference.
+        (org-footnote-get-next-reference, org-footnote-delete-references)
+        (org-footnote-delete-definitions): New functions.
+        (org-footnote-goto-previous-reference, org-footnote-all-labels)
+        (org-insert-footnote-reference-near-definition, org-footnote-delete):
+        Rewrite to use org-footnote-get-next-reference.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-re): don't end an inline footnote
+        * org-footnote.el (org-footnote-re): Don't end an inline footnote
         at unrelated closing square brackets.
-        (org-footnote-at-reference-p): improve accuracy of the function to
+        (org-footnote-at-reference-p): Improve accuracy of the function to
         determine if point is at a reference and to extract definition of an
         inline footnote.
-        (org-footnote-all-labels, org-footnote-action, org-footnote-delete,
-        org-footnote-auto-adjust-maybe): make use of previous function.
+        (org-footnote-all-labels, org-footnote-action, org-footnote-delete)
+        (org-footnote-auto-adjust-maybe): Make use of previous function.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -1058,14 +1070,14 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-cycle-item-indentation): cycling back to
+        * org-list.el (org-cycle-item-indentation): Cycling back to
         original position deleted any additional information in the item,
         like a counter or a tag.
 
 2011-07-28  Pieter Praet  <pieter@praet.org>
 
         * org-crypt.el (org-crypt-disable-auto-save): New defcustom.
-        (org-decrypt-entry): before decrypting, check whether
+        (org-decrypt-entry): Before decrypting, check whether
         `auto-save-mode' is enabled for the current buffer, and act on it
         according to how `org-crypt-disable-auto-save' is set.  Remove
         comment re "encrypt[ing] Org auto-saved buffers".  Remove on-init
@@ -1249,29 +1261,29 @@
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-C.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-C.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-asymptote.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-asymptote.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-awk.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-awk.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-clojure.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-clojure.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-haskell.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-haskell.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-latex.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-latex.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-lisp.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-lisp.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-ocaml.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-ocaml.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-perl.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-perl.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-python.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-python.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-ruby.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-ruby.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-tangle.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-tangle.el (ob-tangle): Initialize variable from `ob-tangle'.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -1294,12 +1306,12 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-reset-checkbox-state-subtree): make the command
+        * org-list.el (org-reset-checkbox-state-subtree): Make the command
         more robust, and correctly update check-boxes in the whole
         sub-tree.
-        (org-update-checkbox-count): fix bug accumulating count of checkboxes
+        (org-update-checkbox-count): Fix bug accumulating count of checkboxes
         when walking a subtree.
-        (org-update-checkbox-count-maybe): add an optional argument passed to
+        (org-update-checkbox-count-maybe): Add an optional argument passed to
         org-update-checkbox-count.
 
 2011-07-28  Ted Zlatanov  <tzz@lifelogs.com>
@@ -1325,9 +1337,9 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-parse-list): replace transitional
+        * org-list.el (org-list-parse-list): Replace transitional
         check-boxes with "[CBTRANS]" string during parsing.
-        (org-list-to-generic): use the new property `:cbtrans' to configure
+        (org-list-to-generic): Use the new property `:cbtrans' to configure
         export string for transitional check-boxes.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -2793,7 +2805,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-html.el (org-export-as-html): fix export of email.
+        * org-html.el (org-export-as-html): Fix export of email.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -2814,11 +2826,11 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-crypt.el: remove useless TODO in comments.
+        * org-crypt.el: Remove useless TODO in comments.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-html.el (org-export-as-html): the default postamble now only
+        * org-html.el (org-export-as-html): The default postamble now only
         export a date paragraph if `org-export-time-stamp-file' is
         non-nil.
 
@@ -2924,9 +2936,9 @@
 
 2011-07-28  Manuel Giraud  <manuel.giraud@univ-nantes.fr>
 
-        * org-html.el (org-format-org-table-html): fix anchors in HTML
+        * org-html.el (org-format-org-table-html): Fix anchors in HTML
         export (thanks to <aankhen@gmail.com>)
-        (org-html-protect): fix a  bug that prevents some target to be
+        (org-html-protect): Fix a  bug that prevents some target to be
         rendered correctly.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -3011,15 +3023,15 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-capture.el (org-capture-put-target-region-and-position): New
-        function to store information about the target buffer.
+        * org-capture.el (org-capture-put-target-region-and-position):
+        New function to store information about the target buffer.
         (org-capture-set-target-location): Use it.
-        (org-capture-finalize): restore the target buffer in its
+        (org-capture-finalize): Restore the target buffer in its
         possibly narrowed state.  Also restore the cursor position.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-crypt.el (auto-save-default): make sure entries are
+        * org-crypt.el (auto-save-default): Make sure entries are
         encrypted before auto-saving.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
@@ -3035,7 +3047,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-narrow-to-subtree): ensure `org-back-to-heading'
+        * org.el (org-narrow-to-subtree): Ensure `org-back-to-heading'
         will move point to a real heading and not an inline task by
         wraping function into a `org-with-limited-levels' macro.
 
@@ -3059,7 +3071,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-table.el (org-table-fix-formulas-confirm): new custom
+        * org-table.el (org-table-fix-formulas-confirm): New custom
         variable.
         (org-table-insert-column, org-table-delete-column)
         (org-table-move-column, org-table-move-row)
@@ -3089,14 +3101,14 @@
 
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
 
-        * org-latex.el: place \title \author \date before
+        * org-latex.el: Place \title \author \date before
         \begin{document}.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org-html.el (org-export-html-preamble)
-        (org-export-html-postamble): now default to `nil'.
-        (org-export-as-html): when :html-pre/postamble is nil, fall
+        (org-export-html-postamble): Now default to `nil'.
+        (org-export-as-html): When :html-pre/postamble is nil, fall
         back on the default pre/postamble, which depends on the
         :author-info, :email-info, :creator-info options.
 
@@ -3117,7 +3129,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org.el (org-move-subtree-down): leave the cursor at the same
+        * org.el (org-move-subtree-down): Leave the cursor at the same
         column we were at.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -3130,7 +3142,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-exp.el (org-export-remove-headline-metadata): bugfix: don't
+        * org-exp.el (org-export-remove-headline-metadata): Bugfix: don't
         case-fold-search to avoid mixing TODO keywords with real headline
         words.
 
@@ -3156,7 +3168,7 @@
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org-html.el (org-export-html-postamble-format)
-        (org-export-html-preamble-format): explain how to escape the
+        (org-export-html-preamble-format): Explain how to escape the
         `%' character.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -3333,14 +3345,14 @@
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
         * ob-latex.el (org-babel-execute:latex): Add imagemagick options,
-        and for file types other than png and pdf it uses imagemagick to
-        convert a compiled pdf file to the desired file type.
-        (convert-pdf): Convert a pdf file to a new file type using
+        and for file types other than png and PDF it uses imagemagick to
+        convert a compiled PDF file to the desired file type.
+        (convert-pdf): Convert a PDF file to a new file type using
         imagemagick.
 
 2011-07-28  Puneeth Chaganti  <punchagan@gmail.com>
 
-        * org-capture.el (org-capture-fill-template): fix bug with the
+        * org-capture.el (org-capture-fill-template): Fix bug with the
         display of interactive prompt in templates expansion.
 
 2011-07-28  Reiner Steib  <reiner.steib@gmx.de>
@@ -3499,7 +3511,7 @@
         * org.el (org-set-autofill-regexps): Use `org-item-re' in
         `paragraph-start' to recognize alphabetical lists.
         (org-fill-paragraph): Enforce a pre-computed fill-prefix before
-        calling `fill-paragraph' when point in in an item.  Also prevent
+        calling `fill-paragraph' when point is in an item.  Also prevent
         paragraphs getting merged into an adjacent list upon filling.
         (org-adaptive-fill-function): Make sure to determine real
         fill-prefix for auto-fill.
@@ -3597,7 +3609,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-struct): when a line has org-example
+        * org-list.el (org-list-struct): When a line has org-example
         property, skip the entire block.  This is needed during export,
         for example when src blocks in org markup contain lists, and are
         returned verbatim because org isn't in the list of interpreted
@@ -3706,7 +3718,7 @@
         * org-capture.el (org-capture-place-item): Reflect changes to
         `org-item-beginning-re'.
 
-        * org-docbook.el (org-export-docbook-list-line): handle New type
+        * org-docbook.el (org-export-docbook-list-line): Handle New type
         of items.
 
         * org-exp.el (org-export-mark-list-end)
@@ -4165,7 +4177,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-html.el (org-export-as-html): expand the HTML title.
+        * org-html.el (org-export-as-html): Expand the HTML title.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -4945,7 +4957,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-mark-list-ending): insert additional
+        * org-exp.el (org-export-mark-list-ending): Insert additional
         newline characters if end-list-marker is at a wrong position.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
@@ -5020,7 +5032,7 @@
         with code implementing the writing of graohical output to file.
         (org-babel-execute:R): Use `org-babel-R-graphical-output-file' to
         determine whether R is taking responsibility for writing output to
-        file; if so, this is signalled to ob.el by returning a nil result.
+        file; if so, this is signaled to ob.el by returning a nil result.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
@@ -5786,7 +5798,7 @@
 
 2010-12-11  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-preprocess-string): delaying code block
+        * org-exp.el (org-export-preprocess-string): Delay code block
         processing a bit to allow correct list parsing in the export string.
 
 2010-12-11  Christopher Allan Webber  <cwebber@dustycloud.org>
@@ -5843,7 +5855,7 @@
 
 2010-12-11  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-lob.el (org-babel-lob-get-info): including pass-through
+        * ob-lob.el (org-babel-lob-get-info): Include pass-through
         header arguments in results variable header argument string.
 
 2010-12-11  David Maus  <dmaus@ictsoc.de>
@@ -5867,7 +5879,7 @@
 
 2010-12-11  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-indent-line-function): simplify code and remove bug that
+        * org.el (org-indent-line-function): Simplify code and remove bug that
         would insert a tab at the beginning of the line when trying to
         indent the item.
 
@@ -5891,7 +5903,7 @@
 
 2010-12-11  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-calc.el (org-babel-execute:calc): support for variables --
+        * ob-calc.el (org-babel-execute:calc): Support for variables --
         converts :var variables in calc variables.
 
 2010-12-11  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -7163,7 +7175,7 @@
         src blocks.
         (org-speed-command-default-hook): The default hook for
         org-speed-command-hook.  Factored out from org-self-insert-command
-        and mimics existing behaviour.
+        and mimics existing behavior.
         (org-self-insert-command): Modified to use org-speed-command-hook.
 
 2010-11-11  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -7469,7 +7481,7 @@
 
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-tangle.el: autoload org-babel-tangle-lang-exts from ob-tangle.
+        * ob-tangle.el: Autoload org-babel-tangle-lang-exts from ob-tangle.
 
 2010-11-11  Dan Davison  <davison@stats.ox.ac.uk>
 
@@ -8062,7 +8074,7 @@
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-list.el (org-insert-item-internal): Guessing of blank lines
-        number is made by looking at neighbours items, if any.
+        number is made by looking at neighboring items, if any.
 
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
 
@@ -8431,7 +8443,7 @@
 
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-scheme.el: very preliminary support for evaluating scheme
+        * ob-scheme.el: Very preliminary support for evaluating scheme
         code blocks.
 
         * org.el (org-babel-load-languages): Adding scheme.
@@ -8541,7 +8553,7 @@
 
         * ob-latex.el (org-babel-execute:latex): Adding new ":fit" and
         ":border" header arguments which both use the "preview" latex
-        package to fit the resulting pdf image to the figure.
+        package to fit the resulting PDF image to the figure.
 
 2010-11-11  David Maus  <dmaus@ictsoc.de>
 
@@ -8600,8 +8612,8 @@
 
 2010-11-11  David Maus  <dmaus@ictsoc.de>
 
-        * org-agenda.el (org-write-agenda): Delete postscript file after
-        creating conversion to pdf.
+        * org-agenda.el (org-write-agenda): Delete PostScript file after
+        creating conversion to PDF.
 
 2010-11-11  David Maus  <dmaus@ictsoc.de>
 
@@ -10577,7 +10589,7 @@
         a list of symbols specifying which of the special keywords #+DATE,
         #+AUTHOR, #+EMAIL and #+TITLE should be hidden by font lock.
         (org-fontify-meta-lines-and-blocks): Changes to font-lock code
-        implementing new faces and hiding behaviour.
+        implementing new faces and hiding behavior.
 
         * org-faces.el (org-document-title): New face for #+TITLE lines.
         (org-document-info): New face for #+DATE, #+AUTHOR, #+EMAIL lines.
@@ -11440,7 +11452,7 @@
         package.
 
         * org-latex.el (org-export-latex-tables): Only add a caption when
-        macro in in longtable environments if one has been defined.
+        macro is in longtable environments if one has been defined.
 
         * org-html.el (org-export-as-html): Only take title from buffer if
         not exporting body-only.
@@ -13808,7 +13820,7 @@
 
 2009-08-06  Bastien Guerry  <bzg@altern.org>
 
-        * org.el (org-special-ctrl-a/e): Explicitely bind the value
+        * org.el (org-special-ctrl-a/e): Explicitly bind the value
         'reversed for this option to the "true line boundary first"
         behavior.
         (org-tags-match-list-sublevels): Document the 'indented value for
@@ -14727,7 +14739,7 @@
 
 2009-08-06  Carsten Dominik  <carsten.dominik@gmail.com>
 
-        * org.el (org-sort-entries-or-items): Match TODO keywrds
+        * org.el (org-sort-entries-or-items): Match TODO keywords
         case-sensitively, when sorting.
         (org-priority): Do not match TODO keywords with wrong case.
 
@@ -15559,7 +15571,7 @@
         * org.el (org-agenda-tags-todo-honor-ignore-options):
         Declare variable.
 
-        * org-table.el (org-table-insert-hline): Fix typo in fuction call
+        * org-table.el (org-table-insert-hline): Fix typo in function call
         to `backward-char'.
 
         * org-exp.el (org-export-as-html): Remove the initial space from
@@ -16482,14 +16494,14 @@
 2008-11-23  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-export-latex.el (org-export-latex-subcontent):
-        Interprete target aliases as additonal labels.
+        Interpret target aliases as additional labels.
 
         * org-exp.el (org-export-target-aliases): New variable.
         (org-export-preprocess-string)
         (org-export-handle-invisible-targets): Fill the alias alist.
         (org-export-as-html): Remove the &nbsp; from the anchor, and also
         assign an id.
-        (org-html-level-start): Insert the target aliases as additonal
+        (org-html-level-start): Insert the target aliases as additional
         anchors.
 
         * org.el (org-edit-fixed-width-region): Fix bug when starting a new
@@ -17052,7 +17064,7 @@
         * org.el (org-entry-get-multivalued-property)
         (org-entry-protect-space, org-entry-restore-space):
         New functions.
-        (org-file-apps-defaults-macosx): Let postscript files be opened by
+        (org-file-apps-defaults-macosx): Let PostScript files be opened by
         preview.
         (org-time-stamp-inactive): Call `org-time-stamp'.
         (org-time-stamp): New argument `inactive'.  Also edit inacive
@@ -17290,7 +17302,7 @@
         (org-edit-fixed-width-region): Also try
         `org-edit-fixed-width-region'.
         (org-edit-fixed-width-region-mode): New option.
-        (org-activate-code): Only interprete lines starting with colon
+        (org-activate-code): Only interpret lines starting with colon
         plus a space as example lines.
 
         * org-remember.el (org-remember-templates): Add nil instead of
@@ -18037,4 +18049,3 @@
 
   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/lisp/org/ob-haskell.el b/lisp/org/ob-haskell.el
index cae07036c57..236dbba28f1 100644
--- a/lisp/org/ob-haskell.el
+++ b/lisp/org/ob-haskell.el
@@ -29,7 +29,7 @@
 ;; they can be run, but haskell code can also be run through an
 ;; interactive interpreter.
 ;;
-;; For now lets only allow evaluation using the haskell interpreter.
+;; For now let's only allow evaluation using the haskell interpreter.
 
 ;;; Requirements:
 
@@ -80,7 +80,7 @@
                    (cdr (member org-babel-haskell-eoe
                                 (reverse (mapcar #'org-babel-trim raw)))))))
     (org-babel-reassemble-table
-     (cond 
+     (cond
       ((equal result-type 'output)
        (mapconcat #'identity (reverse (cdr results)) "\n"))
       ((equal result-type 'value)
diff --git a/lisp/org/ob-ledger.el b/lisp/org/ob-ledger.el
index a5bdcbf2f73..4fe61451982 100644
--- a/lisp/org/ob-ledger.el
+++ b/lisp/org/ob-ledger.el
@@ -30,7 +30,7 @@
 ;;
 ;; 1) there is no such thing as a "session" in ledger
 ;;
-;; 2) we are generally only going to return output from the leger program
+;; 2) we are generally only going to return output from the ledger program
 ;;
 ;; 3) we are adding the "cmdline" header argument
 ;;
diff --git a/lisp/org/ob-ocaml.el b/lisp/org/ob-ocaml.el
index ee7a7cc212c..78d309b9e13 100644
--- a/lisp/org/ob-ocaml.el
+++ b/lisp/org/ob-ocaml.el
@@ -29,7 +29,7 @@
 ;; they can be run, but ocaml code can also be run through an
 ;; interactive interpreter.
 ;;
-;; For now lets only allow evaluation using the ocaml interpreter.
+;; For now let's only allow evaluation using the ocaml interpreter.
 
 ;;; Requirements:
 
@@ -99,7 +99,7 @@
    (lambda (pair) (format "let %s = %s;;" (car pair)
                           (org-babel-ocaml-elisp-to-ocaml (cdr pair))))
    (mapcar #'cdr (org-babel-get-header params :var))))
-  
+
 (defun org-babel-ocaml-elisp-to-ocaml (val)
   "Return a string of ocaml code which evaluates to VAL."
   (if (listp val)
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 9274438c18e..7a5c7c8a46a 100644
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -32,7 +32,7 @@
 ;;
 ;; Also SQL evaluation generally takes place inside of a database.
 ;;
-;; For now lets just allow a generic ':cmdline' header argument.
+;; For now let's just allow a generic ':cmdline' header argument.
 ;;
 ;; TODO:
 ;;
@@ -40,7 +40,7 @@
 ;; - add more useful header arguments (user, passwd, database, etc...)
 ;; - support for more engines (currently only supports mysql)
 ;; - what's a reasonable way to drop table data into SQL?
-;; 
+;;
 
 ;;; Code:
 (require 'ob)
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 53a0c5587a2..50761ede7cb 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -156,7 +156,7 @@ and `org-agenda-entry-text-maxlines'."
   "Non-nil means export org-links as descriptive links in agenda added text.
 This variable applies to the text added to the agenda when
 `org-agenda-add-entry-text-maxlines' is larger than 0.
-When this variable nil, the URL will (also) be shown."
+When this variable is nil, the URL will (also) be shown."
   :group 'org-agenda
   :type 'boolean)
 
@@ -339,7 +339,7 @@ agenda dispatcher \\[org-agenda].  Each entry is a list like this:
 
 key      The key (one or more characters as a string) to be associated
          with the command.
-desc     A description of the command, when omitted or nil, a default
+desc     A description of the command; when omitted or nil, a default
          description is built using MATCH.
 type     The command type, any of the following symbols:
           agenda      The daily/weekly agenda.
@@ -354,7 +354,7 @@ type     The command type, any of the following symbols:
 match    What to search for:
           - a single keyword for TODO keyword searches
           - a tags match expression for tags searches
-          - a word search expression for text searches.
+          - a word search expression for text searches
           - a regular expression for occur searches
           For all other commands, this should be the empty string.
 settings  A list of option settings, similar to that in a let form, so like
@@ -363,7 +363,7 @@ settings  A list of option settings, similar to that in a let form, so like
 files     A list of files file to write the produced agenda buffer to
           with the command `org-store-agenda-views'.
           If a file name ends in \".html\", an HTML version of the buffer
-          is written out.  If it ends in \".ps\", a postscript version is
+          is written out.  If it ends in \".ps\", a PostScript version is
           produced.  Otherwise, only the plain text is written to the file.
 
 You can also define a set of commands, to create a composite agenda buffer.
@@ -1619,7 +1619,7 @@ Where CATEGORY-REGEXP is a regexp matching the categories where
 the icon should be displayed.
 FILE-OR-DATA either a file path or a string containing image data.
 
-The other fields can be omited safely if not needed:
+The other fields can be omitted safely if not needed:
 TYPE indicates the image type.
 DATA-P is a boolean indicating whether the FILE-OR-DATA string is
 image data.
@@ -2744,8 +2744,8 @@ This ensures the export commands can easily use it."
 (defun org-write-agenda (file &optional open nosettings)
   "Write the current buffer (an agenda view) as a file.
 Depending on the extension of the file name, plain text (.txt),
-HTML (.html or .htm) or Postscript (.ps) is produced.
-If the extension is .ics, run icalendar export over all files used
+HTML (.html or .htm) or PostScript (.ps) is produced.
+If the extension is .ics, run iCalendar export over all files used
 to construct the agenda and limit the export to entries listed in the
 agenda now.
 With prefix argument OPEN, open the new file immediately.
@@ -2793,7 +2793,7 @@ higher priority settings."
               ((string-match "\\.ps\\'" file)
                (require 'ps-print)
                (ps-print-buffer-with-faces file)
-               (message "Postscript written to %s" file))
+               (message "PostScript written to %s" file))
               ((string-match "\\.pdf\\'" file)
                (require 'ps-print)
                (ps-print-buffer-with-faces
@@ -2972,7 +2972,7 @@ removed from the entry content.  Currently only `planning' is allowed here."
     (nreverse markers)))
 
 (defun org-create-marker-find-array (marker-list)
-  "Create a alist of files names with all marker positions in that file."
+  "Create an alist of files names with all marker positions in that file."
   (let (f tbl m a p)
     (while (setq m (pop marker-list))
       (setq p (marker-position m)
@@ -2997,7 +2997,7 @@ removed from the entry content.  Currently only `planning' is allowed here."
              (member (point) (cdr a)))))))
 
 (defun org-check-for-org-mode ()
-  "Make sure current buffer is in org-mode.  Error if not."
+  "Make sure current buffer is in Org-mode.  Error if not."
   (or (org-mode-p)
       (error "Cannot execute org-mode agenda command on buffer in %s"
              major-mode)))
@@ -3715,9 +3715,9 @@ given in `org-agenda-start-on-weekday'."
 (defvar org-todo-only nil)
 
 (defvar org-search-syntax-table nil
-  "Special syntax table for org-mode search.
-In this table, we have single quotes not as word constituents, to
-that when \"+Ameli\" is searched as a work, it will also match \"Ameli's\"")
+  "Special syntax table for Org-mode search.
+In this table, we have single quotes not as word constituents, so
+that when \"+Ameli\" is searched as a word, it will also match \"Ameli's\"")
 
 (defun org-search-syntax-table ()
   (unless org-search-syntax-table
@@ -4425,7 +4425,7 @@ date.  It also removes lines that contain only whitespace."
            (setq string (org-modify-diary-entry-string string))))))
 
 (defun org-modify-diary-entry-string (string)
-  "Add text properties to string, allowing org-mode to act on it."
+  "Add text properties to string, allowing Org-mode to act on it."
   (org-add-props string nil
     'mouse-face 'highlight
     'help-echo (if buffer-file-name
@@ -5059,7 +5059,7 @@ See also the user option `org-agenda-clock-consistency-checks'."
                               (/ (- tlend ts) 60))
                 face (or (plist-get pl :overlap-face) face)))
          ((and (> tlend 0) (> ts (+ tlend (* 60 maxgap))))
-          ;; There is a gap, lets see if we need to report it
+          ;; There is a gap, let's see if we need to report it
           (unless (org-agenda-check-clock-gap tlend ts gapok)
             (setq issue (format "Clocking gap: %d minutes"
                                   (/ (- ts tlend) 60))
diff --git a/lisp/org/org-bbdb.el b/lisp/org/org-bbdb.el
index a7b6efae836..8401196c81a 100644
--- a/lisp/org/org-bbdb.el
+++ b/lisp/org/org-bbdb.el
@@ -357,7 +357,7 @@ This is used by Org to re-create the anniversary hash table."
           (bbdb-record-name (car (bbdb-completing-read-record "Name: ")))))
 
 (defun org-bbdb-anniv-export-ical ()
-  "Extract anniversaries from BBDB and convert them to icalendar format."
+  "Extract anniversaries from BBDB and convert them to iCalendar format."
   (require 'bbdb)
   (require 'diary-lib)
   (unless (hash-table-p org-bbdb-anniv-hash)
diff --git a/lisp/org/org-beamer.el b/lisp/org/org-beamer.el
index 5cebe50efd1..d5f9beea337 100644
--- a/lisp/org/org-beamer.el
+++ b/lisp/org/org-beamer.el
@@ -411,7 +411,7 @@ the value will be inserted right after the documentclass statement."
 
 
 ;; Functions to initialize and post-process
-;; These fuctions will be hooked into various places in the export process
+;; These functions will be hooked into various places in the export process
 
 (defun org-beamer-initialize-open-trackers ()
   "Reset variables that track if certain environments are open during export."
@@ -451,7 +451,7 @@ The effect is that these values will be accessible during export."
      ((stringp org-beamer-frame-level-now)
       (setq org-beamer-frame-level-now
             (string-to-number org-beamer-frame-level-now))))
-    ;; Find the header additons, most likely theme commands
+    ;; Find the header additions, most likely theme commands
     (setq org-beamer-header-extra
           (or (and (org-region-active-p)
                    (save-excursion
diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el
index 5c9b37b2341..138d99a36d9 100644
--- a/lisp/org/org-bibtex.el
+++ b/lisp/org/org-bibtex.el
@@ -204,7 +204,7 @@
     (:pages        . "One or more page numbers or range of numbers, such as 42-111 or 7,41,73-97 or 43+ (the ‘+’ in this last example indicates pages following that don’t form simple range). BibTEX requires double dashes for page ranges (--).")
     (:publisher    . "The publisher’s name.")
     (:school       . "The name of the school where a thesis was written.")
-    (:series       . "The name of a series or set of books. When citing an entire book, the the title field gives its title and an optional series field gives the name of a series or multi-volume set in which the book is published.")
+    (:series       . "The name of a series or set of books. When citing an entire book, the title field gives its title and an optional series field gives the name of a series or multi-volume set in which the book is published.")
     (:title        . "The work’s title, typed as explained in the LaTeX book.")
     (:type         . "The type of a technical report for example, 'Research Note'.")
     (:volume       . "The volume of a journal or multi-volume book.")
@@ -221,7 +221,7 @@
 
 (defcustom org-bibtex-prefix nil
   "Optional prefix for all bibtex property names.
-For example setting to 'BIB_' would allow interoperability with fireforg."
+For example setting to 'BIB_' would allow interoperability with Fireforg."
   :group 'org-bibtex
   :type  'string)
 
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el
index 05cca0e311e..24aea5d7eae 100644
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -372,7 +372,7 @@ to avoid conflicts with other active capture processes."
   (plist-get (if local org-capture-current-plist org-capture-plist) prop))
 
 (defun org-capture-member (prop &optional local)
-  "Is PROP a preperty in `org-capture-plist'.
+  "Is PROP a property in `org-capture-plist'.
 When LOCAL is set, use the local variable `org-capture-current-plist',
 this is necessary after initialization of the capture process,
 to avoid conflicts with other active capture processes."
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index de5087e163c..6279ed3df0d 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -1261,7 +1261,7 @@ line and position cursor in that line."
             (and (re-search-forward org-property-end-re nil t)
                  (goto-char (match-beginning 0))))
         (throw 'exit t))
-      ;; Lets count the CLOCK lines
+      ;; Let's count the CLOCK lines
       (goto-char beg)
       (while (re-search-forward re end t)
         (setq first (or first (match-beginning 0))
@@ -2125,7 +2125,7 @@ the currently selected interval size."
   "Write out a clock table at position IPOS in the current buffer.
 TABLES is a list of tables with clocking data as produced by
 `org-clock-get-table-data'.  PARAMS is the parameter property list obtained
-from the dynamic block defintion."
+from the dynamic block definition."
   ;; This function looks quite complicated, mainly because there are a
   ;; lot of options which can add or remove columns.  I have massively
   ;; commented this function, the I hope it is understandable.  If
@@ -2641,4 +2641,3 @@ The details of what will be saved are regulated by the variable
 
 
 ;;; org-clock.el ends here
-
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index 896acc5aeae..5e4935caa7e 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -272,7 +272,7 @@ Works on both Emacs and XEmacs."
     nil))
 
 (defmacro org-xemacs-without-invisibility (&rest body)
-  "Turn off exents with invisibility while executing BODY."
+  "Turn off extents with invisibility while executing BODY."
   `(let ((ext-inv (extent-list nil (point-at-bol) (point-at-eol)
                                'all-extents-closed-open 'invisible))
          ext-inv-specs)
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index 48eced9ea08..d567b929056 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -36,7 +36,7 @@
 ;; links to these 'tagged' destinations, allowing seamless navigation between
 ;; multiple org-mode files. Topics can be created in any org mode file and
 ;; will always be found by plain links from other files. Other file types
-;; recognised by ctags (source code files, latex files, etc) will also be
+;; recognized by ctags (source code files, latex files, etc) will also be
 ;; available as destinations for plain links, and similarly, org-mode links
 ;; will be available as tags from source files. Finally, the function
 ;; `org-ctags-find-tag-interactive' lets you choose any known tag, using
@@ -64,19 +64,19 @@
 ;; with the same name as the link; then, if unsuccessful, ask the user if
 ;; he/she wants to rebuild the 'TAGS' database and try again; then ask if
 ;; the user wishes to append 'tag' as a new toplevel heading at the end of
-;; the buffer; and finally, defer to org's default behaviour which is to
+;; the buffer; and finally, defer to org's default behavior which is to
 ;; search the entire text of the current buffer for 'tag'.
 ;;
-;; This behaviour can be modified by changing the value of
+;; This behavior can be modified by changing the value of
 ;; ORG-CTAGS-OPEN-LINK-FUNCTIONS. For example I have the following in my
-;; .emacs, which describes the same behaviour as the above paragraph with
+;; .emacs, which describes the same behavior as the above paragraph with
 ;; one difference:
 ;;
 ;; (setq org-ctags-open-link-functions
 ;;       '(org-ctags-find-tag
 ;;         org-ctags-ask-rebuild-tags-file-then-find-tag
 ;;         org-ctags-ask-append-topic
-;;         org-ctags-fail-silently))  ; <-- prevents org default behaviour
+;;         org-ctags-fail-silently))  ; <-- prevents org default behavior
 ;;
 ;;
 ;; Usage
diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index ee8e6027706..35a51649452 100644
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -2922,7 +2922,7 @@ to the value of `temporary-file-directory'."
           (org-load-modules-maybe)
           (unless org-local-vars
             (setq org-local-vars (org-get-local-variables)))
-          (eval ;; convert to fmt -- mimicing `org-run-like-in-org-mode'
+          (eval ;; convert to fmt -- mimicking `org-run-like-in-org-mode'
            (list 'let org-local-vars
                  (list (intern (format "org-export-as-%s" fmt))
                        nil nil nil ''string t))))
diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el
index 223d2573fdb..0d47132d2f8 100644
--- a/lisp/org/org-footnote.el
+++ b/lisp/org/org-footnote.el
@@ -574,7 +574,7 @@ normalized footnotes towards the end of the pre-processing buffer.
 Some exporters like docbook, odt, etc. expect that footnote
 definitions be available before any references to them.  Such
 exporters can let bind `org-footnote-insert-pos-for-preprocessor' to
-symbol 'point-min to achieve the desired behaviour.
+symbol 'point-min to achieve the desired behavior.
 
 Additional note on `org-footnote-insert-pos-for-preprocessor':
 1. This variable has not effect when FOR-PREPROCESSOR is nil.
diff --git a/lisp/org/org-icalendar.el b/lisp/org/org-icalendar.el
index dd64fc2f783..8a2d66306f3 100644
--- a/lisp/org/org-icalendar.el
+++ b/lisp/org/org-icalendar.el
@@ -204,7 +204,7 @@ When nil of the empty string, use the abbreviation retrieved from Emacs."
   (if org-icalendar-use-UTC-date-time
       ":%Y%m%dT%H%M%SZ"
     ":%Y%m%dT%H%M%S")
-  "Format-string for exporting icalendar DATE-TIME.
+  "Format-string for exporting iCalendar DATE-TIME.
 See `format-time-string' for a full documentation.  The only
 difference is that `org-icalendar-timezone' is used for %Z.
 
diff --git a/lisp/org/org-latex.el b/lisp/org/org-latex.el
index 0402b2da964..7abf85a7092 100644
--- a/lisp/org/org-latex.el
+++ b/lisp/org/org-latex.el
@@ -304,8 +304,8 @@ markup defined, the first one in the association list will be used."
 
 (defcustom org-export-latex-href-format "\\href{%s}{%s}"
   "A printf format string to be applied to href links.
-The format must contain either two %s instances or just one.  
-If it contains two %s instances, the first will be filled with 
+The format must contain either two %s instances or just one.
+If it contains two %s instances, the first will be filled with
 the link, the second with the link description.  If it contains
 only one, the %s will be filled with the link."
   :group 'org-export-latex
@@ -594,7 +594,7 @@ and `org-export-with-tags' instead."
   "Extensions of image files that can be inlined into LaTeX.
 Note that the image extension *actually* allowed depend on the way the
 LaTeX file is processed.  When used with pdflatex, pdf, jpg and png images
-are OK.  When processing through dvi to Postscript, only ps and eps are
+are OK.  When processing through dvi to PostScript, only ps and eps are
 allowed.  The default we use here encompasses both."
   :group 'org-export-latex
   :type '(repeat (string :tag "Extension")))
@@ -2203,7 +2203,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
                 ;; a LaTeX issue, but we here implement a work-around anyway.
                 (setq path (org-export-latex-protect-amp path)
                       desc (org-export-latex-protect-amp desc)))
-              (insert 
+              (insert
                (if (string-match "%s.*%s" org-export-latex-href-format)
                    (format org-export-latex-href-format path desc)
                  (format org-export-latex-href-format path))))
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 866176e4e8f..9184f0c3d54 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -681,7 +681,7 @@ Assume point is at an item."
               (cond
                ((<= (point) lim-up)
                 ;; At upward limit: if we ended at an item, store it,
-                ;; else dimiss useless data recorded above BEG-CELL.
+                ;; else dismiss useless data recorded above BEG-CELL.
                 ;; Jump to part 2.
                 (throw 'exit
                        (setq itm-lst
@@ -1177,7 +1177,7 @@ some heuristics to guess the result."
        ;; When `org-blank-before-new-entry' says so, it is 1.
        ((eq insert-blank-p t) 1)
        ;; `plain-list-item' is 'auto.  Count blank lines separating
-       ;; neighbours items in list.
+       ;; neighboring items in list.
        (t (let ((next-p (org-list-get-next-item item struct prevs)))
             (cond
              ;; Is there a next item?
@@ -1207,7 +1207,7 @@ some heuristics to guess the result."
 If POS is before first character after bullet of the item, the
 new item will be created before the current one.
 
-STRUCT is the list structure.  PREVS is the the alist of previous
+STRUCT is the list structure.  PREVS is the alist of previous
 items, as returned by `org-list-prevs-alist'.
 
 Insert a checkbox if CHECKBOX is non-nil, and string AFTER-BULLET
@@ -2642,7 +2642,7 @@ If a region is active, all items inside will be moved."
 (defvar org-tab-ind-state)
 (defun org-cycle-item-indentation ()
   "Cycle levels of indentation of an empty item.
-The first run indents the item, if applicable.  Subsequents runs
+The first run indents the item, if applicable.  Subsequent runs
 outdent it at meaningful levels in the list.  When done, item is
 put back at its original position with its original bullet.
 
diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index ddb3cf7b63a..0c924cd9f07 100644
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -191,7 +191,7 @@ sitemap of files or summary page for a given project.
                            display folders first or last, respectively.
                            Any other value will mix files and folders.
   :sitemap-sort-files      The site map is normally sorted alphabetically.
-                           You can change this behaviour setting this to
+                           You can change this behavior setting this to
                            `chronologically', `anti-chronologically' or nil.
   :sitemap-ignore-case     Should sorting be case-sensitive?  Default nil.
 
@@ -1114,7 +1114,7 @@ so that the file including them will be republished as well."
       (let ((ctime (org-publish-cache-ctime-of-src filename)))
         (or (< pstamp ctime)
             (when included-files-ctime
-              (not (null (delq nil (mapcar (lambda(ct) (< ctime ct)) 
+              (not (null (delq nil (mapcar (lambda(ct) (< ctime ct))
                                            included-files-ctime))))))))))
 
 (defun org-publish-cache-set-file-property (filename property value &optional project-name)
diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el
index 2bc5ef92ae7..8819f416f1d 100644
--- a/lisp/org/org-remember.el
+++ b/lisp/org/org-remember.el
@@ -63,7 +63,7 @@ and `org-remember-default-headline'.  To force prompting anyway, use
 \\[universal-argument] \\[org-remember-finalize] to file the note.
 
 When this variable is nil, \\[org-remember-finalize] gives you the prompts, and
-\\[universal-argument] \\[org-remember-finalize] triggers the fasttrack."
+\\[universal-argument] \\[org-remember-finalize] triggers the fast track."
   :group 'org-remember
   :type 'boolean)
 
@@ -1122,7 +1122,7 @@ See also the variable `org-reverse-note-order'."
   (condition-case nil
       (require 'remember)
     (error
-     ;; Lets install our own micro version of remember
+     ;; Let's install our own micro version of remember
      (defvar remember-register ?R)
      (defvar remember-mode-hook nil)
      (defvar remember-handler-functions nil)
@@ -1153,4 +1153,3 @@ See also the variable `org-reverse-note-order'."
 
 
 ;;; org-remember.el ends here
-
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 7f49b3236ee..72723845426 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -51,7 +51,7 @@
 (defvar orgtbl-after-send-table-hook nil
   "Hook for functions attaching to `C-c C-c', if the table is sent.
 This can be used to add additional functionality after the table is sent
-to the receiver position, othewise, if table is not sent, the functions
+to the receiver position, otherwise, if table is not sent, the functions
 are not run.")
 
 (defcustom orgtbl-optimized (eq org-enable-table-editor 'optimized)
@@ -1302,7 +1302,7 @@ However, when FORCE is non-nil, create new columns if necessary."
 (defun org-table-line-to-dline (line &optional above)
   "Turn a buffer line number into a data line number.
 If there is no data line in this line, return nil.
-If there is no matchin dline (most likely te refrence was a hline), the
+If there is no matching dline (most likely te refrence was a hline), the
 first dline below it is used.  When ABOVE is non-nil, the one above is used."
   (catch 'exit
     (let ((ll (length org-table-dlines))
@@ -2204,7 +2204,7 @@ For all numbers larger than LIMIT, shift them by DELTA."
                      (string-match "^[a-zA-Z][a-zA-Z0-9]*$" field))
               (push (cons field v) org-table-local-parameters)
               (push (list field line col) org-table-named-field-locations))))
-      ;; Analyse the line types
+      ;; Analyze the line types
       (goto-char beg)
       (setq org-table-current-begin-line (org-current-line)
             org-table-current-begin-pos (point)
@@ -2432,7 +2432,7 @@ not overwrite the stored one."
                       duration-output-format nil
                       fmt (replace-match "" t t fmt)))
             (if (string-match "t" fmt)
-                (setq duration t 
+                (setq duration t
                       duration-output-format org-table-duration-custom-format
                       numbers t
                       fmt (replace-match "" t t fmt)))
@@ -2500,7 +2500,7 @@ not overwrite the stored one."
         ;; Insert complex ranges
         (while (and (string-match org-table-range-regexp form)
                     (> (length (match-string 0 form)) 1))
-          (setq formrg (save-match-data 
+          (setq formrg (save-match-data
                          (org-table-get-range (match-string 0 form) nil n0)))
           (setq formrpl
                 (save-match-data
@@ -2901,7 +2901,7 @@ known that the table will be realigned a little later anyway."
 
 (defun org-table-iterate (&optional arg)
   "Recalculate the table until it does not change anymore.
-The maximun number of iterations is 10, but you can chose a different value
+The maximum number of iterations is 10, but you can chose a different value
 with the prefix ARG."
   (interactive "P")
   (let ((imax (if arg (prefix-numeric-value arg) 10))
@@ -4723,4 +4723,3 @@ list of the fields in the rectangle ."
 
 
 ;;; org-table.el ends here
-
diff --git a/lisp/org/org-taskjuggler.el b/lisp/org/org-taskjuggler.el
index 0d9516a389e..1fb3114bf3f 100644
--- a/lisp/org/org-taskjuggler.el
+++ b/lisp/org/org-taskjuggler.el
@@ -70,7 +70,7 @@
 ;; "taskjuggler_project" (or whatever you customized
 ;; `org-export-taskjuggler-project-tag' to). You are now ready to
 ;; export the project plan with `org-export-as-taskjuggler-and-open'
-;; which will export the project plan and open a gant chart in
+;; which will export the project plan and open a Gantt chart in
 ;; TaskJugglerUI.
 ;;
 ;; * Resources
@@ -354,8 +354,8 @@ information, all the properties, etc."
   (let* ((props (org-entry-properties))
          (components (org-heading-components))
          (level (nth 1 components))
-         (headline 
-          (replace-regexp-in-string 
+         (headline
+          (replace-regexp-in-string
            "\"" "\\\"" (nth 4 components) t t)) ; quote double quotes in headlines
          (parent-ordered (org-taskjuggler-parent-is-ordered-p)))
     (push (cons "level" level) props)
@@ -405,10 +405,10 @@ deeper), then it's not a leaf."
             (successor (car (cdr tasks))))
         (cond
          ;; if a task has no successors it is a leaf
-         ((null successor) 
+         ((null successor)
           (push (cons (cons "leaf-node" t) task) new-list))
          ;; if the successor has a lower level than task it is a leaf
-         ((<= (cdr (assoc "level" successor)) (cdr (assoc "level" task))) 
+         ((<= (cdr (assoc "level" successor)) (cdr (assoc "level" task)))
           (push (cons (cons "leaf-node" t) task) new-list))
          ;; otherwise examine the rest of the tasks
          (t (push task new-list))))
diff --git a/lisp/org/org.el b/lisp/org/org.el
index da39aa189ba..25bfb8a78e8 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -1480,9 +1480,9 @@ When nil, the link search tries to match a phrase with all words
 in the search text."
   :group 'org-link-follow
   :type '(choice
-          (const :tag "Use fuzy text search" nil)
+          (const :tag "Use fuzzy text search" nil)
           (const :tag "Match only exact headline" t)
-          (const :tag "Match extact headline or query to create it"
+          (const :tag "Match exact headline or query to create it"
                  query-to-create)))
 
 (defcustom org-link-frame-setup
@@ -2681,7 +2681,7 @@ When this variable is set to t, the date/time prompt will not let
 you specify dates outside the 1970-2037 range, so it is certain that
 these dates will work in whatever version of Emacs you are
 running, and also that you can move a file from one Emacs implementation
-to another.  WHenever Org is forcing the year for you, it will display
+to another.  Whenever Org is forcing the year for you, it will display
 a message and beep.
 
 When this variable is nil, Org will check if the date is
@@ -2924,7 +2924,7 @@ is better to limit inheritance to certain tags using the variables
           (const :tag "List them, indented with leading dots" indented)))
 
 (defcustom org-tags-sort-function nil
-  "When set, tags are sorted using this function as a comparator."
+  "When set, tags are sorted using this comparison function."
   :group 'org-tags
   :type '(choice
           (const :tag "No sorting" nil)
@@ -5052,7 +5052,7 @@ The time stamps may be either active or inactive.")
 (defvar org-emph-face nil)
 
 (defun org-do-emphasis-faces (limit)
-  "Run through the buffer and add overlays to emphasised strings."
+  "Run through the buffer and add overlays to emphasized strings."
   (let (rtn a)
     (while (and (not rtn) (re-search-forward org-emph-re limit t))
       (if (not (= (char-after (match-beginning 3))
@@ -5549,7 +5549,7 @@ Use `org-reduced-level' to remove the effect of `org-odd-levels'."
 
 (defvar org-font-lock-set-keywords-hook nil
   "Functions that can manipulate `org-font-lock-extra-keywords'.
-This is calles after `org-font-lock-extra-keywords' is defined, but before
+This is called after `org-font-lock-extra-keywords' is defined, but before
 it is installed to be used by font lock.  This can be useful if something
 needs to be inserted at a specific position in the font-lock sequence.")
 
@@ -11217,7 +11217,7 @@ changes.  Such blocking occurs when:
                      (forward-line 1)
                      (re-search-forward org-not-done-heading-regexp pos t))
             (throw 'dont-block nil))  ; block, there is an older sibling not done.
-          ;; Search further up the hierarchy, to see if an anchestor is blocked
+          ;; Search further up the hierarchy, to see if an ancestor is blocked
           (while t
             (goto-char parent-pos)
             (if (not (looking-at org-not-done-heading-regexp))
@@ -14835,7 +14835,7 @@ user."
       (setq ans (replace-match (format "%04d-%02d-%02d\\5" year month day)
                                t nil ans)))
 
-    ;; Help matching dottet european dates
+    ;; Help matching dotted european dates
     (when (string-match
            "^ *\\(3[01]\\|0?[1-9]\\|[12][0-9]\\)\\. ?\\(0?[1-9]\\|1[012]\\)\\. ?\\([1-9][0-9][0-9][0-9]\\)?" ans)
       (setq year (if (match-end 3)