branch: elpa/magit
commit dee732651aefc0e8bb4db97dcf0a37b703bff003
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
changelog: Fix typos
---
CHANGELOG | 4 ++--
docs/RelNotes/1.1.0.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 1117135f571..d10ccc93fb9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -52,7 +52,7 @@ Bugfixes:
#5261
- The branch at point is detected in more contexts now, i.e., when
- there is not actually a branch at point, but one can unambigiously
+ there is not actually a branch at point, but one can unambiguously
be derived from the thing at point. 4876f1921e
- Reworked ~magit-process-password-prompt-regexps~ to be more permissive
@@ -101,7 +101,7 @@ Bug fixes:
- ~magit-stash-index~ did not use ~magit-stash-read-message-function~.
#5295
-- Fixed an error that occured when creating ~magit-hunk-section-map~
+- Fixed an error that occurred when creating ~magit-hunk-section-map~
and the user has disabled ~smerge-command-prefix~. The same bug
exists in Emacs since 29.1, so this will only help users stuck
on Emacs 28. #5300
diff --git a/docs/RelNotes/1.1.0.txt b/docs/RelNotes/1.1.0.txt
index 0e1c1fb168d..762d202f16f 100644
--- a/docs/RelNotes/1.1.0.txt
+++ b/docs/RelNotes/1.1.0.txt
@@ -36,7 +36,7 @@ Changes since v1.0.0
* Added mode `magit-rebase-mode'.
- * Added buttons to commit buffer to cylce to commits which were
+ * Added buttons to commit buffer to cycle to commits which were
previously shown. The commands are `magit-show-commit-backward'
and `magit-show-commit-forward.
