aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/manual/4_WorkingWithFiles.md25
-rw-r--r--doc/manual/6_AdeptEditing.md2
-rw-r--r--doc/manual/9_Preferences.md9
3 files changed, 18 insertions, 18 deletions
diff --git a/doc/manual/4_WorkingWithFiles.md b/doc/manual/4_WorkingWithFiles.md
index 095dba55..4e47165f 100644
--- a/doc/manual/4_WorkingWithFiles.md
+++ b/doc/manual/4_WorkingWithFiles.md
@@ -10,8 +10,8 @@ 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` (``^` `` on Mac OSX) 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
@@ -30,14 +30,14 @@ 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+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.
+horizontally or vertically. `Ctrl+Alt+S` or `Ctrl+Alt+H` splits horizontally
+(top-bottom) and `Ctrl+Alt+V` splits vertically (`^S` and `^V` 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+Tab` (`^⇥` on Mac OSX) goes to the next view and
-`Ctrl+Alt+Shift+Tab` (`^⇧⇥`) goes to the previous one.
+Pressing `Ctrl+Alt+N` (`^⌥⇥` on Mac OSX) goes to the next view and `Ctrl+Alt+P`
+(`^⌥⇧⇥`) goes to the previous one.
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`).
@@ -51,17 +51,18 @@ and opened via the `File -> Save Session...` and `File -> Load Session...`
menus.
Sessions save additional information such as current split views, caret and
-scroll positions in each buffer, and Textadept's window size.
+scroll positions in each buffer, Textadept's window size, and recently opened
+files.
## Snapopen
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 with `Ctrl+Alt+Shift+O` (`⌘⌥⇧O` on Mac
+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.
+`~/.textadept/`.
![Snapopen](images/snapopen.png)
diff --git a/doc/manual/6_AdeptEditing.md b/doc/manual/6_AdeptEditing.md
index ba633e53..cf714c00 100644
--- a/doc/manual/6_AdeptEditing.md
+++ b/doc/manual/6_AdeptEditing.md
@@ -149,7 +149,7 @@ 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` (`⌘⇧H` on Mac OSX). This is useful to show
+word and pressing `Ctrl+Alt+Shift+H` (`⌘⇧H` on Mac OSX). This is useful to show
occurrences of a variable name in source code.
![Word Highlight](images/wordhighlight.png)
diff --git a/doc/manual/9_Preferences.md b/doc/manual/9_Preferences.md
index 3a19e55b..e12b0c72 100644
--- a/doc/manual/9_Preferences.md
+++ b/doc/manual/9_Preferences.md
@@ -79,10 +79,9 @@ 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
-`Ctrl+Shift+N` (`⌘⇧N` on Mac OSX) to create a new buffer instead of `Ctrl+N`
-(`⌘N`):
+`Ctrl+Shift+C` to create a new buffer instead of `Ctrl+N`:
- keys.cN = new_buffer
+ keys.cC = new_buffer
keys.cn = nil
## Locale
@@ -90,10 +89,10 @@ from a file loaded by `~/.textadept/init.lua`. For example maybe you want
Most messages displayed by Textadept are localized. `core/locale.conf` contains
these messages. By default, Textadept is localized in English. To use a
different language, put a translated version of `core/locale.conf` in your
-`~/.textadept/` folder.
+`~/.textadept/` folder. Translations are located in `core/locales/`.
Feel free to translate Textadept and send your modified `locale.conf` files
-to me. I will make them available to other users.
+to me. I will include them in future releases.
## Mime Types