From 8ecc8aa21bf61063a8e2d0ef29a78d4a62616d29 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Wed, 13 Jul 2011 20:51:17 -0400
Subject: Refactored key commands and added menu accelerators. Key commands are
 now in keys.conf and keys.osx.conf which are loaded by the _m.textadept.menu
 module.

---
 doc/manual/10_Advanced.md        |  18 +--
 doc/manual/14_Appendix.md        | 311 +++++++++++++++++++++------------------
 doc/manual/1_Introduction.md     |   5 +
 doc/manual/3_UserInterface.md    |   4 +-
 doc/manual/4_WorkingWithFiles.md |  34 +++--
 doc/manual/5_FileNavigation.md   |  11 +-
 doc/manual/6_AdeptEditing.md     |  86 +++++------
 doc/manual/7_Modules.md          |  24 +--
 doc/manual/9_Preferences.md      |  21 ++-
 9 files changed, 283 insertions(+), 231 deletions(-)

(limited to 'doc/manual')

diff --git a/doc/manual/10_Advanced.md b/doc/manual/10_Advanced.md
index a24c0bdf..274f6293 100644
--- a/doc/manual/10_Advanced.md
+++ b/doc/manual/10_Advanced.md
@@ -2,11 +2,11 @@
 
 ## Command Entry
 
-Access to the Lua state is available through the command entry. Press `F2` to
-access it. It is useful for debugging, inspecting, and entering buffer or view
-commands. If you try to cause instability in Textadept's Lua state, you might
-very well succeed so be careful. For more information, see the
-[scripting](11_Scripting.html) page.
+Access to the Lua state is available through the command entry. Press `Ctrl+E`
+(`⌘E` on Mac OSX) to access it. It is useful for debugging, inspecting, and
+entering buffer or view commands. If you try to cause instability in Textadept's
+Lua state, you might very well succeed so be careful. For more information, see
+the [scripting](11_Scripting.html) page.
 
 Abbreviated commands for the `buffer`, `view` and `gui` are available. So
 `buffer:append_text('foo')` can be shortened to `append_text('foo')`. `print()`
@@ -18,8 +18,8 @@ Lua's `print()`.
 #### Tab Completion
 
 Tab-completion for functions, variables, tables, etc. is available. Press the
-`Tab` key to display a list of available completions. Use the arrow keys to make
-a selection and press `Enter` to insert it.
+`Tab` (`⇥`) key to display a list of available completions. Use the arrow keys
+to make a selection and press `Enter` (`↩`) to insert it.
 
 ![Command Completion](images/commandentrycompletion.png)
 
