Skip to content

Commit 745bdeb

Browse files
skangaskyleam
authored andcommitted
Backport commit ba0871bef from Emacs
; Fix typos: prefer American spelling ba0871bef1e7d321f1124a6ad20e9be158a976dd Stefan Kangas Wed Jul 13 13:04:22 2022 +0200
1 parent 2e36ac2 commit 745bdeb

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

doc/org-manual.org

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2866,12 +2866,12 @@ For more information and examples see the [[https://orgmode.org/worg/org-tutoria
28662866
- transpose ::
28672867

28682868
When =y=, =yes=, or =t= attempt to transpose the table data before
2869-
plotting. Also recognises the shorthand option =trans=.
2869+
plotting. Also recognizes the shorthand option =trans=.
28702870

28712871
- =type= ::
28722872

28732873
Specify the type of the plot, by default one of =2d=, =3d=, =radar=, or =grid=.
2874-
Available types can be customised with ~org-plot/preset-plot-types~.
2874+
Available types can be customized with ~org-plot/preset-plot-types~.
28752875

28762876
- =with= ::
28772877

etc/ORG-NEWS

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ with width equal to the pixel-width of the buffer text multiplied by 0.7.
293293
This functionality is implemented in a new function,
294294
~org-display-inline-image--width~ which contains the width
295295
determination logic previously in ~org-display-inline-images~ and the
296-
new behaviour.
296+
new behavior.
297297

298298
** New options
299299
*** Option ~org-hidden-keywords~ now also applies to #+SUBTITLE:
@@ -311,7 +311,7 @@ descriptions.
311311
*** New option ~org-id-ts-format~
312312

313313
Earlier, IDs generated using =ts= method had a hard-coded format (i.e. =20200923T160237.891616=).
314-
The new option allows user to customise the format.
314+
The new option allows user to customize the format.
315315
Defaults are unchanged.
316316

317317
*** New argument for ~file-desc~ babel header
@@ -503,24 +503,24 @@ heading, except return nil.
503503

504504
*** Faces of all the heading text elements now conform to the headline face
505505

506-
In the past, faces of todo keywords, emphasised text, tags, and
506+
In the past, faces of todo keywords, emphasized text, tags, and
507507
priority cookies inherited =default= face. The resulting headline
508508
fontification was not always consistent, as discussed in [[msg::87h7sawubl.fsf@protesilaos.com][this bug
509509
report]]. Now, the relevant faces adapt to face used to fontify the
510510
current headline level.
511511

512-
Users who prefer to keep the old behaviour should change their face
513-
customisation explicitly stating that =default= face is inherited.
512+
Users who prefer to keep the old behavior should change their face
513+
customization explicitly stating that =default= face is inherited.
514514

515-
Example of old face customisation:
515+
Example of old face customization:
516516

517517
#+begin_src emacs-lisp
518518
(setq org-todo-keyword-faces '(("TODO"
519519
:background "chocolate"
520520
:height 0.75)))
521521
#+end_src
522522

523-
To preserve the old behaviour the above customisation should be
523+
To preserve the old behavior the above customization should be
524524
changed to
525525

526526
#+begin_src emacs-lisp
@@ -543,7 +543,7 @@ The function does not allow for a third optional parameter anymore.
543543
*** LaTeX environment =#+results= are now removed
544544

545545
If a babel src block produces a raw LaTeX environment, it will now be
546-
recognised as a result, and so replaced when re-evaluated.
546+
recognized as a result, and so replaced when re-evaluated.
547547

548548
*** Tag completion now uses =completing-read-multiple=
549549

@@ -681,7 +681,7 @@ enabled, and point is neither in a table nor on a timestamp or a link:
681681
- =C-j= (bound to the new command ~org-return-and-maybe-indent~)
682682
merely inserts a newline.
683683

684-
To get the previous behaviour back, disable ~electric-indent-mode~
684+
To get the previous behavior back, disable ~electric-indent-mode~
685685
explicitly:
686686

687687
#+begin_src emacs-lisp
@@ -1029,7 +1029,7 @@ Previously all session names had ~org-babel-session-~ prepended.
10291029
*** Forward/backward paragraph functions in line with the rest of Emacs
10301030

10311031
~org-forward-paragraph~ and ~org-backward-paragraph~, bound to
1032-
~<C-UP>~ and ~<C-DOWN>~ functions mimic more closely behaviour of
1032+
~<C-UP>~ and ~<C-DOWN>~ functions mimic more closely behavior of
10331033
~forward-paragraph~ and ~backward-paragraph~ functions when
10341034
available.
10351035

0 commit comments

Comments
 (0)