upstream

19 files changed, 59 insertions, 59 deletions

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 983df8a6bfc..7bee98d8110 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1177,7 +1177,7 @@
         * org.el: Remap `outline-promote' and `outline-demote' keys to
         `org-promote-subtree' and `org-demote-subtree'.
 
-2012-01-03  Leo  <sdl.web@gmail.com>
+2012-01-03  Leo Liu  <sdl.web@gmail.com>
 
         * org-agenda.el (org-agenda-do-context-action): Check if marker is
         valid before use.
@@ -1749,7 +1749,7 @@
 
 2012-01-03  Suvayu Ali  <fatkasuvayu+linux@gmail.com>  (tiny change)
 
-        * org-inlinetask.el (org-inlinetask): New customisable face
+        * org-inlinetask.el (org-inlinetask): New customizable face
         for inlinetasks
 
 2012-01-03  Bastien Guerry  <bzg@gnu.org>
@@ -2964,7 +2964,7 @@
 
         * org-latex.el (org-export-latex-header-defs-re): Delete.
 
-2011-07-28  Bastien  <bzg@gnu.org>
+2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org.el (org-last-set-property): New variable.
         (org-read-property-name): Use the new variable: the prompt
@@ -6786,7 +6786,7 @@
         * ob.el (org-babel-params-from-properties): Test for
         "header-arg-name" and ":header-arg-name", in that order.
 
-2011-07-28  Bastien  <bastien.guerry@wikimedia.fr>
+2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org-capture.el (org-capture-templates): Document "currentfile"
         for capture template.
@@ -19573,7 +19573,7 @@
         against all agenda files.
 
 2008-10-12  Carsten Dominik  <dominik@science.uva.nl>
-        Bastien Guerry  <bzg@altern.org>
+            Bastien Guerry  <bzg@altern.org>
 
         * org-list.el: New file, aggregating list functions from org.el
         and org-export-latex.el.
