diff --git a/docs/userguide/en/applications.html b/docs/userguide/en/applications.html
index e571f3acbb..94a4b98b94 100644
--- a/docs/userguide/en/applications.html
+++ b/docs/userguide/en/applications.html
@@ -65,10 +65,6 @@ Otherwise, uninstalling is simply done by deleting the application's folder.
Besides the above listed programs, which are all maintained by the Haiku project, there are a few essential applications bundled in a standard Haiku system. Bugs and feature requests for those have to be filed with the particular maintainer.
+BePDF is Haiku's fast launching PDF viewer. Besides viewing, it supports annotating and user-defined bookmarking for unencrypted PDFs. It's fully localized for 20 languages at the moment with additional languages being easily added via text files.
-BePDF is a fast launching PDF viewer. Besides viewing, it supports annotating and user-defined bookmarking for unencrypted PDFs. It's fully localized for 20 languages at the moment with additional languages being easily added via text files.
+
Applications
- Previous: BeZillaBrowser
+ Previous: ActivityMonitor
Next: CharacterMap
diff --git a/docs/userguide/en/applications/apps-magnify.html b/docs/userguide/en/applications/apps-magnify.html
index 9c760b45d3..5fc63bd88a 100644
--- a/docs/userguide/en/applications/apps-magnify.html
+++ b/docs/userguide/en/applications/apps-magnify.html
@@ -50,7 +50,7 @@ width="64" height="64" />Magnify
You can move the red outline with the CURSOR keys.
To measure distances and align objects, you can add up to two blue crosshairs with ALT H. Their X/Y coordinates toward the top left corner and, if both are added, their X/Y distance from each other, are displayed at the bottom.
They can also be moved with the CURSOR keys. The active crosshair is marked with an "x".
-You can move the mouse pointer pixel by pixel with AltGr CURSOR keys.
+You can move the mouse pointer pixel by pixel with OPT CURSOR keys.
Clicking on the drop-down menu gives you a number of options:
| ALT S | | Saves the current display as a resource file. |
diff --git a/docs/userguide/en/applications/apps-packageinstaller.html b/docs/userguide/en/applications/apps-packageinstaller.html
index ced54dc281..4818d11d62 100644
--- a/docs/userguide/en/applications/apps-packageinstaller.html
+++ b/docs/userguide/en/applications/apps-packageinstaller.html
@@ -30,7 +30,7 @@
Previous: MidiPlayer
- Next: Pe
+ Next: People
@@ -54,7 +54,7 @@ double-clicking a supported file.
Previous: MidiPlayer
- Next: Pe
+ Next: People
-->
diff --git a/docs/userguide/en/applications/apps-pe.html b/docs/userguide/en/applications/apps-pe.html
index fdcd46838b..2c437c7e01 100644
--- a/docs/userguide/en/applications/apps-pe.html
+++ b/docs/userguide/en/applications/apps-pe.html
@@ -26,11 +26,11 @@
@@ -49,11 +49,11 @@ width="64" height="64" />Pe
diff --git a/docs/userguide/en/applications/apps-people.html b/docs/userguide/en/applications/apps-people.html
index 38daaf634b..f1f21f8c42 100644
--- a/docs/userguide/en/applications/apps-people.html
+++ b/docs/userguide/en/applications/apps-people.html
@@ -28,7 +28,7 @@
Applications
- Previous: Pe
+ Previous: PackageInstaller
Next: PoorMan
@@ -62,7 +62,7 @@ width="64" height="64" />People
Applications
- Previous: Pe
+ Previous: PackageInstaller
Next: PoorMan
diff --git a/docs/userguide/en/applications/apps-tv.html b/docs/userguide/en/applications/apps-tv.html
index e3de04f302..65dd85e001 100644
--- a/docs/userguide/en/applications/apps-tv.html
+++ b/docs/userguide/en/applications/apps-tv.html
@@ -29,8 +29,9 @@
Applications
Previous: TextSearch
-
+
diff --git a/docs/userguide/en/applications/apps-vision.html b/docs/userguide/en/applications/apps-vision.html
index bcb61d6c09..b2c438849b 100644
--- a/docs/userguide/en/applications/apps-vision.html
+++ b/docs/userguide/en/applications/apps-vision.html
@@ -26,9 +26,9 @@
- Applications
+ Applications
- Previous: TV
+ Previous: Pe
Next: VLC
@@ -49,9 +49,9 @@ width="64" height="64" />Vision
diff --git a/docs/userguide/en/images/prefs-images/backgrounds.png b/docs/userguide/en/images/prefs-images/backgrounds.png
index 879ac7b301..ed757967dc 100644
Binary files a/docs/userguide/en/images/prefs-images/backgrounds.png and b/docs/userguide/en/images/prefs-images/backgrounds.png differ
diff --git a/docs/userguide/en/keyboard-shortcuts.html b/docs/userguide/en/keyboard-shortcuts.html
index f761d373c2..2ae57d7fe4 100644
--- a/docs/userguide/en/keyboard-shortcuts.html
+++ b/docs/userguide/en/keyboard-shortcuts.html
@@ -36,8 +36,9 @@
-
By default, Haiku's option key, to invoke commands from menus for example, is not the usual CTRL key, but ALT instead. This has historical reasons, because the BeOS was inspired somewhat by MacOS. After you get used to it, it actually feels better as e.g. ALT C and ALT V is reached more conveniently on the keyboard and these commands seamlessly integrate into the bash shell of the Terminal, where CTRL C quits the running process.
-
In any case, you can switch to the maybe more familiar CTRL key in the Keymap preferences. The user guide will always describes the default configuration with option key being ALT.
+
By default, Haiku's shortcut key, to invoke commands from menus for example, is not the usual CTRL key, but ALT instead. This has historical reasons, because the BeOS was inspired somewhat by MacOS. After you get used to it, it actually has advantages as e.g. ALT C and ALT V integrate seamlessly into the bash shell of the Terminal, where CTRL C quits the running process.
+
In any case, you can switch to the maybe more familiar CTRL key in the Keymap preferences. The user guide will always describes the default configuration with the command key being ALT.
+
If you're in doubt which keys are the OPT or MENU keys on your particular keymap/keyboard-layout, again use the Keymap preferences. There you can see what keystroke is sent when you press a key on your keyboard.
Here's a table of many of the most commonly used shortcuts that are always available, even if there isn't a corresponding menu:
@@ -61,8 +62,8 @@
| ALT ↑ | | Opens the parent folder. |
| ALT ↓ or ENTER | | Opens the selected folder. |
-| WIN | | Holding it while opening a folder will automatically close the parent folder. This also works when navigating with the mouse. |
-| right MENU | | Opens the Deskbar menu (leave with ESC). |
+| OPT | | Holding it while opening a folder will automatically close the parent folder. This also works when navigating with the mouse. |
+| MENU | | Opens the Deskbar menu (leave with ESC). |
| ALT Z | | Undo last action. The undo history is only limited by the available memory. Note, this only works for actions on the file itself, changed attributes and permission settings can't be undone with this. Also, once a file is removed from Trash it's gone for good. |
| ALT SHIFT Z | | Redo the action you just reverted with ALT Z. |
diff --git a/docs/userguide/en/tracker-add-ons.html b/docs/userguide/en/tracker-add-ons.html
index a4ebd965ea..76e2844c37 100644
--- a/docs/userguide/en/tracker-add-ons.html
+++ b/docs/userguide/en/tracker-add-ons.html
@@ -43,7 +43,7 @@
| /boot/common/add-ons/Tracker/ | | for add-ons available to every user. |
| /boot/home/config/add-ons/Tracker/ | | for add-ons only available to yourself. |
-The file name of an add-on can be suffixed with a dash and capital letter, and is then available via keyboard shortcut. For example, Open Target Folder-T opens with ALT AltGr T (at least with my keymap, you may have a different key combination).
+
The file name of an add-on can be suffixed with a dash and capital letter, and is then available via keyboard shortcut. For example, Open Target Folder-T opens with ALT OPT T.
Of course, you have to take care of possible shortcut collisions when deciding on a shortcut. You can't have the same for different add-ons.
diff --git a/docs/userguide/en/tracker.html b/docs/userguide/en/tracker.html
index 1fa7f96d73..8852abb4e9 100644
--- a/docs/userguide/en/tracker.html
+++ b/docs/userguide/en/tracker.html
@@ -65,7 +65,7 @@ The above settings will automatically mount any storage device you connect/inser
Navigating
By default, when you double-click a folder, Tracker opens a new window while leaving the parent window open. This can quickly lead to an overcrowded desktop.
-You can prevent that by holding down the left WIN key, which automatically closes the parent window.
+You can prevent that by holding down the OPT key, which automatically closes the parent window.
This is also true for keyboard navigation. For more on that, see topic Shortcuts and key combinations.
Moving through your folders is one of Trackers main purposes, just like the file managers on other platforms. Haiku's Tracker has some unique features that will help you doing that efficiently.
@@ -102,7 +102,7 @@ If you do the above while dragging a file with you, it will be moved to where yo
Clean Up (ALT K) - Aligns all icons to an invisible grid. Hold down SHIFT and the menu becomes which additionally sorts all icons alphabetically.
Select... (SHIFT ALT A) - Select files according to a regular expression.
Close (ALT W) - Closes the window. Hold down SHIFT and the menu becomes which closes every Tracker window.
-Close All in Workspace (ALT Q) - Closes every Tracker window in the current workspace. A useful shortcut if you forgot to hold the WIN key while clicking through folders and all those still open Tracker windows clutter your workspace.
+Close All in Workspace (ALT Q) - Closes every Tracker window in the current workspace. A useful shortcut if you forgot to hold the OPT key while clicking through folders and all those still open Tracker windows clutter your workspace.
Sometimes you just want to rearrange a few icons without doing a complete (ALT K). In that case, you select these icons and start to drag them to their new location. Before you drop them there, keep ALT pressed. This will align the icons to the invisible grid.
The rest of the functions are pretty self-explanatory, leaving the Tracker preferences.
@@ -112,7 +112,7 @@ If you do the above while dragging a file with you, it will be moved to where yo
So, in short, the not so obvious settings:
Desktop - Decide if all mounted disks appear directly on the Desktop or in a window after clicking a single Disk icon sitting on the Desktop.
-Windows - You can set , i.e. a double-clicked folder doesn't open in its own window, but inside the already open window instead, replacing the view of it's parent folder. This is not the same as clicking while holding the WIN key, as described above, because you'll lose the per window saved position and size.
+
Windows - You can set , i.e. a double-clicked folder doesn't open in its own window, but inside the already open window instead, replacing the view of it's parent folder. This is not the same as clicking while holding the OPT key, as described above, because you'll lose the per window saved position and size.
diff --git a/docs/welcome/welcome.html b/docs/welcome/welcome.html
index 4041bcf219..1715eafe6f 100644
--- a/docs/welcome/welcome.html
+++ b/docs/welcome/welcome.html
@@ -51,10 +51,12 @@
-Because of our binary and source compatibility, many BeOS applications run on Haiku. After downloading a package, simply unzip it (double clicking should open Expander) to a folder in /boot/apps/ and start the application from there.
+Because of our binary and source compatibility, many BeOS applications run on Haiku. After downloading a package, simply unzip it (double clicking opens Expander) to /boot/apps/ and start the application from there.
+An exception are OptionalPackages, which are normally included when building Haiku directly from source. Those can, however, also be downloaded and added to any running Haiku system. The only difference to normal archives: you have to unzip directly to root /.
Popular software repositories are: