diff --git a/doc/org-manual.org b/doc/org-manual.org index a15af5179..6c3efcb8c 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -7984,7 +7984,7 @@ mentioning. - ~org-attach-method~ :: #+vindex: org-attach-method When attaching files using the dispatcher {{{kbd(C-c C-a)}}} it - defaults to copying files. The behaviour can be changed by + defaults to copying files. The behavior can be changed by customizing ~org-attach-method~. Options are Copy, Move/Rename, Hard link or Symbolic link. diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index c9722aa85..4ce8e9b1c 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -92,7 +92,7 @@ the message to 30 characters in order to build the description of the link. This behavior was considered as too surprising. As a consequence, Org no longer truncates subjects. -You can get the old behaviour back with the following: +You can get the old behavior back with the following: : (setq org-email-link-description-format "Email %c: %.30s") @@ -170,7 +170,7 @@ From now on inheritance requires no extra property and will adhere to customized to always be activated or never be activated in ~org-attach-use-inheritance~. -The ATTACH_DIR property is deprecated in favour of the shorter +The ATTACH_DIR property is deprecated in favor of the shorter property DIR. Links to folders inside the DIR property can now be declared as relative links. This is not enabled by default, but can be set in ~org-attach-dir-relative~. @@ -178,7 +178,7 @@ be set in ~org-attach-dir-relative~. When adding new attachment to the outline node the preferred way of doing so can be customized. Take a look at ~org-attach-preferred-new-method~. It defaults to using ID since that -was the behaviour before this change. +was the behavior before this change. If both DIR and ID properties are set on the same node, DIR has precedence and will be used. @@ -335,7 +335,7 @@ parameters in ~sql-connection-alist~. The builtin "latex" exporters now accept and use a =:scale= attribute, which scales an image by a given factor. -This attribute is wrapped adound the =scale= parameter of LaTeX's +This attribute is wrapped around the =scale= parameter of LaTeX's =\includegraphics= (bitmap images) or a TiKZ's =\scalebox=. Therefore, its value should be some string palatable to LaTeX as a positive float Its default value is an empty string (i.e. disabled). @@ -386,7 +386,7 @@ You can install it back from MELPA. *** ~org-capture-insert-template-here~ *** ~org-attach-directory~ -It has been deprecated in favour of ~org-attach-id-dir~ which is less +It has been deprecated in favor of ~org-attach-id-dir~ which is less ambiguous given the restructured org-attach. *** ~org-enable-fixed-width-editor~ @@ -612,7 +612,7 @@ document, use =shrink= value instead, or in addition to align: Function ~org-get-tags~ used to return local tags to the current headline. It now returns all the inherited tags in addition to the -local tags. In order to get the old behaviour back, you can use: +local tags. In order to get the old behavior back, you can use: : (org-get-tags nil t) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index e6c37fb7b..60eedb15e 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -7636,7 +7636,7 @@ and deselects entries with tag `John' or matching the regexp `plot'. During entry of the filter, completion for tags, categories and effort values is offered. Since the syntax for categories and tags is identical -there should be no overlap between categoroes and tags. If there is, tags +there should be no overlap between categories and tags. If there is, tags get priority. A single `\\[universal-argument]' prefix arg STRIP-OR-ACCUMULATE will negate the diff --git a/lisp/org-table.el b/lisp/org-table.el index 5f42db506..a2e77e073 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -1709,7 +1709,7 @@ The function assumes `org-table-copy-increment' is non-nil." (number-suffix-regexp (rx (and (one-or-more digit) string-end))) (analyze (lambda (field) - ;; Analyse string FIELD and return information related to + ;; Analyze string FIELD and return information related to ;; increment or nil. When non-nil, return value has the ;; following scheme: (TYPE VALUE PATTERN) where ;; - TYPE is a symbol among `number', `prefix', `suffix' diff --git a/lisp/org.el b/lisp/org.el index c8fcfd21a..431e0214a 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -10009,7 +10009,7 @@ By default the available states are \"TODO\" and \"DONE\". So, for this example: when the item starts with TODO, it is changed to DONE. When it starts with DONE, the DONE is removed. And when neither TODO nor DONE are present, add TODO at the beginning of the heading. -You can set up single-charcter keys to fast-select the new state. See the +You can set up single-character keys to fast-select the new state. See the `org-todo-keywords' and `org-use-fast-todo-selection' for details. With `\\[universal-argument]' prefix ARG, force logging the state change \