diff --git a/lisp/org/ob-fortran.el b/lisp/org/ob-fortran.el
index b6305c42769..46d2269a1d7 100644
--- a/lisp/org/ob-fortran.el
+++ b/lisp/org/ob-fortran.el
@@ -110,7 +110,7 @@ it's header arguments."
   "Wrap body in a \"program ... end program\" block if none exists."
   (if (string-match "^[ \t]*program[ \t]*.*" (capitalize body))
        (let ((vars (mapcar #'cdr (org-babel-get-header params :var))))
-         (if vars (error "cannot use :vars if 'program' statment is present"))
+         (if vars (error "cannot use :vars if 'program' statement is present"))
          body)
     (format "program main\n%s\nend program main\n" body)))
 
@@ -127,7 +127,7 @@ support for sessions"
 ;; helper functions
 
 (defun org-babel-fortran-var-to-fortran (pair)
-  "fortranonvert an elisp val into a string of fortran code specifying a var
+  "Convert an elisp val into a string of fortran code specifying a var
 of the same value."
   ;; TODO list support
   (let ((var (car pair))
diff --git a/lisp/org/ob-latex.el b/lisp/org/ob-latex.el
index 0db71992826..23e8d91fecd 100644
--- a/lisp/org/ob-latex.el
+++ b/lisp/org/ob-latex.el
@@ -132,7 +132,7 @@ This function is called by `org-babel-execute-src-block'."
               (when (file-exists-p transient-pdf-file)
                 (delete-file transient-pdf-file))))))
          ((string-match "\\.\\([^\\.]+\\)$" out-file)
-          (error "can not create %s files, please specify a .png or .pdf file or try the :imagemagick header arguement"
+          (error "can not create %s files, please specify a .png or .pdf file or try the :imagemagick header argument"
                  (match-string 1 out-file))))
         nil) ;; signal that output has already been written to file
     body))
diff --git a/lisp/org/ob-ledger.el b/lisp/org/ob-ledger.el
index e9c142712eb..a454d51e391 100644
--- a/lisp/org/ob-ledger.el
+++ b/lisp/org/ob-ledger.el
@@ -29,7 +29,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/org-agenda.el b/lisp/org/org-agenda.el
index d444aff4f2b..bdf68819089 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -28,7 +28,7 @@
 ;;
 ;; The functions `org-batch-agenda', `org-batch-agenda-csv', and
 ;; `org-batch-store-agenda-views' are implemented as macros to provide
-;; a conveniant way for extracting agenda information from the command
+;; a convenient way for extracting agenda information from the command
 ;; line. The Lisp does not evaluate parameters of a macro call; thus
 ;; it is not necessary to quote the parameters passed to one of those
 ;; functions. E.g. you can write:
@@ -1088,7 +1088,7 @@ and timeline buffers."
               (const :tag "Sunday" 0)))
 
 (defcustom org-agenda-move-date-from-past-immediately-to-today t
-  "Non-nil means jumpt to today when moving a past date forward in time.
+  "Non-nil means jump to today when moving a past date forward in time.
 When using S-right in the agenda to move a a date forward, and the date
 stamp currently points to the past, the first key press will move it
 to today.  WHen nil, just move one day forward even if the date stays
@@ -1660,7 +1660,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.
@@ -3064,7 +3064,7 @@ define a filter for one of the individual blocks.  You need to set it in
 the global options and expect it to be applied to the entire view.")
 
 (defvar org-agenda-category-filter-preset nil
-  "A preset of the categeory filter used for secondary agenda filtering.
+  "A preset of the category filter used for secondary agenda filtering.
 This must be a list of strings, each string must be a single category
 preceded by \"+\" or \"-\".
 This variable should not be set directly, but agenda custom commands can
@@ -4922,7 +4922,7 @@ DAYNAME is a number between 0 (Sunday) and 6 (Saturday).
 SKIP-WEEKS is any number of ISO weeks in the block period for which the
 item should be skipped.  If any of the SKIP-WEEKS arguments is the symbol
 `holidays', then any date that is known by the Emacs calendar to be a
-holidy will also be skipped."
+holiday will also be skipped."
   (let* ((date1 (calendar-absolute-from-gregorian (list m1 d1 y1)))
          (date2 (calendar-absolute-from-gregorian (list m2 d2 y2)))
          (d (calendar-absolute-from-gregorian date)))
@@ -8507,7 +8507,7 @@ tag and (if present) the flagging note."
           (org-agenda-remove-flag hdmarker)
           (let ((win (get-buffer-window "*Flagging Note*")))
             (and win (delete-window win)))
-          (message "Entry unflaged"))
+          (message "Entry unflagged"))
       (setq note (org-entry-get hdmarker "THEFLAGGINGNOTE"))
       (unless note
         (error "No flagging note"))
@@ -8530,7 +8530,7 @@ tag and (if present) the flagging note."
       (org-entry-delete nil "THEFLAGGINGNOTE")
       (setq newhead (org-get-heading)))
     (org-agenda-change-all-lines newhead marker)
-    (message "Entry unflaged")))
+    (message "Entry unflagged")))
 
 (defun org-agenda-get-any-marker (&optional pos)
   (or (get-text-property (or pos (point-at-bol)) 'org-hd-marker)
diff --git a/lisp/org/org-beamer.el b/lisp/org/org-beamer.el
index 0a402ed4038..28b79a03dfe 100644
--- a/lisp/org/org-beamer.el
+++ b/lisp/org/org-beamer.el
@@ -410,7 +410,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."
@@ -450,7 +450,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-capture.el b/lisp/org/org-capture.el
index 46202f8adea..31694d47bc0 100644
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -374,7 +374,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."
@@ -1455,7 +1455,7 @@ The template may still contain \"%?\" for cursor positioning."
       (goto-char (point-min))
       (while (looking-at "[ \t]*\n") (replace-match ""))
       (if (re-search-forward "[ \t\n]*\\'" nil t) (replace-match "\n"))
-      ;; Return the expanded tempate and kill the temporary buffer
+      ;; Return the expanded template and kill the temporary buffer
       (untabify (point-min) (point-max))
       (set-buffer-modified-p nil)
       (prog1 (buffer-string) (kill-buffer (current-buffer))))))
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 2784707e452..6211ae45b1b 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -2128,7 +2128,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
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index 425e8d816c7..7c969375a7f 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -275,7 +275,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 7cbd299782f..ea94d419957 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -35,7 +35,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
diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index 49da40f5f4f..c7e1a94216e 100644
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -2800,7 +2800,7 @@ continue numbering from the last numbered block.
 REPLACE-LABELS is dual-purpose.
 1. It controls the retention of labels in the exported block.
 2. It specifies in what manner the links (or references) to a
