[elpa] externals-release/org 33d0263de8 3/3: Merge branch 'km/from-emacs-29' into bugfix

[ELPA Syncer]

branch: externals-release/org
commit 33d0263de8fd80dbbafc50aefdfc5c79b0d902fd
Merge: 34a8133715 c056afc153
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    Merge branch 'km/from-emacs-29' into bugfix
---
 lisp/oc-bibtex.el | 6 +++---
 lisp/ox.el        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/oc-bibtex.el b/lisp/oc-bibtex.el
index 33fba8c401..4d2297a829 100644
--- a/lisp/oc-bibtex.el
+++ b/lisp/oc-bibtex.el
@@ -6,18 +6,18 @@
 
 ;; This file is part of GNU Emacs.
 
-;; This program is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; This program is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/ox.el b/lisp/ox.el
index 5c0a8f2424..f6629cde4d 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -2559,7 +2559,7 @@ variable and do not do anything that might alter it (like 
calling a
 major mode) to prevent data corruption.  Also, do note that Emacs may
 jump into the created buffer if the original file buffer is closed and
 then re-opened.  Making edits in the buffer copy may also trigger
-Emacs save dialogue.  Prefer using `org-export-with-buffer-copy' macro
+Emacs save dialog.  Prefer using `org-export-with-buffer-copy' macro
 when possible.
 
 When optional key `:to-buffer' is non-nil, copy into BUFFER.