From 58058d1213f848f1eb44c36a3aebe4f4776ed350 Mon Sep 17 00:00:00 2001
From: Masanori Ogino <167209+omasanori@users.noreply.github.com>
Date: Tue, 20 Jun 2023 10:16:00 +0900
Subject: [PATCH] Fixup documentation on history navigation commands

Co-authored-by: Johannes Altmanninger <aclopte@gmail.com>
---
 doc/pages/changelog.asciidoc | 5 ++---
 doc/pages/keys.asciidoc      | 2 +-
 src/main.cc                  | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/doc/pages/changelog.asciidoc b/doc/pages/changelog.asciidoc
index 9cbd18ef..e9bdf758 100644
--- a/doc/pages/changelog.asciidoc
+++ b/doc/pages/changelog.asciidoc
@@ -5,9 +5,8 @@ released versions.
 
 == Development version
 
-* History is now stored linearly instead of in a tree
-
-* `<a-u>` and `<a-U>` now undo selection history
+* `<a-u>` and `<a-U>` now undo/redo selection changes; the previous meaning
+  of moving in history tree has been moved to `<c-j>` and `<c-k>`
 
 * `%exp{...}` expansions provide flexible quoting for expanded strings
   (as double quoted strings)
diff --git a/doc/pages/keys.asciidoc b/doc/pages/keys.asciidoc
index eaadd17f..031a8ac2 100644
--- a/doc/pages/keys.asciidoc
+++ b/doc/pages/keys.asciidoc
@@ -312,7 +312,7 @@ Yanking (copying) and pasting use the *"* register by default (See <<registers#,
     move forward in changes history
 
 *<c-k>*::
-    move forward in changes history
+    move backward in changes history
 
 *<a-u>*::
     undo last selection change
diff --git a/src/main.cc b/src/main.cc
index ac4a5625..9c20b882 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -45,9 +45,9 @@ struct {
     StringView notes;
 } constexpr version_notes[] = { {
         0,
-        "» Selection undo/redo moved to {+b}<a-u>{}/{+b}<a-U>{} "
-        "and moving in history tree to {+b}<c-k>{}/{+b}c-j>{}\n"
-        "» {+b}<a-u>{} and {+b}<a-U>{} now undo selection history\n"
+        "» {+b}<a-u>{} and {+b}<a-U>{} now undo/redo selection changes; "
+        "the previous meaning of moving in history tree has been moved to "
+        "{+b}<c-j>{} and {+b}<c-k>{}\n"
         "» {+u}%exp\\{...}{} expansions provide flexible quoting for expanded "
         "strings (as double quoted strings)\n"
         "» {+u}show-matching -previous{} switch\n"