-   labelled line be formatted.
+   labeled line be formatted.
 
 REPLACE-LABELS is the symbol `keep' if the literal example
 specifies \"-k\" option, is numeric if the literal example
@@ -2808,12 +2808,12 @@ specifies \"-r\" option and is nil otherwise.
 
 Handle REPLACE-LABELS as below:
 - If nil, retain labels in the exported block and use
-  user-provided labels for referencing the labelled lines.
+  user-provided labels for referencing the labeled lines.
 - If it is a number, remove labels in the exported block and use
-  one of line numbers or labels for referencing labelled lines based
+  one of line numbers or labels for referencing labeled lines based
   on NUMBER option.
 - If it is a keep, retain labels in the exported block and use
-  one of line numbers or labels for referencing labelled lines
+  one of line numbers or labels for referencing labeled lines
   based on NUMBER option.
 
 LABEL-FORMAT is the value of \"-l\" switch associated with
@@ -2823,8 +2823,8 @@ PREPROCESS is intended for backend-agnostic handling of source
 block numbering.  When non-nil do the following:
 - do not number the lines
 - always strip the labels from exported block
-- do not make the labelled line a target of an incoming link.
-  Instead mark the labelled line with `org-coderef' property and
+- do not make the labeled line a target of an incoming link.
+  Instead mark the labeled line with `org-coderef' property and
   store the label in it."
   (setq skip1 (or skip1 0) skip2 (or skip2 0))
   (if (and number (not cont)) (setq org-export-last-code-line-counter-value 0))
@@ -3021,7 +3021,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-list.el b/lisp/org/org-list.el
index b36167701b4..da8a810895c 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -71,7 +71,7 @@
 ;; few thousand lines long).  Thus, code should follow the rule:
 ;; "collect once, use many".  As a corollary, it is usually a bad idea
 ;; to use directly an interactive function inside the code, as those,
-;; being independant entities, read the whole list structure another
+;; being independent entities, read the whole list structure another
 ;; time.
 
 ;;; Code:
@@ -685,7 +685,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
@@ -2674,7 +2674,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.
 
@@ -3047,7 +3047,7 @@ Valid parameters PARAMS are:
 
 Alternatively, each parameter can also be a form returning
 a string.  These sexp can use keywords `counter' and `depth',