@@ -39,8 +39,8 @@ buffer (or a selection). You could do the following from the command entry:
     ls={}; for l in buffer:get_text():gmatch('[^\n]+') do ls[#ls+1]=l end;
     table.sort(ls); buffer:set_text(table.concat(ls, '\n'))
 
-A simpler way would be to press `Alt+R` (`Ctrl+Apple+R` on Mac OSX), enter the
-shell command `sort`, and hit `Enter`.
+A simpler way would be to press `Ctrl+|` (`⌘|` on Mac OSX), enter the shell
+command `sort`, and hit `Enter` (`↩`).
 
 The standard input (stdin) for shell commands is determined as follows:
 
diff --git a/doc/manual/14_Appendix.md b/doc/manual/14_Appendix.md
index 82ab7d69..83dab56c 100644
--- a/doc/manual/14_Appendix.md
+++ b/doc/manual/14_Appendix.md
@@ -2,146 +2,177 @@
 
 ## Key Bindings
 
-<table>
-  <tr><th>Linux / Win32</th><th>Mac OSX</th><th>Command</th></tr>
-  <tr><td colspan='3'><strong>File</strong></td></tr>
-  <tr><td>Ctrl+N</td><td>Apple+N</td><td>New file</td></tr>
-  <tr><td>Ctrl+O</td><td>Apple+O</td><td>Open file</td></tr>
-  <tr><td>Alt+O</td><td>Ctrl+O</td><td>Open recent file</td></tr>
-  <tr><td>None</td><td>None</td><td>Reload file</td></tr>
-  <tr><td>Ctrl+S</td><td>Apple+S</td><td>Save file</td></tr>
-  <tr><td>Ctrl+Shift+S</td><td>Apple+Shift+S</td><td>Save file as</td></tr>
-  <tr><td>Ctrl+W</td><td>Apple+W</td><td>Close file</td></tr>
-  <tr><td>Ctrl+Shift+W</td><td>Apple+Shift+W</td><td>Close all</td></tr>
-  <tr><td>None</td><td>None</td><td>Load Session</td></tr>
-  <tr><td>None</td><td>None</td><td>Save Session</td></tr>
-  <tr><td>Alt+Q</td><td>Apple+Q</td><td>Quit textadept</td></tr>
-  <tr><td colspan='3'><strong>Edit</strong></td></tr>
-  <tr><td>Ctrl+Z</td><td>Apple+Z</td><td>Undo</td></tr>
-  <tr><td>Ctrl+Y</td><td>Apple+Shift+Z</td><td>Redo</td></tr>
-  <tr><td>Ctrl+X<br/>Shift+Del</td><td>Apple+X<br/>Shift+Del</td><td>Cut</td></tr>
-  <tr><td>Ctrl+C<br/>Ctrl+Shift+Insert</td><td>Apple+C<br/>Ctrl+Shift+Insert</td><td>Copy</td></tr>
-  <tr><td>Ctrl+V<br/>Shift+Insert</td><td>Apple+V<br/>Shift+Insert</td><td>Paste</td></tr>
-  <tr><td>Ctrl+A</td><td>Apple+A</td><td>Select All</td></tr>
-  <tr><td>Ctrl+E</td><td>Ctrl+M</td><td>Go to matching brace</td></tr>
-  <tr><td>Ctrl+Shift+E</td><td>Apple+Shift+E</td><td>Select to matching brace</td></tr>
-  <tr><td>Ctrl+Return</td><td>Escape</td><td>Autocomplete word in file</td></tr>
-  <tr><td>Ctrl+I</td><td>Ctrl+Escape</td><td>Autocomplete symbol for supported languages</td></tr>
-  <tr><td>Ctrl+H</td><td>Ctrl+H</td><td>Show symbol apidoc for supported languages</td></tr>
-  <tr><td>Ctrl+Q</td><td>Ctrl+Q</td><td>Block comment/uncomment</td></tr>
-  <tr><td>None</td><td>None</td><td>Delete word</td></tr>
-  <tr><td>Ctrl+Shift+H</td><td>Ctrl+Apple+T</td><td>Highlight word occurances</td></tr>
-  <tr><td>None</td><td>Ctrl+T</td><td>Transpose characters</td></tr>
-  <tr><td>None</td><td>None</td><td>Convert indentation</td></tr>
-  <tr><td>None</td><td>Ctrl+K</td><td>Cut to end of line</td></tr>
-  <tr><td>None</td><td>Ctrl+Y</td><td>Paste text cut</td></tr>
-  <tr><td>Alt+C, T</td><td>Ctrl+C, T</td><td>Enclose word or selection in XML tag</td></tr>
-  <tr><td>Alt+C, Shift+T</td><td>Ctrl+C, Shift+T</td><td>Enclose word or selection in single XML tag</td></tr>
-  <tr><td>Alt+C, "</td><td>Ctrl+C, "</td><td>Enclose word or selection in double quotes</td></tr>
-  <tr><td>Alt+C, '</td><td>Ctrl+C, '</td><td>Enclose word or selection in single quotes</td></tr>
-  <tr><td>Alt+C, (</td><td>Ctrl+C, (</td><td>Enclose word or selection in parenthesis</td></tr>
-  <tr><td>Alt+C, [</td><td>Ctrl+C, [</td><td>Enclose word or selection in brackets</td></tr>
-  <tr><td>Alt+C, {</td><td>Ctrl+C, {</td><td>Enclose word or selection in braces</td></tr>
-  <tr><td>Alt+C, C, &lt;char&gt;</td><td>Ctrl+C, C, &lt;char&gt;</td><td>Enclose word or selection in character</td></tr>
-  <tr><td>Alt+S, T</td><td>Ctrl+S, T</td><td>Select between XML tags</td></tr>
-  <tr><td>Alt+S, "</td><td>Ctrl+S, "</td><td>Select between double quotes</td></tr>
-  <tr><td>Alt+S, '</td><td>Ctrl+S, '</td><td>Select between single quotes</td></tr>
-  <tr><td>Alt+S, (</td><td>Ctrl+S, (</td><td>Select between parenthesis</td></tr>
-  <tr><td>Alt+S, [</td><td>Ctrl+S, [</td><td>Select between brackets</td></tr>
-  <tr><td>Alt+S, {</td><td>Ctrl+S, {</td><td>Select between braces</td></tr>
-  <tr><td>Alt+S, W</td><td>Ctrl+S, W</td><td>Select word</td></tr>
-  <tr><td>Alt+S, L</td><td>Ctrl+S, L</td><td>Select line</td></tr>
-  <tr><td>Alt+S, P</td><td>Ctrl+S, P</td><td>Select paragraph</td></tr>
-  <tr><td>Alt+S, S</td><td>Ctrl+S, S</td><td>Select scope (style)</td></tr>
-  <tr><td>Alt+S, G</td><td>Ctrl+S, G</td><td>Grow selection by a character on each end</td></tr>
-  <tr><td>Alt+S, C, &lt;char&gt;</td><td>Ctrl+S, C, &lt;char&gt;</td><td>Select between characters</td></tr>
-  <tr><td>Insert</td><td>Insert</td><td>Toggle overtype</td></tr>
-  <tr><td>Ctrl+Alt+Shift+I</td><td>Ctrl+Apple+Shift+I</td><td>Show style</td></tr>
-  <tr><td colspan='3'><strong>Search</strong></td></tr>
-  <tr><td>Ctrl+F</td><td>Apple+F</td><td>Find</td></tr>
-  <tr><td>F3</td><td>Apple+G</td><td>Find next</td></tr>
-  <tr><td>None</td><td>Apple+Shift+G</td><td>Find prev</td></tr>
-  <tr><td>None</td><td>Apple+R</td><td>Replace</td></tr>
-  <tr><td>Ctrl+Shift+F</td><td>Apple+I</td><td>Find incremental</td></tr>
-  <tr><td>None</td><td>Apple+Shift+F</td><td>Find in files</td></tr>
-  <tr><td>None</td><td>Ctrl+Apple+G</td><td>Goto next file in list</td></tr>
-  <tr><td>None</td><td>Ctrl+Apple+Shift+G</td><td>Goto prev file in list</td></tr>
-  <tr><td>Ctrl+G</td><td>Ctrl+G</td><td>Goto line</td></tr>
-  <tr><td colspan='3'><strong>Tools</strong></td></tr>
-  <tr><td>F2</td><td>F2</td><td>Focus Lua command entry</td></tr>
-  <tr><td>Ctrl+R</td><td>Ctrl+R</td><td>Run file</td></tr>
-  <tr><td>Ctrl+Shift+R</td><td>Ctrl+Shift+R</td><td>Compile file</td></tr>
-  <tr><td>Alt+R</td><td>Ctrl+Apple+R</td><td>Filter through shell command</td></tr>
-  <tr><td>Tab</td><td>Tab</td><td>Expand snippet or next placeholder or indent text</td></tr>
-  <tr><td>Alt+I</td><td>Ctrl+I</td><td>Select snippet to insert</td></tr>
-  <tr><td>Shift+Tab</td><td>Shift+Tab</td><td>Previous snippet placeholder or dedent text</td></tr>
-  <tr><td>Ctrl+Alt+I</td><td>Ctrl+Apple+I</td><td>Cancel current snippet</td></tr>
-  <tr><td colspan='3'><strong>Buffers</strong></td></tr>
-  <tr><td>Ctrl+B</td><td>Apple+B</td><td>Switch buffers</td></tr>
-  <tr><td>Ctrl+Tab</td><td>Ctrl+Tab</td><td>Next buffer</td></tr>
-  <tr><td>Ctrl+Shift+Tab</td><td>Ctrl+Shift+Tab</td><td>Prev buffer</td></tr>
-  <tr><td>Ctrl+Shift+B, E</td><td>Apple+Shift+B, E</td><td>Toggle show end of line</td></tr>
-  <tr><td>Ctrl+Shift+B, W</td><td>Apple+Shift+B, W</td><td>Toggle show whitespace</td></tr>
-  <tr><td>Ctrl+Shift+B, I</td><td>Apple+Shift+B, I</td><td>Toggle show indentation guides</td></tr>
-  <tr><td>Ctrl+Shift+B, Tab</td><td>Apple+Shift+B, Tab</td><td>Toggle use tabs or spaces</td></tr>
-  <tr><td>Ctrl+Shift+B, Space</td><td>Apple+Shift+B, Space</td><td>Toggle show whitespace</td></tr>
-  <tr><td>Ctrl+Shift+B, V</td><td>Apple+Shift+B, V</td><td>Toggle use virtual space</td></tr>
-  <tr><td>Ctrl+L</td><td>Ctrl+L</td><td>Select lexer</td></tr>
-  <tr><td>F5</td><td>F5</td><td>Refresh syntax highlighting</td></tr>
-  <tr><td colspan='3'><strong>Split Views</strong></td></tr>
-  <tr><td>Ctrl+Alt+V, N</td><td>Ctrl+V, N</td><td>Next view</td></tr>
-  <tr><td>Ctrl+Alt+V, P</td><td>Ctrl+V, P</td><td>Prev view</td></tr>
-  <tr><td>Ctrl+Alt+V, S</td><td>Ctrl+V, S</td><td>Split view horizontal</td></tr>
-  <tr><td>Ctrl+Alt+V, Shift+S</td><td>Ctrl+V, Shift+S</td><td>Split view vertica</td></tr>
-  <tr><td>Ctrl+Alt+V, W</td><td>Ctrl+V, W</td><td>Unsplit view</td></tr>
-  <tr><td>Ctrl+Alt+V, Shift+W</td><td>Ctrl+V, Shift+W</td><td>Unsplit all views</td></tr>
-  <tr><td>None</td><td>None</td><td>Grow split view</td></tr>
-  <tr><td>None</td><td>None</td><td>Shrink split view</td></tr>
-  <tr><td>Ctrl+Plus</td><td>Ctrl+Plus</td><td>Zoom in</td></tr>
-  <tr><td>Ctrl+Minus</td><td>Ctrl+Minus</td><td>Zoom out</td></tr>
-  <tr><td>Ctrl+0</td><td>Ctrl+0</td><td>Zoom normal</td></tr>
-  <tr><td colspan='3'><strong>Movement</strong></td></tr>
-  <tr><td>Right</td><td>Right<br/>Ctrl+F</td><td>Next character</td></tr>
-  <tr><td>Shift+Right</td><td>Shift+Right<br/>Ctrl+Shift+F</td><td>Select next character</td></tr>
-  <tr><td>Ctrl+Right</td><td>Ctrl+Right<br/>Ctrl+Apple+F</td><td>Next word</td></tr>
-  <tr><td>Ctrl+Shift+Right</td><td>Ctrl+Shift+Right<br/>Ctrl+Apple+Shift+F</td><td>Select next word</td></tr>
-  <tr><td>Alt+Shift+Right</td><td>Apple+Shift+Right</td><td>Rectangular select next character</td></tr>
-  <tr><td>Left</td><td>Left<br/>Ctrl+B</td><td>Prev character</td></tr>
-  <tr><td>Shift+Left</td><td>Shift+Left<br/>Ctrl+Shift+B</td><td>Select prev character</td></tr>
-  <tr><td>Ctrl+Left</td><td>Ctrl+Left<br/>Ctrl+Apple+B</td><td>Prev word</td></tr>
-  <tr><td>Ctrl+Shift+Left</td><td>Ctrl+Shift+Left<br/>Ctrl+Apple+Shift+B</td><td>Select prev word</td></tr>
-  <tr><td>Alt+Shift+Left</td><td>Apple+Shift+Left</td><td>Rectangular select prev character</td></tr>
-  <tr><td>Down</td><td>Down<br/>Ctrl+N</td><td>Next line</td></tr>
-  <tr><td>Shift+Down</td><td>Shift+Down<br/>Ctrl+Shift+N</td><td>Select next line</td></tr>
-  <tr><td>Ctrl+Down</td><td>Ctrl+Down</td><td>Scroll line down</td></tr>
-  <tr><td>Ctrl+Shift+Down</td><td>Ctrl+Shift+Down</td><td>Rectangular select next line</td></tr>
-  <tr><td>Up</td><td>Up<br/>Ctrl+P</td><td>Next character</td></tr>
-  <tr><td>Shift+Up</td><td>Shift+Up<br/>Ctrl+Shift+P</td><td>Select prev line</td></tr>
-  <tr><td>Ctrl+Up</td><td>Ctrl+Up</td><td>Scroll line up</td></tr>
-  <tr><td>Ctrl+Shift+Up</td><td>Ctrl+Shift+Up</td><td>Rectangular select prev line</td></tr>
-  <tr><td>Home</td><td>Home<br/>Ctrl+A</td><td>Goto beginning of line</td></tr>
-  <tr><td>Shift+Home</td><td>Shift+Home<br/>Ctrl+Shift+A</td><td>Select to beginning of line</td></tr>
-  <tr><td>Ctrl+Home</td><td>Ctrl+Home</td><td>Goto document start</td></tr>
-  <tr><td>Ctrl+Shift+Home</td><td>Ctrl+Shift+Home</td><td>Select to file start</td></tr>
-  <tr><td>Alt+Shift+Home</td><td>Apple+Shift+Home</td><td>Rectangular select to beginning of line</td></tr>
-  <tr><td>End</td><td>End<br/>Ctrl+E</td><td>Goto end of line</td></tr>
-  <tr><td>Shift+End</td><td>Shift+End<br/>Ctrl+Shift+E</td><td>Select to end of line</td></tr>
-  <tr><td>Ctrl+End</td><td>Ctrl+End</td><td>Goto file end</td></tr>
-  <tr><td>Ctrl+Shift+End</td><td>Ctrl+Shift+End</td><td>Select to file end</td></tr>
-  <tr><td>Alt+Shift+End</td><td>Apple+Shift+End</td><td>Rectangular select to end of line</td></tr>
-  <tr><td>Backspace<br/>Shift+Backspace</td><td>Backspace<br/>Shift+Backspace<br/>Ctrl+H</td><td>Delete previous character</td></tr>
-  <tr><td>Ctrl+Backspace</td><td>Ctrl+Backspace<br/>Ctrl+Apple+H</td><td>Delete previous word</td></tr>
-  <tr><td>Ctrl+Shift+Backspace</td><td>Ctrl+Shift+Backspace</td><td>Delete to beginning of line</td></tr>
-  <tr><td>Del</td><td>Del<br/>Ctrl+D</td><td>Delete next character</td></tr>
-  <tr><td>Ctrl+Del</td><td>Ctrl+Del<br/>Ctrl+Apple+D</td><td>Delete next word</td></tr>
-  <tr><td>Ctrl+Shift+Del</td><td>Ctrl+Shift+Del</td><td>Delete to end of line</td></tr>
-  <tr><td>Page Up</td><td>Page Up</td><td>Page up</td></tr>
-  <tr><td>Shift+Page Up</td><td>Shift+Page Up</td><td>Select page up</td></tr>
-  <tr><td>Alt+Shift+Page Up</td><td>Apple+Shift+Page Up</td><td>Rectangular select page up</td></tr>
-  <tr><td>Page Down</td><td>Page Down</td><td>Page down</td></tr>
-  <tr><td>Shift+Page Down</td><td>Shift+Page Down</td><td>Select page down</td></tr>
-  <tr><td>Alt+Shift+Page Down</td><td>Apple+Shift+Page Down</td><td>Rectangular select page down</td></tr>
-</table>
+Linux / Win32 | Mac OSX | Command |
+--------------|---------|---------|
+**File**                        |||
+Ctrl+N      |⌘N  |New file
+Ctrl+O      |⌘O  |Open file
+Ctrl+Alt+O  |⌘⌥O |Open recent file...
+Ctrl+Shift+O|⌘⇧O |Reload file
+Ctrl+S      |⌘S  |Save file
+Ctrl+Shift+S|⌘⇧S |Save file as..
+Ctrl+W      |⌘W  |Close file
+Ctrl+Shift+W|⌘⇧W |Close all files
+None        |None|Load session...
+None        |None|Load session...
+Alt+Q       |⌘Q  |Quit
+
+**Edit**                        |||
+Ctrl+Z<br/>Alt+Backspace|⌘Z       |Undo
+Ctrl+Y<br/>Ctrl+Shift+Z |⌘⇧Z      |Redo
+Ctrl+X<br/>Shift+Del    |⌘X<br/>⇧⌦|Cut
+Ctrl+C<br/>Ctrl+Ins     |⌘C       |Copy
+Ctrl+V<br/>Shift+Ins    |⌘V       |Paste
+Ctrl+D                  |⌘D       |Duplicate line
+Del                     |⌦<br/>^D |Delete
+Ctrl+A                  |⌘A       |Select all
+Ctrl+M                  |^M       |Match brace
+Ctrl+Shift+M            |^⇧M      |Select to brace
+Ctrl+Enter              |^⎋       |Complete word
+None                    |None     |Delete word
+Ctrl+Shift+H            |⌘⇧H      |Highlight word
+Ctrl+Space              |⌥⎋       |Complete symbol
+Ctrl+H                  |^H       |Show documentation
+Ctrl+/                  |^/       |Toggle block comment
+Ctrl+T                  |^T       |Transpose characters
+Ctrl+Shift+J            |^J       |Join lines
+None                    |None     |Convert indentation
+Alt+<                   |^<       |Enclose in XML tags
+Alt+>                   |^>       |Enclose in single XML tag
+Alt+"                   |^"       |Enclose in double quotes
+Alt+'                   |^'       |Enclose in single quotes
+Alt+(                   |^(       |Enclose in parentheses
+Alt+[                   |^[       |Enclose in brackets
+Alt+{                   |^{       |Enclose in braces
+Ctrl++                  |⌘+       |Grow selection by 1 on either side
+Ctrl+\_                 |⌘\_      |Shrink selection by 1 on either side
+Ctrl+<                  |⌘<       |Select between XML tags
+Ctrl+>                  |⌘>       |Select in XML tag
+Ctrl+"                  |⌘"       |Select in double quotes
+Ctrl+'                  |⌘'       |Select in single quotes
+Ctrl+(                  |⌘(       |Select in parentheses
+Ctrl+[                  |⌘[       |Select in brackets
+Ctrl+{                  |⌘{       |Select in braces
+None                    |None     |Select word
+Ctrl+Shift+L            |⌘⇧L      |Select line
+Ctrl+Shift+P            |⌘⇧P      |Select paragraph
+Ctrl+Shift+I            |⌘⇧I      |Select indented block
+None                    |None     |Select style
+
+**Search**                      |||
+Ctrl+F                   |⌘F  |Find
+Ctrl+G<br/>F3            |⌘G  |Find next
+Ctrl+Shift+G<br/>Shift+F3|⌘⇧G |Find previous
+Ctrl+R                   |⌘R  |Replace
+Ctrl+Shift+R             |⌘⇧R |Replace all
+Ctrl+Alt+F               |⌘⌥F |Find incremental
+Ctrl+Shift+F             |⌘⇧F |Find in files
+Ctrl+Alt+G               |⌘⌥G |Goto next file found
+Ctrl+Alt+Shift+G         |⌘⌥⇧G|Goto previous file found
+Ctrl+J                   |⌘J  |Jump to line
+
+**Tools**                       |||
+Ctrl+E          |⌘E     |Command entry
+Ctrl+Alt+R      |^R     |Run
+Ctrl+Alt+Shift+R|^⇧R    |Compile
+Ctrl+&#124;     |⌘&#124;|Filter text through
+Tab             |⇥      |Expand snippet or next placeholder
+Ctrl+K          |⌥⇥     |Insert snippet...
+Shift+Tab       |⇧⇥     |Previous snippet placeholder
+Ctrl+Shift+K    |⌥⇧⇥    |Cancel snippet
+Ctrl+F2         |⌘F2    |Toggle bookmark
+Ctrl+Shift+F2   |⌘⇧F2   |Clear bookmarks
+F2              |F2     |Next bookark
+Shift+F2        |⇧F2    |Previous bookmark
+Alt+F2          |⌥F2    |Goto bookmark...
+Ctrl+U          |⌘U     |Snapopen `_USERHOME`
+Ctrl+Alt+U      |⌘⌥U    |Snapopen `_HOME`
+Ctrl+Alt+Shift+O|⌘⌥⇧O   |Snapopen current directory
+Ctrl+I          |⌘I     |Show style
+
+**Buffer**                      |||
+Ctrl+Tab<br/>Ctrl+PageDown    |^\`   |Next buffer
+Ctrl+Shift+Tab<br/>Ctrl+PageUp|^~    |Previous buffer
+Ctrl+B                        |⌘B    |Switch buffer
+Ctrl+Alt+Enter                |^↩    |Toggle view EOL
+Ctrl+Alt+\\                   |^\\   |Toggle wrap mode
+Ctrl+Alt+Shift+I              |^⇧I   |Toggle show indent guides
+Ctrl+Alt+Shift+T              |^⇧T   |Toggle use tabs
+Ctrl+Alt+Space                |^Space|Toggle view whitespace
+Ctrl+Alt+Shift+V              |^⇧V   |Toggle virtual space
+None                          |None  |`CRLF` EOL mode
+None                          |None  |`CR` EOL mode
+None                          |None  |`LF` EOL mode
+None                          |None  |`UTF-8` encoding
+None                          |None  |`ASCII` encoding
+None                          |None  |`ISO-8859-1` encoding
+None                          |None  |`UTF-16` encoding
+Ctrl+Alt+L                    |⌘⌥L   |Select lexer...
+F5                            |F5    |Refresh syntax highlighting
+
+**View**                        |||
+Ctrl+Alt+Tab             |^⇥       |Next view
+Ctrl+Alt+Shift+Tab       |^⇧⇥      |Previous view
+Ctrl+Alt+Shift+S         |^⇧S      |Split vertical
+Ctrl+Alt+S               |^S       |Split horizontal
+Ctrl+Alt+W               |^W       |Unsplit view
+Ctrl+Alt+Shift+W         |^⇧W      |Unsplit all views
+Ctrl+Alt++<br/>Ctrl+Alt+=|^+<br/>^=|Grow view
+Ctrl+Alt+-               |^-       |Shrink view
+Ctrl+=                   |⌘=       |Zoom in
+Ctrl+-                   |⌘-       |Zoom out
+Ctrl+0                   |⌘0       |Reset zoom
+
+**Help**                        |||
+F1      |F1  |Open manual
+Shift+F1|⇧F1 |Open LuaDoc
+None    |None|About
+
+**Movement**                    |||
+Down                         |⇣<br/>^N    |Line down
+Shift+Down                   |⇧⇣<br/>^⇧N  |Line down extend selection
+Ctrl+Down                    |⌘↘          |Scroll line down
+Alt+Shift+Down               |⌥⇧⇣         |Line down extend rect. selection
+Up                           |⇡<br/>^P    |Line up
+Shift+Up                     |⇧⇡<br/>^⇧P  |Line up extend selection
+Ctrl+Up                      |⌘↖          |Scroll line up
+Alt+Shift+Up                 |⌥⇧⇡         |Line up extend rect. selection
+Left                         |⇠<br/>^B    |Char left
+Shift+Left                   |⇧⇠<br/>^⇧B  |Char left extend selection
+Ctrl+Left                    |^⇠<br/>^⌥B  |Word left
+Ctrl+Shift+Left              |^⇧⇠<br/>^⌥⇧B|Word left extend selection
+Alt+Shift+Left               |⌥⇧⇠         |Char left extend rect. selection
+Right                        |⇢<br/>^F    |Char right
+Shift+Right                  |⇧⇢<br/>^⇧F  |Char right extend selection
+Ctrl+Right                   |^⇢<br/>^⌥F  |Word right
+Ctrl+Shift+Right             |^⇧⇢<br/>^⌥⇧F|Word right extend selection
+Alt+Shift+Right              |⌥⇧⇢         |Char right extend rect. selection
+Home                         |⌘⇠<br/>^A   |Line start
+Shift+Home                   |⌘⇧⇠<br/>^⇧A |Line start extend selection
+Ctrl+Home                    |⌘⇡<br/>↖    |Document start
+Ctrl+Shift+Home              |⌘⇧⇡<br/>⇧↖  |Document start extend selection
+Alt+Shift+Home               |⌥⇧↖         |Line start extend rect. selection
+End                          |⌘⇢<br/>^E   |Line end
+Shift+End                    |⌘⇧⇢<br/>^⇧E |Line end extend selection
+Ctrl+End                     |⌘⇣<br/>↘    |Document end
+Ctrl+Shift+End               |⌘⇧⇣<br/>⇧↘  |Document end extend selection
+Alt+Shift+End                |⌥⇧↘         |Line end extend rect. selection
+PageUp                       |⇞           |Page up
+Shift+PageUp                 |⇧⇞          |Page up extend selection
+Alt+Shift+PageUp             |⌥⇧⇞         |Page up extend rect. selection
+PageDown                     |⇟           |Page down
+Shift+PageDown               |⇧⇟          |Page down extend selection
+Alt+Shift+PageDown           |⌥⇧⇟         |Page down extend rect. selection
+Ctrl+Del                     |⌥⌦          |Delete word right
+Ctrl+Shift+Del               |⌘⌦          |Delete line right
+Ins                          |Ins         |Toggle overtype
+Backspace<br/>Shift+Backspace|⌫<br/>⇧⌫    |Delete back
+Ctrl+Backspace               |⌥⌫          |Delete word left
+Ctrl+Shift+Backspace         |⌘⌫          |Delete line left
+Tab                          |⇥           |Insert tab or indent
+Shift+Tab                    |⇧⇥          |Dedent
+None                         |^K          |Cut to line end
+None                         |^L          |Center line vertically
 
 ## Lua Patterns
 
diff --git a/doc/manual/1_Introduction.md b/doc/manual/1_Introduction.md
index 610a8e81..4e0b17dd 100644
--- a/doc/manual/1_Introduction.md
+++ b/doc/manual/1_Introduction.md
@@ -58,6 +58,11 @@ customization and extensibility from the start; the features come after that.
   `Ctrl+N, N` vs. `Ctrl+N, Shift+N`. In the first key chain, `Control` and `N`
   are pressed followed by `N` with no modifiers. The second has `Control` and
   `N` pressed followed by `Shift` and `N`.
+* When mentioning key commands, the Mac OSX equivalent will often be shown in
+  parenthesis. It may be tempting to assume that some Windows/Linux keys map to
+  Mac OSX's (e.g `Ctrl` to `⌘`), but this is not always the case. Please do not
+  view the key equivalents as translations of one another, but rather as
+  separate entities. This will minimize confusion.
 
 ## Features at a Glance
 
diff --git a/doc/manual/3_UserInterface.md b/doc/manual/3_UserInterface.md
index 14a6169b..e71eecce 100644
--- a/doc/manual/3_UserInterface.md
+++ b/doc/manual/3_UserInterface.md
@@ -11,8 +11,8 @@ More in-depth discussion about some of them is provided later in the manual.
 
 ## Menubar
 
-The completely customizable (and optional!) menubar typically provides access to
-all of Textadept's features.
+The completely customizable (and optional!) menubar provides access to all of
+Textadept's features.
 
 ## Editor View
 
diff --git a/doc/manual/4_WorkingWithFiles.md b/doc/manual/4_WorkingWithFiles.md
index a8afd25b..095dba55 100644
--- a/doc/manual/4_WorkingWithFiles.md
+++ b/doc/manual/4_WorkingWithFiles.md
@@ -10,13 +10,13 @@ question of where to place the bar (above, below, or to one side) and how many
 to have (one for each split view or a single one under the menubar).
 
 You can see which buffer is active by looking at Textadept's titlebar. Pressing
-`Ctrl+Tab` cycles to the next buffer and `Ctrl+Shift+Tab` cycles to the previous
-one.
+`Ctrl+Tab` (``^` `` on Mac OSX) cycles to the next buffer and `Ctrl+Shift+Tab`
+(`^~`) cycles to the previous one.
 
 ## Buffer Browser
 
-To move quickly between buffers, press `Ctrl+B` (`Apple+B` on Mac OSX) to open
-the buffer browser.
+To move quickly between buffers, press `Ctrl+B` (`⌘B` on Mac OSX) to open the
+buffer browser.
 
 ![Buffer Browser](images/bufferbrowser.png)
 
@@ -30,17 +30,17 @@ wildcards. You can also just use the arrow keys. Pressing `Enter` or clicking
 ## Split Views
 
 Textadept allows you to split the editor window as many times as you like either
-horizontally or vertically. `Ctrl+Alt+V, Shift+S` splits vertically
-(side-by-side) and `Ctrl+Alt+V, S` splits horizontally (`Ctrl+V, Shift+S` and
-`Ctrl+V, S` respectively on Mac OSX). You can resize the splitter bar by
-clicking and dragging with the mouse. The same file can be worked with in
-multiple split views.
+horizontally or vertically. `Ctrl+Alt+Shift+S` splits vertically (side-by-side)
+and `Ctrl+Alt+S` splits horizontally (`^⇧S` and `^S` respectively on Mac OSX).
+You can resize the splitter bar by clicking and dragging with the mouse or
+using `Ctrl+Alt++` and `Ctrl+Alt+-` (`^+` and `^-`). The same file can be worked
+with in multiple split views.
 
-Pressing `Ctrl+Alt+V, N` (`Ctrl+V, N` on Mac OSX) goes to the next view and
-`Ctrl+Alt+V, P` goes to the previous one.
+Pressing `Ctrl+Alt+Tab` (`^⇥` on Mac OSX) goes to the next view and
+`Ctrl+Alt+Shift+Tab` (`^⇧⇥`) goes to the previous one.
 
-To unsplit a view, enter the view to keep open and press `Ctrl+Alt+V, W`
-(`Ctrl+V, W` on Mac OSX). To unsplit all views, use `Ctrl+Alt+V, Shift+W`.
+To unsplit a view, enter the view to keep open and press `Ctrl+Alt+W` (`^W` on
+Mac OSX). To unsplit all views, use `Ctrl+Alt+Shift+W` (`^⇧W`).
 
 ## Sessions
 
@@ -58,8 +58,10 @@ scroll positions in each buffer, and Textadept's window size.
 A quicker, though slightly more limited alternative to the standard
 `File -> Open` dialog is snapopen. It behaves like the buffer browser, but
 displays a list of files to open, including files in subdirectories. You can
-snapopen the current file's directory from the `Tools -> Snapopen -> Current
-Directory` menu. Snapopen is pretty limited from the menu, but more versatile
-in scripts. See its [LuaDoc](../modules/_m.textadept.snapopen.html).
+snapopen the current file's directory with `Ctrl+Alt+Shift+O` (`⌘⌥⇧O` on Mac
+OSX) or from the `Tools -> Snapopen -> Current Directory` menu. Snapopen is
+pretty limited from the menu, but more versatile in scripts. See its
+[LuaDoc](../modules/_m.textadept.snapopen.html). `Ctrl+U` (`⌘U`) snaps open
+`~/.textadept/` and `Ctrl+Alt+U` (`⌘⌥U`) snaps open Textadept's home directory.
 
 ![Snapopen](images/snapopen.png)
diff --git a/doc/manual/5_FileNavigation.md b/doc/manual/5_FileNavigation.md
index 6b88af8d..ed0e5539 100644
--- a/doc/manual/5_FileNavigation.md
+++ b/doc/manual/5_FileNavigation.md
@@ -3,18 +3,19 @@
 ## Bookmarks
 
 You can place bookmarks on lines in buffers to jump back to them later. Use the
-`Tools -> Bookmark` menu options to do so.
+`Tools -> Bookmark` menu options or key commands to do so.
 
 ## Goto Line
 
-To jump to a specific line in a file, press `Ctrl+G` and specify the line number
-in the prompt and press `Enter` or click `OK`.
+To jump to a specific line in a file, press `Ctrl+J` (`⌘J` on Mac OSX) and
+specify the line number in the prompt and press `Enter` (`↩`) or click `OK`.
 
 ## Goto Matching Brace
 
 By default, Textadept will highlight the matching brace characters under the
-caret : `(`, `)`, `[`, `]`, `{`, `}`, `<`, and `>`. Pressing `Ctrl+E` (`Ctrl+M`
-in Mac OSX) moves the caret to that matching brace.
+caret : `(`, `)`, `[`, `]`, `{`, `}`, `<`, and `>`. Pressing `Ctrl+M` (`^M` on
+Mac OSX) moves the caret to that matching brace and `Ctrl+Shift+M` (`^⇧M`)
+extends the selection.
 
 ![Matching Braces](images/matchingbrace.png)
 
diff --git a/doc/manual/6_AdeptEditing.md b/doc/manual/6_AdeptEditing.md
index 49f16e74..9b05ce28 100644
--- a/doc/manual/6_AdeptEditing.md
+++ b/doc/manual/6_AdeptEditing.md
@@ -11,16 +11,16 @@ modified in your [preferences](9_Preferences.html#key_commands).
 Usually, quote (`'`, `"`) and brace (`(`, `[`, `{`) characters go together in
 pairs. By default, Textadept automatically inserts the complement character when
 the first is typed. Similarly, the complement is deleted when you press
-`Backspace` over the first. See the
+`Backspace` (`⌫`) over the first. See the
 [preferences](9_Preferences.html#module_settings) page if you would like to
 disable this.
 
 ## Word Completion
 
 Textadept provides buffer-based word completion. Start typing a word, press
-`Ctrl+Return` (`Esc` on Mac OSX), and a list of suggested completions based on
+`Ctrl+Return` (`^⎋` on Mac OSX), and a list of suggested completions based on
 words in the current document is provided. Continuing to type changes the
-suggestion. Press `Return` to complete the selected word.
+suggestion. Press `Return` (`↩`) to complete the selected word.
 
 ![Word Completion](images/wordcompletion.png)
 
@@ -30,8 +30,8 @@ Textadept has the capability to autocomplete symbols for programming languages
 and display API documentation. Lua is of course supported extremely well and
 other languages have basic support with the help of
 [ctags](http://ctags.sf.net). Symbol completion is available by pressing
-`Ctrl+I` (`Ctrl+Esc` on Mac OSX). Documentation for symbols is available with
-`Ctrl+H`.
+`Ctrl+Space` (`⌥⎋` on Mac OSX). Documentation for symbols is available with
+`Ctrl+H` (`^H`).
 
 ![Adeptsense Lua](images/adeptsense_lua.png)
 &nbsp;&nbsp;&nbsp;&nbsp;
@@ -44,28 +44,36 @@ the [LuaDoc](../modules/_m.textadept.adeptsense.html).
 
 ## Find and Replace
 
-`Ctrl+F` (`Apple+F` on Mac OSX) brings up the Find/Replace dialog. In addition
-to offering the usual find and replace, Textadept allows you to find with [Lua
+`Ctrl+F` (`⌘F` on Mac OSX) brings up the Find/Replace dialog. In addition to
+offering the usual find and replace, Textadept allows you to find with [Lua
 patterns](14_Appendix.html#lua_patterns) and replace with Lua captures and even
 Lua code! For example: replacing all `(%w+)` with `%(string.upper('%1'))`
 capitalizes all words in the buffer. Lua captures (`%n`) are only available from
 a Lua pattern search, but embedded Lua code enclosed in `%()` is always allowed.
 
+Note the `Ctrl+G`, `Ctrl+Shift+G`, `Ctrl+R`, `Ctrl+Shift+R` key commands for
+find next, find previous, replace, and replace all (`⌘G`, `⌘⇧G`, `⌘R`, `⌘⇧R`
+respectively on Mac OSX) only work when the Find/Replace dialog is hidden. When
+it is visible, use the button mnemonics: `Alt+N`, `Alt+P`, `Alt+R`, and `Alt+A`
+(`⌘N`, `⌘P`, `⌘R`, `⌘A`) for English locale.
+
 #### Find in Files
 
-Find in Files (`Apple+Shift+F` on Mac OSX) will prompt for a directory to
-search. The results are displayed in a new buffer. Double-clicking a search
-result jumps to it in the file. Replace in Files is not supported. You will have
-to `Find in Files` first, and then `Replace All` for each file a result is found
-in. The `Match Case`, `Whole Word`, and `Lua pattern` flags still apply.
+`Ctrl+Shift+F` brings up Find in Files (`⌘⇧F` on Mac OSX) and will prompt for a
+directory to search. The results are displayed in a new buffer. Double-clicking
+a search result jumps to it in the file. You can also use the `Ctrl+Alt+G` and
+`Ctrl+Alt+Shift+G` (`⌘⌥G` and `⌘⌥⇧G` on Mac OSX) key commands. Replace in Files
+is not supported. You will have to `Find in Files` first, and then `Replace All`
+for each file a result is found in. The `Match Case`, `Whole Word`, and
+`Lua pattern` flags still apply.
 
 ![Find in Files](images/findinfiles.png)
 
 #### Find Incremental
 
-You can start an incremental search by pressing `Ctrl+Shift+F` (`Apple+I` on Mac
-OSX). Incremental search searches the buffer as you type. Only the `Match Case`
-option is recognized.
+You can start an incremental search by pressing `Ctrl+Alt+F` (`⌘⌥F` on Mac OSX).
+Incremental search searches the buffer as you type. Only the `Match Case` option
+is recognized.
 
 #### Replace in Selection
 
@@ -78,8 +86,8 @@ then `Replace All`.
 #### Increase or Decrease Indent Level
 
 The amount of indentation for a selected set of lines is increased by pressing
-`Tab` and decreased by pressing `Shift+Tab`. Using these key sequences when no
-selection is present does not have the same effect.
+`Tab` (`⇥`) and decreased by pressing `Shift+Tab` (`⇧⇥`). Using these key
+sequences when no selection is present does not have the same effect.
 
 #### Change Indent Size
 
@@ -91,9 +99,9 @@ Textadept shows what it is using for indentation in the document statusbar.
 
 #### Using Tabs Instead of Spaces
 
-You can use tabs instead of the default spaces by pressing `Ctrl+T, V, Tab`
-(Apple+T, V, Tab on Mac OSX) or using the `Buffer -> Toggle Use Tabs` menu.
-Textadept shows what it is using for indentation in the document statusbar.
+You can use tabs instead of the default spaces by pressing `Ctrl+Alt+Shift+T`
+(`^⇧T` on Mac OSX) or using the `Buffer -> Toggle Use Tabs` menu. Textadept
+shows what it is using for indentation in the document statusbar.
 
 The default option is usually set by a [language-specific
 module](7_Modules.html#buffer_properties) or the [theme](8_Themes.html#buffer).
@@ -108,8 +116,8 @@ all tabs are converted to spaces.
 
 #### Rectangular Selection
 
-Holding `Alt+Shift` (`Apple+Shift` on Mac OSX) and pressing the arrow keys
-enables rectangular selections to be made. Start typing to type on each line.
+Holding `Alt+Shift` (`⌥⇧` on Mac OSX) and pressing the arrow keys enables
+rectangular selections to be made. Start typing to type on each line.
 
 ![Rectangular Selection](images/rectangularselection.png)
 &nbsp;&nbsp;&nbsp;&nbsp;
@@ -121,36 +129,28 @@ Clicking the mouse at a point in the buffer while holding `Control` places an
 additional caret at that point. Clicking and dragging while holding `Control`
 creates multiple selections. Start typing to enter text at each selection.
 
+This is currently unavailable on Mac OSX.
+
 #### Selecting Entities
 
-Textadept allows you to select many different entities from the caret. `Alt+S`
-(`Ctrl+S` on Mac OSX) is the key prefix to entity selection. Typing `'`, `"`,
-`(`, `[`, or `{` selects all text between the matching delimiters. Typing `W`,
-`L`, `P`, `B`, or `S` (without holding `Shift`) selects the current word, line,
-paragraph, indented block, or style respectively. Typing `T` selects the text
-between `>` and `<`, useful for selecting within HTML tags. Typing `G` grows the
-current selection by one character to each side, so `Alt+S, "` followed by
-`Alt+S, G` selects an entire `""` sequence instead of just the text in-between
-quotes. Finally, typing `C` followed by any other character selects all text
-between a pair of those characters. `Alt+S, C, "` is identical to `Alt+S, "`.
+Textadept allows you to select many different entities from the caret. For
+example, `Ctrl+"` (`^"` on Mac OSX) selects all characters in a `""` sequence.
+Typing `Ctrl++` (`^+`) as a follow-up selects the double-quotes too. See the
+`Edit -> Select In...` menu for available entities and their key commands.
 
 ## Enclosing Text
 
 As a complement to selecting entities, you can enclose text as entities. The
-key prefix is `Alt+C` (`Ctrl+C` on Mac OSX). Typing `'`, `"`, `(`, `[`, or `{`
-encloses the text in the appropriate character pair. Typing `T` (without holding
-`Shift`) creates an opening and closing HTML tag while `Shift+T` creates a
-single HTML tag. Finally, typing `C` followed by any other character encloses
-the text between a pair of those characters. `Alt+C, C, "` is identical to
-`Alt+C, "`.
+`Edit -> Selection -> Enclose In...` menu contains all available entities and
+their key commands.
 
 If no text is selected, the word to the left of the caret is enclosed.
 
 ## Word Highlight
 
 All occurrences of a given word are highlighted by putting the caret over the
-word and pressing `Ctrl+Shift+H` (`Ctrl+Apple+T` on Mac OSX). This is useful to
-show occurrences of a variable name in source code.
+word and pressing `Ctrl+Shift+H` (`⌘⇧H` on Mac OSX). This is useful to show
+occurrences of a variable name in source code.
 
 ![Word Highlight](images/wordhighlight.png)
 
@@ -158,9 +158,9 @@ show occurrences of a variable name in source code.
 
 #### Virtual Space
 
-Virtual space (freehand) mode is enabled and disabled with `Ctrl+T, V, V`
-(`Apple+T, V, V` in Mac OSX). When enabled, caret movement is not restricted by
-line endings.
+Virtual space (freehand) mode is enabled and disabled with `Ctrl+Alt+Shift+V`
+(`^⇧V` in Mac OSX). When enabled, caret movement is not restricted by line
+endings.
 
 #### Overwrite
 
diff --git a/doc/manual/7_Modules.md b/doc/manual/7_Modules.md
index 72880974..917a0b33 100644
--- a/doc/manual/7_Modules.md
+++ b/doc/manual/7_Modules.md
@@ -37,13 +37,13 @@ is loaded or a buffer's lexer is set to that language.
 #### Snippets
 
 Most language-specific modules have a set of
-[snippets](../modules/_m.textadept.snippets.html). Press `Ctrl+Alt+Shift+I`
-(`Ctrl+Apple+Shift+I` on Mac OSX) for a list of available snippets or see the
-module's Lua code. To insert a snippet, type its trigger followed by the `Tab`
-key. Subsequent presses of `Tab` causes the caret to enter tab stops in
-sequential order, `Shift+Tab` goes back to the previous tab stop, and
-`Ctrl+Alt+I` (`Ctrl+Apple+I` on Mac OSX) cancels the current snippet. Snippets
-can be nested (inserted from within another snippet).
+[snippets](../modules/_m.textadept.snippets.html). Press `Ctrl+K` (`⌥⇥` on Mac
+OSX) for a list of available snippets or see the module's Lua code. To insert a
+snippet, type its trigger followed by the `Tab` (`⇥`) key. Subsequent presses of
+`Tab` (`⇥`) causes the caret to enter tab stops in sequential order, `Shift+Tab`
+(`⇧⇥`) goes back to the previous tab stop, and `Ctrl+Shift+K` (`⌥⇧⇥` on Mac OSX)
+cancels the current snippet. Snippets can be nested (inserted from within
+another snippet).
 
 ![Snippet](images/snippet.png)
 &nbsp;&nbsp;&nbsp;&nbsp;
@@ -53,21 +53,23 @@ can be nested (inserted from within another snippet).
 
 Most language-specific modules have a set of [key
 commands](../modules/_m.textadept.keys.html). See the module's Lua code for
-which key commands are available.
+which key commands are available. They are typically stored in the `Ctrl+L`
+(`⌘L` on Mac OSX) key prefix.
 
 ##### Run
 
 Most language-specific modules have a command that runs the code in the current
-file. Pressing `Ctrl+R` runs that command.
+file. Pressing `Ctrl+Alt+R` (`^R` on Mac OSX) runs that command.
 
 ##### Compile
 
 Most language-specific modules have a command that compiles the code in the
-current file. Pressing `Ctrl+Shift+R` runs that command.
+current file. Pressing `Ctrl+Alt+Shift+R` (`^⇧R` on Mac OSX) runs that command.
 
 ##### Block Comments
 
-Pressing `Ctrl+Q` comments or uncomments the code on the selected lines.
+Pressing `Ctrl+/` (`⌘/` on Mac OSX) comments or uncomments the code on the
+selected lines.
 
 #### Buffer Properties
 
diff --git a/doc/manual/9_Preferences.md b/doc/manual/9_Preferences.md
index 579874c6..e917a55c 100644
--- a/doc/manual/9_Preferences.md
+++ b/doc/manual/9_Preferences.md
@@ -70,19 +70,30 @@ You can add global snippets to `snippets` such as:
     snippets['file'] = '%<buffer.filename>'
     snippets['path'] = "%<(buffer.filename or ''):match('^.+[/\\]')>"
 
-So typing `file` or `path` and then pressing `Tab` will insert the snippet.
+So typing `file` or `path` and then pressing `Tab` (`⇥` on Mac OSX) will insert
+the snippet.
 
 ##### Key Commands
 
-It is not recommended to edit Textadept's `modules/textadept/keys.lua` for
-changing the key bindings since your changes could be overwritten when updating
-Textadept. Instead, modify `keys` from within your `~/.textadept/init.lua` or
-from a file loaded by `~/.textadept/init.lua`. For example maybe you want
+The default set of key commands is located in `modules/textadept/keys.conf`
+(`modules/textadept/keys.osx.conf` on Mac OSX) and is loaded by the
+`_m.textadept.menu` module. It is not recommended to edit Textadept's
+`keys.conf` or `keys.osx.conf` for changing the key bindings since your changes
+could be overwritten when updating Textadept. Instead, make a copy in your
+`~/.textadept/modules/textadept/` folder and modify that.
+
+You can also modify key commands from within your your `~/.textadept/init.lua`
+or from a file loaded by `~/.textadept/init.lua`. For example maybe you want
 `Alt+N` to create a new buffer instead of `Ctrl+N`:
 
     keys.an = new_buffer
     keys.cn = nil
 
+If you choose to exclude loading the menu like in the example above, you will
+have to specify your own set of key commands! I happen to do this and keep a
+copy of `~/.textadept/modules/textadept/keys.lua` that is loaded by my
+`~/.textadept/init.lua`.
+
 ## Locale
 
 Most messages displayed by Textadept are localized. `core/locale.conf` contains
-- 
cgit v1.2.3