2 files changed, 40 insertions, 28 deletions
diff --git a/doc/editing_keys.txt b/doc/editing_keys.txt
index e83e888..ab4a022 100644
--- a/doc/editing_keys.txt
+++ b/doc/editing_keys.txt
@@ -1,20 +1,8 @@
 This is kind of a weird mix of UNIX/Emacs/bash and traditional Atari.
 
-^A - move to start of buffer
-^E - move to end of buffer
-Shift-Del - delete (clear) buffer
-^U - delete to start of buffer.
-Shift-Clear or Ctrl-Clear: clear buffer and hide input box (show status)
-^W - delete word to left of cursor
-Left/Right arrows - move cursor
-Backspace - delete the character to the left of the cursor
-Ctrl-Del or ^X - delete the character under the cursor
-Atari key - insert a ^B (meaning, toggle bold)
-^U - delete to start of buffer
-^K - kill (delete) to end of buffer.
-^F or ctrl-shift-Up - move right by one word.
-^B or ctrl-shift-Down - move left by one word.
-Tab - Nick completion (only at the start of an empty input box!)
+Cursor movement:
+
+Left/Right arrows - move cursor left/right
 Up arrow - if the inputbox has anything in it, move up 1 line,
    aka 40 characters, or to the start if the text is less than
    40 characters.
@@ -22,17 +10,37 @@ Up arrow *in an empty inputbox* - bring up last entered command.
    Can coexist with regular use of Up for movement.
 Down arrow - moves down 1 line, aka 40 characters. If this would
    move past the end of the text, moves to the end.
+Ctrl-A - move to start of buffer
+Ctrl-E - move to end of buffer
+Ctrl-F or ctrl-shift-Up - move right by one word.
+Ctrl-B or ctrl-shift-Down - move left by one word.
+
+Deleting text:
+
+Backspace - delete the character to the left of the cursor
+Shift-Del - delete (clear) buffer
+Shift-Clear or Ctrl-Clear: clear buffer and hide input box (show status)
+Ctrl-Del or Ctrl-X - delete the character under the cursor
+Ctrl-U - delete to start of buffer.
+Ctrl-W - delete word to left of cursor
+Ctrl-U - delete to start of buffer
+Ctrl-K - kill (delete) to end of buffer.
+
+Formatting:
+
+Ctrl-I - toggle italic (prints as down-arrow)
+Ctrl-shift-U - toggle underline (prints as right-arrow)
+Atari/inverse key - toggle bold (prints as inverse B)
+
+Other:
+
+Tab - Nick completion (only at the start of an empty input box!)
 Ctrl-Insert - toggle insert/typeover
 
+
 Future plans:
 
 ^Y, Shift-Insert - paste (^K, ^U, ^W fill a paste buffer; need RAM)
-Tab - For [server], complete channels. For [private] and channels,
-    complete channel nicks.
 Shift-Return: Maybe... send buffer but do not clear it.
 
-The glyphs for these will appear as inverse letters, but will actually
-be the appropriate low ASCII characters:
-^I - toggle italic
-^L - toggle underline
 ^S - toggle strikethrough
diff --git a/doc/ui_keys.txt b/doc/ui_keys.txt
index f12fbea..46d42ec 100644
--- a/doc/ui_keys.txt
+++ b/doc/ui_keys.txt
@@ -9,23 +9,27 @@ Help (XL/XE only) - same as Start+A.
 Hold down Start, *or* press and release Escape, and:
 
 1-7 - switch screens
-Up Arrow (without Control) - scroll current screen up
+Up Arrow (without Control) - scroll current screen up. Pressing
+  any key while scrolled up will scroll back down.
 Tab - switch to last displayed screen
-Left/Right (without Control) - previous/next screen.
+Left/Right Arrows (without Control) - previous/next screen.
 A - switch to active screen. [TODO: if no active screen, move
     left one screen... maybe? would this be helpful or annoying?]
+E - show full editbox (instead of screen). You can edit in this
+    mode, but pressing Enter, switching screens, or anything else
+    that normally hides the edit box will switch back to normal
+    screen + status bar display.
 S - show status (hide edit box)
-Q - create screen for last PM (in [private]) or last channel
-    message (in [server]). Does nothing in screens 2-7.
 L - list all screens (number and name).
-W - in query, /whois the user. in PM, last user who PMed.
-    in a channel or [server], no effect.
 N - in channel screen, do a /names #channel. in [server], last
     channel with traffic. no effect elsewhere.
 P - in a query screen, do a /ping <nick>. in [private], last
     nick who PMed. no effect elsewhere.
+Q - create screen for last PM (in [private]) or last channel
+    message (in [server]). Does nothing in screens 2-7.
 T - /topic #channel
-E - show full editbox (instead of screen).
+W - in query, /whois the user. in PM, last user who PMed.
+    in a channel or [server], no effect.
 X - close screen (but do not part channel).
 Ctrl-X - in a channel screen, /part the channel and close the
     screen. no effect elsewhere.