diff --git a/docs/userguide/en/applications.html b/docs/userguide/en/applications.html
index faf4e03d87..e571f3acbb 100644
--- a/docs/userguide/en/applications.html
+++ b/docs/userguide/en/applications.html
@@ -37,7 +37,7 @@
 
 <div class="content">
 
-<p>Before diving into all the applications that come with Haiku, let's have a more detailed look at how to install and uninstall programs you downloaded somewhere, for example from a site mentioned on the <a href="../welcome/welcome.html#software">Welcome</a> page.
+<p>Before diving into all the applications that come with Haiku, let's have a more detailed look at how to install and uninstall programs you downloaded somewhere, for example from a site mentioned on the <a href="../../welcome/welcome.html#software">Welcome</a> page.
 </p>
 
 <h1><a id="install" name="install">Installing applications</a></h1>
diff --git a/docs/userguide/en/applications/apps-installer.html b/docs/userguide/en/applications/apps-installer.html
index de8b4d6906..b22b55b175 100644
--- a/docs/userguide/en/applications/apps-installer.html
+++ b/docs/userguide/en/applications/apps-installer.html
@@ -39,14 +39,33 @@
 <h1><img src="../../images/apps-images/installer-icon_64.png" alt="installer-icon_64.png"
 width="64" height="64" />Installer</h1>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbar:</td><td style="width:15px;"></td><td><span class="menu">Applications</span></td></tr>
+<tr><td>Deskbar:</td><td style="width:15px;"></td><td><i>No entry. Has to be started from </i><span class="path">/boot/system/apps/</span>.</td></tr>
 <tr><td>Location:</td><td></td><td><span class="path">/boot/system/apps/Installer</span></td></tr>
-<tr><td>Settings:</td><td></td><td><span class="path">~/config/settings/???</span></td></tr>
+<tr><td>Settings:</td><td></td><td><i>none</i></td></tr>
 </table>
-<p>Documentation is still missing. If you want to work on it, please announce it on the <a href="http://www.freelists.org/list/haiku-doc">Documentation mailing list</a> to avoid duplication.</p>
+
+<p>The Installer is used to copy Haiku onto another volume. Upon launch it displays a start window with important information. It's not a mindless EULA you're used to click away in the blink of an eye, it states:</p>
+<ul>
+<li><p>This is alpha-quality software. Make backups or suffer the consequences!</p></li>
+<li><p>The Installer needs a prepared partition. You may have to use a <a href="http://gparted.sourceforge.net/livecd.php">GParted LiveCD</a> or a similar tool until Haiku's DriveSetup is mature enough to handle this task.</p></li>
+<li><p>Haiku can be added manually to the bootmanager GRUB. In short, you have add an entry to <span class="path">/boot/grub/menu.lst</span> of your Linux installation, similar to this:</p>
+<pre># Haiku on /dev/sda7
+title		Haiku
+rootnoverify	(hd0,6)
+chainloader	+1</pre></li>
+</ul>
+<p><br /><br /></p>
+<p>Once you acknowledged with <span class="button">Continue</span>, you're presented with the main window:</p>
+<img src="../images/apps-images/installer.png" alt="installer.png" />
+<p>In the first drop-down menu you choose the source for the installation. It can be a currently installed Haiku or can come from an install CD or USB drive, etc.<br />
+The second drop-down menu specifies the target for the installation. This target partition/volume will be completely overwritten and has to be set aside beforehand by a partitioning tool like GParted.</p>
+<p>Clicking the little expander widget will <i>Show Optional Packages</i>, if available, that you can choose to install in addition to the basic Haiku.</p>
+<p>You should do a last check if you really picked the right target before starting the installation process. Click on <span class="button">Setup partitions...</span> to open <a href="drivesetup.html">DriveSetup</a> and have a look at the naming and layout of the available volumes and partitions.</p>
+<p><span class="button">Begin</span> starts the installation procedure, which basically copies everything but the <span class="path">home/</span> and <span class="path">common/</span> folder onto the target volume.</p>
+<p>If you don't use a bootmanager like GRUB, where you can add Haiku (see start window), you can use the button <span class="button">Write Boot Sector</span> to make it bootable directly.</p>
 
 </div>
-<!--
+
 <div class="bottomnav">
 	<p>
 		<a href="../applications.html#list-of-apps">Applications</a>
@@ -56,6 +75,6 @@ width="64" height="64" />Installer</h1>
 		Next: <a href="apps-magnify.html">Magnify</a>
 	</p>
 </div>
--->
+
 </body>
 </html>
diff --git a/docs/userguide/en/applications/apps-packageinstaller.html b/docs/userguide/en/applications/apps-packageinstaller.html
index 09b2060313..ced54dc281 100644
--- a/docs/userguide/en/applications/apps-packageinstaller.html
+++ b/docs/userguide/en/applications/apps-packageinstaller.html
@@ -42,7 +42,7 @@ width="64" height="64" />PackageInstaller</h1>
 <tr><td>Deskbar:</td><td style="width:15px;"></td><td><i>No entry, normally launched via
 double-clicking a supported file.</i></td></tr>
 <tr><td>Location:</td><td></td><td><span class="path">/boot/system/apps/PackageInstaller</span></td></tr>
-<tr><td>Settings:</td><td></td><td>none</td></tr>
+<tr><td>Settings:</td><td></td><td><i>none</i></td></tr>
 </table>
 <p>Documentation is still missing. If you want to work on it, please announce it on the <a href="http://www.freelists.org/list/haiku-doc">Documentation mailing list</a> to avoid duplication.</p>
 
diff --git a/docs/userguide/en/applications/apps-stylededit.html b/docs/userguide/en/applications/apps-stylededit.html
index 5f1d5f4387..a8b8357fa6 100644
--- a/docs/userguide/en/applications/apps-stylededit.html
+++ b/docs/userguide/en/applications/apps-stylededit.html
@@ -41,7 +41,7 @@ width="64" height="64" />StyledEdit</h1>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>Deskbar:</td><td style="width:15px;"></td><td><span class="menu">Applications</span></td></tr>
 <tr><td>Location:</td><td></td><td><span class="path">/boot/system/apps/StyledEdit</span></td></tr>
-<tr><td>Settings:</td><td></td><td>no settings</td></tr>
+<tr><td>Settings:</td><td></td><td><i>none</i></td></tr>
 </table>
 <p>StyledEdit is Haiku's simple text editor. Although it saves files in plain text format, additional attributes are written in order to have limited formatting capabilities when viewed with StyledEdit.</p>
 <img src="../images/apps-images/stylededit.png" alt="stylededit.png" />
diff --git a/docs/userguide/en/deskbar.html b/docs/userguide/en/deskbar.html
index 0b58b97a01..4689041a7e 100644
--- a/docs/userguide/en/deskbar.html
+++ b/docs/userguide/en/deskbar.html
@@ -84,8 +84,8 @@
 <img src="images/deskbar-images/configure.png" alt="configure.png" />
 <p>In this panel you set the number of recent documents, folders and applications that are shown in the Deskbar, or if you show them at all.</p>
 <p>Here, you also configure folders and their contents, which are by default Applications, Demos, Deskbar Applets, and Preferences. You can add your own entries and edit or remove items.<br />
-This part of the panel is just a representation of the folder <span class="path">/boot/home/config/be/</span>. You can just as well link or copy files and folders directly in Tracker to configure your Deskbar.</p>
-<p>Even easier is it to simply drag a file or folder and drop it where you want it into the Deskbar.</p>
+This part of the panel is just a representation of the folder <span class="path">/boot/home/config/be/</span>. You can just as well link or copy files and folders or even queries directly in Tracker to configure your Deskbar.</p>
+<p>It's even easier to simply drag a file, folder or saved query and drop it where you want it into the Deskbar.</p>
 
 <h1>
 <a href="#index"><img src="../images/up.png" align="right" alt="index" border="0" width="16" height="16" /></a>
diff --git a/docs/userguide/en/images/apps-images/installer.png b/docs/userguide/en/images/apps-images/installer.png
new file mode 100644
index 0000000000..84f3360482
Binary files /dev/null and b/docs/userguide/en/images/apps-images/installer.png differ
diff --git a/docs/userguide/en/queries.html b/docs/userguide/en/queries.html
index 5605f8d396..280f853ca5 100644
--- a/docs/userguide/en/queries.html
+++ b/docs/userguide/en/queries.html
@@ -48,7 +48,8 @@
 </td></tr>
 </table>
 
-<p>A query is a file search based on file attributes and can be performed within Tracker or in Terminal. Queries are saved in <span class="path">/boot/home/queries/</span> and by default last seven days before being purged. Note, that these aren't static result lists of your search, but are the query formulas which trigger a new search whenever you open them.</p>
+<p>A query is a file search based on file attributes and can be performed within Tracker or in Terminal. Queries are saved in <span class="path">/boot/home/queries/</span> and by default last seven days before being purged. Note, these aren't static result lists of your search, but are the query formulas which trigger a new search whenever you open them.<br />
+Even better, you don't have to double-click to re-do a query. You can <a href="tracker.html#navigating">drill down</a> a saved query just like any folder by right-clicking on it and navigating through the submenus.</p>
 
 <h1>
 <a href="#index"><img src="../images/up.png" align="right" alt="index" border="0" width="16" height="16" /></a>