-reprensenting respectively counter associated to the current
+representing respectively counter associated to the current
 item, and depth of the current sub-list, starting at 0.
 Obviously, `counter' is only available for parameters applying to
 items."
diff --git a/lisp/org/org-lparse.el b/lisp/org/org-lparse.el
index b13dc86e5a6..229135e9b50 100644
--- a/lisp/org/org-lparse.el
+++ b/lisp/org/org-lparse.el
@@ -854,7 +854,7 @@ version."
             (throw 'nextline nil))
 
           ;; Notes: The baseline version of org-html.el (git commit
-          ;; 3d802e), while encoutering a *line-long* protected text,
+          ;; 3d802e), while encountering a *line-long* protected text,
           ;; does one of the following two things based on the state
           ;; of the export buffer.
 
@@ -869,10 +869,10 @@ version."
           ;; I think --->
 
           ;; Scenario 1 mentioned above kicks in when a block of
-          ;; protected text has to be inserted enbloc. For example,
+          ;; protected text has to be inserted en bloc. For example,
           ;; this happens, when inserting an source or example block
           ;; or preformatted content enclosed in #+backend,
-          ;; #+begin_bakend ... #+end_backend)
+          ;; #+begin_backend ... #+end_backend)
 
           ;; Scenario 2 mentioned above kicks in when the protected
           ;; text is part of a running sentence. For example this
@@ -1189,7 +1189,7 @@ version."
        (t (current-buffer))))))
 
 (defun org-lparse-format-table (lines olines)
-  "Retuns backend-specific code for org-type and table-type tables."
+  "Returns backend-specific code for org-type and table-type tables."
   (if (stringp lines)
       (setq lines (org-split-string lines "\n")))
   (if (string-match "^[ \t]*|" (car lines))
diff --git a/lisp/org/org-odt.el b/lisp/org/org-odt.el
index 886efa014f3..c8fa7ea363b 100644
--- a/lisp/org/org-odt.el
+++ b/lisp/org/org-odt.el
@@ -284,7 +284,7 @@ FILE-MEMBERS.
 Use options 1, 2 or 3 only if styles.xml alone suffices for
 achieving the desired formatting.  Use option 4, if the styles.xml
 references additional files like header and footer images for
-achieving the desired formattting.
+achieving the desired formatting.
 
 Use \"#+ODT_STYLES_FILE: ...\" directive to set this variable on
 a per-file basis.  For example,
@@ -1878,7 +1878,7 @@ ATTR is a string of other attributes of the a element."
     (cons width height)))
 
 (defvar org-odt-entity-labels-alist nil
-  "Associate Labels with the Labelled entities.
+  "Associate Labels with the Labeled entities.
 Each element of the alist is of the form (LABEL-NAME
 CATEGORY-NAME SEQNO LABEL-STYLE-NAME).  LABEL-NAME is same as
 that specified by \"#+LABEL: ...\" line.  CATEGORY-NAME is the
@@ -2213,7 +2213,7 @@ visually."
   (with-current-buffer
       (find-file-noselect (expand-file-name "styles.xml") t)
     ;; Don't make automatic backup of styles.xml file. This setting
-    ;; prevents the backedup styles.xml file from being zipped in to
+    ;; prevents the backed-up styles.xml file from being zipped in to
     ;; odt file. This is more of a hackish fix. Better alternative
     ;; would be to fix the zip command so that the output odt file
     ;; includes only the needed files and excludes any auto-generated
@@ -2228,7 +2228,7 @@ visually."
     (org-odt-configure-outline-numbering
      (if org-export-with-section-numbers org-export-headline-levels 0)))
 
-  ;; Write custom stlyes for source blocks
+  ;; Write custom styles for source blocks
   (org-odt-insert-custom-styles-for-srcblocks
    (mapconcat
     (lambda (style)
@@ -2479,7 +2479,7 @@ Do this when translation to MathML fails."
 ;; `org-export-preprocess-after-blockquote-hook'. Note that this hook
 ;; is the one that is closest and well before the call to
 ;; `org-export-attach-captions-and-attributes' in
-;; `org-export-preprocess-stirng'.  The above arrangement permits
+;; `org-export-preprocess-string'.  The above arrangement permits
 ;; captions, labels and attributes to be attached to png images
 ;; generated out of latex equations.
 (add-hook 'org-export-preprocess-after-blockquote-hook
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index ccdbc314a53..6ffa86a1204 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -145,8 +145,8 @@
 (defgroup org-protocol nil
   "Intercept calls from emacsclient to trigger custom actions.
 
-This is done by advising `server-visit-files' to scann the list of filenames
-for `org-protocol-the-protocol' and sub-procols defined in
+This is done by advising `server-visit-files' to scan the list of filenames
+for `org-protocol-the-protocol' and sub-protocols defined in
 `org-protocol-protocol-alist' and `org-protocol-protocol-alist-default'."
   :version "22.1"
   :group 'convenience
diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index dc794dd92c5..67540a67688 100644
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -277,12 +277,12 @@ in the sitemap."
   :type 'string)
 
 (defcustom org-publish-sitemap-file-entry-format "%t"
-  "How a sitemap file entry is formated.
+  "How a sitemap file entry is formatted.
 You could use brackets to delimit on what part the link will be.
 
 %t is the title.
 %a is the author.
-%d is the date formated using `org-publish-sitemap-date-format'."
+%d is the date formatted using `org-publish-sitemap-date-format'."
   :group 'org-publish
   :type 'string)
 
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index df93a9a7271..0d2a2e6a973 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -50,7 +50,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)
@@ -1299,7 +1299,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 the reference 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))
@@ -2671,7 +2671,7 @@ in the buffer and column1 and column2 are table column numbers."
             (prog1 (org-trim (org-table-get-field c1))
               (if highlight (org-table-highlight-rectangle (point) (point)))))
         ;; A range, return a vector
-        ;; First sort the numbers to get a regular ractangle
+        ;; First sort the numbers to get a regular rectangle
         (if (< r2 r1) (setq tmp r1 r1 r2 r2 tmp))
         (if (< c2 c1) (setq tmp c1 c1 c2 c2 tmp))
         (if corners-only
@@ -2931,7 +2931,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 choose a different value
 with the prefix ARG."
   (interactive "P")
   (let ((imax (if arg (prefix-numeric-value arg) 10))
diff --git a/lisp/org/org-taskjuggler.el b/lisp/org/org-taskjuggler.el
index 68f64974ff3..c1a59ee70cb 100644
--- a/lisp/org/org-taskjuggler.el
+++ b/lisp/org/org-taskjuggler.el
@@ -69,7 +69,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
@@ -572,7 +572,7 @@ with separator \"\n\"."
     (and filtered-items (mapconcat 'identity filtered-items "\n"))))
 
 (defun org-taskjuggler-get-attributes (item attributes)
-  "Return all attribute as a single formated string. ITEM is an
+  "Return all attribute as a single formatted string. ITEM is an
 alist representing either a resource or a task. ATTRIBUTES is a
 list of symbols. Only entries from ITEM are considered that are
 listed in ATTRIBUTES."
diff --git a/lisp/org/org.el b/lisp/org/org.el
index c5d5e545b9f..57d2c96514e 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -4717,7 +4717,7 @@ but the stars and the body are.")
                     "\\(?: +" org-todo-regexp "\\)?"
                     "\\(?: +\\(\\[#.\\]\\)\\)?"
                     "\\(?: +"
-                    ;; Stats cookies can be sticked to body.
+                    ;; Stats cookies can be stuck to body.
                     "\\(?:\\[[0-9%%/]+\\] *\\)?"
                     "\\(%s\\)"
                     "\\(?: *\\[[0-9%%/]+\\]\\)?"
@@ -5241,7 +5241,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))
@@ -5737,7 +5737,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.")
 
@@ -5854,7 +5854,7 @@ needs to be inserted at a specific position in the font-lock sequence.")
   (org-set-local 'org-pretty-entities (not org-pretty-entities))
   (org-restart-font-lock)
   (if org-pretty-entities
-      (message "Entities are displayed as UTF8 characers")
+      (message "Entities are displayed as UTF8 characters")
     (save-restriction
       (widen)
       (org-decompose-region (point-min) (point-max))
@@ -11441,7 +11441,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))
@@ -15123,7 +15123,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)