* What's the right branch for doc string typo fixes right now?
@ 2022-11-16 17:48 Karl Fogel
2022-11-16 19:36 ` Eli Zaretskii
0 siblings, 1 reply; 2+ messages in thread
From: Karl Fogel @ 2022-11-16 17:48 UTC (permalink / raw)
To: Emacs Devel
[-- Attachment #1: Type: text/plain, Size: 805 bytes --]
I'd like to commit the attached patch, which fixes a couple of
typos in a doc string. What's the right branch for this?
Ordinarily I would think 'emacs-28', based on this from
CONTRIBUTE:
> Documentation fixes (in doc strings, in manuals, in NEWS, and in
> comments) should always go to the release branch, if the
> documentation
> to be fixed exists and is relevant to the release-branch
> codebase.
> Doc fixes are always considered "safe" -- even when a release
> branch
> is in feature freeze, it can still receive doc fixes. However,
> this
> rule is limited to fixing real problems in the documentation;
> cleanups
> and stylistic changes are excluded.
However, the last sentence of that paragraph implies that maybe
this should go on 'master' instead of on 'emacs-28'?
Thanks, -Karl
[-- Attachment #2: bookmark-typo-fix.txt --]
[-- Type: text/plain, Size: 680 bytes --]
[[[
Fix two typos in a doc string
]]]
diff --git lisp/bookmark.el lisp/bookmark.el
index b57ad12986..15e7273f91 100644
--- lisp/bookmark.el
+++ lisp/bookmark.el
@@ -365,8 +365,8 @@ bookmark-name-from-full-record
(car bookmark-record))
(defun bookmark-type-from-full-record (bookmark-record)
- "Return then type of BOOKMARK-RECORD.
-BOOKMARK-RECORD is, e.g., one element from `bookmark-alist'. It's
+ "Return the type of BOOKMARK-RECORD.
+BOOKMARK-RECORD is, e.g., one element from `bookmark-alist'. Its
type is read from the symbol property named
`bookmark-handler-type' read on the record handler function."
(let ((handler (bookmark-get-handler bookmark-record)))
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: What's the right branch for doc string typo fixes right now?
2022-11-16 17:48 What's the right branch for doc string typo fixes right now? Karl Fogel
@ 2022-11-16 19:36 ` Eli Zaretskii
0 siblings, 0 replies; 2+ messages in thread
From: Eli Zaretskii @ 2022-11-16 19:36 UTC (permalink / raw)
To: Karl Fogel; +Cc: emacs-devel
> From: Karl Fogel <kfogel@red-bean.com>
> Date: Wed, 16 Nov 2022 11:48:38 -0600
>
> I'd like to commit the attached patch, which fixes a couple of
> typos in a doc string. What's the right branch for this?
The right branch is emacs-28. But since there won't be any releases
from that branch, you could also commit to master if you want.
Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-11-16 19:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-16 17:48 What's the right branch for doc string typo fixes right now? Karl Fogel
2022-11-16 19:36 ` Eli Zaretskii
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).